aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorDiva Canto2014-05-31 08:22:56 -0700
committerDiva Canto2014-05-31 08:22:56 -0700
commitd6f9f690e56f129c4fcfb2d6fdb85f750ab3dd37 (patch)
treee198838d321f9adbce57e7744c8aebc2609b87e4 /OpenSim/Region/ClientStack
parentAdded missing reference (diff)
parentminor: rename velocidyDiff -> velocityDiff (diff)
downloadopensim-SC_OLD-d6f9f690e56f129c4fcfb2d6fdb85f750ab3dd37.zip
opensim-SC_OLD-d6f9f690e56f129c4fcfb2d6fdb85f750ab3dd37.tar.gz
opensim-SC_OLD-d6f9f690e56f129c4fcfb2d6fdb85f750ab3dd37.tar.bz2
opensim-SC_OLD-d6f9f690e56f129c4fcfb2d6fdb85f750ab3dd37.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs
index edc5016..ee1ea1a 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/Tests/WebFetchInvDescModuleTests.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.ClientStack.Linden.Caps.Tests
152 152
153 // A sanity check that the response has the expected number of descendents for a default inventory 153 // A sanity check that the response has the expected number of descendents for a default inventory
154 // TODO: Need a more thorough check. 154 // TODO: Need a more thorough check.
155 Assert.That((int)folderOsd["descendents"], Is.EqualTo(14)); 155 Assert.That((int)folderOsd["descendents"], Is.EqualTo(16));
156 } 156 }
157 } 157 }
158} \ No newline at end of file 158} \ No newline at end of file