Merged in default (pull request #844)

couple trivial changes

Approved-by: Andrey Kleshchev

indra/llaudio/llvorbisencode.h

@@ -40,7 +40,7 @@ const S32 LLVORBISENC_UNSUPPORTED_WORD_SIZE        = 9; // unsupported word size
 const S32 LLVORBISENC_CLIP_TOO_LONG                = 10; // source file is too long
 const S32 LLVORBISENC_CHUNK_SIZE_ERR               = 11; // chunk size is wrong
 
-const F32 LLVORBIS_CLIP_MAX_TIME                               = 10.0f;
+const F32 LLVORBIS_CLIP_MAX_TIME                               = 30.0f;
 const U8  LLVORBIS_CLIP_MAX_CHANNELS                   = 2;
 const U32 LLVORBIS_CLIP_SAMPLE_RATE                            = 44100;
 const U32 LLVORBIS_CLIP_MAX_SAMPLES_PER_CHANNEL        = (U32)(LLVORBIS_CLIP_MAX_TIME * LLVORBIS_CLIP_SAMPLE_RATE);

indra/newview/skins/default/xui/en/floater_report_abuse.xml

@@ -246,7 +246,7 @@
          name="Land__Encroachment__Objects_textures"
          value="63" />        
         <combo_box.item
-         label="Gaming Policy Violation"
+         label="Skill Gaming Policy Violation"
          name="Wagering_gambling"
          value="67" />       
     </combo_box>