5e60392c27
Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice
2024-06-13 14:59:28 -07:00
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
3a212d9608
Merge branch 'spaces-merge' into roxie/webrtc-voice
2024-05-20 12:59:59 -07: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
425f089ffc
addSession had a changed parameter...which wasn't changed everywhere
2024-03-07 19:30:32 -08:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02: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
0f742298de
SL-20376 Clarify group membership status and leave-group confirmation dialog
2023-10-18 23:59:17 +03:00
683e96ed61
SL-20380 Add group notices button as hover button on Groups floater
2023-10-09 12:35:53 +03:00
d0d05ddddf
SL-15039 Prune unused preferences #4
2023-09-27 13:11:12 +03:00
1aa27d4d13
SL-20273 IM, Offer Teleport, Map and Pay SLurls from external browser were blocked
2023-09-07 23:06:00 +03:00
033b04f388
Merge branch 'main' into DRTVWR-582-maint-U
...
# Conflicts:
# indra/newview/llagentlistener.cpp
# indra/newview/llcommanddispatcherlistener.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/llworldmapview.cpp
2023-05-17 18:05:05 +03:00
daca555592
SL-19609 Urls aren't dispatched according to the indicated grid
2023-04-19 20:06:37 +03:00
a6daa3a26d
SL-19432 External group links dont load in SL
2023-03-31 17:47:07 +03:00
f836194516
Merge branch 'main' into DRTVWR-570-maint-Q
...
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00
6f946b6b16
SL-18165 Tighten up some command permissions
2022-10-11 17:29:44 +03:00
b5861e58cb
Merge branch 'master' into DRTVWR-565-maint-P
2022-09-15 20:43:02 +03:00
6724b8ce2c
SL-18051 FIXED Have to leave group more than once to actually leave a group
2022-08-31 14:00:36 +03:00
1e0eafd50c
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/newview/llviewerregion.cpp
2022-02-28 21:56:25 +02:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
b6f36a6159
SL-16535 FIXED The Search floater opens without appropriate search results after performing a search from the NavBar
2021-12-21 17:16:00 +02:00
1cd7252861
SL-15427 open Search without submitting a search request
2021-07-05 12:02:30 +03:00
0fa5fc47a2
Merge branch 'master' into DRTVWR-527-maint
2021-04-30 03:04:47 +03:00
aff37221dd
SL-14794 Group floater not focusing when clicking on 'more info' or 'view profile'
2021-01-29 23:03:04 +02:00
6fdc9da2d3
SL-13587 FIXED The "Picks" floater is opened on the Viewer login page
2020-07-14 17:00:48 +03:00
9621dd8bbd
SL-12100 Premium Enhancements - Changes to rates to create Groups, UI Work
2019-11-22 20:18:30 +02:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
2af5c766c8
MAINT-4016 FIXED Viewer attempts full fetch of member list before allowing user to leave group
2014-05-15 04:56:20 +03:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07: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
2113bb8159
Pull merge from viewer-release
2013-05-22 11:23:51 -07:00
b9a96474e3
fix build
2013-04-04 15:25:33 +03:00
2d7a09839e
CHUI-841 FIXED No warning given that you cannot leave a group you are the last owner of in conversation floater and people floater
...
Added check in LLGroupActions::leave() method for number of members in the group and whether avatar is the owner.
Also added LLFetchGroupMemberData class which sends and handles async request for group member data and used in the above method.
2013-04-03 20:39:35 +03:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07: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
1a1a0b91c0
CHUI-383: Realized that prior changes for this bug caused a regress. The regress was using the people panel or a notecard to start a im/call with a user. When doing this the conversation line item would not be focused. Resolution: Changed all calls to LLIMFloater::show() to LLIMFloaterContainer::showConversation(), which will first select the conversation line item and then show the corresponding conversation floater.
2012-10-26 16:49:22 -07:00
9d3fc5d930
EXP-1209 FIXED Sidetray removed.
...
- Removed all sidetray dependencies and the sidetray itself.
- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
8fd2d69fdf
EXP-1224 FIXED (Create and register a floater for People side tab)
...
- Added a floater for People side tab.
- Replaced calls to LLSideTray with LLFloaterSidePanelContainer.
2011-09-27 22:51:43 +03:00
96f5a8e19c
add testing hook to send a group chat IM.
2011-04-14 15:23:09 -07:00
e9f6de28b2
CHOP-581: Preliminary attempt to add enter/leave group chat hooks.
...
Unstable! Using present "startIM" is known to crash the Mac viewer. Committing
to migrate to different dev box for further debugging.
2011-04-12 11:04:19 -04:00
592294a6ac
SOCIAL-615 FIX Selecting create group, classified, or pick in profile and responding to notification with Don't Quit, clicking on the action again does not show notification
2011-03-01 20:11:49 -08:00
e062a2778b
SOCIAL-608 FIX Create Classified link is available in Basic mode
...
SOCIAL-609 FIX Create Pick link is available in Basic mode in the web profile
SOCIAL-610 FIX View group info in Viewer sidebar are available in Basic mode
2011-02-28 23:43:05 -08:00
e02b83c350
SOCIAL-608 WIP Classified link is available in Basic mode
2011-02-28 22:06:21 -08:00
0a938d395c
STORM-266 FIXED displaying group notices in detached People SP.
...
Fixed failure getting pointers to some child panels of LLSideTray while parent side panels are detached.
2010-09-28 19:40:31 +03:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
b2c9f172d3
Fixed normal bug EXT-6712(SLapp: nothing happens after click on 'secondlife:///app/group/list/show' link from Nearby chat) - added showing my groups tab in people panel.
...
Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/196/
--HG--
branch : product-engine
2010-04-07 19:04:01 +03:00
Roxie Linden