Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
This commit is contained in:
Melanie
2012-08-03 16:46:11 +01:00
20 changed files with 465 additions and 305 deletions

View File

@@ -3081,7 +3081,7 @@ namespace OpenSim.Region.Framework.Scenes
/// <summary>
/// Schedule a terse update for this prim. Terse updates only send position,
/// rotation, velocity, rotational velocity and shape information.
/// rotation, velocity and rotational velocity information.
/// </summary>
public void ScheduleTerseUpdate()
{