diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 061738daae..6858b1d773 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1436,7 +1436,7 @@ if (DARWIN)
set(viewer_RESOURCE_FILES
secondlife.icns
Info-SecondLife.plist
- SecondLife.xib/
+ SecondLife.xib
# CMake doesn't seem to support Xcode language variants well just yet
English.lproj/InfoPlist.strings
English.lproj/language.txt
@@ -1909,6 +1909,7 @@ if (WINDOWS)
elseif (DARWIN)
set_target_properties(${VIEWER_BINARY_NAME}
PROPERTIES
+ RESOURCE SecondLife.xib
LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Xlinker -dead_strip -Xlinker -map -Xlinker ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}.MAP"
)
else (WINDOWS)
diff --git a/indra/newview/SecondLife.nib b/indra/newview/SecondLife.nib
deleted file mode 100644
index c4ddca50dc..0000000000
Binary files a/indra/newview/SecondLife.nib and /dev/null differ
diff --git a/indra/newview/SecondLife.xib b/indra/newview/SecondLife.xib
index fbff8fe307..781a390673 100644
--- a/indra/newview/SecondLife.xib
+++ b/indra/newview/SecondLife.xib
@@ -1,1136 +1,193 @@
-
-
- 1060
- 12E55
- 4457.6
- 1187.39
- 626.00
-
-
- NSCustomObject
- NSMenu
- NSMenuItem
- NSScrollView
- NSScroller
- NSTextView
- NSView
- NSWindowTemplate
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
- 31
- 2
- {{272, 176}, {938, 42}}
- -1535638528
- Input Window
- LLUserInputWindow
-
-
-
-
- 256
-
-
-
- 256
-
-
-
- 2322
-
-
-
- 2322
-
- Apple HTML pasteboard type
- Apple PDF pasteboard type
- Apple PICT pasteboard type
- Apple PNG pasteboard type
- Apple URL pasteboard type
- CorePasteboardFlavorType 0x6D6F6F76
- NSColor pasteboard type
- NSFilenamesPboardType
- NSStringPboardType
- NeXT Encapsulated PostScript v1.2 pasteboard type
- NeXT RTFD pasteboard type
- NeXT Rich Text Format v1.0 pasteboard type
- NeXT TIFF v4.0 pasteboard type
- NeXT font pasteboard type
- NeXT ruler pasteboard type
- WebURLsWithTitlesPboardType
- public.url
-
- {938, 42}
-
-
-
- _NS:13
-
-
-
-
-
-
-
-
-
-
-
- 166
-
-
-
- 938
- 1
-
-
- 67121127
- 0
-
-
- 3
- MQA
-
-
-
- 6
- System
- selectedTextBackgroundColor
-
- 3
- MC42NjY2NjY2NjY3AA
-
-
-
- 6
- System
- selectedTextColor
-
- 3
- MAA
-
-
-
-
-
-
- 1
- MCAwIDEAA
-
-
- {8, -8}
- 13
-
-
-
-
-
- 1
-
- 6
- {939, 10000000}
-
-
-
- {{1, 1}, {938, 42}}
-
-
-
- _NS:11
-
-
-
- {4, 5}
-
- 79691776
-
-
-
-
-
- file://localhost/Applications/Xcode.app/Contents/SharedFrameworks/DVTKit.framework/Resources/DVTIbeamCursor.tiff
-
-
-
-
- 3
- MCAwAA
-
-
-
- 4
-
-
-
- 256
- {{923, 1}, {16, 42}}
-
-
-
- _NS:83
- NO
-
- _doScroller:
- 0.96666666666666667
-
-
-
- -2147483392
- {{-100, -100}, {87, 18}}
-
-
-
- _NS:33
- NO
- 1
-
- _doScroller:
- 1
- 0.94565218687057495
-
-
- {{-1, -1}, {940, 44}}
-
-
-
- _NS:9
- 133138
-
-
-
- 0.25
- 4
- 1
-
-
- {938, 42}
-
-
-
- _NS:21
-
- {{0, 0}, {2560, 1418}}
- {10000000000000, 10000000000000}
- YES
-
-
-
-
-
-
- terminate:
-
-
-
- 823
-
-
-
- orderFrontStandardAboutPanel:
-
-
-
- 142
-
-
-
- delegate
-
-
-
- 845
-
-
-
- performMiniaturize:
-
-
-
- 37
-
-
-
- arrangeInFront:
-
-
-
- 39
-
-
-
- performZoom:
-
-
-
- 240
-
-
-
- hide:
-
-
-
- 369
-
-
-
- hideOtherApplications:
-
-
-
- 370
-
-
-
- unhideAllApplications:
-
-
-
- 372
-
-
-
- cut:
-
-
-
- 768
-
-
-
- paste:
-
-
-
- 769
-
-
-
- undo:
-
-
-
- 776
-
-
-
- copy:
-
-
-
- 782
-
-
-
- selectAll:
-
-
-
- 785
-
-
-
- toggleFullScreen:
-
-
-
- 842
-
-
-
- window
-
-
-
- 850
-
-
-
- inputWindow
-
-
-
- 953
-
-
-
- inputView
-
-
-
- 954
-
-
-
-
-
- 0
-
-
-
-
-
- -2
-
-
- File's Owner
-
-
- -1
-
-
- First Responder
-
-
- -3
-
-
- Application
-
-
- 29
-
-
-
-
-
-
-
-
- Main Menu
-
-
- 19
-
-
-
-
-
-
-
- 56
-
-
-
-
-
-
-
- 103
-
-
-
-
-
- 57
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 58
-
-
-
-
- 134
-
-
-
-
- 150
-
-
-
-
- 136
-
-
-
-
- 144
-
-
-
-
- 129
-
-
-
-
- 143
-
-
-
-
- 236
-
-
-
-
- 131
-
-
-
-
-
-
-
- 149
-
-
-
-
- 145
-
-
-
-
- 130
-
-
-
-
- 24
-
-
-
-
-
-
-
-
-
-
-
- 92
-
-
-
-
- 5
-
-
-
-
- 239
-
-
-
-
- 23
-
-
-
-
- 711
-
-
-
-
-
-
-
- 712
-
-
-
-
-
-
-
-
-
-
-
-
-
- 716
-
-
-
-
- 717
-
-
-
-
- 718
-
-
-
-
- 721
-
-
-
-
- 824
-
-
-
-
- 841
-
-
-
-
- 828
-
-
-
-
-
-
-
- 829
-
-
-
-
-
- 713
-
-
-
-
- 714
-
-
-
-
- 715
-
-
-
-
- 941
-
-
-
-
-
-
-
- 942
-
-
-
-
-
-
-
- 943
-
-
-
-
-
-
-
-
-
- 944
-
-
-
-
- 945
-
-
-
-
- 946
-
-
-
-
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
-
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- LLNonInlineTextView
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
- 954
-
-
-
-
- LLAppDelegate
- NSObject
-
- LLNonInlineTextView
- NSWindow
- LLNSWindow
-
-
-
- inputView
- LLNonInlineTextView
-
-
- inputWindow
- NSWindow
-
-
- window
- LLNSWindow
-
-
-
- IBProjectSource
- ./Classes/LLAppDelegate.h
-
-
-
- LLNSWindow
- NSWindow
-
- IBProjectSource
- ./Classes/LLNSWindow.h
-
-
-
- LLNonInlineTextView
- NSTextView
-
- IBProjectSource
- ./Classes/LLNonInlineTextView.h
-
-
-
- LLUserInputWindow
- NSPanel
-
- IBProjectSource
- ./Classes/LLUserInputWindow.h
-
-
-
- NSTextView
-
- id
- id
-
-
-
- orderFrontSharingServicePicker:
- id
-
-
- toggleQuickLookPreviewPanel:
- id
-
-
-
- IBProjectSource
- ./Classes/NSTextView.h
-
-
-
-
- 0
- IBCocoaFramework
-
- com.apple.InterfaceBuilder.CocoaPlugin.macosx
-
-
-
- com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3
-
-
- YES
- 3
-
- {11, 11}
- {10, 3}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index b92c9f931b..7fdd803d33 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -950,7 +950,6 @@ class Darwin_x86_64_Manifest(ViewerManifest):
self.path("licenses-mac.txt", dst="licenses.txt")
self.path("featuretable_mac.txt")
self.path("cube.dae")
- self.path("SecondLife.nib")
with self.prefix(src=pkgdir,dst=""):
self.path("ca-bundle.crt")