Merge up to 3.7.15 and fix many deprecated logging statements skipped by flickrfolk

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index f17f233525..0801dc96bf 100755
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -943,10 +943,10 @@ LLSD LLModel::writeModelToStream(std::ostream& ostr, LLSD& mdl, BOOL nowrite, BO
 		}
 	}
 
-    if (mdl.has("submodel_id"))
-	{ //write out submodel id
+        if (mdl.has("submodel_id"))
+        { //write out submodel id
         header["submodel_id"] = (LLSD::Integer)mdl["submodel_id"];
-	}
+        }
 
 	std::string out[MODEL_NAMES_LENGTH];