Melanie 12efac494a Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs

2013-01-19 02:38:04 +00:00

..

Properties

Added AssemblyInfos to every dll in the OpenSim.Region namespace.

2012-11-14 11:09:43 -08:00

YieldProlog

Added AssemblyInfos to every dll in the OpenSim.Region namespace.

2012-11-14 11:09:43 -08:00

CM_Constants.cs

…

CM_Stub.cs

…

Executor.cs

…

LS_Stub.cs

…

LSL_Constants.cs

Merge branch 'master' into careminster

2013-01-19 02:38:04 +00:00

LSL_Stub.cs

Merge branch 'master' into careminster

2012-11-09 22:58:42 +00:00

MOD_Stub.cs

Add a hust UUID to the script invocations

2012-03-26 14:19:55 +01:00

OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp

…

OSSL_Stub.cs

BulletSim: add osGetPhysicsEngineType() LSL function and update

2013-01-11 16:47:35 -08:00

ScriptBase.cs

…

ScriptSponsor.cs

…