Melanie 26cc57b6ca Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs

2012-10-26 21:13:01 +01:00

..

Base

pasting in show uptime code

2012-09-06 06:13:07 -04:00

Handlers

Merge branch 'master' into careminster

2012-10-26 21:13:01 +01:00

ServerMain.cs

Fix build break

2012-10-08 19:02:21 +01:00