summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-09-12merge increment of version numberOz Linden
2012-09-12increment version to 3.4.2Oz Linden
2012-09-12Added tag 3.4.0-release for changeset d02759655d6bOz Linden
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-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-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-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-09Merge with latest viewer-dev.Jonathan Goodman
2012-09-09Use a customized normalized gaussian specular term.Jonathan Goodman
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-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-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-06Updating the viewer to handle diffuse alpha as mode rather than a boolean.William Todd Stinson
2012-09-06DRTVWR-232: MAINT-1440: FIXED Call Tools.TakeCopy instead of ↵maxim_productengine
InspectObject.TakeFreeCopy
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-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-04WIP INTL-46 Set25, Set26, Set27 translations for traditional chinese; add ↵eli
new files
2012-09-04Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-09-04viewer-development mergeChris Baker
2012-09-04Cleaned up commentsChris Baker
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-08-31Adding ability to clear the materials from the selected object faces.William Todd Stinson
2012-08-31- Fixed an issue where service was called twice in a frameChris Baker
- Changed level of output logs - Cleaned up comments
2012-08-31Implemented functionality to test Post requests.William Todd Stinson
2012-08-31Adding a scroll list to report the response from the Put request.William Todd Stinson
2012-08-31merge changes forOz Linden
2012-08-31Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-08-31Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-08-31Copy sourceid= from create_account_url to login-page URL.Nat Goodspeed
This allows the login-page server to respond to any sourceid= associated with the create_account_url, which (we happen to know) varies by skin -- e.g. for the Steam viewer.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-20 16:34:06 +0000