33 files changed, 6029 insertions, 1027 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f0b1689
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,43 @@
+# 
+# This file contains names (and wildcards) of files that
+# Git should ignore.
+# 
+# Since we only care about the actual source code files,
+# all the artwork and libraries are ignored, as are the
+# files that are created when you compile.
+# 
+
+# ARTWORK
+
+linden/LICENSE-logos.txt
+linden/indra/newview/skins/**/textures/
+linden/indra/newview/skins/default/html/btn_purplepill_bg.png
+linden/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
+linden/indra/newview/skins/default/html/unabletoconnect.png
+linden/indra/newview/res/
+linden/indra/newview/res-sdl/
+linden/indra/newview/character/
+linden/indra/newview/app_settings/*.db2
+linden/indra/newview/app_settings/windlight/
+
+
+# LIBRARIES
+
+linden/LICENSES/
+linden/LICENSE-libraries-*.txt
+linden/indra/newview/app_settings/mozilla-runtime-*/
+linden/indra/newview/fonts/
+linden/indra/newview/linux_tools/client-readme-voice.txt
+linden/indra/newview/vivox-runtime/
+linden/libraries/
+linden/indra/lib_releasefordownload_client/
+linden/indra/llwindow/glh/
+
+
+# COMPILED STUFF
+
+linden/indra/viewer-*
+linden/installed.xml
+linden/indra/CMakeFiles
+linden/indra/temp
+linden/indra/test_apps
diff --git a/CONTRIBUTE.txt b/CONTRIBUTE.txt
new file mode 100644
index 0000000..ece4c73
--- /dev/null
+++ b/CONTRIBUTE.txt
@@ -0,0 +1,104 @@
+
+
+                         HOW YOU CAN CONTRIBUTE
+
+
+   Imprudence isn't just a project for programmers. No matter your
+   skills (or lack thereof) or how much time you can commit, there's
+   a way for you to be a part of it.
+
+
+ EVERYBODY AND THEIR GRANDMAS
+
+   Here are some good ways anybody can help out:
+
+     * Let us know what you think needs to be improved about the SL
+       Viewer.
+
+     * Participate in discussions on the forums or mailing list.
+       (Visit ImprudenceViewer.org for links to both of those.)
+
+     * Try out the Imprudence Viewer (when it's released) and give
+       feedback about it.
+
+     * Watch a friend, family member, or co-worker to try SL for the
+       first time, and take notes about the things they find difficult
+       or confusing.
+
+     * Blog about the latest Imprudence news and developments (either
+       on the ImprudenceViewer.org blog or your own).
+
+     * Help organize and coordinate other volunteers to keep things
+       running smoothly.
+
+     * Tell a friend and get them involved too!
+
+
+ ARTISTS, DESIGNERS, AND UI FREAKS
+
+   If you happen to have some graphics skill or an interest in User
+   Interface design, here are some things you could do:
+
+     * Work with users to turn their ideas into something people can
+       look at.
+
+     * Make a sketch or Flash mock-up of how some part of the UI
+       should behave, look, or be organized.
+
+     * Offer suggestions and constructive criticism about other
+       people's designs.
+
+     * Create or improve a color scheme or skin for the Viewer.
+
+     * Paint some graphics or icons for a UI-in-progress.
+
+     * Hook up with a programmer and turn your design into a real,
+       working interface!
+
+
+ CODE MONKEYS AND TEKKIE-WIKIS
+
+   Of course, there's always plenty for programmers and other
+   tech-savvy people to do:
+
+     * Compile a Viewer branch for other people to download and test.
+
+     * Try out a patch to make sure it applies cleanly, and make a Git
+       branch so others can easily merge the changes.
+
+     * Clean up or add comments/documentation for part of the source
+       code.
+
+     * Fix a bug or optimize a slow piece of code.
+
+     * Work with a designer to bring a UI concept to life!
+
+
+ OTHER REALLY COOL PEOPLE
+
+   We're also looking for people who can help with:
+
+     * Accessibility. We'd love to make it easier for people with
+       disabilities to have a functional and satisfying SL experience,
+       but we need people with the knowledge and experience to help us
+       identify the biggest hurdles and find solutions.
+
+     * Localization & Translation. Many of the non-English UI
+       translations are awkward or wrong, but only someone who knows
+       the language can make them better. If you are fluent in both
+       English and another tongue, please help us add or improve the
+       translation for your language.
+
+
+ GOT ANOTHER IDEA?
+
+   There are many more ways to get involved than we could list here;
+   and there are surely some good ones that you can think of, but that
+   we hadn't! Don't hesitate to contact us if you'd like to help
+   out, even if it's not listed here!
+
+
+ CONTACT INFO
+
+   If you’d like to contribute to Imprudence in any way, send an email
+   to jacek.antonelli at gmail or an IM to Jacek Antonelli in-world.
diff --git a/ChangeLog.txt b/ChangeLog.txt
new file mode 100644
index 0000000..84ff38c
--- /dev/null
+++ b/ChangeLog.txt
@@ -0,0 +1,151 @@
+2008-09-28  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llviewermenu.cpp: 
+        Added event callbacks for Attached Lights and Attached Particles.
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml: 
+        Updated XUI menu entries for Attached Lights and Attached Particles
+        to use the new event callbacks. Those menu entries now work.
+        
+        * Updated to SL source 1.21.2.
+
+
+2008-09-23  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llfloaterfriends.cpp:
+        'Offer Teleport' button in friends list is now enabled
+        even when the selected user(s) appear to be offline.
+        Mostly for consistency, but also to allow a work-around
+        for times when presence is flakey.
+
+
+2008-09-22  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llpanelavatar.cpp (setOnlineStatus):
+        'Offer Teleport' button in avatar profile is now always enabled,
+        regardless of whether the other person is known to be online.
+
+        * linden/indra/newview/llimpanel.cpp:
+        'Offer Teleport' button in IM panel is now always enabled,
+        regardless of whether the other person is known to be online.
+        Fixes crash introduced by VWR-2072 when IMing someone not on
+        your friends list, and makes the feature useful in more cases.
+
+        * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
+        Increased maximum settable transparency from 90% to 100%.
+
+        * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
+        Changed "Select Texture" to "Select Faces to Texture".
+
+2008-09-22  Aimee Trescothick  <aimee@ama-zing.co.uk>
+
+        * linden/indra/newview/lloverlaybar.cpp:
+        VWR-8341: Bring back a UI indicator of 'Flycam' text.
+        * linden/indra/newview/lloverlaybar.h:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml:
+        Ditto.
+
+        * linden/indra/newview/app_settings/settings.xml:
+        VWR-8430: Usability improvements to the land tools floater.
+        * linden/indra/newview/llfloatertools.cpp:
+        Ditto.
+        * linden/indra/newview/llfloatertools.h:
+        Ditto.
+        * linden/indra/newview/llpanelland.cpp:
+        Ditto.
+        * linden/indra/newview/llpanelland.h:
+        Ditto.
+        * linden/indra/newview/lltoolbrush.cpp:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/alerts.xml:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
+        Ditto.
+
+2008-09-21  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
+        Reindented and cleaned up menu XML for code readability.
+
+2008-09-20  Michelle2 Zenovka  <robin.cornelius@gmail.com>
+
+        * linden/indra/newview/llfloaterbulkpermission.h: 
+        VWR-5082: 'Set permissions on selected task inventory' feature.
+        * linden/indra/newview/llfloaterbulkpermission.cpp:
+        Ditto.
+        * linden/indra/newview/llviewermenu.cpp:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml:
+        Ditto.
+
+2008-09-20  Paul Churchill  <pnolan@dsl.pipex.com>
+
+        * linden/indra/newview/llimpanel.cpp:
+        VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button.
+        * linden/indra/newview/llimpanel.h:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml:
+        Ditto.
+
+2008-09-19  Gigs Taggart  <gigstaggart@gmail.com>
+
+        * linden/indra/newview/app_settings/settings.xml:
+        VWR-2331: Terraform tool variable "strength".
+        Contributing authors: Gigs Taggart, Aimee Trescothick, Which Linden.
+        * linden/indra/newview/llfloatertools.cpp:
+        Ditto.
+        * linden/indra/newview/llfloatertools.h:
+        Ditto.
+        * linden/indra/newview/lltoolbrush.cpp:
+        Ditto.
+        * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
+        Ditto.
+
+2008-09-19  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/skins/default/xui/en-us/panel_groups.xml: 
+        VWR-8024: simplify group invites: invite to group from groups list.
+
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
+        VWR-1363: Add "Return Object" to the Tools menu.
+
+        * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
+        VWR-7877: Change the default cut increment from 0.05 to 0.025.
+
+        * linden/indra/newview/skins/default/xui/en-us/panel_groups.xml: 
+        VWR-8024: simplify group invites: invite to group from groups list.
+
+2008-09-19  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llviewermenu.cpp: 
+        VWR-2947: Create event callbacks for Advanced menu functions.
+        Part of VWR-2896: Convert "Advanced" menu to XUI.
+
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
+        VWR-2948: Create XUI-based Advanced menu.
+        Part of VWR-2896: Convert "Advanced" menu to XUI.
+
+        * linden/indra/SConstruct:
+        New optional SConstruct flag to specify an exact path to build
+        directory: BUILD_DIR. For convenience until we switch to CMake.
+
+        * linden/indra/SConstruct:
+        VWR-2865: New SConstruct flag to (not) make tarball after compiling.
+        For convenience until we switch to CMake.
+        * linden/indra/newview/viewer_manifest.py: 
+        Ditto.
+
+2008-09-07  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/newview/llpanelobject.cpp:
+        VWR-7827: Allow Dimple/Profile Cut for boxes and box-based prims
+        in the UI.
+        * linden/indra/newview/skins/default/xui/en-us/floater_tools.xml:
+        Ditto.
+
+2008-09-07  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml:
+        VWR-8056: Clean up menu_viewer.xml (main menu XUI).
diff --git a/MANIFESTO.txt b/MANIFESTO.txt
new file mode 100644
index 0000000..2a6fdb4
--- /dev/null
+++ b/MANIFESTO.txt
@@ -0,0 +1,178 @@
+
+
+                        THE IMPRUDENCE MANIFESTO
+
+
+ THE PROBLEM
+
+   The Second Life Viewer suffers from a stifling atmosphere of
+   non-change. This atmosphere emanates from Linden Lab, whose
+   attitudes and policies discourage all but the smallest and most
+   superficial improvements. This is the result of the nature of
+   Linden Lab as a corporation; in particular:
+
+
+     * A lack of resources to invest in making significant
+       improvements to the Viewer. Linden Lab is stuck treading water;
+       they don't have the manpower to spend on making major
+       improvements to the Viewer.
+
+     * A burdensome Quality Assurance procedure that punishes any sort
+       of change. The larger the change, the more it's punished. The
+       simple fact that all changes have to pass through such an
+       arduous process discourages anyone from attempting any major
+       endeavor.
+
+     * A vast throng of paying customers who want the Viewer to remain
+       constant and familiar. If the Viewer changes, they are forced
+       to spend effort relearning it. The most vocal and abusive users
+       even meet change with sneers and insults.
+
+
+   Combined, these render Linden Lab ineffectual at dealing with the
+   fundamental usability problems that plague the Viewer:
+
+
+     * A cluttered interface that frustrates and confuses both new and
+       long-time users. It is difficult to learn, frustrating to use,
+       and obscures the thing that users actually care about: the
+       world.
+
+     * Crude tools that force users into awkward and inefficient
+       workflows. The tools bear little relation to the way today's
+       users want to use them. Whether because these tools are
+       outdated relics of the past, or just half-baked non-solutions,
+       very few rise above even the "somewhat usable" mark.
+
+     * Stability and performance problems that make the Viewer
+       unreliable for any real use. Viewer crashes are an everyday
+       occurance for many users, disrupting their activities,
+       destroying their unsaved work, and afflicting their lives with
+       undue stress and frustration.
+
+
+   We don't deny that Linden Lab has made some progress in these areas
+   over time. But such progress is slow and often superficial, because
+   Linden Lab cannot afford to make significant improvement.
+   Encumbered by their own nature, they are forced onto an untenable
+   road of caution, hesitation, and prudence. This is a path that can
+   lead only to stagnation.
+
+   These fundamental usability problems will not be solved by Linden
+   Lab; their atmosphere precludes it. Even the contribution of source
+   code patches by open sourcers can only address one factor, Linden
+   Lab's lack of resources. Patch contributors are still affected by
+   the burdensome QA process and the community's anti-change attitude
+   just as much as Linden Lab developers are. Any endeavor which
+   relies on Linden Lab to approve and integrate changes will face the
+   same bottlenecks.
+
+
+ SOLUTION
+
+   As I have described, Linden Lab's approach is characterized by
+   three factors that put a damper on significant improvement or
+   innovation:
+
+     * Cautious, gradual changes over a long period of time.
+
+     * Dependence on an overloaded central QA department.
+
+     * Yielding to pressure from large numbers of users to reject
+       change.
+
+   It stands to reason that a project which removed or reduced these
+   factors would be more free to make radical, fundamental changes to
+   the Viewer. Such a project would exhibit the opposite
+   characteristics:
+
+     * More significant changes over a shorter period of time.
+
+     * A scalable, hierarchical QA process to screen and approve
+       changes.
+
+     * Less need to satisfy users who demand non-change.
+
+   This is precisely the sort of project we propose to undertake.
+   Because our approach is incautious, and perhaps even reckless, we
+   have dubbed the project Imprudence. Goals
+
+   The primary goal of Imprudence is simple: to greatly improve the
+   usability of the Viewer. In particular, there are 3 aspects of
+   usability that we intend to address:
+
+     * Approachability. Improving comfort and ease of use, especially
+       for new or non-technical users.
+
+     * Efficiency. Improving speed and ease of common tasks and
+       workflows.
+
+     * Satisfaction. Improving the emotional effect of the software on
+       the user.
+
+   This is not to minimize other aspects of usability, such as
+   reliability, accessibility, or internationalization/localization.
+   We recognize their importance, but lack the expertise to properly
+   address them. We welcome people with such expertise to join the
+   project and help.
+
+
+ METHOD
+
+   In order to achieve these goals, we propose to combine the open and
+   distributed nature of open source development with the dedication
+   to quality design usually associated with commercial products. The
+   main highlights of our approach are:
+
+     * Open, public project management. Our plans, goals, and roadmaps
+       are laid out on the table. Our code is published in plain view
+       as it's written. There won't be any sudden bombshells to
+       disrupt your plans.
+
+     * A pro-change atmosphere. Change is natural and healthy, and it
+       is the only way to make improvement. We encourage experimental
+       change, coupled with evaluation to filter out the negative.
+       Users wanting a static, unchanging viewer should look
+       elsewhere.
+
+     * Designers, programmers, and users working with each other. Good
+       software requires more than just a team of programmers. It
+       needs designers listening to users, programmers working with
+       designers, and users testing and providing feedback. Every role
+       is necessary and appreciated.
+
+     * Commmunity involvement. There are many ways to be involved,
+       whatever your interests, skill set, or level of commitment.
+       Contributions are welcomed, not looked upon as burdens.
+
+     * A modern, distributed development model. The Git version
+       control system makes it easy for programmers to work freely
+       without stepping on each others' toes. Easy and powerful
+       branching and merging tools mean that releases will never be
+       littered with untested, half-baked code.
+
+     * A scalable, hierarchical QA model. New contributions work their
+       way up a hierarchy of approval, which will start small and grow
+       naturally as load increases. By the time a contribution reaches
+       the top of the hierarchy, it has been tested, polished, and
+       approved by multiple people, and is ready to be integrated.
+
+
+ A CALL FOR VOLUNTEERS
+
+   Imprudence is an open-source, volunteer effort; it depends on
+   people like you getting involved! There are many ways to
+   contribute, and most of them don't require any programming skills
+   or special knowledge -- just some free time and the will to be part
+   of something great.
+
+   If you'd like to contribute in any way, have a look at
+   CONTRIBUTE.txt.
+
+   You have nothing to lose, and a better SL experience to gain!
+
+
+ SIGNATORIES
+
+   Jacek Antonelli       (August 27, 2008)
+   McCabe Maxsted        (August 27, 2008)
diff --git a/README.txt b/README.txt
index d7f6c75..be85b03 100644
--- a/README.txt
+++ b/README.txt
@@ -1,55 +1,41 @@
 
-  
- ABOUT THE SECOND LIFE VIEWER SOURCE ARCHIVE PROJECT
-
-   This project is a community-maintained archive of Second Life 
-   viewer source code releases. For more information about the 
-   project, see:  
-
-     http://github.com/jacek/sl-viewer-source-archive/
-  
-  
- PURPOSE
- 
-   The purpose of the archive is to provide a base for viewer
-   forks or patch development and a convenient method for viewing
-   and merging the diffs between releases via the Git version
-   control system.
-  
-  
- CONTENTS
-  
-   The archive contains the full source code for every official,
-   versioned release and release candidate of the Second Life
-   viewer since January 2007, when the viewer code was first
-   released.
-
-   The archive does not contain the source for betas, "First
-   Look" viewers, dated snapshots, or development branches,
-   because it is infeasible to deduce their ancestral
-   relationship to other versions.
-
-   The archive also does not contain the viewer artwork or
-   required libraries, for space and licensing reasons.
-
-   As of this writing, these other resources (as well as all
-   code contained in the archive) are available for download
-   from Linden Research, Inc.:
-
-     http://wiki.secondlife.com/wiki/Source_downloads
-
-  
+
+ ABOUT IMPRUDENCE
+
+   Imprudence is an open source metaverse viewer project based on
+   the Second Life Viewer source.
+
+   The goal of Imprudence is to greatly improve the usability of
+   the Viewer through community involvement, thoughtful design,
+   modern development methods, and a pro-change atmosphere.
+
+   For more information about the rationale, goals, and methods
+   of the Imprudence project, please see MANIFESTO.txt.
+
+   If you would like to get involved with the Imprudence project,
+   please see CONTRIBUTE.txt. There are many ways you can help,
+   no matter your skills or the amount of time you can dedicate.
+
+
+   Imprudence is online at ImprudenceViewer.org
+
+
+   The latest source code for the Imprudence Viewer is always
+   available at:
+
+     http://github.com/jacek/imprudence/tree/master
+
+
  LICENSE
-  
-   All code in the archive has been released by Linden Research
-   Inc. under the terms of the GNU General Public License version
-   2.0 (plus a special exception). See linden/LICENSE-source.txt
-   for details.
-  
-  
+
+   All code is licensed under the terms of the GNU General Public
+   License version 2.0 (plus a special exception).
+
+   See linden/LICENSE-source.txt for details.
+
+
  DISCLAIMERS AND NOTICES
- 
-   The project and archive are in no way affiliated with
-   Linden Research, Inc.
 
    Second Life is a registered trademark of Linden Research, Inc.
+
+   Imprudence is in no way affiliated with Linden Research, Inc.
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index ea5ba5d..346aba5 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -14,6 +14,8 @@ Adam Marker
 Aimee Trescothick
         VWR-3903
         VWR-4083
+        VWR-8341
+        VWR-8430
 Alejandro Rosenthal
         VWR-1184
 Alissa Sabre
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index e93ea57..ae0feb6 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -124,6 +124,7 @@ set(viewer_SOURCE_FILES
     llfloateravatarpicker.cpp
     llfloateravatartextures.cpp
     llfloaterbuildoptions.cpp
+    llfloaterbulkpermission.cpp
     llfloaterbump.cpp
     llfloaterbuycontents.cpp
     llfloaterbuy.cpp
@@ -514,6 +515,7 @@ set(viewer_HEADER_FILES
     llfloateravatarpicker.h
     llfloateravatartextures.h
     llfloaterbuildoptions.h
+    llfloaterbulkpermission.h
     llfloaterbump.h
     llfloaterbuy.h
     llfloaterbuycontents.h
@@ -1019,6 +1021,7 @@ set(viewer_XUI_FILES
     skins/default/xui/en-us/floater_avatar_picker.xml
     skins/default/xui/en-us/floater_avatar_textures.xml
     skins/default/xui/en-us/floater_build_options.xml
+    skins/default/xui/en-us/floater_bulk_perms.xml
     skins/default/xui/en-us/floater_bumps.xml
     skins/default/xui/en-us/floater_buy_contents.xml
     skins/default/xui/en-us/floater_buy_currency.xml
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 07fa71c..2083877 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4191,6 +4191,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LandBrushForce</key>
+    <map>
+      <key>Comment</key>
+      <string>Multiplier for land modification brush force.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>1.0</real>
+    </map>
     <key>Language</key>
     <map>
       <key>Comment</key>
@@ -5607,7 +5618,7 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>RadioLandBrushSize</key>
+    <key>LandBrushSize</key>
     <map>
       <key>Comment</key>
       <string>Size of land modification brush (0 = small, 1 = medium, 2 = large)</string>
diff --git a/linden/indra/newview/llfloaterbulkpermission.cpp b/linden/indra/newview/llfloaterbulkpermission.cpp
new file mode 100644
index 0000000..29d94bc
--- /dev/null
+++ b/linden/indra/newview/llfloaterbulkpermission.cpp
@@ -0,0 +1,595 @@
+/** 
+ * @file llfloaterbulkpermissions.cpp
+ * @brief A floater which allows task inventory item's properties to be changed on mass.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * 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
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+/* Allow multiple task inventory properties to be set in one go, by Michelle2 Zenovka */
+
+/* TODO
+        
+        * Add in the option to select objects or task inventory
+s
+
+It would be nice to set the permissions on groups of prims as well as task inventory
+
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+#include "llfloaterbulkpermission.h"
+#include "llagent.h"
+#include "llchat.h"
+#include "llviewerwindow.h"
+#include "llviewerobject.h"
+#include "llviewerobjectlist.h"
+#include "llviewerregion.h"
+#include "lscript_rt_interface.h"
+#include "llviewercontrol.h"
+#include "llviewerobject.h"
+#include "llviewerregion.h"
+#include "llresmgr.h"
+#include "llbutton.h"
+#include "lldir.h"
+#include "llfloaterchat.h"
+#include "llviewerstats.h"
+#include "lluictrlfactory.h"
+#include "llselectmgr.h"
+#include "llinventory.h"
+
+
+#include <algorithm>
+#include <functional>
+#include "llcachename.h"
+#include "lldbstrings.h"
+#include "llinventory.h"
+
+#include "llagent.h"
+#include "llbutton.h"
+#include "llcheckboxctrl.h"
+#include "llfloateravatarinfo.h"
+#include "llfloatergroupinfo.h"
+#include "llinventorymodel.h"
+#include "lllineeditor.h"
+#include "llradiogroup.h"
+#include "llresmgr.h"
+#include "roles_constants.h"
+#include "llselectmgr.h"
+#include "lltextbox.h"
+#include "lluiconstants.h"
+#include "llviewerinventory.h"
+#include "llviewerobjectlist.h"
+#include "llviewerregion.h"
+#include "llviewercontrol.h"
+
+#include "lluictrlfactory.h"
+
+
+const char* BULKPERM_QUEUE_TITLE = "Update Progress";
+const char* BULKPERM_START_STRING = "update";
+
+namespace
+{
+        struct BulkQueueObjects : public LLSelectedObjectFunctor
+        {
+                BOOL scripted;
+                BOOL modifiable;
+                LLFloaterBulkPermission* mQueue;
+                BulkQueueObjects(LLFloaterBulkPermission* q) : mQueue(q), scripted(FALSE), modifiable(FALSE) {}
+                virtual bool apply(LLViewerObject* obj)
+                {
+                        scripted = obj->flagScripted();
+                        modifiable = obj->permModify();
+
+                        mQueue->addObject(obj->getID());
+                        return false;
+                        
+                }
+        };
+}
+
+///----------------------------------------------------------------------------
+/// Class LLFloaterBulkPermission
+///----------------------------------------------------------------------------
+
+// static
+LLMap<LLUUID, LLFloaterBulkPermission*> LLFloaterBulkPermission::sInstances;
+
+
+// Default constructor
+LLFloaterBulkPermission::LLFloaterBulkPermission(const std::string& name,
+                                                                                         const LLRect& rect,
+                                                                                         const char* title,
+                                                                                         const char* start_string) :
+        LLFloater(name, rect, title,
+                          RESIZE_YES, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT,
+                          DRAG_ON_TOP, MINIMIZE_YES, CLOSE_YES)
+{
+
+        req_perm_mask=0; // This should match the default state the checkboxes are set to
+        recurse=false;
+
+        LLUICtrlFactory::getInstance()->buildFloater(this,"floater_bulk_perms.xml");
+
+        childSetAction("Apply...",onApplyBtn,this);
+        childSetEnabled("Apply...",TRUE);
+
+        childSetCommitCallback("Modify",&onCommitPermissions, this);
+        childSetCommitCallback("Trans",&onCommitPermissions, this);
+        childSetCommitCallback("Copy",&onCommitPermissions, this);
+
+        //childSetCommitCallback("Recurse",&onRecurse, this);
+
+        childSetCommitCallback("Parent",&onParent, this);
+
+        childSetCommitCallback("objects",&InvSelection, this);
+        childSetCommitCallback("scripts",&InvSelection, this);
+        childSetCommitCallback("textures",&InvSelection, this);
+        childSetCommitCallback("sounds",&InvSelection, this);
+        childSetCommitCallback("animations",&InvSelection, this);
+        childSetCommitCallback("notecards",&InvSelection, this);
+        childSetCommitCallback("landmarks",&InvSelection, this);
+        childSetCommitCallback("bodyparts",&InvSelection, this);
+        childSetCommitCallback("clothing",&InvSelection, this);
+        childSetCommitCallback("gestures",&InvSelection, this);
+
+        //Set variable state to XUI default state consistancy
+        processObject=getChild<LLCheckBoxCtrl>("objects")->get();
+        processScript=getChild<LLCheckBoxCtrl>("scripts")->get();
+        processTexture=getChild<LLCheckBoxCtrl>("textures")->get();
+        processSound=getChild<LLCheckBoxCtrl>("sounds")->get();
+        processAnimation=getChild<LLCheckBoxCtrl>("animations")->get();
+        processNotecard=getChild<LLCheckBoxCtrl>("notecards")->get();
+        processGesture=getChild<LLCheckBoxCtrl>("gestures")->get();
+        processClothing=getChild<LLCheckBoxCtrl>("clothing")->get();
+        processBodypart=getChild<LLCheckBoxCtrl>("bodyparts")->get();
+        processLandmark=getChild<LLCheckBoxCtrl>("landmarks")->get();
+        parent=getChild<LLCheckBoxCtrl>("Parent")->get();
+
+
+        setTitle(title);
+        
+        if (!getHost())
+        {
+                LLRect curRect = getRect();
+                translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
+        }
+        
+        mStartString = start_string;
+        mDone = FALSE;
+        sInstances.addData(mID, this);
+
+}
+
+void LLFloaterBulkPermission::doApply()
+{
+        // Its alive now do the nasty work that the ScriptQueue and friends try to do in the menu code
+        // but first grab the user options
+
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
+        list->deleteAllItems();
+
+        //Apply to selected objects if requested first
+
+        if(parent)
+        {
+                llinfos<< "Setting permission on parent items" << llendl;
+                LLSelectMgr::getInstance()->selectionSetObjectPermissions(PERM_NEXT_OWNER,true, req_perm_mask);
+                LLSelectMgr::getInstance()->selectionSetObjectPermissions(PERM_NEXT_OWNER,false, ~req_perm_mask); //How annoying need to set and unset
+        }
+
+
+        LLFloaterBulkPermission* q;
+        q=(LLFloaterBulkPermission*)this;
+
+        BulkQueueObjects func(q);
+        const bool firstonly = false;
+        bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func, firstonly);
+        if(fail)
+        {
+                if ( !func.modifiable )
+                {
+                        gViewerWindow->alertXml("NO MODIFY");
+                }
+                else
+                {
+                        llwarns << "Bad logic. Are there actualy any items in that prim?" << llendl;
+                }
+        }
+        else
+        {
+                if (!q->start())
+                {
+                        llwarns << "Unexpected failure attepmting to set permissions." << llendl;
+                }
+        }
+}
+
+// Destroys the object
+LLFloaterBulkPermission::~LLFloaterBulkPermission()
+{
+        sInstances.removeData(mID);
+}
+
+// find an instance by ID. Return NULL if it does not exist.
+// static
+LLFloaterBulkPermission* LLFloaterBulkPermission::findInstance(const LLUUID& id)
+{
+        if(sInstances.checkData(id))
+        {
+                return sInstances.getData(id);
+        }
+        return NULL;
+}
+
+
+// This is the callback method for the viewer object currently being
+// worked on.
+// NOT static, virtual!
+void LLFloaterBulkPermission::inventoryChanged(LLViewerObject* viewer_object,
+                                                                                         InventoryObjectList* inv,
+                                                                                         S32,
+                                                                                         void* q_id)
+{
+        llinfos << "LLFloaterBulkPermission::inventoryChanged() for  object "
+                        << viewer_object->getID() << llendl;
+
+        //Remove this listener from the object since its
+        //listener callback is now being executed.
+        
+        //We remove the listener here because the function
+        //removeVOInventoryListener removes the listener from a ViewerObject
+        //which it internally stores.
+        
+        //If we call this further down in the function, calls to handleInventory
+        //and nextObject may update the interally stored viewer object causing
+        //the removal of the incorrect listener from an incorrect object.
+        
+        //Fixes SL-6119:Recompile scripts fails to complete
+        removeVOInventoryListener();
+
+        if (viewer_object && inv && (viewer_object->getID() == mCurrentObjectID) )
+        {
+                handleInventory(viewer_object, inv);
+        }
+        else
+        {
+                // something went wrong...
+                // note that we're not working on this one, and move onto the
+                // next object in the list.
+                llwarns << "No inventory for " << mCurrentObjectID
+                                << llendl;
+                nextObject();
+        }
+}
+
+void LLFloaterBulkPermission::onApplyBtn(void* user_data)
+{
+        LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)user_data;
+        self->doApply();
+}
+
+
+// static
+void LLFloaterBulkPermission::InvSelection(LLUICtrl* ctrl, void* data)
+{
+        LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
+
+        self->processObject=self->getChild<LLCheckBoxCtrl>("objects")->get();
+        self->processScript=self->getChild<LLCheckBoxCtrl>("scripts")->get();
+        self->processTexture=self->getChild<LLCheckBoxCtrl>("textures")->get();
+        self->processSound=self->getChild<LLCheckBoxCtrl>("sounds")->get();
+        self->processAnimation=self->getChild<LLCheckBoxCtrl>("animations")->get();
+        self->processNotecard=self->getChild<LLCheckBoxCtrl>("notecards")->get();
+        self->processGesture=self->getChild<LLCheckBoxCtrl>("gestures")->get();
+        self->processClothing=self->getChild<LLCheckBoxCtrl>("clothing")->get();
+        self->processBodypart=self->getChild<LLCheckBoxCtrl>("bodyparts")->get();
+        self->processLandmark=self->getChild<LLCheckBoxCtrl>("landmarks")->get();
+
+
+}
+
+// static
+void LLFloaterBulkPermission::onParent(LLUICtrl* ctrl, void* data)
+{
+        LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
+        self->parent=self->getChild<LLCheckBoxCtrl>("Parent")->get();
+}
+
+// static
+void LLFloaterBulkPermission::onRecurse(LLUICtrl* ctrl, void* data)
+{
+        LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
+        self->recurse=self->getChild<LLCheckBoxCtrl>("Recurse")->get();
+}
+
+// static
+void LLFloaterBulkPermission::onCommitPermissions(LLUICtrl* ctrl, void* data)
+{
+        LLFloaterBulkPermission* self = (LLFloaterBulkPermission*)data;
+        LLCheckBoxCtrl* CheckModify = self->getChild<LLCheckBoxCtrl>("Modify");
+        LLCheckBoxCtrl* CheckCopy = self->getChild<LLCheckBoxCtrl>("Copy");
+        LLCheckBoxCtrl* CheckTrans = self->getChild<LLCheckBoxCtrl>("Trans");
+
+        self->req_perm_mask=0;
+
+        if(CheckModify->get())
+        {
+                self->req_perm_mask|=PERM_MODIFY;
+        }
+        else
+        {
+                self->req_perm_mask&=~PERM_MODIFY;
+        }
+
+        if(CheckCopy->get())
+        {
+                self->req_perm_mask|=PERM_COPY;
+        }
+        else
+        {
+                self->req_perm_mask&=~PERM_COPY;
+        }
+
+        if(CheckTrans->get())
+        {
+                self->req_perm_mask|=PERM_TRANSFER;
+        }
+        else
+        {
+                self->req_perm_mask&=~PERM_TRANSFER;
+        }
+
+
+}
+
+void LLFloaterBulkPermission::addObject(const LLUUID& id)
+{
+        mObjectIDs.put(id);
+}
+
+BOOL LLFloaterBulkPermission::start()
+{
+        llinfos << "LLFloaterBulkPermission::start()" << llendl;
+        char buffer[MAX_STRING];                                /*Flawfinder: ignore*/
+        snprintf(buffer, sizeof(buffer), "Starting %s of %d items.", mStartString, mObjectIDs.count());                 /* Flawfinder: ignore */
+
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
+        list->addCommentText(buffer);
+
+        return nextObject();
+}
+
+BOOL LLFloaterBulkPermission::isDone() const
+{
+        return (mCurrentObjectID.isNull() || (mObjectIDs.count() == 0));
+}
+
+// go to the next object. If no objects left, it falls out silently
+// and waits to be killed by the window being closed.
+BOOL LLFloaterBulkPermission::nextObject()
+{
+        S32 count;
+        BOOL successful_start = FALSE;
+        do
+        {
+                count = mObjectIDs.count();
+                llinfos << "LLFloaterBulkPermission::nextObject() - " << count
+                                << " objects left to process." << llendl;
+                mCurrentObjectID.setNull();
+                if(count > 0)
+                {
+                        successful_start = popNext();
+                }
+                llinfos << "LLFloaterBulkPermission::nextObject() "
+                                << (successful_start ? "successful" : "unsuccessful")
+                                << llendl; 
+        } while((mObjectIDs.count() > 0) && !successful_start);
+
+        if(isDone() && !mDone)
+        {
+                
+                LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
+                mDone = TRUE;
+                char buffer[MAX_STRING];                /*Flawfinder: ignore*/
+                snprintf(buffer, sizeof(buffer), "Done.");                              /* Flawfinder: ignore */
+                list->addCommentText(buffer);
+
+        }
+        return successful_start;
+}
+
+// returns true if the queue has started, otherwise false.  This
+// method pops the top object off of the queue.
+BOOL LLFloaterBulkPermission::popNext()
+{
+        // get the first element off of the container, and attempt to get
+        // the inventory.
+        BOOL rv = FALSE;
+        S32 count = mObjectIDs.count();
+        if(mCurrentObjectID.isNull() && (count > 0))
+        {
+                mCurrentObjectID = mObjectIDs.get(0);
+                llinfos << "LLFloaterBulkPermission::popNext() - mCurrentID: "
+                                << mCurrentObjectID << llendl;
+                mObjectIDs.remove(0);
+                LLViewerObject* obj = gObjectList.findObject(mCurrentObjectID);
+                if(obj)
+                {
+                        llinfos << "LLFloaterBulkPermission::popNext() requesting inv for "
+                                        << mCurrentObjectID << llendl;
+                        LLUUID* id = new LLUUID(mID);
+
+                        registerVOInventoryListener(obj,id);
+                        requestVOInventory();
+                        rv = TRUE;
+                }
+                else
+                {
+                        llinfos<<"LLFloaterBulkPermission::popNext() returned a NULL LLViewerObject" <<llendl;
+                        //Arrrg what do we do here?
+                }
+        }
+
+        return rv;
+}
+
+
+// static
+LLFloaterBulkPermission* LLFloaterBulkPermission::create()
+{
+        S32 left, top;
+        gFloaterView->getNewFloaterPosition(&left, &top);
+        LLRect rect = gSavedSettings.getRect("CompileOutputRect");
+        rect.translate(left - rect.mLeft, top - rect.mTop);
+        LLFloaterBulkPermission* new_queue = new LLFloaterBulkPermission("queue",rect,"Setting Bulk permissions","Results");
+        new_queue->open();       /*Flawfinder: ignore*/
+        return new_queue;
+}
+
+
+void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, InventoryObjectList* inv)
+{
+        // find all of the lsl, leaving off duplicates. We'll remove
+        // all matching asset uuids on compilation success.
+
+        llinfos<<"handleInventory"<<llendl;
+
+        char buffer[MAX_STRING];                 /*Flawfinder: ignore*/
+        LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
+
+        InventoryObjectList::const_iterator it = inv->begin();
+        InventoryObjectList::const_iterator end = inv->end();
+        for ( ; it != end; ++it)
+        {
+                llinfos<<"Doing iterator of inventory"<<llendl;
+
+                if(  ( (*it)->getType() == LLAssetType::AT_LSL_TEXT && processScript) ||
+                     ( (*it)->getType() == LLAssetType::AT_TEXTURE && processTexture) ||
+                     ( (*it)->getType() == LLAssetType::AT_SOUND && processSound) ||
+                     ( (*it)->getType() == LLAssetType::AT_LANDMARK && processLandmark) ||
+                     ( (*it)->getType() == LLAssetType::AT_CLOTHING && processClothing) ||
+                     ( (*it)->getType() == LLAssetType::AT_OBJECT && processObject) ||
+                     ( (*it)->getType() == LLAssetType::AT_NOTECARD && processNotecard) ||
+                     ( (*it)->getType() == LLAssetType::AT_BODYPART && processBodypart) ||
+                     ( (*it)->getType() == LLAssetType::AT_ANIMATION && processAnimation) ||
+                     ( (*it)->getType() == LLAssetType::AT_GESTURE && processGesture))
+                {
+
+                        LLViewerObject* object = gObjectList.findObject(viewer_obj->getID());
+
+                        if (object)
+                        {
+                                LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
+                                LLViewerInventoryItem* new_item = (LLViewerInventoryItem*)item;
+                                LLPermissions perm(new_item->getPermissions());
+
+                                // chomp the inventory name so it fits in the scroll window nicely
+                                // and the user can see the [OK]
+                                std::string invname;
+                                invname=item->getName().substr(0,item->getName().size() < 30 ? item->getName().size() : 30 );
+                                
+                                // My attempt at checking valid permissions, CHECK ME
+                                // note its not actually bad to try to set permissions that are not allowed as the
+                                // server will protect against this, but it will piss the user off if its wrong
+                                if(
+                                (perm.getCreator()==gAgentID) ||
+                                (perm.getMaskOwner() & PERM_TRANSFER) && (perm.getMaskOwner() & PERM_MODIFY) || 
+                                (gAgent.getGroupID()==perm.getGroup() && (perm.getMaskGroup() & PERM_TRANSFER) && (perm.getMaskGroup() & PERM_MODIFY))
+                                ){      
+                                        llinfos<<"Setting perms"<<llendl;
+                                        perm.setMaskNext(req_perm_mask);
+                                        new_item->setPermissions(perm);
+                                        updateInventory(object,new_item,TASK_INVENTORY_ITEM_KEY,FALSE);                         
+                                        snprintf(buffer, sizeof(buffer), "Setting perms on '%s' [OK]", invname.c_str());                        /* Flawfinder: ignore */
+                                }
+                                else
+                                {
+                                        llinfos<<"NOT setting perms"<<llendl;
+                                        snprintf(buffer, sizeof(buffer), "Setting perms on '%s' [FAILED]", invname.c_str());                    /* Flawfinder: ignore */
+
+                                }
+                                
+                                list->addCommentText(buffer);
+
+                                if(recurse &&  ( (*it)->getType() == LLAssetType::AT_OBJECT && processObject))
+                                {
+                                        //Add this object back to the queue to be processed as it has inventory
+                                        snprintf(buffer, sizeof(buffer), "Queueing object '%s' for open", invname.c_str());
+                                        llwarns << "Queueing object "<< invname.c_str() << " ID "<< (*it)->getUUID()<<llendl;
+                                        mObjectIDs.put((*it)->getUUID());
+                                        // This will not YET work. as this is not a viewer object the unpack will fail                  
+                                }
+
+                        }
+                }
+        }
+
+        nextObject();   
+}
+
+
+// Avoid inventory callbacks etc by just fire and forgetting the message with the permissions update
+// we could do this via LLViewerObject::updateInventory but that uses inventory call backs and buggers
+// us up and we would have a dodgy item iterator
+
+void LLFloaterBulkPermission::updateInventory(
+        LLViewerObject* object,
+        LLViewerInventoryItem* item,
+        U8 key,
+        bool is_new)
+{
+        LLMemType mt(LLMemType::MTYPE_OBJECT);
+        
+
+        // This slices the object into what we're concerned about on the
+        // viewer. The simulator will take the permissions and transfer
+        // ownership.
+        LLPointer<LLViewerInventoryItem> task_item =
+                new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
+                                                                  item->getAssetUUID(), item->getType(),
+                                                                  item->getInventoryType(),
+                                                                  item->getName(), item->getDescription(),
+                                                                  item->getSaleInfo(),
+                                                                  item->getFlags(),
+                                                                  item->getCreationDate());
+        task_item->setTransactionID(item->getTransactionID());
+        LLMessageSystem* msg = gMessageSystem;
+        msg->newMessageFast(_PREHASH_UpdateTaskInventory);
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+        msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+        msg->nextBlockFast(_PREHASH_UpdateData);
+        msg->addU32Fast(_PREHASH_LocalID, object->mLocalID);
+        msg->addU8Fast(_PREHASH_Key, key);
+        msg->nextBlockFast(_PREHASH_InventoryData);
+        task_item->packMessage(msg);
+        msg->sendReliable(object->getRegion()->getHost());
+
+}
+
diff --git a/linden/indra/newview/llfloaterbulkpermission.h b/linden/indra/newview/llfloaterbulkpermission.h
new file mode 100644
index 0000000..3de871b
--- /dev/null
+++ b/linden/indra/newview/llfloaterbulkpermission.h
@@ -0,0 +1,143 @@
+/** 
+ * @file llfloaterbulkpermissions.h
+ * @brief A floater which allows task inventory item's properties to be changed on mass.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * 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
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+/* Allow multiple task inventory properties to be set in one go, by Michelle2 Zenovka */
+
+#ifndef LL_LLBULKPERMISSION_H
+#define LL_LLBULKPERMISSION_H
+
+#include "lldarray.h"
+#include "llinventory.h"
+#include "llviewerobject.h"
+#include "llvoinventorylistener.h"
+#include "llmap.h"
+#include "lluuid.h"
+
+#include "llfloater.h"
+#include "llscrolllistctrl.h"
+
+#include "llviewerinventory.h"
+
+class LLFloaterBulkPermission : public LLFloater, public LLVOInventoryListener
+{
+public:
+        // addObject() accepts an object id.
+        void addObject(const LLUUID& id);
+
+        // start() returns TRUE if the queue has started, otherwise FALSE.
+        BOOL start();
+
+        // Use this method to create a reset queue. Once created, it
+        // will be responsible for it's own destruction.
+        static LLFloaterBulkPermission * create();
+
+protected:
+        LLFloaterBulkPermission(const std::string& name, const LLRect& rect,
+                                                 const char* title, const char* start_string);
+        virtual ~LLFloaterBulkPermission();
+
+        // This is the callback method for the viewer object currently
+        // being worked on.
+        /*virtual*/ void inventoryChanged(LLViewerObject* obj,
+                                                                 InventoryObjectList* inv,
+                                                                 S32 serial_num,
+                                                                 void* queue);
+        
+        // This is called by inventoryChanged
+        void handleInventory(LLViewerObject* viewer_obj,
+                                                                InventoryObjectList* inv);
+
+
+        void updateInventory(LLViewerObject* object,
+                                                                LLViewerInventoryItem* item,
+                                                                U8 key,
+                                                                bool is_new);
+
+
+        static void onCloseBtn(void* user_data);
+        static void onApplyBtn(void* user_data);
+        static void onCommitPermissions(LLUICtrl* ctrl, void* data);
+        static void InvSelection(LLUICtrl* ctrl, void* data);
+        static void onRecurse(LLUICtrl* ctrl, void* data);      
+        static void onParent(LLUICtrl* ctrl, void* data);
+
+        // returns true if this is done
+        BOOL isDone() const;
+
+        //Read the settings and Apply the permissions
+        void doApply();
+
+        // go to the next object. If no objects left, it falls out
+        // silently and waits to be killed by the deleteIfDone() callback.
+        BOOL nextObject();
+        BOOL popNext();
+
+        // Get this instances ID.
+        const LLUUID& getID() const { return mID; } 
+
+        // find an instance by ID. Return NULL if it does not exist.
+        static LLFloaterBulkPermission* findInstance(const LLUUID& id);
+
+        U32 req_perm_mask;
+
+        BOOL processObject;
+        BOOL processScript;
+        BOOL processTexture;
+        BOOL processSound;
+        BOOL processAnimation;
+        BOOL processCallingcard;
+        BOOL processNotecard;
+        BOOL processGesture;
+        BOOL processClothing;
+        BOOL processBodypart;
+        BOOL processLandmark;
+
+        BOOL recurse;
+        BOOL parent;
+
+protected:
+        // UI
+        LLScrollListCtrl* mMessages;
+        LLButton* mCloseBtn;
+
+        // Object Queue
+        LLDynamicArray<LLUUID> mObjectIDs;
+        LLUUID mCurrentObjectID;
+        BOOL mDone;
+
+        LLUUID mID;
+        static LLMap<LLUUID, LLFloaterBulkPermission*> sInstances;
+
+        const char* mStartString;
+
+};
+
+#endif
diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index 8fdaa52..acdd5ce 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -325,14 +325,9 @@ void LLPanelFriends::refreshRightsChangeList()
                 {
                         if(!friend_status->isOnline())
                         {
-                                can_offer_teleport = false;
                                 selected_friends_online = false;
                         }
                 }
-                else // missing buddy info, don't allow any operations
-                {
-                        can_offer_teleport = false;
-                }
         }
         
         if (num_selected == 0)  // nothing selected
diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index c0ea9df..39f6b7a 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -39,6 +39,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llfloatergroups.h"
+#include "llfloatergroupinvite.h"
 
 #include "message.h"
 #include "roles_constants.h"
@@ -223,6 +224,8 @@ BOOL LLPanelGroups::postBuild()
         childSetAction("Create", onBtnCreate, this);
 
         childSetAction("Search...", onBtnSearch, this);
+        
+        childSetAction("Invite...", onBtnInvite, this);
 
         setDefaultBtn("IM");
 
@@ -271,6 +274,14 @@ void LLPanelGroups::enableButtons()
         {
                 childDisable("Create");
         }
+        if (group_id.notNull() && gAgent.hasPowerInGroup(group_id, GP_MEMBER_INVITE))
+        {
+                LLPanelGroups::childEnable("Invite...");
+        }
+        else
+        {
+                LLPanelGroups::childDisable("Invite...");
+        }
 }
 
 
@@ -280,6 +291,12 @@ void LLPanelGroups::onBtnCreate(void* userdata)
         if(self) self->create();
 }
 
+void LLPanelGroups::onBtnInvite(void* userdata)
+{
+        LLPanelGroups* self = (LLPanelGroups*)userdata;
+        if(self) self->invite();
+}
+
 void LLPanelGroups::onBtnActivate(void* userdata)
 {
         LLPanelGroups* self = (LLPanelGroups*)userdata;
@@ -401,6 +418,21 @@ void LLPanelGroups::search()
         LLFloaterDirectory::showGroups();
 }
 
+void LLPanelGroups::invite()
+{
+        LLCtrlListInterface *group_list = childGetListInterface("group list");
+        LLUUID group_id;
+
+        //if (group_list && (group_id = group_list->getCurrentID()).notNull())
+        
+        if (group_list)
+        {
+                group_id = group_list->getCurrentID();
+        }
+
+                LLFloaterGroupInvite::showForGroup(group_id);
+}
+
 // static
 void LLPanelGroups::callbackLeaveGroup(S32 option, void* userdata)
 {
diff --git a/linden/indra/newview/llfloatergroups.h b/linden/indra/newview/llfloatergroups.h
index 5eda8ba..ad3ecac 100644
--- a/linden/indra/newview/llfloatergroups.h
+++ b/linden/indra/newview/llfloatergroups.h
@@ -110,6 +110,7 @@ protected:
         static void onBtnLeave(void* userdata);
         static void onBtnSearch(void* userdata);
         static void onBtnVote(void* userdata);
+        static void onBtnInvite(void* userdata);
         static void onDoubleClickGroup(void* userdata);
 
         void create();
@@ -119,6 +120,7 @@ protected:
         void leave();
         void search();
         void callVote();
+        void invite();
 
         static void callbackLeaveGroup(S32 option, void* userdata);
 
diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 9c00ca6..1498d4a 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -106,9 +106,8 @@ void click_popup_rotate_left(void*);
 void click_popup_rotate_reset(void*);
 void click_popup_rotate_right(void*);
 void click_popup_dozer_mode(LLUICtrl *, void *user);
-void click_popup_dozer_size(LLUICtrl *, void *user);
+void commit_slider_dozer_size(LLUICtrl *, void*);
 void commit_slider_dozer_force(LLUICtrl *, void*);
-void click_dozer_size(LLUICtrl *, void*);
 void click_apply_to_selection(void*);
 void commit_radio_zoom(LLUICtrl *, void*);
 void commit_radio_orbit(LLUICtrl *, void*);
@@ -303,14 +302,16 @@ BOOL	LLFloaterTools::postBuild()
         childSetCommitCallback("radio noise",click_popup_dozer_mode,  (void*)4);
         mRadioDozerRevert = getChild<LLCheckBoxCtrl>("radio revert");
         childSetCommitCallback("radio revert",click_popup_dozer_mode,  (void*)5);
-        mComboDozerSize = getChild<LLComboBox>("combobox brush size");
-        childSetCommitCallback("combobox brush size",click_dozer_size,  (void*)0);
-        if(mComboDozerSize) mComboDozerSize->setCurrentByIndex(0);
         mBtnApplyToSelection = getChild<LLButton>("button apply to selection");
         childSetAction("button apply to selection",click_apply_to_selection,  (void*)0);
         mCheckShowOwners = getChild<LLCheckBoxCtrl>("checkbox show owners");
         childSetValue("checkbox show owners",gSavedSettings.getBOOL("ShowParcelOwners"));
 
+        mSliderDozerSize = getChild<LLSlider>("slider brush size");
+        childSetCommitCallback("slider brush size", commit_slider_dozer_size,  (void*)0);
+        childSetValue( "slider brush size", gSavedSettings.getS32("LandBrushSize"));
+        
+
         mSliderDozerForce = getChild<LLSlider>("slider force");
         childSetCommitCallback("slider force",commit_slider_dozer_force,  (void*)0);
         // the setting stores the actual force multiplier, but the slider is logarithmic, so we convert here
@@ -391,7 +392,8 @@ LLFloaterTools::LLFloaterTools()
         mRadioDozerSmooth(NULL),
         mRadioDozerNoise(NULL),
         mRadioDozerRevert(NULL),
-        mComboDozerSize(NULL),
+        mSliderDozerSize(NULL),
+        mSliderDozerForce(NULL),
         mBtnApplyToSelection(NULL),
         mCheckShowOwners(NULL),
 
@@ -702,7 +704,6 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
         if (mRadioSelectLand)   mRadioSelectLand->setVisible( land_visible );
 
         S32 dozer_mode = gSavedSettings.getS32("RadioLandBrushAction");
-        S32 dozer_size = gSavedSettings.getS32("RadioLandBrushSize");
 
         if (mRadioDozerFlatten)
         {
@@ -734,17 +735,17 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                 mRadioDozerRevert       ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 5);
                 mRadioDozerRevert       ->setVisible( land_visible );
         }
-        if (mComboDozerSize)
-        {
-                mComboDozerSize         ->setCurrentByIndex(dozer_size);
-                mComboDozerSize         ->setVisible( land_visible );
-                mComboDozerSize         ->setEnabled( tool == LLToolBrushLand::getInstance() );
-        }
         if (mBtnApplyToSelection)
         {
                 mBtnApplyToSelection->setVisible( land_visible );
                 mBtnApplyToSelection->setEnabled( land_visible && !LLViewerParcelMgr::getInstance()->selectionEmpty() && tool != LLToolSelectLand::getInstance());
         }
+        if (mSliderDozerSize)
+        {
+                mSliderDozerSize        ->setVisible( land_visible );
+                childSetVisible("Brush:", land_visible);
+                childSetVisible("Brush Size:", land_visible);
+        }
         if (mCheckShowOwners)
         {
                 mCheckShowOwners        ->setVisible( land_visible );
@@ -933,23 +934,15 @@ void click_popup_rotate_right(void*)
 
 void click_popup_dozer_mode(LLUICtrl *, void *user)
 {
-        S32 show_owners = gSavedSettings.getBOOL("ShowParcelOwners");
         S32 mode = (S32)(intptr_t) user;
         gFloaterTools->setEditTool( LLToolBrushLand::getInstance() );
         gSavedSettings.setS32("RadioLandBrushAction", mode);
-        gSavedSettings.setBOOL("ShowParcelOwners", show_owners);
-}
-
-void click_popup_dozer_size(LLUICtrl *, void *user)
-{
-        S32 size = (S32)(intptr_t) user;
-        gSavedSettings.setS32("RadioLandBrushSize", size);
 }
 
-void click_dozer_size(LLUICtrl *ctrl, void *user)
+void commit_slider_dozer_size(LLUICtrl *ctrl, void*)
 {
-        S32 size = ((LLComboBox*) ctrl)->getCurrentIndex();
-        gSavedSettings.setS32("RadioLandBrushSize", size);
+        S32 size = (S32)ctrl->getValue().asInteger();
+        gSavedSettings.setS32("LandBrushSize", size);
 }
 
 void commit_slider_dozer_force(LLUICtrl *ctrl, void*)
diff --git a/linden/indra/newview/llfloatertools.h b/linden/indra/newview/llfloatertools.h
index a75aa87..c4d6337 100644
--- a/linden/indra/newview/llfloatertools.h
+++ b/linden/indra/newview/llfloatertools.h
@@ -168,11 +168,10 @@ public:
         LLCheckBoxCtrl  *mRadioDozerSmooth;
         LLCheckBoxCtrl  *mRadioDozerNoise;
         LLCheckBoxCtrl  *mRadioDozerRevert;
+        LLSlider                *mSliderDozerSize;
         LLSlider                *mSliderDozerForce;
-
-        LLComboBox              *mComboDozerSize;
+        LLCheckBoxCtrl  *mCheckShowOwners;
         LLButton                *mBtnApplyToSelection;
-        LLCheckBoxCtrl  *mCheckShowOwners;
 
         std::vector<LLButton*>  mButtons;//[ 15 ];
 
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index a6693a3..5e260ec 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -1247,6 +1247,7 @@ BOOL LLFloaterIMPanel::postBuild()
                 childSetAction("end_call_btn", onClickEndCall, this);
                 childSetAction("send_btn", onClickSend, this);
                 childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
+                childSetAction("offer_tp_btn", onClickOfferTeleport, this);
 
                 childSetAction("moderator_kick_speaker", onKickSpeaker, this);
                 //LLButton* close_btn = getChild<LLButton>("close_btn");
@@ -1396,6 +1397,7 @@ void LLFloaterIMPanel::draw()
                 childSetValue("mute_btn", LLMuteList::getInstance()->isMuted(mOtherParticipantUUID, LLMute::flagVoiceChat));
                 childSetVisible("mute_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive());
         }
+
         LLFloater::draw();
 }
 
@@ -1732,6 +1734,13 @@ void LLFloaterIMPanel::onTabClick(void* userdata)
         self->setInputFocus(TRUE);
 }
 
+// static
+void LLFloaterIMPanel::onClickOfferTeleport(void* userdata)
+{
+        LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
+
+        handle_lure(self->mOtherParticipantUUID);
+}
 
 // static
 void LLFloaterIMPanel::onClickProfile( void* userdata )
diff --git a/linden/indra/newview/llimpanel.h b/linden/indra/newview/llimpanel.h
index 974fc4d..5bac0bd 100644
--- a/linden/indra/newview/llimpanel.h
+++ b/linden/indra/newview/llimpanel.h
@@ -231,6 +231,7 @@ public:
 
         static void             onClickProfile( void* userdata );
         static void             onClickGroupInfo( void* userdata );
+        static void             onClickOfferTeleport( void* userdata );
         static void             onClickClose( void* userdata );
         static void             onClickStartCall( void* userdata );
         static void             onClickEndCall( void* userdata );
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index d0aad25..1087fd8 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -50,6 +50,7 @@
 #include "llui.h"
 #include "llviewercontrol.h"
 #include "llviewerimagelist.h"
+#include "llviewerjoystick.h"
 #include "llviewermedia.h"
 #include "llviewermenu.h"       // handle_reset_view()
 #include "llviewermedia.h"
@@ -120,6 +121,7 @@ BOOL LLOverlayBar::postBuild()
 {
         childSetAction("IM Received",onClickIMReceived,this);
         childSetAction("Set Not Busy",onClickSetNotBusy,this);
+        childSetAction("Flycam",onClickFlycam,this);
         childSetAction("Mouselook",onClickMouselook,this);
         childSetAction("Stand Up",onClickStandUp,this);
         childSetVisible("chat_bar", gSavedSettings.getBOOL("ChatVisible"));
@@ -209,6 +211,16 @@ void LLOverlayBar::refresh()
                 buttons_changed = TRUE;
         }
 
+        BOOL flycam = LLViewerJoystick::getInstance()->getOverrideCamera();
+        button = getChild<LLButton>("Flycam");
+        if (button && button->getVisible() != flycam)
+        {
+                button->setVisible(flycam);
+                sendChildToFront(button);
+                moveChildToBackOfTabGroup(button);
+                buttons_changed = TRUE;
+        }               
+
         BOOL mouselook_grabbed;
         mouselook_grabbed = gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_DOWN_INDEX)
                 || gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX);
@@ -284,6 +296,12 @@ void LLOverlayBar::onClickSetNotBusy(void*)
 
 
 // static
+void LLOverlayBar::onClickFlycam(void*)
+{
+        LLViewerJoystick::getInstance()->toggleFlycam();
+}
+
+// static
 void LLOverlayBar::onClickResetView(void* data)
 {
         handle_reset_view();
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 907441e..5880ff0 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -68,6 +68,7 @@ public:
         
         static void onClickIMReceived(void* data);
         static void onClickSetNotBusy(void* data);
+        static void onClickFlycam(void* data);
         static void onClickMouselook(void* data);
         static void onClickStandUp(void* data);
         static void onClickResetView(void* data);
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index 7b21a15..76dbd1f 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1318,7 +1318,7 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
         }
         else
         {
-                childSetEnabled("Offer Teleport...", (online_status == ONLINE_STATUS_YES));
+                childSetEnabled("Offer Teleport...", TRUE);
                 childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString());
         }
 }
diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp
index c1e9ab3..0b3ba52 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -37,10 +37,13 @@
 
 #include "llagent.h"
 #include "llbutton.h"
+#include "llcheckboxctrl.h"
 #include "llfloaterland.h"
 #include "lltextbox.h"
+#include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
+#include "llviewerwindow.h"
 #include "roles_constants.h"
 
 #include "lluictrlfactory.h"
@@ -65,6 +68,10 @@ BOOL	LLPanelLandInfo::postBuild()
         childSetAction("button subdivide land",onClickDivide,this);
         childSetAction("button join land",onClickJoin,this);
         childSetAction("button about land",onClickAbout,this);
+        childSetAction("button show owners help", onShowOwnersHelp, this);
+
+        mCheckShowOwners = getChild<LLCheckBoxCtrl>("checkbox show owners");
+        childSetValue("checkbox show owners", gSavedSettings.getBOOL("ShowParcelOwners"));
 
         return TRUE;
 }
@@ -72,7 +79,8 @@ BOOL	LLPanelLandInfo::postBuild()
 // Methods
 //
 LLPanelLandInfo::LLPanelLandInfo(const std::string& name)
-:       LLPanel(name)
+:       LLPanel(name),
+        mCheckShowOwners(NULL)
 {
         if (!sInstance)
         {
@@ -255,3 +263,19 @@ void LLPanelLandInfo::onClickAbout(void*)
 
         LLFloaterLand::showInstance();
 }
+
+void LLPanelLandInfo::onShowOwnersHelp(void* user_data)
+{
+        LLPanelLandInfo* self = static_cast<LLPanelLandInfo*>(user_data);
+
+        const char* xml_alert = "ShowOwnersHelp";
+        LLAlertDialog* dialogp = gViewerWindow->alertXml(xml_alert);
+        if (dialogp)
+        {
+                LLFloater* root_floater = gFloaterView->getParentFloater(self);
+                if (root_floater)
+                {
+                        root_floater->addDependentFloater(dialogp);
+                }
+        }       
+}
diff --git a/linden/indra/newview/llpanelland.h b/linden/indra/newview/llpanelland.h
index c83bf2c..c44cb9d 100644
--- a/linden/indra/newview/llpanelland.h
+++ b/linden/indra/newview/llpanelland.h
@@ -50,6 +50,8 @@ public:
 
         void refresh();
         static void refreshAll();
+        
+        LLCheckBoxCtrl  *mCheckShowOwners;
 
 protected:
         static void onClickClaim(void*);
@@ -57,6 +59,7 @@ protected:
         static void onClickDivide(void*);
         static void onClickJoin(void*);
         static void onClickAbout(void*);
+        static void onShowOwnersHelp(void*);
 
 protected:
         //LLTextBox*            mTextPriceLabel;
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index 9022c14..cc9d969 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -830,7 +830,7 @@ void LLPanelObject::getState( )
         BOOL top_shear_x_visible                = TRUE;
         BOOL top_shear_y_visible                = TRUE;
         BOOL twist_visible                              = TRUE;
-        BOOL advanced_cut_visible               = FALSE;
+        BOOL advanced_cut_visible               = TRUE;
         BOOL taper_visible                              = FALSE;
         BOOL skew_visible                               = FALSE;
         BOOL radius_offset_visible              = FALSE;
@@ -841,6 +841,7 @@ void LLPanelObject::getState( )
         F32      twist_inc                                      = OBJECT_TWIST_LINEAR_INC;
 
         BOOL advanced_is_dimple = FALSE;
+        BOOL advanced_is_slice = FALSE;
         BOOL size_is_hole = FALSE;
 
         // Tune based on overall volume type
@@ -854,6 +855,7 @@ void LLPanelObject::getState( )
                 //twist_visible                 = FALSE;
                 advanced_cut_visible    = TRUE;
                 advanced_is_dimple              = TRUE;
+                advanced_is_slice               = FALSE;
                 twist_min                               = OBJECT_TWIST_MIN;
                 twist_max                               = OBJECT_TWIST_MAX;
                 twist_inc                               = OBJECT_TWIST_INC;
@@ -867,6 +869,7 @@ void LLPanelObject::getState( )
                 size_is_hole                    = TRUE;
                 skew_visible                    = TRUE;
                 advanced_cut_visible    = TRUE;
+                advanced_is_slice               = FALSE;
                 taper_visible                   = TRUE;
                 radius_offset_visible   = TRUE;
                 revolutions_visible             = TRUE;
@@ -894,8 +897,20 @@ void LLPanelObject::getState( )
                 break;
                 
         case MI_BOX:
+                advanced_cut_visible    = TRUE;
+                advanced_is_slice               = TRUE;
+                break;
+
         case MI_CYLINDER:
+                advanced_cut_visible    = TRUE;
+                advanced_is_slice               = TRUE;
+                break;
+
         case MI_PRISM:
+                advanced_cut_visible    = TRUE;
+                advanced_is_slice               = TRUE;
+                break;
+
         default:
                 break;
         }
@@ -987,6 +1002,8 @@ void LLPanelObject::getState( )
 
         childSetVisible("advanced_cut", FALSE);
         childSetVisible("advanced_dimple", FALSE);
+        childSetVisible("advanced_slice", FALSE);
+
         if (advanced_cut_visible)
         {
                 if (advanced_is_dimple)
@@ -994,6 +1011,12 @@ void LLPanelObject::getState( )
                         childSetVisible("advanced_dimple", TRUE);
                         childSetEnabled("advanced_dimple", enabled);
                 }
+
+                else if (advanced_is_slice)
+                {
+                        childSetVisible("advanced_slice", TRUE);
+                        childSetEnabled("advanced_slice", enabled);
+                }
                 else
                 {
                         childSetVisible("advanced_cut", TRUE);
@@ -1889,6 +1912,7 @@ void LLPanelObject::clearCtrls()
         childSetEnabled("scale_taper", FALSE);
         childSetEnabled( "advanced_cut", FALSE );
         childSetEnabled( "advanced_dimple", FALSE );
+        childSetVisible("advanced_slice", FALSE);
 }
 
 //
diff --git a/linden/indra/newview/lltoolbrush.cpp b/linden/indra/newview/lltoolbrush.cpp
index 0869cf3..214d773 100644
--- a/linden/indra/newview/lltoolbrush.cpp
+++ b/linden/indra/newview/lltoolbrush.cpp
@@ -96,7 +96,7 @@ LLToolBrushLand::LLToolBrushLand()
         mGotHover(FALSE),
         mBrushSelected(FALSE)
 {
-        mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize");
+        mBrushIndex = gSavedSettings.getS32("LandBrushSize");
 }
 
 void LLToolBrushLand::modifyLandAtPointGlobal(const LLVector3d &pos_global,
@@ -447,7 +447,7 @@ void LLToolBrushLand::render()
                         spot.mdV[VX] = floor( spot.mdV[VX] + 0.5 );
                         spot.mdV[VY] = floor( spot.mdV[VY] + 0.5 );
 
-                        mBrushIndex = gSavedSettings.getS32("RadioLandBrushSize");
+                        mBrushIndex = gSavedSettings.getS32("LandBrushSize");
                         region_list_t regions;
                         determineAffectedRegions(regions, spot);
 
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index c2a8055..5e67712 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -86,6 +86,7 @@
 #include "llfloateravatarinfo.h"
 #include "llfloateravatartextures.h"
 #include "llfloaterbuildoptions.h"
+#include "llfloaterbulkpermission.h"
 #include "llfloaterbump.h"
 #include "llfloaterbuy.h"
 #include "llfloaterbuycontents.h"
@@ -671,10 +672,13 @@ void init_menus()
         // TomY TODO convert these two
         LLMenuGL*menu;
 
+        // Advanced (Client) menu is XUI now! \o/
+        /*
         menu = new LLMenuGL(CLIENT_MENU_NAME);
         init_client_menu(menu);
         gMenuBarView->appendMenu( menu );
         menu->updateParent(LLMenuGL::sMenuContainer);
+        */
 
         menu = new LLMenuGL(SERVER_MENU_NAME);
         init_server_menu(menu);
@@ -6066,6 +6070,18 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
         }
 }
 
+
+class LLToolsSetBulkPerms : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloaterBulkPermission* queue = NULL;
+                queue = LLFloaterBulkPermission::create();
+                return true;
+        }
+};
+
+
 class LLToolsSelectedScriptAction : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -7582,7 +7598,2146 @@ class LLWorldDayCycle : public view_listener_t
 
 
 
-static void addMenu(view_listener_t *menu, const std::string& name)
+//-------------------------------------------------------------------
+// Advanced menu
+//-------------------------------------------------------------------
+
+
+///////////////////
+// SHOW CONSOLES //
+///////////////////
+
+
+class LLAdvancedToggleConsole : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string console_type = userdata.asString();
+                if ("frame" == console_type)
+                {
+                        toggle_visibility( (void*)gDebugView->mFrameStatView );
+                }
+                else if ("texture" == console_type)
+                {
+                        toggle_visibility( (void*)gTextureView );
+                }
+                else if ("debug" == console_type)
+                {
+                        toggle_visibility( (void*)((LLView*)gDebugView->mDebugConsolep) );
+                }
+                else if ("fast timers" == console_type)
+                {
+                        toggle_visibility( (void*)gDebugView->mFastTimerView );
+                }
+                else if ("memory" == console_type)
+                {
+                        toggle_visibility( (void*)gDebugView->mMemoryView );
+                }
+                return true;
+        }
+};
+
+
+class LLAdvancedCheckConsole : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string console_type = userdata["data"].asString();
+                bool new_value = false;
+                if ("frame" == console_type)
+                {
+                        new_value = get_visibility( (void*)gDebugView->mFrameStatView );
+                }
+                else if ("texture" == console_type)
+                {
+                        new_value = get_visibility( (void*)gTextureView );
+                }
+                else if ("debug" == console_type)
+                {
+                        new_value = get_visibility( (void*)((LLView*)gDebugView->mDebugConsolep) );
+                }
+                else if ("fast timers" == console_type)
+                {
+                        new_value = get_visibility( (void*)gDebugView->mFastTimerView );
+                }
+                else if ("memory" == console_type)
+                {
+                        new_value = get_visibility( (void*)gDebugView->mMemoryView );
+                }
+
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+
+//////////////////////////
+// DUMP INFO TO CONSOLE //
+//////////////////////////
+
+
+class LLAdvancedDumpInfoToConsole : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string info_type = userdata.asString();
+                if ("region" == info_type)
+                {
+                        handle_region_dump_settings(NULL);
+                }
+                else if ("group" == info_type)
+                {
+                        handle_dump_group_info(NULL);
+                }
+                else if ("capabilities" == info_type)
+                {
+                        handle_dump_capabilities_info(NULL);
+                }
+                return true;
+        }
+};
+
+
+
+///////////////////////////////
+// RELOAD SETTINGS OVERRIDES //
+///////////////////////////////
+
+
+class LLAdvancedReloadSettingsOverrides : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                reload_personal_settings_overrides(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////
+// HUD INFO //
+//////////////
+
+
+class LLAdvancedToggleHUDInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string info_type = userdata.asString();
+                if ("velocity" == info_type)
+                {
+                        toggle_visibility( (void*)gVelocityBar );
+                }
+                else if ("camera" == info_type)
+                {
+                        gDisplayCameraPos = !(gDisplayCameraPos);
+                }
+                else if ("wind" == info_type)
+                {
+                        gDisplayWindInfo = !(gDisplayWindInfo);
+                }
+                else if ("fov" == info_type)
+                {
+                        gDisplayFOV = !(gDisplayFOV);
+                }
+                return true;
+        }
+};
+
+class LLAdvancedCheckHUDInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string info_type = userdata["data"].asString();
+                bool new_value = false;
+                if ("velocity" == info_type)
+                {
+                        new_value = get_visibility( (void*)gVelocityBar );
+                }
+                else if ("camera" == info_type)
+                {
+                        new_value = gDisplayCameraPos;
+                }
+                else if ("wind" == info_type)
+                {
+                        new_value = gDisplayWindInfo;
+                }
+                else if ("fov" == info_type)
+                {
+                        new_value = gDisplayFOV;
+                }
+
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// CLEAR GROUP CACHE //
+///////////////////////
+
+
+class LLAdvancedClearGroupCache : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLGroupMgr::debugClearAllGroups(NULL);
+                return true;
+        }
+};
+
+
+
+
+/////////////////
+// RENDER TYPE //
+/////////////////
+
+
+U32 render_type_from_string(std::string render_type)
+{
+        if ("simple" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_SIMPLE;
+        }
+        else if ("alpha" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_ALPHA;
+        }
+        else if ("tree" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_TREE;
+        }
+        else if ("avatar" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_AVATAR;
+        }
+        else if ("terrain" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_TERRAIN;
+        }
+        else if ("sky" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_SKY;
+        }
+        else if ("water" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_WATER;
+        }
+        else if ("ground" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_GROUND;
+        }
+        else if ("volume" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_VOLUME;
+        }
+        else if ("grass" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_GRASS;
+        }
+        else if ("clouds" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_CLOUDS;
+        }
+        else if ("particles" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_PARTICLES;
+        }
+        else if ("bump" == render_type)
+        {
+                return LLPipeline::RENDER_TYPE_BUMP;
+        }
+        else
+        {
+                return 0;
+        }
+}
+
+
+class LLAdvancedToggleRenderType : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 render_type = render_type_from_string( userdata.asString() );
+                if ( render_type != 0 )
+                {
+                        LLPipeline::toggleRenderTypeControl( (void*)render_type );
+                }
+                return true;
+        }
+};
+
+
+class LLAdvancedCheckRenderType : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 render_type = render_type_from_string( userdata["data"].asString() );
+                bool new_value = false;
+
+                if ( render_type != 0 )
+                {
+                        new_value = LLPipeline::hasRenderTypeControl( (void*)render_type );
+                }
+                
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////
+// FEATURE //
+/////////////
+
+
+U32 feature_from_string(std::string feature)
+{
+        if ("ui" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_UI;
+        }
+        else if ("selected" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_SELECTED;
+        }
+        else if ("highlighted" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_HIGHLIGHTED;
+        }
+        else if ("dynamic textures" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_DYNAMIC_TEXTURES;
+        }
+        else if ("foot shadows" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_FOOT_SHADOWS;
+        }
+        else if ("fog" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_FOG;
+        }
+        else if ("palette" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_PALETTE;
+        }
+        else if ("fr info" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_FR_INFO;
+        }
+        else if ("flexible" == feature)
+        {
+                return LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE;
+        }
+        else
+        {
+                return 0;
+        }
+};
+
+
+class LLAdvancedToggleFeature : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 feature = feature_from_string( userdata.asString() );
+
+                if ( feature != 0 )
+                {
+                        LLPipeline::toggleRenderDebugFeature( (void*)feature );
+                }
+
+                return true;
+        }
+};
+
+
+class LLAdvancedCheckFeature : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 feature = feature_from_string( userdata["data"].asString() );
+                bool new_value = false;
+
+                if ( feature != 0 )
+                {
+                        new_value = LLPipeline::toggleRenderDebugFeatureControl( (void*)feature );
+                }
+                
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////
+// INFO DISPLAY //
+//////////////////
+
+
+U32 info_display_from_string(std::string info_display)
+{
+        if ("verify" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_VERIFY;
+        }
+        else if ("bboxes" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_BBOXES;
+        }
+        else if ("points" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_POINTS;
+        }
+        else if ("octree" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_OCTREE;
+        }
+        else if ("occlusion" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_OCCLUSION;
+        }
+        else if ("render batches" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_BATCH_SIZE;
+        }
+        else if ("texture anim" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_TEXTURE_ANIM;
+        }
+        else if ("texture priority" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY;
+        }
+        else if ("shame" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_SHAME;
+        }
+        else if ("texture area" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_TEXTURE_AREA;
+        }
+        else if ("face area" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_FACE_AREA;
+        }
+        else if ("picking" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_PICKING;
+        }
+        else if ("lights" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_LIGHTS;
+        }
+        else if ("particles" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_PARTICLES;
+        }
+        else if ("composition" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_COMPOSITION;
+        }
+        else if ("glow" == info_display)
+        {
+                return LLPipeline::RENDER_DEBUG_GLOW;
+        }
+        else
+        {
+                return 0;
+        }
+};
+
+
+class LLAdvancedToggleInfoDisplay : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 info_display = info_display_from_string( userdata.asString() );
+
+                if ( info_display != 0 )
+                {
+                        LLPipeline::toggleRenderDebug( (void*)info_display );
+                }
+
+                return true;
+        }
+};
+
+
+class LLAdvancedCheckInfoDisplay : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                U32 info_display = info_display_from_string( userdata["data"].asString() );
+                bool new_value = false;
+
+                if ( info_display != 0 )
+                {
+                        new_value = LLPipeline::toggleRenderDebugControl( (void*)info_display );
+                }
+                
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////
+// SELECT BUFFER //
+///////////////////
+
+
+class LLAdvancedToggleSelectBuffer : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugSelect = !(gDebugSelect);
+                return true;
+        }
+};
+
+class LLAdvancedCheckSelectBuffer : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugSelect;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// RANDOMIZE FRAMERATE //
+/////////////////////////
+
+
+class LLAdvancedToggleRandomizeFramerate : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gRandomizeFramerate = !(gRandomizeFramerate);
+                return true;
+        }
+};
+
+class LLAdvancedCheckRandomizeFramerate : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gRandomizeFramerate;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// PERIODIC SLOW FRAME //
+/////////////////////////
+
+
+class LLAdvancedTogglePeriodicSlowFrame : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gPeriodicSlowFrame = !(gPeriodicSlowFrame);
+                return true;
+        }
+};
+
+class LLAdvancedCheckPeriodicSlowFrame : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gPeriodicSlowFrame;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////
+// FRAME TEST //
+////////////////
+
+
+class LLAdvancedToggleFrameTest : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLPipeline::sRenderFrameTest = !(LLPipeline::sRenderFrameTest);
+                return true;
+        }
+};
+
+class LLAdvancedCheckFrameTest : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLPipeline::sRenderFrameTest;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////////
+// HIDE SELECTED OBJECTS //
+///////////////////////////
+
+
+class LLAdvancedToggleHideSelectedObjects : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gHideSelectedObjects = !(gHideSelectedObjects);
+                return true;
+        }
+};
+
+class LLAdvancedCheckHideSelectedObjects : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gHideSelectedObjects;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////////
+// SELECTED TEXTURE INFO //
+///////////////////////////
+
+
+class LLAdvancedSelectedTextureInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_selected_texture_info(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// TOGGLE WIREFRAME //
+//////////////////////
+
+
+class LLAdvancedToggleWireframe : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gUseWireframe = !(gUseWireframe);
+                return true;
+        }
+};
+
+class LLAdvancedCheckWireframe : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gUseWireframe;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// DISABLE TEXTURES //
+//////////////////////
+
+
+class LLAdvancedToggleDisableTextures : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                menu_toggle_variable((void*)&LLViewerImage::sDontLoadVolumeTextures);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDisableTextures : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = menu_check_variable((void*)&LLViewerImage::sDontLoadVolumeTextures);
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////////////////////////
+// RENDER ATTACHED LIGHTS / PARTICLES //
+////////////////////////////////////////
+
+
+class LLToggleRenderAttachedLights : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+    menu_toggle_control((void *)"RenderAttachedLights");
+    LLPipeline::sRenderAttachedLights = gSavedSettings.getBOOL("RenderAttachedLights");
+                return true;
+        }
+};
+
+class LLToggleRenderAttachedParticles : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+    menu_toggle_control((void *)"RenderAttachedParticles");
+    LLPipeline::sRenderAttachedParticles = gSavedSettings.getBOOL("RenderAttachedParticles");
+                return true;
+        }
+};
+
+
+
+//////////////////////////
+// DUMP SCRIPTED CAMERA //
+//////////////////////////
+
+
+class LLAdvancedDumpScriptedCamera : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_dump_followcam(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////////////
+// DUMP REGION OBJECT CACHE //
+//////////////////////////////
+
+
+class LLAdvancedDumpRegionObjectCache : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_dump_region_object_cache(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////
+// SLURL TEST //
+////////////////
+
+
+class LLAdvancedSLURLTest : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_slurl_test(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////////
+// TOGGLE EDITABLE UI //
+////////////////////////
+
+
+class LLAdvancedToggleEditableUI : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                edit_ui(NULL);
+                return true;
+        }
+};
+
+// *TODO: Add corresponding "Check" for EditableUI, so it can
+// become a menu_item_check. Need to add check_edit_ui(void*)
+// or functional equivalent to do that.
+
+
+
+//////////////////////
+// ASYNC KEYSTROKES //
+//////////////////////
+
+
+class LLAdvancedToggleAsyncKeystrokes : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gHandleKeysAsync = !(gHandleKeysAsync);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAsyncKeystrokes : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gHandleKeysAsync;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////
+// DUMP SELECT MGR //
+/////////////////////
+
+
+class LLAdvancedDumpSelectMgr : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                dump_select_mgr(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////
+// DUMP INVENTORY //
+////////////////////
+
+
+class LLAdvancedDumpInventory : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                dump_inventory(NULL);
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// DUMP FOCUS HOLDER //
+///////////////////////
+
+
+class LLAdvancedDumpFocusHolder : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_dump_focus(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////////////////
+// PRINT SELECTED OBJECT INFO //
+////////////////////////////////
+
+
+class LLAdvancedPrintSelectedObjectInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                print_object_info(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// PRINT AGENT INFO //
+//////////////////////
+
+
+class LLAdvancedPrintAgentInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                print_agent_nvpairs(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////////////////
+// PRINT TEXTURE MEMORY STATS //
+////////////////////////////////
+
+
+class LLAdvancedPrintTextureMemoryStats : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                output_statistics(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// DEBUG SELECT MGR //
+//////////////////////
+
+
+class LLAdvancedToggleDebugSelectMgr : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugSelectMgr = !(gDebugSelectMgr);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugSelectMgr : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugSelectMgr;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////
+// DEBUG CLICKS //
+//////////////////
+
+
+class LLAdvancedToggleDebugClicks : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugClicks = !(gDebugClicks);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugClicks : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugClicks;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////
+// DEBUG VIEWS //
+/////////////////
+
+
+class LLAdvancedToggleDebugViews : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLView::sDebugRects = !(LLView::sDebugRects);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugViews : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLView::sDebugRects;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// XUI NAME TOOLTIPS //
+///////////////////////
+
+
+class LLAdvancedToggleXUINameTooltips : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                toggle_show_xui_names(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedCheckXUINameTooltips : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = check_show_xui_names(NULL);
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////////
+// DEBUG MOUSE EVENTS //
+////////////////////////
+
+
+class LLAdvancedToggleDebugMouseEvents : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLView::sDebugMouseHandling = !(LLView::sDebugMouseHandling);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugMouseEvents : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLView::sDebugMouseHandling;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////
+// DEBUG KEYS //
+////////////////
+
+
+class LLAdvancedToggleDebugKeys : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLView::sDebugKeys = !(LLView::sDebugKeys);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugKeys : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLView::sDebugKeys;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// DEBUG WINDOW PROC //
+///////////////////////
+
+
+class LLAdvancedToggleDebugWindowProc : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugWindowProc = !(gDebugWindowProc);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugWindowProc : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugWindowProc;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////////////
+// DEBUG TEXT EDITOR TIPS //
+////////////////////////////
+
+
+class LLAdvancedToggleDebugTextEditorTips : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugTextEditorTips = !(gDebugTextEditorTips);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugTextEditorTips : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugTextEditorTips;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// SHOW FLOATER TEST //
+///////////////////////
+
+
+class LLAdvancedShowFloaterTest : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloaterTest::show(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// EXPORT MENUS TO XML //
+/////////////////////////
+
+
+class LLAdvancedExportMenusToXML : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_export_menus_to_xml(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////
+// EDIT UI //
+/////////////
+
+
+class LLAdvancedEditUI : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloaterEditUI::show(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// LOAD UI FROM XML //
+//////////////////////
+
+
+class LLAdvancedLoadUIFromXML : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_load_from_xml(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////
+// SAVE UI TO XML //
+////////////////////
+
+
+class LLAdvancedSaveUIToXML : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_save_to_xml(NULL);
+                return true;
+        }
+};
+
+
+
+///////////////
+// XUI NAMES //
+///////////////
+
+
+class LLAdvancedToggleXUINames : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                toggle_show_xui_names(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedCheckXUINames : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = check_show_xui_names(NULL);
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////////
+// GRAB BAKED TEXTURE //
+////////////////////////
+
+
+class LLAdvancedGrabBakedTexture : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string texture_type = userdata.asString();
+                if ("eyes" == texture_type)
+                {
+                        handle_grab_texture( (void*)LLVOAvatar::TEX_EYES_BAKED );
+                }
+                else if ("head" == texture_type)
+                {
+                        handle_grab_texture( (void*)LLVOAvatar::TEX_HEAD_BAKED );
+                }
+                else if ("upper" == texture_type)
+                {
+                        handle_grab_texture( (void*)LLVOAvatar::TEX_UPPER_BAKED );
+                }
+                else if ("lower" == texture_type)
+                {
+                        handle_grab_texture( (void*)LLVOAvatar::TEX_SKIRT_BAKED );
+                }
+                else if ("skirt" == texture_type)
+                {
+                        handle_grab_texture( (void*)LLVOAvatar::TEX_SKIRT_BAKED );
+                }
+
+                return true;
+        }
+};
+
+class LLAdvancedEnableGrabBakedTexture : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string texture_type = userdata["data"].asString();
+                bool new_value = false;
+
+                if ("iris" == texture_type)
+                {
+                        new_value = enable_grab_texture( (void*)LLVOAvatar::TEX_EYES_BAKED );
+                }
+                else if ("head" == texture_type)
+                {
+                        new_value = enable_grab_texture( (void*)LLVOAvatar::TEX_HEAD_BAKED );
+                }
+                else if ("upper" == texture_type)
+                {
+                        new_value = enable_grab_texture( (void*)LLVOAvatar::TEX_UPPER_BAKED );
+                }
+                else if ("lower" == texture_type)
+                {
+                        new_value = enable_grab_texture( (void*)LLVOAvatar::TEX_LOWER_BAKED );
+                }
+                else if ("skirt" == texture_type)
+                {
+                        new_value = enable_grab_texture( (void*)LLVOAvatar::TEX_SKIRT_BAKED );
+                }
+                
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// ALLOW IDLE / AFK //
+//////////////////////
+
+
+class LLAdvancedToggleAllowIdleAFK : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gAllowIdleAFK = !(gAllowIdleAFK);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAllowIdleAFK : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gAllowIdleAFK;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////
+// APPEARANCE TO XML //
+///////////////////////
+
+
+class LLAdvancedAppearanceToXML : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::dumpArchetypeXML(NULL);
+                return true;
+        }
+};
+
+
+
+///////////////////////////////
+// TOGGLE CHARACTER GEOMETRY //
+///////////////////////////////
+
+
+class LLAdvancedToggleCharacterGeometry : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_god_request_avatar_geometry(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedEnableCharacterGeometry : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                enable_god_customer_service(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////////////////
+// TEST MALE / TEST FEMALE //
+/////////////////////////////
+
+
+class LLAdvancedTestMale : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_test_male(NULL);
+                return true;
+        }
+};
+
+
+class LLAdvancedTestFemale : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_test_female(NULL);
+                return true;
+        }
+};
+
+
+
+///////////////
+// TOGGLE PG //
+///////////////
+
+
+class LLAdvancedTogglePG : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_toggle_pg(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// ALLOW SELECT AVATAR //
+/////////////////////////
+
+
+class LLAdvancedToggleAllowSelectAvatar : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gAllowSelectAvatar = !(gAllowSelectAvatar);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAllowSelectAvatar : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gAllowSelectAvatar;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////////////
+// ALLOW TAP-TAP-HOLD RUN //
+////////////////////////////
+
+
+class LLAdvancedToggleAllowTapTapHoldRun : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gAllowTapTapHoldRun = !(gAllowTapTapHoldRun);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAllowTapTapHoldRun : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gAllowTapTapHoldRun;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////////
+// FORCE PARAMS TO DEFAULT //
+/////////////////////////////
+
+
+class LLAdvancedForceParamsToDefault : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLAgent::clearVisualParams(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////////
+// RELOAD VERTEX SHADER //
+//////////////////////////
+
+
+class LLAdvancedReloadVertexShader : public view_listener_t
+{
+  bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+  {
+    reload_vertex_shader(NULL);
+    return true;
+  }
+};
+
+
+
+////////////////////
+// ANIMATION INFO //
+////////////////////
+
+
+class LLAdvancedToggleAnimationInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::sShowAnimationDebug = !(LLVOAvatar::sShowAnimationDebug);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAnimationInfo : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLVOAvatar::sShowAnimationDebug;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////////////
+// SLOW MOTION ANIMATIONS //
+////////////////////////////
+
+
+class LLAdvancedToggleSlowMotionAnimations : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                slow_mo_animations(NULL);
+                return true;
+        }
+};
+
+// *TODO: Add a corresponding "Check" event for SlowMotionAnimations,
+// so that it can become a menu_item_check with the "X" indicator.
+// See indra/newview/skins/xui/en_us/menu_viewer.xml
+
+
+
+//////////////////
+// SHOW LOOK AT //
+//////////////////
+
+
+class LLAdvancedToggleShowLookAt : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLHUDEffectLookAt::sDebugLookAt = !(LLHUDEffectLookAt::sDebugLookAt);
+                return true;
+        }
+};
+
+class LLAdvancedCheckShowLookAt : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLHUDEffectLookAt::sDebugLookAt;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////
+// SHOW POINT AT //
+///////////////////
+
+
+class LLAdvancedToggleShowPointAt : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLHUDEffectPointAt::sDebugPointAt = !(LLHUDEffectPointAt::sDebugPointAt);
+                return true;
+        }
+};
+
+class LLAdvancedCheckShowPointAt : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLHUDEffectPointAt::sDebugPointAt;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// DEBUG JOINT UPDATES //
+/////////////////////////
+
+
+class LLAdvancedToggleDebugJointUpdates : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::sJointDebug = !(LLVOAvatar::sJointDebug);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugJointUpdates : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLVOAvatar::sJointDebug;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////
+// DISABLE LOD //
+/////////////////
+
+
+class LLAdvancedToggleDisableLOD : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLViewerJoint::sDisableLOD = !(LLViewerJoint::sDisableLOD);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDisableLOD : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLViewerJoint::sDisableLOD;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// DEBUG CHARACTER VIS //
+/////////////////////////
+
+
+class LLAdvancedToggleDebugCharacterVis : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::sDebugInvisible = !(LLVOAvatar::sDebugInvisible);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugCharacterVis : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLVOAvatar::sDebugInvisible;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////////
+// SHOW COLLISION PLANE //
+//////////////////////////
+
+/***************************
+ *
+ *  Disabled. See DEV-14477
+ *
+ ***************************
+
+class LLAdvancedToggleShowCollisionPlane : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::sShowFootPlane = !(LLVOAvatar::sShowFootPlane);
+                return true;
+        }
+};
+
+class LLAdvancedCheckShowCollisionPlane : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLVOAvatar::sShowFootPlane;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+***************************/
+
+
+/////////////////////////////
+// SHOW COLLISION SKELETON //
+/////////////////////////////
+
+
+class LLAdvancedToggleShowCollisionSkeleton : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLVOAvatar::sShowCollisionVolumes = !(LLVOAvatar::sShowCollisionVolumes);
+                return true;
+        }
+};
+
+class LLAdvancedCheckShowCollisionSkeleton : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLVOAvatar::sShowCollisionVolumes;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////////
+// DISPLAY AGENT TARGET //
+//////////////////////////
+
+
+class LLAdvancedToggleDisplayAgentTarget : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLAgent::sDebugDisplayTarget = !(LLAgent::sDebugDisplayTarget);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDisplayAgentTarget : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLAgent::sDebugDisplayTarget;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+///////////////////////////
+// DEBUG AVATAR ROTATION //
+///////////////////////////
+
+
+class LLAdvancedToggleDebugAvatarRotation : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gDebugAvatarRotation = !(gDebugAvatarRotation);
+                return true;
+        }
+};
+
+class LLAdvancedCheckDebugAvatarRotation : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gDebugAvatarRotation;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// DUMP ATTACHMENTS //
+//////////////////////
+
+
+class LLAdvancedDumpAttachments : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_dump_attachments(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////////
+// REBAKE TEXTURES //
+/////////////////////
+
+
+class LLAdvancedRebakeTextures : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_rebake_textures(NULL);
+                return true;
+        }
+};
+
+
+
+///////////////////////////
+// DEBUG AVATAR TEXTURES //
+///////////////////////////
+
+
+class LLAdvancedDebugAvatarTextures : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_debug_avatar_textures(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////////////////
+// DUMP AVATAR LOCAL TEXTURES //
+////////////////////////////////
+
+
+class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_dump_avatar_local_textures(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////
+// MESSAGE LOG //
+/////////////////
+
+
+class LLAdvancedEnableMessageLog : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_viewer_enable_message_log(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedDisableMessageLog : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_viewer_disable_message_log(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////
+// DROP PACKET //
+/////////////////
+
+
+class LLAdvancedDropPacket : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                drop_packet(NULL);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// FRAME STATS LOGGING //
+/////////////////////////
+
+
+class LLAdvancedFrameStatsLogging : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string command = userdata.asString();
+                if ("start logging" == command)
+                {
+                        LLFrameStats::startLogging(NULL);
+                }
+                else if ("stop logging" == command)
+                {
+                        LLFrameStats::stopLogging(NULL);
+                }
+                else if ("timed logging 10" == command)
+                {
+                        LLFrameStats::timedLogging10(NULL);
+                }
+                else if ("timed logging 30" == command)
+                {
+                        LLFrameStats::timedLogging30(NULL);
+                }
+                else if ("timed logging 60" == command)
+                {
+                        LLFrameStats::timedLogging60(NULL);
+                }
+
+                return true;
+        }               
+};
+
+
+
+/////////////////
+// AGENT PILOT //
+/////////////////
+
+
+class LLAdvancedAgentPilot : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                std::string command = userdata.asString();
+                if ("start playback" == command)
+                {
+                        LLAgentPilot::startPlayback(NULL);
+                }
+                else if ("stop playback" == command)
+                {
+                        LLAgentPilot::stopPlayback(NULL);
+                }
+                else if ("start record" == command)
+                {
+                        LLAgentPilot::startRecord(NULL);
+                }
+                else if ("stop record" == command)
+                {
+                        LLAgentPilot::saveRecord(NULL);
+                }
+
+                return true;
+        }               
+};
+
+
+
+//////////////////////
+// AGENT PILOT LOOP //
+//////////////////////
+
+
+class LLAdvancedToggleAgentPilotLoop : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLAgentPilot::sLoop = !(LLAgentPilot::sLoop);
+                return true;
+        }
+};
+
+class LLAdvancedCheckAgentPilotLoop : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLAgentPilot::sLoop;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+/////////////////////////
+// SHOW OBJECT UPDATES //
+/////////////////////////
+
+
+class LLAdvancedToggleShowObjectUpdates : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                gShowObjectUpdates = !(gShowObjectUpdates);
+                return true;
+        }
+};
+
+class LLAdvancedCheckShowObjectUpdates : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = gShowObjectUpdates;
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+////////////////////
+// COMPRESS IMAGE //
+////////////////////
+
+
+class LLAdvancedCompressImage : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_compress_image(NULL);
+                return true;
+        }
+};
+
+
+
+//////////////////////
+// CLOTHING FLOATER //
+//////////////////////
+
+
+class LLAdvancedToggleClothingFloater : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_clothing(NULL);
+                return true;
+        }
+};
+
+// There is no LLAdvancedCheckClothingFloater.
+
+
+
+/////////////////////////
+// SHOW DEBUG SETTINGS //
+/////////////////////////
+
+
+class LLAdvancedShowDebugSettings : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLFloaterSettingsDebug::show(NULL);
+                return true;
+        }
+};
+
+
+
+////////////////////////
+// VIEW ADMIN OPTIONS //
+////////////////////////
+
+
+class LLAdvancedToggleViewAdminOptions : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_admin_override_toggle(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedCheckViewAdminOptions : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = check_admin_override(NULL);
+                std::string control_name = userdata["control"].asString();
+                gMenuHolder->findControl(control_name)->setValue(new_value);
+                return true;
+        }
+};
+
+
+
+//////////////////
+// ADMIN STATUS //
+//////////////////
+
+
+class LLAdvancedRequestAdminStatus : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_god_mode(NULL);
+                return true;
+        }
+};
+
+class LLAdvancedLeaveAdminStatus : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                handle_leave_god_mode(NULL);
+                return true;
+        }
+};
+
+
+
+static void addMenu(view_listener_t *menu, const char *name)
 {
         sMenus.push_back(menu);
         menu->registerListener(gMenuHolder, name);
@@ -7691,6 +9846,7 @@ void initialize_menus()
         addMenu(new LLToolsSaveToInventory(), "Tools.SaveToInventory");
         addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory");
         addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction");
+        addMenu(new LLToolsSetBulkPerms(), "Tools.SetBulkPerms");
 
         addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie");
         addMenu(new LLToolsEnableLink(), "Tools.EnableLink");
@@ -7793,4 +9949,159 @@ void initialize_menus()
         addMenu(new LLSomethingSelectedNoHUD(), "SomethingSelectedNoHUD");
         addMenu(new LLEditableSelected(), "EditableSelected");
         addMenu(new LLEditableSelectedMono(), "EditableSelectedMono");
+
+
+        // Advanced (top level menu)
+        addMenu(new LLAdvancedToggleConsole(), "Advanced.ToggleConsole");
+        addMenu(new LLAdvancedCheckConsole(), "Advanced.CheckConsole");
+        addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole");
+        addMenu(new LLAdvancedReloadSettingsOverrides(), "Advanced.ReloadSettingsOverrides");
+
+        // Advanced > HUD Info
+        addMenu(new LLAdvancedToggleHUDInfo(), "Advanced.ToggleHUDInfo");
+        addMenu(new LLAdvancedCheckHUDInfo(), "Advanced.CheckHUDInfo");
+
+        addMenu(new LLAdvancedClearGroupCache(), "Advanced.ClearGroupCache");
+
+        // Advanced > Render > Types
+        addMenu(new LLAdvancedToggleRenderType(), "Advanced.ToggleRenderType");
+        addMenu(new LLAdvancedCheckRenderType(), "Advanced.CheckRenderType");
+
+        // Advanced > Render > Features
+        addMenu(new LLAdvancedToggleFeature(), "Advanced.ToggleFeature");
+        addMenu(new LLAdvancedCheckFeature(), "Advanced.CheckFeature");
+
+        // Advanced > Render > Info Displays
+        addMenu(new LLAdvancedToggleInfoDisplay(), "Advanced.ToggleInfoDisplay");
+        addMenu(new LLAdvancedCheckInfoDisplay(), "Advanced.CheckInfoDisplay");
+        addMenu(new LLAdvancedToggleSelectBuffer(), "Advanced.ToggleSelectBuffer");
+        addMenu(new LLAdvancedCheckSelectBuffer(), "Advanced.CheckSelectBuffer");
+        addMenu(new LLAdvancedToggleRandomizeFramerate(), "Advanced.ToggleRandomizeFramerate");
+        addMenu(new LLAdvancedCheckRandomizeFramerate(), "Advanced.CheckRandomizeFramerate");
+        addMenu(new LLAdvancedTogglePeriodicSlowFrame(), "Advanced.TogglePeriodicSlowFrame");
+        addMenu(new LLAdvancedCheckPeriodicSlowFrame(), "Advanced.CheckPeriodicSlowFrame");
+        addMenu(new LLAdvancedToggleFrameTest(), "Advanced.ToggleFrameTest");
+        addMenu(new LLAdvancedCheckFrameTest(), "Advanced.CheckFrameTest");
+        addMenu(new LLAdvancedToggleHideSelectedObjects(), "Advanced.ToggleHideSelectedObjects");
+        addMenu(new LLAdvancedCheckHideSelectedObjects(), "Advanced.CheckHideSelectedObjects");
+        addMenu(new LLAdvancedSelectedTextureInfo(), "Advanced.SelectedTextureInfo");
+        addMenu(new LLAdvancedToggleWireframe(), "Advanced.ToggleWireframe");
+        addMenu(new LLAdvancedCheckWireframe(), "Advanced.CheckWireframe");
+        addMenu(new LLAdvancedToggleDisableTextures(), "Advanced.ToggleDisableTextures");
+        addMenu(new LLAdvancedCheckDisableTextures(), "Advanced.CheckDisableTextures");
+
+        // Advanced > Render (top level menu)
+        addMenu(new LLToggleRenderAttachedLights(), "ToggleRenderAttachedLights");
+        addMenu(new LLToggleRenderAttachedParticles(), "ToggleRenderAttachedParticles");
+
+        // Advanced > World
+        addMenu(new LLAdvancedDumpScriptedCamera(), "Advanced.DumpScriptedCamera");
+        addMenu(new LLAdvancedDumpRegionObjectCache(), "Advanced.DumpRegionObjectCache");
+
+        // Advanced > UI
+        addMenu(new LLAdvancedSLURLTest(), "Advanced.SLURLTest");
+        addMenu(new LLAdvancedToggleEditableUI(), "Advanced.ToggleEditableUI");
+        //addMenu(new LLAdvancedCheckEditableUI(), "Advanced.CheckEditableUI");
+        addMenu(new LLAdvancedToggleAsyncKeystrokes(), "Advanced.ToggleAsyncKeystrokes");
+        addMenu(new LLAdvancedCheckAsyncKeystrokes(), "Advanced.CheckAsyncKeystrokes");
+        addMenu(new LLAdvancedDumpSelectMgr(), "Advanced.DumpSelectMgr");
+        addMenu(new LLAdvancedDumpInventory(), "Advanced.DumpInventory");
+        addMenu(new LLAdvancedDumpFocusHolder(), "Advanced.DumpFocusHolder");
+        addMenu(new LLAdvancedPrintSelectedObjectInfo(), "Advanced.PrintSelectedObjectInfo");
+        addMenu(new LLAdvancedPrintAgentInfo(), "Advanced.PrintAgentInfo");
+        addMenu(new LLAdvancedPrintTextureMemoryStats(), "Advanced.PrintTextureMemoryStats");
+        addMenu(new LLAdvancedToggleDebugSelectMgr(), "Advanced.ToggleDebugSelectMgr");
+        addMenu(new LLAdvancedCheckDebugSelectMgr(), "Advanced.CheckDebugSelectMgr");
+        addMenu(new LLAdvancedToggleDebugClicks(), "Advanced.ToggleDebugClicks");
+        addMenu(new LLAdvancedCheckDebugClicks(), "Advanced.CheckDebugClicks");
+        addMenu(new LLAdvancedCheckDebugViews(), "Advanced.CheckDebugViews");
+        addMenu(new LLAdvancedToggleDebugViews(), "Advanced.ToggleDebugViews");
+        addMenu(new LLAdvancedToggleXUINameTooltips(), "Advanced.ToggleXUINameTooltips");
+        addMenu(new LLAdvancedCheckXUINameTooltips(), "Advanced.CheckXUINameTooltips");
+        addMenu(new LLAdvancedToggleDebugMouseEvents(), "Advanced.ToggleDebugMouseEvents");
+        addMenu(new LLAdvancedCheckDebugMouseEvents(), "Advanced.CheckDebugMouseEvents");
+        addMenu(new LLAdvancedToggleDebugKeys(), "Advanced.ToggleDebugKeys");
+        addMenu(new LLAdvancedCheckDebugKeys(), "Advanced.CheckDebugKeys");
+        addMenu(new LLAdvancedToggleDebugWindowProc(), "Advanced.ToggleDebugWindowProc");
+        addMenu(new LLAdvancedCheckDebugWindowProc(), "Advanced.CheckDebugWindowProc");
+        addMenu(new LLAdvancedToggleDebugTextEditorTips(), "Advanced.ToggleDebugTextEditorTips");
+        addMenu(new LLAdvancedCheckDebugTextEditorTips(), "Advanced.CheckDebugTextEditorTips");
+
+        // Advanced > XUI
+        addMenu(new LLAdvancedShowFloaterTest(), "Advanced.ShowFloaterTest");
+        addMenu(new LLAdvancedExportMenusToXML(), "Advanced.ExportMenusToXML");
+        addMenu(new LLAdvancedEditUI(), "Advanced.EditUI");
+        addMenu(new LLAdvancedLoadUIFromXML(), "Advanced.LoadUIFromXML");
+        addMenu(new LLAdvancedSaveUIToXML(), "Advanced.SaveUIToXML");
+        addMenu(new LLAdvancedToggleXUINames(), "Advanced.ToggleXUINames");
+        addMenu(new LLAdvancedCheckXUINames(), "Advanced.CheckXUINames");
+
+        // Advanced > Character > Grab Baked Texture
+        addMenu(new LLAdvancedGrabBakedTexture(), "Advanced.GrabBakedTexture");
+        addMenu(new LLAdvancedEnableGrabBakedTexture(), "Advanced.EnableGrabBakedTexture");
+
+        // Advanced > Character > Character Tests
+        addMenu(new LLAdvancedToggleAllowIdleAFK(), "Advanced.ToggleAllowIdleAFK");
+        addMenu(new LLAdvancedCheckAllowIdleAFK(), "Advanced.CheckAllowIdleAFK");
+        addMenu(new LLAdvancedAppearanceToXML(), "Advanced.AppearanceToXML");
+        addMenu(new LLAdvancedToggleCharacterGeometry(), "Advanced.ToggleCharacterGeometry");
+        addMenu(new LLAdvancedTestMale(), "Advanced.TestMale");
+        addMenu(new LLAdvancedTestFemale(), "Advanced.TestFemale");
+        addMenu(new LLAdvancedTogglePG(), "Advanced.TogglePG");
+        addMenu(new LLAdvancedToggleAllowSelectAvatar(), "Advanced.ToggleAllowSelectAvatar");
+        addMenu(new LLAdvancedCheckAllowSelectAvatar(), "Advanced.CheckAllowSelectAvatar");
+
+        // Advanced > Character (toplevel)
+        addMenu(new LLAdvancedToggleAllowTapTapHoldRun(), "Advanced.ToggleAllowTapTapHoldRun");
+        addMenu(new LLAdvancedCheckAllowTapTapHoldRun(), "Advanced.CheckAllowTapTapHoldRun");
+        addMenu(new LLAdvancedForceParamsToDefault(), "Advanced.ForceParamsToDefault");
+        addMenu(new LLAdvancedReloadVertexShader(), "Advanced.ReloadVertexShader");
+        addMenu(new LLAdvancedToggleAnimationInfo(), "Advanced.ToggleAnimationInfo");
+        addMenu(new LLAdvancedCheckAnimationInfo(), "Advanced.CheckAnimationInfo");
+        addMenu(new LLAdvancedToggleSlowMotionAnimations(), "Advanced.ToggleSlowMotionAnimations");
+        //addMenu(new LLAdvancedCheckSlowMotionAnimations(), "Advanced.CheckSlowMotionAnimations");
+        addMenu(new LLAdvancedToggleShowLookAt(), "Advanced.ToggleShowLookAt");
+        addMenu(new LLAdvancedCheckShowLookAt(), "Advanced.CheckShowLookAt");
+        addMenu(new LLAdvancedToggleShowPointAt(), "Advanced.ToggleShowPointAt");
+        addMenu(new LLAdvancedCheckShowPointAt(), "Advanced.CheckShowPointAt");
+        addMenu(new LLAdvancedToggleDebugJointUpdates(), "Advanced.ToggleDebugJointUpdates");
+        addMenu(new LLAdvancedCheckDebugJointUpdates(), "Advanced.CheckDebugJointUpdates");
+        addMenu(new LLAdvancedToggleDisableLOD(), "Advanced.ToggleDisableLOD");
+        addMenu(new LLAdvancedCheckDisableLOD(), "Advanced.CheckDisableLOD");
+        addMenu(new LLAdvancedToggleDebugCharacterVis(), "Advanced.ToggleDebugCharacterVis");
+        addMenu(new LLAdvancedCheckDebugCharacterVis(), "Advanced.CheckDebugCharacterVis");
+//      addMenu(new LLAdvancedToggleShowCollisionPlane(), "Advanced.ToggleShowCollisionPlane");
+//      addMenu(new LLAdvancedCheckShowCollisionPlane(), "Advanced.CheckShowCollisionPlane");
+        addMenu(new LLAdvancedToggleShowCollisionSkeleton(), "Advanced.ToggleShowCollisionSkeleton");
+        addMenu(new LLAdvancedCheckShowCollisionSkeleton(), "Advanced.CheckShowCollisionSkeleton");
+        addMenu(new LLAdvancedToggleDisplayAgentTarget(), "Advanced.ToggleDisplayAgentTarget");
+        addMenu(new LLAdvancedCheckDisplayAgentTarget(), "Advanced.CheckDisplayAgentTarget");
+        addMenu(new LLAdvancedToggleDebugAvatarRotation(), "Advanced.ToggleDebugAvatarRotation");
+        addMenu(new LLAdvancedCheckDebugAvatarRotation(), "Advanced.CheckDebugAvatarRotation");
+        addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments");
+        addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures");
+        addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
+        addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
+
+        // Advanced > Network
+        addMenu(new LLAdvancedEnableMessageLog(), "Advanced.EnableMessageLog");
+        addMenu(new LLAdvancedDisableMessageLog(), "Advanced.DisableMessageLog");
+        addMenu(new LLAdvancedDropPacket(), "Advanced.DropPacket");
+
+        // Advanced > Recorder
+        addMenu(new LLAdvancedFrameStatsLogging(), "Advanced.FrameStatsLogging");
+        addMenu(new LLAdvancedAgentPilot(), "Advanced.AgentPilot");
+        addMenu(new LLAdvancedToggleAgentPilotLoop(), "Advanced.ToggleAgentPilotLoop");
+        addMenu(new LLAdvancedCheckAgentPilotLoop(), "Advanced.CheckAgentPilotLoop");
+
+        // Advanced (toplevel)
+        addMenu(new LLAdvancedToggleShowObjectUpdates(), "Advanced.ToggleShowObjectUpdates");
+        addMenu(new LLAdvancedCheckShowObjectUpdates(), "Advanced.CheckShowObjectUpdates");
+        addMenu(new LLAdvancedCompressImage(), "Advanced.CompressImage");
+        addMenu(new LLAdvancedToggleClothingFloater(), "Advanced.ToggleClothingFloater");
+        addMenu(new LLAdvancedShowDebugSettings(), "Advanced.ShowDebugSettings");
+        addMenu(new LLAdvancedToggleViewAdminOptions(), "Advanced.ToggleViewAdminOptions");
+        addMenu(new LLAdvancedCheckViewAdminOptions(), "Advanced.CheckViewAdminOptions");
+        addMenu(new LLAdvancedRequestAdminStatus(), "Advanced.RequestAdminStatus");
+        addMenu(new LLAdvancedLeaveAdminStatus(), "Advanced.LeaveAdminStatus");
 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
index 20b04db..8bbdc3d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml
@@ -1999,6 +1999,19 @@ Join land?
                         Cancel
                 </option>
         </alert>
+        <alert name="ShowOwnersHelp">
+                <message name="message">
+                        If this box is checked, land parcels will be
+overlaid with a color indicating their status.
+                        
+Red: Land owned by others.
+Green: Your land.
+Aqua: Land owned by a group that you are a member of.
+Yellow: For sale.
+Purple: Land in the auction system.
+Grey: Rare public land.
+                </message>
+        </alert>        
         <alert modal="true" name="ConfirmNotecardSave">
                 <message name="message">
                         This notecard needs to be saved before the item can be copied or viewed. Save notecard?
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml b/linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml
new file mode 100644
index 0000000..3dd838a
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_bulk_perms.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-554" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" can_tear_off="false" enabled="true" height="420"
+     left="367" min_height="1000" min_width="460" mouse_opaque="true"
+     name="floaterrecursiveperms" title="Bulk permission settings"
+     width="460">
+
+<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+                             mouse_opaque="true" name="applyto" v_pad="0" width="206">Apply to</text>
+
+<check_box bottom="-70" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Scripts" left="10" mouse_opaque="true"
+                             name="scripts" radio_style="false"
+                             tool_tip="Apply bulk permissions to scripts"
+                             width="219"/>
+
+<check_box bottom="-90" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Textures" left="10" mouse_opaque="true"
+                             name="textures" radio_style="false"
+                             tool_tip="Apply bulk permissions to textures"
+                             width="219"/>
+
+<check_box bottom="-110" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Animations" left="10" mouse_opaque="true"
+                             name="animations" radio_style="false"
+                             tool_tip="Apply bulk permissions to animations"
+                             width="219"/>
+
+<check_box bottom="-130" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Sounds" left="10" mouse_opaque="true"
+                             name="sounds" radio_style="false"
+                             tool_tip="Apply bulk permissions to sounds"
+                             width="219"/>
+
+<check_box bottom="-150" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Contained objects" left="10" mouse_opaque="true"
+                             name="objects" radio_style="false"
+                             tool_tip="Apply bulk permissions to objects inside inventory"
+                             width="219"/>
+
+<check_box bottom="-170" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Landmarks" left="10" mouse_opaque="true"
+                             name="landmarks" radio_style="false"
+                             tool_tip="Apply bulk permissions to landmarks"
+                             width="219"/>
+
+<check_box bottom="-190" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Notecards" left="10" mouse_opaque="true"
+                             name="notecards" radio_style="false"
+                             tool_tip="Apply bulk permissions to notecards"
+                             width="219"/>
+
+<check_box bottom="-210" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Gesture" left="10" mouse_opaque="true"
+                             name="gestures" radio_style="false"
+                             tool_tip="Apply bulk permissions to gestures"
+                             width="219"/>
+
+<check_box bottom="-230" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Clothing" left="10" mouse_opaque="true"
+                             name="clothing" radio_style="false"
+                             tool_tip="Apply bulk permissions to clothing"
+                             width="219"/>
+
+<check_box bottom="-250" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Bodypart" left="10" mouse_opaque="true"
+                             name="bodyparts" radio_style="false"
+                             tool_tip="Apply bulk permissions to bodyparts"
+                             width="219"/>
+
+<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom="-40" drop_shadow_visible="true" enabled="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left="200"
+                             mouse_opaque="true" name="applyto" v_pad="0" width="206">Permissions</text>
+
+
+<check_box bottom="-110" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Copy" left="200" mouse_opaque="true"
+                             name="Copy" radio_style="false"
+                             tool_tip="Next owner can copy"
+                             width="219"/>
+
+<check_box bottom="-130" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Modify" left="200" mouse_opaque="true"
+                             name="Modify" radio_style="false"
+                             tool_tip="Next owner can modify"
+                             width="219"/>
+
+<check_box bottom="-150" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Trans" left="200" mouse_opaque="true"
+                             name="Trans" radio_style="false"
+                             tool_tip="Next owner can transfer"
+                             width="219"/>
+
+<check_box bottom="-230" enabled="true" follows="left|top" font="SansSerifSmall"
+                             height="16" initial_value="false"
+                             label="Modify Parent Prims" left="200" mouse_opaque="true"
+                             name="Parent" radio_style="false"
+                             tool_tip="Modify parent prims not just inventory"
+                             width="219" default="true"/>
+
+<scroll_list background_visible="true" bottom="-410" column_padding="5" draw_border="true"
+             draw_heading="false" draw_stripes="true" enabled="true"
+             follows="left|top|right|bottom" height="140" left="10" mouse_opaque="true"
+             multi_select="false" name="queue output" width="440" />
+
+<button bottom="-70" enabled="true" follows="left|top" font="SansSerif"
+                             halign="center" height="20" label="Apply..."
+                             label_selected="Apply..." left="295" mouse_opaque="true"
+                             name="Apply..." scale_image="true" width="145" />
+
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index cce06b5..c3058c4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -51,6 +51,9 @@
                      image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
                      name="mute_btn" tool_tip="Mute voice" width="25" />
         </panel>
+        <button bottom_delta="0" follows="right|top" font="SansSerif"
+             halign="center" bottom ="-40" height="20" label="Offer Teleport" right="-5"
+             mouse_opaque="true" name="offer_tp_btn" scale_image="true" width="102" />
         <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
              bottom="30" embedded_items="false" enabled="false"
              follows="left|top|right|bottom" font="SansSerif" height="221" left="5"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 7f2ce76..742da45 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -77,7 +77,7 @@
              initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
              mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
+             initial_value="false" label="Select Faces to Texture" left="4" mouse_opaque="true"
              name="radio select face" radio_style="true" width="114" />
         <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
@@ -245,55 +245,63 @@
 
 <!-- Land panel -->
 
-        <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
+        <check_box bottom="-69" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Select Land" left="4" mouse_opaque="true"
              name="radio select land" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Flatten Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Flatten" left="4" mouse_opaque="true"
              name="radio flatten" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Raise Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Raise" left="4" mouse_opaque="true"
              name="radio raise" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Lower Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Lower" left="4" mouse_opaque="true"
              name="radio lower" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Smooth Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Smooth" left="4" mouse_opaque="true"
              name="radio smooth" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Roughen Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Roughen" left="4" mouse_opaque="true"
              name="radio noise" radio_style="true" width="114" />
-        <check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-             initial_value="false" label="Revert Land" left="4" mouse_opaque="true"
+        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+             initial_value="false" label="Revert" left="4" mouse_opaque="true"
              name="radio revert" radio_style="true" width="114" />
-        <combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18" left="118"
-             max_chars="20" mouse_opaque="true" name="combobox brush size" width="134">
-                <combo_item name="Small" value="Small">
-                        Small
-                </combo_item>
-                <combo_item name="Medium" value="Medium">
-                        Medium
-                </combo_item>
-                <combo_item name="Large" value="Large">
-                        Large
-                </combo_item>
-        </combo_box>
-        <volume_slider bottom_delta="-19" follows="left|top" height="16" hidden="false" increment="0.1"
-         initial_val="0.00" left="176" max_val="2.0" min_val="-1.0"
-             mouse_opaque="true" name="slider force" width="70" />      
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom_delta="4" drop_shadow_visible="true" enabled="true" follows="left|top"
-             font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-             left="126" mouse_opaque="true" name="Strength:" v_pad="0" width="128">
-                  Strength:
-        </text>    
-        <button bottom_delta="-22" follows="left|top" font="SansSerifSmall" halign="center"
-             height="16" label="Apply to selection" label_selected="Apply to selection"
+        <button bottom="-74" follows="left|top" font="SansSerifSmall" halign="center"
+             height="20" label="Apply to selection" label_selected="Apply to selection"
              left="118" mouse_opaque="true" name="button apply to selection"
              scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
-        <check_box bottom_delta="-20" control_name="ShowParcelOwners" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false" label="Show Owners"
-             left="118" mouse_opaque="true" name="checkbox show owners" width="134" />
+
+
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
+             border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118"
+             hidden="false" mouse_opaque="true" name="Brush:" v_pad="0" width="100">
+                  Brush:
+        </text>
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
+             border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
+             hidden="false" mouse_opaque="true" name="Brush Size:" v_pad="0" width="100">
+                  Size
+        </text>
+        <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
+             increment="1.0" initial_val="0.0" left="178" max_val="2.0" min_val="0.0"
+             mouse_opaque="true" name="slider brush size" width="80" /> 
+
+
+        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
+             border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+             follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
+              hidden="false" mouse_opaque="true" name="Strength:" v_pad="0" width="100">
+                  Strength
+        </text>
+        <volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
+             increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
+             mouse_opaque="true" name="slider force" width="80" />      
+
+
         <button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
              height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
              name="button more" scale_image="TRUE" tool_tip="Advanced Options"
@@ -722,10 +730,10 @@
                                 Path Cut Begin and End
                         </text>
                         <spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"
+                             increment="0.025" initial_val="0" label="B" label_width="10" left="121"
                              max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin" width="68" />
                         <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
+                             increment="0.025" initial_val="1" label="E" label_width="10" left_delta="73"
                              max_val="1" min_val="0.02" mouse_opaque="true" name="cut end" width="68" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
@@ -824,12 +832,18 @@
                              mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141">
                                 Dimple Begin and End
                         </text>
+                        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                             bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+                             font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+                             mouse_opaque="true" name="advanced_slice" v_pad="0" width="141">
+                                Slice Begin and End
+                        </text>
                         <spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="0" label="B" label_width="10" left="121"
+                             increment="0.025" initial_val="0" label="B" label_width="10" left="121"
                              max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
                              width="68" />
                         <spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
+                             increment="0.025" initial_val="1" label="E" label_width="10" left_delta="73"
                              max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
                              width="68" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -1003,7 +1017,7 @@
                                 Transparency %
                         </text>
                         <spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
-                             increment="2" initial_val="0" left="180" max_val="90" min_val="0"
+                             increment="2" initial_val="0" left="180" max_val="100" min_val="0"
                              mouse_opaque="true" name="ColorTrans" width="80" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
@@ -1204,34 +1218,59 @@
         <panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
              name="land info panel" width="272">
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-                     bottom="-18" drop_shadow_visible="true" follows="left|top"
-                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+                     bottom="-40" drop_shadow_visible="true" follows="left|top"
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+                     mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
+                        Modify Parcel
+                </text>
+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+                     height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
+                     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
+                     width="112" />
+                <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+                     height="20" label="Join..." label_selected="Join..." left="48"
+                     mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
+                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+                     mouse_opaque="true" name="label_parcel_info" v_pad="0" width="150">
+                        Parcel Information
+                </text>
+                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
                      mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
                         Price: L$[PRICE] for [AREA] sq. m.
                 </text>
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-                     mouse_opaque="true" name="label_area" v_pad="0" width="128">
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
+                     mouse_opaque="true" name="label_area" v_pad="0" width="150">
                         Area: [AREA] sq. m.
                 </text>
-                <button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Buy Land..." label_selected="Buy Land..." left="76"
-                     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="102" />
                 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Abandon Land..." label_selected="Abandon Land..."
-                     left="76" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
-                     width="102" />
+                     height="20" label="About Land..." label_selected="About Land..." left="48"
+                     mouse_opaque="true" name="button about land" scale_image="TRUE" width="112" />
+                <check_box bottom_delta="-24" control_name="ShowParcelOwners" follows="left|top"
+                     tool_tip="Colour parcels according to their status" font="SansSerifSmall"
+                     height="16" initial_value="false" label="Show Status" left="48" 
+                     mouse_opaque="true" name="checkbox show owners" width="100" />
+                        <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+                             height="18" label="?" label_selected="?" left_delta="94"
+                             mouse_opaque="true" name="button show owners help" width="18" />
+                <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
+                     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+                     mouse_opaque="true" name="label_parcel_trans" v_pad="0" width="150">
+                        Land Transactions
+                </text>
                 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Subdivide..." label_selected="Subdivide..." left="76"
-                     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
-                     width="102" />
+                     height="20" label="Buy Land..." label_selected="Buy Land..." left="48"
+                     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="112" />
                 <button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="Join..." label_selected="Join..." left="76"
-                     mouse_opaque="true" name="button join land" scale_image="TRUE" width="102" />
-                <button bottom_delta="-40" follows="left|top" font="SansSerif" halign="center"
-                     height="20" label="About Land..." label_selected="About Land..." left="76"
-                     mouse_opaque="true" name="button about land" scale_image="TRUE" width="102" />
+                     height="20" label="Abandon Land..." label_selected="Abandon Land..."
+                     left="48" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
+                     width="112" />
         </panel>
         <string name="status_rotate">
                 Drag colored bands to rotate object
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index bbe9fbd..f82f254 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1,863 +1,2044 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
-     height="18" left="0" mouse_opaque="true" name="Main Menu" opaque="false"
-     tear_off="false" width="802">
-        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="263" label="File" left="0" mouse_opaque="false" name="File"
-             opaque="true" tear_off="true" width="243">
-                <tearoff_menu bottom="-10" enabled="true" height="10" label="~~~~~~~~~~~" left="0"
-                     mouse_opaque="true" name="~~~~~~~~~~~" width="243" />
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Upload Image (L$[COST])..."
-                     left="0" mouse_opaque="true" name="Upload Image" shortcut="control|U"
-                     width="243">
-                        <on_click function="File.UploadImage" userdata="" />
-                        <on_enable function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call bottom="-48" enabled="true" height="19" label="Upload Sound (L$[COST])..."
-                     left="0" mouse_opaque="true" name="Upload Sound" width="243">
-                        <on_click function="File.UploadSound" userdata="" />
-                        <on_enable function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call bottom="-67" enabled="true" height="19" label="Upload Animation (L$[COST])..."
-                     left="0" mouse_opaque="true" name="Upload Animation" width="243">
-                        <on_click function="File.UploadAnim" userdata="" />
-                        <on_enable function="File.EnableUpload" />
-                </menu_item_call>
-                <menu_item_call bottom="-86" enabled="true" height="19"
-                     label="Bulk Upload (L$[COST] per file)..." left="0" mouse_opaque="true"
-                     name="Bulk Upload" width="243">
-                        <on_click function="File.UploadBulk" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="243" />
-                <menu_item_call bottom="-113" enabled="true" height="19" label="Close Window" left="0"
-                     mouse_opaque="true" name="Close Window" shortcut="control|W" width="243">
-                        <on_click function="File.CloseWindow" userdata="" />
-                        <on_enable function="File.EnableCloseWindow" userdata="" />
-                </menu_item_call>
-                <menu_item_call bottom="-113" enabled="true" height="19" label="Close All Windows" left="0"
-                     mouse_opaque="true" name="Close All Windows" shortcut="control|shift|W"
-                     width="243">
-                        <on_click function="File.CloseAllWindows" userdata="" />
-                        <on_enable function="File.EnableCloseAllWindows" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-121" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="243" />
-                <menu_item_call bottom="-140" enabled="true" height="19" label="Save Texture As..." left="0"
-                     mouse_opaque="true" name="Save Texture As..." width="243">
-                        <on_click function="File.SaveTexture" userdata="" />
-                        <on_enable function="File.EnableSaveAs" />
-                </menu_item_call>
-                <menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="243" />
-                <menu_item_call bottom="-167" enabled="true" height="19" label="Take Snapshot" left="0"
-                     mouse_opaque="true" name="Take Snapshot" shortcut="control|shift|S"
-                     width="243">
-                        <on_click function="File.TakeSnapshot" userdata="" />
-                </menu_item_call>
-                <menu_item_call bottom="-186" enabled="true" height="19" label="Snapshot to Disk" left="0"
-                     mouse_opaque="true" name="Snapshot to Disk" shortcut="control|`"
-                     useMacCtrl="true" width="243">
-                        <on_click function="File.TakeSnapshotToDisk" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="243" />
-                <menu_item_call bottom="-259" enabled="true" height="19" label="Quit" left="0"
-                     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
-                        <on_click function="File.Quit" userdata="" />
-                </menu_item_call>
-        </menu>
-        <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
-             opaque="true" tear_off="true" width="153">
-                <menu_item_call bottom="-29" enabled="false" height="19" label="Undo" left="0"
-                     mouse_opaque="true" name="Undo" shortcut="control|Z" width="153">
-                        <on_click function="Edit.Undo" userdata="" />
-                        <on_enable function="Edit.EnableUndo" />
-                </menu_item_call>
-                <menu_item_call bottom="-48" enabled="false" height="19" label="Redo" left="0"
-                     mouse_opaque="true" name="Redo" shortcut="control|Y" width="153">
-                        <on_click function="Edit.Redo" userdata="" />
-                        <on_enable function="Edit.EnableRedo" />
-                </menu_item_call>
-                <menu_item_separator bottom="-56" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="153" />
-                <menu_item_call bottom="-75" enabled="false" height="19" label="Cut" left="0"
-                     mouse_opaque="true" name="Cut" shortcut="control|X" width="153">
-                        <on_click function="Edit.Cut" userdata="" />
-                        <on_enable function="Edit.EnableCut" />
-                </menu_item_call>
-                <menu_item_call bottom="-94" enabled="false" height="19" label="Copy" left="0"
-                     mouse_opaque="true" name="Copy" shortcut="control|C" width="153">
-                        <on_click function="Edit.Copy" userdata="" />
-                        <on_enable function="Edit.EnableCopy" />
-                </menu_item_call>
-                <menu_item_call bottom="-113" enabled="false" height="19" label="Paste" left="0"
-                     mouse_opaque="true" name="Paste" shortcut="control|V" width="153">
-                        <on_click function="Edit.Paste" userdata="" />
-                        <on_enable function="Edit.EnablePaste" />
-                </menu_item_call>
-                <menu_item_call bottom="-132" enabled="false" height="19" label="Delete" left="0"
-                     mouse_opaque="true" name="Delete" shortcut="Del" width="153">
-                        <on_click function="Edit.Delete" userdata="" />
-                        <on_enable function="Edit.EnableDelete" />
-                </menu_item_call>
-                <menu_item_separator bottom="-140" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="153" />
-                <menu_item_call bottom="-159" enabled="true" height="19" label="Search..." left="0"
-                     mouse_opaque="true" name="Search..." shortcut="control|F" width="153">
-                        <on_click function="Edit.Search" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-167" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="153" />
-                <menu_item_call bottom="-186" enabled="false" height="19" label="Select All" left="0"
-                     mouse_opaque="true" name="Select All" shortcut="control|A" width="153">
-                        <on_click function="Edit.SelectAll" userdata="" />
-                        <on_enable function="Edit.EnableSelectAll" />
-                </menu_item_call>
-                <menu_item_call bottom="-205" enabled="false" height="19" label="Deselect" left="0"
-                     mouse_opaque="true" name="Deselect" shortcut="control|E" width="153">
-                        <on_click function="Edit.Deselect" userdata="" />
-                        <on_enable function="Edit.EnableDeselect" />
-                </menu_item_call>
-                <menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="153" />
-                <menu_item_call bottom="-232" enabled="false" height="19" label="Duplicate" left="0"
-                     mouse_opaque="true" name="Duplicate" shortcut="control|D" width="153">
-                        <on_click function="Edit.Duplicate" userdata="" />
-                        <on_enable function="Edit.EnableDuplicate" />
-                </menu_item_call>
-                <menu_item_separator bottom="-240" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator5" width="153" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="554" label="Attach Object" left="0" mouse_opaque="false"
-                     name="Attach Object" opaque="true" tear_off="true" width="117" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="554" label="Detach Object" left="191" mouse_opaque="false"
-                     name="Detach Object" opaque="true" tear_off="true" width="118" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="204" label="Take Off Clothing" left="0" mouse_opaque="false"
-                     name="Take Off Clothing" opaque="true" tear_off="true" width="118">
-                        <menu_item_call bottom="-29" enabled="false" height="19" label="Shirt" left="0"
-                             mouse_opaque="true" name="Shirt" width="118">
-                                <on_click function="Edit.TakeOff" userdata="shirt" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="shirt" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-48" enabled="false" height="19" label="Pants" left="0"
-                             mouse_opaque="true" name="Pants" width="118">
-                                <on_click function="Edit.TakeOff" userdata="pants" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="pants" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-67" enabled="false" height="19" label="Shoes" left="0"
-                             mouse_opaque="true" name="Shoes" width="118">
-                                <on_click function="Edit.TakeOff" userdata="shoes" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="shoes" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-86" enabled="false" height="19" label="Socks" left="0"
-                             mouse_opaque="true" name="Socks" width="118">
-                                <on_click function="Edit.TakeOff" userdata="socks" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="socks" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-105" enabled="false" height="19" label="Jacket" left="0"
-                             mouse_opaque="true" name="Jacket" width="118">
-                                <on_click function="Edit.TakeOff" userdata="jacket" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="jacket" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-124" enabled="false" height="19" label="Gloves" left="0"
-                             mouse_opaque="true" name="Gloves" width="118">
-                                <on_click function="Edit.TakeOff" userdata="gloves" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="gloves" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-143" enabled="false" height="19" label="Undershirt" left="0"
-                             mouse_opaque="true" name="Menu Undershirt" width="118">
-                                <on_click function="Edit.TakeOff" userdata="undershirt" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-162" enabled="false" height="19" label="Underpants" left="0"
-                             mouse_opaque="true" name="Menu Underpants" width="118">
-                                <on_click function="Edit.TakeOff" userdata="underpants" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="underpants" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-181" enabled="false" height="19" label="Skirt" left="0"
-                             mouse_opaque="true" name="Skirt" width="118">
-                                <on_click function="Edit.TakeOff" userdata="skirt" />
-                                <on_enable function="Edit.EnableTakeOff" userdata="skirt" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-200" enabled="true" height="19" label="All Clothes" left="0"
-                             mouse_opaque="true" name="All Clothes" width="118">
-                                <on_click function="Edit.TakeOff" userdata="all" />
-                        </menu_item_call>
+
+<menu_bar name="Main Menu" drop_shadow="false" follows="left|top|right"
+          opaque="false" tear_off="false">
+
+
+  <!-- FILE -->
+
+  <menu name="File" create_jump_keys="true" label="File"
+        opaque="true" tear_off="true">
+    <menu_item_call name="Upload Image"
+                    label="Upload Image (L$[COST])..."
+                    shortcut="control|U">
+      <on_click function="File.UploadImage" userdata="" />
+      <on_enable function="File.EnableUpload" />
+    </menu_item_call>
+    <menu_item_call name="Upload Sound"
+                    label="Upload Sound (L$[COST])...">
+      <on_click function="File.UploadSound" userdata="" />
+      <on_enable function="File.EnableUpload" />
+    </menu_item_call>
+    <menu_item_call name="Upload Animation"
+                    label="Upload Animation (L$[COST])...">
+      <on_click function="File.UploadAnim" userdata="" />
+      <on_enable function="File.EnableUpload" />
+    </menu_item_call>
+    <menu_item_call name="Bulk Upload"
+                    label="Bulk Upload (L$[COST] per file)...">
+      <on_click function="File.UploadBulk" userdata="" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Close Window"
+                    label="Close Window"
+                    shortcut="control|W">
+      <on_click function="File.CloseWindow"
+                userdata="" />
+      <on_enable function="File.EnableCloseWindow"
+                 userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Close All Windows"
+                    label="Close All Windows"
+                    shortcut="control|shift|W">
+      <on_click function="File.CloseAllWindows"
+                userdata="" />
+      <on_enable function="File.EnableCloseAllWindows"
+                 userdata="" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Save Texture As..."
+                    label="Save Texture As...">
+      <on_click function="File.SaveTexture" userdata="" />
+      <on_enable function="File.EnableSaveAs" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Take Snapshot"
+                    label="Take Snapshot"
+                    shortcut="control|shift|S">
+      <on_click function="File.TakeSnapshot" userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Snapshot to Disk"
+                    label="Snapshot to Disk"
+                    shortcut="control|`" useMacCtrl="true">
+      <on_click function="File.TakeSnapshotToDisk"
+                userdata="" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Quit" label="Quit"
+                    shortcut="control|Q">
+      <on_click function="File.Quit" userdata="" />
+    </menu_item_call>
+  </menu>
+
+
+
+  <!-- EDIT -->
+
+  <menu name="Edit" create_jump_keys="true" label="Edit"
+        opaque="true" tear_off="true">
+    <menu_item_call name="Undo" enabled="false" label="Undo"
+                    shortcut="control|Z">
+      <on_click function="Edit.Undo" userdata="" />
+      <on_enable function="Edit.EnableUndo" />
+    </menu_item_call>
+    <menu_item_call name="Redo" enabled="false" label="Redo"
+                    shortcut="control|Y">
+      <on_click function="Edit.Redo" userdata="" />
+      <on_enable function="Edit.EnableRedo" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Cut" enabled="false" label="Cut"
+                    shortcut="control|X">
+      <on_click function="Edit.Cut" userdata="" />
+      <on_enable function="Edit.EnableCut" />
+    </menu_item_call>
+    <menu_item_call name="Copy" enabled="false" label="Copy"
+                    shortcut="control|C">
+      <on_click function="Edit.Copy" userdata="" />
+      <on_enable function="Edit.EnableCopy" />
+    </menu_item_call>
+    <menu_item_call name="Paste" enabled="false" label="Paste"
+                    shortcut="control|V">
+      <on_click function="Edit.Paste" userdata="" />
+      <on_enable function="Edit.EnablePaste" />
+    </menu_item_call>
+    <menu_item_call name="Delete" enabled="false" label="Delete"
+                    shortcut="Del">
+      <on_click function="Edit.Delete" userdata="" />
+      <on_enable function="Edit.EnableDelete" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Search..." label="Search..."
+                    shortcut="control|F">
+      <on_click function="Edit.Search" userdata="" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Select All" enabled="false"
+                    label="Select All"
+                    shortcut="control|A">
+      <on_click function="Edit.SelectAll" userdata="" />
+      <on_enable function="Edit.EnableSelectAll" />
+    </menu_item_call>
+    <menu_item_call name="Deselect" enabled="false"
+                    label="Deselect"
+                    shortcut="control|E">
+      <on_click function="Edit.Deselect" userdata="" />
+      <on_enable function="Edit.EnableDeselect" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Duplicate" enabled="false"
+                    label="Duplicate"
+                    shortcut="control|D">
+      <on_click function="Edit.Duplicate" userdata="" />
+      <on_enable function="Edit.EnableDuplicate" />
+    </menu_item_call>
+    <menu_item_separator />
+
+    <menu name="Attach Object" create_jump_keys="true"
+          label="Attach Object" opaque="true" tear_off="true" />
+
+    <menu name="Detach Object" create_jump_keys="true"
+          label="Detach Object" opaque="true" tear_off="true" />
+
+
+    <menu name="Take Off Clothing" create_jump_keys="true"
+          label="Take Off Clothing" opaque="true" tear_off="true">
+
+      <menu_item_call name="Shirt" enabled="false" label="Shirt">
+        <on_click function="Edit.TakeOff"
+                  userdata="shirt" />
+        <on_enable function="Edit.EnableTakeOff"
+                   userdata="shirt" />
+      </menu_item_call>
+      <menu_item_call name="Pants" enabled="false" label="Pants">
+        <on_click function="Edit.TakeOff"
+                  userdata="pants" />
+        <on_enable function="Edit.EnableTakeOff"
+                   userdata="pants" />
+      </menu_item_call>
+      <menu_item_call name="Shoes" enabled="false" label="Shoes">
+        <on_click function="Edit.TakeOff"
+                  userdata="shoes" />
+        <on_enable function="Edit.EnableTakeOff"
+                   userdata="shoes" />
+      </menu_item_call>
+      <menu_item_call name="Socks" enabled="false" label="Socks">
+        <on_click function="Edit.TakeOff"
+                  userdata="socks" />
+        <on_enable function="Edit.EnableTakeOff"
+                   userdata="socks" />
+      </menu_item_call>
+      <menu_item_call name="Jacket" enabled="false" label="Jacket">
+        <on_click function="Edit.TakeOff"
+                  userdata="jacket" />
+        <on_enable function="Edit.EnableTakeOff"
+                   userdata="jacket" />
+      </menu_item_call>
+      <menu_item_call name="Gloves" enabled="false" label="Gloves">
+        <on_click function="Edit.TakeOff"
+                  userdata="gloves" />
+        <on_enable function="Edit.EnableTakeOff"
+                   userdata="gloves" />
+      </menu_item_call>
+      <menu_item_call name="Menu Undershirt" enabled="false"
+                      label="Undershirt">
+        <on_click function="Edit.TakeOff"
+                  userdata="undershirt" />
+        <on_enable function="Edit.EnableTakeOff"
+                   userdata="undershirt" />
+      </menu_item_call>
+      <menu_item_call name="Menu Underpants" enabled="false"
+                      label="Underpants">
+        <on_click function="Edit.TakeOff"
+                  userdata="underpants" />
+        <on_enable function="Edit.EnableTakeOff"
+                   userdata="underpants" />
+      </menu_item_call>
+      <menu_item_call name="Skirt" enabled="false" label="Skirt">
+        <on_click function="Edit.TakeOff"
+                  userdata="skirt" />
+        <on_enable function="Edit.EnableTakeOff"
+                   userdata="skirt" />
+      </menu_item_call>
+      <menu_item_call name="All Clothes" label="All Clothes">
+        <on_click function="Edit.TakeOff"
+                  userdata="all" />
+      </menu_item_call>
+    </menu>
+    <menu_item_separator />
+    <menu_item_call name="Gestures..." label="Gestures..."
+                    shortcut="control|G">
+      <on_click function="ShowFloater"
+                userdata="gestures" />
+    </menu_item_call>
+    <menu_item_call name="Profile..." label="Profile...">
+      <on_click function="ShowAgentProfile"
+                userdata="agent" />
+    </menu_item_call>
+    <menu_item_call name="Appearance..." label="Appearance...">
+      <on_click function="ShowFloater"
+                userdata="appearance" />
+      <on_enable function="Edit.EnableCustomizeAvatar" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_check name="Friends..." label="Friends..."
+                     shortcut="control|shift|F">
+      <on_click function="ShowFloater"
+                userdata="friends" />
+      <on_check function="FloaterVisible"
+                userdata="friends" />
+    </menu_item_check>
+    <menu_item_call name="Groups..." label="Groups...">
+      <on_click function="ShowAgentGroups"
+                userdata="agent" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Preferences..." label="Preferences..."
+                    shortcut="control|P">
+      <on_click function="ShowFloater"
+                userdata="preferences" />
+    </menu_item_call>
+  </menu>
+
+
+
+  <!-- VIEW -->
+
+  <menu name="View" create_jump_keys="true" label="View"
+        opaque="true" tear_off="true">
+    <menu_item_call name="Mouselook" label="Mouselook"
+                    shortcut="M">
+      <on_click function="View.Mouselook" userdata="" />
+      <on_enable function="View.EnableMouselook" />
+    </menu_item_call>
+    <menu_item_check name="Build" label="Build"
+                     shortcut="B">
+      <on_click function="View.BuildMode" userdata="" />
+      <on_check function="View.CheckBuildMode" />
+    </menu_item_check>
+    <menu_item_check name="Joystick Flycam" label="Joystick Flycam"
+                     shortcut="alt|shift|F">
+      <on_click function="View.JoystickFlycam" userdata="" />
+      <on_check function="View.CheckJoystickFlycam" />
+    </menu_item_check>
+    <menu_item_call name="Reset View" label="Reset View"
+                    shortcut="Esc">
+      <on_click function="View.ResetView" userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Look at Last Chatter" enabled="false"
+                    label="Look at Last Chatter" shortcut="control|\">
+      <on_click function="View.LookAtLastChatter" userdata="" />
+      <on_enable function="View.EnableLastChatter" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_check name="Toolbar" label="Toolbar">
+      <on_click function="ShowFloater" userdata="toolbar" />
+      <on_check function="FloaterVisible" userdata="toolbar" />
+    </menu_item_check>
+    <menu_item_check name="Chat History" label="Local Chat"
+                     shortcut="control|H">
+      <on_click function="ShowFloater" userdata="chat history" />
+      <on_check function="FloaterVisible" userdata="chat history" />
+    </menu_item_check>
+    <menu_item_check name="Instant Message" label="Communicate"
+                     shortcut="control|T">
+      <on_click function="ShowFloater" userdata="im" />
+      <on_check function="FloaterVisible" userdata="im" />
+    </menu_item_check>
+    <menu_item_call name="Inventory" label="Inventory"
+                    shortcut="control|I">
+      <on_click function="ShowFloater" userdata="inventory" />
+    </menu_item_call>
+    <menu_item_check name="Active Speakers" label="Active Speakers">
+      <on_click function="ShowFloater" userdata="active speakers" />
+      <on_check function="FloaterVisible" userdata="active speakers" />
+    </menu_item_check>
+    <menu_item_check name="Mute List" label="Mute List">
+      <on_click function="ShowFloater" userdata="mute list" />
+      <on_check function="FloaterVisible" userdata="mute list" />
+    </menu_item_check>
+    <menu_item_separator />
+    <menu_item_check name="Camera Controls" label="Camera Controls">
+      <on_click function="ShowFloater" userdata="camera controls" />
+      <on_check function="FloaterVisible" userdata="camera controls" />
+    </menu_item_check>
+    <menu_item_check name="Movement Controls" label="Movement Controls">
+      <on_click function="ShowFloater" userdata="movement controls" />
+      <on_check function="FloaterVisible" userdata="movement controls" />
+    </menu_item_check>
+    <menu_item_check name="World Map" label="World Map"
+                     shortcut="control|M">
+      <on_click function="ShowFloater" userdata="world map" />
+      <on_check control="ShowWorldMap" />
+    </menu_item_check>
+    <menu_item_check name="Mini-Map" label="Mini-Map"
+                     shortcut="control|shift|M">
+      <on_click function="ShowFloater" userdata="mini map" />
+      <on_check control="ShowMiniMap" />
+    </menu_item_check>
+    <menu_item_separator />
+    <menu_item_check name="Statistics Bar" label="Statistics Bar"
+                     shortcut="control|shift|1">
+      <on_click function="ShowFloater" userdata="stat bar" />
+      <on_check function="FloaterVisible" userdata="stat bar" />
+    </menu_item_check>
+    <menu_item_check name="Property Lines" label="Property Lines"
+                     shortcut="control|alt|shift|P">
+      <on_click function="ToggleControl" userdata="ShowPropertyLines" />
+      <on_check control="ShowPropertyLines" />
+    </menu_item_check>
+    <menu_item_check name="Land Owners" label="Land Owners">
+      <on_click function="ToggleControl" userdata="ShowParcelOwners" />
+      <on_check control="ShowParcelOwners" />
+    </menu_item_check>
+    <menu_item_separator />
+    <menu name="Hover Tips" create_jump_keys="true" label="Hover Tips"
+          opaque="true" tear_off="true">
+      <menu_item_check name="Show Tips" label="Show Tips"
+                       shortcut="control|shift|T">
+        <on_click function="View.ShowHoverTips" userdata="" />
+        <on_check function="View.CheckShowHoverTips" />
+      </menu_item_check>
+      <menu_item_separator />
+      <menu_item_check name="Land Tips" label="Land Tips">
+        <on_click function="ToggleControl"
+                  userdata="ShowLandHoverTip" />
+        <on_enable function="View.CheckShowHoverTips" />
+        <on_check control="ShowLandHoverTip" />
+      </menu_item_check>
+      <menu_item_check name="Tips On All Objects"
+                       label="Tips On All Objects">
+        <on_click function="ToggleControl"
+                  userdata="ShowAllObjectHoverTip" />
+        <on_enable function="View.CheckShowHoverTips" />
+        <on_check control="ShowAllObjectHoverTip" />
+      </menu_item_check>
+    </menu>
+    <menu_item_check name="Highlight Transparent"
+                     label="Highlight Transparent"
+                     shortcut="control|alt|T">
+      <on_click function="View.HighlightTransparent" userdata="" />
+      <on_check function="View.CheckHighlightTransparent" />
+    </menu_item_check>
+    <menu_item_check name="Beacons Always On" label="Beacons Always On">
+      <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
+      <on_check control="BeaconAlwaysOn" />
+    </menu_item_check>
+    <menu name="Beacons" create_jump_keys="true" label="Beacons"
+          opaque="true" tear_off="true">
+      <menu_item_check name="Scripted Objects With Touch Only"
+                       label="Scripted Objects with Touch Only">
+        <on_click function="View.ToggleBeacon"
+                  userdata="scripttouchbeacon" />
+        <on_check function="View.CheckBeaconEnabled"
+                  userdata="scripttouchbeacon" />
+      </menu_item_check>
+      <menu_item_check name="Scripted Objects" label="Scripted Objects">
+        <on_click function="View.ToggleBeacon"
+                  userdata="scriptsbeacon" />
+        <on_check function="View.CheckBeaconEnabled"
+                  userdata="scriptsbeacon" />
+      </menu_item_check>
+      <menu_item_check name="Physical Objects" label="Physical Objects">
+        <on_click function="View.ToggleBeacon"
+                  userdata="physicalbeacon" />
+        <on_check function="View.CheckBeaconEnabled"
+                  userdata="physicalbeacon" />
+      </menu_item_check>
+      <menu_item_check name="Sound Sources" label="Sound Sources">
+        <on_click function="View.ToggleBeacon"
+                  userdata="soundsbeacon" />
+        <on_check function="View.CheckBeaconEnabled"
+                  userdata="soundsbeacon" />
+      </menu_item_check>
+      <menu_item_check name="Particle Sources" label="Particle Sources">
+        <on_click function="View.ToggleBeacon"
+                  userdata="particlesbeacon" />
+        <on_check function="View.CheckBeaconEnabled"
+                  userdata="particlesbeacon" />
+      </menu_item_check>
+      <menu_item_separator />
+      <menu_item_check name="Render Highlights" label="Render Highlights">
+        <on_click function="View.ToggleBeacon"
+                  userdata="renderhighlights" />
+        <on_check function="View.CheckBeaconEnabled"
+                  userdata="renderhighlights" />
+      </menu_item_check>
+      <menu_item_check name="Render Beacons" label="Render Beacons">
+        <on_click function="View.ToggleBeacon"
+                  userdata="renderbeacons" />
+        <on_check function="View.CheckBeaconEnabled"
+                  userdata="renderbeacons" />
+      </menu_item_check>
+      <menu_item_separator />
+      <menu_item_check name="Hide Particles" label="Hide Particles">
+        <on_click function="View.ToggleRenderType"
+                  userdata="hideparticles" />
+        <on_check function="View.CheckRenderType"
+                  userdata="hideparticles" />
+      </menu_item_check>
+      <menu_item_separator />
+      <menu name="Beacon Width" color="0 0 0 1" create_jump_keys="true"
+            label="Beacon Width" opaque="true" tear_off="true">
+        <menu_item_call name="Beacon Width 1" label="1">
+          <on_click function="View.BeaconWidth" userdata="1" />
+        </menu_item_call>
+        <menu_item_call name="Beacon Width 4" label="4">
+          <on_click function="View.BeaconWidth" userdata="4" />
+        </menu_item_call>
+        <menu_item_call name="Beacon Width 16" label="16">
+          <on_click function="View.BeaconWidth" userdata="16" />
+        </menu_item_call>
+        <menu_item_call name="Beacon Width 32" label="32">
+          <on_click function="View.BeaconWidth" userdata="32" />
+        </menu_item_call>
+      </menu>
+    </menu>
+    <menu_item_check name="Show HUD Attachments"
+                     label="Show HUD Attachments"
+                     shortcut="alt|shift|H">
+      <on_click function="View.ShowHUDAttachments" userdata="" />
+      <on_check function="View.CheckHUDAttachments" />
+    </menu_item_check>
+    <menu_item_separator />
+    <menu_item_call name="Zoom In" label="Zoom In"
+                    shortcut="control|0">
+      <on_click function="View.ZoomIn" userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Zoom Default" label="Zoom Default"
+                    shortcut="control|9">
+      <on_click function="View.ZoomDefault" userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Zoom Out" label="Zoom Out"
+                    shortcut="control|8">
+      <on_click function="View.ZoomOut" userdata="" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Toggle Fullscreen" label="Toggle Fullscreen"
+                    shortcut="alt|Enter">
+      <on_click function="View.Fullscreen" userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Set UI Size to Default"
+                    label="Set UI Size to Default">
+      <on_click function="View.DefaultUISize" userdata="" />
+    </menu_item_call>
+  </menu>
+
+
+
+  <!-- WORLD -->
+
+  <menu name="World" create_jump_keys="true" label="World"
+        opaque="true" tear_off="true">
+    <menu_item_call name="Chat" label="Chat" shortcut="">
+      <on_click function="World.Chat" userdata="" />
+    </menu_item_call>
+    <menu_item_check name="Always Run" label="Always Run"
+                     shortcut="control|R">
+      <on_click function="World.AlwaysRun" userdata="" />
+      <on_check function="World.CheckAlwaysRun" userdata="" />
+    </menu_item_check>
+    <menu_item_check name="Fly" label="Fly" shortcut="Home">
+      <on_click function="World.Fly" userdata="" />
+      <on_enable function="World.EnableFly" />
+      <on_check control="FlyBtnState" />
+    </menu_item_check>
+    <menu_item_separator />
+    <menu_item_call name="Create Landmark Here"
+                    label="Create Landmark Here">
+      <on_click function="World.CreateLandmark" userdata="" />
+      <on_enable function="World.EnableCreateLandmark" userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Set Home to Here" label="Set Home to Here">
+      <on_click function="World.SetHomeLocation" userdata="" />
+      <on_enable function="World.EnableSetHomeLocation" userdata="" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Teleport Home" label="Teleport Home"
+                    shortcut="control|shift|H">
+      <on_click function="World.TeleportHome" userdata="" />
+      <on_enable function="World.EnableTeleportHome" userdata="" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Set Away" label="Set Away">
+      <on_click function="World.SetAway" userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Set Busy" label="Set Busy">
+      <on_click function="World.SetBusy" userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Stop All Animations" enabled="false"
+                    label="Stop All Animations">
+      <on_click function="Tools.StopAllAnimations" userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Release Keys" enabled="false" label="Release Keys">
+      <on_click function="Tools.ReleaseKeys" userdata="" />
+      <on_enable function="Tools.EnableReleaseKeys" userdata="" />
+                </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Account History..."
+                    label="Account History...">
+      <on_click function="PromptShowURL"
+                userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
+    </menu_item_call>
+    <menu_item_call name="Manage My Account..."
+                    label="Manage My Account...">
+      <on_click function="PromptShowURL"
+                userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
+    </menu_item_call>
+    <menu_item_call name="Buy and Sell L$..." label="Buy L$...">
+      <on_click function="ShowFloater" userdata="buy currency" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="My Land..." label="My Land...">
+      <on_click function="ShowFloater" userdata="my land" />
+    </menu_item_call>
+    <menu_item_call name="About Land..." label="About Land...">
+      <on_click function="ShowFloater" userdata="about land" />
+    </menu_item_call>
+    <menu_item_call name="Buy Land..." label="Buy Land...">
+      <on_click function="ShowFloater" userdata="buy land" />
+      <on_enable function="World.EnableBuyLand" />
+    </menu_item_call>
+    <menu_item_call name="Region/Estate..." label="Region/Estate...">
+      <on_click function="ShowFloater" userdata="about region" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu name="Environment Settings" create_jump_keys="true"
+          label="Environment Settings" opaque="true" tear_off="true">
+      <menu_item_call name="Sunrise" label="Sunrise">
+        <on_click function="World.EnvSettings" userdata="sunrise" />
+      </menu_item_call>
+      <menu_item_call name="Noon" label="Midday"
+                      shortcut="control|shift|Y">
+        <on_click function="World.EnvSettings" userdata="noon" />
+      </menu_item_call>
+      <menu_item_call name="Sunset" label="Sunset"
+                      shortcut="control|shift|N">
+        <on_click function="World.EnvSettings" userdata="sunset" />
+      </menu_item_call>
+      <menu_item_call name="Midnight" label="Midnight">
+        <on_click function="World.EnvSettings" userdata="midnight" />
+      </menu_item_call>
+      <menu_item_call name="Revert to Region Default" enabled="false"
+                      label="Revert to Region Default">
+        <on_click function="World.EnvSettings" userdata="default" />
+      </menu_item_call>
+      <menu_item_separator />
+      <menu_item_call name="Environment Editor" enabled="false"
+                      label="Environment Editor">
+        <on_click function="World.EnvSettings" userdata="editor" />
+      </menu_item_call>
+    </menu>
+  </menu>
+
+
+
+  <!-- TOOLS -->
+
+  <menu name="Tools" create_jump_keys="true" label="Tools"
+        opaque="true" tear_off="true" visible="false">
+    <menu name="Select Tool" create_jump_keys="true" label="Select Tool"
+          opaque="true" tear_off="true">
+      <menu_item_call name="Focus" label="Focus" shortcut="control|1">
+        <on_click function="Tools.SelectTool" userdata="focus" />
+      </menu_item_call>
+      <menu_item_call name="Move" label="Move" shortcut="control|2">
+        <on_click function="Tools.SelectTool" userdata="move" />
+      </menu_item_call>
+      <menu_item_call name="Edit" label="Edit" shortcut="control|3">
+        <on_click function="Tools.SelectTool" userdata="edit" />
+      </menu_item_call>
+      <menu_item_call name="Create" label="Create" shortcut="control|4">
+        <on_click function="Tools.SelectTool" userdata="create" />
+      </menu_item_call>
+      <menu_item_call name="Land" label="Land" shortcut="control|5">
+        <on_click function="Tools.SelectTool" userdata="land" />
+      </menu_item_call>
+    </menu>
+    <menu_item_separator />
+    <menu_item_check name="Select Only My Objects"
+                     label="Select Only My Objects">
+      <on_click function="Tools.SelectOnlyMyObjects"
+                userdata="agents" />
+      <on_check control="SelectOwnedOnly" />
+    </menu_item_check>
+    <menu_item_check name="Select Only Movable Objects"
+                     label="Select Only Movable Objects">
+      <on_click function="Tools.SelectOnlyMovableObjects"
+                userdata="movable" />
+      <on_check control="SelectMovableOnly" />
+    </menu_item_check>
+    <menu_item_check name="Select By Surrounding"
+                     label="Select By Surrounding">
+      <on_click function="Tools.SelectBySurrounding"
+                userdata="" />
+      <on_check control="RectangleSelectInclusive" />
+    </menu_item_check>
+    <menu_item_check name="Show Hidden Selection"
+                     label="Show Hidden Selection">
+      <on_click function="Tools.ShowHiddenSelection"
+                userdata="" />
+      <on_check control="RenderHiddenSelections" />
+    </menu_item_check>
+    <menu_item_check name="Show Light Radius for Selection"
+                     label="Show Light Radius for Selection">
+      <on_click function="Tools.ShowSelectionLightRadius"
+                userdata="" />
+      <on_check control="RenderLightRadius" />
+    </menu_item_check>
+    <menu_item_check name="Show Selection Beam"
+                     label="Show Selection Beam">
+      <on_click function="ToggleControl"
+                userdata="ShowSelectionBeam" />
+      <on_check control="ShowSelectionBeam" />
+    </menu_item_check>
+    <menu_item_separator />
+    <menu_item_check name="Snap to Grid" enabled="false"
+                     label="Snap to Grid" shortcut="G">
+      <on_click function="ToggleControl"
+                userdata="SnapEnabled" />
+      <on_check control="SnapEnabled" />
+      <on_enable function="Tools.EnableToolNotPie" />
+    </menu_item_check>
+    <menu_item_call name="Snap Object XY to Grid" enabled="false"
+                    label="Snap Object XY to Grid" shortcut="shift|X">
+      <on_click function="Tools.SnapObjectXY" userdata="" />
+      <on_enable function="Tools.EnableToolNotPie" />
+    </menu_item_call>
+    <menu_item_call name="Use Selection for Grid" enabled="false"
+                    label="Use Selection for Grid" shortcut="shift|G">
+      <on_click function="Tools.UseSelectionForGrid" userdata="" />
+      <on_enable function="SomethingSelected" />
+    </menu_item_call>
+    <menu_item_call name="Grid Options..." enabled="false"
+                    label="Grid Options..." shortcut="control|shift|B">
+      <on_click function="ShowFloater" userdata="grid options" />
+      <on_enable function="Tools.EnableToolNotPie" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_check name="Edit Linked Parts" enabled="false"
+                     label="Edit Linked Parts" shortcut="">
+      <on_click function="ToggleControl" userdata="EditLinkedParts" />
+      <on_click function="Tools.EditLinkedParts" userdata="" />
+      <on_check control="EditLinkedParts" />
+      <on_enable function="Tools.EnableToolNotPie" />
+    </menu_item_check>
+    <menu_item_call name="Link" enabled="false" label="Link"
+                    shortcut="control|L">
+      <on_click function="Tools.Link" userdata="" />
+      <on_enable function="Tools.EnableLink" />
+    </menu_item_call>
+    <menu_item_call name="Unlink" enabled="false" label="Unlink"
+                    shortcut="control|shift|L">
+      <on_click function="Tools.Unlink" userdata="" />
+      <on_enable function="Tools.EnableUnlink" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Focus on Selection" enabled="false"
+                    label="Focus on Selection" shortcut="H">
+      <on_click function="Tools.LookAtSelection" userdata="focus" />
+      <on_enable function="Tools.SomethingSelectedNoHUD" />
+    </menu_item_call>
+    <menu_item_call name="Zoom to Selection" enabled="false"
+                    label="Zoom to Selection" shortcut="shift|H">
+      <on_click function="Tools.LookAtSelection" userdata="zoom" />
+      <on_enable function="Tools.SomethingSelectedNoHUD" />
+    </menu_item_call>
+    <menu_item_call name="Menu Object Take" enabled="false"
+                    label="Buy Object" visible="false">
+      <on_click function="Tools.BuyOrTake" userdata="" />
+      <on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" />
+    </menu_item_call>
+    <menu_item_call name="Take Copy" enabled="false"
+                    label="Take Copy">
+      <on_click function="Tools.TakeCopy" userdata="" />
+      <on_enable function="Tools.EnableTakeCopy" />
+    </menu_item_call>
+    <menu_item_call name="Return..." enabled="false"
+                    label="Return Object">
+      <on_click function="Object.Return" />
+      <on_enable function="Object.EnableReturn" />
+    </menu_item_call>
+    <menu_item_call name="Save Object Back to My Inventory"
+                    enabled="false"
+                    label="Save Object Back to My Inventory">
+      <on_click function="Tools.SaveToInventory" userdata="" />
+      <on_enable function="Tools.EnableSaveToInventory" />
+    </menu_item_call>
+    <menu_item_call name="Save Object Back to Object Contents"
+                    enabled="false"
+                    label="Save Object Back to Object Contents">
+      <on_click function="Tools.SaveToObjectInventory" userdata="" />
+      <on_enable function="Tools.EnableSaveToObjectInventory" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Show Script Warning/Error Window"
+                    label="Show Script Warning/Error Window">
+      <on_click function="ShowFloater" userdata="script errors" />
+    </menu_item_call>
+                <menu name="Recompile Scripts in Selection" create_jump_keys="true"
+                      label="Recompile Scripts in Selection" opaque="true"
+          tear_off="true">
+                  <menu_item_call name="Mono" label="Mono">
+                          <on_click function="Tools.SelectedScriptAction"
+                  userdata="compile mono" />
+                          <on_enable function="EditableSelectedMono" />
+                  </menu_item_call>
+                  <menu_item_call name="LSL" label="LSL">
+                          <on_click function="Tools.SelectedScriptAction"
+                  userdata="compile lsl" />
+                          <on_enable function="EditableSelected" />
+                  </menu_item_call>
                 </menu>
-                <menu_item_separator bottom="-305" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator6" width="153" />
-                <menu_item_call bottom="-324" enabled="true" height="19" label="Gestures..." left="0"
-                     mouse_opaque="true" name="Gestures..." shortcut="control|G" width="153">
-                        <on_click function="ShowFloater" userdata="gestures" />
-                </menu_item_call>
-                <menu_item_call bottom="-343" enabled="true" height="19" label="Profile..." left="0"
-                     mouse_opaque="true" name="Profile..." width="153">
-                        <on_click function="ShowAgentProfile" userdata="agent" />
-                </menu_item_call>
-                <menu_item_call bottom="-362" enabled="true" height="19" label="Appearance..." left="0"
-                     mouse_opaque="true" name="Appearance..." width="153">
-                        <on_click function="ShowFloater" userdata="appearance" />
-                        <on_enable function="Edit.EnableCustomizeAvatar" />
-                </menu_item_call>
-                <menu_item_separator bottom="-370" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator7" width="153" />
-                <menu_item_check bottom="-389" enabled="true" height="19" label="Friends..." left="0"
-                     mouse_opaque="true" name="Friends..." shortcut="control|shift|F"
-                     width="153">
-                        <on_click function="ShowFloater" userdata="friends" />
-                        <on_check function="FloaterVisible" userdata="friends" />
-                </menu_item_check>
-                <menu_item_call bottom="-408" enabled="true" height="19" label="Groups..." left="0"
-                     mouse_opaque="true" name="Groups..." width="153">
-                        <on_click function="ShowAgentGroups" userdata="agent" />
-                </menu_item_call>
-                <menu_item_separator bottom="-416" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator8" width="153" />
-                <menu_item_call bottom="-435" enabled="true" height="19" label="Preferences..." left="0"
-                     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
-                        <on_click function="ShowFloater" userdata="preferences" />
-                </menu_item_call>
-        </menu>
-        <menu bottom="-1" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="537" label="View" left="80" mouse_opaque="false" name="View"
-             opaque="true" tear_off="true" width="211">
-                <tearoff_menu bottom="-10" enabled="true" height="10" label="~~~~~~~~~~~" left="0"
-                     mouse_opaque="true" name="~~~~~~~~~~~" width="211" />
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Mouselook" left="0"
-                     mouse_opaque="true" name="Mouselook" shortcut="M" width="211">
-                        <on_click function="View.Mouselook" userdata="" />
-                        <on_enable function="View.EnableMouselook" />
-                </menu_item_call>
-                <menu_item_check bottom="-48" enabled="true" height="19" label="Build" left="0"
-                     mouse_opaque="true" name="Build" shortcut="B" width="211">
-                        <on_click function="View.BuildMode" userdata="" />
-                        <on_check function="View.CheckBuildMode" />
-                </menu_item_check>
-                <menu_item_check bottom="-48" enabled="true" height="19" label="Joystick Flycam" left="0"
-                     mouse_opaque="true" name="Joystick Flycam" shortcut="alt|shift|F"
-                     width="211">
-                        <on_click function="View.JoystickFlycam" userdata="" />
-                        <on_check function="View.CheckJoystickFlycam" />
-                </menu_item_check>
-                <menu_item_call bottom="-67" enabled="true" height="19" label="Reset View" left="0"
-                     mouse_opaque="true" name="Reset View" shortcut="Esc" width="211">
-                        <on_click function="View.ResetView" userdata="" />
-                </menu_item_call>
-                <menu_item_call bottom="-86" enabled="false" height="19" label="Look at Last Chatter" left="0"
-                     mouse_opaque="true" name="Look at Last Chatter" shortcut="control|\"
-                     width="211">
-                        <on_click function="View.LookAtLastChatter" userdata="" />
-                        <on_enable function="View.EnableLastChatter" />
-                </menu_item_call>
-                <menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="211" />
-                <menu_item_check bottom="-113" enabled="true" height="19" label="Toolbar" left="0"
-                     mouse_opaque="true" name="Toolbar" width="211">
-                        <on_click function="ShowFloater" userdata="toolbar" />
-                        <on_check function="FloaterVisible" userdata="toolbar" />
-                </menu_item_check>
-                <menu_item_check bottom="-132" enabled="true" height="19" label="Local Chat" left="0"
-                     mouse_opaque="true" name="Chat History" shortcut="control|H" width="211">
-                        <on_click function="ShowFloater" userdata="chat history" />
-                        <on_check function="FloaterVisible" userdata="chat history" />
-                </menu_item_check>
-                <menu_item_check bottom="-151" enabled="true" height="19" label="Communicate" left="0"
-                     mouse_opaque="true" name="Instant Message" shortcut="control|T" width="211">
-                        <on_click function="ShowFloater" userdata="im" />
-                        <on_check function="FloaterVisible" userdata="im" />
-                </menu_item_check>
-                <menu_item_call bottom="-170" enabled="true" height="19" label="Inventory" left="0"
-                     mouse_opaque="true" name="Inventory" shortcut="control|I" width="211">
-                        <on_click function="ShowFloater" userdata="inventory" />
-                </menu_item_call>
-                <menu_item_check bottom="-189" enabled="true" height="19" label="Active Speakers" left="0"
-                     mouse_opaque="true" name="Active Speakers" width="211">
-                        <on_click function="ShowFloater" userdata="active speakers" />
-                        <on_check function="FloaterVisible" userdata="active speakers" />
-                </menu_item_check>
-                <menu_item_check bottom="-189" enabled="true" height="19" label="Mute List" left="0"
-                     mouse_opaque="true" name="Mute List" width="211">
-                        <on_click function="ShowFloater" userdata="mute list" />
-                        <on_check function="FloaterVisible" userdata="mute list" />
-                </menu_item_check>
-                <menu_item_separator bottom="-197" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="211" />
-                <menu_item_check bottom="-216" enabled="true" height="19" label="Camera Controls" left="0"
-                     mouse_opaque="true" name="Camera Controls" width="211">
-                        <on_click function="ShowFloater" userdata="camera controls" />
-                        <on_check function="FloaterVisible" userdata="camera controls" />
-                </menu_item_check>
-                <menu_item_check bottom="-235" enabled="true" height="19" label="Movement Controls" left="0"
-                     mouse_opaque="true" name="Movement Controls" width="211">
-                        <on_click function="ShowFloater" userdata="movement controls" />
-                        <on_check function="FloaterVisible" userdata="movement controls" />
-                </menu_item_check>
-                <menu_item_check bottom="-254" enabled="true" height="19" label="World Map" left="0"
-                     mouse_opaque="true" name="World Map" shortcut="control|M" width="211">
-                        <on_click function="ShowFloater" userdata="world map" />
-                        <on_check control="ShowWorldMap" />
-                </menu_item_check>
-                <menu_item_check bottom="-273" enabled="true" height="19" label="Mini-Map" left="0"
-                     mouse_opaque="true" name="Mini-Map" shortcut="control|shift|M" width="211">
-                        <on_click function="ShowFloater" userdata="mini map" />
-                        <on_check control="ShowMiniMap" />
-                </menu_item_check>
-                <menu_item_separator bottom="-281" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="211" />
-                <menu_item_check bottom="-300" enabled="true" height="19" label="Statistics Bar" left="0"
-                     mouse_opaque="true" name="Statistics Bar" shortcut="control|shift|1"
-                     width="211">
-                        <on_click function="ShowFloater" userdata="stat bar" />
-                        <on_check function="FloaterVisible" userdata="stat bar" />
-                </menu_item_check>
-                <menu_item_check bottom="-319" enabled="true" height="19" label="Property Lines" left="0"
-                     mouse_opaque="true" name="Property Lines" shortcut="control|alt|shift|P"
-                     width="211">
-                        <on_click function="ToggleControl" userdata="ShowPropertyLines" />
-                        <on_check control="ShowPropertyLines" />
-                </menu_item_check>
-                <menu_item_check bottom="-338" enabled="true" height="19" label="Land Owners" left="0"
-                     mouse_opaque="true" name="Land Owners" width="211">
-                        <on_click function="ToggleControl" userdata="ShowParcelOwners" />
-                        <on_check control="ShowParcelOwners" />
-                </menu_item_check>
-                <menu_item_separator bottom="-346" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="211" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="79" label="Hover Tips" left="0" mouse_opaque="false"
-                     name="Hover Tips" opaque="true" tear_off="true" width="158">
-                        <menu_item_check bottom="-29" enabled="true" height="19" label="Show Tips" left="0"
-                             mouse_opaque="true" name="Show Tips" shortcut="control|shift|T" width="158">
-                                <on_click function="View.ShowHoverTips" userdata="" />
-                                <on_check function="View.CheckShowHoverTips" />
-                        </menu_item_check>
-                        <menu_item_separator bottom="-37" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator" width="158" />
-                        <menu_item_check bottom="-56" enabled="true" height="19" label="Land Tips" left="0"
-                             mouse_opaque="true" name="Land Tips" width="158">
-                                <on_click function="ToggleControl" userdata="ShowLandHoverTip" />
-                                <on_enable function="View.CheckShowHoverTips" />
-                                <on_check control="ShowLandHoverTip" />
-                        </menu_item_check>
-                        <menu_item_check bottom="-75" enabled="true" height="19" label="Tips On All Objects" left="0"
-                             mouse_opaque="true" name="Tips On All Objects" width="158">
-                                <on_click function="ToggleControl" userdata="ShowAllObjectHoverTip" />
-                                <on_enable function="View.CheckShowHoverTips" />
-                                <on_check control="ShowAllObjectHoverTip" />
-                        </menu_item_check>
-                </menu>
-                <menu_item_check bottom="-403" enabled="true" height="19" label="Highlight Transparent" left="0"
-                     mouse_opaque="true" name="Highlight Transparent" shortcut="control|alt|T"
-                     width="211">
-                        <on_click function="View.HighlightTransparent" userdata="" />
-                        <on_check function="View.CheckHighlightTransparent" />
-                </menu_item_check>
-                <menu_item_check bottom="-384" enabled="true" height="19" label="Beacons Always On" left="0"
-                     mouse_opaque="true" name="Beacons Always On"
-                     width="211">
-                        <on_click function="ToggleControl" userdata="BeaconAlwaysOn" />
-                        <on_check control="BeaconAlwaysOn" />
-                </menu_item_check>
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="117" label="Beacons" left="0" mouse_opaque="false" name="Beacons"
-                     opaque="true" tear_off="true" width="129">
-                        <menu_item_check bottom="-29" enabled="true" height="19"
-                             label="Scripted Objects with Touch Only" left="0" mouse_opaque="true"
-                             name="Scripted Objects With Touch Only" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="scripttouchbeacon" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="scripttouchbeacon" />
-                        </menu_item_check>
-                        <menu_item_check bottom="-48" enabled="true" height="19" label="Scripted Objects" left="0"
-                             mouse_opaque="true" name="Scripted Objects" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="scriptsbeacon" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="scriptsbeacon" />
-                        </menu_item_check>
-                        <menu_item_check bottom="-67" enabled="true" height="19" label="Physical Objects" left="0"
-                             mouse_opaque="true" name="Physical Objects" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="physicalbeacon" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="physicalbeacon" />
-                        </menu_item_check>
-                        <menu_item_check bottom="-86" enabled="true" height="19" label="Sound Sources" left="0"
-                             mouse_opaque="true" name="Sound Sources" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="soundsbeacon" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="soundsbeacon" />
-                        </menu_item_check>
-                        <menu_item_check bottom="-105" enabled="true" height="19" label="Particle Sources" left="0"
-                             mouse_opaque="true" name="Particle Sources" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="particlesbeacon" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="particlesbeacon" />
-                        </menu_item_check>
-                        <menu_item_separator bottom="-113" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator" width="129" />
-                        <menu_item_check bottom="-121" enabled="true" height="19" label="Render Highlights" left="0"
-                             mouse_opaque="true" name="Render Highlights" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="renderhighlights" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="renderhighlights" />
-                        </menu_item_check>
-                        <menu_item_check bottom="-140" enabled="true" height="19" label="Render Beacons" left="0"
-                             mouse_opaque="true" name="Render Beacons" width="129">
-                                <on_click function="View.ToggleBeacon" userdata="renderbeacons" />
-                                <on_check function="View.CheckBeaconEnabled" userdata="renderbeacons" />
-                        </menu_item_check>
-                        <menu_item_separator bottom="-159" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator2" width="129" />
-                        <menu_item_check bottom="-167" enabled="true" height="19" label="Hide Particles" left="0"
-                             mouse_opaque="true" name="Hide Particles" width="129">
-                                <on_click function="View.ToggleRenderType" userdata="hideparticles" />
-                                <on_check function="View.CheckRenderType" userdata="hideparticles" />
-                        </menu_item_check>
-                        <menu_item_separator bottom="-186" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator3" width="129" />
-                        <menu bottom="-205" color="0 0 0 1" create_jump_keys="true" drop_shadow="true"
-                             enabled="true" height="117" label="Beacon Width" left="0"
-                             mouse_opaque="false" name="Beacon Width" opaque="true" tear_off="true"
-                             width="129">
-                                <menu_item_call bottom="-19" enabled="true" height="19" label="1" left="0" mouse_opaque="true"
-                                     name="Beacon Width 1" width="188">
-                                        <on_click function="View.BeaconWidth" userdata="1" />
-                                </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" label="4" left="0" mouse_opaque="true"
-                                     name="Beacon Width 4" width="188">
-                                        <on_click function="View.BeaconWidth" userdata="4" />
-                                </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" label="16" left="0" mouse_opaque="true"
-                                     name="Beacon Width 16" width="188">
-                                        <on_click function="View.BeaconWidth" userdata="16" />
-                                </menu_item_call>
-                                <menu_item_call bottom="-19" enabled="true" height="19" label="32" left="0" mouse_opaque="true"
-                                     name="Beacon Width 32" width="188">
-                                        <on_click function="View.BeaconWidth" userdata="32" />
-                                </menu_item_call>
-                        </menu>
-                </menu>
-                <menu_item_check bottom="-441" enabled="true" height="19" label="Show HUD Attachments" left="0"
-                     mouse_opaque="true" name="Show HUD Attachments" shortcut="alt|shift|H"
-                     width="211">
-                        <on_click function="View.ShowHUDAttachments" userdata="" />
-                        <on_check function="View.CheckHUDAttachments" />
-                </menu_item_check>
-                <menu_item_separator bottom="-449" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator5" width="211" />
-                <menu_item_call bottom="-468" enabled="true" height="19" label="Zoom In" left="0"
-                     mouse_opaque="true" name="Zoom In" shortcut="control|0" width="211">
-                        <on_click function="View.ZoomIn" userdata="" />
-                </menu_item_call>
-                <menu_item_call bottom="-487" enabled="true" height="19" label="Zoom Default" left="0"
-                     mouse_opaque="true" name="Zoom Default" shortcut="control|9" width="211">
-                        <on_click function="View.ZoomDefault" userdata="" />
-                </menu_item_call>
-                <menu_item_call bottom="-506" enabled="true" height="19" label="Zoom Out" left="0"
-                     mouse_opaque="true" name="Zoom Out" shortcut="control|8" width="211">
-                        <on_click function="View.ZoomOut" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-514" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator6" width="211" />
-                <menu_item_call bottom="-19" enabled="true" height="19" label="Toggle Fullscreen" left="0"
-                     mouse_opaque="true" name="Toggle Fullscreen" shortcut="alt|Enter"
-                     width="188">
-                        <on_click function="View.Fullscreen" userdata="" />
-                </menu_item_call>
-                <menu_item_call bottom="-38" enabled="true" height="19" label="Set UI Size to Default" left="0"
-                     mouse_opaque="true" name="Set UI Size to Default" width="188">
-                        <on_click function="View.DefaultUISize" userdata="" />
-                </menu_item_call>
-        </menu>
-        <menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="339" label="World" left="0" mouse_opaque="false" name="World"
-             opaque="true" tear_off="true" width="185">
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Chat" left="0"
-                     mouse_opaque="true" name="Chat" shortcut="" width="185">
-                        <on_click function="World.Chat" userdata="" />
-                </menu_item_call>
-                <menu_item_check bottom="-67" enabled="true" height="19" label="Always Run" left="0"
-                     mouse_opaque="true" name="Always Run" shortcut="control|R" width="185">
-                        <on_click function="World.AlwaysRun" userdata="" />
-                        <on_check function="World.CheckAlwaysRun" userdata="" />
-                </menu_item_check>
-                <menu_item_check bottom="-86" enabled="true" height="19" label="Fly" left="0"
-                     mouse_opaque="true" name="Fly" shortcut="Home" width="185">
-                        <on_click function="World.Fly" userdata="" />
-                        <on_enable function="World.EnableFly" />
-                        <on_check control="FlyBtnState" />
-                </menu_item_check>
-                <menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="185" />
-                <menu_item_call bottom="-113" enabled="true" height="19" label="Create Landmark Here" left="0"
-                     mouse_opaque="true" name="Create Landmark Here" width="185">
-                        <on_click function="World.CreateLandmark" userdata="" />
-                        <on_enable function="World.EnableCreateLandmark" userdata="" />
-                </menu_item_call>
-                <menu_item_call bottom="-132" enabled="true" height="19" label="Set Home to Here" left="0"
-                     mouse_opaque="true" name="Set Home to Here" width="185">
-                        <on_click function="World.SetHomeLocation" userdata="" />
-                        <on_enable function="World.EnableSetHomeLocation" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-140" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="185" />
-                <menu_item_call bottom="-159" enabled="true" height="19" label="Teleport Home" left="0"
-                     mouse_opaque="true" name="Teleport Home" shortcut="control|shift|H"
-                     width="185">
-                        <on_click function="World.TeleportHome" userdata="" />
-                        <on_enable function="World.EnableTeleportHome" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-167" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="185" />
-                <menu_item_call bottom="-186" enabled="true" height="19" label="Set Away" left="0"
-                     mouse_opaque="true" name="Set Away" width="185">
-                        <on_click function="World.SetAway" userdata="" />
-                </menu_item_call>
-                <menu_item_call bottom="-205" enabled="true" height="19" label="Set Busy" left="0"
-                     mouse_opaque="true" name="Set Busy" width="185">
-                        <on_click function="World.SetBusy" userdata="" />
-                </menu_item_call>
-                <menu_item_call bottom="-281" enabled="false" height="19" label="Stop All Animations" left="0"
-                     mouse_opaque="true" name="Stop All Animations" width="250">
-                        <on_click function="Tools.StopAllAnimations" userdata="" />
-                </menu_item_call>
-                <menu_item_call bottom="-213" enabled="false" height="19" label="Release Keys" left="0"
-                     mouse_opaque="true" name="Release Keys" width="250">
-                        <on_click function="Tools.ReleaseKeys" userdata="" />
-                        <on_enable function="Tools.EnableReleaseKeys" userdata="" />
-                </menu_item_call>
-                <menu_item_separator bottom="-232" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="185" />
-                <menu_item_call bottom="-232" enabled="true" height="19" label="Account History..." left="0"
-                     mouse_opaque="true" name="Account History..." width="185">
-                        <on_click function="PromptShowURL"
-                             userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
-                </menu_item_call>
-                <menu_item_call bottom="-267" enabled="true" height="19" label="Manage My Account..." left="0"
-                     mouse_opaque="true" name="Manage My Account..." width="166">
-                        <on_click function="PromptShowURL"
-                             userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
-                </menu_item_call>
-                <menu_item_call bottom="-286" enabled="true" height="19" label="Buy L$..." left="0"
-                     mouse_opaque="true" name="Buy and Sell L$..." width="166">
-                        <on_click function="ShowFloater" userdata="buy currency" />
-                </menu_item_call>
-                <menu_item_separator bottom="-213" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator5" width="185" />
-                <menu_item_call bottom="-251" enabled="true" height="19" label="My Land..." left="0"
-                     mouse_opaque="true" name="My Land..." width="185">
-                        <on_click function="ShowFloater" userdata="my land" />
-                </menu_item_call>
-                <menu_item_call bottom="-270" enabled="true" height="19" label="About Land..." left="0"
-                     mouse_opaque="true" name="About Land..." width="185">
-                        <on_click function="ShowFloater" userdata="about land" />
-                </menu_item_call>
-                <menu_item_call bottom="-289" enabled="true" height="19" label="Buy Land..." left="0"
-                     mouse_opaque="true" name="Buy Land..." width="185">
-                        <on_click function="ShowFloater" userdata="buy land" />
-                        <on_enable function="World.EnableBuyLand" />
-                </menu_item_call>
-                <menu_item_call bottom="-308" enabled="true" height="19" label="Region/Estate..." left="0"
-                     mouse_opaque="true" name="Region/Estate..." width="185">
-                        <on_click function="ShowFloater" userdata="about region" />
-                </menu_item_call>
-                <menu_item_separator bottom="-316" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator6" width="185" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="117" label="Environment Settings" left="0" mouse_opaque="false"
-                     name="Environment Settings" opaque="true" tear_off="true" width="169">
-                        <menu_item_call bottom="-29" enabled="true" height="19" label="Sunrise" left="0"
-                             mouse_opaque="true" name="Sunrise" width="169">
-                                <on_click function="World.EnvSettings" userdata="sunrise" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-48" enabled="true" height="19" label="Midday" left="0"
-                             mouse_opaque="true" name="Noon" shortcut="control|shift|Y" width="169">
-                                <on_click function="World.EnvSettings" userdata="noon" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-67" enabled="true" height="19" label="Sunset" left="0"
-                             mouse_opaque="true" name="Sunset" shortcut="control|shift|N" width="169">
-                                <on_click function="World.EnvSettings" userdata="sunset" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-86" enabled="true" height="19" label="Midnight" left="0"
-                             mouse_opaque="true" name="Midnight" width="169">
-                                <on_click function="World.EnvSettings" userdata="midnight" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-105" enabled="false" height="19" label="Revert to Region Default"
-                             left="0" mouse_opaque="true" name="Revert to Region Default" width="169">
-                                <on_click function="World.EnvSettings" userdata="default" />
-                        </menu_item_call>
-                        <menu_item_separator bottom="-113" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator" width="169" />
-                        <menu_item_call bottom="-132" enabled="false" height="19" label="Environment Editor" left="0"
-                             mouse_opaque="true" name="Environment Editor" width="169">
-                                <on_click function="World.EnvSettings" userdata="editor" />
-                        </menu_item_call>
-                </menu>
-        </menu>
-        <menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="510" label="Tools" left="0" mouse_opaque="false" name="Tools"
-             opaque="true" tear_off="true" visible="false" width="250">
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="109" label="Select Tool" left="0" mouse_opaque="false"
-                     name="Select Tool" opaque="true" tear_off="true" width="118">
-                        <menu_item_call bottom="-29" enabled="true" height="19" label="Focus" left="0"
-                             mouse_opaque="true" name="Focus" shortcut="control|1" width="118">
-                                <on_click function="Tools.SelectTool" userdata="focus" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-48" enabled="true" height="19" label="Move" left="0"
-                             mouse_opaque="true" name="Move" shortcut="control|2" width="118">
-                                <on_click function="Tools.SelectTool" userdata="move" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-67" enabled="true" height="19" label="Edit" left="0"
-                             mouse_opaque="true" name="Edit" shortcut="control|3" width="118">
-                                <on_click function="Tools.SelectTool" userdata="edit" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-86" enabled="true" height="19" label="Create" left="0"
-                             mouse_opaque="true" name="Create" shortcut="control|4" width="118">
-                                <on_click function="Tools.SelectTool" userdata="create" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-105" enabled="true" height="19" label="Land" left="0"
-                             mouse_opaque="true" name="Land" shortcut="control|5" width="118">
-                                <on_click function="Tools.SelectTool" userdata="land" />
-                        </menu_item_call>
-                </menu>
-                <menu_item_separator bottom="-37" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="250" />
-                <menu_item_check bottom="-56" enabled="true" height="19" label="Select Only My Objects" left="0"
-                     mouse_opaque="true" name="Select Only My Objects" width="250">
-                        <on_click function="Tools.SelectOnlyMyObjects" userdata="agents" />
-                        <on_check control="SelectOwnedOnly" />
-                </menu_item_check>
-                <menu_item_check bottom="-75" enabled="true" height="19" label="Select Only Movable Objects"
-                     left="0" mouse_opaque="true" name="Select Only Movable Objects" width="250">
-                        <on_click function="Tools.SelectOnlyMovableObjects" userdata="movable" />
-                        <on_check control="SelectMovableOnly" />
-                </menu_item_check>
-                <menu_item_check bottom="-94" enabled="true" height="19" label="Select By Surrounding" left="0"
-                     mouse_opaque="true" name="Select By Surrounding" width="250">
-                        <on_click function="Tools.SelectBySurrounding" userdata="" />
-                        <on_check control="RectangleSelectInclusive" />
-                </menu_item_check>
-                <menu_item_check bottom="-113" enabled="true" height="19" label="Show Hidden Selection" left="0"
-                     mouse_opaque="true" name="Show Hidden Selection" width="250">
-                        <on_click function="Tools.ShowHiddenSelection" userdata="" />
-                        <on_check control="RenderHiddenSelections" />
-                </menu_item_check>
-                <menu_item_check bottom="-132" enabled="true" height="19"
-                     label="Show Light Radius for Selection" left="0" mouse_opaque="true"
-                     name="Show Light Radius for Selection" width="250">
-                        <on_click function="Tools.ShowSelectionLightRadius" userdata="" />
-                        <on_check control="RenderLightRadius" />
-                </menu_item_check>
-                <menu_item_check bottom="-151" enabled="true" height="19" label="Show Selection Beam" left="0"
-                     mouse_opaque="true" name="Show Selection Beam" width="250">
-                        <on_click function="ToggleControl" userdata="ShowSelectionBeam" />
-                        <on_check control="ShowSelectionBeam" />
-                </menu_item_check>
-                <menu_item_separator bottom="-159" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="250" />
-                <menu_item_check bottom="-178" enabled="false" height="19" label="Snap to Grid" left="0"
-                     mouse_opaque="true" name="Snap to Grid" shortcut="G" width="250">
-                        <on_click function="ToggleControl" userdata="SnapEnabled" />
-                        <on_check control="SnapEnabled" />
-                        <on_enable function="Tools.EnableToolNotPie" />
-                </menu_item_check>
-                <menu_item_call bottom="-197" enabled="false" height="19" label="Snap Object XY to Grid"
-                     left="0" mouse_opaque="true" name="Snap Object XY to Grid"
-                     shortcut="shift|X" width="250">
-                        <on_click function="Tools.SnapObjectXY" userdata="" />
-                        <on_enable function="Tools.EnableToolNotPie" />
-                </menu_item_call>
-                <menu_item_call bottom="-216" enabled="false" height="19" label="Use Selection for Grid"
-                     left="0" mouse_opaque="true" name="Use Selection for Grid"
-                     shortcut="shift|G" width="250">
-                        <on_click function="Tools.UseSelectionForGrid" userdata="" />
-                        <on_enable function="SomethingSelected" />
-                </menu_item_call>
-                <menu_item_call bottom="-235" enabled="false" height="19" label="Grid Options..." left="0"
-                     mouse_opaque="true" name="Grid Options..." shortcut="control|shift|B"
-                     width="250">
-                        <on_click function="ShowFloater" userdata="grid options" />
-                        <on_enable function="Tools.EnableToolNotPie" />
-                </menu_item_call>
-                <menu_item_separator bottom="-243" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="250" />
-                <menu_item_check bottom="" enabled="false" height="" label="Edit Linked Parts" left=""
-                     mouse_opaque="true" name="Edit Linked Parts" shortcut="" width="">
-                        <on_click function="ToggleControl" userdata="EditLinkedParts" />
-                        <on_click function="Tools.EditLinkedParts" userdata="" />
-                        <on_check control="EditLinkedParts" />
-                        <on_enable function="Tools.EnableToolNotPie" />
-                </menu_item_check>
-                <menu_item_call bottom="-262" enabled="false" height="19" label="Link" left="0"
-                     mouse_opaque="true" name="Link" shortcut="control|L" width="250">
-                        <on_click function="Tools.Link" userdata="" />
-                        <on_enable function="Tools.EnableLink" />
-                </menu_item_call>
-                <menu_item_call bottom="-281" enabled="false" height="19" label="Unlink" left="0"
-                     mouse_opaque="true" name="Unlink" shortcut="control|shift|L" width="250">
-                        <on_click function="Tools.Unlink" userdata="" />
-                        <on_enable function="Tools.EnableUnlink" />
-                </menu_item_call>
-                <menu_item_separator bottom="-289" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator4" width="250" />
-                <menu_item_call bottom="-308" enabled="false" height="19" label="Focus on Selection" left="0"
-                     mouse_opaque="true" name="Focus on Selection" shortcut="H" width="250">
-                        <on_click function="Tools.LookAtSelection" userdata="focus" />
-                        <on_enable function="Tools.SomethingSelectedNoHUD" />
-                </menu_item_call>
-                <menu_item_call bottom="-327" enabled="false" height="19" label="Zoom to Selection" left="0"
-                     mouse_opaque="true" name="Zoom to Selection" shortcut="shift|H" width="250">
-                        <on_click function="Tools.LookAtSelection" userdata="zoom" />
-                        <on_enable function="Tools.SomethingSelectedNoHUD" />
-                </menu_item_call>
-                <menu_item_call bottom="-346" enabled="false" height="19" label="Buy Object" left="0"
-                     mouse_opaque="true" name="Menu Object Take" visible="false" width="250">
-                        <on_click function="Tools.BuyOrTake" userdata="" />
-                        <on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" />
-                </menu_item_call>
-                <menu_item_call bottom="-365" enabled="false" height="19" label="Take Copy" left="0"
-                     mouse_opaque="true" name="Take Copy" width="250">
-                        <on_click function="Tools.TakeCopy" userdata="" />
-                        <on_enable function="Tools.EnableTakeCopy" />
-                </menu_item_call>
-                <menu_item_call bottom="-384" enabled="false" height="19"
-                     label="Save Object Back to My Inventory" left="0" mouse_opaque="true"
-                     name="Save Object Back to My Inventory" width="250">
-                        <on_click function="Tools.SaveToInventory" userdata="" />
-                        <on_enable function="Tools.EnableSaveToInventory" />
-                </menu_item_call>
-                <menu_item_call bottom="-403" enabled="false" height="19"
-                     label="Save Object Back to Object Contents" left="0" mouse_opaque="true"
-                     name="Save Object Back to Object Contents" width="250">
-                        <on_click function="Tools.SaveToObjectInventory" userdata="" />
-                        <on_enable function="Tools.EnableSaveToObjectInventory" />
-                </menu_item_call>
-                <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator6" width="250" />
-                <menu_item_call bottom="-430" enabled="true" height="19"
-                     label="Show Script Warning/Error Window" left="0" mouse_opaque="true"
-                     name="Show Script Warning/Error Window" width="250">
-                        <on_click function="ShowFloater" userdata="script errors" />
-                </menu_item_call>
-                <menu bottom="-449" color="0 0 0 1" drop_shadow="true" enabled="true" height="52"
-                     hidden="false" label="Recompile Scripts in Selection" left="0" mouse_opaque="false"
-                     name="Recompile Scripts in Selection" opaque="true" tear_off="true" create_jump_keys="true" width="169">
-                     <menu_item_call bottom="-29" enabled="true" height="19" 
-                             hidden="false" label="Mono" left="0"
-                             mouse_opaque="true" name="Mono" width="169">
-                             <on_click function="Tools.SelectedScriptAction" userdata="compile mono" />
-                             <on_enable function="EditableSelectedMono" />
-                     </menu_item_call>
-                     <menu_item_call bottom="-48" enabled="true" height="19" 
-                             hidden="false" label="LSL" left="0"
-                             mouse_opaque="true" name="LSL" width="169">
-                             <on_click function="Tools.SelectedScriptAction" userdata="compile lsl" />
-                             <on_enable function="EditableSelected" />
-                     </menu_item_call>
-                </menu>
-                <menu_item_call bottom="-468" enabled="false" height="19" label="Reset Scripts in Selection"
-                     left="0" mouse_opaque="true" name="Reset Scripts in Selection" width="250">
-                        <on_click function="Tools.SelectedScriptAction" userdata="reset" />
-                        <on_enable function="EditableSelected" />
-                </menu_item_call>
-                <menu_item_call bottom="-487" enabled="false" height="19"
-                     label="Set Scripts to Running in Selection" left="0" mouse_opaque="true"
-                     name="Set Scripts to Running in Selection" width="250">
-                        <on_click function="Tools.SelectedScriptAction" userdata="start" />
-                        <on_enable function="EditableSelected" />
-                </menu_item_call>
-                <menu_item_call bottom="-506" enabled="false" height="19"
-                     label="Set Scripts to Not Running in Selection" left="0"
-                     mouse_opaque="true" name="Set Scripts to Not Running in Selection"
-                     width="250">
-                        <on_click function="Tools.SelectedScriptAction" userdata="stop" />
-                        <on_enable function="EditableSelected" />
-                </menu_item_call>
-        </menu>
-        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
-             height="317" label="Help" left="227" mouse_opaque="false" name="Help"
-             opaque="true" tear_off="true" width="166">
-                <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"
-                     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
-                        <on_click function="ShowFloater" userdata="help f1" />
-                </menu_item_call>
-                <menu_item_call bottom="-48" enabled="true" height="19" label="Tutorial" left="0"
-                     mouse_opaque="true" name="Tutorial" width="166">
-                        <on_click function="ShowFloater" userdata="help tutorial" />
-                </menu_item_call>
-                <menu_item_separator bottom="-75" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator" width="166" />
-                <menu_item_call bottom="-94" enabled="true" height="19" label="Official Linden Blog..."
-                     left="0" mouse_opaque="true" name="Official Linden Blog..." width="166">
-                        <on_click function="PromptShowURL"
-                             userdata="WebLaunchSupportWiki,http://blog.secondlife.com/" />
-                </menu_item_call>
-                <menu_item_separator bottom="-102" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator2" width="166" />
-                <menu_item_call bottom="-121" enabled="true" height="19" label="Scripting Guide..." left="0"
-                     mouse_opaque="true" name="Scripting Guide..." width="166">
-                        <on_click function="PromptShowFile" userdata="WebLaunchLSLGuide,lsl_guide.html" />
-                </menu_item_call>
-                <menu_item_call bottom="-140" enabled="true" height="19" label="Scripting Portal..." left="0"
-                     mouse_opaque="true" name="Scripting Portal..." width="166">
-                        <on_click function="PromptShowURL"
-                             userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
-                </menu_item_call>
-                <menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator3" width="166" />
-                <menu_item_call bottom="-194" enabled="true" height="19" label="Report Abuse..." left="0"
-                     mouse_opaque="true" name="Report Abuse..." width="166">
-                        <on_click function="ShowFloater" userdata="complaint reporter" />
-                </menu_item_call>
-                <menu_item_call bottom="-213" enabled="true" height="19" label="Bumps, Pushes &amp; Hits..."
-                     left="0" mouse_opaque="true" name="Bumps, Pushes &amp;amp; Hits..."
-                     width="166">
-                        <on_click function="ShowFloater" userdata="mean events" />
-                </menu_item_call>
-                <menu_item_call label="Lag Meter" name="Lag Meter">
-                        <on_click function="ShowFloater" userdata="lag meter" />
-                </menu_item_call>
-                <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                     mouse_opaque="true" name="separator7" width="250" />
-                <menu bottom="-554" create_jump_keys="true" drop_shadow="true" enabled="true"
-                     height="109" label="Bug Reporting" left="0" mouse_opaque="false"
-                     name="Bug Reporting" opaque="true" tear_off="true" width="118">
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker..."
-                             left="0" mouse_opaque="true" name="Public Issue Tracker..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Public Issue Tracker Help..."
-                             left="0" mouse_opaque="true" name="Publc Issue Tracker Help..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
-                        </menu_item_call>
-                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator7" width="250" />
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Bug Reporting 101..." left="0"
-                             mouse_opaque="true" name="Bug Reporing 101..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="Security Issues..." left="0"
-                             mouse_opaque="true" name="Security Issues..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
-                        </menu_item_call>
-                        <menu_item_call bottom="-94" enabled="true" height="19" label="QA Wiki..." left="0"
-                             mouse_opaque="true" name="QA Wiki..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
-                        </menu_item_call>
-                        <menu_item_separator bottom="-411" enabled="true" height="8" label="-----------" left="0"
-                             mouse_opaque="true" name="separator9" width="250" />
-                        <menu_item_call bottom="-240" enabled="true" height="19" label="Report Bug..." left="0"
-                             mouse_opaque="true" name="Report Bug..." width="166">
-                                <on_click function="PromptShowURL"
-                                     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-                        </menu_item_call>
-                </menu>
-                <menu_item_call bottom="-313" enabled="true" height="19" label="About Second Life..." left="0"
-                     mouse_opaque="true" name="About Second Life..." width="166">
-                        <on_click function="ShowFloater" userdata="about" />
-                </menu_item_call>
-        </menu>
+    <menu_item_call name="Reset Scripts in Selection" enabled="false"
+                    label="Reset Scripts in Selection">
+      <on_click function="Tools.SelectedScriptAction"
+                userdata="reset" />
+      <on_enable function="EditableSelected" />
+    </menu_item_call>
+    <menu_item_call name="Set Scripts to Running in Selection"
+                    enabled="false"
+                    label="Set Scripts to Running in Selection">
+      <on_click function="Tools.SelectedScriptAction"
+                userdata="start" />
+      <on_enable function="EditableSelected" />
+    </menu_item_call>
+    <menu_item_call name="Set Scripts to Not Running in Selection"
+                    enabled="false"
+                    label="Set Scripts to Not Running in Selection">
+      <on_click function="Tools.SelectedScriptAction"
+                userdata="stop" />
+      <on_enable function="EditableSelected" />
+    </menu_item_call>
+    <menu_item_call name="Set permissions on selected task inventory"
+                    enabled="false"
+                    label="Set permissions on selected task inventory">
+      <on_click function="Tools.SetBulkPerms" userdata="" />
+      <on_enable function="EditableSelected" />
+    </menu_item_call>
+  </menu>
+
+
+
+  <!-- HELP -->
+
+  <menu name="Help" create_jump_keys="true" label="Help"
+        opaque="true" tear_off="true">
+    <menu_item_call name="Second Life Help" label="Second Life Help"
+                    shortcut="F1">
+      <on_click function="ShowFloater" userdata="help f1" />
+    </menu_item_call>
+    <menu_item_call name="Tutorial" label="Tutorial">
+      <on_click function="ShowFloater" userdata="help tutorial" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Official Linden Blog..."
+                    label="Official Linden Blog...">
+      <on_click function="PromptShowURL"
+                userdata="WebLaunchSupportWiki,http://blog.secondlife.com/" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Scripting Guide..."
+                    label="Scripting Guide...">
+      <on_click function="PromptShowFile"
+                userdata="WebLaunchLSLGuide,lsl_guide.html" />
+    </menu_item_call>
+    <menu_item_call name="Scripting Portal..."
+                    label="Scripting Portal...">
+      <on_click function="PromptShowURL"
+                userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu_item_call name="Report Abuse..." label="Report Abuse...">
+      <on_click function="ShowFloater"
+                userdata="complaint reporter" />
+    </menu_item_call>
+    <menu_item_call name="Bumps, Pushes &amp;amp; Hits..."
+                    label="Bumps, Pushes &amp; Hits...">
+      <on_click function="ShowFloater" userdata="mean events" />
+    </menu_item_call>
+    <menu_item_call name="Lag Meter" label="Lag Meter">
+      <on_click function="ShowFloater" userdata="lag meter" />
+    </menu_item_call>
+    <menu_item_separator />
+    <menu name="Bug Reporting" create_jump_keys="true"
+          label="Bug Reporting" opaque="true" tear_off="true">
+      <menu_item_call name="Public Issue Tracker..."
+                      label="Public Issue Tracker...">
+        <on_click function="PromptShowURL"
+                  userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
+      </menu_item_call>
+      <menu_item_call name="Publc Issue Tracker Help..."
+                      label="Public Issue Tracker Help...">
+        <on_click function="PromptShowURL"
+                  userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
+      </menu_item_call>
+      <menu_item_separator />
+      <menu_item_call name="Bug Reporing 101..."
+                      label="Bug Reporting 101...">
+        <on_click function="PromptShowURL"
+                  userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+      </menu_item_call>
+      <menu_item_call name="Security Issues..."
+                      label="Security Issues...">
+        <on_click function="PromptShowURL"
+                  userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
+      </menu_item_call>
+      <menu_item_call name="QA Wiki..." label="QA Wiki...">
+        <on_click function="PromptShowURL"
+                  userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
+      </menu_item_call>
+      <menu_item_separator />
+      <menu_item_call name="Report Bug..." label="Report Bug...">
+        <on_click function="PromptShowURL"
+                  userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
+      </menu_item_call>
+    </menu>
+    <menu_item_separator />
+    <menu_item_call name="About Second Life..."
+                    label="About Second Life...">
+      <on_click function="ShowFloater" userdata="about" />
+    </menu_item_call>
+  </menu>
+
+
+
+  <!-- ADVANCED -->
+
+  <menu name="Advanced" drop_shadow="true"
+        opaque="true" tear_off="true">
+
+
+    <!-- CONSOLES -->
+
+    <menu name="Consoles" drop_shadow="true"
+          opaque="true" tear_off="true">
+      <menu_item_check name="Frame Console" label="Frame Console"
+                       shortcut="control|shift|2">
+        <on_click function="Advanced.ToggleConsole"
+                  userdata="frame" />
+        <on_check function="Advanced.CheckConsole"
+                  userdata="frame" />
+      </menu_item_check>
+      <menu_item_check name="Texture Console" label="Texture Console"
+                       shortcut="control|shift|3">
+        <on_click function="Advanced.ToggleConsole"
+                  userdata="texture" />
+        <on_check function="Advanced.CheckConsole"
+                  userdata="texture" />
+      </menu_item_check>
+      <menu_item_check name="Debug Console" label="Debug Console"
+                       shortcut="control|shift|4">
+        <on_click function="Advanced.ToggleConsole"
+                  userdata="debug" />
+        <on_check function="Advanced.CheckConsole"
+                  userdata="debug" />
+      </menu_item_check>
+      <menu_item_check name="Fast Timers" label="Fast Timers"
+                       shortcut="control|shift|9">
+        <on_click function="Advanced.ToggleConsole"
+                  userdata="fast timers" />
+        <on_check function="Advanced.CheckConsole"
+                  userdata="fast timers" />
+      </menu_item_check>
+      <!-- Requires compiled-in support, I think?
+      <menu_item_check name="Memory" label="Memory"
+                       shortcut="control|shift|0">
+        <on_click function="Advanced.ToggleConsole"
+                  userdata="memory" />
+        <on_check function="Advanced.CheckConsole"
+                  userdata="memory" />
+      </menu_item_check>
+      -->
+      <menu_item_separator />
+      <menu_item_call name="Region Info to Debug Console"
+                      label="Region Info to Debug Console">
+        <on_click function="Advanced.DumpInfoToConsole"
+                  userdata="region" />
+      </menu_item_call>
+      <menu_item_call name="Group Info to Debug Console"
+                      label="Group Info to Debug Console">
+        <on_click function="Advanced.DumpInfoToConsole"
+                  userdata="group" />
+      </menu_item_call>
+      <menu_item_call name="Capabilities Info to Debug Console"
+                      label="Capabilities Info to Debug Console">
+        <on_click function="Advanced.DumpInfoToConsole"
+                  userdata="capabilities" />
+      </menu_item_call>
+    </menu>
+
+
+    <menu_item_call name="Reload personal setting overrides"
+                    label="Reload personal settings overrides"
+                    shortcut="control|shift|F2">
+      <on_click function="Advanced.ReloadSettingsOverrides" userdata="" />
+    </menu_item_call>
+
+
+
+    <!-- HUD INFO -->
+
+    <menu name="HUD Info" drop_shadow="true"
+          opaque="true" tear_off="true">
+      <menu_item_check name="Velocity" label="Velocity">
+        <on_click function="Advanced.ToggleHUDInfo"
+                  userdata="velocity" />
+        <on_check function="Advanced.CheckHUDInfo"
+                  userdata="velocity" />
+      </menu_item_check>
+      <menu_item_check name="Camera" label="Camera">
+        <on_click function="Advanced.ToggleHUDInfo"
+                  userdata="camera" />
+        <on_check function="Advanced.CheckHUDInfo"
+                  userdata="camera" />
+      </menu_item_check>
+      <menu_item_check name="Wind" label="Wind">
+        <on_click function="Advanced.ToggleHUDInfo"
+                  userdata="wind" />
+        <on_check function="Advanced.CheckHUDInfo"
+                  userdata="wind" />
+      </menu_item_check>
+      <menu_item_check name="FOV" label="FOV">
+        <on_click function="Advanced.ToggleHUDInfo"
+                  userdata="fov" />
+        <on_check function="Advanced.CheckHUDInfo"
+                  userdata="fov" />
+      </menu_item_check>
+    </menu>
+
+
+    <menu_item_separator />
+
+    <menu_item_check name="High-res Snapshot"
+                     label="High-res Snapshot">
+      <on_click function="ToggleControl"
+                userdata="HighResSnapshot" />
+      <on_check control="HighResSnapshot" />
+    </menu_item_check>
+    <menu_item_check name="Quiet Snapshots to Disk"
+                     label="Quiet Snapshots to Disk">
+      <on_click function="ToggleControl"
+                userdata="QuietSnapshotsToDisk" />
+      <on_check control="QuietSnapshotsToDisk" />
+    </menu_item_check>
+    <menu_item_check name="Compress Snapshots to Disk"
+                     label="Compress Snapshots to Disk">
+      <on_click function="ToggleControl"
+                userdata="CompressSnapshotsToDisk" />
+      <on_check control="CompressSnapshotsToDisk" />
+    </menu_item_check>
+    <menu_item_check name="Show Mouselook Crosshairs"
+                     label="Show Mouselook Crosshairs">
+      <on_click function="ToggleControl"
+                userdata="ShowCrosshairs" />
+      <on_check control="ShowCrosshairs" />
+    </menu_item_check>
+    <menu_item_check name="Debug Permissions"
+                     label="Debug Permissions">
+      <on_click function="ToggleControl"
+                userdata="DebugPermissions" />
+      <on_check control="DebugPermissions" />
+    </menu_item_check>
+    <menu_item_call name="Clear Group Cache"
+                    label="Clear Group Cache">
+      <on_click function="Advanced.ClearGroupCache"
+                userdata="" />
+    </menu_item_call>
+    <menu_item_separator />
+
+
+
+    <!-- RENDERING -->
+
+    <menu name="Rendering" drop_shadow="true"
+          opaque="true" tear_off="true">
+
+      <!-- TYPES -->
+      <menu name="Types" drop_shadow="true"
+            opaque="true" tear_off="true">
+        <menu_item_check name="Simple" label="Simple"
+                         shortcut="control|alt|shift|1">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="simple" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="simple" />
+        </menu_item_check>
+        <menu_item_check name="Alpha" label="Alpha"
+                         shortcut="control|alt|shift|2">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="alpha" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="alpha" />
+        </menu_item_check>
+        <menu_item_check name="Tree" label="Tree"
+                         shortcut="control|alt|shift|3">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="tree" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="tree" />
+        </menu_item_check>
+        <menu_item_check name="Character" label="Character"
+                         shortcut="control|alt|shift|4">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="avatar" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="avatar" />
+        </menu_item_check>
+        <menu_item_check name="SurfacePatch" label="SurfacePatch"
+                         shortcut="control|alt|shift|5">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="terrain" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="terrain" />
+        </menu_item_check>
+        <menu_item_check name="Sky" label="Sky"
+                         shortcut="control|alt|shift|6">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="sky" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="sky" />
+        </menu_item_check>
+        <menu_item_check name="Water" label="Water"
+                         shortcut="control|alt|shift|7">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="water" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="water" />
+        </menu_item_check>
+        <menu_item_check name="Ground" label="Ground"
+                         shortcut="control|alt|shift|8">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="ground" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="ground" />
+        </menu_item_check>
+        <menu_item_check name="Volume" label="Volume"
+                         shortcut="control|alt|shift|9">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="volume" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="volume" />
+        </menu_item_check>
+        <menu_item_check name="Grass" label="Grass"
+                         shortcut="control|alt|shift|0">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="grass" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="grass" />
+        </menu_item_check>
+        <menu_item_check name="Clouds" label="Clouds"
+                         shortcut="control|alt|shift|-">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="clouds" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="clouds" />
+        </menu_item_check>
+        <menu_item_check name="Particles" label="Particles"
+                         shortcut="control|alt|shift|=">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="particles" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="particles" />
+        </menu_item_check>
+        <menu_item_check name="Bump" label="Bump"
+                         shortcut="control|alt|shift|\">
+          <on_click function="Advanced.ToggleRenderType"
+                    userdata="bump" />
+          <on_check function="Advanced.CheckRenderType"
+                    userdata="bump" />
+        </menu_item_check>
+      </menu>
+
+
+      <!-- FEATURES -->
+      <menu name="Features" drop_shadow="true"
+            opaque="true" tear_off="true">
+        <menu_item_check name="UI" label="UI"
+                         shortcut="control|alt|F1">
+          <on_click function="Advanced.ToggleFeature"
+                    userdata="ui" />
+          <on_check function="Advanced.CheckFeature"
+                    userdata="ui" />
+        </menu_item_check>
+        <menu_item_check name="Selected" label="Selected"
+                         shortcut="control|alt|F2">
+          <on_click function="Advanced.ToggleFeature"
+                    userdata="selected" />
+          <on_check function="Advanced.CheckFeature"
+                    userdata="selected" />
+        </menu_item_check>
+        <menu_item_check name="Highlighted" label="Highlighted"
+                         shortcut="control|alt|F3">
+          <on_click function="Advanced.ToggleFeature"
+                    userdata="highlighted" />
+          <on_check function="Advanced.CheckFeature"
+                    userdata="highlighted" />
+        </menu_item_check>
+        <menu_item_check name="Dynamic Textures" label="Dynamic Textures"
+                         shortcut="control|alt|F4">
+          <on_click function="Advanced.ToggleFeature"
+                    userdata="dynamic textures" />
+          <on_check function="Advanced.CheckFeature"
+                    userdata="dynamic textures" />
+        </menu_item_check>
+        <menu_item_check name="Foot Shadows" label="Foot Shadows"
+                         shortcut="control|alt|F5">
+          <on_click function="Advanced.ToggleFeature"
+                    userdata="foot shadows" />
+          <on_check function="Advanced.CheckFeature"
+                    userdata="foot shadows" />
+        </menu_item_check>
+        <menu_item_check name="Fog" label="Fog"
+                         shortcut="control|alt|F6">
+          <on_click function="Advanced.ToggleFeature"
+                    userdata="fog" />
+          <on_check function="Advanced.CheckFeature"
+                    userdata="fog" />
+        </menu_item_check>
+        <menu_item_check name="Palletized Textures"
+                         label="Palletized Textures"
+                         shortcut="control|alt|F7">
+          <on_click function="Advanced.ToggleFeature"
+                    userdata="palette" />
+          <on_check function="Advanced.CheckFeature"
+                    userdata="palette" />
+        </menu_item_check>
+        <menu_item_check name="Test FRInfo" label="Test FRInfo"
+                         shortcut="control|alt|F8">
+          <on_click function="Advanced.ToggleFeature"
+                    userdata="fr info" />
+          <on_check function="Advanced.CheckFeature"
+                    userdata="fr info" />
+        </menu_item_check>
+        <menu_item_check name="Flexible Objects"
+                         label="Flexible Objects"
+                         shortcut="control|alt|F9">
+          <on_click function="Advanced.ToggleFeature"
+                    userdata="flexible" />
+          <on_check function="Advanced.CheckFeature"
+                    userdata="flexible" />
+        </menu_item_check>
+      </menu>
+
+
+      <!-- INFO DISPLAYS -->
+      <menu name="Info Displays" drop_shadow="true"
+            opaque="true" tear_off="true">
+        <menu_item_check name="Verify" label="Verify">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="verify" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="verify" />
+        </menu_item_check>
+        <menu_item_check name="BBoxes" label="BBoxes">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="bboxes" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="bboxes" />
+        </menu_item_check>
+        <menu_item_check name="Points" label="Points">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="points" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="points" />
+        </menu_item_check>
+        <menu_item_check name="Octree" label="Octree">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="octree" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="octree" />
+        </menu_item_check>
+        <menu_item_check name="Occlusion" label="Occlusion">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="occlusion" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="occlusion" />
+        </menu_item_check>
+        <menu_item_check name="Render Batches"
+                         label="Render Batches">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="render batches" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="render batches" />
+        </menu_item_check>
+        <menu_item_check name="Animated Textures"
+                         label="Animated Textures">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="texture anim" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="texture anim" />
+        </menu_item_check>
+        <menu_item_check name="Texture Priority"
+                         label="Texture Priority">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="texture priority" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="texture priority" />
+        </menu_item_check>
+        <menu_item_check name="Avatar Rendering Cost"
+                         label="Avatar Rendering Cost">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="shame" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="shame" />
+        </menu_item_check>
+        <menu_item_check name="Texture Area (sqrt(A))"
+                         label="Texture Area (sqrt(A))">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="texture area" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="texture area" />
+        </menu_item_check>
+        <menu_item_check name="Face Area (sqrt(A))"
+                         label="Face Area (sqrt(A))">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="face area" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="face area" />
+        </menu_item_check>
+        <menu_item_check name="Pick Render" label="Pick Render">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="picking" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="picking" />
+        </menu_item_check>
+        <menu_item_check name="Lights" label="Lights">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="lights" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="lights" />
+        </menu_item_check>
+        <menu_item_check name="Particles" label="Particles">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="particles" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="particles" />
+        </menu_item_check>
+        <menu_item_check name="Composition"
+                         label="Composition">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="composition" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="composition" />
+        </menu_item_check>
+        <menu_item_check name="Glow" label="Glow">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="glow" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="glow" />
+        </menu_item_check>
+        <menu_item_check name="Show Depth Buffer"
+                         label="Show Depth Buffer">
+          <on_click function="ToggleControl"
+                    userdata="ShowDepthBuffer" />
+          <on_check control="ShowDepthBuffer" />
+        </menu_item_check>
+        <menu_item_check name="Show Select Buffer"
+                         label="Show Select Buffer">
+          <on_click function="Advanced.ToggleSelectBuffer"
+                    userdata="" />
+          <on_check function="Advanced.CheckSelectBuffer"
+                    userdata="" />
+        </menu_item_check>
+        <menu_item_check name="Vectorize Perf Test"
+                         label="Vectorize Perf Test">
+          <on_click function="ToggleControl"
+                    userdata="VectorizePerfTest" />
+          <on_check control="VectorizePerfTest" />
+        </menu_item_check>
+      </menu>
+
+
+      <!-- RENDER TESTS -->
+      <menu name="Render Tests" drop_shadow="true"
+            opaque="true" tear_off="true">
+        <menu_item_check name="Camera Offset" label="Camera Offset">
+          <on_click function="ToggleControl"
+                    userdata="CameraOffset" />
+          <on_check control="CameraOffset" />
+        </menu_item_check>
+        <menu_item_check name="Randomize Framerate"
+                         label="Randomize Framerate">
+          <on_click function="Advanced.ToggleRandomizeFramerate"
+                    userdata="" />
+          <on_check function="Advanced.CheckRandomizeFramerate"
+                    userdata="" />
+        </menu_item_check>
+        <menu_item_check name="Periodic Slow Frame"
+                         label="Periodic Slow Frame">
+          <on_click function="Advanced.TogglePeriodicSlowFrame"
+                    userdata="" />
+          <on_check function="Advanced.CheckPeriodicSlowFrame"
+                    userdata="" />
+        </menu_item_check>
+        <menu_item_check name="Frame Test" label="Frame Test">
+          <on_click function="Advanced.ToggleFrameTest"
+                    userdata="" />
+          <on_check function="Advanced.CheckFrameTest"
+                    userdata="" />
+        </menu_item_check>
+      </menu>
+
+
+      <menu_item_separator />
+
+      <menu_item_check name="Axes" label="Axes">
+        <on_click function="ToggleControl" userdata="ShowAxes" />
+        <on_check control="ShowAxes" />
+      </menu_item_check>
+
+      <menu_item_separator />
+
+      <menu_item_check name="Hide Selected" label="Hide Selected">
+        <on_click function="Advanced.ToggleHideSelectedObjects"
+                  userdata="" />
+        <on_check function="Advanced.CheckHideSelectedObjects"
+                  userdata="" />
+      </menu_item_check>
+
+      <menu_item_separator />
+
+      <menu_item_check name="Tangent Basis" label="Tangent Basis">
+        <on_click function="ToggleControl"
+                  userdata="ShowTangentBasis" />
+        <on_check control="ShowTangentBasis" />
+      </menu_item_check>
+      <menu_item_call name="Selected Texture Info"
+                      label="Selected Texture Info"
+                      shortcut="control|alt|shift|T">
+        <on_click function="Advanced.SelectedTextureInfo"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_check name="Wireframe" label="Wireframe"
+                       shortcut="control|shift|R">
+        <on_click function="Advanced.ToggleWireframe" userdata="" />
+        <on_check function="Advanced.CheckWireframe" userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Object-Object Occlusion"
+                       label="Object-Object Occlusion"
+                       shortcut="control|shift|O">
+        <on_click function="ToggleControl"
+                  userdata="UseOcclusion" />
+        <on_check control="UseOcclusion" />
+      </menu_item_check>
+      <menu_item_check name="Debug GL" label="Debug GL">
+        <on_click function="ToggleControl"
+                  userdata="RenderDebugGL" />
+        <on_check control="RenderDebugGL" />
+      </menu_item_check>
+      <menu_item_check name="Debug Pipeline" label="Debug Pipeline">
+        <on_click function="ToggleControl"
+                  userdata="RenderDebugPipeline" />
+        <on_check control="RenderDebugPipeline" />
+      </menu_item_check>
+      <menu_item_check name="Fast Alpha" label="Fast Alpha">
+        <on_click function="ToggleControl"
+                  userdata="RenderFastAlpha" />
+        <on_check control="RenderFastAlpha" />
+      </menu_item_check>
+      <menu_item_check name="Animate Textures"
+                       label="Animate Textures">
+        <on_click function="ToggleControl"
+                  userdata="AnimateTextures" />
+        <on_check control="AnimateTextures" />
+      </menu_item_check>
+      <menu_item_check name="Disable Textures"
+                       label="Disable Textures">
+        <on_click function="Advanced.ToggleDisableTextures"
+                  userdata="" />
+        <on_check function="Advanced.CheckDisableTextures"
+                  userdata="" />
+      </menu_item_check>
+      <!-- Disabled because it doesn't seem to be used anymore.
+      <menu_item_check name="HTTP Get Textures"
+                       label="HTTP Get Textures">
+        <on_click function="ToggleControl"
+                  userdata="ImagePipelineUseHTTP" />
+        <on_check control="ImagePipelineUseHTTP" />
+      </menu_item_check>
+      -->
+      <menu_item_check name="Run Multiple Threads"
+                       label="Run Multiple Threads">
+        <on_click function="ToggleControl"
+                  userdata="RunMultipleThreads" />
+        <on_check control="RunMultipleThreads" />
+      </menu_item_check>
+      <!-- Disabled because it doesn't work very well?
+      <menu_item_check name="Dynamic Reflections"
+                       label="Dynamic Reflections">
+        <on_click function="ToggleControl"
+                  userdata="RenderDynamicReflections" />
+        <on_check control="RenderDynamicReflections" />
+      </menu_item_check>
+      -->
+      <menu_item_check name="Cheesy Beacon" label="Cheesy Beacon">
+        <on_click function="ToggleControl"
+                  userdata="CheesyBeacon" />
+        <on_check control="CheesyBeacon" />
+      </menu_item_check>
+      <menu_item_check name="Attached Lights" label="Attached Lights">
+        <on_click function="ToggleRenderAttachedLights" />
+        <on_check control="RenderAttachedLights" />
+      </menu_item_check>
+      <menu_item_check name="Attached Particles" label="Attached Particles">
+        <on_click function="ToggleRenderAttachedParticles" />
+        <on_check control="RenderAttachedParticles" />
+      </menu_item_check>
+    </menu>
+
+
+
+    <!-- WORLD -->
+
+    <menu name="World" drop_shadow="true"
+          opaque="true" tear_off="true">
+      <!-- Disabled because you can't do this in Windlight.
+      <menu_item_check name="Mouse Moves Sun"
+                       label="Mouse Moves Sun"
+                       shortcut="control|alt|M">
+        <on_click function="ToggleControl" userdata="MouseSun" />
+        <on_check control="MouseSun" />
+      </menu_item_check>
+      -->
+      <menu_item_check name="Sim Sun Override"
+                       label="Sim Sun Override">
+        <on_click function="ToggleControl"
+                  userdata="SkyOverrideSimSunPosition" />
+        <on_check control="SkyOverrideSimSunPosition" />
+      </menu_item_check>
+      <menu_item_call name="Dump Scripted Camera"
+                      label="Dump Scripted Camera">
+        <on_click function="Advanced.DumpScriptedCamera"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_check name="Fixed Weather" label="Fixed Weather">
+        <on_click function="ToggleControl"
+                  userdata="FixedWeather" />
+        <on_check control="FixedWeather" />
+      </menu_item_check>
+      <menu_item_call name="Dump Region Object Cache"
+                      label="Dump Region Object Cache">
+        <on_click function="Advanced.DumpRegionObjectCache"
+                  userdata="" />
+      </menu_item_call>
+    </menu>
+
+
+
+    <!-- UI -->
+
+    <menu name="UI" drop_shadow="true"
+          opaque="true" tear_off="true">
+
+      <menu_item_call name="SLURL Test" label="SLURL Test">
+        <on_click function="Advanced.SLURLTest" userdata="" />
+      </menu_item_call>
+
+      <!--
+           *TODO: Make this a proper toggle item with the "X" indicator.
+           1. Add a "Advanced.CheckEditableUI" function in llviewermenu.cpp.
+           2. Change this surrounding menu_item_call to a menu_item_check.
+           3. Uncomment the "on_check" line below.
+        -->
+      <menu_item_call name="Editable UI" label="Editable UI">
+        <on_click function="Advanced.ToggleEditableUI" userdata="" />
+        <!--
+        <on_check function="Advanced.CheckEditableUI" userdata="" />
+        -->
+      </menu_item_call>
+
+      <menu_item_check name="Async Keystrokes"
+                       label="Async Keystrokes">
+        <on_click function="Advanced.ToggleAsyncKeystrokes"
+                  userdata="" />
+        <on_check function="Advanced.CheckAsyncKeystrokes"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_call name="Dump SelectMgr" label="Dump SelectMgr">
+        <on_click function="Advanced.DumpSelectMgr" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Dump Inventory" label="Dump Inventory">
+        <on_click function="Advanced.DumpInventory" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Dump Focus Holder"
+                      label="Dump Focus Holder"
+                      shortcut="control|alt|F">
+        <on_click function="Advanced.DumpFocusHolder" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Print Selected Object Info"
+                      label="Print Selected Object Info"
+                      shortcut="control|shift|P">
+        <on_click function="Advanced.PrintSelectedObjectInfo"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Print Agent Info"
+                      label="Print Agent Info" shortcut="shift|P">
+        <on_click function="Advanced.PrintAgentInfo" userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Memory Stats" label="Memory Stats"
+                      shortcut="control|alt|shift|M">
+        <on_click function="Advanced.PrintTextureMemoryStats"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_check name="Double-Click Auto-Pilot"
+                       label="Double-Click Auto-Pilot">
+        <on_click function="ToggleControl"
+                  userdata="DoubleClickAutoPilot" />
+        <on_check control="DoubleClickAutoPilot" />
+      </menu_item_check>
+      <menu_item_separator />
+      <menu_item_check name="Debug SelectMgr"
+                       label="Debug SelectMgr">
+        <on_click function="Advanced.ToggleDebugSelectMgr"
+                  userdata="" />
+        <on_check function="Advanced.CheckDebugSelectMgr"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Clicks"
+                       label="Debug Click">
+        <on_click function="Advanced.ToggleDebugClicks"
+                  userdata="" />
+        <on_check function="Advanced.CheckDebugClicks"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Views"
+                       label="Debug Views">
+        <on_click function="Advanced.ToggleDebugViews"
+                  userdata="" />
+        <on_check function="Advanced.CheckDebugViews"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Show Name Tooltips"
+                       label="Show Name Tooltips">
+        <on_click function="Advanced.ToggleXUINameTooltips"
+                  userdata="" />
+        <on_check function="Advanced.CheckXUINameTooltips"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Mouse Events"
+                       label="Debug Mouse Events">
+        <on_click function="Advanced.ToggleDebugMouseEvents"
+                  userdata="" />
+        <on_check function="Advanced.CheckDebugMouseEvents"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Keys"
+                       label="Debug Keys">
+        <on_click function="Advanced.ToggleDebugKeys"
+                  userdata="" />
+        <on_check function="Advanced.CheckDebugKeys"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug WindowProc"
+                       label="Debug WindowProc">
+        <on_click function="Advanced.ToggleDebugWindowProc"
+                  userdata="" />
+        <on_check function="Advanced.CheckDebugWindowProc"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Text Editor Tips"
+                       label="Debug Text Editor Tips">
+        <on_click function="Advanced.ToggleDebugTextEditorTips"
+                  userdata="" />
+        <on_check function="Advanced.CheckDebugTextEditorTips"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_separator />
+      <menu_item_check name="Show Time"
+                       label="Show Time">
+        <on_click function="ToggleControl"
+                  userdata="DebugShowTime" />
+        <on_check control="DebugShowTime" />
+      </menu_item_check>
+      <menu_item_check name="Show Render Info"
+                       label="Show Render Info">
+        <on_click function="ToggleControl"
+                  userdata="DebugShowRenderInfo" />
+        <on_check control="DebugShowRenderInfo" />
+      </menu_item_check>
+      <menu_item_check name="Show Color Under Cursor"
+                       label="Show Color Under Cursor">
+        <on_click function="ToggleControl"
+                  userdata="DebugShowColor" />
+        <on_check control="DebugShowColor" />
+      </menu_item_check>
+    </menu>
+
+
+
+    <!-- XUI -->
+
+    <menu name="XUI" drop_shadow="true"
+          opaque="true" tear_off="true">
+      <menu_item_call name="Floater Test..."
+                      label="Floater Test...">
+        <on_click function="Advanced.ShowFloaterTest"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Export Menus to XML..."
+                      label="Export Menus to XML...">
+        <on_click function="Advanced.ExportMenusToXML"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Edit UI..."
+                      label="Edit UI...">
+        <on_click function="Advanced.EditUI"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Load from XML..."
+                      label="Load from XML...">
+        <on_click function="Advanced.LoadUIFromXML"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Save to XML..."
+                      label="Save to XML...">
+        <on_click function="Advanced.SaveUIToXML"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_check name="Show XUI Names"
+                       label="Show XUI Names">
+        <on_click function="Advanced.ToggleXUINames"
+                  userdata="" />
+        <on_check function="Advanced.CheckXUINames"
+                  userdata="" />
+      </menu_item_check>
+    </menu>
+
+
+
+    <!-- CHARACTER -->
+
+    <menu name="Character" drop_shadow="true"
+          opaque="true" tear_off="true">
+
+      <menu name="Grab Baked Texture" drop_shadow="true"
+            opaque="true" tear_off="true">
+
+        <menu_item_call name="Iris" enabled="false"
+                        label="Iris">
+          <on_click function="Advanced.GrabBakedTexture"
+                    userdata="eyes" />
+          <on_enable function="Advanced.EnableGrabBakedTexture"
+                     userdata="eyes" />
+        </menu_item_call>
+        <menu_item_call name="Head" enabled="false"
+                        label="Head">
+          <on_click function="Advanced.GrabBakedTexture"
+                    userdata="head" />
+          <on_enable function="Advanced.EnableGrabBakedTexture"
+                     userdata="head" />
+        </menu_item_call>
+        <menu_item_call name="Upper Body" enabled="false"
+                        label="Upper Body">
+          <on_click function="Advanced.GrabBakedTexture"
+                    userdata="upper" />
+          <on_enable function="Advanced.EnableGrabBakedTexture"
+                     userdata="upper" />
+        </menu_item_call>
+        <menu_item_call name="Lower Body" enabled="false"
+                        label="Lower Body">
+          <on_click function="Advanced.GrabBakedTexture"
+                    userdata="lower" />
+          <on_enable function="Advanced.EnableGrabBakedTexture"
+                     userdata="lower" />
+        </menu_item_call>
+        <menu_item_call name="Skirt" enabled="false"
+                        label="Skirt">
+          <on_click function="Advanced.GrabBakedTexture"
+                    userdata="skirt" />
+          <on_enable function="Advanced.EnableGrabBakedTexture"
+                     userdata="skirt" />
+        </menu_item_call>
+      </menu>
+
+      <!-- CHARACTER TESTS -->
+      <menu name="Character Tests" drop_shadow="true"
+            opaque="true" tear_off="true">
+        <menu_item_check name="Go Away/AFK When Idle"
+                         label="Go Away/AFK When Idle">
+          <on_click function="Advanced.ToggleAllowIdleAFK"
+                    userdata="" />
+          <on_check function="Advanced.CheckAllowIdleAFK"
+                    userdata="" />
+        </menu_item_check>
+        <menu_item_call name="Appearance To XML"
+                        label="Appearance To XML">
+          <on_click function="Advanced.ToggleAppearanceToXML"
+                    userdata="" />
+        </menu_item_call>
+        <menu_item_call name="Toggle Character Geometry"
+                        enabled="false"
+                        label="Toggle Character Geometry">
+          <on_click function="Advanced.ToggleCharacterGeometry"
+                    userdata="" />
+          <on_enable function="EnableGodCustomerService"
+                     userdata="" />
+        </menu_item_call>
+        <menu_item_call name="Test Male" label="Test Male">
+          <on_click function="Advanced.TestMale" userdata="" />
+        </menu_item_call>
+        <menu_item_call name="Test Female" label="Test Female">
+          <on_click function="Advanced.TestFemale" userdata="" />
+        </menu_item_call>
+        <menu_item_call name="Toggle PG" label="Toggle PG">
+          <on_click function="Advanced.TogglePG" userdata="" />
+        </menu_item_call>
+        <menu_item_check name="Allow Select Avatar"
+                         label="Allow Select Avatar">
+          <on_click function="Advanced.ToggleAllowSelectAvatar"
+                    userdata="" />
+          <on_check function="Advanced.CheckAllowSelectAvatar"
+                    userdata="" />
+        </menu_item_check>
+      </menu>
+
+      <menu_item_check name="Enable Lip Sync (Beta)"
+                       label="Enable Lip Sync (Beta)">
+        <on_click function="ToggleControl"
+                  userdata="LipSyncEnabled" />
+        <on_check control="LipSyncEnabled" />
+      </menu_item_check>
+      <menu_item_check name="Tap-Tap-Hold To Run"
+                       label="Tap-Tap-Hold To Run">
+        <on_click function="Advanced.ToggleAllowTapTapHoldRun"
+                  userdata="" />
+        <on_check function="Advanced.CheckAllowTapTapHoldRun"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_call name="Force Params to Default"
+                      label="Force Params to Default">
+        <on_click function="Advanced.ForceParamsToDefault"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Reload Vertex Shader"
+                      label="Reload Vertex Shader">
+        <on_click function="Advanced.ReloadVertexShader"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_check label="Animation Info"
+                       name="Animation Info">
+        <on_click function="Advanced.ToggleAnimationInfo"
+                  userdata="" />
+        <on_check function="Advanced.CheckAnimationInfo"
+                  userdata="" />
+      </menu_item_check>
+
+      <!--
+           *TODO: Make this a proper toggle item with the "X" indicator.
+           1. Add a "Advanced.CheckSlowmotionAnimation" function in
+           llviewermenu.cpp.
+           2. Change this surrounding menu_item_call to a menu_item_check.
+           3. Uncomment the "on_check" line below.
+      -->
+      <menu_item_call name="Slow Motion Animations"
+                      label="Slow Motion Animations">
+        <on_click function="Advanced.ToggleSlowMotionAnimations"
+                  userdata="" />
+        <!--
+        <on_check function="Advanced.CheckSlowMotionAnimations"
+                  userdata="" />
+        -->
+      </menu_item_call>
+
+      <menu_item_check name="Show Look At"
+                       label="Show Look At">
+        <on_click function="Advanced.ToggleShowLookAt"
+                  userdata="" />
+        <on_check function="Advanced.CheckShowLookAt"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Show Point At"
+                       label="Show Point At">
+        <on_click function="Advanced.ToggleShowPointAt"
+                  userdata="" />
+        <on_check function="Advanced.CheckShowPointAt"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Joint Updates"
+                       label="Debug Joint Updates">
+        <on_click function="Advanced.ToggleDebugJointUpdates"
+                  userdata="" />
+        <on_check function="Advanced.CheckDebugJointUpdates"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Disable LOD"
+                       label="Disable LOD">
+        <on_click function="Advanced.ToggleDisableLOD"
+                  userdata="" />
+        <on_check function="Advanced.CheckDisableLOD"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Character Vis"
+                       label="Debug Character Vis">
+        <on_click function="Advanced.ToggleDebugCharacterVis"
+                  userdata="" />
+        <on_check function="Advanced.CheckDebugCharacterVis"
+                  userdata="" />
+      </menu_item_check>
+
+      <!--  Disabled. See DEV-14477
+      <menu_item_check name="Show Collision Plane"
+                       label="Show Collision Plane">
+        <on_click function="Advanced.ToggleShowCollisionPlane"
+                  userdata="" />
+        <on_check function="Advanced.CheckShowCollisionPlane"
+                  userdata="" />
+      </menu_item_check>
+      -->
+
+      <menu_item_check name="Show Collision Skeleton"
+                       label="Show Collision Skeleton">
+        <on_click function="Advanced.ToggleShowCollisionSkeleton"
+                  userdata="" />
+        <on_check function="Advanced.CheckShowCollisionSkeleton"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Display Agent Target"
+                       label="Display Agent Target">
+        <on_click function="Advanced.ToggleDisplayAgentTarget"
+                  userdata="" />
+        <on_check function="Advanced.CheckDisplayAgentTarget"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_check name="Debug Rotation"
+                       label="Debug Rotation">
+        <on_click function="Advanced.ToggleDebugAvatarRotation"
+                  userdata="" />
+        <on_check function="Advanced.CheckDebugAvatarRotation"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_call name="Dump Attachments"
+                      label="Dump Attachments">
+        <on_click function="Advanced.DumpAttachments"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Rebake Textures"
+                      label="Rebake Textures"
+                      shortcut="control|alt|R">
+        <on_click function="Advanced.RebakeTextures"
+                  userdata="" />
+      </menu_item_call>
+    </menu>
+
+
+
+    <!-- NETWORK -->
+
+    <menu name="Network" drop_shadow="true"
+          opaque="true" tear_off="true">
+      <menu_item_call name="Enable Message Log"
+                      label="Enable Message Log">
+        <on_click function="Advanced.EnableMessageLog"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_call name="Disable Message Log"
+                      label="Disable Message Log">
+        <on_click function="Advanced.DisableMessageLog"
+                  userdata="" />
+      </menu_item_call>
+      <menu_item_separator />
+      <menu_item_check name="Velocity Interpolate Objects"
+                       label="Velocity Interpolate Objects">
+        <on_click function="ToggleControl"
+                  userdata="VelocityInterpolate" />
+        <on_check control="VelocityInterpolate" />
+      </menu_item_check>
+      <menu_item_check name="Ping Interpolate Object Positions"
+                       label="Ping Interpolate Object Positions">
+        <on_click function="ToggleControl"
+                  userdata="PingInterpolate" />
+        <on_check control="PingInterpolate" />
+      </menu_item_check>
+      <menu_item_separator />
+      <menu_item_call name="Drop a Packet" label="Drop a Packet"
+                      shortcut="control|alt|L">
+        <on_click function="Advanced.DropPacket"
+                  userdata="" />
+      </menu_item_call>
+    </menu>
+
+
+
+    <!-- RECORDER -->
+
+    <menu name="Recorder" drop_shadow="true"
+          opaque="true" tear_off="true">
+      <menu_item_check name="Full Session Logging"
+                       label="Full Session Logging">
+        <on_click function="ToggleControl"
+                  userdata="StatsSessionTrackFrameStats" />
+        <on_check control="StatsSessionTrackFrameStats" />
+      </menu_item_check>
+      <menu_item_call name="Start Logging" label="Start Logging">
+        <on_click function="Advanced.FrameStatsLogging"
+                  userdata="start logging" />
+      </menu_item_call>
+      <menu_item_call name="Stop Logging" label="Stop Logging">
+        <on_click function="Advanced.FrameStatsLogging"
+                  userdata="stop logging" />
+      </menu_item_call>
+      <menu_item_call name="Log 10 Seconds" label="Log 10 Seconds">
+        <on_click function="Advanced.FrameStatsLogging"
+                  userdata="timed logging 10" />
+      </menu_item_call>
+      <menu_item_call name="Log 30 Seconds" label="Log 30 Seconds">
+        <on_click function="Advanced.FrameStatsLogging"
+                  userdata="timed logging 30" />
+      </menu_item_call>
+      <menu_item_call name="Log 60 Seconds" label="Log 60 Seconds">
+        <on_click function="Advanced.FrameStatsLogging"
+                  userdata="timed logging 60" />
+      </menu_item_call>
+
+      <menu_item_separator />
+
+      <menu_item_call name="Start Playback" label="Start Playback">
+        <on_click function="Advanced.AgentPilot"
+                  userdata="start playback" />
+      </menu_item_call>
+      <menu_item_call name="Stop Playback" label="Stop Playback">
+        <on_click function="Advanced.AgentPilot"
+                  userdata="stop playback" />
+      </menu_item_call>
+      <menu_item_check name="Loop Playback" label="Loop Playback">
+        <on_click function="Advanced.ToggleAgentPilotLoop"
+                  userdata="" />
+        <on_check function="Advanced.CheckAgentPilotLoop"
+                  userdata="" />
+      </menu_item_check>
+      <menu_item_call name="Start Record" label="Start Record">
+        <on_click function="Advanced.AgentPilot"
+                  userdata="start record" />
+      </menu_item_call>
+      <menu_item_call name="Stop Record" label="Stop Record">
+        <on_click function="Advanced.AgentPilot"
+                  userdata="stop record" />
+      </menu_item_call>
+    </menu>
+
+
+    <menu_item_separator />
+
+
+    <menu_item_check name="Show Updates" label="Show Updates">
+      <on_click function="Advanced.ToggleShowObjectUpdates"
+                userdata="" />
+      <on_check function="Advanced.CheckShowObjectUpdates"
+                userdata="" />
+    </menu_item_check>
+
+    <menu_item_separator />
+
+    <menu_item_call name="Compress Image..."
+                    label="Compress Image...">
+      <on_click function="Advanced.CompressImage"
+                userdata="" />
+    </menu_item_call>
+    <menu_item_check name="Limit Select Distance"
+                     label="Limit Select Distance">
+      <on_click function="ToggleControl"
+                userdata="LimitSelectDistance" />
+      <on_check control="LimitSelectDistance" />
+    </menu_item_check>
+    <menu_item_check name="Disable Camera Constraints"
+                     label="Disable Camera Constraints">
+      <on_click function="ToggleControl"
+                userdata="DisableCameraConstraints" />
+      <on_check control="DisableCameraConstraints" />
+    </menu_item_check>
+    <menu_item_check name="Mouse Smoothing"
+                     label="Mouse Smoothing">
+      <on_click function="ToggleControl"
+                userdata="MouseSmooth" />
+      <on_check control="MouseSmooth" />
+    </menu_item_check>
+
+    <menu_item_separator />
+
+    <menu_item_check name="Console Window"
+                     label="Console Window">
+      <on_click function="ToggleControl"
+                userdata="ShowConsoleWindow" />
+      <on_check control="ShowConsoleWindow" />
+    </menu_item_check>
+    <menu_item_check name="Output Debug Minidump"
+                     label="Output Debug Minidump">
+      <on_click function="ToggleControl"
+                userdata="SaveMiniDump" />
+      <on_check control="SaveMiniDump" />
+    </menu_item_check>
+    <menu_item_check name="Clothing..."
+                     label="Clothing...">
+      <on_click function="Advanced.ToggleClothingFloater"
+                userdata="" />
+    </menu_item_check>
+    <menu_item_call name="Debug Settings"
+                    label="Debug Settings">
+      <on_click function="Advanced.ShowDebugSettings"
+                userdata="" />
+    </menu_item_call>
+    <menu_item_check name="View Admin Options"
+                     label="View Admin Options"
+                     shortcut="control|alt|V">
+      <on_click function="Advanced.ToggleViewAdminOptions"
+                userdata="" />
+      <on_check function="Advanced.CheckViewAdminOptions"
+                userdata="" />
+    </menu_item_check>
+    <menu_item_call name="Request Admin Status"
+                    label="Request Admin Status"
+                    shortcut="control|alt|G">
+      <on_click function="Advanced.RequestAdminStatus"
+                userdata="" />
+    </menu_item_call>
+    <menu_item_call name="Leave Admin Status"
+                    label="Leave Admin Status"
+                    shortcut="control|alt|shift|G">
+      <on_click function="Advanced.LeaveAdminStatus"
+                userdata="" />
+    </menu_item_call>
+
+  </menu>
+
 </menu_bar>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
index 416f58b..02d5504 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_groups.xml
@@ -34,4 +34,6 @@
              label="Create..." name="Create" width="80" />

         <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

              label="Search..." name="Search..." width="80" />

+        <button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"

+             label="Invite..." name="Invite..." width="80" />

 </panel>

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index 926e3d8..997a5a6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -27,6 +27,10 @@
                                              tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
                                              width="102" />
                                         <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+                                             label="Flycam" label_selected="Flycam" left="229" name="Flycam" scale_image="true"
+                                             tool_tip="Your camera is under joystick control, click here to release it."
+                                             width="102" />
+                                        <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
                                              label="Mouselook" label_selected="Mouselook" left="343" name="Mouselook"
                                              scale_image="true"
                                              tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 429e564..3d56c7d 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -570,25 +570,30 @@ class LinuxManifest(ViewerManifest):
                 find %(dst)s -type f -perm 0600 | xargs --no-run-if-empty chmod 0644;
                 find %(dst)s -type f -perm 0400 | xargs --no-run-if-empty chmod 0444;
                 true""" %  {'dst':self.get_dst_prefix() })
+
         self.package_file = installer_name + '.tar.bz2'
 
-        # temporarily move directory tree so that it has the right
-        # name in the tarfile
-        self.run_command("mv %(dst)s %(inst)s" % {
-            'dst': self.get_dst_prefix(),
-            'inst': self.build_path_of(installer_name)})
-        try:
-            # --numeric-owner hides the username of the builder for
-            # security etc.
-            self.run_command('tar -C %(dir)s --numeric-owner -cjf '
-                             '%(inst_path)s.tar.bz2 %(inst_name)s' % {
-                'dir': self.get_build_prefix(),
-                'inst_name': installer_name,
-                'inst_path':self.build_path_of(installer_name)})
-        finally:
-            self.run_command("mv %(inst)s %(dst)s" % {
+        if("package" in self.args['actions'] or
+           "unpacked" in self.args['actions']):
+
+            # temporarily move directory tree so that it has the right
+            # name in the tarfile
+            self.run_command("mv %(dst)s %(inst)s" % {
                 'dst': self.get_dst_prefix(),
                 'inst': self.build_path_of(installer_name)})
+            try:
+                # --numeric-owner hides the username of the builder for
+                # security etc.
+                self.run_command('tar -C %(dir)s --numeric-owner -cjf '
+                                 '%(inst_path)s.tar.bz2 %(inst_name)s' % {
+                    'dir': self.get_build_prefix(),
+                    'inst_name': installer_name,
+                    'inst_path':self.build_path_of(installer_name)})
+            finally:
+                self.run_command("mv %(inst)s %(dst)s" % {
+                    'dst': self.get_dst_prefix(),
+                    'inst': self.build_path_of(installer_name)})
+
 
 class Linux_i686Manifest(LinuxManifest):
     def construct(self):