summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-12increment version to 3.4.2Oz Linden
2012-09-12Added tag 3.4.0-release for changeset d02759655d6bOz Linden
2012-09-12Fix for link errors on linuxDon Kjer
2012-09-12SH-3347 create demo of back end texture baking serviceNyx Linden
First link of the back-end service with some LLAppearance code.
2012-09-12Automated merge with http://bitbucket.org/oz_linden/viewer-beta-notcmallocDave Parks
2012-09-12MAINT-1503 Minimal set of changes needed to safely disable tcmallocDave Parks
2012-09-12Fixing merge conflicts related to restoring DRTVWR-167 changesBrad Payne (Vir Linden)
2012-09-12initial attempt to restore changes that make removing tcmalloc possible; not ↵Oz Linden
tested
2012-09-11Dump XML tweaks, suppress wearable updates when bakes should dominateBrad Payne (Vir Linden)
2012-09-11Resync steam/xui/*/strings.xml with default/xui/*/strings.xml.Nat Goodspeed
The steam/xui/*/strings.xml files are intended only to override a single string (create_account_url). But until the strings.xml C++ code supports fallback to the default skin, we must manually keep them synchronized except for that one string.
2012-09-11Merge up to http://hg.secondlife.com/viewer-developmentNat Goodspeed
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-11Added tag 3.3.4-beta6 for changeset 62b07aa81b19Oz Linden
2012-09-11merge changes for DRTVWR-213Oz Linden
2012-09-11tag merge of DRTVWR-213Oz Linden
2012-09-11merge changes for DRTVWR-212Oz Linden
2012-09-11tag merge of DRTVWR-212Oz Linden
2012-09-10Fixed line endings from DOS to UNIX.Baker Linden
2012-09-10dumpArchetypeXML tweaks, appearance debuggingBrad Payne (Vir Linden)
2012-09-10FIX INTL-104 Translation of Set34 in 8 languages, including Steam contenteli
2012-09-10FIX INTL-106 French linguistic fixeseli
2012-09-10inconsequential change to force new buildOz Linden
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-09-10BUILDFIX WIN fixing windows build errorNyx (Neal Orman)
converted a struct to a class, cleaning up a forward declaration that caused windows build issues.
2012-09-10mergeBrad Payne (Vir Linden)
2012-09-10more baked texture debugging under DebugAvatarCompositeBakedBrad Payne (Vir Linden)
2012-09-09Fixed crashes on login. Moved most of the remaining character/skeleton ↵Don Kjer
generation code into llappearance. Moved non-rendering related LLViewerJoint functionality into LLAvatarJoint.
2012-09-08DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
cmake and other files didn't get moved over, do it by hand.
2012-09-08Fixed #include typoDon Kjer
2012-09-08Automated mergeDon Kjer
2012-09-08Removed most llappearance -> llui dependencies (LLTrans remains). Moved ↵Don Kjer
LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
2012-09-07Automated merge with https://bitbucket.org/don_linden/sunshine-experimentalNyx (Neal Orman)
2012-09-07SH-3264 Porting over the XML loading of the avatar structure to llappearanceNyx (Neal Orman)
Moved over the necessary classes to llappearance to support the loading of the avatar's structure & params from file.
2012-09-08Fleshing out appearance-utility standalone app. Added input/output ↵Don Kjer
processing, argument parsing, and general error handling.
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Cmake files not merged correctly and had to be done by hand. New memory allocation made some memory usage tests in the llcorehttp integration tests no longer valid. Would like to work on LLLog sometime and get it to be consistent. Special flags needed for windows build of example program.
2012-09-07enhanced XML archetype dumping, added to per-avatar menusBrad Payne (Vir Linden)
2012-09-07DRTVWR-209 Additional merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
Restore original deleteRequest/removeRequest implementation removing a small race. Remove a short-lived additional timeout scheme on requests which really isn't appropriate as originally implemented as we can have very long-lived requests on big regions.
2012-09-07Automated merge with file:///Users/nat/linden/davep-viewer-development-rebasedNat Goodspeed
2012-09-07DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.Monty Brandenberg
This was yet another refresh from v-d because of significant changes to lltexturefetch that would not have been resolvable by casual application of any merge tool. There are still a few questions outstanding but this is the initial, optimistic merge.
2012-09-07MAINT-1491 Fix for L&S never being enabled by default on XP/Linux/OS XDave Parks
2012-09-06Automated merge with file:///Users/nat/linden/davep-viewer-development-rebasedNat Goodspeed
2012-09-06Do the proper fix this time...Baker Linden
2012-09-06Added explicit casting for Linux build, hopefully making it work.Baker Linden
2012-09-06Adding appearance utility packageDon Kjer
2012-09-06DRTVWR-232: MAINT-1440: FIXED Call Tools.TakeCopy instead of ↵maxim_productengine
InspectObject.TakeFreeCopy
2012-09-06MergeDon Kjer
2012-09-06Extracted mWearableDatas from LLAgentWearables into ↵Don Kjer
llappearance/LLWearableData. Moved LLDriverParam into llappearance
2012-09-05[MAINT-513] Large group managementBaker Linden
- 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-05mergeBrad Payne (Vir Linden)
2012-09-05Debug display for baked vs. composite status, via setting ↵Brad Payne (Vir Linden)
DebugAvatarCompositeBaked