diff options
author | Sean Dague | 2008-04-24 12:27:24 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-24 12:27:24 +0000 |
commit | 2a2ef42e64e202c81762adf0cc0e4cb1393f71ef (patch) | |
tree | 20768ffd9610712a51a4cc7f9f0ffbe667fbe2e2 /OpenSim/Region/ClientStack | |
parent | * Adds much better support for attachments that you right click on in world. (diff) | |
download | opensim-SC_OLD-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.zip opensim-SC_OLD-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.tar.gz opensim-SC_OLD-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.tar.bz2 opensim-SC_OLD-2a2ef42e64e202c81762adf0cc0e4cb1393f71ef.tar.xz |
replace hard tabs with 4 spaces to be consistant in the source.
Please adjust your editors to not use hard tabs.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientView.cs | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 0a6431d..5b9bfdb 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs | |||
@@ -91,7 +91,7 @@ namespace OpenSim.Region.ClientStack | |||
91 | private readonly uint m_circuitCode; | 91 | private readonly uint m_circuitCode; |
92 | private int m_moneyBalance; | 92 | private int m_moneyBalance; |
93 | 93 | ||
94 | private int m_animationSequenceNumber = 1; | 94 | private int m_animationSequenceNumber = 1; |
95 | 95 | ||
96 | private byte[] m_channelVersion = Helpers.StringToField("OpenSimulator 0.5"); // Dummy value needed by libSL | 96 | private byte[] m_channelVersion = Helpers.StringToField("OpenSimulator 0.5"); // Dummy value needed by libSL |
97 | 97 | ||
@@ -233,8 +233,8 @@ namespace OpenSim.Region.ClientStack | |||
233 | private RequestAsset handlerRequestAsset = null; // OnRequestAsset; | 233 | private RequestAsset handlerRequestAsset = null; // OnRequestAsset; |
234 | private UUIDNameRequest handlerTeleportHomeRequest = null; | 234 | private UUIDNameRequest handlerTeleportHomeRequest = null; |
235 | 235 | ||
236 | private ScriptAnswer handlerScriptAnswer = null; | 236 | private ScriptAnswer handlerScriptAnswer = null; |
237 | private RequestPayPrice handlerRequestPayPrice = null; | 237 | private RequestPayPrice handlerRequestPayPrice = null; |
238 | private ObjectDeselect handlerObjectDetach = null; | 238 | private ObjectDeselect handlerObjectDetach = null; |
239 | 239 | ||
240 | /* Properties */ | 240 | /* Properties */ |
@@ -307,10 +307,10 @@ namespace OpenSim.Region.ClientStack | |||
307 | get { return m_moneyBalance; } | 307 | get { return m_moneyBalance; } |
308 | } | 308 | } |
309 | 309 | ||
310 | public int NextAnimationSequenceNumber | 310 | public int NextAnimationSequenceNumber |
311 | { | 311 | { |
312 | get { return m_animationSequenceNumber++; } | 312 | get { return m_animationSequenceNumber++; } |
313 | } | 313 | } |
314 | 314 | ||
315 | /* METHODS */ | 315 | /* METHODS */ |
316 | 316 | ||
@@ -793,8 +793,8 @@ namespace OpenSim.Region.ClientStack | |||
793 | 793 | ||
794 | public event UUIDNameRequest OnTeleportHomeRequest; | 794 | public event UUIDNameRequest OnTeleportHomeRequest; |
795 | 795 | ||
796 | public event ScriptAnswer OnScriptAnswer; | 796 | public event ScriptAnswer OnScriptAnswer; |
797 | public event RequestPayPrice OnRequestPayPrice; | 797 | public event RequestPayPrice OnRequestPayPrice; |
798 | 798 | ||
799 | #region Scene/Avatar to Client | 799 | #region Scene/Avatar to Client |
800 | 800 | ||
@@ -1171,28 +1171,28 @@ namespace OpenSim.Region.ClientStack | |||
1171 | OutPacket(money, ThrottleOutPacketType.Task); | 1171 | OutPacket(money, ThrottleOutPacketType.Task); |
1172 | } | 1172 | } |
1173 | 1173 | ||
1174 | public void SendPayPrice(LLUUID objectID, int[] payPrice) | 1174 | public void SendPayPrice(LLUUID objectID, int[] payPrice) |
1175 | { | 1175 | { |
1176 | if(payPrice[0] == 0 && | 1176 | if(payPrice[0] == 0 && |
1177 | payPrice[1] == 0 && | 1177 | payPrice[1] == 0 && |
1178 | payPrice[2] == 0 && | 1178 | payPrice[2] == 0 && |
1179 | payPrice[3] == 0 && | 1179 | payPrice[3] == 0 && |
1180 | payPrice[4] == 0) | 1180 | payPrice[4] == 0) |
1181 | return; | 1181 | return; |
1182 | 1182 | ||
1183 | PayPriceReplyPacket payPriceReply = (PayPriceReplyPacket)PacketPool.Instance.GetPacket(PacketType.PayPriceReply); | 1183 | PayPriceReplyPacket payPriceReply = (PayPriceReplyPacket)PacketPool.Instance.GetPacket(PacketType.PayPriceReply); |
1184 | payPriceReply.ObjectData.ObjectID = objectID; | 1184 | payPriceReply.ObjectData.ObjectID = objectID; |
1185 | payPriceReply.ObjectData.DefaultPayPrice = payPrice[0]; | 1185 | payPriceReply.ObjectData.DefaultPayPrice = payPrice[0]; |
1186 | 1186 | ||
1187 | payPriceReply.ButtonData=new PayPriceReplyPacket.ButtonDataBlock[4]; | 1187 | payPriceReply.ButtonData=new PayPriceReplyPacket.ButtonDataBlock[4]; |
1188 | payPriceReply.ButtonData[0]=new PayPriceReplyPacket.ButtonDataBlock(); | 1188 | payPriceReply.ButtonData[0]=new PayPriceReplyPacket.ButtonDataBlock(); |
1189 | payPriceReply.ButtonData[0].PayButton = payPrice[1]; | 1189 | payPriceReply.ButtonData[0].PayButton = payPrice[1]; |
1190 | payPriceReply.ButtonData[1]=new PayPriceReplyPacket.ButtonDataBlock(); | 1190 | payPriceReply.ButtonData[1]=new PayPriceReplyPacket.ButtonDataBlock(); |
1191 | payPriceReply.ButtonData[1].PayButton = payPrice[2]; | 1191 | payPriceReply.ButtonData[1].PayButton = payPrice[2]; |
1192 | payPriceReply.ButtonData[2]=new PayPriceReplyPacket.ButtonDataBlock(); | 1192 | payPriceReply.ButtonData[2]=new PayPriceReplyPacket.ButtonDataBlock(); |
1193 | payPriceReply.ButtonData[2].PayButton = payPrice[3]; | 1193 | payPriceReply.ButtonData[2].PayButton = payPrice[3]; |
1194 | payPriceReply.ButtonData[3]=new PayPriceReplyPacket.ButtonDataBlock(); | 1194 | payPriceReply.ButtonData[3]=new PayPriceReplyPacket.ButtonDataBlock(); |
1195 | payPriceReply.ButtonData[3].PayButton = payPrice[4]; | 1195 | payPriceReply.ButtonData[3].PayButton = payPrice[4]; |
1196 | 1196 | ||
1197 | OutPacket(payPriceReply, ThrottleOutPacketType.Task); | 1197 | OutPacket(payPriceReply, ThrottleOutPacketType.Task); |
1198 | } | 1198 | } |
@@ -2530,8 +2530,8 @@ namespace OpenSim.Region.ClientStack | |||
2530 | return true; | 2530 | return true; |
2531 | } | 2531 | } |
2532 | 2532 | ||
2533 | public void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question) | 2533 | public void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question) |
2534 | { | 2534 | { |
2535 | ScriptQuestionPacket scriptQuestion = (ScriptQuestionPacket)PacketPool.Instance.GetPacket(PacketType.ScriptQuestion); | 2535 | ScriptQuestionPacket scriptQuestion = (ScriptQuestionPacket)PacketPool.Instance.GetPacket(PacketType.ScriptQuestion); |
2536 | scriptQuestion.Data = new ScriptQuestionPacket.DataBlock(); | 2536 | scriptQuestion.Data = new ScriptQuestionPacket.DataBlock(); |
2537 | // TODO: don't create new blocks if recycling an old packet | 2537 | // TODO: don't create new blocks if recycling an old packet |
@@ -2542,7 +2542,7 @@ namespace OpenSim.Region.ClientStack | |||
2542 | scriptQuestion.Data.ObjectOwner = Helpers.StringToField(ownerName); | 2542 | scriptQuestion.Data.ObjectOwner = Helpers.StringToField(ownerName); |
2543 | 2543 | ||
2544 | OutPacket(scriptQuestion, ThrottleOutPacketType.Task); | 2544 | OutPacket(scriptQuestion, ThrottleOutPacketType.Task); |
2545 | } | 2545 | } |
2546 | 2546 | ||
2547 | protected virtual bool Logout(IClientAPI client, Packet packet) | 2547 | protected virtual bool Logout(IClientAPI client, Packet packet) |
2548 | { | 2548 | { |
@@ -3915,14 +3915,14 @@ namespace OpenSim.Region.ClientStack | |||
3915 | } | 3915 | } |
3916 | break; | 3916 | break; |
3917 | 3917 | ||
3918 | case PacketType.ScriptAnswerYes: | 3918 | case PacketType.ScriptAnswerYes: |
3919 | ScriptAnswerYesPacket scriptAnswer = (ScriptAnswerYesPacket)Pack; | 3919 | ScriptAnswerYesPacket scriptAnswer = (ScriptAnswerYesPacket)Pack; |
3920 | 3920 | ||
3921 | handlerScriptAnswer = OnScriptAnswer; | 3921 | handlerScriptAnswer = OnScriptAnswer; |
3922 | if (handlerScriptAnswer != null) | 3922 | if (handlerScriptAnswer != null) |
3923 | { | 3923 | { |
3924 | handlerScriptAnswer(this, scriptAnswer.Data.TaskID, scriptAnswer.Data.ItemID, scriptAnswer.Data.Questions); | 3924 | handlerScriptAnswer(this, scriptAnswer.Data.TaskID, scriptAnswer.Data.ItemID, scriptAnswer.Data.Questions); |
3925 | } | 3925 | } |
3926 | break; | 3926 | break; |
3927 | 3927 | ||
3928 | #endregion | 3928 | #endregion |
@@ -4613,14 +4613,14 @@ namespace OpenSim.Region.ClientStack | |||
4613 | // TODO: handle this packet | 4613 | // TODO: handle this packet |
4614 | //m_log.Warn("[CLIENT]: unhandled EconomyDataRequest packet"); | 4614 | //m_log.Warn("[CLIENT]: unhandled EconomyDataRequest packet"); |
4615 | break; | 4615 | break; |
4616 | case PacketType.RequestPayPrice: | 4616 | case PacketType.RequestPayPrice: |
4617 | RequestPayPricePacket requestPayPricePacket = (RequestPayPricePacket)Pack; | 4617 | RequestPayPricePacket requestPayPricePacket = (RequestPayPricePacket)Pack; |
4618 | handlerRequestPayPrice = OnRequestPayPrice; | 4618 | handlerRequestPayPrice = OnRequestPayPrice; |
4619 | if (handlerRequestPayPrice != null) | 4619 | if (handlerRequestPayPrice != null) |
4620 | { | 4620 | { |
4621 | handlerRequestPayPrice(this, requestPayPricePacket.ObjectData.ObjectID); | 4621 | handlerRequestPayPrice(this, requestPayPricePacket.ObjectData.ObjectID); |
4622 | } | 4622 | } |
4623 | break; | 4623 | break; |
4624 | 4624 | ||
4625 | #endregion | 4625 | #endregion |
4626 | 4626 | ||