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
2d1c1cbf3a
Merge
...
--HG--
branch : product-engine
2010-02-10 15:26:04 +02:00
efee637e3b
Merge from default branch
...
--HG--
branch : product-engine
2010-02-10 15:24:27 +02:00
5831cb1394
merge
...
--HG--
branch : product-engine
2010-02-10 14:42:30 +02:00
3e9e874ab4
modified icon from ticket EXT-2957
...
--HG--
branch : product-engine
2010-02-10 14:41:58 +02:00
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
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
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
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
22dccc74a8
DEV-43688 Cycle3 JA massive linguistic changes by Rika for better UI, post truncation fix
2010-02-09 19:38:19 -08:00
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
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
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
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
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
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
ac5bd9d504
Fixed normal bug EXT-5116 ( Voice notification should display on top of IM window, not under.)
...
- added moving notifications floaters to front in the floater view while opening.
--HG--
branch : product-engine
2010-02-09 16:31:46 +02: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
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
552ad07f33
merge
2010-02-08 14:57:17 -08:00
Tofu Linden