diff options
author | John Hurliman | 2009-10-21 16:24:17 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-21 16:24:17 -0700 |
commit | 2b39ff0a39229f1cea513b12e6d093e31c40d0b2 (patch) | |
tree | 9b5637ecf48129b025fafec5eeed19c852e13716 /OpenSim/Region | |
parent | * FireQueueEmpty now checks if a measurable amount of time has passed, and if... (diff) | |
parent | Fix llParticleSystem to accept LSL variables and LSL constants in place (diff) | |
download | opensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.zip opensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.gz opensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.bz2 opensim-SC_OLD-2b39ff0a39229f1cea513b12e6d093e31c40d0b2.tar.xz |
Merged master into prioritization
Diffstat (limited to '')
3 files changed, 28 insertions, 18 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index ca6a2a3..143dd2a 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -628,8 +628,20 @@ namespace OpenSim | |||
628 | break; | 628 | break; |
629 | 629 | ||
630 | case "save": | 630 | case "save": |
631 | m_log.Info("Saving configuration file: " + Application.iniFilePath); | 631 | if (cmdparams.Length < 2) |
632 | m_config.Save(Application.iniFilePath); | 632 | { |
633 | m_log.Error("SYNTAX: " + n + " SAVE FILE"); | ||
634 | return; | ||
635 | } | ||
636 | |||
637 | if (Application.iniFilePath == cmdparams[1]) | ||
638 | { | ||
639 | m_log.Error("FILE can not be "+Application.iniFilePath); | ||
640 | return; | ||
641 | } | ||
642 | |||
643 | m_log.Info("Saving configuration file: " + cmdparams[1]); | ||
644 | m_config.Save(cmdparams[1]); | ||
633 | break; | 645 | break; |
634 | } | 646 | } |
635 | } | 647 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index b209199..b2544fa 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -1244,18 +1244,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1244 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Updating scene title for {0} with title: {1}", AgentID, Title); | 1244 | if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Updating scene title for {0} with title: {1}", AgentID, Title); |
1245 | 1245 | ||
1246 | ScenePresence presence = null; | 1246 | ScenePresence presence = null; |
1247 | lock (m_sceneList) | 1247 | |
1248 | foreach (Scene scene in m_sceneList) | ||
1248 | { | 1249 | { |
1249 | foreach (Scene scene in m_sceneList) | 1250 | presence = scene.GetScenePresence(AgentID); |
1251 | if (presence != null) | ||
1250 | { | 1252 | { |
1251 | presence = scene.GetScenePresence(AgentID); | 1253 | presence.Grouptitle = Title; |
1252 | if (presence != null) | ||
1253 | { | ||
1254 | presence.Grouptitle = Title; | ||
1255 | 1254 | ||
1256 | // FixMe: Ter suggests a "Schedule" method that I can't find. | 1255 | // FixMe: Ter suggests a "Schedule" method that I can't find. |
1257 | presence.SendFullUpdateToAllClients(); | 1256 | presence.SendFullUpdateToAllClients(); |
1258 | } | ||
1259 | } | 1257 | } |
1260 | } | 1258 | } |
1261 | } | 1259 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 57b14f7..a94b4e4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4660,7 +4660,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4660 | { | 4660 | { |
4661 | index = src.Length + index; | 4661 | index = src.Length + index; |
4662 | } | 4662 | } |
4663 | if (index >= src.Length) | 4663 | if (index >= src.Length || index < 0) |
4664 | { | 4664 | { |
4665 | return 0; | 4665 | return 0; |
4666 | } | 4666 | } |
@@ -4685,7 +4685,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4685 | { | 4685 | { |
4686 | index = src.Length + index; | 4686 | index = src.Length + index; |
4687 | } | 4687 | } |
4688 | if (index >= src.Length) | 4688 | if (index >= src.Length || index < 0) |
4689 | { | 4689 | { |
4690 | return 0.0; | 4690 | return 0.0; |
4691 | } | 4691 | } |
@@ -4712,7 +4712,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4712 | { | 4712 | { |
4713 | index = src.Length + index; | 4713 | index = src.Length + index; |
4714 | } | 4714 | } |
4715 | if (index >= src.Length) | 4715 | if (index >= src.Length || index < 0) |
4716 | { | 4716 | { |
4717 | return String.Empty; | 4717 | return String.Empty; |
4718 | } | 4718 | } |
@@ -4726,7 +4726,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4726 | { | 4726 | { |
4727 | index = src.Length + index; | 4727 | index = src.Length + index; |
4728 | } | 4728 | } |
4729 | if (index >= src.Length) | 4729 | if (index >= src.Length || index < 0) |
4730 | { | 4730 | { |
4731 | return ""; | 4731 | return ""; |
4732 | } | 4732 | } |
@@ -4740,7 +4740,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4740 | { | 4740 | { |
4741 | index = src.Length + index; | 4741 | index = src.Length + index; |
4742 | } | 4742 | } |
4743 | if (index >= src.Length) | 4743 | if (index >= src.Length || index < 0) |
4744 | { | 4744 | { |
4745 | return new LSL_Vector(0, 0, 0); | 4745 | return new LSL_Vector(0, 0, 0); |
4746 | } | 4746 | } |
@@ -4761,7 +4761,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4761 | { | 4761 | { |
4762 | index = src.Length + index; | 4762 | index = src.Length + index; |
4763 | } | 4763 | } |
4764 | if (index >= src.Length) | 4764 | if (index >= src.Length || index < 0) |
4765 | { | 4765 | { |
4766 | return new LSL_Rotation(0, 0, 0, 1); | 4766 | return new LSL_Rotation(0, 0, 0, 1); |
4767 | } | 4767 | } |
@@ -5844,7 +5844,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5844 | 5844 | ||
5845 | for (int i = 0; i < rules.Length; i += 2) | 5845 | for (int i = 0; i < rules.Length; i += 2) |
5846 | { | 5846 | { |
5847 | switch ((int)rules.Data[i]) | 5847 | switch (Convert.ToInt32(rules.Data[i])) |
5848 | { | 5848 | { |
5849 | case (int)ScriptBaseClass.PSYS_PART_FLAGS: | 5849 | case (int)ScriptBaseClass.PSYS_PART_FLAGS: |
5850 | prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)(uint)rules.GetLSLIntegerItem(i + 1); | 5850 | prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)(uint)rules.GetLSLIntegerItem(i + 1); |