From 8016e73cc0a2a27062fae27e609535e002eef362 Mon Sep 17 00:00:00 2001 From: Leyla Farazha Date: Thu, 9 Jul 2009 22:30:15 +0000 Subject: svn merge -r126726:126727 svn+ssh://svn.lindenlab.com/linden/branches/skinning/skinning-15/ DEV-35109 Nav bar does not record teleports taken by any method other than typing into nav bar DEV-35117 Hard to open local chat, needs bottom bar widget for now hiding test IM floaters --- indra/newview/lllocationhistory.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'indra/newview/lllocationhistory.cpp') diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp index 179eca2532..43512372b1 100644 --- a/indra/newview/lllocationhistory.cpp +++ b/indra/newview/lllocationhistory.cpp @@ -37,11 +37,28 @@ #include // for std::setw() #include "llui.h" +#include "llagent.h" +#include "llslurl.h" +#include "llviewerregion.h" +#include "llviewerparcelmgr.h" + + +void addLocationHistory() +{ + LLVector3 position = gAgent.getPositionAgent(); + std::string region_name = gAgent.getRegion()->getName(); + std::string location = LLSLURL::buildSLURL(region_name, position.mV[VX], + position.mV[VY], position.mV[VZ]); + LLLocationHistory* lh = LLLocationHistory::getInstance(); + lh->addItem(location); + lh->save(); +} LLLocationHistory::LLLocationHistory() : mFilename("typed_locations.txt"), mLoadedCallback(NULL) { + LLViewerParcelMgr::getInstance()->setTeleportFinishedCallback(addLocationHistory); } void LLLocationHistory::addItem(std::string item) -- cgit v1.2.3 From 24be0ba83c97bcefb8afe565a7483c2e99bbf11a Mon Sep 17 00:00:00 2001 From: James Cook Date: Fri, 10 Jul 2009 03:14:23 +0000 Subject: Fix Linux build error due to F32/S32 conversion warning. Not reviewed. --- indra/newview/lllocationhistory.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/newview/lllocationhistory.cpp') diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp index 43512372b1..0059bfd2dc 100644 --- a/indra/newview/lllocationhistory.cpp +++ b/indra/newview/lllocationhistory.cpp @@ -47,8 +47,10 @@ void addLocationHistory() { LLVector3 position = gAgent.getPositionAgent(); std::string region_name = gAgent.getRegion()->getName(); - std::string location = LLSLURL::buildSLURL(region_name, position.mV[VX], - position.mV[VY], position.mV[VZ]); + std::string location = LLSLURL::buildSLURL(region_name, + (S32)(position.mV[VX]), + (S32)(position.mV[VY]), + (S32)(position.mV[VZ]) ); LLLocationHistory* lh = LLLocationHistory::getInstance(); lh->addItem(location); lh->save(); -- cgit v1.2.3 From 83a6ea234f32bf30d1f16b276d128debb2aeea02 Mon Sep 17 00:00:00 2001 From: James Cook Date: Tue, 14 Jul 2009 19:06:17 +0000 Subject: Merge skinning-15 to viewer-2. Fixes include: DEV-35175 Spawning context menu should not move mouse cursor (Note: introduces regression where menu can fall off bottom of screen, will fix shortly) DEV-35143 Modal alerts appear behind side tray DEV-35141 Landmarks image and description outside of landmarks Merging revisions 126418-126419,126726-126727,126856-126857,127010-127011,127014-127016 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-15 into G:\viewer-2.0.0-3, respecting ancestry --- indra/newview/lllocationhistory.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/lllocationhistory.cpp') diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp index 0059bfd2dc..9ab57a9d76 100644 --- a/indra/newview/lllocationhistory.cpp +++ b/indra/newview/lllocationhistory.cpp @@ -42,7 +42,6 @@ #include "llviewerregion.h" #include "llviewerparcelmgr.h" - void addLocationHistory() { LLVector3 position = gAgent.getPositionAgent(); -- cgit v1.2.3 From 408bed3d6b01d654d460b9ee0d929370194d8f9a Mon Sep 17 00:00:00 2001 From: James Cook Date: Wed, 15 Jul 2009 20:20:30 +0000 Subject: Revert rev 126736 for DEV-35109 which made location history in nav bar show all teleports instead of only those typed. viewer-2 now meets current spec, but spec is under discussion and Product Engine may be asked to reimplement something different. Merging revisions 126736-126735 of svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 into D:\viewer-2.0.0-3, respecting ancestry --- indra/newview/lllocationhistory.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'indra/newview/lllocationhistory.cpp') diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp index 9ab57a9d76..179eca2532 100644 --- a/indra/newview/lllocationhistory.cpp +++ b/indra/newview/lllocationhistory.cpp @@ -37,29 +37,11 @@ #include // for std::setw() #include "llui.h" -#include "llagent.h" -#include "llslurl.h" -#include "llviewerregion.h" -#include "llviewerparcelmgr.h" - -void addLocationHistory() -{ - LLVector3 position = gAgent.getPositionAgent(); - std::string region_name = gAgent.getRegion()->getName(); - std::string location = LLSLURL::buildSLURL(region_name, - (S32)(position.mV[VX]), - (S32)(position.mV[VY]), - (S32)(position.mV[VZ]) ); - LLLocationHistory* lh = LLLocationHistory::getInstance(); - lh->addItem(location); - lh->save(); -} LLLocationHistory::LLLocationHistory() : mFilename("typed_locations.txt"), mLoadedCallback(NULL) { - LLViewerParcelMgr::getInstance()->setTeleportFinishedCallback(addLocationHistory); } void LLLocationHistory::addItem(std::string item) -- cgit v1.2.3 From ca51e8f33dfa0cd455438f11902fb1d839bf6206 Mon Sep 17 00:00:00 2001 From: James Cook Date: Mon, 27 Jul 2009 16:50:01 +0000 Subject: Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes. svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8 --- indra/newview/lllocationhistory.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview/lllocationhistory.cpp') diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp index 179eca2532..ed56e3e195 100644 --- a/indra/newview/lllocationhistory.cpp +++ b/indra/newview/lllocationhistory.cpp @@ -55,6 +55,11 @@ void LLLocationHistory::addItem(std::string item) mItems.erase(mItems.begin(), mItems.end()-max_items); } +void LLLocationHistory::removeItems() +{ + mItems.erase(mItems.begin(), mItems.end()); +} + bool LLLocationHistory::getMatchingItems(std::string substring, location_list_t& result) const { -- cgit v1.2.3 From e97f7728a90dd66014f6b3f0cd5e8d4c71f48691 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 30 Jul 2009 23:22:41 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3 --- indra/newview/lllocationhistory.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra/newview/lllocationhistory.cpp') diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp index ed56e3e195..471a0868bc 100644 --- a/indra/newview/lllocationhistory.cpp +++ b/indra/newview/lllocationhistory.cpp @@ -39,8 +39,7 @@ #include "llui.h" LLLocationHistory::LLLocationHistory() : - mFilename("typed_locations.txt"), - mLoadedCallback(NULL) + mFilename("typed_locations.txt") { } @@ -134,6 +133,5 @@ void LLLocationHistory::load() file.close(); - if (mLoadedCallback) - mLoadedCallback(); + mLoadedSignal(); } -- cgit v1.2.3