Robert Adams b76c233db3 Merge branch 'dev_kitty' into physbucket ...

Conflicts:
	OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs

2011-03-03 08:54:01 -08:00

..

Agent

Fixed Caps handlers leak

2011-02-05 19:34:02 -08:00

Asset

Add linden prim renderer and update libOMV

2010-10-04 00:10:08 +01:00

Avatar

Merge branch 'dev' into dev_kitty

2011-02-25 16:23:57 -08:00

Framework

Merge branch 'dev' into dev_kitty

2011-02-14 14:56:48 -08:00

Hypergrid

Revert "Updates all IRegionModules to the new style region modules."

2010-01-29 07:21:06 +00:00

InterGrid

Revert "Merge remote branch 'otakup0pe/mantis5110'"

2010-10-22 23:52:07 +01:00

LightShare

When LightShare is enabled, the standard day cycle is bypassed and replaced by

2010-11-03 02:04:17 +00:00

RegionSync/RegionSyncModule

Merge branch 'dev_kitty' into physbucket

2011-03-03 08:54:01 -08:00

Resources

Amend to yesterday's deletions: forgot to delete the RemoteInventory module in th addin.xml file.

2011-02-05 07:55:54 -08:00

Scripting

Enabled touch events (ObjectGrab, ObjectGrabbing, ObjectDeGrab) to be propagated to script engine and triggers script.

2011-01-10 14:14:40 -08:00

ServiceConnectorsIn

Implement Scope ID lookup on GetLandData. Stacked regions were not handled

2011-01-03 19:40:55 +00:00

ServiceConnectorsOut

Some conflict, probably due to line ending at LocalGridServiceConnector.cs. Just commit the difference to move on.

2011-02-15 15:07:43 -08:00

World

Merge branch 'dev' into dev_kitty

2011-02-14 14:56:48 -08:00