aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2008-07-24 15:20:47 +0000
committerJeff Ames2008-07-24 15:20:47 +0000
commita4ad6a67b7647e4c321a242851f9d17968227fb2 (patch)
treee2527d04bf157a2e65f8d42448754c0cebbf3832 /OpenSim
parentoops...forgot to svn add OSHttpHttpHandler.cs last week. (diff)
downloadopensim-SC_OLD-a4ad6a67b7647e4c321a242851f9d17968227fb2.zip
opensim-SC_OLD-a4ad6a67b7647e4c321a242851f9d17968227fb2.tar.gz
opensim-SC_OLD-a4ad6a67b7647e4c321a242851f9d17968227fb2.tar.bz2
opensim-SC_OLD-a4ad6a67b7647e4c321a242851f9d17968227fb2.tar.xz
Update svn properties. Minor formatting cleanup.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
-rw-r--r--OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs14
4 files changed, 17 insertions, 17 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index 31abadb..3cfc478 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -234,7 +234,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
234 { 234 {
235 DropResend(id); 235 DropResend(id);
236 236
237 AddAcks(ref packet); 237 AddAcks(ref packet);
238 QueuePacket(packet, throttlePacketType, id); 238 QueuePacket(packet, throttlePacketType, id);
239 239
240 // We want to see that packet arrive if it's reliable 240 // We want to see that packet arrive if it's reliable
@@ -246,8 +246,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
246 } 246 }
247 } 247 }
248 248
249 private void AddAcks(ref Packet packet) 249 private void AddAcks(ref Packet packet)
250 { 250 {
251 // Add acks to outgoing packets 251 // Add acks to outgoing packets
252 // 252 //
253 if (m_PendingAcks.Count > 0) 253 if (m_PendingAcks.Count > 0)
@@ -268,8 +268,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
268 break; 268 break;
269 } 269 }
270 } 270 }
271 } 271 }
272 272
273 private void QueuePacket( 273 private void QueuePacket(
274 Packet packet, ThrottleOutPacketType throttlePacketType, 274 Packet packet, ThrottleOutPacketType throttlePacketType,
275 Object id) 275 Object id)
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 1a60f45..d7fd2c5 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -5320,8 +5320,8 @@ namespace OpenSim.Region.ScriptEngine.Common
5320 { 5320 {
5321 m_host.AddScriptLPS(1); 5321 m_host.AddScriptLPS(1);
5322 5322
5323 if(m_host.ParentGroup == null) 5323 if (m_host.ParentGroup == null)
5324 return; 5324 return;
5325 5325
5326 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); 5326 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber);
5327 5327
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ed320f8..201308d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5118,9 +5118,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5118 public void llSetLinkPrimitiveParams(int linknumber, LSL_Types.list rules) 5118 public void llSetLinkPrimitiveParams(int linknumber, LSL_Types.list rules)
5119 { 5119 {
5120 m_host.AddScriptLPS(1); 5120 m_host.AddScriptLPS(1);
5121 5121
5122 if(m_host.ParentGroup == null) 5122 if (m_host.ParentGroup == null)
5123 return; 5123 return;
5124 5124
5125 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber); 5125 SceneObjectPart part = m_host.ParentGroup.GetLinkNumPart(linknumber);
5126 5126
diff --git a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
index 0b07b30..9547b0b 100644
--- a/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
+++ b/OpenSim/Tests/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGeneratorTest.cs
@@ -684,8 +684,8 @@ default
684 { 684 {
685 integer x = 1; 685 integer x = 1;
686 686
687 if(x) llSay(0, ""Hello""); 687 if (x) llSay(0, ""Hello"");
688 if(1) 688 if (1)
689 { 689 {
690 llSay(0, ""Hi""); 690 llSay(0, ""Hi"");
691 integer r = 3; 691 integer r = 3;
@@ -790,8 +790,8 @@ default
790 integer x = 1; 790 integer x = 1;
791 integer y = 0; 791 integer y = 0;
792 792
793 if(x && y) llSay(0, ""Hello""); 793 if (x && y) llSay(0, ""Hello"");
794 if(x || y) 794 if (x || y)
795 { 795 {
796 llSay(0, ""Hi""); 796 llSay(0, ""Hi"");
797 integer r = 3; 797 integer r = 3;
@@ -983,14 +983,14 @@ default
983 integer x = 1; 983 integer x = 1;
984 integer y = 0; 984 integer y = 0;
985 985
986 for(x = 10; x >= 0; x--) 986 for (x = 10; x >= 0; x--)
987 { 987 {
988 llOwnerSay(""Launch in T minus "" + x); 988 llOwnerSay(""Launch in T minus "" + x);
989 IncreaseRocketPower(); 989 IncreaseRocketPower();
990 } 990 }
991 991
992 for(x = 0, y = 6; y > 0 && x != y; x++, y--) llOwnerSay(""Hi "" + x + "", "" + y); 992 for (x = 0, y = 6; y > 0 && x != y; x++, y--) llOwnerSay(""Hi "" + x + "", "" + y);
993 for(x = 0, y = 6; ! y; x++,y--) llOwnerSay(""Hi "" + x + "", "" + y); 993 for (x = 0, y = 6; ! y; x++,y--) llOwnerSay(""Hi "" + x + "", "" + y);
994 } 994 }
995} 995}
996"; 996";