summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-11-08Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Lynx Linden
2009-11-08DEV-38840: Fix the Pay Resident floater.Lynx Linden
It was failing to open due to an unknown string and the L$5 button was labelled incorrectly (it said L$1).
2009-11-08EXT-332: Added support for local currency estimates to the Buy L$Lynx Linden
and Buy Land floaters. We now check for a new estimatedLocalCost key from the XML-RPC server, which provides the estimated cost in the user's local currency, e.g., "US$ 10.00" or "10.00 Euros". Note: the server is not currently sending this information. The previous codepath still exists and should be unaffected. That is, we will continue to check for an estimatedCost key from the server with a value specified in US cents. We give precedence to estimatedLocalCost though and may want to remove this code once the international billing server changes go live. <lynx@lindenlab.com> HG: branch 'default' HG: changed indra/newview/llcurrencyuimanager.cpp HG: changed indra/newview/llcurrencyuimanager.h HG: changed indra/newview/llfloaterbuyland.cpp HG: changed indra/newview/skins/default/xui/en/floater_buy_land.xml
2009-11-07DEV-42215: Don't zap valid g(First|Last)name with empty strings.Nat Goodspeed
In the --autologin case, gFirstname, gLastname were validly set from gSavedSettings, but at the last minute were overwritten with empty strings from gLoginHandler. Only perform those assignments if gLoginHandler has non-empty strings to contribute.
2009-11-07mergeSteve Bennetts
2009-11-06Partial fix for DEV-42153.Monroe Linden
This code seems to work on some objects and not on others. I suspect I'm not doing something quite right in LLVOVolume::getApproximateFaceNormal().
2009-11-06Added camera preset art and attached to camera controlsErica
2009-11-06merge changes from product-engineSteve Bennetts
2009-11-06Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Erica
2009-11-06New inventory iconErica
2009-11-06Temp fix to prevent crash while missing sidepanel_task_info.xml.Steve Bennetts
2009-11-06Fixed textrue prioritization so that boosted textures are always highest ↵Steve Bennetts
priority.
2009-11-06EXT-2031 Admin Menu Missing Without Advanced Menu EnabledSteve Bennetts
2009-11-06Adding new option definition - forgot.CG Linden
2009-11-06Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2009-11-06Merge of avatar-pipeline changes into viewer2Eric M. Tulla (BigPapi)
2009-11-06mergeLoren Shih
--HG-- branch : avatar-pipeline
2009-11-06mergeLeyla Farazha
2009-11-06EXT-1576 "Zoom In" menu option should be disabled when the person is not ↵Leyla Farazha
in range EXT-2306 Default voice input/output pref panel to closed
2009-11-06DEV-42272 - viewer crash on startup in LLCurlRequest::processSteve Bennetts
2009-11-06EXT-2278 : "Save Texture As" for bottom panelLoren Shih
EXT-2310 : "Save Texture As" for inventory right-click menu "Save Texture As" now works properly and brings up the texture preview while saving. Also added "Save Texture As" to the right-click inventory context menu. --HG-- branch : avatar-pipeline
2009-11-06mergeJames Cook
2009-11-06EXT-1501 Menu fonts now configurable in XUI, set size to SansSerifSmallJames Cook
2009-11-06Changed llwarns on spurious InventoryPanel::buildNewViews debug mesage to ↵Loren Shih
lldebugs. --HG-- branch : avatar-pipeline
2009-11-06Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/Justin C. Rounds (Chuck)
2009-11-06Changed "Support" tab to "Info".Justin C. Rounds (Chuck)
http://jira.secondlife.com/browse/EXT-2177
2009-11-06merge from remote repoRick Pasetto
2009-11-06FIX: zoom/unzoom should appear to be one iconRick Pasetto
this was a fairly trivial UI change....
2009-11-06EXT-2215 - Viewer crashes while trying to decode imageSteve Bennetts
llwarns is not entirely thread safe. Need to fix that, but for now, use LL_DEBUGS instead.
2009-11-06Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/Justin C. Rounds (Chuck)
2009-11-06Updated default_profile_picture to match style. Added Blank graphic to use ↵Justin C. Rounds (Chuck)
as overlay icon (in order to produce tool-tip). Created panel_profile_user.xml which is a profile panel specifically for the current user, and modified panel_me_profile to call it accordingly. http://jira.secondlife.com/browse/EXT-2245
2009-11-06FIX DEV-41587: Update current URL in draw()Rick Pasetto
The current URL is now re-fetched from the current selection. Also did some minor refactoring
2009-11-06mergeSteve Bennetts
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06Make test text floaters so Erica can make a call on final font sizes.James Cook
2009-11-06Fixed normal bug EXT-1509 "Going into mouselook while in a private callSergei Litovchuk
ruins the call floater.": - Made callfloater a single instance floater. - Updated floater IM panel visibility change logic. - Added NULL checks for voice client pointers in LLFloaterIMPanel. --HG-- branch : product-engine
2009-11-06hg mergeVadim Savchuk
--HG-- branch : product-engine
2009-11-06mergeVadim Savchuk
--HG-- branch : product-engine
2009-11-06mergeJames Cook
2009-11-06fixed bug EXT-2111 Unable to edit the Notes & Privacy contentDenis Serdjuk
--HG-- branch : product-engine
2009-11-06Changed default help URL for board demo per email discussion on ↵James Cook
viewer2009@lists.
2009-11-06Show glow around interactive objects on hover. Glow shows through ↵James Cook
objects/avatars - this is expected. Effect from DaveP long ago, hover code by me long ago, just changing the default setting.
2009-11-06mergeVadim Savchuk
--HG-- branch : product-engine
2009-11-06Backed out changeset c3b8509f465a (EXT-989) as causing numerous conflicts.Vadim Savchuk
Will reapply the changes later. --HG-- branch : product-engine
2009-11-06No ticket, added comments to split-by-date code.Sergey Borushevsky
--HG-- branch : product-engine
2009-11-06merge.Tofu Linden
2009-11-06Backed out changeset ad70c07b05b6Tofu Linden
(ad70c07b05b6 was 'Reduced "Medium" font size, which is a temporary fix until menu font can be defined specifically. http://jira.secondlife.com/browse/EXT-1315') This change was too all-around impactful just for the sake of the menu font - it made medium and small font sizes indistinguishable, leading to lots of invisible mismatches as long as this hack persisted...
2009-11-06EXT-1823 avatar shape corrupted with huge legs/feetNyx (Neal Orman)
As suspected a morph mask issue. Apparently we were setting success to false if the user specifies a pant or shrit texture without an alpha channel. Result: bad morph masks. Patch begins to clean up the isMorphMaskValid issue, as well as fixing this error. Code reviewed by Vir
2009-11-06Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2009-11-06partial implementation for the major task (EXT-989) IM chiclets should ↵Dmitry Oleshko
expand to show active voice indicator --HG-- branch : product-engine