aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorMelanie2010-03-06 12:24:09 +0000
committerMelanie2010-03-06 12:24:09 +0000
commit1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90 (patch)
tree69419084feb98d59888b59a643e5fa062314605d /OpenSim/Server
parentRemove a superfluous array creation (diff)
parent- implementing server 1.38 functions (diff)
downloadopensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.zip
opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.gz
opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.bz2
opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.xz
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index c7d5ff1..7e3e68b 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -44,8 +44,6 @@ namespace OpenSim.Server.Handlers.Asset
44{ 44{
45 public class XInventoryInConnector : ServiceConnector 45 public class XInventoryInConnector : ServiceConnector
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48
49 private IInventoryService m_InventoryService; 47 private IInventoryService m_InventoryService;
50 private string m_ConfigName = "InventoryService"; 48 private string m_ConfigName = "InventoryService";
51 49
@@ -197,7 +195,7 @@ namespace OpenSim.Server.Handlers.Asset
197 if (!request.ContainsKey("PRINCIPAL")) 195 if (!request.ContainsKey("PRINCIPAL"))
198 return FailureResult(); 196 return FailureResult();
199 197
200 if(m_InventoryService.CreateUserInventory(new UUID(request["PRINCIPAL"].ToString()))) 198 if (m_InventoryService.CreateUserInventory(new UUID(request["PRINCIPAL"].ToString())))
201 result["RESULT"] = "True"; 199 result["RESULT"] = "True";
202 else 200 else
203 result["RESULT"] = "False"; 201 result["RESULT"] = "False";