aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-08-14 20:00:24 +0100
committerJustin Clark-Casey (justincc)2009-08-14 20:00:24 +0100
commit3e94eecc5c56666ae731efdb93114e3f01851ef8 (patch)
treed44d7373e9fafcde277c82d1eb893b3e213b4dc0 /OpenSim
parentAdd standard doc and standard doc formatting to IAssetService (diff)
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-3e94eecc5c56666ae731efdb93114e3f01851ef8.zip
opensim-SC_OLD-3e94eecc5c56666ae731efdb93114e3f01851ef8.tar.gz
opensim-SC_OLD-3e94eecc5c56666ae731efdb93114e3f01851ef8.tar.bz2
opensim-SC_OLD-3e94eecc5c56666ae731efdb93114e3f01851ef8.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index a3672d5..88452d2 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -113,6 +113,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
113 agent.InventoryFolder = UUID.Zero; 113 agent.InventoryFolder = UUID.Zero;
114 agent.startpos = Vector3.Zero; 114 agent.startpos = Vector3.Zero;
115 agent.CapsPath = GetRandomCapsObjectPath(); 115 agent.CapsPath = GetRandomCapsObjectPath();
116 agent.ChildrenCapSeeds = new Dictionary<ulong, string>();
116 117
117 string reason; 118 string reason;
118 scene.NewUserConnection(agent, out reason); 119 scene.NewUserConnection(agent, out reason);