summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2009-11-10fixed normal bug EXT-1649 Groups you chatted in recently show up in the ↵Andrew Polunin
Recent People tab --HG-- branch : product-engine
2009-11-10EXT-2078angela
2009-11-10mergeRamzi Linden
2009-11-10I18N: several nodes in XUI have no name= or a duplicate name=, thus cant be ↵Ramzi Linden
localized. Notifications console was listed twice in the Develop>Console menu
2009-11-10Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-10DEV-35097 final check in XUI for instances of the nonapproved terms "2nd ↵Ramzi Linden
Life", "1st Life", "SLURL"
2009-11-10Develop>XUI>Send Test IMs: Lets not poke fun of a resident tradition in the ↵Ramzi Linden
public beta. Also it should test a sentence that wraps. Ideally it would also test a string with double-byte characters but I dont know how to do that.
2009-11-10Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-10clean up include llfontglangela
2009-11-09LLViewerMediaImpl now keeps track of which instance is the current parcel ↵Monroe Linden
media instance. The active parcel media instance always gets priority over other inworld media.
2009-11-09PARTIAL FIX (workaround) DEV-41949: LLMediaEntry::setWhitelist() and ↵Rick Pasetto
LLMediaEntry::asLLSD() have a contract conflict Review #31 So, here's what was happening, briefly: - LLMediaEntry::setWhitelist() would be a no-op if given an LLSD that did not have a WHITELIST_KEY - LLMediaEntry::asLLSD() would render the LLMediaEntry *without* a WHITELIST_KEY if the whitelist was empty Therefore, when the viewer marshalled an LLMediaEntry for the server, it would send it without a WHITELIST_KEY. When the server got it, it would not erase the last value. This is actually a workaround: it patches asLLSD() with an LLSD::emptyArray() if the key is not there. However, this should be fixed on the server: in either or both of the following ways: 1) LLMediaEntry::setWhitelist() should not be a no-op if the LLSD has no WHITELIST_KEY: it should erase the whitelist 2) LLMediaEntry::asLLSD() should render an empty whitelist in WHITELIST_KEY as an empty array Note that both could be done and still work. A unit test should and will be written next.
2009-11-09Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-09Refinement to my previous commit:Monroe Linden
Created LLViewerMediaImpl::unload(), which unloads the media and clears internal state (such as the last-navigated URL) to keep it from getting reloaded. LLViewerMedia::updateMediaImpl() now calls unload() on the impl instead of just using destroyMediaSource().
2009-11-09Merging DEV-41724/DEV-41725 3rd party lib staging work with viewer-2-0.brad kittenbrink
2009-11-09FIX DEV-42093 - Make sure to navigate home if current URL is empty on "Apply"Rick Pasetto
This change gets rid of the crufty (and confusing) "apply()" functions from llpanelmediasettings*. Those functions were never being called, yet changes were being made in them. Instead, I added "preApply()" and "postApply()" to each of these panels, which the floater (who really does the "apply()"ing) now calls before and after it applies the changes to the media data.
2009-11-09Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-09Dev-42424 Turning on impostors for intel cards above 965Palmer
2009-11-09Fix for DEV-42029 (changing media on multiple faces can make a zombie SLPlugin).Monroe Linden
Made LLViewerMedia::updateMediaImpl() unload the impl's media plugin when the current URL goes empty. Made LLVOVolume::syncMediaData() call removeMediaImpl() if the media data gets deleted.