Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

2012-01-11 02:28:14 -05:00
parent c5d4ccc78d ced937cc46
commit 8543106f5e
31 changed files with 504 additions and 321 deletions
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -378,6 +378,7 @@ void init_default_trans_args()
 	default_trans_args.insert("SECOND_LIFE_GRID");
 	default_trans_args.insert("SUPPORT_SITE");
 	default_trans_args.insert("CURRENCY");
+	default_trans_args.insert("GRID_OWNER");
 }

 //----------------------------------------------------------------------------