Melanie dc612d0f08 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

2011-11-28 11:06:38 +00:00

..

YieldProlog

Formatting cleanup.

2009-06-10 04:28:56 +00:00

CM_Constants.cs

First attempt at fixing mantis #4641. It's better but there are now some issues with permissions.

2010-03-31 21:30:44 -07:00

CM_Stub.cs

Add the country functions in the careminster API

2011-02-12 20:59:09 +01:00

Executor.cs

Merge branch 'master' into careminster

2010-01-11 02:04:58 +00:00

LS_Stub.cs

Merge branch 'master' into careminster-presence-refactor

2010-11-03 02:34:36 +00:00

LSL_Constants.cs

Merge branch 'master' into bigmerge

2011-11-28 11:06:38 +00:00

LSL_Stub.cs

Merge commit '528fcede6c31c056c3863fd19528558fcbaf475f' into bigmerge

2011-10-11 23:08:38 +01:00

MOD_Stub.cs

…

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

Make local teleports send CHANGED_TELEPORT

2010-06-12 07:34:22 +02:00

OSSL_Stub.cs

Implement osNpcStand(<npc-id>)

2011-10-17 01:56:25 +01:00

ScriptBase.cs

Add virtual method StateChange to ScriptBaseClass

2010-01-02 21:21:31 +01:00

ScriptSponsor.cs

…