aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
authorMW2007-07-13 16:12:38 +0000
committerMW2007-07-13 16:12:38 +0000
commitfcc7f86427f14f9a43a918f30cdf97b438c49a77 (patch)
treeaad3ff8beb98e63365db9b6982fff14817aad2f6 /OpenSim/Framework/General
parentrename file to not have spaces in it (diff)
downloadopensim-SC_OLD-fcc7f86427f14f9a43a918f30cdf97b438c49a77.zip
opensim-SC_OLD-fcc7f86427f14f9a43a918f30cdf97b438c49a77.tar.gz
opensim-SC_OLD-fcc7f86427f14f9a43a918f30cdf97b438c49a77.tar.bz2
opensim-SC_OLD-fcc7f86427f14f9a43a918f30cdf97b438c49a77.tar.xz
Changed simpleApp to use basic physics.
Done some work of fixing primitive/SceneObject copying. Set DefaultHome region to 1000,1000.
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/Types/NetworkServersInfo.cs4
-rw-r--r--OpenSim/Framework/General/Types/PrimitiveBaseShape.cs5
2 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index 89ebf94..21ff4b9 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -44,8 +44,8 @@ namespace OpenSim.Framework.Types
44 public string UserRecvKey = ""; 44 public string UserRecvKey = "";
45 public bool isSandbox; 45 public bool isSandbox;
46 46
47 public uint DefaultHomeLocX = 0; 47 public uint DefaultHomeLocX = 1000;
48 public uint DefaultHomeLocY = 0; 48 public uint DefaultHomeLocY = 1000;
49 49
50 public int HttpListenerPort = 9000; 50 public int HttpListenerPort = 9000;
51 public int RemotingListenerPort = 8895; 51 public int RemotingListenerPort = 8895;
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index 886c00d..1844caa 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -70,6 +70,11 @@ namespace OpenSim.Framework.Types
70 70
71 } 71 }
72 72
73 public PrimitiveBaseShape Copy()
74 {
75 return (PrimitiveBaseShape) this.MemberwiseClone();
76 }
77
73 public static PrimitiveBaseShape DefaultBox() 78 public static PrimitiveBaseShape DefaultBox()
74 { 79 {
75 PrimitiveBaseShape primShape = new PrimitiveBaseShape(); 80 PrimitiveBaseShape primShape = new PrimitiveBaseShape();