diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 15:09:18 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 15:09:18 +0100 |
| commit | 8f16be49dc86f0fca228b09ce0b788ad03482888 (patch) | |
| tree | 0ef6c9564513e1be6672b5c4cb26a285025ea838 /indra | |
| parent | 3c47d1faf1abb38ad05036de65bea3b7e21f683f (diff) | |
some fixing from the viewer-trunk merge.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index 63a684ccc4..7c6660e28b 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -1173,4 +1173,6 @@ void LLCurl::cleanupClass() { llerrs << "CURL easy handles not cleaned up on shutdown!" << llendl; } +} + diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index e5abe02afd..d5e4da41e4 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -46,7 +46,6 @@ class LLInventoryModel; class LLMenuGL; class LLCallingCardObserver; class LLViewerJointAttachment; - MESH_ICON_NAME, typedef std::vector<std::string> menuentry_vec_t; @@ -219,6 +218,7 @@ enum EInventoryIcon ANIMATION_ICON_NAME, GESTURE_ICON_NAME, + MESH_ICON_NAME, LINKITEM_ICON_NAME, LINKFOLDER_ICON_NAME, |