summaryrefslogtreecommitdiff
path: root/indra/newview/llnamebox.cpp
diff options
context:
space:
mode:
authorSabrina Shanman <cosmic@lindenlab.com>2022-11-09 00:17:22 +0000
committerSabrina Shanman <cosmic@lindenlab.com>2022-11-09 00:17:22 +0000
commit4d961ccbaafd4e8c17359c49f1acc15967e0e29c (patch)
treeffad843bc655d1d978bee03651bdd29d321a9702 /indra/newview/llnamebox.cpp
parentded67322deb36dc842deb0e4c47022691d5ffb2b (diff)
parent4aaa48419594c993c6c1b0bd2f5585c6492b6a31 (diff)
Merged in revert-pr-1190 (pull request #1191)
Revert "SL-18523: When editing an object's material override, use the object's material override as a base, rather than its render material (pull request #1190)"
Diffstat (limited to 'indra/newview/llnamebox.cpp')
0 files changed, 0 insertions, 0 deletions