From f58cfdac22b3a739273ec6a2143057a536646eb2 Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Fri, 1 Jun 2012 16:01:40 -0400 Subject: STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached --- doc/contributions.txt | 1 + indra/newview/lltracker.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 04edfb4bea..a24e43c774 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -629,6 +629,7 @@ Jonathan Yap STORM-1809 STORM-1793 STORM-1810 + STORM-1870 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp index bf1f8808a7..cbd16e873d 100644 --- a/indra/newview/lltracker.cpp +++ b/indra/newview/lltracker.cpp @@ -251,7 +251,7 @@ void LLTracker::render3D() instance()->mBeaconText->setDoFade(FALSE); } - F32 dist = gFloaterWorldMap->getDistanceToDestination(instance()->mTrackedPositionGlobal, 0.0f); + F32 dist = gFloaterWorldMap->getDistanceToDestination(instance()->getTrackedPositionGlobal(), 0.0f); if (dist < DESTINATION_REACHED_RADIUS) { instance()->stopTrackingAvatar(); -- cgit v1.2.3 From c2f0a8ef02d04664bb894eff4b2ca815c3f93d1f Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Mon, 4 Jun 2012 16:23:16 -0400 Subject: STORM-1872 A line break is missing in ..\app_settings\settings.xml --- doc/contributions.txt | 1 + indra/newview/app_settings/settings.xml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 04edfb4bea..a80dbe2839 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -629,6 +629,7 @@ Jonathan Yap STORM-1809 STORM-1793 STORM-1810 + STORM-1872 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 05c05b9393..bad82f6486 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10784,7 +10784,8 @@ F32 Value 0.1 - ToolTipFadeTime + + ToolTipFadeTime Comment Seconds over which tooltip fades away -- cgit v1.2.3 From f9879b8ea922affd4a1e82c45ce120d5e016c705 Mon Sep 17 00:00:00 2001 From: MartinRJ Date: Mon, 4 Jun 2012 17:01:32 -0400 Subject: STORM-1845: Move "Show HUD Attachments" to Me menu --- doc/contributions.txt | 2 ++ indra/newview/skins/default/xui/en/menu_viewer.xml | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 04edfb4bea..db4984b75f 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -725,6 +725,8 @@ Marc2 Sands Marianne McCann Marine Kelley STORM-281 +MartinRJ Fayray + STORM-1845 Matthew Anthony Matthew Dowd VWR-1344 diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 5ba566b175..204b73b043 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -193,6 +193,15 @@ + + + + @@ -1373,15 +1382,6 @@ - - - - -- cgit v1.2.3 From 2ad0bc334dc275f60889d7f083e90b8d2775104d Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 5 Jun 2012 10:02:48 -0400 Subject: storm-1703: update license statements --- doc/contributions.txt | 2 ++ indra/newview/skins/default/xui/en/floater_about.xml | 19 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/contributions.txt b/doc/contributions.txt index 04edfb4bea..89fcfd0601 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -297,6 +297,8 @@ Cherry Cheevers ChickyBabes Zuzu Christopher Organiser Ciaran Laval +Cinder Roxley + STORM-1703 Clara Young Coaldust Numbers VWR-1095 diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 060d889003..63eb87f27a 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -196,27 +196,26 @@ Dummy Name replaced at run time top="5" width="435" word_wrap="true"> - 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion - APR Copyright (C) 2000-2004 The Apache Software Foundation - Collada DOM Copyright 2005 Sony Computer Entertainment Inc. - cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se) + 3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion + APR Copyright (C) 2011 The Apache Software Foundation + Collada DOM Copyright 2006 Sony Computer Entertainment Inc. + cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se) DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc. expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd. - FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org). + FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg. GL Copyright (C) 1999-2004 Brian Paul. GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia. google-perftools Copyright (c) 2005, Google Inc. Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited. jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW) jpeglib Copyright (C) 1991-1998, Thomas G. Lane. - ogg/vorbis Copyright (C) 2001, Xiphophorus - OpenSSL Copyright (C) 1998-2002 The OpenSSL Project. - PCRE Copyright (c) 1997-2008 University of Cambridge + ogg/vorbis Copyright (C) 2002, Xiphophorus + OpenSSL Copyright (C) 1998-2008 The OpenSSL Project. + PCRE Copyright (c) 1997-2012 University of Cambridge SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) xmlrpc-epi Copyright (C) 2000 Epinions, Inc. - zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler. - google-perftools Copyright (c) 2005, Google Inc. + zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler. Second Life Viewer uses Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (and its Licensors). All Rights Reserved. See www.havok.com for details. -- cgit v1.2.3 From 408987515462ceb60260f39efcbdd0dd163a5971 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Fri, 8 Jun 2012 08:59:31 -0400 Subject: tag merge of DRTVWR-163 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 4f3f55ad94..13eb905b74 100644 --- a/.hgtags +++ b/.hgtags @@ -297,3 +297,4 @@ d29a260119f8d5a5d168e25fed0c7ea6b3f40161 3.3.2-beta1 c623bbc854b6f7ee1b33a3718f76715046aa2937 viewer-release-candidate 675668bd24d3bea570814f71762a2a806f7e1b8d viewer-release-candidate 675668bd24d3bea570814f71762a2a806f7e1b8d 3.3.2-release +c08e2ac17a99973b2a94477659220b99b8847ae2 DRTVWR-163 -- cgit v1.2.3