aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ChangeLog.txt
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-14 17:52:41 -0700
committerMcCabe Maxsted2009-09-14 17:52:41 -0700
commit7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd (patch)
tree0243666021de3ae6ac61a6c6f4e57d42771fe964 /ChangeLog.txt
parentApplied BlockClickSit debug setting from Emerald to block sit click action (diff)
downloadmeta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.zip
meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.gz
meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.bz2
meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.xz
Merged in jacek/next
Diffstat (limited to 'ChangeLog.txt')
-rw-r--r--ChangeLog.txt208
1 files changed, 164 insertions, 44 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4d26242..f973236 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -213,7 +213,7 @@
213 213
2142009-09-08 McCabe Maxsted <hakushakukun@gmail.com> 2142009-09-08 McCabe Maxsted <hakushakukun@gmail.com>
215 215
216 * Created my own version of Emerald's chat channel tool. 216 * Created my own version of Emerald's chat channel tool.
217 217
218 modified: linden/indra/newview/app_settings/settings.xml 218 modified: linden/indra/newview/app_settings/settings.xml
219 modified: linden/indra/newview/llchatbar.cpp 219 modified: linden/indra/newview/llchatbar.cpp
@@ -225,23 +225,24 @@
225 modified: linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml 225 modified: linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
226 modified: linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml 226 modified: linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
227 modified: linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml 227 modified: linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
228 228
229 229
230 * New chat channel preference should change only on apply. 230 * New chat channel preference should change only on apply.
231 231
232 modified: linden/indra/newview/llprefschat.cpp 232 modified: linden/indra/newview/llprefschat.cpp
233 modified: linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml 233 modified: linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
234 234
235 235
236 * Commented out permissions button (todo: backport this if there's time). 236 * Commented out permissions button
237 237 (todo: backport this if there's time).
238
238 modified: linden/indra/newview/skins/default/xui/en-us/floater_tools.xml 239 modified: linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
239 240
240 241
2412009-09-07 McCabe Maxsted <hakushakukun@gmail.com> 2422009-09-07 McCabe Maxsted <hakushakukun@gmail.com>
242 243
243 * Fixed tool brush size. 244 * Fixed tool brush size.
244 245
245 modified: linden/indra/newview/app_settings/settings.xml 246 modified: linden/indra/newview/app_settings/settings.xml
246 modified: linden/indra/newview/llfloatertools.cpp 247 modified: linden/indra/newview/llfloatertools.cpp
247 modified: linden/indra/newview/lltoolbrush.cpp 248 modified: linden/indra/newview/lltoolbrush.cpp
@@ -249,8 +250,8 @@
249 modified: linden/scripts/messages/message_template.msg 250 modified: linden/scripts/messages/message_template.msg
250 251
251 252
252 * Applied and tweaked last owner in tools window from Emerald viewer. 253 * Applied and tweaked last owner in tools window from Emerald viewer.
253 254
254 modified: linden/indra/newview/llpanelpermissions.cpp 255 modified: linden/indra/newview/llpanelpermissions.cpp
255 modified: linden/indra/newview/llpanelpermissions.h 256 modified: linden/indra/newview/llpanelpermissions.h
256 modified: linden/indra/newview/skins/default/xui/en-us/floater_tools.xml 257 modified: linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -258,38 +259,38 @@
258 259
2592009-09-06 McCabe Maxsted <hakushakukun@gmail.com> 2602009-09-06 McCabe Maxsted <hakushakukun@gmail.com>
260 261
261 * Applied sit anywhere feature from Emerald viewer. 262 * Applied sit anywhere feature from Emerald viewer.
262 263
263 modified: linden/indra/newview/llviewermenu.cpp 264 modified: linden/indra/newview/llviewermenu.cpp
264 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml 265 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
265 266
266 267
267 * Applied phantom avatar feature from Emerald viewer. 268 * Applied phantom avatar feature from Emerald viewer.
268 269
269 modified: linden/indra/newview/llagent.cpp 270 modified: linden/indra/newview/llagent.cpp
270 modified: linden/indra/newview/llagent.h 271 modified: linden/indra/newview/llagent.h
271 modified: linden/indra/newview/llappviewer.cpp 272 modified: linden/indra/newview/llappviewer.cpp
272 modified: linden/indra/newview/llviewermenu.cpp 273 modified: linden/indra/newview/llviewermenu.cpp
273 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml 274 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
274 275
275 276
276 * Start fetching inventory at startup. 277 * Start fetching inventory at startup.
277 278
278 modified: linden/indra/newview/llstartup.cpp 279 modified: linden/indra/newview/llstartup.cpp
279 280
280 281
281 * Added Emerald viewer's animation list. 282 * Added Emerald viewer's animation list.
282 283
283 new file: linden/indra/newview/jcfloater_animation_list.cpp 284 new file: linden/indra/newview/jcfloater_animation_list.cpp
284 new file: linden/indra/newview/jcfloater_animation_list.h 285 new file: linden/indra/newview/jcfloater_animation_list.h
285 new file: linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml 286 new file: linden/indra/newview/skins/default/xui/en-us/floater_animation_list.xml
286 modified: linden/indra/newview/CMakeLists.txt 287 modified: linden/indra/newview/CMakeLists.txt
287 modified: linden/indra/newview/llviewermenu.cpp 288 modified: linden/indra/newview/llviewermenu.cpp
288 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml 289 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
289 290
290 291
291 * Added Emerald viewer's asset browser. 292 * Added Emerald viewer's asset browser.
292 293
293 new file: linden/indra/newview/llfloaterassetbrowser.cpp 294 new file: linden/indra/newview/llfloaterassetbrowser.cpp
294 new file: linden/indra/newview/llfloaterassetbrowser.h 295 new file: linden/indra/newview/llfloaterassetbrowser.h
295 new file: linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml 296 new file: linden/indra/newview/skins/default/xui/en-us/floater_asset_browser.xml
@@ -297,25 +298,125 @@
297 modified: linden/indra/newview/llfloaterassetbrowser.cpp 298 modified: linden/indra/newview/llfloaterassetbrowser.cpp
298 modified: linden/indra/newview/llviewermenu.cpp 299 modified: linden/indra/newview/llviewermenu.cpp
299 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml 300 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
300 301
301 302
302 * Added LLScrollListCtrl::getSelectedIDs(). 303 * Added LLScrollListCtrl::getSelectedIDs().
303 304
304 modified: linden/indra/llui/llscrolllistctrl.cpp 305 modified: linden/indra/llui/llscrolllistctrl.cpp
305 modified: linden/indra/llui/llscrolllistctrl.h 306 modified: linden/indra/llui/llscrolllistctrl.h
306 307
307 308
308 * Fixed reference to missing colors.xml entry. 309 * Fixed reference to missing colors.xml entry.
309 310
310 modified: linden/indra/newview/jcfloater_animation_list.cpp 311 modified: linden/indra/newview/jcfloater_animation_list.cpp
311 312
312 313
313 * Fixed ground sit menu entry missing check. 314 * Fixed ground sit menu entry missing check.
314 315
315 modified: linden/indra/newview/llviewermenu.cpp 316 modified: linden/indra/newview/llviewermenu.cpp
316 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml 317 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
317 318
318 319
3202009-09-05 Jacek Antonelli <jacek.antonelli@gmail.com>
321
322 * Converted RLVa menu items to XUI.
323
324 modified: linden/indra/newview/llviewermenu.cpp
325 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
326
327
3282009-09-04 Jacek Antonelli <jacek.antonelli@gmail.com>
329
330 * Applied Kitty Barnett's RLVa 1.0.1h (Restrained Life) patch.
331 Made a few non-functional changes to help it apply.
332
333 modified: linden/indra/llcommon/llchat.h
334 modified: linden/indra/newview/CMakeLists.txt
335 modified: linden/indra/newview/app_settings/settings.xml
336 modified: linden/indra/newview/app_settings/settings_per_account.xml
337 modified: linden/indra/newview/llagent.cpp
338 modified: linden/indra/newview/llagent.h
339 modified: linden/indra/newview/llappviewer.cpp
340 modified: linden/indra/newview/llchatbar.cpp
341 modified: linden/indra/newview/llfloaterabout.cpp
342 modified: linden/indra/newview/llfloateractivespeakers.cpp
343 modified: linden/indra/newview/llfloaterbeacons.cpp
344 modified: linden/indra/newview/llfloaterchat.cpp
345 modified: linden/indra/newview/llfloaterinspect.cpp
346 modified: linden/indra/newview/llfloaterland.cpp
347 modified: linden/indra/newview/llfloaterland.h
348 modified: linden/indra/newview/llfloatermap.cpp
349 modified: linden/indra/newview/llfloatermap.h
350 modified: linden/indra/newview/llfloateropenobject.cpp
351 modified: linden/indra/newview/llfloaterproperties.cpp
352 modified: linden/indra/newview/llfloaterregioninfo.cpp
353 modified: linden/indra/newview/llfloaterregioninfo.h
354 modified: linden/indra/newview/llfloaterreporter.cpp
355 modified: linden/indra/newview/llfloatersettingsdebug.cpp
356 modified: linden/indra/newview/llfloaterwindlight.cpp
357 modified: linden/indra/newview/llfloaterworldmap.cpp
358 modified: linden/indra/newview/llglsandbox.cpp
359 modified: linden/indra/newview/llhoverview.cpp
360 modified: linden/indra/newview/llhudtext.cpp
361 modified: linden/indra/newview/llhudtext.h
362 modified: linden/indra/newview/llimpanel.cpp
363 modified: linden/indra/newview/llimview.cpp
364 modified: linden/indra/newview/llinventorybridge.cpp
365 modified: linden/indra/newview/llinventorymodel.cpp
366 modified: linden/indra/newview/llinventoryview.cpp
367 modified: linden/indra/newview/llinventoryview.h
368 modified: linden/indra/newview/llmaniptranslate.cpp
369 modified: linden/indra/newview/llnetmap.cpp
370 modified: linden/indra/newview/llnotify.cpp
371 modified: linden/indra/newview/lloverlaybar.cpp
372 modified: linden/indra/newview/llpanelavatar.cpp
373 modified: linden/indra/newview/llpanelclassified.cpp
374 modified: linden/indra/newview/llpanelcontents.cpp
375 modified: linden/indra/newview/llpaneldisplay.cpp
376 modified: linden/indra/newview/llpanelinventory.cpp
377 modified: linden/indra/newview/llpanelland.cpp
378 modified: linden/indra/newview/llpanellogin.cpp
379 modified: linden/indra/newview/llpanelobject.cpp
380 modified: linden/indra/newview/llpanelpermissions.cpp
381 modified: linden/indra/newview/llpanelpick.cpp
382 modified: linden/indra/newview/llprefsim.cpp
383 modified: linden/indra/newview/llpreviewscript.cpp
384 modified: linden/indra/newview/llselectmgr.cpp
385 modified: linden/indra/newview/llstartup.cpp
386 modified: linden/indra/newview/llstatusbar.cpp
387 modified: linden/indra/newview/lltoolbar.cpp
388 modified: linden/indra/newview/lltooldraganddrop.cpp
389 modified: linden/indra/newview/lltoolface.cpp
390 modified: linden/indra/newview/lltoolgrab.cpp
391 modified: linden/indra/newview/lltoolpie.cpp
392 modified: linden/indra/newview/lltoolplacer.cpp
393 modified: linden/indra/newview/lltoolselect.cpp
394 modified: linden/indra/newview/lltracker.cpp
395 modified: linden/indra/newview/llviewercontrol.cpp
396 modified: linden/indra/newview/llviewerdisplay.cpp
397 modified: linden/indra/newview/llviewermenu.cpp
398 modified: linden/indra/newview/llviewermessage.cpp
399 modified: linden/indra/newview/llviewerobject.cpp
400 modified: linden/indra/newview/llviewertexteditor.cpp
401 modified: linden/indra/newview/llviewerwindow.cpp
402 modified: linden/indra/newview/llvoavatar.cpp
403 modified: linden/indra/newview/llvovolume.cpp
404 modified: linden/indra/newview/llworldmapview.cpp
405 modified: linden/indra/newview/pipeline.cpp
406 new file: linden/indra/newview/rlvevent.h
407 new file: linden/indra/newview/rlvextensions.cpp
408 new file: linden/indra/newview/rlvextensions.h
409 new file: linden/indra/newview/rlvfloaterbehaviour.cpp
410 new file: linden/indra/newview/rlvfloaterbehaviour.h
411 new file: linden/indra/newview/rlvhandler.cpp
412 new file: linden/indra/newview/rlvhandler.h
413 new file: linden/indra/newview/rlvhelper.cpp
414 new file: linden/indra/newview/rlvhelper.h
415 new file: linden/indra/newview/rlvmultistringsearch.cpp
416 new file: linden/indra/newview/rlvmultistringsearch.h
417 new file: linden/indra/newview/skins/default/xui/en-us/floater_rlv_behaviour.xml
418
419
3192009-09-04 McCabe Maxsted <hakushakukun@gmail.com> 4202009-09-04 McCabe Maxsted <hakushakukun@gmail.com>
320 421
321 * Updated GStreamer and Zlib windows libs. 422 * Updated GStreamer and Zlib windows libs.
@@ -365,6 +466,25 @@
365 modified: linden/indra/llcharacter/llkeyframemotion.cpp 466 modified: linden/indra/llcharacter/llkeyframemotion.cpp
366 467
367 468
469 * Updated object backup feature to Meerkat's SVN, imported floater.
470
471 modified: linden/indra/newview/primbackup.cpp
472 modified: linden/indra/newview/primbackup.h
473 new file: linden/indra/newview/skins/default/xui/en-us/floater_prim_import.xml
474
475
476 * Imported Meerkat's object backup feature.
477
478 modified: linden/indra/newview/CMakeLists.txt
479 modified: linden/indra/newview/app_settings/settings.xml
480 modified: linden/indra/newview/llviewermenu.cpp
481 modified: linden/indra/newview/llviewerobjectlist.cpp
482 new file: linden/indra/newview/primbackup.cpp
483 new file: linden/indra/newview/primbackup.h
484 modified: linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
485 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
486
487
368 * Updated some python scripts to not use deprecated modules. 488 * Updated some python scripts to not use deprecated modules.
369 489
370 modified: linden/indra/lib/python/indra/base/lluuid.py 490 modified: linden/indra/lib/python/indra/base/lluuid.py