diff options
| author | Melanie | 2012-11-17 02:58:14 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-17 02:58:14 +0000 |
| commit | 7ad082f7c39ba82adeae3c25ca0befcf983c879d (patch) | |
| tree | 0e3c488c65ef22b53e4536dd07f46c1467b58f78 /OpenSim/Region/OptionalModules/World | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Prevent a buffer overflow in asset receiving (diff) | |
| download | opensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.zip opensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.gz opensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.bz2 opensim-SC-7ad082f7c39ba82adeae3c25ca0befcf983c879d.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 5471afa..3a03101 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -473,7 +473,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 473 | public event MuteListEntryRemove OnRemoveMuteListEntry; | 473 | public event MuteListEntryRemove OnRemoveMuteListEntry; |
| 474 | public event GodlikeMessage onGodlikeMessage; | 474 | public event GodlikeMessage onGodlikeMessage; |
| 475 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; | 475 | public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; |
| 476 | 476 | public event GenericCall2 OnUpdateThrottles; | |
| 477 | #pragma warning restore 67 | 477 | #pragma warning restore 67 |
| 478 | 478 | ||
| 479 | #endregion | 479 | #endregion |