Brad Payne (Vir Linden)
39308422f1
Cleanup and consolidation
2010-04-01 17:05:25 -04:00
Richard Linden
09add95e31
EXT-6307 World Map: field of view triangle rotates
...
reviewed by Leyla
2010-04-01 13:42:42 -07:00
Eli Linden
9cf97ccd33
fix bad xml; IT linguistic
2010-04-01 13:39:41 -07:00
Richard Nelson
6cc65f9e5f
merge
2010-04-01 12:52:04 -07:00
Richard Nelson
df45c16169
removed unused textures
...
reviewed by Erica
2010-04-01 12:49:23 -07:00
Richard Nelson
656a533fac
EXT-6431 - Avatar head doesn't correctly follow mouse when side panel is open
2010-04-01 12:41:41 -07:00
Richard Nelson
e254aa6dc6
EXT-3531 - Ctrl-P does not work reliably on login
...
deprecated handle_edit_keys_directly and moved edit menu out of menu_viewer and menu_login
2010-04-01 12:06:16 -07:00
Richard Nelson
bb4c1384ac
EXT-3531 - Ctrl-P does not work reliably on login
...
forgot menu_edit.xml
2010-04-01 12:05:17 -07:00
Richard Linden
406b595e8c
fixed build
2010-04-01 11:51:06 -07:00
Richard Nelson
7b4046df83
EXT-3531 - Ctrl-P does not work reliably on login
2010-04-01 11:47:21 -07:00
Roxie Linden
19be852fd6
Automated merge
2010-04-01 11:47:20 -07:00
Loren Shih
12a1c0aa8b
EXT-6680 : [INFRASTRUCTURE] Change LLInventoryPanel "LLFolderView* mFolders" to "LLFolderView* mRootFolder"
...
Superficial member variable name changes.
2010-04-01 14:41:12 -04:00
Loren Shih
5372782d50
EXT-4084 : Change LLInventoryBridge "LLFolderView* folder" to "LLFolderView *rootFolder"
...
Superficial cleanup - changed all instances to "LLFolderView* root".
2010-04-01 14:29:23 -04:00
Vadim Savchuk
0d7d486f8f
Fixed bug EXT-6337 (Changing maturity settings in preferences floater only works on first floater spawn when account is not age verified).
...
I'm actually copying an existing fix from the viewer-hotfix branch. See the ticket for more details.
Not reviewed.
--HG--
branch : product-engine
2010-04-01 21:22:12 +03:00
Xiaohong Bao
309d94452b
fix for EXT-6678: crash at LLTextureCache::openAndReadEntry [secondlife-bin lltexturecache.cpp:1111]
2010-04-01 11:39:01 -06:00
Tofu Linden
ab79bf7aae
Checker: CHECKED_RETURN
...
Function: LLViewerMediaImpl::createMediaSource()
File: /indra/newview/llviewermedia.cpp
2010-04-01 17:34:26 +01:00
Xiaohong Bao
990011f3d6
make LLImageBase::allocateData() thread-safe.
...
insert debug code for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-01 10:30:27 -06:00
Tofu Linden
03322a8e87
Checker: UNINIT_CTOR
...
Function: LLVOAvatarSelf::LLVOAvatarSelf(const LLUUID &, unsigned char, LLViewerRegion *)
File: /indra/newview/llvoavatarself.cpp
2010-04-01 17:29:08 +01:00
Tofu Linden
fb08c17cdd
Checker: UNINIT_CTOR
...
Function: LLAgentCamera::LLAgentCamera()
File: /indra/newview/llagentcamera.cpp
2010-04-01 17:25:42 +01:00
Tofu Linden
56dbd313a1
Checker: CHECKED_RETURN
...
Function: LLAgentCamera::updateCamera()
File: /indra/newview/llagentcamera.cpp
not a bug, but I cleaned up BOOL->bool
2010-04-01 17:23:49 +01:00
Vadim Savchuk
4a9567d749
Minor optimization: removed reduntant getChild() calls. Not reviewed.
...
--HG--
branch : product-engine
2010-04-01 19:23:09 +03:00
Tofu Linden
569f322f0d
PE merge
2010-04-01 17:12:12 +01:00
Tofu Linden
8421d3dcd3
PE merge
2010-04-01 17:01:08 +01:00
Eugene Mutavchi
5db663c87e
Partial fix for normal bug EXT-6612 (End Call button in 1:1 IMs should be labeled End Call (not Leave Call))
...
--HG--
branch : product-engine
2010-04-01 18:47:35 +03:00
Nyx (Neal Orman)
7cce085480
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-04-01 11:24:23 -04:00
Nyx (Neal Orman)
6eeb4247bb
updating some back-end functionality that will come in handy as we bring the UI up to date with multiwearables.
...
code reviewed by Seraph and Vir.
2010-04-01 11:24:04 -04:00
Dmitry Zaporozhan
08a2242ceb
Fixed windows build
...
--HG--
branch : product-engine
2010-04-01 18:20:34 +03:00
Loren Shih
045fb06137
automated merge
2010-04-01 10:44:07 -04:00
Dmitry Zaporozhan
3c036ef49b
(work in progress) EXT-6564(major) - Fix wearable editing panels
...
Fixed Edit Shape panel layout:
- fixed widget positioning according to spec
- added gear button bar
- fixed accordion positioning
- fixed parameter list positioning
TODO:
- fix parameter panel positioning
- apply changes to the rest of wearable panels
Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/149/
--HG--
branch : product-engine
2010-04-01 17:41:47 +03:00
Dmitry Zaporozhan
7b0dab5083
(work in progress) Update for LLAccordionCtrl arrange single expansion.
...
Found this issue while working on EXT-6564(Fix wearable editing panels) - Every single_expansion accordion is treated like "fit_parent" is set to "true" after changes made in 9805 : e6c5f3b23be1 (fix for EXT-5128 Groups accordions should all appear on-screen w/out scrolling (open accordion should fill space)).
Updated accordion to take into account "fit_parent" property.
Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/147/
--HG--
branch : product-engine
2010-04-01 17:28:36 +03:00
Alexei Arabadji
e22850f57d
Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
...
--HG--
branch : product-engine
2010-04-01 17:48:36 +03:00
Alexei Arabadji
53c96ec24b
EXT-2801 Record "object return" notification into IM history, not chat history,
...
replaced toast timer LLTimer with LLEventTimer implementation that not depends on draw method;
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/148/
--HG--
branch : product-engine
2010-04-01 17:48:07 +03:00
Sergei Litovchuk
b98ebdecda
Fixed reopened major bug (EXT-5106) Side panel list view toolbars are missing background art.
...
- Made toolbars look connected to the respective lists.
- Fixed tab container background in Inventory side panel.
Tab container reserves 1 pixel for the border width so we have to use top_pad="-1" to move the toolbar 1 pixel up to physically connect them.
--HG--
branch : product-engine
2010-04-01 17:24:50 +03:00
Tofu Linden
97f9dbee2c
BOOL->bool on llassettype.*
2010-04-01 14:40:44 +01:00
Alexei Arabadji
4992eaf27d
fixed EXT-2801 Record "object return" notification into IM history, not chat history,
...
* added class for LLPostponedNotification to rpovide possibility postpone adding notification to notifications system till sender avatar name will be received from cache name;
* rolled back changes related to fix of EXT-4779;
* avoided passing avatar id when logging 'Object Return' notification to nearby chat;
eviewed by Vadim Savchuk at https://jira.secondlife.com/browse/EXT-6373
--HG--
branch : product-engine
2010-04-01 15:24:36 +03:00
Alexei Arabadji
91b28e42cb
Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
...
--HG--
branch : product-engine
2010-04-01 14:59:21 +03:00
Alexei Arabadji
c6cdd40c4e
fixed EXT-6373 Consecutive offer messages are unreadable in the IM log
...
replaced [NAME] with [NAME_SLURL] in friendship offer notification;
--HG--
branch : product-engine
2010-04-01 14:58:24 +03:00
Igor Borovkov
985d422210
forgot to commit visible=false of Add Wearables panel as part of EXT-6548 Edit Outfit: Clean up XUI to allow all elements to fit properly in the panel
...
Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/143/
--HG--
branch : product-engine
2010-04-01 14:30:09 +03:00
Dmitry Zaporozhan
9c0087c0a6
Fixed normal bug EXT-6023 - [HARD CODED]? Side Bar : "More" link inside "Profile" and "Pick"
...
According to ticket, files in "widgets" folder are not localized and "more_label" is not a translatable attribute.
Replaced "more_label" with "label". expandable_text "More" text is accessible through "textbox.label" attribute.
Added "textbox.label" to every expandable_text to make "More" text localizable.
--HG--
branch : product-engine
2010-04-01 14:07:45 +03:00
Igor Borovkov
69833aff50
drafted out edit outfit panel XUI layout as major part of EXT-6548 Edit Outfit: Clean up XUI to allow all elements to fit properly in the panel
...
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/143/
--HG--
branch : product-engine
2010-04-01 13:35:25 +03:00
Mike Antipov
25976eb3da
Merge from default branch
...
--HG--
branch : product-engine
2010-04-01 12:28:08 +03:00
Eugene Mutavchi
7f38ea1474
Fixed normal bug EXT-6659("Ctrl+A" combination allows selecting of several picks) - added check that multiple selection is allowed
...
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/146/
--HG--
branch : product-engine
2010-04-01 11:32:51 +03:00
Monroe Linden
68870a1f59
Added copyright header to new unit test.
2010-03-31 18:53:50 -07:00
Monroe Linden
e868159922
Added unit test for LLPluginCookieStore.
2010-03-31 18:51:09 -07:00
Monroe Linden
11b588c29c
Fixed a problem with LLPluginCookieStore that would have caused problems when adding multiple cookies with setCookies(), setAllCookies(), and setCookiesFromHost().
2010-03-31 18:50:20 -07:00
CG Linden
a1092147e0
merge
2010-03-31 15:25:04 -07:00
CG Linden
ac271e1d50
Include channel names in update_version_files.py invocation to fix bad viewer channel name.
2010-03-31 15:24:42 -07:00
Loren Shih
1e83755715
EXT-3604 : Accordion folders should show "Loading..." when fetching contents
...
Superficial cleanup of LLFolderViewItem::draw. No functionality change.
2010-03-31 17:55:08 -04:00
Monroe Linden
5c19099622
Enable OpenID auth in the embedded webkit browser.
...
Extract openid_url and openid_token tokens from the login response in process_login_success_response() and send them to LLViewerMedia if they're present.
Added LLViewerMedia::openIDSetup() to receive openid_url and openid_token, and added code to LLViewerMedia to do a POST with LLHTTPClient, retrieve the resulting cookie, and push it into the central cookie store. Also made sure the OpenID cookie gets re-added when the cookie store is cleared.
Added LLPluginCookieStore::setCookiesFromHost() to properly add a cookie that may not have a domain set. Made LLPluginCookieStore::Cookie::parse() add missing domain and path fields to cookies as necessary.
Fixed an issue where carriage returns in the string passed to LLPluginCookieStore::setCookies() or LLPluginCookieStore::setCookiesFromHost() would cause a parse failure.
Reviewed by gino and callum at http://codereview.lindenlab.com/1254001
2010-03-31 13:53:40 -07:00
Brad Payne (Vir Linden)
e504f89513
merge
2010-03-31 16:11:21 -04:00