aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/ApplicationPlugins/RemoteController
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 6691f14..7803d92 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -31,7 +31,7 @@ using System.IO;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Timers; 33using System.Timers;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using Nini.Config; 36using Nini.Config;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
@@ -113,7 +113,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
113 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword)) 113 (!requestData.Contains("password") || (string) requestData["password"] != requiredPassword))
114 throw new Exception("wrong password"); 114 throw new Exception("wrong password");
115 115
116 LLUUID regionID = new LLUUID((string) requestData["regionID"]); 116 UUID regionID = new UUID((string) requestData["regionID"]);
117 117
118 responseData["accepted"] = "true"; 118 responseData["accepted"] = "true";
119 response.Value = responseData; 119 response.Value = responseData;
@@ -198,7 +198,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
198 throw new Exception("wrong password"); 198 throw new Exception("wrong password");
199 199
200 string file = (string)requestData["filename"]; 200 string file = (string)requestData["filename"];
201 LLUUID regionID = (string) requestData["regionid"]; 201 UUID regionID = (string) requestData["regionid"];
202 m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file); 202 m_log.InfoFormat("[RADMIN]: Terrain Loading: {0}", file);
203 203
204 responseData["accepted"] = "true"; 204 responseData["accepted"] = "true";
@@ -379,7 +379,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
379 379
380 // extract or generate region ID now 380 // extract or generate region ID now
381 Scene scene = null; 381 Scene scene = null;
382 LLUUID regionID = LLUUID.Zero; 382 UUID regionID = UUID.Zero;
383 if (requestData.ContainsKey("region_id") && 383 if (requestData.ContainsKey("region_id") &&
384 !String.IsNullOrEmpty((string)requestData["region_id"])) 384 !String.IsNullOrEmpty((string)requestData["region_id"]))
385 { 385 {
@@ -391,7 +391,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
391 } 391 }
392 else 392 else
393 { 393 {
394 regionID = LLUUID.Random(); 394 regionID = UUID.Random();
395 m_log.DebugFormat("[RADMIN] CreateRegion: new region UUID {0}", regionID); 395 m_log.DebugFormat("[RADMIN] CreateRegion: new region UUID {0}", regionID);
396 } 396 }
397 397
@@ -517,7 +517,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
517 /// <description>error message if success is false</description></item> 517 /// <description>error message if success is false</description></item>
518 /// <item><term>avatar_uuid</term> 518 /// <item><term>avatar_uuid</term>
519 /// <description>UUID of the newly created avatar 519 /// <description>UUID of the newly created avatar
520 /// account; LLUUID.Zero if failed. 520 /// account; UUID.Zero if failed.
521 /// </description></item> 521 /// </description></item>
522 /// </list> 522 /// </list>
523 /// </remarks> 523 /// </remarks>
@@ -551,9 +551,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
551 if (null != userProfile) 551 if (null != userProfile)
552 throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname)); 552 throw new Exception(String.Format("avatar {0} {1} already exists", firstname, lastname));
553 553
554 LLUUID userID = m_app.CreateUser(firstname, lastname, passwd, regX, regY); 554 UUID userID = m_app.CreateUser(firstname, lastname, passwd, regX, regY);
555 555
556 if (userID == LLUUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}", 556 if (userID == UUID.Zero) throw new Exception(String.Format("failed to create new user {0} {1}",
557 firstname, lastname)); 557 firstname, lastname));
558 558
559 responseData["success"] = "true"; 559 responseData["success"] = "true";
@@ -569,7 +569,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
569 m_log.DebugFormat("[RADMIN] CreateUser: failed: {0}", e.ToString()); 569 m_log.DebugFormat("[RADMIN] CreateUser: failed: {0}", e.ToString());
570 570
571 responseData["success"] = "false"; 571 responseData["success"] = "false";
572 responseData["avatar_uuid"] = LLUUID.Zero.ToString(); 572 responseData["avatar_uuid"] = UUID.Zero.ToString();
573 responseData["error"] = e.Message; 573 responseData["error"] = e.Message;
574 574
575 response.Value = responseData; 575 response.Value = responseData;
@@ -742,7 +742,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
742 Scene scene = null; 742 Scene scene = null;
743 if (requestData.Contains("region_uuid")) 743 if (requestData.Contains("region_uuid"))
744 { 744 {
745 LLUUID region_uuid = (string)requestData["region_uuid"]; 745 UUID region_uuid = (string)requestData["region_uuid"];
746 if (!m_app.SceneManager.TryGetScene(region_uuid, out scene)) 746 if (!m_app.SceneManager.TryGetScene(region_uuid, out scene))
747 throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); 747 throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
748 } 748 }
@@ -802,7 +802,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
802 string filename = (string)requestData["filename"]; 802 string filename = (string)requestData["filename"];
803 if (requestData.Contains("region_uuid")) 803 if (requestData.Contains("region_uuid"))
804 { 804 {
805 LLUUID region_uuid = (string)requestData["region_uuid"]; 805 UUID region_uuid = (string)requestData["region_uuid"];
806 if (!m_app.SceneManager.TrySetCurrentScene(region_uuid)) 806 if (!m_app.SceneManager.TrySetCurrentScene(region_uuid))
807 throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString())); 807 throw new Exception(String.Format("failed to switch to region {0}", region_uuid.ToString()));
808 m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString()); 808 m_log.InfoFormat("[RADMIN] Switched to region {0}", region_uuid.ToString());
@@ -827,7 +827,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
827 switch (xml_version) 827 switch (xml_version)
828 { 828 {
829 case "1": 829 case "1":
830 m_app.SceneManager.LoadCurrentSceneFromXml(filename, true, new LLVector3(0, 0, 0)); 830 m_app.SceneManager.LoadCurrentSceneFromXml(filename, true, new Vector3(0, 0, 0));
831 break; 831 break;
832 832
833 case "2": 833 case "2":