Rick Pasetto
fe07c1a29c
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-02-24 14:18:36 -08:00
Eli Linden
a31cb50d46
DEV-46346 JA linguistic fix
2010-02-24 12:17:53 -08:00
Rick Pasetto
be7a190d68
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-02-24 12:05:19 -08:00
Rick Pasetto
f308379079
EXT-5682 - Honor "Hide URL" for Parcel Media and Parcel Audio
...
Review #141
2010-02-24 11:34:49 -08:00
Tofu Linden
2a392edbcc
merge.
2010-02-24 19:14:29 +00:00
Xiaohong Bao
9b7615c906
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-24 12:12:19 -07:00
Xiaohong Bao
254db516c5
fix for EXT-5710: improve the raw image reloading process in the texture pipeline; EXT-4612: failing assert LLViewerTexture::setDecodePriority: ASSERT (!mInImageList); EXT-4912: Texture alpha mask is not applied on the first frame after decode.
2010-02-24 12:09:22 -07:00
Eli Linden
aada63efee
DEV-46346 Cycle5 JA change
2010-02-24 10:57:39 -08:00
Eugene Mutavchi
1852382e45
Related to low bug EXT-5523 (Bottom part of "Create classfield dialog" is overlapped by unnecessary scroller) - changed the height of content panel
...
--HG--
branch : product-engine
2010-02-24 20:11:33 +02:00
Eugene Mutavchi
e8c52502c3
Fixed normal bug EXT-5512 (Change in text size for already written chat is not updated. Only affects new chat)
...
--HG--
branch : product-engine
2010-02-24 18:45:09 +02:00
Sergei Litovchuk
5e65a2de67
Fixed major bug (EXT-5666) Attachment name in the group notice toast becomes empty if click on it.
...
- Changed color that is set to attachment after it was clicked.
--HG--
branch : product-engine
2010-02-24 18:38:04 +02:00
Sergei Litovchuk
280671ce4a
Fixed major bug (EXT-5657) Location input becomes empty if press Ctrl+C.
...
- Added check for pressed Ctrl button.
--HG--
branch : product-engine
2010-02-24 18:26:16 +02:00
Mike Antipov
e40f221167
Fixed major bug EXT-5589 (Notifications button falls under side panel)
...
-- added usage of max_width from layout_panel xml param instead of hardcoded in code.
--HG--
branch : product-engine
2010-02-24 17:27:40 +02:00
Igor Borovkov
6575b685e9
fixed EXT-5526 Objects are shown as persons in the chat history from previous sessions
...
- new chat source type CHAT_SOURCE_UNKNOWN for avatar names not in cache and object names consisting of two words (avatar names like)
- new icon (unknown_icon.png) for message headers () of nearby chat messagses coming from CHAT_SOURCE_UNKNOWN
- context menu no longer displayed for object names from chat history (no UUIDs)
- double click on message headers in nearby chat no longer opens Inspector (no UUIDs)
- object names (loaded from chat history) in nearby chat are no longer SLURLed (no UUIDs for them)
--HG--
branch : product-engine
2010-02-24 17:18:05 +02:00
Mike Antipov
08ede585ce
Work on major bug EXT-5589 (Notifications button falls under side panel)
...
-- updated LLLayoutStack to process "max_width" & "max_height" attributes for layout_panel.
--HG--
branch : product-engine
2010-02-24 17:13:56 +02:00
Mike Antipov
acc97bd55f
Work on major bug EXT-5589 (Notifications button falls under side panel)
...
Applayed Eugene Mutavchi's patch:
-- removed min/max width params from xml <string> tags
-- "min_width" for nearby chat bar now is got from the an appropriate layout panel params
-- "max_width" for nearby chat bar is moved to constant.
--HG--
branch : product-engine
2010-02-24 16:41:28 +02:00
Vadim Savchuk
df29381dc0
merge
...
--HG--
branch : product-engine
2010-02-24 16:36:15 +02:00
Vadim Savchuk
7bb3d97110
Fixed bug EXT-5688 (Strange date format in group members table).
...
* Removed the excessive zeroes from day format.
* Fixed padding with spaces instead of zeroes on Linux.
--HG--
branch : product-engine
2010-02-24 16:34:55 +02:00
Denis Serdjuk
4ad0d181db
merge
...
--HG--
branch : product-engine
2010-02-24 15:25:02 +02:00
Denis Serdjuk
887d03e55f
back out a fix for EXT-5194 at changeset a577d1cad9ff
...
--HG--
branch : product-engine
2010-02-24 15:02:18 +02:00
Vadim Savchuk
1ef3fed827
Merge from default branch
...
--HG--
branch : product-engine
2010-02-24 14:02:51 +02:00
Alexei Arabadji
172d9b21ab
Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2010-02-24 12:44:12 +02:00
Alexei Arabadji
d7945e5d31
implemented EXT-4641 “[BSI] Undocked camera and movement floaters position should persist across the sessions”,
...
made move and camera floaters save dock state;
--HG--
branch : product-engine
2010-02-24 12:43:27 +02:00
Mike Antipov
a4589431d9
Merge to tip
...
--HG--
branch : product-engine
2010-02-24 11:59:38 +02:00
Mike Antipov
2ad421cef6
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
Completed
-- code improvements: updated condition to store really switched on indicators for future switching off.
--HG--
branch : product-engine
2010-02-24 11:53:10 +02:00
Mike Antipov
2fc5956d9d
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
-- added more log information
-- session uuid can now be set only from SpeakingIndicatorManager to ensure target session is the same indicator was registered with.
-- comments cleanup
--HG--
branch : product-engine
2010-02-24 11:13:52 +02:00
Mike Antipov
022c433d53
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
- implemented passing of target session UUID for which registered indicator should be shown only.
--HG--
branch : product-engine
2010-02-24 10:59:52 +02:00
Tofu Linden
a7bca7055a
PE merge. Conflict resolved.
2010-02-24 08:57:27 +00:00
Paul Guslisty
1d45b1edcd
Fixed normal but EXT - 5108 (Preferences vertical tabs don't align to tab container)
...
- Added offset in TabContainer between Tab and TabPanel in case of VERTICAL Tabs orientation.
--HG--
branch : product-engine
2010-02-24 10:16:35 +02:00
Palmer Truelson
245fe3edc6
Fix compiler complaints about signed/unsigned mismatch
2010-02-23 23:02:20 -08:00
Palmer Truelson
8ae07481a4
EXT-5684 - Added some more gpus to gpu table. no code changed
2010-02-23 22:57:54 -08:00
Denis Serdjuk
83712555cf
fixed Low bug EXT-5126 Not enough padding on left edge of Nearby Chat toasts
...
Solution:
Nearby Chat toasts has been aligned with the chat input field
--HG--
branch : product-engine
2010-02-23 19:49:44 +02:00
Sergei Litovchuk
daa5051e51
Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2010-02-23 19:01:09 +02:00
Eugene Mutavchi
bbb6a7efb0
Implemented major sub-task EXT-5556 (hard-coded: menu Build > Object > Take. The word "Take" is hard-coded)
...
--HG--
branch : product-engine
2010-02-23 18:48:30 +02:00
Ychebotarev ProductEngine
1bd720eefb
cleanup and fix build
...
--HG--
branch : product-engine
2010-02-23 18:45:51 +02:00
Ychebotarev ProductEngine
e04376c329
merge
...
--HG--
branch : product-engine
2010-02-23 18:38:58 +02:00
Ychebotarev ProductEngine
a17f39ee1d
cleanup
...
--HG--
branch : product-engine
2010-02-23 18:38:26 +02:00
Mike Antipov
57a81ed44d
No ticket. Fixed Windows Release build (warning treated as error)
...
Warning: c:\slbuild\viewer-2-0\libraries\include\boost\lexical_cast.hpp(1159) : warning C4702: unreachable code
Reason: additional boost lib dependence after changes (EXT-5215) for EXT-5215 (Disable showing full yyyy/mm/dd timestamp for messages (nearby chat/im)
--HG--
branch : product-engine
2010-02-23 18:32:55 +02:00
Vadim Savchuk
8bf9bc2dc7
Removed an unnecessary include.
...
--HG--
branch : product-engine
2010-02-23 18:10:35 +02:00
Vadim Savchuk
6b6d8cee77
Fixed low priority bug EXT-5653 (View Profile: Hand-pointer is shown when hovering mouse above homepage that isn't a valid URL).
...
Removed an unnecessary on-click callback (that caused the cursor change) from the textbox.
--HG--
branch : product-engine
2010-02-23 18:10:08 +02:00
Ychebotarev ProductEngine
3300c5b800
merge
...
--HG--
branch : product-engine
2010-02-23 18:05:32 +02:00
Ychebotarev ProductEngine
a8165dfe59
fix for normal EXT-5598 Group member status list is sorted by name instead of date
...
--HG--
branch : product-engine
2010-02-23 18:05:00 +02:00
Sergei Litovchuk
ef5e9472d3
Fixed normal bug (EXT-5554) 'Land for Sale' icon should always be visible.
...
- Made 'Land for Sale' icon visible in Navigation bar even if "Show Parcel Properties" is off.
--HG--
branch : product-engine
2010-02-23 16:57:39 +02:00
Mike Antipov
1f8fb3f3ba
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
- updated code to store target session id for which registered indicator should be shown and process it while switching indicators on.
--HG--
branch : product-engine
2010-02-23 15:33:10 +02:00
Mike Antipov
d5a0fd7997
Work on major bug EXT-5562 (Misleading Active Voice Indicators in Group Chat Window, when Speakers are in Spatial Chat Only)
...
- updated interfaces of LLSpeakingIndicatorManager::registerSpeakingIndicator & LLOutputMonitorCtrl::setSpeakerId
to take a target session id for which registered indicator should be shown.
--HG--
branch : product-engine
2010-02-23 13:20:43 +02:00
Vadim Savchuk
44333983a6
Merge from default branch
...
--HG--
branch : product-engine
2010-02-23 12:59:49 +02:00
Paul Guslisty
b9ed402558
Fxed normal bug EXT - 5465 (Invalid ellipsis usage for resident names in the IM tabs)
...
- Added reshaping procedure for tabs with LLIconCtrl
--HG--
branch : product-engine
2010-02-23 09:45:16 +02:00
Paul Guslisty
d47ca7a671
No ticket. Set correct tag name for tab label attrbute in tabbed IM floater.
...
--HG--
branch : product-engine
2010-02-23 07:51:05 +02:00
Rick Pasetto
37291bea8d
Follow-up from previous change based on code review #137
2010-02-22 19:25:51 -08:00
Rick Pasetto
50a99d5419
FIX (unposted bug): "hasMedia" and "hasAudio" no longer checks preferences: it's now up to callers to decide to do that
...
Review #137
2010-02-22 19:04:27 -08:00