Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'shyotl/master'

Browse Source
This commit is contained in:
Latif Khalifa
2013-04-06 09:26:23 +02:00
parent 5ad2e32712 b16bb264cc
commit fc4fcc9450
17 changed files with 170 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/skins/default/xui/en-us/floater_report_abuse.xml
View File

@@ -125,7 +125,7 @@
Fraud > Pyramid scheme or chain letter
</combo_item><combo_item name="Fraud__US$" value="50">
Fraud > US$
</combo_item><combo_item name="Ridiculous3" value="71">
</combo_item><combo_item name="Ridiculous3" value="100">
Freud > User has taken an interest in their mother
</combo_item><combo_item name="Harassment__Advert_farms___visual_spam" value="51">
Harassment > Advert farms / visual spam
@@ -139,7 +139,7 @@
Harassment > Solicting/inciting others to violate ToS
</combo_item><combo_item name="Harassment__Verbal_abuse" value="56">
Harassment > Verbal abuse
</combo_item><combo_item name="Ridiculous1" value="69">
</combo_item><combo_item name="Ridiculous1" value="100">
Harassment > User keeps licking finger and touching me
</combo_item><combo_item name="Indecency__Broadly_offensive_content_or_conduct" value="57">
Indecency > Broadly offensive content or conduct
@@ -164,7 +164,7 @@
Land > Encroachment > Particles
</combo_item><combo_item name="Land__Encroachment__Trees_plants" value="65">
Land > Encroachment > Trees/plants
</combo_item><combo_item name="Ridiculous2" value="70">
</combo_item><combo_item name="Ridiculous2" value="100">
Land > Encroachment > User won't stay on their side of the car
</combo_item><combo_item name="Wagering_gambling" value="67">
Wagering/gambling

9
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -4953,6 +4953,15 @@ Be as specific as you can, including steps to reproduce the bug if possible.
Entering an accurate description helps us file and process bug reports.
</notification>
<notification
icon="alertmodal.tga"
name="HelpReportNope"
type="alertmodal">
Do not meddle in the affairs of wizards, for they are subtle and quick to anger. - J.R.R. Tolkien
Please choose a legitimate category if you actually have something to report.
</notification>
<notification
icon="alertmodal.tga"
name="HelpReportAbuseContainsCopyright"