e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
c285f59ce2
Replace BOOL with bool in llwindow and dependent classes
2024-02-18 15:51:54 +02:00
3c40a833ef
Merge branch 'master' into DRTVWR-530-maint
2021-06-07 21:05:04 +03:00
5cde118ec8
SL-14664 Added zoomout and sizeall
...
Remade code to use getCursorFromString
2021-04-27 23:08:54 +03:00
7cd076c796
DRTVWR-510 remove all LL_SOLARIS conditionals
2020-10-08 17:16:22 -06:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
e9116575bf
OPEN-209: Corrected all instances of trigraphs in the code.
...
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -07:00
fe24e442a6
BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macros
2013-08-14 20:50:26 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
cec50f8c14
Fix for gcc 4.6 build failures on Linux in llwindowsdl.cpp
2013-03-13 19:17:13 +00:00
9ea6a96be9
LLWindow merge fixes for Mac
2013-03-11 17:29:05 -04:00
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
716e2ea3b1
Pull and merge viewer-development
2012-12-12 10:58:47 -08:00
65998aaea8
Pull from viewer-development
2012-12-05 12:43:35 -05:00
3e8fdb9daa
Fixed previous commit.
2012-12-01 00:12:32 +00:00
6cff95f8c7
Fix for STORM-1854. Adapted the fix based on other open source consumers of fontconfig that were encountering the same error.
2012-11-30 18:26:56 -05:00
a567c425ca
MAINT-536 MAINT-1913 Added missing URL scheme filtering to the Linux viewer, changed URL scheme whitelist. Reviewed by Callum.
2012-11-14 02:24:58 +00:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00: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
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
1c71b90300
EXP-1651 FIXED Added saving window size after each reshape.
...
Fixed broken resize indicator on Linux viewer window (EXP-1580).
2011-12-06 21:43:58 +02: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
1a7e49ece8
EXP-1580 FIXED applying "MinWindowWidth" and "MinWindowHeight" settings to Linux viewer window.
...
Added minimum size setting method for X11 viewer window on Linux.
2011-11-30 01:01:22 +02:00
9a5a96aadc
EXP-1580 FIXED resize indicator on Linux showing Viewer window can be resized below minimum size.
...
Fixed using minimum window dimensions configured in debug settings.
2011-11-29 16:45:10 +02: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
4292204732
EXP-1488 FIXED Minimum viewer window size limited to 1024x768 on Linux.
2011-11-02 22:47:56 +02:00
1a499c13c8
NEVER use glFinish outside shutdownGL
2011-10-12 11:06:57 -05: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
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
3e11f81b69
EXT-2418 - improved cursors for sit/open/buy - the neglected Linux part.
2010-03-31 15:24:10 +01:00
eeeca91797
merge
2010-03-29 15:29:12 -07:00
e50586043b
EXT-3258 - Viewer freezes while external web browser loads page
...
reviewed by Callum
2010-03-29 15:28:48 -07:00
ac10340316
EXT-6580 restrict size of linux's fallback font list
...
reviewed and approved for hotfix branch by Q.
2010-03-29 18:03:58 +01: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
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
bbbf3ee867
Wow, fix gcc fussiness that only happens in release builds for some reason.
2010-02-19 14:01:07 +00:00
2165d8c376
Linux viewer: add some instrumentation to detect VM and/or RSS bloat at runtime. This helped me identify the EXT-5552 cause (fix landing soon)
2010-02-19 12:24:44 +00:00
6d08400145
EXT-3651 DEV-44500 Keyboard interaction does not work with Flash media
...
This change lets Linux pass keys through to Flash.
2010-02-09 18:19:35 +00:00
08b4d7edf1
restore trivial llwindowsdl code improvement.
...
p.s. previous commit comment should have read 'hopefully trunk-UNbreaking' :)
and this overall mergeset is work towards:
EXT-3651 DEV-44500 Keyboard interaction does not work with Flash media
... although on linux this does not actually help yet.
2010-02-09 15:10:08 +00:00
b0791c3001
Backed out changeset 0664cf2c9edf
2010-02-09 15:07:45 +00:00
f9f6f1958d
EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event
...
This should be a lot better now. But still not good overall. Performance is now just bad instead of intolerable.
2010-02-05 09:01:58 +00:00
Ansariel