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

More various small, old patches.

Browse Source 
Updated source tree to include everything I did
up till 2010-11-09.

Still to add: IMP-590, IMP-701, IMP-734, IMP-735 and IMP-702.
This commit is contained in:
Aleric Inglewood
2011-05-04 19:48:16 +02:00
parent ab5915c16c
commit f2199a504b
11 changed files with 23 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/contributions.txt
View File

@@ -84,7 +84,7 @@ Aleric Inglewood
SNOW-477 (IMP-577) SNOW-477 (IMP-577)
SNOW-479 SNOW-479
SNOW-626 SNOW-626
SNOW-713 SNOW-713 (IMP-692)
SNOW-744 (IMP-578) SNOW-744 (IMP-578)
SNOW-752 SNOW-752
SNOW-753 SNOW-753
@@ -100,6 +100,12 @@ Aleric Inglewood
IMP-566 IMP-566
IMP-567 IMP-567
IMP-573 IMP-573
IMP-660
IMP-661
IMP-662
IMP-663
IMP-664
IMP-670
Alissa Sabre Alissa Sabre
VWR-81 VWR-81
VWR-83 VWR-83

9
indra/cmake/LLCommon.cmake
View File

@@ -11,11 +11,4 @@ set(LLCOMMON_INCLUDE_DIRS
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
) )
if (LINUX) set(LLCOMMON_LIBRARIES llcommon)
# In order to support using ld.gold on linux, we need to explicitely
# specify all libraries that llcommon uses.
# llcommon uses `clock_gettime' which is provided by librt on linux.
set(LLCOMMON_LIBRARIES llcommon rt)
else (LINUX)
set(LLCOMMON_LIBRARIES llcommon)
endif (LINUX)

4
indra/llcommon/llstring.h
View File

@@ -213,7 +213,7 @@ public:
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
// Static Utility functions that operate on std::strings // Static Utility functions that operate on std::strings
static std::basic_string<T> null; static std::basic_string<T> const null;
typedef std::map<LLFormatMapString, LLFormatMapString> format_map_t; typedef std::map<LLFormatMapString, LLFormatMapString> format_map_t;
static S32 format(std::basic_string<T>& s, const format_map_t& fmt_map); static S32 format(std::basic_string<T>& s, const format_map_t& fmt_map);
@@ -304,7 +304,7 @@ public:
}; };
template<class T> std::basic_string<T> LLStringUtilBase<T>::null; template<class T> std::basic_string<T> const LLStringUtilBase<T>::null;
typedef LLStringUtilBase<char> LLStringUtil; typedef LLStringUtilBase<char> LLStringUtil;
typedef LLStringUtilBase<llwchar> LLWStringUtil; typedef LLStringUtilBase<llwchar> LLWStringUtil;

4
indra/llui/llnotifications.cpp
View File

@@ -1194,13 +1194,13 @@ void replaceSubstitutionStrings(LLXMLNodePtr node, StringMap& replacements)
if (found != replacements.end()) if (found != replacements.end())
{ {
replacement = found->second; replacement = found->second;
//llwarns << "replaceSubstituionStrings: value: " << value << " repl: " << replacement << llendl; //llinfos << "replaceSubstitutionStrings: value: \"" << value << "\" repl: \"" << replacement << "\"." << llendl;
it->second->setValue(replacement); it->second->setValue(replacement);
} }
else else
{ {
llwarns << "replaceSubstituionStrings FAILURE: value: " << value << " repl: " << replacement << llendl; llwarns << "replaceSubstitutionStrings FAILURE: could not find replacement \"" << value << "\"." << llendl;
} }
} }
} }

5
indra/llvfs/llvfs.cpp
View File

@@ -566,8 +566,9 @@ LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename
} }
} }
LL_WARNS("VFS") << "Using index file " << mIndexFilename << LL_ENDL; // Success!
LL_WARNS("VFS") << "Using data file " << mDataFilename << LL_ENDL; LL_INFOS("VFS") << "Using index file " << mIndexFilename << LL_ENDL;
LL_INFOS("VFS") << "Using data file " << mDataFilename << LL_ENDL;
mValid = VFSVALID_OK; mValid = VFSVALID_OK;
} }

11
indra/newview/llfeaturemanager.cpp
View File

@@ -252,12 +252,10 @@ BOOL LLFeatureManager::loadFeatureTables()
mTableVersion = version; mTableVersion = version;
LLFeatureList *flp = NULL; LLFeatureList *flp = NULL;
while (!file.eof() && file.good()) while (file >> name)
{ {
char buffer[MAX_STRING]; /*Flawfinder: ignore*/ char buffer[MAX_STRING]; /*Flawfinder: ignore*/
file >> name;
if (name.substr(0,2) == "//") if (name.substr(0,2) == "//")
{ {
// This is a comment. // This is a comment.
@@ -265,13 +263,6 @@ BOOL LLFeatureManager::loadFeatureTables()
continue; continue;
} }
if (name.empty())
{
// This is a blank line
file.getline(buffer, MAX_STRING);
continue;
}
if (name == "list") if (name == "list")
{ {
if (flp) if (flp)

2
indra/newview/llnamelistctrl.cpp
View File

@@ -72,7 +72,7 @@ LLNameListCtrl::~LLNameListCtrl()
// public // public
BOOL LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos, BOOL LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos,
BOOL enabled, std::string& suffix) BOOL enabled, std::string const& suffix)
{ {
//llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl; //llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl;

2
indra/newview/llnamelistctrl.h
View File

@@ -58,7 +58,7 @@ public:
// Add a user to the list by name. It will be added, the name // Add a user to the list by name. It will be added, the name
// requested from the cache, and updated as necessary. // requested from the cache, and updated as necessary.
BOOL addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM, BOOL addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM,
BOOL enabled = TRUE, std::string& suffix = LLStringUtil::null); BOOL enabled = TRUE, std::string const& suffix = LLStringUtil::null);
BOOL addNameItem(LLScrollListItem* item, EAddPosition pos = ADD_BOTTOM); BOOL addNameItem(LLScrollListItem* item, EAddPosition pos = ADD_BOTTOM);
virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL); virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);

2
indra/newview/lltexturecache.cpp
View File

@@ -1426,7 +1426,7 @@ void LLTextureCache::readHeaderCache()
{ {
// Special case: cache size was reduced, need to remove entries // Special case: cache size was reduced, need to remove entries
// Note: After we prune entries, we will call this again and create the LRU // Note: After we prune entries, we will call this again and create the LRU
U32 entries_to_purge = (num_entries-empty_entries) - sCacheMaxEntries; U32 entries_to_purge = (num_entries - empty_entries) - sCacheMaxEntries;
llinfos << "Texture Cache Entries: " << num_entries << " Max: " << sCacheMaxEntries << " Empty: " << empty_entries << " Purging: " << entries_to_purge << llendl; llinfos << "Texture Cache Entries: " << num_entries << " Max: " << sCacheMaxEntries << " Empty: " << empty_entries << " Purging: " << entries_to_purge << llendl;
// We can exit the following loop with the given condition, since if we'd reach the end of the lru set we'd have: // We can exit the following loop with the given condition, since if we'd reach the end of the lru set we'd have:
// purge_list.size() = lru.size() = num_entries - empty_entries = entries_to_purge + sCacheMaxEntries >= entries_to_purge // purge_list.size() = lru.size() = num_entries - empty_entries = entries_to_purge + sCacheMaxEntries >= entries_to_purge

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

@@ -389,5 +389,6 @@
<texture name="media_btn_scrollup.png"/> <texture name="media_btn_scrollup.png"/>
<texture name="media_btn_stoploading.png"/> <texture name="media_btn_stoploading.png"/>
<texture name="media_panel_divider.png"/> <texture name="media_panel_divider.png"/>
<texture name="media_panel_scrollbg.png"/>
</textures> </textures>

20
install.xml
View File

@@ -162,26 +162,12 @@
<string>artwork</string> <string>artwork</string>
<key>packages</key> <key>packages</key>
<map> <map>
<key>darwin</key> <key>common</key>
<map> <map>
<key>md5sum</key> <key>md5sum</key>
<string>5e047437d73d1017bf270a6c6e936f23</string> <string>a2cde4f24bdcc260b661e139846b8acd</string>
<key>url</key> <key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090415.tar.bz2</uri> <uri>http://imprudenceviewer.org/download/libs/imprudence-artwork-20101026.tar.bz2</uri>
</map>
<key>linux</key>
<map>
<key>md5sum</key>
<string>5e047437d73d1017bf270a6c6e936f23</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090415.tar.bz2</uri>
</map>
<key>windows</key>
<map>
<key>md5sum</key>
<string>5e047437d73d1017bf270a6c6e936f23</string>
<key>url</key>
<uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/artwork-common-20090415.tar.bz2</uri>
</map> </map>
</map> </map>
</map> </map>