From bb8ff8707c93604007c00a5227be35b2799bdb92 Mon Sep 17 00:00:00 2001
From: Geenz <geenz@geenzo.com>
Date: Thu, 11 Jul 2013 18:27:50 -0400
Subject: Fix a crash on 10.6.x due to auto layout not being supported in 10.6
nibs.
---
indra/newview/SecondLife.nib | Bin 13021 -> 12348 bytes
indra/newview/SecondLife.xib | 138 +++++++++++--------------------------------
2 files changed, 34 insertions(+), 104 deletions(-)
(limited to 'indra/newview')
diff --git a/indra/newview/SecondLife.nib b/indra/newview/SecondLife.nib
index a5f2717167..8b99b5a770 100644
Binary files a/indra/newview/SecondLife.nib and b/indra/newview/SecondLife.nib differ
diff --git a/indra/newview/SecondLife.xib b/indra/newview/SecondLife.xib
index e5736f76a4..370df6bf5f 100644
--- a/indra/newview/SecondLife.xib
+++ b/indra/newview/SecondLife.xib
@@ -2,16 +2,15 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">12E52</string>
- <string key="IBDocument.InterfaceBuilderVersion">3084</string>
+ <string key="IBDocument.SystemVersion">12E55</string>
+ <string key="IBDocument.InterfaceBuilderVersion">4457.6</string>
<string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">3084</string>
+ <string key="NS.object.0">4457.6</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
- <string>IBNSLayoutConstraint</string>
<string>NSCustomObject</string>
<string>NSMenu</string>
<string>NSMenuItem</string>
@@ -329,13 +328,15 @@
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
<object class="NSView" key="NSWindowView" id="305280978">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{1024, 600}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:20</string>
</object>
- <string key="NSScreenRect">{{0, 0}, {2560, 1440}}</string>
+ <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<string key="NSFrameAutosaveName">Second Life</string>
<int key="NSWindowCollectionBehavior">128</int>
@@ -360,7 +361,7 @@
<array class="NSMutableArray" key="NSSubviews">
<object class="NSClipView" id="871543330">
<reference key="NSNextResponder" ref="238626476"/>
- <int key="NSvFlags">2304</int>
+ <int key="NSvFlags">2322</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTextView" id="395788163">
<reference key="NSNextResponder" ref="871543330"/>
@@ -533,7 +534,7 @@
<reference key="NSNextKeyView" ref="238626476"/>
<string key="NSReuseIdentifierKey">_NS:21</string>
</object>
- <string key="NSScreenRect">{{0, 0}, {2560, 1440}}</string>
+ <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
@@ -952,70 +953,6 @@
<reference key="object" ref="1044753903"/>
<array class="NSMutableArray" key="children">
<reference ref="238626476"/>
- <object class="IBNSLayoutConstraint" id="721706750">
- <reference key="firstItem" ref="1044753903"/>
- <int key="firstAttribute">4</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="238626476"/>
- <int key="secondAttribute">4</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">-1</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="1044753903"/>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- </object>
- <object class="IBNSLayoutConstraint" id="797493936">
- <reference key="firstItem" ref="1044753903"/>
- <int key="firstAttribute">6</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="238626476"/>
- <int key="secondAttribute">6</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">-1</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="1044753903"/>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- </object>
- <object class="IBNSLayoutConstraint" id="262904360">
- <reference key="firstItem" ref="238626476"/>
- <int key="firstAttribute">3</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="1044753903"/>
- <int key="secondAttribute">3</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">-1</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="1044753903"/>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- </object>
- <object class="IBNSLayoutConstraint" id="609370450">
- <reference key="firstItem" ref="238626476"/>
- <int key="firstAttribute">5</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="1044753903"/>
- <int key="secondAttribute">5</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">-1</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="1044753903"/>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- </object>
</array>
<reference key="parent" ref="979091056"/>
</object>
@@ -1044,26 +981,6 @@
<reference key="object" ref="339833963"/>
<reference key="parent" ref="238626476"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">949</int>
- <reference key="object" ref="609370450"/>
- <reference key="parent" ref="1044753903"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">950</int>
- <reference key="object" ref="262904360"/>
- <reference key="parent" ref="1044753903"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">951</int>
- <reference key="object" ref="797493936"/>
- <reference key="parent" ref="1044753903"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">952</int>
- <reference key="object" ref="721706750"/>
- <reference key="parent" ref="1044753903"/>
- </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1110,23 +1027,12 @@
<string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="941.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="941.NSWindowTemplate.visibleAtLaunch"/>
- <array class="NSMutableArray" key="942.IBNSViewMetadataConstraints">
- <reference ref="609370450"/>
- <reference ref="262904360"/>
- <reference ref="797493936"/>
- <reference ref="721706750"/>
- </array>
<string key="942.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="NO" key="943.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="943.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="944.CustomClassName">LLNonInlineTextView</string>
<string key="944.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="945.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="946.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="949.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="950.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="951.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="952.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
@@ -1187,6 +1093,27 @@
<string key="minorKey">./Classes/LLUserInputWindow.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSTextView</string>
+ <dictionary class="NSMutableDictionary" key="actions">
+ <string key="orderFrontSharingServicePicker:">id</string>
+ <string key="toggleQuickLookPreviewPanel:">id</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="orderFrontSharingServicePicker:">
+ <string key="name">orderFrontSharingServicePicker:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="toggleQuickLookPreviewPanel:">
+ <string key="name">toggleQuickLookPreviewPanel:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/NSTextView.h</string>
+ </object>
+ </object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
@@ -1195,12 +1122,15 @@
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
</object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+ <integer value="4600" key="NS.object.0"/>
+ </object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NSMenuCheckmark">{11, 11}</string>
<string key="NSMenuMixedState">{10, 3}</string>
</dictionary>
- <bool key="IBDocument.UseAutolayout">YES</bool>
</data>
</archive>
--
cgit v1.2.3