aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/CommunicationsManager.cs
diff options
context:
space:
mode:
authorMW2008-06-29 11:48:58 +0000
committerMW2008-06-29 11:48:58 +0000
commitf3f31744abaf8a9df952a0d547faa59035b46ff3 (patch)
treed400f1ef6854d9f7b57007f92e774b5c7b1a1c81 /OpenSim/Framework/Communications/CommunicationsManager.cs
parentcouple of small fixes to try to fix support for multiple inventory servers in... (diff)
downloadopensim-SC-f3f31744abaf8a9df952a0d547faa59035b46ff3.zip
opensim-SC-f3f31744abaf8a9df952a0d547faa59035b46ff3.tar.gz
opensim-SC-f3f31744abaf8a9df952a0d547faa59035b46ff3.tar.bz2
opensim-SC-f3f31744abaf8a9df952a0d547faa59035b46ff3.tar.xz
patch and files from mantis #1630, Thanks Melanie
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 45f692b..ccd6491 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Framework.Communications
134 134
135 public bool TryGetInventoryService(string host, out IInventoryServices inventoryService) 135 public bool TryGetInventoryService(string host, out IInventoryServices inventoryService)
136 { 136 {
137 if ((host == string.Empty) | (host == "default")) 137 if ((host == string.Empty) || (host == "default"))
138 { 138 {
139 host = m_defaultInventoryHost; 139 host = m_defaultInventoryHost;
140 } 140 }