summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures
AgeCommit message (Collapse)Author
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-05-09Merge downstream code and viewer-betasimon
2013-05-07Merge vwr-dev-matGraham Madarasz
2013-05-07NORSPEC-51 Fix (additional) Added missing imagecallum_linden
2013-05-01NORSPEC-51 Fix for Incorrect Texture icon used in build tool when normal or ↵callum_linden
specular map is not set to 'Use Texture'
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11First pass on alpha blended materialsGeenz
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-22Pull and merge latest viewer-betasimon
2013-03-20Merge with viewer-chuiprep@lindenlab.com
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-18CHUI-830 Icons uploadedMnikolenko ProductEngine
2013-03-15CHUI-830 FIXED Button for collapsing torn-off floater(to a single input ↵Mnikolenko ProductEngine
line) is added. Show toasts for new messages for that conversation, regardless of other prefs.
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2012-12-21CHUI-621 FIXED Notification chiclet UI errormaksymsproductengine
2012-12-19CHUI-592 FIXED Unread notifications are not being saved in notification chicletmaksymsproductengine
2012-12-04CHUI-573 FIXED Notification chiclet shown when object chiclets are shownmaksymsproductengine
2012-11-29CHUI-553 FIXED Remove the conversation chicletmaksymsproductengine
2012-11-08removed references to two nonexistent textures in textures.xmlBrad Payne (Vir Linden)
2012-11-07CHUI-514: Updating to Leo's latest icon batch.William Todd Stinson
2012-10-19CHUI-391: Replacing nearby chat icon.William Todd Stinson
2012-09-26CHUI-344 FIXED (LLConversationViewSession: enable icon update)Paul ProductEngine
- This commit also fixes CHUI-345 CHUI-346
2012-08-15CHUI-235 FIXED (Create icons for new conversation log list items)Paul ProductEngine
- Replaced old icons with new ones
2012-08-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-07-27Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-07-23Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-06-28CHUI-82 : Fixed all icons to use the new Conv_*.png icons; please use those ↵Merov Linden
in the new UIs moving forward
2012-06-26Some clean-up after checking the differences between the pathfinding branch ↵Todd Stinson
and viewer-release.
2012-06-18PATH-750: Adding icon to display pathfinding dirty state.Todd Stinson
2012-06-18Renaming the dynamic pathfinding icons to be better represent pathfinding ↵Todd Stinson
disabled.
2012-06-14Updating the slurl icon with Leo's design and toggling the behavior to show ↵Todd Stinson
on PF disabled regions.
2012-06-11Pull and merge from ↵Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
2012-06-11PATH-710: Removing the pathfinding basic floater and supporting class.Todd Stinson
2012-06-11WIP:path-703 Adding icon to slurl bar to indicate if dynamic pathfinding is ↵prep
enabled or disbled.
2012-05-08merge changes for version 3.3.1Oz Linden
2012-03-13pull and merge from viewer-developmentprep
2012-03-09merge changes for vmrg-230Oz Linden
2012-02-14PATH-297: Initial layout and basic implementation for the pathfinding basic ↵Todd Stinson
floater.
2012-02-10STORM-1793 Supply missing new artworkJonathan Yap
2012-02-24Merge with viewer-developmentKitty Barnett
2012-02-03STORM-276 Added preferences panelKitty Barnett
2012-02-02PATH-245: First pass at laying out the characters floater. Functionality is ↵Todd Stinson
mostly stubbed in. The data is currently tied to the same cap service as the linkset data, so that will need to change as soon as the new service is available.
2012-01-30mergeBrad Payne (Vir Linden)
2012-01-27SH-2768 Put transparency checkerboard back in texture previewDave Parks
2012-01-25MERGE - pulling latest viewer-development into pathfinding branchNyx (Neal Orman)