Melanie 7444f3bfad Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim ...

Conflicts:
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

2012-01-25 15:02:54 +00:00

..

Agent

Improve "j2k decode" command to tell us how many layers and components were decoded, instead of just success/failure

2012-01-05 22:54:33 +00:00

Asset

refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAsset()

2011-10-22 00:13:46 +01:00

Avatar

If deserializing a scene object fails during IAR load then ignore the object rather than halting the IAR load with an exception.

2012-01-11 14:33:26 +00:00

Framework

Fix improper code formatting introduced in 6214e6a217

2012-01-13 17:10:48 -05: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

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

LightShare

Introduce a LightShare kill packet ans send it when needed. Currently only

2011-12-28 09:24:02 +00: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

Allow SmtpClients and other SSL users to work with our cert handler installed

2012-01-14 06:03:27 +00:00

ServiceConnectorsIn

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

ServiceConnectorsOut

Allow retrival of multiple user records in one operation, analog to presence

2012-01-16 23:09:24 +00:00

World

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

2012-01-25 15:02:54 +00:00