From c0450ad230b5197293b57c8f154e992e13c921cc Mon Sep 17 00:00:00 2001 From: Ansariel Date: Mon, 8 Jul 2013 17:23:17 +0200 Subject: [PATCH] More code cleanup --- indra/newview/llinventorybridge.cpp | 40 ++++++++--------- indra/newview/llinventorybridge.h | 8 ++-- indra/newview/llinventoryfilter.cpp | 1 - indra/newview/llinventorymodel.cpp | 7 --- indra/newview/llinventorymodel.h | 14 +++--- .../llinventorymodelbackgroundfetch.cpp | 3 +- indra/newview/llmutelist.cpp | 16 ------- indra/newview/llmutelist.h | 3 -- indra/newview/llnavigationbar.cpp | 18 ++------ indra/newview/llnavigationbar.h | 10 ++--- indra/newview/llnotificationhandler.h | 4 +- indra/newview/llnotificationhandlerutil.cpp | 10 ++--- indra/newview/llpanelmaininventory.cpp | 3 +- indra/newview/llplacesinventorypanel.cpp | 19 -------- indra/newview/llplacesinventorypanel.h | 6 --- indra/newview/llstartup.cpp | 5 --- indra/newview/lltoastnotifypanel.cpp | 6 +-- indra/newview/llviewerfloaterreg.cpp | 2 - indra/newview/llviewermenu.cpp | 2 +- indra/newview/llviewerthrottle.cpp | 19 -------- indra/newview/llviewerwindow.cpp | 44 +++++-------------- 21 files changed, 57 insertions(+), 183 deletions(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 94fae4809b..9c78a11b5b 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -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. // Allow drag and drop in inventory regardless of filter (e.g. Recent) - // 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 diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index c76a501dba..8f8956e5f5 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -160,9 +160,9 @@ protected: BOOL isLostInventory() const; // [/SL:KB] BOOL isCOFFolder() const; // true if COF or descendent of -//-TT Client LSL Bridge +// Client LSL Bridge BOOL isProtectedFolder() const; -//-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 +// ReplaceWornItemsOnly void modifyOutfit(BOOL append, BOOL replace); -//-TT +// void determineFolderType(); void dropToFavorites(LLInventoryItem* inv_item); diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 13b14df0e8..5291e8aa75 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -120,7 +120,6 @@ bool LLInventoryFilter::check(const LLFolderViewModelItem* item) // Clipboard cut items are *always* filtered so we need this value upfront // FIRE-6714: Don't move objects to trash during cut&paste // Don't hide cut items in inventory - //const LLFolderViewEventListener* listener = item->getListener(); CHUI merge LL removed thie line //const BOOL passed_clipboard = (listener ? checkAgainstClipboard(listener->getUUID()) : TRUE); const BOOL passed_clipboard = TRUE; // FIRE-6714: Don't move objects to trash during cut&paste diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 9809d5dc75..e590386304 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -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 with (" << service_name << ") parameter" << llendl; - notifyObservers(); -} - // Call this method when it's time to update everyone on a new state. void LLInventoryModel::notifyObservers() { diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index 41368fba66..a06366efb6 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -40,10 +40,10 @@ #include #include #include -//-TT Patch: ReplaceWornItemsOnly +// ReplaceWornItemsOnly #include "llviewerobjectlist.h" #include "llvoavatarself.h" -//-TT +// class LLInventoryObserver; class LLInventoryObject; @@ -134,11 +134,11 @@ private: LLUUID mLibraryRootFolderID; LLUUID mLibraryOwnerID; -//-TT Patch: ReplaceWornItemsOnly +// ReplaceWornItemsOnly item_array_t mItemArray; item_array_t mObjArray; LLDynamicArray mAttPoints; -//-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 +// 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 +// private: mutable LLPointer 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(); diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 04b2bd3e0f..dfae07a841 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -183,9 +183,8 @@ void LLInventoryModelBackgroundFetch::backgroundFetchCB(void *) void LLInventoryModelBackgroundFetch::backgroundFetch() { -// new: if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived()) // -// old: if (mBackgroundFetchActive && gAgent.getRegion()) + //if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived()) LLViewerRegion* region = gAgent.getRegion(); if (!region || !region->capabilitiesReceived()) { diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp index 0045df298e..0d13db24d5 100644 --- a/indra/newview/llmutelist.cpp +++ b/indra/newview/llmutelist.cpp @@ -784,19 +784,3 @@ void LLMuteList::notifyObservers() it = mObservers.upper_bound(observer); } } - -// 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); - } -} -// diff --git a/indra/newview/llmutelist.h b/indra/newview/llmutelist.h index 3cc61b2fe5..7a70370fe3 100644 --- a/indra/newview/llmutelist.h +++ b/indra/newview/llmutelist.h @@ -117,9 +117,6 @@ public: // call this method on logout to save everything. void cache(const LLUUID& agent_id); - // Agent profile button - LLMute getMute(const LLUUID& id); - private: BOOL loadFromFile(const std::string& filename); BOOL saveToFile(const std::string& filename); diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp index be9c2e7d0b..b64ffd062c 100644 --- a/indra/newview/llnavigationbar.cpp +++ b/indra/newview/llnavigationbar.cpp @@ -320,20 +320,8 @@ BOOL LLNavigationBar::postBuild() setTeleportFailedCallback(boost::bind(&LLNavigationBar::onTeleportFailed, this)); // No size calculations in code please. XUI handles it all now with visibility_control - // LLFavoritesBarCtrl* fp = getChild("favorite"); - // LLPanel* np = getChild("navigation_panel"); - // LLPanel* navFrame = getChild("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("favorite")->getRect(); // // we'll be notified on teleport history changes @@ -779,7 +767,7 @@ void LLNavigationBar::clearHistoryCache() // 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() // { diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h index 89d2fa0ee1..294cba0f5a 100644 --- a/indra/newview/llnavigationbar.h +++ b/indra/newview/llnavigationbar.h @@ -146,12 +146,10 @@ private: LLButton* mBtnHome; LLSearchComboBox* mSearchComboBox; LLLocationInputCtrl* mCmbLocation; -// No size calculations in code please. XUI handles it all now with visibility_control -// LLRect mDefaultNpRect; -// LLRect mDefaultNavContainerRect; -// LLRect mDefaultFpRect; -// LLRect mDefaultFrameRect; -// + // 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; diff --git a/indra/newview/llnotificationhandler.h b/indra/newview/llnotificationhandler.h index 3cb4e51cfa..9342986d11 100644 --- a/indra/newview/llnotificationhandler.h +++ b/indra/newview/llnotificationhandler.h @@ -40,8 +40,7 @@ #include "llavatarname.h" // [FS communication UI] -//class LLIMFloater; CHUI Merge old -//class LLFloaterIMSession; CHUI Merge new +//class LLFloaterIMSession; class FSFloaterIM; // [FS communication UI] @@ -368,7 +367,6 @@ private: * Find IM floater based on "from_id" */ // [FS communication UI] - //static LLIMFloater* findIMFloater(const LLNotificationPtr& notification); static FSFloaterIM* findIMFloater(const LLNotificationPtr& notification); // [FS communication UI] diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index 89ab6db2ea..48dab1cb03 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -35,8 +35,7 @@ #include "llagent.h" // [FS communication UI] -//#include "llfloaterimsession.h" CHUI Merge new -//#include "llimfloater.h" CHUI Merge old +//#include "llfloaterimsession.h" #include "fsfloaterim.h" // [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 communication UI] - //LLFloaterIMNearbyChat* nearby_chat = LLFloaterReg::findTypedInstance("nearby_chat"); CHUI Merge new (including odd white space) - //LLFloaterNearbyChat* nearby_chat = LLFloaterNearbyChat::getInstance(); CHUI Merge old + //LLFloaterIMNearbyChat* nearby_chat = LLFloaterReg::findTypedInstance("nearby_chat"); FSFloaterNearbyChat* nearby_chat = FSFloaterNearbyChat::getInstance(); // [FS communication UI] if (nearby_chat) @@ -349,8 +346,7 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification) void LLHandlerUtil::updateIMFLoaterMesages(const LLUUID& session_id) { // [FS communication UI] - //LLFloaterIMSession* im_floater = LLFloaterIMSession::findInstance(session_id); CHUI Merge new - //LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); CHUI Merge old + //LLFloaterIMSession* im_floater = LLFloaterIMSession::findInstance(session_id); FSFloaterIM* im_floater = FSFloaterIM::findInstance(session_id); // [FS communication UI] if (im_floater != NULL && im_floater->getVisible()) diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 6871199a21..4f7466a7a1 100644 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -906,8 +906,7 @@ void LLPanelMainInventory::onFocusReceived() void LLPanelMainInventory::setFilterTextFromFilter() { - //mFilterText = mActivePanel->getFilter()->getFilterText(); CHUI Merge old - //mFilterText = mActivePanel->getFilter().getFilterText(); 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(); diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp index d2ca28ba0e..48ff4000b4 100644 --- a/indra/newview/llplacesinventorypanel.cpp +++ b/indra/newview/llplacesinventorypanel.cpp @@ -121,22 +121,3 @@ S32 LLPlacesInventoryPanel::notify(const LLSD& info) } return 0; } - -//} 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); \ No newline at end of file diff --git a/indra/newview/llplacesinventorypanel.h b/indra/newview/llplacesinventorypanel.h index b2ed72a234..2805fc4257 100644 --- a/indra/newview/llplacesinventorypanel.h +++ b/indra/newview/llplacesinventorypanel.h @@ -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 diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 0ca71a6a85..b3ea86a63e 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -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 communication UI] - //LLIMFloater::initIMFloater(); //FSFloaterIM::initIMFloater(); CHUI Merge LL removed this, check if still needed // [FS communication UI] display_startup(); diff --git a/indra/newview/lltoastnotifypanel.cpp b/indra/newview/lltoastnotifypanel.cpp index 3511b8e51c..1c6212d363 100644 --- a/indra/newview/lltoastnotifypanel.cpp +++ b/indra/newview/lltoastnotifypanel.cpp @@ -41,8 +41,7 @@ #include "llnotificationsutil.h" #include "llviewermessage.h" // [FS communication UI] -//#include "llfloaterimsession.h" CHUI Merge new -//#include "llimfloater.h" CHUI Merge old +//#include "llfloaterimsession.h" #include "fsfloaterim.h" // [FS communication UI] @@ -199,9 +198,10 @@ void LLToastNotifyPanel::updateButtonsLayout(const std::vectorsetRect(mute_btn_rect); - mControlPanel->addChild(mute_btn); + mControlPanel->addChild(mute_btn); } } + void LLToastNotifyPanel::adjustPanelForScriptNotice(S32 button_panel_width, S32 button_panel_height) { //adjust layout diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 2031a9b848..4919ec23a3 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -236,9 +236,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("fs_nearby_chat", "floater_fs_nearby_chat.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); // [FS communication UI] LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); - // [FS communication UI] LLFloaterReg::add("conversation", "floater_conversation_log.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); - // [FS communication UI] LLFloaterReg::add("destinations", "floater_destinations.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index f0c466c554..dfa907c9f2 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -9988,7 +9988,7 @@ void initialize_menus() view_listener_t::addEnable(new LLUploadCostCalculator(), "Upload.CalculateCosts"); - // [CHUI Merge] + // [FS communication UI] //enable.add("Conversation.IsConversationLoggingAllowed", boost::bind(&LLFloaterIMContainer::isConversationLoggingAllowed)); // Agent diff --git a/indra/newview/llviewerthrottle.cpp b/indra/newview/llviewerthrottle.cpp index 4fdd65abfd..5147272122 100644 --- a/indra/newview/llviewerthrottle.cpp +++ b/indra/newview/llviewerthrottle.cpp @@ -34,11 +34,6 @@ #include "llviewerstats.h" #include "lldatapacker.h" -// FIRE-6340, FIRE-6567 - addendum - don't spam chat -#include "lltrans.h" -#include "llnotificationsutil.h" -// 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; - // FIRE-6795: Remove warning at every login - // FIRE-6340, FIRE-6567 - Setting Bandwidth issues - //static bool bandwidth_warning_latch = false;// FIRE-6340, FIRE-6567 - addendum - don't spam chat - //S32 newBandwidth=(S32) gSavedSettings.getF32("ThrottleBandwidthKBPS"); - //gSavedSettings.setBOOL("BandwidthSettingTooHigh",newBandwidth>1500); - // FIRE-6340, FIRE-6567 - Setting Bandwidth issues - // FIRE-6340, FIRE-6567 - addendum - don't spam chat - //if ( gSavedSettings.getBOOL("BandwidthSettingTooHigh") && !bandwidth_warning_latch ) - // { - // LLNotificationsUtil::add("FSCmdLineBWTooHigh", LLSD()); - // bandwidth_warning_latch = true; - // } - // FIRE-6340, FIRE-6567 - addendum - don't spam chat - // FIRE-6795 LLMessageSystem* msg = gMessageSystem; msg->newMessageFast(_PREHASH_AgentThrottle); diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 67eee9a191..bde215104e 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2022,22 +2022,8 @@ void LLViewerWindow::initWorldUI() // Is done inside XUI now, using visibility_control // if (!gSavedSettings.getBOOL("ShowNavbarNavigationPanel")) // { - // // Re-enable separate toggle for navigation and favorites panel - // //navbar->setVisible(FALSE); - // navbar->showNavigationPanel(FALSE); + // navbar->setVisible(FALSE); // } - - // // Re-enable separate toggle for navigation and favorites panel - // if (!gSavedSettings.getBOOL("ShowNavbarFavoritesPanel")) - // { - // navbar->showFavoritesPanel(FALSE); - // } - // // - - // if (!gSavedSettings.getBOOL("ShowSearchTopBar")) - // { - // navbar->childSetVisible("search_combo_box",FALSE); - // } // if (!gSavedSettings.getBOOL("ShowMenuBarLocation")) @@ -2446,18 +2432,14 @@ void LLViewerWindow::setNormalControlsVisible( BOOL visible ) } // Is done inside XUI now, using visibility_control - // LLNavigationBar* navbarp = LLUI::getRootView()->findChild("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 - // // Separate navigation and favorites panel - // //navbarp->setVisible( visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel") ); - // navbarp->showNavigationPanel(visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel")); - // navbarp->showFavoritesPanel(visible && gSavedSettings.getBOOL("ShowNavbarFavoritesPanel")); - // // Separate navigation and favorites panel - // } - // + //LLNavigationBar* navbarp = LLUI::getRootView()->findChild("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") ); + //} + // } void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid) @@ -5557,13 +5539,7 @@ void LLViewerWindow::setUIVisibility(bool visible) } // Is done inside XUI now, using visibility_control - // // 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); - // // Separate navigation and favorites panel - // - + //LLNavigationBar::getInstance()->setVisible(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE); LLPanelTopInfoBar::getInstance()->setVisible(visible? gSavedSettings.getBOOL("ShowMiniLocationPanel") : FALSE); mRootView->getChildView("status_bar_container")->setVisible(visible); }