diff options
| author | Melanie | 2010-04-30 11:49:16 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-30 11:49:16 +0100 |
| commit | 7dc5ebc9290cc78babee6032b0d1606d6a7848cf (patch) | |
| tree | 284b6ac7d547fcc4357343336d5fc66076e6085d /OpenSim/Region/DataSnapshot | |
| parent | Treat a UserLevel of -1 as an unverified account and refer them to their (diff) | |
| parent | Merge branch '0.6.9-post-fixes' into careminster (diff) | |
| download | opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.zip opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.gz opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.bz2 opensim-SC_OLD-7dc5ebc9290cc78babee6032b0d1606d6a7848cf.tar.xz | |
Merge branch 'careminster' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
| -rw-r--r-- | OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs index f441aa9..6e69902 100644 --- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | |||
| @@ -69,7 +69,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
| 69 | byte RayEndIsIntersection) { this.Stale = true; }; | 69 | byte RayEndIsIntersection) { this.Stale = true; }; |
| 70 | client.OnLinkObjects += delegate (IClientAPI remoteClient, uint parent, List<uint> children) | 70 | client.OnLinkObjects += delegate (IClientAPI remoteClient, uint parent, List<uint> children) |
| 71 | { this.Stale = true; }; | 71 | { this.Stale = true; }; |
| 72 | client.OnDelinkObjects += delegate(List<uint> primIds) { this.Stale = true; }; | 72 | client.OnDelinkObjects += delegate(List<uint> primIds, IClientAPI clientApi) { this.Stale = true; }; |
| 73 | client.OnGrabUpdate += delegate(UUID objectID, Vector3 offset, Vector3 grapPos, | 73 | client.OnGrabUpdate += delegate(UUID objectID, Vector3 offset, Vector3 grapPos, |
| 74 | IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) { this.Stale = true; }; | 74 | IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) { this.Stale = true; }; |
| 75 | client.OnObjectAttach += delegate(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, | 75 | client.OnObjectAttach += delegate(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, |