summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2009-10-16EXT-1637 Clean up build tools > texture > mediaErica Olsen
Replaced temp group activate checkbox tga with png
2009-10-16svn merge -r134817:136516 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-32867 : Avatar Pipeline Project - Multi-Attachments This is a viewer-side-only, infrastructure-only merge for multi-attachments. This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly. Reviewed by: Vir.
2009-10-16EXT-770 Update Me Profile and Me Edit Profile to match updated style guideErica Olsen
EXT-805 Update Me Pick Info and Me Edit Pick Info to match updated style guide
2009-10-16Merge of latest avatar pipeline working branch into viewer2.0 branch.Eric Tulla
Result of: (NO CONFLICTS) svn merge -r 135985:136503 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-11 .
2009-10-16Changing declaration of static constant member variables to match exact ↵Neal Orman
required format. Windows and Linux glossed over this issue, but mac was more picky. Fix code reviewed by Bigpapi.
2009-10-16merging in new wearable infrastructure to get a step closer to eventually ↵Neal Orman
supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command: svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 . Progress can be tracked in DEV-32551. -Nyx
2009-10-16FIX windows build: no automatic conversoin between LLVector3 and LLVector3d??Rick Pasetto
2009-10-16Re-colored graphic as temporary fix to address ↵Justin Rounds
http://jira.secondlife.com/browse/EXT-1486
2009-10-15Fix for another "case not handled in switch" due to the addition of ↵Monroe Linden
MEDIA_EVENT_NAME_CHANGED.
2009-10-15Fix for a "case not handled in switch" due to the addition of ↵Monroe Linden
MEDIA_EVENT_NAME_CHANGED.
2009-10-15Major refactor of LLViewerMediaFocus and LLPanelMediaHUD.Monroe Linden
LLViewerMediaFocus now tracks two separate objects: the currently focused media object, and the media object that's currently being hovered over. It no longer stores smart pointers to either the LLViewerObject or the LLViewerMediaImpl -- it now looks up both by UUID every time they're needed, and fails gracefully if either goes away. This will prevent it from keeping objects from being deleted. The poorly-understood "mouseOverFlag" has been expunged. LLViewerMediaFocus no longer uses LLSelectMgr at all. The object to focus on is explicitly passed between LLViewerMediaFocus and LLPanelMediaHUD instead of going indirectly through the selection manager. LLViewerMediaFocus also no longer interacts with the pick from LLToolPie -- the data it needs from the pick (the object and normal vector) is passed explicitly. LLViewerMediaFocus::setCameraZoom and LLViewerMediaFocus::getBBoxAspectRatio now have no dependencies on the LLViewerMediaFocus object -- all the data they need is passed in when they're called by the LLPanelMediaHUD. I made them static member functions, but they could be moved to LLPanelMediaHUD or even made into file-scoped static functions. The only reason I didn't do either of those is that it seems like they belong with the LLViewerMediaFocus code as opposed to the HUD.
2009-10-15Merge from branch-test (EXT-651)Steve Bennetts
2009-10-15EXT-651 - Added Upload Image shortcut to Advanced > Keyboard Shortcuts. Also ↵Steve Bennetts
cleaned up that menu a little. --HG-- branch : branch-test
2009-10-15Merge from remote repoRick Pasetto
2009-10-15Merge from remote repoRick Pasetto
2009-10-15Clarify comments a littleRick Pasetto
2009-10-16DEV-41389 Localize the splash screen 'loading...' icon in all languagesRamzi Ramey
* added files should already be covered in viewer_manifest.py * Also fix a 1-line typo in Italian installer.
2009-10-16EXT-1561 Update People Profiles to match Style guideErica Olsen
EXT-770 Update Me Profile and Me Edit Profile to match updated style guide EXT-302 Update and My Account links in the Me Panel are misplaced EXT-805 Update Me Pick Info and Me Edit Edit Pick Info to match updated style guide
2009-10-15FIX DEV-39513: Tweak target camera position to avoid a flip when target ↵Rick Pasetto
normal is vertical Review #21 This attempts to tweak the target camera position slightly towards where the camera started from, so as to avoid the flip noted in this JIRA.
2009-10-15Merge to update new version number.callum
2009-10-15Fixed search button icon to match spec. ↵Justin Rounds
http://jira.secondlife.com/browse/EXT-1320
2009-10-15Set scale_image to false in combo_box.xml to fix stretching. ↵Justin Rounds
http://jira.secondlife.com/browse/EXT-1319
2009-10-15Fixed defect for URLs that already have a schemecallum
See http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=18
2009-10-15Merge from branch-test (EXT-1279)Steve Bennetts
2009-10-15EXT-1279 Crash if font file not found.Steve Bennetts
Added getFontDefault() to llfontgl.h --HG-- branch : branch-test
2009-10-15Discovered implementation of Favorites links is not to spec (they are ↵Justin Rounds
buttons instead of text links). Edited XML to "fake" the spec and make the Favorites "buttons" behave as required. Made other layout changes as per http://jira.secondlife.com/browse/EXT-1317
2009-10-15Merge fix for DEV-39832skolb
2009-10-15removed requirement for specializing ParamCompare on boost::function typesRichard Nelson
eliminated usage of iterator_range from LLInitParam made LLTextEditor::addChar consistent with truncate in counting text bytes (not including null terminator) EXT-1494 - Avatar profile description text truncated to 255 characters reviewed by Leyla
2009-10-15Merge up to latest viewer/viewer-2-0Nat Goodspeed
2009-10-15https://jira.lindenlab.com/jira/browse/DEV-40649callum
Media auto refreshes after Whitelist set This checkin fixes a related issue to this task and prohibits user from (A) adding an item to the whitelist that would invalidate the home URL and (b) adding a home URL that would not pass the whitelist.
2009-10-15L10N: add a comment to provide context to a string in strings.xmlRamzi Ramey
2009-10-15EXT-1477 (part2) Last tweak to the Develop menu with a much better name for ↵Ramzi Ramey
the Console Window option thingy.
2009-10-15DEV-41253: Updated the help context calculation code so that it willMartin Reddy
now search through a panel's children to see if there are any visible tabs that have a help topic string defined. If so, we use this string. Updated all of the XUI files that include a tab_container to define help topic strings for their child panels. I named all of these strings with the floater name as the prefix and "tab" at the end. For example, "preferences_display_tab" or "people_nearby_tab".
2009-10-14EXT-1561 Update People Profiles to match Style guideErica Olsen
EXT-1562 Improve design of Home panel in Sidetray
2009-10-14Increase the .dmg setup size from 500MB to 700MBCG Linden
2009-10-14EXT-1304 DEV-40867 Login screen typed in start location is now readable. ↵James Cook
Changed combo_box.xml text tentative color to black, because autocomplete is sufficient to inform the user that they typed something that matches an item in the list. Reviewed with Erica.
2009-10-14EXT-946 There is no terrain on the Mini-Map. Unclear if this fixes the ↵James Cook
problem or not, does not reliably repro for me. Found several uninitialized variables in LLNetMap and fixed those. Reviewed with Richard.
2009-10-14DEV-35179 (part2) improve Keyboard shortcut indicators - oops, missed a few ↵Ramzi Ramey
references in other files. TEXT CHANGES ONLY
2009-10-14Texture view "Keep"/"Discard" buttons are in reverse order. Also, changed ↵Lisabeth Pardi
Keep/Discard to OK/Cancel EXT-762
2009-10-14Remove old art resources from viewerLisabeth Pardi
EXT-785
2009-10-14Merge r135130 for DEV-4476 - Edits to notecards not visible in viewer sessionBrian McGroarty
2009-10-14Remove old art resources from viewerLisabeth Pardi
EXT-785
2009-10-14merge -r 2014-2032 https://svn.aws.productengine.com/secondlife/pe/stable-2 ↵Steven Bennetts
-> viewer-2.0.0-3 * Bugs: EXT-1005 EXT-1488 EXT-320 EXT-1236 EXT-1236 EXT-1002 EXT-1030 * New Dev: EXT-1293 EXT-1416
2009-10-14merge -r 2005-2011 https://svn.aws.productengine.com/secondlife/pe/stable-2 ↵Steven Bennetts
-> viewer-2.0.0-3 * Bugs: EXT-1472 EXT-996
2009-10-14improved metrics for llfontgl::getWidth (use greater of character ↵Richard Nelson
width/xadvance) llfontgl::Addchar now called consistently when requesting font metrics no longer possible to have font glyph info without rendered font EXT-1294 - LLExpandableTextBox: wrong ellipses reviewed by James and Mani
2009-10-14EXT-1477 (part2) Update top menus and top menu spec - a few more ↵Ramzi Ramey
consistencies so that same words are used to refer to same thing, put Rendering stuff together, eliminate the Alt+Enter shortcut
2009-10-14DEV-35179 (part2) improve Keyboard shortcut indicators, using native Mac symbolsRamzi Ramey
* This was made possible by DEV-24828 internationalization work.
2009-10-14Fix bad attribute, possibly related to EXT-946James Cook
2009-10-14Mergeskolb
2009-10-14EXT-1268 'Remember me' is misleading (Reverted to "remember password" on ↵Erica Olsen
login at Ramzi's suggestion)