diff options
author | mingchen | 2007-07-15 21:02:13 +0000 |
---|---|---|
committer | mingchen | 2007-07-15 21:02:13 +0000 |
commit | 6510aea0ed33134c09d25be690a69e1fff4a3282 (patch) | |
tree | 977e759a9ae61b788439e68ce01bd94dfae4c1fc /OpenSim/Region/Environment/Scenes | |
parent | * Primitives are now loaded from Datastore during scene initialisation. (diff) | |
download | opensim-SC-6510aea0ed33134c09d25be690a69e1fff4a3282.zip opensim-SC-6510aea0ed33134c09d25be690a69e1fff4a3282.tar.gz opensim-SC-6510aea0ed33134c09d25be690a69e1fff4a3282.tar.bz2 opensim-SC-6510aea0ed33134c09d25be690a69e1fff4a3282.tar.xz |
*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)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObject.cs | 3 |
2 files changed, 3 insertions, 3 deletions
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 | |||
229 | } | 229 | } |
230 | 230 | ||
231 | this.parcelPrimCheckCount++; | 231 | this.parcelPrimCheckCount++; |
232 | if (this.parcelPrimCheckCount > 100) //check every 10 seconds for tainted prims | 232 | if (this.parcelPrimCheckCount > 50) //check every 5 seconds for tainted prims |
233 | { | 233 | { |
234 | if (m_parcelManager.parcelPrimCountTainted) | 234 | if (m_parcelManager.parcelPrimCountTainted) |
235 | { | 235 | { |
@@ -534,6 +534,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
534 | client.OnParcelDivideRequest += new ParcelDivideRequest(m_parcelManager.handleParcelDivideRequest); | 534 | client.OnParcelDivideRequest += new ParcelDivideRequest(m_parcelManager.handleParcelDivideRequest); |
535 | client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest); | 535 | client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest); |
536 | client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest); | 536 | client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest); |
537 | client.OnParcelSelectObjects += new ParcelSelectObjects(m_parcelManager.handleParcelSelectObjectsRequest); | ||
537 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); | 538 | client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); |
538 | 539 | ||
539 | } | 540 | } |
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 | |||
170 | dupe.children.Add(dupe.rootPrimitive); | 170 | dupe.children.Add(dupe.rootPrimitive); |
171 | dupe.rootPrimitive.Pos = this.Pos; | 171 | dupe.rootPrimitive.Pos = this.Pos; |
172 | dupe.Rotation = this.Rotation; | 172 | dupe.Rotation = this.Rotation; |
173 | LLUUID rootu = dupe.rootUUID; | 173 | dupe.LocalId = m_world.PrimIDAllocate(); |
174 | uint rooti = dupe.rootLocalID; | ||
175 | 174 | ||
176 | dupe.registerEvents(); | 175 | dupe.registerEvents(); |
177 | return dupe; | 176 | return dupe; |