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/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");