diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-17 19:08:13 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-17 19:08:13 -0500 |
| commit | 521820ad8da5d269ad22fae0b6a24bb31f8d41cb (patch) | |
| tree | 3d5494f0c07c1536aff1f685e1bd86baba9d427f /indra/llinventory | |
| parent | 913eff0f675ba8938e298d24e8ef6d5c9c594acb (diff) | |
| parent | e6caf96b0a60dbbc75958ea4a74529601c51541f (diff) | |
Merge of avatar-pipeline branch into viewer2
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llinventory.h | 4 |
1 files changed, 1 insertions, 3 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); |