Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature Touchup: Add backup destination to Emergency Teleport out of region within last 20 seconds before restart feature

Browse Source 
Falls back if first landmark is not in inventory or invalid, region is offline, or the current region is your location
Item drop target is right below the original one in System->Security prefs.

Thanks again to the citizens of Fluffy for enduring these restart tests.
This commit is contained in:
Inusaito Sayori
2014-05-21 19:07:11 -04:00
parent c684987908
commit bfbbcad8e5
5 changed files with 54 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
indra/newview/llfloaterregionrestarting.cpp
View File

@@ -37,14 +37,49 @@
// <singu> For emergency teleports
#include "llinventorymodel.h"
#include "lllandmarklist.h"
#include "llviewerregion.h"
#include "llworldmap.h"
void emergency_teleport()
{
static const LLCachedControl<std::string> landmark(gSavedPerAccountSettings, "EmergencyTeleportLandmark");
if (landmark().empty()) return;
const LLUUID id(landmark);
LLUUID id(landmark);
if (id.isNull()) return;
if (LLViewerInventoryItem* item = gInventory.getItem(id))
gAgent.teleportViaLandmark(item->getAssetUUID());
bool use_backup = false;
LLViewerInventoryItem* item = gInventory.getItem(id);
if (item)
{
if (LLLandmark* lm = gLandmarkList.getAsset(item->getAssetUUID()))
{
if (LLViewerRegion* region = gAgent.getRegion())
use_backup = !lm->getRegionID(id) || id == region->getRegionID(); // LM's Region id null or same as current region
if (!use_backup)
{
LLVector3d pos_global;
if (lm->getGlobalPos(pos_global))
{
if (LLSimInfo* sim_info = LLWorldMap::instance().simInfoFromPosGlobal(pos_global))
{
use_backup = sim_info->isDown();
}
}
else use_backup = true; // No coords, this will fail!
}
}
else use_backup = true;
}
else use_backup = true;
if (use_backup) // Something is wrong with the first provided landmark, fallback.
{
static const LLCachedControl<std::string> landmark(gSavedPerAccountSettings, "EmergencyTeleportLandmarkBackup");
if (landmark().empty()) return;
if (!id.set(landmark)) return;
if (!(item = gInventory.getItem(id))) return;
}
gAgent.teleportViaLandmark(item->getAssetUUID());
}
// </singu>