move all dictionaries to the prebuilt package, and install from there

3 files changed, 1 insertions, 272 deletions

diff --git a/indra/newview/app_settings/dictionaries/dictionaries.xml b/indra/newview/app_settings/dictionaries/dictionaries.xml
deleted file mode 100644
index 0ba959766b..0000000000
--- a/indra/newview/app_settings/dictionaries/dictionaries.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<llsd xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="llsd.xsd">
-    <array>
-        <map>
-        <key>name</key>
-            <string>en_gb</string>
-        <key>is_primary</key>
-            <boolean>1</boolean>
-        <key>language</key>
-            <string>English (United Kingdom)</string>
-        </map>
-        <map>
-        <key>name</key>
-            <string>en_us</string>
-        <key>is_primary</key>
-            <boolean>1</boolean>
-        <key>language</key>
-            <string>English (United States)</string>
-        </map>
-        <map>
-        <key>name</key>
-            <string>es_es</string>
-        <key>is_primary</key>
-            <boolean>1</boolean>
-        <key>language</key>
-            <string>Español (España)</string>
-        </map>
-        <map>
-        <key>name</key>
-            <string>pt_br</string>
-        <key>is_primary</key>
-            <boolean>1</boolean>
-        <key>language</key>
-            <string>Português (Brasil)</string>
-        </map>
-        <map>
-        <key>name</key>
-            <string>sl</string>
-        <key>is_primary</key>
-            <boolean>0</boolean>
-        <key>language</key>
-            <string>Second Life Glossary</string>
-        </map>
-    </array>
-</llsd>
diff --git a/indra/newview/app_settings/dictionaries/sl.dic b/indra/newview/app_settings/dictionaries/sl.dic
deleted file mode 100644
index 57e9dd06cd..0000000000
--- a/indra/newview/app_settings/dictionaries/sl.dic
+++ /dev/null
@@ -1,226 +0,0 @@
-225
-account
-aditi
-adult
-agent
-agni
-alpha
-alt
-animation
-AR
-asset
-attachment
-autoreturn
-avatar
-avie
-baked
-ban
-banlines
-banlist
-BDSM
-beacon
-bling
-block
-blog
-blogger
-bodyparts
-bot
-box
-build
-busy
-cache
-cage
-camp
-campie
-Catznip
-chim
-classified
-client
-coalesced
-collar
-collision
-combat
-community
-concierge
-conference
-continent
-contribution
-coordinate
-copy
-covenant
-CS
-damage
-damage-enabled
-death
-deed
-detach
-displayname
-Dolphin
-drama
-drop
-estate
-event
-face
-facelight
-favorites
-FIC
-Firestorm
-flexible
-flexiprim
-floater
-fly
-flycam
-FMOD
-follower
-forums
-freebie
-freeze
-friendship
-fullperm
-furry
-gadget
-general
-gesture
-goo
-grid
-gridnaut
-griefer
-griefing
-ground
-group
-GSLR
-GUI
-Havok
-hippo
-hippotropolis
-home
-homestead
-host
-HUD
-IM
-impostors
-Imprudence
-indra
-infohub
-inspector
-inventory
-invisiprim
-inworld
-island
-item
-JIRA
-JPEG2000
-Kakadu
-KDU
-kick
-L$
-lag
-land
-landmark
-LDPW
-liaison
-library
-limits
-linden
-LindeX
-link
-linkset
-live
-lock
-log
-machinima
-mainland
-mainlanders
-map
-marketplace
-mature
-media
-mega
-megaprim
-mentor
-mesh
-minimap
-mini-map
-moderate
-modify
-mono
-morph
-MOTD
-mouselook
-mouseview
-move
-mute
-neko
-newbie
-non-physical
-notecard
-NPIOF
-object
-occlusion
-off-world
-officer
-offline
-ogg
-online
-ONSR
-openspace
-orbiter
-orientation
-parcel
-particles
-partner
-permission
-PG
-phantom
-Phoenix
-physics
-pick
-poofer
-position
-premium
-prim
-primitar
-primitive
-profile
-quaternion
-Radegast
-region
-relog
-resi
-resident
-return
-rez
-rezday
-RLV
-RLVa
-roleplay
-run
-ruth
-script
-sculpted
-sculptie
-sculpty
-shout
-sim
-simulator
-Singularity
-skin
-SLEX
-SLurl
-snapshot
-stipend
-telehub
-teleport
-terraform
-texture
-tier
-TOS
-transfer
-unlink
-username
-UUID
-vendor
-viewer
-walk
-whisper
-windlight
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1b732676e4..a59b763910 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -92,7 +92,7 @@ class ViewerManifest(LLManifest):
                 # ... and the entire windlight directory
                 self.path("windlight")
                 # ... and the pre-installed spell checking dictionaries
-                self.path("dictionaries")
+                self.path("../../packages/dictionaries", dst="dictionaries")
                 self.end_prefix("app_settings")
 
             if self.prefix(src="character"):