Melanie f7df68d922 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs

2012-10-07 02:48:28 +01:00

..

AutoBackup

Line endings

2011-11-23 16:09:11 -08:00

MoneyModule

Merge branch 'master' into careminster

2012-01-28 01:01:23 +00:00

NPC

Merge branch 'master' into careminster

2012-10-07 02:48:28 +01:00

TreePopulator

refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.

2012-03-31 01:52:06 +01:00

WorldView

Ensure closure of bitmap and memory stream with using() statements in WorldViewModule.

2012-06-06 02:45:36 +01:00