aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-17 16:14:23 +0000
committerJustin Clarke Casey2008-11-17 16:14:23 +0000
commit558704be8bf96a58fe18dac19cfb37a81dbba57b (patch)
tree56de364930ae75ad591645f80eed20331393bbf6
parent* Eliminate SOG.FakeDeleteGroup() since it is now identical with DeleteGroup(... (diff)
downloadopensim-SC_OLD-558704be8bf96a58fe18dac19cfb37a81dbba57b.zip
opensim-SC_OLD-558704be8bf96a58fe18dac19cfb37a81dbba57b.tar.gz
opensim-SC_OLD-558704be8bf96a58fe18dac19cfb37a81dbba57b.tar.bz2
opensim-SC_OLD-558704be8bf96a58fe18dac19cfb37a81dbba57b.tar.xz
* Remove the TransferRequest and hip debugging console output that crept in recently
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
3 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index f549461..224e9a3 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -286,7 +286,7 @@ namespace OpenSim.Framework
286 + 0.07f * (float)m_visualparams[78] / 255.0f // Shoe platform height 286 + 0.07f * (float)m_visualparams[78] / 255.0f // Shoe platform height
287 + 0.3836f * (float)m_visualparams[125] / 255.0f // Leg length 287 + 0.3836f * (float)m_visualparams[125] / 255.0f // Leg length
288 - m_avatarHeight / 2) * 0.3f - 0.04f; 288 - m_avatarHeight / 2) * 0.3f - 0.04f;
289 System.Console.WriteLine("Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset); 289 //System.Console.WriteLine("Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset);
290 } 290 }
291 291
292 public virtual void SetWearable(int wearableId, AvatarWearable wearable) 292 public virtual void SetWearable(int wearableId, AvatarWearable wearable)
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 42565c5..13d1bbb 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -4946,7 +4946,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4946 //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request"); 4946 //Console.WriteLine("ClientView.ProcessPackets.cs:ProcessInPacket() - Got transfer request");
4947 4947
4948 TransferRequestPacket transfer = (TransferRequestPacket)Pack; 4948 TransferRequestPacket transfer = (TransferRequestPacket)Pack;
4949 Console.WriteLine("Transfer Request: " + transfer.ToString()); 4949 //Console.WriteLine("Transfer Request: " + transfer.ToString());
4950 // Validate inventory transfers 4950 // Validate inventory transfers
4951 // Has to be done here, because AssetCache can't do it 4951 // Has to be done here, because AssetCache can't do it
4952 // 4952 //
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 40629c6..968581b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1438,7 +1438,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1438 part.Shape.FlexiForceY = (float)Force.y; 1438 part.Shape.FlexiForceY = (float)Force.y;
1439 part.Shape.FlexiForceZ = (float)Force.z; 1439 part.Shape.FlexiForceZ = (float)Force.z;
1440 part.Shape.PathCurve = 0x80; 1440 part.Shape.PathCurve = 0x80;
1441
1442 } 1441 }
1443 1442
1444 part.ParentGroup.HasGroupChanged = true; 1443 part.ParentGroup.HasGroupChanged = true;
@@ -1447,9 +1446,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1447 1446
1448 /// <summary> 1447 /// <summary>
1449 /// Set a light point on a part 1448 /// Set a light point on a part
1450 ///
1451 /// FIXME: Much of this code should probably be in SceneObjectGroup
1452 /// </summary> 1449 /// </summary>
1450 /// FIXME: Much of this code should probably be in SceneObjectGroup
1451 ///
1453 /// <param name="part"></param> 1452 /// <param name="part"></param>
1454 /// <param name="light"></param> 1453 /// <param name="light"></param>
1455 /// <param name="color"></param> 1454 /// <param name="color"></param>