Melanie 43128c9016 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-01-14 06:09:19 +00:00

..

Caps

Merge branch 'master' into bigmerge

2011-12-01 12:16:59 +00:00

EntityTransfer

Adapt a cast to using the new TeleportFlags

2012-01-11 19:00:17 +01:00

InterfaceCommander

Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522

2010-02-12 23:13:35 +00:00

InventoryAccess

HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.

2012-01-12 09:56:35 -08:00

Library

For default everyone permissions on library items, make notecards and scripts non-modifiable (but still copyable, etc).

2011-07-23 02:18:23 +01:00

Monitoring

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

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

Statistics/Logging

Formatting cleanup.

2010-09-12 13:43:49 -04:00

UserManagement

Fix improper code formatting introduced in 6214e6a217

2012-01-13 17:10:48 -05:00