Commit Graph

92 Commits (bdce32a02b34e42ab2f145af5f8beb54f4e2b534)

Author SHA1 Message Date
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
maksymsproductengine 6ca7c588a8 MAINT-3871 FIXED Recent issues with dragging the World Map. 2014-03-28 19:09:38 +02:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
maksymsproductengine b1c943859b MAINT-3250 FIXED [TUI] Dragging on the Map does not working correctly 2013-10-23 18:11:56 +03:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
simon 1d8e3997c8 Pull and merge latest viewer-beta 2013-03-22 14:17:26 -07:00
prep@lindenlab.com f2948cb1eb Merge with viewer-chui 2013-03-20 17:53:51 -05:00
Richard Linden 8de397b19e SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
merov c294c7c474 CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux 2013-03-16 16:09:50 -07:00
Graham Madarasz (Graham Linden) e8dfa28697 Rollback Maestro interp changes 2013-03-14 14:12:26 -07:00
Don Kjer 9150757c81 More fixes for gcc-4.6 breakage 2013-03-13 21:01:50 +00:00
Nyx Linden 1586107e87 SH-3944 WIP CHUI merge fixing
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
Graham Madarasz (Graham) f061b2b90e Optimize interp code to elim hundreds of divides per frame and fix jitter bugs. 2013-03-08 15:31:37 -08:00
Richard Linden e6dc88241b MAINT-1474 FIXED World map tracking ring renders in incorrect position with UI scale != 1 2012-08-23 17:07:03 -07:00
Oz Linden 633bd44b4a merge changes for vmrg-225 2012-03-09 12:58:50 -05:00
Richard Linden c47c31fdbf EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat 2012-01-31 17:51:43 -08:00
Jonathan Yap 3b2511661e STORM-1793 1) Treat all mini-map altitudes above 1020 m as the same height 2) Improve z-level accuracy
With help from Aleric Inglewood
2012-01-27 08:33:26 -05:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
Siana Gearz 7e0444cbe7 STORM-1678: Correct map display when For Sale is enabled 2011-11-02 11:59:33 -07:00
Dave Parks 7c95af74f1 SH-2243 work in progress -- application side matrix stack management 2011-09-14 16:30:45 -05:00
Richard Linden fa3f4d1166 EXP-880 FIX Enable navigation chrome for Search floater
search floater derives from floater_web_content
all web content now uses floater_web_content instead of media_browser
2011-07-12 20:58:30 -07:00
callum b286a9091b SOCIAL-688 FIX Multiple SLurls error given in minimal skin when clicking links in web profile
Also fixes SOCIAL-521 and SOCIAL-428
2011-03-25 13:56:14 -07:00
Merov Linden 9652de51ce STORM-281 : merge to viewer-development + fix indentation 2010-10-20 20:13:47 -07:00
Merov Linden e44b548704 STORM-281 : Fix Map FOV frustum when UI size not equal to 1 2010-10-19 17:48:35 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Eugene Mutavchi b36539f23f Fixed normal EXT-6853 ([HARDCODE] Number of "Person"/ "People" in World Map - hard coded?) - added 2 UI strings: "world_map_person" and "world_map_people".
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/290/

--HG--
branch : product-engine
2010-04-21 20:05:45 +03:00
Richard Nelson 04332ede42 EXT-6307 - World Map: field of view triangle rotates
reviewed by monroe
2010-04-14 17:57:28 -07:00
Richard Linden 09add95e31 EXT-6307 World Map: field of view triangle rotates
reviewed by Leyla
2010-04-01 13:42:42 -07:00
Loren Shih 0a56031bd3 automated merge 2010-03-25 20:15:51 -04:00
Loren Shih fc49539b36 EXT-2959 : Full out camera functions from llagent to llagentcamera
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
Kent Quirk a3a4235a89 EXT-6321 -- clicking on an event in the main map now invokes the event details floater instead of trying to do a search for the event. 2010-03-18 09:22:34 -04:00
Sergei Litovchuk ae2cbf2df8 Fix for critical task (EXT-4710) Update maturity icons for World Map.
- Updated maturity icons in map overlay.

--HG--
branch : product-engine
2010-02-08 17:45:52 +02:00
Tofu Linden 3e8e3b85d9 DEV-44607 ugly/broken font used for region labels in world map view 2009-12-22 16:47:50 -08:00
Kent Quirk f496c2b164 DEV-43622 : API change (no functionality change) to fix a design error in LLSD
I made it about a year and a half ago; Zero found it while reading code. I had added a return value to LLSD::insert(), but a) did it wrong, and b) broke the STL-like semantics of insert(). So I've put insert() back to returning void and created LLSD::with(), which does what my earlier insert() did. The compiler then caught all the cases where insert()'s return value were being used, and I changed those to use with() instead.
2009-12-01 20:59:08 -05:00
Steve Bennetts 0db73b1ac5 merge 2009-11-06 12:20:52 -08:00
Steve Bennetts afe6350160 merge from texture-pipeline 2009-11-06 12:15:41 -08:00
Tofu Linden 956ce3af65 M_PI -> F_PI - who knew that M_PI was dropped from C99 onwards?!
Oh well, this should still be better.
2009-11-06 16:41:56 +00:00
Tofu Linden 6552c1a973 merge. 2009-11-06 14:58:27 +00:00
Tofu Linden 904f6124b2 magic number removal rampage: 3.14159 -> M_PI or F_PI
--HG--
branch : texture-pipeline
2009-11-06 13:27:28 +00:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Xiaohong Bao abf77532d8 fix the bug that textuer boost level is mixed with boolean numbers. 2009-11-03 19:42:52 -07:00
Steve Bennetts 53c972a521 * Changes to enable differentiating between icon texture priority and other UI texture priority.
* Still need to only request smaller mip maps of icon textures
2009-10-25 23:05:15 -07:00
Martin Reddy eb620735fc DEV-41358: Added support for search categories.
You can now specify a search category for all web-based searches,
e.g., "all" (default), "people", "places", "events", "groups", "wiki",
"destinations", "classifieds". Specifying a category will add the
relevant subdir to the search URL, as specified by the search team.
2009-10-20 14:07:50 +00:00