From 6510aea0ed33134c09d25be690a69e1fff4a3282 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Sun, 15 Jul 2007 21:02:13 +0000
Subject: *Added support for the "show" button that highlights objects over the
 selected Objects *Known bug, client does some weird "showing" when more than
 255 objects are meant to be selected (linked objects count as one object)

---
 OpenSim/Region/Environment/Scenes/Scene.cs       | 3 ++-
 OpenSim/Region/Environment/Scenes/SceneObject.cs | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 0186ba8..a06679a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -229,7 +229,7 @@ namespace OpenSim.Region.Environment.Scenes
                 }
 
                 this.parcelPrimCheckCount++;
-                if (this.parcelPrimCheckCount > 100) //check every 10 seconds for tainted prims
+                if (this.parcelPrimCheckCount > 50) //check every 5 seconds for tainted prims
                 {
                     if (m_parcelManager.parcelPrimCountTainted)
                     {
@@ -534,6 +534,7 @@ namespace OpenSim.Region.Environment.Scenes
             client.OnParcelDivideRequest += new ParcelDivideRequest(m_parcelManager.handleParcelDivideRequest);
             client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest);
             client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest);
+            client.OnParcelSelectObjects += new ParcelSelectObjects(m_parcelManager.handleParcelSelectObjectsRequest);
             client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
 
         }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 95db271..c925584 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -170,8 +170,7 @@ namespace OpenSim.Region.Environment.Scenes
             dupe.children.Add(dupe.rootPrimitive);
             dupe.rootPrimitive.Pos = this.Pos;
             dupe.Rotation = this.Rotation;
-            LLUUID rootu = dupe.rootUUID;
-            uint rooti = dupe.rootLocalID;
+            dupe.LocalId = m_world.PrimIDAllocate();
 
             dupe.registerEvents();
             return dupe;
-- 
cgit v1.1