diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-01 08:16:58 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-01 08:16:58 +0300 |
| commit | 38c2a5bde985a6a8a96d912d432f8bdf7e5b60be (patch) | |
| tree | b3469444ea8dabe4e76a8a265ac086a9db78891c /indra/llui/llvirtualtrackball.cpp | |
| parent | 9bf2dfbb39032d7407295089cf181de0987083e5 (diff) | |
| parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) | |
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
Diffstat (limited to 'indra/llui/llvirtualtrackball.cpp')
| -rw-r--r-- | indra/llui/llvirtualtrackball.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llvirtualtrackball.cpp b/indra/llui/llvirtualtrackball.cpp index 6e0aef740d..deb357cd9f 100644 --- a/indra/llui/llvirtualtrackball.cpp +++ b/indra/llui/llvirtualtrackball.cpp @@ -83,7 +83,7 @@ LLVirtualTrackball::LLVirtualTrackball(const LLVirtualTrackball::Params& p) mBorder = LLUICtrlFactory::create<LLViewBorder>(border); addChild(mBorder); - + LLButton::Params btn_rt = p.btn_rotate_top; btn_rt.rect(LLRect(centerX - axis_offset_lt, border_rect.mTop, centerX + axis_offset_rb, border_rect.mTop - btn_size)); btn_rt.click_callback.function(boost::bind(&LLVirtualTrackball::onRotateTopClick, this)); @@ -247,7 +247,7 @@ void LLVirtualTrackball::onRotateTopClick() if (getEnabled()) { LLQuaternion delta; - delta.setAngleAxis(mIncrementBtn, 1, 0, 0); + delta.setAngleAxis(mIncrementBtn, 1, 0, 0); mValue *= delta; setValueAndCommit(mValue); @@ -316,7 +316,7 @@ void LLVirtualTrackball::onRotateRightMouseEnter() void LLVirtualTrackball::setValue(const LLSD& value) { - if (value.isArray() && value.size() == 4) + if (value.isArray() && value.size() == 4) { mValue.setValue(value); } @@ -334,7 +334,7 @@ void LLVirtualTrackball::setValue(F32 x, F32 y, F32 z, F32 w) void LLVirtualTrackball::setValueAndCommit(const LLQuaternion &value) { - mValue = value; + mValue = value; onCommit(); } @@ -345,7 +345,7 @@ LLSD LLVirtualTrackball::getValue() const LLQuaternion LLVirtualTrackball::getRotation() const { - return mValue; + return mValue; } // static |