Melanie c95c8ab246 Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

2011-10-11 21:06:06 +01:00

..

Agent

Merge branch 'master' into careminster-presence-refactor

2011-05-05 09:49:10 +01:00

Asset

Merge fixes, and fix the build

2011-09-14 18:46:42 -07:00

Avatar

Fix a rather stupid VS warning "The operation overflows at compile time in checked mode" - doesn't make much sense to me, but for some reason it doesn't like 256 - 6 when 256 is a constant...

2011-09-14 19:31:55 -07:00

Framework

Bring us up to date.

2011-09-14 19:11:32 -07:00

Hypergrid

3rd way of reseting the HG Map. This time, don't use the grid service; instead keep track of which map blocks each client has seen in the region, and reset exactly those when the client closes.

2011-06-10 17:22:17 -07:00

InterGrid

Broke down Caps.cs into a generic Caps object that simply registers/unregisters capabilities and a specific bunch of capability implementations in Linden space called BunchOfCaps.

2011-05-01 18:22:53 -07:00

LightShare

Stop displaying "Sending windowslig profile to client" when WL is disabled

2011-07-05 03:08:36 +02:00

Resources

Moved the Mono Addins declaration of the HGFriendsModule to where the one for FriendModule is -- CoreModulePlugin.addin.xml (trying to hunt down the slowness reported by Nebadon related to HGFriends)

2011-06-06 18:20:02 -07:00

Scripting

Bring us up to date.

2011-09-14 19:11:32 -07:00

ServiceConnectorsIn

remove mono compiler warnings

2011-08-23 21:41:16 +01:00

ServiceConnectorsOut

Merge commit '8fb3e71b14e28bf8a4ddb72e3d1b529128f090ce' into bigmerge

2011-10-11 21:06:06 +01:00

World

Bring us up to date.

2011-09-14 19:11:32 -07:00