summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-10-23Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nat Goodspeed
2009-10-23EXT-1698 I18N: the string (worn) or (worn on left hand) wont honor its ↵angela
translation
2009-10-23add help topic to floater media setting and it's panelsangela
2009-10-22Merge before pushcallum
2009-10-22No Jira - added some new bookmarks to include Flash based sitescallum
for testing purposes.
2009-10-22Fix for DEV-41643 "stray "(none)" in the Media Settings Controls"callum
removing name attribute stopped "Missing String" message appearing - don't know why - asking around.
2009-10-22merge from pullJames Cook
2009-10-22EXT-287 Side tray open/close arrows are now an image, not the text "<<" and ">>"James Cook
Removed some dead code from LLSideTray Next step is to merge all the tab art with overlay art and use button selected images to show a "pressed" state for all buttons. Reviewed with Angela.
2009-10-22EXT-1654 - Attempt to fix crash on close by cleaning up some callbacksSteve Bennetts
Reviewed by Richard
2009-10-22Let Python handle quoting of Mac run_command() args (using %r).Nat Goodspeed
2009-10-22mooseErica Firment
2009-10-22EXT-1449 Viewer 2.0 Fit & Finish Pass: Places Panel - Landmark detail ↵erica
-actually deleted the file this time
2009-10-22mergeMark Palange (Mani)
2009-10-22Moved internal LLSideTrayTab class to .cpp file, de-inline param block ↵James Cook
constructor, not reviewed
2009-10-22Fixing the build for PE.Mark Palange (Mani)
Now building with llkdu can be skipped by specifying INSTALL_PROPRIETARY=OFF when configuring the build. Reviewed by palmer
2009-10-22Merge my changes with rev. 2603callum
2009-10-22DEV-41721 - "Alt-image enabled" is not yet functional: remove from UIcallum
2009-10-22DEV-41720 - "Select Texture" should be "Select Face" in build toolscallum
2009-10-22EXT-1449 Viewer 2.0 Fit & Finish Pass: Places Panel - Landmark detailerica@bukkit.local
2009-10-22merge from remote repoRick Pasetto
2009-10-22DEV-41626 Remove/disable "first click interacts" from the UI sinceRick Pasetto
we're not implementing it as a feature yet.
2009-10-22mergeSteve Bennetts
2009-10-22EXT-1651 Fix "You cannot close the Buy Land window" error message that ↵James Cook
prevents buying land more than once per login session. Made LLFloaterBuyLandUI destroy itself on close, which cleans up pending currency transactions. Changed LLViewerParcelMgr::deleteBuyInfo() signature because I found it confusing. Reviewed with Richard.
2009-10-22EXT-1784 Server getting spammed whenever you put on a wearableNeal Orman
Made an adjustment to ignore remove requests on items that don't exist, to avoid the extra messages to the server. Also made a couple of adjustments to ensure removal of alpha masks and tattoos along with other wearable types. Added these code points to the wiki page detailing what modifications need to be made when adding a new wearable type: https://wiki.lindenlab.com/wiki/User:Vir#Adding_new_wearables Code reviewed by Seraph.
2009-10-22EXT-356 Tab Height background needs to be settable per instanceLeyla Farazha
now we have first, middle, last tab art reviewed by richard
2009-10-22Fixed Mac build breaker: failing ln -s command.Nat Goodspeed
viewer_manifest.py has acquired new 'ln -s' commands to avoid duplicating shared .dylib files between the main Second Life app bundle and the embedded mac-updater and mac-crash-logger app bundles. Unfortunately, the second time I ran with these new commands, they failed because the target already existed. Added -f switch to make that case benign.
2009-10-22Fix broken test compile.Nat Goodspeed
It looks as though someone tried to reactivate the skip()ped test by replacing "google.com" with "linux.org" and deleting the skip() call. Unfortunately the edit went wrong: the instance of "google.com" in the skip() call was replaced, and the line declaring hostStr = "google.com" was deleted. Removing the local hostStr variable broke the compile. (Possible merge glitch?) On the above assumption, I commented out the skip() call, reinstated the hostStr declaration and replaced "google.com" with "linux.org" therein.
2009-10-22Fix the Mac and Linux build after llwearable breakage. Needed to addLynx Linden
an explicit include for LLViewerFetchedTexture because it's used for a template specialization, and fixed LLLocalTextureObject constructor to take a const LLUUID reference so locals can be passed.
2009-10-22Deleted some files that were deleted by PE but missed during merges.Steven Bennetts
Added some missing licensing info.
2009-10-21Merged in my DEV-35406 crash on shutdown fix.brad kittenbrink
2009-10-22Fix for Mac build.Steven Bennetts
2009-10-21Workaround for DEV-35406 lleventhost crash on shutdown.brad kittenbrink
The fix deletes all LLEventPumps boost::signal objects prior to unloading any dlls. reviewed by Nat.
2009-10-21mergeSteve Bennetts
2009-10-21mergepalange
2009-10-21DEV-41615 DEV-41615 Add symlinks to updater and crash logger app bundles to ↵palange
fix dylib refs.\nllcommon, apr and expat dylibs were missing from the crash logger and updater, instead of shipping extra copies were using relative pathed symlinks to the copies in the Second Life.app/Contents/Resources folder.
2009-10-21Fix for DEV-41542 (hitting Tab at google login on MoaP inserts a character ↵Monroe Linden
into the password field). Moved some special-case handling from LLMediaCtrl::handleKeyHere/handleUnicodeCharHere to LLViewerMediaImpl::handleKeyHere/handleUnicodeCharHere so that the key handling for LLViewerMediaFocus gets the benefit of it as well.
2009-10-22Merging revisions 2146-2150 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry * Bugs: EXT-1752 EXT-1754
2009-10-22Merging revisions 2129-2144 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry * Bugs: EXT-1293 EXT-1611 EXT-1613 EXT-1176 EXT-1724 EXT-1186 EXT-1662 EXT-1760 EXT-1720 * Dev: EXT-1575 EXT-1770 EXT-1232 EXT-1234
2009-10-21svn merge -r136533:136919 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 * Bugs: EXT-1779
2009-10-21DEV-41600: one last change: rename INTERACT and CONTROl to ↵Rick Pasetto
MEDIA_PERM_INTERACT and MEDIA_PERM_CONTROL
2009-10-21converted LLToast::Params to be a param blockRichard Nelson
reviewed by James
2009-10-21selected inventory item no longer renders double boxRichard Nelson
reviewed by James
2009-10-21DEV-41600 Refactored my previous change based on review feedback from monroeRick Pasetto
2009-10-21Code audit for r136515 ("merging in new wearable infrastructure...")Loren Shih
No expected functionality change; this mostly contains cosmetic cleanup. Reviewed by: Nyx
2009-10-21fix for chat history layout bugsRichard Nelson
EXT-1728 - there is no new line in the text copied on junction of 2 panels EXT-1670 - fix chat history use of widgets reviewed by James
2009-10-21EXT-1534 Remove 'Group __' from accordian names in Group profile ↵Ramzi Ramey
(panel_group_info_sidetray.xml) EXT-1520 some very preliminary Groups profile cleanup - add some emphasis color for readability - fix the missized text_editor on L$ Planning tab
2009-10-21Backed out changeset 60da2fc952a0Rick Pasetto
2009-10-21Test code to allow drag/drop of *file* (not URLs) into the viewer Window - ↵callum
Will not be pushed to main repository - only committed so I can bundle my changes and share
2009-10-21DEV-41622 : [BUG] : "Could find parent for..." spam from LLInventoryPanelLoren Shih
It's now possible that items may not exist in the hierachy of the inventorypanel's contents, so this warning spam is a false positive. Removed unnecessary spam, did slight code cleanup.
2009-10-21L10N: call it 'My Inventory' in the menu_viewerRamzi Ramey