aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Local
diff options
context:
space:
mode:
authorTeravus Ovares2008-08-25 07:35:17 +0000
committerTeravus Ovares2008-08-25 07:35:17 +0000
commit2912aafe259727351eb9405532e45aa3501b7e9a (patch)
tree34774a49306ae19a6682580d41927fcfb222ea6e /OpenSim/Region/Communications/Local
parentMantis#2043. Thank you kindly, Ralphos for a patch that addresses: (diff)
downloadopensim-SC_OLD-2912aafe259727351eb9405532e45aa3501b7e9a.zip
opensim-SC_OLD-2912aafe259727351eb9405532e45aa3501b7e9a.tar.gz
opensim-SC_OLD-2912aafe259727351eb9405532e45aa3501b7e9a.tar.bz2
opensim-SC_OLD-2912aafe259727351eb9405532e45aa3501b7e9a.tar.xz
* This commit incorporates the heart of the OpenGridProtocol patch that is currently on Forge in a nice, friendly modular format.
* There are a lot of changes and this is quite experimental. It's off by default, but you can turn it on by examining the bottom of the opensim.ini.example for the proper OpenSim.ini settings. Remember, you still need an agent domain.. * Furthermore, it isn't quite right when it comes to teleporting to remote regions (place_avatar)
Diffstat (limited to 'OpenSim/Region/Communications/Local')
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs3
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index a2e1e0c..a2c3c2c 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Communications.Local
107 // connectivity errors. 107 // connectivity errors.
108 // Don't change this line below to 'm_regions[regionInfo.RegionHandle] = regionInfo' unless you 108 // Don't change this line below to 'm_regions[regionInfo.RegionHandle] = regionInfo' unless you
109 // *REALLY* know what you are doing here. 109 // *REALLY* know what you are doing here.
110 m_regions.Remove(regionInfo.RegionHandle); 110 m_regions[regionInfo.RegionHandle] = regionInfo;
111 111
112 m_log.Warn("[INTERREGION STANDALONE]: Region registered twice. Region went down and came back up."); 112 m_log.Warn("[INTERREGION STANDALONE]: Region registered twice. Region went down and came back up.");
113 113
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index 4f60462..6e7ace5 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -49,6 +49,9 @@ namespace OpenSim.Region.Communications.Local
49 m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID); 49 m_log.InfoFormat("[LOCAL INVENTORY SERVICE]: Requesting inventory for user {0}", userID);
50 50
51 List<InventoryFolderBase> skeletonFolders = GetInventorySkeleton(userID); 51 List<InventoryFolderBase> skeletonFolders = GetInventorySkeleton(userID);
52 if (skeletonFolders == null)
53 return;
54
52 InventoryFolderImpl rootFolder = null; 55 InventoryFolderImpl rootFolder = null;
53 56
54 List<InventoryFolderImpl> folders = new List<InventoryFolderImpl>(); 57 List<InventoryFolderImpl> folders = new List<InventoryFolderImpl>();