* SimpleApp works again:

  * NetworkServersInfo settable without config file
  * DefaultHomeLoc throws if getted before setted
  * Removed nonsensical sandbox distinction
  * Refactored default config file creation

* Some more small refactorings on shapes

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
         public string UserRecvKey = "";
         public bool isSandbox;
 
-        public uint DefaultHomeLocX = 0;
-        public uint DefaultHomeLocY = 0;
-
         public int HttpListenerPort = 9000;
         public int RemotingListenerPort = 8895;
 
@@ -59,9 +56,22 @@ namespace OpenSim.Framework.Types
             configMember.performConfigurationRetrieve();
         }
 
-        public NetworkServersInfo( )
+        public NetworkServersInfo( uint defaultHomeLocX, uint defaultHomeLocY )
+        {
+            m_defaultHomeLocX = defaultHomeLocX;
+            m_defaultHomeLocY = defaultHomeLocY;
+        }
+
+        private uint? m_defaultHomeLocX;
+        public uint DefaultHomeLocX
         {
+            get { return m_defaultHomeLocX.Value; }
+        }
 
+        private uint? m_defaultHomeLocY;
+        public uint DefaultHomeLocY
+        {
+            get { return m_defaultHomeLocY.Value; }
         }
 
         public void loadConfigurationOptions()
@@ -94,10 +104,10 @@ namespace OpenSim.Framework.Types
                     this.RemotingListenerPort = (int)configuration_object;
                     break;
                 case "DefaultLocationX":
-                    this.DefaultHomeLocX = (uint)configuration_object;
+                    this.m_defaultHomeLocX = (uint)configuration_object;
                     break;
                 case "DefaultLocationY":
-                    this.DefaultHomeLocY = (uint)configuration_object;
+                    this.m_defaultHomeLocY = (uint)configuration_object;
                     break;
                 case "GridServerURL":
                     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
     {
         //protected ShapeType m_type = ShapeType.Unknown;
 
+
+        private static byte[] m_defaultTextureEntry;
+        
         public byte PCode;
         public ushort PathBegin;
         public ushort PathEnd;
@@ -60,9 +63,15 @@ namespace OpenSim.Framework.Types
             }
         }
 
+        static PrimitiveBaseShape()
+        {
+            m_defaultTextureEntry = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")).ToBytes();
+        }
+        
         public PrimitiveBaseShape()
         {
             ExtraParams = new byte[1];
+            TextureEntry = m_defaultTextureEntry;
         }
 
         //void returns need to change of course
@@ -91,29 +100,15 @@ namespace OpenSim.Framework.Types
         {
             get
             {
-                BoxShape primShape = new BoxShape();
+                BoxShape boxShape = new BoxShape();
 
-                primShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
-                primShape.PathBegin = 0;
-                primShape.PathEnd = 0;
-                primShape.PathScaleX = 0;
-                primShape.PathScaleY = 0;
-                primShape.PathShearX = 0;
-                primShape.PathShearY = 0;
-                primShape.PathSkew = 0;
-                primShape.ProfileBegin = 0;
-                primShape.ProfileEnd = 0;
-                primShape.ProfileHollow = 0;
-                primShape.PathRadiusOffset = 0;
-                primShape.PathRevolutions = 0;
-                primShape.PathTaperX = 0;
-                primShape.PathTaperY = 0;
-                primShape.PathTwist = 0;
-                primShape.PathTwistBegin = 0;
-                LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005"));
-                primShape.TextureEntry = ntex.ToBytes();
+                boxShape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
 
-                return primShape;
+                //boxShape.PathTaperX = 1;
+                //boxShape.PathTaperY = 1;
+                boxShape.PathSkew = 1;
+                
+                return boxShape;
             }
         }
     }