6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
97a45e7597
Cleaning up legacy cursors and adding merge guard comments on changed code
2014-05-19 16:54:18 -07:00
ee88720b8a
Backed out changeset: ec54b058227c
2014-05-18 20:02:31 -07:00
6a74754813
Dump broken legacy V1 cursors nobody seem to fix, miss or care about for over 2 years
2014-05-14 19:13:46 +02:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
152d76e13e
MAINT-2939 FIXED [CHUI] On Windows machine location address bar in viewer goes blank if location is selected and a menu item is seleted
2013-07-30 20:03:21 +03:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
2113bb8159
Pull merge from viewer-release
2013-05-22 11:23:51 -07:00
1c5659b1ca
CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0
2013-04-25 20:02:36 +03:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
ed4c40a7ab
Merge with -lgpl
2013-10-14 20:57:33 +02:00
329ca38457
Merge with -lgpl.
2013-09-14 23:23:26 +02:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
db4543dbf8
Adhere to standard OSX app practices and bounce the icon whenever Firestorm is not the active app
2013-10-02 00:32:36 -06:00
0addf213ed
Merge with FS tip. First pass.
2013-08-02 00:40:48 +02:00
bdee194522
Fix some easy little pointer confusions for 64 bit versions.
2013-08-01 23:52:49 +02:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
d3924200b6
Removing unused gHeadlessClient code from viewer
2012-09-23 03:06:11 +00:00
4feef5af63
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-23 19:21:34 -07:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
bf1c1947d7
PATH-743: Updating the cursors for path testing mode to final designs.
2012-06-25 14:28:21 -07:00
6e710333e7
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-06-22 18:59:31 -07:00
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
11b6e272ab
PATH-743: Altering the mouse cursor to give more feed back when in path testing mode.
2012-06-21 16:39:35 -07:00
99dc246ac8
Merge
2012-06-15 14:29:46 -05:00
8cb09ca444
Merge to FS LGPL 29865
2012-08-30 15:45:02 -07:00
cb24ec2e0d
merge LL 3.3.4 beta
...
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
01c7d1eafb
Merge LL pathfinding
...
with help from Armin and NickyD
2012-08-06 18:14:39 -07:00
1777fa5187
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
2012-05-25 15:07:22 -07:00
78f2663c4a
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:04:55 -04:00
6aeb2c68b9
Refining the behavior of the pathing test tool behavior with regards to mouse clicks.
2012-04-11 13:20:54 -07:00
2115211328
Re-implementing the path testing functionality as a proper LLTool.
2012-04-09 18:53:52 -07:00
76eeeadeaa
MAINT-771 Add RenderAutoHideSurfaceAreaLimit debug setting for protecting against sculpt based crashers.
2012-03-19 15:31:10 -05:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
c5894c2781
Merge with Firestorm LGPL
2012-06-08 22:43:34 +02:00
8e0bc37f42
When setting window size, don't add hardcoded chrome values 16/38 when running under win32. Instead calculate those values dynamically.
2012-06-08 20:56:52 +02:00
1c55d5cbb6
Merge LL 3.3.2 release
2012-05-28 17:02:11 -07:00
8024727d45
EXP-1832 WIP Viewer Size not persistent across logins
...
fixed not unmaximizing properly on Windows
put in error logging on Mac
2012-02-27 11:26:08 -08:00
4e24022b8c
EXP-1305 FIXED Prevent avatar from walking after double-clicking the title bar.
2012-02-27 15:54:41 +02:00
9da67fff0a
EXP-1832 FIX Viewer Size not persistent across logins
...
made Set Window Size correctly set interior window rect, preserving measured dimensions
2012-02-23 12:39:32 -08:00
0249a0d1e7
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:07:09 -04:00
Tank_Master