diff --git a/indra/newview/floatermedialists.cpp b/indra/newview/floatermedialists.cpp index 903a325fbf..8730e30283 100644 --- a/indra/newview/floatermedialists.cpp +++ b/indra/newview/floatermedialists.cpp @@ -47,23 +47,21 @@ BOOL FloaterMediaLists::postBuild() childSetAction("remove_whitelist", boost::bind(&FloaterMediaLists::onWhitelistRemove, this)); childSetAction("add_blacklist", boost::bind(&FloaterMediaLists::onBlacklistAdd, this)); childSetAction("remove_blacklist", boost::bind(&FloaterMediaLists::onBlacklistRemove, this)); - - if (!mWhitelistSLC || !mBlacklistSLC) - { - return TRUE; - } - for(S32 i = 0;i<(S32)LLViewerParcelMedia::sMediaFilterList.size();i++) + for (LLSD::array_iterator p_itr = LLViewerParcelMedia::sMediaFilterList.beginArray(); + p_itr != LLViewerParcelMedia::sMediaFilterList.endArray(); + ++p_itr) { + LLSD itr = (*p_itr); LLSD element; element["columns"][0]["column"] = "list"; - element["columns"][0]["value"] = LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString(); - if (LLViewerParcelMedia::sMediaFilterList[i]["action"].asString() == "allow") + element["columns"][0]["value"] = itr["domain"].asString(); + if (itr["action"].asString() == "allow") { mWhitelistSLC->addElement(element); mWhitelistSLC->sortByColumn("list", TRUE); } - else if (LLViewerParcelMedia::sMediaFilterList[i]["action"].asString() == "deny") + else if (itr["action"].asString() == "deny") { mBlacklistSLC->addElement(element); mBlacklistSLC->sortByColumn("list", TRUE); diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index bb7fa1c16d..d0c383dce6 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -60,6 +60,9 @@ #include #include +#if OPENSIM +#include "llviewernetwork.h" +#endif const std::string FS_BRIDGE_FOLDER = "#LSL Bridge"; const std::string FS_BRIDGE_CONTAINER_FOLDER = "Landscaping"; @@ -111,7 +114,7 @@ FSLSLBridge::~FSLSLBridge() { } -bool FSLSLBridge::lslToViewer(std::string message, LLUUID fromID, LLUUID ownerID) +bool FSLSLBridge::lslToViewer(const std::string& message, const LLUUID& fromID, const LLUUID& ownerID) { if (!gSavedSettings.getBOOL("UseLSLBridge")) { @@ -275,9 +278,15 @@ bool FSLSLBridge::lslToViewer(std::string message, LLUUID fromID, LLUUID ownerID return status; } -bool FSLSLBridge::viewerToLSL(std::string message, FSLSLBridgeRequestResponder* responder) +bool FSLSLBridge::canUseBridge() { - if (!gSavedSettings.getBOOL("UseLSLBridge")) + static LLCachedControl sUseLSLBridge(gSavedSettings, "UseLSLBridge"); + return (isBridgeValid() && sUseLSLBridge); +} + +bool FSLSLBridge::viewerToLSL(const std::string& message, FSLSLBridgeRequestResponder* responder) +{ + if (!canUseBridge()) { return false; } @@ -291,7 +300,7 @@ bool FSLSLBridge::viewerToLSL(std::string message, FSLSLBridgeRequestResponder* return true; } -bool FSLSLBridge::updateBoolSettingValue(std::string msgVal) +bool FSLSLBridge::updateBoolSettingValue(const std::string& msgVal) { std::string boolVal = "0"; @@ -303,7 +312,7 @@ bool FSLSLBridge::updateBoolSettingValue(std::string msgVal) return viewerToLSL(msgVal + "|" + boolVal, new FSLSLBridgeRequestResponder()); } -bool FSLSLBridge::updateBoolSettingValue(std::string msgVal, bool contentVal) +bool FSLSLBridge::updateBoolSettingValue(const std::string& msgVal, bool contentVal) { std::string boolVal = "0"; @@ -356,7 +365,7 @@ void FSLSLBridge::recreateBridge() } } // clear the stored bridge ID - we are starting over. - mpBridge = 0; //the object itself will get cleaned up when new one is created. + mpBridge = NULL; //the object itself will get cleaned up when new one is created. initCreationStep(); } @@ -438,6 +447,11 @@ void FSLSLBridge::startCreation() void FSLSLBridge::initCreationStep() { +// Don't create on OpenSim. We need to fallback to another creation process there, unfortunately. +// There is no way to ensure a rock object will ever be in a grid's Library. +#if OPENSIM + if (LLGridManager::getInstance()->isInOpenSim()) return; +#endif mBridgeCreating = true; //announce yourself reportToNearbyChat(LLTrans::getString("fsbridge_creating")); @@ -715,7 +729,7 @@ void FSLSLBridge::setupBridgePrim(LLViewerObject* object) object->setVolume(LLVolumeParams(profParams, pathParams), 0); object->setScale(LLVector3(10.0f, 10.0f, 10.0f), TRUE); - for (int i = 0; i < object->getNumTEs(); i++) + for (S32 i = 0; i < object->getNumTEs(); i++) { LLViewerTexture* image = LLViewerTextureManager::getFetchedTexture( IMG_INVISIBLE ); object->setTEImage(i, image); //transparent texture @@ -904,8 +918,8 @@ void FSLSLBridgeScriptCallback::fire(const LLUUID& inv_item) std::string FSLSLBridgeScriptCallback::prepUploadFile() { - std::string fName = gDirUtilp->getExpandedFilename(LL_PATH_FS_RESOURCES, UPLOAD_SCRIPT_CURRENT); - std::string fNew = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,UPLOAD_SCRIPT_CURRENT); + const std::string fName = gDirUtilp->getExpandedFilename(LL_PATH_FS_RESOURCES, UPLOAD_SCRIPT_CURRENT); + const std::string fNew = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,UPLOAD_SCRIPT_CURRENT); LLFILE* fpIn = LLFile::fopen(fName, "rt"); if (!fpIn) @@ -928,7 +942,7 @@ std::string FSLSLBridgeScriptCallback::prepUploadFile() std::string bridgeScript( (char const*)&vctData[0] ); - std::string bridgekey = "BRIDGEKEY"; + const std::string bridgekey = "BRIDGEKEY"; bridgeScript.replace(bridgeScript.find(bridgekey), bridgekey.length(), FSLSLBridge::getInstance()->findFSCategory().asString()); LLFILE *fpOut = LLFile::fopen(fNew, "wt"); @@ -947,9 +961,9 @@ std::string FSLSLBridgeScriptCallback::prepUploadFile() return fNew; } -void FSLSLBridge :: checkBridgeScriptName(std::string fileName) +void FSLSLBridge::checkBridgeScriptName(const std::string& fileName) { - if ((fileName.length() == 0) || !mBridgeCreating) + if ((fileName.empty()) || !mBridgeCreating) { LL_WARNS("FSLSLBridge") << "Bridge script length was zero, or bridge was not marked as under creation. Aborting." << LL_ENDL; return; @@ -963,7 +977,7 @@ void FSLSLBridge :: checkBridgeScriptName(std::string fileName) } //need to parse out the last length of a GUID and compare to saved possible names. - std::string fileOnly = fileName.substr(fileName.length() - UPLOAD_SCRIPT_CURRENT.length(), UPLOAD_SCRIPT_CURRENT.length()); + const std::string fileOnly = fileName.substr(fileName.length() - UPLOAD_SCRIPT_CURRENT.length(), UPLOAD_SCRIPT_CURRENT.length()); if (fileOnly == UPLOAD_SCRIPT_CURRENT) { @@ -1022,7 +1036,7 @@ void FSLSLBridge::finishBridge() // // Helper functions /// -bool FSLSLBridge::isItemAttached(LLUUID iID) +bool FSLSLBridge::isItemAttached(const LLUUID& iID) { return (isAgentAvatarValid() && gAgentAvatarp->isWearingAttachment(iID)); } @@ -1122,7 +1136,7 @@ LLUUID FSLSLBridge::findFSBridgeContainerCategory() return LLUUID(); } -LLViewerInventoryItem* FSLSLBridge::findInvObject(std::string obj_name, LLUUID catID, LLAssetType::EType type) +LLViewerInventoryItem* FSLSLBridge::findInvObject(const std::string& obj_name, const LLUUID& catID, LLAssetType::EType type) { LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; @@ -1151,7 +1165,7 @@ LLViewerInventoryItem* FSLSLBridge::findInvObject(std::string obj_name, LLUUID c return NULL; } -void FSLSLBridge::cleanUpBridgeFolder(std::string nameToCleanUp) +void FSLSLBridge::cleanUpBridgeFolder(const std::string& nameToCleanUp) { LL_INFOS("FSLSLBridge") << "Cleaning leftover scripts and bridges for folder " << nameToCleanUp << LL_ENDL; diff --git a/indra/newview/fslslbridge.h b/indra/newview/fslslbridge.h index ad6829fa91..8779ce7818 100644 --- a/indra/newview/fslslbridge.h +++ b/indra/newview/fslslbridge.h @@ -58,11 +58,11 @@ public: FSLSLBridge(); ~FSLSLBridge(); - bool lslToViewer(std::string message, LLUUID fromID, LLUUID ownerID); - bool viewerToLSL(std::string message, FSLSLBridgeRequestResponder* responder = NULL); + bool lslToViewer(const std::string& message, const LLUUID& fromID, const LLUUID& ownerID); + bool viewerToLSL(const std::string& message, FSLSLBridgeRequestResponder* responder = NULL); - bool updateBoolSettingValue(std::string msgVal); - bool updateBoolSettingValue(std::string msgVal, bool contentVal); + bool updateBoolSettingValue(const std::string& msgVal); + bool updateBoolSettingValue(const std::string& msgVal, bool contentVal); void initBridge(); void recreateBridge(); @@ -74,9 +74,9 @@ public: void setBridge(LLViewerInventoryItem* item) { mpBridge = item; }; LLViewerInventoryItem* getBridge() { return mpBridge; }; - bool isBridgeValid() const { return NULL != mpBridge; } + bool canUseBridge(); - void checkBridgeScriptName(std::string fileName); + void checkBridgeScriptName(const std::string& fileName); std::string currentFullName() { return mCurrentFullName; } LLUUID getBridgeFolder() { return mBridgeFolderID; } @@ -100,18 +100,19 @@ private: LLUUID mBridgeUUID; bool mIsFirstCallDone; //initialization conversation + bool isBridgeValid() const { return NULL != mpBridge; } protected: - LLViewerInventoryItem* findInvObject(std::string obj_name, LLUUID catID, LLAssetType::EType type); + LLViewerInventoryItem* findInvObject(const std::string& obj_name, const LLUUID& catID, LLAssetType::EType type); LLUUID findFSCategory(); LLUUID findFSBridgeContainerCategory(); - bool isItemAttached(LLUUID iID); + bool isItemAttached(const LLUUID& iID); void createNewBridge(); void create_script_inner(LLViewerObject* object); bool isOldBridgeVersion(LLInventoryItem* item); void cleanUpBridgeFolder(); - void cleanUpBridgeFolder(std::string nameToCleanUp); + void cleanUpBridgeFolder(const std::string& nameToCleanUp); void setupBridgePrim(LLViewerObject* object); void initCreationStep(); void cleanUpBridge(); diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp index 4bc3c25991..774a913826 100644 --- a/indra/newview/fsradar.cpp +++ b/indra/newview/fsradar.cpp @@ -169,10 +169,10 @@ void FSRadar::updateRadarList() static LLCachedControl RadarLeaveChannelAlert(gSavedSettings, "RadarLeaveChannelAlert"); static LLCachedControl nearMeRange(gSavedSettings, "NearMeRange"); static LLCachedControl limitRange(gSavedSettings, "LimitRadarByRange"); - static LLCachedControl sUseLSLBridge(gSavedSettings, "UseLSLBridge"); static LLCachedControl RenderFarClip(gSavedSettings, "RenderFarClip"); static LLCachedControl sFSLegacyRadarFriendColoring(gSavedSettings, "FSLegacyRadarFriendColoring"); static LLCachedControl sRadarColorNamesByDistance(gSavedSettings, "FSRadarColorNamesByDistance", false); + bool sUseLSLBridge = FSLSLBridge::instance().canUseBridge(); F32 drawRadius(RenderFarClip); const LLVector3d& posSelf = gAgent.getPositionGlobal(); diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index e078d8dbe2..e80f1aa7c9 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4731,7 +4731,7 @@ void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global) sendReliableMessage(); } // Client LSL Bridge - if (gSavedSettings.getBOOL("UseLSLBridge") && isLocal) + if (FSLSLBridge::instance().canUseBridge() && isLocal) { teleportBridgeGlobal(pos_global); } @@ -4771,7 +4771,7 @@ void LLAgent::doTeleportViaLocationLookAt(const LLVector3d& pos_global) teleportRequest(region_handle, pos_local, getTeleportKeepsLookAt()); // Client LSL Bridge - if (gSavedSettings.getBOOL("UseLSLBridge")) + if (FSLSLBridge::instance().canUseBridge()) { if (region_handle == to_region_handle(getPositionGlobal())) { diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index cf6f409744..ed862939d0 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -1493,7 +1493,7 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id) gInventory.collectDescendentsIf(cat_id, cats, items, FALSE, collector); // Client LSL Bridge - if (gSavedSettings.getBOOL("UseLSLBridge")) + if (FSLSLBridge::instance().canUseBridge()) { //if replacing - make sure bridge stays. if (FSLSLBridge::instance().getBridge()) @@ -2034,7 +2034,7 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new, obj_items.insert(obj_items.end(), obj_items_new.begin(), obj_items_new.end()); // [/RLVa:KB] //-TT Client LSL Bridge - if (gSavedSettings.getBOOL("UseLSLBridge")) + if (FSLSLBridge::instance().canUseBridge()) { //if replacing - make sure bridge stays. if (!append && FSLSLBridge::instance().getBridge()) @@ -3893,6 +3893,12 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove) { continue; } + // LSL Bridge + if (FSLSLBridge::instance().canUseBridge() && linked_item == FSLSLBridge::instance().getBridge()) + { + continue; + } + // fUpdateAppearance = true; const LLUUID& linked_item_id = gInventory.getLinkedItemID(*it); diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index 154284eb6f..14433e5bad 100755 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -610,7 +610,7 @@ void LLUpdateAgentInventoryResponder::uploadComplete(const LLSD& content) } } // Client LSL Bridge - if (gSavedSettings.getBOOL("UseLSLBridge")) + if (FSLSLBridge::instance().canUseBridge()) { FSLSLBridge::instance().checkBridgeScriptName(mFileName); } diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 0137d50032..1a6a62c368 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -257,6 +257,20 @@ bool callback_clear_inventory_cache(const LLSD& notification, const LLSD& respon } // +// Clear inventory cache button +bool callback_clear_web_browser_cache(const LLSD& notification, const LLSD& response) +{ + S32 option = LLNotificationsUtil::getSelectedOption(notification, response); + if ( option == 0 ) // YES + { + LLViewerMedia::clearAllCaches(); + LLViewerMedia::clearAllCookies(); + } + + return false; +} +// + bool callback_clear_cache(const LLSD& notification, const LLSD& response) { S32 option = LLNotificationsUtil::getSelectedOption(notification, response); @@ -450,6 +464,9 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key) // Clear inventory cache button mCommitCallbackRegistrar.add("Pref.InvClearCache", boost::bind(&LLFloaterPreference::onClickInventoryClearCache, this)); // + // Clear web browser cache button + mCommitCallbackRegistrar.add("Pref.WebBrowserClearCache", boost::bind(&LLFloaterPreference::onClickWebBrowserClearCache, this)); + // mCommitCallbackRegistrar.add("Pref.SetCache", boost::bind(&LLFloaterPreference::onClickSetCache, this)); mCommitCallbackRegistrar.add("Pref.ResetCache", boost::bind(&LLFloaterPreference::onClickResetCache, this)); // mCommitCallbackRegistrar.add("Pref.ClickSkin", boost::bind(&LLFloaterPreference::onClickSkin, this,_1, _2)); @@ -1210,6 +1227,13 @@ void LLFloaterPreference::onClickInventoryClearCache() } // +// Clear web browser cache button +void LLFloaterPreference::onClickWebBrowserClearCache() +{ + LLNotificationsUtil::add("ConfirmClearWebBrowserCache", LLSD(), LLSD(), callback_clear_web_browser_cache); +} +// + // Called when user changes language via the combobox. void LLFloaterPreference::onLanguageChange() { @@ -2227,6 +2251,9 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im // Clear inventory cache button getChildView("ClearInventoryCache")->setEnabled(TRUE); + + // Clear web browser cache button + getChildView("ClearWebBrowserCache")->setEnabled(TRUE); } void LLFloaterPreference::refreshUI() @@ -2689,15 +2716,6 @@ BOOL LLPanelPreference::postBuild() } // -#ifdef OPENSIM // -// - if(LLGridManager::getInstance()->isInOpenSim() && !LLGridManager::getInstance()->isInAuroraSim() && hasChild("UseLSLBridge", TRUE)) - { - getChild("UseLSLBridge")->setEnabled(FALSE); - } -// -#endif // OPENSIM // - apply(); return true; } diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h index a9ab82d635..3c55ec11d1 100755 --- a/indra/newview/llfloaterpreference.h +++ b/indra/newview/llfloaterpreference.h @@ -204,6 +204,8 @@ public: //void callback_clear_settings(const LLSD& notification, const LLSD& response); // Clear inventory cache button void onClickInventoryClearCache(); + // Clear web browser cache button + void onClickWebBrowserClearCache(); void updateSliderText(LLSliderCtrl* ctrl, LLTextBox* text_box); void refreshUI(); diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 70cc2c143b..7ebd3502ad 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2579,15 +2579,6 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x, set_startup_status(1.0, "", ""); display_startup(); -// -#ifdef OPENSIM // - if (LLGridManager::getInstance()->isInOpenSim() && !LLGridManager::getInstance()->isInAuroraSim()) - { - gSavedSettings.setBOOL("UseLSLBridge", FALSE); - } -#endif // OPENSIM // -// - // Client LSL Bridge if (gSavedSettings.getBOOL("UseLSLBridge")) { diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 356fabc393..d3ed8fe9a9 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4295,12 +4295,7 @@ class FSSelfCheckMoveLock : public view_listener_t bool enable_bridge_function() { -#ifdef OPENSIM - if (LLGridManager::getInstance()->isInOpenSim() && !LLGridManager::getInstance()->isInAuroraSim()) - // No bridge on OpenSim yet. - return false; -#endif // OPENSIM - return (gSavedSettings.getBOOL("UseLSLBridge") && FSLSLBridge::instance().isBridgeValid()); + return FSLSLBridge::instance().canUseBridge(); } bool enable_move_lock() diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e63b341f04..276f5dd4bf 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4426,8 +4426,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) case CHAT_TYPE_OWNER: // Client LSL Bridge { - static LLCachedControl sUseLSLBridge(gSavedSettings, "UseLSLBridge"); - if (sUseLSLBridge && FSLSLBridge::instance().lslToViewer(mesg, from_id, owner_id)) + if (FSLSLBridge::instance().lslToViewer(mesg, from_id, owner_id)) { return; } @@ -8367,7 +8366,7 @@ void process_teleport_failed(LLMessageSystem *msg, void**) gAgent.stopTyping(); llinfos << "Teleport error, reason=" << reason << llendl; - if ((!gSavedSettings.getBOOL("UseLSLBridge")) || + if (!FSLSLBridge::instance().canUseBridge() || (reason != "Could not teleport closer to destination")) { LLNotificationsUtil::add("CouldNotTeleportReason", args); diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index da773f9274..570d13e17b 100755 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -1939,38 +1939,33 @@ void callback_MOAP_alert2(const LLSD ¬ification, const LLSD &response, LLMedi } } -bool LLViewerParcelMedia::saveDomainFilterList() +void LLViewerParcelMedia::saveDomainFilterList() { - std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "medialist.xml"); + const std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "medialist.xml"); - llofstream medialistFile(medialist_filename); - LLSDSerialize::toPrettyXML(sMediaFilterList, medialistFile); - medialistFile.close(); - return true; + llofstream medialist; + medialist.open(medialist_filename); + LLSDSerialize::toPrettyXML(sMediaFilterList, medialist); + medialist.close(); } -bool LLViewerParcelMedia::loadDomainFilterList() +void LLViewerParcelMedia::loadDomainFilterList() { - std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "medialist.xml"); + const std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "medialist.xml"); - if(!LLFile::isfile(medialist_filename)) - { - LLSD emptyllsd; - llofstream medialistFile(medialist_filename); - LLSDSerialize::toPrettyXML(emptyllsd, medialistFile); - medialistFile.close(); - } - - if(LLFile::isfile(medialist_filename)) + if (LLFile::isfile(medialist_filename)) { llifstream medialistFile(medialist_filename); LLSDSerialize::fromXML(sMediaFilterList, medialistFile); medialistFile.close(); - return true; } else { - return false; + LLSD emptyllsd; + llofstream medialist; + medialist.open(medialist_filename); + LLSDSerialize::toPrettyXML(emptyllsd, medialist); + medialist.close(); } } diff --git a/indra/newview/llviewerparcelmedia.h b/indra/newview/llviewerparcelmedia.h index f5f0087061..aa6eaec4f4 100755 --- a/indra/newview/llviewerparcelmedia.h +++ b/indra/newview/llviewerparcelmedia.h @@ -59,8 +59,8 @@ class LLViewerParcelMedia : public LLViewerMediaObserver // user has media filter enabled and play requested static std::string extractDomain(std::string url); // helper function to extract domain from url and conve - static bool loadDomainFilterList(); - static bool saveDomainFilterList(); + static void loadDomainFilterList(); + static void saveDomainFilterList(); static void stop(); // user clicked stop button in media transport controls diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 7b3591046e..d7839d3d32 100755 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -2293,6 +2293,10 @@ Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion a Möchten Sie Ihren Inventar-Cache wirklich leeren? + + Möchten Sie Ihren Webbrowser-Cache wirklich leeren? + + Sind Sie sicher, dass Sie Ihre Cookies löschen möchten? diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml index 64d1c3eaf1..eb48297a03 100755 --- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml @@ -69,6 +69,7 @@ + + - + diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index ec03520e04..56b8c6f7bb 100755 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -390,6 +390,9 @@ Czy na pewno chcesz kontynuować? Bufor danych zostanie przeniesiony po restarcie aplikacji [APP_NAME]. Pamiętaj: Opcja ta wyczyszcza bufor danych. + + Bufor dźwięków zostanie przeniesiony po restarcie aplikacji [APP_NAME]. + Ustawienia portu zostają zaktualizowane po restarcie aplikacji [APP_NAME]. @@ -3739,7 +3742,7 @@ Obecne ustawienie: [CURRENT_VALUE] Nie można śledzić tego awatara, ponieważ jest poza zasięgiem radaru. - Pamięć podręczna Twojej Przeglądarki jest pusta. Miej na uwadze, że możesz przez jakiś czas odczuwać obniżoną wydajność i spowolnione doczytywanie obiektów z Szafy. + Pamięć podręczna (bufor danych) Twojej Przeglądarki jest pusta. Miej na uwadze, że możesz przez jakiś czas odczuwać obniżoną wydajność i spowolnione doczytywanie obiektów z Szafy. Witaj w grupie wsparcia Phoenix/Firestorm! diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml index ef9267b47f..e9423a2b34 100755 --- a/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_privacy.xml @@ -5,7 +5,7 @@ Zaloguj się, by zmienić -