Tofu Linden
bbfc0e4719
CID 424
...
Checker: UNINIT_CTOR
Function: LLDragDropWin32Target::LLDragDropWin32Target(HWND__ *)
File: /indra/llwindow/lldragdropwin32.cpp
2010-02-10 16:52:26 +00:00
Tofu Linden
792ebb1936
CID-423
...
Checker: UNINIT
Function: LLVolume::cleanupTriangleData(int, const std::vector<LLVolume::Point, std::allocator<LLVolume::Point>> &, int, int *, int &, LLVector3 **, int &, int **)
File: /indra/llmath/llvolume.cpp
The code looks right, I'm just adding an llassert().
2010-02-10 16:49:56 +00:00
Tofu Linden
15825cb899
fix 9d63853d2045 / EXT-651
...
that checkin broke the xml and killed the Developer menu - repair it.
2010-02-10 14:20:23 +00:00
Tofu Linden
8a8304eeac
PE merge
2010-02-10 14:15:02 +00:00
Tofu Linden
30f74e81dc
PE merge.
2010-02-10 14:13:59 +00:00
Mike Antipov
2d1c1cbf3a
Merge
...
--HG--
branch : product-engine
2010-02-10 15:26:04 +02:00
Mike Antipov
efee637e3b
Merge from default branch
...
--HG--
branch : product-engine
2010-02-10 15:24:27 +02:00
Ychebotarev ProductEngine
5831cb1394
merge
...
--HG--
branch : product-engine
2010-02-10 14:42:30 +02:00
Ychebotarev ProductEngine
3e9e874ab4
modified icon from ticket EXT-2957
...
--HG--
branch : product-engine
2010-02-10 14:41:58 +02:00
Ychebotarev ProductEngine
3eeb4e6599
partitial fix for normal task EXT-2957 [BSI] Implement object icon for chat from objects, instead of using generic image for missing profile picture
...
--HG--
branch : product-engine
2010-02-10 14:35:29 +02:00
Eugene Mutavchi
ea9185e0dc
Fixed linux build error - added skipped newline at end of file
...
--HG--
branch : product-engine
2010-02-10 13:37:49 +02:00
Dmitry Zaporozhan
ff22967233
Fixed low bug EXT-5124 - Display buddy icons on online/offline alerts
...
--HG--
branch : product-engine
2010-02-10 13:03:11 +02:00
Dmitry Zaporozhan
f8aa91dccb
Fixed function name.
...
--HG--
branch : product-engine
2010-02-10 12:10:43 +02:00
Igor Borovkov
3d8caa79a7
fixed waiting bug for EXT-4976 IM Window with 'Show End of Last Conversation' turned on, doesnt show Avatar name, or correct information
...
--HG--
branch : product-engine
2010-02-10 13:04:18 +02:00
Ychebotarev ProductEngine
8288530c45
merge
...
--HG--
branch : product-engine
2010-02-10 11:16:07 +02:00
Ychebotarev ProductEngine
d3f30dc96e
fix task EXT-5129 Move Group image and founder name into General accordion
...
--HG--
branch : product-engine
2010-02-10 11:13:26 +02:00
Eli Linden
22dccc74a8
DEV-43688 Cycle3 JA massive linguistic changes by Rika for better UI, post truncation fix
2010-02-09 19:38:19 -08:00
Loren Shih
15ac7c00db
automated merge viewer2.0->viewer2.0
2010-02-09 21:24:44 -05:00
Loren Shih
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
Loren Shih
e180c5f204
EXT-4602 : Copying folders doesn't work
...
Folders are back to being no longer copyable.
2010-02-09 21:21:11 -05:00
Xiaohong Bao
dace364cd0
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-09 18:10:10 -08:00
Xiaohong Bao
1940347ce0
change some llassert_always to llassert in llviewertexture.cpp
2010-02-09 18:09:43 -08:00
Xiaohong Bao
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
Leyla Farazha
22193b15b8
Merge
2010-02-09 15:56:42 -08:00
Leyla Farazha
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
Erica
465a3356a2
returning take to top level of object context menu. Change was mistakenly reverted
2010-02-09 15:08:11 -08:00
Eric M. Tulla (BigPapi)
543a75919a
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-09 18:01:45 -05:00
Eric M. Tulla (BigPapi)
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
Nyx (Neal Orman)
47f9208243
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-09 17:43:36 -05:00
Nyx (Neal Orman)
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
Xiaohong Bao
89df03e8cc
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-09 12:53:50 -08:00
Xiaohong Bao
13e395aef2
more fix for EXT-4352: texture problem in viewer 2.0. fixed texture priority problem.
2010-02-09 12:53:05 -08:00
Tofu Linden
bc9122feb9
PE merge.
2010-02-09 19:41:35 +00:00
Tofu Linden
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
Tofu Linden
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
Eugene Mutavchi
d3d389c698
Update of major bug EXT-5022 (streaming media first use dialog should be removed)
...
--HG--
branch : product-engine
2010-02-09 19:18:17 +02:00
Eugene Mutavchi
33d1d5bc4d
Fixed normal bug EXT-651 (Upload Image shortcut (Ctrl-U / Cmd-U) does not work)
...
--HG--
branch : product-engine
2010-02-09 19:18:17 +02:00
Dmitry Zaporozhan
1129c7252a
Fixed normal bug EXT-4817 - Preferences > Chat > Alert color preference is broken
...
--HG--
branch : product-engine
2010-02-09 18:51:33 +02:00
Tofu Linden
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
Mike Antipov
1d5df49d6a
Fixed normal bug EXT-5119 (Voice Control Panel should open only after call is connected, so it's not overlapped by voice notifications.)
...
- updated condition when VCP should be shown to check voice channel state (CONNECTED)
--HG--
branch : product-engine
2010-02-09 17:48:35 +02:00
Tofu Linden
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
Mike Antipov
41f350cee9
Fixed normal bug EXT-5244 ( There is no "i" button for Name fields from nearby chat)
...
- reason: changes in c91e724d4f15 related to EXT-4547.
Also multiple warnings appeared in log: LLView::getChild: Found child named user_name but of wrong type class L
LTextBox, expecting class LLViewerTextEditor *
- fix: changed template class from LLViewerTextEditor to LLTextBase in getChild.
--HG--
branch : product-engine
2010-02-09 17:13:54 +02:00
Tofu Linden
69ed7058b4
merge.
2010-02-09 15:13:06 +00:00
Tofu Linden
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
Tofu Linden
c920a71240
merge
2010-02-09 15:08:10 +00:00
Tofu Linden
b0791c3001
Backed out changeset 0664cf2c9edf
2010-02-09 15:07:45 +00:00
Tofu Linden
d181c3e41b
merge.
2010-02-09 14:52:39 +00:00
Tofu Linden
c66e9199a5
Backed out changeset b1c241040751
2010-02-09 14:52:13 +00:00
Tofu Linden
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
Erica
cea7fcdec8
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-09 06:44:00 -08:00