summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermap.cpp
AgeCommit message (Collapse)Author
2011-01-04merge changes for storm-467Oz Linden
2010-12-22STORM-466 Fix for: minimap cannot be reset to default zoomJonathan Yap
2010-12-18STORM-467 Fix for minimap zoom does not persist to the next sessionJonathan Yap
2010-11-01STORM-420 : Took Andrew's comment into account, fixing the issue when ↵Merov Linden
minimap was minimized
2010-10-29STORM-420 : allow teleport when double clicking the minimap if doubleclick ↵Merov Linden
teleport is on, allow beacon setting if not
2010-10-06STORM-299 : mergeMerov Linden
2010-10-06STORM-299 FIXED World map floater opening instead Mini-map if double-click ↵Andrew Productengine
on minimized Mini-map. - What map floater is shown on Mini-map doublecklick now differs depending on whether it is minimized.
2010-09-01VWR-13221 (SNOW-188) FIXED Allow panning of the minimapAimee Linden
Imported from Snowglobe.
2010-09-16mergeRichard Linden
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-16moved buildFloater out of lluictrlfactory to llfloater.cppRichard Nelson
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-06-22EXT-7882 FIX Set caption when floater minimized and remove when maximized.Yuri Chebotarev
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/624/ --HG-- branch : product-engine
2010-06-09EXT-7605 FIX fix consequences. to play safe reduce ctrl sizeYuri Chebotarev
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/540/ --HG-- branch : product-engine
2010-06-02EXT-7550 FIX fix floater height and minimap position right after start.Yuri Chebotarev
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/497/ --HG-- branch : product-engine
2010-05-18EXT-7112 fix Set map pos,bgnd and size in code to match mockupYuri Chebotarev
--HG-- branch : product-engine
2010-03-26Manual merge from default branchVadim Savchuk
Resolved conflict in indra/newview/llviewerwindow.cpp. --HG-- branch : product-engine
2010-03-26Fixen normal EXT-6434 (Mini Map does not go transparent when not in focus)Paul Guslisty
- Set background opaque of the floater depending on focus and made map's background color transparent Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/99/ --HG-- branch : product-engine
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-02-01fix for normal EXT-4512 [BSI] Can't minimize Mini-MapYchebotarev ProductEngine
actually this has nothing with original bug description so...fix map and text pos on map resize --HG-- branch : product-engine
2010-01-28fix for normal EXT-4512 [BSI] Can't minimize Mini-MapYchebotarev ProductEngine
also this fix EXT-2119 even if its marked as fixed... --HG-- branch : product-engine
2009-11-17EXT-2226 Add "Rotate Mini Map" toggle to mini-map context menuJames Cook
Reviewed with Kelly
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
2009-10-14EXT-946 There is no terrain on the Mini-Map. Unclear if this fixes the ↵James Cook
problem or not, does not reliably repro for me. Found several uninitialized variables in LLNetMap and fixed those. Reviewed with Richard.
2009-08-29EXT-729 - moved XML from menu_minimap.xml to menu_mini_map.xml and deleted ↵Steven Bennetts
menu_minimap.xml (translations all have menu_mini_map.xml)
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to ↵James Cook
register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
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-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
QAR-424
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
DEV-11202: Unhandled Excpetion in pipeline.cpp. Merged over updated windlight ui help text from windlight14. Reverting a const change in a virtual that was not propagated to all overrides. DEV-10957 stop and pause Media and music buttons do not work DEV-10762 Displayed page in the client browser disappears when crossing property boundaries. DEV-11220 replace misspellings in alerts.xml parameters of 'messsage' DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip DEV-11193 clean up some viewer strings related to Windlight help text svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads DEV-11110 Media browser history dropdown does not save items across sessions Ran the xuiparse -process tool on all en-us xml files. This does NOT change any data, merely reorders attributes and cleans up tab/spacing. DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown dev-10623 "parcels that played movies no longer work in combo-merge-ui" DEV-11379 - crash in LLTabContainer::draw() DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview DEV-11158 sculpties on the top10 crash list DEV-11404 "Send Current URL to Parcel" does not set the MIME type merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database. DEV-10489: no draw distance cheating DEV-879: water noise frequency DEV-10764: macbook air support DEV-10878: Linux Intel945 support DEV-7551: featuretable adjustments for framerate. DEV-11426 Enormous mini-map. DEV-11505 - Crash in gunzip_file. Removed final LinkedList, SkipMap, and AssocList templates from the Viewer! DEV-11115 truncated word in the Advanced Water Editor's modal help dialog
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ↵Steven Bennetts
79986 : 80178 -> release. QAR-290 = QAR-271 + QAR-191
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-11-01svn merge -r 72652:72881 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release QAR-11: pair-reviewed the merge w/ Sam.
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-02svn merge -r 70819:70853 ↵Tess Chu
svn+ssh://svn/svn/linden/branches/urldispatcher-for-merge
2007-04-04svn merge -r 59826:59968 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-02-02Result of svn merge -r57264:57370 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 18:35:55 +0000