diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-15 15:27:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-15 15:27:36 +0300 |
| commit | 4ddaeb377271361f4a104774709d4ba31568e9de (patch) | |
| tree | 0c19f415cb30983169a1a6aa3559b83841ee78e3 /indra/llui/llvirtualtrackball.cpp | |
| parent | 26f70456d1e9059c48d25e08fc07f893315b1f3c (diff) | |
| parent | 363b89947c580e1056cb5f4ae32ebfd9eaf12a17 (diff) | |
Merge pull request #1477 from secondlife/marchcat/x-c-merge
Maint X -> Maint C 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 |