livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

viewer#2163 Crash at getReflectionProbeIsDynamic

master
Andrey Kleshchev 2024-08-01 12:40:10 +03:00 committed by Andrey Kleshchev
parent 399eb2104e
commit 848d0cb27d
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llreflectionmap.cpp
View File

@ -220,7 +220,7 @@ F32 LLReflectionMap::getNearClip()
if (mViewerObject && mViewerObject->getVolume())
{
ret = ((LLVOVolume*)mViewerObject)->getReflectionProbeNearClip();
ret = mViewerObject->getReflectionProbeNearClip();
}
else if (mGroup)
{
@ -240,7 +240,7 @@ bool LLReflectionMap::getIsDynamic()
mViewerObject &&
mViewerObject->getVolume())
{
return ((LLVOVolume*)mViewerObject)->getReflectionProbeIsDynamic();
return mViewerObject->getReflectionProbeIsDynamic();
}
return false;

4
indra/newview/llviewerobject.h
View File

@ -266,7 +266,11 @@ public:
virtual bool isRiggedMesh() const { return false; }
virtual bool hasLightTexture() const { return false; }
virtual bool isReflectionProbe() const { return false; }
virtual F32 getReflectionProbeAmbiance() const { return 0.f; }
virtual F32 getReflectionProbeNearClip() const { return 0.f; }
virtual bool getReflectionProbeIsBox() const { return false; }
virtual bool getReflectionProbeIsDynamic() const { return false; };
virtual bool getReflectionProbeIsMirror() const { return false; };
// This method returns true if the object is over land owned by
// the agent, one of its groups, or it encroaches and

8
indra/newview/llvovolume.h
View File

@ -304,11 +304,11 @@ public:
bool setReflectionProbeIsMirror(bool is_mirror);
bool isReflectionProbe() const override;
F32 getReflectionProbeAmbiance() const;
F32 getReflectionProbeNearClip() const;
F32 getReflectionProbeAmbiance() const override;
F32 getReflectionProbeNearClip() const override;
bool getReflectionProbeIsBox() const override;
bool getReflectionProbeIsDynamic() const;
bool getReflectionProbeIsMirror() const;
bool getReflectionProbeIsDynamic() const override;
bool getReflectionProbeIsMirror() const override;
// Flexible Objects
U32 getVolumeInterfaceID() const;