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

Re-add temp upload function for screenshots on OpenSim/Non-SSB regions and hide unavailable snapshot options in OpenSim

Ansariel 2015-01-19 13:59:28 +01:00
parent e1e21e0629
commit 8fff80c102
6 changed files with 176 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
indra/newview/llfloatersnapshot.cpp
View File

@ -48,6 +48,12 @@
#include "lltoolmgr.h"
#include "llwebprofile.h"
// <FS:CR> FIRE-9621 - Hide Profile panel on Snapshots on non-sl grids
#ifdef OPENSIM
#include "llviewernetwork.h" // isOpenSim()
#endif // OPENSIM
// </FS:CR>
///----------------------------------------------------------------------------
/// Local function declarations, constants, enums, and typedefs
///----------------------------------------------------------------------------
@ -1170,6 +1176,33 @@ void LLFloaterSnapshot::onOpen(const LLSD& key)
// Initialize default tab.
getChild<LLSideTrayPanelContainer>("panel_container")->getCurrentPanel()->onOpen(LLSD());
// <FS:CR> FIRE-9621
#ifdef OPENSIM
if (!LLGridManager::getInstance()->isInSecondLife())
{
LLLayoutStack* stackcontainer = findChild<LLLayoutStack>("option_buttons");
if (stackcontainer)
{
LLLayoutPanel* panel_snapshot_profile = stackcontainer->findChild<LLLayoutPanel>("lp_profile");
if (panel_snapshot_profile)
{
panel_snapshot_profile->setVisible(FALSE);
}
LLLayoutPanel* panel_snapshot_facebook = stackcontainer->findChild<LLLayoutPanel>("lp_facebook");
if (panel_snapshot_facebook)
{
panel_snapshot_facebook->setVisible(FALSE);
}
LLLayoutPanel* panel_snapshot_twitter = stackcontainer->findChild<LLLayoutPanel>("lp_twitter");
if (panel_snapshot_twitter)
{
panel_snapshot_twitter->setVisible(FALSE);
}
}
}
#endif // OPENSIM
// </FS:CR>
}
void LLFloaterSnapshot::onClose(bool app_quitting)

14
indra/newview/llpanelsnapshotinventory.cpp
View File

@ -35,6 +35,12 @@
#include "llpanelsnapshot.h"
#include "llviewercontrol.h" // gSavedSettings
// <FS:CR> FIRE-10537 - Temp texture uploads aren't functional on SSB regions
#include "llagent.h"
#include "llviewerregion.h"
#include "llcheckboxctrl.h"
// </FS:CR>
/**
* The panel provides UI for saving snapshot as an inventory texture.
*/
@ -79,6 +85,14 @@ BOOL LLPanelSnapshotInventory::postBuild()
void LLPanelSnapshotInventory::onOpen(const LLSD& key)
{
getChild<LLUICtrl>("hint_lbl")->setTextArg("[UPLOAD_COST]", llformat("%d", LLGlobalEconomy::Singleton::getInstance()->getPriceUpload()));
// <FS:CR> FIRE-10537 - Temp texture uploads aren't functional on SSB regions
if (LLGlobalEconomy::Singleton::getInstance()->getPriceUpload() == 0
|| gAgent.getRegion()->getCentralBakeVersion() > 0)
{
gSavedSettings.setBOOL("TemporaryUpload", FALSE);
}
getChild<LLCheckBoxCtrl>("inventory_temp_upload")->setVisible(LLGlobalEconomy::Singleton::getInstance()->getPriceUpload() > 0 && gAgent.getRegion()->getCentralBakeVersion() == 0);
// </FS:CR>
LLPanelSnapshot::onOpen(key);
}

36
indra/newview/skins/default/xui/de/panel_snapshot_options.xml
View File

@ -1,16 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="panel_snapshot_options">
<button label="Ins Profil hochladen" name="save_to_profile_btn"/>
<button label="Per E-Mail senden" name="save_to_email_btn"/>
<button label="Im Inventar speichern" name="save_to_inventory_btn"/>
<button label="Auf Festplatte speichern" name="save_to_computer_btn"/>
<text name="send_to_facebook_textbox">
Senden an: [secondlife:/// Facebook]
</text>
<text name="send_to_twitter_textbox">
[secondlife:/// Twitter]
</text>
<text name="send_to_flickr_textbox">
[secondlife:/// Flickr]
</text>
<layout_stack name="option_buttons">
<layout_panel name="lp_download">
<button label="Auf Festplatte speichern" name="save_to_computer_btn"/>
</layout_panel>
<layout_panel name="lp_inventory">
<button label="Im Inventar speich. (L$[AMOUNT])" name="save_to_inventory_btn"/>
</layout_panel>
<layout_panel name="lp_profile">
<button label="Ins Profil hochladen" name="save_to_profile_btn"/>
</layout_panel>
<layout_panel name="lp_facebook">
<button label="Auf Facebook hochladen" name="send_to_facebook_btn"/>
</layout_panel>
<layout_panel name="lp_twitter">
<button label="Auf Twitter hochladen" name="send_to_twitter_btn"/>
</layout_panel>
<layout_panel name="lp_flickr">
<button label="Auf Flickr hochladen" name="send_to_flickr_btn"/>
</layout_panel>
<layout_panel name="lp_email">
<button label="Per E-Mail senden" name="save_to_email_btn"/>
</layout_panel>
</layout_stack>
</panel>

11
indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
View File

@ -102,6 +102,15 @@
left="10"
name="inventory_keep_aspect_check"
visible="false" />
<check_box
control_name="TemporaryUpload"
top_pad="-10"
follows="left|top"
label="Temp upload"
layout="topleft"
left="10"
name="inventory_temp_upload"
visible="false" />
<text
follows="top|left"
font="SansSerif"
@ -110,7 +119,7 @@
left="10"
length="1"
name="hint_lbl"
top_pad="6"
top_pad="1"
width="200"
type="string"
word_wrap="true">

86
indra/newview/skins/default/xui/en/panel_snapshot_options.xml
View File

@ -5,6 +5,22 @@
layout="topleft"
name="panel_snapshot_options"
width="208">
<layout_stack
animate="false"
name="option_buttons"
orientation="vertical"
height="186"
width="208"
left="0"
top="9"
follows="all"
layout="topleft">
<layout_panel
auto_resize="false"
user_resize="false"
top_pad="0"
height="22"
name="lp_download">
<button
follows="left|top"
font="SansSerif"
@ -18,10 +34,17 @@
layout="topleft"
left="9"
name="save_to_computer_btn"
top_pad="9">
top_pad="0">
<button.commit_callback
function="Snapshot.SaveToComputer" />
</button>
</layout_panel>
<layout_panel
auto_resize="false"
user_resize="false"
top_pad="0"
height="22"
name="lp_inventory">
<button
follows="left|top"
font="SansSerif"
@ -33,12 +56,19 @@
imgoverlay_label_space="10"
label="Save to Inventory (L$[AMOUNT])"
layout="topleft"
left_delta="0"
left="9"
name="save_to_inventory_btn"
top_pad="5">
top_pad="0">
<button.commit_callback
function="Snapshot.SaveToInventory" />
</button>
</layout_panel>
<layout_panel
auto_resize="false"
user_resize="false"
top_pad="0"
height="22"
name="lp_profile">
<button
follows="left|top"
font="SansSerif"
@ -51,11 +81,18 @@
label="Upload to Profile"
layout="topleft"
name="save_to_profile_btn"
left_delta="0"
top_pad="5">
left="9"
top_pad="0">
<button.commit_callback
function="Snapshot.SaveToProfile" />
</button>
</layout_panel>
<layout_panel
auto_resize="false"
user_resize="false"
top_pad="0"
height="22"
name="lp_facebook">
<button
follows="left|top"
font="SansSerif"
@ -67,12 +104,19 @@
imgoverlay_label_space="10"
label="Upload to Facebook"
layout="topleft"
left_delta="0"
left="9"
name="send_to_facebook_btn"
top_pad="5">
top_pad="0">
<button.commit_callback
function="Snapshot.SendToFacebook"/>
</button>
</layout_panel>
<layout_panel
auto_resize="false"
user_resize="false"
top_pad="0"
height="22"
name="lp_twitter">
<button
follows="left|top"
font="SansSerif"
@ -84,12 +128,19 @@
imgoverlay_label_space="10"
label="Upload to Twitter"
layout="topleft"
left_delta="0"
left="9"
name="send_to_twitter_btn"
top_pad="5">
top_pad="0">
<button.commit_callback
function="Snapshot.SendToTwitter"/>
</button>
</layout_panel>
<layout_panel
auto_resize="false"
user_resize="false"
top_pad="0"
height="22"
name="lp_flickr">
<button
follows="left|top"
font="SansSerif"
@ -101,12 +152,19 @@
imgoverlay_label_space="10"
label="Upload to Flickr"
layout="topleft"
left_delta="0"
left="9"
name="send_to_flickr_btn"
top_pad="5">
top_pad="0">
<button.commit_callback
function="Snapshot.SendToFlickr"/>
</button>
</layout_panel>
<layout_panel
auto_resize="false"
user_resize="false"
top_pad="0"
height="22"
name="lp_email">
<button
follows="left|top"
font="SansSerif"
@ -118,10 +176,12 @@
imgoverlay_label_space="10"
label="Send via E-mail"
layout="topleft"
left_delta="0"
left="9"
name="save_to_email_btn"
top_pad="5">
top_pad="0">
<button.commit_callback
function="Snapshot.SaveToEmail" />
</button>
</layout_panel>
</layout_stack>
</panel>

30
indra/newview/skins/default/xui/pl/panel_snapshot_options.xml
View File

@ -1,10 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="panel_snapshot_options">
<button label="Zapisz na dysku twardym" name="save_to_computer_btn" />
<button label="Zapisz do Szafy ([AMOUNT]L$)" name="save_to_inventory_btn" />
<button label="Wyślij na mój Kanał" name="save_to_profile_btn" />
<button label="Załaduj na Facebook" name="send_to_facebook_btn" />
<button label="Załaduj na Twitter" name="send_to_twitter_btn" />
<button label="Załaduj na Flickr" name="send_to_flickr_btn" />
<button label="Wyślij przez e-mail" name="save_to_email_btn" />
<layout_stack name="option_buttons">
<layout_panel name="lp_download">
<button label="Zapisz na dysku twardym" name="save_to_computer_btn" />
</layout_panel>
<layout_panel name="lp_inventory">
<button label="Zapisz do Szafy ([AMOUNT]L$)" name="save_to_inventory_btn" />
</layout_panel>
<layout_panel name="lp_profile">
<button label="Wyślij na mój Kanał" name="save_to_profile_btn" />
</layout_panel>
<layout_panel name="lp_facebook">
<button label="Załaduj na Facebook" name="send_to_facebook_btn" />
</layout_panel>
<layout_panel name="lp_twitter">
<button label="Załaduj na Twitter" name="send_to_twitter_btn" />
</layout_panel>
<layout_panel name="lp_flickr">
<button label="Załaduj na Flickr" name="send_to_flickr_btn" />
</layout_panel>
<layout_panel name="lp_email">
<button label="Wyślij przez e-mail" name="save_to_email_btn" />
</layout_panel>
</layout_stack>
</panel>