diff options
| author | angela <angela@lindenlab.com> | 2009-12-04 13:23:20 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-12-04 13:23:20 +0800 |
| commit | 29ed5c88c0a8aade716fed33d66ef12f7207b61e (patch) | |
| tree | 9fd971585e9b1fcb486547f84e756758884e6148 /indra/newview/llpanelobjectinventory.h | |
| parent | f9a023e69f2a9090cf80a9fce854ce14f2990543 (diff) | |
| parent | 6dcdcb191111a4ac2ea423d1d3e21673bb930b1d (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
Diffstat (limited to 'indra/newview/llpanelobjectinventory.h')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelobjectinventory.h b/indra/newview/llpanelobjectinventory.h index 6722bb212e..bc339ece35 100644 --- a/indra/newview/llpanelobjectinventory.h +++ b/indra/newview/llpanelobjectinventory.h @@ -74,6 +74,9 @@ public: virtual void deleteAllChildren(); virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string& tooltip_msg); + /*virtual*/ void onFocusLost(); + /*virtual*/ void onFocusReceived(); + static void idle(void* user_data); protected: |