diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-15 18:49:02 +0000 |
| commit | aeb6d0c93c1122c1320f99c1a652a5e2f1d60d52 (patch) | |
| tree | 5aedb2a22e54d9c2c2fe9389d4ad6cebe891c5f1 /indra/newview/lljoystickbutton.h | |
| parent | dbf45ad4294a59c050982b5a417fe86272026454 (diff) | |
svn merge -r 56599:56738 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/lljoystickbutton.h')
| -rw-r--r-- | indra/newview/lljoystickbutton.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h index a9a8acdfaf..8b0a5665d4 100644 --- a/indra/newview/lljoystickbutton.h +++ b/indra/newview/lljoystickbutton.h @@ -75,7 +75,7 @@ public: virtual void onHeldDown(); - static LLView* LLJoystickAgentTurn::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); + static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); }; @@ -96,7 +96,7 @@ public: virtual void onHeldDown(); virtual void onMouseUp(); - static LLView* LLJoystickAgentSlide::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); + static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory); }; |