diff options
Diffstat (limited to 'OpenSim/Grid/InventoryServer')
-rw-r--r-- | OpenSim/Grid/InventoryServer/GridInventoryService.cs | 14 | ||||
-rw-r--r-- | OpenSim/Grid/InventoryServer/Main.cs | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index 643cf4d..e4d43d4 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs | |||
@@ -84,12 +84,12 @@ namespace OpenSim.Grid.InventoryServer | |||
84 | { | 84 | { |
85 | return true; | 85 | return true; |
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
89 | m_log.WarnFormat( | 89 | m_log.WarnFormat( |
90 | "[GRID AGENT INVENTORY]: Rejecting request since source {0} was not in the list of trusted sources", | 90 | "[GRID AGENT INVENTORY]: Rejecting request since source {0} was not in the list of trusted sources", |
91 | peer); | 91 | peer); |
92 | 92 | ||
93 | return false; | 93 | return false; |
94 | } | 94 | } |
95 | else | 95 | else |
@@ -110,7 +110,7 @@ namespace OpenSim.Grid.InventoryServer | |||
110 | if (m_doLookup) | 110 | if (m_doLookup) |
111 | { | 111 | { |
112 | m_log.InfoFormat("[GRID AGENT INVENTORY]: checking authed session {0} {1}", session_id, avatar_id); | 112 | m_log.InfoFormat("[GRID AGENT INVENTORY]: checking authed session {0} {1}", session_id, avatar_id); |
113 | 113 | ||
114 | if (m_session_cache.getCachedSession(session_id, avatar_id) == null) | 114 | if (m_session_cache.getCachedSession(session_id, avatar_id) == null) |
115 | { | 115 | { |
116 | // cache miss, ask userserver | 116 | // cache miss, ask userserver |
@@ -137,7 +137,7 @@ namespace OpenSim.Grid.InventoryServer | |||
137 | m_log.Info("[GRID AGENT INVENTORY]: got authed session from cache"); | 137 | m_log.Info("[GRID AGENT INVENTORY]: got authed session from cache"); |
138 | return true; | 138 | return true; |
139 | } | 139 | } |
140 | 140 | ||
141 | m_log.Warn("[GRID AGENT INVENTORY]: unknown session_id, request rejected"); | 141 | m_log.Warn("[GRID AGENT INVENTORY]: unknown session_id, request rejected"); |
142 | return false; | 142 | return false; |
143 | } | 143 | } |
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs index 7e6a29b..a77c570 100644 --- a/OpenSim/Grid/InventoryServer/Main.cs +++ b/OpenSim/Grid/InventoryServer/Main.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim.Grid.InventoryServer | |||
65 | public override void Startup() | 65 | public override void Startup() |
66 | { | 66 | { |
67 | base.Startup(); | 67 | base.Startup(); |
68 | 68 | ||
69 | InventoryConfig config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); | 69 | InventoryConfig config = new InventoryConfig(LogName, (Path.Combine(Util.configDir(), "InventoryServer_Config.xml"))); |
70 | 70 | ||
71 | m_inventoryService = new GridInventoryService(config.UserServerURL); | 71 | m_inventoryService = new GridInventoryService(config.UserServerURL); |