diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-08-05 18:45:18 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-08-05 18:45:18 -0700 |
| commit | a8d216e194327c7bee8a42c983f7f2ca01adb385 (patch) | |
| tree | 76819d6e78c7e7cf0c5e54d319847f4731c77205 /indra/newview/llpanelclassified.cpp | |
| parent | 860a82863966435bea680d8541f051e99a6c226c (diff) | |
| parent | 24d146a9ff26af1f3e4cf5af2c5238ca42e2c6c7 (diff) | |
Merged in my DEV-35401 "doubleton" fix.
Diffstat (limited to 'indra/newview/llpanelclassified.cpp')
| -rw-r--r-- | indra/newview/llpanelclassified.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp index df687ffb30..42522942f3 100644 --- a/indra/newview/llpanelclassified.cpp +++ b/indra/newview/llpanelclassified.cpp @@ -55,7 +55,6 @@ #include "llcommandhandler.h" // for classified HTML detail page click tracking #include "llviewercontrol.h" #include "lllineeditor.h" -#include "llfloaterclassified.h" #include "lltextbox.h" #include "llcombobox.h" #include "llviewertexteditor.h" @@ -1063,7 +1062,7 @@ void LLPanelClassified::sendClassifiedClickMessage(const std::string& type) //////////////////////////////////////////////////////////////////////////////////////////// LLFloaterPriceForListing::LLFloaterPriceForListing() -: LLFloater(), +: LLFloater(LLSD()), mCallback(NULL), mUserData(NULL) { } @@ -1099,7 +1098,7 @@ void LLFloaterPriceForListing::show( void (*callback)(S32, std::string, void*), LLFloaterPriceForListing *self = new LLFloaterPriceForListing(); // Builds and adds to gFloaterView - LLUICtrlFactory::getInstance()->buildFloater(self, "floater_price_for_listing.xml"); + LLUICtrlFactory::getInstance()->buildFloater(self, "floater_price_for_listing.xml", NULL); self->center(); self->mCallback = callback; |