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

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

master
Kitty Barnett 2021-02-15 20:23:00 +01:00
parent 9af27dd18a 214632c171
commit 1cb9591e13
20 changed files with 273 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25623,5 +25623,16 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSStatusBarTimeFormat</key>
<map>
<key>Comment</key>
<string>Which time format to use for the status bar clock, e.g. 12 Hours, 24 Hours, etc. The default "Language" restores the original behavior of changing the time display mode per language.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Language</string>
</map>
</map>
</llsd>

6
indra/newview/lllandmarklist.cpp
View File

@ -106,12 +106,14 @@ LLLandmark* LLLandmarkList::getAsset(const LLUUID& asset_uuid, loaded_callback_t
mWaitList.insert(asset_uuid);
return NULL;
}
// <FS:Beq/> fIRE-14457 Fix CopySLURL fails / landmakrs not loading - based on snippet from Chorazin Allen
mRequestedList[asset_uuid] = gFrameTimeSeconds;
gAssetStorage->getAssetData(asset_uuid,
LLAssetType::AT_LANDMARK,
LLLandmarkList::processGetAssetReply,
NULL);
mRequestedList[asset_uuid] = gFrameTimeSeconds;
// <FS:Beq/> fIRE-14457 Fix CopySLURL fails / landmakrs not loading - based on snippet from Chorazin Allen
// mRequestedList[asset_uuid] = gFrameTimeSeconds;
}
return NULL;
}

86
indra/newview/llstatusbar.cpp
View File

@ -519,9 +519,49 @@ BOOL LLStatusBar::postBuild()
updateVolumeControlsVisibility(LLSD(FALSE));
}
// </FS:PP>
// <FS:Zi> FIRE-20390, FIRE-4269 - Option for 12/24 hour clock and seconds display
mClockFormatChoices["12 Hour"] = "[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt]";
mClockFormatChoices["12 Hour Seconds"] = "[hour12, datetime, slt]:[min, datetime, slt]:[second, datetime, slt] [ampm, datetime, slt]";
mClockFormatChoices["12 Hour TZ"] = "[hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]";
mClockFormatChoices["12 Hour TZ Seconds"] = "[hour12, datetime, slt]:[min, datetime, slt]:[second, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]";
mClockFormatChoices["24 Hour"] = "[hour24, datetime, slt]:[min, datetime, slt]";
mClockFormatChoices["24 Hour Seconds"] = "[hour24, datetime, slt]:[min, datetime, slt]:[second, datetime, slt]";
mClockFormatChoices["24 Hour TZ"] = "[hour24, datetime, slt]:[min, datetime, slt] [timezone, datetime, slt]";
mClockFormatChoices["24 Hour TZ Seconds"] = "[hour24, datetime, slt]:[min, datetime, slt]:[second, datetime, slt] [timezone, datetime, slt]";
// use the time format defined in the language's panel_status_bar.xml (default)
mClockFormatChoices["Language"] = getString("time");
mClockFormat = gSavedSettings.getString("FSStatusBarTimeFormat");
// </FS:Zi>
return TRUE;
}
// <FS:Zi> FIRE-20390, FIRE-4269 - Option for 12/24 hour clock and seconds display
void LLStatusBar::updateClockDisplay()
{
// Get current UTC time, adjusted for the user's clock
// being off.
time_t utc_time;
utc_time = time_corrected();
std::string timeStr = mClockFormatChoices[mClockFormat];
LLSD substitution;
substitution["datetime"] = (S32) utc_time;
LLStringUtil::format (timeStr, substitution);
mTextTime->setText(timeStr);
// <FS:Ansariel> Add seconds to clock
static const std::string tooltip_template = getString("timeTooltip");
std::string dtStr = tooltip_template;
// </FS:Ansariel>
LLStringUtil::format (dtStr, substitution);
mTextTime->setToolTip (dtStr);
}
// </FS:Zi>
// Per-frame updates of visibility
void LLStatusBar::refresh()
{
@ -562,29 +602,25 @@ void LLStatusBar::refresh()
{
mClockUpdateTimer.reset();
// Get current UTC time, adjusted for the user's clock
// being off.
time_t utc_time;
utc_time = time_corrected();
// <FS:Zi> FIRE-20390, FIRE-4269 - Option for 12/24 hour clock and seconds display
// // Get current UTC time, adjusted for the user's clock
// // being off.
// time_t utc_time;
// utc_time = time_corrected();
// <FS:Ansariel> Add seconds to clock
//std::string timeStr = getString("time");
static const std::string time_template = getString("time");
std::string timeStr = time_template;
// </FS:Ansariel>
LLSD substitution;
substitution["datetime"] = (S32) utc_time;
LLStringUtil::format (timeStr, substitution);
mTextTime->setText(timeStr);
// std::string timeStr = getString("time");
// LLSD substitution;
// substitution["datetime"] = (S32) utc_time;
// LLStringUtil::format (timeStr, substitution);
// mTextTime->setText(timeStr);
// set the tooltip to have the date
// <FS:Ansariel> Add seconds to clock
//std::string dtStr = getString("timeTooltip");
static const std::string tooltip_template = getString("timeTooltip");
std::string dtStr = tooltip_template;
// </FS:Ansariel>
LLStringUtil::format (dtStr, substitution);
mTextTime->setToolTip (dtStr);
// // set the tooltip to have the date
// std::string dtStr = getString("timeTooltip");
// LLStringUtil::format (dtStr, substitution);
// mTextTime->setToolTip (dtStr);
updateClockDisplay();
// </FS:Zi>
}
// <FS:Zi> Pathfinding rebake functions
@ -1717,6 +1753,14 @@ void LLStatusBar::onPopupRolloverChanged(const LLSD& newvalue)
}
}
// <FS:Zi> FIRE-20390, FIRE-4269 - Option for 12/24 hour clock and seconds display
void LLStatusBar::onTimeFormatChanged(const std::string& format)
{
mClockFormat = format;
updateClockDisplay();
}
// </FS:Zi>
// Implements secondlife:///app/balance/request to request a L$ balance
// update via UDP message system. JC
class LLBalanceHandler : public LLCommandHandler

22
indra/newview/llstatusbar.h
View File

@ -157,6 +157,9 @@ public:
void updateCurrencySymbols();
// </COLOSI opensim multi-currency support>
// <FS:Zi> FIRE-20390, FIRE-4269 - Option for 12/24 hour clock and seconds display
void onTimeFormatChanged(const std::string& format);
private:
void onClickBuyCurrency();
@ -166,7 +169,8 @@ private:
void onMouseEnterPresets();
void onMouseEnterVolume();
void onMouseEnterNearbyMedia();
void onClickScreen(S32 x, S32 y);
// <FS:Ansariel> Does not exist 15-02-2021
//void onClickScreen(S32 x, S32 y);
static void onClickStreamToggle(void* data); // <FS:Zi> Media/Stream separation
static void onClickMediaToggle(void* data);
@ -259,16 +263,11 @@ private:
/**
* Updates the visibility state of the parcel icons according to parcel properties
*/
void updateParcelIconVisibility();
// <FS:Ansariel> Does not exist 15-02-2021
//void updateParcelIconVisibility();
void onBuyLandClicked();
// <FS:Ansariel> Pathfinding support
void onRegionBoundaryCrossed();
void onNavMeshStatusChange(const LLPathfindingNavMeshStatus &pNavMeshStatus);
void createNavMeshStatusListenerForCurrentRegion();
// </FS:Ansariel> Pathfinding support
// <FS:Ansariel> FIRE-19697: Add setting to disable graphics preset menu popup on mouse over
void onPopupRolloverChanged(const LLSD& newvalue);
@ -395,6 +394,13 @@ private:
void onMouseLeaveParcelInfo();
// </FS:Zi>
// <FS:Zi> FIRE-20390, FIRE-4269 - Option for 12/24 hour clock and seconds display
std::map<std::string, std::string> mClockFormatChoices;
std::string mClockFormat;
void updateClockDisplay();
// </FS:Zi>
std::string mCurrentLocationString;
};

14
indra/newview/llviewercontrol.cpp
View File

@ -1048,6 +1048,17 @@ void handleSmallCameraFloaterChanged(const LLSD& newValue)
}
// </FS:Ansariel>
// <FS:Zi> FIRE-20390, FIRE-4269 - Option for 12/24 hour clock and seconds display
void handleStatusbarTimeformatChanged(const LLSD& newValue)
{
const std::string format = newValue.asString();
if (gStatusBar)
{
gStatusBar->onTimeFormatChanged(format);
}
}
// </FS:Zi>
////////////////////////////////////////////////////////////////////////////
void settings_setup_listeners()
@ -1298,6 +1309,9 @@ void settings_setup_listeners()
// <FS:Ansariel> Optional small camera floater
gSavedSettings.getControl("FSUseSmallCameraFloater")->getSignal()->connect(boost::bind(&handleSmallCameraFloaterChanged, _2));
// <FS:Zi> FIRE-20390, FIRE-4269 - Option for 12/24 hour clock and seconds display
gSavedSettings.getControl("FSStatusBarTimeFormat")->getSignal()->connect(boost::bind(&handleStatusbarTimeformatChanged, _2));
}
#if TEST_CACHED_CONTROL

49
indra/newview/llviewerobjectlist.cpp
View File

@ -83,6 +83,7 @@
#include <algorithm>
#include <iterator>
#include <tuple> // <FS:Beq/> FIRE-30694 DeadObject Spamming cleanup
#include "fsassetblacklist.h"
#include "fsfloaterimport.h"
#include "fscommon.h"
@ -1410,15 +1411,30 @@ void LLViewerObjectList::clearDebugText()
void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp)
{
bool new_dead_object = true;
// <FS:Beq> FIRE-30694 DeadObject Spam - handle new_dead_object properly and closer to source
// bool new_dead_object = true;
if (mDeadObjects.find(objectp->mID) != mDeadObjects.end())
{
LL_INFOS() << "Object " << objectp->mID << " already on dead list!" << LL_ENDL;
new_dead_object = false;
// <FS:Beq> FIRE-30694 DeadObject Spam
// new_dead_object = false;
}
else
{
mDeadObjects.insert(objectp->mID);
// <FS:Beq> FIRE-30694 DeadObject Spam
// mDeadObjects.insert(objectp->mID);
bool success;
std::tie( std::ignore, success ) = mDeadObjects.insert( objectp->mID );
if( success )
{
mNumDeadObjects++;
llassert( mNumDeadObjects == mDeadObjects.size() );
}
else
{
LL_WARNS() << "Object " << objectp->mID << " failed to insert on dead list!" << LL_ENDL;
}
// </FS:Beq>
}
// Cleanup any references we have to this object
@ -1454,10 +1470,11 @@ void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp)
// Also, not cleaned up
removeDrawable(objectp->mDrawable);
if(new_dead_object)
{
mNumDeadObjects++;
}
// <FS:Beq> FIRE-30694 DeadObject Spam
// if(new_dead_object)
// {
// mNumDeadObjects++;
// }
}
static LLTrace::BlockTimerStatHandle FTM_REMOVE_DRAWABLE("Remove Drawable");
@ -1589,12 +1606,17 @@ void LLViewerObjectList::killAllObjects()
void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
{
// <FS:Beq/> FIRE-30694 DeadObject Spam
llassert( mNumDeadObjects == mDeadObjects.size() );
if (!mNumDeadObjects)
{
// No dead objects, don't need to scan object list.
return;
}
// <FS:Beq/> FIRE-30694 DeadObject Spam
S32 num_divergent = 0;
S32 num_removed = 0;
LLViewerObject *objectp;
@ -1617,7 +1639,13 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
if (objectp->isDead())
{
mDeadObjects.erase(objectp->mID); // <FS:Ansariel> Use timer for cleaning up dead objects
// <FS:Beq> FIRE-30694 DeadObject Spam
// mDeadObjects.erase(objectp->mID); // <FS:Ansariel> Use timer for cleaning up dead objects
if(mDeadObjects.erase(objectp->mID)==0)
{
LL_WARNS() << "Attempt to delete object " << objectp->mID << " but object not in dead list" << LL_ENDL;
num_divergent++; // this is the number we are adrift in the count
}
LLPointer<LLViewerObject>::swap(*iter, *target);
*target = NULL;
++target;
@ -1651,9 +1679,10 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
mObjects.erase(mObjects.begin()+(mObjects.size()-num_removed), mObjects.end());
mNumDeadObjects -= num_removed;
if (mNumDeadObjects != mDeadObjects.size())
// TODO(Beq) If this still happens, we ought to realign at this point. Do a full sweep and reset.
if ( mNumDeadObjects != mDeadObjects.size() )
{
LL_WARNS() << "Num dead objects != dead object list size" << LL_ENDL;
LL_WARNS() << "Num dead objects (" << mNumDeadObjects << ") != dead object list size (" << mDeadObjects.size() << "), deadlist discrepancy (" << num_divergent << ")" << LL_ENDL;
}
// </FS:Ansariel>
}

2
indra/newview/llviewertexturelist.cpp
View File

@ -1017,7 +1017,7 @@ void LLViewerTextureList::updateOneImageDecodePriority(LLPointer<LLViewerFetched
{
const F32 lazy_flush_timeout = 30.f; // stop decoding
const F32 max_inactive_time = 20.f; // actually delete
const S32 min_refs = 3; // 1 for mImageList, 1 for mUUIDMap, 1 for local reference
const S32 min_refs = 4; // 1 for mImageList, 1 for mUUIDMap, 2 for local references
bool reset_timer = gViewerWindow->getProgressView()->getVisible();

5
indra/newview/llviewerwindow.cpp
View File

@ -5939,7 +5939,10 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
if ((image_width <= gGLManager.mGLMaxTextureSize && image_height <= gGLManager.mGLMaxTextureSize) &&
(image_width > window_width || image_height > window_height) && LLPipeline::sRenderDeferred && !show_ui)
{
U32 color_fmt = type == LLSnapshotModel::SNAPSHOT_TYPE_DEPTH ? GL_DEPTH_COMPONENT : GL_RGBA;
// <FS:Ansariel> FIRE-15667: 24bit depth maps
//U32 color_fmt = type == LLSnapshotModel::SNAPSHOT_TYPE_DEPTH ? GL_DEPTH_COMPONENT : GL_RGBA;
U32 color_fmt = (type == LLSnapshotModel::SNAPSHOT_TYPE_DEPTH || type == LLSnapshotModel::SNAPSHOT_TYPE_DEPTH24) ? GL_DEPTH_COMPONENT : GL_RGBA;
// </FS:Ansariel>
if (scratch_space.allocate(image_width, image_height, color_fmt, true, true))
{
original_width = gPipeline.mDeferredScreen.getWidth();

14
indra/newview/skins/default/xui/de/panel_preferences_UI.xml
View File

@ -104,6 +104,20 @@
<check_box label="Menüsuche anzeigen" name="show_search_menu_check"/>
<check_box label="Kontostand anzeigen" name="FSShowCurrencyBalanceInStatusbar"/>
<check_box label="Popup-Fenster beim Überfahren der Icons mit der Maus in der Menüleiste aktivieren" name="FSStatusBarMenuButtonPopupOnRollover"/>
<text name="statusbar_timeformat_textbox">
Zeitformat:
</text>
<combo_box name="FSStatusBarTimeFormat" tool_tip="Bestimmt das Zeitformat, das in der Menüleiste verwendet wird.">
<combo_box.item label="Standard ausgewählter Sprache" name="Language"/>
<combo_box.item label="12 Stunden" name="12_Hour"/>
<combo_box.item label="12 Stunden inkl. Sekunden" name="12_Hour_Seconds"/>
<combo_box.item label="12 Stunden inkl. Zeitzone" name="12_Hour_TZ"/>
<combo_box.item label="12 Stunden inkl. Sekunden &amp; Zeitzone" name="12_Hour_TZ_Seconds"/>
<combo_box.item label="24 Stunden" name="24_Hour"/>
<combo_box.item label="24 Stunden inkl. Sekunden" name="24_Hour_Seconds"/>
<combo_box.item label="24 Stunden inkl. Zeitzone" name="24_Hour_TZ"/>
<combo_box.item label="24 Stunden inkl. Sekunden &amp; Zeitzone" name="24_Hour_TZ_Seconds"/>
</combo_box>
<text name="navfav_textbox">
Navigations- und Favoriten-Leiste:
</text>

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

@ -81,6 +81,11 @@
<key>value</key>
<string>"[OBJECT]" wurde aufgrund von RLV-Einschränkungen verweigert, dich zu teleportieren.</string>
</map>
<key>blocked_scriptdialog</key>
<map>
<key>value</key>
<string>Skript-Dialog oder Textbox kann aufgrund von RLV-Einschränkungen nicht angezeigt werden.</string>
</map>
<key>blocked_startim</key>
<map>
<key>value</key>

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

@ -165,7 +165,7 @@ Additional code generously contributed to Firestorm by:
top_pad="4"
width="450"
wrap="true">
Albatroz Hird, Alexie Birman, Andromeda Rage, Angeldark Raymaker, Animats, Armin Weatherwax, Beq Janus, Casper Warden, Chalice Yao, Chaser Zaks, Cron Stardust, Damian Zhaoying, Dan Threebeards, Dawa Gurbux, Denver Maksim, Drake Arconis, Felyza Wishbringer, f0rbidden, Fractured Crystal, Geenz Spad, Gibson Firehawk, Hitomi Tiponi, Inusaito Sayori, Jean Severine, Katharine Berry, Kittin Ninetails, Kool Koolhoven, Lance Corrimal, Lassie, Latif Khalifa, Laurent Bechir, Magne Metaverse LLC, Magus Freston, Manami Hokkigai, MartinRJ Fayray, McCabe Maxstead, Melancholy Lemon, Melysmile, Mimika Oh, Mister Acacia, MorganMegan, mygoditsfullofstars, Mysty Saunders, Nagi Michinaga, Name Short, nhede Core, NiranV Dean, Nogardrevlis Lectar, Oren Hurvitz, Paladin Forzane, paperwork, Penny Patton, Peyton Menges, programmtest, Qwerty Venom, Revolution Smythe, Romka Swallowtail, Sahkolihaa Contepomi, sal Kaligawa, Samm Florian, Satomi Ahn, Sei Lisa, Sempervirens Oddfellow, Shin Wasp, Shyotl Kuhr, Sione Lomu, Skills Hak, StarlightShining, Sunset Faulkes, Testicular Slingshot, Thickbrick Sleaford, Ubit Umarov, Vaalith Jinn, Vincent Sylvester, Whirly Fizzle, Xenhat Liamano, Zwagoth Klaar and others.
Albatroz Hird, Alexie Birman, Andromeda Rage, Angeldark Raymaker, Animats, Armin Weatherwax, Beq Janus, Casper Warden, Chalice Yao, Chaser Zaks, Chorazin Allen, Cron Stardust, Damian Zhaoying, Dan Threebeards, Dawa Gurbux, Denver Maksim, Drake Arconis, Felyza Wishbringer, f0rbidden, Fractured Crystal, Geenz Spad, Gibson Firehawk, Hitomi Tiponi, Inusaito Sayori, Jean Severine, Katharine Berry, Kittin Ninetails, Kool Koolhoven, Lance Corrimal, Lassie, Latif Khalifa, Laurent Bechir, Magne Metaverse LLC, Magus Freston, Manami Hokkigai, MartinRJ Fayray, McCabe Maxstead, Melancholy Lemon, Melysmile, Mimika Oh, Mister Acacia, MorganMegan, mygoditsfullofstars, Mysty Saunders, Nagi Michinaga, Name Short, nhede Core, NiranV Dean, Nogardrevlis Lectar, Oren Hurvitz, Paladin Forzane, paperwork, Penny Patton, Peyton Menges, programmtest, Qwerty Venom, Revolution Smythe, Romka Swallowtail, Sahkolihaa Contepomi, sal Kaligawa, Samm Florian, Satomi Ahn, Sei Lisa, Sempervirens Oddfellow, Shin Wasp, Shyotl Kuhr, Sione Lomu, Skills Hak, StarlightShining, Sunset Faulkes, Testicular Slingshot, Thickbrick Sleaford, Ubit Umarov, Vaalith Jinn, Vincent Sylvester, Whirly Fizzle, Xenhat Liamano, Zwagoth Klaar and others.
</text>
<text
follows="top|left"

58
indra/newview/skins/default/xui/en/panel_preferences_UI.xml
View File

@ -721,6 +721,63 @@
name="FSStatusBarMenuButtonPopupOnRollover"
width="270"
control_name="FSStatusBarMenuButtonPopupOnRollover"/>
<text
type="string"
follows="left|top"
height="16"
layout="topleft"
name="statusbar_timeformat_textbox"
left="13"
top_pad="8"
width="75">
Time format:
</text>
<combo_box
control_name="FSStatusBarTimeFormat"
height="23"
layout="topleft"
left_pad="10"
top_delta="-4"
name="FSStatusBarTimeFormat"
tool_tip="Selects the time format used on main menu bar."
width="250">
<combo_box.item
label="Language default"
name="Language"
value="Language"/>
<combo_box.item
label="12 Hour"
name="12_Hour"
value="12 Hour"/>
<combo_box.item
label="12 Hour incl. Seconds"
name="12_Hour_Seconds"
value="12 Hour Seconds"/>
<combo_box.item
label="12 Hour incl. Timezone"
name="12_Hour_TZ"
value="12 Hour TZ"/>
<combo_box.item
label="12 Hour incl. Seconds &amp; Timezone"
name="12_Hour_TZ_Seconds"
value="12 Hour TZ Seconds"/>
<combo_box.item
label="24 Hour"
name="24_Hour"
value="24 Hour"/>
<combo_box.item
label="24 Hour incl. Seconds"
name="24_Hour_Seconds"
value="24 Hour Seconds"/>
<combo_box.item
label="24 Hour incl. Timezone"
name="24_Hour_TZ"
value="12 Hour TZ"/>
<combo_box.item
label="24 Hour incl. Seconds &amp; Timezone"
name="24_Hour_TZ_Seconds"
value="24 Hour TZ Seconds"/>
</combo_box>
<text
type="string"
@ -762,7 +819,6 @@
width="270"
left="20"
control_name="ShowSearchTopBar"/>
</panel>
<!--Interface Windows-->

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

@ -307,7 +307,7 @@
font="SansSerifSmall"
text_color="TimeTextColor"
follows="right|top"
halign="left"
halign="center"
height="16"
h_pad="2"
top="4"

14
indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
View File

@ -98,6 +98,20 @@
<check_box label="Pokaż wyszukiwarkę pozycji w menu" name="show_search_menu_check" />
<check_box label="Pokaż stan konta" name="FSShowCurrencyBalanceInStatusbar" />
<check_box label="Włącz autorozwijanie menusów przy wskazywaniu ikon na pasku" name="FSStatusBarMenuButtonPopupOnRollover" />
<text name="statusbar_timeformat_textbox">
Format czasu:
</text>
<combo_box name="FSStatusBarTimeFormat" tool_tip="Wybierz format czasu używany na pasku głównego menu.">
<combo_box.item label="Domyślny języka" name="Language" />
<combo_box.item label="12-godzinny" name="12_Hour" />
<combo_box.item label="12-godzinny z sekundami" name="12_Hour_Seconds" />
<combo_box.item label="12-godzinny ze strefą czasową" name="12_Hour_TZ" />
<combo_box.item label="12-godzinny ze strefą czasową i sekundami" name="12_Hour_TZ_Seconds" />
<combo_box.item label="24-godzinny" name="24_Hour" />
<combo_box.item label="24-godzinny z sekundami" name="24_Hour_Seconds" />
<combo_box.item label="24-godzinny ze strefą czasową" name="24_Hour_TZ" />
<combo_box.item label="24-godzinny ze strefą czasową i sekundami" name="24_Hour_TZ_Seconds" />
</combo_box>
<text name="navfav_textbox">
Paski nawigacji i ulubionych:
</text>

5
indra/newview/skins/default/xui/pl/rlva_strings.xml
View File

@ -124,6 +124,11 @@
<key>value</key>
<string>Teleportacja poprzez obiekt '[OBJECT]' nie powiodła się ze względu na ograniczenia RLV</string>
</map>
<key>blocked_scriptdialog</key>
<map>
<key>value</key>
<string>Nie można wyświetlić okna dialogowego lub pola tekstowego skryptu ze względu na ograniczenia RLV</string>
</map>
<key>blocked_startim</key>
<map>
<key>value</key>

4
indra/newview/skins/default/xui/ru/floater_fs_asset_blacklist.xml
View File

@ -33,6 +33,8 @@
<columns name="permanent" label="Постоянно"/>
</fs_scroll_list>
<button name="remove_btn" label="Удалить из черного списка" width="190"/>
<button name="remove_temp_btn" label="Удалить не постоянные" width="190" />
<button name="remove_temp_btn" label="Удалить не постоянные" width="170" />
<button name="play_btn" label="Проиграть звук" tool_tip="Воспроизвести выбранный звук; для воспроизведения можно выбрать только одну звуковую запись." width="120"/>
<button name="stop_btn" label="Остановить звук" tool_tip="Остановить воспроизведение текущего звука." width="120"/>
<button name="close_btn" label="Закрыть"/>
</floater>

14
indra/newview/skins/default/xui/ru/panel_preferences_UI.xml
View File

@ -102,6 +102,20 @@
<check_box label="Показать поиск в меню" name="show_search_menu_check"/>
<check_box label="Показать текущий баланс L$" name="FSShowCurrencyBalanceInStatusbar"/>
<check_box label="Включить выпадающие окна меню мыши на значках верхнего меню" name="FSStatusBarMenuButtonPopupOnRollover" width="270" />
<text name="statusbar_timeformat_textbox" width="100">
Формат времени:
</text>
<combo_box name="FSStatusBarTimeFormat" tool_tip="Выбирает формат времени, используемый в строке главного меню." width="250">
<combo_box.item label="Стандарт выбранного языка" name="Language"/>
<combo_box.item label="12 Часов" name="12_Hour"/>
<combo_box.item label="12 Часов с Секундами" name="12_Hour_Seconds"/>
<combo_box.item label="12 Часов с Часовым поясом" name="12_Hour_TZ"/>
<combo_box.item label="12 Часов с Секундами и Часовым поясом" name="12_Hour_TZ_Seconds"/>
<combo_box.item label="24 Часа" name="24_Hour"/>
<combo_box.item label="24 Часа с Секундами" name="24_Hour_Seconds"/>
<combo_box.item label="24 Часа с Часовым поясом" name="24_Hour_TZ"/>
<combo_box.item label="24 Часа с Секундами и Часовым поясом" name="24_Hour_TZ_Seconds"/>
</combo_box>
<text name="navfav_textbox">
Панель навигации и закладок:
</text>

5
indra/newview/skins/default/xui/ru/rlva_strings.xml
View File

@ -136,6 +136,11 @@
<key>value</key>
<string>'[OBJECT]' было отказано в разрешении телепортировать вас из-за ограничений RLV</string>
</map>
<key>blocked_scriptdialog</key>
<map>
<key>value</key>
<string>Невозможно отобразить диалоговое окно или текстовое поле скрипта из-за ограничений RLV</string>
</map>
<key>blocked_startim</key>
<map>
<key>value</key>

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

@ -336,7 +336,7 @@
font="SansSerifSmall"
text_color="TimeTextColor"
follows="right|top"
halign="left"
halign="center"
height="16"
h_pad="2"
top="4"

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

@ -332,7 +332,7 @@
font="SansSerifSmall"
text_color="TimeTextColor"
follows="right|top"
halign="left"
halign="center"
height="16"
h_pad="2"
top="4"