livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,701 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

71 Commits (866eeb7897dc861e6fda56181ffabeae958fc20e)

Author SHA1 Message Date
Kitty Barnett a713ffa247 Merged with default tip (Revision ddfc2ed6aee1) 
--HG--
branch : RLVa
 2011-05-25 13:37:12 +02:00
Ricky Curtice 89216a6c21 Merged with viewer-development. 
The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.
 2011-04-29 14:23:27 -07:00
Oz Linden cb47ae3264 merge changes for storm-971 2011-03-21 06:59:55 -04:00
Kitty Barnett 7b0455ba0f Merged with default tip (Revision 78d1d228709c) 
--HG--
branch : RLVa
 2011-03-19 16:14:42 +01: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
Ricky Curtice 9bac314ba0 Switched to using *_SQUARED constants instead of multiplied constants, and cleaned up a few other minor issues noted during review. 2011-03-12 23:39:10 -08:00
Ricky Curtice d4d292258e Squared all dist_vec() based comparisons and other dist_vec() operations where sensible. 
Not all instances of dist_vec() were squared, only those where it wouldn't (hopefully) change the functionality.
 2011-03-10 22:07:06 -08:00
Richard Linden 3c43ec4a96 SOCIAL-622 FIX Double clicking on mini map in people panel places a red circle that cannot be removed and tooltip references opening world map 2011-03-02 21:04:30 -08:00
Richard Linden 2c9cd5f4b2 SOCIAL-612 FIX Double Click on mini-map in People Nearby tab opens world map 
double click does nothing now
 2011-03-01 19:49:19 -08:00
Kitty Barnett 604345b918 Merged with .RLVa tip 
--HG--
branch : RLVa
 2011-02-19 01:12:23 +01:00
Twisted Laws 0d5b0cad14 Embed Minimap into the Nearby list of the People Sidebar 2011-01-26 19:22:42 -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
Kitty Barnett 16a94fb8e2 - merge : region names on the minimap tooltip should be hidden when @showloc=n restricted 
--HG--
branch : RLVa
 2010-11-01 03:11:33 +01:00
Kitty Barnett dd554a73a1 - merge : agent names on the minimap tooltip should be anonymized when @shownames=n restricted 
--HG--
branch : RLVa
 2010-11-01 03:03:13 +01:00
Kitty Barnett 1c2ef4090a Merged with default tip (Revision f20bf424bd86) 
--HG--
branch : RLVa
 2010-10-30 17:28:00 +02: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 ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Kitty Barnett 436f3ba929 Merged with default tip (Revision b7f03886bbc7) 
--HG--
branch : RLVa
 2010-09-02 03:27:33 +02:00
Aimee Linden 711ccfa57f VWR-13221 (SNOW-188) SUPPLEMENTARY Allow panning of the minimap 
Fix Linux build.
 2010-09-01 15:05:24 +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
Kitty Barnett b6a073c659 Initial commit of RLVa-1.2.0i 
--HG--
branch : RLVa
 2010-08-22 10:57:22 +02:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
James Cook d674d11f89 Rename LLAvatarName::getNameAndSLID() to getCompleteName() 
Discussed with Leyla/Richard
 2010-05-21 17:11:31 -07:00
James Cook 8992232e64 DEV-50013 Display names in mini-map tooltips 
Reviewed with Leyla
 2010-05-21 16:45:35 -07: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
Palmer Truelson 7885748497 Turning back on Davep's ui optimizations. Backed out changeset 6c161782dba3 2010-02-23 17:08:06 -08:00
Palmer Truelson 651b14fcae Backed out davep's UI optimization. changeset 3134cb7bb181 2010-02-12 21:04:51 -08:00
Dave Parks 979ddb2ec9 No more matrix ops in UI code. 2010-02-04 23:41:54 -06: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
richard abc76784d5 EXT-2382 - fix for clipping of minimap 2009-11-11 11:19:37 -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
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
James Cook d6101558a1 Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also 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-07-06 21:58:04 +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
Mark Palange f89f19990c QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
Steven Bennetts afe61eb994 QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge 
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
 2008-08-12 17:29:50 +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 ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake) 
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
 2008-06-06 22:43:38 +00:00
Steven Bennetts 63e7894148 QAR-570 maint-render-4 merge 
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
 2008-05-08 18:41:20 +00:00
Steven Bennetts d85247e63e QAR-449 Viewer 1.20 RC 0 
merge Branch_1-20-Viewer -r 84060 : 84432 -> release
 2008-04-17 02:42:27 +00:00