Commit Graph

112 Commits (e935a8aebca4ae014b5f6b438612ac5674678fe6)

Author SHA1 Message Date
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 38c2a5bde9 Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge 2024-05-01 08:16:58 +03: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 c285f59ce2 Replace BOOL with bool in llwindow and dependent classes 2024-02-18 15:51:54 +02:00
Andrey Kleshchev d00b6e4216 SL-15039 Prune unused preferences #1
List of removed preferences (usused per statistics):
AdvanceOutfitSnapshot
AnimationDebug
AskedAboutCrashReports
AudioLevelDoppler
AudioLevelRolloff
AudioLevelUnderwaterRolloff
AudioLevelWind
AutoAcceptNewInventory
AutoLoadWebProfiles
AvatarBacklight
AvatarPickerSortOrder
AvatarPosFinalOffset
AvatarBakedTextureUploadTimeout
AvatarBakedLocalTextureUpdateTimeout
AnimatedObjectsIgnoreLimits
AnimatedObjectsGlobalScale
AvatarBoundingBoxComplexity
StartUpChannelUUID
NearByChatChannelUUID
NotificationChannelUUID
AlertChannelUUID
AssetStorageLogFrequency
AvatarInspectorTooltipDelay
AllowBottomTrayButtonReordering
AvatarRotateThresholdSlow
AvatarRotateThresholdFast
2023-09-22 19:28:23 +03:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
pavelk_productengine b147d659dc MAINT-4734 (Separate transaction notices from group notice/invites)
1) stripped off attachment field;
 2) made logos (group's, sender's, etc) in expanded view the same size as in condensed view;
 3) turned on notification showing upon click;
 4) fixed cropped right border of Invite and Transactions notifications;
 5) enabled "Collapse All" button;
 6) stripped off unnecessary icons.
2015-03-17 18:26:28 +02:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Oz Linden 7ca10e5161 merge changes for 3.6.4-release 2013-08-26 15:14:12 -04: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
Oz Linden 4faad350c7 Improve envelope notification behavior when there is no toast to display 2013-07-24 12:34:32 -04:00
maksymsproductengine 4965a0de28 CHUI-966 FIXED WARNING: LLSysWellWindow::removeItemByID: Unable to remove notification given when deleting notification 2013-06-01 01:30:32 +03:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
maksymsproductengine cc900b732d CHUI-592 FIXED Unread notifications are not being saved in notification chiclet 2012-12-19 02:44:48 +02:00
maksymsproductengine f1155c4fa5 CHUI-573 FIXED Notification chiclet shown when object chiclets are shown 2012-12-04 04:14:51 +02:00
maksymsproductengine 15157ecb09 CHUI-553 FIXED Remove the conversation chiclet 2012-11-29 03:27:45 +02:00
William Todd Stinson 67bc42a80a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-20 16:20:40 -08:00
maxim_productengine 4094972434 CHUI-389 FIXED Added parameter for sessionAdded to get access to has_offline_msg value.
Set UnreadIMs icon to visible if messages were sent while offline.
2012-11-14 15:28:05 +02:00
Nat Goodspeed 3653727e7f Introduce new LLDir::findSkinnedFilenames() method. Use as needed.
In a number of different places, for different reasons, the viewer wants to
load a UI-related file that might be overridden by a non-default skin; and
within that skin, might further be overridden by a non-default language.
Apparently, for each of those use cases, every individual developer approached
it as an entirely new problem, solving it idiosyncratically for that one case.
Not only is this a maintenance problem, but it rubs one's nose in the fact
that most such solutions consider only a subset of the relevant skin
directories.
Richard and I evolved an API intended to address all such cases: a central
LLDir method returning a list of relevant pathnames, from most general to most
localized, filtered to present only existing files; plus a couple of
convenience methods to specifically obtain the most general and most localized
available file.
There were several load-skinned-file methods (LLFloater::buildFromFile(),
LLPanel::buildFromFile() and LLUICtrlFactory::createFromFile() -- apparently
cloned-and-modified from each other) that contained funky bolted-on logic to
output the loaded data to an optional passed LLXMLNodePtr param. The trouble
is that passing that param forced each of these methods to subvert its normal
search: specifically for that case, it needed to find the baseline XML file
instead of the localized one. Richard agreed that for the intended usage
(reformatting XML files) we should use XML schema instead, and that the hacky
functionality should be removed. Remove it. Also remove
LLUICtrlFactory::getLocalizedXMLNode(), only used for those three special cases.
Some callers explicitly passed the optional LLXMLNodePtr param as NULL. Remove
that.
Remove LLFloaterUIPreview::displayFloater(save) param, which relied on the
optional output LLXMLNodePtr param. Make onClickSaveFloater() and
onClickSaveAll() emit popupAndPrintWarning() about discontinued functionality.
Recast LLFloater::buildFromFile(), LLPanel::buildFromFile(),
LLUICtrlFactory::createFromFile(), LLNotifications::loadTemplates(),
LLUI::locateSkin(), LLFontRegistry::parseFontInfo(),
LLUIColorTable::loadFromSettings(), LLUICtrlFactory::loadWidgetTemplate(),
LLUICtrlFactory::getLayeredXMLNode(), LLUIImageList::initFromFile(),
LLAppViewer::launchUpdater() and LLMediaCtrl::navigateToLocalPage() to use
findSkinnedFilenames(). (Is LLAppViewer::launchUpdater() ever called any more?
Apparently so -- though the linux-updater.bin logic to process the relevant
command-line switch has been disabled. Shrug.) (Is
LLMediaCtrl::navigateToLocalPage() ever used?? If so, why?)
Remove LLUI::setupPaths(), getXUIPaths(), getSkinPath() and
getLocalizedSkinPath(). Remove the skins/paths.xml file read by setupPaths().
The only configuration it contained was the pair of partial paths "xui/en" and
"xui/[LANGUAGE]" -- hardly likely to change. getSkinPath() specifically
returned the first of these, while getLocalizedSkinPath() specifically
returned the second. This knowledge is now embedded in findSkinnedFilenames().
Also remove paths.xml from viewer_manifest.py.
Remove injected xui_paths from LLFontGL::initClass() and
LLFontRegistry::LLFontRegistry(). These are no longer needed since
LLFontRegistry can now directly consult LLDir for its path search. Stop
passing LLUI::getXUIPaths() to LLFontGL::initClass() in LLViewerWindow's
constructor and initFonts() method.
Add LLDir::append() and add() methods for the simple task of combining two
path components separated by getDirDelimiter() -- but only if they're both
non-empty. Amazing how often that logic is replicated. Replace some existing
concatenations with add() or append().
New LLDir::findSkinnedFilenames() method must know current language. Allow
injecting current language by adding an LLDir::setSkinFolder(language) param,
and pass it where LLAppViewer::init() and initConfiguration() currently call
setSkinFolder(). Also add LLDir::getSkinFolder() and getLanguage() methods.
Change LLFLoaterUIPreview's LLLocalizationResetForcer helper to "forcibly
reset language" using LLDir::setSkinFolder() instead of LLUI::setupPaths().
Update LLDir stubs in lldir_stub.cpp and llupdaterservice_test.cpp.
Add LLDir::getUserDefaultSkinDir() to obtain often-overlooked possible skin
directory -- like getUserSkinDir() but with "default" in place of the current
skin name as the last path component. (However, we hope findSkinnedFilenames()
obviates most explicit use of such individual skin directory pathnames.)
Add LLDir unit tests for new findSkinnedFilenames() and add() methods -- the
latter exercises append() as well.
Tweak indra/integration_tests/llui_libtest/llui_libtest.cpp for all the above.
Notably, comment out its export_test_floaters() function, since the essential
LLFloater::buildFromFile(optional LLXMLNodePtr) functionality has been
removed. This may mean that llui_libtest.cpp has little remaining value, not
sure.
2012-10-10 14:57:43 -04:00
Richard Linden 2fa1c42aad CHUI-51 WIP notifications routig code cleanup
phase 2, removal of extraneous signaling in favor of llnotificationchannels
made notificationchannels work better with overrides and lifetime managed
by creator
2012-03-29 23:48:29 -07:00
Richard Linden 1ea65f0285 CHUI-51 WIP notifications routig code cleanup
phase 1, removal of most of llnotificationhandler
2012-03-27 22:56:02 -07:00
Vadim ProductEngine 5dc8e44c76 EXP-1499 FIXED Added some NULL checks in notifications UI code to avoid a crash on exit.
The crash happened if connection timed out while there were unread object inventory offers.
2011-12-20 20:44:38 +02:00
Paul ProductEngine 06cb4e8602 EXP-1417 FIXED (Docked Notifications window tears off from the dock icon when deleting notifications one by one)
- Changed LLSysWellWindow::reshapeWindow() so that the floater decreases from bottom to top, without changing top coordinate.

- Force dock control repositioning in case floater rect changed.
2011-10-26 16:58:28 +02:00
Seth ProductEngine 9273459251 EXP-1285 FIXED Chiclets moved to the upper right of the viewer window.
- Floaters dock to chiclets at the bottom.
- Floaters docking region limited to non-toolbar view.
- Chiclet bar is positioned between the right toolbar and the minimized floaters stacked at the top left corner by default.
2011-10-10 17:09:46 +03:00
Paul ProductEngine 0e8232790b STORM-413 FIXED The presentation of IM sessions in message well depends on method that was used for opening IM window
- Replaced setRect method with setShape so that reshape and translate method be called
2011-04-11 18:07:24 +03:00
Leyla Farazha a4b223248e Merge 2010-09-27 17:54:52 -07:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Richard Linden 949b604655 Backed out changeset: d71309f8bd0e 2010-09-17 15:01:44 -07:00
Richard Linden 83bb4b9518 fixed merge 2010-09-16 22:10:30 -07:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Richard Nelson 02d8197019 changed buildPanel/buildFloater to member functions buildFromFile
streamlined LLUICtrlFactory's interface
2010-08-20 10:14:28 -07:00
Richard Nelson c20bd2dfee cleaned up LLUICtrlFactory...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Leyla Farazha 6f256e2d57 Merge with dessie/viewer-release 2010-08-04 15:44:45 -07:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Leyla Farazha 0e06dc8964 Merge from dessie/viewer-release 2010-07-27 14:13:07 -07:00
Leyla Farazha d603085c03 Merge with dessie/viewer-release 2010-07-19 17:22:12 -07:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Alexei Arabadji 4f6badf216 EXT-8124 FIXED Avoided saving processed notifications that spawns script floater.
Details:
1 Avoided memory leak in LLScriptFloaterManager caused not destroying processed notifications.
2 Provided destroying notification if user initiate closing script floater and not destroying if viewer exit.

reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/721/

--HG--
branch : product-engine
2010-07-12 16:34:38 +03:00
Leyla Farazha 33d1aa30ab Merge from dessie/viewer-release 2010-07-06 17:51:07 -07:00
Vadim Savchuk 54bf954b16 EXT-8226 FIXED Potential fix for a crash at startup in LLIMWellWindow::findIMChiclet().
Bug reason: LLChicletPanel::onCurrentVoiceChannelChanged() was called at startup, which, in turn, called LLIMWellWindow::findIMChiclet().
Apparently, LLIMWellWindow::mMessageList was not initialized yet, so dereferencing the null pointer caused the crash.

I couldn't reproduce the crash so I've just added defensive checks (just for any case)
and moved binding LLIMWellWindow::findIMChiclet() to sFindChicletsSignal from the constructor to postBuild().

Reviewed by Alexei Arabadji at https://codereview.productengine.com/secondlife/r/692/

--HG--
branch : product-engine
2010-07-05 17:38:01 +03:00
James Cook ae91c0e7c6 DEV-50202 IM toast notification shows SLID and flashing info icon
Fixed to use Display Name (Username), fixed icon placement,
also fixed notifications system well names.  Reviewed with Leyla.
2010-05-28 15:15:33 -07:00
Alexei Arabadji dd93c6e6f3 EXT-7230 FIXED
Corrected functionality that determines is syswell window is empty;
Removed obsolete functionality related to separator of syswell window items;
reviewed by Loren Shih at https://codereview.productengine.com/secondlife/r/349/

--HG--
branch : product-engine
2010-05-06 10:18:19 +03:00
Eugene Mutavchi 2768663081 Related to normal bug EXT-5715(Conversations window auto-resizes when new conversation starts.) - disabled auto-resizing of well window if it was reshaped by user.
--HG--
branch : product-engine
2010-03-23 20:34:12 +02:00
Eugene Mutavchi 7c4728ca13 Fixed normal bug EXT-5715(Conversations window auto-resizes when new conversation starts.)
--HG--
branch : product-engine
2010-02-26 20:14:53 +02:00
Dmitry Zaporozhan bfe5754ad2 Update for low bug EXT-5201 - Opening multi tabbed IM floater from IMWell does not focus the floater.
Implemented same fix for Script Floaters

--HG--
branch : product-engine
2010-02-09 13:58:14 +02:00