summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2012-09-05SH-3264 Worked to move over mBakedTextureDatas from LLVOAvatar to ↵Nyx (Neal Orman)
LLAvatarAppearance. Appear to have been able to move over the parts that are common to both the backend and the viewer into LLAvatarAppearance.
2012-09-05Reapply f6ed57210865 to zh/notifications.xml: remove "FirstRun" link.Nat Goodspeed
Because create_account_url should vary between viewer languages and skins, we've made an effort to ensure that create_account_url is used everywhere, instead of directly embedding http://join.secondlife.com. Recent rev 6ee71714935f accidentally reinserted the link embedded in the "FirstRun" notification for language 'zh'. Delete it again.
2012-09-05Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-09-05Merge VirLinden/sunshine -> don_linden/sunshine-experimentalDon Kjer
2012-09-05Merge viewer-development -> VirLinden/sunshineDon Kjer
2012-09-04WIP INTL-46 Set25, Set26, Set27 translations for traditional chinese; add ↵eli
new files
2012-09-04Cleanup actions from code review of llappearance with nyxDon Kjer
2012-09-04viewer-development mergeChris Baker
2012-09-04Cleaned up commentsChris Baker
2012-09-04Set virtual inheritance on LLTexture -> LLRefCountDon Kjer
2012-09-04Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTextureDon Kjer
2012-09-04Split LLTexLayerSetBuffer into llappearance portion, and viewer-specific ↵Don Kjer
LLViewerTexLayerSetBuffer
2012-09-04merge changes for DRTVWR-207Oz Linden
2012-09-04merge changes for DRTVWR-206Oz Linden
2012-09-04tag merge of DRTVWR-206Oz Linden
2012-09-04More clean-up to closer match original file order. For llavatarappearance diffsDon Kjer
2012-09-03Merge VirLinden/sunshine -> don_linden/sunshine-experimentalDon Kjer
2012-09-03Renamed LLVOAvatarDefines to LLAvatarAppearanceDefinesDon Kjer
2012-09-03Cleanup of llappearance refactor file definition order for easier diff'ingDon Kjer
2012-09-03Fixed typo in cmake fileDon Kjer
2012-09-03Extracted texture baking system into llappearance library.Don Kjer