aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/app_settings
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/newview/app_settings
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/newview/app_settings')
-rw-r--r--linden/indra/newview/app_settings/keywords.ini4
-rw-r--r--linden/indra/newview/app_settings/message.xml228
-rw-r--r--linden/indra/newview/app_settings/shaders/class1/environment/glowF.glsl14
-rw-r--r--linden/indra/newview/app_settings/shaders/class1/environment/glowV.glsl10
-rw-r--r--linden/indra/newview/app_settings/shaders/class2/environment/waterF.glsl2
5 files changed, 258 insertions, 0 deletions
diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index bf49c2c..f53a384 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -438,6 +438,10 @@ PARCEL_FLAG_USE_BAN_LIST Used with llGetParcelFlags to find if a parcel uses a
438PARCEL_FLAG_USE_LAND_PASS_LIST Used with llGetParcelFlags to find if a parcel allows passes to be purchased 438PARCEL_FLAG_USE_LAND_PASS_LIST Used with llGetParcelFlags to find if a parcel allows passes to be purchased
439PARCEL_FLAG_LOCAL_SOUND_ONLY Used with llGetParcelFlags to find if a parcel restricts spacialized sound to the parcel 439PARCEL_FLAG_LOCAL_SOUND_ONLY Used with llGetParcelFlags to find if a parcel restricts spacialized sound to the parcel
440PARCEL_FLAG_RESTRICT_PUSHOBJECT Used with llGetParcelFlags to find if a parcel restricts llPushObject() calls 440PARCEL_FLAG_RESTRICT_PUSHOBJECT Used with llGetParcelFlags to find if a parcel restricts llPushObject() calls
441PARCEL_FLAG_LOCAL_SOUND_ONLY Used with llGetParcelFlags to find if a parcel restricts spacialized sound to the parcel
442PARCEL_FLAG_RESTRICT_PUSHOBJECT Used with llGetParcelFlags to find if a parcel restricts llPushObject() calls
443PARCEL_FLAG_ALLOW_ALL_OBJECT_ENTRY Used with llGetParcelFlags to find if a parcel allows all objects to enter
444PARCEL_FLAG_ALLOW_GROUP_OBJECT_ENTRY Used with llGetParcelFlags to find if a parcel only allows group (and owner) objects to enter
441 445
442REGION_FLAG_ALLOW_DAMAGE Used with llGetRegionFlags to find if a region is entirely damage enabled 446REGION_FLAG_ALLOW_DAMAGE Used with llGetRegionFlags to find if a region is entirely damage enabled
443REGION_FLAG_FIXED_SUN Used with llGetRegionFlags to find if a region has a fixed sun position 447REGION_FLAG_FIXED_SUN Used with llGetRegionFlags to find if a region has a fixed sun position
diff --git a/linden/indra/newview/app_settings/message.xml b/linden/indra/newview/app_settings/message.xml
new file mode 100644
index 0000000..5402a64
--- /dev/null
+++ b/linden/indra/newview/app_settings/message.xml
@@ -0,0 +1,228 @@
1<?xml version="1.0"?>
2<llsd>
3 <map>
4 <key>serverDefaults</key>
5 <!--
6 a map of server names to default message transport
7 -->
8 <map>
9 <key>simulator</key>
10 <string>template</string>
11
12 <key>userserver</key>
13 <string>template</string>
14
15 <key>spaceserver</key>
16 <string>template</string>
17
18 <key>dataserver</key>
19 <string>template</string>
20
21 <key>logDataserver</key>
22 <string>template</string>
23
24 <key>inventoryDataserver</key>
25 <string>template</string>
26
27 <key>viewer</key>
28 <string>template</string>
29
30 </map>
31 <key>messages</key>
32 <!--
33 a map of individual message names that override defaults
34 -->
35 <map>
36 <!--
37 Circuit related messages
38 -->
39 <key>PacketAck</key>
40 <map>
41 <key>builder</key>
42 <string>template</string>
43 <key>trusted-sender</key>
44 <boolean>false</boolean>
45 </map>
46
47 <key>OpenCircuit</key>
48 <map>
49 <key>builder</key>
50 <string>template</string>
51 <key>trusted-sender</key>
52 <boolean>false</boolean>
53 </map>
54
55 <key>CloseCircuit</key>
56 <map>
57 <key>builder</key>
58 <string>template</string>
59 <key>trusted-sender</key>
60 <boolean>false</boolean>
61 </map>
62
63 <key>StartPingCheck</key>
64 <map>
65 <key>builder</key>
66 <string>template</string>
67 <key>trusted-sender</key>
68 <boolean>false</boolean>
69 </map>
70
71 <key>CompletePingCheck</key>
72 <map>
73 <key>builder</key>
74 <string>template</string>
75 <key>trusted-sender</key>
76 <boolean>false</boolean>
77 </map>
78
79 <key>AddCircuitCode</key>
80 <map>
81 <key>builder</key>
82 <string>template</string>
83 <key>trusted-sender</key>
84 <boolean>true</boolean>
85 </map>
86
87 <key>UseCircuitCode</key>
88 <map>
89 <key>builder</key>
90 <string>template</string>
91 <key>trusted-sender</key>
92 <boolean>false</boolean>
93 </map>
94
95 <key>CreateTrustedCircuit</key>
96 <map>
97 <key>builder</key>
98 <string>template</string>
99 <key>trusted-sender</key>
100 <boolean>false</boolean>
101 </map>
102
103 <!--
104 Viewer to userserver messages.
105 -->
106 <key>ConnectAgentToUserserver</key>
107 <map>
108 <key>builder</key>
109 <string>template</string>
110 <key>trusted-sender</key>
111 <boolean>false</boolean>
112 </map>
113
114 <!--
115 Viewer to simulator messages sent before Untrusted-senderSimulatorMessage cap received.
116 -->
117 <key>SecuredTemplateChecksumRequest</key>
118 <map>
119 <key>builder</key>
120 <string>template</string>
121 <key>trusted-sender</key>
122 <boolean>false</boolean>
123 </map>
124
125 <key>CompleteAgentMovement</key>
126 <map>
127 <key>builder</key>
128 <string>template</string>
129 <key>trusted-sender</key>
130 <boolean>false</boolean>
131 </map>
132
133 <key>EconomyDataRequest</key>
134 <map>
135 <key>builder</key>
136 <string>template</string>
137 <key>trusted-sender</key>
138 <boolean>false</boolean>
139 </map>
140
141 <key>ViewerEffect</key>
142 <map>
143 <key>builder</key>
144 <string>template</string>
145 <key>trusted-sender</key>
146 <boolean>false</boolean>
147 </map>
148
149 <!--
150 Viewer to simulator messages sent unreliably.
151 -->
152 <key>AgentUpdate</key>
153 <map>
154 <key>builder</key>
155 <string>template</string>
156 <key>trusted-sender</key>
157 <boolean>false</boolean>
158 </map>
159
160 <!--
161 Messages created by LLThrottleGroup clients
162 -->
163 <key>ImagePacket</key>
164 <map>
165 <key>builder</key>
166 <string>template</string>
167 <key>trusted-sender</key>
168 <boolean>false</boolean>
169 </map>
170
171 <key>LayerData</key>
172 <map>
173 <key>builder</key>
174 <string>template</string>
175 <key>trusted-sender</key>
176 <boolean>false</boolean>
177 </map>
178
179 <key>ObjectUpdateCached</key>
180 <map>
181 <key>builder</key>
182 <string>template</string>
183 <key>trusted-sender</key>
184 <boolean>false</boolean>
185 </map>
186
187 <key>ObjectUpdateCompressed</key>
188 <map>
189 <key>builder</key>
190 <string>template</string>
191 <key>trusted-sender</key>
192 <boolean>false</boolean>
193 </map>
194
195 <key>ObjectUpdate</key>
196 <map>
197 <key>builder</key>
198 <string>template</string>
199 <key>trusted-sender</key>
200 <boolean>false</boolean>
201 </map>
202
203 <key>ImprovedTerseObjectUpdate</key>
204 <map>
205 <key>builder</key>
206 <string>template</string>
207 <key>trusted-sender</key>
208 <boolean>false</boolean>
209 </map>
210
211 <key>AvatarAnimation</key>
212 <map>
213 <key>builder</key>
214 <string>template</string>
215 <key>trusted-sender</key>
216 <boolean>false</boolean>
217 </map>
218
219 <key>AvatarAppearance</key>
220 <map>
221 <key>builder</key>
222 <string>template</string>
223 <key>trusted-sender</key>
224 <boolean>false</boolean>
225 </map>
226 </map>
227 </map>
228</llsd>
diff --git a/linden/indra/newview/app_settings/shaders/class1/environment/glowF.glsl b/linden/indra/newview/app_settings/shaders/class1/environment/glowF.glsl
new file mode 100644
index 0000000..670b976
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/environment/glowF.glsl
@@ -0,0 +1,14 @@
1uniform sampler2D diffuseMap;
2
3void main()
4{
5 vec4 color1 = texture2D(diffuseMap, gl_TexCoord[0].xy);
6 vec4 color2 = texture2D(diffuseMap, gl_TexCoord[1].xy);
7 vec4 color3 = texture2D(diffuseMap, gl_TexCoord[2].xy);
8 vec4 color4 = texture2D(diffuseMap, gl_TexCoord[3].xy);
9 vec4 color5 = texture2D(diffuseMap, gl_TexCoord[4].xy);
10
11 vec4 col = (color1+color2+color3+color4+color5)*0.21;
12 col = max(col, col*0.25 + color5*0.75);
13 gl_FragColor = col;
14}
diff --git a/linden/indra/newview/app_settings/shaders/class1/environment/glowV.glsl b/linden/indra/newview/app_settings/shaders/class1/environment/glowV.glsl
new file mode 100644
index 0000000..3b1a72e
--- /dev/null
+++ b/linden/indra/newview/app_settings/shaders/class1/environment/glowV.glsl
@@ -0,0 +1,10 @@
1uniform float delta;
2void main()
3{
4 gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
5 gl_TexCoord[0].xy = gl_MultiTexCoord0.xy + vec2(delta, delta);
6 gl_TexCoord[1].xy = gl_MultiTexCoord0.xy + vec2(-delta, delta);
7 gl_TexCoord[2].xy = gl_MultiTexCoord0.xy + vec2(-delta, -delta);
8 gl_TexCoord[3].xy = gl_MultiTexCoord0.xy + vec2(delta, -delta);
9 gl_TexCoord[4].xy = gl_MultiTexCoord0.xy;
10}
diff --git a/linden/indra/newview/app_settings/shaders/class2/environment/waterF.glsl b/linden/indra/newview/app_settings/shaders/class2/environment/waterF.glsl
index e0e79e9..11a057b 100644
--- a/linden/indra/newview/app_settings/shaders/class2/environment/waterF.glsl
+++ b/linden/indra/newview/app_settings/shaders/class2/environment/waterF.glsl
@@ -132,5 +132,7 @@ void main()
132 //apply fog 132 //apply fog
133 applyScatter(color.rgb); 133 applyScatter(color.rgb);
134 134
135 color.a = spec*0.5+fb.a;
136
135 gl_FragColor = color; 137 gl_FragColor = color;
136} 138}
generated by cgit v1.1 at 2025-01-16 23:13:54 +0000