aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorMW2008-06-29 20:39:34 +0000
committerMW2008-06-29 20:39:34 +0000
commitb0330a0bb50a3b30dbaa526cdcafd4e0b9aa6c7b (patch)
tree73ac3685bb1105a934fcd59bb882290e31db21fb /OpenSim/Grid
parent* Reload terrain from archive if there is one (diff)
downloadopensim-SC_OLD-b0330a0bb50a3b30dbaa526cdcafd4e0b9aa6c7b.zip
opensim-SC_OLD-b0330a0bb50a3b30dbaa526cdcafd4e0b9aa6c7b.tar.gz
opensim-SC_OLD-b0330a0bb50a3b30dbaa526cdcafd4e0b9aa6c7b.tar.bz2
opensim-SC_OLD-b0330a0bb50a3b30dbaa526cdcafd4e0b9aa6c7b.tar.xz
disabled the multiple inventory server support in login service again.
And reverted CachedUserInfo back to revision 5262. I don't think most of the inventory problems that people are reporting are due to these, but its easier to deal with one set of potential problems at a time, and I'm not going to get any time in the week to work on this anyway.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 9b2600f..78f6e7c 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -422,10 +422,10 @@ namespace OpenSim.Grid.UserServer
422 protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl) 422 protected override InventoryData GetInventorySkeleton(LLUUID userID, string serverUrl)
423 { 423 {
424 string invUrl = m_config.InventoryUrl; 424 string invUrl = m_config.InventoryUrl;
425 if (!String.IsNullOrEmpty(serverUrl)) 425 //if (!String.IsNullOrEmpty(serverUrl))
426 { 426 //{
427 invUrl = serverUrl+"/"; 427 // invUrl = serverUrl+"/";
428 } 428 //}
429 429
430 m_log.DebugFormat( 430 m_log.DebugFormat(
431 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", 431 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",