diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-12-29 13:23:02 -0500 |
| commit | 5f99331f4a9ed5ed78af7b47bdad152949e63ec4 (patch) | |
| tree | 78aa91b7a1ac5f31a4e1de11f1a30d4b53561a05 /indra/newview/llscreenchannel.h | |
| parent | ed365b9c0eea12fa30629be7d26605b77eeedc05 (diff) | |
| parent | 087c105317058dc3a011c937a5aceaf87fdecc26 (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llscreenchannel.h')
| -rw-r--r-- | indra/newview/llscreenchannel.h | 2 |
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); |