2 files changed, 2 insertions, 23 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6afabf9..4d20e13 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5200,8 +5200,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             // NOTE: 3rd case is needed because a NULL_KEY comes through as
             // type 'obj' and wrongly returns ""
             else if (!(src.Data[index] is LSL_String ||
-                    src.Data[index] is LSL_Key ||
-                       src.Data[index] == "00000000-0000-0000-0000-000000000000"))
+                       src.Data[index] is LSL_Key ||
+                       src.Data[index].ToString() == "00000000-0000-0000-0000-000000000000"))
             {
                 return "";
             }
diff --git a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
index 50f9377..7d21a4b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
@@ -1377,27 +1377,6 @@ namespace OpenSim.Region.ScriptEngine.Shared
             }
         }
 
-        //
-        // BELOW IS WORK IN PROGRESS... IT WILL CHANGE, SO DON'T USE YET! :)
-        //
-
-        public struct StringTest
-        {
-            // Our own little string
-            internal string actualString;
-            public static implicit operator bool(StringTest mString)
-            {
-                if (mString.actualString.Length == 0)
-                    return true;
-                return false;
-            }
-            public override string ToString()
-            {
-                return actualString;
-            }
-
-        }
-
         [Serializable]
         public struct key
         {