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

..

Plugins

Merge branch 'master' into careminster

2013-01-10 01:38:03 +00:00

Properties

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

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

ApiManager.cs

Add osForceAttachToAvatar() and osForceDetachFromAvatar()

2012-04-24 00:03:57 +01:00

AsyncCommandManager.cs

avoid potencial NullReferenceException

2012-11-24 03:39:37 +00:00

CM_Api.cs

JustinCC's core re-merge

2013-01-16 15:47:55 +00:00

LS_Api.cs

JustinCC's core re-merge

2013-01-16 15:47:55 +00:00

LSL_Api.cs

Merge branch 'master' into careminster

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

MOD_Api.cs

JustinCC's core re-merge

2013-01-16 15:47:55 +00:00

OSSL_Api.cs

Merge branch 'master' into careminster

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