diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-10-16 09:42:46 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-10-16 09:42:46 -0400 |
| commit | 4a0a88ed335e9082fe1acfbdf2593e179304b64e (patch) | |
| tree | 6739972ed137d372bcf2dc000df56a4b7db02400 /indra/llcharacter/llvisualparam.cpp | |
| parent | cc5f8686feee4efea124d582b99990dd987e1e98 (diff) | |
| parent | 22f53c85588912582f33d840d106b10f54f2c62d (diff) | |
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..1934ed55d3 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) + { + mParamLocation = loc; + } + else if (mParamLocation == loc) + { + // no action + } + else + { + llwarns << "param location is already " << mParamLocation << ", not slamming to " << loc << llendl; + } +} + |