ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 20:55:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into prioritization

Browse Source
This commit is contained in:
John Hurliman
2009-10-21 16:24:17 -07:00
parent b06f258319 d88bb83136
commit 2b39ff0a39
8 changed files with 271 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Region/Application/OpenSim.cs
View File

@@ -628,8 +628,20 @@ namespace OpenSim
break;
case "save":
m_log.Info("Saving configuration file: " + Application.iniFilePath);
m_config.Save(Application.iniFilePath);
if (cmdparams.Length < 2)
{
m_log.Error("SYNTAX: " + n + " SAVE FILE");
return;
}
if (Application.iniFilePath == cmdparams[1])
{
m_log.Error("FILE can not be "+Application.iniFilePath);
return;
}
m_log.Info("Saving configuration file: " + cmdparams[1]);
m_config.Save(cmdparams[1]);
break;
}
}

20
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
View File

@@ -1244,18 +1244,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
if (m_debugEnabled) m_log.DebugFormat("[GROUPS]: Updating scene title for {0} with title: {1}", AgentID, Title);
ScenePresence presence = null;
lock (m_sceneList)
{
foreach (Scene scene in m_sceneList)
{
presence = scene.GetScenePresence(AgentID);
if (presence != null)
{
presence.Grouptitle = Title;
// FixMe: Ter suggests a "Schedule" method that I can't find.
presence.SendFullUpdateToAllClients();
}
foreach (Scene scene in m_sceneList)
{
presence = scene.GetScenePresence(AgentID);
if (presence != null)
{
presence.Grouptitle = Title;
// FixMe: Ter suggests a "Schedule" method that I can't find.
presence.SendFullUpdateToAllClients();
}
}
}

14
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -4660,7 +4660,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
index = src.Length + index;
}
if (index >= src.Length)
if (index >= src.Length || index < 0)
{
return 0;
}
@@ -4685,7 +4685,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
index = src.Length + index;
}
if (index >= src.Length)
if (index >= src.Length || index < 0)
{
return 0.0;
}
@@ -4712,7 +4712,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
index = src.Length + index;
}
if (index >= src.Length)
if (index >= src.Length || index < 0)
{
return String.Empty;
}
@@ -4726,7 +4726,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
index = src.Length + index;
}
if (index >= src.Length)
if (index >= src.Length || index < 0)
{
return "";
}
@@ -4740,7 +4740,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
index = src.Length + index;
}
if (index >= src.Length)
if (index >= src.Length || index < 0)
{
return new LSL_Vector(0, 0, 0);
}
@@ -4761,7 +4761,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
index = src.Length + index;
}
if (index >= src.Length)
if (index >= src.Length || index < 0)
{
return new LSL_Rotation(0, 0, 0, 1);
}
@@ -5844,7 +5844,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
for (int i = 0; i < rules.Length; i += 2)
{
switch ((int)rules.Data[i])
switch (Convert.ToInt32(rules.Data[i]))
{
case (int)ScriptBaseClass.PSYS_PART_FLAGS:
prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)(uint)rules.GetLSLIntegerItem(i + 1);