aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authormingchen2007-06-28 02:07:59 +0000
committermingchen2007-06-28 02:07:59 +0000
commit440bb4a358cdc01559f624dbcbb7391d260616e0 (patch)
tree088381278f09c467ba98932d05d4b8d1489c5e3e /OpenSim/Region
parent*Moved all the classes into their own file from LLSDHelpers.cs (diff)
downloadopensim-SC-440bb4a358cdc01559f624dbcbb7391d260616e0.zip
opensim-SC-440bb4a358cdc01559f624dbcbb7391d260616e0.tar.gz
opensim-SC-440bb4a358cdc01559f624dbcbb7391d260616e0.tar.bz2
opensim-SC-440bb4a358cdc01559f624dbcbb7391d260616e0.tar.xz
*Fixed UserServer and OpenSim so now they start without crashing.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs2
-rw-r--r--OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs2
-rw-r--r--OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs2
4 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e06d38c..7bf6b8d 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -154,7 +154,7 @@ namespace OpenSim
154 { 154 {
155 try 155 try
156 { 156 {
157 AssetCache = new AssetCache("OpenSim.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey); 157 AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
158 InventoryCache = new InventoryCache(); 158 InventoryCache = new InventoryCache();
159 } 159 }
160 catch (Exception e) 160 catch (Exception e)
@@ -169,7 +169,7 @@ namespace OpenSim
169 { 169 {
170 try 170 try
171 { 171 {
172 AssetCache = new AssetCache("OpenSim.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey); 172 AssetCache = new AssetCache("OpenSim.Region.GridInterfaces.Remote.dll", this.serversData.AssetURL, this.serversData.AssetSendKey);
173 InventoryCache = new InventoryCache(); 173 InventoryCache = new InventoryCache();
174 } 174 }
175 catch (Exception e) 175 catch (Exception e)
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 8c1e965..4060d68 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -2,7 +2,7 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using OpenSim; 4using OpenSim;
5using OpenSim.GridInterfaces.Local; 5using OpenSim.Region.GridInterfaces.Local;
6using OpenSim.Framework.Interfaces; 6using OpenSim.Framework.Interfaces;
7using OpenSim.Framework.Types; 7using OpenSim.Framework.Types;
8using OpenSim.Framework.Console; 8using OpenSim.Framework.Console;
diff --git a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
index 87eff49..95d03f1 100644
--- a/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Local/LocalAssetServer.cs
@@ -38,7 +38,7 @@ using libsecondlife;
38using Db4objects.Db4o; 38using Db4objects.Db4o;
39using Db4objects.Db4o.Query; 39using Db4objects.Db4o.Query;
40 40
41namespace OpenSim.GridInterfaces.Local 41namespace OpenSim.Region.GridInterfaces.Local
42{ 42{
43 public class LocalAssetPlugin : IAssetPlugin 43 public class LocalAssetPlugin : IAssetPlugin
44 { 44 {
diff --git a/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
index ca01c68..4652f70 100644
--- a/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim/Region/GridInterfaces/Remote/RemoteAssetServer.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Types; 37using OpenSim.Framework.Types;
38using OpenSim.Framework.Utilities; 38using OpenSim.Framework.Utilities;
39 39
40namespace OpenSim.GridInterfaces.Remote 40namespace OpenSim.Region.GridInterfaces.Remote
41{ 41{
42 public class RemoteAssetServer : IAssetServer 42 public class RemoteAssetServer : IAssetServer
43 { 43 {