merged in jacek/next

10 files changed, 93 insertions, 3 deletions

diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index e1c68b9..23053d3 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -102,6 +102,8 @@ if [ -n "$LL_TCMALLOC" ]; then
     fi
 fi
 
+export GST_PLUGIN_PATH="${GST_PLUGIN_PATH}:${RUN_PATH}/lib/gstreamer-plugins/"
+
 export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"'
 export SL_CMD='$LL_WRAPPER bin/do-not-directly-run-imprudence-bin'
 export SL_OPT="`cat gridargs.dat` $@"
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index cb9a379..4ef52f0 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -4490,6 +4490,7 @@ LLInventoryFilter::LLInventoryFilter(const std::string& name) :
 
         mSubStringMatchOffset = 0;
         mFilterSubString.clear();
+        mFilterWorn = false;
         mFilterGeneration = 0;
         mMustPassGeneration = S32_MAX;
         mMinRequiredGeneration = 0;
@@ -4521,9 +4522,12 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
                 earliest = 0;
         }
         LLFolderViewEventListener* listener = item->getListener();
+        const LLUUID& item_id = listener->getUUID();
         mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos;
         BOOL passed = (listener->getNInventoryType() & mFilterOps.mFilterTypes || listener->getNInventoryType() == LLInventoryType::NIT_NONE)
                                         && (mFilterSubString.size() == 0 || mSubStringMatchOffset != std::string::npos)
+                                        && (mFilterWorn == false || gAgent.isWearingItem(item_id) ||
+                                                gAgent.getAvatarObject() && gAgent.getAvatarObject()->isWearingAttachment(item_id))
                                         && ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions)
                                         && (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate);
         return passed;
@@ -4544,6 +4548,7 @@ BOOL LLInventoryFilter::isNotDefault()
 {
         return mFilterOps.mFilterTypes != mDefaultFilterOps.mFilterTypes 
                 || mFilterSubString.size() 
+                || mFilterWorn
                 || mFilterOps.mPermissions != mDefaultFilterOps.mPermissions
                 || mFilterOps.mMinDate != mDefaultFilterOps.mMinDate 
                 || mFilterOps.mMaxDate != mDefaultFilterOps.mMaxDate
@@ -4554,6 +4559,7 @@ BOOL LLInventoryFilter::isActive()
 {
         return mFilterOps.mFilterTypes != LLInventoryType::NIT_ALL
                 || mFilterSubString.size() 
+                || mFilterWorn
                 || mFilterOps.mPermissions != PERM_NONE 
                 || mFilterOps.mMinDate != time_min()
                 || mFilterOps.mMaxDate != time_max()
@@ -4989,6 +4995,12 @@ std::string LLInventoryFilter::rebuildFilterText()
         {
                 mFilterText += " - Since Logoff";
         }
+        
+        if (getFilterWorn())
+        {
+                mFilterText += " - Worn";
+        }
+        
         return mFilterText;
 }
 
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index af3248d..b668015 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -194,6 +194,9 @@ public:
         
         void setFilterSubString(const std::string& string);
         const std::string getFilterSubString(BOOL trim = FALSE);
+        
+        void setFilterWorn(bool worn) { mFilterWorn = worn; }
+        bool getFilterWorn() const { return mFilterWorn; }
 
         void setFilterPermissions(PermissionMask perms);
         PermissionMask getFilterPermissions() const { return mFilterOps.mPermissions; }
@@ -257,6 +260,7 @@ protected:
         filter_ops              mDefaultFilterOps;
         std::string::size_type  mSubStringMatchOffset;
         std::string             mFilterSubString;
+        bool                    mFilterWorn;
         U32                             mOrder;
         const std::string       mName;
         S32                             mFilterGeneration;
@@ -745,6 +749,7 @@ public:
 
         LLInventoryFilter* getFilter() { return &mFilter; }
         const std::string getFilterSubString(BOOL trim = FALSE);
+        bool getFilterWorn() const { return mFilter.getFilterWorn(); }
         U32 getFilterTypes() const { return mFilter.getFilterTypes(); }
         PermissionMask getFilterPermissions() const { return mFilter.getFilterPermissions(); }
         LLInventoryFilter::EFolderShow getShowFolderState() { return mFilter.getShowFolderState(); }
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index a265906..1e16b92 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -547,6 +547,15 @@ void LLInventoryView::init(LLInventoryModel* inventory)
                 recent_items_panel->getFilter()->markDefault();
                 recent_items_panel->setSelectCallback(onSelectionChange, recent_items_panel);
         }
+        LLInventoryPanel* worn_items_panel = getChild<LLInventoryPanel>("Worn Items");
+        if (worn_items_panel)
+        {
+                worn_items_panel->setSortOrder(gSavedSettings.getU32("InventorySortOrder"));
+                worn_items_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
+                worn_items_panel->getFilter()->markDefault();
+                worn_items_panel->setFilterWorn(true);
+                worn_items_panel->setSelectCallback(onSelectionChange, worn_items_panel);
+        }
 
         // Now load the stored settings from disk, if available.
         std::ostringstream filterSaveName;
@@ -595,6 +604,7 @@ BOOL LLInventoryView::postBuild()
 {
         childSetTabChangeCallback("inventory filter tabs", "All Items", onFilterSelected, this);
         childSetTabChangeCallback("inventory filter tabs", "Recent Items", onFilterSelected, this);
+        childSetTabChangeCallback("inventory filter tabs", "Worn Items", onFilterSelected, this);
         //panel->getFilter()->markDefault();
         return TRUE;
 }
@@ -621,6 +631,15 @@ LLInventoryView::~LLInventoryView( void )
                 filter->toLLSD(filterState);
                 filterRoot[filter->getName()] = filterState;
         }
+        
+        LLInventoryPanel* worn_items_panel = getChild<LLInventoryPanel>("Worn Items");
+        if (worn_items_panel)
+        {
+                LLInventoryFilter* filter = worn_items_panel->getFilter();
+                LLSD filterState;
+                filter->toLLSD(filterState);
+                filterRoot[filter->getName()] = filterState;
+        }
 
         std::ostringstream filterSaveName;
         filterSaveName << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "filters.xml");
@@ -1653,6 +1672,11 @@ void LLInventoryPanel::setFilterSubString(const std::string& string)
         mFolders->getFilter()->setFilterSubString(string);
 }
 
+void LLInventoryPanel::setFilterWorn(bool worn)
+{
+        mFolders->getFilter()->setFilterWorn(worn);
+}
+
 void LLInventoryPanel::setSortOrder(U32 order)
 {
         mFolders->getFilter()->setSortOrder(order);
diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h
index c5c8532..dd6756a 100644
--- a/linden/indra/newview/llinventoryview.h
+++ b/linden/indra/newview/llinventoryview.h
@@ -108,6 +108,9 @@ public:
         U32 getFilterPermMask() const { return mFolders->getFilterPermissions(); }
         void setFilterSubString(const std::string& string);
         const std::string getFilterSubString() { return mFolders->getFilterSubString(); }
+        void setFilterWorn(bool worn);
+        bool getFilterWorn() const { return mFolders->getFilterWorn(); }
+        
         void setSortOrder(U32 order);
         U32 getSortOrder() { return mFolders->getSortOrder(); }
         void setSinceLogoff(BOOL sl);
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index d1c34f1..0c642bc 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -999,4 +999,4 @@ void LLPanelFace::onClickAutoFix(void* userdata)
 void LLPanelFace::onClickTextureConstants(void *)
 {
         gViewerWindow->alertXml("ClickTextureConstants");
-}
\ No newline at end of file
+}
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 16da49d..6166ba5 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -249,4 +249,4 @@ void LLPanelGeneral::onClickResetUISize(void* user_data)
 {
         gSavedSettings.setF32("UIScaleFactor", 1.0f);
         gViewerWindow->reshape(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
-}
\ No newline at end of file
+}
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 4c6de79..c4cbf84 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5073,6 +5073,10 @@ class LLShowFloater : public view_listener_t
                 {
                         LLFloaterPreference::show(NULL);
                 }
+                else if (floater_name == "toolbar")
+                {
+                        LLToolBar::toggle(NULL);
+                }
                 else if (floater_name == "chat history")
                 {
                         LLFloaterChat::toggleInstance(LLSD());
@@ -5205,6 +5209,10 @@ class LLFloaterVisible : public view_listener_t
                 {
                         new_value = LLFloaterMyFriends::instanceVisible(0);
                 }
+                else if (floater_name == "toolbar")
+                {
+                        new_value = LLToolBar::visible(NULL);
+                }
                 else if (floater_name == "chat history")
                 {
                         new_value = LLFloaterChat::instanceVisible();
@@ -7203,6 +7211,25 @@ class LLViewCheckRenderType : public view_listener_t
         }
 };
 
+class LLViewShowHUDAttachments : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                LLPipeline::sShowHUDAttachments = !LLPipeline::sShowHUDAttachments;
+                return true;
+        }
+};
+
+class LLViewCheckHUDAttachments : public view_listener_t
+{
+        bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+        {
+                bool new_value = LLPipeline::sShowHUDAttachments;
+                gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+                return true;
+        }
+};
+
 class LLEditEnableTakeOff : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -9657,6 +9684,7 @@ void initialize_menus()
         addMenu(new LLViewToggleBeacon(), "View.ToggleBeacon");
         addMenu(new LLViewBeaconWidth(), "View.BeaconWidth");
         addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType");
+        addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments");
         addMenu(new LLViewZoomOut(), "View.ZoomOut");
         addMenu(new LLViewZoomIn(), "View.ZoomIn");
         addMenu(new LLViewZoomDefault(), "View.ZoomDefault");
@@ -9671,6 +9699,7 @@ void initialize_menus()
         addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
         addMenu(new LLViewCheckBeaconEnabled(), "View.CheckBeaconEnabled");
         addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
+        addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
 
         // World menu
         addMenu(new LLWorldChat(), "World.Chat");
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 590555f..3d1c569 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -61,6 +61,10 @@
                      follows="left|top|right|bottom" height="431" label="Recent Items"
                      left_delta="0" mouse_opaque="true" name="Recent Items"
                      sort_order="RecentItemsSortOrder" width="461" />
+                <inventory_panel allow_multi_select="true" border="true" bottom_delta="0"
+                     follows="left|top|right|bottom" height="431" label="Worn Items"
+                     left_delta="0" mouse_opaque="true" name="Worn Items"
+                     sort_order="RecentItemsSortOrder" width="461" />
         </tab_container>
 
         <menu_bar bottom="-34" drop_shadow="false" follows="left|top|right" height="18" left="2"
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 a741b94..2d5402b 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
@@ -281,6 +281,10 @@
       <on_click function="ShowFloater" userdata="inworld browser" />
     </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" />
@@ -1124,6 +1128,13 @@
           <on_check function="Advanced.CheckFeature"
                     userdata="flexible" />
         </menu_item_check>
+        <menu_item_check name="HUD Attachments"
+                         label="HUD Attachments"
+                         shortcut="">
+          <on_click function="View.ShowHUDAttachments" userdata="" />
+          <on_check function="View.CheckHUDAttachments" />
+        </menu_item_check>
+
       </menu>
 
 
@@ -1603,7 +1614,7 @@
       </menu_item_call>
       <menu_item_check name="Show XUI Names"
                        label="Show XUI Names"
-                       shortcut="control|shift|x">
+                       shortcut="">
         <on_click function="Advanced.ToggleXUINames"
                   userdata="" />
         <on_check function="Advanced.CheckXUINames"