Commit Graph

44 Commits (f00647b6fd7e023c7607e9c7e43d6ad737d1bf7b)

Author SHA1 Message Date
Ansariel abc27703e6 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-03 22:50:13 +01:00
Ansariel f7bd33161b Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-12 11:05:22 +01:00
Ansariel a0be0371d7 Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-11-12 01:12:13 +01:00
Andrey Kleshchev 46ebe69f32 SL-14303 Fix LLWearableType to not spam in logs 2020-11-10 18:18:51 +02:00
Andrey Kleshchev 5e7a0a963e SL-14190 moved sAvatarDictionary 2020-11-03 22:12:39 +02:00
Andrey Kleshchev 99d2ae5e02 SL-14190 sAvatarDictionary was not used 2020-10-26 18:47:12 +02:00
Ansariel 11b532ed95 Merge LL viewer-release 5.1.6 2018-06-21 17:36:51 +02:00
Anchor Linden 71fa94b366 [MAINT-8693] - fix null check 2018-05-30 05:51:37 +05:30
Andrey Kleshchev 9e58cb266c MAINT-8693 Fixed crashes during login if you wear a BOM tattoo layer 2018-05-25 21:11:54 +00:00
Andrey Kleshchev c2a2590a7d MAINT-8693 Fixed crashes during login if you wear a BOM tattoo layer 2018-05-25 21:11:54 +00:00
Ansariel 919521d121 Merge Firestorm LGPL tip 2016-05-21 19:02:00 +02:00
Ansariel 472215b46c Merge bento-box 2016-04-14 14:29:20 +02:00
Brad Payne (Vir Linden) 6a84d236f4 SL-362 - changed 'could not link driven params for wearable' into a debug message. Needs more diagnosis to figure out whether we care. Silencing for now to avoid redundant bug reports. 2016-04-11 09:01:44 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Nicky 2c4a3e7610 Crash in LLPanelEditWearable::isDirty(): Make sure there's no dangling pointer to a LLWearable. 2016-02-17 12:18:53 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Brad Payne (Vir Linden) f47ceb47bb merged jelly-doll viewer-release into bento 2016-05-21 08:15:28 -04:00
Oz Linden 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
Oz Linden 8b42c7898e replace llifstream and llofstream with std::ifstream and std::ofstream respectively 2015-04-07 17:59:28 -04:00
Oz Linden 3a57b18896 convert llifstream and llofstream to std::ifstream and std::ofstream respectively 2015-04-07 17:28:05 -04:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Nat Goodspeed ae6440eecc MAINT-4744: Eliminate viewer dependency on (old) GNU libstdc++.
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.
2015-01-28 15:55:18 -05:00
Ansariel 546b276eba Fix merge issue 2015-01-18 17:18:23 +01:00
Stinson Linden 8392fde6f6 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
Stinson Linden 76023f172c MAINT-4009: Patching a leak of LLVisualParam derived objects that were being leaked because the LLWearable class was not destroying itself properly. 2014-05-14 22:55:19 +01:00
Stinson Linden 75538968db MAINT-4009: Patching the final leak of LLViewerFetchedTexture objects occurring because the LLWearable class was not properly destroying itself. 2014-05-14 19:49:13 +01:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Brad Payne (Vir Linden) 82f147367f SH-3455 WIP - removing bake upload code 2013-09-19 11:10:59 -04: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
Richard Linden 075a7bcc98 SH-4297 WIP interesting: viewer-interesting starts loading cached scene late
dependency cleanup - removed a lot of unecessary includes
2013-07-18 15:09:45 -07:00
prep 46ab23c94b llinventory merge fixes 2013-03-11 18:02:16 -04:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Nyx Linden fa3f91e454 SH-3798 FIX avatar skins look dull
Wearable parsing error caused last texture in some assets to fail to parse.
Parser now does not throw an error if the wearable does not end in a newline
2013-02-28 23:32:00 +00:00
Nyx Linden 705a23ac0d SH-3803 FIX Missing Wearable reported in sunshine viewer
Newly refactored wearable parsing did not account for extra whitespace cleanly.
Updated the code to handle extra blank lines in the wearable assets.
2013-02-14 13:41:36 -05:00
Brad Payne (Vir Linden) 7d6da2ebe8 more param location logging, added wearable type info to dumpArchetypeXML 2012-10-17 13:43:19 -04:00
Brad Payne (Vir Linden) 22f53c8558 additional debugging info, including tracking where visual params live 2012-10-15 18:41:55 -04:00
Don Kjer 793dde16f3 Merge sunshine-internal -> sunshine-experimental 2012-09-27 22:01:40 +00:00
Don Kjer 7153d1db11 Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable 2012-09-20 04:29:17 +00:00
Don Kjer 5bb8962c4e Merge sunshine -> sunshine-experimental 2012-09-13 22:14:53 +00:00
Nyx (Neal Orman) f1d6052e36 SH-3264 Moved over a few more items to llappearance
moved over:
isWearingWearableType
wearable::writeToAvatar
wearable::mTEMap (stores LocalTextureObject*)
more from wearable::import/export
wearable::createVisualParams, etc
2012-09-11 11:59:45 -04:00
Don Kjer 21c364c4d4 Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines 2012-09-03 09:10:24 +00:00
Don Kjer 0c7623f628 Cleanup of llappearance refactor file definition order for easier diff'ing 2012-09-03 08:37:58 +00:00
Don Kjer c355fb98d3 Extracted texture baking system into llappearance library. 2012-09-03 06:12:50 +00:00
Nyx (Neal Orman) 51fabc3850 SH-3261 SH-3324 WIP Starting extraction of wearable/appearance libraries
First pass at cmake configs, and starting to try to move wearable class.
Things are broken, checkpointing work to collaborate.
2012-08-21 18:21:11 -04:00