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

Merge Firestorm LGPL

master
Ansariel 2016-10-15 14:09:17 +02:00
parent c835b01aa9 8cf629c9dd
commit bc32feea42
29 changed files with 261 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autobuild.xml
View File

@ -3584,7 +3584,6 @@
<array>
<string>--fmodex</string>
<string>--kdu</string>
<string>--quicktime</string>
<string>--version</string>
<string>--platform win32</string>
</array>
@ -3621,7 +3620,6 @@
<array>
<string>--fmodex</string>
<string>--kdu</string>
<string>--quicktime</string>
<string>--version</string>
<string>--platform win32</string>
</array>
@ -3658,7 +3656,6 @@
<array>
<string>--fmodex</string>
<string>--kdu</string>
<string>--quicktime</string>
<string>--version</string>
<string>--platform win32</string>
</array>

8
indra/llmessage/llexperiencecache.cpp
View File

@ -36,6 +36,7 @@
#include <map>
#include <boost/tokenizer.hpp>
#include <boost/concept_check.hpp>
#include "../newview/llviewernetwork.h" // <FS:Ansariel> Log getting spammed with experience requests from other grids; Yes, it IS ugly!
//=========================================================================
namespace LLExperienceCacheImpl
@ -98,7 +99,12 @@ LLExperienceCache::~LLExperienceCache()
void LLExperienceCache::initSingleton()
{
mCacheFileName = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "experience_cache.xml");
// <FS:Ansariel> Log getting spammed with experience requests from other grids
//mCacheFileName = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "experience_cache.xml");
const std::string grid_id_str = LLDir::getScrubbedFileName(LLGridManager::getInstance()->getGridId());
const std::string& grid_id_lower = utf8str_tolower(grid_id_str);
mCacheFileName = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "experience_cache." + grid_id_lower + ".xml");
// </FS:Ansariel>
LL_INFOS("ExperienceCache") << "Loading " << mCacheFileName << LL_ENDL;
llifstream cache_stream(mCacheFileName.c_str());

10
indra/media_plugins/gstreamer10/CMakeLists.txt
View File

@ -62,11 +62,11 @@ target_link_libraries(media_plugin_gstreamer10
${GSTREAMER10_LIBRARIES}
)
add_dependencies(media_plugin_gstreamer10
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
)
#add_dependencies(media_plugin_gstreamer10
# ${LLPLUGIN_LIBRARIES}
# ${MEDIA_PLUGIN_BASE_LIBRARIES}
# ${LLCOMMON_LIBRARIES}
#)
if (WINDOWS)
set_target_properties(

10
indra/media_plugins/libvlc/CMakeLists.txt
View File

@ -56,11 +56,11 @@ target_link_libraries(media_plugin_libvlc
${PLUGIN_API_WINDOWS_LIBRARIES}
)
add_dependencies(media_plugin_libvlc
${LLPLUGIN_LIBRARIES}
${MEDIA_PLUGIN_BASE_LIBRARIES}
${LLCOMMON_LIBRARIES}
)
#add_dependencies(media_plugin_libvlc
# ${LLPLUGIN_LIBRARIES}
# ${MEDIA_PLUGIN_BASE_LIBRARIES}
# ${LLCOMMON_LIBRARIES}
#)
if (WINDOWS)
set_target_properties(

22
indra/newview/app_settings/settings.xml
View File

@ -24169,6 +24169,28 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSLogAutoAcceptInventoryToChat</key>
<map>
<key>Comment</key>
<string>If enabled, auto-accepted inventory items will be logged to nearby chat.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSStatusBarShowFPS</key>
<map>
<key>Comment</key>
<string>If enabled, shows the current FPS in the main menu bar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
</map>
</llsd>

3
indra/newview/exoflickr.cpp
View File

@ -29,6 +29,7 @@
#include "llbase64.h"
#include "llcorehttputil.h"
#include "llsdutil.h"
#include "llflickrconnect.h"
// third-party
#if LL_USESYSTEMLIBS
@ -293,7 +294,7 @@ void exoFlickr::uploadPhoto(const LLSD& args, LLImageFormatted *image, response_
pHeader->append("Content-Type", "multipart/form-data; boundary=" + boundary);
options->setWantHeaders(true);
options->setRetries(0);
options->setTimeout(600);
options->setTimeout(FLICKR_CONNECT_TIMEOUT);
FSCoreHttpUtil::callbackHttpPostRaw(UPLOAD_URL, post_data, boost::bind( exoFlickrUploadResponse, _1, callback ), boost::bind( exoFlickrUploadResponse, _1, callback ), pHeader, options );
}

1
indra/newview/fsavatarrenderpersistence.cpp
View File

@ -36,7 +36,6 @@ FSAvatarRenderPersistence::FSAvatarRenderPersistence()
FSAvatarRenderPersistence::~FSAvatarRenderPersistence()
{
saveAvatarRenderSettings();
}
void FSAvatarRenderPersistence::init()

3
indra/newview/fsavatarrenderpersistence.h
View File

@ -40,6 +40,8 @@ friend class FSPanelPreferenceBackup;
public:
void init();
void saveAvatarRenderSettings();
LLVOAvatar::VisualMuteSettings getAvatarRenderSettings(const LLUUID& avatar_id);
void setAvatarRenderSettings(const LLUUID& avatar_id, LLVOAvatar::VisualMuteSettings render_settings);
@ -57,7 +59,6 @@ private:
virtual ~FSAvatarRenderPersistence();
void loadAvatarRenderSettings();
void saveAvatarRenderSettings();
avatar_render_setting_t mAvatarRenderMap;

2
indra/newview/fsfloaternearbychat.cpp
View File

@ -243,7 +243,7 @@ void FSFloaterNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD
LLAvatarName av_name;
LLAvatarNameCache::get(chat.mFromID, &av_name);
if (!av_name.isDisplayNameDefault())
if (!av_name.isDisplayNameDefault() && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) || chat.mChatType == CHAT_TYPE_IM || chat.mChatType == CHAT_TYPE_IM_GROUP))
{
from_name = av_name.getCompleteName();
}

2
indra/newview/installers/windows/installer_template.nsi
View File

@ -376,7 +376,7 @@ WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninst
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG"
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe"'
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayVersion" "${VERSION_LONG}"
WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "EstimatedSize" "0x00030C00" # 195 MB
WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "EstimatedSize" "0x00055000" # 340 MB
# <FS:Ansariel> Add additional data for uninstall list in Windows
WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayIcon" '"$INSTDIR\$INSTEXE"'
# BUG-2707 Disable SEHOP for installed viewer.

6
indra/newview/llagent.cpp
View File

@ -3581,6 +3581,12 @@ void LLAgent::sendAnimationRequests(const std::vector<LLUUID> &anim_ids, EAnimRe
{
sendReliableMessage();
}
// <FS> Crash fix by Henri Beauchamp
else
{
msg->clearMessage();
}
// </FS>
}
void LLAgent::sendAnimationRequest(const LLUUID &anim_id, EAnimRequest request)

10
indra/newview/llappviewer.cpp
View File

@ -258,6 +258,8 @@
#if HAS_GROWL
#include "growlmanager.h"
#endif
#include "fsavatarrenderpersistence.h"
// *FIX: These extern globals should be cleaned up.
// The globals either represent state/config/resource-storage of either
// this app, or another 'component' of the viewer. App globals should be
@ -1434,8 +1436,10 @@ bool LLAppViewer::init()
LLVoiceChannel::initClass();
LLVoiceClient::getInstance()->init(gServicePump);
// <FS:Ansariel> [FS communication UI]
// LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLFloaterIMContainer::onCurrentChannelChanged, _1), true);
LLVoiceChannel::setCurrentVoiceChannelChangedCallback( boost::bind( &FSFloaterVoiceControls::sOnCurrentChannelChanged, _1 ), true );
// </FS:Ansariel> [FS communication UI]
joystick = LLViewerJoystick::getInstance();
joystick->setNeedsReset(true);
@ -2042,6 +2046,12 @@ bool LLAppViewer::cleanup()
LLPhysicsExtensions::quitSystem();
#endif // </FS:ND>
// <FS:ND> FIRE-20152; save avatar render settings during cleanup, not in the dtor of the static instance.
// Otherwise the save will happen during crt termination when most of the viewers infrastructure is in a non deterministic state
if( FSAvatarRenderPersistence::instanceExists() )
FSAvatarRenderPersistence::getInstance()->saveAvatarRenderSettings();
// </FS:ND>
// Must clean up texture references before viewer window is destroyed.
if(LLHUDManager::instanceExists())
{

2
indra/newview/llflickrconnect.cpp
View File

@ -192,7 +192,7 @@ void LLFlickrConnect::flickrShareImageCoro(LLPointer<LLImageFormatted> image, st
httpOpts->setFollowRedirects(false);
// <FS:Ansariel> FIRE-20026: Pictures might get uploaded multiple times after a timeout occurs
httpOpts->setRetries(0);
httpOpts->setTimeout(600);
httpOpts->setTimeout(FLICKR_CONNECT_TIMEOUT);
// </FS:Ansariel>
std::string imageFormat;

3
indra/newview/llflickrconnect.h
View File

@ -35,6 +35,9 @@
class LLEventPump;
// <FS:Ansariel> Connection/upload timeout for Flickr
const U32 FLICKR_CONNECT_TIMEOUT = 600;
/**
* @class LLFlickrConnect
*

72
indra/newview/llstatusbar.cpp
View File

@ -190,7 +190,7 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
mSquareMetersCredit(0),
mSquareMetersCommitted(0),
mPathfindingFlashOn(TRUE), // <FS:Zi> Pathfinding rebake functions
mAudioStreamEnabled(FALSE), // ## Zi: Media/Stream separation
mAudioStreamEnabled(FALSE), // <FS:Zi> Media/Stream separation
mRebakeStuck(FALSE), // <FS:LO> FIRE-7639 - Stop the blinking after a while
mNearbyIcons(FALSE), // <FS:Ansariel> Script debug
mSearchData(NULL), // <FS:ND/> Hook up and init for filtering
@ -481,14 +481,6 @@ BOOL LLStatusBar::postBuild()
updateNetstatVisibility(LLSD(FALSE));
}
// <FS:PP> Option to hide volume controls (sounds, media, stream) in upper right
mVolumeIconsWidth = mBtnVolume->getRect().getWidth() + mStreamToggle->getRect().getWidth() + mMediaToggle->getRect().getWidth();
if (!gSavedSettings.getBOOL("FSEnableVolumeControls"))
{
updateVolumeControlsVisibility(LLSD(FALSE));
}
// </FS:PP>
// <FS:ND> Hook up and init for filtering
mFilterEdit = getChild<LLSearchEditor>("search_menu_edit");
mSearchPanel = getChild<LLPanel>("menu_search_panel");
@ -499,6 +491,23 @@ BOOL LLStatusBar::postBuild()
gSavedSettings.getControl("FSMenuSearch")->getCommitSignal()->connect(boost::bind(&LLStatusBar::updateMenuSearchVisibility, this, _2));
// </FS:ND>
// <FS:PP> Option to hide volume controls (sounds, media, stream) in upper right
mVolumeIconsWidth = mBtnVolume->getRect().getWidth() + mStreamToggle->getRect().getWidth() + mMediaToggle->getRect().getWidth();
if (!gSavedSettings.getBOOL("FSEnableVolumeControls"))
{
updateVolumeControlsVisibility(LLSD(FALSE));
}
// </FS:PP>
// <FS:Ansariel> FIRE-14482: Show FPS in status bar
mFPSText = getChild<LLTextBox>("FPSText");
gSavedSettings.getControl("FSStatusBarShowFPS")->getSignal()->connect(boost::bind(&LLStatusBar::onShowFPSChanged, this, _2));
if (!gSavedSettings.getBOOL("FSStatusBarShowFPS"))
{
onShowFPSChanged(LLSD(FALSE));
}
// </FS:Ansariel>
return TRUE;
}
@ -508,8 +517,14 @@ void LLStatusBar::refresh()
static LLCachedControl<bool> show_net_stats(gSavedSettings, "ShowNetStats", false);
bool net_stats_visible = show_net_stats;
if (net_stats_visible)
// <FS:Ansariel> Less frequent update of net stats
//if (net_stats_visible)
//{
if (net_stats_visible && mNetStatUpdateTimer.getElapsedTimeF32() > 0.5f)
{
mNetStatUpdateTimer.reset();
// </FS:Ansariel>
// Adding Net Stat Meter back in
F32 bwtotal = gViewerThrottle.getMaxBandwidth() / 1000.f;
mSGBandwidth->setMin(0.f);
@ -519,6 +534,15 @@ void LLStatusBar::refresh()
//mSGBandwidth->setThreshold(2, bwtotal);
}
// <FS:Ansariel> FIRE-14482: Show FPS in status bar
static LLCachedControl<bool> fsStatusBarShowFPS(gSavedSettings, "FSStatusBarShowFPS");
if (fsStatusBarShowFPS && mFPSUpdateTimer.getElapsedTimeF32() > 0.5f)
{
mFPSUpdateTimer.reset();
mFPSText->setText(llformat("%.1f", LLTrace::get_frame_recording().getPeriodMeanPerSec(LLStatViewer::FPS)));
}
// </FS:Ansariel>
// update clock every 10 seconds
if(mClockUpdateTimer.getElapsedTimeF32() > 10.f)
{
@ -1533,14 +1557,41 @@ void LLStatusBar::updateVolumeControlsVisibility(const LLSD& data)
LLRect rect = mTimeMediaPanel->getRect();
rect.translate(cVolumeIconsWidth * translateFactor, 0);
rect.mRight -= cVolumeIconsWidth * translateFactor;
mTimeMediaPanel->setRect(rect);
mFPSText->translate(-(cVolumeIconsWidth * translateFactor), 0);
rect = mBalancePanel->getRect();
rect.translate(cVolumeIconsWidth * translateFactor, 0);
mBalancePanel->setRect(rect);
mSearchPanel->translate(cVolumeIconsWidth * translateFactor, 0);
}
// </FS:PP>
// <FS:Ansariel> FIRE-14482: Show FPS in status bar
void LLStatusBar::onShowFPSChanged(const LLSD& newvalue)
{
const S32 text_width = mFPSText->getRect().getWidth() + 4; // left_pad = 4
BOOL show_fps = newvalue.asBoolean();
S32 translateFactor = (show_fps ? -1 : 1);
mFPSText->setVisible(show_fps);
LLRect rect = mTimeMediaPanel->getRect();
rect.translate(text_width * translateFactor, 0);
rect.mRight -= text_width * translateFactor;
mTimeMediaPanel->setRect(rect);
rect = mBalancePanel->getRect();
rect.translate(text_width * translateFactor, 0);
mBalancePanel->setRect(rect);
mSearchPanel->translate(text_width * translateFactor, 0);
}
// </FS:Ansariel>
// <FS:Zi> Pathfinding rebake functions
BOOL LLStatusBar::rebakeRegionCallback(const LLSD& notification, const LLSD& response)
{
@ -1649,3 +1700,4 @@ void LLStatusBar::onPopupRolloverChanged(const LLSD& newvalue)
mMouseEnterNearbyMediaConnection = mMediaToggle->setMouseEnterCallback(boost::bind(&LLStatusBar::onMouseEnterNearbyMedia, this));
}
}
// </FS:Ansariel>

7
indra/newview/llstatusbar.h
View File

@ -265,6 +265,9 @@ private:
// <FS:Ansariel> FIRE-19697: Add setting to disable graphics preset menu popup on mouse over
void onPopupRolloverChanged(const LLSD& newvalue);
// <FS:Ansariel> FIRE-14482: Show FPS in status bar
void onShowFPSChanged(const LLSD& newvalue);
public:
/**
@ -316,6 +319,7 @@ private:
LLTextBox *mTextBalance;
LLTextBox *mTextHealth;
LLTextBox *mTextTime;
LLTextBox *mFPSText; // <FS:Ansariel> FIRE-14482: Show FPS in status bar
LLTextBox* mTextParcelName;
@ -334,6 +338,8 @@ private:
LLIconCtrl *mScriptOut;
// </FS:Ansariel> Script debug
LLFrameTimer mClockUpdateTimer;
LLFrameTimer mFPSUpdateTimer; // <FS:Ansariel> FIRE-14482: Show FPS in status bar
LLFrameTimer mNetStatUpdateTimer; // <FS:Ansariel> Less frequent update of net stats
S32 mVolumeIconsWidth; // <FS:PP> Option to hide volume controls (sounds, media, stream) in upper right
S32 mBalance;
@ -385,7 +391,6 @@ private:
bool mRebakeStuck; // <FS:LO> FIRE-7639 - Stop the blinking after a while
// <FS:Zi> Make hovering over parcel info actually work
private:
void onMouseEnterParcelInfo();
void onMouseLeaveParcelInfo();
// </FS:Zi>

37
indra/newview/llviewermessage.cpp
View File

@ -2356,6 +2356,43 @@ void inventory_offer_handler(LLOfferInfo* info)
p.payload = payload;
LLPostponedNotification::add<LLPostponedOfferNotification>(p, info->mFromID, false);
}
// <FS:Ansariel> FIRE-19540: Log auto-accepted inventory to nearby chat
else if (gSavedSettings.getBOOL("FSLogAutoAcceptInventoryToChat"))
{
std::string message_type;
LLStringUtil::format_map_t chat_args;
chat_args["OBJECT_TYPE"] = (!typestr.empty() ? LLTrans::getString(typestr) : "");
chat_args["DESC"] = msg;
if (info->mFromObject)
{
std::string str_pos;
std::string::size_type idx_start = info->mDesc.rfind(" ( http://");
std::string::size_type idx_end = info->mDesc.find(" )", idx_start);
if (idx_start != std::string::npos && idx_end != std::string::npos)
{
LLSLURL url_pos(info->mDesc.substr(idx_start + 3, idx_end - (idx_start + 3)));
str_pos = "&slurl=" + LLURI::escape(url_pos.getLocationString());
}
chat_args["OBJECT_NAME"] = "[" + LLSLURL("objectim", info->mObjectID, "").getSLURLString() + "?name=" + LLURI::escape(info->mFromName) + "&owner=" + info->mFromID.asString() + (info->mFromGroup ? "&groupowned=true" : "") + str_pos + " " + info->mFromName + "]";
message_type = "InvOfferAutoAcceptObject";
}
else
{
bool fRlvCanShowName = (!RlvActions::isRlvEnabled()) ||
(RlvActions::canShowName(RlvActions::SNC_DEFAULT, info->mFromID)) || (!RlvUtil::isNearbyAgent(info->mFromID)) || (RlvUIEnabler::hasOpenIM(info->mFromID)) || (RlvUIEnabler::hasOpenProfile(info->mFromID));
std::string name_slurl = LLSLURL("agent", info->mFromID, (fRlvCanShowName ? "inspect" : "rlvanonym")).getSLURLString();
chat_args["USER_NAME"] = name_slurl;
message_type = "InvOfferAutoAcceptUser";
}
report_to_nearby_chat(LLTrans::getString(message_type, chat_args));
}
// </FS:Ansariel>
// <FS:Ansariel> Show offered inventory also if auto-accept is enabled (FIRE-5101)
if (bAutoAccept && gSavedSettings.getBOOL("ShowNewInventory"))

1
indra/newview/skins/default/xui/de/menu_hide_navbar.xml
View File

@ -8,4 +8,5 @@
<menu_item_check label="Simulator-Version in Menüleiste anzeigen" name="FSStatusbarShowSimulatorVersion"/>
<menu_item_check label="Menüsuche anzeigen" name="FSMenuSearch"/>
<menu_item_check label="Kontostand anzeigen" name="FSShowCurrencyBalanceInStatusbar"/>
<menu_item_check label="Bilder pro Sekunde anzeigen" name="FSStatusBarShowFPS"/>
</menu>

4
indra/newview/skins/default/xui/de/notifications.xml
View File

@ -3020,7 +3020,7 @@ Versuchen Sie es in einigen Minuten erneut.
</form>
</notification>
<notification name="UserGiveItem">
[NAME_SLURL] hat Ihnen folgendes [OBJECTTYPE] übergeben:
[NAME_SLURL] hat Ihnen folgende/n/s [OBJECTTYPE] übergeben:
[ITEM_SLURL]
<form name="form">
<button name="Show" text="Anzeigen"/>
@ -3030,7 +3030,7 @@ Versuchen Sie es in einigen Minuten erneut.
</form>
</notification>
<notification name="UserGiveItemLegacy">
[NAME_SLURL] hat Ihnen folgendes [OBJECTTYPE] übergeben:
[NAME_SLURL] hat Ihnen folgende/n/s [OBJECTTYPE] übergeben:
[ITEM_SLURL]
<form name="form">
<button name="Show" text="Anzeigen"/>

1
indra/newview/skins/default/xui/de/panel_preferences_privacy.xml
View File

@ -25,6 +25,7 @@
<check_box label="Mikrofon ausschalten, wenn Anrufe beendet werden" name="auto_disengage_mic_check"/>
<check_box label="Objekten erlauben, die aktuelle Spracheinstellung abzufragen" name="LanguageIsPublic"/>
<check_box label="Automatisches Akzeptieren von Inventar-Angeboten" name="Auto_Accept_New_Inventory"/>
<check_box label="Automatisch akzeptierte Inventar-Angebote im Chat in der Nähe protokollieren" name="FSLogAutoAcceptInventoryToChat"/>
<check_box label="Klassische Annahme/Ablehnungs-Nachrichten für Inventar-Angebote verwenden" name="FSUseLegacyInventoryAcceptMessages" tool_tip="Falls aktiviert, werden Annahme- bzw. Ablehnungs-Nachrichten erst verschickt, wenn der entsprechende Button angeklickt wurde. Falls deaktiviert, wird automatisch eine Annahme-Nachricht verschickt, sobald das angebotene Objekt im Inventar eingetroffen ist. Diese Option hat keinen Effekt, wenn Inventar-Angebote automatisch akzeptiert werden."/>
<check_box label="Automatisch empfangene Objekte im Inventar anzeigen" name="Show_In_Inventory"/>
<check_box label="Automatisch akzeptierte Notizkarten, Landmarken und Texturen anzeigen" name="Show_New_Inventory"/>

3
indra/newview/skins/default/xui/de/panel_status_bar.xml
View File

@ -23,5 +23,8 @@
<button name="stream_toggle_btn" tool_tip="Audiostream der Parzelle starten/stoppen"/>
<button name="media_toggle_btn" tool_tip="Alle Medien starten/stoppen (Musik, Video, Webseiten)"/>
<button name="volume_btn" tool_tip="Steuerung der Gesamtlautstärke"/>
<text name="FPSText" tool_tip="Bilder pro Sekunde">
200.0
</text>
</panel>
</panel>

5
indra/newview/skins/default/xui/de/strings.xml
View File

@ -2722,6 +2722,11 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
<string name="InvOfferDecline">
Sie lehnen [DESC] von [NAME] ab.
</string>
<string name="InvOfferAutoAcceptObject">
Ein Objekt namens [OBJECT_NAME] hat Ihnen folgende/n/s [OBJECT_TYPE] übergeben: [DESC]</string>
<string name="InvOfferAutoAcceptUser">
[USER_NAME] hat Ihnen folgende/n/s [OBJECT_TYPE] übergeben: [DESC]
</string>
<string name="GroupMoneyTotal">
Gesamtbetrag
</string>

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

@ -98,4 +98,15 @@
function="CheckControl"
parameter="FSShowCurrencyBalanceInStatusbar" />
</menu_item_check>
<menu_item_check
label="Show Frames per Second"
layout="topleft"
name="FSStatusBarShowFPS">
<on_click
function="ToggleControl"
parameter="FSStatusBarShowFPS" />
<on_check
function="CheckControl"
parameter="FSStatusBarShowFPS" />
</menu_item_check>
</menu>

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

@ -136,11 +136,22 @@
name="Auto_Accept_New_Inventory"
top_pad="10"
width="350" />
<check_box
control_name="FSLogAutoAcceptInventoryToChat"
enabled_control="AutoAcceptNewInventory"
height="16"
label="Log automatically accepted inventory items to nearby chat"
layout="topleft"
left_delta="10"
name="FSLogAutoAcceptInventoryToChat"
top_pad="3"
width="350" />
<check_box
control_name="FSUseLegacyInventoryAcceptMessages"
height="16"
label="Use legacy inventory offer accept/decline messages"
layout="topleft"
left_delta="-10"
name="FSUseLegacyInventoryAcceptMessages"
tool_tip="If enabled, the viewer will only send accept and decline messages after pressing the according button. If disabled, the accept response will be sent automatically as soon as the inventory offer has been received. This option has no effect if inventory offers are accepted automatically."
top_pad="3"

32
indra/newview/skins/default/xui/en/panel_status_bar.xml
View File

@ -177,7 +177,7 @@
height="18"
name="damage_text"
value="100%"
top="3"
top="4"
left="238"
visible="true"
width="35"
@ -274,7 +274,7 @@
<panel
height="18"
left="-260"
left="-306"
width="95"
top="0"
follows="right|top"
@ -294,8 +294,7 @@
text_color="CurrencyColor"
text_readonly_color="CurrencyColor"
tool_tip="Click to refresh your L$ balance"
v_pad="4"
top="0"
top="4"
wrap="false"
value="L$??"
width="35" />
@ -307,7 +306,7 @@
image_hover_unselected="buy_over"
image_unselected="buy_off"
image_pressed="buy_press"
height="18"
height="17"
label="BUY L$"
label_color="White"
left_pad="2"
@ -321,8 +320,8 @@
<panel
height="18"
left_pad="12"
width="150"
left_pad="4"
width="204"
top="0"
follows="right|top"
name="time_and_media_bg"
@ -336,12 +335,12 @@
follows="right|top"
halign="right"
height="16"
top="5"
top="4"
layout="topleft"
left="0"
name="TimeText"
tool_tip="Current time (Pacific)"
width="50">
width="58">
24:00 AM PST
</text>
<button
@ -349,7 +348,7 @@
height="16"
image_unselected="Presets_Icon"
image_pressed="Presets_Icon"
left_delta="55"
left_delta="63"
top="2"
name="presets_icon"
width="18" />
@ -392,5 +391,18 @@
top="2"
name="volume_btn"
width="16" />
<text
name="FPSText"
type="string"
follows="right|top"
top="4"
left_pad="4"
height="16"
width="42"
halign="center"
tool_tip="Frames per second"
wrap="false">
200.0
</text>
</panel>
</panel>

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

@ -1237,6 +1237,8 @@ This feature is currently in Beta. Please add your name to this [http://goo.gl/f
<!-- FS:Ansariel: Removed nolink-tags for console -->
<string name="InvOfferDecline">You decline [DESC] from [NAME].</string>
<string name="InvOfferFrom">from</string>
<string name="InvOfferAutoAcceptObject">An object named [OBJECT_NAME] gave you this [OBJECT_TYPE]: [DESC]</string>
<string name="InvOfferAutoAcceptUser">[USER_NAME] gave you this [OBJECT_TYPE]: [DESC]</string>
<!-- group money -->
<string name="GroupMoneyTotal">Total</string>

18
indra/newview/skins/starlight/xui/en/panel_status_bar.xml
View File

@ -259,7 +259,7 @@
<panel
height="18"
left="-405"
left="-430"
width="90"
top="0"
follows="right|top"
@ -307,7 +307,7 @@
<panel
height="18"
left_pad="7"
width="278"
width="303"
top="0"
follows="right|top"
name="time_and_media_bg"
@ -409,5 +409,19 @@
name="volume_btn"
tool_tip="Global Volume Control"
width="16" />
<text
name="FPSText"
type="string"
follows="right|top"
top="0"
left_pad="4"
height="16"
width="42"
v_pad="4"
halign="center"
tool_tip="Frames per second"
wrap="false">
200.0
</text>
</panel>
</panel>

18
indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
View File

@ -257,7 +257,7 @@
<panel
height="18"
left="-405"
left="-430"
width="90"
top="0"
follows="right|top"
@ -304,7 +304,7 @@
<panel
height="18"
left_pad="7"
width="278"
width="303"
top="0"
follows="right|top"
name="time_and_media_bg"
@ -405,5 +405,19 @@
name="volume_btn"
tool_tip="Global Volume Control"
width="16" />
<text
name="FPSText"
type="string"
follows="right|top"
top="0"
left_pad="4"
height="16"
width="42"
v_pad="4"
halign="center"
tool_tip="Frames per second"
wrap="false">
200.0
</text>
</panel>
</panel>

15
scripts/configure_firestorm.sh
View File

@ -34,7 +34,6 @@ WANTS_PACKAGE=$FALSE
WANTS_VERSION=$FALSE
WANTS_KDU=$FALSE
WANTS_FMODEX=$FALSE
WANTS_QUICKTIME=$FALSE
WANTS_OPENSIM=$TRUE
WANTS_AVX=$FALSE
WANTS_AVX2=$FALSE
@ -101,7 +100,6 @@ getArgs()
;;
kdu) WANTS_KDU=$TRUE;;
fmodex) WANTS_FMODEX=$TRUE;;
quicktime) WANTS_QUICKTIME=$TRUE;;
opensim) WANTS_OPENSIM=$TRUE;;
no-opensim) WANTS_OPENSIM=$FALSE;;
avx) WANTS_AVX=$TRUE;;
@ -279,7 +277,6 @@ echo -e "configure_firestorm.py" > $LOG
echo -e " PLATFORM: '$PLATFORM'" | tee -a $LOG
echo -e " KDU: `b2a $WANTS_KDU`" | tee -a $LOG
echo -e " FMODEX: `b2a $WANTS_FMODEX`" | tee -a $LOG
echo -e " QUICKTIME: `b2a $WANTS_QUICKTIME`" | tee -a $LOG
echo -e " OPENSIM: `b2a $WANTS_OPENSIM`" | tee -a $LOG
echo -e " AVX: `b2a $WANTS_AVX` " | tee -a $LOG
echo -e " AVX2: `b2a $WANTS_AVX2` " | tee -a $LOG
@ -379,16 +376,6 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
FMODEX="-DFMODEX:BOOL=OFF"
fi
if [ $PLATFORM == "win32" ] ; then
if [ $WANTS_QUICKTIME -eq $TRUE ] ; then
QUICKTIME="-DHAVE_QUICKTIME_3P:BOOL=ON"
else
QUICKTIME="-DHAVE_QUICKTIME_3P:BOOL=OFF"
fi
else
QUICKTIME=""
fi
if [ $WANTS_OPENSIM -eq $TRUE ] ; then
OPENSIM="-DOPENSIM:BOOL=ON"
else
@ -459,7 +446,7 @@ if [ $WANTS_CONFIG -eq $TRUE ] ; then
UNATTENDED="-DUNATTENDED=ON"
fi
cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $QUICKTIME $KDU $OPENSIM $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=$WORD_SIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
cmake -G "$TARGET" ../indra $CHANNEL $FMODEX $KDU $OPENSIM $AVX_OPTIMIZATION $AVX2_OPTIMIZATION $PACKAGE $UNATTENDED -DLL_TESTS:BOOL=OFF -DWORD_SIZE:STRING=$WORD_SIZE -DCMAKE_BUILD_TYPE:STRING=$BTYPE \
-DNDTARGET_ARCH:STRING="${TARGET_ARCH}" -DROOT_PROJECT_NAME:STRING=Firestorm $LL_ARGS_PASSTHRU | tee $LOG
if [ $PLATFORM == "win32" ] ; then