Commit Graph

101 Commits (0c39bdfd4de14a02104f3748030e974fbc98d978)

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 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
Mnikolenko Productengine ceb752c133 SL-11690 Parse URLs in Group description and Land description 2021-08-13 16:05:32 +03:00
andreykproductengine 9621dd8bbd SL-12100 Premium Enhancements - Changes to rates to create Groups, UI Work 2019-11-22 20:18:30 +02:00
Brad Payne (Vir Linden) 4300b204f0 SL-10499 - handle package info from benefits service 2019-11-20 14:03:57 +00:00
Brad Payne (Vir Linden) 65550520ed SL-10499 - benefits. Removed no-longer-needed lleconomy files and classes. Group-related costs and limits via benefits. 2019-11-15 15:13:11 +00:00
maxim_productengine 5111e0c921 SL-10229 FIXED Group icon doesn't display by default in the People and Profile floaters after creating new group 2018-12-13 18:21:11 +02:00
maxim_productengine 3c12c7ce56 MAINT-8619 Disable local textures for selection in Group profile 2018-05-23 11:58:42 +03:00
Mnikolenko Productengine 373947aba3 MAINT-6509 Viewer still allows you to create a group with leading spaces in the group name 2016-06-17 12:07:16 +03:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
AndreyL ProductEngine 7854350151 MAINT-5225 FIXED Viewer makes unnecessary requests to get group members 2015-05-27 20:02:16 +03:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
maksymsproductengine e6c85c46c4 MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
Mnikolenko ProductEngine 1be85e1a0a MAINT-3710 FIXED List of members is removed from General tab. Title column is added to the list in Members tab. Roles tab is renamed to Roles & Members and Roles sub-tab is default now. 2014-02-10 12:09:32 +02: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 Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Merov Linden 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
Merov Linden 3d137bae5c Merge with viewer-chui 2012-12-17 19:29:35 -08:00
Merov Linden 6fe7144104 CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary 2012-12-17 18:59:01 -08:00
Kelly Washington 5c22524f29 MAINT-1979 Viewer crashes while attempting to join group in the moment of loading group members
* Fix one race condition that could dereference a dangling pointer.
reviewed with Simon and Baker.
2012-12-03 16:37:05 -08:00
Kelly Washington 6a947c80c3 MAINT-1897 Poor performance viewing large group member lists
* Remove debug spam
2012-11-12 15:34:21 -08:00
Kelly Washington 014edb89e8 MAINT-1897 Poor performance viewing large group member lists
* Use LLAvatarNameCache in group UI to match what namelists use and prevent double lookups
* Remove LLSD -> Prams legacy pattern which is super slow.
* Member list on general tab only adds to the list after names are known
2012-11-12 14:15:22 -08:00
Baker Linden e459024c82 [MAINT-513] Large group management
- Reduced the timeout to 5 minutes, down from 10 minutes.
- Provided output for GroupMemberResponder error
- Removed commented calls to sendGroupMembersRequest
- Reordered calls to sendCapGroupMembersRequest so it's called last
2012-09-05 15:55:34 -07:00
Chris Baker 7ecf3ce40f - Fixed an issue where service was called twice in a frame
- Changed level of output logs
- Cleaned up comments
2012-08-31 17:53:47 -07:00
Chris Baker de2ce3f51f Start of getting WSGI service on viewer 2012-08-23 19:40:10 -07:00
Oz Linden 9779fcd97a merge changes for storm-918 2011-09-12 11:29:59 -04:00
brad kittenbrink dbc92691a6 Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated a bunch of unnecesary header dependencies. 2011-05-05 17:13:52 -07:00
Paul ProductEngine cec8ed1875 STORM-918 Changes in Group Role Titles or Assignments Not Reflected in Title Dropdown
- After role member data was changed in Roles->Members, role titles need to be updated too.
2011-04-19 19:43:27 +03:00
Andrew Productengine f4d713ad12 STORM-404 FIXED Fixed crash in LLPanelGroupGeneral::updateMembers().
Crash happened when trying to create new group while other group was still updating. It was caused by invalid iterator mMemberProgress in LLPanelGroupGeneral::updateMembers().
Its usage shouldn't have been reached when member list is cleared and empty thanking to gdatap->isMemberDataComplete() check at the beginning of the function. But when the new group was created while members of other group were still updating this
protection failed: in LLGroupMgr::processGroupMembersReply() for the group being created mMemberDataComplete was set TRUE when group size was zero(because this new group still
had no members). So the check for completness in LLPanelGroupGeneral::updateMembers() was succesfully passed, and further in this method viewer crashed.

- Added check for emptiness of member list into LLPanelGroupGeneral::updateMembers().
2010-11-01 15:58:26 +02: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
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 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
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Richard Nelson 5062351a0a deprecated ADD_SORTED due to n^2 behavior, set the sort order on the scroll list instead 2010-08-04 19:01:18 -07:00
Andrew Dyukov 4c693bfe89 EXT-2707 FIXED Fixed incorrectness of coalesced objects icons in inventory.
Bug was caused by multiobject's icon name index substitution with ordinary object's one. It happened because index was set depending on asset type in switch that followed "if" which set index for multiobject regardless of its result.

- Added returning index icon name inside of "if" block to avoid change of the index by switch for multiobject.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/804/

--HG--
branch : product-engine
2010-07-27 18:30:35 +03:00
Leyla Farazha 33d1aa30ab Merge from dessie/viewer-release 2010-07-06 17:51:07 -07:00
Yuri Chebotarev 14b122380e EXT-7979 FIX always reset "dirty" flag after applying changes
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/663/

--HG--
branch : product-engine
2010-06-30 10:35:26 +03:00
Leyla Farazha f39d10dc33 LLNameBox -> LLTextBox 2010-05-26 16:23:56 -07:00
Yuri Chebotarev 4683283a66 EXT-7045 FIX miss one more texture setup place.
Also remove redundant variable and do some refactoring.
Reviwed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/391/

--HG--
branch : product-engine
2010-05-17 18:36:53 +03:00
Yuri Chebotarev 059a714230 EXT-7045 FIX Group profile not using placeholder art
add placeholder art, add code to convert texture name to ID since LLTextureCtrl can't accept textures by name...
Reviwed V.Savchuk at https://codereview.productengine.com/secondlife/r/378

--HG--
branch : product-engine
2010-05-13 15:54:23 +03:00
Vadim Savchuk cf6b233e50 Fixed critical bug EXT-6468 (group creation process ignores group options set prior to creation).
Submitting on behalf of Yuri Cheborarev.

Reviewed by Leyla: https://codereview.productengine.com/secondlife/r/81/

--HG--
branch : product-engine
2010-03-23 21:47:17 +02:00
Ychebotarev ProductEngine a8165dfe59 fix for normal EXT-5598 Group member status list is sorted by name instead of date
--HG--
branch : product-engine
2010-02-23 18:05:00 +02:00
Ychebotarev ProductEngine d3f30dc96e fix task EXT-5129 Move Group image and founder name into General accordion
--HG--
branch : product-engine
2010-02-10 11:13:26 +02:00