Melanie d1e681f682 Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

2011-10-11 23:14:23 +01:00

..

Agent

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

2011-10-11 22:51:44 +01:00

Asset

Merge fixes, and fix the build

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

Avatar

Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge

2011-10-11 23:14:23 +01:00

Framework

Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge

2011-10-11 23:14:23 +01: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

Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge

2011-10-11 23:01:52 +01:00

ServiceConnectorsIn

remove mono compiler warnings

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

ServiceConnectorsOut

Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge

2011-10-11 22:54:03 +01:00

World

Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

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