aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/cmake/CopyWinLibs.cmake424
-rw-r--r--linden/indra/newview/llfloatersnapshot.cpp2
-rw-r--r--linden/indra/newview/lltoolpie.cpp10
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml63
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml66
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_pie_hud.xml43
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml74
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml37
-rw-r--r--linden/install.xml4
10 files changed, 370 insertions, 361 deletions
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index 458b016..452292a 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -8,83 +8,77 @@ include(CMakeCopyIfDifferent)
8 8
9set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins") 9set(gst_plugin_release_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/lib/gstreamer-plugins")
10set(gst_plugin_release_files 10set(gst_plugin_release_files
11 libdshowsrcwrapper.dll 11 libgstaacparse.dll
12 libgsta52.dll 12 libgstadder.dll
13 libgstacmenc.dll 13 libgstaiffparse.dll
14 libgstadder.dll 14 libgstalaw.dll
15 libgstalaw.dll 15 libgstalpha.dll
16 libgstalpha.dll 16 libgstasfdemux.dll
17 libgstalphacolor.dll 17 libgstaudioconvert.dll
18 libgstapp.dll 18 libgstaudiofx.dll
19 libgstasfdemux.dll 19 libgstaudiorate.dll
20 libgstaudiochunk.dll 20 libgstaudioresample.dll
21 libgstaudioconvert.dll 21 libgstauparse.dll
22 libgstaudiofx.dll 22 libgstautoconvert.dll
23 libgstaudiorate.dll 23 libgstautodetect.dll
24 libgstaudioresample.dll 24 libgstavi.dll
25 libgstaudiotestsrc.dll 25 libgstcoreelements.dll
26 libgstautodetect.dll 26 libgstcutter.dll
27 libgstavi.dll 27 libgstdecodebin.dll
28 libgstcoreelements.dll 28 libgstdecodebin2.dll
29 libgstcutter.dll 29 libgstdshowdecwrapper.dll
30 libgstdecodebin.dll 30 libgstdshowsrcwrapper.dll
31 libgstdecodebin2.dll 31 libgstdshowvideosink.dll
32 libgstdirectdraw.dll 32 libgstffmpeg.dll
33 libgstdirectsound.dll 33 libgstffmpegcolorspace.dll
34 libgstdshowdecwrapper.dll 34 libgstflv.dll
35 libgstdshowsrcwrapper.dll 35 libgstgdp.dll
36 libgstdshowvideosink.dll 36 libgstgio.dll
37 libgstfaad.dll 37 libgsth264parse.dll
38 libgstffmpeg.dll 38 libgsticydemux.dll
39 libgstffmpegcolorspace.dll 39 libgstid3demux.dll
40 libgstflv.dll 40 libgstinterleave.dll
41 libgstgamma.dll 41 libgstjpeg.dll
42 libgstgdp.dll 42 libgstmpeg4videoparse.dll
43 libgsth264parse.dll 43 libgstmpegaudioparse.dll
44 libgsticydemux.dll 44 libgstmpegdemux.dll
45 libgstid3demux.dll 45 libgstmpegstream.dll
46 libgstjpeg.dll 46 libgstmpegtsmux.dll
47 libgstlevel.dll 47 libgstmpegvideoparse.dll
48 libgstmms.dll 48 libgstmulaw.dll
49 libgstmpeg2dec.dll 49 libgstmultifile.dll
50 libgstmpeg4videoparse.dll 50 libgstneon.dll
51 libgstmpegaudioparse.dll 51 libgstplaybin.dll
52 libgstmpegstream.dll 52 libgstpng.dll
53 libgstmpegvideoparse.dll 53 libgstqtdemux.dll
54 libgstmulaw.dll 54 libgstqtmux.dll
55 libgstmultipart.dll 55 libgstqueue2.dll
56 libgstneon.dll 56 libgstreal.dll
57 libgstogg.dll 57 libgstrealmedia.dll
58 libgstpcapparse.dll 58 libgstrtpmanager.dll
59 libgstplaybin.dll 59 libgstrtpmux.dll
60 libgstpng.dll 60 libgstrtp_good.dll
61 libgstqtdemux.dll 61 libgstrtsp_good.dll
62 libgstqueue2.dll 62 libgstselector.dll
63 libgstreal.dll 63 libgstsmpte.dll
64 libgstrealmedia.dll 64 libgsttheora.dll
65 libgstrtp.dll 65 libgsttypefindfunctions.dll
66 libgstrtpmanager.dll 66 libgstudp.dll
67 libgstrtpmuxer.dll 67 libgstvideobox.dll
68 libgstrtsp.dll 68 libgstvideocrop.dll
69 libgstsmpte.dll 69 libgstvideofilterbalance.dll
70 libgsttheora.dll 70 libgstvideofiltergamma.dll
71 libgsttypefindfunctions.dll 71 libgstvideomixer.dll
72 libgstudp.dll 72 libgstvideorate.dll
73 libgstvideobalance.dll 73 libgstvideoscale.dll
74 libgstvideobox.dll 74 libgstvideosignal.dll
75 libgstvideocrop.dll 75 libgstvolume.dll
76 libgstvideomixer.dll 76 libgstwasapi.dll
77 libgstvideorate.dll 77 libgstwaveform.dll
78 libgstvideoscale.dll 78 libgstwavparse.dll
79 libgstvideosignal.dll 79 libgstwininet.dll
80 libgstvolume.dll 80 libgstwinks.dll
81 libgstvorbis.dll 81 libgstx264.dll
82 libgstwasapi.dll
83 libgstwavparse.dll
84 libgstwininet.dll
85 libgstwinks.dll
86 libgstx264.dll
87 libgstxvid.dll
88 ) 82 )
89 83
90copy_if_different( 84copy_if_different(
@@ -97,83 +91,77 @@ set(all_targets ${all_targets} ${out_targets})
97 91
98set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins") 92set(gst_plugin_debug_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/lib/gstreamer-plugins")
99set(gst_plugin_debug_files 93set(gst_plugin_debug_files
100 libdshowsrcwrapper.dll 94 libgstaacparse.dll
101 libgsta52.dll 95 libgstadder.dll
102 libgstacmenc.dll 96 libgstaiffparse.dll
103 libgstadder.dll 97 libgstalaw.dll
104 libgstalaw.dll 98 libgstalpha.dll
105 libgstalpha.dll 99 libgstasfdemux.dll
106 libgstalphacolor.dll 100 libgstaudioconvert.dll
107 libgstapp.dll 101 libgstaudiofx.dll
108 libgstasfdemux.dll 102 libgstaudiorate.dll
109 libgstaudiochunk.dll 103 libgstaudioresample.dll
110 libgstaudioconvert.dll 104 libgstauparse.dll
111 libgstaudiofx.dll 105 libgstautoconvert.dll
112 libgstaudiorate.dll 106 libgstautodetect.dll
113 libgstaudioresample.dll 107 libgstavi.dll
114 libgstaudiotestsrc.dll 108 libgstcoreelements.dll
115 libgstautodetect.dll 109 libgstcutter.dll
116 libgstavi.dll 110 libgstdecodebin.dll
117 libgstcoreelements.dll 111 libgstdecodebin2.dll
118 libgstcutter.dll 112 libgstdshowdecwrapper.dll
119 libgstdecodebin.dll 113 libgstdshowsrcwrapper.dll
120 libgstdecodebin2.dll 114 libgstdshowvideosink.dll
121 libgstdirectdraw.dll 115 libgstffmpeg.dll
122 libgstdirectsound.dll 116 libgstffmpegcolorspace.dll
123 libgstdshowdecwrapper.dll 117 libgstflv.dll
124 libgstdshowsrcwrapper.dll 118 libgstgdp.dll
125 libgstdshowvideosink.dll 119 libgstgio.dll
126 libgstfaad.dll 120 libgsth264parse.dll
127 libgstffmpeg.dll 121 libgsticydemux.dll
128 libgstffmpegcolorspace.dll 122 libgstid3demux.dll
129 libgstflv.dll 123 libgstinterleave.dll
130 libgstgamma.dll 124 libgstjpeg.dll
131 libgstgdp.dll 125 libgstmpeg4videoparse.dll
132 libgsth264parse.dll 126 libgstmpegaudioparse.dll
133 libgsticydemux.dll 127 libgstmpegdemux.dll
134 libgstid3demux.dll 128 libgstmpegstream.dll
135 libgstjpeg.dll 129 libgstmpegtsmux.dll
136 libgstlevel.dll 130 libgstmpegvideoparse.dll
137 libgstmms.dll 131 libgstmulaw.dll
138 libgstmpeg2dec.dll 132 libgstmultifile.dll
139 libgstmpeg4videoparse.dll 133 libgstneon.dll
140 libgstmpegaudioparse.dll 134 libgstplaybin.dll
141 libgstmpegstream.dll 135 libgstpng.dll
142 libgstmpegvideoparse.dll 136 libgstqtdemux.dll
143 libgstmulaw.dll 137 libgstqtmux.dll
144 libgstmultipart.dll 138 libgstqueue2.dll
145 libgstneon.dll 139 libgstreal.dll
146 libgstogg.dll 140 libgstrealmedia.dll
147 libgstpcapparse.dll 141 libgstrtpmanager.dll
148 libgstplaybin.dll 142 libgstrtpmux.dll
149 libgstpng.dll 143 libgstrtp_good.dll
150 libgstqtdemux.dll 144 libgstrtsp_good.dll
151 libgstqueue2.dll 145 libgstselector.dll
152 libgstreal.dll 146 libgstsmpte.dll
153 libgstrealmedia.dll 147 libgsttheora.dll
154 libgstrtp.dll 148 libgsttypefindfunctions.dll
155 libgstrtpmanager.dll 149 libgstudp.dll
156 libgstrtpmuxer.dll 150 libgstvideobox.dll
157 libgstrtsp.dll 151 libgstvideocrop.dll
158 libgstsmpte.dll 152 libgstvideofilterbalance.dll
159 libgsttheora.dll 153 libgstvideofiltergamma.dll
160 libgsttypefindfunctions.dll 154 libgstvideomixer.dll
161 libgstudp.dll 155 libgstvideorate.dll
162 libgstvideobalance.dll 156 libgstvideoscale.dll
163 libgstvideobox.dll 157 libgstvideosignal.dll
164 libgstvideocrop.dll 158 libgstvolume.dll
165 libgstvideomixer.dll 159 libgstwasapi.dll
166 libgstvideorate.dll 160 libgstwaveform.dll
167 libgstvideoscale.dll 161 libgstwavparse.dll
168 libgstvideosignal.dll 162 libgstwininet.dll
169 libgstvolume.dll 163 libgstwinks.dll
170 libgstvorbis.dll 164 libgstx264.dll
171 libgstwasapi.dll
172 libgstwavparse.dll
173 libgstwininet.dll
174 libgstwinks.dll
175 libgstx264.dll
176 libgstxvid.dll
177 ) 165 )
178 166
179copy_if_different( 167copy_if_different(
@@ -220,39 +208,45 @@ set(debug_files
220 libgmodule-2.0-0.dll 208 libgmodule-2.0-0.dll
221 libgobject-2.0-0.dll 209 libgobject-2.0-0.dll
222 libgthread-2.0-0.dll 210 libgthread-2.0-0.dll
223 avcodec-51.dll 211 charset.dll
224 avformat-52.dll 212 intl.dll
225 avutil-49.dll 213 libgcrypt-11.dll
226 intl.dll 214 libgnutls-26.dll
227 libfaacdrm.dll 215 libgpg-error-0.dll
228 libgstapp-0.10.dll 216 libgstapp.dll
229 libgstaudio-0.10.dll 217 libgstaudio.dll
230 libgstbase-0.10.dll 218 libgstbase-0.10.dll
231 libgstcdda-0.10.dll 219 libgstcdda.dll
232 libgstcontroller-0.10.dll 220 libgstcontroller-0.10.dll
233 libgstdataprotocol-0.10.dll 221 libgstdataprotocol-0.10.dll
234 libgstdshow-0.10.dll 222 libgstdshow.dll
235 libgstfft-0.10.dll 223 libgstfft.dll
236 libgstinterfaces-0.10.dll 224 libgstinterfaces.dll
237 libgstnet-0.10.dll 225 libgstnet-0.10.dll
238 libgstnetbuffer-0.10.dll 226 libgstnetbuffer.dll
239 libgstpbutils-0.10.dll 227 libgstpbutils.dll
240 libgstreamer-0.10.dll 228 libgstreamer-0.10.dll
241 libgstriff-0.10.dll 229 libgstriff.dll
242 libgstrtp-0.10.dll 230 libgstrtp.dll
243 libgstrtsp-0.10.dll 231 libgstrtsp.dll
244 libgstsdp-0.10.dll 232 libgstsdp.dll
245 libgsttag-0.10.dll 233 libgsttag.dll
246 libgstvideo-0.10.dll 234 libgstvideo.dll
247 libjpeg.dll 235 libneon-27.dll
248 libmms.dll 236 libogg-0.dll
249 liboil-0.3-0.dll 237 liboil-0.3-0.dll
250 libpng13.dll 238 libopenjpeg-2.dll
251 libspeex.dll 239 libschroedinger-1.0-0.dll
240 libspeex-1.dll
241 libtheora-0.dll
242 libvorbis-0.dll
243 libvorbisenc-2.dll
244 libxml2-2.dll
252 ogg.dll 245 ogg.dll
253 vorbis.dll 246 vorbis.dll
254 xvidcore.dll 247 xvidcore.dll
255 zlib1.dll 248 zlib1.dll
249 libpng12-0.dll
256 ) 250 )
257 251
258copy_if_different( 252copy_if_different(
@@ -296,39 +290,45 @@ set(release_files
296 libgmodule-2.0-0.dll 290 libgmodule-2.0-0.dll
297 libgobject-2.0-0.dll 291 libgobject-2.0-0.dll
298 libgthread-2.0-0.dll 292 libgthread-2.0-0.dll
299 avcodec-51.dll 293 charset.dll
300 avformat-52.dll 294 intl.dll
301 avutil-49.dll 295 libgcrypt-11.dll
302 intl.dll 296 libgnutls-26.dll
303 libfaacdrm.dll 297 libgpg-error-0.dll
304 libgstapp-0.10.dll 298 libgstapp.dll
305 libgstaudio-0.10.dll 299 libgstaudio.dll
306 libgstbase-0.10.dll 300 libgstbase-0.10.dll
307 libgstcdda-0.10.dll 301 libgstcdda.dll
308 libgstcontroller-0.10.dll 302 libgstcontroller-0.10.dll
309 libgstdataprotocol-0.10.dll 303 libgstdataprotocol-0.10.dll
310 libgstdshow-0.10.dll 304 libgstdshow.dll
311 libgstfft-0.10.dll 305 libgstfft.dll
312 libgstinterfaces-0.10.dll 306 libgstinterfaces.dll
313 libgstnet-0.10.dll 307 libgstnet-0.10.dll
314 libgstnetbuffer-0.10.dll 308 libgstnetbuffer.dll
315 libgstpbutils-0.10.dll 309 libgstpbutils.dll
316 libgstreamer-0.10.dll 310 libgstreamer-0.10.dll
317 libgstriff-0.10.dll 311 libgstriff.dll
318 libgstrtp-0.10.dll 312 libgstrtp.dll
319 libgstrtsp-0.10.dll 313 libgstrtsp.dll
320 libgstsdp-0.10.dll 314 libgstsdp.dll
321 libgsttag-0.10.dll 315 libgsttag.dll
322 libgstvideo-0.10.dll 316 libgstvideo.dll
323 libjpeg.dll 317 libneon-27.dll
324 libmms.dll 318 libogg-0.dll
325 liboil-0.3-0.dll 319 liboil-0.3-0.dll
326 libpng13.dll 320 libopenjpeg-2.dll
327 libspeex.dll 321 libschroedinger-1.0-0.dll
322 libspeex-1.dll
323 libtheora-0.dll
324 libvorbis-0.dll
325 libvorbisenc-2.dll
326 libxml2-2.dll
328 ogg.dll 327 ogg.dll
329 vorbis.dll 328 vorbis.dll
330 xvidcore.dll 329 xvidcore.dll
331 zlib1.dll 330 zlib1.dll
331 libpng12-0.dll
332 ) 332 )
333 333
334copy_if_different( 334copy_if_different(
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index accbcb4..0ffcae3 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -2066,7 +2066,6 @@ void LLFloaterSnapshot::draw()
2066 if(previewp->getSnapshotType() != LLSnapshotLivePreview::SNAPSHOT_LOCAL) 2066 if(previewp->getSnapshotType() != LLSnapshotLivePreview::SNAPSHOT_LOCAL)
2067 { 2067 {
2068 childSetEnabled("high_res_check",FALSE); 2068 childSetEnabled("high_res_check",FALSE);
2069 childSetVisible("high_res_check",FALSE);
2070 childSetEnabled("ui_check",TRUE); 2069 childSetEnabled("ui_check",TRUE);
2071 if (ui_in_snapshot) 2070 if (ui_in_snapshot)
2072 { 2071 {
@@ -2075,7 +2074,6 @@ void LLFloaterSnapshot::draw()
2075 } 2074 }
2076 else 2075 else
2077 { 2076 {
2078 childSetVisible("high_res_check",TRUE);
2079 if (high_res_snapshot) 2077 if (high_res_snapshot)
2080 { 2078 {
2081 childSetEnabled("high_res_check",TRUE); 2079 childSetEnabled("high_res_check",TRUE);
diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 63b6e34..73e39cb 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -314,6 +314,16 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
314 if (object->isAvatar() 314 if (object->isAvatar()
315 || (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner())) 315 || (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner()))
316 { 316 {
317 // Toggle Inspect only for attachments
318 if (object->isAttachment())
319 {
320 gMenuHolder->childSetEnabled("Avatar Inspect", TRUE);
321 }
322 else
323 {
324 gMenuHolder->childSetEnabled("Avatar Inspect", FALSE);
325 }
326
317 // Find the attachment's avatar 327 // Find the attachment's avatar
318 while( object && object->isAttachment()) 328 while( object && object->isAttachment())
319 { 329 {
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
index a3e2bba..9a352a6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_attachment.xml
@@ -6,41 +6,42 @@
6 <menu_item_call enabled="true" label="Groups..." name="Groups..."> 6 <menu_item_call enabled="true" label="Groups..." name="Groups...">
7 <on_click function="ShowAgentGroups" userdata="agent" /> 7 <on_click function="ShowAgentGroups" userdata="agent" />
8 </menu_item_call> 8 </menu_item_call>
9 <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Attachment Touch"> 9 <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
10 <on_click function="Object.Touch" /> 10 <on_click function="Object.Touch" />
11 <on_enable function="Attachment.EnableTouch" userdata="Touch" /> 11 <on_enable function="Object.EnableTouch" userdata="Touch" />
12 </menu_item_call> 12 </menu_item_call>
13 <menu_item_call enabled="true" label="Stand Up" name="Stand Up"> 13 <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
14 <on_click function="Self.StandUp" userdata="" /> 14 <on_click function="Self.StandUp" userdata="" />
15 <on_enable function="Self.EnableStandUp" /> 15 <on_enable function="Self.EnableStandUp" />
16 </menu_item_call> 16 </menu_item_call>
17 <menu_item_call enabled="true" label="Friends..." name="Friends..."> 17 <menu_item_call enabled="true" label="Friends..." name="Friends...">
18 <on_click function="ShowFloater" userdata="friends" /> 18 <on_click function="ShowFloater" userdata="friends" />
19 </menu_item_call> 19 </menu_item_call>
20 <menu_item_call enabled="true" label="Gestures..." name="Gestures..."> 20 <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
21 <on_click function="ShowFloater" userdata="gestures" /> 21 <on_click function="ShowFloater" userdata="appearance" />
22 </menu_item_call> 22 <on_enable function="Edit.EnableCustomizeAvatar" />
23 <pie_menu label="More &gt;" name="More &gt;"> 23 </menu_item_call>
24 <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach"> 24 <pie_menu label="More &gt;" name="More &gt;">
25 <on_click function="Attachment.Detach" /> 25 <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
26 <on_enable function="Attachment.EnableDetach" /> 26 <on_click function="Attachment.Drop" />
27 </menu_item_call> 27 <on_enable function="Attachment.EnableDrop" />
28 </menu_item_call>
28 <menu_item_separator /> 29 <menu_item_separator />
30 <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
31 <on_click function="Attachment.Detach" />
32 <on_enable function="Attachment.EnableDetach" />
33 </menu_item_call>
29 <menu_item_separator /> 34 <menu_item_separator />
35 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
36 <on_click function="Object.Inspect" />
37 <on_enable function="Object.EnableInspect" />
38 </menu_item_call>
30 <menu_item_separator /> 39 <menu_item_separator />
31 <menu_item_separator /> 40 <menu_item_separator />
32 <menu_item_separator /> 41 <menu_item_separator />
33 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit..."> 42 </pie_menu>
34 <on_click function="Object.Edit" /> 43 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
35 <on_enable function="EnableEdit" /> 44 <on_click function="Object.Edit" />
36 </menu_item_call> 45 <on_enable function="EnableEdit" />
37 <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
38 <on_click function="Attachment.Drop" />
39 <on_enable function="Attachment.EnableDrop" />
40 </menu_item_call>
41 </pie_menu>
42 <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
43 <on_click function="ShowFloater" userdata="appearance" />
44 <on_enable function="Edit.EnableCustomizeAvatar" />
45 </menu_item_call> 46 </menu_item_call>
46</pie_menu> 47</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
index 2d44dab..3b79bdd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_avatar.xml
@@ -10,44 +10,44 @@
10 <menu_item_call enabled="false" label="Go To" mouse_opaque="true" name="Go To"> 10 <menu_item_call enabled="false" label="Go To" mouse_opaque="true" name="Go To">
11 <on_click function="GoToObject" /> 11 <on_click function="GoToObject" />
12 </menu_item_call> 12 </menu_item_call>
13 <menu_item_call enabled="false" label="Abuse..." mouse_opaque="true" name="abuse"> 13 <menu_item_call enabled="true" label="Group Invite..." mouse_opaque="true" name="Invite...">
14 <on_click function="Avatar.ReportAbuse" /> 14 <on_click function="Avatar.InviteToGroup" />
15 </menu_item_call> 15 </menu_item_call>
16 <menu_item_call enabled="false" label="Add Friend..." mouse_opaque="true" name="Add Friend"> 16 <menu_item_call enabled="false" label="Add Friend..." mouse_opaque="true" name="Add Friend">
17 <on_click function="Avatar.AddFriend" /> 17 <on_click function="Avatar.AddFriend" />
18 <on_enable function="Avatar.EnableAddFriend" /> 18 <on_enable function="Avatar.EnableAddFriend" />
19 </menu_item_call> 19 </menu_item_call>
20 <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay..."> 20 <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay...">
21 <on_click function="PayObject" /> 21 <on_click function="PayObject" />
22 <on_enable function="EnablePayObject" /> 22 <on_enable function="EnablePayObject" />
23 </menu_item_call> 23 </menu_item_call>
24 <pie_menu label="More &gt;" name="More &gt;"> 24 <pie_menu label="More &gt;" name="More &gt;">
25 <menu_item_call enabled="false" label="Freeze..." mouse_opaque="true" name="Freeze..."> 25 <menu_item_call enabled="false" label="Freeze..." mouse_opaque="true" name="Freeze...">
26 <on_click function="Avatar.Freeze" /> 26 <on_click function="Avatar.Freeze" />
27 <on_enable function="Avatar.EnableFreezeEject" /> 27 <on_enable function="Avatar.EnableFreezeEject" />
28 </menu_item_call> 28 </menu_item_call>
29 <menu_item_call enabled="false" label="Give Card" mouse_opaque="true" name="Give Card"> 29 <menu_item_call enabled="false" label="Give Card" mouse_opaque="true" name="Give Card">
30 <on_click function="Avatar.GiveCard" /> 30 <on_click function="Avatar.GiveCard" />
31 </menu_item_call> 31 </menu_item_call>
32 <menu_item_call enabled="true" label="Group Invite..." mouse_opaque="true" name="Invite..."> 32 <menu_item_call enabled="true" label="Report..." mouse_opaque="true" name="abuse">
33 <on_click function="Avatar.InviteToGroup" /> 33 <on_click function="Avatar.ReportAbuse" />
34 </menu_item_call> 34 </menu_item_call>
35 <menu_item_separator /> 35 <menu_item_call enabled="false" label="Eject..." mouse_opaque="true" name="Eject...">
36 <menu_item_call enabled="false" label="Eject..." mouse_opaque="true" name="Eject..."> 36 <on_click function="Avatar.Eject" />
37 <on_click function="Avatar.Eject" /> 37 <on_enable function="Avatar.EnableFreezeEject" />
38 <on_enable function="Avatar.EnableFreezeEject" /> 38 </menu_item_call>
39 </menu_item_call> 39 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Avatar Inspect">
40 <on_click function="Object.Inspect" />
41 <on_enable function="Object.EnableInspect" />
42 </menu_item_call>
43 <menu_item_separator />
40 <menu_item_call enabled="false" label="Debug..." mouse_opaque="true" name="Debug..."> 44 <menu_item_call enabled="false" label="Debug..." mouse_opaque="true" name="Debug...">
41 <on_click function="Avatar.Debug" /> 45 <on_click function="Avatar.Debug" />
42 <on_visible function="Avatar.VisibleDebug" /> 46 <on_visible function="Avatar.VisibleDebug" />
43 <on_enable function="Avatar.EnableDebug" /> 47 <on_enable function="Avatar.EnableDebug" />
44 </menu_item_call> 48 </menu_item_call>
45 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> 49 </pie_menu>
46 <on_click function="Object.Inspect" /> 50 <menu_item_call enabled="false" label="Send IM..." mouse_opaque="true" name="Send IM...">
47 <on_enable function="Object.EnableInspect" /> 51 <on_click function="Avatar.SendIM" />
48 </menu_item_call>
49 </pie_menu>
50 <menu_item_call enabled="false" label="Send IM..." mouse_opaque="true" name="Send IM...">
51 <on_click function="Avatar.SendIM" />
52 </menu_item_call> 52 </menu_item_call>
53</pie_menu> 53</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_hud.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_hud.xml
index ba6db28..7fac0bc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_hud.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_hud.xml
@@ -1,23 +1,26 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?> 1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<pie_menu name="Hud Pie"> 2<pie_menu name="HUD Pie">
3 <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach"> 3 <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
4 <on_click function="Attachment.Detach" /> 4 <on_click function="Attachment.Drop" />
5 <on_enable function="Attachment.EnableDetach" /> 5 <on_enable function="Attachment.EnableDrop" />
6 </menu_item_call> 6 </menu_item_call>
7 <menu_item_separator /> 7 <menu_item_separator />
8 <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Attachment Touch"> 8 <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
9 <on_click function="Object.Touch" /> 9 <on_click function="Object.Touch" />
10 <on_enable function="Attachment.EnableTouch" userdata="Touch" /> 10 <on_enable function="Object.EnableTouch" userdata="Touch" />
11 </menu_item_call>
12 <menu_item_separator />
13 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
14 <on_click function="Object.Inspect" />
15 <on_enable function="Object.EnableInspect" />
16 </menu_item_call>
17 <menu_item_separator />
18 <menu_item_call enabled="false" label="Detach" mouse_opaque="true" name="Detach">
19 <on_click function="Attachment.Detach" />
20 <on_enable function="Attachment.EnableDetach" />
21 </menu_item_call>
22 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
23 <on_click function="Object.Edit" />
24 <on_enable function="EnableEdit" />
11 </menu_item_call> 25 </menu_item_call>
12 <menu_item_separator />
13 <menu_item_separator />
14 <menu_item_separator />
15 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
16 <on_click function="Object.Edit" />
17 <on_enable function="EnableEdit" />
18 </menu_item_call>
19 <menu_item_call enabled="false" label="Drop" mouse_opaque="true" name="Drop">
20 <on_click function="Attachment.Drop" />
21 <on_enable function="Attachment.EnableDrop" />
22 </menu_item_call>
23</pie_menu> 26</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml
index 81ae04f..5f9c770 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_land.xml
@@ -20,12 +20,12 @@
20 <on_click function="Land.BuyPass" /> 20 <on_click function="Land.BuyPass" />
21 <on_enable function="Land.EnableBuyPass" /> 21 <on_enable function="Land.EnableBuyPass" />
22 </menu_item_call> 22 </menu_item_call>
23 <menu_item_call enabled="false" label="Buy Land..." mouse_opaque="true" name="Land Buy">
24 <on_click function="ShowFloater" userdata="buy land" />
25 <on_enable function="World.EnableBuyLand" />
26 </menu_item_call>
23 <menu_item_call enabled="false" label="Edit Terrain" mouse_opaque="true" name="Edit Terrain"> 27 <menu_item_call enabled="false" label="Edit Terrain" mouse_opaque="true" name="Edit Terrain">
24 <on_click function="Land.Edit" /> 28 <on_click function="Land.Edit" />
25 <on_enable function="EnableEdit" /> 29 <on_enable function="EnableEdit" />
26 </menu_item_call> 30 </menu_item_call>
27 <menu_item_call enabled="false" label="Buy Land..." mouse_opaque="true" name="Land Buy">
28 <on_click function="ShowFloater" userdata="buy land" />
29 <on_enable function="World.EnableBuyLand" />
30 </menu_item_call>
31</pie_menu> 31</pie_menu>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index b63e007..6796944 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -4,9 +4,9 @@
4 <on_click function="Object.Open" /> 4 <on_click function="Object.Open" />
5 <on_enable function="Object.EnableOpen" /> 5 <on_enable function="Object.EnableOpen" />
6 </menu_item_call> 6 </menu_item_call>
7 <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy..."> 7 <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
8 <on_click function="Object.Buy" /> 8 <on_click function="Object.Build" />
9 <on_enable function="Object.EnableBuy" /> 9 <on_enable function="EnableEdit" />
10 </menu_item_call> 10 </menu_item_call>
11 <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch"> 11 <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
12 <on_click function="Object.Touch" /> 12 <on_click function="Object.Touch" />
@@ -17,56 +17,56 @@
17 <on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" /> 17 <on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" />
18 </menu_item_call> 18 </menu_item_call>
19 <menu_item_call enabled="false" label="Take" mouse_opaque="true" name="Pie Object Take"> 19 <menu_item_call enabled="false" label="Take" mouse_opaque="true" name="Pie Object Take">
20 <on_click function="Tools.Take" /> 20 <on_click function="Tools.BuyOrTake" />
21 <on_enable function="Tools.EnableTake" /> 21 <on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" />
22 </menu_item_call> 22 </menu_item_call>
23 <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay..."> 23 <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay...">
24 <on_click function="PayObject" /> 24 <on_click function="PayObject" />
25 <on_enable function="EnablePayObject" /> 25 <on_enable function="EnablePayObject" />
26 </menu_item_call> 26 </menu_item_call>
27 <pie_menu label="More &gt;" name="More &gt;"> 27 <pie_menu label="More &gt;" name="More &gt;">
28 <menu_item_call enabled="false" label="Build" mouse_opaque="true" name="Create"> 28 <menu_item_call enabled="false" label="Delete" mouse_opaque="true" name="Delete">
29 <on_click function="Object.Build" /> 29 <on_click function="Object.Delete" />
30 <on_enable function="EnableEdit" /> 30 <on_enable function="Object.EnableDelete" />
31 </menu_item_call> 31 </menu_item_call>
32 <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear"> 32 <menu_item_call enabled="false" label="Wear" mouse_opaque="true" name="Wear">
33 <on_click function="Object.AttachToAvatar" /> 33 <on_click function="Object.AttachToAvatar" />
34 <on_enable function="Object.EnableWear" /> 34 <on_enable function="Object.EnableWear" />
35 </menu_item_call> 35 </menu_item_call>
36 <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy"> 36 <menu_item_call enabled="false" label="Take Copy" mouse_opaque="true" name="Take Copy">
37 <on_click function="Tools.TakeCopy" /> 37 <on_click function="Tools.TakeCopy" />
38 <on_enable function="Tools.EnableTakeCopy" /> 38 <on_enable function="Tools.EnableTakeCopy" />
39 </menu_item_call> 39 </menu_item_call>
40 <pie_menu label="Attach HUD &gt;" name="Object Attach HUD" /> 40 <pie_menu label="Attach HUD &gt;" name="Object Attach HUD" />
41 <pie_menu label="Attach &gt;" name="Object Attach" /> 41 <pie_menu label="Attach &gt;" name="Object Attach" />
42 <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return..."> 42 <menu_item_call enabled="false" label="Return..." mouse_opaque="true" name="Return...">
43 <on_click function="Object.Return" /> 43 <on_click function="Object.Return" />
44 <on_enable function="Object.EnableReturn" /> 44 <on_enable function="Object.EnableReturn" />
45 </menu_item_call> 45 </menu_item_call>
46 <pie_menu label="More &gt;" name="Rate Menu"> 46 <pie_menu label="More &gt;" name="Rate Menu">
47 <menu_item_separator />
48 <menu_item_separator />
49 <menu_item_call enabled="false" label="Abuse..." mouse_opaque="true"
50 name="Report Abuse...">
51 <on_click function="Object.ReportAbuse" />
52 <on_enable function="Object.EnableReportAbuse" />
53 </menu_item_call>
54 <menu_item_separator />
55 <menu_item_separator /> 47 <menu_item_separator />
56 <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute"> 48 <menu_item_call enabled="false" label="Mute" mouse_opaque="true" name="Object Mute">
57 <on_click function="Object.Mute" /> 49 <on_click function="Object.Mute" />
58 <on_enable function="Object.EnableMute" /> 50 <on_enable function="Object.EnableMute" />
59 </menu_item_call> 51 </menu_item_call>
52 <menu_item_call enabled="false" label="Report..." mouse_opaque="true"
53 name="Report Abuse...">
54 <on_click function="Object.ReportAbuse" />
55 <on_enable function="Object.EnableReportAbuse" />
56 </menu_item_call>
60 <menu_item_separator /> 57 <menu_item_separator />
61 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> 58 <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect">
62 <on_click function="Object.Inspect" /> 59 <on_click function="Object.Inspect" />
63 <on_enable function="Object.EnableInspect" /> 60 <on_enable function="Object.EnableInspect" />
64 </menu_item_call> 61 </menu_item_call>
65 </pie_menu> 62 <menu_item_separator />
66 <menu_item_call enabled="false" label="Delete" mouse_opaque="true" name="Delete"> 63 <menu_item_separator />
67 <on_click function="Object.Delete" /> 64 <menu_item_separator />
68 <on_enable function="Object.EnableDelete" /> 65 </pie_menu>
69 </menu_item_call> 66 <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
67 <on_click function="Object.Buy" />
68 <on_enable function="Object.EnableBuy" />
69 </menu_item_call>
70 </pie_menu> 70 </pie_menu>
71 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit..."> 71 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
72 <on_click function="Object.Edit" /> 72 <on_click function="Object.Edit" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
index 4fb7262..082eb53 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_self.xml
@@ -6,18 +6,17 @@
6 <menu_item_call enabled="true" label="Groups..." name="Groups..."> 6 <menu_item_call enabled="true" label="Groups..." name="Groups...">
7 <on_click function="ShowAgentGroups" userdata="agent" /> 7 <on_click function="ShowAgentGroups" userdata="agent" />
8 </menu_item_call> 8 </menu_item_call>
9 <menu_item_call enabled="true" label="Inventory" name="Inventory"> 9 <menu_item_separator />
10 <on_click function="ShowFloater" userdata="inventory" /> 10 <menu_item_call enabled="true" label="Stand Up" name="Stand Up">
11 </menu_item_call> 11 <on_click function="Self.StandUp" userdata="" />
12 <menu_item_call enabled="true" label="Stand Up" name="Stand Up"> 12 <on_enable function="Self.EnableStandUp" />
13 <on_click function="Self.StandUp" userdata="" /> 13 </menu_item_call>
14 <on_enable function="Self.EnableStandUp" /> 14 <menu_item_call enabled="true" label="Friends..." name="Friends...">
15 </menu_item_call> 15 <on_click function="ShowFloater" userdata="friends" />
16 <menu_item_call enabled="true" label="Friends..." name="Friends..."> 16 </menu_item_call>
17 <on_click function="ShowFloater" userdata="friends" /> 17 <menu_item_call enabled="true" label="Appearance..." name="Appearance...">
18 </menu_item_call> 18 <on_click function="ShowFloater" userdata="appearance" />
19 <menu_item_call enabled="true" label="Gestures..." name="Gestures..."> 19 <on_enable function="Edit.EnableCustomizeAvatar" />
20 <on_click function="ShowFloater" userdata="gestures" />
21 </menu_item_call> 20 </menu_item_call>
22 <pie_menu enabled="true" label="Take Off &gt;" name="Take Off &gt;"> 21 <pie_menu enabled="true" label="Take Off &gt;" name="Take Off &gt;">
23 <pie_menu enabled="true" label="Clothes &gt;" name="Clothes &gt;"> 22 <pie_menu enabled="true" label="Clothes &gt;" name="Clothes &gt;">
@@ -76,17 +75,15 @@
76 </menu_item_call> 75 </menu_item_call>
77 </pie_menu> 76 </pie_menu>
78 <menu_item_separator /> 77 <menu_item_separator />
79 <pie_menu enabled="true" label="HUD &gt;" name="Object Detach HUD" />
80 <menu_item_separator />
81 <pie_menu enabled="true" label="Detach &gt;" name="Object Detach" />
82 <menu_item_separator />
83 <menu_item_call enabled="true" label="Detach All" name="Detach All"> 78 <menu_item_call enabled="true" label="Detach All" name="Detach All">
84 <on_click function="Self.RemoveAllAttachments" userdata="" /> 79 <on_click function="Self.RemoveAllAttachments" userdata="" />
85 <on_enable function="Self.EnableRemoveAllAttachments" /> 80 <on_enable function="Self.EnableRemoveAllAttachments" />
86 </menu_item_call> 81 </menu_item_call>
82 <menu_item_separator />
83 <pie_menu enabled="true" label="Detach &gt;" name="Object Detach" />
84 <menu_item_separator />
85 <pie_menu enabled="true" label="HUD &gt;" name="Object Detach HUD" />
86 <menu_item_separator />
87 </pie_menu> 87 </pie_menu>
88 <menu_item_call enabled="true" label="Appearance..." name="Appearance..."> 88 <menu_item_separator />
89 <on_click function="ShowFloater" userdata="appearance" />
90 <on_enable function="Edit.EnableCustomizeAvatar" />
91 </menu_item_call>
92</pie_menu> 89</pie_menu>
diff --git a/linden/install.xml b/linden/install.xml
index a756beb..f4ddffc 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -445,9 +445,9 @@
445 <key>windows</key> 445 <key>windows</key>
446 <map> 446 <map>
447 <key>md5sum</key> 447 <key>md5sum</key>
448 <string>4623b4a4c8ac4219d94abf7913612bb7</string> 448 <string>1a55b7f4b5b14bc65609ac703277dba0</string>
449 <key>url</key> 449 <key>url</key>
450 <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-04172009.tar.bz2</uri> 450 <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-windows-05172009.tar.bz2</uri>
451 </map> 451 </map>
452 </map> 452 </map>
453 </map> 453 </map>
generated by cgit v1.1 at 2025-01-10 16:13:24 +0000