aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-09-07 00:46:37 -0700
committerMcCabe Maxsted2010-09-07 00:46:37 -0700
commit43cd306e901c444b997614c8e3d16ef79c3aa044 (patch)
tree8c07a54e874a137ba936e4dca2b8330f991a4446 /linden/indra/newview/llstartup.cpp
parentUse solid circles instead of asterisks for password fields. (diff)
downloadmeta-impy-43cd306e901c444b997614c8e3d16ef79c3aa044.zip
meta-impy-43cd306e901c444b997614c8e3d16ef79c3aa044.tar.gz
meta-impy-43cd306e901c444b997614c8e3d16ef79c3aa044.tar.bz2
meta-impy-43cd306e901c444b997614c8e3d16ef79c3aa044.tar.xz
Applied #472: teleport history from Emerald, patch by Ansariel Hiler, feature originally by Zi Ree
Diffstat (limited to 'linden/indra/newview/llstartup.cpp')
-rw-r--r--linden/indra/newview/llstartup.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index b76c5be..6622740 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -191,6 +191,8 @@
191#include "jcfloater_animation_list.h" 191#include "jcfloater_animation_list.h"
192#include "jcfloaterareasearch.h" 192#include "jcfloaterareasearch.h"
193 193
194#include "llfloaterteleporthistory.h"
195
194#if LL_LIBXUL_ENABLED 196#if LL_LIBXUL_ENABLED
195#include "llmozlib.h" 197#include "llmozlib.h"
196#endif // LL_LIBXUL_ENABLED 198#endif // LL_LIBXUL_ENABLED
@@ -2730,6 +2732,14 @@ bool idle_startup()
2730 2732
2731 LLFirstUse::ClientTags(); 2733 LLFirstUse::ClientTags();
2732 2734
2735 // Add login location to teleport history 'teleported-into'
2736 LLVector3 agent_pos=gAgent.getPositionAgent();
2737 LLViewerRegion* regionp = gAgent.getRegion();
2738 if (gFloaterTeleportHistory)
2739 {
2740 gFloaterTeleportHistory->addEntry(regionp->getName(),(S16)agent_pos.mV[0],(S16)agent_pos.mV[1],(S16)agent_pos.mV[2],false);
2741 }
2742
2733 // Let the map know about the inventory. 2743 // Let the map know about the inventory.
2734 if(gFloaterWorldMap) 2744 if(gFloaterWorldMap)
2735 { 2745 {