diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index e0e2c4bab2..b3e39811b3 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -901,7 +901,8 @@ namespace OpenSim.Data.MySQL
                          "covenant, covenant_datetime, Sandbox, sunvectorx, sunvectory, " +
                          "sunvectorz, loaded_creation_datetime, " +
                          "loaded_creation_id, map_tile_ID, block_search, casino, " +
-                         "TelehubObject, parcel_tile_ID, cacheID) " +
+                         "TelehubObject, parcel_tile_ID, cacheID, " +
+                         "TerrainPBR1, TerrainPBR2, TerrainPBR3, TerrainPBR4)" +
                           "values (?RegionUUID, ?BlockTerraform, " +
                          "?BlockFly, ?AllowDamage, ?RestrictPushing, " +
                          "?AllowLandResell, ?AllowLandJoinDivide, " +
@@ -918,7 +919,8 @@ namespace OpenSim.Data.MySQL
                          "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                          "?loaded_creation_datetime, ?loaded_creation_id, " +
                          "?map_tile_ID, ?block_search, ?casino, " +
-                         "?TelehubObject, ?parcel_tile_ID, ?cacheID)";
+                         "?TelehubObject, ?parcel_tile_ID, ?cacheID, " +
+                         "?TerrainPBR1, ?TerrainPBR2, ?TerrainPBR3, ?TerrainPBR4)";
 
                     FillRegionSettingsCommand(cmd, rs);
                     ExecuteNonQuery(cmd);
@@ -1298,6 +1300,11 @@ namespace OpenSim.Data.MySQL
             if (row["cacheID"] is not DBNull)
                 newSettings.CacheID = DBGuid.FromDB(row["cacheID"]);
 
+            newSettings.TerrainPBR1 = DBGuid.FromDB(row["TerrainPBR1"]);
+            newSettings.TerrainPBR2 = DBGuid.FromDB(row["TerrainPBR2"]);
+            newSettings.TerrainPBR3 = DBGuid.FromDB(row["TerrainPBR3"]);
+            newSettings.TerrainPBR4 = DBGuid.FromDB(row["TerrainPBR4"]);
+
 
             return newSettings;
         }
@@ -1700,6 +1707,11 @@ namespace OpenSim.Data.MySQL
             cmd.Parameters.AddWithValue("parcel_tile_ID", settings.ParcelImageID.ToString());
             cmd.Parameters.AddWithValue("TelehubObject", settings.TelehubObject.ToString());
             cmd.Parameters.AddWithValue("cacheID", settings.CacheID.ToString());
+
+            cmd.Parameters.AddWithValue("TerrainPBR1", settings.TerrainPBR1.ToString());
+            cmd.Parameters.AddWithValue("TerrainPBR2", settings.TerrainPBR2.ToString());
+            cmd.Parameters.AddWithValue("TerrainPBR3", settings.TerrainPBR3.ToString());
+            cmd.Parameters.AddWithValue("TerrainPBR4", settings.TerrainPBR4.ToString());
         }
 
         /// <summary>
diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 918d3df7d7..1e949c6a89 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -558,4 +558,12 @@ COMMIT;
 :VERSION 65         #----- add linkset data binary storage column
 BEGIN;
 ALTER TABLE `prims` ADD COLUMN `lnkstBinData` blob default NULL;
+COMMIT;
+
+:VERSION 66         #----- add PBR Terrain storage column
+BEGIN;
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR1` varchar(36) NOT NULL;
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR2` varchar(36) NOT NULL;
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR3` varchar(36) NOT NULL;
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR4` varchar(36) NOT NULL;
 COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
index efc8bc88ed..155594f33c 100755
--- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs
@@ -957,7 +957,8 @@ namespace OpenSim.Data.PGSQL
 ,block_show_in_search = :block_show_in_search ,agent_limit = :agent_limit ,object_bonus = :object_bonus ,maturity = :maturity
 ,disable_scripts = :disable_scripts ,disable_collisions = :disable_collisions ,disable_physics = :disable_physics
 ,terrain_texture_1 = :terrain_texture_1 ,terrain_texture_2 = :terrain_texture_2 ,terrain_texture_3 = :terrain_texture_3
-,terrain_texture_4 = :terrain_texture_4 ,elevation_1_nw = :elevation_1_nw ,elevation_2_nw = :elevation_2_nw
+,terrain_texture_4 = :terrain_texture_4 , TerrainPBR1 = :TerrainPBR1, TerrainPBR2 = :TerrainPBR2, TerrainPBR3 = :TerrainPBR3
+,TerrainPBR4 = :TerrainPBR4, elevation_1_nw = :elevation_1_nw ,elevation_2_nw = :elevation_2_nw
 ,elevation_1_ne = :elevation_1_ne ,elevation_2_ne = :elevation_2_ne ,elevation_1_se = :elevation_1_se ,elevation_2_se = :elevation_2_se
 ,elevation_1_sw = :elevation_1_sw ,elevation_2_sw = :elevation_2_sw ,water_height = :water_height ,terrain_raise_limit = :terrain_raise_limit
 ,terrain_lower_limit = :terrain_lower_limit ,use_estate_sun = :use_estate_sun ,fixed_sun = :fixed_sun ,sun_position = :sun_position
@@ -1080,6 +1081,12 @@ namespace OpenSim.Data.PGSQL
 
             if (!(row["cacheID"] is DBNull))
                 newSettings.CacheID = new UUID((Guid)row["cacheID"]);
+
+            newSettings.TerrainPBR1 = new UUID((Guid)row["TerrainPBR1"]);
+            newSettings.TerrainPBR2 = new UUID((Guid)row["TerrainPBR2"]);
+            newSettings.TerrainPBR3 = new UUID((Guid)row["TerrainPBR3"]);
+            newSettings.TerrainPBR4 = new UUID((Guid)row["TerrainPBR4"]);
+
             return newSettings;
         }
 
@@ -1552,53 +1559,57 @@ namespace OpenSim.Data.PGSQL
         /// <returns></returns>
         private NpgsqlParameter[] CreateRegionSettingParameters(RegionSettings settings)
         {
-            List<NpgsqlParameter> parameters = new List<NpgsqlParameter>();
-
-            parameters.Add(_Database.CreateParameter("regionUUID", settings.RegionUUID));
-            parameters.Add(_Database.CreateParameter("block_terraform", settings.BlockTerraform));
-            parameters.Add(_Database.CreateParameter("block_fly", settings.BlockFly));
-            parameters.Add(_Database.CreateParameter("allow_damage", settings.AllowDamage));
-            parameters.Add(_Database.CreateParameter("restrict_pushing", settings.RestrictPushing));
-            parameters.Add(_Database.CreateParameter("allow_land_resell", settings.AllowLandResell));
-            parameters.Add(_Database.CreateParameter("allow_land_join_divide", settings.AllowLandJoinDivide));
-            parameters.Add(_Database.CreateParameter("block_show_in_search", settings.BlockShowInSearch));
-            parameters.Add(_Database.CreateParameter("agent_limit", settings.AgentLimit));
-            parameters.Add(_Database.CreateParameter("object_bonus", settings.ObjectBonus));
-            parameters.Add(_Database.CreateParameter("maturity", settings.Maturity));
-            parameters.Add(_Database.CreateParameter("disable_scripts", settings.DisableScripts));
-            parameters.Add(_Database.CreateParameter("disable_collisions", settings.DisableCollisions));
-            parameters.Add(_Database.CreateParameter("disable_physics", settings.DisablePhysics));
-            parameters.Add(_Database.CreateParameter("terrain_texture_1", settings.TerrainTexture1));
-            parameters.Add(_Database.CreateParameter("terrain_texture_2", settings.TerrainTexture2));
-            parameters.Add(_Database.CreateParameter("terrain_texture_3", settings.TerrainTexture3));
-            parameters.Add(_Database.CreateParameter("terrain_texture_4", settings.TerrainTexture4));
-            parameters.Add(_Database.CreateParameter("elevation_1_nw", settings.Elevation1NW));
-            parameters.Add(_Database.CreateParameter("elevation_2_nw", settings.Elevation2NW));
-            parameters.Add(_Database.CreateParameter("elevation_1_ne", settings.Elevation1NE));
-            parameters.Add(_Database.CreateParameter("elevation_2_ne", settings.Elevation2NE));
-            parameters.Add(_Database.CreateParameter("elevation_1_se", settings.Elevation1SE));
-            parameters.Add(_Database.CreateParameter("elevation_2_se", settings.Elevation2SE));
-            parameters.Add(_Database.CreateParameter("elevation_1_sw", settings.Elevation1SW));
-            parameters.Add(_Database.CreateParameter("elevation_2_sw", settings.Elevation2SW));
-            parameters.Add(_Database.CreateParameter("water_height", settings.WaterHeight));
-            parameters.Add(_Database.CreateParameter("terrain_raise_limit", settings.TerrainRaiseLimit));
-            parameters.Add(_Database.CreateParameter("terrain_lower_limit", settings.TerrainLowerLimit));
-            parameters.Add(_Database.CreateParameter("use_estate_sun", settings.UseEstateSun));
-            parameters.Add(_Database.CreateParameter("Sandbox", settings.Sandbox));
-            parameters.Add(_Database.CreateParameter("fixed_sun", settings.FixedSun));
-            parameters.Add(_Database.CreateParameter("sun_position", settings.SunPosition));
-            parameters.Add(_Database.CreateParameter("sunvectorx", settings.SunVector.X));
-            parameters.Add(_Database.CreateParameter("sunvectory", settings.SunVector.Y));
-            parameters.Add(_Database.CreateParameter("sunvectorz", settings.SunVector.Z));
-            parameters.Add(_Database.CreateParameter("covenant", settings.Covenant));
-            parameters.Add(_Database.CreateParameter("covenant_datetime", settings.CovenantChangedDateTime));
-            parameters.Add(_Database.CreateParameter("Loaded_Creation_DateTime", settings.LoadedCreationDateTime));
-            parameters.Add(_Database.CreateParameter("Loaded_Creation_ID", settings.LoadedCreationID));
-            parameters.Add(_Database.CreateParameter("TerrainImageID", settings.TerrainImageID));
-            parameters.Add(_Database.CreateParameter("ParcelImageID", settings.ParcelImageID));
-            parameters.Add(_Database.CreateParameter("TelehubObject", settings.TelehubObject));
-
-            parameters.Add(_Database.CreateParameter("cacheID", settings.CacheID));
+            List<NpgsqlParameter> parameters =
+            [
+                _Database.CreateParameter("regionUUID", settings.RegionUUID),
+                _Database.CreateParameter("block_terraform", settings.BlockTerraform),
+                _Database.CreateParameter("block_fly", settings.BlockFly),
+                _Database.CreateParameter("allow_damage", settings.AllowDamage),
+                _Database.CreateParameter("restrict_pushing", settings.RestrictPushing),
+                _Database.CreateParameter("allow_land_resell", settings.AllowLandResell),
+                _Database.CreateParameter("allow_land_join_divide", settings.AllowLandJoinDivide),
+                _Database.CreateParameter("block_show_in_search", settings.BlockShowInSearch),
+                _Database.CreateParameter("agent_limit", settings.AgentLimit),
+                _Database.CreateParameter("object_bonus", settings.ObjectBonus),
+                _Database.CreateParameter("maturity", settings.Maturity),
+                _Database.CreateParameter("disable_scripts", settings.DisableScripts),
+                _Database.CreateParameter("disable_collisions", settings.DisableCollisions),
+                _Database.CreateParameter("disable_physics", settings.DisablePhysics),
+                _Database.CreateParameter("terrain_texture_1", settings.TerrainTexture1),
+                _Database.CreateParameter("terrain_texture_2", settings.TerrainTexture2),
+                _Database.CreateParameter("terrain_texture_3", settings.TerrainTexture3),
+                _Database.CreateParameter("terrain_texture_4", settings.TerrainTexture4),
+                _Database.CreateParameter("elevation_1_nw", settings.Elevation1NW),
+                _Database.CreateParameter("elevation_2_nw", settings.Elevation2NW),
+                _Database.CreateParameter("elevation_1_ne", settings.Elevation1NE),
+                _Database.CreateParameter("elevation_2_ne", settings.Elevation2NE),
+                _Database.CreateParameter("elevation_1_se", settings.Elevation1SE),
+                _Database.CreateParameter("elevation_2_se", settings.Elevation2SE),
+                _Database.CreateParameter("elevation_1_sw", settings.Elevation1SW),
+                _Database.CreateParameter("elevation_2_sw", settings.Elevation2SW),
+                _Database.CreateParameter("water_height", settings.WaterHeight),
+                _Database.CreateParameter("terrain_raise_limit", settings.TerrainRaiseLimit),
+                _Database.CreateParameter("terrain_lower_limit", settings.TerrainLowerLimit),
+                _Database.CreateParameter("use_estate_sun", settings.UseEstateSun),
+                _Database.CreateParameter("Sandbox", settings.Sandbox),
+                _Database.CreateParameter("fixed_sun", settings.FixedSun),
+                _Database.CreateParameter("sun_position", settings.SunPosition),
+                _Database.CreateParameter("sunvectorx", settings.SunVector.X),
+                _Database.CreateParameter("sunvectory", settings.SunVector.Y),
+                _Database.CreateParameter("sunvectorz", settings.SunVector.Z),
+                _Database.CreateParameter("covenant", settings.Covenant),
+                _Database.CreateParameter("covenant_datetime", settings.CovenantChangedDateTime),
+                _Database.CreateParameter("Loaded_Creation_DateTime", settings.LoadedCreationDateTime),
+                _Database.CreateParameter("Loaded_Creation_ID", settings.LoadedCreationID),
+                _Database.CreateParameter("TerrainImageID", settings.TerrainImageID),
+                _Database.CreateParameter("ParcelImageID", settings.ParcelImageID),
+                _Database.CreateParameter("TelehubObject", settings.TelehubObject),
+                _Database.CreateParameter("cacheID", settings.CacheID),
+                _Database.CreateParameter("TerrainPBR1", settings.TerrainPBR1),
+                _Database.CreateParameter("TerrainPBR2", settings.TerrainPBR2),
+                _Database.CreateParameter("TerrainPBR3", settings.TerrainPBR3),
+                _Database.CreateParameter("TerrainPBR4", settings.TerrainPBR4),
+            ];
 
             return parameters.ToArray();
         }
diff --git a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
index 3e51d34309..0c89495036 100644
--- a/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/RegionStore.migrations
@@ -1259,3 +1259,11 @@ COMMIT;
 BEGIN;
 ALTER TABLE "public"."prims" ADD COLUMN "lnkstBinData" bytea NULL;
 COMMIT;
+
+:VERSION 54         #----- add pbr terrain storage
+BEGIN;
+ALTER TABLE regionsettings ADD COLUMN "TerrainPBR1" uuid NOT NULL;
+ALTER TABLE regionsettings ADD COLUMN "TerrainPBR2" uuid NOT NULL;
+ALTER TABLE regionsettings ADD COLUMN "TerrainPBR3" uuid NOT NULL;
+ALTER TABLE regionsettings ADD COLUMN "TerrainPBR4" uuid NOT NULL;
+COMMIT;
diff --git a/OpenSim/Data/SQLite/Resources/RegionStore.migrations b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
index 8e7085532e..92d046e6b5 100644
--- a/OpenSim/Data/SQLite/Resources/RegionStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/RegionStore.migrations
@@ -410,3 +410,12 @@ COMMIT;
 BEGIN;
 ALTER TABLE `prims` ADD COLUMN `lnkstBinData` blob default NULL;
 COMMIT;
+
+
+:VERSION 42         #----- add pbr terrain storage
+BEGIN;
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR1` char(36) NOT NULL;
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR2` char(36) NOT NULL;
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR3` char(36) NOT NULL;
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR4` char(36) NOT NULL;
+COMMIT;
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 211805b77b..7ca7d1fd3c 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -1438,6 +1438,10 @@ namespace OpenSim.Data.SQLite
             createCol(regionsettings, "terrain_texture_2", typeof(String));
             createCol(regionsettings, "terrain_texture_3", typeof(String));
             createCol(regionsettings, "terrain_texture_4", typeof(String));
+            createCol(regionsettings, "TerrainPBR1", typeof(String));
+            createCol(regionsettings, "TerrainPBR2", typeof(String));
+            createCol(regionsettings, "TerrainPBR3", typeof(String));
+            createCol(regionsettings, "TerrainPBR4", typeof(String));
             createCol(regionsettings, "elevation_1_nw", typeof(Double));
             createCol(regionsettings, "elevation_2_nw", typeof(Double));
             createCol(regionsettings, "elevation_1_ne", typeof(Double));
@@ -2010,6 +2014,11 @@ namespace OpenSim.Data.SQLite
             if (row["cacheID"] is not System.DBNull)
                 newSettings.CacheID = new UUID((String)row["cacheID"]);
 
+            newSettings.TerrainPBR1 = new UUID((String)row["TerrainPBR1"]);
+            newSettings.TerrainPBR2 = new UUID((String)row["TerrainPBR2"]);
+            newSettings.TerrainPBR3 = new UUID((String)row["TerrainPBR3"]);
+            newSettings.TerrainPBR4 = new UUID((String)row["TerrainPBR4"]);
+
             return newSettings;
         }
 
@@ -2370,6 +2379,12 @@ namespace OpenSim.Data.SQLite
             row["block_search"] = settings.GodBlockSearch;
             row["casino"] = settings.Casino;
             row["cacheID"] = settings.CacheID;
+
+            row["TerrainPBR1"] = settings.TerrainPBR1.ToString();
+            row["TerrainPBR2"] = settings.TerrainPBR2.ToString();
+            row["TerrainPBR3"] = settings.TerrainPBR3.ToString();
+            row["TerrainPBR4"] = settings.TerrainPBR4.ToString();
+
         }
 
         /// <summary>
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 90814f771d..7b74a1f4e0 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -116,6 +116,12 @@ namespace OpenSim.Framework
         public static readonly UUID DEFAULT_TERRAIN_TEXTURE_3 = new("179cdabd-398a-9b6b-1391-4dc333ba321f");
         public static readonly UUID DEFAULT_TERRAIN_TEXTURE_4 = new("beb169c7-11ea-fff2-efe5-0f24dc881df2");
 
+        public static readonly UUID DEFAULT_TERRAIN_PBR_1 = new("b8d3965a-ad78-bf43-699b-bff8eca6c975");
+        public static readonly UUID DEFAULT_TERRAIN_PBR_2 = new("abb783e6-3e93-26c0-248a-247666855da3");
+        public static readonly UUID DEFAULT_TERRAIN_PBR_3 = new("179cdabd-398a-9b6b-1391-4dc333ba321f");
+        public static readonly UUID DEFAULT_TERRAIN_PBR_4 =  new("beb169c7-11ea-fff2-efe5-0f24dc881df2");
+
+
         public void Save()
         {
             OnSave?.Invoke(this);
@@ -226,13 +232,7 @@ namespace OpenSim.Framework
         public UUID TerrainTexture1
         {
             get { return m_TerrainTexture1; }
-            set
-            {
-                if (value.IsZero())
-                    m_TerrainTexture1 = DEFAULT_TERRAIN_TEXTURE_1;
-                else
-                    m_TerrainTexture1 = value;
-            }
+            set { m_TerrainTexture1 = value.IsZero() ? DEFAULT_TERRAIN_TEXTURE_1 : value; }
         }
 
         private UUID m_TerrainTexture2 = UUID.Zero;
@@ -240,13 +240,7 @@ namespace OpenSim.Framework
         public UUID TerrainTexture2
         {
             get { return m_TerrainTexture2; }
-            set
-            {
-                if (value.IsZero())
-                    m_TerrainTexture2 = DEFAULT_TERRAIN_TEXTURE_2;
-                else
-                    m_TerrainTexture2 = value;
-            }
+            set { m_TerrainTexture2 = value.IsZero() ? DEFAULT_TERRAIN_TEXTURE_2 : value; }
         }
 
         private UUID m_TerrainTexture3 = UUID.Zero;
@@ -254,13 +248,7 @@ namespace OpenSim.Framework
         public UUID TerrainTexture3
         {
             get { return m_TerrainTexture3; }
-            set
-            {
-                if (value.IsZero())
-                    m_TerrainTexture3 = DEFAULT_TERRAIN_TEXTURE_3;
-                else
-                    m_TerrainTexture3 = value;
-            }
+            set { m_TerrainTexture3 = value.IsZero() ? DEFAULT_TERRAIN_TEXTURE_3 : value; }
         }
 
         private UUID m_TerrainTexture4 = UUID.Zero;
@@ -268,15 +256,38 @@ namespace OpenSim.Framework
         public UUID TerrainTexture4
         {
             get { return m_TerrainTexture4; }
-            set
-            {
-                if (value.IsZero())
-                    m_TerrainTexture4 = DEFAULT_TERRAIN_TEXTURE_4;
-                else
-                    m_TerrainTexture4 = value;
-            }
+            set { m_TerrainTexture4 = value.IsZero() ? DEFAULT_TERRAIN_TEXTURE_4 : value; }
         }
 
+        private UUID m_TerrainPBR1 = UUID.Zero;
+        public UUID TerrainPBR1
+        {
+            get { return m_TerrainPBR1; }
+            set { m_TerrainPBR1 = value.IsZero() ? DEFAULT_TERRAIN_PBR_1 : value; }
+        }
+
+        private UUID m_TerrainPBR2 = UUID.Zero;
+        public UUID TerrainPBR2
+        {
+            get { return m_TerrainPBR2; }
+            set { m_TerrainPBR2 = value.IsZero() ? DEFAULT_TERRAIN_PBR_2 : value; }
+        }
+
+        private UUID m_TerrainPBR3 = UUID.Zero;
+        public UUID TerrainPBR3
+        {
+            get { return m_TerrainPBR3; }
+            set { m_TerrainPBR3 = value.IsZero() ? DEFAULT_TERRAIN_PBR_3 : value; }
+        }
+        private UUID m_TerrainPBR4 = UUID.Zero;
+
+        public UUID TerrainPBR4
+        {
+            get { return m_TerrainPBR4; }
+            set { m_TerrainPBR4 = value.IsZero() ? DEFAULT_TERRAIN_PBR_4 : value; }
+        }
+
+
         private double m_Elevation1NW = 10;
         public double Elevation1NW
         {
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index 8341e04a56..648c9b6025 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -140,6 +140,18 @@ namespace OpenSim.Framework.Serialization.External
                     case "Texture4":
                         settings.TerrainTexture4 = UUID.Parse(xtr.ReadElementContentAsString());
                         break;
+                    case "PBR1":
+                        settings.TerrainPBR1 = UUID.Parse(xtr.ReadElementContentAsString());
+                        break;
+                    case "PBR2":
+                        settings.TerrainPBR2 = UUID.Parse(xtr.ReadElementContentAsString());
+                        break;
+                    case "PBR3":
+                        settings.TerrainPBR3 = UUID.Parse(xtr.ReadElementContentAsString());
+                        break;
+                    case "PBR4":
+                        settings.TerrainPBR3 = UUID.Parse(xtr.ReadElementContentAsString());
+                        break;
                     case "ElevationLowSW":
                         settings.Elevation1SW = double.Parse(xtr.ReadElementContentAsString(), Culture.NumberFormatInfo);
                         break;
@@ -301,6 +313,10 @@ namespace OpenSim.Framework.Serialization.External
             xtw.WriteElementString("Texture2", settings.TerrainTexture2.ToString());
             xtw.WriteElementString("Texture3", settings.TerrainTexture3.ToString());
             xtw.WriteElementString("Texture4", settings.TerrainTexture4.ToString());
+            xtw.WriteElementString("PBR1", settings.TerrainPBR1.ToString());
+            xtw.WriteElementString("PBR2", settings.TerrainPBR2.ToString());
+            xtw.WriteElementString("PBR3", settings.TerrainPBR3.ToString());
+            xtw.WriteElementString("PBR4", settings.TerrainPBR4.ToString());
             xtw.WriteElementString("ElevationLowSW", settings.Elevation1SW.ToString());
             xtw.WriteElementString("ElevationLowNW", settings.Elevation1NW.ToString());
             xtw.WriteElementString("ElevationLowSE", settings.Elevation1SE.ToString());
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index a35c18cd4a..13ef265e2b 100755
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -1164,6 +1164,12 @@ namespace OpenSim.Region.CoreModules.Asset
                 gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainTexture2, (sbyte)AssetType.Texture);
                 gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainTexture3, (sbyte)AssetType.Texture);
                 gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainTexture4, (sbyte)AssetType.Texture);
+
+                gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainPBR1, (sbyte)AssetType.Texture);
+                gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainPBR2, (sbyte)AssetType.Texture);
+                gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainPBR3, (sbyte)AssetType.Texture);
+                gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainPBR4, (sbyte)AssetType.Texture);
+
                 gatherer.AddGathered(s.RegionInfo.RegionSettings.TerrainImageID, (sbyte)AssetType.Texture);
 
                 s.RegionEnvironment?.GatherAssets(gatheredids);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 42a0f37853..bdfbecc0b0 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -1119,6 +1119,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             currentRegionSettings.TerrainTexture2 = loadedRegionSettings.TerrainTexture2;
             currentRegionSettings.TerrainTexture3 = loadedRegionSettings.TerrainTexture3;
             currentRegionSettings.TerrainTexture4 = loadedRegionSettings.TerrainTexture4;
+            currentRegionSettings.TerrainPBR1 = loadedRegionSettings.TerrainPBR1;
+            currentRegionSettings.TerrainPBR2 = loadedRegionSettings.TerrainPBR2;
+            currentRegionSettings.TerrainPBR3 = loadedRegionSettings.TerrainPBR3;
+            currentRegionSettings.TerrainPBR4 = loadedRegionSettings.TerrainPBR4;
             currentRegionSettings.UseEstateSun = loadedRegionSettings.UseEstateSun;
             currentRegionSettings.WaterHeight = loadedRegionSettings.WaterHeight;
             currentRegionSettings.TelehubObject = loadedRegionSettings.TelehubObject;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
index c219097a9b..fb163bb35f 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -320,7 +320,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver
             if (regionSettings.TerrainTexture4 != RegionSettings.DEFAULT_TERRAIN_TEXTURE_4)
                 assetUuids[regionSettings.TerrainTexture4] = (sbyte)AssetType.Texture;
 
-            if(scene.RegionEnvironment != null)
+            if (regionSettings.TerrainPBR1 != RegionSettings.DEFAULT_TERRAIN_PBR_1)
+                assetUuids[regionSettings.TerrainPBR1] = (sbyte)AssetType.Texture; // it can be both tex or material
+
+            if (regionSettings.TerrainPBR2 != RegionSettings.DEFAULT_TERRAIN_PBR_2)
+                assetUuids[regionSettings.TerrainPBR2] = (sbyte)AssetType.Texture;
+
+            if (regionSettings.TerrainPBR3 != RegionSettings.DEFAULT_TERRAIN_PBR_3)
+                assetUuids[regionSettings.TerrainPBR3] = (sbyte)AssetType.Texture;
+
+            if (regionSettings.TerrainPBR4 != RegionSettings.DEFAULT_TERRAIN_PBR_4)
+                assetUuids[regionSettings.TerrainPBR4] = (sbyte)AssetType.Texture;
+
+            if (scene.RegionEnvironment != null)
                 scene.RegionEnvironment.GatherAssets(assetUuids);
 
             List<ILandObject> landObjects = scene.LandChannel.AllParcels();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c4dc47e594..74df9f951e 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -856,6 +856,15 @@ namespace OpenSim.Region.Framework.Scenes
                 updatedTerrainTextures = true;
             }
 
+            if (rs.TerrainPBR1.IsZero())
+                rs.TerrainPBR1 = RegionSettings.DEFAULT_TERRAIN_PBR_1;
+            if (rs.TerrainPBR2.IsZero())
+                rs.TerrainPBR2 = RegionSettings.DEFAULT_TERRAIN_PBR_2;
+            if (rs.TerrainPBR3.IsZero())
+                rs.TerrainPBR3 = RegionSettings.DEFAULT_TERRAIN_PBR_3;
+            if (rs.TerrainPBR4.IsZero())
+                rs.TerrainPBR4 = RegionSettings.DEFAULT_TERRAIN_PBR_4;
+
             if (updatedTerrainTextures)
                 rs.Save();
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 1688e65007..c3a1e540f7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -6592,6 +6592,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public LSL_Vector osTemperature2sRGB(LSL_Float dtemp)
         {
+            //aproximate fit to http://www.vendian.org/mncharity/dir3/blackbody/ 10degree D65 tables
             float temp = (float)dtemp.value;
             if (temp <= 1000f)
                 return new LSL_Vector(1.0, 0.0401, 0);