Tank_Master
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08: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
Don Kjer
d3924200b6
Removing unused gHeadlessClient code from viewer
2012-09-23 03:06:11 +00:00
Todd Stinson
4feef5af63
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-23 19:21:34 -07:00
simon@Simon-PC.lindenlab.com
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
Dave Parks
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
Todd Stinson
bf1c1947d7
PATH-743: Updating the cursors for path testing mode to final designs.
2012-06-25 14:28:21 -07:00
Todd Stinson
6e710333e7
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-06-22 18:59:31 -07:00
Dave Parks
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
Todd Stinson
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
Dave Parks
99dc246ac8
Merge
2012-06-15 14:29:46 -05:00
Tank_Master
8cb09ca444
Merge to FS LGPL 29865
2012-08-30 15:45:02 -07:00
Tank_Master
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
Tank@test_master.ftrdhcpuser.net
01c7d1eafb
Merge LL pathfinding
...
with help from Armin and NickyD
2012-08-06 18:14:39 -07:00
simon@Simon-PC.lindenlab.com
1777fa5187
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
2012-05-25 15:07:22 -07:00
Nat Goodspeed
78f2663c4a
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:04:55 -04:00
Todd Stinson
6aeb2c68b9
Refining the behavior of the pathing test tool behavior with regards to mouse clicks.
2012-04-11 13:20:54 -07:00
Todd Stinson
2115211328
Re-implementing the path testing functionality as a proper LLTool.
2012-04-09 18:53:52 -07:00
Dave Parks
76eeeadeaa
MAINT-771 Add RenderAutoHideSurfaceAreaLimit debug setting for protecting against sculpt based crashers.
2012-03-19 15:31:10 -05:00
Tank_Master
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
Ansariel
c5894c2781
Merge with Firestorm LGPL
2012-06-08 22:43:34 +02:00
Nicky
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
Tank_Master
1c55d5cbb6
Merge LL 3.3.2 release
2012-05-28 17:02:11 -07:00
Richard Linden
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
Vadim ProductEngine
4e24022b8c
EXP-1305 FIXED Prevent avatar from walking after double-clicking the title bar.
2012-02-27 15:54:41 +02:00
Richard Linden
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
Nat Goodspeed
0249a0d1e7
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:07:09 -04:00
Dave Parks
002c9b3f3d
MAINT-516 Potential fix for crash on startup in LLWindowWin32::switchContext
2012-04-11 16:02:24 -05:00
Tank_Master
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
Richard Linden
4c333d64ca
EXP-1832 FIX Viewer Size not persistent across logins
...
Save *window* width and height, not client area
2012-02-16 15:45:43 -08:00
Vadim ProductEngine
12b4862330
EXP-1832 FIXED Viewer Size not persistent across logins.
...
Symptoms: Viewer window shrank by a few pixels on each startup.
Reason: We used client rect (which did not include the window border) to create the viewer window.
Solution: Convert client rect into window rect, i.e. expand it by the border size.
2012-02-13 19:57:35 +02:00
Richard Linden
f27ea1aff7
EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
...
fixed build
moved conversion funcs to llwindow.cpp as they work on all platforms
refactored translateintorect to take overlap as parameter
2012-02-07 22:50:49 -08:00
Richard Linden
4e08461f8a
EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
...
changed over to new convert() method
added LLCoordFloater
2012-02-07 19:29:10 -08:00
Richard Linden
d56be1f175
EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
...
refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-07 12:31:48 -08:00
callum
987463d924
EXP-1765 POSSIBLE_FIX crash on startup at LLWindowWin32::switchContext(...)
2012-01-27 13:18:27 -08:00
merov
86ef722e7c
EXP-1775 : cleanup a bit PeekMessage() usage, avoid eating one event when reaching MAX_MESSAGE_PER_UPDATE.
2012-01-13 15:11:37 -08:00
Nicky
52fc943c6d
Merge up to 26312 / 0010858de5a1 (V/dev tip).
2012-01-27 18:29:47 +01:00
callum
9cdfecd9e1
EXP-1765 (Add debug info) crash on startup at LLWindowWin32::switchContext()
2012-01-10 10:40:27 -08:00
Richard Linden
dd9263d017
Automated merge with http://hg.secondlife.com/viewer-development
2011-12-08 11:02:00 -08:00
Nicky
6ef7838cd2
Merge up to 25972:7fceba778ee6 (V/Dev)
2012-01-17 21:15:06 +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
1e2d424f9e
STORM-1713: Mouse pointer flickers when hovering over any active/clickable UI item
2011-12-05 23:35:29 +01:00
Richard Linden
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
Richard Linden
20221c8e77
EXP-1485 FIX -- Viewer should have a minimum size
...
moved min size logic into LLWindow
2011-11-28 12:51:15 -08:00
Oz Linden
b69be18d7b
merge changes for vmrg-193
2011-11-24 06:56:57 -05:00
callum
e4e4977f5e
EXP-1527 FIX Debug values for windowwidth and windowheight can be set below minimum required values
...
and
EXP-1528 Launching viewer with a settings.xml file with windowwidth and windowheight set below minimum values, launches to those values not minimum window size
2011-11-11 12:29:04 -08:00
Oz Linden
6b516b7a6c
merge changes for vmrg-182
2011-11-08 15:59:50 -05:00
Dave Parks
fa5a0a90f4
SH-2240 Fix for core profile assertions when Debug GL enabled.
2011-11-03 15:00:40 -05:00
Leslie Linden
f6e3d0e581
EXP-1486 FIX -- Minimum window size on windows
...
Reviewed by Callum.
2011-10-31 13:27:25 -07:00