Commit Graph

401 Commits (efca9657a22ebbcacee705c00cac4e803f2ffa98)

Author SHA1 Message Date
Dessie Linden 9aad318fb9 Merged from viewer-release 2010-06-25 12:39:46 -07:00
Richard Nelson 742c123879 EXT-8071 FIX Viewer crashes in login screen when moving mousewheel in login fields. 2010-06-25 10:37:08 -07:00
Leyla Farazha 7f73d1414b merge fix, commenting out code after return true 2010-06-21 11:48:54 -07:00
Leyla Farazha b088449517 Merge from ssh://hg.lindenlab.com/dessie/viewer-release 2010-06-21 11:24:33 -07:00
Kent Quirk 4bf8a0c7fc Merge (and resolve conflict) from q/viewer-release 2010-06-17 11:37:21 -04:00
Dessie Linden 74817f151f Merged from q/viewer-release 2010-06-17 07:42:08 -07:00
Leyla Farazha 83a7a342ea removing fullscreen functionality
reviewed by richard cc#212
2010-06-15 17:21:27 -07:00
Richard Linden 4fb3198642 EXT-7090 WIP STRG(CTRL)+SHIFT+S in Mouselook doesnt make a snapshot
made world view extend to where menu bar would normally be when in mouselook
2010-06-15 15:25:55 -07:00
Dessie Linden 9461316e56 Merged from viewer-release 2010-06-11 11:51:59 -07:00
Andrew Dyukov ae43801f44 EXT-6655 Fixed Made the default busy message repsonse localizable with already existing account settings
- The root of busy response problem is that this text is located in non-localizable xml and, to make things worse, may be changed by user. So usual translation approach is little help here. So busy response was set the following way(EXT-5885)- on first run, string was written there from strings xml and was never changed later without direct user actions. So after changin locale message always remained the same.

- To make this string localize each time locale is changed and if it is the same as default message, new setting was added- BusyResponseChanged which is TRUE if user's busy message differ's from default. If it is true, we do nothing when locale changes, otherwise we set default message from current locale as user's busy message.

- Old transitional code from DEV-24146 was removed in this diff including unnecessary "BusyModeResponse2" setting(it is not needed because we'll anyway have to set busy message to default after first run of viewer after this fix and now busy response will be stored in "BusyModeResponse").

Warning! If user modified busy response message before this fix, it will be reset to default after first postfix run.

Reviewed by Richard Linden at https://codereview.productengine.com/secondlife/r/350/

--HG--
branch : product-engine
2010-06-08 23:30:56 +03:00
Tofu Linden 66d367cb0d merge from viewer-public 2010-06-04 11:16:32 +01:00
Andrew Polunin 5609f78f45 EXT-5808 FIXED Mini-Location panel was added below Navigation Bar
- Implemented class LLPanelTopInfoBar (llpaneltopinfobar.h, llpaneltopinfobar.cpp, panel_topinfo_bar.xml). Most of it's implementation is borrowed from LLLocationInputCtrl class.
- Mini-Location panel is turned off by default.
- Added top bar context menu option \"Show Mini-Location Panel\".
- Mini-Location panel displays the same context menu as top bar.
- Added code to initialize LLPanelTopInfoBar in llviewerwindow.cpp.
- Added declaration of the widget in main_view.xml

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/464/

--HG--
branch : product-engine
2010-06-03 18:59:16 +03:00
Tofu Linden dc6662d7a8 merge from viewer-public 2010-05-28 09:59:39 +01:00
Palmer f6ee642edf merge 2010-05-27 17:19:52 -07:00
Nyx (Neal Orman) 9a0a68aa44 Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public 2010-05-27 14:52:46 -04:00
Nyx (Neal Orman) cd46893057 EXT-7209 EXT-7366 EXT-7213 FIX EXT-7392 WIP
Final fixes for:
EXT-7209 camera to enter appearance edit mode
EXT-7366 change camera to face front of avatar in previews
EXT-7213 kill old appearance editor

Partial fix for:
EXT-7392 alpha mask checkboxes are not hooked up

All changes code reviewed by vir. Following commits (plus this one) reviewed with this checkin:
425d4e960450
15d04b6464a7
e92ae606de12
adc94512ea9b
24577dbbf7a4
6f28b241eae2

(sorry dessie! :) )
2010-05-27 14:40:49 -04:00
Tofu Linden 617e961445 merge from viewer-public 2010-05-27 12:34:05 +01:00
Richard Nelson f33fdbf0ef moved SidebarCameraMovement logic out of special widget to camera setup code 2010-05-26 19:36:15 -07:00
Nyx (Neal Orman) b524aacb59 EXT-7213 WIP kill old appearance editor and all traces of code
First pass - eliminated all references to gFloaterCustomize except
those that call saveIfDirty. Haven't compiled, haven't reviewed.
Will clean up in further patches and get reviewed before pushing.
2010-05-25 20:17:23 -04:00
Karl Stiefvater (qarl) e3753ed8b2 S3 feature/gpu table implementation. reviewed by palmer and davep. 2010-05-21 16:11:21 -05:00
Vadim Savchuk fe64168217 Manual merge from default branch.
Auto-resolved conflicts in:
- indra/newview/llpaneleditwearable.cpp
- indra/newview/llviewermenu.cpp
- indra/newview/llviewerwindow.cpp
- indra/newview/skins/default/xui/en/notifications.xml

--HG--
branch : product-engine
2010-05-20 14:05:32 +03:00
Tofu Linden 191fc90954 merge from viewer-public 2010-05-20 11:47:15 +01:00
Tofu Linden ae0dbecb1c merge from PE's viewer-trunk 2010-05-20 11:44:49 +01:00
Richard Nelson 47a398e52f EXT-6534 FIXED Snapshot to Disk ... causes snapshot of the active window with a background to the correct size but the window the same size as original 2010-05-19 17:11:28 -07:00
Richard Nelson f67e0d801d EXT-6364 - Ctrl-Alt-F1 doesn't currently hide all the viewer UI
reviewed by leyla
2010-05-19 16:22:31 -07:00
Mike Antipov 5d4b48bbb4 EXT-7104 WIP Implemented a functionality to control the width of the chat entry field.
* LLResizeBar calls notifyParent on resizing before changing rect of view, bottomtray processed this notification to update other buttons.
* Had to move setup of buttons visibility on startup into LLBottomTray to ensure all buttons have necessary visibility BEFORE restore the width of the chat entry field;
* Updated layout between chatbar and speak button to show resize mouse pointer in the middle between them.

Implemented behavior: visible buttons shrink to their minimal width when the chat entry field gets wider.

Also were refactored:
* moved declaration of settings related to buttons visibility from the settings.xml to LLBottomTray.
* moved setting of control listeners to LLBottomTray.

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

--HG--
branch : product-engine
2010-05-19 15:23:51 +03:00
Tofu Linden df07ba176c merge from viewer-public 2010-05-12 11:44:16 +01:00
Roxie Linden 2fd59393fc Automated Merge 2010-05-10 15:25:49 -07:00
Tofu Linden 1e0033b175 merge 2010-05-06 20:35:34 +01:00
Karl Stiefvater (qarl) 2673bd28d7 EXT-6775 Remove support for full-screen mode in Viewer 2. reviewed by Moss
(changes name of setting WindowFullScreen to FullScreen per discussion in jira.)
2010-05-05 13:40:55 -05:00
Roxie Linden 8d8f167a4e automated merge with trunk 2010-04-19 16:24:05 -07:00
Leyla Farazha 89fad5ded4 Merge 2010-04-07 17:09:46 -07:00
Leyla Farazha 8bf3a6ad2b EXT-6308 Drag and Drop cursor indicates you can drop a URL on a Shared Media prim that you are not allowed to Navigate
reviewd by Richard cc# 178
2010-04-07 15:03:27 -07:00
Roxie Linden 8ba5517a08 Automated merge 2010-04-07 13:20:33 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 59a90f197f merge from viewer-trunk 2010-04-09 11:25:45 +01:00
Richard Linden ff6c503c9a EXT-4885 - [DnD] cannot drag slurls from Google Chrome into SL on windows 2010-04-07 10:17:05 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden 9523c70f9d DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
Includes: DEV-45800, DEV-45803 - Grid Manager
DEV-45804 - SLURL refactor
DEV-45801 - Single username field (for Identity Evolution and SLE Ldap)
Also,
Includes Certificate Management code allowing the viewer to connect to
grids not signed by a well know key (just like any web browser).  Also
contains secure storage for things like passwords.
The security/certificate code is modular with the intention of adding modules
to directly use the operating system facilities for crypto if available.
(that's much more secure than we'll ever be)

Also, refactor of voice to modularize it, and add a diamondware voice module.
CR:  Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-02 02:03:21 -07:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
Richard Nelson 6cc65f9e5f merge 2010-04-01 12:52:04 -07:00
Richard Nelson 7b4046df83 EXT-3531 - Ctrl-P does not work reliably on login 2010-04-01 11:47:21 -07:00
Vadim Savchuk 3e23c04c9b Merge from default branch
--HG--
branch : product-engine
2010-03-30 18:19:56 +03:00
Roxie Linden 86dc5bce1a Automated merge 2010-03-29 16:24:58 -07: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
Brad Payne (Vir Linden) b2a667b722 For EXT-4666: changed LLGestureManager to LLGestureMgr throughout 2010-03-29 11:10:54 -04:00
Vadim Savchuk a5227864bd Manual merge from default branch
Resolved conflict in indra/newview/llviewerwindow.cpp.

--HG--
branch : product-engine
2010-03-26 19:00:27 +02:00
Loren Shih 0a56031bd3 automated merge 2010-03-25 20:15:51 -04:00