aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMW2007-08-16 18:22:08 +0000
committerMW2007-08-16 18:22:08 +0000
commitcb90510e1631343e87f35e75af4022e3fc611103 (patch)
treec1f0850f7ed12892a64c22331e7356bcb0dc1c09 /OpenSim/Region/Environment
parent* Introduced IScriptHost as an interface to fetching object data from scripts. (diff)
downloadopensim-SC_OLD-cb90510e1631343e87f35e75af4022e3fc611103.zip
opensim-SC_OLD-cb90510e1631343e87f35e75af4022e3fc611103.tar.gz
opensim-SC_OLD-cb90510e1631343e87f35e75af4022e3fc611103.tar.bz2
opensim-SC_OLD-cb90510e1631343e87f35e75af4022e3fc611103.tar.xz
Had to rename Rotation in SceneObjectGroup to GroupRotation to stop conflict with Rotation in entitybase (couldn't override as they are different types (LL vs Axiom) and didn't want to add new).
When you take prims into inventory (or delete them), they should now be removed from the prim datastore, so they no longer reappear in-world when you restart opensim.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs5
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index 3f90723..f0f73b0 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -270,6 +270,7 @@ namespace OpenSim.Region.Environment.Scenes
270 remoteClient.SendInventoryItemUpdate(item); 270 remoteClient.SendInventoryItemUpdate(item);
271 } 271 }
272 272
273 storageManager.DataStore.RemoveObject(((SceneObjectGroup)selectedEnt).UUID);
273 ((SceneObjectGroup)selectedEnt).DeleteGroup(); 274 ((SceneObjectGroup)selectedEnt).DeleteGroup();
274 275
275 lock (Entities) 276 lock (Entities)
@@ -318,7 +319,7 @@ namespace OpenSim.Region.Environment.Scenes
318 { 319 {
319 SceneObjectGroup group = new SceneObjectGroup(this, this.m_regionHandle, xmlData); 320 SceneObjectGroup group = new SceneObjectGroup(this, this.m_regionHandle, xmlData);
320 this.AddEntity(group); 321 this.AddEntity(group);
321 group.Pos = pos; 322 group.AbsolutePosition = pos;
322 } 323 }
323 324
324 /// <summary> 325 /// <summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index a5ad2e6..ec62509 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -35,12 +35,11 @@ namespace OpenSim.Region.Environment.Scenes
35 get { return 1; } 35 get { return 1; }
36 } 36 }
37 37
38 public LLQuaternion Rotation 38 public LLQuaternion GroupRotation
39 { 39 {
40 get { return m_rootPart.RotationOffset; } 40 get { return m_rootPart.RotationOffset; }
41 } 41 }
42 42
43
44 /// <summary> 43 /// <summary>
45 /// 44 ///
46 /// </summary> 45 /// </summary>
@@ -538,7 +537,7 @@ namespace OpenSim.Region.Environment.Scenes
538 SceneObjectPart part = this.GetChildPrim(localID); 537 SceneObjectPart part = this.GetChildPrim(localID);
539 if (part != null) 538 if (part != null)
540 { 539 {
541 return part.PartName; 540 return part.Name;
542 } 541 }
543 return ""; 542 return "";
544 } 543 }