From 9bdeb8af6f797e35b5322d6856ecc488340c9453 Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Mon, 6 Aug 2007 10:48:40 +0000
Subject: * 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
---
.../Framework/General/Types/NetworkServersInfo.cs | 22 +++++++++----
.../Framework/General/Types/PrimitiveBaseShape.cs | 37 ++++++++++------------
OpenSim/Region/Application/OpenSimMain.cs | 33 ++++++++-----------
.../Region/ClientStack/RegionApplicationBase.cs | 2 ++
.../Communications/Local/LocalUserServices.cs | 4 +--
OpenSim/Region/Examples/SimpleApp/Program.cs | 5 +--
prebuild.xml | 1 +
7 files changed, 51 insertions(+), 53 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;
}
}
}
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index c68f75e..7fb48b0 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -120,30 +120,19 @@ namespace OpenSim
m_httpServer.AddStreamHandler(new SimStatusHandler());
}
- if (m_sandbox)
- {
- m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
- }
- else
- {
- m_commsManager = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache);
- }
-
-
- string path = Path.Combine(Util.configDir(), "Regions");
- if (!Directory.Exists(path))
+ string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
+
+ if (!Directory.Exists(regionConfigPath))
{
- Directory.CreateDirectory(path);
+ Directory.CreateDirectory(regionConfigPath);
}
- string[] configFiles = Directory.GetFiles(path, "*.xml");
+
+ string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
if (configFiles.Length == 0)
{
- string path2 = Path.Combine(Util.configDir(), "Regions");
- string path3 = Path.Combine(path2, "default.xml");
-
- RegionInfo regionInfo = new RegionInfo("DEFAULT REGION CONFIG", path3);
- configFiles = Directory.GetFiles(path, "*.xml");
+ CreateDefaultRegionInfoXml(Path.Combine(regionConfigPath, "default.xml"));
+ configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
}
for (int i = 0; i < configFiles.Length; i++)
@@ -156,7 +145,6 @@ namespace OpenSim
m_localScenes.Add(scene);
-
m_udpServers.Add(udpServer);
m_regionData.Add(regionInfo);
}
@@ -170,6 +158,11 @@ namespace OpenSim
}
+ private static void CreateDefaultRegionInfoXml(string fileName)
+ {
+ new RegionInfo("DEFAULT REGION CONFIG", fileName);
+ }
+
protected override StorageManager CreateStorageManager(RegionInfo regionInfo)
{
return new StorageManager("OpenSim.DataStore.NullStorage.dll", regionInfo.DataStore, regionInfo.RegionName);
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 008b4c7..5683b31 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -41,6 +41,7 @@ using libsecondlife;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Caches;
+using OpenSim.Region.Communications.Local;
namespace OpenSim.Region.ClientStack
{
@@ -78,6 +79,7 @@ namespace OpenSim.Region.ClientStack
m_httpServer.Start();
m_inventoryCache = new InventoryCache();
+ m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
}
protected abstract void Initialize();
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index c351451..cc80c81 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -16,10 +16,10 @@ namespace OpenSim.Region.Communications.Local
private uint defaultHomeX ;
private uint defaultHomeY;
- public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversData)
+ public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversInfo)
{
m_Parent = parent;
- this.serversInfo = serversData;
+ this.serversInfo = serversInfo;
defaultHomeX = this.serversInfo.DefaultHomeLocX;
defaultHomeY = this.serversInfo.DefaultHomeLocY;
}
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index a27cc0c..50b0780 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -35,8 +35,7 @@ namespace SimpleApp
StartLog();
- m_networkServersInfo = new NetworkServersInfo( );
-
+ m_networkServersInfo = new NetworkServersInfo( 1000, 1000 );
LocalAssetServer assetServer = new LocalAssetServer();
assetServer.SetServerInfo("http://localhost:8003/", "");
@@ -48,8 +47,6 @@ namespace SimpleApp
{
base.StartUp();
- m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
-
m_log.Notice(m_log.LineInfo);
ScenePresence.PhysicsEngineFlying = true;
diff --git a/prebuild.xml b/prebuild.xml
index dcf03ec..fb35d98 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -573,6 +573,7 @@
+
--
cgit v1.1