Rye Mutt
|
6db7b30123
|
Fix find child during search/draw in debug settings floater
|
2024-08-18 22:56:35 -04:00 |
|
Ansariel
|
9fdca96f8b
|
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
|
2024-07-08 20:27:14 +02:00 |
|
Ansariel
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
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 |
|
Andrey Lihatskiy
|
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 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Ansariel
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +02:00 |
|
Andrey Kleshchev
|
3fd86c2f23
|
SL-18871 Debug setting's description is not scrollable
|
2023-01-05 01:34:03 +02:00 |
|
Mnikolenko Productengine
|
8de9beeb6f
|
SL-18388 Searchable debug settings UI
|
2022-10-24 21:46:14 +03:00 |
|
Mnikolenko Productengine
|
74d6e6b65c
|
SL-12904 FIXED Camera Preset does not restore correctly when sitting
|
2020-04-20 14:27:22 +03:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05: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 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
Aleric Inglewood
|
42604a1080
|
VWR-24315: update cached control values when resetting debug setting to default
|
2011-01-20 14:35:04 -05:00 |
|
Monroe Linden
|
b62b10dd26
|
Post-convert merge by convert_monolith.py from ./viewer-experience
|
2010-08-27 16:58:33 -07:00 |
|
Richard Nelson
|
124bc854dd
|
moved buildFloater out of lluictrlfactory to llfloater.cpp
|
2010-08-16 17:44:23 -07:00 |
|
Tofu Linden
|
e416840f85
|
Backed out changeset c3d41f18ce2b
back-out the back-out for this branch. yay.
|
2010-08-24 19:22:00 +01:00 |
|
Tofu Linden
|
98cc236503
|
Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
|
2010-08-24 18:44:39 +01:00 |
|
Tofu Linden
|
6ba23344c9
|
merge heads. whew.
|
2010-08-24 18:37:53 +01:00 |
|
Oz Linden
|
06b0d72efa
|
Change license from GPL to LGPL (version 2.1)
|
2010-08-13 07:24:57 -04:00 |
|
Richard Nelson
|
566e3969f9
|
deprecated LLPanel::child*() methods
|
2010-07-30 10:02:30 -07:00 |
|
angela
|
433eb89473
|
EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc)
|
2010-01-14 09:38:46 +08:00 |
|
David Parks
|
536e38ad51
|
Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
|
2009-09-22 11:11:45 +00:00 |
|
Richard Nelson
|
138bf11322
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
|
2009-08-24 20:04:52 +00:00 |
|
James Cook
|
d6101558a1
|
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
|
2009-07-06 21:58:04 +00:00 |
|
Steven Bennetts
|
ade6bbb06c
|
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
|
2009-06-21 17:16:27 +00:00 |
|
Steven Bennetts
|
9ec432034d
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
|
2009-06-21 08:04:56 +00:00 |
|
Dave Simmons
|
24b26d71ee
|
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
|
2009-03-20 20:00:47 +00:00 |
|
Aaron Brashears
|
e3cf284388
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
Steven Bennetts
|
25c10ed028
|
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
|
2008-06-26 00:39:00 +00:00 |
|
James Cook
|
55c25229b7
|
svn merge -r 83778:83944 maint-ui-10-merge
QAR-442
|
2008-04-03 18:43:54 +00:00 |
|
Steven Bennetts
|
941cb9f412
|
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
|
2008-04-01 17:45:04 +00:00 |
|
Steven Bennetts
|
e3b97ac65b
|
merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
|
2008-03-20 21:41:26 +00:00 |
|
Steven Bennetts
|
672a76d0ea
|
reverting premature commit at 82410.
|
2008-03-15 01:18:27 +00:00 |
|
Mark Palange
|
04611efae8
|
[NOTE: This was an erroneous commit, and was reverted in the next revision]
QAR-369 - viewer-cleanup2-7 81916 merged into release.
|
2008-03-14 23:21:38 +00:00 |