diff options
| author | Don Kjer <don@lindenlab.com> | 2012-10-17 23:12:52 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-10-17 23:12:52 +0000 |
| commit | a32dbd314809e7d0093745f0bbcb3628320f8c5e (patch) | |
| tree | f08973b9250835a7ef6fa61a90dfb43a2a30e183 /indra/llcharacter/llvisualparam.cpp | |
| parent | 98e2488f6fd64eb428fcc8f659cb7f0d82196449 (diff) | |
| parent | 2390e21a9d2fc6f5cabe132a2bbd807aec186cfa (diff) | |
automated merge
Diffstat (limited to 'indra/llcharacter/llvisualparam.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llcharacter/llvisualparam.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/indra/llcharacter/llvisualparam.cpp b/indra/llcharacter/llvisualparam.cpp index 255f61b1b3..826f76bae0 100644..100755 --- a/indra/llcharacter/llvisualparam.cpp +++ b/indra/llcharacter/llvisualparam.cpp @@ -168,7 +168,8 @@ LLVisualParam::LLVisualParam() mIsAnimating( FALSE ), mID( -1 ), mInfo( 0 ), - mIsDummy(FALSE) + mIsDummy(FALSE), + mParamLocation(LOC_UNKNOWN) { } @@ -320,3 +321,20 @@ void LLVisualParam::resetDrivenParams() // nothing to do for non-driver parameters return; } + +void LLVisualParam::setParamLocation(EParamLocation loc) +{ + if (mParamLocation == LOC_UNKNOWN || loc == LOC_UNKNOWN) + { + mParamLocation = loc; + } + else if (mParamLocation == loc) + { + // no action + } + else + { + llwarns << "param location is already " << mParamLocation << ", not slamming to " << loc << llendl; + } +} + |