summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-11-12Better fix for edge case where abort call to readComplete() can cause a crash.Steve Bennetts
2009-11-11Fix for DEV-42720 - media settings floater is Emptycallum
2009-11-11mergeLoren Shih
2009-11-11Took out unnecessary llinfos msg from LLInventoryModel.Loren Shih
2009-11-11EXT-387 : Clean up WARNINGS - Advanced.DumpAvatarLocalTexturesLoren Shih
Added menu callbacks in for avatar texture debug, but disabled functionality for release version.
2009-11-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/James Cook
2009-11-11Revert global font setting for UI controls because it makes About Land crashJames Cook
Apparently moving ui_ctrl to a different registry breaks our ability to create dummy ones in code. Reverting until I have time to investigate. Discussed with Richard
2009-11-11Fix merge error (and hence build breakage :( )Rick Pasetto
2009-11-11Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-11EXT-2261 : Inventory view should show default foldres (i.e. expand My Inventory)Loren Shih
2009-11-11Fix a potential crash if scroll button is not thereRick Pasetto
2009-11-11some minor changes based on Richard's code reviewRick Pasetto
Code Collab #34
2009-11-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Brad Payne (Vir Linden)
2009-11-11Remove references to media_panel_scroll in ↵Monroe Linden
LLPanelPrimMediaControls::updateShape(), as it was removed from the XUI file.
2009-11-11Changing VC Debugger working directory to be ${CMAKE_CURRENT_SOURCE_DIR} to ↵brad kittenbrink
restore ability to edit in place xui files, shaders, etc.
2009-11-11mergeLeyla Farazha
2009-11-11Believe this fixes the remaining issues with missing attachment links on ↵Brad Payne (Vir Linden)
first use of 2.0 - EXT-1593 and EXT-1591.
2009-11-11EXT-950 Minimized floaters default to a bad location onscreenLeyla Farazha
EXT-2298 [BSI] Busy mode response shows as "|TOKEN COPY BusyModeResponse|" in General prefs while offline
2009-11-11EXT-2377 : Add XML switch to showing either menubar or gear menuLoren Shih
Reverting previous checkin for enabling this. This is more complicated than worth spending time on, at the moment.
2009-11-11Fix bad XML causing UI images not to load.James Cook
2009-11-11Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-11Add ToolTip functionality to LLScrollListCellRick Pasetto
This change enables a user to set a custom tool tip on a particular scroll list cell by calling setToolTip(). Then, this tool tip is used. If this is not done, the existing tooltip functionality is left alone. Reviewed by Richard
2009-11-11Merge from product-engineSteve Bennetts
2009-11-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Xiaohong Bao
2009-11-11use "LLViewerTexture::EBoostLevel" to replace "S32" for texture boost level.Xiaohong Bao
2009-11-11DEV-41358: Changed format of preferred maturity for search.Lynx Linden
Now preferred maturity is passed to the search web pages as an r={13|21|42} query param.
2009-11-11merge: pulling changes from trunkNyx (Neal Orman)
2009-11-11Changes to fix an LLERRS caused by SRV request timeout.Mark Palange (Mani)
Added settings to config SRV request params Increased timeout to 10 seconds Changed timeout to generate login failure event instead of an error. Added unit test to cover SRV failure event.
2009-11-11fixing build - last commit had bad call to startAppearanceAnimationNyx (Neal Orman)
function definition of startAppearanceAnimation chagned - last patch missed eliminating the parameters at line 6594 in llvoavatar.cpp. This patch fixes the issue, confirmed builds and runs locally.
2009-11-11Fixed typo.Justin C. Rounds (Chuck)
http://jira.secondlife.com/browse/EXT-2359
2009-11-11Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/Justin C. Rounds (Chuck)
2009-11-11Added tool-tip graphic.Justin C. Rounds (Chuck)
2009-11-11DEV-34507 too many baked texture uploadsNyx (Neal Orman)
Fixed a double-bake bug on hitting the "OK" button of the appearance editor Also cleaned up extraneous calls to requestLayersetUpload. Behavior should now be consistent with resident expectations. Code reviewed by Bigpapi
2009-11-11EXT-2173 use of visual param animation inconsistent at bestNyx (Neal Orman)
removed ambiguous parameter "set_by_user" from many places in codebase, renaming it to be upload_bake, which is a more accurate descriptor. This allowed me to see several inconsistencies in how this variable was being set - these errors were also fixed. User-visible result should be that baked textures are not reuploaded on changing avatar sex until the save button is pressed. primary win here is code clarity. Code reviewed by Bigpapi.
2009-11-11Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2009-11-11unbreak buildrichard
2009-11-11Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2009-11-11mergerichard
2009-11-11added stylized text to tooltips for showxuinamesrichard
2009-11-11fix wrapping of text segment containing multiple newlines and ending on a ↵richard
newline reviewed by leyla
2009-11-11added viewports to LLRenderTarget to speed up animation of sidetrayrichard
reviewed by Leyla
2009-11-11mergeLoren Shih
2009-11-11EXT-2382 - fix for clipping of minimaprichard
2009-11-11Manual merge.Vadim Savchuk
Resolved conflicts in panel_bottomtray.xml and llavataractions.cpp. --HG-- branch : product-engine
2009-11-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/James Cook
2009-11-11Add widgets/ui_ctrl.xml that can set default font size across all widgets.James Cook
Individual widgets/*.xml files will need to have explicit font="foo" params removed to start using the defaults. Discussed with Richard.
2009-11-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Brad Payne (Vir Linden)
2009-11-11outgoing call dialog. doesn't do anything and is ugly/wrong, but it exists. ↵Tofu Linden
WIP.
2009-11-11mergeLoren Shih
2009-11-11EXT-2377 : Add XML switch to showing either menubar or gear menuLoren Shih
First pass attempt at this. This is not debugged, but hg won't let me merge until I commit this change...