aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared
diff options
context:
space:
mode:
authorOren Hurvitz2014-04-22 20:04:12 +0300
committerOren Hurvitz2014-04-23 16:37:36 +0300
commit998d7009a65def0a4debc9369d35b63611db5b55 (patch)
treed1303dc0387ae9ce4ddb076d5ccc856f3d5844e0 /OpenSim/Region/ScriptEngine/Shared
parentWorkaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff)
downloadopensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.zip
opensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz
opensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2
opensim-SC-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz
Eliminated many warnings
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs21
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
5200 // NOTE: 3rd case is needed because a NULL_KEY comes through as 5200 // NOTE: 3rd case is needed because a NULL_KEY comes through as
5201 // type 'obj' and wrongly returns "" 5201 // type 'obj' and wrongly returns ""
5202 else if (!(src.Data[index] is LSL_String || 5202 else if (!(src.Data[index] is LSL_String ||
5203 src.Data[index] is LSL_Key || 5203 src.Data[index] is LSL_Key ||
5204 src.Data[index] == "00000000-0000-0000-0000-000000000000")) 5204 src.Data[index].ToString() == "00000000-0000-0000-0000-000000000000"))
5205 { 5205 {
5206 return ""; 5206 return "";
5207 } 5207 }
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
1377 } 1377 }
1378 } 1378 }
1379 1379
1380 //
1381 // BELOW IS WORK IN PROGRESS... IT WILL CHANGE, SO DON'T USE YET! :)
1382 //
1383
1384 public struct StringTest
1385 {
1386 // Our own little string
1387 internal string actualString;
1388 public static implicit operator bool(StringTest mString)
1389 {
1390 if (mString.actualString.Length == 0)
1391 return true;
1392 return false;
1393 }
1394 public override string ToString()
1395 {
1396 return actualString;
1397 }
1398
1399 }
1400
1401 [Serializable] 1380 [Serializable]
1402 public struct key 1381 public struct key
1403 { 1382 {