diff options
| author | Adam Frisby | 2009-08-16 21:21:38 +1000 |
|---|---|---|
| committer | Adam Frisby | 2009-08-16 21:21:38 +1000 |
| commit | aea4d7c63b64ee06e51725acb6d1e48c971b26d8 (patch) | |
| tree | f2be39d773040ea117f194f2a341e1df0adc2c60 /OpenSim/Region/OptionalModules/World | |
| parent | * [MRM] Implements permission checks on IObject implementations in SOPObject.... (diff) | |
| parent | Add copyright headers. Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.zip opensim-SC_OLD-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.tar.gz opensim-SC_OLD-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.tar.bz2 opensim-SC_OLD-aea4d7c63b64ee06e51725acb6d1e48c971b26d8.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 1 |
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 4a8ba8c..f0bdf3b 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -213,6 +213,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 213 | public event UpdateShape OnUpdatePrimShape; | 213 | public event UpdateShape OnUpdatePrimShape; |
| 214 | public event ObjectExtraParams OnUpdateExtraParams; | 214 | public event ObjectExtraParams OnUpdateExtraParams; |
| 215 | public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; | 215 | public event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily; |
| 216 | public event ObjectRequest OnObjectRequest; | ||
| 216 | public event ObjectSelect OnObjectSelect; | 217 | public event ObjectSelect OnObjectSelect; |
| 217 | public event GenericCall7 OnObjectDescription; | 218 | public event GenericCall7 OnObjectDescription; |
| 218 | public event GenericCall7 OnObjectName; | 219 | public event GenericCall7 OnObjectName; |