summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2011-06-23Fix for VOICE-3 [crashhunters] LLVoiceVoiceClient::stateMachineRoxie Linden
Race condition with parcel changing while shutting down. If a parcel changes, we went into code that requests the cap for the new parcel voice channel info. This happened in any state, not the two states where it is really appropriate. stateRunning or stateNoSession. When shutting down, we may be in stateTerminate, stateLeavingSession, or so on, and we don't want to muck with getting caps and such during that time.
2011-06-23Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2011-06-23Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-06-23merge changes for storm-899Oz Linden
2011-06-23Automated merge with ssh://hg.lindenlab.com/leyla/viewer-experience-ddRichard Linden
2011-06-23EXP-926 FIX -- Received items badge count and item count shown in inbox do ↵Leslie Linden
not always match * getFreshItemCount() function returns getTotalItemCount() for now, until we properly support item fresh-ness
2011-06-23merge changes for storm-1437Oz Linden
2011-06-22EXP-923 FIX Landmarks moved to new folders do not show as moved until relog ↵Richard Linden
in viewer - Delete, Copy, and Paste functions not working as well
2011-06-22merge and fixing linux build issuesLeyla Farazha
2011-06-22making it so that inbox shows up quickerLeyla Farazha
2011-06-22EXP-890 FIX -- Resizing inbox or outbox to minimum size while open does not ↵Leslie Linden
show present items when hte box is next opened EXP-897 FIX -- Black box shown in UI when shrinking Inbox down in size * Layout panel now supports "expanded_min_dim" parameter which allows a different min size to be specified when the layout panel is collapsed vs expanded. * Inbox and Outbox expanded_min_dim attributes are now set to be larger than min dim so they can not be collapsed all the way when they are expanded.
2011-06-22mergeDave Parks
2011-06-22SH-1848 Integrate changeset to fix typo in shader name preventing shadows ↵Dave Parks
being enabled while anti-aliasing is on on platforms where filenames are case sensitive.
2011-06-22SH-1815 Fix for crash when using old version slmDave Parks
2011-06-22EXP-919 FIX 2 -- Toggling InventoryDisplayInbox value to True in Viewer on ↵Leslie Linden
Agni creates Inbox and Outbox system folders * Fixed the "start_in" folder tag to no longer create folders it is trying to track that do not exist.
2011-06-22merge another batch of changes from windlight integration repoOz Linden
2011-06-22mergeprep
2011-06-22WIP SH-1791 - constructAndAddReturnable() now accepts target regionprep
2011-06-22SH-989 FIX - only reject LOD if vertex total is too high, rather than ↵Brad Payne (Vir Linden)
checking mesh-by-mesh. This should make rejections much less common.
2011-06-22mergeBrad Payne (Vir Linden)
2011-06-22EXP-919 FIX -- Toggling InventoryDisplayInbox value to True in Viewer on ↵Leslie Linden
Agni creates Inbox and Outbox system folders * The code should no longer create these folders when querying for them. Reviewed by Richard
2011-06-22EXP-920 FIX -- Received Items panel is not opened if closed when a new ↵Leslie Linden
Direct Delivery items is delivered when user has Inventory panel open * Mac build fix by removing an unused variable * Inbox panel now auto-expands when new item delivered Reviewed by Richard
2011-06-22Mergecallum
2011-06-22STORM-1305 WIP UI changes in the Edit Water Preset floater.Vadim ProductEngine
- Made the floater smaller. - Removed the "Control Help" label. - Removed the view border, added a horizontal separator. - Fixed the color swatch to only handle mouse within the color box.
2011-06-22STORM-1305 WIP Fixed texture control to not display hand cursor outside of ↵Vadim ProductEngine
the texture. Also click outside of the texture will not show the picker anymore.
2011-06-22WIP for SH-1791prep linden
2011-06-22mergeBrad Payne (Vir Linden)
2011-06-22correct linux compilation problem in lldrawpoolwlskyOz Linden
2011-06-22SH-1725 WIP Floater upload model wizard update:Seth ProductEngine
- XUI changed according to latest mockups - Added switching to advanced upload floater - Added "Recalculate geometry" and "Recalculate physics" buttons
2011-06-22merge latest viewer-developmentOz Linden
2011-06-22STORM-1305 WIP UI changes in the Day Cycle Editor.Vadim ProductEngine
- Made the floater smaller. - Removed the "Control Help" label. - Removed the view border, added a horizontal separator. - Added missing vertical line above the rightmost "12 am" label.
2011-06-22merge changes for storm-1421Oz Linden
2011-06-22STORM-899 [ILL-FORMED XML] 'No attachments worn' text on blank 'Attachments' ↵Jonathan Yap
accordion remains in English for all locales Added / to xml file
2011-06-21CHOP-662 Merged into viewer-development-crash-hordeSquire
2011-06-21STORM-1368 Merge with veiewer-development-crash-hordeSquire
2011-06-21Pulled from viewer developmentSquire
2011-06-21FIX VWR-25160 en_xui_changeeli_linden
2011-06-21FIX VWR-25159eli_linden
2011-06-21fix for SH-1642: [PUBLIC_JIRA_USERS][crashhunters] crash at ↵Xiaohong Bao
LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *) [secondlife-bin llviewertexturelist.cpp]
2011-06-21fix for SH-369: [PUBLIC-JIRA-USERS] [crashhunters] ↵Xiaohong Bao
LLVOAvatar::updateImpostors crash
2011-06-21FIX VWR-25118eli_linden
2011-06-21EXP-877 Profile button not active when selecting items in Marketplace inboxLeyla Farazha
2011-06-21Fix for memory leak & extra inventory observers in ↵Don Kjer
start_new_inventory_observer. Reviewed by Richard
2011-06-21Fix for memory leak & extra inventory observers in ↵Don Kjer
start_new_inventory_observer. Reviewed by Richard
2011-06-21EXP-895 Selecting items in Marketplace Inbox does not change focus in ↵Leyla Farazha
inventory panel away from items selected in inventory panel
2011-06-21pull late release change back from viewer-pre-releaseOz Linden
2011-06-21FIX VWR-25072eli_linden
2011-06-21FIX VWR-25071eli_linden
2011-06-21SH-1719 FIXED Viewer side cleanup of presentation of accounting data in ↵Paul ProductEngine
build tools - Moved grid mode combo box to the grid options floater - Updated UI of the build floater according to the spec - Fixed "conflict" between LLFloaterOpenHandler and LLFloaterHandler command handlers
2011-06-21Merge with latest lindenlab/viewer-developmentsimon@lindenlab.com