Merge remote-tracking branch 'origin/next' into WL-refactor

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 @@
 #include "lltimer.h"
 #include "llmd5.h"
 
-#include "lightshare.h"
+#include "llettherebelight.h"
 #include "llagent.h"
 #include "llcallingcard.h"
 #include "llconsole.h"
@@ -653,7 +653,6 @@ void send_sound_trigger(const LLUUID& sound_id, F32 gain)
 bool join_group_response(const LLSD& notification, const LLSD& response)
 {
         S32 option = LLNotification::getSelectedOption(notification, response);
-        BOOL delete_context_data = TRUE;
         bool accept_invite = false;
 
         LLUUID group_id = notification["payload"]["group_id"].asUUID();
@@ -682,7 +681,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
                 }
                 else
                 {
-                        delete_context_data = FALSE;
                         LLSD args;
                         args["NAME"] = name;
                         args["INVITE"] = message;
@@ -696,7 +694,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
                 // sure the user is sure they want to join.
                 if (fee > 0)
                 {
-                        delete_context_data = FALSE;
                         LLSD args;
                         args["COST"] = llformat("%d", fee);
                         args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();