Merge in Storm-1838

2013-07-31 15:49:34 -04:00
parent 9676eac3db
commit 04c78a1d8a
15 changed files with 314 additions and 50 deletions
--- a/indra/newview/ascentprefschat.h
+++ b/indra/newview/ascentprefschat.h
@@ -107,6 +107,7 @@ protected:
    BOOL mBlockItemOfferSpam;
    BOOL mBlockScriptSpam;
    BOOL mBlockTeleportSpam;
+	bool mBlockTeleportRequestSpam;
    BOOL mNotifyOnSpam;
    BOOL mSoundMulti;
    U32  mNewLines;