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

Merge Firestorm LGPL

meow-7.2.2
Ansariel 2016-09-15 22:34:54 +02:00
parent 78407979d4 abf6750189
commit 5b483b8b38
6 changed files with 64 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llflickrconnect.cpp
View File

@ -190,6 +190,7 @@ void LLFlickrConnect::flickrShareImageCoro(LLPointer<LLImageFormatted> image, st
httpOpts->setWantHeaders(true);
httpOpts->setFollowRedirects(false);
httpOpts->setRetries(0); // <FS:Ansariel> FIRE-20026: Pictures might get uploaded multiple times after a timeout occurs
std::string imageFormat;
if (dynamic_cast<LLImagePNG*>(image.get()))

46
indra/newview/llpanelmaininventory.cpp
View File

@ -307,19 +307,17 @@ BOOL LLPanelMainInventory::postBuild()
// <FS:AW opensim currency support>
// // *TODO:Get the cost info from the server
// const std::string upload_cost("10");
// \0/ Copypasta! See llviewermessage, llviewermenu and llpanelmaininventory
S32 cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
std::string upload_cost;
#ifdef OPENSIM // <FS:AW optional opensim support>
bool in_opensim = LLGridManager::getInstance()->isInOpenSim();
if(in_opensim)
#ifdef OPENSIM
if (LLGridManager::getInstance()->isInOpenSim())
{
upload_cost = cost > 0 ? llformat("%s%d", "L$", cost) : LLTrans::getString("free");
}
else
#endif // OPENSIM // <FS:AW optional opensim support>
#endif
{
upload_cost = cost > 0 ? llformat("%s%d", "L$", cost) : llformat("%d", gSavedSettings.getU32("DefaultUploadCost"));
upload_cost = "L$" + (cost > 0 ? llformat("%d", cost) : llformat("%d", gSavedSettings.getU32("DefaultUploadCost")));
}
// </FS:AW opensim currency support>
@ -1796,11 +1794,11 @@ void LLPanelMainInventory::setUploadCostIfNeeded()
LLMenuItemBranchGL* upload_menu = menu->findChild<LLMenuItemBranchGL>("upload");
if(upload_menu)
{
S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
std::string cost_str;
// getPriceUpload() returns -1 if no data available yet.
// <FS:AW opensim currency support>
// S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
// std::string cost_str;
//
// // getPriceUpload() returns -1 if no data available yet.
// if(upload_cost >= 0)
// {
// mNeedUploadCost = false;
@ -1810,31 +1808,21 @@ void LLPanelMainInventory::setUploadCostIfNeeded()
// {
// cost_str = llformat("%d", gSavedSettings.getU32("DefaultUploadCost"));
// }
// upload_menu->getChild<LLView>("Upload Image")->setLabelArg("[COST]", cost_str);
// upload_menu->getChild<LLView>("Upload Sound")->setLabelArg("[COST]", cost_str);
// upload_menu->getChild<LLView>("Upload Animation")->setLabelArg("[COST]", cost_str);
// upload_menu->getChild<LLView>("Bulk Upload")->setLabelArg("[COST]", cost_str);
// \0/ Copypasta! See llviewermessage, llviewermenu and llpanelmaininventory
S32 cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
std::string upload_cost;
#ifdef OPENSIM // <FS:AW optional opensim support>
bool in_opensim = LLGridManager::getInstance()->isInOpenSim();
if(in_opensim)
#ifdef OPENSIM
if (LLGridManager::getInstance()->isInOpenSim())
{
upload_cost = cost > 0 ? llformat("%s%d", "L$", cost) : LLTrans::getString("free");
cost_str = upload_cost > 0 ? llformat("%s%d", "L$", upload_cost) : LLTrans::getString("free");
}
else
#endif // OPENSIM // <FS:AW optional opensim support>
#endif
{
upload_cost = cost > 0 ? llformat("%s%d", "L$", cost) : llformat("%d", gSavedSettings.getU32("DefaultUploadCost"));
cost_str = "L$" + (upload_cost > 0 ? llformat("%d", upload_cost) : llformat("%d", gSavedSettings.getU32("DefaultUploadCost")));
}
upload_menu->getChild<LLView>("Upload Image")->setLabelArg("[COST]", upload_cost);
upload_menu->getChild<LLView>("Upload Sound")->setLabelArg("[COST]", upload_cost);
upload_menu->getChild<LLView>("Upload Animation")->setLabelArg("[COST]", upload_cost);
upload_menu->getChild<LLView>("Bulk Upload")->setLabelArg("[COST]", upload_cost);
// </FS:AW opensim currency support>
upload_menu->getChild<LLView>("Upload Image")->setLabelArg("[COST]", cost_str);
upload_menu->getChild<LLView>("Upload Sound")->setLabelArg("[COST]", cost_str);
upload_menu->getChild<LLView>("Upload Animation")->setLabelArg("[COST]", cost_str);
upload_menu->getChild<LLView>("Bulk Upload")->setLabelArg("[COST]", cost_str);
}
}
}

42
indra/newview/llviewermenu.cpp
View File

@ -633,16 +633,15 @@ void init_menus()
// \0/ Copypasta! See llviewermessage, llviewermenu and llpanelmaininventory
S32 cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
std::string upload_cost;
#ifdef OPENSIM // <FS:AW optional opensim support>
bool in_opensim = LLGridManager::getInstance()->isInOpenSim();
if(in_opensim)
#ifdef OPENSIM
if (LLGridManager::getInstance()->isInOpenSim())
{
upload_cost = cost > 0 ? llformat("%s%d", "L$", cost) : LLTrans::getString("free");
}
else
#endif // OPENSIM // <FS:AW optional opensim support>
#endif
{
upload_cost = cost > 0 ? llformat("%s%d", "L$", cost) : llformat("%d", gSavedSettings.getU32("DefaultUploadCost"));
upload_cost = "L$" + (cost > 0 ? llformat("%d", cost) : llformat("%d", gSavedSettings.getU32("DefaultUploadCost")));
}
// </FS:AW opensim currency support>
gMenuHolder->childSetLabelArg("Upload Image", "[COST]", upload_cost);
@ -7552,7 +7551,12 @@ void handle_viewer_disable_message_log(void*)
void handle_customize_avatar()
{
// <FS:Ansariel> FIRE-19614: Make CTRL-O toggle the appearance floater
if (LLFloaterReg::instanceVisible("appearance"))
LLFloater* floater = LLFloaterReg::findInstance("appearance");
if (floater && floater->isMinimized())
{
floater->setMinimized(FALSE);
}
else if (LLFloater::isShown(floater))
{
LLFloaterReg::hideInstance("appearance");
}
@ -10579,10 +10583,10 @@ class LLToggleUIHints : public view_listener_t
void LLUploadCostCalculator::calculateCost()
{
S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
// getPriceUpload() returns -1 if no data available yet.
// <FS:AW opensim currency support>
// S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
//
// // getPriceUpload() returns -1 if no data available yet.
// if(upload_cost >= 0)
// {
// mCostStr = llformat("%d", upload_cost);
@ -10591,23 +10595,16 @@ void LLUploadCostCalculator::calculateCost()
// {
// mCostStr = llformat("%d", gSavedSettings.getU32("DefaultUploadCost"));
// }
// \0/ Copypasta! See llviewermessage, llviewermenu and llpanelmaininventory
S32 cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
std::string upload_cost;
#ifdef OPENSIM // <FS:AW optional opensim support>
bool in_opensim = LLGridManager::getInstance()->isInOpenSim();
if(in_opensim)
if (LLGridManager::getInstance()->isInOpenSim())
{
upload_cost = cost > 0 ? llformat("%s%d", "L$", cost) : LLTrans::getString("free");
mCostStr = upload_cost > 0 ? llformat("%s%d", "L$", upload_cost) : LLTrans::getString("free");
}
else
#endif // OPENSIM // <FS:AW optional opensim support>
{
upload_cost = cost > 0 ? llformat("%s%d", "L$", cost) : llformat("%d", gSavedSettings.getU32("DefaultUploadCost"));
mCostStr = "L$" + (upload_cost > 0 ? llformat("%d", upload_cost) : llformat("%d", gSavedSettings.getU32("DefaultUploadCost")));
}
mCostStr = upload_cost;
// </FS:AW opensim currency support>
}
@ -10682,7 +10679,12 @@ void toggleTeleportHistory()
}
else
{
if (LLFloaterReg::instanceVisible("places"))
LLFloater* floater = LLFloaterReg::findInstance("places");
if (floater && floater->isMinimized())
{
floater->setMinimized(FALSE);
}
else if (LLFloater::isShown(floater))
{
LLFloaterReg::hideInstance("places");
}

45
indra/newview/llviewermessage.cpp
View File

@ -8112,41 +8112,36 @@ void process_frozen_message(LLMessageSystem *msgsystem, void **user_data)
void process_economy_data(LLMessageSystem *msg, void** /*user_data*/)
{
LLGlobalEconomy::processEconomyData(msg, LLGlobalEconomy::Singleton::getInstance());
S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
// <FS:AW opensim currency support>
// AW: from this point anything is bogus because it's all replaced by the LLUploadCostCalculator in llviewermenu
// S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
// LL_INFOS_ONCE("Messaging") << "EconomyData message arrived; upload cost is L$" << upload_cost << LL_ENDL;
// gMenuHolder->getChild<LLUICtrl>("Upload Image")->setLabelArg("[COST]", llformat("%d", upload_cost));
// gMenuHolder->getChild<LLUICtrl>("Upload Sound")->setLabelArg("[COST]", llformat("%d", upload_cost));
// gMenuHolder->getChild<LLUICtrl>("Upload Animation")->setLabelArg("[COST]", llformat("%d", upload_cost));
// gMenuHolder->getChild<LLUICtrl>("Bulk Upload")->setLabelArg("[COST]", llformat("%d", upload_cost));
std::string cost_str;
#ifdef OPENSIM
if (LLGridManager::getInstance()->isInOpenSim())
{
cost_str = upload_cost > 0 ? llformat("%s%d", "L$", upload_cost) : LLTrans::getString("free");
}
else
#endif
{
cost_str = "L$" + (upload_cost > 0 ? llformat("%d", upload_cost) : llformat("%d", gSavedSettings.getU32("DefaultUploadCost")));
}
LL_INFOS_ONCE("Messaging") << Tea::wrapCurrency("EconomyData message arrived; upload cost is L$") << cost_str << LL_ENDL;
gMenuHolder->getChild<LLUICtrl>("Upload Image")->setLabelArg("[COST]", cost_str);
gMenuHolder->getChild<LLUICtrl>("Upload Sound")->setLabelArg("[COST]", cost_str);
gMenuHolder->getChild<LLUICtrl>("Upload Animation")->setLabelArg("[COST]", cost_str);
gMenuHolder->getChild<LLUICtrl>("Bulk Upload")->setLabelArg("[COST]", cost_str);
// <FS:AW opensim currency support>
// update L$ substitution for "Buy and Sell L$", it was set before we knew the currency
gMenuHolder->getChild<LLUICtrl>("Buy and Sell L$")->setLabelArg("L$", LLStringExplicit("L$"));
// \0/ Copypasta! See llviewermessage, llviewermenu and llpanelmaininventory
S32 cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
std::string upload_cost;
#ifdef OPENSIM // <FS:AW optional opensim support>
bool in_opensim = LLGridManager::getInstance()->isInOpenSim();
if(in_opensim)
{
upload_cost = cost > 0 ? llformat("%s%d", "L$", cost) : LLTrans::getString("free");
}
else
#endif // OPENSIM // <FS:AW optional opensim support>
{
upload_cost = cost > 0 ? llformat("%s%d", "L$", cost) : llformat("%d", gSavedSettings.getU32("DefaultUploadCost"));
}
LL_INFOS_ONCE("Messaging") << Tea::wrapCurrency("EconomyData message arrived; upload cost is L$") << upload_cost << LL_ENDL;
gMenuHolder->getChild<LLUICtrl>("Upload Image")->setLabelArg("[COST]", upload_cost);
gMenuHolder->getChild<LLUICtrl>("Upload Sound")->setLabelArg("[COST]", upload_cost);
gMenuHolder->getChild<LLUICtrl>("Upload Animation")->setLabelArg("[COST]", upload_cost);
gMenuHolder->getChild<LLUICtrl>("Bulk Upload")->setLabelArg("[COST]", upload_cost);
// <FS:AW opensim currency support>
}
void notify_cautioned_script_question(const LLSD& notification, const LLSD& response, S32 orig_questions, BOOL granted)

3
indra/newview/skins/default/xui/en/floater_region_tracker.xml
View File

@ -84,6 +84,9 @@
left="5"
multi_select="true"
draw_heading="true"
persist_sort_order="true"
primary_sort_only="true"
sort_column="0"
column_padding="0"
search_column="0">
<scroll_list.columns

2
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
View File

@ -914,7 +914,7 @@
follows="left|top"
control_name="VoiceCallsRejectAdHoc"
height="15"
label="Automatically reject all incoming AdHoc (conference) voice calls"
label="Automatically reject all incoming conference (ad-hoc) voice calls"
layout="topleft"
left="25"
name="VoiceCallsRejectAdHoc"