summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-08-22Fix up white space to follow coding policy guidelinescallum_linden
2012-08-17Minor change required for merge from viewer-developmentAura Linden
2012-08-17Merged in from viewer-development.Aura Linden
2012-08-16Silly Python 'string' fixcallumprentice
2012-08-16Silly Python 'string' fixcallumprentice
2012-08-16Silly typo fixcallumprentice
2012-08-15Add explicit reference to keychain to usecallumprentice
2012-08-15merge back beta fixesOz Linden
2012-08-15silly typo - change language from dutch to english :)callumprentice
2012-08-15merge changes for DRTVWR-198Oz Linden
2012-08-15Changed name of keychain to match setup instructionscallum_linden
2012-08-15merge changes for DRTVWR-194Oz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-14merge changes for DRTVWR-193Oz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-14merge changes for DRTVWR-195Oz Linden
2012-08-14merge changes for DRTVWR-191Oz Linden
2012-08-14correct merge errorOz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-14merge back beta fixesOz Linden
2012-08-14merge changes for DRTVWR-192Oz Linden
2012-08-10VWR-29358 : Fix auto scroll to selection when the filter is activeMerov Linden
2012-08-10merge changes for DRTVWR-190Oz Linden
2012-08-09MAINT-1197 : Fix inventory deselection/reselection when cutting itemsMerov Linden
2012-08-09MAINT-1342: correct initial login location handling, clarify the two related ↵Oz Linden
persistent settings
2012-08-09MAINT-113 Fix for flashing property lines when selecting objects.davep@spiral.lindenlab.com
2012-08-08Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-08-08More optional signing stuff for 10.5Aura Linden
2012-08-08Add implementation comments to LLHandle.Nat Goodspeed
I recently tried to wade through llhandle.h and got somewhat perplexed. Armed with an explanation from Richard, I've added notes to the file to try to make it a bit less mysterious.
2012-08-08Pulled merge, changed . to , in viewer-manifestAura Linden
2012-08-08More optional config for 10.5 buildsAura Linden
2012-08-08Move llhandle.h into llcommon; same generality as llpointer.h.Nat Goodspeed
Leaving llhandle.h in llui restricts the set of viewer project directories which could potentially use it, and there's nothing whatsoever UI-specific about it.
2012-08-08merge changes for DRTVWR-189Oz Linden
2012-08-07merge changes for DRTVWR-188Oz Linden
2012-08-07merge with headcallum_linden
2012-08-07Read password for developer keychain from build-secrets repo and use it to ↵callum_linden
unlock keychain. Only unlock and code sign if running under Team City.
2012-08-06PATH-842, VWR-29431: BUGFIX Correcting a regression introduced by the fix ↵Todd Stinson
for PATH-542. The viewer calculated rotation resulting from an object's angular velocity was being incorrectly reset when the corresponding object update was received. With this bugfix, the rotation resulting from the angular velocity is accumulated separately and is re-appplied when the object update resets the object's rotation.
2012-08-06Removed (unworking) code signing parameters from autobuild (wrong place)callumprentice
Added them to correct place (Cmake config)
2012-08-05Remove jarring viewer log spam message -- unless it's true.Nat Goodspeed
For as long as I've been paying attention to viewer logs, every run has always stated -- in all-caps, no less! : NOTE: ALL NOTIFICATIONS THAT OCCUR WILL GET ADDED TO IGNORE LIST FOR LATER RUNS. I have always found that unsettling, having little desire to automatically ignore notifications -- especially not whatever random set happens to manifest during a particular run. However, over time I've learned that it seems to have no actual impact. I've wondered (not too hard) what it actually *does* mean -- but generally I'm looking at a viewer log because I'm in hot pursuit of some quite different problem. Stumbling across the source for this message today in LLViewerWindow::LLViewerWindow, I was shocked -- shocked! -- to find it was being produced unconditionally! Therefore it has heretofore been utterly meaningless log spam. It provided no additional information whatsoever to anyone reading a log -- only that vague sense of unease. Make this conditional on gSavedSettings.getBOOL("IgnoreAllNotifications"), which would appear to be the original intent. Now its presence (or absence) actually says something about internal conditions in the viewer.
2012-08-03Make first-login popup button "Create Account"; remove embedded link.Nat Goodspeed
Popup text used to end with the question: Visit [[create_account_url] [SECOND_LIFE] web site] to create a new account? presumably to set context for the buttons labeled "New Account..." and "Continue". At Leo's request, remove the question and relabel the yes button "Create Account...".
2012-08-03When turning off create-account button, also turn off its title text.Nat Goodspeed
Login-panel logic distinguishes "system grid" from "non-system grid." With Oz's recent changes for pathfinding, now only agni and aditi are "system grids;" anything else configured into grids.xml is a "non-system grid." The difference is that when you select a "non-system grid" on the grid selector, we turn off the "lost password?" link and the "create account" button -- since how can we help with either if we don't recognize the grid? This logic already existed, but only turned off the create-account button, leaving the new title "CREATE YOUR ACCOUNT" over an empty corner of the login panel. Turn that off too.
2012-08-03Merge with lindenlab/viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-02Manual cleanup from merge up to viewer-development.Nat Goodspeed
Some viewer-development code had been moved, and so wasn't patched with my panel_login layout changes; verified each of my llpanellogin.cpp commits against new tip rev. Reformatted panel_login.xml in the spirit of the preferred indentation scheme but with my layout changes.
2012-08-02Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-08-02MAINT-515 FIX, CHOP-100 FIX - technically we are avoiding these issues ↵Brad Payne (Vir Linden)
rather than fixing them; changing llcommon to be statically linked avoids the symbol issues with llcommon.dll
2012-08-01FIX INTL-100 Frrench linguistic fixeseli
2012-08-01sync with viewer-dev for 'fr'eli
2012-08-01sync with viewer-dev for 'ja'eli
2012-08-01sync with viewer-dev for changes and new files for 'en'eli
2012-08-01sync with viewer-dev, removing obsolete fileseli