summaryrefslogtreecommitdiff
path: root/indra/newview/llscreenchannel.h
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-07-02 08:56:49 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2010-07-02 08:56:49 -0700
commit6098fd2ebcd1bd78a8f8c638f707e8a14033df9b (patch)
tree9e296f4096ee670237e9545ee0e9c083c6ad5dbd /indra/newview/llscreenchannel.h
parentf1a1f613cf035d9c8e15c03bac7b00972eb3bb66 (diff)
parent5fd6887477b61e10ffd29086b9330a54b3a571d2 (diff)
Automated merge with ssh://hg.lindenlab.com/brad/viewer-dev
Diffstat (limited to 'indra/newview/llscreenchannel.h')
-rw-r--r--indra/newview/llscreenchannel.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index 46c5fed7b6..160635974d 100644
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -65,6 +65,8 @@ 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);
+
+ bool resetPositionAndSize(const LLSD& newvalue);
// initialization of channel's shape and position
virtual void init(S32 channel_left, S32 channel_right);