Melanie 243acef917 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2011-11-03 00:06:14 +00:00

..

Caps

Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.

2011-11-02 14:59:00 -07:00

UDP

Merge branch 'master' into bigmerge

2011-10-30 10:16:25 +00:00