Commit Graph

48 Commits (14ddfcdf5237c9529d8a8edbd4c86cfd53cfaf78)

Author SHA1 Message Date
maxim_productengine 4b44be799a MAINT-1416 FIXED Close Mini-map floater after Ctrl-W if it's opened and other floaters are not in focus 2012-08-21 18:10:45 +03:00
maxim_productengine ba7e1ec1d4 MAINT-328 FIXED Use stopTracking() before each new beacon 2012-08-08 17:55:04 +03:00
Richard Linden 30527b2206 EXP-1409 FIX WASD controls don't move avatar while Move floater is in focus
moved "chrome" flags to xui
separated hiding floater title from setting chrome
toolbar toggle button now moves floaters to frontmost and doesn't necessarily rely on focus
2011-10-18 14:09:52 -07:00
Leslie Linden 530d5af407 EXP-1204 PROGRESS -- As a User I want flexible floater management with no sidetray
EXP-1292 FIX -- Mini-map floater can't be closed by clicking the sidebar button again.

* Mini-map floater text updated
* Mini-map floater behavior now acts more like other windows, has a title, etc.
2011-10-04 12:05:27 -07:00
Oz Linden cb47ae3264 merge changes for storm-971 2011-03-21 06:59:55 -04:00
Vadim ProductEngine 2cddf137e3 STORM-971 FIXED Disable the 'Stop Tracking' menu item in Mini-map floater when tracking gets stopped.
- Removed the menu from LLFloaterMap (the mini-map floater)
  that had conflicted with the one in the LLNetMap widget.
- Fixed updating of the "Stop Tracking" menu item; moved that code
  out of draw() to avoid excessive updates.
- Preventively fixed LLTracker::isTracking() to return strictly 1 or 0
  (BOOL is known to cause hard-to-debug side effects with values > 1
  because it's essentially just an int and thus doesn't enforce
  any limitations on the value).
2011-03-14 17:37:56 +02:00
Richard Linden 7ffd09a697 Merge 2011-03-01 17:16:37 -08:00
Twisted Laws 0d5b0cad14 Embed Minimap into the Nearby list of the People Sidebar 2011-01-26 19:22:42 -05:00
Oz Linden 78895f9e0c merge changes for storm-467 2011-01-04 16:45:08 -05:00
Jonathan Yap ef5f9ee893 STORM-466 Fix for: minimap cannot be reset to default zoom 2010-12-22 08:47:43 -05:00
Jonathan Yap 09c7d38166 STORM-467 Fix for minimap zoom does not persist to the next session 2010-12-18 16:44:51 -05:00
Merov Linden 87e2b01fbb STORM-420 : Took Andrew's comment into account, fixing the issue when minimap was minimized 2010-11-01 17:28:28 -07:00
Merov Linden 398b8564e1 STORM-420 : allow teleport when double clicking the minimap if doubleclick teleport is on, allow beacon setting if not 2010-10-29 15:42:29 -07:00
Merov Linden ac76af0e2d STORM-299 : merge 2010-10-06 22:21:24 -07:00
Andrew Productengine d950a97af0 STORM-299 FIXED World map floater opening instead Mini-map if double-click on minimized Mini-map.
- What map floater is shown on Mini-map doublecklick now differs depending on whether it is minimized.
2010-10-06 14:02:34 +03:00
Aimee Linden 2b5cfc2a4d VWR-13221 (SNOW-188) FIXED Allow panning of the minimap
Imported from Snowglobe.
2010-09-01 14:14:35 +01:00
Richard Linden 1911993cc7 merge 2010-09-16 19:45:57 -07:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Richard Nelson 124bc854dd moved buildFloater out of lluictrlfactory to llfloater.cpp 2010-08-16 17:44:23 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Yuri Chebotarev 0d099b4f08 EXT-7882 FIX Set caption when floater minimized and remove when maximized.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/624/

--HG--
branch : product-engine
2010-06-22 15:47:36 +03:00
Yuri Chebotarev d807db70e0 EXT-7605 FIX fix consequences. to play safe reduce ctrl size
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/540/

--HG--
branch : product-engine
2010-06-09 19:07:21 +03:00
Yuri Chebotarev 129d504dd9 EXT-7550 FIX fix floater height and minimap position right after start.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/497/

--HG--
branch : product-engine
2010-06-02 18:23:06 +03:00
Yuri Chebotarev d3cfb6ca36 EXT-7112 fix Set map pos,bgnd and size in code to match mockup
--HG--
branch : product-engine
2010-05-18 17:57:04 +03:00
Vadim Savchuk a5227864bd Manual merge from default branch
Resolved conflict in indra/newview/llviewerwindow.cpp.

--HG--
branch : product-engine
2010-03-26 19:00:27 +02:00
Paul Guslisty 4d8338ff3e Fixen normal EXT-6434 (Mini Map does not go transparent when not in focus)
- 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-26 09:47:42 +02: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
Ychebotarev ProductEngine 3650ef0d9f fix for normal EXT-4512 [BSI] Can't minimize Mini-Map
actually this has nothing with original bug description so...fix map and text pos on map resize

--HG--
branch : product-engine
2010-02-01 16:30:48 +02:00
Ychebotarev ProductEngine 1631ca7173 fix for normal EXT-4512 [BSI] Can't minimize Mini-Map
also this fix EXT-2119 even if its marked as fixed...

--HG--
branch : product-engine
2010-01-28 10:34:12 +02:00
James Cook 6d6ee6af54 EXT-2226 Add "Rotate Mini Map" toggle to mini-map context menu
Reviewed with Kelly
2009-11-17 12:03:57 -08:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
James Cook 8799193fde EXT-946 There is no terrain on the Mini-Map. Unclear if this fixes the problem or not, does not reliably repro for me. Found several uninitialized variables in LLNetMap and fixed those. Reviewed with Richard. 2009-10-14 23:02:38 +00:00
Steven Bennetts c4384d64a1 EXT-729 - moved XML from menu_minimap.xml to menu_mini_map.xml and deleted menu_minimap.xml (translations all have menu_mini_map.xml) 2009-08-29 01:47:33 +00:00
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to 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-07-07 00:53:05 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Christian Goetze 1aa0416aef svn merge -r114093:114412 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-03-13 21:28:40 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release
QAR-424
2008-04-01 17:45:04 +00:00
Steven Bennetts 377ae59c21 merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release
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-03-11 01:47:36 +00:00
Steven Bennetts 2e32d44e71 merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +00:00
Steven Bennetts 050dad0ce3 merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +00:00
Josh Bell 7afa8058aa svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
2007-11-01 22:02:35 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 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-04 23:19:43 +00:00
Tess Chu cfd17f3322 svn merge -r 70819:70853 svn+ssh://svn/svn/linden/branches/urldispatcher-for-merge 2007-10-02 22:38:38 +00:00
Josh Bell 98740db8fd svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-04 19:49:24 +00:00
Aaron Brashears 305c74d516 Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00