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/CMakeLists.txt
-4
View File
@@ -142,8 +142,6 @@ set(viewer_SOURCE_FILES
fsfloaterwhitelisthelper.cpp
fsjointpose.cpp
fskeywords.cpp
fslslbridge.cpp
fslslbridgerequest.cpp
fslslpreproc.cpp
fslslpreprocviewer.cpp
fsmaniprotatejoint.cpp
@@ -961,8 +959,6 @@ set(viewer_HEADER_FILES
fsjointpose.h
fsgridhandler.h
fskeywords.h
fslslbridge.h
fslslbridgerequest.h
fslslpreproc.h
fslslpreprocviewer.h
fsmoneytracker.h
indra/newview/app_settings/commands.xml
-9
View File
@@ -561,15 +561,6 @@
is_running_function="Floater.IsOpen"
is_running_parameters="conversation"
/>
<command name="move_lock"
available_in_toybox="true"
icon="move_lock"
label_ref="Command_Move_Lock_Label"
tooltip_ref="Command_Move_Lock_Tooltip"
execute_function="Self.ToggleMoveLock"
is_running_function="Self.GetMoveLock"
is_enabled_function="Self.EnableMoveLock"
/>
<command name="block_list"
available_in_toybox="true"
icon="block_list"
indra/newview/app_settings/grids.xml
+974 -26
View File
File diff suppressed because it is too large Load Diff
indra/newview/app_settings/settings.xml
-44
View File
@@ -16429,17 +16429,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<string>77a018af-098e-c037-51a6-178f05877c6f</string>
</map>
<key>UISndMovelockToggle</key>
<map>
<key>Comment</key>
<string>Sound file for toggling movelock (uuid for sound asset)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>4174f859-0d3d-c517-c424-72923dc21f65</string>
</map>
<key>UISndNewIncomingIMSession</key>
<map>
<key>Comment</key>
@@ -17416,28 +17405,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<array/>
</map>
<key>UseLSLBridge</key>
<map>
<key>Comment</key>
<string>Use the client LSL bridge for lsl functionality</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RelockMoveLockAfterRegionChange</key>
<map>
<key>Comment</key>
<string>TRUE: Re-lock movelock after region change - refresh avatar position and send to LSL-Client Bridge script. FALSE: Disengage the lock automatically after region change.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>VelocityInterpolate</key>
<map>
<key>Comment</key>
@@ -22201,17 +22168,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>PlayModeUISndMovelockToggle</key>
<map>
<key>Comment</key>
<string>Holds state for Prefs &gt; Sound/Media &gt; UI Sounds - UISndMovelockToggle.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>PlayModeUISndNewIncomingIMSession</key>
<map>
<key>Comment</key>
indra/newview/app_settings/settings_per_account.xml
-67
View File
@@ -974,73 +974,6 @@
<key>Value</key>
<string>0</string>
</map>
<key>UseLSLFlightAssist</key>
<map>
<key>Comment</key>
<string>Use the client LSL bridge for flight boost - boost power: 0.0 (disabled), 0.5 (mild), 1.0 (moderate), 2.0 (high), 15.0 (extreme).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>UseMoveLock</key>
<map>
<key>Comment</key>
<string>Use the client LSL Bridge for movelock</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RelockMoveLockAfterMovement</key>
<map>
<key>Comment</key>
<string>If movelock built-in into LSL Bridge is active, then lock and unlock position after stopping or starting movement</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>MoveLockInfoVisibleOnScreen</key>
<map>
<key>Comment</key>
<string>If movelock built-in into LSL Bridge is active, then show info on screen all the time</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>BridgeIntegrationOC</key>
<map>
<key>Comment</key>
<string>Allow OpenCollar protocol to enable or disable built in AO. Client LSL Bridge needs to be enabled.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>BridgeIntegrationLM</key>
<map>
<key>Comment</key>
<string>Allow LockMeister protocol to enable or disable built in AO. Client LSL Bridge needs to be enabled.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<!-- End of Firestorm settings -->
<key>FSStoredCameraPos</key>
<map>
indra/newview/fsareasearch.cpp
+1 -5
View File
@@ -50,7 +50,6 @@
#include "lltabcontainer.h"
#include "llspinctrl.h"
#include "lltoolgrab.h"
#include "fslslbridge.h"
#include "llcombobox.h"
#include "llnotificationsutil.h"
#include "fsassetblacklist.h"
@@ -1662,7 +1661,7 @@ bool FSPanelAreaSearchList::onContextMenuItemEnable(const LLSD& userdata)
}
else if (parameter == "script")
{
return (mResultList->getNumSelected() > 0 && enable_bridge_function());
return (mResultList->getNumSelected() > 0 );
}
else
{
@@ -1790,9 +1789,6 @@ bool FSPanelAreaSearchList::onContextMenuItemClick(const LLSD& userdata)
cnt++;
}
break;
case 's': // script
FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + item->getUUID().asString() + "|" + (gSavedSettings.getBOOL("FSScriptInfoExtended") ? "1" : "0"));
break;
case 'l': // blacklist
{
const LLUUID& object_id = item->getUUID();
indra/newview/fsfloaterperformance.cpp
-10
View File
@@ -55,7 +55,6 @@
#include "fsavatarrenderpersistence.h"
#include "llpresetsmanager.h"
#include "llwindow.h"
#include "fslslbridge.h"
#include "llbutton.h"
extern F32 gSavedDrawDistance;
@@ -484,11 +483,6 @@ void FSFloaterPerformance::populateHUDList()
LLViewerObject* attached_object = attachment_iter->get();
if (attached_object && attached_object->isHUDAttachment())
{
if (attached_object->getAttachmentItemName() == FSLSLBridge::instance().currentFullName())
{
continue;
}
max_gpu_time = llmax(max_gpu_time, attached_object->mGPURenderTime);
}
}
@@ -510,10 +504,6 @@ void FSFloaterPerformance::populateHUDList()
LLViewerObject* attached_object = attachment_iter->get();
if (attached_object && attached_object->isHUDAttachment())
{
if (attached_object->getAttachmentItemName() == FSLSLBridge::instance().currentFullName())
{
continue;
}
F32 gpu_time = attached_object->mGPURenderTime;
indra/newview/fsgridhandler.cpp
+1 -1
View File
@@ -150,7 +150,7 @@ void gridDownloadComplete( LLSD const &aData, LLGridManager* mOwner, GridEntry*
}
}
const char* DEFAULT_LOGIN_PAGE = "https://phoenixviewer.com/app/loginV3/";
const char* DEFAULT_LOGIN_PAGE = "https://viewer-splash.secondlife.com/";
const char* SYSTEM_GRID_SLURL_BASE = "secondlife://%s/secondlife/";
const char* MAIN_GRID_SLURL_BASE = "http://maps.secondlife.com/secondlife/";
indra/newview/fsradar.cpp
+1 -7
View File
@@ -39,8 +39,6 @@
#include "fsassetblacklist.h"
#include "fscommon.h"
#include "fskeywords.h"
#include "fslslbridge.h"
#include "fslslbridgerequest.h"
#include "lggcontactsets.h"
#include "lfsimfeaturehandler.h"
#include "llagent.h"
@@ -187,7 +185,6 @@ void FSRadar::updateRadarList()
LLViewerParcelMgr& parcelmgr = LLViewerParcelMgr::instance();
LLUIColorTable& colortable = LLUIColorTable::instance();
LLAvatarTracker& avatartracker = LLAvatarTracker::instance();
FSLSLBridge& bridge = FSLSLBridge::instance();
LFSimFeatureHandler& simfeaturehandler = LFSimFeatureHandler::instance();
const F32 chat_range_say = (F32)simfeaturehandler.sayRange();
@@ -219,7 +216,6 @@ void FSRadar::updateRadarList()
static LLCachedControl<bool> sFSRadarColorNamesByDistance(gSavedSettings, "FSRadarColorNamesByDistance", false);
static LLCachedControl<bool> sFSRadarShowMutedAndDerendered(gSavedSettings, "FSRadarShowMutedAndDerendered");
static LLCachedControl<bool> sFSRadarEnhanceByBridge(gSavedSettings, "FSRadarEnhanceByBridge");
bool sUseLSLBridge = bridge.canUseBridge();
F32 drawRadius(sRenderFarClip);
const LLVector3d& posSelf = gAgent.getPositionGlobal();
@@ -362,7 +358,7 @@ void FSRadar::updateRadarList()
}
//schedule offset requests, if needed
if (sUseLSLBridge && sFSRadarEnhanceByBridge && (now > (mRadarLastBulkOffsetRequestTime + FSRADAR_COARSE_OFFSET_INTERVAL)) && (now > lastZOffsetTime + FSRADAR_COARSE_OFFSET_INTERVAL))
if (now > (mRadarLastBulkOffsetRequestTime + FSRADAR_COARSE_OFFSET_INTERVAL) && (now > lastZOffsetTime + FSRADAR_COARSE_OFFSET_INTERVAL))
{
mRadarOffsetRequests.push_back(avId);
ent->mLastZOffsetTime = now;
@@ -667,7 +663,6 @@ void FSRadar::updateRadarList()
if (++updatesPerRequest > FSRADAR_MAX_OFFSET_REQUESTS)
{
msg = msg.substr(0, msg.size() - 1);
bridge.viewerToLSL(prefix + msg, FSLSLBridgeRequestRadarPos_Success);
//LL_INFOS() << " OFFSET REQUEST SEGMENT"<< prefix << msg << LL_ENDL;
msg.clear();
updatesPerRequest = 0;
@@ -676,7 +671,6 @@ void FSRadar::updateRadarList()
if (updatesPerRequest > 0)
{
msg = msg.substr(0, msg.size() - 1);
bridge.viewerToLSL(prefix + msg, FSLSLBridgeRequestRadarPos_Success);
//LL_INFOS() << " OFFSET REQUEST FINAL " << prefix << msg << LL_ENDL;
}
indra/newview/llagent.cpp
+1 -65
View File
@@ -114,7 +114,6 @@
// Firestorm includes
#include "fsfloaternearbychat.h"
#include "fslslbridge.h"
#include "llpresetsmanager.h"
#include "NACLantispam.h"
@@ -4756,43 +4755,6 @@ void LLAgent::clearVisualParams(void *data)
//---------------------------------------------------------------------------
// Teleport
//---------------------------------------------------------------------------
// <FS:TT> Client LSL Bridge
bool LLAgent::teleportBridgeLocal(LLVector3& pos_local)
{
std::stringstream msgstream;
msgstream << std::setiosflags(std::ios::fixed) << std::setprecision(6);
msgstream << pos_local.mV[VX] << ", " << pos_local.mV[VY] << ", " << pos_local.mV[VZ];
// Check for FIRE-10718: llGetSimulatorHostname() is causing LSL Bridge to sleep for 10 seconds during check for current hostname in order to prevent double-click teleport on SL grid, so let's check this in the viewer itself and send 1/0 as additional value
#ifdef OPENSIM
const std::string isLindenLabHost = LLGridManager::getInstance()->isInSecondLife() ? "1" : "0";
#else
const std::string isLindenLabHost = "1";
#endif
return FSLSLBridge::instance().viewerToLSL("llMoveToTarget|" + msgstream.str() + "|" + isLindenLabHost);
}
bool LLAgent::teleportBridgeGlobal(const LLVector3d& pos_global)
{
// <FS:Beq> FIRE-30534 VarRegion fixes
// U64 region_handle = to_region_handle(pos_global);
U64 region_handle{};
auto regionp = getRegion();
if(regionp)
{
region_handle = to_region_handle(pos_global, regionp->getOriginGlobal(), regionp->getWidth());
}
else
{
region_handle = to_region_handle(pos_global);
}
// </FS:Beq>
LLVector3 pos_local = (LLVector3)(pos_global - from_region_handle(region_handle));
return teleportBridgeLocal(pos_local);
}
// </FS:TT> Client LSL Bridge
// teleportCore() - stuff to do on any teleport
// protected
@@ -5424,12 +5386,6 @@ void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global)
<< LL_ENDL;
// </FS:Beq>
}
// <FS:TT> Client LSL Bridge
if (FSLSLBridge::instance().canUseBridge() && is_local)
{
teleportBridgeGlobal(pos_global);
}
// </FS:TT>
}
// Teleport to global position, but keep facing in the same direction
@@ -5487,15 +5443,6 @@ void LLAgent::teleportViaLocationLookAt(const LLVector3d& pos_global, const LLVe
// LLVector3 pos_local = (LLVector3)(pos_global - from_region_handle(region_handle));
// teleportRequest(region_handle, pos_local, look_at);
// // <FS:TT> Client LSL Bridge
// if (FSLSLBridge::instance().canUseBridge())
// {
// if (region_handle == to_region_handle(getPositionGlobal()))
// {
// teleportBridgeLocal(pos_local);
// }
// }
// // </FS:TT>
// }
void LLAgent::doTeleportViaLocationLookAt(const LLVector3d& pos_global, const LLVector3& look_at)
{
@@ -5521,17 +5468,6 @@ void LLAgent::doTeleportViaLocationLookAt(const LLVector3d& pos_global, const LL
LLVector3 pos_within_target_region = (LLVector3)(pos_global - from_region_handle(region_handle));
teleportRequest(region_handle, pos_within_target_region, look_at);
// <FS:TT> Client LSL Bridge
if ( FSLSLBridge::instance().canUseBridge() )
{
// refresh regionp
regionp = getRegion();
if( regionp && ( region_handle == regionp->getHandle() ) )
{
teleportBridgeLocal(pos_within_target_region);
}
}
// </FS:TT>
}
// </FS:Beq>
LLAgent::ETeleportState LLAgent::getTeleportState() const
@@ -6101,7 +6037,7 @@ void LLAgent::renderAutoPilotTarget()
// <FS> Phantom mode
void LLAgent::togglePhantom()
{
make_ui_sound("UISndMovelockToggle");
// make_ui_sound("UISndMovelockToggle");
mPhantom = !mPhantom;
if (mPhantom)
{
indra/newview/llappearancemgr.cpp
-91
View File
@@ -73,8 +73,6 @@
#include "rlvlocks.h"
// [/RLVa:KB]
#include "fslslbridge.h"
namespace
{
const S32 BAKE_RETRY_MAX_COUNT = 5;
@@ -1758,23 +1756,6 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
gInventory.collectDescendentsIf(cat_id, cats, items, false, collector);
// <FS:TT> Client LSL Bridge
if (FSLSLBridge::instance().canUseBridge())
{
LL_INFOS("FSLSLBridge") << "reinserting bridge at outfit remove" << LL_ENDL;
for (LLInventoryModel::item_array_t::iterator i = items.begin(); i != items.end(); ++i)
{
const LLViewerInventoryItem* item = *i;
if (item->getName() == FSLSLBridge::instance().currentFullName())
{
items.erase(i);
break;
}
}
}
// </FS:TT>
LLInventoryModel::item_array_t::const_iterator it = items.begin();
const LLInventoryModel::item_array_t::const_iterator it_end = items.end();
uuid_vec_t uuids_to_remove;
@@ -1860,13 +1841,6 @@ void LLAppearanceMgr::slamCategoryLinks(const LLUUID& src_id, const LLUUID& dst_
{
const LLViewerInventoryItem* item = (*iter);
// <FS:Ansariel> Don't add LSL bridge to outfit
if (item->getName() == FSLSLBridge::instance().currentFullName())
{
continue;
}
// </FS:Ansariel>
switch (item->getActualType())
{
case LLAssetType::AT_LINK:
@@ -1920,12 +1894,6 @@ void LLAppearanceMgr::shallowCopyCategoryContents(const LLUUID& src_id, const LL
++iter)
{
const LLViewerInventoryItem* item = (*iter);
// <FS:Ansariel> Skip LSL bridge
if (item->getName() == FSLSLBridge::instance().currentFullName())
{
continue;
}
// </FS:Ansariel>
switch (item->getActualType())
{
case LLAssetType::AT_LINK:
@@ -2341,19 +2309,6 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new,
obj_items.insert(obj_items.end(), obj_items_new.begin(), obj_items_new.end());
// [/RLVa:KB]
// <FS:TT> Client LSL Bridge
if (FSLSLBridge::instance().canUseBridge())
{
//if replacing - make sure bridge stays.
if (!append && FSLSLBridge::instance().getBridge())
{
LL_INFOS("FSLSLBridge") << "Reinserting bridge at outfit replace" << LL_ENDL;
obj_items.insert(obj_items.end(), FSLSLBridge::instance().getBridge());
LL_INFOS("FSLSLBridge") << "Bridge reinserted" << LL_ENDL;
}
}
// </FS:TT>
removeDuplicateItems(obj_items);
// - Gestures: include COF contents only if appending.
@@ -2781,19 +2736,6 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool enforce_item_restrictions,
LLInventoryModel::item_array_t cof_item_array;
get_sorted_base_and_cof_items(cof_item_array, outfit_item_array);
// <FS:Ansariel> Exclude LSL bridge or the following size check will always fail!
for (LLInventoryModel::item_array_t::iterator i = cof_item_array.begin(); i != cof_item_array.end(); ++i)
{
LLViewerInventoryItem *item = *i;
if (FSLSLBridge::instance().isBridgeValid() && item && item->getLinkedUUID() == FSLSLBridge::instance().getBridge()->getUUID())
{
cof_item_array.erase(i);
break;
}
}
// </FS:Ansariel>
if (outfit_item_array.size() == cof_item_array.size())
{
for (U32 i = 0; i < cof_item_array.size(); ++i)
@@ -3561,19 +3503,6 @@ void LLAppearanceMgr::updateIsDirty()
}
}
// <FS:TS> FIRE-3018: Ignore the bridge when checking for dirty.
for (LLInventoryModel::item_array_t::iterator i = cof_items.begin(); i != cof_items.end(); ++i)
{
LLViewerInventoryItem *item = *i;
if (FSLSLBridge::instance().isBridgeValid() && item && item->getLinkedUUID() == FSLSLBridge::instance().getBridge()->getUUID())
{
cof_items.erase( i );
break;
}
}
// </FS:TS>
if(outfit_items.size() != cof_items.size())
{
LL_DEBUGS("Avatar") << "item count different - base " << outfit_items.size() << " cof " << cof_items.size() << LL_ENDL;
@@ -3798,19 +3727,6 @@ void update_base_outfit_after_ordering()
}
}
// <FS:Ansariel> Exclude LSL bridge or the following size check will always fail!
for (LLInventoryModel::item_array_t::iterator i = cof_item_array.begin(); i != cof_item_array.end(); ++i)
{
LLViewerInventoryItem *item = *i;
if (FSLSLBridge::instance().isBridgeValid() && item && item->getLinkedUUID() == FSLSLBridge::instance().getBridge()->getUUID())
{
cof_item_array.erase(i);
break;
}
}
// </FS:Ansariel>
if (outfit_item_array.size() != cof_item_array.size())
{
return;
@@ -4583,13 +4499,6 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove, nul
continue;
}
// <FS:Ansariel> LSL Bridge
if (FSLSLBridge::instance().canUseBridge() && linked_item_id == FSLSLBridge::instance().getBridge()->getUUID())
{
continue;
}
// </FS:Ansariel>
LLViewerInventoryItem *item = gInventory.getItem(linked_item_id);
if (item && item->getType() == LLAssetType::AT_OBJECT)
{
indra/newview/llavataractions.cpp
+1 -2
View File
@@ -88,7 +88,6 @@
// Firestorm includes
#include "fsfloaterim.h"
#include "fsfloaterimcontainer.h"
#include "fslslbridge.h"
#include "fsradar.h"
#include "fsassetblacklist.h"
#include "llagentpicksinfo.h"
@@ -1949,7 +1948,7 @@ void LLAvatarActions::zoomIn(const LLUUID& idAgent)
void LLAvatarActions::getScriptInfo(const LLUUID& idAgent)
{
LL_INFOS() << "Reporting Script Info for avatar: " << idAgent.asString() << LL_ENDL;
FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + idAgent.asString() + "|" + (gSavedSettings.getBOOL("FSScriptInfoExtended") ? "1" : "0"));
//FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + idAgent.asString() + "|" + (gSavedSettings.getBOOL("FSScriptInfoExtended") ? "1" : "0"));
}
indra/newview/llfloaterpreference.cpp
-2
View File
@@ -234,8 +234,6 @@ bool callback_clear_cache(const LLSD& notification, const LLSD& response);
// <Firestorm>
bool callback_clear_inventory_cache(const LLSD& notification, const LLSD& response);
void handleFlightAssistOptionChanged(const LLSD& newvalue);
void handleMovelockOptionChanged(const LLSD& newvalue);
void handleMovelockAfterMoveOptionChanged(const LLSD& newvalue);
bool callback_clear_settings(const LLSD& notification, const LLSD& response);
// <FS:AW opensim search support>
bool callback_clear_debug_search(const LLSD& notification, const LLSD& response);
indra/newview/llinventorybridge.cpp
-9
View File
@@ -90,7 +90,6 @@
#include "rlvlocks.h"
// [/RLVa:KB]
// <FS:TT> Client LSL Bridge
#include "fslslbridge.h"
#include "aoengine.h"
// </FS:TT>
@@ -1464,13 +1463,6 @@ bool LLInvFVBridge::isLockedFolder(bool ignore_setting /*= false*/) const
return false;
}
if ((mUUID == FSLSLBridge::instance().getBridgeFolder()
|| model->isObjectDescendentOf(mUUID, FSLSLBridge::instance().getBridgeFolder()))
&& (gSavedPerAccountSettings.getBOOL("LockBridgeFolder") || ignore_setting))
{
return true;
}
if ((mUUID == AOEngine::instance().getAOFolder()
|| model->isObjectDescendentOf(mUUID, AOEngine::instance().getAOFolder()))
&& (gSavedPerAccountSettings.getBOOL("LockAOFolders") || ignore_setting))
@@ -6532,7 +6524,6 @@ bool LLFolderBridge::isLocked() const
static LLCachedControl<bool> LockWearableFavoritesFolders(gSavedPerAccountSettings, "LockWearableFavoritesFolders");
return ((mUUID == AOEngine::instance().getAOFolder() && LockAOFolders) ||
(mUUID == FSLSLBridge::instance().getBridgeFolder() && LockBridgeFolder) ||
(mUUID == FSFloaterWearableFavorites::getFavoritesFolder() && LockWearableFavoritesFolders));
}
// </FS:Ansariel>
indra/newview/llinventoryfunctions.cpp
-10
View File
@@ -99,7 +99,6 @@
// Firestorm includes
#include "aoengine.h"
#include "fsfloaterwearablefavorites.h"
#include "fslslbridge.h"
#include "llfloatermarketplacelistings.h"
#include "llfloaterproperties.h"
@@ -750,9 +749,6 @@ bool get_is_item_removable(const LLInventoryModel* model, const LLUUID& id, bool
(model->isObjectDescendentOf(id, AOEngine::instance().getAOFolder())
&& gSavedPerAccountSettings.getBOOL("LockAOFolders"))
||
(model->isObjectDescendentOf(id, FSLSLBridge::instance().getBridgeFolder())
&& gSavedPerAccountSettings.getBOOL("LockBridgeFolder"))
||
(model->isObjectDescendentOf(id, FSFloaterWearableFavorites::getFavoritesFolder())
&& gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders"))
)
@@ -889,9 +885,6 @@ bool get_is_category_removable(const LLInventoryModel* model, const LLUUID& id)
((id == AOEngine::instance().getAOFolder() || model->isObjectDescendentOf(id, AOEngine::instance().getAOFolder()))
&& gSavedPerAccountSettings.getBOOL("LockAOFolders"))
||
((id == FSLSLBridge::instance().getBridgeFolder() || model->isObjectDescendentOf(id, FSLSLBridge::instance().getBridgeFolder()))
&& gSavedPerAccountSettings.getBOOL("LockBridgeFolder"))
||
((id == FSFloaterWearableFavorites::getFavoritesFolder() || model->isObjectDescendentOf(id, FSFloaterWearableFavorites::getFavoritesFolder()))
&& gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders"))
)
@@ -994,9 +987,6 @@ bool get_is_category_renameable(const LLInventoryModel* model, const LLUUID& id)
((id == AOEngine::instance().getAOFolder() || model->isObjectDescendentOf(id, AOEngine::instance().getAOFolder()))
&& gSavedPerAccountSettings.getBOOL("LockAOFolders"))
||
((id == FSLSLBridge::instance().getBridgeFolder() || model->isObjectDescendentOf(id, FSLSLBridge::instance().getBridgeFolder()))
&& gSavedPerAccountSettings.getBOOL("LockBridgeFolder"))
||
((id == FSFloaterWearableFavorites::getFavoritesFolder() || model->isObjectDescendentOf(id, FSFloaterWearableFavorites::getFavoritesFolder()))
&& gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders"))
)
indra/newview/llinventorymodel.cpp
+1 -6
View File
@@ -87,7 +87,6 @@
#include "aoengine.h"
#include "fsfloaterwearablefavorites.h"
#include "fslslbridge.h"
#ifdef OPENSIM
#include "llviewernetwork.h"
#endif
@@ -1929,8 +1928,6 @@ void LLInventoryModel::changeItemParent(LLViewerInventoryItem* item,
// <FS> Locked folder
if ((isObjectDescendentOf(item->getUUID(), AOEngine::instance().getAOFolder())
&& gSavedPerAccountSettings.getBOOL("LockAOFolders")) ||
(isObjectDescendentOf(item->getUUID(), FSLSLBridge::instance().getBridgeFolder())
&& gSavedPerAccountSettings.getBOOL("LockBridgeFolder")) ||
(isObjectDescendentOf(item->getUUID(), FSFloaterWearableFavorites::getFavoritesFolder())
&& gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders")))
{
@@ -1971,8 +1968,6 @@ void LLInventoryModel::changeCategoryParent(LLViewerInventoryCategory* cat,
// <FS> Protected folder
if ((isObjectDescendentOf(cat->getUUID(), AOEngine::instance().getAOFolder())
&& gSavedPerAccountSettings.getBOOL("LockAOFolders")) ||
(isObjectDescendentOf(cat->getUUID(), FSLSLBridge::instance().getBridgeFolder())
&& gSavedPerAccountSettings.getBOOL("LockBridgeFolder")) ||
(isObjectDescendentOf(cat->getUUID(), FSFloaterWearableFavorites::getFavoritesFolder())
&& gSavedPerAccountSettings.getBOOL("LockWearableFavoritesFolders")))
{
@@ -4806,7 +4801,7 @@ void LLInventoryModel::wearAttachmentsOnAvatarCheckRemove(LLViewerObject *object
}
}
if (!isFound && att_id != FSLSLBridge::instance().getAttachedID())
if (!isFound)
{
items_to_detach.push_back(att_id);
}
indra/newview/llpanelobjectinventory.cpp
-67
View File
@@ -1056,68 +1056,6 @@ public:
//static bool enableIfCopyable( void* userdata );
};
class LLTaskLSLBridge : public LLTaskScriptBridge
{
public:
LLTaskLSLBridge(LLPanelObjectInventory* panel,
const LLUUID& uuid,
const std::string& name) :
LLTaskScriptBridge(panel, uuid, name) {}
virtual bool canOpenItem() const { return true; }
virtual void openItem();
virtual bool removeItem();
//virtual void buildContextMenu(LLMenuGL& menu);
//static void copyToInventory(void* userdata);
};
// virtual
void LLTaskLSLBridge::openItem()
{
LL_INFOS() << "LLTaskLSLBridge::openItem() " << mUUID << LL_ENDL;
LLViewerObject* object = gObjectList.findObject(mPanel->getTaskUUID());
if(!object || object->isInventoryPending())
{
return;
}
// [RLVa:KB] - Checked: 2010-03-27 (RLVa-1.2.0b) | Modified: RLVa-1.1.0a
if ( (rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.isLockedAttachment(object->getRootEdit())) )
{
RlvUtil::notifyBlockedViewXXX(LLAssetType::AT_SCRIPT);
return;
}
// [/RLVa:KB]
if (object->permModify() || gAgent.isGodlike())
{
LLSD floater_key;
floater_key["taskid"] = mPanel->getTaskUUID();
floater_key["itemid"] = mUUID;
LLLiveLSLEditor* preview = LLFloaterReg::showTypedInstance<LLLiveLSLEditor>("preview_scriptedit", floater_key, TAKE_FOCUS_YES);
if (preview)
{
LLSelectNode *node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode(NULL, true);
if (node && node->mValid)
{
preview->setObjectName(node->mName);
}
preview->setObjectID(mPanel->getTaskUUID());
}
}
else
{
LLNotificationsUtil::add("CannotOpenScriptObjectNoMod");
}
}
// virtual
bool LLTaskLSLBridge::removeItem()
{
LLFloaterReg::hideInstance("preview_scriptedit", LLSD(mUUID));
return LLTaskInvFVBridge::removeItem();
}
///----------------------------------------------------------------------------
/// Class LLTaskObjectBridge
///----------------------------------------------------------------------------
@@ -1448,11 +1386,6 @@ LLTaskInvFVBridge* LLTaskInvFVBridge::createObjectBridge(LLPanelObjectInventory*
object_id,
object_name);
break;
case LLAssetType::AT_LSL_TEXT:
new_bridge = new LLTaskLSLBridge(panel,
object_id,
object_name);
break;
case LLAssetType::AT_SETTINGS:
new_bridge = new LLTaskSettingsBridge(panel,
object_id,
indra/newview/llstartup.cpp
-15
View File
@@ -238,7 +238,6 @@
#include "fsfloatersearch.h"
#include "fsfloaterstreamtitle.h"
#include "fsfloaterwearablefavorites.h"
#include "fslslbridge.h"
#include "fsradar.h"
#include "fsregistrarutils.h"
#include "fsscriptlibrary.h"
@@ -3221,20 +3220,6 @@ bool idle_startup()
LLNotificationsUtil::add("FailedToGetBenefits", LLSD(), LLSD(), boost::bind(on_benefits_failed_callback, _1, _2));
}
// <FS:TT> Client LSL Bridge
if (gSavedSettings.getBOOL("UseLSLBridge"))
{
if (!FSLSLBridge::instance().getBridgeCreating())
{
FSLSLBridge::instance().initBridge();
}
else
{
LL_INFOS("FSLSLBridge") << "LSL bridge already getting created - skipping bridge init" << LL_ENDL;
}
}
// </FS:TT>
// <FS:Ansariel> Favorite Wearables
FSFloaterWearableFavorites::initCategory();
indra/newview/llviewercontrol.cpp
-33
View File
@@ -102,7 +102,6 @@
#include "fsfloaternearbychat.h"
#include "fsfloaterposestand.h"
#include "fsfloaterteleporthistory.h"
#include "fslslbridge.h"
#include "fsradar.h"
#include "llavataractions.h"
#include "lldiskcache.h"
@@ -847,31 +846,6 @@ static void handleSetPoseStandLock(const LLSD& newvalue)
}
// </FS:CR> Posestand Ground Lock
// <FS:TT> Client LSL Bridge
static void handleFlightAssistOptionChanged(const LLSD& newvalue)
{
FSLSLBridge::instance().viewerToLSL("UseLSLFlightAssist|" + newvalue.asString());
}
// </FS:TT>
// <FS:PP> Movelock for Bridge
static void handleMovelockOptionChanged(const LLSD& newvalue)
{
FSLSLBridge::instance().updateBoolSettingValue("UseMoveLock", newvalue.asBoolean());
}
static void handleMovelockAfterMoveOptionChanged(const LLSD& newvalue)
{
FSLSLBridge::instance().updateBoolSettingValue("RelockMoveLockAfterMovement", newvalue.asBoolean());
}
// </FS:PP>
// <FS:PP> External integrations (OC, LM etc.) for Bridge
static void handleExternalIntegrationsOptionChanged()
{
FSLSLBridge::instance().updateIntegrations();
}
// </FS:PP>
static void handleDecimalPrecisionChanged(const LLSD& newvalue)
{
LLFloaterTools* build_tools = LLFloaterReg::findTypedInstance<LLFloaterTools>("build");
@@ -1478,15 +1452,8 @@ void settings_setup_listeners()
// <FS:CR> Pose stand ground lock
setting_setup_signal_listener(gSavedSettings, "FSPoseStandLock", handleSetPoseStandLock);
setting_setup_signal_listener(gSavedPerAccountSettings, "UseLSLFlightAssist", handleFlightAssistOptionChanged);
setting_setup_signal_listener(gSavedPerAccountSettings, "UseMoveLock", handleMovelockOptionChanged);
setting_setup_signal_listener(gSavedPerAccountSettings, "RelockMoveLockAfterMovement", handleMovelockAfterMoveOptionChanged);
setting_setup_signal_listener(gSavedSettings, "FSBuildToolDecimalPrecision", handleDecimalPrecisionChanged);
// <FS:PP> External integrations (OC, LM etc.) for Bridge
setting_setup_signal_listener(gSavedPerAccountSettings, "BridgeIntegrationOC", handleExternalIntegrationsOptionChanged);
setting_setup_signal_listener(gSavedPerAccountSettings, "BridgeIntegrationLM", handleExternalIntegrationsOptionChanged);
setting_setup_signal_listener(gSavedSettings, "FSNameTagShowLegacyUsernames", handleUsernameFormatOptionChanged);
setting_setup_signal_listener(gSavedSettings, "FSTrimLegacyNames", handleLegacyTrimOptionChanged);
indra/newview/llviewermenu.cpp
+1 -98
View File
@@ -162,7 +162,6 @@
// Firestorm includes
#include "fsassetblacklist.h"
#include "fsdata.h"
#include "fslslbridge.h"
#include "fscommon.h"
#include "fsfloaterexport.h"
#include "fsfloatercontacts.h"
@@ -5149,85 +5148,6 @@ class FSSelfCheckForceSit : public view_listener_t
}
};
// Phantom mode -KC & <FS:CR>
class FSSelfToggleMoveLock : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
if (LLGridManager::getInstance()->isInSecondLife())
{
make_ui_sound("UISndMovelockToggle");
bool new_value = !gSavedPerAccountSettings.getBOOL("UseMoveLock");
gSavedPerAccountSettings.setBOOL("UseMoveLock", new_value);
if (new_value)
{
LLNotificationsUtil::add("MovelockEnabling", LLSD());
}
else
{
LLNotificationsUtil::add("MovelockDisabling", LLSD());
}
}
#ifdef OPENSIM
else
{
gAgent.togglePhantom();
}
#endif // OPENSIM
//TODO: feedback to local chat
return true;
}
};
class FSSelfCheckMoveLock : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
bool new_value(false);
if (LLGridManager::getInstance()->isInSecondLife())
{
new_value = gSavedPerAccountSettings.getBOOL("UseMoveLock");
// <FS:Chanayane> prevents having Move Lock activated but disabled when for some reason the LSL Bridge is not worn or not ready
if (new_value && !enable_bridge_function())
{
gSavedPerAccountSettings.setBOOL("UseMoveLock", false);
new_value = false;
}
// </FS:Chanayane>
}
#ifdef OPENSIM
else
{
new_value = gAgent.getPhantom();
}
#endif // OPENSIM
return new_value;
}
};
bool enable_bridge_function()
{
return FSLSLBridge::instance().canUseBridge();
}
bool enable_move_lock()
{
#ifdef OPENSIM
// Phantom mode always works on opensim, at least right now.
if (LLGridManager::getInstance()->isInOpenSim())
return true;
#endif // OPENSIM
return enable_bridge_function();
}
bool enable_script_info()
{
return (!LLSelectMgr::getInstance()->getSelection()->isEmpty()
&& enable_bridge_function());
}
// </FS:CR>
// [SJ - Adding IgnorePrejump in Menu ]
class FSSelfToggleIgnorePreJump : public view_listener_t
{
@@ -7999,7 +7919,7 @@ void handle_script_info()
{
object_id = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->mID;
LL_INFOS() << "Reporting Script Info for object: " << object_id.asString() << LL_ENDL;
FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + object_id.asString() + "|" + (gSavedSettings.getBOOL("FSScriptInfoExtended") ? "1" : "0"));
//FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + object_id.asString() + "|" + (gSavedSettings.getBOOL("FSScriptInfoExtended") ? "1" : "0"));
}
}
@@ -8500,11 +8420,6 @@ void handle_buy_currency()
LLBuyCurrencyHTML::openCurrencyFloater();
}
void handle_recreate_lsl_bridge()
{
FSLSLBridge::instance().recreateBridge();
}
class LLFloaterVisible : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
@@ -9193,10 +9108,6 @@ static bool onEnableAttachmentLabel(LLUICtrl* ctrl, const LLSD& data)
if (attached_object)
{
LLViewerInventoryItem* itemp = gInventory.getItem(attached_object->getAttachmentItemID());
// <FS:Ansariel> Hide bridge from attach to HUD menus
//if (itemp)
if (itemp && !(FSLSLBridge::instance().getBridge() && FSLSLBridge::instance().getBridge()->getUUID() == itemp->getUUID() && data["index"].asInteger() == FS_BRIDGE_POINT))
// </FS:Ansariel>
{
label += std::string(" (") + itemp->getName() + std::string(")");
break;
@@ -12510,9 +12421,6 @@ void initialize_menus()
commit.add("EditShape", boost::bind(&handle_edit_shape));
commit.add("HoverHeight", boost::bind(&handle_hover_height));
commit.add("EditPhysics", boost::bind(&handle_edit_physics));
// <FS:TT> Client LSL Bridge
commit.add("RecreateLSLBridge", boost::bind(&handle_recreate_lsl_bridge));
// </FS:TT>
// View menu
view_listener_t::addMenu(new LLViewMouselook(), "View.Mouselook");
@@ -12904,9 +12812,6 @@ void initialize_menus()
view_listener_t::addMenu(new FSSelfForceSit(), "Self.ForceSit"); //KC
enable.add("Self.EnableForceSit", boost::bind(&enable_forcesit_self)); //KC
view_listener_t::addMenu(new FSSelfCheckForceSit(), "Self.getForceSit"); //KC
view_listener_t::addMenu(new FSSelfToggleMoveLock(), "Self.ToggleMoveLock"); //KC
view_listener_t::addMenu(new FSSelfCheckMoveLock(), "Self.GetMoveLock"); //KC
enable.add("Self.EnableMoveLock", boost::bind(&enable_move_lock)); // <FS:CR>
view_listener_t::addMenu(new FSSelfToggleIgnorePreJump(), "Self.toggleIgnorePreJump"); //SJ
view_listener_t::addMenu(new FSSelfCheckIgnorePreJump(), "Self.getIgnorePreJump"); //SJ
view_listener_t::addMenu(new LLSelfRemoveAllAttachments(), "Self.RemoveAllAttachments");
@@ -13009,7 +12914,6 @@ void initialize_menus()
enable.add("Object.EnableUnmute", boost::bind(&enable_object_unmute));
enable.add("Object.EnableBuy", boost::bind(&enable_buy_object));
commit.add("Object.ZoomIn", boost::bind(&handle_look_at_selection, "zoom"));
enable.add("Object.EnableScriptInfo", boost::bind(&enable_script_info)); // <FS:CR>
enable.add("Object.EnableShowOriginal", boost::bind(&enable_object_show_original)); // <FS:Ansariel> Disable if prevented by RLVa
@@ -13077,7 +12981,6 @@ void initialize_menus()
enable.add("EnableGLTFSaveAs", boost::bind(&enable_gltf_save_as));
enable.add("EnableGLTFUpload", boost::bind(&enable_gltf_upload));
enable.add("EnableTerrainLocalPaintMap", std::bind(&enable_terrain_local_paintmap));
enable.add("EnableBridgeFunction", boost::bind(&enable_bridge_function)); // <FS:CR>
view_listener_t::addMenu(new LLFloaterVisible(), "FloaterVisible");
view_listener_t::addMenu(new LLSomethingSelected(), "SomethingSelected");
indra/newview/llviewermessage.cpp
+1 -14
View File
@@ -145,7 +145,6 @@
#include "fsfloaterplacedetails.h"
#include "fsradar.h"
#include "fskeywords.h" // <FS:PP> FIRE-10178: Keyword Alerts in group IM do not work unless the group is in the foreground
#include "fslslbridge.h"
#include "fsmoneytracker.h"
#include "llattachmentsmgr.h"
#include "lleconomy.h"
@@ -3098,14 +3097,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
chat.mText = LLTrans::getString("whisper") + " ";
break;
case CHAT_TYPE_OWNER:
// <FS:TT> Client LSL Bridge
{
if (FSLSLBridge::instance().lslToViewer(mesg, from_id, owner_id))
{
return;
}
}
// </FS:TT>
// <FS:KC> cmdline packager
if (cmdline_packager(mesg, from_id, owner_id))
@@ -7653,11 +7644,7 @@ void process_teleport_failed(LLMessageSystem *msg, void**)
gAgent.stopTyping();
LL_INFOS() << "Teleport error, message_id=" << message_id << LL_ENDL;
if (!FSLSLBridge::instance().canUseBridge() ||
(message_id != "Could not teleport closer to destination"))
{
LLNotificationsUtil::add("CouldNotTeleportReason", args);
}
LLNotificationsUtil::add("CouldNotTeleportReason", args);
if( gAgent.getTeleportState() != LLAgent::TELEPORT_NONE )
{
indra/newview/llviewernetwork.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ const std::string GRID_LOGIN_IDENTIFIER_TYPES = "login_identifier_types";
const std::string GRID_SLURL_BASE = "slurl_base";
const std::string GRID_APP_SLURL_BASE = "app_slurl_base";
const std::string DEFAULT_LOGIN_PAGE = "https://phoenixviewer.com/app/loginV3/";
const std::string DEFAULT_LOGIN_PAGE = "https://viewer-splash.secondlife.com/";
const std::string MAIN_GRID_LOGIN_URI = "https://login.agni.lindenlab.com/cgi-bin/login.cgi";
indra/newview/llviewerwindow.cpp
-11
View File
@@ -495,7 +495,6 @@ public:
static const std::string beacon_sun = LLTrans::getString("BeaconSun");
static const std::string beacon_moon = LLTrans::getString("BeaconMoon");
static const std::string particle_hiding = LLTrans::getString("ParticleHiding");
static const std::string movelock_enabled = LLTrans::getString("MovelockEnabled"); // <FS:PP> FIRE-29880: Movelock
// Draw the statistics in a light gray
// and in a thin font
@@ -870,16 +869,6 @@ public:
ypos += y_inc;
}
// <FS:PP> FIRE-29880: Movelock
static LLCachedControl<bool> fsRenderMovelockState(gSavedPerAccountSettings, "UseMoveLock");
static LLCachedControl<bool> fsRenderMovelockText(gSavedPerAccountSettings, "MoveLockInfoVisibleOnScreen");
if (fsRenderMovelockState && fsRenderMovelockText)
{
addText(xpos, ypos, movelock_enabled);
ypos += y_inc;
}
// </FS:PP>
// only display these messages if we are actually rendering beacons at this moment
// <FS:LO> Always show the beacon text regardless if the floater is visible
// <FS:Ansa> ...and if we want to see it
indra/newview/llvoavatar.cpp
-7
View File
@@ -133,7 +133,6 @@
#include "llviewernetwork.h" // [FS:CR] isInSecondlife()
#include "llsidepanelappearance.h"
#include "fsavatarrenderpersistence.h"
#include "fslslbridge.h" // <FS:PP> Movelock position refresh
#include "fsdiscordconnect.h" // <FS:LO> tapping a place that happens on landing in world to start up discord
@@ -8894,12 +8893,6 @@ void LLVOAvatar::sitDown(bool bSitting)
}
// [/RLVa:KB]
// <FS:PP> Refresh movelock position after sitting down to prevent pulling avatar back to previous one after standing up
if (bSitting && gSavedPerAccountSettings.getBOOL("UseMoveLock") && gSavedPerAccountSettings.getBOOL("RelockMoveLockAfterMovement"))
{
FSLSLBridge::instance().viewerToLSL("UseMoveLock|1|noreport");
}
// </FS:PP>
}
}
indra/newview/llvoavatarself.cpp
-25
View File
@@ -63,7 +63,6 @@
#include "lluiusage.h"
// Firestorm includes
#include "fslslbridge.h"
#include "lggbeammaps.h"
#include "piemenu.h"
#include "pieslice.h"
@@ -1664,16 +1663,6 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view
// <FS:TT> ReplaceWornItemsOnly
gInventory.wearAttachmentsOnAvatarCheckRemove(viewer_object, attachment);
// </FS:TT>
// <FS:TT> Client LSL Bridge
if (attachment->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME && gSavedSettings.getBOOL("UseLSLBridge"))
{
LLViewerInventoryItem* inv_object = gInventory.getItem(viewer_object->getAttachmentItemID());
if (inv_object && inv_object->getName() == FSLSLBridge::instance().currentFullName())
{
FSLSLBridge::instance().processAttach(viewer_object, attachment);
}
}
// </FS:TT>
updateLODRiggedAttachments();
// [RLVa:KB] - Checked: 2010-08-22 (RLVa-1.2.1a) | Modified: RLVa-1.2.1a
@@ -1728,16 +1717,6 @@ bool LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object)
(*mAttachmentSignal)(viewer_object, pAttachPt, ACTION_DETACH);
}
// <FS:TT> Client LSL Bridge
if (pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME)
{
LLViewerInventoryItem* inv_object = gInventory.getItem(viewer_object->getAttachmentItemID());
if (inv_object && inv_object->getName() == FSLSLBridge::instance().currentFullName())
{
FSLSLBridge::instance().processDetach(viewer_object, pAttachPt);
}
}
// </FS:TT>
break;
}
}
@@ -1811,10 +1790,6 @@ bool LLVOAvatarSelf::detachAttachmentIntoInventory(const LLUUID &item_id)
{
LLInventoryItem* item = gInventory.getItem(item_id);
// if (item)
// [RLVa:KB] - Checked: 2010-09-04 (RLVa-1.2.1c) | Added: RLVa-1.2.1c
if ( (item) && (((!rlv_handler_t::isEnabled()) || (gRlvAttachmentLocks.canDetach(item))) ||
FSLSLBridge::instance().canDetach(item->getUUID())) )
// [/RLVa:KB]
{
gMessageSystem->newMessageFast(_PREHASH_DetachAttachmentIntoInv);
gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
indra/newview/rlvhandler.cpp
+2 -6
View File
@@ -72,7 +72,6 @@
// <FS:Ansariel> [FS communication UI]
#include "fsfloatervoicecontrols.h"
// </FS:Ansariel> [FS communication UI]
#include "fslslbridge.h"
#include "fsradar.h"
// Boost includes
@@ -3635,8 +3634,7 @@ ERlvCmdRet RlvHandler::onGetAttach(const RlvCommand& rlvCmd, std::string& strRep
if ( (0 == idxAttachPt) || (itAttach->first == idxAttachPt) )
{
// Ansa: Do not include the bridge when checking for number of objects
S32 bridge_correct = (pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME && FSLSLBridge::instance().isBridgeValid()) ? 1 : 0;
bool fWorn = ((pAttachPt->getNumObjects() - bridge_correct) > 0) &&
bool fWorn = (pAttachPt->getNumObjects() > 0) &&
( (!RlvSettings::getHideLockedAttach()) || (RlvForceWear::isForceDetachable(pAttachPt, true, rlvCmd.getObjectID())) );
strReply.push_back( (fWorn) ? '1' : '0' );
}
@@ -3665,10 +3663,8 @@ ERlvCmdRet RlvHandler::onGetAttachNames(const RlvCommand& rlvCmd, std::string& s
switch (rlvCmd.getBehaviourType())
{
case RLV_BHVR_GETATTACHNAMES: // Every attachment point that has an attached object
// Ansa: Do not include the bridge when checking for number of objects
{
S32 bridge_correct = ((pAttachPt->getName() == FS_BRIDGE_ATTACHMENT_POINT_NAME && FSLSLBridge::instance().isBridgeValid()) ? 1 : 0);
fAdd = ((pAttachPt->getNumObjects() - bridge_correct) > 0);
fAdd = (pAttachPt->getNumObjects() > 0);
}
break;
case RLV_BHVR_GETADDATTACHNAMES: // Every attachment point that can be attached to (wear replace OR wear add)
indra/newview/rlvhelper.cpp
-7
View File
@@ -23,10 +23,6 @@
#include "llviewerobjectlist.h"
#include "pipeline.h"
//<FS:TS> FIRE-4453 bridge detached by the RLV command @remattach=force
#include "fslslbridge.h"
//</FS:TS> FIRE-4453
#include "rlvcommon.h"
#include "rlveffects.h"
#include "rlvhelper.h"
@@ -1416,9 +1412,6 @@ bool RlvForceWear::isForceDetachable(const LLViewerObject* pAttachObj, bool fChe
&& ( (idExcept.isNull()) ? (!gRlvAttachmentLocks.isLockedAttachment(pAttachObj))
: (!gRlvAttachmentLocks.isLockedAttachmentExcept(pAttachObj, idExcept)) )
&& (isStrippable(pAttachObj->getAttachmentItemID()))
//<FS:TS> FIRE-4453 bridge detached by the RLV command @remattach=force
&& (pAttachObj->getID() != FSLSLBridge::instance().getAttachedID())
//</FS:TS> FIRE-4453
#ifdef RLV_EXPERIMENTAL_COMPOSITEFOLDERS
&& ( (!fCheckComposite) || (!RlvSettings::getEnableComposites()) ||
(!gRlvHandler.getCompositeInfo(pAttachPt->getItemID(), NULL, &pFolder)) || (gRlvHandler.canTakeOffComposite(pFolder)) )
indra/newview/rlvlocks.cpp
-8
View File
@@ -15,7 +15,6 @@
*/
#include "llviewerprecompiledheaders.h"
#include "fslslbridge.h"
#include "llagent.h"
#include "llappearancemgr.h"
#include "llattachmentsmgr.h"
@@ -659,13 +658,6 @@ void RlvAttachmentLockWatchdog::onDetach(const LLViewerObject* pAttachObj, const
if ( (!idxAttachPt) || (idAttachItem.isNull()) )
return;
// <FS:Ansariel> Bridge can always be detached
if (FSLSLBridge::instance().canDetach(idAttachItem))
{
return;
}
// </FS:Ansariel>
// If it's an attachment that's pending force-detach then we don't want to do anything (even if it's currently "remove locked")
rlv_detach_map_t::iterator itDetach = std::find(m_PendingDetach.begin(), m_PendingDetach.end(), idAttachItem);
if (itDetach != m_PendingDetach.end())
indra/newview/skins/default/textures/textures.xml
-1
View File
@@ -873,7 +873,6 @@ with the same filename but different name
<texture name="pose_stand" file_name="toolbar_icons/posestand.png" preload="true" />
<texture name="Command_Snapshot_2_Disk_Icon" file_name="toolbar_icons/snapshot_to_disk.png" preload="true" />
<texture name="radar" file_name="toolbar_icons/radar.png" preload="true" />
<texture name="move_lock" file_name="toolbar_icons/movelock.png" preload="true" />
<texture name="block_list" file_name="toolbar_icons/blocklist.png" preload="true" />
<texture name="resync_animations" file_name="toolbar_icons/resync_animations.png" preload="true" />
<texture name="Group_Titles_Icon" file_name="toolbar_icons/group_titles.png" preload="true" />
indra/newview/skins/default/textures/windows/login_pm_logo.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 637 KiB

After

Width:  |  Height:  |  Size: 256 KiB

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>
indra/newview/skins/default/xui/es/notifications.xml
-6
View File
@@ -4738,12 +4738,6 @@ El nombre NO puede contener los caracteres ":" o "|".
<notification name="PhantomOff">
Modo fantasma desactivado.
</notification>
<notification name="MovelockEnabled">
Bloqueo de movimiento activado.
</notification>
<notification name="MovelockDisabled">
Bloqueo de movimiento desactivado.
</notification>
<notification label="Restablecer todas las configuraciones" name="FirestormClearSettingsPrompt">
Restablecer todas las configuraciones puede ser útil si estás experimentando problemas, aunque tendrás que repetir todas las personalizaciones que hayas podido hacer a la configuración por defecto.
indra/newview/skins/default/xui/es/panel_preferences_firestorm.xml
-2
View File
@@ -13,8 +13,6 @@
<check_box label="Desactivar la pantalla de progreso del cierre de sesión" name="logout_screen_toggle" tool_tip="Desactiva la pantalla negra que muestra el progreso del cierre de la sesión."/>
<check_box label="Activar escalado progresivo de distancia de dibujo" name="FSRenderFarClipStepping" tool_tip="Si lo activas, Firestorm aumentará progresivamente la distancia de dibujo después de un teleporte." width="300"/>
<slider name="progressive_draw_distance_interval" tool_tip="Intérvalo en segundos entre cada incremento de distancia de dibujo"/>
<check_box name="UseLSLBridge" label="Activar el LSL-Client Bridge" tool_tip="Permite al visor usar un accesorio con scripts (Bridge) para extender sus características"/>
<!-- <check_box name="UseLSLFlightAssist" label="Activar asistente de vuelo del Bridge" tool_tip="Activa el script que permite volar y flotar a mayor altitud"/> -->
</panel>
<panel label="Protección" name="ProtectionTab">
<check_box label="Impedir que pueda sentarme con un clic del botón izquierdo del ratón" name="FSBlockClickSit"/>
indra/newview/skins/default/xui/es/panel_preferences_move.xml
-1
View File
@@ -42,7 +42,6 @@
<check_box label="Volar/aterrizar al mantener arriba/abajo" name="automatic_fly"/>
<check_box label="Activar el modo conmutado para agacharse" name="crouch_toggle_mode"/>
<check_box label="Hacer girar al avatar cuando camina hacia atrás" name="backwardsturnavatar" tool_tip="Gira el avatar para encarar la cámara cuando lo haces caminar hacia atrás"/>
<check_box label="Si movelock está activado, volver a bloquear tras cambiar de región" name="RelockMoveLockAfterRegionChange"/>
<text name="single_click_action_lbl">
Un solo clic en el terreno:
</text>
indra/newview/skins/default/xui/es/strings.xml
-1
View File
@@ -5939,7 +5939,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
<string name="Collision_ScriptedObject">[NAME] te ha golpeado con un objeto con scripts.</string>
<string name="Collision_PhysicalObject">[NAME] te ha golpeado con un objeto físico.</string>
<string name="Collision_UnknownType">[NAME] ha causado una colisión de tipo desconocido.</string>
<string name="MovelockEnabled">Avatar &gt; Movimiento &gt; Bloquear activado</string>
<string name="BusyResponse">respuesta de ocupado</string>
<string name="TeleportMaturityExceeded">
El residente no puede visitar esta región.
indra/newview/skins/default/xui/it/strings.xml
-3
View File
@@ -5948,9 +5948,6 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
<string name="Collision_UnknownType">
[NAME] ha causato una collisione sconosciuta.
</string>
<string name="MovelockEnabled">
Io &gt; Movimento &gt; Blocca attivo
</string>
<string name="BusyResponse">
busy response
</string>
indra/newview/skins/starlight/textures/textures.xml
-1
View File
@@ -919,7 +919,6 @@ with the same filename but different name
<texture name="radar" file_name="toolbar_icons/radar.png" preload="true" />
<texture name="Chat_History" file_name="icons/Chat_History.png" preload="false" />
<texture name="Icon_DialogStack" file_name="icons/Icon_DialogStack.png" preload="false" />
<texture name="move_lock" file_name="toolbar_icons/movelock.png" preload="true" />
<texture name="Edit_Flip_X" file_name="icons/Edit_Flip_X.png" preload="false" />
<texture name="AddItem_Menu" file_name="icons/AddItem_Menu.png" preload="false" />
<texture name="TrashItem_Menu" file_name="icons/TrashItem_Menu.png" preload="false" />
indra/newview/skins/starlight/xui/en/panel_fs_login.xml
+2 -2
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">
indra/newview/skins/starlightcui/textures/textures.xml
-1
View File
@@ -919,7 +919,6 @@ with the same filename but different name
<texture name="radar" file_name="toolbar_icons/radar.png" preload="true" />
<texture name="Chat_History" file_name="icons/Chat_History.png" preload="false" />
<texture name="Icon_DialogStack" file_name="icons/Icon_DialogStack.png" preload="false" />
<texture name="move_lock" file_name="toolbar_icons/movelock.png" preload="true" />
<texture name="Edit_Flip_X" file_name="icons/Edit_Flip_X.png" preload="false" />
<texture name="AddItem_Menu" file_name="icons/AddItem_Menu.png" preload="false" />
<texture name="TrashItem_Menu" file_name="icons/TrashItem_Menu.png" preload="false" />
indra/newview/skins/starlightcui/xui/en/panel_fs_login.xml
+2 -2
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/
https://ayudavirtual.org/unirseasl/
</string>
<panel.string
name="forgot_password_url">