diff options
author | Melanie | 2012-08-23 01:41:47 +0100 |
---|---|---|
committer | Melanie | 2012-08-23 01:41:47 +0100 |
commit | f8603a215d142f3b83a5ff1dc022b716b3e48f99 (patch) | |
tree | 49971f8e12efcfea18b4b2fdb6bd54c904d3f52c /OpenSim/Region/ScriptEngine | |
parent | Merge branch 'avination' into careminster (diff) | |
parent | this should be an if-else block in case the non-phys min/max are smaller than... (diff) | |
download | opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.zip opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.gz opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.bz2 opensim-SC-f8603a215d142f3b83a5ff1dc022b716b3e48f99.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
3 files changed, 14 insertions, 11 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 434638d..0c7f49b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -1490,11 +1490,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1490 | scale.y = Math.Max(World.m_minPhys, Math.Min(World.m_maxPhys, scale.y)); | 1490 | scale.y = Math.Max(World.m_minPhys, Math.Min(World.m_maxPhys, scale.y)); |
1491 | scale.z = Math.Max(World.m_minPhys, Math.Min(World.m_maxPhys, scale.z)); | 1491 | scale.z = Math.Max(World.m_minPhys, Math.Min(World.m_maxPhys, scale.z)); |
1492 | } | 1492 | } |
1493 | 1493 | else | |
1494 | // Next we clamp the scale to the non-physical min/max | 1494 | { |
1495 | scale.x = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.x)); | 1495 | // If not physical, then we clamp the scale to the non-physical min/max |
1496 | scale.y = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.y)); | 1496 | scale.x = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.x)); |
1497 | scale.z = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.z)); | 1497 | scale.y = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.y)); |
1498 | scale.z = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.z)); | ||
1499 | } | ||
1498 | 1500 | ||
1499 | Vector3 tmp = part.Scale; | 1501 | Vector3 tmp = part.Scale; |
1500 | tmp.X = (float)scale.x; | 1502 | tmp.X = (float)scale.x; |
@@ -1568,7 +1570,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1568 | if (face == ScriptBaseClass.ALL_SIDES) | 1570 | if (face == ScriptBaseClass.ALL_SIDES) |
1569 | face = SceneObjectPart.ALL_SIDES; | 1571 | face = SceneObjectPart.ALL_SIDES; |
1570 | 1572 | ||
1571 | m_host.SetFaceColor(color, face); | 1573 | m_host.SetFaceColorAlpha(face, color, null); |
1572 | } | 1574 | } |
1573 | 1575 | ||
1574 | public void SetTexGen(SceneObjectPart part, int face,int style) | 1576 | public void SetTexGen(SceneObjectPart part, int face,int style) |
@@ -3900,7 +3902,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3900 | try | 3902 | try |
3901 | { | 3903 | { |
3902 | foreach (SceneObjectPart part in parts) | 3904 | foreach (SceneObjectPart part in parts) |
3903 | part.SetFaceColor(color, face); | 3905 | part.SetFaceColorAlpha(face, color, null); |
3904 | } | 3906 | } |
3905 | finally | 3907 | finally |
3906 | { | 3908 | { |
@@ -8243,8 +8245,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8243 | LSL_Vector color=rules.GetVector3Item(idx++); | 8245 | LSL_Vector color=rules.GetVector3Item(idx++); |
8244 | double alpha=(double)rules.GetLSLFloatItem(idx++); | 8246 | double alpha=(double)rules.GetLSLFloatItem(idx++); |
8245 | 8247 | ||
8246 | part.SetFaceColor(color, face); | 8248 | part.SetFaceColorAlpha(face, color, alpha); |
8247 | SetAlpha(part, alpha, face); | ||
8248 | 8249 | ||
8249 | break; | 8250 | break; |
8250 | 8251 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 37766fb..04c3184 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -2925,7 +2925,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2925 | avatar.SpeedModifier = (float)SpeedModifier; | 2925 | avatar.SpeedModifier = (float)SpeedModifier; |
2926 | } | 2926 | } |
2927 | 2927 | ||
2928 | public void osKickAvatar(string FirstName,string SurName,string alert) | 2928 | public void osKickAvatar(string FirstName, string SurName, string alert) |
2929 | { | 2929 | { |
2930 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); | 2930 | CheckThreatLevel(ThreatLevel.Severe, "osKickAvatar"); |
2931 | m_host.AddScriptLPS(1); | 2931 | m_host.AddScriptLPS(1); |
@@ -2939,7 +2939,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2939 | sp.ControllingClient.Kick(alert); | 2939 | sp.ControllingClient.Kick(alert); |
2940 | 2940 | ||
2941 | // ...and close on our side | 2941 | // ...and close on our side |
2942 | sp.Scene.IncomingCloseAgent(sp.UUID); | 2942 | sp.Scene.IncomingCloseAgent(sp.UUID, false); |
2943 | } | 2943 | } |
2944 | }); | 2944 | }); |
2945 | } | 2945 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 17a0d69..03be2ab 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -546,6 +546,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
546 | "OpenSim.Region.ScriptEngine.Shared.dll")); | 546 | "OpenSim.Region.ScriptEngine.Shared.dll")); |
547 | parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, | 547 | parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, |
548 | "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); | 548 | "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll")); |
549 | parameters.ReferencedAssemblies.Add(Path.Combine(rootPath, | ||
550 | "OpenMetaverseTypes.dll")); | ||
549 | 551 | ||
550 | if (lang == enumCompileType.yp) | 552 | if (lang == enumCompileType.yp) |
551 | { | 553 | { |