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

hopefully this fixes everything

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-03 16:32:04 -03:00
parent a581fade7b
commit 8df2389509
9 changed files with 250 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llfloaternamedesc.cpp
View File

@@ -71,6 +71,9 @@ const S32 PREF_BUTTON_HEIGHT = 16;
LLFloaterNameDesc::LLFloaterNameDesc(const std::string& filename )
: LLFloater(std::string("Name/Description Floater"))
{
// <edit>
mItem = NULL;
// </edit>
mFilenameAndPath = filename;
mFilename = gDirUtilp->getBaseFileName(filename, false);
// SL-5521 Maintain capitalization of filename when making the inventory item. JC
@@ -78,6 +81,19 @@ LLFloaterNameDesc::LLFloaterNameDesc(const std::string& filename )
mIsAudio = FALSE;
}
// <edit>
LLFloaterNameDesc::LLFloaterNameDesc(const std::string& filename, void* item )
: LLFloater(std::string("Name/Description Floater"))
{
mItem = item;
mFilenameAndPath = filename;
mFilename = gDirUtilp->getBaseFileName(filename, false);
// SL-5521 Maintain capitalization of filename when making the inventory item. JC
//LLStringUtil::toLower(mFilename);
mIsAudio = FALSE;
}
// </edit>
//-----------------------------------------------------------------------------
// postBuild()
//-----------------------------------------------------------------------------