diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-06-04 17:39:39 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-06-04 17:39:39 -0700 |
| commit | 7889df945b0d6bb23f864ba8d1ede16f67a27c8e (patch) | |
| tree | f7c94c4cb0a349cef5b2967466855936ee8af7ff /indra/newview/llagentbenefits.cpp | |
| parent | 6161d2f479868508f41d1236ee819a667fbd7f9f (diff) | |
| parent | 9f97ff7286aceef5be4e7589ca4af911edf30f12 (diff) | |
Merge remote-tracking branch 'origin/release/materials_featurette' into project/gltf_development
Diffstat (limited to 'indra/newview/llagentbenefits.cpp')
| -rw-r--r-- | indra/newview/llagentbenefits.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentbenefits.cpp b/indra/newview/llagentbenefits.cpp index 4ac4d2136f..e9f00f6556 100644 --- a/indra/newview/llagentbenefits.cpp +++ b/indra/newview/llagentbenefits.cpp @@ -175,7 +175,7 @@ S32 LLAgentBenefits::getTextureUploadCost(const LLViewerTexture* tex) const return getTextureUploadCost(); } } - return getTextureUploadCost(); + return 0; } S32 LLAgentBenefits::getTextureUploadCost(const LLImageBase* tex) const |