Melanie 48569e856a Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-10-30 01:02:20 +00:00

..

JsonStore

Allow an incoming identifier to be specified for a JsonStore.

2012-09-11 16:42:07 -07:00

Minimodule

shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string

2012-10-29 23:39:00 +00:00

ObjectModules

…

RegionReadyModule

Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."

2012-09-30 07:48:03 -07:00

XmlRpcRouterModule

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00