diff options
| author | Melanie | 2010-03-06 12:24:09 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-06 12:24:09 +0000 |
| commit | 1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90 (patch) | |
| tree | 69419084feb98d59888b59a643e5fa062314605d /OpenSim/Region/OptionalModules/World | |
| parent | Remove a superfluous array creation (diff) | |
| parent | - implementing server 1.38 functions (diff) | |
| download | opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.zip opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.gz opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.bz2 opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.xz | |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
| -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; |