diff --git a/doc/contributions.txt b/doc/contributions.txt index 693d4c37b8..7824f7f5cb 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -576,6 +576,7 @@ Jonathan Yap STORM-1567 STORM-1572 STORM-1574 + STORM-1579 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/skins/default/xui/en/panel_region_covenant.xml b/indra/newview/skins/default/xui/en/panel_region_covenant.xml index 2b2ea78fac..df16f6fd37 100644 --- a/indra/newview/skins/default/xui/en/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/en/panel_region_covenant.xml @@ -107,13 +107,13 @@ There is no Covenant provided for this Estate. diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml index 15df095efa..4550603134 100644 --- a/indra/newview/skins/default/xui/en/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml @@ -171,6 +171,16 @@ tool_tip="List of objects experiencing the most potential collisions" top="313" width="150" /> +