summaryrefslogtreecommitdiff
path: root/indra/lscript
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-03-26 17:30:51 +0000
committerJosh Bell <josh@lindenlab.com>2007-03-26 17:30:51 +0000
commit64395d21592ecd35b6f476d38df1a46bd8edc1a8 (patch)
tree540c56abb3a48fd0cc4694c716ee5d2711ef3095 /indra/lscript
parent720eab7a32555dabf3562280e86f232465a0e220 (diff)
Effectively: merge 59238:59702 Branch_1-13-4 --> release EXCEPT for the back out (r59497) and re-patch (r59531) of upload-queue, and fixes merged directly from Maintenance.
merge -r 59328:59428 Branch_1-13-4 --> release * address regex needs "s" option to support multiline addresses. Patched previously, not sure how it got dropped. * added new promo code to accommodate printer error * Fix for SL-37108 "SVC-55: look at may be broken" * Paired/reviewed with Qarl * Release notes for Release Notes for 1.13.4(59329) * merge release-candidate@58928 long-live-legacy-particles@59317 -> Branch_1-13-14 SKIP -r 59428:59437 (temporary), 59437:59465 (from release), 59465:59497 (back out of upload-queue) merge -r 59497:59510 Branch_1-13-4 --> release * SL-37932 legacy particle clean up * SL-33228 llParticleSystem( [] ) may not shut down reliably * SL-37909 llParticleSystem([ ]) bug now affects unlinked and root prims SKIP -r 59510:59531 (re-patch of upload-queue) merge -r 59531:59585 Branch_1-13-4 --> release * blacklist and release notes updates SKIP -r 59585:59656 (patches from maintenance) merge -r 59656:59691 Branch_1-13-4 --> release * blacklist and release notes updates SKIP -r 59691:59702 (already ported to release)
Diffstat (limited to 'indra/lscript')
-rw-r--r--indra/lscript/lscript_library.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/lscript/lscript_library.h b/indra/lscript/lscript_library.h
index 007d36fbcd..ed6e3bc1de 100644
--- a/indra/lscript/lscript_library.h
+++ b/indra/lscript/lscript_library.h
@@ -407,11 +407,11 @@ public:
}
}
- LLScriptLibData(LLVector3 &vec) : mType(LST_VECTOR), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(vec), mQuat(), mListp(NULL)
+ LLScriptLibData(const LLVector3 &vec) : mType(LST_VECTOR), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(vec), mQuat(), mListp(NULL)
{
}
- LLScriptLibData(LLQuaternion &quat) : mType(LST_QUATERNION), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(), mQuat(quat), mListp(NULL)
+ LLScriptLibData(const LLQuaternion &quat) : mType(LST_QUATERNION), mInteger(0), mFP(0.f), mKey(NULL), mString(NULL), mVec(), mQuat(quat), mListp(NULL)
{
}