Commit Graph

178 Commits (e0d14e02e152b4e75ff8bdd974677f9669163d68)

Author SHA1 Message Date
Andrey Lihatskiy 4a00da1ada
Update indra/newview/llfloatertools.cpp
Remove trailing whitespace to pass pre-commit check
2024-08-19 08:18:41 +03:00
Rye Mutt 934e1f665f Fix findChild during draw in the tools floater 2024-08-18 21:41:53 -04: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
Ansariel 8c16ec2b53 Convert BOOL to bool in LLControlGroup and related classes 2024-02-21 03:00:25 +02:00
Andrey Kleshchev b49632f427 SL-20343 Close material live editor if editor floater closes
Closing tools floater disabled selection, material editor can't work without that
2023-09-28 03:55:43 +03:00
Andrey Lihatskiy 59ab8e78f4 Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
Mnikolenko Productengine 9f5a38b98e SL-17562 FIXED Grid Options changes position upon reopening of Build Window 2022-06-16 19:40:33 +03:00
Andrey Kleshchev 8ea7867528 SL-16344 #3 Moved LLPanelFace related code into LLPanelFace 2022-01-17 20:45:46 +02:00
Andrey Kleshchev 1b929cb9a9 SL-16344 #2 Do not play media preview if not opened 2022-01-15 03:43:43 +02:00
Andrey Kleshchev 488fb8bab6 SL-16344 #1 Sometimes editor's media title picks obsolete description
Wait for media_plugin to navigate to destination
2022-01-15 01:08:12 +02:00
Andrey Kleshchev a066c9a859 SL-13359 #10 Indicate face selection in tools floater 2020-06-22 19:48:00 +03:00
andreykproductengine 583558dad8 SL-11378 Edit tool floater displays with issues if opened mid-drag 2019-06-06 20:05:51 +03:00
maxim_productengine 9ef117b1fd SL-10815 FIXED The weight of an object is displayed in the 'Land tool' floater 2019-03-28 16:03:13 +02:00
Oz Linden f1d4e788e7 SL-967 simplify viewer log file field syntax
MAINT-8991: only escape log message characters once, add unit test
remove extra log line created by LL_ERRS
document that tags may not contain spaces
2018-08-29 16:43:45 -04:00
andreykproductengine 177f24f56f MAINT-8586 Eliminate obsolete xui elements 2018-05-29 17:26:10 +03:00
andreykproductengine 66502df050 MAINT-8540 Eliminated a lot of xui related log warnings on startup and opening preferences 2018-04-20 20:21:20 +03:00
andreykproductengine 72b0ce5cb0 MAINT-8058 Simplification 2017-12-06 19:40:58 +02:00
andreykproductengine 6fe00fd9ad MAINT-8058 Fixed background requests on every prim edit 2017-12-06 19:40:58 +02:00
AndreyL ProductEngine 13cddfdfdd Mac buildfix 2017-06-01 15:30:49 +03:00
daianakproductengine 8c393b4993 MAINT-321 If Spin option is turned on, user cannot lift an object using Ctrl button + Mouse 2017-05-31 19:55:38 +03:00
Mnikolenko Productengine 26511f5b87 MAINT-6994 Viewer still reports remaining capacity incorrectly during the presence of an region object bonus. 2016-12-13 11:59:53 +02:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Mnikolenko ProductEngine 3cec33653b build fix 2015-09-22 17:11:36 +03:00
Mnikolenko ProductEngine 723eae7187 MAINT-2130 FIXED Update Tools floater after loosing selection. 2015-09-22 12:46:18 +03:00
Mnikolenko ProductEngine 71babaf882 MAINT-147 FIXED Allow follow cam scripts after closing Build tools floater. 2015-03-10 11:29:17 +02:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
andreykproductengine 4e0d3bdd4d MAINT-3977 FIXED Object does not display newly added contents if it was edited that session and you teleported to another region and back and then added new contents. 2014-05-06 17:21:18 +03:00
Richard Linden 0b9eeb02ab MAINT-2059 FIX Corner scaling doesn't highlight distance text
much cleanup of vector math
also made Stretch Both Sides checkbox clickable via label
2014-02-24 18:36:13 -08:00
Richard Linden 59628d6f85 Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-10-01 14:28:39 -07: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 Linden dd31d9941f NORSPEC-296 make add_media button always available as long as the face is editable 2013-07-02 07:39:55 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Kelly Washington d41eaa2e3d MAINT-1743 "Use Selection for Grid" does not change the grid ruler to "Reference"
in the tools floater
Reviewed with Simon.
2012-10-25 09:54:04 -07:00
Todd Stinson 6d84272d38 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-23 15:11:10 -07:00
Todd Stinson 246df49315 MAINT-1413,MAINT-1425,MAINT-1426: BUGFIX Correcting a problem where the build/edit floater was being dirtied at the wrong time. 2012-08-14 19:34:24 -07:00
Todd Stinson 9488baada3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-09 12:06:09 -07:00
Richard Linden c4f59fd588 CHUI-239 FIX Viewer crash when opening object with contents 2012-07-25 14:30:17 -07:00
Todd Stinson f143da27bf PATH-760: Ensuring that the pathfinding attribute field works correctly with multiple objects selected. 2012-06-21 18:03:23 -07:00
Todd Stinson aea6b0c70c PATH-760: Renaming some methods of LLSelectMgr. 2012-06-21 17:29:12 -07:00
Todd Stinson 379aff3520 PATH-713: Disabling all editable object fields on the build tools floater when a static pathfinding object is in not in the current region. 2012-06-13 16:57:35 -07:00
Todd Stinson 2d94e8e764 PATH-629: Allowing viewer edits to permanent objects when in god-mode regardless of frozen mode. 2012-05-08 18:44:04 -07:00
Todd Stinson 58041846d5 Removing unreachable code from the viewer. Corresponding changes made on the server to remove the message handling. 2012-03-16 14:19:30 -07:00
callum ecb18174d4 EXP-1845 FIX Media controls cannot be selected or set in Build tools texture tab 2012-02-03 14:37:25 -08:00