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
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
c285f59ce2
Replace BOOL with bool in llwindow and dependent classes
2024-02-18 15:51:54 +02:00
bce1630e26
SL-10780 FIXED Speaker icon is shown for all friends
2019-03-22 17:31:26 +02:00
b25a22a2c1
Merged in lindenlab/viewer-release
2016-05-19 23:02:37 +03:00
b2fd397818
MAINT-6220 enable searching of the friend list with the classic username of the avatar.
2016-05-04 11:31:00 +03:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
56b158e486
CHUI-675 FIX You can select multiple users in people floater but can only drag and drop one name to conversation
...
Moved drag and drop start in LLAvatarListItem instead of LLAvatarList, and made LLFloaterIMSession handle multiple dropped participants correctly
2013-02-01 18:54:15 +00:00
c2d332a89c
CHUI-580 : WIP : Added disconnect of callbacks once they're called to prevent filling up the callback queue
2012-12-17 20:16:33 -08:00
3d137bae5c
Merge with viewer-chui
2012-12-17 19:29:35 -08:00
6fe7144104
CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary
2012-12-17 18:59:01 -08:00
89671fa1ad
CHUI-545: Adjusted fix because the old implementation of ::switchIndicator was not very clean and relied on the visiblity of the OutputMonitorCtrl to have a visibility of true even when it wasn't. The fix implemented makes it so that the visibility of OutputMonitorCtrl is always correct and the parent of this ctrl can use this information to adjust children adjacent to OutputMonitorCtrl.
2012-12-12 16:59:57 -08:00
3a49beed0e
CHUI-580 : WIP : Change the display name cache system, deprecating the old protocol and using the cap (People API) whenever available. Still has occurence of Resident as last name to clean up.
2012-12-05 20:25:46 -08:00
6e2b3527cc
CHUI-475: Ensuring that objects that query the avatar name cache with a callback store the connection and disconnect on object destruction. This should help resolve some of the heap corruption we are seeing.
2012-11-02 13:22:48 -07:00
569146f27c
CHUI-120 WIP Modified chat participants drag and drop not to use LLClipboard.
2012-06-13 21:21:19 +03:00
1807796514
Fix post merge build issue: take clipboard changes into account
2012-06-08 12:15:36 -07:00
9b92235291
CHUI-120 WIP Added conversations participants drag and drop from avatar lists to IM floaters.
...
- Added new drag and drop type DAD_PERSON and source SOURCE_PEOPLE to avoid highliting the toolbars when using SOURCE_VIEWER.
- Disabled calling card drop support as it is considered obsolete.
2012-06-08 01:08:58 +03:00
ea7420a7b3
STORM-293 FIXED Friend permissions icons overlap long names on 'My Friends' tab
...
- Added 'avatar name right padding' as parameter to avatar_list_item.
Before it was calculated and correctness of calculation was strongly dependent on right positioning elements in XML, which was prone to errors.
2010-10-19 20:59:08 +03:00
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
60db8577a9
Merge
2010-09-16 12:02:24 -07:00
a923da7fc7
DEV-52931 Toggling "View Display Names" doesn't take effect right away in the Friends list
2010-09-13 14:59:31 -07:00
073d56b0e1
VWR-21253 SUPPLEMENTARY Permission icons in the friends list
...
Incorporate code review feedback.
2010-09-10 11:49:50 +01:00
bd734e3198
VWR-21253 MERGE Permission icons in the friends list
2010-09-07 17:55:10 +01:00
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
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
fbcbfb8805
merge
2010-09-23 12:00:17 -07:00
8e67a60528
STORM-128 FIXED New friends list permission icons
...
* Added new icon artwork.
* Reordered the icons so that the most common ones are to the right, so that they change position as little as possible.
* Removed old 1.23 icons.
2010-09-23 12:13:43 +01:00
abe758d45f
merge
2010-09-22 19:11:29 -07:00
3fb0736bec
CID-509
...
Checker: UNINIT_CTOR
Function: LLAvatarListItem::LLAvatarListItem(bool)
File: /indra/newview/llavatarlistitem.cpp
2010-09-22 13:42:10 +01:00
1911993cc7
merge
2010-09-16 19:45:57 -07:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
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
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
02d8197019
changed buildPanel/buildFloater to member functions buildFromFile
...
streamlined LLUICtrlFactory's interface
2010-08-20 10:14:28 -07:00
c20bd2dfee
cleaned up LLUICtrlFactory...
...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
dcbdb1fee5
EXT-1579 FIXED Show icons representing permissions granted in friends list on roll-over.
...
Needs new icon artwork, currently reusing old 1.23 icons.
2010-07-22 17:35:35 +01:00
566e3969f9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07:00
0ebdba45f6
Merge with dessie/viewer-public to get Callum's webkit changes
2010-05-26 10:53:59 -07:00
b2274765da
DEV-50013 Group chat moderator tooltip shows username
2010-05-25 14:48:55 -07:00
d634239bac
EXT-6726 WIP Added stubs for most of Appearance SP context/gear menus.
...
Shared code with avatar lists context menus.
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/415/
--HG--
branch : product-engine
2010-05-20 14:54:34 +03:00
ac17ec0c28
Merge pull from dessie/viewer-public
2010-05-19 15:58:56 -07:00
f4148502e4
Rename mSLID to mUsername to match the name of the field in the UI
...
Product made a late-breaking request to change the name of this
field. The wire protocol for People API has not yet changed.
2010-05-18 16:00:45 -07:00
09a58b804b
EXT-7158 FIXED Moved lltextutil from newview to llui library.
...
Reviewed by Richard Nelson and Mike Antipov at https://codereview.productengine.com/secondlife/r/363/
--HG--
branch : product-engine
2010-05-19 01:20:39 +03:00
22f4de740d
inspector and friends list tooltip updates
...
reviewed by James
2010-05-17 15:28:37 -07:00
Ansariel