diff options
| author | Kitto Flora | 2010-03-12 13:48:31 -0500 |
|---|---|---|
| committer | Kitto Flora | 2010-03-12 13:48:31 -0500 |
| commit | 7bd48d383d3383c1e633f76f76a5291f4224d48a (patch) | |
| tree | 18997a5b1a123091af18a1a7984d7dd7873930ac /OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |
| parent | Dynamics Integration Part 1 (diff) | |
| parent | Small consistency change (diff) | |
| download | opensim-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/OptionalModules/World/NPC/NPCAvatar.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 3135cdc..cf2076f 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -298,6 +298,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 298 | public event ObjectBuy OnObjectBuy; | 298 | public event ObjectBuy OnObjectBuy; |
| 299 | public event BuyObjectInventory OnBuyObjectInventory; | 299 | public event BuyObjectInventory OnBuyObjectInventory; |
| 300 | public event AgentSit OnUndo; | 300 | public event AgentSit OnUndo; |
| 301 | public event AgentSit OnRedo; | ||
| 302 | public event LandUndo OnLandUndo; | ||
| 301 | 303 | ||
| 302 | public event ForceReleaseControls OnForceReleaseControls; | 304 | public event ForceReleaseControls OnForceReleaseControls; |
| 303 | public event GodLandStatRequest OnLandStatRequest; | 305 | public event GodLandStatRequest OnLandStatRequest; |