Merge remote-tracking branch 'jacek/next' into next

Conflicts (manualy merged):
	linden/indra/newview/app_settings/default_grids.xml
	linden/indra/newview/primbackup.cpp
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/notifications.xml

InWorldz specific crap removed.

1 files changed, 2 insertions, 0 deletions

diff --git a/linden/indra/newview/llpanelgroupgeneral.h b/linden/indra/newview/llpanelgroupgeneral.h
index c4572e2..9e39125 100644
--- a/linden/indra/newview/llpanelgroupgeneral.h
+++ b/linden/indra/newview/llpanelgroupgeneral.h
@@ -76,6 +76,7 @@ private:
         static void onClickInfo(void* userdata);
         static void onReceiveNotices(LLUICtrl* ctrl, void* data);
         static void openProfile(void* data);
+        static void onClickCopyLink(void* userdata);
 
     static bool joinDlgCB(const LLSD& notification, const LLSD& response);
 
@@ -98,6 +99,7 @@ private:
         LLTextEditor            *mEditCharter;
         LLButton                        *mBtnJoinGroup;
         LLButton                        *mBtnInfo;
+        LLButton                        *mBtnCopyLink;
 
         LLNameListCtrl  *mListVisibleMembers;