aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-01 18:17:08 -0600
committerJacek Antonelli2008-12-01 18:17:08 -0600
commit567586af40a1683a3c89863c9dbedd2b3cc90897 (patch)
tree3d89a5520be2f02a05cee7154bf44f3d945c51a3 /linden
parentDoc packaging moved to platform-independent manifest. (diff)
downloadmeta-impy-567586af40a1683a3c89863c9dbedd2b3cc90897.zip
meta-impy-567586af40a1683a3c89863c9dbedd2b3cc90897.tar.gz
meta-impy-567586af40a1683a3c89863c9dbedd2b3cc90897.tar.bz2
meta-impy-567586af40a1683a3c89863c9dbedd2b3cc90897.tar.xz
Fixed indentation for 'skins' prefix.
Diffstat (limited to 'linden')
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py46
1 files changed, 25 insertions, 21 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index f0b0b8d..749cced 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -75,27 +75,31 @@ class ViewerManifest(LLManifest):
75 self.path("*.txt") 75 self.path("*.txt")
76 self.end_prefix("fonts") 76 self.end_prefix("fonts")
77 77
78 # skins 78 # skins
79 if self.prefix(src="skins"): 79 if self.prefix(src="skins"):
80 self.path("paths.xml") 80 self.path("paths.xml")
81 # include the entire textures directory recursively 81
82 if self.prefix(src="*/textures"): 82 # include the entire textures directory recursively
83 self.path("*.tga") 83 if self.prefix(src="*/textures"):
84 self.path("*.j2c") 84 self.path("*.tga")
85 self.path("*.jpg") 85 self.path("*.j2c")
86 self.path("*.png") 86 self.path("*.jpg")
87 self.path("textures.xml") 87 self.path("*.png")
88 self.end_prefix("*/textures") 88 self.path("textures.xml")
89 self.path("*/xui/*/*.xml") 89 self.end_prefix("*/textures")
90 self.path("*/*.xml") 90
91 91 self.path("*/xui/*/*.xml")
92 # Local HTML files (e.g. loading screen) 92 self.path("*/*.xml")
93 if self.prefix(src="*/html"): 93
94 self.path("*.png") 94 # Local HTML files (e.g. loading screen)
95 self.path("*/*/*.html") 95 if self.prefix(src="*/html"):
96 self.path("*/*/*.gif") 96 self.path("*.png")
97 self.end_prefix("*/html") 97 self.path("*/*/*.html")
98 self.end_prefix("skins") 98 self.path("*/*/*.gif")
99 self.end_prefix("*/html")
100
101 self.end_prefix("skins")
102
99 self.path("lsl_guide.html") 103 self.path("lsl_guide.html")
100 self.path("gpu_table.txt") 104 self.path("gpu_table.txt")
101 105