aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/NHibernate/Terrain.cs12
-rw-r--r--OpenSim/Data/Tests/BasicRegionTest.cs10
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs6
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs51
4 files changed, 39 insertions, 40 deletions
diff --git a/OpenSim/Data/NHibernate/Terrain.cs b/OpenSim/Data/NHibernate/Terrain.cs
index 292b3b4..bd6f992 100644
--- a/OpenSim/Data/NHibernate/Terrain.cs
+++ b/OpenSim/Data/NHibernate/Terrain.cs
@@ -74,15 +74,15 @@ namespace OpenSim.Data.NHibernate
74 74
75 private static double[,] parseTerrain(byte[] data) 75 private static double[,] parseTerrain(byte[] data)
76 { 76 {
77 double[,] terret = new double[256,256]; 77 double[,] terret = new double[Constants.RegionSize, Constants.RegionSize];
78 terret.Initialize(); 78 terret.Initialize();
79 79
80 MemoryStream str = new MemoryStream(data); 80 MemoryStream str = new MemoryStream(data);
81 BinaryReader br = new BinaryReader(str); 81 BinaryReader br = new BinaryReader(str);
82 try { 82 try {
83 for (int x = 0; x < 256; x++) 83 for (int x = 0; x < Constants.RegionSize; x++)
84 { 84 {
85 for (int y = 0; y < 256; y++) 85 for (int y = 0; y < Constants.RegionSize; y++)
86 { 86 {
87 terret[x, y] = br.ReadDouble(); 87 terret[x, y] = br.ReadDouble();
88 } 88 }
@@ -97,13 +97,13 @@ namespace OpenSim.Data.NHibernate
97 97
98 private static byte[] serializeTerrain(double[,] val) 98 private static byte[] serializeTerrain(double[,] val)
99 { 99 {
100 MemoryStream str = new MemoryStream((int)(65536 * sizeof (double))); 100 MemoryStream str = new MemoryStream((int) ((Constants.RegionSize*Constants.RegionSize)*sizeof (double)));
101 BinaryWriter bw = new BinaryWriter(str); 101 BinaryWriter bw = new BinaryWriter(str);
102 102
103 // TODO: COMPATIBILITY - Add byte-order conversions 103 // TODO: COMPATIBILITY - Add byte-order conversions
104 for (int x = 0; x < 256; x++) 104 for (int x = 0; x < Constants.RegionSize; x++)
105 { 105 {
106 for (int y = 0; y < 256; y++) 106 for (int y = 0; y < Constants.RegionSize; y++)
107 { 107 {
108 double height = val[x, y]; 108 double height = val[x, y];
109 if (height <= 0.0) 109 if (height <= 0.0)
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 179692a..e7ce8af 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -882,10 +882,10 @@ namespace OpenSim.Data.Tests
882 882
883 private double[,] GenTerrain(double value) 883 private double[,] GenTerrain(double value)
884 { 884 {
885 double[,] terret = new double[256,256]; 885 double[,] terret = new double[Constants.RegionSize, Constants.RegionSize];
886 terret.Initialize(); 886 terret.Initialize();
887 for (int x = 0; x < 256; x++) 887 for (int x = 0; x < Constants.RegionSize; x++)
888 for (int y = 0; y < 256; y++) 888 for (int y = 0; y < Constants.RegionSize; y++)
889 terret[x,y] = value; 889 terret[x,y] = value;
890 890
891 return terret; 891 return terret;
@@ -893,8 +893,8 @@ namespace OpenSim.Data.Tests
893 893
894 private bool CompareTerrain(double[,] one, double[,] two) 894 private bool CompareTerrain(double[,] one, double[,] two)
895 { 895 {
896 for (int x = 0; x < 256; x++) 896 for (int x = 0; x < Constants.RegionSize; x++)
897 for (int y = 0; y < 256; y++) 897 for (int y = 0; y < Constants.RegionSize; y++)
898 if (one[x,y] != two[x,y]) 898 if (one[x,y] != two[x,y])
899 return false; 899 return false;
900 900
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs
index 1ccc8a4..c7f9569 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/IObject.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -37,6 +37,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
37 uint LocalID { get; } 37 uint LocalID { get; }
38 UUID GlobalID { get; } 38 UUID GlobalID { get; }
39 39
40 String Name { get; set; }
41 String Description { get; set; }
42
40 IObject[] Children { get; } 43 IObject[] Children { get; }
41 44
42 /// <summary> 45 /// <summary>
@@ -48,6 +51,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
48 51
49 Vector3 Scale { get; set; } 52 Vector3 Scale { get; set; }
50 Quaternion Rotation { get; set; } 53 Quaternion Rotation { get; set; }
54 Vector3 Position { get; set; }
51 55
52 Vector3 SitTarget { get; set; } 56 Vector3 SitTarget { get; set; }
53 String SitTargetText { get; set; } 57 String SitTargetText { get; set; }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index e1b9f3e..538a496 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -1,31 +1,4 @@
1/* 1using System.Collections.Generic;
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Collections.Generic;
29using OpenMetaverse; 2using OpenMetaverse;
30using OpenSim.Framework; 3using OpenSim.Framework;
31using OpenSim.Region.Framework.Scenes; 4using OpenSim.Region.Framework.Scenes;
@@ -71,6 +44,18 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
71 get { return GetSOP().UUID; } 44 get { return GetSOP().UUID; }
72 } 45 }
73 46
47 public string Name
48 {
49 get { return GetSOP().Name; }
50 set { GetSOP().Name = value; }
51 }
52
53 public string Description
54 {
55 get { return GetSOP().Description; }
56 set { GetSOP().Description = value; }
57 }
58
74 public IObject[] Children 59 public IObject[] Children
75 { 60 {
76 get 61 get
@@ -123,6 +108,16 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
123 set { throw new System.NotImplementedException(); } 108 set { throw new System.NotImplementedException(); }
124 } 109 }
125 110
111 public Vector3 Position
112 {
113 get { return GetSOP().AbsolutePosition; }
114 set
115 {
116 SceneObjectPart pos = GetSOP();
117 pos.UpdateOffSet(value - pos.AbsolutePosition);
118 }
119 }
120
126 public Vector3 SitTarget 121 public Vector3 SitTarget
127 { 122 {
128 get { throw new System.NotImplementedException(); } 123 get { throw new System.NotImplementedException(); }