summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerfloaterreg.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-03-13 16:45:52 -0700
committerMerov Linden <merov@lindenlab.com>2014-03-13 16:45:52 -0700
commit705d4182c8a84728e7f00cf48110c8f9720e4c29 (patch)
tree1666346cc9031c54020f10db9d033d796680bcc8 /indra/newview/llviewerfloaterreg.cpp
parent9de02b0cd3ac05ce172e12dbc2d288a5deccba11 (diff)
DD-42 : Rename merchant items to marketplace listings to be consistent with spec
Diffstat (limited to 'indra/newview/llviewerfloaterreg.cpp')
-rwxr-xr-xindra/newview/llviewerfloaterreg.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index f55de790d8..853d98693b 100755
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -243,7 +243,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("tex_fetch_debugger", "floater_texture_fetch_debugger.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTextureFetchDebugger>);
}
LLFloaterReg::add("media_settings", "floater_media_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMediaSettings>);
- LLFloaterReg::add("merchant_items", "floater_merchant_items.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMerchantItems>);
+ LLFloaterReg::add("marketplace_listings", "floater_marketplace_listings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMarketplaceListings>);
LLFloaterReg::add("message_critical", "floater_critical.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTOS>);
LLFloaterReg::add("message_tos", "floater_tos.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTOS>);
LLFloaterReg::add("moveview", "floater_moveview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMove>);