diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/HGOpenSimNode.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 54 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs | 24 |
3 files changed, 40 insertions, 40 deletions
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index f85c9dd..c0f57f1 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs | |||
@@ -146,7 +146,7 @@ namespace OpenSim | |||
146 | m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); | 146 | m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); |
147 | } | 147 | } |
148 | 148 | ||
149 | void RunCommand(string module, string[] cp) | 149 | new void RunCommand(string module, string[] cp) |
150 | { | 150 | { |
151 | List<string> cmdparams = new List<string>(cp); | 151 | List<string> cmdparams = new List<string>(cp); |
152 | if (cmdparams.Count < 1) | 152 | if (cmdparams.Count < 1) |
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 37066c2..5aee06a 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -321,32 +321,32 @@ namespace OpenSim | |||
321 | 321 | ||
322 | #region Console Commands | 322 | #region Console Commands |
323 | 323 | ||
324 | private void KickUserCommand(string module, string[] cmdparams) | 324 | // private void KickUserCommand(string module, string[] cmdparams) |
325 | { | 325 | // { |
326 | if (cmdparams.Length < 4) | 326 | // if (cmdparams.Length < 4) |
327 | return; | 327 | // return; |
328 | 328 | ||
329 | IList agents = m_sceneManager.GetCurrentSceneAvatars(); | 329 | // IList agents = m_sceneManager.GetCurrentSceneAvatars(); |
330 | 330 | ||
331 | foreach (ScenePresence presence in agents) | 331 | // foreach (ScenePresence presence in agents) |
332 | { | 332 | // { |
333 | RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); | 333 | // RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); |
334 | 334 | ||
335 | if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) && presence.Lastname.ToLower().Contains(cmdparams[3].ToLower())) | 335 | // if (presence.Firstname.ToLower().Contains(cmdparams[2].ToLower()) && presence.Lastname.ToLower().Contains(cmdparams[3].ToLower())) |
336 | { | 336 | // { |
337 | m_console.Notice( | 337 | // m_console.Notice( |
338 | String.Format( | 338 | // String.Format( |
339 | "Kicking user: {0,-16}{1,-16}{2,-37} in region: {3,-16}", | 339 | // "Kicking user: {0,-16}{1,-16}{2,-37} in region: {3,-16}", |
340 | presence.Firstname, | 340 | // presence.Firstname, |
341 | presence.Lastname, | 341 | // presence.Lastname, |
342 | presence.UUID, | 342 | // presence.UUID, |
343 | regionInfo.RegionName)); | 343 | // regionInfo.RegionName)); |
344 | 344 | ||
345 | presence.Scene.IncomingCloseAgent(presence.UUID); | 345 | // presence.Scene.IncomingCloseAgent(presence.UUID); |
346 | } | 346 | // } |
347 | } | 347 | // } |
348 | m_console.Notice(""); | 348 | // m_console.Notice(""); |
349 | } | 349 | // } |
350 | 350 | ||
351 | /// <summary> | 351 | /// <summary> |
352 | /// Run an optional startup list of commands | 352 | /// Run an optional startup list of commands |
@@ -761,7 +761,7 @@ namespace OpenSim | |||
761 | } | 761 | } |
762 | 762 | ||
763 | // see BaseOpenSimServer | 763 | // see BaseOpenSimServer |
764 | private void HandleShow(string mod, string[] cmd) | 764 | override public void HandleShow(string mod, string[] cmd) |
765 | { | 765 | { |
766 | List<string> args = new List<string>(cmd); | 766 | List<string> args = new List<string>(cmd); |
767 | args.RemoveAt(0); | 767 | args.RemoveAt(0); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs index e2718cc..291efd2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs | |||
@@ -109,25 +109,25 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests | |||
109 | return (float)(Math.PI * degrees / 180); | 109 | return (float)(Math.PI * degrees / 180); |
110 | } | 110 | } |
111 | 111 | ||
112 | private double FromRadians(float radians) | 112 | // private double FromRadians(float radians) |
113 | { | 113 | // { |
114 | return radians * 180 / Math.PI; | 114 | // return radians * 180 / Math.PI; |
115 | } | 115 | // } |
116 | 116 | ||
117 | private double FromLslFloat(LSL_Types.LSLFloat lslFloat) | 117 | private double FromLslFloat(LSL_Types.LSLFloat lslFloat) |
118 | { | 118 | { |
119 | return lslFloat.value; | 119 | return lslFloat.value; |
120 | } | 120 | } |
121 | 121 | ||
122 | private LSL_Types.LSLFloat ToLslFloat(double value) | 122 | // private LSL_Types.LSLFloat ToLslFloat(double value) |
123 | { | 123 | // { |
124 | return new LSL_Types.LSLFloat(value); | 124 | // return new LSL_Types.LSLFloat(value); |
125 | } | 125 | // } |
126 | 126 | ||
127 | private Quaternion FromLslQuaternion(LSL_Types.Quaternion lslQuaternion) | 127 | // private Quaternion FromLslQuaternion(LSL_Types.Quaternion lslQuaternion) |
128 | { | 128 | // { |
129 | return new Quaternion((float)lslQuaternion.x, (float)lslQuaternion.y, (float)lslQuaternion.z, (float)lslQuaternion.s); | 129 | // return new Quaternion((float)lslQuaternion.x, (float)lslQuaternion.y, (float)lslQuaternion.z, (float)lslQuaternion.s); |
130 | } | 130 | // } |
131 | 131 | ||
132 | private LSL_Types.Quaternion ToLslQuaternion(Quaternion quaternion) | 132 | private LSL_Types.Quaternion ToLslQuaternion(Quaternion quaternion) |
133 | { | 133 | { |