diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-06 14:33:35 -0500 |
| commit | 894e98a708f4135cb4543b95ce46c2b8c4929393 (patch) | |
| tree | 2055d289ca6c55eacb300feddb38b2935e8ae132 /indra/newview/llscreenchannel.h | |
| parent | 1ca028cd7b2b4a169cdc776dfa4b38b2fcb76440 (diff) | |
| parent | 94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (diff) | |
merge changes for storm-812
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); |