Commit Graph

84 Commits (e71215dcfdb960f64a7f10d2fba71790f8e7bcd1)

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
Lars Næsbye Christensen f1c97f4057 misc: BOOL to bool 2024-02-18 22:04:44 +02:00
Andrey Kleshchev 0c2b00efaa SL-19346 PERMISSION_DEBIT remove warning for Linden owned content 2023-03-06 22:53:04 +02:00
Andrey Kleshchev b6c7eee505 SL-16320 Remove references to AvaLine from the viewer 2021-11-05 21:01:45 +02:00
Andrey Kleshchev 8772aed531 SL-15013 Block List very often is empty when I log in
It looks like these messages were often getting lost.
These requests have higher, more visible impact if lost, so doubled retries.
As per Ansariel's suggestion moved request to a less busy stage.
2021-04-13 22:48:11 +03:00
Andrey Kleshchev e538aaabc7 SL-14497 Observers sometimes were notified with wrong flags 2020-12-09 21:33:11 +02:00
Andrey Kleshchev d561756d58 SL-14497 Unblocking does not remove voice block 2020-12-08 23:25:34 +02:00
Andrey Kleshchev 6fddbeb397 SL-12748 Blocked username displays old name after name change 2020-06-05 16:59:34 +03:00
Mnikolenko Productengine 17c22d317f MAINT-2880 Particle generator object doesn't start displaying particles, when unblocking the owner of this object 2017-11-09 16:09:51 +02:00
Mnikolenko Productengine e62444c0e7 MAINT-7443 FIXED Able to Block a user with Lastname Linden 2017-05-29 11:30:07 +03:00
Mnikolenko Productengine bb3380b220 MAINT-7359 improve new Avatar Render Settings window 2017-05-10 15:41:16 +03:00
Mnikolenko Productengine d23b6e442e MAINT-7168 Avatar rendering settings adjustments 2017-03-15 12:08:30 +02:00
andreykproductengine 605160d501 MAINT-7118 Swapping legacy people API with new cache 2017-02-15 20:40:03 +02:00
AndreyL ProductEngine 7fceb3a63f Merged in lindenlab/viewer-cleanup 2016-11-14 22:04:37 +02:00
Mnikolenko Productengine 5828d06114 SL-448 Implement a limit to block list 2016-10-26 15:10:40 +03:00
Nat Goodspeed c92eb7e591 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2016-08-30 11:36:06 -04:00
Oz Linden 5822fb00b6 merge DRTVWR-398 build cleanup fixes 2016-03-07 12:41:11 -05:00
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
AndreyL ProductEngine f6d995b0a2 MAINT-6018 Open URL dialog spam
Remove notifications of muted agents
2016-01-11 03:35:24 +02:00
Oz Linden 9848fc4253 merge changes for 4.0.1-release 2016-01-15 17:01:16 -05:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nat Goodspeed 11c428759e Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2015-11-02 14:09:43 -05:00
Oz Linden 58db350223 MAINT-5622: correct rendering of explicitly derendered and blocked avatars 2015-09-11 17:59:29 -04:00
Nat Goodspeed 3fc39776dd MAINT-5232: Remove dubious polling in LLMuteList::getInstance().
The LLMuteList singleton instance might be requested before gMessageSystem is
constructed. LLMuteList wants to register a couple gMessageSystem callbacks.
Since gMessageSystem is not (yet) itself an LLSingleton, LLMuteList's
constructor can't just call it into existence. Until now, LLMuteList overrode
LLSingleton's getInstance() method: every time getInstance() was called, the
subclass override method would check whether gMessageSystem had been
initialized, and if so, register its callbacks before forwarding the call to
the base-class LLSingleton::getInstance() method.
Change to use LLPounceable::callWhenReady() instead.
This is the reason gMessageSystem was made an LLPounceable.
2015-05-27 14:38:51 -04:00
Nat Goodspeed 833579b14b MAINT-5232: Convert gMessageSystem != NULL to simple bool test.
Now that gMessageSystem is an LLPounceable, we would either have to define
comparisons to LLPounceable's held type or static_cast<LLMessageSystem*> to
literally compare to NULL. But since we already define operator bool(), that's
the easy (and idiomatic) fix.
2015-05-23 13:34:34 -04:00
andreykproductengine ca446ad0b7 MAINT-5036 FIXED Blocked user can send invites to group 2015-04-07 12:06:23 +03:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
dmitrykproductengine 9e451513d9 MAINT-3069 FIXED Adding/removing item from blocklist blocks viewer up to a disconnect 2013-09-11 11:21:27 +03: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
MartinRJ Fayray 08c424e511 STORM-1878: Blocking an avatar does not derender worn lights 2012-06-10 14:18:38 +02:00
paul_productengine 23717a0918 BUG STORM-1004 FIXED Unblocking/blocking name sometimes deletes identically named entry, but of different TYPE
LLMuteList stores muted objects in two sets: set of names and set of ids. Avatar objects are stored by ids (set of ids), other objects can be stored both by name(set of names) or ids

- Delete items from corresponding set (from set of names or ids), not form both sets at time.

- Improved isMuted method's logic. Now if avatar is tested whether it's muted or not, don't search its name in the set of names.
2011-02-18 15:28:38 +02: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
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
James Cook 2b7153c26a merge from dessie/viewer-public right before SLE code landed 2010-05-11 16:11:09 -07:00
Mike Antipov 78eed3fc07 WIP: normal bug EXT-6865 (Voice isn't blocked for Avaline callers connected via PSTN bridge)
Applyied Aimee's patch to enable blocking of avaline caller:
 added an "External" mute type which isn't sent to the SL servers or stored in the cache across sessions.
 The caller's ID will change each time so there's no point cluttering up the mute list by persisting them.

Known issue: Right now the mute is added with the caller's phone number as the name shown in the block list,
 so that will need changing to "Avaline Caller 1" etc

--HG--
branch : product-engine
2010-04-30 13:25:48 +03:00
James Cook ecc2c72650 Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final 2010-03-29 16:55:22 -07:00
Mike Antipov 1550729348 Done normal task EXT-6290 ([TRUNCATION] Block List - type shown after name is truncated when the name is long. need 'en' xui rework)
* Changed the way blocked items are shown in the list. For now they are separated on two columns: Name & Type.
   If Name is too long it is shown truncated (with ...)

* As result remove deprecated methods from LLMute to concatenate its name & type and to extract name & type from the such concatenated string.
* reduce include dependence from llmutelist.h

--HG--
branch : product-engine
2010-03-18 18:13:39 +02:00
James Cook 42176145c9 Converted names build from avatar object LLNameValue pairs to SLID
Added temporary getDisplayName() to LLCacheName
Moved temporary placeholder display names into LLCacheName
Eliminated rarely used LLAgentUI::buildName in favor of buildFullName
Standardized buildFullName capitalization
2010-02-08 14:55:30 -08:00
James Cook 88350edbcb merge 2010-02-03 14:13:56 -08:00
James Cook 146e9d5e4d Support returning full_name (and SLID) for LLCacheName::get() calls
Changed callback signature to full_name instead of first_name,last_name
Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
Change Pay dialog names to SLURL links
Tweaked layout of Pay Resident and Pay via Object floaters to make SLURLs fit
Consolidate name first + " " + last concatenation in LLCacheName::buildFullName()
Reviewed with Kelly
2010-02-01 17:06:18 -08:00
Igor Borovkov 69c676c6eb got rid of llimpanel.h includes for EXT-1196 Stalls on startup in LLPanelFriends::refreshNames
--HG--
branch : product-engine
2010-01-28 18:34:42 +02:00
Igor Borovkov 70b6d603ed got rid of LLFloaterIMPanel usage for EXT-1196 Stalls on startup in LLPanelFriends::refreshNames
--HG--
branch : product-engine
2010-01-28 18:30:58 +02:00
Mike Antipov 6e932911d5 Related to normal bug EXT-4108 ([BSI] Voice volume sliders do not preserve settings per resident between voice sessions)
- moved default internal voice level value into application settings
- cleanned up include list in llmutelist.cpp

--HG--
branch : product-engine
2010-01-25 17:29:57 +02:00
Mike Antipov 2ea3fd9563 Fixed normal bug EXT-4108 ([BSI] Voice volume sliders do not preserve settings per resident between voice sessions)
- moved necessary functionality from LLMuteList to LLVoiceClient. It was used only in active speackers floater which is deprecated.
- initialized saving/loading of voice level in voice client.
- also saving voice levels between session is activated.

--HG--
branch : product-engine
2010-01-25 17:06:35 +02:00
Mike Antipov 69c803fec5 cleanning include list. rearrange the list in imview.cpp
--HG--
branch : product-engine
2010-01-20 21:02:41 +02:00
Ychebotarev ProductEngine 82de841c52 merge
--HG--
branch : product-engine
2010-01-19 17:13:21 +02:00