diff options
| author | Diva Canto | 2009-08-16 08:59:58 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-08-16 08:59:58 -0700 |
| commit | 6808b9109e33a111e3655ae214cd7b80ef3346f4 (patch) | |
| tree | 02cddcbd4d6676dfc4840863e498943986b19c47 /OpenSim/Region/OptionalModules/World | |
| parent | Merge branch 'master' into inventory-connector (diff) | |
| parent | * Implements ISecurityCredential member on SPAvatar, SPAvatarAttachment (diff) | |
| download | opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.zip opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.gz opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.bz2 opensim-SC_OLD-6808b9109e33a111e3655ae214cd7b80ef3346f4.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into inventory-connector
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; |