aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-06 14:58:23 +0000
committerMelanie Thielker2008-09-06 14:58:23 +0000
commit9e545c9984790ddeabba0bf86e229af90da09ad6 (patch)
treebf305b155bcd2aadc1fb8a209d262a86f676fca3 /OpenSim/Framework/Communications
parent* Replace a Try/catch I commented out while testing/fixing issues. (diff)
downloadopensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.zip
opensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.gz
opensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.bz2
opensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.xz
Mantis #2133
Thank you, Xugu Madison and ChrisDown, for a patch that fixes linux filename extensions from .Xml back to .xml
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs2
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs2
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs2
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
index 7e561b5..88047c2 100644
--- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
+++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Cache
66 66
67 libraryFolders.Add(ID, this); 67 libraryFolders.Add(ID, this);
68 68
69 LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.Xml")); 69 LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml"));
70 70
71 // CreateLibraryItems(); 71 // CreateLibraryItems();
72 } 72 }
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 3239268..e9dc3c4 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Communications
57 new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); 57 new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect));
58 58
59 // loader will try to load all providers (MySQL, MSSQL, etc) 59 // loader will try to load all providers (MySQL, MSSQL, etc)
60 // unless it is constrainted to the correct "Provider" entry in the addin.Xml 60 // unless it is constrainted to the correct "Provider" entry in the addin.xml
61 loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); 61 loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider));
62 loader.Load(); 62 loader.Load();
63 63
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 5a63e70..b6564bf 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.Communications
59 new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect)); 59 new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect));
60 60
61 // loader will try to load all providers (MySQL, MSSQL, etc) 61 // loader will try to load all providers (MySQL, MSSQL, etc)
62 // unless it is constrainted to the correct "Provider" entry in the addin.Xml 62 // unless it is constrainted to the correct "Provider" entry in the addin.xml
63 loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); 63 loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider));
64 loader.Load(); 64 loader.Load();
65 65