summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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 changes for DRTVWR-213Oz 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-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
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 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-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-04viewer-development mergeChris Baker
2012-09-04Cleaned up commentsChris Baker
2012-09-04merge changes for DRTVWR-207Oz Linden
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-31merge changes forOz Linden
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.
2012-08-31Now that LLURI isn't broken, use it to construct login-page URL.Nat Goodspeed
Previous logic constructed a std::ostringstream, directly messing with '?' vs. '&', ugly libcurl escape calls etc. Now we can deconstruct the LLGridManager:: getLoginPage() URL, supplement the params map as needed and then rebuild a new URL using LLURI::buildHTTP().
2012-08-30WIP INTL-46 Set24 translation for traditional chinese; add new files; remove ↵eli
obsolete files
2012-08-30FIX INTL-101 translation of set33 for 8 languages; add new files; remove ↵eli
obsolete files
2012-08-29MAINT-1491 Make GPU table more readable, clear out some cruft, and start ↵Dave Parks
reporting raw GL strings in viewer stats instead of GPU table labels to make future GPU table overhauls more effective.
2012-08-29MAINT-1491 Add Intel HD Graphics entries.Dave Parks
2012-08-29MAINT-1491 Add Radeon HD 7xxx chips, get rid of "ATI Technologies" catch ↵Dave Parks
all, split up NVIDIA GT(X) 6xx series into mobile/desktop.
2012-08-29WIP INTL-46 Traditional Chinese translation for Set23TW (120829)eli
2012-08-29MAINT-1497 Remove "ATI Geforce" lines (also add "expected OpenGL version" field)Dave Parks
2012-08-29MAINT-1455 FIX Media Texture not visually updated correctlycallum
Reviewed by me. (Bao created)
2012-08-28Got viewer displaying new data formatChris Baker
2012-08-28MAINT-1491 Tuned analysis function for more consistent resultsDave Parks
2012-08-28MAINT-1491 Integration of statistically generated GPU table -- enable ↵Dave Parks
shadows by default where appropriate.
2012-08-27MAINT-1480: Ensuring that the new angular velocity is remembered for later ↵William Todd Stinson
comparison to the previous angular velocity.
2012-08-27PATH-868: Ensuring that walkability values are reset to a previous value if ↵Todd Stinson
the empty string is entered.
2012-08-27MAINT-1480: Clearing the angular velocity accummulation when the updated ↵Todd Stinson
angular velocity is set to zero.
2012-08-23Start of getting WSGI service on viewerChris Baker
2012-08-22Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-22PATH-864: Altering the minimum linksets floater size to smaller to allow ↵Todd Stinson
fitting to 1024 width screens.
2012-08-22MAINT-1444: Make bottom-right corner of new login panel overlap.Nat Goodspeed
MAINT-1444 complains that with all optional login-panel controls enabled, the login panel is wider than 1024 pixels: at that width, the new "Start now" button is pushed completely off the right edge of the window. Richard told me how to tweak the layout so that the controls can squeeze together in an overlapping way, enabling all controls to be visible even at 1024 width.
2012-08-22merge changes for DRTVWR-202Oz Linden
2012-08-22Fix up white space to follow coding policy guidelinescallum_linden
2012-08-22pull back release hotfix and beta fixesOz Linden
2012-08-22merge changes for DRTVWR-203Oz Linden