aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs35
-rw-r--r--OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs1
3 files changed, 36 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 0e5ffc0..df6908a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1210,7 +1210,7 @@ namespace OpenSim.Region.Framework.Scenes
1210 #region Client Event handlers 1210 #region Client Event handlers
1211 1211
1212 /// <summary> 1212 /// <summary>
1213 /// 1213 /// Update the scale of an individual prim.
1214 /// </summary> 1214 /// </summary>
1215 /// <param name="localID"></param> 1215 /// <param name="localID"></param>
1216 /// <param name="scale"></param> 1216 /// <param name="scale"></param>
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
index 627f294..95ecfc6 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
@@ -63,5 +63,40 @@ namespace OpenSim.Region.Framework.Scenes.Tests
63 Assert.That(g1Post.RootPart.Scale.Y, Is.EqualTo(3)); 63 Assert.That(g1Post.RootPart.Scale.Y, Is.EqualTo(3));
64 Assert.That(g1Post.RootPart.Scale.Z, Is.EqualTo(4)); 64 Assert.That(g1Post.RootPart.Scale.Z, Is.EqualTo(4));
65 } 65 }
66
67 /// <summary>
68 /// Test resizing an individual part in a scene object.
69 /// </summary>
70 [Test]
71 public void TestResizeSceneObjectPart()
72 {
73 TestHelper.InMethod();
74 //log4net.Config.XmlConfigurator.Configure();
75
76 Scene scene = SceneSetupHelpers.SetupScene();
77
78 SceneObjectGroup g1 = SceneSetupHelpers.CreateSceneObject(2, UUID.Zero);
79 g1.RootPart.Scale = new Vector3(2, 3, 4);
80 g1.Parts[1].Scale = new Vector3(5, 6, 7);
81
82 scene.AddSceneObject(g1);
83
84 SceneObjectGroup g1Post = scene.GetSceneObjectGroup(g1.UUID);
85
86 g1Post.Resize(new Vector3(8, 9, 10), g1Post.Parts[1].LocalId);
87
88 SceneObjectGroup g1PostPost = scene.GetSceneObjectGroup(g1.UUID);
89
90 SceneObjectPart g1RootPart = g1PostPost.RootPart;
91 SceneObjectPart g1ChildPart = g1PostPost.Parts[1];
92
93 Assert.That(g1RootPart.Scale.X, Is.EqualTo(2));
94 Assert.That(g1RootPart.Scale.Y, Is.EqualTo(3));
95 Assert.That(g1RootPart.Scale.Z, Is.EqualTo(4));
96
97 Assert.That(g1ChildPart.Scale.X, Is.EqualTo(8));
98 Assert.That(g1ChildPart.Scale.Y, Is.EqualTo(9));
99 Assert.That(g1ChildPart.Scale.Z, Is.EqualTo(10));
100 }
66 } 101 }
67} \ No newline at end of file 102} \ No newline at end of file
diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
index 520d639..69e2d17 100644
--- a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
@@ -50,7 +50,6 @@ namespace OpenSim.Services.Connectors
50 MethodBase.GetCurrentMethod().DeclaringType); 50 MethodBase.GetCurrentMethod().DeclaringType);
51 51
52 private string m_ServerURI = String.Empty; 52 private string m_ServerURI = String.Empty;
53 private IImprovedAssetCache m_Cache = null;
54 53
55 public MapImageServicesConnector() 54 public MapImageServicesConnector()
56 { 55 {