summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-11-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-11adding warning msg when fetching for folders with NULL uuidangela
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-10Fix for Windows compile error.Steve Bennetts
2009-11-10mergeSteve Bennetts
2009-11-11Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-10Fix for DEV-42328 (Muting then Unmuting All Nearby Media resets nearby media ↵Monroe Linden
to Home URL). Fixed by having LLViewerMedia::updateMediaImpl() copy the media entry's current URL into the media impl's mMediaURL in the case where the impl has a non-empty media URL but the function doesn't do a navigate.
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-11Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-10Merge changes from product-engineSteve Bennetts
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-10Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-10FIX DEV-41991: do not allow media settings panel to come up if media data is ↵Rick Pasetto
in flight Review #33 This change marks the current selection "not editable" if any objects in the selection are currently "in flight" (i.e. their media data has not been fetched yet, or is in the process of being fetched). This involved adding API to LLMediaDataClient to query whether an object is in the process of being fetched (i.e. in the queue). I've added a unit test for this new API.
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Erica
2009-11-10pushing changes to named font sizes prior to hardcoded font removalErica
2009-11-10mergeLeyla Farazha
2009-11-10EXT-2338 Move button tooltips to strings the viewer translation tool can parse.James Cook
Also moved mSpeakBtn from llnearbychatbar to llbottomtray, because the bottom tray is its parent.
2009-11-10EXT-1478 Tool-tip background and border colors are being ignoredLeyla Farazha
EXT-2082 Multifloater preview tab container extends outside window border EXT-773 odd notecard behaviour on closing an unsaved notcard reviewed by Richard
2009-11-10Fix for DEV-42400 (Mouse pointer location does not map correctly to ↵Monroe Linden
non-square media faces).
2009-11-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-11-11DEV-41358: Added user's preferred maturity level to search URL.Lynx Linden
The Search URL now includes a "r=" query parameter to specify the user's preferred maturity rating. This can be "pg" or "pg,mature" or "pg,mature,adult".
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-11-10Added PluginAttachDebuggerToPlugins debug setting.Monroe Linden
Added accessors to get platform-specific process ID from LLProcessLauncher. Added an optional "debug" argument to LLPluginClassMedia::init() and LLPluginProcessParent::init() (defaults to false). Mac only: made the state machine in LLPluginProcessParent::idle() open a new window in Terminal.app with a gdb session attached to the plugin process upon successful launch.
2009-11-10DEV-40001: Add support for a pre-login help topic.Lynx Linden
Asking for help (e.g., pressing F1) before logging in will now display a specific pre-login help topic, "pre_login_help". This behavior was agreed upon with Rand to allow us to display a custom page to help the user log on successfully.
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Erica
2009-11-10EXT-2349 : Diagnose warning spam: [X] is in model and in view, but STRUCTURE ↵Loren Shih
flag not set No longer allowing recursive calls to gInventory.notifyObservers. Added debugging tools to catch when this happens. This fixes the symptom, but we'll also need to remove whatever code is causing the recursive calls.
2009-11-10EXT-2355 Preferences: Inconsistent use of capital letters for second word of ↵Lis Pardi
labels
2009-11-10Added media textures to textures.xmlErica
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-11Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Erica
2009-11-10EXT-2336 add new media art to viewerErica
2009-11-10Restore "Show Advanced Permissions"Steve Bennetts
2009-11-10EXT-2356 Replace Log button in bottom tray with up arrowLis Pardi
2009-11-10Minor comment cleanup for llagentwearables.cpp.Loren Shih
2009-11-10Add newline at end of fileJames Cook
2009-11-10mergeJames Cook
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-10added filenames to xui names output when using filename="" in XUIrichard
reviewed by Richard
2009-11-10Sanitize naming of getWindowRect (scaled vs. raw pixels) and ↵James Cook
getWorldViewRect (scaled vs. raw) Reduces chance of future UI bugs related to UI size. Discussed with Richard.
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0brad kittenbrink
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-10Make LLInstanceTracker a public base of LLLayoutStack.Nat Goodspeed
Qualify instance_iter with LLLayoutStack:: rather than having to restate the template params to LLInstanceTracker.
2009-11-10further fixes in gcc landRick Pasetto
2009-11-10fix for gccRick Pasetto
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-10FIX DEV-41949: LLMediaEntry::setWhitelist() and LLMediaEntry::asLLSD() have ↵Rick Pasetto
a contract conflict Review #32 This code will go into both server 1.32 branch and the viewer branch. As proposed in DEV-41949, I've changed setWhitelist(const LLSD &whitelist) to clear the whitelist if the WHITELIST_KEY is not present in the passed-in 'whitelist'. I've also made sure that asLLSD() ensures that the WHITELIST_KEY is erased in the given LLSD.
2009-11-10mergerichard