summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-02-10merge from viewer2 trunk.Tofu Linden
2010-02-09DEV-43688 Cycle3 JA massive linguistic changes by Rika for better UI, post ↵Eli Linden
truncation fix
2010-02-09automated merge viewer2.0->viewer2.0Loren Shih
2010-02-09EXT-3071 : CTRL+I should bring up either inventorySP or inventory floaterLoren Shih
EXT-5239 : Consider removing CTRL+I to spawn multiple inventory windows BTEST-42 : Can't hide inventory by pressing CTRL+I CTRL+I will now either open the inventory sidepanel, or close the sidepanel.
2010-02-09EXT-4602 : Copying folders doesn't workLoren Shih
Folders are back to being no longer copyable.
2010-02-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Xiaohong Bao
2010-02-09change some llassert_always to llassert in llviewertexture.cppXiaohong Bao
2010-02-09more for EXT-4352: texture problem in viewer 2.0. TEXTURE_CACHE_ENTRY_SIZE ↵Xiaohong Bao
does not match the FIRST_PACKET_SIZE on the sim side.
2010-02-09MergeLeyla Farazha
2010-02-09EXT-4449 [BSI] Zoom In does not function properly on large or linked prim setsLeyla Farazha
reviewed by Richard CC#99
2010-02-09returning take to top level of object context menu. Change was mistakenly ↵Erica
reverted
2010-02-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Eric M. Tulla (BigPapi)
2010-02-09EXT-3980 - Closed folders were being reexpanded unnecessarily during ↵Eric M. Tulla (BigPapi)
inventory search. We now only update the open/closed status when we've updated the filter status. -Reviewed by Richard
2010-02-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Nyx (Neal Orman)
2010-02-09EXT-4569 alpha preview not working after alpha is savedNyx (Neal Orman)
We were setting the baked texture ID to IMG_INVISIBLE when hitting the save button on the appearance editor to force the right texture IDs to be sent to surrounding viewers. Now, when you make a change after it is saved, it clears this texture ID. This restores expected functionality. Code reviewed by bigpapi. -Nyx
2010-02-09merge from viewer2.Tofu Linden
2010-02-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Xiaohong Bao
2010-02-09more fix for EXT-4352: texture problem in viewer 2.0. fixed texture priority ↵Xiaohong Bao
problem.
2010-02-09merge from viewer2 trunk.Tofu Linden
2010-02-09mergedavep@billy.gateway.2wire.net
2010-02-09EXT-3651 DEV-44500 Keyboard interaction does not work with Flash mediaTofu Linden
This change lets Linux pass keys through to Flash.
2010-02-09mergedavep@billy.gateway.2wire.net
2010-02-09merge from viewer2 trunk.Tofu Linden
2010-02-09EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a ↵Tofu Linden
mouse move event use the proper cmake include() so glib is really found!
2010-02-09EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a ↵Tofu Linden
mouse move event restore part of this fix - glib-compatible Qt needs it, and flash needs a glib-compatible Qt.
2010-02-09merge.Tofu Linden
2010-02-09restore trivial llwindowsdl code improvement.Tofu Linden
p.s. previous commit comment should have read 'hopefully trunk-UNbreaking' :) and this overall mergeset is work towards: EXT-3651 DEV-44500 Keyboard interaction does not work with Flash media ... although on linux this does not actually help yet.
2010-02-09mergeTofu Linden
2010-02-09Backed out changeset 0664cf2c9edfTofu Linden
2010-02-09merge.Tofu Linden
2010-02-09Backed out changeset b1c241040751Tofu Linden
2010-02-09Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Erica
2010-02-09EXT-4362 replace red beacon arrowErica
2010-02-09merge.Tofu Linden
2010-02-09Fixed too-dark object chat colorErica
2010-02-09PE mergeTofu Linden
2010-02-09Fixed normal bug EXT-5068 - Me panel opens in "edit" mode every time.Dmitry Zaporozhan
--HG-- branch : product-engine
2010-02-09HACK HACK HACK to unbreak linux build while I wait for access to the new ↵Tofu Linden
llqtwebkit code. only affects linux. may harm webkit functionality temporarily. to be backed-out.
2010-02-09Fixed normal bug EXT-5109 - IM chiclet buttons missing top border and need ↵Dmitry Zaporozhan
to move up 1px. Increased chiclet panel height by 1px and moved it to center horizontally. --HG-- branch : product-engine
2010-02-09mergeYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-09fix for major EXT-5099 Blocked IM text comes from "Second Life" in nearby chatYchebotarev ProductEngine
--HG-- branch : product-engine
2010-02-09Fixed low bug EXT-5203 - Script chiclets are not toggled when object spawns ↵Dmitry Zaporozhan
multiple script floaters --HG-- branch : product-engine
2010-02-09Update for low bug EXT-5201 - Opening multi tabbed IM floater from IMWell ↵Dmitry Zaporozhan
does not focus the floater. Implemented same fix for Script Floaters --HG-- branch : product-engine
2010-02-09Fixed low bug EXT-5201 - Opening multi tabbed IM floater from IMWell does ↵Dmitry Zaporozhan
not focus the floater. --HG-- branch : product-engine
2010-02-09Fixed normal bug EXT-5087 - Clicking on IMWell item does not open minimized ↵Dmitry Zaporozhan
multi tabbed IM floater. --HG-- branch : product-engine
2010-02-09MergeMike Antipov
--HG-- branch : product-engine
2010-02-09Fixed normal bug EXT - 5065 ( Buttons are slightly misalign in slider ↵Paul Guslisty
(Preferences) ) --HG-- branch : product-engine
2010-02-09MergeMike Antipov
--HG-- branch : product-engine
2010-02-09Fixed normal bug EXT - 4878 (Tab labels are no longer obeying halign attribute)Paul Guslisty
--HG-- branch : product-engine
2010-02-08Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0Monroe Linden