aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorMelanie2010-02-22 03:00:59 +0000
committerMelanie2010-02-22 03:00:59 +0000
commit1f45e6c6497e05638f014e92098165befbbea100 (patch)
tree0e4fdd96ef3d3727fc051a9f81375bfbaf0b04f4 /OpenSim/Server/Handlers
parentOne more test running. (diff)
parentFormatting cleanup. (diff)
downloadopensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.zip
opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.gz
opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.bz2
opensim-SC_OLD-1f45e6c6497e05638f014e92098165befbbea100.tar.xz
Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index a944972..3ab1622 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -207,7 +207,7 @@ namespace OpenSim.Server.Handlers.Asset
207 if (!request.ContainsKey("PRINCIPAL")) 207 if (!request.ContainsKey("PRINCIPAL"))
208 return FailureResult(); 208 return FailureResult();
209 209
210 if(m_InventoryService.CreateUserInventory(new UUID(request["PRINCIPAL"].ToString()))) 210 if (m_InventoryService.CreateUserInventory(new UUID(request["PRINCIPAL"].ToString())))
211 result["RESULT"] = "True"; 211 result["RESULT"] = "True";
212 else 212 else
213 result["RESULT"] = "False"; 213 result["RESULT"] = "False";