diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-07-01 15:38:19 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-07-01 15:38:19 -0600 |
| commit | d875b34de0dbc34d5435fe1f87822a70974851d6 (patch) | |
| tree | 54b73e766e55010d3ba5ace29e170ed0cae7cbcc /indra/newview/llwearable.h | |
| parent | ddf87b874a0841a65ec95d2d8ed4764412cd394c (diff) | |
| parent | 9fafe9853ad00dea98c39dc4501eedf4b5970207 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra/newview/llwearable.h')
| -rw-r--r-- | indra/newview/llwearable.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h index 34a231c4bb..9ca8a9c3f9 100644 --- a/indra/newview/llwearable.h +++ b/indra/newview/llwearable.h @@ -164,8 +164,7 @@ private: te_map_t mTEMap; // maps TE to LocalTextureObject te_map_t mSavedTEMap; // last saved version of TEMap - LLUUID mItemID; // ID of the inventory item in the agent's inventory - LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList ; + LLUUID mItemID; // ID of the inventory item in the agent's inventory }; #endif // LL_LLWEARABLE_H |