summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lloutfitgallery.cpp5
-rw-r--r--indra/newview/lloutfitgallery.h1
-rwxr-xr-xindra/newview/lloutfitslist.cpp14
-rwxr-xr-xindra/newview/lloutfitslist.h6
4 files changed, 15 insertions, 11 deletions
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 92827a7b6f..e50c35f29f 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -221,9 +221,6 @@ LLOutfitGalleryItem* LLOutfitGallery::buildGalleryItem(std::string name)
{
LLOutfitGalleryItem::Params giparams;
LLOutfitGalleryItem* gitem = LLUICtrlFactory::create<LLOutfitGalleryItem>(giparams);
- LLRect girect = LLRect(0, GALLERY_ITEM_HEIGHT - GALLERY_ITEM_HEIGHT,
- GALLERY_ITEM_WIDTH, 0);
- //gitem->setRect(girect);
gitem->reshape(GALLERY_ITEM_WIDTH, GALLERY_ITEM_HEIGHT);
gitem->setVisible(true);
gitem->setFollowsLeft();
@@ -340,7 +337,7 @@ void LLOutfitGallery::updateAddedCategory(LLUUID cat_id)
item->setRightMouseDownCallback(boost::bind(&LLOutfitListBase::outfitRightClickCallBack, this,
_1, _2, _3, cat_id));
LLWearableItemsList* list = NULL;
- item->setFocusReceivedCallback(boost::bind(&LLOutfitListBase::ñhangeOutfitSelection, this, list, cat_id));
+ item->setFocusReceivedCallback(boost::bind(&LLOutfitListBase::ChangeOutfitSelection, this, list, cat_id));
if (galleryCreated)
{
addToGallery(item);
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index 01d56d917f..323e2580f6 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -104,7 +104,6 @@ private:
LLPanel* buildLayoutPanel(int left);
LLPanel* buildLayoutStak(int left, int bottom);
void moveLayoutStak(LLPanel* stack, int left, int bottom);
- LLView* mView;
std::vector<LLPanel*> mStacks;
std::vector<LLPanel*> mPanels;
std::vector<LLOutfitGalleryItem*> mItems;
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 736da5d411..2b99391dc8 100755
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -227,7 +227,7 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
_1, _2, _3, cat_id));
// Setting tab focus callback to monitor currently selected outfit.
- tab->setFocusReceivedCallback(boost::bind(&LLOutfitListBase::ñhangeOutfitSelection, this, list, cat_id));
+ tab->setFocusReceivedCallback(boost::bind(&LLOutfitListBase::ChangeOutfitSelection, this, list, cat_id));
// Setting callback to reset items selection inside outfit on accordion collapsing and expanding (EXT-7875)
tab->setDropDownStateChangedCallback(boost::bind(&LLOutfitsList::resetItemSelection, this, list, cat_id));
@@ -469,7 +469,7 @@ void LLOutfitsList::onListSelectionChange(LLUICtrl* ctrl)
LLViewerInventoryItem *item = gInventory.getItem(list->getSelectedUUID());
if (!item) return;
- ñhangeOutfitSelection(list, item->getParentUUID());
+ ChangeOutfitSelection(list, item->getParentUUID());
}
void LLOutfitListBase::performAction(std::string action)
@@ -508,7 +508,7 @@ void LLOutfitsList::onSetSelectedOutfitByUUID(const LLUUID& outfit_uuid)
if (!list) continue;
tab->setFocus(TRUE);
- ñhangeOutfitSelection(list, outfit_uuid);
+ ChangeOutfitSelection(list, outfit_uuid);
tab->setDisplayChildren(true);
}
@@ -1198,7 +1198,7 @@ void LLOutfitListBase::outfitRightClickCallBack(LLUICtrl* ctrl, S32 x, S32 y, co
onOutfitRightClick(ctrl, x, y, cat_id);
}
-void LLOutfitListBase::ñhangeOutfitSelection(LLWearableItemsList* list, const LLUUID& category_id)
+void LLOutfitListBase::ChangeOutfitSelection(LLWearableItemsList* list, const LLUUID& category_id)
{
onChangeOutfitSelection(list, category_id);
mSelectedOutfitUUID = category_id;
@@ -1335,6 +1335,9 @@ LLOutfitListGearMenuBase::LLOutfitListGearMenuBase(LLOutfitListBase* olist)
llassert(mMenu);
}
+LLOutfitListGearMenuBase::~LLOutfitListGearMenuBase()
+{}
+
void LLOutfitListGearMenuBase::updateItemsVisibility()
{
onUpdateItemsVisibility();
@@ -1472,6 +1475,9 @@ LLOutfitListGearMenu::LLOutfitListGearMenu(LLOutfitListBase* olist)
: LLOutfitListGearMenuBase(olist)
{}
+LLOutfitListGearMenu::~LLOutfitListGearMenu()
+{}
+
void LLOutfitListGearMenu::onUpdateItemsVisibility()
{
if (!mMenu) return;
diff --git a/indra/newview/lloutfitslist.h b/indra/newview/lloutfitslist.h
index f4b02991e5..9495866d73 100755
--- a/indra/newview/lloutfitslist.h
+++ b/indra/newview/lloutfitslist.h
@@ -76,7 +76,7 @@ public:
void computeDifference(const LLInventoryModel::cat_array_t& vcats, uuid_vec_t& vadded, uuid_vec_t& vremoved);
// highlights currently worn outfit in list and unhighlights previously worn
void highlightBaseOutfit();
- void ñhangeOutfitSelection(LLWearableItemsList* list, const LLUUID& category_id);
+ void ChangeOutfitSelection(LLWearableItemsList* list, const LLUUID& category_id);
virtual void getCurrentCategories(uuid_vec_t& vcur) = 0;
@@ -153,7 +153,8 @@ class LLOutfitListGearMenuBase
{
public:
LLOutfitListGearMenuBase(LLOutfitListBase* olist);
-
+ virtual ~LLOutfitListGearMenuBase();
+
void updateItemsVisibility();
LLToggleableMenu* getMenu();
@@ -183,6 +184,7 @@ class LLOutfitListGearMenu : public LLOutfitListGearMenuBase
{
public:
LLOutfitListGearMenu(LLOutfitListBase* olist);
+ virtual ~LLOutfitListGearMenu();
protected:
/*virtual*/ void onUpdateItemsVisibility();