Commits

si...@Simon-PC.lindenlab.com  committed 88fd867 Draft

Fix merge breakage

  • Participants
  • Parent commits 797e0a3

Comments (0)

Files changed (2)

File indra/newview/CMakeLists.txt

     llmarketplacenotifications.cpp
     llmediactrl.cpp
     llmediadataclient.cpp
-    llmemoryview.cpp
     llmenuoptionpathfindingrebakenavmesh.cpp
     llmeshrepository.cpp
     llmimetypes.cpp
     llmarketplacenotifications.h
     llmediactrl.h
     llmediadataclient.h
-    llmemoryview.h
     llmenuoptionpathfindingrebakenavmesh.h
     llmeshrepository.h
     llmimetypes.h

File indra/newview/pipeline.cpp

 	}
 
 	return ret;
-
-	return ret;
 }
 
 bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples)