summaryrefslogtreecommitdiff
path: root/indra/newview/llscreenchannel.h
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-01-07 10:48:38 -0800
committerDon Kjer <don@lindenlab.com>2011-01-07 10:48:38 -0800
commit829c2c86975dd80d13008c38246fa8ea0d10529c (patch)
treee90bda161771de9f3fcd98e2806e8eed7c4222fc /indra/newview/llscreenchannel.h
parenta9bc51e6416dd637080c0307de99d5e09d06dcc4 (diff)
parentc132d20a7433e2d09e3521a15497f661fcbd18b8 (diff)
Merge from viewer-development
Diffstat (limited to 'indra/newview/llscreenchannel.h')
-rw-r--r--indra/newview/llscreenchannel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llscreenchannel.h b/indra/newview/llscreenchannel.h
index c536a21779..d207d13981 100644
--- a/indra/newview/llscreenchannel.h
+++ b/indra/newview/llscreenchannel.h
@@ -59,8 +59,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);
+ void resetPositionAndSize();
- bool resetPositionAndSize(const LLSD& newvalue);
// initialization of channel's shape and position
virtual void init(S32 channel_left, S32 channel_right);