diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-01-23 14:15:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-01-23 14:15:55 -0500 |
| commit | f93126e1ea0ba3d97291a979897b0cf590dd4703 (patch) | |
| tree | 2848e039a79ce78da27d6bb0f1d0f2a3a5624da9 | |
| parent | 37e04247d9d9e455289c86fe88c07c5398b0dde7 (diff) | |
| parent | c0d2d316bef9157fcf80e7ee33aff38b55410f16 (diff) | |
merge changes for storm-1796
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index ee8cbfa9f2..ce11a595a2 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -608,6 +608,7 @@ Jonathan Yap STORM-1733 STORM-1790 STORM-1788 + STORM-1796 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 47236c1a48..587c461bee 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -59,7 +59,6 @@ top_pad="30" width="350" /> <check_box - enabled_control="EnableVoiceChat" control_name="VoiceCallsFriendsOnly" height="16" label="Only friends and groups can call or IM me" |