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

Merge.

Nicky 2014-04-07 19:59:43 +02:00
parent b9d12d2e23 7889dbc9e2
commit e28a76448e
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/fsradar.h
View File

@ -128,9 +128,9 @@ private:
radarfields_map_t mLastRadarSweep;
entry_map_t mEntryList;
std::vector<LLUUID> mRadarEnterAlerts;
std::vector<LLUUID> mRadarLeaveAlerts;
std::vector<LLUUID> mRadarOffsetRequests;
uuid_vec_t mRadarEnterAlerts;
uuid_vec_t mRadarLeaveAlerts;
uuid_vec_t mRadarOffsetRequests;
std::vector<LLSD> mRadarEntriesData;
S32 mRadarFrameCount;

2
indra/newview/linux_tools/wrapper.sh
View File

@ -164,7 +164,7 @@ LL_RUN_ERR=$?
if [ $LL_RUN_ERR -ne 0 ]; then
# generic error running the binary
echo '*** Bad shutdown ($LL_RUN_ERR). ***'
if [ "$(uname -m)" = "x86_64" ]; then
if [ "$(uname -m)" = "x86_64" ] && [ "$(file bin/do-not-directly-run-firestorm-bin | grep -o 64-bit )" != "64-bit" ]; then
echo
cat << EOFMARKER
You are running the Firestorm Viewer on a x86_64 platform. The

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

@ -2237,6 +2237,10 @@ Chcesz wyłączyć Tryb Zajętości przed zakończeniem tej transakcji?
Na pewno chcesz wyczyścić bufor Szafy?
<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
</notification>
<notification name="ConfirmClearWebBrowserCache">
Na pewno chcesz wyczyścić bufor wbudowanej przeglądarki internetowej?
<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/>
</notification>
<notification name="ConfirmClearCookies">
Na pewno chcesz wyczyścić ciasteczka?
<usetemplate name="okcancelbuttons" notext="Anuluj" yestext="Tak"/>

1
indra/newview/skins/default/xui/pl/panel_preferences_setup.xml
View File

@ -56,6 +56,7 @@
<combo_box.item label="Pięć okien" name="web_5"/>
<combo_box.item label="Dziesięć okien" name="web_10"/>
</combo_box>
<button label="Wyczyść bufor przeglądarki WWW" name="ClearWebBrowserCache" width="195"/>
<check_box label="Włącz wtyczki" name="browser_plugins_enabled"/>
<check_box label="Akceptuj ciasteczka" name="cookies_enabled"/>
<check_box label="Włącz Javascript" name="browser_javascript_enabled"/>