diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 85dcfe606..554198299 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -208,11 +208,13 @@ static void request(
AIStateMachine* parent = NULL,
AIStateMachine::state_type new_parent_state = 0)
{
- if (responder)
- {
- // For possible debug output from within the responder.
- responder->setURL(url);
+ llassert(responder);
+
+ if (!responder) {
+ responder = new LLHTTPClient::ResponderIgnore;
}
+ // For possible debug output from within the responder.
+ responder->setURL(url);
LLURLRequest* req;
try
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index eb86f1e96..c1da6e8e5 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -293,6 +293,20 @@ void LLUICtrlFactory::buildFloaterInternal(LLFloater *floaterp, LLXMLNodePtr &ro
mBuiltFloaters[handle] = filename;
}
+//-----------------------------------------------------------------------------
+// getBuiltFloater()
+//-----------------------------------------------------------------------------
+LLFloater* LLUICtrlFactory::getBuiltFloater(const std::string name) const
+{
+ for (built_floater_t::const_iterator i = mBuiltFloaters.begin(); i != mBuiltFloaters.end(); ++i)
+ {
+ LLFloater* floater = i->first.get();
+ if (floater && floater->getName() == name)
+ return floater;
+ }
+ return NULL;
+}
+
//-----------------------------------------------------------------------------
// saveToXML()
//-----------------------------------------------------------------------------
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index 4dd0cdd73..345d25cad 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -61,6 +61,8 @@ public:
BOOL buildPanelFromBuffer(LLPanel *panelp, const std::string &buffer,
const LLCallbackMap::map_t* factory_map = NULL);
+ LLFloater* getBuiltFloater(const std::string name) const;
+
void removePanel(LLPanel* panelp) { mBuiltPanels.erase(panelp->getHandle()); }
void removeFloater(LLFloater* floaterp) { mBuiltFloaters.erase(floaterp->getHandle()); }
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a3a0880ee..75eea9830 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -192,7 +192,7 @@
Type
U32
Value
- 32
+ 12
HTTPMinRequests
+ HTTPThrottleBandwidth
+
TeleportHistoryMaxEntries
+ ShowSimChannel
+
MoyFastMiniMap
+ FloaterFavoritesRect
+
FloaterFindRect2
+ FloaterMyOutfitsRect
+
FloaterObjectIMInfo