diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-11 20:32:05 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-11 20:32:05 -0400 |
| commit | 2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3 (patch) | |
| tree | b8a0cc747dd73da553d8d3504d3c842d9283be73 /OpenSim/ApplicationPlugins/Rest | |
| parent | Try something to help the tests complete. (diff) | |
| parent | Fixes a race condition in EQ processing that was making EQs pop up again upon... (diff) | |
| download | opensim-SC_OLD-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.zip opensim-SC_OLD-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.gz opensim-SC_OLD-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.bz2 opensim-SC_OLD-2e9fc9a22b9718bb96934ed3b51ac0767f9ca4f3.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest')
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs index a1cd116..aec06be 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs | |||
| @@ -265,7 +265,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
| 265 | 265 | ||
| 266 | if (Rest.InventoryServices.HasInventoryForUser(rdata.uuid)) | 266 | if (Rest.InventoryServices.HasInventoryForUser(rdata.uuid)) |
| 267 | { | 267 | { |
| 268 | rdata.root = Rest.InventoryServices.RequestRootFolder(rdata.uuid); | 268 | rdata.root = Rest.InventoryServices.GetRootFolder(rdata.uuid); |
| 269 | 269 | ||
| 270 | Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}", | 270 | Rest.Log.DebugFormat("{0} Inventory Root retrieved for {1} {2}", |
| 271 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); | 271 | MsgId, rdata.userProfile.FirstName, rdata.userProfile.SurName); |