Commit Graph

80 Commits (67ab0084f87c40bf31d7fadded55cc9ea6299ca2)

Author SHA1 Message Date
Nat Goodspeed 573287b50f DRTVWR-418: Fix API for LLTracker::stopTracking().
The signature for LLTracker::stopTracking() was silly: it accepted a void* for
the sole purpose of testing whether it was NULL. In other words, the parameter
was really a bool in void* clothing. Most callers passed NULL.

What got ugly was when you wanted to pass 'true', or a variable bool value.
Such values had to be cast to void*. In 64-bit land, the compiler correctly
flags that as extremely dubious practice.

But it's entirely unnecessary. Since stopTracking() wants a bool, change its
parameter to bool. Everybody wins.

(While at it, change a few related method params from BOOL to builtin bool.)
2016-12-20 09:44:10 -05:00
Nicky e8aa2dd71f x64: Do not use a union of LLColor4U. Especially having the two pointer in there will blow up the struct to at least 8 byte, which will break VBO packing as this class needs to be 4 byte in size.
(transplanted from 847df86d6b5daa69dcfc428df18876a9c1e8bef6)
2016-04-22 14:58:25 +02:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Oz Linden 71a468c6fb merge changes for other open sourc contributions 2015-07-30 11:09:00 -04:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
Jonathan Yap cacaf21eb5 STORM-2088 Minimap no longer remembers zoom setting between sessions 2014-12-05 09:46:07 -05:00
callum_linden a37c41e3f5 Update to build on Xcode 6.0: removal of some unused variables 2014-10-19 17:30:46 -07:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Cinder Roxley 0d663f8d2c STORM-1958: Only draw the user's netmap dot once 2013-07-23 15:31:00 +00:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 8de397b19e SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Jonathan Yap 3b2511661e STORM-1793 1) Treat all mini-map altitudes above 1020 m as the same height 2) Improve z-level accuracy
With help from Aleric Inglewood
2012-01-27 08:33:26 -05:00
Dave Parks 7c95af74f1 SH-2243 work in progress -- application side matrix stack management 2011-09-14 16:30:45 -05: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
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
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
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
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
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