aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMelanie2012-03-11 01:47:36 +0100
committerMelanie2012-03-11 01:47:36 +0100
commit0a4056ad2267656e6b2c07c7989690ecabc07b5f (patch)
tree04f25af9832347f1a88890f9d8067f6f0e2155c9 /OpenSim/Region/OptionalModules/World
parentMerge branch 'master' into careminster (diff)
parent Changed undo redo internals. moved exec code to UndoState.cs from sop that n... (diff)
downloadopensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.zip
opensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.tar.gz
opensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.tar.bz2
opensim-SC_OLD-0a4056ad2267656e6b2c07c7989690ecabc07b5f.tar.xz
Merge branch 'ubitwork'
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index cbc3813..cdb6efe 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -275,6 +275,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
275 public event UpdatePrimTexture OnUpdatePrimTexture; 275 public event UpdatePrimTexture OnUpdatePrimTexture;
276 public event UpdateVector OnUpdatePrimGroupPosition; 276 public event UpdateVector OnUpdatePrimGroupPosition;
277 public event UpdateVector OnUpdatePrimSinglePosition; 277 public event UpdateVector OnUpdatePrimSinglePosition;
278 public event ClientChangeObject onClientChangeObject;
278 public event UpdatePrimRotation OnUpdatePrimGroupRotation; 279 public event UpdatePrimRotation OnUpdatePrimGroupRotation;
279 public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition; 280 public event UpdatePrimSingleRotationPosition OnUpdatePrimSingleRotationPosition;
280 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation; 281 public event UpdatePrimSingleRotation OnUpdatePrimSingleRotation;