Skip to content
Snippets Groups Projects
Commit f93126e1 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-1796

parents 37e04247 c0d2d316
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 1
− 0
View file @ f93126e1
...@@ -608,6 +608,7 @@ Jonathan Yap ...@@ -608,6 +608,7 @@ Jonathan Yap
STORM-1733 STORM-1733
STORM-1790 STORM-1790
STORM-1788 STORM-1788
STORM-1796
Kadah Coba Kadah Coba
STORM-1060 STORM-1060
Jondan Lundquist Jondan Lundquist
......
indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+ 0
− 1
View file @ f93126e1
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
top_pad="30" top_pad="30"
width="350" /> width="350" />
<check_box <check_box
enabled_control="EnableVoiceChat"
control_name="VoiceCallsFriendsOnly" control_name="VoiceCallsFriendsOnly"
height="16" height="16"
label="Only friends and groups can call or IM me" label="Only friends and groups can call or IM me"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment