livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More code cleanup

master
Ansariel 2013-07-08 17:23:17 +02:00
parent 7a89e64106
commit c0450ad230
21 changed files with 57 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
indra/newview/llinventorybridge.cpp
View File

@ -4356,7 +4356,6 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
// Check whether the item being dragged from active inventory panel
// passes the filter of the destination panel.
// <FS:Ansariel> Allow drag and drop in inventory regardless of filter (e.g. Recent)
// <FS:TM> CHUI merge LL changed below, kept commented out
//if (accept && active_panel)
//{
// LLFolderViewItem* fv_item = active_panel->getItemByID(inv_item->getUUID());
@ -5786,25 +5785,26 @@ bool confirm_attachment_rez(const LLSD& notification, const LLSD& response)
if (itemp)
{
// /*
// {
// U8 attachment_pt = notification["payload"]["attachment_point"].asInteger();
// LLMessageSystem* msg = gMessageSystem;
// msg->newMessageFast(_PREHASH_RezSingleAttachmentFromInv);
// msg->nextBlockFast(_PREHASH_AgentData);
// msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
// msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
// msg->nextBlockFast(_PREHASH_ObjectData);
// msg->addUUIDFast(_PREHASH_ItemID, itemp->getUUID());
// msg->addUUIDFast(_PREHASH_OwnerID, itemp->getPermissions().getOwner());
// msg->addU8Fast(_PREHASH_AttachmentPt, attachment_pt);
// pack_permissions_slam(msg, itemp->getFlags(), itemp->getPermissions());
// msg->addStringFast(_PREHASH_Name, itemp->getName());
// msg->addStringFast(_PREHASH_Description, itemp->getDescription());
// msg->sendReliable(gAgent.getRegion()->getHost());
// return false;
// }
// */
/*
{
U8 attachment_pt = notification["payload"]["attachment_point"].asInteger();
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_RezSingleAttachmentFromInv);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->nextBlockFast(_PREHASH_ObjectData);
msg->addUUIDFast(_PREHASH_ItemID, itemp->getUUID());
msg->addUUIDFast(_PREHASH_OwnerID, itemp->getPermissions().getOwner());
msg->addU8Fast(_PREHASH_AttachmentPt, attachment_pt);
pack_permissions_slam(msg, itemp->getFlags(), itemp->getPermissions());
msg->addStringFast(_PREHASH_Name, itemp->getName());
msg->addStringFast(_PREHASH_Description, itemp->getDescription());
msg->sendReliable(gAgent.getRegion()->getHost());
return false;
}
*/
// Queue up attachments to be sent in next idle tick, this way the
// attachments are batched up all into one message versus each attachment

8
indra/newview/llinventorybridge.h
View File

@ -160,9 +160,9 @@ protected:
BOOL isLostInventory() const;
// [/SL:KB]
BOOL isCOFFolder() const; // true if COF or descendent of
//-TT Client LSL Bridge
// <FS:TT> Client LSL Bridge
BOOL isProtectedFolder() const;
//-TT
// </FS:TT>
BOOL isInboxFolder() const; // true if COF or descendent of marketplace inbox
BOOL isOutboxFolder() const; // true if COF or descendent of marketplace outbox
BOOL isOutboxFolderDirectParent() const;
@ -349,9 +349,9 @@ protected:
BOOL checkFolderForContentsOfType(LLInventoryModel* model, LLInventoryCollectFunctor& typeToCheck);
void modifyOutfit(BOOL append);
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
void modifyOutfit(BOOL append, BOOL replace);
//-TT
// </FS:TT>
void determineFolderType();
void dropToFavorites(LLInventoryItem* inv_item);

1
indra/newview/llinventoryfilter.cpp
View File

@ -120,7 +120,6 @@ bool LLInventoryFilter::check(const LLFolderViewModelItem* item)
// Clipboard cut items are *always* filtered so we need this value upfront
// <FS:Ansariel> FIRE-6714: Don't move objects to trash during cut&paste
// Don't hide cut items in inventory
//const LLFolderViewEventListener* listener = item->getListener(); <FS:TM> CHUI merge LL removed thie line
//const BOOL passed_clipboard = (listener ? checkAgainstClipboard(listener->getUUID()) : TRUE);
const BOOL passed_clipboard = TRUE;
// </FS:Ansariel> FIRE-6714: Don't move objects to trash during cut&paste

7
indra/newview/llinventorymodel.cpp
View File

@ -1453,13 +1453,6 @@ void LLInventoryModel::idleNotifyObservers()
notifyObservers();
}
//-TT 2.6.9 - function deprecated
void LLInventoryModel::notifyObservers(const std::string service_name)
{
llinfos << "Calling deprecated function <notifyObservers(const std::string service_name)> with (" << service_name << ") parameter" << llendl;
notifyObservers();
}
// Call this method when it's time to update everyone on a new state.
void LLInventoryModel::notifyObservers()
{

14
indra/newview/llinventorymodel.h
View File

@ -40,10 +40,10 @@
#include <set>
#include <string>
#include <vector>
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
#include "llviewerobjectlist.h"
#include "llvoavatarself.h"
//-TT
// </FS:TT>
class LLInventoryObserver;
class LLInventoryObject;
@ -134,11 +134,11 @@ private:
LLUUID mLibraryRootFolderID;
LLUUID mLibraryOwnerID;
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
item_array_t mItemArray;
item_array_t mObjArray;
LLDynamicArray<std::string> mAttPoints;
//-TT
// </FS:TT>
//--------------------------------------------------------------------
// Structure
@ -281,7 +281,7 @@ public:
const LLUUID& getLinkedItemID(const LLUUID& object_id) const;
LLViewerInventoryItem* getLinkedItem(const LLUUID& object_id) const;
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
void wearItemsOnAvatar(LLInventoryCategory* category);
void wearAttachmentsOnAvatarCheckRemove(LLViewerObject *object, const LLViewerJointAttachment *attachment);
@ -289,7 +289,7 @@ private:
void wearWearablesOnAvatar(LLUUID category_id);
void wearAttachmentsOnAvatar(LLUUID category_id);
void wearGesturesOnAvatar(LLUUID category_id);
//-TT
// </FS:TT>
private:
mutable LLPointer<LLViewerInventoryItem> mLastItem; // cache recent lookups
@ -477,8 +477,6 @@ public:
// notifyObservers() manually to update regardless of whether state change
// has been indicated.
void idleNotifyObservers();
//-TT 2.6.9 - function deprecated
void notifyObservers(const std::string service_name);
// Call to explicitly update everyone on a new state.
void notifyObservers();

3
indra/newview/llinventorymodelbackgroundfetch.cpp
View File

@ -183,9 +183,8 @@ void LLInventoryModelBackgroundFetch::backgroundFetchCB(void *)
void LLInventoryModelBackgroundFetch::backgroundFetch()
{
// <FS:TM> new: if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived())
// <FS:AW>
// <FS:TM> old: if (mBackgroundFetchActive && gAgent.getRegion())
//if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived())
LLViewerRegion* region = gAgent.getRegion();
if (!region || !region->capabilitiesReceived())
{

16
indra/newview/llmutelist.cpp
View File

@ -784,19 +784,3 @@ void LLMuteList::notifyObservers()
it = mObservers.upper_bound(observer);
}
}
// <FS:Ansariel> Agent profile button
LLMute LLMuteList::getMute(const LLUUID& id)
{
LLMute mute(id);
mute_set_t::iterator found = mMutes.find(mute);
if (found != mMutes.end())
{
return (*found);
}
else
{
return LLMute(LLUUID::null);
}
}
// </FS:Ansariel>

3
indra/newview/llmutelist.h
View File

@ -117,9 +117,6 @@ public:
// call this method on logout to save everything.
void cache(const LLUUID& agent_id);
// <FS:Ansariel> Agent profile button
LLMute getMute(const LLUUID& id);
private:
BOOL loadFromFile(const std::string& filename);
BOOL saveToFile(const std::string& filename);

18
indra/newview/llnavigationbar.cpp
View File

@ -320,20 +320,8 @@ BOOL LLNavigationBar::postBuild()
setTeleportFailedCallback(boost::bind(&LLNavigationBar::onTeleportFailed, this));
// <FS:Zi> No size calculations in code please. XUI handles it all now with visibility_control
// LLFavoritesBarCtrl* fp = getChild<LLFavoritesBarCtrl>("favorite");
// LLPanel* np = getChild<LLPanel>("navigation_panel");
// LLPanel* navFrame = getChild<LLPanel>("navigation_bar");
// mDefaultNavContainerRect = getRect();
// mDefaultFpRect = fp->getRect();
// mDefaultNpRect = np->getRect();
// mDefaultFrameRect = navFrame->getRect();
// mDefaultNavContainerRect.set(mDefaultNavContainerRect.mLeft, mDefaultNpRect.mTop,mDefaultNavContainerRect.mRight, mDefaultFpRect.mBottom);
// setRect(mDefaultNavContainerRect);
// navFrame->setRect(mDefaultFrameRect);
// np->setRect(mDefaultNpRect);
// fp->setRect(mDefaultFpRect);
//mDefaultNbRect = getRect();
//mDefaultFpRect = getChild<LLFavoritesBarCtrl>("favorite")->getRect();
// </FS:Zi>
// we'll be notified on teleport history changes
@ -779,7 +767,7 @@ void LLNavigationBar::clearHistoryCache()
// <FS:Zi> No size calculations in code please. XUI handles it all now with visibility_control
// int LLNavigationBar::getDefNavBarHeight()
// {
// return mDefaultNpRect.getHeight();
// return mDefaultNbRect.getHeight();
// }
// int LLNavigationBar::getDefFavBarHeight()
// {

10
indra/newview/llnavigationbar.h
View File

@ -146,12 +146,10 @@ private:
LLButton* mBtnHome;
LLSearchComboBox* mSearchComboBox;
LLLocationInputCtrl* mCmbLocation;
// <FS:Zi> No size calculations in code please. XUI handles it all now with visibility_control
// LLRect mDefaultNpRect;
// LLRect mDefaultNavContainerRect;
// LLRect mDefaultFpRect;
// LLRect mDefaultFrameRect;
// </FS:Zi>
// <FS:Zi> No size calculations in code please. XUI handles it all now with visibility_control
//LLRect mDefaultNbRect;
//LLRect mDefaultFpRect;
// <7FS:Zi>
boost::signals2::connection mTeleportFailedConnection;
boost::signals2::connection mTeleportFinishConnection;
boost::signals2::connection mHistoryMenuConnection;

4
indra/newview/llnotificationhandler.h
View File

@ -40,8 +40,7 @@
#include "llavatarname.h"
// <FS:Ansariel> [FS communication UI]
//class LLIMFloater; <FS:TM> CHUI Merge old
//class LLFloaterIMSession; <FS:TM> CHUI Merge new
//class LLFloaterIMSession;
class FSFloaterIM;
// </FS:Ansariel> [FS communication UI]
@ -368,7 +367,6 @@ private:
* Find IM floater based on "from_id"
*/
// <FS:Ansariel> [FS communication UI]
//static LLIMFloater* findIMFloater(const LLNotificationPtr& notification);
static FSFloaterIM* findIMFloater(const LLNotificationPtr& notification);
// </FS:Ansariel> [FS communication UI]

10
indra/newview/llnotificationhandlerutil.cpp
View File

@ -35,8 +35,7 @@
#include "llagent.h"
// <FS:Ansariel> [FS communication UI]
//#include "llfloaterimsession.h" <FS:TM> CHUI Merge new
//#include "llimfloater.h" <FS:TM> CHUI Merge old
//#include "llfloaterimsession.h"
#include "fsfloaterim.h"
// </FS:Ansariel> [FS communication UI]
#include "llimview.h"
@ -119,7 +118,6 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type,
// [SL:KB] - Patch: Chat-Logs | Checked: 2010-11-18 (Catznip-2.4.0c) | Added: Catznip-2.4.0c
LLIMModel::instance().logToFile(file_name, from, from_id, message);
// [/SL:KB]
//-TT 2.8.2 merge changes - left out for now
//// Build a new format username or firstname_lastname for legacy names
//// to use it for a history log filename.
//std::string user_name = LLCacheName::buildUsername(session_name);
@ -256,8 +254,7 @@ void LLHandlerUtil::logGroupNoticeToIMGroup(
void LLHandlerUtil::logToNearbyChat(const LLNotificationPtr& notification, EChatSourceType type)
{
// <FS:Ansariel> [FS communication UI]
//LLFloaterIMNearbyChat* nearby_chat = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"); <FS:TM> CHUI Merge new (including odd white space)
//LLFloaterNearbyChat* nearby_chat = LLFloaterNearbyChat::getInstance(); <FS:TM> CHUI Merge old
//LLFloaterIMNearbyChat* nearby_chat = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat");
FSFloaterNearbyChat* nearby_chat = FSFloaterNearbyChat::getInstance();
// </FS:Ansariel> [FS communication UI]
if (nearby_chat)
@ -349,8 +346,7 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification)
void LLHandlerUtil::updateIMFLoaterMesages(const LLUUID& session_id)
{
// <FS:Ansariel> [FS communication UI]
//LLFloaterIMSession* im_floater = LLFloaterIMSession::findInstance(session_id); <FS:TM> CHUI Merge new
//LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); <FS:TM> CHUI Merge old
//LLFloaterIMSession* im_floater = LLFloaterIMSession::findInstance(session_id);
FSFloaterIM* im_floater = FSFloaterIM::findInstance(session_id);
// </FS:Ansariel> [FS communication UI]
if (im_floater != NULL && im_floater->getVisible())

3
indra/newview/llpanelmaininventory.cpp
View File

@ -906,8 +906,7 @@ void LLPanelMainInventory::onFocusReceived()
void LLPanelMainInventory::setFilterTextFromFilter()
{
//mFilterText = mActivePanel->getFilter()->getFilterText(); <FS:TM> CHUI Merge old
//mFilterText = mActivePanel->getFilter().getFilterText(); <FS:TM> CHUI Merge new
//mFilterText = mActivePanel->getFilter().getFilterText();
// ## Zi: Filter dropdown
// this method gets called by the filter subwindow (once every frame), so we update our combo box here
LLInventoryFilter &filter = mActivePanel->getFilter();

19
indra/newview/llplacesinventorypanel.cpp
View File

@ -121,22 +121,3 @@ S32 LLPlacesInventoryPanel::notify(const LLSD& info)
}
return 0;
}
//} <FS:TM> CHUI Merge error
//
//BOOL LLPlacesFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
// EDragAndDropType cargo_type,
// void* cargo_data,
// EAcceptance* accept,
// std::string& tooltip_msg)
//{
// // Don't accept anything except landmarks and folders to be dropped
// // in places folder view. See STORM-296.
// if (cargo_type != DAD_LANDMARK && cargo_type != DAD_CATEGORY)
// {
// *accept = ACCEPT_NO;
// return FALSE;
// }
//
// return LLFolderView::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data,
// accept, tooltip_msg);

6
indra/newview/llplacesinventorypanel.h
View File

@ -56,10 +56,4 @@ private:
LLSaveFolderState* mSavedFolderState;
};
/*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg);
#endif //LL_LLINVENTORYSUBTREEPANEL_H

5
indra/newview/llstartup.cpp
View File

@ -193,10 +193,6 @@
#include "llvoicechannel.h"
#include "llpathfindingmanager.h"
// [RLVa:KB] - Checked: 2010-02-27 (RLVa-1.2.0a)
#include "rlvhandler.h"
// [/RLVa:KB]
#include "lllogin.h"
#include "llevents.h"
#include "llstartuplistener.h"
@ -2614,7 +2610,6 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
LLAgentPicksInfo::getInstance()->requestNumberOfPicks();
// <FS:Ansariel> [FS communication UI]
//LLIMFloater::initIMFloater();
//FSFloaterIM::initIMFloater(); <FS:TM> CHUI Merge LL removed this, check if still needed
// </FS:Ansariel> [FS communication UI]
display_startup();

6
indra/newview/lltoastnotifypanel.cpp
View File

@ -41,8 +41,7 @@
#include "llnotificationsutil.h"
#include "llviewermessage.h"
// <FS:Ansariel> [FS communication UI]
//#include "llfloaterimsession.h" <FS:TM> CHUI Merge new
//#include "llimfloater.h" <FS:TM> CHUI Merge old
//#include "llfloaterimsession.h"
#include "fsfloaterim.h"
// </FS:Ansariel> [FS communication UI]
@ -199,9 +198,10 @@ void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair
mute_btn_rect.setOriginAndSize(mute_btn_left, BOTTOM_PAD,// always move mute button at the bottom
mute_btn_rect.getWidth(), mute_btn_rect.getHeight());
mute_btn->setRect(mute_btn_rect);
mControlPanel->addChild(mute_btn);
mControlPanel->addChild(mute_btn);
}
}
void LLToastNotifyPanel::adjustPanelForScriptNotice(S32 button_panel_width, S32 button_panel_height)
{
//adjust layout

2
indra/newview/llviewerfloaterreg.cpp
View File

@ -236,9 +236,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("fs_nearby_chat", "floater_fs_nearby_chat.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterNearbyChat>);
// </FS:Ansariel> [FS communication UI]
LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);
// <FS:Ansariel> [FS communication UI]
LLFloaterReg::add("conversation", "floater_conversation_log.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterConversationLog>);
// </FS:Ansariel> [FS communication UI]
LLFloaterReg::add("destinations", "floater_destinations.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDestinations>);

2
indra/newview/llviewermenu.cpp
View File

@ -9988,7 +9988,7 @@ void initialize_menus()
view_listener_t::addEnable(new LLUploadCostCalculator(), "Upload.CalculateCosts");
// [CHUI Merge]
// <FS:Ansariel> [FS communication UI]
//enable.add("Conversation.IsConversationLoggingAllowed", boost::bind(&LLFloaterIMContainer::isConversationLoggingAllowed));
// Agent

19
indra/newview/llviewerthrottle.cpp
View File

@ -34,11 +34,6 @@
#include "llviewerstats.h"
#include "lldatapacker.h"
//<FS:HG> FIRE-6340, FIRE-6567 - addendum - don't spam chat
#include "lltrans.h"
#include "llnotificationsutil.h"
//</FS:HG> FIRE-6340, FIRE-6567 - addendum - don't spam chat
using namespace LLOldEvents;
// consts
@ -152,20 +147,6 @@ LLViewerThrottleGroup LLViewerThrottleGroup::operator-(const LLViewerThrottleGro
void LLViewerThrottleGroup::sendToSim() const
{
llinfos << "Sending throttle settings, total BW " << mThrottleTotal << llendl;
//<FS:TS> FIRE-6795: Remove warning at every login
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
//static bool bandwidth_warning_latch = false;//<FS:HG> FIRE-6340, FIRE-6567 - addendum - don't spam chat
//S32 newBandwidth=(S32) gSavedSettings.getF32("ThrottleBandwidthKBPS");
//gSavedSettings.setBOOL("BandwidthSettingTooHigh",newBandwidth>1500);
//</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
//<FS:HG> FIRE-6340, FIRE-6567 - addendum - don't spam chat
//if ( gSavedSettings.getBOOL("BandwidthSettingTooHigh") && !bandwidth_warning_latch )
// {
// LLNotificationsUtil::add("FSCmdLineBWTooHigh", LLSD());
// bandwidth_warning_latch = true;
// }
//</FS:HG> FIRE-6340, FIRE-6567 - addendum - don't spam chat
//</FS:TS> FIRE-6795
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_AgentThrottle);

44
indra/newview/llviewerwindow.cpp
View File

@ -2022,22 +2022,8 @@ void LLViewerWindow::initWorldUI()
// <FS:Zi> Is done inside XUI now, using visibility_control
// if (!gSavedSettings.getBOOL("ShowNavbarNavigationPanel"))
// {
// // <FS:Ansariel> Re-enable separate toggle for navigation and favorites panel
// //navbar->setVisible(FALSE);
// navbar->showNavigationPanel(FALSE);
// navbar->setVisible(FALSE);
// }
// // <FS:Ansariel> Re-enable separate toggle for navigation and favorites panel
// if (!gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"))
// {
// navbar->showFavoritesPanel(FALSE);
// }
// // </FS:Ansariel>
// if (!gSavedSettings.getBOOL("ShowSearchTopBar"))
// {
// navbar->childSetVisible("search_combo_box",FALSE);
// }
// </FS:Zi>
if (!gSavedSettings.getBOOL("ShowMenuBarLocation"))
@ -2446,18 +2432,14 @@ void LLViewerWindow::setNormalControlsVisible( BOOL visible )
}
// <FS:Zi> Is done inside XUI now, using visibility_control
// LLNavigationBar* navbarp = LLUI::getRootView()->findChild<LLNavigationBar>("navigation_bar");
// if (navbarp)
// {
// // when it's time to show navigation bar we need to ensure that the user wants to see it
// // i.e. ShowNavbarNavigationPanel option is true
// // <FS:Ansariel> Separate navigation and favorites panel
// //navbarp->setVisible( visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel") );
// navbarp->showNavigationPanel(visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel"));
// navbarp->showFavoritesPanel(visible && gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"));
// // </FS:Ansariel> Separate navigation and favorites panel
// }
// </FS_Zi>
//LLNavigationBar* navbarp = LLUI::getRootView()->findChild<LLNavigationBar>("navigation_bar");
//if (navbarp)
//{
// // when it's time to show navigation bar we need to ensure that the user wants to see it
// // i.e. ShowNavbarNavigationPanel option is true
// navbarp->setVisible( visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel") );
//}
// </FS:Zi>
}
void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
@ -5557,13 +5539,7 @@ void LLViewerWindow::setUIVisibility(bool visible)
}
// <FS:Zi> Is done inside XUI now, using visibility_control
// // <FS:Ansariel> Separate navigation and favorites panel
// //LLNavigationBar::getInstance()->setVisible(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE);
// LLNavigationBar::getInstance()->showNavigationPanel(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE);
// LLNavigationBar::getInstance()->showFavoritesPanel(visible ? gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"): FALSE);
// // </FS:Ansariel> Separate navigation and favorites panel
// </FS:Zi>
//LLNavigationBar::getInstance()->setVisible(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE);
LLPanelTopInfoBar::getInstance()->setVisible(visible? gSavedSettings.getBOOL("ShowMiniLocationPanel") : FALSE);
mRootView->getChildView("status_bar_container")->setVisible(visible);
}