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

Merge git://github.com/Lirusaito/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2011-12-28 04:28:49 +01:00
parent aad10c9b8d 536189340d
commit a7510d3b3a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llinventory/llinventory.cpp
View File

@@ -226,7 +226,7 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
} }
// exportFile should be replaced with exportLegacyStream // exportFile should be replaced with exportLegacyStream
// not sure whether exportLegacyStream(llofstream(fp)) would work, fp may need to get icramented... // not sure whether exportLegacyStream(llofstream(fp)) would work, fp may need to get incremented...
BOOL LLInventoryObject::exportFile(LLFILE* fp, BOOL) const BOOL LLInventoryObject::exportFile(LLFILE* fp, BOOL) const
{ {
std::string uuid_str; std::string uuid_str;

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

@@ -66,7 +66,7 @@
<ScrollBgWriteableColor value="33, 33, 33, 80" /> <ScrollBgWriteableColor value="33, 33, 33, 80" />
<ScrollBGStripeColor value="100, 100, 100, 25" /> <ScrollBGStripeColor value="100, 100, 100, 25" />
<ScrollDisabledColor value="33, 33, 33, 204" /> <ScrollDisabledColor value="33, 33, 33, 204" />
<ScrollSelectedBGColor value="33, 33, 33, 204" /> <ScrollSelectedBGColor value="222, 222, 222, 150" />
<ScrollSelectedFGColor value="255, 255, 255, 255" /> <!-- Text color --> <ScrollSelectedFGColor value="255, 255, 255, 255" /> <!-- Text color -->
<ScrollUnselectedColor value="222, 222, 222, 150" /> <!-- Text color --> <ScrollUnselectedColor value="222, 222, 222, 150" /> <!-- Text color -->
<ScrollHighlightedColor value="222, 222, 222, 80" /> <!-- Hover color --> <ScrollHighlightedColor value="222, 222, 222, 80" /> <!-- Hover color -->