aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712007-05-16 20:36:35 +0000
committerlbsa712007-05-16 20:36:35 +0000
commit3435e0cb3ac51aaa9433d446f4a9b498e789830a (patch)
treeb16e53cd95b1045842973b32b9608646a80c356e
parent* here goes nothing... (diff)
downloadopensim-SC_OLD-3435e0cb3ac51aaa9433d446f4a9b498e789830a.zip
opensim-SC_OLD-3435e0cb3ac51aaa9433d446f4a9b498e789830a.tar.gz
opensim-SC_OLD-3435e0cb3ac51aaa9433d446f4a9b498e789830a.tar.bz2
opensim-SC_OLD-3435e0cb3ac51aaa9433d446f4a9b498e789830a.tar.xz
* sing loud, sing proud, sing from the heart
-rw-r--r--OpenSim.RegionServer/CAPS/AdminWebFront.cs1
-rw-r--r--OpenSim.RegionServer/world/World.cs3
-rw-r--r--OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs2
3 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim.RegionServer/CAPS/AdminWebFront.cs
index 743d1a9..2299fa4 100644
--- a/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ b/OpenSim.RegionServer/CAPS/AdminWebFront.cs
@@ -10,7 +10,6 @@ using OpenSim.Framework.Inventory;
10using libsecondlife; 10using libsecondlife;
11using OpenSim.RegionServer.world.scripting; 11using OpenSim.RegionServer.world.scripting;
12using Avatar=libsecondlife.Avatar; 12using Avatar=libsecondlife.Avatar;
13using OpenSim.RegionServer.world.scripting.Scripts;
14 13
15namespace OpenSim.CAPS 14namespace OpenSim.CAPS
16{ 15{
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 148efc9..640ab81 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -14,7 +14,6 @@ using OpenSim.Framework.Inventory;
14using OpenSim.Assets; 14using OpenSim.Assets;
15//using OpenSim.world.scripting; 15//using OpenSim.world.scripting;
16using OpenSim.RegionServer.world.scripting; 16using OpenSim.RegionServer.world.scripting;
17using OpenSim.RegionServer.world.scripting.Scripts;
18using OpenSim.Terrain; 17using OpenSim.Terrain;
19 18
20namespace OpenSim.world 19namespace OpenSim.world
@@ -673,7 +672,7 @@ namespace OpenSim.world
673 { 672 {
674 this.m_scripts.Add("FollowRandomAvatar", delegate() 673 this.m_scripts.Add("FollowRandomAvatar", delegate()
675 { 674 {
676 return new FollowRandomAvatar(); 675 return new OpenSim.RegionServer.world.scripting.FollowRandomAvatar();
677 }); 676 });
678 } 677 }
679 678
diff --git a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
index 388a95c..6a689ab 100644
--- a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife; 4using libsecondlife;
5 5
6namespace OpenSim.RegionServer.world.scripting.Scripts 6namespace OpenSim.RegionServer.world.scripting
7{ 7{
8 public class FollowRandomAvatar : Script 8 public class FollowRandomAvatar : Script
9 { 9 {