diff options
author | Jeff Ames | 2008-05-14 05:11:23 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-14 05:11:23 +0000 |
commit | c995d60d37032db3198b8496e186aa7a892dc7a8 (patch) | |
tree | 826147e66f61c812897d9b0acdb16ebfeb30d4d3 /OpenSim/Region/ClientStack | |
parent | * Added 3 warnings in response to the warnings. Adam, read the warnings. (diff) | |
download | opensim-SC_OLD-c995d60d37032db3198b8496e186aa7a892dc7a8.zip opensim-SC_OLD-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.gz opensim-SC_OLD-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.bz2 opensim-SC_OLD-c995d60d37032db3198b8496e186aa7a892dc7a8.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index b8f055e..af20687 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -1204,11 +1204,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1204 | 1204 | ||
1205 | public void SendPayPrice(LLUUID objectID, int[] payPrice) | 1205 | public void SendPayPrice(LLUUID objectID, int[] payPrice) |
1206 | { | 1206 | { |
1207 | if(payPrice[0] == 0 && | 1207 | if (payPrice[0] == 0 && |
1208 | payPrice[1] == 0 && | 1208 | payPrice[1] == 0 && |
1209 | payPrice[2] == 0 && | 1209 | payPrice[2] == 0 && |
1210 | payPrice[3] == 0 && | 1210 | payPrice[3] == 0 && |
1211 | payPrice[4] == 0) | 1211 | payPrice[4] == 0) |
1212 | return; | 1212 | return; |
1213 | 1213 | ||
1214 | PayPriceReplyPacket payPriceReply = (PayPriceReplyPacket)PacketPool.Instance.GetPacket(PacketType.PayPriceReply); | 1214 | PayPriceReplyPacket payPriceReply = (PayPriceReplyPacket)PacketPool.Instance.GetPacket(PacketType.PayPriceReply); |
@@ -3094,7 +3094,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3094 | return true; | 3094 | return true; |
3095 | } | 3095 | } |
3096 | 3096 | ||
3097 | |||
3098 | public void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question) | 3097 | public void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question) |
3099 | { | 3098 | { |
3100 | ScriptQuestionPacket scriptQuestion = (ScriptQuestionPacket)PacketPool.Instance.GetPacket(PacketType.ScriptQuestion); | 3099 | ScriptQuestionPacket scriptQuestion = (ScriptQuestionPacket)PacketPool.Instance.GetPacket(PacketType.ScriptQuestion); |
@@ -3108,13 +3107,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3108 | 3107 | ||
3109 | OutPacket(scriptQuestion, ThrottleOutPacketType.Task); | 3108 | OutPacket(scriptQuestion, ThrottleOutPacketType.Task); |
3110 | } | 3109 | } |
3110 | |||
3111 | private void InitDefaultAnimations() | 3111 | private void InitDefaultAnimations() |
3112 | { | 3112 | { |
3113 | } | 3113 | } |
3114 | 3114 | ||
3115 | public LLUUID GetDefaultAnimation(string name) | 3115 | public LLUUID GetDefaultAnimation(string name) |
3116 | { | 3116 | { |
3117 | if(m_defaultAnimations.ContainsKey(name)) | 3117 | if (m_defaultAnimations.ContainsKey(name)) |
3118 | return m_defaultAnimations[name]; | 3118 | return m_defaultAnimations[name]; |
3119 | return LLUUID.Zero; | 3119 | return LLUUID.Zero; |
3120 | } | 3120 | } |
@@ -3318,8 +3318,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3318 | handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; | 3318 | handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; |
3319 | if (handlerUpdatePrimGroupScale != null) | 3319 | if (handlerUpdatePrimGroupScale != null) |
3320 | { | 3320 | { |
3321 | 3321 | // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); | |
3322 | // Console.WriteLine("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z ); | ||
3323 | handlerUpdatePrimGroupScale(localId, scale5, this); | 3322 | handlerUpdatePrimGroupScale(localId, scale5, this); |
3324 | handlerUpdateVector = OnUpdatePrimGroupPosition; | 3323 | handlerUpdateVector = OnUpdatePrimGroupPosition; |
3325 | 3324 | ||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 95510e1..5f83b50 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -369,7 +369,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
369 | protected virtual void AddNewClient(Packet packet) | 369 | protected virtual void AddNewClient(Packet packet) |
370 | { | 370 | { |
371 | //Slave regions don't accept new clients | 371 | //Slave regions don't accept new clients |
372 | if(m_localScene.Region_Status != RegionStatus.SlaveScene) | 372 | if (m_localScene.Region_Status != RegionStatus.SlaveScene) |
373 | { | 373 | { |
374 | UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; | 374 | UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; |
375 | lock (clientCircuits) | 375 | lock (clientCircuits) |