aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewermessage.cpp')
-rw-r--r--[-rwxr-xr-x]linden/indra/newview/llviewermessage.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 3fdfbef..92e3fa9 100755..100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -65,7 +65,7 @@
65#include "lltimer.h" 65#include "lltimer.h"
66#include "llmd5.h" 66#include "llmd5.h"
67 67
68#include "lightshare.h" 68#include "llettherebelight.h"
69#include "llagent.h" 69#include "llagent.h"
70#include "llcallingcard.h" 70#include "llcallingcard.h"
71#include "llconsole.h" 71#include "llconsole.h"
@@ -653,7 +653,6 @@ void send_sound_trigger(const LLUUID& sound_id, F32 gain)
653bool join_group_response(const LLSD& notification, const LLSD& response) 653bool join_group_response(const LLSD& notification, const LLSD& response)
654{ 654{
655 S32 option = LLNotification::getSelectedOption(notification, response); 655 S32 option = LLNotification::getSelectedOption(notification, response);
656 BOOL delete_context_data = TRUE;
657 bool accept_invite = false; 656 bool accept_invite = false;
658 657
659 LLUUID group_id = notification["payload"]["group_id"].asUUID(); 658 LLUUID group_id = notification["payload"]["group_id"].asUUID();
@@ -682,7 +681,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
682 } 681 }
683 else 682 else
684 { 683 {
685 delete_context_data = FALSE;
686 LLSD args; 684 LLSD args;
687 args["NAME"] = name; 685 args["NAME"] = name;
688 args["INVITE"] = message; 686 args["INVITE"] = message;
@@ -696,7 +694,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
696 // sure the user is sure they want to join. 694 // sure the user is sure they want to join.
697 if (fee > 0) 695 if (fee > 0)
698 { 696 {
699 delete_context_data = FALSE;
700 LLSD args; 697 LLSD args;
701 args["COST"] = llformat("%d", fee); 698 args["COST"] = llformat("%d", fee);
702 args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol(); 699 args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();