diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 361008973a..1cba3b6a7b 100755
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -502,7 +502,7 @@ BOOL LLPanelLandGeneral::postBuild()
// to enabled the floater will just throw an error when trying to get it's cap
// Crash fix
//std::string url = gAgent.getRegion()->getCapability("LandResources");
- std::string url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("LandResources") : "";
+ std::string url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("LandResources") : LLStringUtil::null;
//
if (!url.empty())
{
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 4cb1fbb5b3..b15e052f97 100755
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -225,7 +225,7 @@ BOOL LLFloaterRegionInfo::postBuild()
// Aurora Sim - Region Settings Console
// We only use this panel on Aurora-based sims
- std::string url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("DispatchOpenRegionSettings") : "";
+ std::string url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("DispatchOpenRegionSettings") : LLStringUtil::null;
if (!url.empty())
{
panel = new LLPanelRegionOpenSettingsInfo;
@@ -881,7 +881,7 @@ void LLFloaterRegionInfo::requestMeshRezInfo()
{
// Crash fix
//std::string sim_console_url = gAgent.getRegion()->getCapability("SimConsoleAsync");
- std::string sim_console_url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("SimConsoleAsync") : "";
+ std::string sim_console_url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("SimConsoleAsync") : LLStringUtil::null;
//
if (!sim_console_url.empty())
@@ -1065,7 +1065,7 @@ void LLPanelRegionOpenSettingsInfo::onClickOrs(void* userdata)
LL_INFOS() << "LLPanelRegionOpenSettingsInfo::onClickOrs()" << LL_ENDL;
LLSD body;
- std::string url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("DispatchOpenRegionSettings") : "";
+ std::string url = gAgent.getRegion() ? gAgent.getRegion()->getCapability("DispatchOpenRegionSettings") : LLStringUtil::null;
if (!url.empty())
{
body["draw_distance"] = (LLSD::Integer)self->childGetValue("draw_distance");
@@ -1935,7 +1935,7 @@ bool LLPanelEstateInfo::accessAddCore2(const LLSD& notification, const LLSD& res
//Get parent floater name
LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
LLFloater* parent_floater = panel ? gFloaterView->getParentFloater(panel) : NULL;
- const std::string& parent_floater_name = parent_floater ? parent_floater->getName() : "";
+ const std::string& parent_floater_name = parent_floater ? parent_floater->getName() : LLStringUtil::null;
//Determine the button that triggered opening of the avatar picker
//(so that a shadow frustum from the button to the avatar picker can be created)