Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Tofu Linden a85139cd7d merge. 2010-03-29 18:07:39 +01:00
Tofu Linden 6507534ad4 merge from viewer-hotfix 2010-03-29 18:06:46 +01:00
Tofu Linden ac10340316 EXT-6580 restrict size of linux's fallback font list
reviewed and approved for hotfix branch by Q.
2010-03-29 18:03:58 +01:00
Aimee Linden eb0aaff4aa Merge 2010-03-29 17:53:21 +01:00
Loren Shih b6e7850c0a Merge 2010-03-29 12:30:09 -04:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Vadim Savchuk f8d1b5cc77 merge
--HG--
branch : product-engine
2010-03-29 18:41:38 +03:00
Vadim Savchuk 6e0770908d Manual merge from default branch
Resolved conflicts in indra/newview/llchathistory.cpp in favor of trunk version.

--HG--
branch : product-engine
2010-03-29 18:41:08 +03:00
Vadim Savchuk f8e44a8974 Merge from default branch
--HG--
branch : product-engine
2010-03-29 18:28:51 +03:00
Paul Guslisty cb98c887da Fixed normal bug EXT-6048 (Shortcut for Groups Ctrl-Shift-G)
-Added tag for shortcut to the XML

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/131/

--HG--
branch : product-engine
2010-03-29 18:14:39 +03:00
Brad Payne (Vir Linden) b2a667b722 For EXT-4666: changed LLGestureManager to LLGestureMgr throughout 2010-03-29 11:10:54 -04:00
Brad Payne (Vir Linden) 4ff53b9066 For EXT-4666: changed LLAppearanceManager to LLAppearanceMgr throughout 2010-03-29 11:02:39 -04:00
Brad Payne (Vir Linden) 783eb286a6 merge 2010-03-29 10:53:22 -04:00
Aimee Linden fc0906d6e8 EXT-6031 Refactoring of voice volume representation
Standardizes representation of volume as [0.0 - 1.0] logarithmic with 0db at 0.5 within LLVoiceClient
Reviewed by Tofu.
2010-03-29 14:39:17 +01:00
Tofu Linden 61657d2e79 The linux counterpart to changeset 818541c93c7c 2010-03-29 14:14:07 +01:00
Igor Borovkov f55af5fcdf done EXT-6547 Rename stuff related with Panel Look Info to Panel Outfit Edit
renamed panel_look_info.xml to panel_outfit_edit.xml
renamed llpanellookinfo.cpp/llpanellookinfo.h to llpaneloutfitedit.cpp/llpaneloutfitedit.h
renamed LLPanelLookInfo to LLPanelOutfitEdit

Reviewed at https://codereview.productengine.com/secondlife/r/130/

--HG--
branch : product-engine
2010-03-29 14:07:40 +03:00
Aimee Linden 8654ba5e25 EXT-6515 Turn off Vivox automatic crash reporting 2010-03-29 10:49:21 +01:00
Tofu Linden 0fd7054131 viewer-2-0 merge 2010-03-28 11:50:40 +01:00
Eli Linden bdf4b0b33f IT translation review of set3 2010-03-27 18:07:22 -07:00
Tofu Linden c25d59a948 merge from viewer-2-0 2010-03-27 13:04:08 +00:00
Eli Linden 4f766829f3 PL CT global edit 2010-03-26 21:41:33 -07:00
Eli Linden 5ac0348131 fix invalid xml 2010-03-26 21:24:26 -07:00
Eli Linden 3499c46469 Merge 2010-03-26 21:22:42 -07:00
Eli Linden 609767d219 IT translation review for set6C 2010-03-26 21:21:59 -07:00
Eli Linden d60830b522 PT linguistic 2010-03-26 21:12:43 -07:00
Kent Quirk 8543b1d2af Merge. 2010-03-26 22:03:47 -04:00
Kent Quirk f66057f0ef Merge 2010-03-26 22:02:14 -04:00
Kent Quirk 524b207125 Fix application icon position for Mac 2010-03-26 22:00:59 -04:00
Monroe Linden cb7ea3f354 Fix "clear cookies" not clearing cookies in some cases
LLViewerMedia::clearAllCookies was sending "clear cookies" messages to all plugins and deleting cookie files, but it wasn't clearing the cookies in the central store.  It now does all of the above.
2010-03-26 18:21:10 -07:00
Monroe Linden 8a3fe4d9e4 Fix for EXT-6573 (Mouse-steering doesn't work in third person view)
LLAgentCamera::cameraOrbitAround() (which had been created from LLAgent:: cameraOrbitAround() when LLAgentCamera was factored out) wasn't correctly processing yaw.  Specifically, since gAgent.getFrameAgent() returns by value and not reference, gAgent.getFrameAgent().rotate() was discarding the result of the rotation.

Changed LLAgentCamera::cameraOrbitAround() to use gAgent.yaw() instead, and changed LLAgent::getFrameAgent() to return a const reference instead of a value, which should make the compiler catch errors like this.

Reviewed by Richard in http://codereview.lindenlab.com/1153001
2010-03-26 17:47:12 -07:00
Eli Linden 40fdb2b932 IT translation review for set6A; FR and ES linguistic 2010-03-26 17:46:35 -07:00
Richard Nelson d98b2ce486 merge 2010-03-26 17:00:28 -07:00
Richard Nelson 12e570913c EXT-EXT-6317 - cursor does not indicate clicking will trigger an action when over transparent objects
reviewed by Leyla
(transplanted from 4b90aa824b05ef6d29973b55bec8eb6210e1edf9)
2010-03-26 16:57:56 -07:00
Richard Nelson 8ab9ea934f EXT-EXT-6317 - cursor does not indicate clicking will trigger an action when over transparent objects
reviewed by Leyla
2010-03-26 16:57:56 -07:00
Eli Linden b2234485b2 Merge 2010-03-26 16:35:37 -07:00
Eli Linden dde671f1df ES linguistic 2010-03-26 16:34:20 -07:00
Eli Linden c59484a562 DE FR ES linguistic 2010-03-26 16:32:20 -07:00
Eli Linden e5edc41ac8 DA CT edit 2010-03-26 16:26:33 -07:00
Monroe Linden 28e3190296 Fix a couple of minor issues with the central cookie storage code.
Made LLViewerMedia::clearAllCookies() delete the new per-user cookie file (userdir/plugin_cookies.txt) as well as the old one.

Made LLViewerMedia::loadCookieFile() send the clear_cookies message to all loaded plugins.
2010-03-26 16:19:34 -07:00
Eli Linden 8155e60dee IT translation for set5C 2010-03-26 15:48:11 -07:00
Monroe Linden 4e7838fb00 Implemented central storage mechanism for media plugin cookies.
Added LLPluginCookieStore, which manages the central list of cookies.

New Mac and Windows versions of llqtwebkit, built from the tip of the cookie-api branch on http://bitbucket.org/lindenlab/llqtwebkit/ (currently revision f35a5eab8c2f).

Added "set_cookies" and "cookie_set" messages to the media_browser message class in the plugin API, and made the webkit plugin use them appropriately.

Added methods to LLViewerMedia to read/write the cookie file and add/remove individual cookies.

Added hooks to read/write the cookie file (plugin_cookies.txt) in the same places as  the location history (idle_startup() in llstartup.cpp and LLAppViewer::cleanup(), respectively).

Reviewed by Richard at http://codereview.lindenlab.com/1006003
2010-03-26 15:39:21 -07:00
Kent Quirk 2b68fd569d Merge 2010-03-26 18:34:27 -04:00
Eli Linden fe1a1a09dc FR linguistic 2010-03-26 14:38:00 -07:00
Kent Quirk b33b9c326b Merge 2010-03-26 17:07:02 -04:00
Kent Quirk 32253813b4 EXT-3818 -- absolute minimal fix for Viewer 2, can be better fixed in 2.1. Previous proposed fix caused a crash on at least one machine, too risky. 2010-03-26 17:05:29 -04:00
Mark Palange (Mani) 4888c9a103 Merge patches in q/viewer-hotfix to viewer-2-0 2010-03-26 14:04:03 -07:00
Mark Palange (Mani) 55f549db45 EXT-6517 Now updating the location value in refreshLocation.
Reviewed by Richard
2010-03-26 12:52:02 -07:00
Kent Quirk c58125e804 Merge 2010-03-26 15:42:32 -04:00
Kent Quirk 7464a71318 Merge 2010-03-26 15:41:43 -04:00