diff options
author | Eli Linden <eli@lindenlab.com> | 2010-04-19 12:53:59 -0700 |
---|---|---|
committer | Eli Linden <eli@lindenlab.com> | 2010-04-19 12:53:59 -0700 |
commit | 5f80e5681c7a0e9f0fc5889ede435c79358fc639 (patch) | |
tree | ee9e5826ee220a971aa7990ef83a64644bf644d9 /indra/newview/llfolderview.h | |
parent | a1a43f7942f68e75eaadaa9c5280ac196c4ed6a7 (diff) | |
parent | 7f0a7789903809d489e9f85575be18c88df1ea98 (diff) |
Merge
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r-- | indra/newview/llfolderview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index 42390dfd17..874723bb1a 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -279,7 +279,7 @@ protected: LLScrollContainer* mScrollContainer; // NULL if this is not a child of a scroll container. void commitRename( const LLSD& data ); - static void onRenamerLost( LLFocusableElement* renamer); + void onRenamerLost( LLFocusableElement* renamer); void finishRenamingItem( void ); void closeRenamer( void ); |