livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-2043 FIX

meow-7.2.2
Brad Payne (Vir Linden) 2011-07-12 14:35:32 -04:00
parent b8351e83e8
commit 77e2be7984
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloatermodelpreview.cpp
View File

@ -101,7 +101,9 @@
#include "llcallbacklist.h"
#include "llviewerobjectlist.h"
#include "llanimationstates.h"
#include "llviewernetwork.h"
#include "glod/glod.h"
#include <boost/algorithm/string.hpp>
const S32 SLM_SUPPORTED_VERSION = 2;
@ -476,6 +478,18 @@ BOOL LLFloaterModelPreview::postBuild()
text->setMouseDownCallback(boost::bind(&LLModelPreview::setPreviewLOD, mModelPreview, i));
}
}
std::string current_grid = LLGridManager::getInstance()->getGridLabel();
std::transform(current_grid.begin(),current_grid.end(),current_grid.begin(),::tolower);
std::string validate_url;
if (current_grid == "agni")
{
validate_url = "http://secondlife.com/my/account/mesh.php";
}
else
{
validate_url = llformat("http://secondlife.%s.lindenlab.com/my/account/mesh.php",current_grid.c_str());
}
getChild<LLTextBox>("warning_message")->setTextArg("[VURL]", validate_url);
mUploadBtn = getChild<LLButton>("ok_btn");
mCalculateBtn = getChild<LLButton>("calculate_btn");

2
indra/newview/skins/default/xui/en/floater_model_preview.xml Normal file → Executable file
View File

@ -92,7 +92,7 @@
parse_urls="true"
wrap="true"
visible="false">
You will not be able to complete the final upload of this model to the Second Life servers. [secondlife:///app/floater/learn_more Find out how] to get enabled for mesh model uploads.</text>
You will not be able to complete the final upload of this model to the Second Life servers. [[VURL] Find out how] to get enabled for mesh model uploads.</text>
<text
height="65"