summaryrefslogtreecommitdiff
path: root/indra/newview/llworldmapview.cpp
AgeCommit message (Collapse)Author
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-20Merge with viewer-chuiprep@lindenlab.com
2013-03-16CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on ↵merov
Linux
2013-03-13More fixes for gcc-4.6 breakageDon Kjer
2013-03-12SH-3944 WIP CHUI merge fixingNyx Linden
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.
2012-08-23MAINT-1474 FIXED World map tracking ring renders in incorrect position with ↵Richard Linden
UI scale != 1
2012-03-09merge changes for vmrg-225Oz Linden
2012-01-31EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
2012-01-27STORM-1793 1) Treat all mini-map altitudes above 1020 m as the same height ↵Jonathan Yap
2) Improve z-level accuracy With help from Aleric Inglewood
2011-11-24merge changes for vmrg-193Oz Linden
2011-11-02STORM-1678: Correct map display when For Sale is enabledSiana Gearz
2011-09-14SH-2243 work in progress -- application side matrix stack managementDave Parks
2011-07-12EXP-880 FIX Enable navigation chrome for Search floaterRichard Linden
search floater derives from floater_web_content all web content now uses floater_web_content instead of media_browser
2011-03-25SOCIAL-688 FIX Multiple SLurls error given in minimal skin when clicking ↵callum
links in web profile Also fixes SOCIAL-521 and SOCIAL-428
2010-10-20STORM-281 : merge to viewer-development + fix indentationMerov Linden
2010-10-19STORM-281 : Fix Map FOV frustum when UI size not equal to 1Merov Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-04-21Fixed normal EXT-6853 ([HARDCODE] Number of "Person"/ "People" in World Map ↵Eugene Mutavchi
- 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-14EXT-6307 - World Map: field of view triangle rotatesRichard Nelson
reviewed by monroe
2010-04-01EXT-6307 World Map: field of view triangle rotatesRichard Linden
reviewed by Leyla
2010-03-25automated mergeLoren Shih
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-03-18EXT-6321 -- clicking on an event in the main map now invokes the event ↵Kent Quirk
details floater instead of trying to do a search for the event.
2010-02-08Fix for critical task (EXT-4710) Update maturity icons for World Map.Sergei Litovchuk
- Updated maturity icons in map overlay. --HG-- branch : product-engine
2009-12-22DEV-44607 ugly/broken font used for region labels in world map viewTofu Linden
2009-12-01DEV-43622 : API change (no functionality change) to fix a design error in LLSDKent Quirk
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-11-06mergeSteve Bennetts
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06M_PI -> F_PI - who knew that M_PI was dropped from C99 onwards?!Tofu Linden
Oh well, this should still be better.
2009-11-06merge.Tofu Linden
2009-11-06magic number removal rampage: 3.14159 -> M_PI or F_PITofu Linden
--HG-- branch : texture-pipeline
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-11-03fix the bug that textuer boost level is mixed with boolean numbers.Xiaohong Bao
2009-10-25* Changes to enable differentiating between icon texture priority and other ↵Steve Bennetts
UI texture priority. * Still need to only request smaller mip maps of icon textures
2009-10-20DEV-41358: Added support for search categories.Martin Reddy
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-19DEV-41358: Remove the code for the old search interface.Martin Reddy
This checkin deletes all of the code associated with the old XUI-based search interface, including LLFloaterDirectory, LLPanelDir*, a global variable event hack, and the associated XUI file. The new web-based search interface, LLFloaterSearch, is the way of the future. Deleted 19 files and 5,838 lines of code.
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵James Cook
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-09-09merge -r132032-132812 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-10EXT-127: Tooltips don't disappear immediately after moving mouse out of objectRichard Nelson
reviewed by Austin
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also ↵James Cook
UI color refactoring and new FreeType font library on Linux. svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-05-22svn merge -r121194:121210Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1 QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-03-20svn merge -r113004:115000 ↵Dave Simmons
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge latest 1.26 into trunk
2009-03-13svn merge -r114093:114412 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 19:48:10 +0000