aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/ScriptEngine
diff options
context:
space:
mode:
authorJeff Ames2007-12-20 05:43:02 +0000
committerJeff Ames2007-12-20 05:43:02 +0000
commitbe2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch)
tree688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim/Grid/ScriptEngine
parent*Added event called after any movement is handled (OnClientMovement) - will b... (diff)
downloadopensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.xz
Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532
Diffstat (limited to 'OpenSim/Grid/ScriptEngine')
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 64921d7..8f58b55 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -820,7 +820,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
820 820
821 public string llGetOwner() 821 public string llGetOwner()
822 { 822 {
823 return m_host.ObjectOwner.ToStringHyphenated(); 823 return m_host.ObjectOwner.ToString();
824 } 824 }
825 825
826 public void llInstantMessage(string user, string message) 826 public void llInstantMessage(string user, string message)
@@ -840,7 +840,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
840 840
841 public string llGetKey() 841 public string llGetKey()
842 { 842 {
843 return m_host.UUID.ToStringHyphenated(); 843 return m_host.UUID.ToString();
844 } 844 }
845 845
846 public void llSetBuoyancy(double buoyancy) 846 public void llSetBuoyancy(double buoyancy)
@@ -1234,7 +1234,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
1234 1234
1235 public string llList2Key(List<string> src, int index) 1235 public string llList2Key(List<string> src, int index)
1236 { 1236 {
1237 //return OpenSim.Framework.ToStringHyphenated(src[index]); 1237 //return OpenSim.Framework.ToString(src[index]);
1238 return src[index].ToString(); 1238 return src[index].ToString();
1239 } 1239 }
1240 1240
@@ -1923,7 +1923,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
1923 1923
1924 public string llGetCreator() 1924 public string llGetCreator()
1925 { 1925 {
1926 return m_host.ObjectCreator.ToStringHyphenated(); 1926 return m_host.ObjectCreator.ToString();
1927 } 1927 }
1928 1928
1929 public string llGetTimestamp() 1929 public string llGetTimestamp()
@@ -2265,14 +2265,14 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
2265 LLUUID createdTexture = 2265 LLUUID createdTexture =
2266 textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url, 2266 textureManager.AddDynamicTextureURL(World.RegionInfo.RegionID, m_host.UUID, contentType, url,
2267 extraParams, timer); 2267 extraParams, timer);
2268 return createdTexture.ToStringHyphenated(); 2268 return createdTexture.ToString();
2269 } 2269 }
2270 else 2270 else
2271 { 2271 {
2272 //TODO update existing dynamic textures 2272 //TODO update existing dynamic textures
2273 } 2273 }
2274 2274
2275 return LLUUID.Zero.ToStringHyphenated(); 2275 return LLUUID.Zero.ToString();
2276 } 2276 }
2277 2277
2278 private void NotImplemented(string Command) 2278 private void NotImplemented(string Command)
@@ -2281,4 +2281,4 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
2281 throw new NotImplementedException("Command not implemented: " + Command); 2281 throw new NotImplementedException("Command not implemented: " + Command);
2282 } 2282 }
2283 } 2283 }
2284} \ No newline at end of file 2284}