From 10258645f6b32a59ef1b09294e1570e52fd8cbca Mon Sep 17 00:00:00 2001
From: SignpostMarv <github@signpostmarv.name>
Date: Mon, 20 Aug 2012 11:08:36 +0100
Subject: [PATCH 1/2] adding constructor and implicit operator for LSLString &
 UUID similar to recent LSL Vector & OMV Vector work

---
 OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 9d9df9c..2a01e9c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1479,6 +1479,8 @@ namespace OpenSim.Region.ScriptEngine.Shared
             }
 
             public LSLString(LSLInteger i) : this(i.value) {}
+
+            public LSLString(UUID key) : this(key.ToString()) { }
             
             #endregion
 
@@ -1585,6 +1587,11 @@ namespace OpenSim.Region.ScriptEngine.Shared
                 return new list(new object[]{s});
             }
 
+            public static implicit operator LSLString(UUID key)
+            {
+                return new LSLString(key);
+            }
+
             #endregion
 
             #region Overriders
-- 
1.7.11.msysgit.1


From 01f52f67cd920570cdb06f797ee6271f68267930 Mon Sep 17 00:00:00 2001
From: SignpostMarv <github@signpostmarv.name>
Date: Mon, 20 Aug 2012 11:13:39 +0100
Subject: [PATCH 2/2] refactoring similar to recent LSL Vector & OMV Vector
 work

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs   | 2 +-
 .../ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs    | 2 +-
 .../ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs   | 2 +-
 .../ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs      | 2 +-
 .../ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs    | 2 +-
 OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs       | 4 ++--
 OpenSim/Region/ScriptEngine/XEngine/EventManager.cs                 | 6 +++---
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 8936cb2..c44d21c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -1669,7 +1669,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 return;
             }
 
-            object[] resobj = new object[] { new LSL_Types.LSLString(m_host.UUID.ToString()), new LSL_Types.LSLString(message) };
+            object[] resobj = new object[] { new LSL_Types.LSLString(m_host.UUID), new LSL_Types.LSLString(message) };
 
             SceneObjectPart sceneOP = World.GetSceneObjectPart(objUUID);
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs
index 9f78a49..7363779 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Dataserver.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
             m_CmdManager.m_ScriptEngine.PostObjectEvent(ds.localID,
                     new EventParams("dataserver", new Object[]
-                            { new LSL_Types.LSLString(ds.ID.ToString()),
+                            { new LSL_Types.LSLString(ds.ID),
                             new LSL_Types.LSLString(reply)},
                     new DetectParams[0]));
         }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
index 629b14b..324d7ab 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/HttpRequest.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
 
                 object[] resobj = new object[]
                 {
-                    new LSL_Types.LSLString(httpInfo.ReqID.ToString()),
+                    new LSL_Types.LSLString(httpInfo.ReqID),
                     new LSL_Types.LSLInteger(httpInfo.Status),
                     new LSL_Types.list(),
                     new LSL_Types.LSLString(httpInfo.ResponseBody)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
index efa86fc..ed54654 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Listener.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                     {
                         new LSL_Types.LSLInteger(lInfo.GetChannel()),
                         new LSL_Types.LSLString(lInfo.GetName()),
-                        new LSL_Types.LSLString(lInfo.GetID().ToString()),
+                        new LSL_Types.LSLString(lInfo.GetID()),
                         new LSL_Types.LSLString(lInfo.GetMessage())
                     };
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
index 25c4cbe..6e339b7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/XmlRequest.cs
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
                     {
                         new LSL_Types.LSLInteger(3),
                         new LSL_Types.LSLString(srdInfo.Channel.ToString()),
-                        new LSL_Types.LSLString(srdInfo.GetReqID().ToString()),
+                        new LSL_Types.LSLString(srdInfo.GetReqID()),
                         new LSL_Types.LSLString(String.Empty),
                         new LSL_Types.LSLInteger(srdInfo.Idata),
                         new LSL_Types.LSLString(srdInfo.Sdata)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 5793cc9..8c0e746 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -368,7 +368,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 if (m_stateSource == StateSource.AttachedRez)
                 {
                     PostEvent(new EventParams("attach",
-                        new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0]));
+                        new object[] { new LSL_Types.LSLString(m_AttachedAvatar) }, new DetectParams[0]));
                 }
                 else if (m_stateSource == StateSource.RegionStart)
                 {
@@ -403,7 +403,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 if (m_stateSource == StateSource.AttachedRez)
                 {
                     PostEvent(new EventParams("attach",
-                        new object[] { new LSL_Types.LSLString(m_AttachedAvatar.ToString()) }, new DetectParams[0]));
+                        new object[] { new LSL_Types.LSLString(m_AttachedAvatar) }, new DetectParams[0]));
                 }
 
             }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index cee10df..28c7e55 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -225,7 +225,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         {
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "money", new object[] {
-                    new LSL_Types.LSLString(agentID.ToString()),
+                    new LSL_Types.LSLString(agentID),
                     new LSL_Types.LSLInteger(amount) },
                     new DetectParams[0]));
         }
@@ -348,7 +348,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         {
             myScriptEngine.PostScriptEvent(itemID, new EventParams(
                     "control",new object[] {
-                    new LSL_Types.LSLString(agentID.ToString()),
+                    new LSL_Types.LSLString(agentID),
                     new LSL_Types.LSLInteger(held),
                     new LSL_Types.LSLInteger(change)},
                     new DetectParams[0]));
@@ -409,7 +409,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
         {
             myScriptEngine.PostObjectEvent(localID, new EventParams(
                     "attach",new object[] {
-                    new LSL_Types.LSLString(avatar.ToString()) },
+                    new LSL_Types.LSLString(avatar) },
                     new DetectParams[0]));
         }
 
-- 
1.7.11.msysgit.1