diff options
author | Seth ProductEngine <slitovchuk@productengine.com> | 2011-09-30 15:59:38 +0300 |
---|---|---|
committer | Seth ProductEngine <slitovchuk@productengine.com> | 2011-09-30 15:59:38 +0300 |
commit | 4ac6eed116a888e113d6f4f031e57e09a141b55a (patch) | |
tree | df6e87ff58a6008dbe1006874ba5a53af91d1871 /indra/newview/llscreenchannel.h | |
parent | 66e21e0330b2f66b986a1ed76873af9752dcf2e1 (diff) | |
parent | 9d3fc5d930bd1dae07771350080e5140c0113891 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llscreenchannel.h')
-rw-r--r-- | indra/newview/llscreenchannel.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h index d207d13981..8f11c82673 100644 --- a/indra/newview/llscreenchannel.h +++ b/indra/newview/llscreenchannel.h @@ -59,7 +59,6 @@ public: // Channel's outfit-functions // update channel's size and position in the World View virtual void updatePositionAndSize(LLRect old_world_rect, LLRect new_world_rect); - void resetPositionAndSize(); // initialization of channel's shape and position virtual void init(S32 channel_left, S32 channel_right); |