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

Fixes for mac compatibility. Big thanks to Katharine Berry for catching the issue.

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-22 22:19:38 -04:00
parent ec55705bdd
commit ac96519df3
4 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llfloatercolorpicker.cpp
View File

@@ -751,13 +751,10 @@ drawPalette ()
std::string RGBToHex(int rNum, int gNum, int bNum) std::string RGBToHex(int rNum, int gNum, int bNum)
{ {
std::string result; std::string result;
char chr[255];
sprintf_s(chr, "%.2X", rNum); result.append(llformat("%.2X", rNum));
result.append(chr); result.append(llformat("%.2X", gNum));
sprintf_s(chr, "%.2X", gNum); result.append(llformat("%.2X", bNum));
result.append(chr);
sprintf_s(chr, "%.2X", bNum);
result.append(chr);
return result; return result;
} }

2
indra/newview/skins/default/xui/en-us/floater_color_picker.xml
View File

@@ -76,7 +76,7 @@
Hex: Hex:
</text> </text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="18" left_delta="64" max_length="7" mouse_opaque="true" font="SansSerifSmall" height="18" left_delta="64" max_length="6" mouse_opaque="true"
tool_tip="" name="hexval" control_name="ColorHexValue" tool_tip="" name="hexval" control_name="ColorHexValue"
width="49"/> width="49"/>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"

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

@@ -122,6 +122,8 @@
Fraud > Pyramid scheme or chain letter Fraud > Pyramid scheme or chain letter
</combo_item><combo_item name="Fraud__US$" value="50"> </combo_item><combo_item name="Fraud__US$" value="50">
Fraud > US$ Fraud > US$
</combo_item><combo_item name="Ridiculous3" value="71">
Freud > User has taken an interest in their mother
</combo_item><combo_item name="Harassment__Advert_farms___visual_spam" value="51"> </combo_item><combo_item name="Harassment__Advert_farms___visual_spam" value="51">
Harassment > Advert farms / visual spam Harassment > Advert farms / visual spam
</combo_item><combo_item name="Harassment__Defaming_individuals_or_groups" value="52"> </combo_item><combo_item name="Harassment__Defaming_individuals_or_groups" value="52">
@@ -134,6 +136,8 @@
Harassment > Solicting/inciting others to violate ToS Harassment > Solicting/inciting others to violate ToS
</combo_item><combo_item name="Harassment__Verbal_abuse" value="56"> </combo_item><combo_item name="Harassment__Verbal_abuse" value="56">
Harassment > Verbal abuse Harassment > Verbal abuse
</combo_item><combo_item name="Ridiculous1" value="69">
Harassment > User keeps licking finger and touching me
</combo_item><combo_item name="Indecency__Broadly_offensive_content_or_conduct" value="57"> </combo_item><combo_item name="Indecency__Broadly_offensive_content_or_conduct" value="57">
Indecency > Broadly offensive content or conduct Indecency > Broadly offensive content or conduct
<!-- 58 = deprecated by AO --> <!-- 58 = deprecated by AO -->
@@ -157,20 +161,15 @@
Land > Encroachment > Particles Land > Encroachment > Particles
</combo_item><combo_item name="Land__Encroachment__Trees_plants" value="65"> </combo_item><combo_item name="Land__Encroachment__Trees_plants" value="65">
Land > Encroachment > Trees/plants Land > Encroachment > Trees/plants
</combo_item><combo_item name="Ridiculous2" value="70">
Land > Encroachment > User won't stay on their side of the car
</combo_item><combo_item name="Wagering_gambling" value="67"> </combo_item><combo_item name="Wagering_gambling" value="67">
Wagering/gambling Wagering/gambling
</combo_item> </combo_item>
<combo_item name="Other" value="68"> <combo_item name="Other" value="68">
Other Other
</combo_item> </combo_item>
<combo_item name="Ridiculous1" value="69"> </combo_box>
User keeps licking finger and touching me
</combo_item>
<combo_item name="Ridiculous2" value="70">
User won't stay on their side of the car
</combo_item>
</combo_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-26" drop_shadow_visible="true" follows="left|top" bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16" font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"

1
indra/newview/wlfPanel_AdvSettings.cpp
View File

@@ -142,7 +142,6 @@ void wlfPanel_AdvSettings::draw()
expand_button->setImageOverlay(ButtonState); expand_button->setImageOverlay(ButtonState);
refresh(); refresh();
LLPanel::draw(); LLPanel::draw();
} }
wlfPanel_AdvSettings::~wlfPanel_AdvSettings () wlfPanel_AdvSettings::~wlfPanel_AdvSettings ()
{ {