aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
diff options
context:
space:
mode:
authorKitto Flora2010-03-12 13:48:31 -0500
committerKitto Flora2010-03-12 13:48:31 -0500
commit7bd48d383d3383c1e633f76f76a5291f4224d48a (patch)
tree18997a5b1a123091af18a1a7984d7dd7873930ac /OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
parentDynamics Integration Part 1 (diff)
parentSmall consistency change (diff)
downloadopensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.zip
opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.gz
opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.bz2
opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.xz
Resolved merge
Diffstat (limited to 'OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs')
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 172d012..d2b0161 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -194,6 +194,8 @@ namespace OpenSim.Region.Examples.SimpleModule
194 public event ObjectBuy OnObjectBuy; 194 public event ObjectBuy OnObjectBuy;
195 public event BuyObjectInventory OnBuyObjectInventory; 195 public event BuyObjectInventory OnBuyObjectInventory;
196 public event AgentSit OnUndo; 196 public event AgentSit OnUndo;
197 public event AgentSit OnRedo;
198 public event LandUndo OnLandUndo;
197 199
198 public event ForceReleaseControls OnForceReleaseControls; 200 public event ForceReleaseControls OnForceReleaseControls;
199 201