aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-24 21:38:46 +0100
committerJustin Clark-Casey (justincc)2012-08-24 21:38:46 +0100
commit01771aca40289ec8e212794aeedba7c80ce7d642 (patch)
tree8819de178d78ef649c70323cba28834714716839
parentPass the "attachToBackup" bool given to SceneGraph.AddNewSceneObject() down i... (diff)
parentstripping superfluous whitespace (diff)
downloadopensim-SC_OLD-01771aca40289ec8e212794aeedba7c80ce7d642.zip
opensim-SC_OLD-01771aca40289ec8e212794aeedba7c80ce7d642.tar.gz
opensim-SC_OLD-01771aca40289ec8e212794aeedba7c80ce7d642.tar.bz2
opensim-SC_OLD-01771aca40289ec8e212794aeedba7c80ce7d642.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs20
1 files changed, 5 insertions, 15 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 0d275f7..2bfb9b3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5165,25 +5165,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5165 /// separated list. There is a space after 5165 /// separated list. There is a space after
5166 /// each comma. 5166 /// each comma.
5167 /// </summary> 5167 /// </summary>
5168
5169 public LSL_String llList2CSV(LSL_List src) 5168 public LSL_String llList2CSV(LSL_List src)
5170 { 5169 {
5171
5172 string ret = String.Empty;
5173 int x = 0;
5174
5175 m_host.AddScriptLPS(1); 5170 m_host.AddScriptLPS(1);
5176 5171
5177 if (src.Data.Length > 0) 5172 return string.Join(", ",
5178 { 5173 (new List<object>(src.Data)).ConvertAll<string>(o =>
5179 ret = src.Data[x++].ToString(); 5174 {
5180 for (; x < src.Data.Length; x++) 5175 return o.ToString();
5181 { 5176 }).ToArray());
5182 ret += ", "+src.Data[x].ToString();
5183 }
5184 }
5185
5186 return ret;
5187 } 5177 }
5188 5178
5189 /// <summary> 5179 /// <summary>