summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-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-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
2010-05-26ND-47143 WIP FR translation for set11Eli Linden
2010-05-26ND-47143 WIP FR translation for set11Eli Linden
2010-05-26MergeEli Linden
2010-05-26EXT-7290 FIX missing translation for ITEli Linden
2010-05-26MergeDessie Linden
2010-05-26EXT-7017 FIXED Changed dialog phrasing to match recommendationDessie Linden
2010-05-26ND-46735 WIP FR JA linguisticEli Linden
2010-05-26EXT-7213 WIP kill old appearance editor and all traces of codeNyx (Neal Orman)
part 2 - correcting a few points that would have broken the build. Final version will be reviewed before pushing.
2010-05-26mergeYuri Chebotarev
--HG-- branch : product-engine
2010-05-26Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-26EXT-7255 FIXED Added dragbar into edit outfit panel.Mike Antipov
Reverted changes committed by mistake in (5d420914a906). --HG-- branch : product-engine
2010-05-26EXT-7255 FIXED Added dragbar into edit outfit panel.Mike Antipov
I was going to implement dragbar via icon rendered in LLResizeBar. Layout panel marked as user_resize=true would have resize bar icon next to it. But there is an issue in layout stack when user_resize is possible only if there are more than one layout panels with user_resize=true. And applied resize icon (dragbar) is rendered where it is not necessary. See EXT-7471 for details. So, dragbar was implemented as a workaround: added an icon with dragbar into the "add to outfit" panel. Also layout of the "add to outfit" panel was updated to match spec. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/441/ --HG-- branch : product-engine
2010-05-26mergeYuri Chebotarev
--HG-- branch : product-engine
2010-05-26EXT-7434 FIX Worldview rect wasn't updated when "SidebarCameraMovement" ↵Yuri Chebotarev
variable was changes. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/443/ --HG-- branch : product-engine
2010-05-26EXT-7423 FIX Roles tab was marked as updated when role description field ↵Yuri Chebotarev
receives focus. reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/444/ --HG-- branch : product-engine
2010-05-26Merge from default branch, resolving conflict in ↵Mike Antipov
indra/newview/llinventorybridge.cpp LLObjectBridge::openItem() was concurrency modified. Applied behavior that was changed in c3220f7f7699 according to VWR-13743 FIXED Change Request: Change double click action for inventory wearables DEV-33391 FIXED Change Request: Change double click action for inventory wearables --HG-- branch : product-engine
2010-05-25Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-05-25EXT-7213 WIP kill old appearance editor and all traces of codeNyx (Neal Orman)
First pass - eliminated all references to gFloaterCustomize except those that call saveIfDirty. Haven't compiled, haven't reviewed. Will clean up in further patches and get reviewed before pushing.
2010-05-25mergeRichard Linden
2010-05-25DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the ↵Richard Linden
viewer
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 04:17:40 +0000