summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-10-26mergeDenis Serdjuk
--HG-- branch : product-engine
2009-10-26mergeVadim Savchuk
--HG-- branch : product-engine
2009-10-26Merge from default to product-engineIgor Borovkov
--HG-- branch : product-engine
2009-10-26IM minor refactoring: removed unused LLIMMgr::isIMSessionOpen(...) - ↵Igor Borovkov
duplicate of LLIMMgr::hasSession(...) --HG-- branch : product-engine
2009-10-25* Changes to enable differentiating between icon texture priority and other ↵Steve Bennetts
UI texture priority. * Still need to only request smaller mip maps of icon textures
2009-10-23mergeErica Firment
2009-10-23EXT-1702, EXT-1692, Viewer 2.0 Fit & Finish Pass: People Panel - ProfileErica Firment
2009-10-23mergeJames Cook
2009-10-23EXT-968 Side tray buttons have "selected" appearance when each tab is selected.James Cook
Changed mTabs to hold LLSideTrayTab* so we don't have to dynamic_cast<> everywhere Reviewed with Leyla.
2009-10-23Merged change to auto play pref (DEV-41787)skolb
2009-10-23DEV-41787 Media Auto Play controls were removed from prefs. Also made auto ↵skolb
play override prim settings.
2009-10-23fixed normal bug EXT-1630 Edit Landmark: Current landmark place should be ↵Denis Serdjuk
selected by default in the \"Place Landmark In\" picklist --HG-- branch : product-engine
2009-10-23mergeSteve Bennetts
2009-10-23mergeSteve Bennetts
2009-10-23mergeSteve Bennetts
2009-10-23For EXT-1863 : "Wear" and "Take Off" for items should be properly greyed out ↵Loren Shih
depending on item worn state
2009-10-23Merging revisions 2156-2183 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry * Bugs: EXT-1590 EXT-1694 EXT-1660 EXT-1646 EXT-1694 EXT-1316 EXT-1775 EXT-1798 EXT-1799 EXT-1117 EXT-1571 EXT-1572 * Dev: EXT-1757 EXT-991 EXT-1758 EXT-1770 EXT-1192 EXT-1613 EXT-1611 EXT-1256 EXT-1758 EXT-747
2009-10-23For EXT-1862 : Wearing an item shouldn't refocus to COFLoren Shih
2009-10-23svn merge -r137024:137071 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845
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-23Fix for DEV-41563 / EXT-1814. Partial revert of revision 136284.Eric Tulla
These textures are used during terrain rendering. Not having them also breaks invisiprims in an interesting way.
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-1822 changing textures in appearance not immediateNeal Orman
Texture changes in appearance editor were not taking effect immediately. Changed texture setting code to refresh local bake of textures. Code reviewed by Vir
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.