1 files changed, 13 insertions, 5 deletions

diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 98228d5..a51d8e4 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -173,7 +173,7 @@ std::vector<LLString> LLUICtrlFactory::mXUIPaths;
 class LLUICtrlLocate : public LLUICtrl
 {
 public:
-        LLUICtrlLocate() : LLUICtrl("locate", LLRect(0,0,0,0), FALSE, NULL, NULL) {}
+        LLUICtrlLocate() : LLUICtrl("locate", LLRect(0,0,0,0), FALSE, NULL, NULL) { setTabStop(FALSE); }
         virtual void draw() { }
 
         virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_LOCATE; }
@@ -181,7 +181,11 @@ public:
 
         static LLView *fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
         {
+                LLString name("pad");
+                node->getAttributeString("name", name);
+
                 LLUICtrlLocate *new_ctrl = new LLUICtrlLocate();
+                new_ctrl->setName(name);
                 new_ctrl->initFromXML(node, parent);
                 return new_ctrl;
         }
@@ -196,6 +200,7 @@ LLUICtrlFactory::LLUICtrlFactory()
         LLUICtrlCreator<LLButton>::registerCreator(LL_BUTTON_TAG, this);
         LLUICtrlCreator<LLCheckBoxCtrl>::registerCreator(LL_CHECK_BOX_CTRL_TAG, this);
         LLUICtrlCreator<LLComboBox>::registerCreator(LL_COMBO_BOX_TAG, this);
+        LLUICtrlCreator<LLFlyoutButton>::registerCreator(LL_FLYOUT_BUTTON_TAG, this);
         LLUICtrlCreator<LLLineEditor>::registerCreator(LL_LINE_EDITOR_TAG, this);
         LLUICtrlCreator<LLSearchEditor>::registerCreator(LL_SEARCH_EDITOR_TAG, this);
         LLUICtrlCreator<LLScrollListCtrl>::registerCreator(LL_SCROLL_LIST_CTRL_TAG, this);
@@ -282,8 +287,11 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &filename, LLXMLNodePtr&
         
         if (!LLXMLNode::parseFile(mXUIPaths.front() + filename, root, NULL))
         {       
-                llwarns << "Problem reading UI description file: " << mXUIPaths.front() + filename << llendl;
-                return FALSE;
+                if (!LLXMLNode::parseFile(filename, root, NULL))
+                {
+                        llwarns << "Problem reading UI description file: " << mXUIPaths.front() + filename << llendl;
+                        return FALSE;
+                }
         }
 
         LLXMLNodePtr updateRoot;