summaryrefslogtreecommitdiff
path: root/indra/newview/llscreenchannel.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-04 16:45:08 -0500
committerOz Linden <oz@lindenlab.com>2011-01-04 16:45:08 -0500
commit78895f9e0c628dc33268578faf135e967cf30142 (patch)
tree6bca9250bf59591dce7636de42efe3cf293a232f /indra/newview/llscreenchannel.h
parent09c7d38166e3f5d04ed6321b2ac06c4112bb858b (diff)
parent562ed9c4d463ccb96dd4e6b23dff6ad6c845fc96 (diff)
merge changes for storm-467
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);