summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwearable.cpp
AgeCommit message (Collapse)Author
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2021-03-02Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-02-03Merge with Master after Viewer releaseCallum Prentice
2021-02-01Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2020-11-23SL-14370 Fix loading indicatorsAndrey Kleshchev
2020-11-20SL-14370 Don't build Appearance floater if it's not neededMnikolenko Productengine
2020-11-10SL-14303 Fix LLWearableType to not spam in logsAndrey Kleshchev
2020-11-03SL-14190 moved sAvatarDictionaryAndrey Kleshchev
2020-10-26SL-14190 sAvatarDictionary was not usedAndrey Kleshchev
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2018-05-30[MAINT-8693] - fix null checkAnchor Linden
2016-11-16mergeBrad Payne (Vir Linden)
2016-07-26build fixMnikolenko Productengine
2016-07-26MAINT-6566 Avatar sliders display incorrect values immediately after saving ↵Mnikolenko Productengine
a copy of the wearable.
2016-05-21merged jelly-doll viewer-release into bentoBrad Payne (Vir Linden)
2016-03-23SL-344 - hook for debugging wearable contents during slider testing.Brad Payne (Vir Linden)
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-01-28MAINT-4744: Eliminate viewer dependency on (old) GNU libstdc++.Nat Goodspeed
To be more accurate, this changeset doesn't actually eliminate the dependency: it eliminates the use cases for the llifstream / llofstream feature that requires it. Currently you can construct an llifstream or llofstream from an open LLFILE* file handle (or, except on Windows, an int file descriptor). But rather than containing a streambuf implementation based on FILE*, llfile.h relies on the fact that the Windows std::filebuf happens to support that as a nonstandard extension; also on a nonstandard GNU extension __gnu_cxx::stdio_filebuf<char>. To move from GNU libstdc++ to clang's libc++ (the direction on Mac), we could code a streambuf that supports FILE*. But before doing that, it's worth asking whether anyone actually uses this questionable feature. In fact there were only two methods: LLWearable::exportFile() and importFile() -- and only one call to either, in LLViewerWearable::saveNewAsset(). The code in saveNewAsset() opened the LLFILE* immediately before calling exportFile(), meaning we could reasonably push the open operation down into exportFile(). That logic was complex anyway due to the need for the caller to close the LLFILE* regardless of the success of the exportFile(). Change LLWearable::exportFile() and importFile() to accept a std::string filename rather than an open LLFILE*. Change LLViewerWearable::saveNewAsset() to simply call exportFile(filename) rather than horsing around with an LLFILE* handle. (This improves the code in another way too: it encapsulates the need to open the relevant file in binary mode. Previously, each caller had to remember to do that.) To prevent inadvertent reintroduction of ll[io]fstream(LLFILE*) code, add llstream_LLFILE preprocessor macro (default 0) to control access to the relevant constructors. Also suppress rdbuf() override, the only method whose signature references llstdio_filebuf.
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2013-09-23SH-3455 WIP - post-SSA cleanupBrad Payne (Vir Linden)
2013-09-23SH-3455 WIP - post-SSA cleanup, including removal of mUseServerBakes and ↵Brad Payne (Vir Linden)
related methods
2013-09-19SH-3455 WIP - removing bake upload codeBrad Payne (Vir Linden)
2013-09-19SH-3455 WIP - removing bake upload codeBrad Payne (Vir Linden)
2013-09-19SH-3455 WIP - removing bake upload codeBrad Payne (Vir Linden)
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-06-21SH-4240 FIX Users can set their hover height to 0Nyx Linden
Adjusted the startup conditions, and relogging should apply the enforcement as appropriate now. Note that this affects the startup enforcement and should re-test the macro avatar loading bug.
2013-06-05merge with viewer-releaseRichard Linden
2013-03-11mergeprep
2013-03-08SH-3959 WIP - pass information about type of fetched image - server bake, ↵Brad Payne (Vir Linden)
host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2012-10-17additional diagnostics, improved shape stability at cost of increasing ↵Brad Payne (Vir Linden)
entanglement between baked and local appearance
2012-10-03additional fixes for avoiding avatar param manipulation via wearables, ↵Brad Payne (Vir Linden)
setting correct state from avatar appearance
2012-09-27mergeBrad Payne (Vir Linden)
2012-09-27audited uses of centralBakeVersion vs. isUsingServerBakesBrad Payne (Vir Linden)
2012-09-27Merging sunshine-experimental into sunshine-internalNyx (Neal Orman)
2012-09-27Fix for ruthing in non-server-bake regionsBrad Payne (Vir Linden)
2012-09-27Fix for mac/linux 'ruth' appearance. Fix for linux build issueDon Kjer
2012-09-26more state management stuff, DRANO flags for problematic areasBrad Payne (Vir Linden)
2012-09-20Partial rewrite of llifstream and llofstream (Windows implementation ↵Don Kjer
pending). Moved more functionality from llviewerwearable to llwearable
2012-09-19small tweaks to param debugging, restricting LLWearable::writeToAvatarBrad Payne (Vir Linden)
2012-09-19work in progress, more debugging/logging of avatar visual param infoBrad Payne (Vir Linden)
2012-09-13Merge sunshine -> sunshine-experimentalDon Kjer
2012-09-11SH-3264 Moved over a few more items to llappearanceNyx (Neal Orman)
moved over: isWearingWearableType wearable::writeToAvatar wearable::mTEMap (stores LocalTextureObject*) more from wearable::import/export wearable::createVisualParams, etc
2012-09-06Extracted mWearableDatas from LLAgentWearables into ↵Don Kjer
llappearance/LLWearableData. Moved LLDriverParam into llappearance
2012-09-04Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTextureDon Kjer
2012-09-03Renamed LLVOAvatarDefines to LLAvatarAppearanceDefinesDon Kjer
2012-09-03Cleanup of llappearance refactor file definition order for easier diff'ingDon Kjer
2012-09-03Extracted texture baking system into llappearance library.Don Kjer