Ansariel
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Ansariel
f59579cd8f
FIRE-6904: Double Clicking Land Sales Price Tags in WorldMap causes Search Error
2015-08-23 14:33:56 +02:00
Ansariel
272bce84a6
FIRE-16588: Replace llround with ll_round in Firestorm-specific code
2015-08-06 22:56:41 +02:00
Nicky
50f40ab271
Compile fix.
2015-05-05 18:09:57 +02:00
Nicky
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02: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
Ansariel
100e50a4a8
Backout the backout of the backout backout for MAINT-3250 after LL backed out their backout backout and sync with V3 now MAINT-3250 is completely reverted
2015-02-02 21:09:18 +01:00
Ansariel
48fc17d6e1
Merge LL V3.7.16
2015-01-14 17:36:30 +01:00
callum_linden
577a3973ea
Update to build on Xcode 6.0: Large (and final) collection of fixes for unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
2014-10-20 14:00:39 -07:00
simon
a5568f942b
Merge downstream version 3.7.8 code
2014-05-07 15:28:13 -07:00
maksymsproductengine
6ca7c588a8
MAINT-3871 FIXED Recent issues with dragging the World Map.
2014-03-28 19:09:38 +02:00
Richard Linden
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
Tank_Master
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
ziree
fb5c21dd29
Backing out 40802 (backout of backout of MAINT-3250 - mouse issues in world map) - Now it gets confusing. MAINT-3250 should now be gone from our code, because MAINT-3870 didn't fix it either and will also be backed out.
2014-04-28 17:47:37 +02:00
Ansariel
919d66ca5a
Backout 23cbd2ebb8aa again because MAINT-3870 should fix the cam issues
2014-04-16 21:45:59 +02:00
Ansariel
47fffb4544
FIRE-13469: Backout the MAINT-3250 fix for release due to unwanted side effects.
2014-04-16 21:29:50 +02:00
Tank_Master
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
maksymsproductengine
b1c943859b
MAINT-3250 FIXED [TUI] Dragging on the Map does not working correctly
2013-10-23 18:11:56 +03:00
Richard Linden
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
Richard Linden
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Richard Linden
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
simon
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
Oz Linden
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
simon
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
simon
1d8e3997c8
Pull and merge latest viewer-beta
2013-03-22 14:17:26 -07:00
prep@lindenlab.com
f2948cb1eb
Merge with viewer-chui
2013-03-20 17:53:51 -05: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
merov
c294c7c474
CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux
2013-03-16 16:09:50 -07:00
Graham Madarasz (Graham Linden)
e8dfa28697
Rollback Maestro interp changes
2013-03-14 14:12:26 -07:00
Don Kjer
9150757c81
More fixes for gcc-4.6 breakage
2013-03-13 21:01:50 +00:00
Nyx Linden
1586107e87
SH-3944 WIP CHUI merge fixing
...
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
Graham Madarasz (Graham)
f061b2b90e
Optimize interp code to elim hundreds of divides per frame and fix jitter bugs.
2013-03-08 15:31:37 -08:00
Tank_Master
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
Tank_Master
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
Cinders
661b17e9f1
Refactor Region Grid Coordinates to use it's own setting FSShowRegionGridCoordinates rather than piggy back on FSRegionAdvancedInfo, float text above region name, and a little bit of pushing stuff around in Move & View prefs
2013-05-05 16:01:17 -06:00
Cinders
e28387b7e4
Show region grid coordinates in the world map when advanced info is enabled
2013-05-03 10:03:48 -06:00
Richard Linden
e6dc88241b
MAINT-1474 FIXED World map tracking ring renders in incorrect position with UI scale != 1
2012-08-23 17:07:03 -07:00
Ansariel
3126e58f24
More cleanup after SSB/RLVa merge
2013-03-02 00:28:06 +01:00
Tank_Master
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
Tank_Master
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
Kitty Barnett
4101c43f5f
Merged with viewer-sunshine tip (Revision 87a6fc812214)
...
--HG--
branch : RLVa
2013-02-20 19:25:10 +01:00
Cinders
2c9e821188
Rename HAS_OPENSIM_SUPPORT switch to OPENSIM
2013-02-18 21:24:20 -07: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
Tank_Master
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
Nyx Linden
438ceeb008
BUILDFIX: merge cleanup
...
A couple of merge issues that caused the resulting code to not build.
2013-01-25 17:58:11 -05:00
Nyx Linden
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00