aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/General/Types/NetworkServersInfo.cs22
-rw-r--r--OpenSim/Framework/General/Types/PrimitiveBaseShape.cs37
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs33
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs4
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs5
-rw-r--r--prebuild.xml1
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
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 }
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
120 m_httpServer.AddStreamHandler(new SimStatusHandler()); 120 m_httpServer.AddStreamHandler(new SimStatusHandler());
121 } 121 }
122 122
123 if (m_sandbox) 123 string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
124 { 124
125 m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache); 125 if (!Directory.Exists(regionConfigPath))
126 }
127 else
128 {
129 m_commsManager = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache);
130 }
131
132
133 string path = Path.Combine(Util.configDir(), "Regions");
134 if (!Directory.Exists(path))
135 { 126 {
136 Directory.CreateDirectory(path); 127 Directory.CreateDirectory(regionConfigPath);
137 } 128 }
138 string[] configFiles = Directory.GetFiles(path, "*.xml"); 129
130 string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
139 131
140 if (configFiles.Length == 0) 132 if (configFiles.Length == 0)
141 { 133 {
142 string path2 = Path.Combine(Util.configDir(), "Regions"); 134 CreateDefaultRegionInfoXml(Path.Combine(regionConfigPath, "default.xml"));
143 string path3 = Path.Combine(path2, "default.xml"); 135 configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
144
145 RegionInfo regionInfo = new RegionInfo("DEFAULT REGION CONFIG", path3);
146 configFiles = Directory.GetFiles(path, "*.xml");
147 } 136 }
148 137
149 for (int i = 0; i < configFiles.Length; i++) 138 for (int i = 0; i < configFiles.Length; i++)
@@ -156,7 +145,6 @@ namespace OpenSim
156 145
157 m_localScenes.Add(scene); 146 m_localScenes.Add(scene);
158 147
159
160 m_udpServers.Add(udpServer); 148 m_udpServers.Add(udpServer);
161 m_regionData.Add(regionInfo); 149 m_regionData.Add(regionInfo);
162 } 150 }
@@ -170,6 +158,11 @@ namespace OpenSim
170 158
171 } 159 }
172 160
161 private static void CreateDefaultRegionInfoXml(string fileName)
162 {
163 new RegionInfo("DEFAULT REGION CONFIG", fileName);
164 }
165
173 protected override StorageManager CreateStorageManager(RegionInfo regionInfo) 166 protected override StorageManager CreateStorageManager(RegionInfo regionInfo)
174 { 167 {
175 return new StorageManager("OpenSim.DataStore.NullStorage.dll", regionInfo.DataStore, regionInfo.RegionName); 168 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;
41using OpenSim.Region.Environment.Scenes; 41using OpenSim.Region.Environment.Scenes;
42using OpenSim.Framework.Communications; 42using OpenSim.Framework.Communications;
43using OpenSim.Framework.Communications.Caches; 43using OpenSim.Framework.Communications.Caches;
44using OpenSim.Region.Communications.Local;
44 45
45namespace OpenSim.Region.ClientStack 46namespace OpenSim.Region.ClientStack
46{ 47{
@@ -78,6 +79,7 @@ namespace OpenSim.Region.ClientStack
78 m_httpServer.Start(); 79 m_httpServer.Start();
79 80
80 m_inventoryCache = new InventoryCache(); 81 m_inventoryCache = new InventoryCache();
82 m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
81 } 83 }
82 84
83 protected abstract void Initialize(); 85 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
16 private uint defaultHomeX ; 16 private uint defaultHomeX ;
17 private uint defaultHomeY; 17 private uint defaultHomeY;
18 18
19 public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversData) 19 public LocalUserServices(CommunicationsLocal parent, NetworkServersInfo serversInfo)
20 { 20 {
21 m_Parent = parent; 21 m_Parent = parent;
22 this.serversInfo = serversData; 22 this.serversInfo = serversInfo;
23 defaultHomeX = this.serversInfo.DefaultHomeLocX; 23 defaultHomeX = this.serversInfo.DefaultHomeLocX;
24 defaultHomeY = this.serversInfo.DefaultHomeLocY; 24 defaultHomeY = this.serversInfo.DefaultHomeLocY;
25 } 25 }
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
35 35
36 StartLog(); 36 StartLog();
37 37
38 m_networkServersInfo = new NetworkServersInfo( ); 38 m_networkServersInfo = new NetworkServersInfo( 1000, 1000 );
39
40 39
41 LocalAssetServer assetServer = new LocalAssetServer(); 40 LocalAssetServer assetServer = new LocalAssetServer();
42 assetServer.SetServerInfo("http://localhost:8003/", ""); 41 assetServer.SetServerInfo("http://localhost:8003/", "");
@@ -48,8 +47,6 @@ namespace SimpleApp
48 { 47 {
49 base.StartUp(); 48 base.StartUp();
50 49
51 m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
52
53 m_log.Notice(m_log.LineInfo); 50 m_log.Notice(m_log.LineInfo);
54 51
55 ScenePresence.PhysicsEngineFlying = true; 52 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 @@
573 <Reference name="OpenSim.Framework"/> 573 <Reference name="OpenSim.Framework"/>
574 <Reference name="OpenSim.Framework.Console"/> 574 <Reference name="OpenSim.Framework.Console"/>
575 <Reference name="OpenSim.Framework.Communications"/> 575 <Reference name="OpenSim.Framework.Communications"/>
576 <Reference name="OpenSim.Region.Communications.Local"/>
576 <Reference name="OpenSim.Region.Physics.Manager"/> 577 <Reference name="OpenSim.Region.Physics.Manager"/>
577 <Reference name="OpenSim.Framework.Servers"/> 578 <Reference name="OpenSim.Framework.Servers"/>
578 <Reference name="OpenSim.Framework.Data"/> 579 <Reference name="OpenSim.Framework.Data"/>