summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-05-28mergeTofu Linden
2010-05-28remove dos line-endings, grr.Tofu Linden
2010-05-28merge from viewer-publicTofu Linden
2010-05-28merge from PE's viewer-trunkTofu Linden
2010-05-27mergeRichard Linden
2010-05-27VI-49 FIX "_external" links should work in shared mediaRichard Linden
monroe already did most of this, just moved dialog for confirming opening external browser to common code that calls out to external browser so no way to skip notification unless the user opts out
2010-05-27mo' mergin mo problemsPalmer
2010-05-27mergePalmer
2010-05-27MergeEli Linden
2010-05-27EXT-7332 WIP remove DE overrideEli Linden
2010-05-27mergeBrad Payne (Vir Linden)
2010-05-27EXT-6953 WIP - pre-push cleanup after review. Accumulated EXT-6953 commits ↵Brad Payne (Vir Linden)
reviewed by Nyx.
2010-05-28EXT-7118 FIXED Changed text in group call invite.Andrew Dyukov
- Changed group invite string from "has joined a Voice Chat call with the group [GROUP]" to "just joined '[GROUP]' voice channel." - Added special string for group invite question saying "Would you like to leave [CURRENT_CHAT] and join the call with '[GROUP]'"? - Hooked up this string in code. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/458/ --HG-- branch : product-engine
2010-05-27MergeEli Linden
2010-05-27ND-47144 WIP ES editEli Linden
2010-05-27EXT-6953 WIP - cleanupBrad Payne (Vir Linden)
2010-05-27Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-27EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIPNyx (Neal Orman)
Final fixes for: EXT-7209 camera to enter appearance edit mode EXT-7366 change camera to face front of avatar in previews EXT-7213 kill old appearance editor Partial fix for: EXT-7392 alpha mask checkboxes are not hooked up All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin: 425d4e960450 15d04b6464a7 e92ae606de12 adc94512ea9b 24577dbbf7a4 6f28b241eae2 (sorry dessie! :) )
2010-05-27mergeBrad Payne (Vir Linden)
2010-05-27ND-47146 WIP JA translation for set11Eli Linden
2010-05-27ND-47146 WIP JA translation for set11Eli Linden
2010-05-27ND-47144 WIP ES translation for set11Eli Linden
2010-05-27ND-47144 WIP ES translation for set11Eli Linden
2010-05-27mergeYuri Chebotarev
--HG-- branch : product-engine
2010-05-27EXT-7389 FIX disable menu item if more then one person is selected.Yuri Chebotarev
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/447/ --HG-- branch : product-engine
2010-05-27EXT-7231 FIX if precision is "0" set validation function to ↵Yuri Chebotarev
validateNonNegativeS32 reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/451/ --HG-- branch : product-engine
2010-05-27EXT-2260 ADDITIONAL FIX Added missing XMLAndrew Dyukov
Added xml of new widget which was occasionally not included into 19fc8b450df2. --HG-- branch : product-engine
2010-05-27EXT-2493 FIXED Changed appearance of moveview floater according to new style ↵Andrew Dyukov
guide. Replaced icons with relevant ones and changed positions of items in floater via xml. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/445/ --HG-- branch : product-engine
2010-05-27EXT-7200 FIXED Integrated art missing from appearance.Andrew Dyukov
Replaced "Shop" button text with icon, changed sizes of buttons according to comments in ticket, also changed heights of hovered and selected icons for items- made them equal to heights of panels they are used on. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/410/ --HG-- branch : product-engine
2010-05-27EXT-2260 FIXED Changed camera floater according to new styleAndrew Dyukov
- Implemented new widget- panel_camera_item, to use in camera floater. They are used inside of two panels. Their order is configurable via XML. Mouse down callbacks and images which are used for selected and and unselected items are also set in XML. - Now there are only 3 buttons instead of four at the bottom of the floater- pan and orbit are now shown simultaneously. - Implemented correct work of object view after moving from camera modes to presets list (and back). It wasn't workin completely correct in old version of floater. - Integrated new art. Reviewed by Igor Borovkov at https://codereview.productengine.com/secondlife/r/436/ --HG-- branch : product-engine
2010-05-27mergeMike Antipov
--HG-- branch : product-engine
2010-05-27EXT-6937 FIXED Implemented initializing of moderate_mode on first join voice ↵Mike Antipov
chat. This is a workaround until a way to request the current voice channel moderation mode is implemented in the viewer. Details: * Added method to initialize Speaker manager's Voice moderate_mode once Agent's participant state is known. * Once agent's voice participant is updated this method is called. * This method initializes Voice moderate_mode only once. This is necessary to process "Mute everyone" menu item calls properly. Also renamed moderateVoiceOtherParticipants methods with moderateVoiceAllParticipants and related staff. Reviewed by Aimee Walton at https://codereview.productengine.com/secondlife/r/448/ --HG-- branch : product-engine
2010-05-27EXT-7497 FIXED Made Build, Search, Map, Mini-Map and Sidebar buttons in ↵Mike Antipov
bottomtray hidden by default. Also declaration of all settings related to bottom bar buttons and custom chatbar width were moved from code to settings.xml to prevent issues with resetting of these settings between restarts. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/452/ --HG-- branch : product-engine
2010-05-27Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/Alexei Arabadji
--HG-- branch : product-engine
2010-05-27EXT-7090 FIXED Made snapshot preview and minimap(like in 1.23) floaters ↵Alexei Arabadji
showable in mouselook mode. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/449/ --HG-- branch : product-engine
2010-05-27merge from viewer-publicTofu Linden
2010-05-27EXT-7392 FIXED hooked up alpha mask checkboxes to the alpha mask wearableIgor Borovkov
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/434/ --HG-- branch : product-engine
2010-05-27EXT-7422 FIXED saving initial outfit in My Outfits on very first loginIgor Borovkov
added saving initial outfit in My Outfits when wearables got loaded Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/450/ --HG-- branch : product-engine
2010-05-27Merge from default branch.Mike Antipov
Incoming changes in (924d091c166c) moved SidebarCameraMovement logic out of special widget to camera setup code are reset changes in (380b2422b864) EXT-7434 FIX Worldview rect wasn't updated when "SidebarCameraMovement" variable But seems bug is not reproduced. --HG-- branch : product-engine
2010-05-27Fixed linux buildPaul Guslisty
--HG-- branch : product-engine
2010-05-26moved SidebarCameraMovement logic out of special widget to camera setup codeRichard Nelson
2010-05-26mergeRichard Nelson
2010-05-26erica's layout fix for object inspectorsRichard Nelson
2010-05-26EXT-4128 FIX After using Object Profile, edited objects remain highlighted ↵Richard Nelson
when edit floater is closed
2010-05-26Merge remote heads since last local commit.Jonathan Wolk
2010-05-26Fixes for DEV-50619 Have the low graphics settings be the lowest possible ↵Jonathan Wolk
settings for settings with slider bars and DEV-50618 Have Draw Classic Clouds be off for low graphics settings and DEV-50616 Toggling Draw Classic Clouds does not actually prevent them from being drawn if clouds have been drawn once. Reviewed by qarl
2010-05-26mergeRichard Nelson
2010-05-26made L$ balance non-clickableRichard Nelson
2010-05-26Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-26 EXT-7213 WIP kill old appearance editor and traces of codeNyx (Neal Orman)
Removed last remaining references to gFloaterCustomize. Next step: kill the files themselves. Will be reviewed when complete, before pushing