Melanie 4e9457ca0c Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge ...

Conflicts:
	OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs

2011-10-25 03:26:09 +01:00

..

Agent

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

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

Asset

Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge

2011-10-25 03:18:29 +01:00

Avatar

Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge

2011-10-25 03:19:49 +01:00

Framework

Merge branch 'master' into bigmerge

2011-10-12 07:29:35 +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 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmerge

2011-10-12 07:24:53 +01:00

ServiceConnectorsIn

remove mono compiler warnings

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

ServiceConnectorsOut

Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge

2011-10-25 03:26:09 +01:00

World

Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge

2011-10-25 03:17:26 +01:00