summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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
2009-11-10EXT-677 Build tool arrows work again with UI size != 1.0James Cook
Must use scaled (virtual) pixels in some computations Will review with Richard
2009-11-10EXT-1503 Cosmetic and Polish issues with Viewer 2.0 Internal Alphan -- ↵Lis Pardi
Notifications with long headlines are overlapping with text
2009-11-10Implemented normal task EXT-1937 (Please update landmarks and locations to ↵Andrew Dyukov
the latest decided format). --HG-- branch : product-engine
2009-11-10Merging DEV-41724/DEV-41725 3rd party lib staging work with viewer-2-0.brad kittenbrink
2009-11-10Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-11-10Added an explicit copy constructor to LLPluginMessage.Monroe Linden
2009-11-10mergerichard
2009-11-10MergeNat Goodspeed
2009-11-10Reconcile LLNameListCtrl with new LLInstanceTracker interfaceNat Goodspeed
2009-11-10Fix for mac failure in apr shared lib staging (Part of DEV-41724)brad kittenbrink
2009-11-10DEV-41317 DEV-42311: Added ad-hoc voice call support.Lynx Linden
You can now multiple select users in the People panel, hit Call, and start an ad-hoc voice conference call with those users. The most difficult part here was automatically starting the call once the conference chat panel popped up. We have to wait for the panel to initialize before we can start a call, so I added another callback to LLIMModel to enable us to get notified when the panel has initialized. This is all wrapped up behind a new LLAvatarActions::startAdhocCall() API.
2009-11-10Enhance LLInstanceTracker variants to be more uniform.Nat Goodspeed
For both the (so far unused) generic KEY form and the KEY = T* form, provide key_iter, beginKeys(), endKeys(). Change instance_iter so that when dereferenced, it gives you a T& rather than a T*, to be more harmonious with a typical STL container. (You parameterize LLInstanceTracker with T, not with T*.) Fix existing usage in llfasttimer.cpp and lltimer.cpp to agree. For the KEY = T* specialization, add T* getInstance(T*) so client isn't forced to know which variant was used. Add unit tests for uniformity of public operations on both variants.
2009-11-10Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/Justin C. Rounds (Chuck)
2009-11-10Changed value of "Unused?" to modify highlight color.Justin C. Rounds (Chuck)
http://jira.secondlife.com/browse/EXT-2312
2009-11-10Don't allocate memory for debugging strings every mouse click.James Cook
2009-11-10Remove dangling LLEVENTS_LISTENER_ARITY controlNat Goodspeed
2009-11-10mergeYuri Chebotarev
--HG-- branch : product-engine
2009-11-10Minor develop.py tweaks to make mac logs more readable in parabuild output.brad kittenbrink
Supressing all the setenv spam.
2009-11-10Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-10Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/Alexei Arabadji
--HG-- branch : product-engine
2009-11-10fixed EXT-2275 "[BSI] New incoming IM or Group IM pushes all existing (andAlexei Arabadji
new) chiclets off the right end of the chiclet bar." --HG-- branch : product-engine
2009-11-10MergeDmitry Zaporozhan
--HG-- branch : product-engine
2009-11-10Update for major task EXT-2250 - Implement Classifieds list in Picks panel.Dmitry Zaporozhan
Removed temporary workaround which was expanding only one accordion in Picks panel. --HG-- branch : product-engine
2009-11-10Update for major task EXT-2251 - Implement panels for creating, editing and ↵Dmitry Zaporozhan
viewing Classifieds. Fixed bugs, cleared code. --HG-- branch : product-engine
2009-11-10(EXT-2343) Preference > Chat > ColorSwatch 's LLUIColorTable is not workingangela
2009-11-10check for NULL to prevent crashingangela
2009-11-10mergeVadim Savchuk
--HG-- branch : product-engine
2009-11-10Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2009-11-10No ticket. Cleaned up the code after last commitEugene Kondrashev
--HG-- branch : product-engine
2009-11-10Implemented Sub-task EXT-2214-Refactor IM Control PanelsEugene Kondrashev
--HG-- branch : product-engine
2009-11-10merge.Tofu Linden
2009-11-10No Ticket: added possibility to resize a floater in UI Preview Tool (if ↵Mike Antipov
can_resize attribute is set in xml) --HG-- branch : product-engine
2009-11-10Update for major task EXT-2251 - Implement panels for creating, editing and ↵Dmitry Zaporozhan
viewing Classifieds. Fixed bugs, improved functionality. --HG-- branch : product-engine
2009-11-10mergeYuri Chebotarev
--HG-- branch : product-engine
2009-11-10Fixed line endings from 4df44e70aa9dAndrew Dyukov
--HG-- branch : product-engine
2009-11-10L10N: Add some translations to FR, DE, JA from Localization Cycle1.Ramzi Linden
2009-11-10mergeMike Antipov
--HG-- branch : product-engine