diff options
| author | Tom | 2010-08-06 08:09:10 -0700 |
|---|---|---|
| committer | Tom | 2010-08-06 08:09:10 -0700 |
| commit | 0d4086e6025d2d6ccbf1339a22a443eb746e834f (patch) | |
| tree | 5a9c8a75ec34ccdea292cbc947655d36cd4eb09e /OpenSim/Server | |
| parent | Since i've narrowed the fault down to one function, add some spammy debug to ... (diff) | |
| parent | Change XEngine to use the new constant (diff) | |
| download | opensim-SC-0d4086e6025d2d6ccbf1339a22a443eb746e834f.zip opensim-SC-0d4086e6025d2d6ccbf1339a22a443eb746e834f.tar.gz opensim-SC-0d4086e6025d2d6ccbf1339a22a443eb746e834f.tar.bz2 opensim-SC-0d4086e6025d2d6ccbf1339a22a443eb746e834f.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs index ac6a3ab..e3d30e5 100644 --- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | |||
| @@ -408,6 +408,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
| 408 | 408 | ||
| 409 | byte[] HandlePurgeFolder(Dictionary<string,object> request) | 409 | byte[] HandlePurgeFolder(Dictionary<string,object> request) |
| 410 | { | 410 | { |
| 411 | |||
| 411 | Dictionary<string,object> result = new Dictionary<string,object>(); | 412 | Dictionary<string,object> result = new Dictionary<string,object>(); |
| 412 | UUID folderID = UUID.Zero; | 413 | UUID folderID = UUID.Zero; |
| 413 | UUID.TryParse(request["ID"].ToString(), out folderID); | 414 | UUID.TryParse(request["ID"].ToString(), out folderID); |