diff options
| -rw-r--r-- | indra/llinventory/llinventory.h | 4 | ||||
| -rw-r--r-- | indra/newview/llpanellandmarks.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/llpanellandmarks.h | 8 |
3 files changed, 13 insertions, 15 deletions
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h index 3de9d14f54..9faecbea85 100644 --- a/indra/llinventory/llinventory.h +++ b/indra/llinventory/llinventory.h @@ -35,7 +35,6 @@ #include <functional> -#include "llassetstorage.h" #include "lldarray.h" #include "llfoldertype.h" #include "llinventorytype.h" @@ -45,7 +44,6 @@ #include "llsaleinfo.h" #include "llsd.h" #include "lluuid.h" -#include "llxmlnode.h" // consts for Key field in the task inventory update message extern const U8 TASK_INVENTORY_ITEM_KEY; @@ -357,7 +355,7 @@ protected: typedef std::list<LLPointer<LLInventoryObject> > InventoryObjectList; -// These functions convert between structured data and an inventroy +// These functions convert between structured data and an inventory // item, appropriate for serialization. LLSD ll_create_sd_from_inventory_item(LLPointer<LLInventoryItem> item); //LLPointer<LLInventoryItem> ll_create_item_from_sd(const LLSD& sd_item); diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp index ce1a7f98df..e199db37ab 100644 --- a/indra/newview/llpanellandmarks.cpp +++ b/indra/newview/llpanellandmarks.cpp @@ -97,10 +97,10 @@ BOOL LLLandmarksPanel::postBuild() U32 sort_order = gSavedSettings.getU32(LLInventoryPanel::DEFAULT_SORT_ORDER); mSortByDate = sort_order & LLInventoryFilter::SO_DATE; - initFavoritesInventroyPanel(); - initLandmarksInventroyPanel(); - initMyInventroyPanel(); - initLibraryInventroyPanel(); + initFavoritesInventoryPanel(); + initLandmarksInventoryPanel(); + initMyInventoryPanel(); + initLibraryInventoryPanel(); getChild<LLAccordionCtrlTab>("tab_favorites")->setDisplayChildren(true); getChild<LLAccordionCtrlTab>("tab_landmarks")->setDisplayChildren(true); @@ -357,7 +357,7 @@ void LLLandmarksPanel::setErrorStatus(U32 status, const std::string& reason) // PRIVATE METHODS ////////////////////////////////////////////////////////////////////////// -void LLLandmarksPanel::initFavoritesInventroyPanel() +void LLLandmarksPanel::initFavoritesInventoryPanel() { mFavoritesInventoryPanel = getChild<LLInventorySubTreePanel>("favorites_list"); @@ -366,7 +366,7 @@ void LLLandmarksPanel::initFavoritesInventroyPanel() initAccordion("tab_favorites", mFavoritesInventoryPanel); } -void LLLandmarksPanel::initLandmarksInventroyPanel() +void LLLandmarksPanel::initLandmarksInventoryPanel() { mLandmarksInventoryPanel = getChild<LLInventorySubTreePanel>("landmarks_list"); @@ -380,7 +380,7 @@ void LLLandmarksPanel::initLandmarksInventroyPanel() initAccordion("tab_landmarks", mLandmarksInventoryPanel); } -void LLLandmarksPanel::initMyInventroyPanel() +void LLLandmarksPanel::initMyInventoryPanel() { mMyInventoryPanel= getChild<LLInventorySubTreePanel>("my_inventory_list"); @@ -389,7 +389,7 @@ void LLLandmarksPanel::initMyInventroyPanel() initAccordion("tab_inventory", mMyInventoryPanel); } -void LLLandmarksPanel::initLibraryInventroyPanel() +void LLLandmarksPanel::initLibraryInventoryPanel() { mLibraryInventoryPanel = getChild<LLInventorySubTreePanel>("library_list"); diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index 745f9364c2..097d79badf 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -78,10 +78,10 @@ protected: /*virtual*/ void setErrorStatus(U32 status, const std::string& reason); private: - void initFavoritesInventroyPanel(); - void initLandmarksInventroyPanel(); - void initMyInventroyPanel(); - void initLibraryInventroyPanel(); + void initFavoritesInventoryPanel(); + void initLandmarksInventoryPanel(); + void initMyInventoryPanel(); + void initLibraryInventoryPanel(); void initLandmarksPanel(LLInventorySubTreePanel* inventory_list); void initAccordion(const std::string& accordion_tab_name, LLInventorySubTreePanel* inventory_list); void onAccordionExpandedCollapsed(const LLSD& param, LLInventorySubTreePanel* inventory_list); |