Tank_Master
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
Kitty Barnett
e1b955226d
Merged with viewer-sunshine tip (Revision bd1162cb6fbe)
...
--HG--
branch : RLVa
2013-02-11 23:04:05 +01:00
Tank_Master
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
Don Kjer
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
Cinders
3e13995a3d
FIRE-8046: Support for Aurora Sim Var region - Adapted from Angstrom Viewer with thanks to nhede Core and Revolution Smythe. Also adds support for certain other aurora-sim features which still need some work.
2012-10-28 08:03:39 -06:00
Nicky
9983903093
Fix for GCC 4.6.3 when compiling 64 bit.
2012-10-14 22:46:52 +02:00
Ansariel
69303ab2ce
Added sophisticated option to choose the double click action on the minimap and made handling and tooltips consistent throughout all minimap instances (FIRE-6705)
2012-06-21 17:38:47 +02:00
Tank_Master
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
Kitty Barnett
ddc6afdd81
Merged with default tip (Revision f8183e357a6f)
...
--HG--
branch : RLVa
2012-04-21 22:29:42 +02:00
Ansariel
d3f63baca2
Possible Linux compile fix (FIRE-5430)
2012-03-11 11:02:03 +01:00
Kitty Barnett
b450c6541f
FIXED Never show a custom avatar color on the minimap when @shownames restricted
2012-03-11 01:26:42 +01: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
Nicky
88068b0bca
Merge up to 26400 / dd7b1341e59e (FS tip).
2012-02-04 00:40:27 +01:00
Ansariel
69508cb27b
* Proper fix of detecting avatars at unknown height after CoarseLocationUpdate update
...
* Reverted proposed change of LLWorld::getAvatars() as part of STORM-1793, because it breaks stuff
2012-02-03 15:05:00 +01:00
Nicky
47124812cd
Merge up to 26394 / 1d7dbcc52ca3 (FS tip).
2012-02-02 19:49:00 +01:00
Ansariel
c04ba6b52d
Improved minimap hovertip to show correct distance if radar has exact distance
2012-01-31 23:00:42 +01:00
Ansariel
c108eda8e8
Adopted STORM-1793: Improve minimap altitudes above 1020m and take updated CoarseLocationUpdate message into account; From Jonathan Yap, Aleric Inglewood & Xellessanova Zenith
2012-01-31 22:49:35 +01:00
Ansariel
cce2e278d0
Fixed crashes after merge when trying to access the people panel
2012-01-21 14:07:03 +01:00
Nicky
1714747536
After merge compare FS tree agsindt V/dev.
...
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
Nicky
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
Ansariel
2ea68ba215
* FIRE-4282: Added option to change colors for chat rings on minimap
...
* Changed the default color to something better visible
* Chat rings now distinguish between chat range and shout range
2012-01-04 12:48:33 +01:00
Ansariel
4bdf4556c7
Fixed missing change in netmap code
2012-01-02 18:05:58 +01:00
Ansariel
13e80d2db4
Fixing minimap zoom level; Zoom level now synchronizes throughout all instances (FIRE-4238)
2012-01-01 21:08:40 +01:00
Kitty Barnett
e035e0bb59
Merged with default tip (Revision 1343609b39cf)
...
--HG--
branch : RLVa
2011-11-30 12:16:49 +01:00
Dave Parks
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
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
Ansariel
0c7d9db795
Added RLV check for profile option on minimap
2011-12-23 13:15:40 +01:00
Ansariel
0fd6541ec1
Added avatar tracking feature from radar/minimap (FIRE-2049 & FIRE-2116)
2011-12-22 19:58:20 +01:00
Ansariel
ec010b2f0a
Added profile to minimap context menu (FIRE-4472)
2011-12-19 14:11:04 +01:00
Ansariel
40a3c1aa5a
Fix for minimap does not persist zoom level throughout sessions (FIRE-2881)
2011-11-16 19:01:24 +01:00
Ansariel
e6f5c2ceb9
Proper check for the cam to avatar feature on the minimap to take avatars at height >1020m into account
...
Get rid of the useless and clumsy I-button on the minimap hovertips
2011-10-15 11:12:32 +02:00
Ansariel
959d65ce64
Making minimap cam message localizable
2011-10-14 20:52:21 +02:00
Liny
be1360c90a
Adding the ability to rightclick on a dot on the minimap and cam to the dot (only works if they are within draw distance). Fixes FIRE-1721.
2011-10-12 15:50:14 -07:00
Nicky
4455fdc6a2
Do not put pointers into the LLColor4U union. That messes everything up when compiling under 64 Bit
2011-09-12 21:51:02 +02:00
LGG@LGG-LAPPY
67cafba002
Fix bug where extra avs would have the wrong tag color (also code cleanup)
2011-09-02 00:20:22 -05:00
LGG@LGG-LAPPY
7e4388d7dd
Contact Sets For Firestorm (Comm->Contact Sets)
2011-09-01 09:50:54 -05:00