diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-04 16:59:57 +0000 |
| commit | a10f9639004b4eedc3b6e7b624912ff4ebd8fdc5 (patch) | |
| tree | 051625f9ac6a0d08f613cf11da318c3fd30b06a9 /indra/newview/llviewertexteditor.h | |
| parent | 62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (diff) | |
svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
Diffstat (limited to 'indra/newview/llviewertexteditor.h')
| -rw-r--r-- | indra/newview/llviewertexteditor.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h index 237c85ad53..019375b010 100644 --- a/indra/newview/llviewertexteditor.h +++ b/indra/newview/llviewertexteditor.h @@ -126,14 +126,13 @@ private: LLPointer<class LLEmbeddedNotecardOpener> mInventoryCallback; // *TODO: Add right click menus for SLURLs - //LLHandle<LLView> mPopupMenuHandle; + //LLViewHandle mPopupMenuHandle; // // Inner classes // class LLTextCmdInsertEmbeddedItem; - }; #endif // LL_VIEWERTEXTEDITOR_H |