SL-15168 Reset title of guidebook when opening
parent
9dee16185a
commit
2ddbdeb165
|
|
@ -51,6 +51,12 @@ BOOL LLFloaterHowTo::postBuild()
|
|||
|
||||
void LLFloaterHowTo::onOpen(const LLSD& key)
|
||||
{
|
||||
// LLFloaterHowTo is intended to be opened as a location specific guidebook
|
||||
// with custom titles, reset the title, LLUrlFloaterDispatchHandler will
|
||||
// set needed one later
|
||||
// todo: make title into general parameter for LLFloaterWebContent
|
||||
setTitle(getString("default_tittle"));
|
||||
|
||||
LLFloaterWebContent::Params p(key);
|
||||
if (!p.url.isProvided() || p.url.getValue().empty())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ const std::string KEY_URI("floater_url");
|
|||
const std::string KEY_PARAMS("floater_params");
|
||||
|
||||
// Supported floaters, for now it's exact matching, later it might get extended
|
||||
const std::string FLOATER_GUIDEBOOK("secondlife://guidebook"); // translates to "how_to"
|
||||
const std::string FLOATER_WEB_CONTENT("secondlife://browser"); // translates to "web_content"
|
||||
const std::string FLOATER_GUIDEBOOK("secondlife:///guidebook"); // translates to "how_to"
|
||||
const std::string FLOATER_WEB_CONTENT("secondlife:///browser"); // translates to "web_content"
|
||||
|
||||
// Web content universal arguments
|
||||
const std::string KEY_TRUSTED_CONTENT("trusted_content");
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
legacy_header_height="18"
|
||||
can_resize="false"
|
||||
can_minimize="false"
|
||||
can_close="false"
|
||||
can_close="false"
|
||||
height="525"
|
||||
layout="topleft"
|
||||
name="floater_how_to"
|
||||
|
|
@ -14,4 +14,9 @@
|
|||
width="310"
|
||||
rel_x="-0.469309"
|
||||
rel_y="-0.011166"
|
||||
filename="floater_web_content.xml"/>
|
||||
filename="floater_web_content.xml">
|
||||
<floater.string
|
||||
name="default_tittle">
|
||||
WELCOME ISLAND GUIDEBOOK
|
||||
</floater.string>
|
||||
</floater>
|
||||
Loading…
Reference in New Issue