Merge from secondlife/develop into 2025.08

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/llfilesystem/lldir_utils_objc.mm b/indra/llfilesystem/lldir_utils_objc.mm
index 01fe9e1f2c..35513d5647 100644
--- a/indra/llfilesystem/lldir_utils_objc.mm
+++ b/indra/llfilesystem/lldir_utils_objc.mm
@@ -1,28 +1,28 @@
-/** 
+/**
  * @file lldir_utils_objc.mm
  * @brief Cocoa implementation of directory utilities for macOS
  *
  * $LicenseInfo:firstyear=2020&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2020, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
- */ 
+ */
 #if LL_DARWIN
 
 //WARNING:  This file CANNOT use standard linden includes due to conflicts between definitions of BOOL
@@ -39,18 +39,18 @@ std::string getSystemTempFolder()
             tempDir = @"/tmp";
         result = std::string([tempDir UTF8String]);
     }
-    
+
     return result;
 }
 
-//findSystemDirectory scoped exclusively to this file. 
+//findSystemDirectory scoped exclusively to this file.
 std::string findSystemDirectory(NSSearchPathDirectory searchPathDirectory,
                                    NSSearchPathDomainMask domainMask)
 {
     std::string result;
     @autoreleasepool {
         NSString *path = nil;
-        
+
         // Search for the path
         NSArray* paths = NSSearchPathForDirectoriesInDomains(searchPathDirectory,
                                                              domainMask,
@@ -60,10 +60,10 @@ std::string findSystemDirectory(NSSearchPathDirectory searchPathDirectory,
             path = [paths objectAtIndex:0];
             //HACK:  Always attempt to create directory, ignore errors.
             NSError *error = nil;
-            
+
             [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:&error];
-            
-            
+
+
             result = std::string([path UTF8String]);
         }
     }
@@ -88,7 +88,7 @@ std::string getSystemResourceFolder()
         NSString *bundlePath = [[NSBundle mainBundle] resourcePath];
         result = std::string([bundlePath UTF8String]);
     }
-    
+
     return result;
 }
 
@@ -102,7 +102,7 @@ std::string getSystemApplicationSupportFolder()
 {
     return findSystemDirectory (NSApplicationSupportDirectory,
                                 NSUserDomainMask);
-    
+
 }
 
 #endif // LL_DARWIN