14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
9ea6a96be9
LLWindow merge fixes for Mac
2013-03-11 17:29:05 -04:00
d3924200b6
Removing unused gHeadlessClient code from viewer
2012-09-23 03:06:11 +00:00
9e2db5a173
PATH-852: BUGFIX Adding the custom pathfinding cursors to the mac and linux builds as apparently they never worked there.
2012-08-13 18:28:34 -07:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
d9c7b9253d
merge LL 3.4.0 viewer-beta
2012-08-31 00:18:30 -07:00
784b6b5f52
Deleting duplicated lines that shouldn't have been there.
2012-08-19 15:57:32 -05:00
4f3bfdd014
Fix compile error after PATH-852 patch added.
2012-08-19 02:54:08 -05:00
4fb0a3bf13
PATH-852: BUGFIX Adding the custom pathfinding cursors to the mac and linux builds as apparently they never worked there.
2012-08-13 18:28:34 -07:00
1c55d5cbb6
Merge LL 3.3.2 release
2012-05-28 17:02:11 -07:00
874a67776b
fix for mac build
2012-02-27 14:02:09 -08: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
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
dd9263d017
Automated merge with http://hg.secondlife.com/viewer-development
2011-12-08 11:02:00 -08:00
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
1e2d424f9e
STORM-1713: Mouse pointer flickers when hovering over any active/clickable UI item
2011-12-05 23:35:29 +01:00
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
20221c8e77
EXP-1485 FIX -- Viewer should have a minimum size
...
moved min size logic into LLWindow
2011-11-28 12:51:15 -08:00
b69be18d7b
merge changes for vmrg-193
2011-11-24 06:56:57 -05:00
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
727199e223
EXP-1487 FIX -- Minimum window size on mac
2011-10-31 12:49:57 -07:00
1a499c13c8
NEVER use glFinish outside shutdownGL
2011-10-12 11:06:57 -05:00
8f94ff85f9
merging up latest mesh-development to nyx-mesh-development
2011-05-17 12:13:54 -04:00
8017900e7f
merge
2011-05-12 18:50:22 -05:00
a52019d6d1
SH-1521 FIX -- Lighting and Shadows grayed out on mac
...
* Modified mac feature table to bring it up to date with latest renderer features including deferred rendering
* Changed mac AGL pixel format to no longer allow it to revert to software rendering when shader compilation errors occur.
* Fixed up various GLSL shader compilation warnings and errors that came up as a result of the above changes.
* Changed initial conditions for the "hardware skinning" checkbox on the preferences floater so it can be modified before login on machines that support avatar vertex programs.
* Removed unused avatarAlphaF.glsl files
Reviewed by davep
2011-05-10 14:34:36 -07:00
36f8899861
EXP-637 FIX -- As a new user, I would like Second Life to start up with a maximized window to fully immerse myself in the experience
...
Mac viewer now properly supports the calls to maximize and unmaximize the screen.
Reviewed by Callum
2011-04-25 17:31:04 -07:00
d1683bd65a
glFlush != glFinish. doh.
2011-01-13 13:46:00 -05:00
8fae5d49bf
testing: adding glFlush() each frame for performance testing
2011-01-07 18:24:35 -05:00
0a14d57cdb
FIRE-3798/STORM-1713: Linden Lab approved version of the fix for mouse cursor flickering when hovered over inworld objects
2011-12-08 18:20:08 +01:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
9fd0edb326
Initial 2.8.3+ merge, Tozh & Arrehn
...
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
e277b8a4ac
Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.
2011-08-04 11:53:40 -04:00
1b3d330f85
Allow opening files from within Firestorm on OS X. Fixes FIRE-720 for OS X users.
2011-05-07 16:53:39 -05:00
e1072ac2f6
EOL fixes.
2011-05-05 20:05:16 -05:00
a7e724e6c6
Less intrustive code for legacy cursor support
2011-01-18 17:27:11 -08:00
afd3be7439
Fixing duplicate '{' from V1-style icons checkin
2011-01-16 11:08:38 -05:00
80e2a367a3
Added support for legacy cursors
2011-01-15 20:07:08 -08:00
15c8a8cc0a
Branding updaters & Crashloggers. These aren't used, but better to do it now.
2010-11-21 12:05:51 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
e50586043b
EXT-3258 - Viewer freezes while external web browser loads page
...
reviewed by Callum
2010-03-29 15:28:48 -07:00
11e4b42ec9
merge
...
--HG--
branch : product-engine
2010-03-18 16:38:44 +02:00
beaeb85d8f
merge
...
--HG--
branch : product-engine
2010-03-18 16:38:23 +02:00
c67bc96278
Backed out changeset f4c0761897c6 EXT-4820([NUX] Viewer dimensions on first-run)
...
by which "moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux."
--HG--
branch : product-engine
2010-03-18 16:31:09 +02:00
9229f09928
Backed out changeset a95c1f4dcf02 EXT-4820([NUX] Viewer dimensions on first-run)
...
by which "implemented LLWindowMacOSX::maximize() method"
--HG--
branch : product-engine
2010-03-18 16:28:54 +02:00
2240ece438
EXT-2418 - improved cursors for sit/open/buy
2010-03-09 16:21:52 -08:00
e5c4438fd7
merge
2010-03-09 13:27:26 -08:00
dcf279d663
EXT-2418 added open/sit/buy mouse cursors
2010-03-05 18:34:36 -08:00
48fd4c8d14
Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux.
...
--HG--
branch : product-engine
2010-03-05 21:36:41 +02:00
870dcca787
Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - implemented LLWindowMacOSX::maximize() method
...
--HG--
branch : product-engine
2010-03-05 21:36:41 +02:00
Tank_Master