Damian/Puma_Viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quitado código del LSL bridge y funciones dependientes

Browse Source 
Corrección de errores previos en la migración.
Cambiada la pantalla de inicio (Splash Screen)
This commit is contained in:
Damian
2025-05-26 06:28:46 -03:00
parent a5d5fe6288
commit 32da2fd0fb
55 changed files with 1001 additions and 1029 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/skins/default/xui/en/floater_top_objects.xml
-13
View File
@@ -298,19 +298,6 @@
<button.commit_callback
function="TopObjects.Profile" />
</button>
<button
enabled_control="UseLSLBridge"
follows="bottom|left"
height="23"
label="Script Info"
layout="topleft"
left_pad="10"
name="script_info_btn"
top_delta="0"
width="100">
<button.commit_callback
function="TopObjects.ScriptInfo" />
</button>
<button
enabled="false"
follows="bottom|left"
indra/newview/skins/default/xui/en/menu_fs_radar_options.xml
-10
View File
@@ -292,16 +292,6 @@
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"
indra/newview/skins/default/xui/en/menu_viewer.xml
-17
View File
@@ -423,17 +423,6 @@
<menu_item_check.on_enable
function="Self.EnableForceSit" />
</menu_item_check>
<menu_item_check
label="Movelock"
shortcut="control|alt|P"
name="Move Lock">
<menu_item_check.on_check
function="Self.GetMoveLock" />
<menu_item_check.on_click
function="Self.ToggleMoveLock" />
<menu_item_check.on_enable
function="Self.EnableMoveLock" />
</menu_item_check>
<menu_item_check
label="Quickjump"
name="Avatar Ignore Prejump">
@@ -558,12 +547,6 @@
function="Floater.Show"
parameter="lagmeter" />
</menu_item_call>
<menu_item_call
label="Recreate LSL Bridge"
name="Recreate LSL Bridge">
<menu_item_call.on_click
function="RecreateLSLBridge"/>
</menu_item_call>
</menu>
<menu_item_call
indra/newview/skins/default/xui/en/notifications.xml
-28
View File
@@ -11196,34 +11196,6 @@ Phantom mode on.
Phantom mode off.
</notification>
<notification
icon="notifytip.tga"
name="MovelockEnabled"
type="notifytip">
Movelock enabled. Use Avatar &gt; Movement &gt; Movelock to disable.
</notification>
<notification
icon="notifytip.tga"
name="MovelockDisabled"
type="notifytip">
Movelock disabled.
</notification>
<notification
icon="notifytip.tga"
name="MovelockEnabling"
type="notifytip">
Enabling movelock...
</notification>
<notification
icon="notifytip.tga"
name="MovelockDisabling"
type="notifytip">
Disabling movelock...
</notification>
<notification
icon="notifytip.tga"
name="FlightAssistEnabled"
indra/newview/skins/default/xui/en/panel_fs_login.xml
+2 -54
View File
@@ -12,10 +12,10 @@
width="1024">
<panel.string
name="real_url" translate="false">
https://phoenixviewer.com/app/loginV3/
https://viewer-splash.secondlife.com/
</panel.string>
<string name="reg_in_client_url" translate="false">
http://secondlife.eniac15.lindenlab.com/reg-in-client/
http://ayudavirtual.org/unirseasl/
</string>
<panel.string
name="forgot_password_url">
@@ -299,57 +299,5 @@
tab_stop="false"
visible="false" />
</layout_panel>
<layout_panel
tab_stop="false"
follows="right|bottom"
name="mode_selection"
width="210"
min_width="100"
height="80">
<text
follows="right|bottom"
font="SansSerif"
font.style="BOLD"
font.size="Large"
halign="right"
height="16"
name="mode_selection_text"
top="8"
right="-15"
width="200">
SELECT MODE
</text>
<combo_box
follows="right|bottom"
top="35"
left_pad="10"
right="-15"
height="23"
max_chars="128"
tool_tip="Select which style of viewer you are most familiar with to set your defaults to appropriately."
name="mode_combo"
width="110">
<combo_box.item
label="Firestorm"
name="Firestorm"
value="settings_firestorm.xml" />
<combo_box.item
label="Phoenix"
name="Phoenix"
value="settings_phoenix.xml" />
<combo_box.item
label="[VIEWER_GENERATION]"
name="V3"
value="settings_v3.xml" />
<combo_box.item
label="Hybrid"
name="Hybrid"
value="settings_hybrid.xml" />
<combo_box.item
label="Text"
name="Text"
value="settings_text.xml" />
</combo_box>
</layout_panel>
</layout_stack>
</panel>
indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
+1 -53
View File
@@ -52,7 +52,7 @@
<icon
height="125"
width="125"
image_name="login_fs_logo"
image_name="login_pm_logo"
left="0"
top="10"
name="sl_logo_small" />
@@ -320,58 +320,6 @@
+ Click to add more grids
</text>
</layout_panel>
<layout_panel
follows="left|top|right"
name="mode_selection"
width="342"
height="66">
<text
follows="right|top"
font="SansSerifLarge"
halign="right"
valign="center"
height="32"
name="mode_selection_text"
top_pad="5"
right="-130"
width="75">
Mode:
</text>
<combo_box
follows="right|bottom"
top_delta="0"
left_pad="10"
right="-5"
height="32"
max_chars="128"
tool_tip="Select which style of viewer you are most familiar with to set your defaults to appropriately."
name="mode_combo"
width="120"
combo_button.scale_image="true">
<combo_box.drop_down_button
font="SansSerifLarge"/>
<combo_box.item
label="Firestorm"
name="Firestorm"
value="settings_firestorm.xml" />
<combo_box.item
label="Phoenix"
name="Phoenix"
value="settings_phoenix.xml" />
<combo_box.item
label="[VIEWER_GENERATION]"
name="V3"
value="settings_v3.xml" />
<combo_box.item
label="Hybrid"
name="Hybrid"
value="settings_hybrid.xml" />
<combo_box.item
label="Text"
name="Text"
value="settings_text.xml" />
</combo_box>
</layout_panel>
</layout_stack> <!-- 2nd_row_stack -->
</layout_panel> <!-- 2nd_row -->
indra/newview/skins/default/xui/en/panel_preferences_chat.xml
-11
View File
@@ -1688,17 +1688,6 @@
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" />
<text
layout="topleft"
follows="left|top"
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
-72
View File
@@ -148,49 +148,6 @@
width="225"
tool_tip="Interval in seconds between each draw distance increment"/>
<check_box
top_pad="10"
control_name="UseLSLBridge"
follows="left|top"
height="16"
initial_value="true"
name="UseLSLBridge"
label="Enable LSL-Client Bridge"
left="10"
width="270"
tool_tip="Allows the Viewer to use a scripted attachment (Bridge) to extend its features"/>
<combo_box
control_name="UseLSLFlightAssist"
enabled_control="UseLSLBridge"
layout="topleft"
left="10"
top_pad="2"
follows="left|top"
height="25"
name="UseLSLFlightAssist"
tool_tip="Enables the script that assists flying and hovering at extended altitudes"
width="225">
<combo_box.item
label="Flight Assist: Disabled"
name="flight_disabled"
value="0.0" />
<combo_box.item
label="Flight Assist: Mild boost"
name="flight_mild"
value="0.5" />
<combo_box.item
label="Flight Assist: Moderate boost"
name="flight_moderate"
value="1.0" />
<combo_box.item
label="Flight Assist: Strong boost"
name="flight_strong"
value="2.0" />
<combo_box.item
label="Flight Assist: Extreme boost"
name="flight_extreme"
value="15.0" />
</combo_box>
<slider
name="manual_environment_change_transition_period"
control_name="FSEnvironmentManualTransitionTime"
@@ -852,26 +809,6 @@
width="500">
LSL-Client Bridge external protocols integration:
</text>
<check_box
follows="left|top"
height="16"
label="Allow OpenCollar protocol to enable or disable built in AO"
left="15"
top_pad="10"
name="BridgeIntegrationOC"
width="450"
enabled_control="UseLSLBridge"
control_name="BridgeIntegrationOC" />
<check_box
follows="left|top"
height="16"
label="Allow LockMeister protocol to enable or disable built in AO"
left="15"
top_pad="2"
name="BridgeIntegrationLM"
width="450"
enabled_control="UseLSLBridge"
control_name="BridgeIntegrationLM" />
</panel>
@@ -1648,15 +1585,6 @@
tool_tip="Expand the advanced animation information in the animation preview floater by default"
name="FSAnimationPreviewExpanded"
control_name="FSAnimationPreviewExpanded"/>
<check_box
top_pad="8"
follows="left|top"
height="16"
label="Enable extended script info details"
tool_tip="If enabled, extend basic script info feature with various details useful for builders"
name="FSScriptInfoExtended"
enabled_control="UseLSLBridge"
control_name="FSScriptInfoExtended"/>
<check_box
top_pad="8"
follows="left|top"
indra/newview/skins/default/xui/en/panel_preferences_move.xml
-35
View File
@@ -582,41 +582,6 @@
value="1"
width="75" />
</radio_group>
<text
follows="left|top"
type="string"
length="1"
height="10"
layout="topleft"
left="10"
name="movelock_lbl"
width="450"
top_pad="5">
If built in LSL Bridge movelock is active...
</text>
<check_box
control_name="RelockMoveLockAfterRegionChange"
enabled_control="UseLSLBridge"
follows="left|top"
height="20"
label="Always re-lock position after region change"
layout="topleft"
left_delta="5"
name="RelockMoveLockAfterRegionChange"
width="237"
top_pad="5"/>
<check_box
control_name="RelockMoveLockAfterMovement"
enabled_control="UseLSLBridge"
follows="left|top"
height="20"
label="Lock and unlock position after stopping or starting movement"
layout="topleft"
left_delta="0"
name="RelockMoveLockAfterMovement"
width="237"
top_pad="0"/>
<text
follows="left|top"
type="string"
indra/newview/skins/default/xui/en/panel_preferences_sound.xml
-56
View File
@@ -3643,62 +3643,6 @@ Hover your mouse cursor over UUID field to show its default value.
left_pad="1"
width="120" />
<text
layout="topleft"
follows="left|top"
top_pad="7"
left="5"
height="14"
width="150"
tool_tip="Sound UUID played on toggling movelock."
name="textFSMovelockToggle">
Toggling movelock:
</text>
<line_editor
follows="left|top"
left_pad="5"
height="20"
max_length_chars="256"
name="UISndMovelockToggle"
control_name="UISndMovelockToggle"
width="218"/>
<button
follows="left|top"
name="Prev_UISndMovelockToggle"
height="20"
label="P"
layout="topleft"
top_delta="-1"
left_pad="1"
width="17"
sound_flags="0"
tool_tip="Preview this sound.">
<button.commit_callback
function="PreviewUISound"
parameter="UISndMovelockToggle"/>
</button>
<button
follows="left|top"
name="Def_UISndMovelockToggle"
height="20"
label="D"
layout="topleft"
left_pad="1"
width="17"
tool_tip="Reset to the default UUID.">
<button.commit_callback
function="ResetControl"
parameter="UISndMovelockToggle"/>
</button>
<check_box
control_name="PlayModeUISndMovelockToggle"
height="20"
label="Play this sound"
layout="topleft"
name="PlayModeUISndMovelockToggle"
left_pad="1"
width="120" />
<text
layout="topleft"
follows="left|top"
indra/newview/skins/default/xui/en/strings.xml
-2
View File
@@ -2760,7 +2760,6 @@ name="Command_360_Capture_Label">360° Snapshot</string>
<string name="Command_Snapshot_To_Disk_Label">Snapshot to Disk</string>
<string name="Command_Radar_Label">Radar</string>
<string name="Command_Conversation_Log_Label">Conversation Log</string>
<string name="Command_Move_Lock_Label">Movelock</string>
<string name="Command_Blocklist_Label">Block List</string>
<string name="Command_ResyncAnimations_Label">Resync animations</string>
<string name="Command_RegionTracker_Label">Region Tracker</string>
@@ -2919,7 +2918,6 @@ name="Command_360_Capture_Tooltip">Capture a 360° equirectangular image</string
<string name="Collision_PhysicalObject">[NAME] hit you with a physical object.</string>
<string name="Collision_UnknownType">[NAME] caused a collision of unknown type.</string>
<string name="MovelockEnabled">Avatar &gt; Movement &gt; Movelock is enabled</string>
<string name="BusyResponse">busy response</string>