summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterproperties.cpp
diff options
context:
space:
mode:
authorAndrew Meadows <andrew@lindenlab.com>2010-10-11 10:40:05 -0700
committerAndrew Meadows <andrew@lindenlab.com>2010-10-11 10:40:05 -0700
commit92a8d93b0d3084c1ccd4fb9cccc285bc14d01404 (patch)
treea07a9cba41f8609a6cfc6449877ca5c2d6ddfdd9 /indra/newview/llfloaterproperties.cpp
parentc2f5bc0b129e0e0d2606a8e7849bbf37eb0276ea (diff)
parent48c2b2496d3ed6aeeebb0bc8950725f8ef7e305f (diff)
Another merge from http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llfloaterproperties.cpp')
-rw-r--r--indra/newview/llfloaterproperties.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index e4e4713dbc..dd12fa64d3 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -108,8 +108,6 @@ LLFloaterProperties::LLFloaterProperties(const LLUUID& item_id)
mDirty(TRUE)
{
mPropertiesObserver = new LLPropertiesObserver(this);
-
- //LLUICtrlFactory::getInstance()->buildFloater(this,"floater_inventory_item_properties.xml");
}
// Destroys the object