diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 41580f20b7..971572c25c 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5943,17 +5943,6 @@ Value 0.0 - ForceInitialCOFDelay - - Comment - Number of seconds to delay initial processing of COF contents - Persist - 1 - Type - F32 - Value - 0.0 - ForceShowGrid Comment @@ -5991,17 +5980,6 @@ Backup 0 - ForceMissingType - - Comment - Force this wearable type to be missing from COF - Persist - 1 - Type - U32 - Value - 255 - FreezeTime Comment @@ -9349,17 +9327,6 @@ Change of this parameter will affect the layout of buttons in notification toast Boolean Value 0 - - PlaySoundNewConversation - - Comment - Plays a sound when have a new conversation. - Persist - 1 - Type - Boolean - Value - 1 PlaySoundTeleportOffer @@ -15935,17 +15902,6 @@ Change of this parameter will affect the layout of buttons in notification toast Backup 0 - VerifyInitialWearables - - Comment - Compares the initial wearables to the COF contents to determine which one to use for the intial outfit - Persist - 1 - Type - Boolean - Value - 0 - VertexShaderEnable Comment diff --git a/indra/newview/app_settings/settings_hybrid.xml b/indra/newview/app_settings/settings_hybrid.xml index 7139105c05..7f88c8c284 100644 --- a/indra/newview/app_settings/settings_hybrid.xml +++ b/indra/newview/app_settings/settings_hybrid.xml @@ -135,18 +135,6 @@ 2 - FSScriptDialogNoTransparency - - Comment - If true, script dialogs will be shown opaque and ignore the floater opacity settings. - Persist - 1 - Type - Boolean - Value - 0 - - ShowRadarMinimap Comment diff --git a/indra/newview/app_settings/settings_latency.xml b/indra/newview/app_settings/settings_latency.xml index 663ba3daab..780a3c8189 100644 --- a/indra/newview/app_settings/settings_latency.xml +++ b/indra/newview/app_settings/settings_latency.xml @@ -35,18 +35,6 @@ 0 - SkinCurrent - - Comment - The currently selected skin. - Persist - 1 - Type - String - Value - vintage - - FSColorClienttags Comment diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml index e00370d8c3..b3f06b967b 100755 --- a/indra/newview/app_settings/settings_per_account.xml +++ b/indra/newview/app_settings/settings_per_account.xml @@ -624,17 +624,6 @@ Value - ExodusFlickrUsername - - Comment - Flickr Username - Persist - 1 - Type - String - Value - - ExodusFlickrNSID Comment diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index e0afcd5d1a..49df1a785c 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -245,8 +245,10 @@ private: const F32 LLAgent::MIN_AFK_TIME = 10.0f; const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f; -BOOL LLAgent::ignorePrejump = 0; -BOOL LLAgent::PhoenixForceFly; +// Ignore prejump and always fly +BOOL LLAgent::ignorePrejump = FALSE; +BOOL LLAgent::fsAlwaysFly; +// Ignore prejump and always fly std::map LLAgent::sTeleportErrorMessages; std::map LLAgent::sTeleportProgressMessages; @@ -461,24 +463,26 @@ LLAgent::LLAgent() : mMoveTimer.stop(); } +// Ignore prejump and always fly void LLAgent::updateIgnorePrejump(const LLSD &data) { ignorePrejump = data.asBoolean(); } -void LLAgent::updatePhoenixForceFly(const LLSD &data) +void LLAgent::updateFSAlwaysFly(const LLSD &data) { - PhoenixForceFly = data.asBoolean(); - if (PhoenixForceFly == TRUE) + fsAlwaysFly = data.asBoolean(); + if (fsAlwaysFly) { llinfos << "Enabling Fly Override" << llendl; - if (gSavedSettings.getBOOL("FirstUseFlyOverride") == TRUE) - { - LLNotificationsUtil::add("FirstUseFlyOverride"); + if (gSavedSettings.getBOOL("FirstUseFlyOverride")) + { + LLNotificationsUtil::add("FirstUseFlyOverride"); gSavedSettings.setBOOL("FirstUseFlyOverride", FALSE); } } } +// Ignore prejump and always fly // Requires gSavedSettings to be initialized. //----------------------------------------------------------------------------- @@ -504,8 +508,8 @@ void LLAgent::init() mIsDoSendMaturityPreferenceToServer = true; ignorePrejump = gSavedSettings.getBOOL("FSIgnoreFinishAnimation"); gSavedSettings.getControl("FSIgnoreFinishAnimation")->getSignal()->connect(boost::bind(&LLAgent::updateIgnorePrejump, this, _2)); - PhoenixForceFly = gSavedSettings.getBOOL("FSAlwaysFly"); - gSavedSettings.getControl("FSAlwaysFly")->getSignal()->connect(boost::bind(&LLAgent::updatePhoenixForceFly, this, _2)); + fsAlwaysFly = gSavedSettings.getBOOL("FSAlwaysFly"); + gSavedSettings.getControl("FSAlwaysFly")->getSignal()->connect(boost::bind(&LLAgent::updateFSAlwaysFly, this, _2)); selectAutorespond(gSavedPerAccountSettings.getBOOL("FSAutorespondMode")); selectAutorespondNonFriends(gSavedPerAccountSettings.getBOOL("FSAutorespondNonFriendsMode")); @@ -786,8 +790,13 @@ BOOL LLAgent::canFly() if (gRlvHandler.hasBehaviour(RLV_BHVR_FLY)) return FALSE; // [/RLVa:KB] if (isGodlike()) return TRUE; - //LGG always fly code - if(PhoenixForceFly) return TRUE; + // Always fly + if (fsAlwaysFly) + { + return TRUE; + } + // + LLViewerRegion* regionp = getRegion(); if (regionp && regionp->getBlockFly()) return FALSE; @@ -2271,11 +2280,6 @@ void LLAgent::endAnimationUpdateUI() gMenuBarView->setVisible(TRUE); // Separate navigation and favorites panel //LLNavigationBar::getInstance()->setVisible(TRUE && gSavedSettings.getBOOL("ShowNavbarNavigationPanel")); - // Is done inside XUI now, using visibility_control - // LLNavigationBar::getInstance()->showNavigationPanel(TRUE && gSavedSettings.getBOOL("ShowNavbarNavigationPanel")); - // LLNavigationBar::getInstance()->showFavoritesPanel(TRUE && gSavedSettings.getBOOL("ShowNavbarFavoritesPanel")); - // - // Separate navigation and favorites panel gStatusBar->setVisibleForMouselook(true); if (gSavedSettings.getBOOL("ShowMiniLocationPanel")) @@ -2406,11 +2410,6 @@ void LLAgent::endAnimationUpdateUI() gMenuBarView->setVisible(FALSE); // Separate navigation and favorites panel //LLNavigationBar::getInstance()->setVisible(FALSE); - // Is done inside XUI now, using visibility_control - // LLNavigationBar::getInstance()->showNavigationPanel(FALSE); - // LLNavigationBar::getInstance()->showFavoritesPanel(FALSE); - // - // Separate navigation and favorites panel gStatusBar->setVisibleForMouselook(false); LLPanelTopInfoBar::getInstance()->setVisible(FALSE); @@ -3105,6 +3104,7 @@ void LLAgent::sendMaturityPreferenceToServer(U8 pPreferredMaturity) } } } + BOOL LLAgent::getAdminOverride() const { return mAgentAccess->getAdminOverride(); @@ -3604,7 +3604,7 @@ void LLAgent::processAgentDropGroup(LLMessageSystem *msg, void **) LLGroupMgr::getInstance()->clearGroupData(group_id); // close the floater for this group, if any. - // AO: Don't assume that because we drop a group, we want floaters to change. + // Don't assume that because we drop a group, we want floaters to change. //LLGroupActions::closeGroup(group_id); } else @@ -3708,7 +3708,7 @@ LLHTTPRegistration // static void LLAgent::processAgentGroupDataUpdate(LLMessageSystem *msg, void **) -{ +{ LLUUID agent_id; msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id ); @@ -3764,7 +3764,7 @@ class LLAgentGroupDataUpdateViewerNode : public LLHTTPNode if(body.has("body")) body = body["body"]; LLUUID agent_id = body["AgentData"][0]["AgentID"].asUUID(); - + if (agent_id != gAgentID) { llwarns << "processAgentGroupDataUpdate for agent other than me" << llendl; @@ -3807,7 +3807,7 @@ class LLAgentGroupDataUpdateViewerNode : public LLHTTPNode gAgent.mGroups.put(group); } if (need_floater_update) - { + { update_group_floaters(group.mID); } } @@ -3847,6 +3847,7 @@ void LLAgent::processAgentDataUpdate(LLMessageSystem *msg, void **) gAgent.mGroupPowers = 0; gAgent.mGroupName.clear(); } + // Restore to world if (gAgent.restoreToWorld) { //This fires if we're trying to restore an item to world using the correct group. @@ -3887,6 +3888,8 @@ void LLAgent::processAgentDataUpdate(LLMessageSystem *msg, void **) msg->addUUIDFast(_PREHASH_GroupID, gAgent.restoreToWorldGroup); gAgent.sendReliableMessage(); } + // + update_group_floaters(active_id); // Fire event for group title overview @@ -4159,7 +4162,7 @@ void LLAgent::clearVisualParams(void *data) //--------------------------------------------------------------------------- // Teleport //--------------------------------------------------------------------------- -//-TT Client LSL Bridge +// Client LSL Bridge bool LLAgent::teleportBridgeLocal(LLVector3& pos_local) { std::stringstream msgstream; @@ -4175,9 +4178,8 @@ bool LLAgent::teleportBridgeGlobal(const LLVector3d& pos_global) LLVector3 pos_local = (LLVector3)(pos_global - from_region_handle(region_handle)); return teleportBridgeLocal(pos_local); - } -//-TT Client LSL Bridge +// Client LSL Bridge // teleportCore() - stuff to do on any teleport // protected @@ -4221,7 +4223,7 @@ bool LLAgent::teleportCore(bool is_local) // hide the Region/Estate floater LLFloaterReg::hideInstance("region_info"); - // hide the Search floater (TS: FIRE-2886, backing out STORM-1474) + // minimize the Search floater (STORM-1474) { LLFloater* instance = LLFloaterReg::getInstance("search"); @@ -4269,7 +4271,7 @@ bool LLAgent::teleportCore(bool is_local) // bit of a hack -KC KCWindlightInterface::instance().setTPing(true); } - make_ui_sound("UISndTeleportOut"); //AO + make_ui_sound("UISndTeleportOut"); // MBW -- Let the voice client know a teleport has begun so it can leave the existing channel. // This was breaking the case of teleporting within a single sim. Backing it out for now. @@ -4568,12 +4570,12 @@ void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global) msg->addVector3Fast(_PREHASH_LookAt, pos); sendReliableMessage(); } -//-TT Client LSL Bridge +// Client LSL Bridge if (gSavedSettings.getBOOL("UseLSLBridge") && isLocal) { teleportBridgeGlobal(pos_global); } -//-TT +// } // Teleport to global position, but keep facing in the same direction @@ -4600,19 +4602,23 @@ void LLAgent::doTeleportViaLocationLookAt(const LLVector3d& pos_global) U64 region_handle = to_region_handle(pos_global); // Aurora-sim var region teleports LLSimInfo* simInfo = LLWorldMap::instance().simInfoFromHandle(region_handle); - if(simInfo) + if (simInfo) + { region_handle = simInfo->getHandle(); + } // LLVector3 pos_local = (LLVector3)(pos_global - from_region_handle(region_handle)); teleportRequest(region_handle, pos_local, getTeleportKeepsLookAt()); -//-TT Client LSL Bridge +// Client LSL Bridge if (gSavedSettings.getBOOL("UseLSLBridge")) { if (region_handle == to_region_handle(getPositionGlobal())) + { teleportBridgeLocal(pos_local); + } } -//-TT +// } void LLAgent::setTeleportState(ETeleportState state) @@ -5106,21 +5112,25 @@ void LLAgent::renderAutoPilotTarget() } } -// Firestorm Phantom +// Phantom mode void LLAgent::togglePhantom() { mPhantom = !mPhantom; - if(mPhantom) + if (mPhantom) + { LLNotificationsUtil::add("PhantomOn", LLSD()); + } else + { LLNotificationsUtil::add("PhantomOff", LLSD()); + } } bool LLAgent::getPhantom() const { return mPhantom; } -// Firestorm Phantom +// Phantom mode /********************************************************************************/ diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 8100bbb68d..2c4fc888e4 100755 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -461,10 +461,13 @@ private: U32 mControlFlags; // Replacement for the mFooKey's BOOL mbFlagsDirty; BOOL mbFlagsNeedReset; // ! HACK ! For preventing incorrect flags sent when crossing region boundaries + + // Ignore prejump and always fly static BOOL ignorePrejump; - static BOOL PhoenixForceFly; + static BOOL fsAlwaysFly; void updateIgnorePrejump(const LLSD &data); - void updatePhoenixForceFly(const LLSD &data); + void updateFSAlwaysFly(const LLSD &data); + // Ignore prejump and always fly //-------------------------------------------------------------------- // Animations @@ -613,10 +616,10 @@ public: void teleportViaLocationLookAt(const LLVector3d& pos_global);// To a global location, preserving camera rotation void teleportCancel(); // May or may not be allowed by server bool getTeleportKeepsLookAt() { return mbTeleportKeepsLookAt; } // Whether look-at reset after teleport -//-TT Client LSL Bridge +// Client LSL Bridge bool teleportBridgeLocal(LLVector3& pos_local); // Teleport using LSL Bridge - bool teleportBridgeGlobal(const LLVector3d& pos_global); // Teleport using LSL Bridge -//-TT + bool teleportBridgeGlobal(const LLVector3d& pos_global); // Teleport using LSL Bridge +// protected: bool teleportCore(bool is_local = false); // Stuff for all teleports; returns true if the teleport can proceed diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 7f08fa80f0..db3406d794 100755 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2898,8 +2898,6 @@ S32 LLAgentCamera::directionToKey(S32 direction) } // FIRE-7758: Save/load camera position feature -// Copyright (C) 2012, Ansariel Hiller @ Second Life for Phoenix Firestorm Viewer -// This code is licensed unter the GNU Lesser General Public License version 2.1 void LLAgentCamera::storeCameraPosition() { mStoredCameraPos = getCameraPositionGlobal(); @@ -2935,4 +2933,3 @@ void LLAgentCamera::loadCameraPosition() // FIRE-7758: Save/load camera position feature // EOF - diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h index 290ad4e4d8..ba4fc13223 100755 --- a/indra/newview/llagentcamera.h +++ b/indra/newview/llagentcamera.h @@ -393,8 +393,6 @@ private: *******************************************************************************/ // FIRE-7758: Save/load camera position feature -// Copyright (C) 2012, Ansariel Hiller @ Second Life for Phoenix Firestorm Viewer -// This code is licensed unter the GNU Lesser General Public License version 2.1 public: void storeCameraPosition(); void loadCameraPosition(); diff --git a/indra/newview/llagentlanguage.cpp b/indra/newview/llagentlanguage.cpp index 8dddb42207..16af26eb5b 100755 --- a/indra/newview/llagentlanguage.cpp +++ b/indra/newview/llagentlanguage.cpp @@ -47,7 +47,7 @@ void LLAgentLanguage::onChange() { // Clear inventory cache so that default names of inventory items // appear retranslated (EXT-8308). - // AO: Purging the cache every language change is less desirable than having to manually cache clear once to retranslate inventory. + // Purging the cache every language change is less desirable than having to manually cache clear once to retranslate inventory. //gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE); } diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp index fbaa3cc944..7b52bd39a0 100755 --- a/indra/newview/llagentui.cpp +++ b/indra/newview/llagentui.cpp @@ -172,6 +172,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const sim_access_string.empty() ? "" : " - ", sim_access_string.c_str()); break; + // V1 format statusbar case LOCATION_FORMAT_V1_STATUSBAR: if (fsStatusbarShowSimulatorVersion && !simulator_channel.empty()) { @@ -191,6 +192,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const sim_access_string.c_str()); } break; + // V1 format statusbar } } else @@ -225,6 +227,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const sim_access_string.empty() ? "" : " - ", sim_access_string.c_str()); break; + // V1 format statusbar case LOCATION_FORMAT_V1_STATUSBAR: if (fsStatusbarShowSimulatorVersion && !simulator_channel.empty()) { @@ -246,6 +249,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const parcel_name.c_str()); } break; + // V1 format statusbar } } str = buffer; diff --git a/indra/newview/llagentui.h b/indra/newview/llagentui.h index d6122a8391..3fac43e619 100755 --- a/indra/newview/llagentui.h +++ b/indra/newview/llagentui.h @@ -39,7 +39,7 @@ public: LOCATION_FORMAT_NO_MATURITY, // Parcel, Region (x, y, z) LOCATION_FORMAT_NO_COORDS, // Parcel, Region - Maturity LOCATION_FORMAT_FULL, // Parcel, Region (x, y, z) - Maturity - LOCATION_FORMAT_V1_STATUSBAR, // Ansariel: V1 mode for status bar: Region (x, y, z) - Maturity - Parcel + LOCATION_FORMAT_V1_STATUSBAR, // V1 mode for status bar: Region (x, y, z) - Maturity - Parcel }; static void buildFullname(std::string &name); diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index 0e6a798877..45e7452a60 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1492,7 +1492,7 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id) gInventory.collectDescendentsIf(cat_id, cats, items, FALSE, collector); -//-TT Client LSL Bridge +// Client LSL Bridge if (gSavedSettings.getBOOL("UseLSLBridge")) { //if replacing - make sure bridge stays. @@ -1501,10 +1501,9 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id) llinfos << "reinserting bridge at outfit remove" << llendl; //items.find(FSLSLBridge::instance().getBridge()); items.removeObj(FSLSLBridge::instance().getBridge()); - llinfos << "reinserted bridge at outfit remove" << llendl; } } -//-TT +// LLInventoryModel::item_array_t::const_iterator it = items.begin(); const LLInventoryModel::item_array_t::const_iterator it_end = items.end(); @@ -2578,12 +2577,12 @@ void LLAppearanceMgr::getUserDescendents(const LLUUID& category, } void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append) -//-TT Patch: ReplaceWornItemsOnly +// ReplaceWornItemsOnly { wearInventoryCategory(category, copy, append, false); } void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append, bool replace) -//-TT +// { if(!category) return; @@ -2599,26 +2598,26 @@ void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool callAfterCategoryFetch(category->getUUID(),boost::bind(&LLAppearanceMgr::wearCategoryFinal, &LLAppearanceMgr::instance(), category->getUUID(), copy, append)); -//-TT Patch: ReplaceWornItemsOnly +// ReplaceWornItemsOnly //category->getUUID(), copy, append, replace)); -//-TT +// } -//-TT Patch: ReplaceWornItemsOnly +// ReplaceWornItemsOnly void LLAppearanceMgr::replaceCategoryInCurrentOutfit(const LLUUID& cat_id) { LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id); wearInventoryCategory(cat, false, true); } -//-TT +// void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append) -//-TT Patch: ReplaceWornItemsOnly +// ReplaceWornItemsOnly { wearCategoryFinal(cat_id, copy_items, append, false); } void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append, bool replace) -//-TT +// { LL_INFOS("Avatar") << self_av_string() << "starting" << LL_ENDL; @@ -3109,7 +3108,7 @@ void LLAppearanceMgr::updateIsDirty() gInventory.collectDescendentsIf(base_outfit, outfit_cats, outfit_items, LLInventoryModel::EXCLUDE_TRASH, collector); - // FIRE-3018: Ignore the bridge when checking for dirty. -- TS + // FIRE-3018: Ignore the bridge when checking for dirty. for (U32 i = 0; i < cof_items.size(); ++i) { LLViewerInventoryItem *item = cof_items.get(i); @@ -3120,6 +3119,7 @@ void LLAppearanceMgr::updateIsDirty() break; } } + // if(outfit_items.count() != cof_items.count()) { @@ -3887,14 +3887,14 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove) bool fUpdateAppearance = false; for (uuid_vec_t::const_iterator it = ids_to_remove.begin(); it != ids_to_remove.end(); ++it) { - const LLUUID& linked_item_id = gInventory.getLinkedItemID(*it); - - if ( (rlv_handler_t::isEnabled()) && (!rlvPredCanRemoveItem(gInventory.getItem(linked_item_id))) ) + const LLInventoryItem* linked_item = gInventory.getLinkedItem(*it); + if (linked_item && (rlv_handler_t::isEnabled()) && (!rlvPredCanRemoveItem(linked_item)) ) { continue; } fUpdateAppearance = true; + const LLUUID& linked_item_id = gInventory.getLinkedItemID(*it); removeCOFItemLinks(linked_item_id); } @@ -3914,15 +3914,15 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove) void LLAppearanceMgr::removeItemFromAvatar(const LLUUID& id_to_remove) { - LLUUID linked_item_id = gInventory.getLinkedItemID(id_to_remove); - // [RLVa:KB] - Checked: 2013-02-12 (RLVa-1.4.8) - if ( (rlv_handler_t::isEnabled()) && (!rlvPredCanRemoveItem(gInventory.getItem(linked_item_id))) ) + const LLInventoryItem* linked_item = gInventory.getLinkedItem(id_to_remove); + + if (linked_item && (rlv_handler_t::isEnabled()) && (!rlvPredCanRemoveItem(linked_item)) ) { return; } // [/RLVA:KB] - + LLUUID linked_item_id = gInventory.getLinkedItemID(id_to_remove); removeCOFItemLinks(linked_item_id); updateAppearanceFromCOF(); } diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index fa50656257..351cfd8f1d 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -61,17 +61,15 @@ public: bool append = false, const LLUUID& idOutfit = LLUUID::null); // [/RLVa:KB] void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append); -//-TT Patch: ReplaceWornItemsOnly +// ReplaceWornItemsOnly void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append, bool items); -//-TT +// void wearInventoryCategoryOnAvatar(LLInventoryCategory* category, bool append); void wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append); -//-TT Patch: ReplaceWornItemsOnly +// ReplaceWornItemsOnly void wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append, bool items); -//-TT -//-TT Patch: ReplaceWornItemsOnly void replaceCategoryInCurrentOutfit(const LLUUID& cat_id); -//-TT +// void wearOutfitByName(const std::string& name); void changeOutfit(bool proceed, const LLUUID& category, bool append); void replaceCurrentOutfit(const LLUUID& new_outfit); diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 16cd66fd37..5edfe9c5b2 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1136,12 +1136,15 @@ bool LLAppViewer::init() gGLManager.printGLInfoString(); // Load Default bindings + // Optional AZERTY keyboard layout + //std::string key_bindings_file = gDirUtilp->findFile("keys.xml", std::string keyBindingFileName("keys.xml"); if (gSavedSettings.getBOOL("FSUseAzertyKeyboardLayout")) { keyBindingFileName = "keys_azerty.xml"; } std::string key_bindings_file = gDirUtilp->findFile(keyBindingFileName, + // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, ""), gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "")); diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index 658dcfd90c..154284eb6f 100755 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -51,9 +51,6 @@ #include "llviewertexlayer.h" #include "llviewerwindow.h" #include "lltrans.h" -//-TT Client LSL Bridge -#include "fslslbridge.h" -//-TT // library includes #include "lldir.h" @@ -66,6 +63,8 @@ #include "llsdutil.h" #include "llvfs.h" #include "tea.h" // +// Client LSL Bridge +#include "fslslbridge.h" // When uploading multiple files, don't display any of them when uploading more than this number. static const S32 FILE_COUNT_DISPLAY_THRESHOLD = 5; @@ -610,10 +609,12 @@ void LLUpdateAgentInventoryResponder::uploadComplete(const LLSD& content) preview->callbackLSLCompileFailed(content["errors"]); } } -//-TT Client LSL Bridge + // Client LSL Bridge if (gSavedSettings.getBOOL("UseLSLBridge")) - FSLSLBridge::instance().checkBridgeScriptName(mFileName); -//-TT + { + FSLSLBridge::instance().checkBridgeScriptName(mFileName); + } + // break; } diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 528c77983c..13b401dab0 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -69,30 +69,27 @@ #include "llviewerobjectlist.h" #include "llviewermessage.h" // for handle_lure #include "llviewerregion.h" -// [FS communication UI] -#include "fsfloaterim.h" -#include "fsfloaterimcontainer.h" -// [FS communication UI] #include "lltrans.h" #include "llcallingcard.h" #include "llslurl.h" // IDEVO #include "llsidepanelinventory.h" -// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0) + +// Firestorm includes +#include "fsfloaterim.h" +#include "fsfloaterimcontainer.h" +#include "fsfloaterprofile.h" +#include "fslslbridge.h" +#include "fswsassetblacklist.h" +#include "llfloaterregioninfo.h" +#include "llfloaterreporter.h" +#include "llparcel.h" +#include "lltrans.h" +#include "llviewermenu.h" +#include "llviewerparcelmgr.h" +#include "llworld.h" #include "rlvactions.h" #include "rlvcommon.h" -#include "rlvhandler.h" // FIRE-8804: Prevent opening inventory from using share in radar context menu -// [/RLVa:KB] -#include "fslslbridge.h" -// -#include "llworld.h" //Added: Catznip-2.4.0g -#include "llfloaterreporter.h" // [SL:KB] - Patch: UI-SidepanelPeople -#include "llparcel.h" //Added: Catznip-2.4.0g -#include "llviewerparcelmgr.h" //Added: Catznip-2.4.0g -#include "fsfloaterprofile.h" -#include "llfloaterregioninfo.h" -#include "lltrans.h" -#include "fswsassetblacklist.h" -#include "llviewermenu.h" +#include "rlvhandler.h" // static void LLAvatarActions::requestFriendshipDialog(const LLUUID& id, const std::string& name) @@ -206,9 +203,8 @@ static void on_avatar_name_cache_start_im(const LLUUID& agent_id, if (session_id != LLUUID::null) { // [FS communication UI] - //LLFloaterIMContainer::getInstance()->showConversation(session_id); CHUI merge LL New - //LLIMFloater::show(session_id); CHUI merge LL old - FSFloaterIM::show(session_id); // FS orig + //LLFloaterIMContainer::getInstance()->showConversation(session_id); + FSFloaterIM::show(session_id); // [FS communication UI] } make_ui_sound("UISndStartIM"); @@ -361,15 +357,12 @@ void LLAvatarActions::startConference(const uuid_vec_t& ids, const LLUUID& float if (session_id == LLUUID::null) { - // [FS communication UI] - // return; CHUI merge LL new - //LLIMFloater::show(session_id); CHUI merge LL old - FSFloaterIM::show(session_id); // CHUI merge FS orig - // [FS communication UI] + return; } // [FS communication UI] //FSFloaterIMContainer::getInstance()->showConversation(session_id); + FSFloaterIM::show(session_id); // [FS communication UI] make_ui_sound("UISndStartIM"); diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp index 41dca4371f..0a35791b29 100755 --- a/indra/newview/llavatarlist.cpp +++ b/indra/newview/llavatarlist.cpp @@ -488,23 +488,23 @@ void LLAvatarList::refresh() { // *NOTE: If you change the UI to show a different string, // be sure to change the filter code below. - - // CHUI merge LL old begin v - //if (LLRecentPeople::instance().isAvalineCaller(buddy_id)) - //{ - // const LLSD& call_data = LLRecentPeople::instance().getData(buddy_id); - // addAvalineItem(buddy_id, call_data["session_id"].asUUID(), call_data["call_number"].asString()); - //} - //else - //{ - // CHUI merge new - addNewItem(buddy_id, - //display_name.empty() ? waiting_str : display_name, CHUI merge new - //av_name.mDisplayName.empty() ? waiting_str : av_name.mDisplayName, CHUI merge old - av_name.getCompleteName(), // FS orig - LLAvatarTracker::instance().isBuddyOnline(buddy_id)); + if (LLRecentPeople::instance().isAvalineCaller(buddy_id)) + { + const LLSD& call_data = LLRecentPeople::instance().getData(buddy_id); + addAvalineItem(buddy_id, call_data["session_id"].asUUID(), call_data["call_number"].asString()); + } + else + { + // Always show usernames on avatar lists + //std::string display_name = av_name.getDisplayName(); + //addNewItem(buddy_id, + // display_name.empty() ? waiting_str : display_name, + // LLAvatarTracker::instance().isBuddyOnline(buddy_id)); + addNewItem(buddy_id, + av_name.getCompleteName(), + LLAvatarTracker::instance().isBuddyOnline(buddy_id)); + // + } modified = true; nadded++; } @@ -529,9 +529,10 @@ void LLAvatarList::refresh() const LLUUID& buddy_id = it->asUUID(); LLAvatarName av_name; have_names &= LLAvatarNameCache::get(buddy_id, &av_name); - //if (!findInsensitive(av_name.mDisplayName, mNameFilter)) CHUI merge old - //if (!findInsensitive(av_name.getDisplayName(), mNameFilter)) CHUI merge new - if (!findInsensitive(av_name.getCompleteName(), mNameFilter)) // FS orig + // Always show usernames on avatar lists + //if (!findInsensitive(av_name.getDisplayName(), mNameFilter)) + if (!findInsensitive(av_name.getCompleteName(), mNameFilter)) + // { removeItemByUUID(buddy_id); modified = true; diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index 30e61c7285..ac3e3d1a38 100755 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -63,20 +63,12 @@ #include "llavataractions.h" #include "lggcontactsets.h" -// CHUI Merge varify if any of the below are still needed -// Remove floating chat bar -// #include "llnearbychat.h" // [FS communication UI] -//#include "llfloaternearbychat.h" -#include "fsfloaternearbychat.h" // CHUI Merge can we get rid if this? line 903 +#include "fsfloaterim.h" +#include "fsfloaternearbychat.h" // [FS communication UI] -// #include "llfloaterreg.h" #include "llnotificationmanager.h" -// [FS communication UI] -//#include "llimfloater.h" -#include "fsfloaterim.h" -// ///---------------------------------------------------------------------------- /// Local function declarations, constants, enums, and typedefs @@ -356,8 +348,8 @@ void LLAvatarTracker::setBuddyOnline(const LLUUID& id, bool is_online) } else { - // Fix possable log spam with a large friendslist when SL messes up. - //lldebugs << "!! No buddy info found for " << id + // Fix possible log spam with a large friendslist when SL messes up. + //llwarns << "!! No buddy info found for " << id lldebugs << "!! No buddy info found for " << id << ", setting to " << (is_online ? "Online" : "Offline") << llendl; // @@ -928,7 +920,6 @@ void LLAvatarTracker::formFriendship(const LLUUID& id) // FIRE-3248: Disable add friend button on IM floater if friendship request accepted LLUUID im_session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, id); // [FS communication UI] - //LLIMFloater* im_floater = LLIMFloater::findInstance(im_session_id); FSFloaterIM* im_floater = FSFloaterIM::findInstance(im_session_id); // [FS communication UI] if (im_floater) @@ -957,7 +948,6 @@ void LLAvatarTracker::processTerminateFriendship(LLMessageSystem* msg, void**) // FIRE-3248: Disable add friend button on IM floater if friendship request accepted LLUUID im_session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, id); // [FS communication UI] - //LLIMFloater* im_floater = LLIMFloater::findInstance(im_session_id); FSFloaterIM* im_floater = FSFloaterIM::findInstance(im_session_id); // [FS communication UI] if (im_floater) diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 960995205e..a426e9dec6 100755 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -362,8 +362,7 @@ bool LLIMChiclet::getShowNewMessagesIcon() void LLIMChiclet::onMouseDown() { // [FS communication UI] - //LLFloaterIMSession::toggle(getSessionId()); CHUI merge new - //LLIMFloater::toggle(getSessionId()); CHUI Merge old + //LLFloaterIMSession::toggle(getSessionId()); FSFloaterIM::toggle(getSessionId()); // [FS communication UI] } @@ -517,8 +516,7 @@ void LLChicletPanel::onCurrentVoiceChannelChanged(const LLUUID& session_id) if (gSavedSettings.getBOOL("OpenIMOnVoice")) { // [FS communication UI] - //LLFloaterIMContainer::getInstance()->showConversation(session_id); CHUI Merge new - //LLIMFloater::show(chiclet->getSessionId()); CHUI Merge old + //LLFloaterIMContainer::getInstance()->showConversation(session_id); FSFloaterIM::show(chiclet->getSessionId()); // [FS communication UI] } @@ -998,8 +996,7 @@ bool LLChicletPanel::isAnyIMFloaterDoked() != mChicletList.end(); it++) { // [FS communication UI] - //LLFloaterIMSession* im_floater = LLFloaterReg::findTypedInstance( CHUI Merge new - //LLIMFloater* im_floater = LLFloaterReg::findTypedInstance( CHUI Merge old + //LLFloaterIMSession* im_floater = LLFloaterReg::findTypedInstance( // "impanel", (*it)->getSessionId()); FSFloaterIM* im_floater = LLFloaterReg::findTypedInstance( "fs_impanel", (*it)->getSessionId()); diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp index 2ea50d0dbf..78c19e7b3b 100755 --- a/indra/newview/llchicletbar.cpp +++ b/indra/newview/llchicletbar.cpp @@ -29,10 +29,6 @@ #include "llchiclet.h" #include "lllayoutstack.h" -// [FS communication UI] -//#include "llimfloater.h" // for LLIMFloater CHUI Merge LL removed this line -#include "fsfloaterim.h" -// [FS communication UI] #include "llpaneltopinfobar.h" #include "llsyswellwindow.h" diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp index b18381ceec..eef3e6686d 100755 --- a/indra/newview/llfirstuse.cpp +++ b/indra/newview/llfirstuse.cpp @@ -73,15 +73,11 @@ void LLFirstUse::resetFirstUse() // static void LLFirstUse::otherAvatarChatFirst(bool enable) -{ // CHUI Merge check - // Remove floating chat bar - //CHUI: firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "nearby_chat").with("direction", "top_right").with("distance", 24)); - //FUI: firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "chat_bar").with("direction", "top_right").with("distance", 24)); +{ // [FS communication UI] - firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "nearby_chat").with("direction", "top_right").with("distance", 24)); // CHUI Merge lets try the CHUI line - //firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "fs_nearby_chat").with("direction", "top_right").with("distance", 24)); + //firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "nearby_chat").with("direction", "top_right").with("distance", 24)); + firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "fs_nearby_chat").with("direction", "top_right").with("distance", 24)); // [FS communication UI] - // } // static diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp index 1e60ff71c2..da105d14ca 100755 --- a/indra/newview/llfloaterconversationpreview.cpp +++ b/indra/newview/llfloaterconversationpreview.cpp @@ -29,10 +29,10 @@ #include "llfloaterconversationpreview.h" #include "llimview.h" #include "lllineeditor.h" -// +// [FS communication UI] //#include "llfloaterimnearbychat.h" #include "fsfloaternearbychat.h" -// +// [FS communication UI] #include "llspinctrl.h" #include "lltrans.h" #include "llviewercontrol.h" // @@ -53,10 +53,10 @@ LLFloaterConversationPreview::LLFloaterConversationPreview(const LLSD& session_i BOOL LLFloaterConversationPreview::postBuild() { - // + // [FS communication UI] //mChatHistory = getChild("chat_history"); mChatHistory = getChild("chat_history"); - // + // [FS communication UI] const LLConversation* conv = LLConversationLog::instance().getConversation(mSessionID); std::string name; @@ -167,10 +167,10 @@ void LLFloaterConversationPreview::showHistory() } else if (from_id.isNull()) { - // [Firestorm Communications UI ] + // [FS communication UI] //chat.mSourceType = LLFloaterIMNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT; chat.mSourceType = FSFloaterNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT; - // + // [FS communication UI] } LLSD chat_args; diff --git a/indra/newview/llfloaterconversationpreview.h b/indra/newview/llfloaterconversationpreview.h index a4cc29b177..8650348466 100755 --- a/indra/newview/llfloaterconversationpreview.h +++ b/indra/newview/llfloaterconversationpreview.h @@ -26,10 +26,10 @@ #ifndef LLFLOATERCONVERSATIONPREVIEW_H_ #define LLFLOATERCONVERSATIONPREVIEW_H_ -// +// [FS communication UI] //#include "llchathistory.h" #include "fschathistory.h" -// +// [FS communication UI] #include "llfloater.h" extern const std::string LL_FCP_COMPLETE_NAME; //"complete_name" @@ -54,10 +54,10 @@ private: void showHistory(); LLSpinCtrl* mPageSpinner; - // + // [FS communication UI] //LLChatHistory* mChatHistory; FSChatHistory* mChatHistory; - // + // [FS communication UI] LLUUID mSessionID; int mCurrentPage; int mPageSize; diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index a5a903d712..c10531024e 100755 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -40,24 +40,19 @@ #include "llimview.h" // for gIMMgr #include "llnotificationsutil.h" #include "llstatusbar.h" // can_afford_transaction() -// [FS communication UI] -//#include "llimfloater.h" CHU merge LL removed this -#include "fsfloaterim.h" -// [FS communication UI] #include "groupchatlistener.h" -// [RLVa:KB] - Checked: 2011-03-28 (RLVa-1.3.0) + +// Firestorm includes +#include "exogroupmutelist.h" +#include "fscontactsfloater.h" +#include "fsdata.h" +#include "fsfloatergroup.h" +#include "fsfloaterim.h" +#include "llpanelgroup.h" #include "llslurl.h" #include "rlvactions.h" #include "rlvcommon.h" #include "rlvhandler.h" -// [/RLVa:KB] -#include "exogroupmutelist.h" -// Standalone group floater -#include "fsfloatergroup.h" -#include "llpanelgroup.h" -// -#include "fscontactsfloater.h" -#include "fsdata.h" // // Globals @@ -499,8 +494,7 @@ LLUUID LLGroupActions::startIM(const LLUUID& group_id) if (session_id != LLUUID::null) { // [FS communication UI] - //LLFloaterIMContainer::getInstance()->showConversation(session_id); CHUI Merge LL new - //LLIMFloater::show(session_id); CHUI Merge LL old + //LLFloaterIMContainer::getInstance()->showConversation(session_id); FSFloaterIM::show(session_id); // [FS communication UI] } diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 451b90ebb6..8def4272a4 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -51,8 +51,8 @@ #include "llcallingcard.h" #include "llchat.h" // [FS communication UI] -//#include "llfloaterimsession.h" CHUI Merge new -//#include "llfloaterimcontainer.h" CHUI Merge new +//#include "llfloaterimsession.h" +//#include "llfloaterimcontainer.h" #include "fsfloaterim.h" // [FS communication UI] #include "llgroupiconctrl.h" @@ -145,14 +145,14 @@ void process_dnd_im(const LLSD& notification) false, false); //will need slight refactor to retrieve whether offline message or not (assume online for now) - // [CHUI Merge] Do we need this? + // [FS communication UI] //LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance("im_container"); // //if (im_box) //{ // im_box->flashConversationItemWidget(sessionID, true); //} - // [CHUI Merge] + // [FS communication UI] } } @@ -908,7 +908,6 @@ void LLIMModel::LLIMSession::buildHistoryFileName() // LLAvatarName av_name; // // For outgoing sessions we already have a cached name // // so no need for a callback in LLAvatarNameCache::get() -// CHUI Merge below is new if statement from LL // if (LLAvatarNameCache::get(mOtherParticipantID, &av_name)) // { // mHistoryFileName = LLCacheName::buildUsername(av_name.getUserName()); @@ -917,26 +916,6 @@ void LLIMModel::LLIMSession::buildHistoryFileName() // { // // Incoming P2P sessions include a name that we can use to build a history file name // mHistoryFileName = LLCacheName::buildUsername(mName); -// } -// } -//} -// CHUI Merge below is the old if statement from LL -// if (LLAvatarNameCache::get(mOtherParticipantID, &av_name)) -// { -// if (av_name.mUsername.empty()) -// { -// // Display names are off, use mDisplayName which will be the legacy name -// mHistoryFileName = LLCacheName::buildUsername(av_name.getDisplayName()); -// } -// else -// { -// mHistoryFileName = av_name.mUsername; -// } -// } -// else -// { -// // Incoming P2P sessions include a name that we can use to build a history file name -// mHistoryFileName = LLCacheName::buildUsername(mName); // } } else @@ -2934,6 +2913,7 @@ void LLIMMgr::addMessage( // Configurable IM sounds static LLCachedControl PlayModeUISndNewIncomingIMSession(gSavedSettings, "PlayModeUISndNewIncomingIMSession"); static LLCachedControl PlayModeUISndNewIncomingGroupIMSession(gSavedSettings, "PlayModeUISndNewIncomingGroupIMSession"); + BOOL do_not_disturb = gAgent.isDoNotDisturb(); // Configurable IM sounds bool new_session = !hasSession(new_session_id); @@ -3001,29 +2981,28 @@ void LLIMMgr::addMessage( } // Configurable IM sounds - if(PlayModeUISndNewIncomingIMSession != 0 && dialog == IM_NOTHING_SPECIAL) + // //Play sound for new conversations + // if (!gAgent.isDoNotDisturb() && (gSavedSettings.getBOOL("PlaySoundNewConversation") == TRUE)) + if(!do_not_disturb && PlayModeUISndNewIncomingIMSession != 0 && dialog == IM_NOTHING_SPECIAL) { - //Play sound for new conversations - if (!gAgent.isDoNotDisturb() && (gSavedSettings.getBOOL("PlaySoundNewConversation") == TRUE)) - { make_ui_sound("UISndNewIncomingIMSession"); } - else if(PlayModeUISndNewIncomingGroupIMSession != 0 && dialog != IM_NOTHING_SPECIAL) + else if(!do_not_disturb && PlayModeUISndNewIncomingGroupIMSession != 0 && dialog != IM_NOTHING_SPECIAL) { make_ui_sound("UISndNewIncomingGroupIMSession"); } } - else if(PlayModeUISndNewIncomingIMSession == 2 && dialog == IM_NOTHING_SPECIAL) + else if(!do_not_disturb && PlayModeUISndNewIncomingIMSession == 2 && dialog == IM_NOTHING_SPECIAL) { make_ui_sound("UISndNewIncomingIMSession"); } - else if(PlayModeUISndNewIncomingGroupIMSession == 2 && dialog != IM_NOTHING_SPECIAL) + else if(!do_not_disturb && PlayModeUISndNewIncomingGroupIMSession == 2 && dialog != IM_NOTHING_SPECIAL) { make_ui_sound("UISndNewIncomingGroupIMSession"); // } // IM Sounds only for sessions not in focus - else if(PlayModeUISndNewIncomingIMSession == 3 && dialog == IM_NOTHING_SPECIAL) + else if(!do_not_disturb && PlayModeUISndNewIncomingIMSession == 3 && dialog == IM_NOTHING_SPECIAL) { // [FS communication UI] //LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); @@ -3034,7 +3013,7 @@ void LLIMMgr::addMessage( make_ui_sound("UISndNewIncomingIMSession"); } } - else if(PlayModeUISndNewIncomingGroupIMSession == 3 && dialog != IM_NOTHING_SPECIAL) + else if(!do_not_disturb && PlayModeUISndNewIncomingGroupIMSession == 3 && dialog != IM_NOTHING_SPECIAL) { // [FS communication UI] //LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); @@ -3045,7 +3024,6 @@ void LLIMMgr::addMessage( make_ui_sound("UISndNewIncomingGroupIMSession"); } } - } // bool skip_message = false; @@ -3065,14 +3043,14 @@ void LLIMMgr::addMessage( } // Open conversation floater if offline messages are present - // [CHUI Merge] + // [FS communication UI] //if (is_offline_msg) // { // LLFloaterReg::showInstance("im_container"); // LLFloaterReg::getTypedInstance("im_container")-> // flashConversationItemWidget(new_session_id, true); // } - // [CHUI Merge] + // [FS communication UI] } void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 94fae4809b..9c78a11b5b 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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 100755 --- 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/llsaveoutfitcombobtn.cpp b/indra/newview/llsaveoutfitcombobtn.cpp index 1c250d0a8a..32295cd96f 100755 --- a/indra/newview/llsaveoutfitcombobtn.cpp +++ b/indra/newview/llsaveoutfitcombobtn.cpp @@ -31,8 +31,6 @@ #include "llsidepanelappearance.h" #include "llsaveoutfitcombobtn.h" #include "llviewermenu.h" -#include "llagent.h" -#include "llviewerregion.h" static const std::string SAVE_BTN("save_btn"); static const std::string SAVE_FLYOUT_BTN("save_flyout_btn"); @@ -80,10 +78,6 @@ void LLSaveOutfitComboBtn::saveOutfit(bool as_new) panel_outfits_inventory->onSave(); } - if ( gAgent.getRegion() && gAgent.getRegion()->getCentralBakeVersion()) - { - LLAppearanceMgr::instance().requestServerAppearanceUpdate(); - } //*TODO how to get to know when base outfit is updated or new outfit is created? } diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 2098e8568b..a2349d4b02 100755 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -232,11 +232,6 @@ void LLSidepanelAppearance::updateToVisibility(const LLSD &new_visibility) gAgentCamera.changeCameraToDefault(); gAgentCamera.resetView(); } - - if ( mEditWearable->getVisible() ) - { - mEditWearable->revertChanges(); - } } } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 4c578b235f..68f9d0f25a 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -194,10 +194,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" @@ -2616,7 +2612,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 100755 --- 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 100755 --- 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 100755 --- 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/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 699a2f98f5..843bbb9ea2 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2769,35 +2769,36 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // if there is not a panel for this conversation (i.e. it is a new IM conversation // initiated by the other party) then... - send_do_not_disturb_message(msg, from_id, session_id); - // CHUI Merge LL changed this - //std::string response; - //LLAgentUI::buildFullname(my_name); - //if (is_busy) - //{ - // response = gSavedPerAccountSettings.getString("BusyModeResponse"); - //} - //else if (is_autorespond_nonfriends && !is_friend) - //{ - // response = gSavedPerAccountSettings.getString("FSAutorespondNonFriendsResponse"); - //} - //else if (is_autorespond) - //{ - // response = gSavedPerAccountSettings.getString("FSAutorespondModeResponse"); - //} - //pack_instant_message( CHUI Merge LL removed this and below, comented out above to be looked at later - // gMessageSystem, - // gAgent.getID(), - // FALSE, - // gAgent.getSessionID(), - // from_id, - // my_name, - // response, - // IM_ONLINE, - // IM_BUSY_AUTO_RESPONSE, - // session_id); - //gAgent.sendReliableMessage(); - // CHUI Merge End + // FS autoresponse feature + //send_do_not_disturb_message(msg, from_id, session_id); + std::string my_name; + std::string response; + LLAgentUI::buildFullname(my_name); + if (is_do_not_disturb) + { + response = gSavedPerAccountSettings.getString("DoNotDisturbModeResponse"); + } + else if (is_autorespond_nonfriends && !is_friend) + { + response = gSavedPerAccountSettings.getString("FSAutorespondNonFriendsResponse"); + } + else if (is_autorespond) + { + response = gSavedPerAccountSettings.getString("FSAutorespondModeResponse"); + } + pack_instant_message( + gMessageSystem, + gAgent.getID(), + FALSE, + gAgent.getSessionID(), + from_id, + my_name, + response, + IM_ONLINE, + IM_DO_NOT_DISTURB_AUTO_RESPONSE, + session_id); + gAgent.sendReliableMessage(); + // FS autoresponse feature } // checkfor and process reqinfo @@ -4571,7 +4572,7 @@ void process_teleport_start(LLMessageSystem *msg, void**) { gTeleportDisplay = TRUE; gAgent.setTeleportState( LLAgent::TELEPORT_START ); - make_ui_sound("UISndTeleportOut"); //AO + make_ui_sound("UISndTeleportOut"); LL_INFOS("Messaging") << "Teleport initiated by remote TeleportStart message with TeleportFlags: " << teleport_flags << LL_ENDL; diff --git a/indra/newview/llviewerthrottle.cpp b/indra/newview/llviewerthrottle.cpp index 4fdd65abfd..5147272122 100755 --- 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 52cfe5db56..5535df11ee 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2023,22 +2023,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")) @@ -2447,18 +2433,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) @@ -5454,12 +5436,22 @@ S32 LLViewerWindow::getChatConsoleBottomPad() if(gToolBarView) { - // FS:Ansariel This gets called every frame, so don't call getChild/findChild every time! - offset += gToolBarView->getBottomToolbar()->getRect().getHeight(); - LLView* chat_stack = gToolBarView->getBottomChatStack(); - if (chat_stack) + // Tie console to legacy snap edge when possible + static LLUICachedControl legacy_snap ("FSLegacyEdgeSnap", false); + if (legacy_snap) { - offset = chat_stack->getRect().getHeight(); + LLRect snap_rect = gFloaterView->getSnapRect(); + offset = snap_rect.mBottom; + }// Tie console to legacy snap edge when possible + else + { + // FS:Ansariel This gets called every frame, so don't call getChild/findChild every time! + offset += gToolBarView->getBottomToolbar()->getRect().getHeight(); + LLView* chat_stack = gToolBarView->getBottomChatStack(); + if (chat_stack) + { + offset = chat_stack->getRect().getHeight(); + } } } // @@ -5482,9 +5474,6 @@ LLRect LLViewerWindow::getChatConsoleRect() console_rect.mLeft += CONSOLE_PADDING_LEFT; // This also works without relog! - //static const BOOL CHAT_FULL_WIDTH = gSavedSettings.getBOOL("ChatFullWidth"); - - //if (CHAT_FULL_WIDTH) static LLCachedControl chatFullWidth(gSavedSettings, "ChatFullWidth"); if (chatFullWidth) // @@ -5507,18 +5496,36 @@ LLRect LLViewerWindow::getChatConsoleRect() // Push the chat console out of the way of the vertical toolbars if (gToolBarView) { - LLToolBar* toolbar_left = gToolBarView->getToolBar(LLToolBarView::TOOLBAR_LEFT); - if (toolbar_left && toolbar_left->hasButtons()) + // Tie console to legacy snap edge when possible + static LLUICachedControl legacy_snap ("FSLegacyEdgeSnap", false); + if (legacy_snap) { - console_rect.mLeft += toolbar_left->getRect().getWidth(); - } + LLRect snap_rect = gFloaterView->getSnapRect(); + if (console_rect.mRight > snap_rect.mRight) + { + console_rect.mRight = snap_rect.mRight; + } - LLToolBar* toolbar_right = gToolBarView->getToolBar(LLToolBarView::TOOLBAR_RIGHT); - LLRect toolbar_right_screen_rect; - toolbar_right->localRectToScreen(toolbar_right->getRect(), &toolbar_right_screen_rect); - if (toolbar_right && toolbar_right->hasButtons() && console_rect.mRight >= toolbar_right_screen_rect.mLeft) + if (console_rect.mLeft < snap_rect.mLeft) + { + console_rect.mLeft = snap_rect.mLeft; + } + }// Tie console to legacy snap edge when possible + else { - console_rect.mRight -= toolbar_right->getRect().getWidth(); + LLToolBar* toolbar_left = gToolBarView->getToolBar(LLToolBarView::TOOLBAR_LEFT); + if (toolbar_left && toolbar_left->hasButtons()) + { + console_rect.mLeft += toolbar_left->getRect().getWidth(); + } + + LLToolBar* toolbar_right = gToolBarView->getToolBar(LLToolBarView::TOOLBAR_RIGHT); + LLRect toolbar_right_screen_rect; + toolbar_right->localRectToScreen(toolbar_right->getRect(), &toolbar_right_screen_rect); + if (toolbar_right && toolbar_right->hasButtons() && console_rect.mRight >= toolbar_right_screen_rect.mLeft) + { + console_rect.mRight -= toolbar_right->getRect().getWidth(); + } } } // @@ -5548,13 +5555,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); } diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 6c31f0391c..3d3733d457 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2942,13 +2942,12 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) if (mClientTagData.has("name") && !mClientTagData["name"].asString().empty()) { - addNameTagLine(av_name.getDisplayName()+" (" + mClientTagData["name"].asString() + ")",name_tag_color,LLFontGL::NORMAL, LLFontGL::getFontSansSerif()); + addNameTagLine(av_name.getDisplayName()+" (" + mClientTagData["name"].asString() + ")",name_tag_color,LLFontGL::NORMAL, LLFontGL::getFontSansSerif(), (!av_name.getDisplayName().empty()) ); } else { - addNameTagLine(av_name.getDisplayName(), name_tag_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerif()); + addNameTagLine(av_name.getDisplayName(), name_tag_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerif(), true); } - } // Suppress SLID display if display name matches exactly (ugh) @@ -2958,9 +2957,13 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) // FIRE-1061 LLColor4 username_color; if (colorize_username) + { username_color = LLUIColorTable::instance().getColor("NameTagUsername", LLColor4::white); + } else + { username_color = name_tag_color * 0.83f; + } // // Show user name as legacy name if selected -- TS @@ -2969,14 +2972,13 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) { username = LLCacheName::buildFullName( firstname->getString(), lastname->getString() ); } - addNameTagLine(username, username_color, LLFontGL::NORMAL, - LLFontGL::getFontSansSerifSmall()); + addNameTagLine(username, username_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerifSmall()); } // [RLVa:KB] - Checked: 2010-10-31 (RLVa-1.2.2a) | Modified: RLVa-1.2.2a } else { - addNameTagLine(RlvStrings::getAnonym(av_name), name_tag_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerif()); + addNameTagLine(RlvStrings::getAnonym(av_name), name_tag_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerif(), (!av_name.getDisplayName().empty()) ); } // [/RLVa:KB] } @@ -2988,7 +2990,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) if ( (fRlvShowNames) && (!isSelf()) ) { full_name = RlvStrings::getAnonym(full_name); - addNameTagLine(full_name, name_tag_color, LLFontGL::NORMAL, font); + addNameTagLine(full_name, name_tag_color, LLFontGL::NORMAL, font, true); } // [/RLVa:KB] else // Only check for client tags when not RLV anon -AO @@ -2996,11 +2998,11 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) if (mClientTagData.has("name") && !mClientTagData["name"].asString().empty()) { lldebugs << "ClientTag is set! mClientTag=" << mClientTagData["name"].asString() << llendl; - addNameTagLine(full_name+" (" + mClientTagData["name"].asString() + ")",name_tag_color,LLFontGL::NORMAL, LLFontGL::getFontSansSerif()); + addNameTagLine(full_name+" (" + mClientTagData["name"].asString() + ")",name_tag_color,LLFontGL::NORMAL, LLFontGL::getFontSansSerif(), true); } else { - addNameTagLine(full_name, name_tag_color, LLFontGL::NORMAL, font); + addNameTagLine(full_name, name_tag_color, LLFontGL::NORMAL, font, true); } } } @@ -3118,7 +3120,10 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name) } } -void LLVOAvatar::addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font) +// Fix nametag not properly updating when display name arrives +//void LLVOAvatar::addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font) +void LLVOAvatar::addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font, bool is_name /* = false */) +// { llassert(mNameText); if (mVisibleChat || mVisibleTyping) @@ -3129,7 +3134,13 @@ void LLVOAvatar::addNameTagLine(const std::string& line, const LLColor4& color, { mNameText->addLine(line, color, (LLFontGL::StyleFlags)style, font); } - mNameIsSet |= !line.empty(); + // Fix nametag not properly updating when display name arrives + //mNameIsSet |= !line.empty(); + if (is_name) + { + mNameIsSet |= !line.empty(); + } + // } void LLVOAvatar::clearNameTag() @@ -4725,7 +4736,7 @@ void LLVOAvatar::updateTextures() const EBakedTextureIndex baked_index = texture_dict->mBakedTextureIndex; if (texture_dict->mIsLocalTexture) { - addLocalTextureStats((ETextureIndex)texture_index, imagep, texel_area_ratio, render_avatar, layer_baked[baked_index]); + addLocalTextureStats((ETextureIndex)texture_index, imagep, texel_area_ratio, render_avatar, mBakedTextureDatas[baked_index].mIsUsed); } } } @@ -4832,7 +4843,6 @@ void LLVOAvatar::addBakedTextureStats( LLViewerFetchedTexture* imagep, F32 pixel //the texture pipeline will stop fetching this texture. imagep->resetTextureStats(); - // This we never want to do for OpenSim. Keep as true when LL changes this. imagep->setMaxVirtualSizeResetInterval(MAX_TEXTURE_VIRTURE_SIZE_RESET_INTERVAL); imagep->resetMaxVirtualSizeResetCounter() ; diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index d6123c9fd0..7f30bbed86 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -258,7 +258,10 @@ public: static void invalidateNameTag(const LLUUID& agent_id); // force all name tags to rebuild, useful when display names turned on/off static void invalidateNameTags(); - void addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font); + // Fix nametag not properly updating when display name arrives + //void addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font); + void addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font, bool is_name = false); + // void idleUpdateRenderCost(); void idleUpdateBelowWater(); diff --git a/indra/newview/skins/Latency/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/Latency/xui/en/panel_profile_secondlife.xml index 4e6a05ed10..64e8c62df0 100644 --- a/indra/newview/skins/Latency/xui/en/panel_profile_secondlife.xml +++ b/indra/newview/skins/Latency/xui/en/panel_profile_secondlife.xml @@ -319,19 +319,6 @@ KC: Use view_border's around text_editor's due to text render issues with border name="partner_text" max_length="254" /> - - - - +