summaryrefslogtreecommitdiff
path: root/indra/llrender/llrendernavprim.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-05-08 11:59:20 -0700
committerGraham Linden <graham@lindenlab.com>2019-05-08 11:59:20 -0700
commitbb585d95b5955effb813621942e10429ea97df1f (patch)
tree7e1364e8313052b53c5e2b4e19733d6b59b33867 /indra/llrender/llrendernavprim.cpp
parent65cb4b6d20b52ffebdc93e0e19f99520f6364dde (diff)
Fix merge by putting back loadFromFilename.
Diffstat (limited to 'indra/llrender/llrendernavprim.cpp')
0 files changed, 0 insertions, 0 deletions