0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# 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/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# 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/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03: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
210f59a923
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llstatbar.cpp
# indra/llui/lltabcontainer.h
# indra/llwindow/lldxhardware.cpp
# indra/llwindow/lldxhardware.h
# indra/llwindow/llkeyboard.cpp
# indra/llwindow/llkeyboard.h
# indra/llwindow/llkeyboardheadless.cpp
# indra/llwindow/llkeyboardheadless.h
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowsdl.cpp
# indra/llwindow/llwindowsdl.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchiclet.cpp
# indra/newview/llfasttimerview.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloaterbvhpreview.cpp
# indra/newview/llfloatermap.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltoolcomp.cpp
# indra/newview/lltoolcomp.h
# indra/newview/lltoolface.cpp
# indra/newview/lltoolfocus.h
# indra/newview/lltoolpie.cpp
2024-02-18 16:22:54 +01:00
ab2675497b
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/llimagebmp.cpp
# indra/llimage/llimagetga.cpp
# indra/llui/lltransutil.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llpanelprofile.cpp
2024-01-05 14:31:37 +01:00
096156d16c
SL-18058 Post-merge functionality restore #2
2024-01-03 00:38:57 +02:00
830c9ce388
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelprofile.cpp
2023-12-18 19:05:55 +01:00
c87850ddab
Merge branch 'main' into DRTVWR-591-maint-X
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llpanelprofile.cpp
# indra/newview/llspatialpartition.cpp
2023-12-18 07:57:29 +02:00
63f30264ff
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/newview/app_settings/settings.xml
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llinspectavatar.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llviewerjoystick.cpp
2023-10-26 20:58:56 +02:00
d4087fce7b
SL-20513 Cleanup LLAvatarPropertiesProcessor #1
2023-10-25 19:13:21 +03:00
866e71d1f8
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llappearancemgr.cpp
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/lltoastalertpanel.cpp
# indra/newview/skins/default/xui/en/floater_preview_gesture.xml
# indra/newview/skins/default/xui/en/panel_group_general.xml
# indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
# indra/newview/skins/default/xui/en/strings.xml
2023-10-21 13:52:40 +02:00
702e4c7dc1
SL-20163 Rework LLAvatarPropertiesProcessor::sendRequest()
2023-10-20 19:23:29 +02:00
5c8b25521e
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
2023-07-25 15:06:37 +02:00
37a6b6411c
SL-18058 Updated profile picture not shown in Conversation floater
2023-07-25 00:15:37 +03:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
df4205dc46
Merge viewer-bear
2016-04-02 03:52:29 +02:00
0e155c51a9
MAINT-6257 Textures loading issues.
2016-03-29 18:52:54 +03:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
e7ade840e4
Merge viewer-bear
2016-01-24 14:00:30 +01:00
a53caef1e8
MAINT-4018 Improvements to icon fetching.
2015-12-09 18:35:36 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
0e0795b602
Merge viewer-notice
2015-10-05 13:08:48 +02:00
9a93bb1861
merge changes for MAINT-4734
2015-05-18 21:08:22 +03:00
5c6cf3e7fb
restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes
2015-04-10 11:02:37 -04:00
8b42c7898e
replace llifstream and llofstream with std::ifstream and std::ofstream respectively
2015-04-07 17:59:28 -04:00
3a57b18896
convert llifstream and llofstream to std::ifstream and std::ofstream respectively
2015-04-07 17:28:05 -04:00
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
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
123f8e77cd
MAINT-4288 FIXED Backed out changeset for MAINT-4018 (c92d43623c2c)
2014-08-22 16:38:37 +03:00
ca79d23893
MAINT-4018 FIXED Mini profile pictures tend to fail to load fully, and sometimes not at all.
...
Profile icons are no longer discarded uless they are too big. Icons will refresh correctly if needed.
2014-05-23 19:05:49 +03:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
c35801ef1c
fixed focus issue on inventory
2013-11-05 19:26:23 -08:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
a9ffc0120a
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : RLVa
2013-05-06 23:54:58 +02:00
9177903931
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2013-04-29 15:39:42 +02:00
e1b955226d
Merged with viewer-sunshine tip (Revision bd1162cb6fbe)
...
--HG--
branch : RLVa
2013-02-11 23:04:05 +01:00
b368a21202
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-04 21:06:34 +01: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
6fe7144104
CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary
2012-12-17 18:59:01 -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
486bdf3284
CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
...
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02: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
fcb010e835
CHUI-338 FIXED (LLAvatarNameResponder warning shown in debug console when using spinner to page through chat history viewer)
...
- Trying to restore avatarID by its name before appending message to chat history.
- Also prevented requesting avatar name by null LLUUID in LLAvatarIconCtrl::setValue
2012-09-19 19:20:21 +03:00
21c364c4d4
Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines
2012-09-03 09:10:24 +00:00
c355fb98d3
Extracted texture baking system into llappearance library.
2012-09-03 06:12:50 +00:00
6c71e11b2f
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2012-04-17 21:44:48 +02:00
ddc6afdd81
Merged with default tip (Revision f8183e357a6f)
...
--HG--
branch : RLVa
2012-04-21 22:29:42 +02:00
Ansariel