aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/Types/NetworkServersInfo.cs22
-rw-r--r--OpenSim/Framework/General/Types/PrimitiveBaseShape.cs37
2 files changed, 32 insertions, 27 deletions
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
index c40746b..ae19aff 100644
--- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs
@@ -45,9 +45,6 @@ namespace OpenSim.Framework.Types
45 public string UserRecvKey = ""; 45 public string UserRecvKey = "";
46 public bool isSandbox; 46 public bool isSandbox;
47 47
48 public uint DefaultHomeLocX = 0;
49 public uint DefaultHomeLocY = 0;
50
51 public int HttpListenerPort = 9000; 48 public int HttpListenerPort = 9000;
52 public int RemotingListenerPort = 8895; 49 public int RemotingListenerPort = 8895;
53 50
@@ -59,9 +56,22 @@ namespace OpenSim.Framework.Types
59 configMember.performConfigurationRetrieve(); 56 configMember.performConfigurationRetrieve();
60 } 57 }
61 58
62 public NetworkServersInfo( ) 59 public NetworkServersInfo( uint defaultHomeLocX, uint defaultHomeLocY )
60 {
61 m_defaultHomeLocX = defaultHomeLocX;
62 m_defaultHomeLocY = defaultHomeLocY;
63 }
64
65 private uint? m_defaultHomeLocX;
66 public uint DefaultHomeLocX
63 { 67 {
68 get { return m_defaultHomeLocX.Value; }
69 }
64 70
71 private uint? m_defaultHomeLocY;
72 public uint DefaultHomeLocY
73 {
74 get { return m_defaultHomeLocY.Value; }
65 } 75 }
66 76
67 public void loadConfigurationOptions() 77 public void loadConfigurationOptions()
@@ -94,10 +104,10 @@ namespace OpenSim.Framework.Types
94 this.RemotingListenerPort = (int)configuration_object; 104 this.RemotingListenerPort = (int)configuration_object;
95 break; 105 break;
96 case "DefaultLocationX": 106 case "DefaultLocationX":
97 this.DefaultHomeLocX = (uint)configuration_object; 107 this.m_defaultHomeLocX = (uint)configuration_object;
98 break; 108 break;
99 case "DefaultLocationY": 109 case "DefaultLocationY":
100 this.DefaultHomeLocY = (uint)configuration_object; 110 this.m_defaultHomeLocY = (uint)configuration_object;
101 break; 111 break;
102 case "GridServerURL": 112 case "GridServerURL":
103 this.GridURL = (string)configuration_object; 113 this.GridURL = (string)configuration_object;
diff --git a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
index 57018b2..1938a90 100644
--- a/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/Types/PrimitiveBaseShape.cs
@@ -21,6 +21,9 @@ namespace OpenSim.Framework.Types
21 { 21 {
22 //protected ShapeType m_type = ShapeType.Unknown; 22 //protected ShapeType m_type = ShapeType.Unknown;
23 23
24
25 private static byte[] m_defaultTextureEntry;
26
24 public byte PCode; 27 public byte PCode;
25 public ushort PathBegin; 28 public ushort PathBegin;
26 public ushort PathEnd; 29 public ushort PathEnd;
@@ -60,9 +63,15 @@ namespace OpenSim.Framework.Types
60 } 63 }
61 } 64 }
62 65
66 static PrimitiveBaseShape()
67 {
68 m_defaultTextureEntry = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")).ToBytes();
69 }
70
63 public PrimitiveBaseShape() 71 public PrimitiveBaseShape()
64 { 72 {
65 ExtraParams = new byte[1]; 73 ExtraParams = new byte[1];
74 TextureEntry = m_defaultTextureEntry;
66 } 75 }
67 76
68 //void returns need to change of course 77 //void returns need to change of course
@@ -91,29 +100,15 @@ namespace OpenSim.Framework.Types
91 { 100 {
92 get 101 get
93 { 102 {
94 BoxShape primShape = new BoxShape(); 103 BoxShape boxShape = new BoxShape();
95 104
96 primShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f); 105 boxShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
97 primShape.PathBegin = 0;
98 primShape.PathEnd = 0;
99 primShape.PathScaleX = 0;
100 primShape.PathScaleY = 0;
101 primShape.PathShearX = 0;
102 primShape.PathShearY = 0;
103 primShape.PathSkew = 0;
104 primShape.ProfileBegin = 0;
105 primShape.ProfileEnd = 0;
106 primShape.ProfileHollow = 0;
107 primShape.PathRadiusOffset = 0;
108 primShape.PathRevolutions = 0;
109 primShape.PathTaperX = 0;
110 primShape.PathTaperY = 0;
111 primShape.PathTwist = 0;
112 primShape.PathTwistBegin = 0;
113 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));
114 primShape.TextureEntry = ntex.ToBytes();
115 106
116 return primShape; 107 //boxShape.PathTaperX = 1;
108 //boxShape.PathTaperY = 1;
109 boxShape.PathSkew = 1;
110
111 return boxShape;
117 } 112 }
118 } 113 }
119 } 114 }