diff options
author | John Hurliman | 2010-03-10 14:06:12 -0800 |
---|---|---|
committer | John Hurliman | 2010-03-10 14:06:12 -0800 |
commit | b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a (patch) | |
tree | c20d8f5be598d70caff0589629427f6450573cf4 /OpenSim/Services/Connectors/Inventory | |
parent | * Cleaned up and commented the messy SendInventoryUpdate, fixed a broken debu... (diff) | |
parent | Reintroduce a check that was dropped from permissions (diff) | |
download | opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.zip opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.gz opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.bz2 opensim-SC_OLD-b18ca2fee6624d63faf0d44dd2d4b7b64c93fc5a.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services/Connectors/Inventory')
-rw-r--r-- | OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs index 9821dd4..0cc1978 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | |||
@@ -126,7 +126,7 @@ namespace OpenSim.Services.Connectors | |||
126 | }); | 126 | }); |
127 | 127 | ||
128 | if (ret == null) | 128 | if (ret == null) |
129 | return null; | 129 | return null; |
130 | if (ret.Count == 0) | 130 | if (ret.Count == 0) |
131 | return null; | 131 | return null; |
132 | 132 | ||