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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Drake Arconis
2012-02-20 07:19:35 -05:00
parent c6d6eed7d3 9477a5f32f
commit ad1e3f1d2d
21 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llimagej2coj/llimagej2coj.cpp
View File

@@ -168,7 +168,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
// dereference the array.
if(!image || !image->numcomps)
{
llwarns << "ERROR -> decodeImpl: failed to decode image!" << llendl;
llwarns << "failed to decode image!" << llendl;
if (image)
{
opj_image_destroy(image);
@@ -183,6 +183,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
{
if (image->comps[i].factor != base.getRawDiscardLevel())
{
llwarns << "Expected discard level not reached!" << llendl;
// if we didn't get the discard level we're expecting, fail
opj_image_destroy(image);
base.decodeFailed();

24
indra/newview/llnotify.cpp
View File

@@ -242,6 +242,30 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification,
// it appears below the caution textbox
y = y - caution_height;
}
else if (mIsCaution && mIsTip)
{
const S32 BTN_TOP = BOTTOM_PAD + (((mNumOptions-1+2)/3)) * (BTN_HEIGHT+VPAD);
// Tokenization on \n is handled by LLTextBox
const S32 MAX_LENGTH = 512 + 20 + DB_FIRST_NAME_BUF_SIZE + DB_LAST_NAME_BUF_SIZE + DB_INV_ITEM_NAME_BUF_SIZE; // For script dialogs: add space for title.
text = new LLTextEditor(std::string("box"), LLRect(x, y, getRect().getWidth()-2, mIsTip ? BOTTOM : BTN_TOP+16), MAX_LENGTH, mMessage, sFont, FALSE);
text->setWordWrap(TRUE);
text->setTabStop(FALSE);
text->setMouseOpaque(FALSE);
text->setBorderVisible(FALSE);
text->setTakesNonScrollClicks(FALSE);
text->setHideScrollbarForShortDocs(TRUE);
text->setReadOnlyBgColor ( LLColor4::transparent ); // the background color of the box is manually
// rendered under the text box, therefore we want
// the actual text box to be transparent
text->setReadOnlyFgColor ( gColors.getColor("NotifyCautionWarnColor") ); //sets caution text color for tip notifications
text->setEnabled(FALSE); // makes it read-only
text->setTabStop(FALSE); // can't tab to it (may be a problem for scrolling via keyboard)
addChild(text);
}
else
{

4
indra/newview/skins/Pony-Aquablue/colors_base.xml
View File

@@ -99,7 +99,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="70, 170, 255, 255" />
<NotifyTextColor value="0, 0, 0, 255" />
<NotifyCautionBoxColor value="0, 0, 0, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255" />
<GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -195,7 +195,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="62, 62, 62, 255" /> <!-- Warnings floaters, like when returning objects -->
<AlertTextColor value="147, 169, 213, 255" />
<AlertCautionBoxColor value="0, 0, 0, 255" /> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

4
indra/newview/skins/Pony-Purple/colors_base.xml
View File

@@ -98,7 +98,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="255, 174, 70, 255" />
<NotifyTextColor value="0, 0, 0, 255" />
<NotifyCautionBoxColor value="0, 0, 0, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="255, 179, 70, 255" />
<GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -195,7 +195,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="62, 62, 62, 255" /> <!-- Warnings floaters, like when returning objects -->
<AlertTextColor value="215, 200, 150, 255" />
<AlertCautionBoxColor value="0, 0, 0, 255" /> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

2
indra/newview/skins/dark/colors_base.xml
View File

@@ -96,7 +96,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="66, 66, 66, 255"/>
<NotifyTextColor value="200, 200, 200, 255"/>
<NotifyCautionBoxColor value="0, 0, 0, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255"/> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255"/>
<GroupNotifyTextColor value="0, 0, 0 255" />

4
indra/newview/skins/darkgred/colors_base.xml
View File

@@ -96,7 +96,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="0, 0, 0, 220" />
<NotifyTextColor value="255, 0, 0, 255" />
<NotifyCautionBoxColor value="0, 0, 0, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="189, 0, 0, 240" />
<GroupNotifyTextColor value="1, 0, 0, 255" />
@@ -192,7 +192,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="0, 0, 0, 245"/>
<AlertTextColor value="228, 0, 0, 255"/>
<AlertCautionBoxColor value="0, 0, 0, 255"/> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255"/> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255"/> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

1
indra/newview/skins/default/colors_base.xml
View File

@@ -195,6 +195,7 @@
<ConsoleBackground value="0, 0, 0, 255" />
<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/> <!-- "loading..." in the inv -->
<InventoryBackgroundColor value="62, 62, 62, 80"/>
<SHMediaTickerOscillatorColor value ="0, 0, 0, 191"/>
<!-- Alert box colors -->
<AlertBoxColor value="62, 62, 62, 255" /> <!-- Warnings floaters, like when returning objects -->

2
indra/newview/skins/emerald/colors_base.xml
View File

@@ -194,7 +194,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="0, 0, 0, 255" /> <!-- Warnings floaters, like when returning objects -->
<AlertTextColor value="91, 187, 83, 255" />
<AlertCautionBoxColor value="0, 0, 0, 255" /> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

4
indra/newview/skins/gemini/colors_base.xml
View File

@@ -98,7 +98,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="66, 66, 66, 255" />
<NotifyTextColor value="255, 255, 255, 128" />
<NotifyCautionBoxColor value="0, 0, 0, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="66, 66, 66, 255" />
<GroupNotifyTextColor value="255, 255, 255, 128" />
@@ -196,7 +196,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="33, 33, 33, 255" /> <!-- Warnings floaters, like when returning objects -->
<AlertTextColor value="128, 128, 128, 255" />
<AlertCautionBoxColor value="0, 0, 0, 255" /> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

4
indra/newview/skins/gred/colors_base.xml
View File

@@ -96,7 +96,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="189, 0, 0, 240" />
<NotifyTextColor value="1, 0, 0, 255" />
<NotifyCautionBoxColor value="0, 0, 0, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="189, 0, 0, 240" />
<GroupNotifyTextColor value="1, 0, 0, 255" />
@@ -193,7 +193,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="227, 0, 0, 245"/>
<AlertTextColor value="1, 0, 0, 255"/>
<AlertCautionBoxColor value="0, 0, 0, 255"/> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255"/> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255"/> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

4
indra/newview/skins/kdarknv/colors.xml
View File

@@ -87,7 +87,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="166, 166, 166, 255"/>
<NotifyTextColor value="0, 0, 0, 255"/>
<NotifyCautionBoxColor value="0, 0, 0, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255"/> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255"/>
<GroupNotifyTextColor value="0, 0, 0 255" />
@@ -181,4 +181,4 @@
<MultiSliderThumbCenterSelectedColor value="50, 50, 255, 255"/>
<MultiSliderTriangleColor value="50, 255, 255, 255"/>
</settings>
</settings>

4
indra/newview/skins/kdarknv/colors_base.xml
View File

@@ -99,7 +99,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="70, 170, 255, 255" />
<NotifyTextColor value="0, 0, 0, 255" />
<NotifyCautionBoxColor value="0, 0, 0, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255" />
<GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -188,7 +188,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="62, 62, 62, 255" /> <!-- Warnings floaters, like when returning objects -->
<AlertTextColor value="147, 169, 213, 255" />
<AlertCautionBoxColor value="0, 0, 0, 255" /> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

4
indra/newview/skins/kliteat/colors_base.xml
View File

@@ -99,7 +99,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="70, 170, 255, 255" />
<NotifyTextColor value="0, 0, 0, 255" />
<NotifyCautionBoxColor value="0, 0, 0, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255" />
<GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -188,7 +188,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="62, 62, 62, 255" /> <!-- Warnings floaters, like when returning objects -->
<AlertTextColor value="147, 169, 213, 255" />
<AlertCautionBoxColor value="0, 0, 0, 255" /> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

4
indra/newview/skins/openlife/colors.xml
View File

@@ -96,7 +96,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="152, 160, 160, 255"/>
<NotifyTextColor value="0, 0, 0, 255"/>
<NotifyCautionBoxColor value="0, 0, 0, 255"/>
<NotifyCautionBoxColor value="254, 209, 118, 255"/>
<NotifyCautionWarnColor value="0, 0, 0, 255"/>
<FocusBackgroundColor value="176, 184, 184, 255"/>
<GroupNotifyBoxColor value="255, 170, 70, 255"/>
@@ -182,7 +182,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="176, 184, 184, 255"/>
<AlertTextColor value="0, 0, 0, 255"/>
<AlertCautionBoxColor value="0, 0, 0, 255"/> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255"/> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255"/> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

4
indra/newview/skins/openlife/colors_base.xml
View File

@@ -96,7 +96,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="70, 170, 255, 255" />
<NotifyTextColor value="0, 0, 0, 255" />
<NotifyCautionBoxColor value="0, 0, 0, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255" />
<GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -176,7 +176,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="62, 62, 62, 255" /> <!-- Warnings floaters, like when returning objects -->
<AlertTextColor value="147, 169, 213, 255" />
<AlertCautionBoxColor value="0, 0, 0, 255" /> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

2
indra/newview/skins/pslgreen/colors_base.xml
View File

@@ -96,7 +96,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="66, 66, 66, 255"/>
<NotifyTextColor value="200, 200, 200, 255"/>
<NotifyCautionBoxColor value="0, 0, 0, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255"/> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255"/>
<GroupNotifyTextColor value="0, 0, 0 255" />

2
indra/newview/skins/pslpurple/colors_base.xml
View File

@@ -96,7 +96,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="66, 66, 66, 255"/>
<NotifyTextColor value="200, 200, 200, 255"/>
<NotifyCautionBoxColor value="0, 0, 0, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255"/> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255"/>
<GroupNotifyTextColor value="0, 0, 0 255" />

4
indra/newview/skins/ruby/colors_base.xml
View File

@@ -96,7 +96,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="0, 0, 0, 220" />
<NotifyTextColor value="255, 0, 0, 255" />
<NotifyCautionBoxColor value="0, 0, 0, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="189, 0, 0, 240" />
<GroupNotifyTextColor value="1, 0, 0, 255" />
@@ -192,7 +192,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="0, 0, 0, 245"/>
<AlertTextColor value="228, 0, 0, 255"/>
<AlertCautionBoxColor value="0, 0, 0, 255"/> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255"/> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255"/> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

2
indra/newview/skins/sapphire/colors_base.xml
View File

@@ -96,7 +96,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="66, 66, 66, 255"/>
<NotifyTextColor value="200, 200, 200, 255"/>
<NotifyCautionBoxColor value="0, 0, 0, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255"/> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255"/> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 170, 255, 255"/>
<GroupNotifyTextColor value="0, 0, 0 255" />

4
indra/newview/skins/silver/colors_base.xml
View File

@@ -98,7 +98,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="170, 210, 255, 240" />
<NotifyTextColor value="0, 30, 60, 255" />
<NotifyCautionBoxColor value="0, 0, 0, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="170, 210, 255, 240" />
<GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -199,7 +199,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="165, 180, 200, 245"/>
<AlertTextColor value="0, 30, 60, 255"/>
<AlertCautionBoxColor value="0, 0, 0, 255"/> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255"/> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255"/> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->

4
indra/newview/skins/wisdom/colors_base.xml
View File

@@ -99,7 +99,7 @@
<!-- NOTIFICATION POP-UPS -->
<NotifyBoxColor value="70, 70, 70, 155" />
<NotifyTextColor value="0, 0, 0, 255" />
<NotifyCautionBoxColor value="0, 0, 0, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionBoxColor value="254, 209, 118, 255" /> <!-- the background color of caution permissions prompts -->
<NotifyCautionWarnColor value="0, 0, 0, 255" /> <!-- the foreground color of the special title text in caution permissions prompts -->
<GroupNotifyBoxColor value="70, 70, 70, 255" />
<GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -191,7 +191,7 @@
<!-- Alert box colors -->
<AlertBoxColor value="62, 62, 62, 255" /> <!-- Warnings floaters, like when returning objects -->
<AlertTextColor value="147, 169, 213, 255" />
<AlertCautionBoxColor value="0, 0, 0, 255" /> <!-- Background color of caution alerts -->
<AlertCautionBoxColor value="254, 209, 118, 255" /> <!-- Background color of caution alerts -->
<AlertCautionTextColor value="0, 0, 0, 255" /> <!-- Foreground color of the special title text in caution alerts -->
<!-- Multi sliders, as in the sky animation setting -->