diff options
Diffstat (limited to 'Agent_Manager.cs')
-rw-r--r-- | Agent_Manager.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Agent_Manager.cs b/Agent_Manager.cs index a5b041c..ec70388 100644 --- a/Agent_Manager.cs +++ b/Agent_Manager.cs | |||
@@ -267,32 +267,32 @@ namespace OpenSim | |||
267 | { | 267 | { |
268 | 268 | ||
269 | //shouldn't have to read all this in from disk for every new client | 269 | //shouldn't have to read all this in from disk for every new client |
270 | string data_path = System.AppDomain.CurrentDomain.BaseDirectory + @"\layer_data\"; | 270 | string data_path = System.IO.Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, @"layer_data"); |
271 | 271 | ||
272 | //send layerdata | 272 | //send layerdata |
273 | LayerDataPacket layerpack = new LayerDataPacket(); | 273 | LayerDataPacket layerpack = new LayerDataPacket(); |
274 | layerpack.LayerID.Type = 76; | 274 | layerpack.LayerID.Type = 76; |
275 | this.SendLayerData(userInfo,ref layerpack, data_path+@"layerdata0.dat"); | 275 | this.SendLayerData(userInfo,ref layerpack, System.IO.Path.Combine(data_path, @"layerdata0.dat")); |
276 | 276 | ||
277 | LayerDataPacket layerpack1 = new LayerDataPacket(); | 277 | LayerDataPacket layerpack1 = new LayerDataPacket(); |
278 | layerpack1.LayerID.Type = 76; | 278 | layerpack1.LayerID.Type = 76; |
279 | this.SendLayerData(userInfo, ref layerpack, data_path+@"layerdata1.dat"); | 279 | this.SendLayerData(userInfo, ref layerpack, System.IO.Path.Combine(data_path, @"layerdata1.dat")); |
280 | 280 | ||
281 | LayerDataPacket layerpack2 = new LayerDataPacket(); | 281 | LayerDataPacket layerpack2 = new LayerDataPacket(); |
282 | layerpack2.LayerID.Type = 56; | 282 | layerpack2.LayerID.Type = 56; |
283 | this.SendLayerData(userInfo, ref layerpack, data_path+@"layerdata2.dat"); | 283 | this.SendLayerData(userInfo, ref layerpack, System.IO.Path.Combine(data_path, @"layerdata2.dat")); |
284 | 284 | ||
285 | LayerDataPacket layerpack3 = new LayerDataPacket(); | 285 | LayerDataPacket layerpack3 = new LayerDataPacket(); |
286 | layerpack3.LayerID.Type = 55; | 286 | layerpack3.LayerID.Type = 55; |
287 | this.SendLayerData(userInfo, ref layerpack, data_path+@"layerdata3.dat"); | 287 | this.SendLayerData(userInfo, ref layerpack, System.IO.Path.Combine(data_path, @"layerdata3.dat")); |
288 | 288 | ||
289 | LayerDataPacket layerpack4 = new LayerDataPacket(); | 289 | LayerDataPacket layerpack4 = new LayerDataPacket(); |
290 | layerpack4.LayerID.Type = 56; | 290 | layerpack4.LayerID.Type = 56; |
291 | this.SendLayerData(userInfo, ref layerpack, data_path+@"layerdata4.dat"); | 291 | this.SendLayerData(userInfo, ref layerpack, System.IO.Path.Combine(data_path, @"layerdata4.dat")); |
292 | 292 | ||
293 | LayerDataPacket layerpack5 = new LayerDataPacket(); | 293 | LayerDataPacket layerpack5 = new LayerDataPacket(); |
294 | layerpack5.LayerID.Type = 55; | 294 | layerpack5.LayerID.Type = 55; |
295 | this.SendLayerData(userInfo, ref layerpack, data_path+@"layerdata5.dat"); | 295 | this.SendLayerData(userInfo, ref layerpack, System.IO.Path.Combine(data_path, @"layerdata5.dat")); |
296 | 296 | ||
297 | //send intial set of captured prims data? | 297 | //send intial set of captured prims data? |
298 | this.Prim_Manager.ReadPrimDatabase( "objectdatabase.ini", userInfo); | 298 | this.Prim_Manager.ReadPrimDatabase( "objectdatabase.ini", userInfo); |