diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 84c2a14c6e1b282ab2a6d954e0684790c0794786..39f8697e8c21d1e55c2d04cd665320391de031d9 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -75,9 +75,6 @@ elseif (WINDOWS)
   endif (EXISTS ${VIEWER_DIR}win_setup)
   # add_dependencies(viewer windows-setup windows-crash-logger)
   add_dependencies(viewer windows-crash-logger)
-elseif (SOLARIS)
-  add_subdirectory(solaris_crash_logger)
-  add_dependencies(viewer solaris-crash-logger)
 endif (LINUX)
 
 add_subdirectory(${VIEWER_PREFIX}newview)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 512a1e870d93ded40033102a6d42025e89555a21..7c1db31f045c0e26f70629a02ae50c5f7356e574 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -790,7 +790,7 @@ def construct(self):
             self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib")   
 
             if self.prefix(dst="MacOS"):
-                #this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322 and SL-323
+                #this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322, SL-323 and MAINT-6928
                 self.path2basename(vmpdir,"SL_Launcher")
                 self.path2basename(vmpdir,"*.py")
                 llbase_path = os.path.join(self.get_dst_prefix(),'llbase')
@@ -808,6 +808,14 @@ def construct(self):
                     os.makedirs(requests_path)
                 if self.prefix(dst="requests"):
                     self.path2basename(requestsdir,"*")
+                    self.end_prefix()   
+                #these supplemental files are in case the user still has 2.6 as their default python
+                #https://jira.secondlife.com/browse/MAINT-6928
+                p266_path = os.path.join(self.get_dst_prefix(),'2.6')
+                if not os.path.exists(p266_path):
+                    os.makedirs(p266_path) 
+                if self.prefix(dst="2.6"):
+                    self.path2basename(vmp266dir,"*.py")
                     self.end_prefix()                
                 self.end_prefix()  
 
@@ -903,7 +911,7 @@ def path_optional(src, dst):
                                 'ca-bundle.crt',
                                 'SLVoice',
                                 ):
-                     self.path2basename(relpkgdir, libfile)
+                    self.path2basename(relpkgdir, libfile)
 
                 # dylibs that vary based on configuration
                 if self.args['configuration'].lower() == 'debug':