15ac7c00db
automated merge viewer2.0->viewer2.0
2010-02-09 21:24:44 -05:00
21020ef480
EXT-3071 : CTRL+I should bring up either inventorySP or inventory floater
...
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-09 21:22:37 -05:00
e180c5f204
EXT-4602 : Copying folders doesn't work
...
Folders are back to being no longer copyable.
2010-02-09 21:21:11 -05:00
dace364cd0
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-09 18:10:10 -08:00
1940347ce0
change some llassert_always to llassert in llviewertexture.cpp
2010-02-09 18:09:43 -08:00
c0d361ca3e
more for EXT-4352: texture problem in viewer 2.0. TEXTURE_CACHE_ENTRY_SIZE does not match the FIRST_PACKET_SIZE on the sim side.
2010-02-09 17:45:43 -08:00
22193b15b8
Merge
2010-02-09 15:56:42 -08:00
f040942f19
EXT-4449 [BSI] Zoom In does not function properly on large or linked prim sets
...
reviewed by Richard CC#99
2010-02-09 15:55:33 -08:00
465a3356a2
returning take to top level of object context menu. Change was mistakenly reverted
2010-02-09 15:08:11 -08:00
543a75919a
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-09 18:01:45 -05:00
bef6944ce1
EXT-3980 - Closed folders were being reexpanded unnecessarily during inventory search.
...
We now only update the open/closed status when we've updated the filter status.
-Reviewed by Richard
2010-02-09 18:00:33 -05:00
47f9208243
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-09 17:43:36 -05:00
d0e96bf4b2
EXT-4569 alpha preview not working after alpha is saved
...
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-09 17:43:16 -05:00
89df03e8cc
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-09 12:53:50 -08:00
13e395aef2
more fix for EXT-4352: texture problem in viewer 2.0. fixed texture priority problem.
2010-02-09 12:53:05 -08:00
9a19daccd0
EXT-3651 DEV-44500 Keyboard interaction does not work with Flash media
...
Update llqtwebkit to 4a97db00bfb1 from monroe's extern bb tree
2010-02-09 19:37:21 +00:00
6d08400145
EXT-3651 DEV-44500 Keyboard interaction does not work with Flash media
...
This change lets Linux pass keys through to Flash.
2010-02-09 18:19:35 +00:00
c9b27bec33
EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event
...
use the proper cmake include() so glib is really found!
2010-02-09 15:56:34 +00:00
b809b87136
EXT-4290 [Flash] On linux, youtube videos don't play unless its getting a mouse move event
...
restore part of this fix - glib-compatible Qt needs it, and flash needs a glib-compatible Qt.
2010-02-09 15:28:30 +00:00
69ed7058b4
merge.
2010-02-09 15:13:06 +00:00
08b4d7edf1
restore trivial llwindowsdl code improvement.
...
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-09 15:10:08 +00:00
c920a71240
merge
2010-02-09 15:08:10 +00:00
b0791c3001
Backed out changeset 0664cf2c9edf
2010-02-09 15:07:45 +00:00
d181c3e41b
merge.
2010-02-09 14:52:39 +00:00
c66e9199a5
Backed out changeset b1c241040751
2010-02-09 14:52:13 +00:00
fa8f322ea4
upgrade qt+llqtwebkit. not quite as upgraded as it needs to be, but hopefully trunk-breaking.
2010-02-09 14:51:59 +00:00
cea7fcdec8
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-09 06:44:00 -08:00
cb31551c52
EXT-4362 replace red beacon arrow
2010-02-09 06:43:40 -08:00
40c8dddc7b
merge.
2010-02-09 14:39:11 +00:00
5b139bdf61
Fixed too-dark object chat color
2010-02-09 06:37:31 -08:00
3c75565675
PE merge
2010-02-09 14:21:49 +00:00
99aad90f63
Fixed normal bug EXT-5068 - Me panel opens in "edit" mode every time.
...
--HG--
branch : product-engine
2010-02-09 16:17:53 +02:00
5abb6dece7
HACK HACK HACK to unbreak linux build while I wait for access to the new llqtwebkit code.
...
only affects linux. may harm webkit functionality temporarily. to be backed-out.
2010-02-09 14:00:33 +00:00
486b0b5d18
Fixed normal bug EXT-5109 - IM chiclet buttons missing top border and need to move up 1px.
...
Increased chiclet panel height by 1px and moved it to center horizontally.
--HG--
branch : product-engine
2010-02-09 15:07:46 +02:00
2dc2c6e009
merge
...
--HG--
branch : product-engine
2010-02-09 14:57:03 +02:00
b16030e204
fix for major EXT-5099 Blocked IM text comes from "Second Life" in nearby chat
...
--HG--
branch : product-engine
2010-02-09 14:44:26 +02:00
886de22d57
Fixed low bug EXT-5203 - Script chiclets are not toggled when object spawns multiple script floaters
...
--HG--
branch : product-engine
2010-02-09 14:07:09 +02:00
bfe5754ad2
Update for low bug EXT-5201 - Opening multi tabbed IM floater from IMWell does not focus the floater.
...
Implemented same fix for Script Floaters
--HG--
branch : product-engine
2010-02-09 13:58:14 +02:00
d139894cc1
Fixed low bug EXT-5201 - Opening multi tabbed IM floater from IMWell does not focus the floater.
...
--HG--
branch : product-engine
2010-02-09 13:43:23 +02:00
aa30d0550c
Fixed normal bug EXT-5087 - Clicking on IMWell item does not open minimized multi tabbed IM floater.
...
--HG--
branch : product-engine
2010-02-09 13:39:45 +02:00
a567b5f24b
Merge
...
--HG--
branch : product-engine
2010-02-09 10:35:46 +02:00
3e15f7887e
Fixed normal bug EXT - 5065 ( Buttons are slightly misalign in slider (Preferences) )
...
--HG--
branch : product-engine
2010-02-09 10:31:17 +02:00
e61f9d6465
Merge
...
--HG--
branch : product-engine
2010-02-09 10:19:17 +02:00
e788930172
Fixed normal bug EXT - 4878 (Tab labels are no longer obeying halign attribute)
...
--HG--
branch : product-engine
2010-02-09 10:06:52 +02:00
bf2273d0ad
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-08 18:17:15 -08:00
41da63f5e6
Linguistic fix on behalf of Simone
2010-02-08 16:06:20 -08:00
d321c6aa98
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-08 15:43:07 -08:00
7877bd3e8e
Merge with tip
2010-02-08 15:41:25 -08:00
a01a54bcbc
New version of LLQTwebkit to fix cookie bug introduced by contractor :)
2010-02-08 15:40:25 -08:00
6cd1b17565
Rebuild of mac llqtwebkit library to pick up changeset 4a97db00bfb1 (fix for an accidentally deleted line that prevented cookie file from being read).
2010-02-08 15:33:32 -08:00
Loren Shih