Commit Graph

33 Commits (61cb88c510804e3e43f3f2a30fbfac46db9ef804)

Author SHA1 Message Date
Ansariel da8e719b91 Added avatar marking for minimap. Fixes FIRE-1483 2011-07-15 22:37:22 +02:00
Ansariel b7ce168697 Changing zoom level of minimap in people panel via context menu now works again. Fixes FIRE-1749 2011-06-28 18:14:39 +02:00
Tonya Souther c5ab18cd42 Minimap fixes: save zoom level, double click teleports. From Ansariel Hiller, fixes FIRE-1720. 2011-06-26 16:32:16 -05:00
Tank_Master af6a01203d implmented storm-1068 - Add optional range ring(s) to the mini-map
(modified to add option to gear menu on nearby pannle and in FS preference, chat tab)
2011-06-12 21:03:14 -07:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00
Arrehn 283aea09ca FIRE-597, patch by Ansariel, Minimap distance distance to avatar 2011-03-07 09:48:55 -05:00
Twisted Laws 0d5b0cad14 Embed Minimap into the Nearby list of the People Sidebar 2011-01-26 19:22:42 -05:00
Arrehn d0d3e716dc Rolling back before back RLV merge 2010-11-04 10:02:01 -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
Aimee Linden 71fd7c89aa VWR-17653 (SNOW-734) FIXED Show inspectors for avatars on the MiniMap
Reworked, as the original version clashed with the display names merge.
2010-09-07 21:51:41 +01:00
Aimee Linden a330399082 VWR-17653 (SNOW-734) FIXED Show inspectors for avatars on the MiniMap
Imported from Snowglobe.
2010-09-01 14:22:38 +01: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
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Aimee Linden f35a2112ea EXT-7055: Re-remove old MAP_SCALE_* constants removed in DEV-30614 that have snuck back in 2010-04-24 18:55:55 +01: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
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new 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-10-03 23:40:28 +00:00
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +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
Brad Kittenbrink 087bd26553 Merge of QAR-1383 event-system-7 into trunk.
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04 16:24:21 +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
Melinda Green e1d8dac25a svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
2008-12-15 21:21:19 +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 e3b97ac65b merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
2008-03-20 21:41:26 +00:00
Steven Bennetts 672a76d0ea reverting premature commit at 82410. 2008-03-15 01:18:27 +00:00
Mark Palange 04611efae8 [NOTE: This was an erroneous commit, and was reverted in the next revision]
QAR-369 - viewer-cleanup2-7 81916 merged into release.
2008-03-14 23:21:38 +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
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
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00