diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-15 06:14:10 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-15 06:14:10 +0800 |
| commit | 055fe5f69edf4c51c3d4cf9794148b167ce847ab (patch) | |
| tree | 9775110b56997048b3bf2a178fa87046ed10319a | |
| parent | aa50b72f97114d2e4a45d6224590e97e12e17290 (diff) | |
| parent | 2c0db0cd0c00bcd0ebd3b91c5f69797443e556c3 (diff) | |
Merge tag 'Second_Life_Release#2c0db0cd-2025.06' into 2025.06
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llreflectionmap.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 0ee843cc60..b26a34e470 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -7.2.0 +7.2.1 diff --git a/indra/newview/llreflectionmap.h b/indra/newview/llreflectionmap.h index a818793550..8da18e0945 100644 --- a/indra/newview/llreflectionmap.h +++ b/indra/newview/llreflectionmap.h @@ -124,7 +124,7 @@ public: LLSpatialGroup* mGroup = nullptr; // viewer object this probe is tracking (if any) - LLPointer<LLViewerObject> mViewerObject = nullptr; + LLPointer<LLViewerObject> mViewerObject; // what priority should this probe have (higher is higher priority) // currently only 0 or 1 |