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

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Physics/Manager/PhysicsScene.cs

2012-08-01 23:03:03 +01:00

..

Dataserver.cs

Add sensor, dataserver requests, timer and listener counts to "xengine status" command.

2012-03-06 23:21:17 +00:00

HttpRequest.cs

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

Listener.cs

Add regression TestDetachScriptedAttachmentToInventory()

2012-07-11 21:43:35 +01:00

SensorRepeat.cs

Merge branch 'master' into careminster

2012-08-01 23:03:03 +01:00

Timer.cs

Merge branch 'master' into careminster

2012-03-07 00:51:59 +00:00

XmlRequest.cs

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00