Second Life viewer sources 1.23.0-RC

1 files changed, 332 insertions, 334 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 023c758..26a8c02 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1,3 +1,4 @@
+
 /** 
  * @file llviewermenu.cpp
  * @brief Builds menus out of items.
@@ -17,7 +18,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -100,13 +102,16 @@
 #include "llfloatereditui.h"
 #include "llfloaterchatterbox.h"
 #include "llfloaterfriends.h"
+#include "llfloaterfonttest.h"
 #include "llfloatergesture.h"
 #include "llfloatergodtools.h"
 #include "llfloatergroupinfo.h"
 #include "llfloatergroupinvite.h"
 #include "llfloatergroups.h"
 #include "llfloaterhtml.h"
-#include "llfloaterhtmlhelp.h"
+#include "llfloaterhtmlcurrency.h"
+#include "llfloaterhtmlhelp.h"                  // gViewerHtmlHelp
+#include "llfloaterhtmlsimple.h"
 #include "llfloaterhud.h"
 #include "llfloaterinspect.h"
 #include "llfloaterlagmeter.h"
@@ -116,6 +121,7 @@
 #include "llfloatermute.h"
 #include "llfloateropenobject.h"
 #include "llfloaterpermissionsmgr.h"
+#include "llfloaterperms.h"
 #include "llfloaterpostprocess.h"
 #include "llfloaterpreference.h"
 #include "llfloaterregioninfo.h"
@@ -182,6 +188,7 @@
 #include "llviewercamera.h"
 #include "llviewergenericmessage.h"
 #include "llviewergesture.h"
+#include "llviewerimagelist.h"  // gImageList
 #include "llviewerinventory.h"
 #include "llviewermenufile.h"   // init_menu_file()
 #include "llviewermessage.h"
@@ -208,6 +215,7 @@
 
 #include "lltexlayer.h"
 
+using namespace LLVOAvatarDefines;
 void init_client_menu(LLMenuGL* menu);
 void init_server_menu(LLMenuGL* menu);
 
@@ -281,9 +289,6 @@ typedef LLMemberListener<LLView> view_listener_t;
 void handle_leave_group(void *);
 
 // File Menu
-const char* upload_pick(void* data);
-void handle_upload(void* data);
-//void handle_upload_object(void* data);
 void handle_compress_image(void*);
 BOOL enable_save_as(void *);
 
@@ -307,7 +312,7 @@ BOOL is_selection_buy_not_take();
 S32 selection_price();
 BOOL enable_take();
 void handle_take();
-void confirm_take(S32 option, void* data);
+bool confirm_take(const LLSD& notification, const LLSD& response);
 BOOL enable_buy(void*); 
 void handle_buy(void *);
 void handle_buy_object(LLSaleInfo sale_info);
@@ -329,7 +334,6 @@ void handle_agent_stop_moving(void*);
 void print_packets_lost(void*);
 void drop_packet(void*);
 void velocity_interpolate( void* data );
-void update_fov(S32 increments);
 void toggle_wind_audio(void);
 void toggle_water_audio(void);
 void handle_rebake_textures(void*);
@@ -358,7 +362,8 @@ void run_vectorize_perf_test(void *)
 
 // Debug UI
 void handle_web_search_demo(void*);
-void handle_slurl_test(void*);
+void handle_web_browser_test(void*);
+void handle_buy_currency_test(void*);
 void handle_save_to_xml(void*);
 void handle_load_from_xml(void*);
 
@@ -416,7 +421,6 @@ void handle_force_delete(void*);
 void print_object_info(void*);
 void print_agent_nvpairs(void*);
 void toggle_debug_menus(void*);
-void toggle_map( void* user_data );
 void export_info_callback(LLAssetInfo *info, void **user_data, S32 result);
 void export_data_callback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, void **user_data, S32 result);
 void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExtStat ext_status);
@@ -466,7 +470,6 @@ BOOL enable_grab_texture(void*);
 void handle_dump_region_object_cache(void*);
 
 BOOL menu_ui_enabled(void *user_data);
-void check_toggle_control( LLUICtrl *, void* user_data );
 BOOL menu_check_control( void* user_data);
 void menu_toggle_variable( void* user_data );
 BOOL menu_check_variable( void* user_data);
@@ -651,7 +654,7 @@ void init_menus()
     gViewerWindow->setMenuBackgroundColor(false, 
         LLViewerLogin::getInstance()->isInProductionGrid());
 
-        // *TODO:Get the cost info from the server
+        // Assume L$10 for now, the server will tell us the real cost at login
         const std::string upload_cost("10");
         gMenuHolder->childSetLabelArg("Upload Image", "[COST]", upload_cost);
         gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost);
@@ -950,13 +953,6 @@ void init_client_menu(LLMenuGL* menu)
                                                                                 &menu_check_control,
                                                                                 (void*)"SaveMinidump"));
 
-        // TomY Temporary menu item so we can test this floater
-        menu->append(new LLMenuItemCheckGL("Clothing...", 
-                                                                                                &handle_clothing,
-                                                                                                NULL,
-                                                                                                NULL,
-                                                                                                NULL));
-
         menu->append(new LLMenuItemCallGL("Debug Settings...", LLFloaterSettingsDebug::show, NULL, NULL));
         menu->append(new LLMenuItemCheckGL("View Admin Options", &handle_admin_override_toggle, NULL, &check_admin_override, NULL, 'V', MASK_CONTROL | MASK_ALT));
 
@@ -999,6 +995,7 @@ void init_debug_world_menu(LLMenuGL* menu)
 
 void handle_export_menus_to_xml(void*)
 {
+
         LLFilePicker& picker = LLFilePicker::instance();
         if(!picker.getSaveFile(LLFilePicker::FFSAVE_XML))
         {
@@ -1020,7 +1017,13 @@ extern BOOL gDebugSelectMgr;
 
 void init_debug_ui_menu(LLMenuGL* menu)
 {
-        menu->append(new LLMenuItemCallGL("SLURL Test", &handle_slurl_test));
+        menu->append(new LLMenuItemCheckGL("Rotate Mini-Map", menu_toggle_control, NULL, menu_check_control, (void*)"MiniMapRotate"));
+        menu->append(new LLMenuItemCheckGL("Use default system color picker", menu_toggle_control, NULL, menu_check_control, (void*)"UseDefaultColorPicker"));
+        menu->append(new LLMenuItemCheckGL("Show search panel in overlay bar", menu_toggle_control, NULL, menu_check_control, (void*)"ShowSearchBar"));
+        menu->appendSeparator();
+
+        menu->append(new LLMenuItemCallGL("Web Browser Test", &handle_web_browser_test));
+        menu->append(new LLMenuItemCallGL("Buy Currency Test", &handle_buy_currency_test));
         menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui));
         menu->append(new LLMenuItemCallGL( "Dump SelectMgr", &dump_select_mgr));
         menu->append(new LLMenuItemCallGL( "Dump Inventory", &dump_inventory));
@@ -1044,6 +1047,7 @@ void init_debug_ui_menu(LLMenuGL* menu)
         menu->appendSeparator();
         menu->append(new LLMenuItemCheckGL("Show Time", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowTime"));
         menu->append(new LLMenuItemCheckGL("Show Render Info", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderInfo"));
+        menu->append(new LLMenuItemCheckGL("Show Matrices", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderMatrices"));
         menu->append(new LLMenuItemCheckGL("Show Color Under Cursor", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowColor"));
         
         menu->createJumpKeys();
@@ -1052,6 +1056,7 @@ void init_debug_ui_menu(LLMenuGL* menu)
 void init_debug_xui_menu(LLMenuGL* menu)
 {
         menu->append(new LLMenuItemCallGL("Floater Test...", LLFloaterTest::show));
+        menu->append(new LLMenuItemCallGL("Font Test...", LLFloaterFontTest::show));
         menu->append(new LLMenuItemCallGL("Export Menus to XML...", handle_export_menus_to_xml));
         menu->append(new LLMenuItemCallGL("Edit UI...", LLFloaterEditUI::show));        
         menu->append(new LLMenuItemCallGL("Load from XML...", handle_load_from_xml));
@@ -1181,6 +1186,9 @@ void init_debug_rendering_menu(LLMenuGL* menu)
         sub_menu->append(new LLMenuItemCheckGL("Octree",        &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_OCTREE));
+        sub_menu->append(new LLMenuItemCheckGL("Shadow Frusta", &LLPipeline::toggleRenderDebug, NULL,
+                                                                                                        &LLPipeline::toggleRenderDebugControl,
+                                                                                                        (void*)LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA));
         sub_menu->append(new LLMenuItemCheckGL("Occlusion",     &LLPipeline::toggleRenderDebug, NULL,
                                                                                                         &LLPipeline::toggleRenderDebugControl,
                                                                                                         (void*)LLPipeline::RENDER_DEBUG_OCCLUSION));
@@ -1306,8 +1314,6 @@ void init_debug_rendering_menu(LLMenuGL* menu)
         menu->createJumpKeys();
 }
 
-extern BOOL gDebugAvatarRotation;
-
 void init_debug_avatar_menu(LLMenuGL* menu)
 {
         LLMenuGL* sub_menu = new LLMenuGL("Grab Baked Texture");
@@ -1352,9 +1358,15 @@ void init_debug_avatar_menu(LLMenuGL* menu)
         //menu->append(new LLMenuItemToggleGL("Show Attachment Points", &LLVOAvatar::sShowAttachmentPoints));
         //diabling collision plane due to DEV-14477 -brad
         //menu->append(new LLMenuItemToggleGL("Show Collision Plane", &LLVOAvatar::sShowFootPlane));
-        menu->append(new LLMenuItemToggleGL("Show Collision Skeleton", &LLVOAvatar::sShowCollisionVolumes));
-        menu->append(new LLMenuItemToggleGL( "Display Agent Target", &LLAgent::sDebugDisplayTarget));
-        menu->append(new LLMenuItemToggleGL( "Debug Rotation", &gDebugAvatarRotation));
+        menu->append(new LLMenuItemCheckGL("Show Collision Skeleton",
+                                                                           &LLPipeline::toggleRenderDebug, NULL,
+                                                                           &LLPipeline::toggleRenderDebugControl,
+                                                                           (void*)LLPipeline::RENDER_DEBUG_AVATAR_VOLUME));
+        menu->append(new LLMenuItemCheckGL("Display Agent Target",
+                                                                           &LLPipeline::toggleRenderDebug, NULL,
+                                                                           &LLPipeline::toggleRenderDebugControl,
+                                                                           (void*)LLPipeline::RENDER_DEBUG_AGENT_TARGET));
+        menu->append(new LLMenuItemToggleGL( "Debug Rotation", &LLVOAvatar::sDebugAvatarRotation));
         menu->append(new LLMenuItemCallGL("Dump Attachments", handle_dump_attachments));
         menu->append(new LLMenuItemCallGL("Rebake Textures", handle_rebake_textures, NULL, NULL, 'R', MASK_ALT | MASK_CONTROL ));
 #ifndef LL_RELEASE_FOR_DOWNLOAD
@@ -1366,11 +1378,12 @@ void init_debug_avatar_menu(LLMenuGL* menu)
 
 void init_debug_baked_texture_menu(LLMenuGL* menu)
 {
-        menu->append(new LLMenuItemCallGL("Iris", handle_grab_texture, enable_grab_texture, (void*) LLVOAvatar::TEX_EYES_BAKED));
-        menu->append(new LLMenuItemCallGL("Head", handle_grab_texture, enable_grab_texture, (void*) LLVOAvatar::TEX_HEAD_BAKED));
-        menu->append(new LLMenuItemCallGL("Upper Body", handle_grab_texture, enable_grab_texture, (void*) LLVOAvatar::TEX_UPPER_BAKED));
-        menu->append(new LLMenuItemCallGL("Lower Body", handle_grab_texture, enable_grab_texture, (void*) LLVOAvatar::TEX_LOWER_BAKED));
-        menu->append(new LLMenuItemCallGL("Skirt", handle_grab_texture, enable_grab_texture, (void*) LLVOAvatar::TEX_SKIRT_BAKED));
+        menu->append(new LLMenuItemCallGL("Iris", handle_grab_texture, enable_grab_texture, (void*) TEX_EYES_BAKED));
+        menu->append(new LLMenuItemCallGL("Head", handle_grab_texture, enable_grab_texture, (void*) TEX_HEAD_BAKED));
+        menu->append(new LLMenuItemCallGL("Upper Body", handle_grab_texture, enable_grab_texture, (void*) TEX_UPPER_BAKED));
+        menu->append(new LLMenuItemCallGL("Lower Body", handle_grab_texture, enable_grab_texture, (void*) TEX_LOWER_BAKED));
+        menu->append(new LLMenuItemCallGL("Skirt", handle_grab_texture, enable_grab_texture, (void*) TEX_SKIRT_BAKED));
+        menu->append(new LLMenuItemCallGL("Hair", handle_grab_texture, enable_grab_texture, (void*) TEX_HAIR_BAKED));
         menu->createJumpKeys();
 }
 
@@ -2121,9 +2134,10 @@ class LLGoToObject : public view_listener_t
 //---------------------------------------------------------------------------
 // Parcel freeze, eject, etc.
 //---------------------------------------------------------------------------
-void callback_freeze(S32 option, void* data)
+bool callback_freeze(const LLSD& notification, const LLSD& response)
 {
-        LLUUID* avatar_id = (LLUUID*) data;
+        LLUUID avatar_id = notification["payload"]["avatar_id"].asUUID();
+        S32 option = LLNotification::getSelectedOption(notification, response);
 
         if (0 == option || 1 == option)
         {
@@ -2135,7 +2149,7 @@ void callback_freeze(S32 option, void* data)
                 }
 
                 LLMessageSystem* msg = gMessageSystem;
-                LLViewerObject* avatar = gObjectList.findObject(*avatar_id);
+                LLViewerObject* avatar = gObjectList.findObject(avatar_id);
 
                 if (avatar)
                 {
@@ -2144,16 +2158,15 @@ void callback_freeze(S32 option, void* data)
                         msg->addUUID("AgentID", gAgent.getID());
                         msg->addUUID("SessionID", gAgent.getSessionID());
                         msg->nextBlock("Data");
-                        msg->addUUID("TargetID", *avatar_id );
+                        msg->addUUID("TargetID", avatar_id );
                         msg->addU32("Flags", flags );
                         msg->sendReliable( avatar->getRegion()->getHost() );
                 }
         }
-
-        delete avatar_id;
-        avatar_id = NULL;
+        return false;
 }
 
+
 class LLAvatarFreeze : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -2161,23 +2174,25 @@ class LLAvatarFreeze : public view_listener_t
                 LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 if( avatar )
                 {
-                        LLUUID* avatar_id = new LLUUID( avatar->getID() );
                         std::string fullname = avatar->getFullname();
+                        LLSD payload;
+                        payload["avatar_id"] = avatar->getID();
 
                         if (!fullname.empty())
                         {
-                                LLStringUtil::format_map_t args;
-                                args["[AVATAR_NAME]"] = fullname;
-                                gViewerWindow->alertXml("FreezeAvatarFullname",
+                                LLSD args;
+                                args["AVATAR_NAME"] = fullname;
+                                LLNotifications::instance().add("FreezeAvatarFullname",
                                                         args,
-                                                        callback_freeze,
-                                                        (void*)avatar_id);
+                                                        payload,
+                                                        callback_freeze);
                         }
                         else
                         {
-                                gViewerWindow->alertXml("FreezeAvatar",
-                                                        callback_freeze,
-                                                        (void*)avatar_id);
+                                LLNotifications::instance().add("FreezeAvatar",
+                                                        LLSD(),
+                                                        payload,
+                                                        callback_freeze);
                         }
                 }
                 return true;
@@ -2223,26 +2238,16 @@ class LLAvatarDebug : public view_listener_t
         }
 };
 
-struct MenuCallbackData
-{
-        bool ban_enabled;
-        LLUUID avatar_id;
-};
-
-void callback_eject(S32 option, void* data)
+bool callback_eject(const LLSD& notification, const LLSD& response)
 {
-        MenuCallbackData *callback_data = (MenuCallbackData*)data;
-        if (!callback_data)
-        {
-                return;
-        }
+        S32 option = LLNotification::getSelectedOption(notification, response);
         if (2 == option)
         {
-                // Cancle button.
-                return;
+                // Cancel button.
+                return false;
         }
-        LLUUID avatar_id = callback_data->avatar_id;
-        bool ban_enabled = callback_data->ban_enabled;
+        LLUUID avatar_id = notification["payload"]["avatar_id"].asUUID();
+        bool ban_enabled = notification["payload"]["ban_enabled"].asBoolean();
 
         if (0 == option)
         {
@@ -2284,10 +2289,7 @@ void callback_eject(S32 option, void* data)
                         msg->sendReliable( avatar->getRegion()->getHost() );
                 }
         }
-
-
-        delete callback_data;
-        callback_data = NULL;
+        return false;
 }
 
 class LLAvatarEject : public view_listener_t
@@ -2297,8 +2299,8 @@ class LLAvatarEject : public view_listener_t
                 LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
                 if( avatar )
                 {
-                        MenuCallbackData *data = new MenuCallbackData;
-                        (*data).avatar_id = avatar->getID();
+                        LLSD payload;
+                        payload["avatar_id"] = avatar->getID();
                         std::string fullname = avatar->getFullname();
 
                         const LLVector3d& pos = avatar->getPositionGlobal();
@@ -2306,40 +2308,42 @@ class LLAvatarEject : public view_listener_t
                         
                         if (LLViewerParcelMgr::getInstance()->isParcelOwnedByAgent(parcel,GP_LAND_MANAGE_BANNED))
                         {
-                                (*data).ban_enabled = true;
+                payload["ban_enabled"] = true;
                                 if (!fullname.empty())
                                 {
-                                        LLStringUtil::format_map_t args;
-                                        args["[AVATAR_NAME]"] = fullname;
-                                        gViewerWindow->alertXml("EjectAvatarFullname",
-                                                args,
-                                                callback_eject,
-                                                (void*)data);
+                                LLSD args;
+                                args["AVATAR_NAME"] = fullname;
+                                LLNotifications::instance().add("EjectAvatarFullname",
+                                                        args,
+                                                        payload,
+                                                        callback_eject);
                                 }
                                 else
                                 {
-                                        gViewerWindow->alertXml("EjectAvatar",
-                                                callback_eject,
-                                                (void*)data);
+                                LLNotifications::instance().add("EjectAvatarFullname",
+                                                        LLSD(),
+                                                        payload,
+                                                        callback_eject);
                                 }
                         }
                         else
                         {
-                                (*data).ban_enabled = false;
+                payload["ban_enabled"] = false;
                                 if (!fullname.empty())
                                 {
-                                        LLStringUtil::format_map_t args;
-                                        args["[AVATAR_NAME]"] = fullname;
-                                        gViewerWindow->alertXml("EjectAvatarFullnameNoBan",
-                                                args,
-                                                callback_eject,
-                                                (void*)data);
+                                LLSD args;
+                                args["AVATAR_NAME"] = fullname;
+                                LLNotifications::instance().add("EjectAvatarFullnameNoBan",
+                                                        args,
+                                                        payload,
+                                                        callback_eject);
                                 }
                                 else
                                 {
-                                        gViewerWindow->alertXml("EjectAvatarNoBan",
-                                                callback_eject,
-                                                (void*)data);
+                                LLNotifications::instance().add("EjectAvatarNoBan",
+                                                        LLSD(),
+                                                        payload,
+                                                        callback_eject);
                                 }
                         }
                 }
@@ -2386,13 +2390,16 @@ class LLAvatarGiveCard : public view_listener_t
                 if(dest && dest->isAvatar())
                 {
                         bool found_name = false;
-                        LLStringUtil::format_map_t args;
+                        LLSD args;
+                        LLSD old_args;
                         LLNameValue* nvfirst = dest->getNVPair("FirstName");
                         LLNameValue* nvlast = dest->getNVPair("LastName");
                         if(nvfirst && nvlast)
                         {
-                                args["[FIRST]"] = nvfirst->getString();
-                                args["[LAST]"] = nvlast->getString();
+                                args["FIRST"] = nvfirst->getString();
+                                args["LAST"] = nvlast->getString();
+                                old_args["FIRST"] = nvfirst->getString();
+                                old_args["LAST"] = nvlast->getString();
                                 found_name = true;
                         }
                         LLViewerRegion* region = dest->getRegion();
@@ -2414,11 +2421,11 @@ class LLAvatarGiveCard : public view_listener_t
                                 transaction_id.generate();
                                 msg->addUUIDFast(_PREHASH_TransactionID, transaction_id);
                                 msg->sendReliable(dest_host);
-                                LLNotifyBox::showXml("OfferedCard", args);
+                                LLNotifications::instance().add("OfferedCard", args);
                         }
                         else
                         {
-                                gViewerWindow->alertXml("CantOfferCallingCard", args);
+                                LLNotifications::instance().add("CantOfferCallingCard", old_args);
                         }
                 }
                 return true;
@@ -2435,8 +2442,9 @@ void login_done(S32 which, void *user)
 }
 
 
-void callback_leave_group(S32 option, void *userdata)
+bool callback_leave_group(const LLSD& notification, const LLSD& response)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
         if (option == 0)
         {
                 LLMessageSystem *msg = gMessageSystem;
@@ -2449,15 +2457,16 @@ void callback_leave_group(S32 option, void *userdata)
                 msg->addUUIDFast(_PREHASH_GroupID, gAgent.mGroupID );
                 gAgent.sendReliableMessage();
         }
+        return false;
 }
 
 void handle_leave_group(void *)
 {
         if (gAgent.getGroupID() != LLUUID::null)
         {
-                LLStringUtil::format_map_t args;
-                args["[GROUP]"] = gAgent.mGroupName;
-                gViewerWindow->alertXml("GroupLeaveConfirmMember", args, callback_leave_group);
+                LLSD args;
+                args["GROUP"] = gAgent.mGroupName;
+                LLNotifications::instance().add("GroupLeaveConfirmMember", args, LLSD(), callback_leave_group);
         }
 }
 
@@ -2520,7 +2529,7 @@ void handle_buy_object(LLSaleInfo sale_info)
 {
         if(!LLSelectMgr::getInstance()->selectGetAllRootsValid())
         {
-                LLNotifyBox::showXml("UnableToBuyWhileDownloading");
+                LLNotifications::instance().add("UnableToBuyWhileDownloading");
                 return;
         }
 
@@ -2529,7 +2538,7 @@ void handle_buy_object(LLSaleInfo sale_info)
         BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
         if (!owners_identical)
         {
-                LLNotifyBox::showXml("CannotBuyObjectsFromDifferentOwners");
+                LLNotifications::instance().add("CannotBuyObjectsFromDifferentOwners");
                 return;
         }
 
@@ -2539,7 +2548,7 @@ void handle_buy_object(LLSaleInfo sale_info)
         valid &= LLSelectMgr::getInstance()->selectGetAggregatePermissions(ag_perm);
         if(!valid || !sale_info.isForSale() || !perm.allowTransferTo(gAgent.getID()))
         {
-                LLNotifyBox::showXml("ObjectNotForSale");
+                LLNotifications::instance().add("ObjectNotForSale");
                 return;
         }
 
@@ -2685,22 +2694,22 @@ void set_god_level(U8 god_level)
         // inventory in items may change in god mode
         gObjectList.dirtyAllObjectInventory();
 
-    if(gViewerWindow)
-    {
-        gViewerWindow->setMenuBackgroundColor(god_level > GOD_NOT,
+        if(gViewerWindow)
+        {
+            gViewerWindow->setMenuBackgroundColor(god_level > GOD_NOT,
             LLViewerLogin::getInstance()->isInProductionGrid());
-    }
-
-    LLStringUtil::format_map_t args;
+        }
+    
+        LLSD args;
         if(god_level > GOD_NOT)
         {
-                args["[LEVEL]"] = llformat("%d",(S32)god_level);
-                LLNotifyBox::showXml("EnteringGodMode", args);
+                args["LEVEL"] = llformat("%d",(S32)god_level);
+                LLNotifications::instance().add("EnteringGodMode", args);
         }
         else
         {
-                args["[LEVEL]"] = llformat("%d",(S32)old_god_level);
-                LLNotifyBox::showXml("LeavingGodMode", args);
+                args["LEVEL"] = llformat("%d",(S32)old_god_level);
+                LLNotifications::instance().add("LeavingGodMode", args);
         }
 
 
@@ -2825,13 +2834,13 @@ void request_friendship(const LLUUID& dest_id)
         if(dest && dest->isAvatar())
         {
                 std::string fullname;
-                LLStringUtil::format_map_t args;
+                LLSD args;
                 LLNameValue* nvfirst = dest->getNVPair("FirstName");
                 LLNameValue* nvlast = dest->getNVPair("LastName");
                 if(nvfirst && nvlast)
                 {
-                        args["[FIRST]"] = nvfirst->getString();
-                        args["[LAST]"] = nvlast->getString();
+                        args["FIRST"] = nvfirst->getString();
+                        args["LAST"] = nvlast->getString();
                         fullname = nvfirst->getString();
                         fullname += " ";
                         fullname += nvlast->getString();
@@ -2842,7 +2851,7 @@ void request_friendship(const LLUUID& dest_id)
                 }
                 else
                 {
-                        gViewerWindow->alertXml("CantOfferFriendship");
+                        LLNotifications::instance().add("CantOfferFriendship");
                 }
         }
 }
@@ -2852,12 +2861,8 @@ class LLEditEnableCustomizeAvatar : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatar = gAgent.getAvatarObject();
-
-                bool enabled = ((avatar && avatar->isFullyLoaded()) &&
-                                   (gAgent.getWearablesLoaded()));
-
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(enabled);
+                bool new_value = gAgent.areWearablesLoaded();
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
                 return true;
         }
 };
@@ -3044,86 +3049,6 @@ void velocity_interpolate( void* data )
 }
 
 
-void update_fov(S32 increments)
-{
-        F32 old_fov = LLViewerCamera::getInstance()->getDefaultFOV();
-        // for each increment, FoV is 20% bigger
-        F32 new_fov = old_fov * pow(1.2f, increments);
-
-        // cap the FoV
-        new_fov = llclamp(new_fov, MIN_FIELD_OF_VIEW, MAX_FIELD_OF_VIEW);
-
-        if (new_fov != old_fov)
-        {
-                LLMessageSystem* msg = gMessageSystem;
-                msg->newMessageFast(_PREHASH_AgentFOV);
-                msg->nextBlockFast(_PREHASH_AgentData);
-                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                msg->addU32Fast(_PREHASH_CircuitCode, gMessageSystem->mOurCircuitCode);
-
-                msg->nextBlockFast(_PREHASH_FOVBlock);
-                msg->addU32Fast(_PREHASH_GenCounter, 0);
-                msg->addF32Fast(_PREHASH_VerticalAngle, new_fov);
-
-                gAgent.sendReliableMessage();
-
-                // force agent to update dirty patches
-                LLViewerCamera::getInstance()->setDefaultFOV(new_fov);
-                LLViewerCamera::getInstance()->setView(new_fov);
-        }
-}
-
-class LLViewZoomOut : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                update_fov(1);
-                return true;
-        }
-};
-
-class LLViewZoomIn : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                update_fov(-1);
-                return true;
-        }
-};
-
-class LLViewZoomDefault : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                F32 old_fov = LLViewerCamera::getInstance()->getView();
-                // for each increment, FoV is 20% bigger
-                F32 new_fov = DEFAULT_FIELD_OF_VIEW;
-
-                if (new_fov != old_fov)
-                {
-                        LLMessageSystem* msg = gMessageSystem;
-                        msg->newMessageFast(_PREHASH_AgentFOV);
-                        msg->nextBlockFast(_PREHASH_AgentData);
-                        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                        msg->addU32Fast(_PREHASH_CircuitCode, gMessageSystem->mOurCircuitCode);
-                        msg->nextBlockFast(_PREHASH_FOVBlock);
-                        msg->addU32Fast(_PREHASH_GenCounter, 0);
-                        msg->addF32Fast(_PREHASH_VerticalAngle, new_fov);
-
-                        gAgent.sendReliableMessage();
-
-                        // force agent to update dirty patches
-                        LLViewerCamera::getInstance()->setDefaultFOV(new_fov);
-                        LLViewerCamera::getInstance()->setView(new_fov);
-                }
-                return true;
-        }
-};
-
-
-
 void toggle_wind_audio(void)
 {
         if (gAudiop)
@@ -3163,7 +3088,7 @@ void handle_reset_view()
         if( (CAMERA_MODE_CUSTOMIZE_AVATAR == gAgent.getCameraMode()) && gFloaterCustomize )
         {
                 // Show dialog box if needed.
-                gFloaterCustomize->askToSaveAllIfDirty( reset_view_final, NULL );
+                gFloaterCustomize->askToSaveIfDirty( reset_view_final, NULL );
         }
         else
         {
@@ -3263,7 +3188,7 @@ void disabled_duplicate(void*)
 {
         if (LLSelectMgr::getInstance()->getSelection()->getPrimaryObject())
         {
-                LLNotifyBox::showXml("CopyFailed");
+                LLNotifications::instance().add("CopyFailed");
         }
 }
 
@@ -3396,7 +3321,7 @@ void handle_claim_public_land(void*)
 {
         if (LLViewerParcelMgr::getInstance()->getSelectionRegion() != gAgent.getRegion())
         {
-                LLNotifyBox::showXml("ClaimPublicLand");
+                LLNotifications::instance().add("ClaimPublicLand");
                 return;
         }
 
@@ -3629,7 +3554,7 @@ void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
         }
         else if(!error.empty())
         {
-                gViewerWindow->alertXml(error);
+                LLNotifications::instance().add(error);
         }
 }
 
@@ -3656,16 +3581,13 @@ class LLObjectReturn : public view_listener_t
                 
                 mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
 
-                gViewerWindow->alertXml("ReturnToOwner",
-                        onReturnToOwner,
-                        (void*)this);
+                LLNotifications::instance().add("ReturnToOwner", LLSD(), LLSD(), boost::bind(&LLObjectReturn::onReturnToOwner, this, _1, _2));
                 return true;
         }
 
-        static void onReturnToOwner(S32 option, void* data)
+        bool onReturnToOwner(const LLSD& notification, const LLSD& response)
         {
-                LLObjectReturn* object_return = (LLObjectReturn*)data;
-
+                S32 option = LLNotification::getSelectedOption(notification, response);
                 if (0 == option)
                 {
                         // Ignore category ID for this derez destination.
@@ -3673,7 +3595,8 @@ class LLObjectReturn : public view_listener_t
                 }
 
                 // drop reference to current selection
-                object_return->mObjectSelection = NULL;
+                mObjectSelection = NULL;
+                return false;
         }
 
 protected:
@@ -3810,48 +3733,46 @@ void handle_take()
         {
                 category_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_OBJECT);
         }
-        LLUUID* cat_id = new LLUUID(category_id);
+        LLSD payload;
+        payload["folder_id"] = category_id;
+
+        LLNotification::Params params("ConfirmObjectTakeLock");
+        params.payload(payload)
+                .functor(confirm_take);
+
         if(locked_but_takeable_object ||
            !you_own_everything)
         {
                 if(locked_but_takeable_object && you_own_everything)
                 {
-                        gViewerWindow->alertXml("ConfirmObjectTakeLock",
-                        confirm_take,
-                        (void*)cat_id);
+                        params.name("ConfirmObjectTakeLock");
 
                 }
                 else if(!locked_but_takeable_object && !you_own_everything)
                 {
-                        gViewerWindow->alertXml("ConfirmObjectTakeNoOwn",
-                        confirm_take,
-                        (void*)cat_id);
+                        params.name("ConfirmObjectTakeNoOwn");
                 }
                 else
                 {
-                        gViewerWindow->alertXml("ConfirmObjectTakeLockNoOwn",
-                        confirm_take,
-                        (void*)cat_id);
+                        params.name("ConfirmObjectTakeLockNoOwn");
                 }
-
-
+        
+                LLNotifications::instance().add(params);
         }
-
         else
         {
-                confirm_take(0, (void*)cat_id);
+                LLNotifications::instance().forceResponse(params, 0);
         }
 }
 
-void confirm_take(S32 option, void* data)
+bool confirm_take(const LLSD& notification, const LLSD& response)
 {
-        LLUUID* cat_id = (LLUUID*)data;
-        if(!cat_id) return;
+        S32 option = LLNotification::getSelectedOption(notification, response);
         if(enable_take() && (option == 0))
         {
-                derez_objects(DRD_TAKE_INTO_AGENT_INVENTORY, *cat_id);
+                derez_objects(DRD_TAKE_INTO_AGENT_INVENTORY, notification["payload"]["folder_id"].asUUID());
         }
-        delete cat_id;
+        return false;
 }
 
 // You can take an item when it is public and transferrable, or when
@@ -4013,13 +3934,15 @@ S32 selection_price()
         return total_price;
 }
 
-void callback_show_buy_currency(S32 option, void*)
+bool callback_show_buy_currency(const LLSD& notification, const LLSD& response)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
         if (0 == option)
         {
                 llinfos << "Loading page " << BUY_CURRENCY_URL << llendl;
                 LLWeb::loadURL(BUY_CURRENCY_URL);
         }
+        return false;
 }
 
 
@@ -4034,14 +3957,13 @@ void show_buy_currency(const char* extra)
         }
         mesg << "Go to " << BUY_CURRENCY_URL << "\nfor information on purchasing currency?";
 
-        LLStringUtil::format_map_t args;
+        LLSD args;
         if (extra != NULL)
         {
-                args["[EXTRA]"] = extra;
+                args["EXTRA"] = extra;
         }
-        args["[URL]"] = BUY_CURRENCY_URL;
-        gViewerWindow->alertXml("PromptGoToCurrencyPage", args, 
-                callback_show_buy_currency);
+        args["URL"] = BUY_CURRENCY_URL;
+        LLNotifications::instance().add("PromptGoToCurrencyPage", args, LLSD(), callback_show_buy_currency);
 }
 
 void handle_buy_currency(void*)
@@ -4105,18 +4027,6 @@ BOOL sitting_on_selection()
         return (avatar->mIsSitting && avatar->getRoot() == root_object);
 }
 
-class LLToolsSaveToInventory : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                if(enable_save_into_inventory(NULL))
-                {
-                        derez_objects(DRD_SAVE_INTO_AGENT_INVENTORY, LLUUID::null);
-                }
-                return true;
-        }
-};
-
 class LLToolsSaveToObjectInventory : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -4221,29 +4131,29 @@ class LLToolsLink : public view_listener_t
         {
                 if(!LLSelectMgr::getInstance()->selectGetAllRootsValid())
                 {
-                        LLNotifyBox::showXml("UnableToLinkWhileDownloading");
+                        LLNotifications::instance().add("UnableToLinkWhileDownloading");
                         return true;
                 }
 
                 S32 object_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
                 if (object_count > MAX_CHILDREN_PER_TASK + 1)
                 {
-                        LLStringUtil::format_map_t args;
-                        args["[COUNT]"] = llformat("%d", object_count);
+                        LLSD args;
+                        args["COUNT"] = llformat("%d", object_count);
                         int max = MAX_CHILDREN_PER_TASK+1;
-                        args["[MAX]"] = llformat("%d", max);
-                        gViewerWindow->alertXml("UnableToLinkObjects", args);
+                        args["MAX"] = llformat("%d", max);
+                        LLNotifications::instance().add("UnableToLinkObjects", args);
                         return true;
                 }
 
                 if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() < 2)
                 {
-                        gViewerWindow->alertXml("CannotLinkIncompleteSet");
+                        LLNotifications::instance().add("CannotLinkIncompleteSet");
                         return true;
                 }
                 if(!LLSelectMgr::getInstance()->selectGetRootsModify())
                 {
-                        gViewerWindow->alertXml("CannotLinkModify");
+                        LLNotifications::instance().add("CannotLinkModify");
                         return true;
                 }
                 LLUUID owner_id;
@@ -4253,7 +4163,7 @@ class LLToolsLink : public view_listener_t
                         // we don't actually care if you're the owner, but novices are
                         // the most likely to be stumped by this one, so offer the
                         // easiest and most likely solution.
-                        gViewerWindow->alertXml("CannotLinkDifferentOwners");
+                        LLNotifications::instance().add("CannotLinkDifferentOwners");
                         return true;
                 }
                 LLSelectMgr::getInstance()->sendLink();
@@ -4287,12 +4197,7 @@ class LLToolsStopAllAnimations : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatarp = gAgent.getAvatarObject();         
-                if (avatarp)
-                {
-                        avatarp->deactivateAllMotions();        
-                        avatarp->startDefaultMotions();
-                }
+                gAgent.stopCurrentAnimations();
                 return true;
         }
 };
@@ -4497,6 +4402,16 @@ void handle_force_delete(void*)
         LLSelectMgr::getInstance()->selectForceDelete();
 }
 
+class LLViewEnableJoystickFlycam : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = (gSavedSettings.getBOOL("JoystickEnabled") && gSavedSettings.getBOOL("JoystickFlycamEnabled"));
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+
 class LLViewEnableLastChatter : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -4659,22 +4574,6 @@ void toggle_debug_menus(void*)
 }
 
 
-void toggle_map( void* user_data )
-{
-        // Toggle the item
-        BOOL checked = gSavedSettings.getBOOL( static_cast<char*>(user_data) );
-        gSavedSettings.setBOOL( static_cast<char*>(user_data), !checked );
-        if (checked)
-        {
-                gFloaterMap->close();
-        }
-        else
-        {
-                gFloaterMap->open();            /* Flawfinder: ignore */        
-        }
-}
-
-
 // LLUUID gExporterRequestID;
 // std::string gExportDirectory;
 
@@ -4812,7 +4711,7 @@ class LLWorldSetBusy : public view_listener_t
                 else
                 {
                         gAgent.setBusy();
-                        gViewerWindow->alertXml("BusyModeSet");
+                        LLNotifications::instance().add("BusyModeSet");
                 }
                 return true;
         }
@@ -4838,7 +4737,7 @@ class LLWorldCreateLandmark : public view_listener_t
                 if (!agent_parcel->getAllowLandmark()
                         && !LLViewerParcelMgr::isParcelOwnedByAgent(agent_parcel, GP_LAND_ALLOW_LANDMARK))
                 {
-                        gViewerWindow->alertXml("CannotCreateLandmarkNotOwner");
+                        LLNotifications::instance().add("CannotCreateLandmarkNotOwner");
                         return true;
                 }
 
@@ -4945,16 +4844,14 @@ class LLAvatarAddFriend : public view_listener_t
         }
 };
 
-void complete_give_money(S32 option, void* user_data)
+bool complete_give_money(const LLSD& notification, const LLSD& response, LLObjectSelectionHandle handle)
 {
+        S32 option = LLNotification::getSelectedOption(notification, response);
         if (option == 0)
         {
                 gAgent.clearBusy();
         }
 
-        LLObjectSelectionHandle handle(*(LLObjectSelectionHandle*)user_data);
-        delete (LLObjectSelectionHandle*)user_data;
-
         LLViewerObject* objectp = handle->getPrimaryObject();
 
         // Show avatar's name if paying attachment
@@ -4980,19 +4877,22 @@ void complete_give_money(S32 option, void* user_data)
                         LLFloaterPay::payViaObject(&give_money, objectp->getID());
                 }
         }
+        return false;
 }
 
 bool handle_give_money_dialog()
 {
-        LLObjectSelectionHandle* handlep = new LLObjectSelectionHandle(LLSelectMgr::getInstance()->getSelection());
+        LLNotification::Params params("BusyModePay");
+        params.functor(boost::bind(complete_give_money, _1, _2, LLSelectMgr::getInstance()->getSelection()));
+
         if (gAgent.getBusy())
         {
                 // warn users of being in busy mode during a transaction
-                gViewerWindow->alertXml("BusyModePay", complete_give_money, handlep);
+                LLNotifications::instance().add(params);
         }
         else
         {
-                complete_give_money(1, handlep);
+                LLNotifications::instance().forceResponse(params, 1);
         }
         return true;
 }
@@ -5143,7 +5043,7 @@ class LLShowFloater : public view_listener_t
                 }
                 else if (floater_name == "appearance")
                 {
-                        if (gAgent.getWearablesLoaded())
+                        if (gAgent.areWearablesLoaded())
                         {
                                 gAgent.changeCameraToCustomizeAvatar();
                         }
@@ -5190,11 +5090,11 @@ class LLShowFloater : public view_listener_t
                 }
                 else if (floater_name == "mini map")
                 {
-                        LLFloaterMap::toggle(NULL);
+                        LLFloaterMap::toggleInstance();
                 }
                 else if (floater_name == "stat bar")
                 {
-                        gDebugView->mFloaterStatsp->setVisible(!gDebugView->mFloaterStatsp->getVisible());
+                        LLFloaterStats::toggleInstance();
                 }
                 else if (floater_name == "my land")
                 {
@@ -5277,6 +5177,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterBeacons::toggleInstance(LLSD());
                 }
+                else if (floater_name == "perm prefs")
+                {
+                        LLFloaterPerms::toggleInstance(LLSD());
+                }
                 return true;
         }
 };
@@ -5322,7 +5226,7 @@ class LLFloaterVisible : public view_listener_t
                 }
                 else if (floater_name == "stat bar")
                 {
-                        new_value = gDebugView->mFloaterStatsp->getVisible();
+                        new_value = LLFloaterStats::instanceVisible();
                 }
                 else if (floater_name == "active speakers")
                 {
@@ -5342,14 +5246,14 @@ class LLFloaterVisible : public view_listener_t
         }
 };
 
-void callback_show_url(S32 option, void* data)
+bool callback_show_url(const LLSD& notification, const LLSD& response)
 {
-        std::string* urlp = (std::string*)data;
+        S32 option = LLNotification::getSelectedOption(notification, response);
         if (0 == option)
         {
-                LLWeb::loadURL(*urlp);
+                LLWeb::loadURL(notification["payload"]["url"].asString());
         }
-        delete urlp;
+        return false;
 }
 
 class LLPromptShowURL : public view_listener_t
@@ -5362,8 +5266,17 @@ class LLPromptShowURL : public view_listener_t
                 {
                         std::string alert = param.substr(0, offset);
                         std::string url = param.substr(offset+1);
-                        std::string* url_copy = new std::string(url);
-                        gViewerWindow->alertXml(alert, callback_show_url, url_copy);
+
+                        if(gSavedSettings.getBOOL("UseExternalBrowser"))
+                        { 
+                        LLSD payload;
+                        payload["url"] = url;
+                        LLNotifications::instance().add(alert, LLSD(), payload, callback_show_url);
+                        }
+                        else
+                        {
+                        LLWeb::loadURL(url);
+                        }
                 }
                 else
                 {
@@ -5373,6 +5286,39 @@ class LLPromptShowURL : public view_listener_t
         }
 };
 
+bool callback_show_file(const LLSD& notification, const LLSD& response)
+{
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        if (0 == option)
+        {
+                LLWeb::loadURL(notification["payload"]["url"]);
+        }
+        return false;
+}
+
+class LLPromptShowFile : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string param = userdata.asString();
+                std::string::size_type offset = param.find(",");
+                if (offset != param.npos)
+                {
+                        std::string alert = param.substr(0, offset);
+                        std::string file = param.substr(offset+1);
+
+                        LLSD payload;
+                        payload["url"] = file;
+                        LLNotifications::instance().add(alert, LLSD(), payload, callback_show_file);
+                }
+                else
+                {
+                        llinfos << "PromptShowFile invalid parameters! Expecting \"ALERT,FILE\"." << llendl;
+                }
+                return true;
+        }
+};
+
 class LLShowAgentProfile : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -5461,7 +5407,6 @@ class LLLandEdit : public view_listener_t
 
                 LLViewerParcelMgr::getInstance()->selectParcelAt( LLToolPie::getInstance()->getPick().mPosGlobal );
 
-                gFloaterTools->showMore(TRUE);
                 gFloaterView->bringToFront( gFloaterTools );
 
                 // Switch to land edit toolset
@@ -5772,8 +5717,7 @@ class LLAttachmentEnableDrop : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
-                BOOL can_build   = gAgent.isGodlike() || (parcel && parcel->getAllowModify());
+                BOOL can_build   = gAgent.isGodlike() || (LLViewerParcelMgr::getInstance()->agentCanBuild());
 
                 //Add an inventory observer to only allow dropping the newly attached item
                 //once it exists in your inventory.  Look at Jira 2422.
@@ -6004,11 +5948,11 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
         {
                 if ( !func.scripted )
                 {
-                        gViewerWindow->alertXml(noscriptmsg);
+                        LLNotifications::instance().add(noscriptmsg);
                 }
                 else if ( !func.modifiable )
                 {
-                        gViewerWindow->alertXml(nomodmsg);
+                        LLNotifications::instance().add(nomodmsg);
                 }
                 else
                 {
@@ -6229,13 +6173,6 @@ class LLToggleControl : public view_listener_t
         }
 };
 
-// As above, but can be a callback from a LLCheckboxCtrl
-void check_toggle_control( LLUICtrl *, void* user_data )
-{
-        BOOL checked = gSavedSettings.getBOOL( static_cast<char*>(user_data) );
-        gSavedSettings.setBOOL( static_cast<char*>(user_data), !checked );
-}
-
 BOOL menu_check_control( void* user_data)
 {
         return gSavedSettings.getBOOL((char*)user_data);
@@ -6462,16 +6399,6 @@ BOOL enable_save_into_inventory(void*)
         return FALSE;
 }
 
-class LLToolsEnableSaveToInventory : public view_listener_t
-{
-        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-        {
-                bool new_value = enable_save_into_inventory(NULL);
-                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-                return true;
-        }
-};
-
 BOOL enable_save_into_task_inventory(void*)
 {
         LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
@@ -6761,12 +6688,12 @@ void handle_debug_avatar_textures(void*)
 
 void handle_grab_texture(void* data)
 {
-        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex)((intptr_t)data);
+        ETextureIndex index = (ETextureIndex)((intptr_t)data);
         LLVOAvatar* avatar = gAgent.getAvatarObject();
         if ( avatar )
         {
                 const LLUUID& asset_id = avatar->grabLocalTexture(index);
-                llinfos << "Adding baked texture " << asset_id << " to inventory." << llendl;
+                LL_INFOS("texture") << "Adding baked texture " << asset_id << " to inventory." << llendl;
                 LLAssetType::EType asset_type = LLAssetType::AT_TEXTURE;
                 LLInventoryType::EType inv_type = LLInventoryType::IT_TEXTURE;
                 LLUUID folder_id(gInventory.findCategoryUUIDForType(asset_type));
@@ -6775,21 +6702,24 @@ void handle_grab_texture(void* data)
                         std::string name = "Baked ";
                         switch (index)
                         {
-                        case LLVOAvatar::TEX_EYES_BAKED:
+                        case TEX_EYES_BAKED:
                                 name.append("Iris");
                                 break;
-                        case LLVOAvatar::TEX_HEAD_BAKED:
+                        case TEX_HEAD_BAKED:
                                 name.append("Head");
                                 break;
-                        case LLVOAvatar::TEX_UPPER_BAKED:
+                        case TEX_UPPER_BAKED:
                                 name.append("Upper Body");
                                 break;
-                        case LLVOAvatar::TEX_LOWER_BAKED:
+                        case TEX_LOWER_BAKED:
                                 name.append("Lower Body");
                                 break;
-                        case LLVOAvatar::TEX_SKIRT_BAKED:
+                        case TEX_SKIRT_BAKED:
                                 name.append("Skirt");
                                 break;
+                        case TEX_HAIR_BAKED:
+                                name.append("Hair");
+                                break;
                         default:
                                 name.append("Unknown");
                                 break;
@@ -6851,7 +6781,7 @@ void handle_grab_texture(void* data)
 
 BOOL enable_grab_texture(void* data)
 {
-        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex)((intptr_t)data);
+        ETextureIndex index = (ETextureIndex)((intptr_t)data);
         LLVOAvatar* avatar = gAgent.getAvatarObject();
         if ( avatar )
         {
@@ -7002,7 +6932,7 @@ void handle_save_to_xml(void*)
         LLFloater* frontmost = gFloaterView->getFrontmost();
         if (!frontmost)
         {
-        gViewerWindow->alertXml("NoFrontmostFloater");
+        LLNotifications::instance().add("NoFrontmostFloater");
                 return;
         }
 
@@ -7035,17 +6965,54 @@ void handle_load_from_xml(void*)
         }
 }
 
-void handle_slurl_test(void*)
+void handle_web_browser_test(void*)
 {
         const bool open_links_externally = false;
         const bool open_app_slurls = true;
         LLFloaterHtml::getInstance()->show(
                 "http://secondlife.com/app/search/slurls.html",
-                "SLURL Test", 
+                "Web Browser Test", 
                 open_links_externally, 
                 open_app_slurls);
 }
 
+void handle_buy_currency_test(void*)
+{
+        std::string url =
+                "http://sarahd-sl-13041.webdev.lindenlab.com/app/lindex/index.php?agent_id=[AGENT_ID]&secure_session_id=[SESSION_ID]&lang=[LANGUAGE]";
+
+        LLStringUtil::format_map_t replace;
+        replace["[AGENT_ID]"] = gAgent.getID().asString();
+        replace["[SESSION_ID]"] = gAgent.getSecureSessionID().asString();
+
+        // *TODO: Replace with call to LLUI::getLanguage() after windows-setup
+        // branch merges in. JC
+        std::string language = "en-us";
+        language = gSavedSettings.getString("Language");
+        if (language.empty() || language == "default")
+        {
+                language = gSavedSettings.getString("InstallLanguage");
+        }
+        if (language.empty() || language == "default")
+        {
+                language = gSavedSettings.getString("SystemLanguage");
+        }
+        if (language.empty() || language == "default")
+        {
+                language = "en-us";
+        }
+
+        replace["[LANGUAGE]"] = language;
+        LLStringUtil::format(url, replace);
+
+        llinfos << "buy currency url " << url << llendl;
+
+        LLFloaterHtmlCurrency* floater = LLFloaterHtmlCurrency::showInstance(url);
+        // Needed so we can use secondlife:///app/floater/self/close SLURLs
+        floater->setTrusted(true);
+        floater->center();
+}
+
 void handle_rebake_textures(void*)
 {
         LLVOAvatar* avatar = gAgent.getAvatarObject();
@@ -7417,6 +7384,37 @@ static void addMenu(view_listener_t *menu, const std::string& name)
 
 void initialize_menus()
 {
+        // A parameterized event handler used as ctrl-8/9/0 zoom controls below.
+        class LLZoomer : public view_listener_t
+        {
+        public:
+                // The "mult" parameter says whether "val" is a multiplier or used to set the value.
+                LLZoomer(F32 val, bool mult=true) : mVal(val), mMult(mult) {}
+                bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+                {
+                        F32 new_fov_rad = mMult ? LLViewerCamera::getInstance()->getDefaultFOV() * mVal : mVal;
+                        LLViewerCamera::getInstance()->setDefaultFOV(new_fov_rad);
+                        gSavedSettings.setF32("CameraAngle", LLViewerCamera::getInstance()->getView()); // setView may have clamped it.
+                        return true;
+                }
+        private:
+                F32 mVal;
+                bool mMult;
+        };
+        
+        class LLAvatarReportAbuse : public view_listener_t
+        {
+                bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+                {
+                        LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
+                        if(avatar)
+                        {
+                                LLFloaterReporter::showFromObject(avatar->getID());
+                        }
+                        return true;
+                }
+        };
+
         // File menu
         init_menu_file();
 
@@ -7456,13 +7454,14 @@ void initialize_menus()
         addMenu(new LLViewHighlightTransparent(), "View.HighlightTransparent");
         addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType");
         addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments");
-        addMenu(new LLViewZoomOut(), "View.ZoomOut");
-        addMenu(new LLViewZoomIn(), "View.ZoomIn");
-        addMenu(new LLViewZoomDefault(), "View.ZoomDefault");
+        addMenu(new LLZoomer(1.2f), "View.ZoomOut");
+        addMenu(new LLZoomer(1/1.2f), "View.ZoomIn");
+        addMenu(new LLZoomer(DEFAULT_FIELD_OF_VIEW, false), "View.ZoomDefault");
         addMenu(new LLViewFullscreen(), "View.Fullscreen");
         addMenu(new LLViewDefaultUISize(), "View.DefaultUISize");
 
         addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
+        addMenu(new LLViewEnableJoystickFlycam(), "View.EnableJoystickFlycam");
         addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
 
         addMenu(new LLViewCheckBuildMode(), "View.CheckBuildMode");
@@ -7513,7 +7512,6 @@ void initialize_menus()
         addMenu(new LLToolsLookAtSelection(), "Tools.LookAtSelection");
         addMenu(new LLToolsBuyOrTake(), "Tools.BuyOrTake");
         addMenu(new LLToolsTakeCopy(), "Tools.TakeCopy");
-        addMenu(new LLToolsSaveToInventory(), "Tools.SaveToInventory");
         addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory");
         addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction");
 
@@ -7522,7 +7520,6 @@ void initialize_menus()
         addMenu(new LLToolsEnableUnlink(), "Tools.EnableUnlink");
         addMenu(new LLToolsEnableBuyOrTake(), "Tools.EnableBuyOrTake");
         addMenu(new LLToolsEnableTakeCopy(), "Tools.EnableTakeCopy");
-        addMenu(new LLToolsEnableSaveToInventory(), "Tools.SaveToInventory");
         addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.SaveToObjectInventory");
 
         /*addMenu(new LLToolsVisibleBuyObject(), "Tools.VisibleBuyObject");
@@ -7549,6 +7546,7 @@ void initialize_menus()
         addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard");
         addMenu(new LLAvatarEject(), "Avatar.Eject");
         addMenu(new LLAvatarSendIM(), "Avatar.SendIM");
+        addMenu(new LLAvatarReportAbuse(), "Avatar.ReportAbuse");
         
         addMenu(new LLObjectEnableMute(), "Avatar.EnableMute");
         addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend");