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

Added option to disable Radar enhancements

Northspring 2014-06-15 02:52:35 +02:00
parent eab01ce6b5
commit d0a51da894
8 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21663,6 +21663,17 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>0</integer>
</map>
<key>FSRadarEnhanceByBridge</key>
<map>
<key>Comment</key>
<string>Enhance radar functionality by using client LSL Bridge.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSSyncronizeTextureMaps</key>
<map>
<key>Comment</key>

3
indra/newview/fsradar.cpp
View File

@ -177,6 +177,7 @@ void FSRadar::updateRadarList()
static LLCachedControl<bool> sFSLegacyRadarFriendColoring(gSavedSettings, "FSLegacyRadarFriendColoring");
static LLCachedControl<bool> sRadarColorNamesByDistance(gSavedSettings, "FSRadarColorNamesByDistance", false);
static LLCachedControl<bool> RadarShowMutedAndDerendered(gSavedSettings, "FSRadarShowMutedAndDerendered");
static LLCachedControl<bool> sFSRadarEnhanceByBridge(gSavedSettings, "FSRadarEnhanceByBridge");
bool sUseLSLBridge = FSLSLBridge::instance().canUseBridge();
F32 drawRadius(RenderFarClip);
@ -329,7 +330,7 @@ void FSRadar::updateRadarList()
}
//schedule offset requests, if needed
if (sUseLSLBridge && (now > (mRadarLastBulkOffsetRequestTime + FSRADAR_COARSE_OFFSET_INTERVAL)) && (now > lastZOffsetTime + FSRADAR_COARSE_OFFSET_INTERVAL))
if (sUseLSLBridge && sFSRadarEnhanceByBridge && (now > (mRadarLastBulkOffsetRequestTime + FSRADAR_COARSE_OFFSET_INTERVAL)) && (now > lastZOffsetTime + FSRADAR_COARSE_OFFSET_INTERVAL))
{
mRadarOffsetRequests.push_back(avId);
ent->mLastZOffsetTime = now;

13
indra/newview/skins/default/xui/en/menu_fs_radar_options.xml
View File

@ -213,7 +213,18 @@
function="RLV.EnableIfNot"
parameter="showminimap" />
</menu_item_check>
<menu_item_check
label="Enhance radar with LSL-Client Bridge"
name="FSRadarEnhanceByBridge"
enabled_control="UseLSLBridge">
<menu_item_check.on_check
control="FSRadarEnhanceByBridge" />
<menu_item_check.on_click
function="ToggleControl"
parameter="FSRadarEnhanceByBridge" />
</menu_item_check>
<menu_item_separator layout="topleft" />
<menu_item_call name="show_blocked_list" label="Open Blocked Residents &amp; Objects">
<menu_item_call.on_click function="Radar.Option.Action" userdata="panel_block_list_sidetray" />

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

@ -1588,6 +1588,17 @@
height="20"
width="400" />
<check_box
enabled_control="UseLSLBridge"
control_name="FSRadarEnhanceByBridge"
name="FSRadarEnhanceByBridge"
label="Enhance radar with LSL-Client Bridge"
tool_tip="If this is enabled, radar functions responsible for determining avatar locations at high altitudes are assisted by the LSL-Client Bridge, particularly when they're beyond draw distance."
layout="topleft"
top_pad="0"
height="20"
width="400" />
</panel>
<!-- Chat: Keyword Alerts -->

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

@ -23,5 +23,6 @@
<menu_item_check label="Powiadom o wyjściu osoby z zasięgu regionu" name="RadarReportSimRangeLeave"/>
<menu_item_check label="Wysyłaj alerty wejść do skryptów" name="RadarEnterChannelAlert"/>
<menu_item_check label="Wysyłaj alerty wyjść do skryptów" name="RadarLeaveChannelAlert"/>
<menu_item_check label="Wspomaganie radaru za pomocą Mostu LSL" name="FSRadarEnhanceByBridge"/>
<menu_item_call label="Pokaż zablokowanych Rezydentów i obiekty" name="show_blocked_list"/>
</toggleable_menu>

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

@ -225,6 +225,7 @@
<button name="Def_UISndRadarSimLeave" tool_tip="Resetuj do domyślnego UUID."/>
<check_box name="RadarEnterChannelAlert" label="Zgłaszaj alerty wejść skryptom"/>
<check_box name="RadarLeaveChannelAlert" label="Zgłaszaj alerty wyjść skryptom"/>
<check_box name="FSRadarEnhanceByBridge" label="Wspomaganie radaru za pomocą Mostu LSL" tool_tip="Gdy ta opcja jest włączona, to funkcje radaru odpowiedzialne za ustalanie wysokości na jakiej znajdują się awatary są wspomagane przez Most LSL - zwłaszcza gdy jest ona duża i osoby są poza polem widzenia."/>
</panel>
<panel label="Detektor słów" name="ChatKeywordAlerts">
<check_box name="FSKeywordOn" label="Włącz detektor słów"/>

13
indra/newview/skins/vintage/xui/en/panel_people.xml
View File

@ -248,6 +248,19 @@ Looking for people to hang out with? Use the search box to find topics or conten
layout="topleft"
follows="left|top"/>
<check_box
enabled_control="UseLSLBridge"
label="Enhance radar with LSL-Client Bridge"
tool_tip="If this is enabled, radar functions responsible for determining avatar locations at high altitudes are assisted by the LSL-Client Bridge, particularly when they're beyond draw distance."
left="0"
top_pad="2"
name="FSRadarEnhanceByBridge"
control_name="FSRadarEnhanceByBridge"
right="-1"
height="16"
layout="topleft"
follows="left|top"/>
<check_box
label="Color names based on distance"
left="0"

1
indra/newview/skins/vintage/xui/pl/panel_people.xml
View File

@ -48,6 +48,7 @@ Chcesz spotkać ludzi? Spróbuj użyć [secondlife:///app/worldmap Mapy Świata]
<check_box label="Zgłaszaj wyjście z przestrzeni regionu" name="RadarReportSimRangeLeave"/>
<check_box label="Zgłaszaj alerty wejść skryptom" name="RadarEnterChannelAlert"/>
<check_box label="Zgłaszaj alerty wyjść skryptom" name="RadarLeaveChannelAlert"/>
<check_box label="Wspomaganie radaru za pomocą Mostu LSL" tool_tip="Gdy ta opcja jest włączona, to funkcje radaru odpowiedzialne za ustalanie wysokości na jakiej znajdują się awatary są wspomagane przez Most LSL - zwłaszcza gdy jest ona duża i osoby są poza polem widzenia." name="FSRadarEnhanceByBridge"/>
<check_box label="Koloruj imiona bazując na odległości" name="FSRadarColorNamesByDistance"/>
<check_box label="Ogranicz odl.:" tool_tip="Ogranicza wyniki do określonego dystansu" name="LimitRadarByRange" />
<text name="radarmap_range_label" value="Format imion radaru:"/>