diff options
| author | John Hurliman | 2010-01-12 10:27:21 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-01-12 10:27:21 -0800 |
| commit | a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5 (patch) | |
| tree | bf12b759e693d6b99494dfa19fb23e13488dd977 /OpenSim/Services/Connectors | |
| parent | Bug in llGetNumberOfPrims always returns to script when no clients are connec... (diff) | |
| parent | Add the option to reject duplicate region names (diff) | |
| download | opensim-SC-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.zip opensim-SC-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.tar.gz opensim-SC-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.tar.bz2 opensim-SC-a8b1a57cd11facdf2c5c583cfa766a44fe5f99c5.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs index 40acd6d..b9ccd7e 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | |||
| @@ -490,7 +490,7 @@ namespace OpenSim.Services.Connectors | |||
| 490 | return replyData; | 490 | return replyData; |
| 491 | } | 491 | } |
| 492 | 492 | ||
| 493 | InventoryFolderBase BuildFolder(Dictionary<string,object> data) | 493 | private InventoryFolderBase BuildFolder(Dictionary<string,object> data) |
| 494 | { | 494 | { |
| 495 | InventoryFolderBase folder = new InventoryFolderBase(); | 495 | InventoryFolderBase folder = new InventoryFolderBase(); |
| 496 | 496 | ||
| @@ -504,7 +504,7 @@ namespace OpenSim.Services.Connectors | |||
| 504 | return folder; | 504 | return folder; |
| 505 | } | 505 | } |
| 506 | 506 | ||
| 507 | InventoryItemBase BuildItem(Dictionary<string,object> data) | 507 | private InventoryItemBase BuildItem(Dictionary<string,object> data) |
| 508 | { | 508 | { |
| 509 | InventoryItemBase item = new InventoryItemBase(); | 509 | InventoryItemBase item = new InventoryItemBase(); |
| 510 | 510 | ||