diff options
author | Teravus Ovares | 2007-12-05 06:44:32 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-12-05 06:44:32 +0000 |
commit | bb824eadeeb2b35025954d0c97f15123c6fd0cbe (patch) | |
tree | afca518b8e5b806cd2e7ab7965d34765d4b18bc4 /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
parent | fixed a few compiler warnings under mono (committed from a train, with adjohn... (diff) | |
download | opensim-SC_OLD-bb824eadeeb2b35025954d0c97f15123c6fd0cbe.zip opensim-SC_OLD-bb824eadeeb2b35025954d0c97f15123c6fd0cbe.tar.gz opensim-SC_OLD-bb824eadeeb2b35025954d0c97f15123c6fd0cbe.tar.bz2 opensim-SC_OLD-bb824eadeeb2b35025954d0c97f15123c6fd0cbe.tar.xz |
* Refactored Permissions into ScenePresence as requested by MW
* Un-hackerized generating the client_flags
* Now handling the ObjectPermissions Update packet
* Warning: Backup your prim before updating. If you fail to do so and something goes wrong then, All Yr prim are belong to us!
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 524fb60..2f00515 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -343,7 +343,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
343 | } | 343 | } |
344 | // } | 344 | // } |
345 | } | 345 | } |
346 | 346 | public uint GenerateClientFlags(LLUUID ObjectID) | |
347 | { | ||
348 | return m_scene.PermissionsMngr.GenerateClientFlags(this.m_uuid, ObjectID); | ||
349 | } | ||
347 | public void SendPrimUpdates() | 350 | public void SendPrimUpdates() |
348 | { | 351 | { |
349 | // if (m_scene.QuadTree.GetNodeID(this.AbsolutePosition.X, this.AbsolutePosition.Y) != m_currentQuadNode) | 352 | // if (m_scene.QuadTree.GetNodeID(this.AbsolutePosition.X, this.AbsolutePosition.Y) != m_currentQuadNode) |
@@ -380,7 +383,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
380 | if (update.LastFullUpdateTime < part.TimeStampFull) | 383 | if (update.LastFullUpdateTime < part.TimeStampFull) |
381 | { | 384 | { |
382 | //need to do a full update | 385 | //need to do a full update |
383 | part.SendFullUpdate(ControllingClient); | 386 | part.SendFullUpdate(ControllingClient, GenerateClientFlags(part.UUID)); |
384 | 387 | ||
385 | // We'll update to the part's timestamp rather than the current to | 388 | // We'll update to the part's timestamp rather than the current to |
386 | // avoid the race condition whereby the next tick occurs while we are | 389 | // avoid the race condition whereby the next tick occurs while we are |
@@ -403,7 +406,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
403 | else | 406 | else |
404 | { | 407 | { |
405 | //never been sent to client before so do full update | 408 | //never been sent to client before so do full update |
406 | part.SendFullUpdate(ControllingClient); | 409 | part.SendFullUpdate(ControllingClient, GenerateClientFlags(part.UUID)); |
407 | ScenePartUpdate update = new ScenePartUpdate(); | 410 | ScenePartUpdate update = new ScenePartUpdate(); |
408 | update.FullID = part.UUID; | 411 | update.FullID = part.UUID; |
409 | update.LastFullUpdateTime = part.TimeStampFull; | 412 | update.LastFullUpdateTime = part.TimeStampFull; |