Commit Graph

147 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Leyla Farazha 8628e67b82 apply resolution cleanup 2010-06-15 17:22:35 -07:00
Leyla Farazha 83a7a342ea removing fullscreen functionality
reviewed by richard cc#212
2010-06-15 17:21:27 -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
Sergei Litovchuk f41d06012b EXT-6384 FIXED check to disable 'Adult' setting when agent is not godlike but has admin menu enabled.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/508/

--HG--
branch : product-engine
2010-06-03 23:02:44 +03:00
Richard Linden 9e7cf5c1bc eliminated several warnings on startup 2010-06-02 13:33:15 -07:00
Roxie Linden 2fd59393fc Automated Merge 2010-05-10 15:25:49 -07: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
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
Vadim Savchuk c9e0b6e476 merge
--HG--
branch : product-engine
2010-04-07 18:41:15 +03:00
Mike Antipov 8329dbdc37 Fixed major bug EXT-6661 (chat log paths reset back to default)
* Removed unused InstantMessageLogFolder
 * Restored initializing logic of InstantMessageLogPath value from 1.23 to share setting between viewers.
 * Restored unused in 2.0 "LogChatTimestamp" and "LogChatIM" settings to avoid removing of them in 2.0
 * Restored default value of the "Save local chat log" setting from 1.23 & replaced with 2.0 own setting (LogNearbyChat was: LogChat)

Reviewed by Igor Borovkov & Kent Quirk at https://codereview.productengine.com/secondlife/r/193/

--HG--
branch : product-engine
2010-04-07 18:33:05 +03:00
Tofu Linden adce2ecdf8 PE merge from pe-viewer-trunk 2010-04-07 13:03:35 +01:00
Tofu Linden 8da371b0f0 merge 2010-04-07 12:16:36 +01:00
Eugene Mutavchi 8723a285fa Fixed normal bug EXT-6600(Block List button in Preferences does nothing prior to login (should be disabled)) - added disabling of Block List button if user is not logged in.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/186/

--HG--
branch : product-engine
2010-04-07 13:38:21 +03:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Vadim Savchuk 7d38dd51c2 Manual merge from default branch.
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357.

--HG--
branch : product-engine
2010-04-02 17:18:36 +03:00
Tofu Linden e46f128d20 PE merge 2010-04-02 12:35:24 +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
Leyla Farazha b6109c4645 EXT-5168 prefs review: Remove "Small nametags" option
reviewed by Richard cc#176
2010-04-01 15:10:30 -07: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
Roxie Linden 18b7ab0018 Weekly automated merge from viewer 2.0 2010-03-22 16:12:41 -07:00
Monroe Linden 0c1ff8e876 Fix for EXT-6304: Shared media cookies cannot be deleted via Preferences
Added static member functions to LLViewerMedia: clearAllCookies(), clearAllCaches(), setCookiesEnabled(), and setProxyConfig().  These iterate through all loaded instances and send appropriate messages.

Also added a hack to clearAllCookies() to delete cookie files for all accounts, which should serve until we centralize cookie storage.

Made LLViewerMedia set the proxy config properly when creating new instances.  Callum is adding code to do something similar with the cookies enabled flag in a separate commit.

Removed get_web_media from llfloaterpreference.cpp and reworked everything that used it to use the new LLViewerMedia functions instead.

Reviewed by Callum at http://codereview.lindenlab.com/838003.
2010-03-18 17:59:14 -07:00
Igor Borovkov 5cae8140f4 fixed EXT-6284 ([HARD CODED] - Menu Einstellungen, Tab Erweitert: "MiddleMouse" needs to be localized)
Control value is preserved, it is being localized on presentation

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

--HG--
branch : product-engine
2010-03-17 13:25:18 +02:00
Roxie Linden 20379fecd9 automated merge 2010-03-08 21:39:38 -08:00
Sergei Litovchuk baafdf216f Fixed (EXT-4704) Add maturity icons to Prefs -> General.
- Added icons updating upon opening Prefs -> General panel.

--HG--
branch : product-engine
2010-03-05 15:36:01 +02:00
Igor Borovkov 85e698fa72 fixed reopened EXT-4131 [BSI] "Only friends and groups can call or IM me" NEEDS auto-response
--HG--
branch : product-engine
2010-03-04 15:24:22 +02:00
Andrew Dyukov b5df36f81f Fixed normal bug EXT-5885 ([HARD CODED] - The busy response should be localized. hard coded in llviewermessage.cpp).
- It wasn't hardcoded in llviewermessage.cpp, but xml which contains it is not localizable. Added string with default busy message to strings.xml
and used it in LLFloaterPreference::cleanupBadSetting().

--HG--
branch : product-engine
2010-03-03 15:02:04 +02:00
Sergei Litovchuk c4277e421c Implemented (EXT-4704) Add maturity icons to Prefs -> General.
--HG--
branch : product-engine
2010-02-24 23:41:04 +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
Tofu Linden b5f9e437ea PE merge. 2010-02-18 16:57:52 +00:00
Lynx Linden b71f451b76 EXT-5461: Reverting change 49e628c3a0c5.
Renaming skins/base back to skins/default to unblock I10n.

Revert was requested by Q.
2010-02-18 15:03:03 +00:00
Vadim Savchuk f33a1d7ad9 merge
--HG--
branch : product-engine
2010-02-18 15:45:48 +02:00
Dmitry Zaporozhan a4a2b148c2 Fixed low bug EXT-4057 - Preferences: Draw Distance value of < 100 displays without an "m".
Removed redundant code, there is no DrawDistanceMeterText1 so no need to switch visibility.

--HG--
branch : product-engine
2010-02-18 12:27:00 +02:00
Chuck Linden 0aaaa06fe0 Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix 2010-02-17 18:47:12 -05:00
Richard Linden effadd3908 merge 2010-02-17 15:16:31 -08:00
Richard Linden 366aa236f2 EXT-5461 - Installing 1.23.5 release version over recent 2.0 builds corrupts 1.23s UI
reviewed by Leyla
2010-02-17 14:37:28 -08:00
Rick Pasetto f55451552a EXT-5272: move prefs out of nearby media
Review #114
This (mostly XUI) change moves the prefs checkboxes out of the nearby media panel and into the prefs floater. The "Sound" tab is now the "Sound & Media" tab, and its layout has been modified drastically to match https://docs.google.com:443/a/lindenlab.​com/Doc?id=ddznhrqn_34kcxdz8f3#​Preferences
2010-02-17 11:27:46 -08:00
Tofu Linden 03f7086bfc EXT-4843 [NUX] Set default Preferences
'General' pane
2010-02-17 17:27:20 +00:00
angela 4a9c68d8e6 EXT-618 Low/Mid/High response is broken in Preferences > Graphics 2010-02-16 20:34:00 +08:00
Monroe Linden 93c4a7a18f Finish up EXT-3908
Remove code for aspect ratio controls from LLFloaterPreference.  (The XUI had already been removed.)

Reviewed by Richard.
2010-02-10 17:16:38 -08:00
Tofu Linden 8fec8c46df CID-92
Checker: FORWARD_NULL
Function: LLFloaterPreference::onBtnCancel()
File: /indra/newview/llfloaterpreference.cpp

CID-91

Checker: FORWARD_NULL
Function: LLFloaterPreference::onBtnApply()
File: /indra/newview/llfloaterpreference.cpp
2010-02-10 17:42:07 +00:00
Tofu Linden 6bd628dc57 CID-93
Checker: FORWARD_NULL
Function: LLFloaterPreference::onBtnOK()
File: /indra/newview/llfloaterpreference.cpp
2010-02-10 17:40:56 +00:00
Ychebotarev ProductEngine 36a44ba0e9 fix for normal EXT-1888 Apply button remains active after Applying changes
--HG--
branch : product-engine
2010-02-04 15:37:25 +02:00
Mike Antipov d643a16c38 Fixed normal bug EXT-4355 (Preferences: Location of logs does not show full path)
- changed "control_name" for view with log path to the "InstantMessageLogPath"
- also changed a line editor state from "disabled" to "readonly" to have a chance to scroll text to see full path in this field.

--HG--
branch : product-engine
2010-01-29 17:01:01 +02:00
Tofu Linden 471b8f71cd Merge conflict resolution. 2010-01-25 11:00:46 -08:00
Rick Pasetto af83fe79d8 "Fix" confusion over media settings
Review #89

This implements the changes Sam wanted in order to reduce the confusion over media enabled-ness, in particular:
- "Media Enabled" pref now only controls "AudioStreamingMedia"
- No more "tentative" state
- New "Music Enabled" pref
- First run dialog controls Media and Music (Sam, this is a change from your request...I think it works better)
- Put a reflection of the "Media Enabled" checkbox in the Nearby Media Floater
- Get rid of the "AudioStreamingVideo" setting altogether (whatever used it, it should now obey "AudioStreamingMedia").
2010-01-25 10:04:56 -08:00
Igor Borovkov c4cb6628b9 fixed linux build
--HG--
branch : product-engine
2010-01-25 17:50:19 +02:00
Igor Borovkov 307d94a92a implemented EXT-4131 [BSI] "Only friends and groups can call or IM me" NEEDS auto-response
added a modal warning window
"Non-friends won't know that you've choosen to ignore their calls and instant messages."

--HG--
branch : product-engine
2010-01-25 17:20:09 +02:00
Rick Pasetto 3a707a1a69 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-15 12:05:24 -08:00