aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2012-08-03 16:46:11 +0100
committerMelanie2012-08-03 16:46:11 +0100
commit0c00abcce18d00ae151a7340b808ffe8d7e200ef (patch)
tree3f19d7653c984120f16b3a2ea74ccf6b34928a2e /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'master' into careminster (diff)
parentrefactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID,... (diff)
downloadopensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.zip
opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.gz
opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.bz2
opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index bd11cde..ce652b4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3081,7 +3081,7 @@ namespace OpenSim.Region.Framework.Scenes
3081 3081
3082 /// <summary> 3082 /// <summary>
3083 /// Schedule a terse update for this prim. Terse updates only send position, 3083 /// Schedule a terse update for this prim. Terse updates only send position,
3084 /// rotation, velocity, rotational velocity and shape information. 3084 /// rotation, velocity and rotational velocity information.
3085 /// </summary> 3085 /// </summary>
3086 public void ScheduleTerseUpdate() 3086 public void ScheduleTerseUpdate()
3087 { 3087 {