From a4000c3744e42fcbb638e742f3b63fa31a0dee15 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 8 May 2009 07:43:08 +0000
Subject: [PATCH] merge trunk@116587 skinning-7@119389 ->
viewer-2.0.0-skinning-7
---
doc/contributions.txt | 3 +
indra/CMakeLists.txt | 4 +
indra/cmake/LLAddBuildTest.cmake | 1 +
indra/cmake/Variables.cmake | 1 +
indra/integration_tests/CMakeLists.txt | 3 +
.../llui_libtest/CMakeLists.txt | 96 +
.../llui_libtest/llui_libtest.cpp | 149 +
.../llui_libtest/llui_libtest.h | 36 +
.../llui_libtest/llwidgetreg.cpp | 107 +
.../llui_libtest/llwidgetreg.h | 43 +
indra/llaudio/llaudiodecodemgr.cpp | 2 +-
indra/llcharacter/llbvhloader.cpp | 161 +-
indra/llcharacter/llbvhloader.h | 51 +-
indra/llcharacter/llcharacter.h | 2 +-
indra/llcharacter/lljointstate.h | 2 +-
indra/llcharacter/llkeyframemotionparam.cpp | 7 +-
indra/llcharacter/llmultigesture.cpp | 64 +-
indra/llcharacter/llmultigesture.h | 10 +-
indra/llcharacter/llpose.h | 6 +-
indra/llcommon/CMakeLists.txt | 18 +
indra/llcommon/is_approx_equal_fraction.h | 23 +
indra/llcommon/linden_common.h | 18 +-
indra/llcommon/llassettype.cpp | 5 +-
indra/llcommon/llassettype.h | 5 +-
indra/llcommon/llboost.h | 15 +
indra/llcommon/llcommon.cpp | 2 +
indra/llcommon/llcommon.h | 3 +-
indra/llcommon/lldate.cpp | 58 +-
indra/llcommon/lldate.h | 4 +-
indra/llcommon/lldoubledispatch.h | 332 +
indra/llcommon/llerrorthread.cpp | 2 +
indra/llcommon/llevent.h | 2 +-
indra/llcommon/llinstancetracker.h | 100 +
indra/llcommon/llmd5.cpp | 1 +
indra/llcommon/llmemory.cpp | 25 +-
indra/llcommon/llmemory.h | 428 +-
indra/llcommon/llmemtype.h | 5 +-
indra/llcommon/llpointer.h | 177 +
indra/llcommon/llptrto.cpp | 108 +
indra/llcommon/llptrto.h | 93 +
indra/llcommon/llqueuedthread.cpp | 2 +
indra/llcommon/llrefcount.cpp | 49 +
indra/llcommon/llrefcount.h | 78 +
indra/llcommon/llsafehandle.h | 167 +
indra/llcommon/llsdserialize.cpp | 2 +-
indra/llcommon/llsdserialize.h | 3 +-
indra/llcommon/llsdutil.cpp | 9 +
indra/llcommon/llsdutil.h | 1 +
indra/llcommon/llsecondlifeurls.cpp | 34 +-
indra/llcommon/llsecondlifeurls.h | 13 +-
indra/llcommon/llsingleton.h | 158 +
indra/llcommon/llstat.cpp | 42 +-
indra/llcommon/llstat.h | 25 +-
indra/llcommon/llstring.cpp | 76 +
indra/llcommon/llstring.h | 251 +-
indra/llcommon/llthread.h | 1 -
indra/llcommon/lltimer.cpp | 9 +-
indra/llcommon/lltimer.h | 9 +-
indra/llcommon/lltreeiterators.h | 691 ++
indra/llcrashlogger/llcrashlogger.cpp | 1 +
indra/llimage/llimage.h | 2 +-
indra/llimage/llimagedxt.h | 1 +
indra/llimage/llimagetga.cpp | 4 +-
indra/llimage/llimageworker.h | 1 +
indra/llimagej2coj/llimagej2coj.cpp | 2 +-
indra/llinventory/lleconomy.h | 2 +-
indra/llinventory/llinventory.cpp | 105 +-
indra/llinventory/llinventory.h | 4 +-
indra/llinventory/llinventorytype.cpp | 4 +
indra/llinventory/llinventorytype.h | 3 +-
indra/llinventory/llnotecard.h | 2 +-
indra/llinventory/llparcel.cpp | 4 +-
indra/llinventory/llparcel.h | 1 +
indra/llinventory/llpermissions.cpp | 63 +-
indra/llinventory/llpermissions.h | 3 -
indra/llinventory/llsaleinfo.cpp | 34 +-
indra/llinventory/llsaleinfo.h | 3 -
indra/llmath/llmath.h | 4 +-
indra/llmath/llrect.h | 6 +-
indra/llmath/llsdutil_math.cpp | 5 +-
indra/llmath/llvolume.h | 2 +-
indra/llmath/llvolumemgr.h | 2 +-
indra/llmath/v4color.cpp | 34 +
indra/llmath/v4color.h | 15 +-
indra/llmath/v4coloru.h | 6 +
indra/llmessage/llares.h | 3 +-
indra/llmessage/llcachename.cpp | 213 +-
indra/llmessage/llcachename.h | 27 +-
indra/llmessage/llhttpclientadapter.cpp | 7 +-
indra/llmessage/llhttpclientadapter.h | 9 +-
indra/llmessage/llhttpclientinterface.h | 7 +-
indra/llmessage/llhttpnode.h | 3 +-
indra/llmessage/llhttpnodeadapter.h | 15 +-
indra/llmessage/llinstantmessage.cpp | 2 +-
indra/llmessage/llinstantmessage.h | 3 +-
indra/llmessage/llmessagesenderinterface.h | 7 +-
indra/llmessage/llregionpresenceverifier.cpp | 25 +-
indra/llmessage/llregionpresenceverifier.h | 25 +-
indra/llmessage/llstoredmessage.cpp | 2 +-
indra/llmessage/llstoredmessage.h | 2 +-
.../llmessage/lltemplatemessagedispatcher.cpp | 17 +-
indra/llmessage/lltemplatemessagedispatcher.h | 17 +-
indra/llmessage/lltransfersourceasset.cpp | 2 +
indra/llmessage/lltrustedmessageservice.cpp | 17 +-
indra/llmessage/lltrustedmessageservice.h | 17 +-
indra/llmessage/message.h | 2 +-
indra/llmessage/message_prehash.cpp | 2 +-
indra/llmessage/tests/commtest.h | 23 +
indra/llmessage/tests/llcurl_stub.cpp | 10 +-
.../tests/llhttpclientadapter_test.cpp | 7 +-
.../lltemplatemessagedispatcher_test.cpp | 17 +-
.../tests/lltesthttpclientadapter.cpp | 2 +-
.../llmessage/tests/lltesthttpclientadapter.h | 2 +-
indra/llmessage/tests/lltestmessagesender.cpp | 2 +-
indra/llmessage/tests/lltestmessagesender.h | 2 +-
.../tests/lltrustedmessageservice_test.cpp | 17 +-
indra/llmessage/tests/networkio.h | 23 +
indra/llprimitive/llmaterialtable.cpp | 11 +
indra/llprimitive/llmaterialtable.h | 2 +
indra/llprimitive/llprimitive.h | 2 +-
indra/llprimitive/llprimtexturelist.cpp | 7 +-
indra/llprimitive/llprimtexturelist.h | 7 +-
indra/llrender/llfontbitmapcache.cpp | 7 +-
indra/llrender/llfontbitmapcache.h | 7 +-
indra/llrender/llfontgl.cpp | 118 +-
indra/llrender/llfontgl.h | 47 +-
indra/llrender/llfontregistry.cpp | 19 +-
indra/llrender/llfontregistry.h | 13 +-
indra/llrender/llimagegl.h | 3 +-
indra/llrender/llrender.h | 2 +-
indra/llrender/llvertexbuffer.cpp | 1 -
indra/llrender/llvertexbuffer.h | 1 -
indra/llui/CMakeLists.txt | 48 +-
indra/llui/llbutton.cpp | 680 +-
indra/llui/llbutton.h | 195 +-
indra/llui/llcallbackmap.h | 19 +-
indra/llui/llcheckboxctrl.cpp | 278 +-
indra/llui/llcheckboxctrl.h | 73 +-
indra/llui/llcombobox.cpp | 555 +-
indra/llui/llcombobox.h | 126 +-
indra/llui/llconsole.cpp | 393 +
indra/llui/llconsole.h | 162 +
indra/llui/llcontainerview.cpp | 301 +
indra/llui/llcontainerview.h | 92 +
indra/llui/lldraghandle.cpp | 105 +-
indra/llui/lldraghandle.h | 44 +-
indra/llui/llf32uictrl.cpp | 57 +
indra/llui/llf32uictrl.h | 83 +
indra/llui/llfloater.cpp | 1649 ++--
indra/llui/llfloater.h | 297 +-
indra/llui/llfloaterreg.cpp | 423 +
indra/llui/llfloaterreg.h | 149 +
indra/llui/llflyoutbutton.cpp | 94 +
indra/llui/llflyoutbutton.h | 71 +
indra/llui/llfocusmgr.cpp | 20 +-
indra/llui/llfunctorregistry.h | 2 +-
indra/llui/lliconctrl.cpp | 126 +-
indra/llui/lliconctrl.h | 32 +-
indra/llui/llkeywords.cpp | 4 +-
indra/llui/lllayoutstack.cpp | 718 ++
indra/llui/lllayoutstack.h | 102 +
indra/llui/lllazyvalue.h | 83 +
indra/llui/lllineeditor.cpp | 690 +-
indra/llui/lllineeditor.h | 177 +-
indra/llui/llmenugl.cpp | 3256 +++----
indra/llui/llmenugl.h | 583 +-
indra/llui/llmodaldialog.cpp | 48 +-
indra/llui/llmodaldialog.h | 2 +-
indra/llui/llmultifloater.cpp | 510 ++
indra/llui/llmultifloater.h | 107 +
indra/llui/llmultislider.cpp | 218 +-
indra/llui/llmultislider.h | 97 +-
indra/llui/llmultisliderctrl.cpp | 392 +-
indra/llui/llmultisliderctrl.h | 71 +-
indra/llui/llnotifications.cpp | 164 +-
indra/llui/llnotifications.h | 97 +-
indra/llui/llpanel.cpp | 1133 +--
indra/llui/llpanel.h | 164 +-
indra/llui/llprogressbar.cpp | 135 +-
indra/llui/llprogressbar.h | 45 +-
indra/llui/llradiogroup.cpp | 248 +-
indra/llui/llradiogroup.h | 74 +-
indra/llui/llresizebar.cpp | 37 +-
indra/llui/llresizebar.h | 26 +-
indra/llui/llresizehandle.cpp | 57 +-
indra/llui/llresizehandle.h | 13 +-
indra/llui/llresmgr.cpp | 147 +-
indra/llui/llresmgr.h | 25 +-
indra/llui/llscrollbar.cpp | 237 +-
indra/llui/llscrollbar.h | 72 +-
indra/llui/llscrollcontainer.cpp | 303 +-
indra/llui/llscrollcontainer.h | 36 +-
indra/llui/llscrollingpanellist.cpp | 62 +-
indra/llui/llscrollingpanellist.h | 30 +-
indra/llui/llscrolllistcell.cpp | 413 +
indra/llui/llscrolllistcell.h | 223 +
indra/llui/llscrolllistcolumn.cpp | 320 +
indra/llui/llscrolllistcolumn.h | 189 +
indra/llui/llscrolllistctrl.cpp | 1884 +---
indra/llui/llscrolllistctrl.h | 433 +-
indra/llui/llscrolllistitem.cpp | 157 +
indra/llui/llscrolllistitem.h | 129 +
indra/llui/llsdparam.cpp | 158 +
indra/llui/llsdparam.h | 107 +
indra/llui/llsearcheditor.cpp | 124 +
indra/llui/llsearcheditor.h | 98 +
indra/llui/llslider.cpp | 155 +-
indra/llui/llslider.h | 71 +-
indra/llui/llsliderctrl.cpp | 339 +-
indra/llui/llsliderctrl.h | 119 +-
indra/llui/llspinctrl.cpp | 371 +-
indra/llui/llspinctrl.h | 74 +-
indra/llui/llstatbar.cpp | 295 +
indra/llui/llstatbar.h | 108 +
indra/llui/llstatgraph.cpp | 163 +
indra/llui/llstatgraph.h | 76 +
indra/llui/llstatview.cpp | 66 +
indra/llui/llstatview.h | 63 +
indra/llui/llstyle.cpp | 32 +-
indra/llui/llstyle.h | 9 +-
indra/llui/lltabcontainer.cpp | 790 +-
indra/llui/lltabcontainer.h | 119 +-
indra/llui/lltextbox.cpp | 245 +-
indra/llui/lltextbox.h | 81 +-
indra/llui/lltexteditor.cpp | 572 +-
indra/llui/lltexteditor.h | 110 +-
indra/llui/lltextparser.cpp | 55 +-
indra/llui/lltextparser.h | 34 +-
indra/llui/llui.cpp | 386 +-
indra/llui/llui.h | 312 +-
indra/llui/lluictrl.cpp | 354 +-
indra/llui/lluictrl.h | 179 +-
indra/llui/lluictrlfactory.cpp | 984 +-
indra/llui/lluictrlfactory.h | 320 +-
indra/llui/lluifwd.h | 1 -
indra/llui/lluiimage.cpp | 158 +
indra/llui/lluiimage.h | 113 +
indra/llui/lluistring.cpp | 7 +-
indra/llui/llview.cpp | 1226 +--
indra/llui/llview.h | 345 +-
indra/llui/llviewborder.cpp | 139 +-
indra/llui/llviewborder.h | 57 +-
indra/llui/llviewmodel.cpp | 163 +
indra/llui/llviewmodel.h | 219 +
indra/llui/llviewquery.h | 2 +-
indra/llvfs/lldir.cpp | 55 +-
indra/llvfs/lldir.h | 34 +-
indra/llvfs/lldir_linux.cpp | 8 +-
indra/llvfs/lldir_linux.h | 3 +-
indra/llvfs/lldir_mac.cpp | 8 +-
indra/llvfs/lldir_mac.h | 3 +-
indra/llvfs/lldir_solaris.cpp | 8 +-
indra/llvfs/lldir_solaris.h | 3 +-
indra/llvfs/lldir_win32.cpp | 17 +-
indra/llvfs/lldir_win32.h | 3 +-
indra/llvfs/lllfsthread.h | 2 +-
indra/llvfs/llpidlock.cpp | 7 +-
indra/llvfs/llpidlock.h | 7 +-
indra/llvfs/llvfs.cpp | 2 +
indra/llwindow/CMakeLists.txt | 6 +-
indra/llwindow/lldxhardware.cpp | 1 +
indra/llwindow/llkeyboard.cpp | 2 +-
indra/llwindow/llkeyboardmacosx.cpp | 2 +-
indra/llwindow/llkeyboardsdl.cpp | 2 +-
indra/llwindow/llkeyboardwin32.cpp | 10 +-
indra/llwindow/llpreeditor.h | 2 +-
indra/llwindow/llwindow.cpp | 233 +-
indra/llwindow/llwindow.h | 83 +-
indra/llwindow/llwindowcallbacks.cpp | 201 +
indra/llwindow/llwindowcallbacks.h | 85 +
indra/llwindow/llwindowheadless.cpp | 6 +-
indra/llwindow/llwindowheadless.h | 9 +-
indra/llwindow/llwindowmacosx.cpp | 27 +-
indra/llwindow/llwindowmacosx.h | 6 +-
indra/llwindow/llwindowsdl.cpp | 16 +-
indra/llwindow/llwindowsdl.h | 5 +-
indra/llwindow/llwindowwin32.cpp | 121 +-
indra/llwindow/llwindowwin32.h | 4 +-
indra/llxml/CMakeLists.txt | 3 +
indra/llxml/llcontrol.cpp | 724 +-
indra/llxml/llcontrol.h | 286 +-
indra/llxml/llcontrolgroupreader.h | 73 +-
indra/llxml/llxmlnode.cpp | 148 +-
indra/llxml/llxmlnode.h | 30 +-
indra/lscript/lscript_execute.h | 2 +
indra/newview/CMakeLists.txt | 106 +-
.../app_settings/ignorable_dialogs.xml | 291 +
indra/newview/app_settings/settings.xml | 8060 ++++++-----------
indra/newview/app_settings/settings_files.xml | 61 +-
indra/newview/app_settings/std_bump.ini | 30 +-
indra/newview/llagent.cpp | 232 +-
indra/newview/llagent.h | 25 +-
indra/newview/llagentaccess.cpp | 52 +-
indra/newview/llagentaccess.h | 32 +-
indra/newview/llagentlanguage.h | 2 +-
indra/newview/llagentpilot.cpp | 3 -
indra/newview/llappviewer.cpp | 351 +-
indra/newview/llappviewer.h | 15 +-
indra/newview/llappviewerwin32.cpp | 24 +-
indra/newview/llassetuploadresponders.cpp | 236 +-
indra/newview/llavatariconctrl.cpp | 244 +
indra/newview/llavatariconctrl.h | 86 +
indra/newview/llavatarpropertiesprocessor.cpp | 138 +
indra/newview/llavatarpropertiesprocessor.h | 80 +
indra/newview/llcallingcard.cpp | 2 +-
indra/newview/llchatbar.cpp | 79 +-
indra/newview/llchatbar.h | 4 +-
indra/newview/llcloud.h | 2 +-
indra/newview/llcolorswatch.cpp | 152 +-
indra/newview/llcolorswatch.h | 57 +-
indra/newview/llcompilequeue.cpp | 255 +-
indra/newview/llcompilequeue.h | 65 +-
indra/newview/llcurrencyuimanager.cpp | 4 +-
indra/newview/lldebugmessagebox.cpp | 131 +-
indra/newview/lldebugmessagebox.h | 4 +-
indra/newview/lldebugview.cpp | 58 +-
indra/newview/lldebugview.h | 14 +-
indra/newview/lldirpicker.cpp | 1 +
indra/newview/lldrawable.h | 1 -
indra/newview/lldrawpoolavatar.cpp | 23 +-
indra/newview/lldrawpoolbump.cpp | 8 +-
indra/newview/lldrawpoolsky.cpp | 1 -
indra/newview/lldrawpooltree.cpp | 1 -
indra/newview/lldrawpoolwater.cpp | 1 -
indra/newview/lldynamictexture.cpp | 5 +
indra/newview/lleventnotifier.cpp | 5 +-
indra/newview/llface.h | 1 -
indra/newview/llfasttimerview.cpp | 23 +-
indra/newview/llfasttimerview.h | 2 +-
indra/newview/llfavoritesbar.cpp | 328 +
indra/newview/llfavoritesbar.h | 70 +
indra/newview/llfilepicker.cpp | 8 +
indra/newview/llfirstuse.cpp | 66 +-
indra/newview/llflexibleobject.h | 1 -
indra/newview/llfloaterabout.cpp | 129 +-
indra/newview/llfloaterabout.h | 13 +-
indra/newview/llfloateranimpreview.cpp | 180 +-
indra/newview/llfloateranimpreview.h | 8 +-
indra/newview/llfloaterauction.cpp | 40 +-
indra/newview/llfloaterauction.h | 14 +-
indra/newview/llfloateravatarpicker.cpp | 78 +-
indra/newview/llfloateravatarpicker.h | 5 +-
indra/newview/llfloateravatartextures.cpp | 29 +-
indra/newview/llfloateravatartextures.h | 1 +
indra/newview/llfloaterbeacons.cpp | 8 +-
indra/newview/llfloaterbeacons.h | 4 +-
indra/newview/llfloaterbuildoptions.cpp | 48 +-
indra/newview/llfloaterbuildoptions.h | 13 +-
indra/newview/llfloaterbulkpermission.cpp | 19 +-
indra/newview/llfloaterbulkpermission.h | 1 +
indra/newview/llfloaterbump.cpp | 56 +-
indra/newview/llfloaterbump.h | 17 +-
indra/newview/llfloaterbuy.cpp | 23 +-
indra/newview/llfloaterbuy.h | 2 +-
indra/newview/llfloaterbuycontents.cpp | 15 +-
indra/newview/llfloaterbuycontents.h | 2 +-
indra/newview/llfloaterbuycurrency.cpp | 20 +-
indra/newview/llfloaterbuyland.cpp | 39 +-
indra/newview/llfloatercamera.cpp | 56 +-
indra/newview/llfloatercamera.h | 2 +-
indra/newview/llfloaterchat.cpp | 182 +-
indra/newview/llfloaterchat.h | 24 +-
indra/newview/llfloaterchatterbox.cpp | 92 +-
indra/newview/llfloaterchatterbox.h | 101 +-
indra/newview/llfloatercolorpicker.cpp | 254 +-
indra/newview/llfloatercolorpicker.h | 10 +-
indra/newview/llfloaterdaycycle.cpp | 14 +-
indra/newview/llfloaterdaycycle.h | 2 +-
indra/newview/llfloaterenvsettings.cpp | 72 +-
indra/newview/llfloaterenvsettings.h | 4 +-
indra/newview/llfloaterevent.cpp | 12 +-
indra/newview/llfloaterevent.h | 2 +-
indra/newview/llfloaterfonttest.cpp | 11 +-
indra/newview/llfloaterfonttest.h | 7 +-
indra/newview/llfloaterfriends.cpp | 77 +-
indra/newview/llfloaterfriends.h | 10 +-
indra/newview/llfloatergesture.cpp | 74 +-
indra/newview/llfloatergesture.h | 2 +-
indra/newview/llfloatergodtools.cpp | 194 +-
indra/newview/llfloatergodtools.h | 25 +-
indra/newview/llfloatergroupinvite.cpp | 41 +-
indra/newview/llfloatergroupinvite.h | 5 +-
indra/newview/llfloatergroups.cpp | 40 +-
indra/newview/llfloatergroups.h | 11 +-
indra/newview/llfloaterhandler.cpp | 2 +-
indra/newview/llfloaterhardwaresettings.cpp | 23 +-
indra/newview/llfloaterhardwaresettings.h | 6 +-
indra/newview/llfloaterhud.cpp | 17 +-
indra/newview/llfloaterinspect.cpp | 29 +-
indra/newview/llfloaterjoystick.cpp | 60 +-
indra/newview/llfloaterjoystick.h | 5 +-
indra/newview/llfloaterlagmeter.cpp | 18 +-
indra/newview/llfloaterlagmeter.h | 4 +-
indra/newview/llfloaterland.cpp | 135 +-
indra/newview/llfloaterland.h | 9 +-
indra/newview/llfloaterlandholdings.cpp | 20 +-
indra/newview/llfloatermap.cpp | 178 +-
indra/newview/llfloatermap.h | 44 +-
indra/newview/llfloatermemleak.cpp | 8 +-
indra/newview/llfloaternamedesc.cpp | 7 +-
.../newview/llfloaternotificationsconsole.cpp | 28 +-
indra/newview/llfloaternotificationsconsole.h | 1 +
indra/newview/llfloateropenobject.cpp | 33 +-
indra/newview/llfloateropenobject.h | 3 +-
indra/newview/llfloaterparcel.cpp | 12 +-
indra/newview/llfloaterparcel.h | 2 +-
indra/newview/llfloaterperms.cpp | 7 +-
indra/newview/llfloaterpostcard.cpp | 33 +-
indra/newview/llfloaterpostcard.h | 6 +-
indra/newview/llfloaterpostprocess.cpp | 33 +-
indra/newview/llfloaterpostprocess.h | 4 +-
indra/newview/llfloaterpreference.cpp | 507 +-
indra/newview/llfloaterpreference.h | 78 +-
indra/newview/llfloaterproperties.cpp | 85 +-
indra/newview/llfloaterproperties.h | 12 +-
indra/newview/llfloaterregioninfo.cpp | 104 +-
indra/newview/llfloaterregioninfo.h | 14 +-
indra/newview/llfloaterreporter.cpp | 254 +-
indra/newview/llfloaterreporter.h | 8 +-
indra/newview/llfloaterscriptdebug.cpp | 84 +-
indra/newview/llfloaterscriptdebug.h | 10 +-
indra/newview/llfloatersellland.cpp | 19 +-
indra/newview/llfloatersellland.h | 3 +-
indra/newview/llfloatersettingsdebug.cpp | 77 +-
indra/newview/llfloatersettingsdebug.h | 8 +-
indra/newview/llfloatersnapshot.cpp | 168 +-
indra/newview/llfloatersnapshot.h | 27 +-
indra/newview/llfloatertelehub.cpp | 10 +-
indra/newview/llfloatertelehub.h | 2 +-
indra/newview/llfloatertools.cpp | 528 +-
indra/newview/llfloatertools.h | 50 +-
indra/newview/llfloatertopobjects.cpp | 23 +-
indra/newview/llfloatertos.cpp | 4 +-
indra/newview/llfloateruipreview.cpp | 1507 +++
indra/newview/llfloateruipreview.h | 215 +
indra/newview/llfloaterurldisplay.cpp | 3 +-
indra/newview/llfloaterurlentry.cpp | 34 +-
indra/newview/llfloaterurlentry.h | 2 +-
.../newview/llfloatervoicedevicesettings.cpp | 19 +-
indra/newview/llfloatervoicedevicesettings.h | 6 +-
indra/newview/llfloaterwater.cpp | 61 +-
indra/newview/llfloaterwater.h | 4 +-
indra/newview/llfloaterwindlight.cpp | 66 +-
indra/newview/llfloaterwindlight.h | 4 +-
indra/newview/llfloaterworldmap.cpp | 226 +-
indra/newview/llfloaterworldmap.h | 25 +-
indra/newview/llfolderview.cpp | 289 +-
indra/newview/llfolderview.h | 95 +-
indra/newview/llglsandbox.cpp | 122 -
indra/newview/llgroupmgr.cpp | 2 +-
indra/newview/llhudeffect.h | 3 -
indra/newview/llhudicon.h | 2 +-
indra/newview/llhudmanager.cpp | 4 +-
indra/newview/llhudmanager.h | 2 +-
indra/newview/llhudobject.h | 2 +-
indra/newview/llhudrender.cpp | 6 +-
indra/newview/llhudrender.h | 2 +
indra/newview/llhudtext.cpp | 10 +-
indra/newview/llhudtext.h | 2 +-
indra/newview/llhudview.cpp | 7 +-
indra/newview/llimpanel.cpp | 141 +-
indra/newview/llimpanel.h | 16 +-
indra/newview/llimview.cpp | 347 +-
indra/newview/llimview.h | 29 +-
indra/newview/llinventoryactions.h | 47 +
indra/newview/llinventorybridge.cpp | 970 +-
indra/newview/llinventorybridge.h | 233 +-
indra/newview/llinventorymodel.cpp | 6 +-
indra/newview/lljoystickbutton.cpp | 183 +-
indra/newview/lljoystickbutton.h | 74 +-
indra/newview/lllocationhistory.cpp | 130 +
indra/newview/lllocationhistory.h | 69 +
indra/newview/lllocationinputctrl.cpp | 1126 +++
indra/newview/lllocationinputctrl.h | 248 +
indra/newview/lllogchat.cpp | 24 +-
indra/newview/llloginhandler.cpp | 10 +-
indra/newview/llmanip.cpp | 41 +-
indra/newview/llmaniprotate.cpp | 38 +-
indra/newview/llmanipscale.cpp | 6 +-
indra/newview/llmaniptranslate.cpp | 6 +-
indra/newview/llmemoryview.cpp | 7 +-
indra/newview/llmemoryview.h | 10 +-
indra/newview/llmenucommands.cpp | 43 +-
indra/newview/llmenucommands.h | 6 -
indra/newview/llmorphview.cpp | 10 +-
indra/newview/llmorphview.h | 10 +-
indra/newview/llmoveview.cpp | 43 +-
indra/newview/llmoveview.h | 4 +-
indra/newview/llmutelist.cpp | 37 +-
indra/newview/llnamebox.cpp | 17 +-
indra/newview/llnamebox.h | 17 +-
indra/newview/llnameeditor.cpp | 60 +-
indra/newview/llnameeditor.h | 26 +-
indra/newview/llnamelistctrl.cpp | 324 +-
indra/newview/llnamelistctrl.h | 66 +-
indra/newview/llnavigationbar.cpp | 523 ++
indra/newview/llnavigationbar.h | 106 +
indra/newview/llnetmap.cpp | 420 +-
indra/newview/llnetmap.h | 106 +-
indra/newview/lloutputmonitorctrl.cpp | 134 +
indra/newview/lloutputmonitorctrl.h | 88 +
indra/newview/lloverlaybar.cpp | 22 +-
indra/newview/lloverlaybar.h | 1 -
indra/newview/llpanelavatar.cpp | 445 +-
indra/newview/llpanelavatar.h | 26 +-
indra/newview/llpanelclassified.cpp | 74 +-
indra/newview/llpanelcontents.cpp | 58 +-
indra/newview/llpanelcontents.h | 2 +-
indra/newview/llpanelface.cpp | 72 +-
indra/newview/llpanelface.h | 23 +-
indra/newview/llpanelgroup.cpp | 196 +-
indra/newview/llpanelgroup.h | 15 +-
indra/newview/llpanelgroupgeneral.cpp | 71 +-
indra/newview/llpanelgroupgeneral.h | 2 +-
indra/newview/llpanelgroupinvite.cpp | 33 +-
indra/newview/llpanelgroupinvite.h | 2 +-
indra/newview/llpanelgrouplandmoney.cpp | 69 +-
indra/newview/llpanelgrouplandmoney.h | 2 +-
indra/newview/llpanelgroupnotices.cpp | 90 +-
indra/newview/llpanelgroupnotices.h | 4 +-
indra/newview/llpanelgrouproles.cpp | 151 +-
indra/newview/llpanelgrouproles.h | 23 +-
indra/newview/llpanelland.cpp | 4 +-
indra/newview/llpanelland.h | 2 +-
indra/newview/llpanellandmedia.cpp | 6 +-
indra/newview/llpanellogin.cpp | 94 +-
indra/newview/llpanellogin.h | 6 +-
indra/newview/llpanelobject.cpp | 79 +-
indra/newview/llpanelobject.h | 14 +-
indra/newview/llpanelpermissions.cpp | 71 +-
indra/newview/llpanelpermissions.h | 14 +-
indra/newview/llpanelpick.cpp | 103 +-
indra/newview/llpanelpick.h | 3 +-
indra/newview/llpanelplace.cpp | 45 +-
indra/newview/llpanelvolume.cpp | 28 +-
indra/newview/llpanelvolume.h | 10 +-
indra/newview/llparcelselection.h | 3 +-
indra/newview/llpreview.cpp | 300 +-
indra/newview/llpreview.h | 58 +-
indra/newview/llpreviewanim.cpp | 69 +-
indra/newview/llpreviewanim.h | 11 +-
indra/newview/llpreviewgesture.cpp | 239 +-
indra/newview/llpreviewgesture.h | 31 +-
indra/newview/llpreviewnotecard.cpp | 172 +-
indra/newview/llpreviewnotecard.h | 21 +-
indra/newview/llpreviewscript.cpp | 737 +-
indra/newview/llpreviewscript.h | 96 +-
indra/newview/llpreviewsound.cpp | 37 +-
indra/newview/llpreviewsound.h | 7 +-
indra/newview/llpreviewtexture.cpp | 182 +-
indra/newview/llpreviewtexture.h | 25 +-
indra/newview/llprogressview.cpp | 9 +-
indra/newview/llprogressview.h | 2 +-
indra/newview/llsavedsettingsglue.cpp | 30 +-
indra/newview/llsavedsettingsglue.h | 10 +-
indra/newview/llselectmgr.cpp | 38 +-
indra/newview/llselectmgr.h | 10 +-
indra/newview/llslurl.cpp | 114 +
indra/newview/llslurl.h | 85 +
indra/newview/llspatialpartition.h | 3 +-
indra/newview/llstartup.cpp | 257 +-
indra/newview/llstartup.h | 4 +
indra/newview/llstatusbar.cpp | 119 +-
indra/newview/llstatusbar.h | 6 +-
indra/newview/llstylemap.cpp | 6 +-
indra/newview/llsurface.cpp | 1 -
indra/newview/llsurface.h | 1 -
indra/newview/llsurfacepatch.h | 2 +-
indra/newview/llteleporthistory.cpp | 251 +
indra/newview/llteleporthistory.h | 212 +
indra/newview/lltexturecache.cpp | 2 +-
indra/newview/lltexturectrl.cpp | 509 +-
indra/newview/lltexturectrl.h | 72 +-
indra/newview/lltextureview.cpp | 53 +-
indra/newview/lltextureview.h | 4 +-
indra/newview/lltool.cpp | 2 +-
indra/newview/lltoolbar.cpp | 253 +-
indra/newview/lltoolbar.h | 21 +-
indra/newview/lltoolbrush.cpp | 2 +-
indra/newview/lltoolcomp.cpp | 9 +-
indra/newview/lltooldraganddrop.cpp | 12 +-
indra/newview/lltoolface.cpp | 7 +-
indra/newview/lltoolgrab.h | 2 +-
indra/newview/lltoolgun.cpp | 5 +-
indra/newview/lltoolindividual.cpp | 5 +-
indra/newview/lltoolmgr.cpp | 93 +-
indra/newview/lltoolmgr.h | 8 +-
indra/newview/lltoolmorph.cpp | 1 -
indra/newview/lltoolobjpicker.cpp | 2 +-
indra/newview/lltoolpie.cpp | 270 +-
indra/newview/lltoolpie.h | 10 +-
indra/newview/lltoolpipette.cpp | 24 +-
indra/newview/lltoolpipette.h | 13 +-
indra/newview/lltoolplacer.cpp | 100 +-
indra/newview/lltoolplacer.h | 39 -
indra/newview/lltoolselect.cpp | 6 +-
indra/newview/lltoolselectland.cpp | 9 +-
indra/newview/lltoolselectrect.cpp | 3 +-
indra/newview/lltoolview.cpp | 4 +-
indra/newview/lltracker.cpp | 23 +-
indra/newview/lltracker.h | 2 +-
indra/newview/lluploaddialog.cpp | 16 +-
indra/newview/llurldispatcher.cpp | 109 +-
indra/newview/llurldispatcher.h | 9 -
indra/newview/llviewchildren.cpp | 8 +-
indra/newview/llviewercamera.cpp | 21 +-
indra/newview/llviewercontrol.cpp | 378 +-
indra/newview/llviewercontrol.h | 116 +-
indra/newview/llviewerdisplay.cpp | 23 +-
indra/newview/llviewerfloaterreg.cpp | 95 +
indra/newview/llviewerfloaterreg.h | 43 +
indra/newview/llviewerinventory.cpp | 10 +-
indra/newview/llviewerkeyboard.cpp | 2 +-
indra/newview/llviewermedia.cpp | 2 +-
indra/newview/llviewermenu.cpp | 5218 ++++++-----
indra/newview/llviewermenu.h | 51 +-
indra/newview/llviewermenufile.cpp | 103 +-
indra/newview/llviewermessage.cpp | 184 +-
indra/newview/llviewermessage.h | 2 +-
indra/newview/llviewernetwork.cpp | 2 +-
indra/newview/llviewerobject.cpp | 9 +-
indra/newview/llviewerobject.h | 2 +-
indra/newview/llviewerobjectlist.cpp | 23 +-
indra/newview/llviewerobjectlist.h | 13 +-
indra/newview/llviewerparcelmedia.cpp | 8 +-
indra/newview/llviewerparcelmgr.cpp | 38 +-
indra/newview/llviewerparcelmgr.h | 19 +-
indra/newview/llviewerparceloverlay.cpp | 29 +-
indra/newview/llviewerpartsim.h | 2 +-
indra/newview/llviewerpartsource.h | 3 +-
indra/newview/llviewerprecompiledheaders.h | 24 +-
indra/newview/llviewerregion.cpp | 6 +-
indra/newview/llviewerregion.h | 3 -
indra/newview/llviewerstats.cpp | 100 +-
indra/newview/llviewerstats.h | 23 +-
indra/newview/llviewertexteditor.cpp | 244 +-
indra/newview/llviewertexteditor.h | 41 +-
indra/newview/llviewerwindow.cpp | 869 +-
indra/newview/llviewerwindow.h | 44 +-
indra/newview/llvoavatar.cpp | 250 +-
indra/newview/llvoavatar.h | 4 +-
indra/newview/llvoavatardefines.cpp | 7 +-
indra/newview/llvoavatardefines.h | 7 +-
indra/newview/llvograss.cpp | 10 -
indra/newview/llvoiceclient.cpp | 112 +-
indra/newview/llvoiceclient.h | 4 +-
indra/newview/llvoicevisualizer.cpp | 26 +-
indra/newview/llvosky.cpp | 2 +-
indra/newview/llvotree.cpp | 2 +-
indra/newview/llvovolume.cpp | 11 +-
indra/newview/llwearable.cpp | 28 +-
indra/newview/llwearable.h | 3 +-
indra/newview/llwearablelist.cpp | 5 +-
indra/newview/llweb.cpp | 31 +-
indra/newview/llweb.h | 7 -
indra/newview/llwldaycycle.cpp | 3 +-
indra/newview/llwldaycycle.h | 2 -
indra/newview/llworld.h | 2 +-
indra/newview/llworldmap.cpp | 18 +-
indra/newview/llworldmap.h | 7 +-
indra/newview/llworldmapview.cpp | 111 +-
indra/newview/llworldmapview.h | 2 +-
indra/newview/macview_Prefix.h | 2 -
indra/newview/pipeline.cpp | 23 +-
indra/newview/pipeline.h | 4 +-
indra/newview/res/bitmap2.bmp | Bin 0 -> 25118 bytes
indra/newview/res/install_icon.BMP | Bin 0 -> 262198 bytes
indra/newview/res/loginbackground.bmp | Bin 0 -> 336054 bytes
indra/newview/res/uninstall_icon.BMP | Bin 0 -> 262198 bytes
indra/newview/skins/default/colors.xml | 3192 ++++++-
.../skins/default/textures/jump_left_in.tga | Bin 0 -> 812 bytes
.../skins/default/textures/jump_left_out.tga | Bin 0 -> 812 bytes
.../skins/default/textures/jump_right_in.tga | Bin 0 -> 812 bytes
.../skins/default/textures/jump_right_out.tga | Bin 0 -> 812 bytes
.../skins/default/textures/menu_separator.png | Bin 0 -> 2831 bytes
.../skins/default/textures/textures.xml | 184 +-
.../skins/default/textures/transparent.j2c | Bin 0 -> 172 bytes
.../default/textures/voice_meter_dot.j2c | Bin 0 -> 499 bytes
.../default/textures/voice_meter_rings.j2c | Bin 0 -> 2518 bytes
.../skins/default/xui/da/floater_about.xml | 72 +-
.../default/xui/da/floater_about_land.xml | 919 +-
.../xui/da/floater_animation_preview.xml | 344 +-
.../skins/default/xui/da/floater_auction.xml | 18 +-
.../default/xui/da/floater_avatar_picker.xml | 30 +-
.../xui/da/floater_avatar_textures.xml | 60 +-
.../skins/default/xui/da/floater_beacons.xml | 30 +-
.../default/xui/da/floater_build_options.xml | 16 +-
.../skins/default/xui/da/floater_bumps.xml | 42 +-
.../default/xui/da/floater_buy_contents.xml | 42 +-
.../default/xui/da/floater_buy_currency.xml | 136 +-
.../skins/default/xui/da/floater_buy_land.xml | 458 +-
.../default/xui/da/floater_buy_object.xml | 52 +-
.../skins/default/xui/da/floater_camera.xml | 24 +-
.../default/xui/da/floater_choose_group.xml | 16 +-
.../default/xui/da/floater_color_picker.xml | 62 +-
.../skins/default/xui/da/floater_critical.xml | 22 +-
.../default/xui/da/floater_customize.xml | 894 +-
.../xui/da/floater_day_cycle_options.xml | 194 +-
.../xui/da/floater_device_settings.xml | 4 +-
.../default/xui/da/floater_inventory.xml | 94 +-
.../da/floater_inventory_item_properties.xml | 170 +-
.../skins/default/xui/da/floater_joystick.xml | 176 +-
.../skins/default/xui/da/floater_lagmeter.xml | 312 +-
.../default/xui/da/floater_land_holdings.xml | 78 +-
.../default/xui/da/floater_live_lsleditor.xml | 24 +-
.../default/xui/da/floater_lsl_guide.xml | 14 +-
.../default/xui/da/floater_media_browser.xml | 38 +-
.../skins/default/xui/da/floater_moveview.xml | 22 +-
.../default/xui/da/floater_mute_object.xml | 24 +-
.../default/xui/da/floater_my_friends.xml | 14 +-
.../default/xui/da/floater_openobject.xml | 20 +-
.../skins/default/xui/da/floater_pay.xml | 42 +-
.../default/xui/da/floater_pay_object.xml | 60 +-
.../skins/default/xui/da/floater_postcard.xml | 72 +-
.../default/xui/da/floater_preferences.xml | 16 +-
.../xui/da/floater_preview_animation.xml | 20 +-
.../xui/da/floater_preview_classified.xml | 4 +-
.../default/xui/da/floater_preview_event.xml | 4 +-
.../xui/da/floater_preview_gesture.xml | 112 +-
.../xui/da/floater_preview_notecard.xml | 26 +-
.../default/xui/da/floater_preview_sound.xml | 20 +-
.../xui/da/floater_preview_texture.xml | 18 +-
.../default/xui/da/floater_report_abuse.xml | 368 +-
.../default/xui/da/floater_script_debug.xml | 12 +-
.../default/xui/da/floater_script_preview.xml | 12 +-
.../default/xui/da/floater_script_queue.xml | 8 +-
.../default/xui/da/floater_script_search.xml | 26 +-
.../default/xui/da/floater_select_key.xml | 14 +-
.../default/xui/da/floater_sell_land.xml | 136 +-
.../default/xui/da/floater_settings_debug.xml | 34 +-
.../skins/default/xui/da/floater_snapshot.xml | 254 +-
.../default/xui/da/floater_sound_preview.xml | 22 +-
.../skins/default/xui/da/floater_telehub.xml | 56 +-
.../default/xui/da/floater_texture_ctrl.xml | 48 +-
.../skins/default/xui/da/floater_tools.xml | 1112 +--
.../skins/default/xui/da/floater_tos.xml | 30 +-
.../xui/da/floater_wearable_save_as.xml | 22 +-
.../default/xui/da/floater_world_map.xml | 162 +-
.../skins/default/xui/da/menu_inventory.xml | 130 +-
.../skins/default/xui/da/menu_login.xml | 26 +-
.../skins/default/xui/da/menu_slurl.xml | 12 +-
.../skins/default/xui/da/menu_viewer.xml | 422 +-
.../skins/default/xui/da/panel_login.xml | 86 +-
.../default/xui/da/panel_preferences_chat.xml | 122 +-
.../xui/da/panel_preferences_general.xml | 236 +-
.../xui/da/panel_preferences_graphics1.xml | 358 +-
.../newview/skins/default/xui/da/strings.xml | 810 +-
.../skins/default/xui/da/xui_version.xml | 8 +-
.../xui/de/floater_animation_preview.xml | 148 +-
.../skins/default/xui/de/floater_beacons.xml | 30 +-
.../skins/default/xui/de/floater_buy_land.xml | 12 +-
.../skins/default/xui/de/floater_camera.xml | 24 +-
.../xui/de/floater_day_cycle_options.xml | 192 +-
.../xui/de/floater_device_settings.xml | 4 +-
.../default/xui/de/floater_env_settings.xml | 48 +-
.../default/xui/de/floater_god_tools.xml | 24 +-
.../xui/de/floater_hardware_settings.xml | 80 +-
.../skins/default/xui/de/floater_hud.xml | 4 +-
.../default/xui/de/floater_image_preview.xml | 40 +-
.../skins/default/xui/de/floater_inspect.xml | 28 +-
.../skins/default/xui/de/floater_joystick.xml | 152 +-
.../skins/default/xui/de/floater_lagmeter.xml | 304 +-
.../default/xui/de/floater_lsl_guide.xml | 14 +-
.../default/xui/de/floater_media_browser.xml | 38 +-
.../default/xui/de/floater_mem_leaking.xml | 36 +-
.../default/xui/de/floater_mute_object.xml | 24 +-
.../default/xui/de/floater_my_friends.xml | 14 +-
.../default/xui/de/floater_post_process.xml | 106 +-
.../xui/de/floater_preview_classified.xml | 4 +-
.../default/xui/de/floater_preview_event.xml | 4 +-
.../default/xui/de/floater_region_info.xml | 4 +-
.../default/xui/de/floater_select_key.xml | 16 +-
.../default/xui/de/floater_sell_land.xml | 12 +-
.../default/xui/de/floater_settings_debug.xml | 8 +-
.../skins/default/xui/de/floater_snapshot.xml | 108 +-
.../skins/default/xui/de/floater_tools.xml | 289 +-
.../default/xui/de/floater_url_entry.xml | 24 +-
.../skins/default/xui/de/floater_water.xml | 178 +-
.../xui/de/floater_windlight_options.xml | 380 +-
.../default/xui/de/floater_world_map.xml | 8 +-
.../skins/default/xui/de/menu_login.xml | 26 +-
.../skins/default/xui/de/menu_slurl.xml | 12 +-
.../skins/default/xui/de/mime_types.xml | 460 +-
.../default/xui/de/panel_audio_device.xml | 50 +-
.../skins/default/xui/de/panel_friends.xml | 82 +-
.../skins/default/xui/de/panel_groups.xml | 30 +-
.../skins/default/xui/de/panel_login.xml | 12 +-
.../xui/de/panel_preferences_general.xml | 72 +-
.../xui/de/panel_preferences_graphics1.xml | 36 +-
.../newview/skins/default/xui/de/strings.xml | 886 +-
.../skins/default/xui/de/teleport_strings.xml | 180 +-
.../skins/default/xui/es/floater_about.xml | 72 +-
.../default/xui/es/floater_about_land.xml | 856 +-
.../xui/es/floater_animation_preview.xml | 328 +-
.../skins/default/xui/es/floater_auction.xml | 18 +-
.../default/xui/es/floater_avatar_picker.xml | 30 +-
.../xui/es/floater_avatar_textures.xml | 60 +-
.../default/xui/es/floater_build_options.xml | 16 +-
.../skins/default/xui/es/floater_bumps.xml | 42 +-
.../default/xui/es/floater_buy_contents.xml | 42 +-
.../default/xui/es/floater_buy_currency.xml | 136 +-
.../skins/default/xui/es/floater_buy_land.xml | 456 +-
.../default/xui/es/floater_buy_object.xml | 52 +-
.../default/xui/es/floater_choose_group.xml | 16 +-
.../default/xui/es/floater_color_picker.xml | 60 +-
.../skins/default/xui/es/floater_critical.xml | 22 +-
.../default/xui/es/floater_customize.xml | 854 +-
.../skins/default/xui/es/floater_gesture.xml | 30 +-
.../default/xui/es/floater_god_tools.xml | 294 +-
.../skins/default/xui/es/floater_im.xml | 90 +-
.../default/xui/es/floater_image_preview.xml | 104 +-
.../default/xui/es/floater_inventory.xml | 94 +-
.../es/floater_inventory_item_properties.xml | 170 +-
.../xui/es/floater_inventory_view_finder.xml | 48 +-
.../default/xui/es/floater_land_holdings.xml | 78 +-
.../default/xui/es/floater_live_lsleditor.xml | 24 +-
.../skins/default/xui/es/floater_moveview.xml | 22 +-
.../default/xui/es/floater_openobject.xml | 16 +-
.../skins/default/xui/es/floater_pay.xml | 42 +-
.../default/xui/es/floater_pay_object.xml | 60 +-
.../skins/default/xui/es/floater_postcard.xml | 72 +-
.../default/xui/es/floater_preferences.xml | 16 +-
.../xui/es/floater_preview_animation.xml | 16 +-
.../xui/es/floater_preview_gesture.xml | 120 +-
.../xui/es/floater_preview_notecard.xml | 32 +-
.../default/xui/es/floater_preview_sound.xml | 16 +-
.../xui/es/floater_preview_texture.xml | 18 +-
.../default/xui/es/floater_report_abuse.xml | 360 +-
.../default/xui/es/floater_script_debug.xml | 12 +-
.../default/xui/es/floater_script_preview.xml | 12 +-
.../default/xui/es/floater_script_queue.xml | 8 +-
.../default/xui/es/floater_script_search.xml | 26 +-
.../default/xui/es/floater_sell_land.xml | 136 +-
.../default/xui/es/floater_settings_debug.xml | 34 +-
.../skins/default/xui/es/floater_snapshot.xml | 270 +-
.../default/xui/es/floater_sound_preview.xml | 22 +-
.../skins/default/xui/es/floater_telehub.xml | 56 +-
.../default/xui/es/floater_texture_ctrl.xml | 48 +-
.../skins/default/xui/es/floater_tools.xml | 1222 +--
.../default/xui/es/floater_top_objects.xml | 110 +-
.../skins/default/xui/es/floater_tos.xml | 32 +-
.../xui/es/floater_wearable_save_as.xml | 22 +-
.../default/xui/es/floater_world_map.xml | 148 +-
.../skins/default/xui/es/menu_inventory.xml | 130 +-
.../skins/default/xui/es/menu_viewer.xml | 406 +-
.../default/xui/es/panel_group_general.xml | 142 +-
.../default/xui/es/panel_group_invite.xml | 46 +-
.../default/xui/es/panel_group_land_money.xml | 150 +-
.../default/xui/es/panel_group_notices.xml | 142 +-
.../default/xui/es/panel_group_roles.xml | 300 +-
.../skins/default/xui/es/panel_login.xml | 86 +-
.../default/xui/es/panel_preferences_chat.xml | 114 +-
.../xui/es/panel_preferences_general.xml | 228 +-
.../xui/es/panel_preferences_graphics1.xml | 352 +-
.../default/xui/es/panel_region_covenant.xml | 100 +-
.../default/xui/es/panel_region_debug.xml | 80 +-
.../default/xui/es/panel_region_estate.xml | 138 +-
.../default/xui/es/panel_region_general.xml | 92 +-
.../default/xui/es/panel_region_terrain.xml | 54 +-
.../default/xui/es/panel_region_texture.xml | 114 +-
.../default/xui/es/panel_scrolling_param.xml | 20 +-
.../skins/default/xui/es/panel_status_bar.xml | 76 +-
.../skins/default/xui/es/xui_version.xml | 8 +-
.../skins/default/xui/fr/floater_about.xml | 68 +-
.../default/xui/fr/floater_about_land.xml | 880 +-
.../xui/fr/floater_animation_preview.xml | 330 +-
.../skins/default/xui/fr/floater_auction.xml | 36 +-
.../default/xui/fr/floater_avatar_picker.xml | 42 +-
.../xui/fr/floater_avatar_textures.xml | 76 +-
.../skins/default/xui/fr/floater_beacons.xml | 30 +-
.../default/xui/fr/floater_build_options.xml | 16 +-
.../skins/default/xui/fr/floater_bumps.xml | 42 +-
.../default/xui/fr/floater_buy_contents.xml | 42 +-
.../default/xui/fr/floater_buy_currency.xml | 136 +-
.../skins/default/xui/fr/floater_buy_land.xml | 472 +-
.../default/xui/fr/floater_buy_object.xml | 52 +-
.../skins/default/xui/fr/floater_camera.xml | 24 +-
.../default/xui/fr/floater_choose_group.xml | 16 +-
.../default/xui/fr/floater_color_picker.xml | 64 +-
.../skins/default/xui/fr/floater_critical.xml | 22 +-
.../default/xui/fr/floater_customize.xml | 898 +-
.../xui/fr/floater_day_cycle_options.xml | 194 +-
.../xui/fr/floater_device_settings.xml | 6 +-
.../default/xui/fr/floater_env_settings.xml | 54 +-
.../default/xui/fr/floater_font_test.xml | 20 +-
.../skins/default/xui/fr/floater_gesture.xml | 36 +-
.../default/xui/fr/floater_god_tools.xml | 222 +-
.../xui/fr/floater_hardware_settings.xml | 76 +-
.../skins/default/xui/fr/floater_hud.xml | 4 +-
.../skins/default/xui/fr/floater_im.xml | 90 +-
.../default/xui/fr/floater_image_preview.xml | 104 +-
.../skins/default/xui/fr/floater_inspect.xml | 28 +-
.../default/xui/fr/floater_inventory.xml | 110 +-
.../fr/floater_inventory_item_properties.xml | 170 +-
.../xui/fr/floater_inventory_view_finder.xml | 48 +-
.../skins/default/xui/fr/floater_joystick.xml | 170 +-
.../skins/default/xui/fr/floater_lagmeter.xml | 304 +-
.../default/xui/fr/floater_land_holdings.xml | 82 +-
.../default/xui/fr/floater_live_lsleditor.xml | 24 +-
.../default/xui/fr/floater_lsl_guide.xml | 14 +-
.../default/xui/fr/floater_media_browser.xml | 40 +-
.../default/xui/fr/floater_mem_leaking.xml | 36 +-
.../skins/default/xui/fr/floater_moveview.xml | 24 +-
.../default/xui/fr/floater_mute_object.xml | 24 +-
.../default/xui/fr/floater_my_friends.xml | 14 +-
.../default/xui/fr/floater_openobject.xml | 16 +-
.../skins/default/xui/fr/floater_pay.xml | 44 +-
.../default/xui/fr/floater_pay_object.xml | 62 +-
.../default/xui/fr/floater_post_process.xml | 108 +-
.../skins/default/xui/fr/floater_postcard.xml | 90 +-
.../default/xui/fr/floater_preferences.xml | 18 +-
.../xui/fr/floater_preview_animation.xml | 20 +-
.../xui/fr/floater_preview_classified.xml | 4 +-
.../default/xui/fr/floater_preview_event.xml | 4 +-
.../xui/fr/floater_preview_gesture.xml | 130 +-
.../xui/fr/floater_preview_notecard.xml | 32 +-
.../default/xui/fr/floater_preview_sound.xml | 24 +-
.../xui/fr/floater_preview_texture.xml | 18 +-
.../default/xui/fr/floater_region_info.xml | 4 +-
.../default/xui/fr/floater_report_abuse.xml | 366 +-
.../default/xui/fr/floater_script_debug.xml | 12 +-
.../default/xui/fr/floater_script_preview.xml | 12 +-
.../default/xui/fr/floater_script_queue.xml | 8 +-
.../default/xui/fr/floater_script_search.xml | 30 +-
.../default/xui/fr/floater_select_key.xml | 14 +-
.../default/xui/fr/floater_sell_land.xml | 144 +-
.../default/xui/fr/floater_settings_debug.xml | 34 +-
.../skins/default/xui/fr/floater_snapshot.xml | 274 +-
.../default/xui/fr/floater_sound_preview.xml | 56 +-
.../skins/default/xui/fr/floater_telehub.xml | 62 +-
.../default/xui/fr/floater_texture_ctrl.xml | 48 +-
.../skins/default/xui/fr/floater_tools.xml | 1248 +--
.../default/xui/fr/floater_top_objects.xml | 110 +-
.../skins/default/xui/fr/floater_tos.xml | 54 +-
.../default/xui/fr/floater_url_entry.xml | 26 +-
.../skins/default/xui/fr/floater_water.xml | 178 +-
.../xui/fr/floater_wearable_save_as.xml | 22 +-
.../xui/fr/floater_windlight_options.xml | 380 +-
.../default/xui/fr/floater_world_map.xml | 178 +-
indra/newview/skins/default/xui/fr/fonts.xml | 18 +-
.../skins/default/xui/fr/menu_inventory.xml | 132 +-
.../skins/default/xui/fr/menu_login.xml | 26 +-
.../skins/default/xui/fr/menu_slurl.xml | 12 +-
.../skins/default/xui/fr/menu_viewer.xml | 422 +-
.../skins/default/xui/fr/mime_types.xml | 460 +-
.../default/xui/fr/panel_audio_device.xml | 50 +-
.../skins/default/xui/fr/panel_friends.xml | 40 +-
.../default/xui/fr/panel_group_general.xml | 160 +-
.../default/xui/fr/panel_group_invite.xml | 52 +-
.../default/xui/fr/panel_group_land_money.xml | 170 +-
.../default/xui/fr/panel_group_notices.xml | 144 +-
.../default/xui/fr/panel_group_roles.xml | 320 +-
.../skins/default/xui/fr/panel_groups.xml | 32 +-
.../skins/default/xui/fr/panel_login.xml | 104 +-
.../default/xui/fr/panel_preferences_chat.xml | 118 +-
.../xui/fr/panel_preferences_general.xml | 238 +-
.../xui/fr/panel_preferences_graphics1.xml | 390 +-
.../default/xui/fr/panel_region_covenant.xml | 102 +-
.../default/xui/fr/panel_region_debug.xml | 80 +-
.../default/xui/fr/panel_region_estate.xml | 156 +-
.../default/xui/fr/panel_region_general.xml | 90 +-
.../default/xui/fr/panel_region_terrain.xml | 54 +-
.../default/xui/fr/panel_region_texture.xml | 144 +-
.../default/xui/fr/panel_scrolling_param.xml | 24 +-
.../skins/default/xui/fr/panel_status_bar.xml | 82 +-
.../skins/default/xui/fr/role_actions.xml | 402 +-
.../newview/skins/default/xui/fr/strings.xml | 932 +-
.../skins/default/xui/fr/teleport_strings.xml | 180 +-
.../skins/default/xui/fr/xui_version.xml | 8 +-
.../skins/default/xui/it/floater_snapshot.xml | 8 +-
.../xui/ja/floater_animation_preview.xml | 148 +-
.../skins/default/xui/ja/floater_beacons.xml | 30 +-
.../skins/default/xui/ja/floater_buy_land.xml | 12 +-
.../skins/default/xui/ja/floater_camera.xml | 24 +-
.../xui/ja/floater_day_cycle_options.xml | 194 +-
.../xui/ja/floater_device_settings.xml | 2 +-
.../default/xui/ja/floater_env_settings.xml | 48 +-
.../default/xui/ja/floater_god_tools.xml | 24 +-
.../xui/ja/floater_hardware_settings.xml | 84 +-
.../skins/default/xui/ja/floater_hud.xml | 4 +-
.../default/xui/ja/floater_image_preview.xml | 40 +-
.../skins/default/xui/ja/floater_inspect.xml | 28 +-
.../skins/default/xui/ja/floater_joystick.xml | 250 +-
.../skins/default/xui/ja/floater_lagmeter.xml | 304 +-
.../default/xui/ja/floater_lsl_guide.xml | 14 +-
.../default/xui/ja/floater_media_browser.xml | 38 +-
.../default/xui/ja/floater_mem_leaking.xml | 38 +-
.../default/xui/ja/floater_mute_object.xml | 24 +-
.../default/xui/ja/floater_my_friends.xml | 14 +-
.../default/xui/ja/floater_post_process.xml | 108 +-
.../xui/ja/floater_preview_classified.xml | 4 +-
.../default/xui/ja/floater_preview_event.xml | 4 +-
.../default/xui/ja/floater_region_info.xml | 4 +-
.../default/xui/ja/floater_select_key.xml | 14 +-
.../default/xui/ja/floater_sell_land.xml | 12 +-
.../default/xui/ja/floater_settings_debug.xml | 8 +-
.../skins/default/xui/ja/floater_snapshot.xml | 108 +-
.../default/xui/ja/floater_url_entry.xml | 26 +-
.../skins/default/xui/ja/floater_water.xml | 178 +-
.../xui/ja/floater_windlight_options.xml | 380 +-
.../default/xui/ja/floater_world_map.xml | 8 +-
.../skins/default/xui/ja/menu_login.xml | 26 +-
.../skins/default/xui/ja/menu_slurl.xml | 12 +-
.../skins/default/xui/ja/mime_types.xml | 460 +-
.../default/xui/ja/panel_audio_device.xml | 52 +-
.../skins/default/xui/ja/panel_friends.xml | 106 +-
.../skins/default/xui/ja/panel_groups.xml | 32 +-
.../skins/default/xui/ja/panel_login.xml | 12 +-
.../xui/ja/panel_preferences_graphics1.xml | 36 +-
.../newview/skins/default/xui/ja/strings.xml | 932 +-
.../skins/default/xui/ja/teleport_strings.xml | 174 +-
.../skins/default/xui/nl/floater_snapshot.xml | 8 +-
.../xui/pl/floater_animation_preview.xml | 148 +-
.../skins/default/xui/pl/floater_beacons.xml | 30 +-
.../skins/default/xui/pl/floater_buy_land.xml | 12 +-
.../default/xui/pl/floater_god_tools.xml | 24 +-
.../xui/pl/floater_hardware_settings.xml | 20 +-
.../default/xui/pl/floater_image_preview.xml | 40 +-
.../default/xui/pl/floater_sell_land.xml | 12 +-
.../default/xui/pl/floater_settings_debug.xml | 8 +-
.../skins/default/xui/pl/floater_snapshot.xml | 108 +-
.../skins/default/xui/pl/floater_tools.xml | 288 +-
.../default/xui/pl/floater_world_map.xml | 8 +-
.../skins/default/xui/pl/panel_login.xml | 14 +-
.../xui/pl/panel_preferences_general.xml | 64 +-
.../xui/pl/panel_preferences_graphics1.xml | 36 +-
.../skins/default/xui/pt/floater_about.xml | 72 +-
.../default/xui/pt/floater_about_land.xml | 864 +-
.../xui/pt/floater_animation_preview.xml | 322 +-
.../skins/default/xui/pt/floater_auction.xml | 18 +-
.../default/xui/pt/floater_avatar_picker.xml | 30 +-
.../xui/pt/floater_avatar_textures.xml | 60 +-
.../skins/default/xui/pt/floater_beacons.xml | 30 +-
.../default/xui/pt/floater_build_options.xml | 16 +-
.../skins/default/xui/pt/floater_bumps.xml | 42 +-
.../default/xui/pt/floater_buy_contents.xml | 42 +-
.../default/xui/pt/floater_buy_currency.xml | 136 +-
.../skins/default/xui/pt/floater_buy_land.xml | 450 +-
.../default/xui/pt/floater_buy_object.xml | 52 +-
.../skins/default/xui/pt/floater_camera.xml | 24 +-
.../default/xui/pt/floater_choose_group.xml | 16 +-
.../default/xui/pt/floater_color_picker.xml | 60 +-
.../skins/default/xui/pt/floater_critical.xml | 22 +-
.../default/xui/pt/floater_customize.xml | 902 +-
.../xui/pt/floater_day_cycle_options.xml | 134 +-
.../default/xui/pt/floater_env_settings.xml | 46 +-
.../skins/default/xui/pt/floater_gesture.xml | 30 +-
.../default/xui/pt/floater_god_tools.xml | 212 +-
.../xui/pt/floater_hardware_settings.xml | 76 +-
.../skins/default/xui/pt/floater_hud.xml | 4 +-
.../skins/default/xui/pt/floater_im.xml | 90 +-
.../default/xui/pt/floater_image_preview.xml | 104 +-
.../skins/default/xui/pt/floater_inspect.xml | 22 +-
.../default/xui/pt/floater_inventory.xml | 94 +-
.../pt/floater_inventory_item_properties.xml | 170 +-
.../xui/pt/floater_inventory_view_finder.xml | 48 +-
.../skins/default/xui/pt/floater_joystick.xml | 166 +-
.../skins/default/xui/pt/floater_lagmeter.xml | 304 +-
.../default/xui/pt/floater_land_holdings.xml | 76 +-
.../default/xui/pt/floater_live_lsleditor.xml | 24 +-
.../default/xui/pt/floater_lsl_guide.xml | 14 +-
.../default/xui/pt/floater_media_browser.xml | 40 +-
.../default/xui/pt/floater_mem_leaking.xml | 24 +-
.../skins/default/xui/pt/floater_moveview.xml | 22 +-
.../default/xui/pt/floater_mute_object.xml | 22 +-
.../default/xui/pt/floater_openobject.xml | 16 +-
.../skins/default/xui/pt/floater_pay.xml | 42 +-
.../default/xui/pt/floater_pay_object.xml | 62 +-
.../skins/default/xui/pt/floater_postcard.xml | 80 +-
.../default/xui/pt/floater_preferences.xml | 16 +-
.../xui/pt/floater_preview_animation.xml | 16 +-
.../xui/pt/floater_preview_classified.xml | 4 +-
.../default/xui/pt/floater_preview_event.xml | 4 +-
.../xui/pt/floater_preview_gesture.xml | 118 +-
.../xui/pt/floater_preview_notecard.xml | 32 +-
.../default/xui/pt/floater_preview_sound.xml | 16 +-
.../xui/pt/floater_preview_texture.xml | 18 +-
.../default/xui/pt/floater_region_info.xml | 4 +-
.../default/xui/pt/floater_report_abuse.xml | 362 +-
.../default/xui/pt/floater_script_debug.xml | 12 +-
.../default/xui/pt/floater_script_preview.xml | 12 +-
.../default/xui/pt/floater_script_queue.xml | 8 +-
.../default/xui/pt/floater_script_search.xml | 26 +-
.../default/xui/pt/floater_sell_land.xml | 136 +-
.../default/xui/pt/floater_settings_debug.xml | 34 +-
.../skins/default/xui/pt/floater_snapshot.xml | 274 +-
.../default/xui/pt/floater_sound_preview.xml | 22 +-
.../skins/default/xui/pt/floater_telehub.xml | 56 +-
.../default/xui/pt/floater_texture_ctrl.xml | 46 +-
.../skins/default/xui/pt/floater_tools.xml | 1220 +--
.../default/xui/pt/floater_top_objects.xml | 110 +-
.../skins/default/xui/pt/floater_tos.xml | 30 +-
.../default/xui/pt/floater_url_entry.xml | 24 +-
.../skins/default/xui/pt/floater_water.xml | 170 +-
.../xui/pt/floater_wearable_save_as.xml | 22 +-
.../xui/pt/floater_windlight_options.xml | 372 +-
.../default/xui/pt/floater_world_map.xml | 126 +-
.../skins/default/xui/pt/menu_inventory.xml | 130 +-
.../skins/default/xui/pt/menu_login.xml | 26 +-
.../skins/default/xui/pt/menu_slurl.xml | 12 +-
.../skins/default/xui/pt/menu_viewer.xml | 406 +-
.../skins/default/xui/pt/mime_types.xml | 460 +-
.../default/xui/pt/panel_audio_device.xml | 50 +-
.../skins/default/xui/pt/panel_friends.xml | 40 +-
.../default/xui/pt/panel_group_general.xml | 132 +-
.../default/xui/pt/panel_group_invite.xml | 46 +-
.../default/xui/pt/panel_group_land_money.xml | 148 +-
.../default/xui/pt/panel_group_notices.xml | 140 +-
.../default/xui/pt/panel_group_roles.xml | 278 +-
.../skins/default/xui/pt/panel_login.xml | 74 +-
.../default/xui/pt/panel_preferences_chat.xml | 118 +-
.../xui/pt/panel_preferences_general.xml | 228 +-
.../xui/pt/panel_preferences_graphics1.xml | 354 +-
.../default/xui/pt/panel_region_covenant.xml | 100 +-
.../default/xui/pt/panel_region_debug.xml | 80 +-
.../default/xui/pt/panel_region_estate.xml | 138 +-
.../default/xui/pt/panel_region_general.xml | 88 +-
.../default/xui/pt/panel_region_terrain.xml | 54 +-
.../default/xui/pt/panel_region_texture.xml | 114 +-
.../default/xui/pt/panel_scrolling_param.xml | 20 +-
.../skins/default/xui/pt/panel_status_bar.xml | 76 +-
.../skins/default/xui/pt/role_actions.xml | 372 +-
.../newview/skins/default/xui/pt/strings.xml | 842 +-
.../skins/default/xui/pt/teleport_strings.xml | 150 +-
.../skins/default/xui/pt/xui_version.xml | 8 +-
indra/newview/tests/llagentaccess_test.cpp | 137 +-
indra/newview/viewer_manifest.py | 1 +
indra/test/CMakeLists.txt | 6 +-
indra/test/lldoubledispatch_tut.cpp | 245 +
indra/test/llpermissions_tut.cpp | 11 +-
indra/test/llsaleinfo_tut.cpp | 15 +-
indra/test/llscriptresource_tut.cpp | 7 +-
indra/test/lltimestampcache_tut.cpp | 7 +-
indra/test/lltranscode_tut.cpp | 7 +-
indra/test/test.h | 5 +-
1135 files changed, 72995 insertions(+), 62605 deletions(-)
create mode 100644 indra/integration_tests/CMakeLists.txt
create mode 100644 indra/integration_tests/llui_libtest/CMakeLists.txt
create mode 100644 indra/integration_tests/llui_libtest/llui_libtest.cpp
create mode 100644 indra/integration_tests/llui_libtest/llui_libtest.h
create mode 100644 indra/integration_tests/llui_libtest/llwidgetreg.cpp
create mode 100644 indra/integration_tests/llui_libtest/llwidgetreg.h
create mode 100755 indra/llcommon/lldoubledispatch.h
create mode 100644 indra/llcommon/llinstancetracker.h
create mode 100644 indra/llcommon/llpointer.h
create mode 100644 indra/llcommon/llptrto.cpp
create mode 100644 indra/llcommon/llptrto.h
create mode 100644 indra/llcommon/llrefcount.cpp
create mode 100644 indra/llcommon/llrefcount.h
create mode 100644 indra/llcommon/llsafehandle.h
create mode 100644 indra/llcommon/llsingleton.h
create mode 100644 indra/llcommon/lltreeiterators.h
create mode 100644 indra/llui/llconsole.cpp
create mode 100644 indra/llui/llconsole.h
create mode 100644 indra/llui/llcontainerview.cpp
create mode 100644 indra/llui/llcontainerview.h
create mode 100644 indra/llui/llf32uictrl.cpp
create mode 100644 indra/llui/llf32uictrl.h
create mode 100644 indra/llui/llfloaterreg.cpp
create mode 100644 indra/llui/llfloaterreg.h
create mode 100644 indra/llui/llflyoutbutton.cpp
create mode 100644 indra/llui/llflyoutbutton.h
create mode 100644 indra/llui/lllayoutstack.cpp
create mode 100644 indra/llui/lllayoutstack.h
create mode 100644 indra/llui/lllazyvalue.h
create mode 100644 indra/llui/llmultifloater.cpp
create mode 100644 indra/llui/llmultifloater.h
create mode 100644 indra/llui/llscrolllistcell.cpp
create mode 100644 indra/llui/llscrolllistcell.h
create mode 100644 indra/llui/llscrolllistcolumn.cpp
create mode 100644 indra/llui/llscrolllistcolumn.h
create mode 100644 indra/llui/llscrolllistitem.cpp
create mode 100644 indra/llui/llscrolllistitem.h
create mode 100644 indra/llui/llsdparam.cpp
create mode 100644 indra/llui/llsdparam.h
create mode 100644 indra/llui/llsearcheditor.cpp
create mode 100644 indra/llui/llsearcheditor.h
create mode 100644 indra/llui/llstatbar.cpp
create mode 100644 indra/llui/llstatbar.h
create mode 100644 indra/llui/llstatgraph.cpp
create mode 100644 indra/llui/llstatgraph.h
create mode 100644 indra/llui/llstatview.cpp
create mode 100644 indra/llui/llstatview.h
create mode 100644 indra/llui/lluiimage.cpp
create mode 100644 indra/llui/lluiimage.h
create mode 100644 indra/llui/llviewmodel.cpp
create mode 100644 indra/llui/llviewmodel.h
create mode 100644 indra/llwindow/llwindowcallbacks.cpp
create mode 100644 indra/llwindow/llwindowcallbacks.h
create mode 100644 indra/newview/app_settings/ignorable_dialogs.xml
create mode 100644 indra/newview/llavatariconctrl.cpp
create mode 100644 indra/newview/llavatariconctrl.h
create mode 100644 indra/newview/llavatarpropertiesprocessor.cpp
create mode 100644 indra/newview/llavatarpropertiesprocessor.h
create mode 100644 indra/newview/llfavoritesbar.cpp
create mode 100644 indra/newview/llfavoritesbar.h
create mode 100644 indra/newview/llfloateruipreview.cpp
create mode 100644 indra/newview/llfloateruipreview.h
create mode 100644 indra/newview/llinventoryactions.h
create mode 100644 indra/newview/lllocationhistory.cpp
create mode 100644 indra/newview/lllocationhistory.h
create mode 100644 indra/newview/lllocationinputctrl.cpp
create mode 100644 indra/newview/lllocationinputctrl.h
create mode 100644 indra/newview/llnavigationbar.cpp
create mode 100644 indra/newview/llnavigationbar.h
create mode 100644 indra/newview/lloutputmonitorctrl.cpp
create mode 100644 indra/newview/lloutputmonitorctrl.h
create mode 100644 indra/newview/llslurl.cpp
create mode 100644 indra/newview/llslurl.h
create mode 100644 indra/newview/llteleporthistory.cpp
create mode 100644 indra/newview/llteleporthistory.h
create mode 100644 indra/newview/llviewerfloaterreg.cpp
create mode 100644 indra/newview/llviewerfloaterreg.h
create mode 100644 indra/newview/res/bitmap2.bmp
create mode 100644 indra/newview/res/install_icon.BMP
create mode 100644 indra/newview/res/loginbackground.bmp
create mode 100644 indra/newview/res/uninstall_icon.BMP
create mode 100644 indra/newview/skins/default/textures/jump_left_in.tga
create mode 100644 indra/newview/skins/default/textures/jump_left_out.tga
create mode 100644 indra/newview/skins/default/textures/jump_right_in.tga
create mode 100644 indra/newview/skins/default/textures/jump_right_out.tga
create mode 100644 indra/newview/skins/default/textures/menu_separator.png
create mode 100644 indra/newview/skins/default/textures/transparent.j2c
create mode 100644 indra/newview/skins/default/textures/voice_meter_dot.j2c
create mode 100644 indra/newview/skins/default/textures/voice_meter_rings.j2c
create mode 100755 indra/test/lldoubledispatch_tut.cpp
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 98c80288da..e030540f28 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -259,6 +259,9 @@ Jacek Antonelli
VWR-597
VWR-2054
VWR-2448
+ VWR-2896
+ VWR-2947
+ VWR-2948
VWR-3605
JB Kraft
VWR-5283
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 7f4c2c33c1..c285bcae4b 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -110,3 +110,7 @@ if (SERVER)
add_subdirectory(${SERVER_PREFIX}tools)
endif (WINDOWS)
endif (SERVER)
+
+# Define after the custom viewer and server targets are created so individual
+# apps can add themselves as dependencies
+add_subdirectory(${INTEGRATION_TESTS_PREFIX}integration_tests)
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 08151bc732..b19eebe1fe 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -31,6 +31,7 @@ MACRO(ADD_BUILD_TEST name parent)
SET(basic_libraries
${LLCOMMON_LIBRARIES}
+ ${LLMATH_LIBRARIES}
${APRUTIL_LIBRARIES}
${APR_LIBRARIES}
${PTHREAD_LIBRARY}
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index c4dcc7eae7..adff01197f 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -23,6 +23,7 @@ set(LIBS_SERVER_PREFIX)
set(SCRIPTS_PREFIX ../scripts)
set(SERVER_PREFIX)
set(VIEWER_PREFIX)
+set(INTEGRATION_TESTS_PREFIX)
set(LIBS_CLOSED_DIR ${CMAKE_SOURCE_DIR}/${LIBS_CLOSED_PREFIX})
set(LIBS_OPEN_DIR ${CMAKE_SOURCE_DIR}/${LIBS_OPEN_PREFIX})
diff --git a/indra/integration_tests/CMakeLists.txt b/indra/integration_tests/CMakeLists.txt
new file mode 100644
index 0000000000..67e8fbf1f2
--- /dev/null
+++ b/indra/integration_tests/CMakeLists.txt
@@ -0,0 +1,3 @@
+# -*- cmake -*-
+
+add_subdirectory(llui_libtest)
diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt
new file mode 100644
index 0000000000..71a47f1475
--- /dev/null
+++ b/indra/integration_tests/llui_libtest/CMakeLists.txt
@@ -0,0 +1,96 @@
+# -*- cmake -*-
+
+project (llui_libtest)
+
+include(00-Common)
+include(LLCommon)
+include(LLImage)
+include(LLImageJ2COJ) # ugh, needed for images
+include(LLMath)
+include(LLRender)
+include(LLWindow)
+include(LLUI)
+include(LLVFS) # ugh, needed for LLDir
+include(LLXML)
+include(Linking)
+# include(Tut)
+
+include_directories(
+ ${FREETYPE_INCLUDE_DIRS}
+ ${LLCOMMON_INCLUDE_DIRS}
+ ${LLIMAGE_INCLUDE_DIRS}
+ ${LLMATH_INCLUDE_DIRS}
+ ${LLRENDER_INCLUDE_DIRS}
+ ${LLUI_INCLUDE_DIRS}
+ ${LLVFS_INCLUDE_DIRS}
+ ${LLWINDOW_INCLUDE_DIRS}
+ ${LLXML_INCLUDE_DIRS}
+ )
+
+set(llui_libtest_SOURCE_FILES
+ llui_libtest.cpp
+ llwidgetreg.cpp
+ )
+
+set(llui_libtest_HEADER_FILES
+ CMakeLists.txt
+ llui_libtest.h
+ llwidgetreg.h
+ )
+
+set_source_files_properties(${llui_libtest_HEADER_FILES}
+ PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llui_libtest_SOURCE_FILES ${llui_libtest_HEADER_FILES})
+
+add_executable(llui_libtest ${llui_libtest_SOURCE_FILES})
+
+# Link with OS-specific libraries for LLWindow dependency
+if (DARWIN)
+ find_library(COCOA_LIBRARY Cocoa)
+ set(OS_LIBRARIES ${COCOA_LIBRARY})
+elseif (WINDOWS)
+ set(OS_LIBRARIES ${WINDOWS_LIBRARIES})
+elseif (LINUX)
+ set(OS_LIBRARIES)
+else (DARWIN)
+ message(FATAL_ERROR "unknown platform")
+endif (DARWIN)
+
+# Libraries on which this library depends, needed for Linux builds
+# Sort by high-level to low-level
+target_link_libraries(llui_libtest
+ llui
+ ${OS_LIBRARIES}
+ )
+
+if (WINDOWS)
+ set_target_properties(llui_libtest
+ PROPERTIES
+ LINK_FLAGS "/NODEFAULTLIB:LIBCMT"
+ LINK_FLAGS_DEBUG "/NODEFAULTLIB:MSVCRT /NODEFAULTLIB:LIBCMTD"
+ )
+
+ # Copy over OpenJPEG.dll
+ # *NOTE: On Windows with VS2005, only the first comment prints
+ set(OPENJPEG_RELEASE
+ "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release/openjpeg.dll")
+ add_custom_command( TARGET llui_libtest POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${OPENJPEG_RELEASE} ${CMAKE_CURRENT_BINARY_DIR}
+ COMMENT "Copying OpenJPEG DLLs to binary directory"
+ )
+ set(OPENJPEG_DEBUG
+ "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug/openjpegd.dll")
+ add_custom_command( TARGET llui_libtest POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ ${OPENJPEG_DEBUG} ${CMAKE_CURRENT_BINARY_DIR}
+ )
+endif (WINDOWS)
+
+if (VIEWER)
+ # Ensure people working on the viewer don't break this library
+ # *NOTE: This could be removed, or only built by Parabuild, if the build
+ # and link times become too long. JC
+ add_dependencies(viewer llui_libtest)
+endif (VIEWER)
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.cpp b/indra/integration_tests/llui_libtest/llui_libtest.cpp
new file mode 100644
index 0000000000..599bcabfcb
--- /dev/null
+++ b/indra/integration_tests/llui_libtest/llui_libtest.cpp
@@ -0,0 +1,149 @@
+/**
+ * @file llui_libtest.cpp
+ * @brief Integration test for the LLUI library
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "linden_common.h"
+
+#include "llui_libtest.h"
+
+// project includes
+#include "llwidgetreg.h"
+
+// linden library includes
+#include "llcontrol.h" // LLControlGroup
+#include "lldir.h"
+#include "llerrorcontrol.h"
+#include "llfloater.h"
+#include "llfontgl.h"
+#include "lltrans.h"
+#include "llui.h"
+#include "lluictrlfactory.h"
+
+#include <iostream>
+
+// *TODO: switch to using TUT
+// *TODO: teach Parabuild about this program, run automatically after full builds
+
+static std::string get_xui_dir()
+{
+ std::string delim = gDirUtilp->getDirDelimiter();
+ return gDirUtilp->getAppRODataDir() + delim + std::string("skins") + delim + "default" + delim + "xui" + delim;
+}
+
+int main(int argc, char** argv)
+{
+ // Must init LLError for llerrs to actually cause errors.
+ LLError::initForApplication(".");
+
+ // Font lookup needs directory support
+ gDirUtilp->initAppDirs("SecondLife", "../../../newview");
+ gDirUtilp->setSkinFolder("default");
+
+ std::string config_filename = gDirUtilp->getExpandedFilename(
+ LL_PATH_APP_SETTINGS, "settings.xml");
+ LLControlGroup config_group("config");
+ config_group.loadFromFile(config_filename);
+
+ std::string color_filename = gDirUtilp->getExpandedFilename(
+ LL_PATH_DEFAULT_SKIN, "colors.xml");
+ LLControlGroup color_group("color");
+ color_group.loadFromFile(color_filename);
+
+ LLControlGroup floater_group("floater");
+ LLControlGroup ignores_group("ignores");
+ LLUI::settings_map_t settings;
+ settings["config"] = &config_group;
+ settings["color"] = &color_group;
+ settings["floater"] = &floater_group;
+ settings["ignores"] = &ignores_group;
+
+ LLImageProviderInterface* image_provider = NULL;
+ LLUI::initClass(settings, image_provider);
+
+ const bool no_register_widgets = false;
+ LLWidgetReg::initClass( no_register_widgets );
+
+ // Unclear if this is needed
+ LLUI::setupPaths();
+ // Otherwise we get translation warnings when setting up floaters
+ // (tooltips for buttons)
+ std::set<std::string> default_args;
+ LLTrans::parseStrings("strings.xml", default_args);
+
+ LLFontManager::initClass();
+
+ // Creating widgets apparently requires fonts to be initialized,
+ // otherwise it crashes.
+ LLFontGL::initClass(96.f, 1.f, 1.f,
+ gDirUtilp->getAppRODataDir(),
+ LLUI::getXUIPaths(),
+ false ); // don't create gl textures
+
+ LLFloaterView::Params fvparams;
+ fvparams.name("Floater View");
+ fvparams.rect( LLRect(0,480,640,0) );
+ fvparams.mouse_opaque(false);
+ fvparams.follows.flags(FOLLOWS_ALL);
+ fvparams.tab_stop(false);
+ gFloaterView = LLUICtrlFactory::create<LLFloaterView> (fvparams);
+
+ // Convert all test floaters to new XML format
+ std::string delim = gDirUtilp->getDirDelimiter();
+ std::string xui_dir = get_xui_dir() + "en-us" + delim;
+ std::string filename;
+ while (gDirUtilp->getNextFileInDir(xui_dir, "floater_test_*.xml", filename, false))
+ {
+ if (filename.find("_new.xml") != std::string::npos)
+ {
+ // don't re-export other test floaters
+ continue;
+ }
+ llinfos << "Converting " << filename << llendl;
+ // Build a floater and output new attributes
+ LLXMLNodePtr output_node = new LLXMLNode();
+ LLFloater* floater = new LLFloater();
+ LLUICtrlFactory::getInstance()->buildFloater(floater,
+ filename,
+ FALSE, // don't open floater
+ output_node);
+ std::string out_filename = xui_dir + filename;
+ std::string::size_type extension_pos = out_filename.rfind(".xml");
+ out_filename.resize(extension_pos);
+ out_filename += "_new.xml";
+
+ llinfos << "Output: " << out_filename << llendl;
+ LLFILE* floater_file = LLFile::fopen(out_filename.c_str(), "w");
+ LLXMLNode::writeHeaderToFile(floater_file);
+ const char* const indent = " ";
+ output_node->writeToFile(floater_file, indent);
+ fclose(floater_file);
+ }
+ return 0;
+}
diff --git a/indra/integration_tests/llui_libtest/llui_libtest.h b/indra/integration_tests/llui_libtest/llui_libtest.h
new file mode 100644
index 0000000000..a84d57dba9
--- /dev/null
+++ b/indra/integration_tests/llui_libtest/llui_libtest.h
@@ -0,0 +1,36 @@
+/**
+ * @file llui_libtest.h
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLUI_LIBTEST_H
+#define LLUI_LIBTEST_H
+
+// TODO
+
+#endif
diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.cpp b/indra/integration_tests/llui_libtest/llwidgetreg.cpp
new file mode 100644
index 0000000000..f4a4665cc5
--- /dev/null
+++ b/indra/integration_tests/llui_libtest/llwidgetreg.cpp
@@ -0,0 +1,107 @@
+/**
+ * @file llwidgetreg.cpp
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "linden_common.h"
+
+#include "llwidgetreg.h"
+
+#include "llbutton.h"
+#include "llcheckboxctrl.h"
+#include "llcombobox.h"
+#include "llcontainerview.h"
+#include "lliconctrl.h"
+#include "llmenugl.h"
+#include "llmultislider.h"
+#include "llmultisliderctrl.h"
+#include "llprogressbar.h"
+#include "llradiogroup.h"
+#include "llscrollcontainer.h"
+#include "llscrollingpanellist.h"
+#include "llscrolllistctrl.h"
+#include "llslider.h"
+#include "llsliderctrl.h"
+#include "llspinctrl.h"
+#include "llstatview.h"
+#include "lltabcontainer.h"
+#include "lltextbox.h"
+#include "lltexteditor.h"
+#include "llflyoutbutton.h"
+#include "llsearcheditor.h"
+#include "lllayoutstack.h"
+
+void LLWidgetReg::initClass(bool register_widgets)
+{
+ // Only need to register if the Windows linker has optimized away the
+ // references to the object files.
+ if (register_widgets)
+ {
+ LLRegisterWidget<LLButton> button("button");
+ LLRegisterWidget<LLCheckBoxCtrl> check_box("check_box");
+ LLRegisterWidget<LLComboBox> combo_box("combo_box");
+ LLRegisterWidget<LLFlyoutButton> flyout_button("flyout_button");
+ LLRegisterWidget<LLContainerView> container_view("container_view");
+ LLRegisterWidget<LLIconCtrl> icon("icon");
+ LLRegisterWidget<LLLineEditor> line_editor("line_editor");
+ LLRegisterWidget<LLSearchEditor> search_editor("search_editor");
+ LLRegisterWidget<LLMenuItemSeparatorGL> menu_item_separator("menu_item_separator");
+ LLRegisterWidget<LLMenuItemCallGL> menu_item_call_gl("menu_item_call");
+ LLRegisterWidget<LLMenuItemCheckGL> menu_item_check_gl("menu_item_check");
+ LLRegisterWidget<LLMenuGL> menu("menu");
+ LLRegisterWidget<LLMenuBarGL> menu_bar("menu_bar");
+ LLRegisterWidget<LLContextMenu> context_menu("context_menu");
+ LLRegisterWidget<LLMultiSlider> multi_slider_bar("multi_slider_bar");
+ LLRegisterWidget<LLMultiSliderCtrl> multi_slider("multi_slider");
+ LLRegisterWidget<LLPanel> panel("panel", &LLPanel::fromXML);
+ LLRegisterWidget<LLLayoutStack> layout_stack("layout_stack", &LLLayoutStack::fromXML);
+ LLRegisterWidget<LLProgressBar> progress_bar("progress_bar");
+ LLRegisterWidget<LLRadioGroup> radio_group("radio_group");
+ LLRegisterWidget<LLRadioCtrl> radio_item("radio_item");
+ LLRegisterWidget<LLScrollContainer> scroll_container("scroll_container");
+ LLRegisterWidget<LLScrollingPanelList> scrolling_panel_list("scrolling_panel_list");
+ LLRegisterWidget<LLScrollListCtrl> scroll_list("scroll_list");
+ LLRegisterWidget<LLSlider> slider_bar("slider_bar");
+ LLRegisterWidget<LLSlider> volume_slider("volume_slider");
+ LLRegisterWidget<LLSliderCtrl> slider("slider");
+ LLRegisterWidget<LLSpinCtrl> spinner("spinner");
+ LLRegisterWidget<LLStatBar> stat_bar("stat_bar");
+ //LLRegisterWidget<LLPlaceHolderPanel> placeholder("placeholder");
+ LLRegisterWidget<LLTabContainer> tab_container("tab_container");
+ LLRegisterWidget<LLTextBox> text("text");
+ LLRegisterWidget<LLTextEditor> simple_text_editor("simple_text_editor");
+ LLRegisterWidget<LLUICtrl> ui_ctrl("ui_ctrl");
+ LLRegisterWidget<LLStatView> stat_view("stat_view");
+ //LLRegisterWidget<LLUICtrlLocate> locate("locate");
+ //LLRegisterWidget<LLUICtrlLocate> pad("pad");
+ LLRegisterWidget<LLViewBorder> view_border("view_border");
+ }
+
+ // *HACK: Usually this is registered as a viewer text editor
+ LLRegisterWidget<LLTextEditor> text_editor("text_editor");
+}
diff --git a/indra/integration_tests/llui_libtest/llwidgetreg.h b/indra/integration_tests/llui_libtest/llwidgetreg.h
new file mode 100644
index 0000000000..263e3958c9
--- /dev/null
+++ b/indra/integration_tests/llui_libtest/llwidgetreg.h
@@ -0,0 +1,43 @@
+/**
+ * @file llwidgetreg.h
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLWIDGETREG_H
+#define LLWIDGETREG_H
+
+// Register all widgets with the builder registry.
+// Useful on Windows where linker discards all references to the
+// static LLRegisterWidget<> calls.
+class LLWidgetReg
+{
+public:
+ static void initClass(bool register_widgets);
+};
+
+#endif
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
index 5b6db3bd87..6a494d1983 100644
--- a/indra/llaudio/llaudiodecodemgr.cpp
+++ b/indra/llaudio/llaudiodecodemgr.cpp
@@ -40,8 +40,8 @@
#include "llstring.h"
#include "lldir.h"
#include "llendianswizzle.h"
-#include "audioengine.h"
#include "llassetstorage.h"
+#include "llrefcount.h"
#include "vorbis/codec.h"
#include "vorbis/vorbisfile.h"
diff --git a/indra/llcharacter/llbvhloader.cpp b/indra/llcharacter/llbvhloader.cpp
index e1f8ce53fb..24391eb8f3 100644
--- a/indra/llcharacter/llbvhloader.cpp
+++ b/indra/llcharacter/llbvhloader.cpp
@@ -56,7 +56,7 @@ const F32 ROTATION_MOTION_THRESHOLD = 0.001f;
char gInFile[1024]; /* Flawfinder: ignore */
char gOutFile[1024]; /* Flawfinder: ignore */
-
+/*
//------------------------------------------------------------------------
// Status Codes
//------------------------------------------------------------------------
@@ -91,7 +91,7 @@ const char *LLBVHLoader::ST_NO_XLT_EASEIN = "Can't get easeIn values.";
const char *LLBVHLoader::ST_NO_XLT_EASEOUT = "Can't get easeOut values.";
const char *LLBVHLoader::ST_NO_XLT_HAND = "Can't get hand morph value.";
const char *LLBVHLoader::ST_NO_XLT_EMOTE = "Can't read emote name.";
-
+*/
//------------------------------------------------------------------------
// find_next_whitespace()
//------------------------------------------------------------------------
@@ -124,7 +124,9 @@ LLQuaternion::Order bvhStringToOrder( char *str )
//-----------------------------------------------------------------------------
// LLBVHLoader()
//-----------------------------------------------------------------------------
-LLBVHLoader::LLBVHLoader(const char* buffer)
+
+/*
+ LLBVHLoader::LLBVHLoader(const char* buffer)
{
reset();
@@ -144,7 +146,7 @@ LLBVHLoader::LLBVHLoader(const char* buffer)
}
}
- char error_text[128]; /* Flawfinder: ignore */
+ char error_text[128]; // Flawfinder: ignore
S32 error_line;
mStatus = loadBVHFile(buffer, error_text, error_line);
if (mStatus != LLBVHLoader::ST_OK)
@@ -158,6 +160,49 @@ LLBVHLoader::LLBVHLoader(const char* buffer)
mInitialized = TRUE;
}
+*/
+LLBVHLoader::LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &errorLine)
+{
+ reset();
+ errorLine = 0;
+ mStatus = loadTranslationTable("anim.ini");
+ loadStatus = mStatus;
+ llinfos<<"Load Status 00 : "<< loadStatus << llendl;
+ if (mStatus == E_ST_NO_XLT_FILE)
+ {
+ //llwarns << "NOTE: No translation table found." << llendl;
+ loadStatus = mStatus;
+ return;
+ }
+ else
+ {
+ if (mStatus != E_ST_OK)
+ {
+ //llwarns << "ERROR: [line: " << getLineNumber() << "] " << mStatus << llendl;
+ errorLine = getLineNumber();
+ loadStatus = mStatus;
+ return;
+ }
+ }
+
+ char error_text[128]; /* Flawfinder: ignore */
+ S32 error_line;
+ mStatus = loadBVHFile(buffer, error_text, error_line);
+
+ if (mStatus != E_ST_OK)
+ {
+ //llwarns << "ERROR: [line: " << getLineNumber() << "] " << mStatus << llendl;
+ loadStatus = mStatus;
+ errorLine = getLineNumber();
+ return;
+ }
+
+ applyTranslations();
+ optimize();
+
+ mInitialized = TRUE;
+}
+
LLBVHLoader::~LLBVHLoader()
{
@@ -167,7 +212,7 @@ LLBVHLoader::~LLBVHLoader()
//------------------------------------------------------------------------
// LLBVHLoader::loadTranslationTable()
//------------------------------------------------------------------------
-LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
+ELoadStatus LLBVHLoader::loadTranslationTable(const char *fileName)
{
mLineNumber = 0;
mTranslations.clear();
@@ -182,7 +227,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
infile.open(path, LL_APR_R);
apr_file_t *fp = infile.getFileHandle();
if (!fp)
- return ST_NO_XLT_FILE;
+ return E_ST_NO_XLT_FILE;
llinfos << "NOTE: Loading translation table: " << fileName << llendl;
@@ -194,9 +239,9 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
// load header
//--------------------------------------------------------------------
if ( ! getLine(fp) )
- return ST_EOF;
+ return E_ST_EOF;
if ( strncmp(mLine, "Translations 1.0", 16) )
- return ST_NO_XLT_HEADER;
+ return E_ST_NO_XLT_HEADER;
//--------------------------------------------------------------------
// load data one line at a time
@@ -222,7 +267,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
{
char name[128]; /* Flawfinder: ignore */
if ( sscanf(mLine, " [%127[^]]", name) != 1 )
- return ST_NO_XLT_NAME;
+ return E_ST_NO_XLT_NAME;
if (strcmp(name, "GLOBALS")==0)
{
@@ -245,7 +290,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
{
char emote_str[1024]; /* Flawfinder: ignore */
if ( sscanf(mLine, " %*s = %1023s", emote_str) != 1 ) /* Flawfinder: ignore */
- return ST_NO_XLT_EMOTE;
+ return E_ST_NO_XLT_EMOTE;
mEmoteName.assign( emote_str );
// llinfos << "NOTE: Emote: " << mEmoteName.c_str() << llendl;
@@ -260,7 +305,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
{
S32 priority;
if ( sscanf(mLine, " %*s = %d", &priority) != 1 )
- return ST_NO_XLT_PRIORITY;
+ return E_ST_NO_XLT_PRIORITY;
mPriority = priority;
// llinfos << "NOTE: Priority: " << mPriority << llendl;
@@ -288,7 +333,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
}
else
{
- return ST_NO_XLT_LOOP;
+ return E_ST_NO_XLT_LOOP;
}
mLoopInPoint = loop_in * mDuration;
@@ -305,7 +350,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
F32 duration;
char type[128]; /* Flawfinder: ignore */
if ( sscanf(mLine, " %*s = %f %127s", &duration, type) != 2 ) /* Flawfinder: ignore */
- return ST_NO_XLT_EASEIN;
+ return E_ST_NO_XLT_EASEIN;
mEaseIn = duration;
continue;
@@ -319,7 +364,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
F32 duration;
char type[128]; /* Flawfinder: ignore */
if ( sscanf(mLine, " %*s = %f %127s", &duration, type) != 2 ) /* Flawfinder: ignore */
- return ST_NO_XLT_EASEOUT;
+ return E_ST_NO_XLT_EASEOUT;
mEaseOut = duration;
continue;
@@ -332,7 +377,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
{
S32 handMorph;
if (sscanf(mLine, " %*s = %d", &handMorph) != 1)
- return ST_NO_XLT_HAND;
+ return E_ST_NO_XLT_HAND;
mHand = handMorph;
continue;
@@ -380,7 +425,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
&constraint.mTargetOffset.mV[VY],
&constraint.mTargetOffset.mV[VZ]) != 13)
{
- return ST_NO_CONSTRAINT;
+ return E_ST_NO_CONSTRAINT;
}
}
else
@@ -440,7 +485,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
&constraint.mTargetOffset.mV[VY],
&constraint.mTargetOffset.mV[VZ]) != 13)
{
- return ST_NO_CONSTRAINT;
+ return E_ST_NO_CONSTRAINT;
}
}
else
@@ -463,7 +508,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
// at this point there must be a valid trans pointer
//----------------------------------------------------------------
if ( ! trans )
- return ST_NO_XLT_NAME;
+ return E_ST_NO_XLT_NAME;
//----------------------------------------------------------------
// check for ignore flag
@@ -472,7 +517,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
{
char trueFalse[128]; /* Flawfinder: ignore */
if ( sscanf(mLine, " %*s = %127s", trueFalse) != 1 ) /* Flawfinder: ignore */
- return ST_NO_XLT_IGNORE;
+ return E_ST_NO_XLT_IGNORE;
trans->mIgnore = (LLStringUtil::compareInsensitive(trueFalse, "true")==0);
continue;
@@ -497,12 +542,12 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
}
else
{
- return ST_NO_XLT_RELATIVE;
+ return E_ST_NO_XLT_RELATIVE;
}
}
else
{
- return ST_NO_XLT_RELATIVE;
+ return E_ST_NO_XLT_RELATIVE;
}
continue;
@@ -523,12 +568,12 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
}
else
{
- return ST_NO_XLT_RELATIVE;
+ return E_ST_NO_XLT_RELATIVE;
}
}
else
{
- return ST_NO_XLT_RELATIVE;
+ return E_ST_NO_XLT_RELATIVE;
}
continue;
@@ -541,7 +586,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
{
char outName[128]; /* Flawfinder: ignore */
if ( sscanf(mLine, " %*s = %127s", outName) != 1 ) /* Flawfinder: ignore */
- return ST_NO_XLT_OUTNAME;
+ return E_ST_NO_XLT_OUTNAME;
trans->mOutName = outName;
continue;
@@ -557,7 +602,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
&fm.mMatrix[0][0], &fm.mMatrix[0][1], &fm.mMatrix[0][2],
&fm.mMatrix[1][0], &fm.mMatrix[1][1], &fm.mMatrix[1][2],
&fm.mMatrix[2][0], &fm.mMatrix[2][1], &fm.mMatrix[2][2] ) != 9 )
- return ST_NO_XLT_MATRIX;
+ return E_ST_NO_XLT_MATRIX;
trans->mFrameMatrix = fm;
continue;
@@ -573,7 +618,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
&om.mMatrix[0][0], &om.mMatrix[0][1], &om.mMatrix[0][2],
&om.mMatrix[1][0], &om.mMatrix[1][1], &om.mMatrix[1][2],
&om.mMatrix[2][0], &om.mMatrix[2][1], &om.mMatrix[2][2] ) != 9 )
- return ST_NO_XLT_MATRIX;
+ return E_ST_NO_XLT_MATRIX;
trans->mOffsetMatrix = om;
continue;
@@ -586,7 +631,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
{
char mergeParentName[128]; /* Flawfinder: ignore */
if ( sscanf(mLine, " %*s = %127s", mergeParentName) != 1 ) /* Flawfinder: ignore */
- return ST_NO_XLT_MERGEPARENT;
+ return E_ST_NO_XLT_MERGEPARENT;
trans->mMergeParentName = mergeParentName;
continue;
@@ -599,7 +644,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
{
char mergeChildName[128]; /* Flawfinder: ignore */
if ( sscanf(mLine, " %*s = %127s", mergeChildName) != 1 ) /* Flawfinder: ignore */
- return ST_NO_XLT_MERGECHILD;
+ return E_ST_NO_XLT_MERGECHILD;
trans->mMergeChildName = mergeChildName;
continue;
@@ -612,7 +657,7 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
{
S32 priority;
if ( sscanf(mLine, " %*s = %d", &priority) != 1 )
- return ST_NO_XLT_PRIORITY;
+ return E_ST_NO_XLT_PRIORITY;
trans->mPriorityModifier = priority;
continue;
@@ -621,14 +666,14 @@ LLBVHLoader::Status LLBVHLoader::loadTranslationTable(const char *fileName)
}
infile.close() ;
- return ST_OK;
+ return E_ST_OK;
}
//------------------------------------------------------------------------
// LLBVHLoader::loadBVHFile()
//------------------------------------------------------------------------
-LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_text, S32 &err_line)
+ELoadStatus LLBVHLoader::loadBVHFile(const char *buffer, char* error_text, S32 &err_line)
{
std::string line;
@@ -650,14 +695,14 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
// consume hierarchy
//--------------------------------------------------------------------
if (iter == tokens.end())
- return ST_EOF;
+ return E_ST_EOF;
line = (*(iter++));
err_line++;
if ( !strstr(line.c_str(), "HIERARCHY") )
{
// llinfos << line << llendl;
- return ST_NO_HIER;
+ return E_ST_NO_HIER;
}
//--------------------------------------------------------------------
@@ -669,7 +714,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
// get next line
//----------------------------------------------------------------
if (iter == tokens.end())
- return ST_EOF;
+ return E_ST_EOF;
line = (*(iter++));
err_line++;
@@ -719,7 +764,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
else
{
strncpy(error_text, line.c_str(), 127); /* Flawfinder: ignore */
- return ST_NO_JOINT;
+ return E_ST_NO_JOINT;
}
//----------------------------------------------------------------
@@ -729,7 +774,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
if ( sscanf(line.c_str(), "%*s %79s", jointName) != 1 ) /* Flawfinder: ignore */
{
strncpy(error_text, line.c_str(), 127); /* Flawfinder: ignore */
- return ST_NO_NAME;
+ return E_ST_NO_NAME;
}
//----------------------------------------------------------------
@@ -754,7 +799,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
//----------------------------------------------------------------
if (iter == tokens.end())
{
- return ST_EOF;
+ return E_ST_EOF;
}
line = (*(iter++));
err_line++;
@@ -765,7 +810,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
if ( !strstr(line.c_str(), "{") )
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_OFFSET;
+ return E_ST_NO_OFFSET;
}
else
{
@@ -777,7 +822,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
//----------------------------------------------------------------
if (iter == tokens.end())
{
- return ST_EOF;
+ return E_ST_EOF;
}
line = (*(iter++));
err_line++;
@@ -788,7 +833,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
if ( !strstr(line.c_str(), "OFFSET") )
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_OFFSET;
+ return E_ST_NO_OFFSET;
}
//----------------------------------------------------------------
@@ -796,7 +841,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
//----------------------------------------------------------------
if (iter == tokens.end())
{
- return ST_EOF;
+ return E_ST_EOF;
}
line = (*(iter++));
err_line++;
@@ -807,7 +852,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
if ( !strstr(line.c_str(), "CHANNELS") )
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_CHANNELS;
+ return E_ST_NO_CHANNELS;
}
//----------------------------------------------------------------
@@ -820,14 +865,14 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
if (!p)
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_ROTATION;
+ return E_ST_NO_ROTATION;
}
const char axis = *(p - 1);
if ((axis != 'X') && (axis != 'Y') && (axis != 'Z'))
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_AXIS;
+ return E_ST_NO_AXIS;
}
joint->mOrder[i] = axis;
@@ -842,7 +887,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
if ( !strstr(line.c_str(), "MOTION") )
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_MOTION;
+ return E_ST_NO_MOTION;
}
//--------------------------------------------------------------------
@@ -850,7 +895,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
//--------------------------------------------------------------------
if (iter == tokens.end())
{
- return ST_EOF;
+ return E_ST_EOF;
}
line = (*(iter++));
err_line++;
@@ -858,13 +903,13 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
if ( !strstr(line.c_str(), "Frames:") )
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_FRAMES;
+ return E_ST_NO_FRAMES;
}
if ( sscanf(line.c_str(), "Frames: %d", &mNumFrames) != 1 )
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_FRAMES;
+ return E_ST_NO_FRAMES;
}
//--------------------------------------------------------------------
@@ -872,7 +917,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
//--------------------------------------------------------------------
if (iter == tokens.end())
{
- return ST_EOF;
+ return E_ST_EOF;
}
line = (*(iter++));
err_line++;
@@ -880,13 +925,13 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
if ( !strstr(line.c_str(), "Frame Time:") )
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_FRAME_TIME;
+ return E_ST_NO_FRAME_TIME;
}
if ( sscanf(line.c_str(), "Frame Time: %f", &mFrameTime) != 1 )
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_FRAME_TIME;
+ return E_ST_NO_FRAME_TIME;
}
mDuration = (F32)mNumFrames * mFrameTime;
@@ -903,7 +948,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
// get next line
if (iter == tokens.end())
{
- return ST_EOF;
+ return E_ST_EOF;
}
line = (*(iter++));
err_line++;
@@ -922,7 +967,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
if ( sscanf(p, "%f %f %f", key.mPos, key.mPos+1, key.mPos+2) != 3 )
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_POS;
+ return E_ST_NO_POS;
}
}
@@ -931,19 +976,19 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
if (!p)
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_ROT;
+ return E_ST_NO_ROT;
}
p = find_next_whitespace(++p);
if (!p)
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_ROT;
+ return E_ST_NO_ROT;
}
p = find_next_whitespace(++p);
if (!p)
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_ROT;
+ return E_ST_NO_ROT;
}
// get 3 rot values for joint
@@ -951,7 +996,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
if ( sscanf(p, " %f %f %f", rot, rot+1, rot+2) != 3 )
{
strncpy(error_text, line.c_str(), 127); /*Flawfinder: ignore*/
- return ST_NO_ROT;
+ return E_ST_NO_ROT;
}
p++;
@@ -962,7 +1007,7 @@ LLBVHLoader::Status LLBVHLoader::loadBVHFile(const char *buffer, char* error_tex
}
}
- return ST_OK;
+ return E_ST_OK;
}
diff --git a/indra/llcharacter/llbvhloader.h b/indra/llcharacter/llbvhloader.h
index 6937b9d835..ecdfc95478 100644
--- a/indra/llcharacter/llbvhloader.h
+++ b/indra/llcharacter/llbvhloader.h
@@ -184,6 +184,41 @@ public:
S32 mPriorityModifier;
};
+typedef enum e_load_status
+ {
+ E_ST_OK,
+ E_ST_EOF,
+ E_ST_NO_CONSTRAINT,
+ E_ST_NO_FILE,
+ E_ST_NO_HIER,
+ E_ST_NO_JOINT,
+ E_ST_NO_NAME,
+ E_ST_NO_OFFSET,
+ E_ST_NO_CHANNELS,
+ E_ST_NO_ROTATION,
+ E_ST_NO_AXIS,
+ E_ST_NO_MOTION,
+ E_ST_NO_FRAMES,
+ E_ST_NO_FRAME_TIME,
+ E_ST_NO_POS,
+ E_ST_NO_ROT,
+ E_ST_NO_XLT_FILE,
+ E_ST_NO_XLT_HEADER,
+ E_ST_NO_XLT_NAME,
+ E_ST_NO_XLT_IGNORE,
+ E_ST_NO_XLT_RELATIVE,
+ E_ST_NO_XLT_OUTNAME,
+ E_ST_NO_XLT_MATRIX,
+ E_ST_NO_XLT_MERGECHILD,
+ E_ST_NO_XLT_MERGEPARENT,
+ E_ST_NO_XLT_PRIORITY,
+ E_ST_NO_XLT_LOOP,
+ E_ST_NO_XLT_EASEIN,
+ E_ST_NO_XLT_EASEOUT,
+ E_ST_NO_XLT_HAND,
+ E_ST_NO_XLT_EMOTE
+ } ELoadStatus;
+
//------------------------------------------------------------------------
// TranslationMap
//------------------------------------------------------------------------
@@ -194,9 +229,11 @@ class LLBVHLoader
friend class LLKeyframeMotion;
public:
// Constructor
- LLBVHLoader(const char* buffer);
+// LLBVHLoader(const char* buffer);
+ LLBVHLoader(const char* buffer, ELoadStatus &loadStatus, S32 &errorLine);
~LLBVHLoader();
-
+
+/*
// Status Codes
typedef const char *Status;
static const char *ST_OK;
@@ -230,13 +267,13 @@ public:
static const char *ST_NO_XLT_EASEOUT;
static const char *ST_NO_XLT_HAND;
static const char *ST_NO_XLT_EMOTE;
-
+*/
// Loads the specified translation table.
- Status loadTranslationTable(const char *fileName);
+ ELoadStatus loadTranslationTable(const char *fileName);
// Load the specified BVH file.
// Returns status code.
- Status loadBVHFile(const char *buffer, char *error_text, S32 &error_line);
+ ELoadStatus loadBVHFile(const char *buffer, char *error_text, S32 &error_line);
// Applies translations to BVH data loaded.
void applyTranslations();
@@ -260,7 +297,7 @@ public:
BOOL isInitialized() { return mInitialized; }
- Status getStatus() { return mStatus; }
+ ELoadStatus getStatus() { return mStatus; }
protected:
// Consumes one line of input from file.
@@ -287,7 +324,7 @@ protected:
std::string mEmoteName;
BOOL mInitialized;
- Status mStatus;
+ ELoadStatus mStatus;
// computed values
F32 mDuration;
};
diff --git a/indra/llcharacter/llcharacter.h b/indra/llcharacter/llcharacter.h
index 0112788884..66c4c188ed 100644
--- a/indra/llcharacter/llcharacter.h
+++ b/indra/llcharacter/llcharacter.h
@@ -42,7 +42,7 @@
#include "llmotioncontroller.h"
#include "llvisualparam.h"
#include "string_table.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llthread.h"
class LLPolyMesh;
diff --git a/indra/llcharacter/lljointstate.h b/indra/llcharacter/lljointstate.h
index 16ad0e1200..e40cf2673f 100644
--- a/indra/llcharacter/lljointstate.h
+++ b/indra/llcharacter/lljointstate.h
@@ -37,7 +37,7 @@
// Header Files
//-----------------------------------------------------------------------------
#include "lljoint.h"
-#include "llmemory.h"
+#include "llrefcount.h"
//-----------------------------------------------------------------------------
// class LLJointState
diff --git a/indra/llcharacter/llkeyframemotionparam.cpp b/indra/llcharacter/llkeyframemotionparam.cpp
index 622405a5e1..c4333fc0fd 100644
--- a/indra/llcharacter/llkeyframemotionparam.cpp
+++ b/indra/llcharacter/llkeyframemotionparam.cpp
@@ -347,8 +347,11 @@ BOOL LLKeyframeMotionParam::loadMotions()
// Load named file by concatenating the character prefix with the motion name.
// Load data into a buffer to be parsed.
//-------------------------------------------------------------------------
- std::string path = gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix())
- + "_" + getName() + ".llp";
+ //std::string path = gDirUtilp->getExpandedFilename(LL_PATH_MOTIONS,mCharacter->getAnimationPrefix())
+ // + "_" + getName() + ".llp";
+ //RN: deprecated unused reference to "motion" directory
+ std::string path;
+
//-------------------------------------------------------------------------
// open the file
diff --git a/indra/llcharacter/llmultigesture.cpp b/indra/llcharacter/llmultigesture.cpp
index 7fe21dbc93..701d6889ca 100644
--- a/indra/llcharacter/llmultigesture.cpp
+++ b/indra/llcharacter/llmultigesture.cpp
@@ -243,7 +243,7 @@ void LLMultiGesture::dump()
//---------------------------------------------------------------------------
LLGestureStepAnimation::LLGestureStepAnimation()
: LLGestureStep(),
- mAnimName("None"),
+ mAnimName("None"),
mAnimAssetID(),
mFlags(0x0)
{ }
@@ -292,20 +292,27 @@ BOOL LLGestureStepAnimation::deserialize(LLDataPacker& dp)
dp.unpackU32(mFlags, "flags");
return TRUE;
}
-
-std::string LLGestureStepAnimation::getLabel() const
+// *TODO: Translate
+std::vector<std::string> LLGestureStepAnimation::getLabel() const
{
- std::string label;
+ std::vector<std::string> strings;
+
+// std::string label;
if (mFlags & ANIM_FLAG_STOP)
{
- label = "Stop Animation: ";
+ strings.push_back( "AnimFlagStop");
+
+// label = "Stop Animation: ";
}
else
{
- label = "Start Animation: ";
+ strings.push_back( "AnimFlagStart");
+
+// label = "Start Animation: ";
}
- label += mAnimName;
- return label;
+ strings.push_back( mAnimName);
+// label += mAnimName;
+ return strings;
}
void LLGestureStepAnimation::dump()
@@ -359,12 +366,15 @@ BOOL LLGestureStepSound::deserialize(LLDataPacker& dp)
dp.unpackU32(mFlags, "flags");
return TRUE;
}
-
-std::string LLGestureStepSound::getLabel() const
+// *TODO: Translate
+std::vector<std::string> LLGestureStepSound::getLabel() const
{
- std::string label("Sound: ");
- label += mSoundName;
- return label;
+ std::vector<std::string> strings;
+ strings.push_back( "Sound");
+ strings.push_back( mSoundName);
+// std::string label("Sound: ");
+// label += mSoundName;
+ return strings;
}
void LLGestureStepSound::dump()
@@ -414,12 +424,13 @@ BOOL LLGestureStepChat::deserialize(LLDataPacker& dp)
dp.unpackU32(mFlags, "flags");
return TRUE;
}
-
-std::string LLGestureStepChat::getLabel() const
+// *TODO: Translate
+std::vector<std::string> LLGestureStepChat::getLabel() const
{
- std::string label("Chat: ");
- label += mChatText;
- return label;
+ std::vector<std::string> strings;
+ strings.push_back("Chat");
+ strings.push_back(mChatText);
+ return strings;
}
void LLGestureStepChat::dump()
@@ -467,22 +478,27 @@ BOOL LLGestureStepWait::deserialize(LLDataPacker& dp)
dp.unpackU32(mFlags, "flags");
return TRUE;
}
-
-std::string LLGestureStepWait::getLabel() const
+// *TODO: Translate
+std::vector<std::string> LLGestureStepWait::getLabel() const
{
- std::string label("--- Wait: ");
+ std::vector<std::string> strings;
+ strings.push_back( "Wait" );
+
+// std::string label("--- Wait: ");
if (mFlags & WAIT_FLAG_TIME)
{
char buffer[64]; /* Flawfinder: ignore */
snprintf(buffer, sizeof(buffer), "%.1f seconds", (double)mWaitSeconds); /* Flawfinder: ignore */
- label += buffer;
+ strings.push_back(buffer);
+// label += buffer;
}
else if (mFlags & WAIT_FLAG_ALL_ANIM)
{
- label += "until animations are done";
+ strings.push_back("until animations are done");
+ // label += "until animations are done";
}
- return label;
+ return strings;
}
diff --git a/indra/llcharacter/llmultigesture.h b/indra/llcharacter/llmultigesture.h
index eb15f600ca..fdffb35c31 100644
--- a/indra/llcharacter/llmultigesture.h
+++ b/indra/llcharacter/llmultigesture.h
@@ -130,7 +130,7 @@ public:
virtual EStepType getType() = 0;
// Return a user-readable label for this step
- virtual std::string getLabel() const = 0;
+ virtual std::vector<std::string> getLabel() const = 0;
virtual S32 getMaxSerialSize() const = 0;
virtual BOOL serialize(LLDataPacker& dp) const = 0;
@@ -152,7 +152,7 @@ public:
virtual EStepType getType() { return STEP_ANIMATION; }
- virtual std::string getLabel() const;
+ virtual std::vector<std::string> getLabel() const;
virtual S32 getMaxSerialSize() const;
virtual BOOL serialize(LLDataPacker& dp) const;
@@ -175,7 +175,7 @@ public:
virtual EStepType getType() { return STEP_SOUND; }
- virtual std::string getLabel() const;
+ virtual std::vector<std::string> getLabel() const;
virtual S32 getMaxSerialSize() const;
virtual BOOL serialize(LLDataPacker& dp) const;
@@ -198,7 +198,7 @@ public:
virtual EStepType getType() { return STEP_CHAT; }
- virtual std::string getLabel() const;
+ virtual std::vector<std::string> getLabel() const;
virtual S32 getMaxSerialSize() const;
virtual BOOL serialize(LLDataPacker& dp) const;
@@ -223,7 +223,7 @@ public:
virtual EStepType getType() { return STEP_WAIT; }
- virtual std::string getLabel() const;
+ virtual std::vector<std::string> getLabel() const;
virtual S32 getMaxSerialSize() const;
virtual BOOL serialize(LLDataPacker& dp) const;
diff --git a/indra/llcharacter/llpose.h b/indra/llcharacter/llpose.h
index 5698f21614..2b976b219d 100644
--- a/indra/llcharacter/llpose.h
+++ b/indra/llcharacter/llpose.h
@@ -36,12 +36,14 @@
//-----------------------------------------------------------------------------
// Header Files
//-----------------------------------------------------------------------------
-#include <string>
-#include "llmap.h"
#include "lljointstate.h"
#include "lljoint.h"
+#include "llmap.h"
+#include "llpointer.h"
+
#include <map>
+#include <string>
//-----------------------------------------------------------------------------
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 3f14be6e18..c4663cc145 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -4,6 +4,7 @@ project(llcommon)
include(00-Common)
include(LLCommon)
+include(Boost)
include_directories(
${EXPAT_INCLUDE_DIRS}
@@ -11,6 +12,11 @@ include_directories(
${ZLIB_INCLUDE_DIRS}
)
+# add_executable(lltreeiterators lltreeiterators.cpp)
+#
+# target_link_libraries(lltreeiterators
+# ${LLCOMMON_LIBRARIES})
+
set(llcommon_SOURCE_FILES
llapp.cpp
llapr.cpp
@@ -44,6 +50,7 @@ set(llcommon_SOURCE_FILES
llprocessor.cpp
llqueuedthread.cpp
llrand.cpp
+ llrefcount.cpp
llrun.cpp
llsd.cpp
llsdserialize.cpp
@@ -98,6 +105,7 @@ set(llcommon_HEADER_FILES
lldefs.h
lldepthstack.h
lldlinked.h
+ lldoubledispatch.h
lldqueueptr.h
llendianswizzle.h
llenum.h
@@ -119,6 +127,7 @@ set(llcommon_HEADER_FILES
llhttpstatuscodes.h
llindexedqueue.h
llindraconfigfile.h
+ llinstancetracker.h
llkeythrottle.h
lllinkedqueue.h
llliveappconfig.h
@@ -134,20 +143,26 @@ set(llcommon_HEADER_FILES
llmetrics.h
llmortician.h
llnametable.h
+ llpointer.h
llpreprocessor.h
llpriqueuemap.h
llprocessor.h
llptrskiplist.h
llptrskipmap.h
+ llptrto.h
llqueuedthread.h
llrand.h
+ llrefcount.h
llrun.h
+ llrefcount.h
+ llsafehandle.h
llsd.h
llsdserialize.h
llsdserialize_xml.h
llsdutil.h
llsecondlifeurls.h
llsimplehash.h
+ llsingleton.h
llskiplist.h
llskipmap.h
llstack.h
@@ -161,6 +176,7 @@ set(llcommon_HEADER_FILES
llsys.h
llthread.h
lltimer.h
+ lltreeiterators.h
lluri.h
lluuid.h
lluuidhashmap.h
@@ -195,4 +211,6 @@ target_link_libraries(
${APR_LIBRARIES}
${EXPAT_LIBRARIES}
${ZLIB_LIBRARIES}
+ ${BOOST_PROGRAM_OPTIONS_LIBRARY}
+ ${BOOST_REGEX_LIBRARY}
)
diff --git a/indra/llcommon/is_approx_equal_fraction.h b/indra/llcommon/is_approx_equal_fraction.h
index f95b148590..d369fbc5b3 100644
--- a/indra/llcommon/is_approx_equal_fraction.h
+++ b/indra/llcommon/is_approx_equal_fraction.h
@@ -7,7 +7,30 @@
* making llcommon depend on llmath.
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
* Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h
index f9d5877ab2..9adf24a492 100644
--- a/indra/llcommon/linden_common.h
+++ b/indra/llcommon/linden_common.h
@@ -33,6 +33,11 @@
#ifndef LL_LINDEN_COMMON_H
#define LL_LINDEN_COMMON_H
+// *NOTE: Please keep includes here to a minimum!
+//
+// Files included here are included in every library .cpp file and
+// are not precompiled.
+
#if defined(LL_WINDOWS) && defined(_DEBUG)
# if _MSC_VER >= 1400 // Visual C++ 2005 or later
# define _CRTDBG_MAP_ALLOC
@@ -51,23 +56,22 @@
#include <cstdio>
#include <cstdlib>
#include <ctime>
-#include <iostream>
-#include <fstream>
+#include <iosfwd>
-// Work Microsoft compiler warnings
+// Work around Microsoft compiler warnings in STL headers
#ifdef LL_WINDOWS
#pragma warning (disable : 4702) // unreachable code
#pragma warning (disable : 4244) // conversion from time_t to S32
#endif // LL_WINDOWS
-#include <algorithm>
#include <list>
#include <map>
#include <vector>
#include <string>
#ifdef LL_WINDOWS
-#pragma warning (3 : 4702) // we like level 3, not 4
+// Reenable warnings we disabled above
+#pragma warning (3 : 4702) // unreachable code, we like level 3, not 4
// level 4 warnings that we need to disable:
#pragma warning (disable : 4100) // unreferenced formal parameter
#pragma warning (disable : 4127) // conditional expression is constant (e.g. while(1) )
@@ -78,6 +82,7 @@
#endif // LL_WINDOWS
// Linden only libs in alpha-order other than stdtypes.h
+// *NOTE: Please keep includes here to a minimum, see above.
#include "stdtypes.h"
#include "lldefs.h"
#include "llerror.h"
@@ -85,8 +90,5 @@
#include "llfasttimer.h"
#include "llfile.h"
#include "llformat.h"
-#include "llstring.h"
-#include "llsys.h"
-#include "lltimer.h"
#endif
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp
index cf3bf89b4f..fc2ac9dcbc 100644
--- a/indra/llcommon/llassettype.cpp
+++ b/indra/llcommon/llassettype.cpp
@@ -70,6 +70,7 @@ asset_info_t asset_types[] =
{ LLAssetType::AT_ANIMATION, "ANIMATION" },
{ LLAssetType::AT_GESTURE, "GESTURE" },
{ LLAssetType::AT_SIMSTATE, "SIMSTATE" },
+ { LLAssetType::AT_FAVORITE, "FAVORITE" },
{ LLAssetType::AT_NONE, "NONE" },
};
@@ -129,7 +130,8 @@ const char* LLAssetType::mAssetTypeNames[LLAssetType::AT_COUNT] =
"jpeg",
"animatn",
"gesture",
- "simstate"
+ "simstate",
+ "favorite"
};
// This table is meant for decoding to human readable form. Put any
@@ -160,6 +162,7 @@ const char* LLAssetType::mAssetTypeHumanNames[LLAssetType::AT_COUNT] =
"animation",
"gesture",
"simstate"
+ "favorite"
};
///----------------------------------------------------------------------------
diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h
index 4077b8d2c1..0ee4ae2821 100644
--- a/indra/llcommon/llassettype.h
+++ b/indra/llcommon/llassettype.h
@@ -131,6 +131,9 @@ public:
// simstate file
AT_SIMSTATE = 22,
+ // favorite items
+ AT_FAVORITE = 23,
+
// +*********************************************+
// | TO ADD AN ELEMENT TO THIS ENUM: |
// +*********************************************+
@@ -140,7 +143,7 @@ public:
// | 4. ADD TO LLAssetType::mAssetTypeHumanNames |
// +*********************************************+
- AT_COUNT = 23,
+ AT_COUNT = 24,
AT_NONE = -1
};
diff --git a/indra/llcommon/llboost.h b/indra/llcommon/llboost.h
index 4df9dbf3bd..f4bfc2bfa2 100644
--- a/indra/llcommon/llboost.h
+++ b/indra/llcommon/llboost.h
@@ -46,4 +46,19 @@
*/
typedef boost::tokenizer<boost::char_separator<char> > boost_tokenizer;
+// Useful combiner for boost signals that retturn a vool (e.g. validation)
+// returns false if any of the callbacks return false
+struct boost_boolean_combiner
+{
+ typedef bool result_type;
+ template<typename InputIterator>
+ bool operator()(InputIterator first, InputIterator last) const
+ {
+ bool res = true;
+ while (first != last)
+ res &= *first++;
+ return res;
+ }
+};
+
#endif // LL_LLBOOST_H
diff --git a/indra/llcommon/llcommon.cpp b/indra/llcommon/llcommon.cpp
index 2cbb71855f..36a0018995 100644
--- a/indra/llcommon/llcommon.cpp
+++ b/indra/llcommon/llcommon.cpp
@@ -32,6 +32,8 @@
#include "linden_common.h"
#include "llcommon.h"
+
+#include "llmemory.h"
#include "llthread.h"
//static
diff --git a/indra/llcommon/llcommon.h b/indra/llcommon/llcommon.h
index 5f77988336..a1808e8a6c 100644
--- a/indra/llcommon/llcommon.h
+++ b/indra/llcommon/llcommon.h
@@ -32,9 +32,8 @@
#ifndef LL_COMMON_H
#define LL_COMMON_H
-#include "llmemory.h"
+// *TODO: remove these?
#include "llapr.h"
-// #include "llframecallbackmanager.h"
#include "lltimer.h"
#include "llfile.h"
diff --git a/indra/llcommon/lldate.cpp b/indra/llcommon/lldate.cpp
index 41a3af398f..7bc9e16bc9 100644
--- a/indra/llcommon/lldate.cpp
+++ b/indra/llcommon/lldate.cpp
@@ -38,10 +38,13 @@
#include "apr_time.h"
#include <time.h>
+#include <locale>
+#include <string>
#include <iomanip>
#include <sstream>
#include "lltimer.h"
+#include "llstring.h"
static const F64 DATE_EPOCH = 0.0;
@@ -88,45 +91,36 @@ std::string LLDate::asString() const
// is one of the standards used and the prefered format
std::string LLDate::asRFC1123() const
{
- std::ostringstream stream;
- toHTTPDateStream(stream);
- return stream.str();
+ return toHTTPDateString (std::string ("%A, %d %b %Y %H:%M:%S GMT"));
}
-void LLDate::toHTTPDateStream(std::ostream& s) const
+std::string LLDate::toHTTPDateString (std::string fmt) const
{
- // http://apr.apache.org/docs/apr/0.9/group__apr__time.html
- apr_time_t time = (apr_time_t)(mSecondsSinceEpoch * LL_APR_USEC_PER_SEC);
+ std::ostringstream stream;
+ time_t locSeconds = (time_t) mSecondsSinceEpoch;
+ struct tm * gmt = gmtime (&locSeconds);
- apr_time_exp_t exp_time ; //Apache time module
+ stream.imbue (std::locale(LLStringUtil::getLocale().c_str()));
+ toHTTPDateStream (stream, gmt, fmt);
+ return stream.str();
+}
- if (apr_time_exp_gmt(&exp_time, time) != APR_SUCCESS)
- {
- // Return Epoch UTC date
- s << "Thursday, 01 Jan 1970 00:00:00 GMT" ;
- return;
- }
+std::string LLDate::toHTTPDateString (tm * gmt, std::string fmt)
+{
+ std::ostringstream stream;
+ stream.imbue (std::locale(LLStringUtil::getLocale().c_str()));
+ toHTTPDateStream (stream, gmt, fmt);
+ return stream.str();
+}
- s << std::dec << std::setfill('0');
-#if( LL_WINDOWS || __GNUC__ > 2)
- s << std::right ;
-#else
- s.setf(ios::right);
-#endif
- std::string day = weekdays[exp_time.tm_wday];
- std::string month = months[exp_time.tm_mon];
-
- s << std::setw(day.length()) << (day)
- << ", " << std::setw(2) << (exp_time.tm_mday)
- << ' ' << std::setw(month.length()) << (month)
- << ' ' << std::setw(4) << (exp_time.tm_year + 1900)
- << ' ' << std::setw(2) << (exp_time.tm_hour)
- << ':' << std::setw(2) << (exp_time.tm_min)
- << ':' << std::setw(2) << (exp_time.tm_sec)
- << " GMT";
+void LLDate::toHTTPDateStream(std::ostream& s, tm * gmt, std::string fmt)
+{
+ using namespace std;
- // RFC 1123 date does not use microseconds
- //llinfos << "Date in RFC 1123 format is " << s << llendl;
+ const char * pBeg = fmt.c_str();
+ const char * pEnd = pBeg + fmt.length();
+ const time_put<char>& tp = use_facet<time_put<char> >(s.getloc());
+ tp.put (s, s, s.fill(), gmt, pBeg, pEnd);
}
void LLDate::toStream(std::ostream& s) const
diff --git a/indra/llcommon/lldate.h b/indra/llcommon/lldate.h
index 32825b18dc..29a9030b6d 100644
--- a/indra/llcommon/lldate.h
+++ b/indra/llcommon/lldate.h
@@ -84,7 +84,9 @@ public:
std::string asString() const;
std::string asRFC1123() const;
void toStream(std::ostream&) const;
- void toHTTPDateStream(std::ostream&) const;
+ std::string toHTTPDateString (std::string fmt) const;
+ static std::string toHTTPDateString (tm * gmt, std::string fmt);
+ static void toHTTPDateStream(std::ostream&, tm *, std::string);
/**
* @brief Set the date from an ISO-8601 string.
*
diff --git a/indra/llcommon/lldoubledispatch.h b/indra/llcommon/lldoubledispatch.h
new file mode 100755
index 0000000000..60678d44fb
--- /dev/null
+++ b/indra/llcommon/lldoubledispatch.h
@@ -0,0 +1,332 @@
+/**
+ * @file lldoubledispatch.h
+ * @author Nat Goodspeed
+ * @date 2008-11-11
+ * @brief function calls virtual on more than one parameter
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#if ! defined(LL_LLDOUBLEDISPATCH_H)
+#define LL_LLDOUBLEDISPATCH_H
+
+#include <list>
+#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <boost/bind.hpp>
+#include <boost/ref.hpp>
+
+/**
+ * This class supports function calls which are virtual on the dynamic type of
+ * more than one parameter. Specifically, we address a limited but useful
+ * subset of that problem: function calls which accept two parameters, and
+ * select which particular function to call depending on the dynamic type of
+ * both.
+ *
+ * Scott Meyers, in More Effective C++ (Item 31), talks about some of the perils
+ * and pitfalls lurking down this pathway. He discusses and dismisses the
+ * straightforward approaches of using single-dispatch virtual functions twice,
+ * and of using a family of single-dispatch virtual functions which each examine
+ * RTTI for their other parameter. He advocates using a registry in which you
+ * look up the actual types of both parameters (he uses the classes' string names,
+ * via typeid(param).name()) to obtain a pointer to a free (non-member) function
+ * that will accept this pair of parameters.
+ *
+ * He does point out that his approach doesn't handle inheritance. If you have a
+ * registry entry for SpaceShip, and you have in hand a MilitaryShip (subclass of
+ * SpaceShip) and an Asteroid, you'd like to call the function appropriate for
+ * SpaceShips and Asteroids -- but alas, his lookup fails because the class name
+ * for your MilitaryShip subclass isn't in the registry.
+ *
+ * This class extends his idea to build a registry whose entries can examine the
+ * dynamic type of the parameter in a more flexible way -- using dynamic_cast<>
+ * -- thereby supporting inheritance relationships.
+ *
+ * Of course we must allow for the ambiguity this permits. We choose to use a
+ * sequence container rather than a map, and require that the client code
+ * specify the order in which dispatch-table entries should be searched. The
+ * result resembles the semantics of the catch clauses for a try/catch block:
+ * you must code catch clauses in decreasing order of specificity, because if
+ * you catch ErrorBaseClass before you catch ErrorSubclass, then any
+ * ErrorSubclass exceptions thrown by the protected code will always match
+ * ErrorBaseClass, and you will never reach your catch(ErrorSubclass) clause.
+ *
+ * So, in a similar way, if you have a specific routine to process
+ * MilitaryShip and Asteroid, you'd better place that in the table @em before
+ * your more general routine that processes SpaceShip and Asteroid, or else
+ * the MilitaryShip variant will never be called.
+ *
+ * @todo This implementation doesn't attempt to deal with
+ * <tt>const</tt>-correctness of arguments. Our container stores templated
+ * objects into which the specific parameter types have been "frozen." But to
+ * store all these in the same container, they are all instances of a base
+ * class with a virtual invocation method. Naturally the base-class virtual
+ * method definition cannot know the <tt>const</tt>-ness of the particular
+ * types with which its template subclass is instantiated.
+ *
+ * One is tempted to suggest four different virtual methods, one for each
+ * combination of @c const and non-<tt>const</tt> arguments. Then the client
+ * will select the particular virtual method that best fits the
+ * <tt>const</tt>-ness of the arguments in hand. The trouble with that idea is
+ * that in order to instantiate the subclass instance, we must compile all
+ * four of its virtual method overrides, which means we must be prepared to
+ * pass all four combinations of @c const and non-<tt>const</tt> arguments to
+ * the registered callable. That only works when the registered callable
+ * accepts both parameters as @c const.
+ *
+ * Of course the virtual method overrides could use @c const_cast to force
+ * them to compile correctly regardless of the <tt>const</tt>-ness of the
+ * registered callable's parameter declarations. But if we're going to force
+ * the issue with @c const_cast anyway, why bother with the four different
+ * virtual methods? Why not just require canonical parameter
+ * <tt>const</tt>-ness for any callables used with this mechanism?
+ *
+ * We therefore require that your callable accept both params as
+ * non-<tt>const</tt>. (This is more general than @c const: you can perform @c
+ * const operations on a non-<tt>const</tt> parameter, but you can't perform
+ * non-<tt>const</tt> operations on a @c const parameter.)
+ *
+ * For ease of use, though, our invocation method accepts both params as @c
+ * const. Again, you can pass a non-<tt>const</tt> object to a @c const param,
+ * but not the other way around. We take care of the @c const_cast for you.
+ */
+// LLDoubleDispatch is a template because we have to assume that all parameter
+// types are subclasses of some common base class -- but we don't have to
+// impose that base class on client code. Instead, we let IT tell US the
+// common parameter base class.
+template<class ReturnType, class ParamBaseType>
+class LLDoubleDispatch
+{
+ typedef LLDoubleDispatch<ReturnType, ParamBaseType> self_type;
+
+public:
+ LLDoubleDispatch() {}
+
+ /**
+ * Call the first matching entry. If there's no registered Functor
+ * appropriate for this pair of parameter types, this call will do
+ * @em nothing! (If you want notification in this case, simply add a new
+ * Functor for (ParamBaseType&, ParamBaseType&) at the end of the table.
+ * The two base-class entries should match anything that isn't matched by
+ * any more specific entry.)
+ *
+ * See note in class documentation about <tt>const</tt>-correctness.
+ */
+ inline
+ ReturnType operator()(const ParamBaseType& param1, const ParamBaseType& param2) const;
+
+ // Borrow a trick from Alexandrescu: use a Type class to "wrap" a type
+ // for purposes of passing the type itself into a template method.
+ template<typename T>
+ struct Type {};
+
+ /**
+ * Add a new Entry for a given @a Functor. As mentioned above, the order
+ * in which you add these entries is very important.
+ *
+ * If you want symmetrical entries -- that is, if a B and an A can call
+ * the same Functor as an A and a B -- then pass @c true for the last
+ * parameter, and we'll add a (B, A) entry as well as an (A, B) entry. But
+ * your @a Functor can still be written to expect exactly the pair of types
+ * you've explicitly specified, because the Entry with the reversed params
+ * will call a special thunk that swaps params before calling your @a
+ * Functor.
+ */
+ template<typename Type1, typename Type2, class Functor>
+ void add(const Type<Type1>& t1, const Type<Type2>& t2, Functor func, bool symmetrical=false)
+ {
+ insert(t1, t2, func);
+ if (symmetrical)
+ {
+ // Use boost::bind() to construct a param-swapping thunk. Don't
+ // forget to reverse the parameters too.
+ insert(t2, t1, boost::bind(func, _2, _1));
+ }
+ }
+
+ /**
+ * Add a new Entry for a given @a Functor, explicitly passing instances of
+ * the Functor's leaf param types to help us figure out where to insert.
+ * Because it can use RTTI, this add() method isn't order-sensitive like
+ * the other one.
+ *
+ * If you want symmetrical entries -- that is, if a B and an A can call
+ * the same Functor as an A and a B -- then pass @c true for the last
+ * parameter, and we'll add a (B, A) entry as well as an (A, B) entry. But
+ * your @a Functor can still be written to expect exactly the pair of types
+ * you've explicitly specified, because the Entry with the reversed params
+ * will call a special thunk that swaps params before calling your @a
+ * Functor.
+ */
+ template <typename Type1, typename Type2, class Functor>
+ void add(const Type1& prototype1, const Type2& prototype2, Functor func, bool symmetrical=false)
+ {
+ // Because we expect our caller to pass leaf param types, we can just
+ // perform an ordinary search to find the first matching iterator. If
+ // we find an existing Entry that matches both params, either the
+ // param types are the same, or the existing Entry uses the base class
+ // for one or both params, and the new Entry must precede that. Assume
+ // our client won't register two callables with exactly the SAME set
+ // of types; in that case we'll insert the new one before any earlier
+ // ones, meaning the last one registered will "win." Note that if
+ // find() doesn't find any matching Entry, it will return end(),
+ // meaning the new Entry will be last, which is fine.
+ typename DispatchTable::iterator insertion = find(prototype1, prototype2);
+ insert(Type<Type1>(), Type<Type2>(), func, insertion);
+ if (symmetrical)
+ {
+ insert(Type<Type2>(), Type<Type1>(), boost::bind(func, _2, _1), insertion);
+ }
+ }
+
+ /**
+ * Add a new Entry for a given @a Functor, specifying the Functor's leaf
+ * param types as explicit template arguments. This will instantiate
+ * temporary objects of each of these types, which requires that they have
+ * a lightweight default constructor.
+ *
+ * If you want symmetrical entries -- that is, if a B and an A can call
+ * the same Functor as an A and a B -- then pass @c true for the last
+ * parameter, and we'll add a (B, A) entry as well as an (A, B) entry. But
+ * your @a Functor can still be written to expect exactly the pair of types
+ * you've explicitly specified, because the Entry with the reversed params
+ * will call a special thunk that swaps params before calling your @a
+ * Functor.
+ */
+ template <typename Type1, typename Type2, class Functor>
+ void add(Functor func, bool symmetrical=false)
+ {
+ // This is a convenience wrapper for the add() variant taking explicit
+ // instances.
+ add(Type1(), Type2(), func, symmetrical);
+ }
+
+private:
+ /// This is the base class for each entry in our dispatch table.
+ struct EntryBase
+ {
+ virtual ~EntryBase() {}
+ virtual bool matches(const ParamBaseType& param1, const ParamBaseType& param2) const = 0;
+ virtual ReturnType operator()(ParamBaseType& param1, ParamBaseType& param2) const = 0;
+ };
+
+ /// Here's the template subclass that actually creates each entry.
+ template<typename Type1, typename Type2, class Functor>
+ class Entry: public EntryBase
+ {
+ public:
+ Entry(Functor func): mFunc(func) {}
+ /// Is this entry appropriate for these arguments?
+ virtual bool matches(const ParamBaseType& param1, const ParamBaseType& param2) const
+ {
+ return (dynamic_cast<const Type1*>(¶m1) &&
+ dynamic_cast<const Type2*>(¶m2));
+ }
+ /// invocation
+ virtual ReturnType operator()(ParamBaseType& param1, ParamBaseType& param2) const
+ {
+ // We perform the downcast so callable can accept leaf param
+ // types, instead of accepting ParamBaseType and downcasting
+ // explicitly.
+ return mFunc(dynamic_cast<Type1&>(param1), dynamic_cast<Type2&>(param2));
+ }
+ private:
+ /// Bind whatever function or function object the instantiator passed.
+ Functor mFunc;
+ };
+
+ /// shared_ptr manages Entry lifespan for us
+ typedef boost::shared_ptr<EntryBase> EntryPtr;
+ /// use a @c list to make it easy to insert
+ typedef std::list<EntryPtr> DispatchTable;
+ DispatchTable mDispatch;
+
+ /// Look up the location of the first matching entry.
+ typename DispatchTable::const_iterator find(const ParamBaseType& param1, const ParamBaseType& param2) const
+ {
+ // We assert that it's safe to call the non-const find() method on a
+ // const LLDoubleDispatch instance. Cast away the const-ness of 'this'.
+ return const_cast<self_type*>(this)->find(param1, param2);
+ }
+
+ /// Look up the location of the first matching entry.
+ typename DispatchTable::iterator find(const ParamBaseType& param1, const ParamBaseType& param2)
+ {
+ return std::find_if(mDispatch.begin(), mDispatch.end(),
+ boost::bind(&EntryBase::matches, _1,
+ boost::ref(param1), boost::ref(param2)));
+ }
+
+ /// Look up the first matching entry.
+ EntryPtr lookup(const ParamBaseType& param1, const ParamBaseType& param2) const
+ {
+ typename DispatchTable::const_iterator found = find(param1, param2);
+ if (found != mDispatch.end())
+ {
+ // Dereferencing the list iterator gets us an EntryPtr
+ return *found;
+ }
+ // not found
+ return EntryPtr();
+ }
+
+ // Break out the actual insert operation so the public add() template
+ // function can avoid calling itself recursively. See add() comments.
+ template<typename Type1, typename Type2, class Functor>
+ void insert(const Type<Type1>& param1, const Type<Type2>& param2, Functor func)
+ {
+ insert(param1, param2, func, mDispatch.end());
+ }
+
+ // Break out the actual insert operation so the public add() template
+ // function can avoid calling itself recursively. See add() comments.
+ template<typename Type1, typename Type2, class Functor>
+ void insert(const Type<Type1>&, const Type<Type2>&, Functor func,
+ typename DispatchTable::iterator where)
+ {
+ mDispatch.insert(where, EntryPtr(new Entry<Type1, Type2, Functor>(func)));
+ }
+
+ /// Don't implement the copy ctor. Everyone will be happier if the
+ /// LLDoubleDispatch object isn't copied.
+ LLDoubleDispatch(const LLDoubleDispatch& src);
+};
+
+template <class ReturnType, class ParamBaseType>
+ReturnType LLDoubleDispatch<ReturnType, ParamBaseType>::operator()(const ParamBaseType& param1,
+ const ParamBaseType& param2) const
+{
+ EntryPtr found = lookup(param1, param2);
+ if (found.get() == 0)
+ return ReturnType(); // bogus return value
+
+ // otherwise, call the Functor we found
+ return (*found)(const_cast<ParamBaseType&>(param1), const_cast<ParamBaseType&>(param2));
+}
+
+#endif /* ! defined(LL_LLDOUBLEDISPATCH_H) */
diff --git a/indra/llcommon/llerrorthread.cpp b/indra/llcommon/llerrorthread.cpp
index 4c779c58c8..f0e46ae78d 100644
--- a/indra/llcommon/llerrorthread.cpp
+++ b/indra/llcommon/llerrorthread.cpp
@@ -31,7 +31,9 @@
#include "linden_common.h"
#include "llerrorthread.h"
+
#include "llapp.h"
+#include "lltimer.h" // ms_sleep()
LLErrorThread::LLErrorThread()
: LLThread("Error"),
diff --git a/indra/llcommon/llevent.h b/indra/llcommon/llevent.h
index 60887a060a..2b8f276df1 100644
--- a/indra/llcommon/llevent.h
+++ b/indra/llcommon/llevent.h
@@ -35,7 +35,7 @@
#define LL_EVENT_H
#include "llsd.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llthread.h"
class LLEventListener;
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h
new file mode 100644
index 0000000000..11f4063a1d
--- /dev/null
+++ b/indra/llcommon/llinstancetracker.h
@@ -0,0 +1,100 @@
+/**
+ * @file llinstancetracker.h
+ * @brief LLInstanceTracker is a mixin class that automatically tracks object
+ * instances with or without an associated key
+ *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ *
+ * Copyright (c) 2000-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLINSTANCETRACKER_H
+#define LL_LLINSTANCETRACKER_H
+
+#include <map>
+
+#include "string_table.h"
+#include <boost/utility.hpp>
+
+// This mix-in class adds support for tracking all instances of the specificed class parameter T
+// The (optional) key associates a value of type KEY with a given instance of T, for quick lookup
+// If KEY is not provided, then instances are stored in a simple list
+template<typename T, typename KEY = T*>
+class LLInstanceTracker : boost::noncopyable
+{
+public:
+ typedef typename std::map<KEY, T*>::iterator instance_iter;
+ typedef typename std::map<KEY, T*>::const_iterator instance_const_iter;
+
+ static T* getInstance(const KEY& k) { instance_iter found = sInstances.find(k); return (found == sInstances.end()) ? NULL : found->second; }
+
+ static instance_iter beginInstances() { return sInstances.begin(); }
+ static instance_iter endInstances() { return sInstances.end(); }
+ static S32 instanceCount() { return sInstances.size(); }
+protected:
+ LLInstanceTracker(KEY key) { add(key); }
+ virtual ~LLInstanceTracker() { remove(); }
+ virtual void setKey(KEY key) { remove(); add(key); }
+ virtual const KEY& getKey() const { return mKey; }
+
+private:
+ void add(KEY key)
+ {
+ mKey = key;
+ sInstances[key] = static_cast<T*>(this);
+ }
+ void remove() { sInstances.erase(mKey); }
+
+private:
+
+ KEY mKey;
+ static std::map<KEY, T*> sInstances;
+};
+
+template<typename T>
+class LLInstanceTracker<T, T*>
+{
+public:
+ typedef typename std::set<T*>::iterator instance_iter;
+ typedef typename std::set<T*>::const_iterator instance_const_iter;
+
+ static instance_iter instancesBegin() { return sInstances.begin(); }
+ static instance_iter instancesEnd() { return sInstances.end(); }
+ static S32 instanceCount() { return sInstances.size(); }
+
+protected:
+ LLInstanceTracker() { sInstances.insert(static_cast<T*>(this)); }
+ virtual ~LLInstanceTracker() { sInstances.erase(static_cast<T*>(this)); }
+
+ LLInstanceTracker(const LLInstanceTracker& other) { sInstances.insert(static_cast<T*>(this)); }
+
+ static std::set<T*> sInstances;
+};
+
+template <typename T, typename KEY> std::map<KEY, T*> LLInstanceTracker<T, KEY>::sInstances;
+template <typename T> std::set<T*> LLInstanceTracker<T, T*>::sInstances;
+
+#endif
diff --git a/indra/llcommon/llmd5.cpp b/indra/llcommon/llmd5.cpp
index 14b4f9f4b0..da9cb94e13 100644
--- a/indra/llcommon/llmd5.cpp
+++ b/indra/llcommon/llmd5.cpp
@@ -83,6 +83,7 @@ documentation and/or software.
#include "llmd5.h"
#include <cassert>
+#include <iostream> // cerr
// how many bytes to grab at a time when checking files
const int LLMD5::BLOCK_LEN = 4096;
diff --git a/indra/llcommon/llmemory.cpp b/indra/llcommon/llmemory.cpp
index a6de3d2d69..5d54cfcade 100644
--- a/indra/llcommon/llmemory.cpp
+++ b/indra/llcommon/llmemory.cpp
@@ -275,27 +275,12 @@ void operator delete[] (void *p)
}
#endif
-
-//----------------------------------------------------------------------------
-
-LLRefCount::LLRefCount() :
- mRef(0)
-{
-}
-
-LLRefCount::~LLRefCount()
-{
- if (mRef != 0)
- {
- llerrs << "deleting non-zero reference" << llendl;
- }
-}
//----------------------------------------------------------------------------
#if defined(LL_WINDOWS)
-U64 getCurrentRSS()
+U64 LLMemory::getCurrentRSS()
{
HANDLE self = GetCurrentProcess();
PROCESS_MEMORY_COUNTERS counters;
@@ -333,7 +318,7 @@ U64 getCurrentRSS()
// }
// }
-U64 getCurrentRSS()
+U64 LLMemory::getCurrentRSS()
{
U64 residentSize = 0;
task_basic_info_data_t basicInfo;
@@ -357,7 +342,7 @@ U64 getCurrentRSS()
#elif defined(LL_LINUX)
-U64 getCurrentRSS()
+U64 LLMemory::getCurrentRSS()
{
static const char statPath[] = "/proc/self/stat";
LLFILE *fp = LLFile::fopen(statPath, "r");
@@ -396,7 +381,7 @@ bail:
#define _STRUCTURED_PROC 1
#include <sys/procfs.h>
-U64 getCurrentRSS()
+U64 LLMemory::getCurrentRSS()
{
char path [LL_MAX_PATH]; /* Flawfinder: ignore */
@@ -419,7 +404,7 @@ U64 getCurrentRSS()
}
#else
-U64 getCurrentRSS()
+U64 LLMemory::getCurrentRSS()
{
return 0;
}
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index b5c0711484..a72e58034b 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -29,444 +29,34 @@
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
-#ifndef LL_MEMORY_H
-#define LL_MEMORY_H
+#ifndef LLMEMORY_H
+#define LLMEMORY_H
-#include <new>
-#include <cstdlib>
-#include "llerror.h"
extern S32 gTotalDAlloc;
extern S32 gTotalDAUse;
extern S32 gDACount;
-const U32 LLREFCOUNT_SENTINEL_VALUE = 0xAAAAAAAA;
-
-//----------------------------------------------------------------------------
-
class LLMemory
{
public:
static void initClass();
static void cleanupClass();
static void freeReserve();
+ // Return the resident set size of the current process, in bytes.
+ // Return value is zero if not known.
+ static U64 getCurrentRSS();
private:
static char* reserveMem;
};
-//----------------------------------------------------------------------------
-// RefCount objects should generally only be accessed by way of LLPointer<>'s
-// NOTE: LLPointer<LLFoo> x = new LLFoo(); MAY NOT BE THREAD SAFE
-// if LLFoo::LLFoo() does anything like put itself in an update queue.
-// The queue may get accessed before it gets assigned to x.
-// The correct implementation is:
-// LLPointer<LLFoo> x = new LLFoo; // constructor does not do anything interesting
-// x->instantiate(); // does stuff like place x into an update queue
-
-// see llthread.h for LLThreadSafeRefCount
-
-//----------------------------------------------------------------------------
-
-class LLRefCount
-{
-protected:
- LLRefCount(const LLRefCount&); // not implemented
-private:
- LLRefCount&operator=(const LLRefCount&); // not implemented
-
-protected:
- virtual ~LLRefCount(); // use unref()
-
-public:
- LLRefCount();
-
- void ref()
- {
- mRef++;
- }
-
- S32 unref()
- {
- llassert(mRef >= 1);
- if (0 == --mRef)
- {
- delete this;
- return 0;
- }
- return mRef;
- }
-
- S32 getNumRefs() const
- {
- return mRef;
- }
-
-private:
- S32 mRef;
-};
-
-//----------------------------------------------------------------------------
-
-// Note: relies on Type having ref() and unref() methods
-template <class Type> class LLPointer
-{
-public:
-
- LLPointer() :
- mPointer(NULL)
- {
- }
-
- LLPointer(Type* ptr) :
- mPointer(ptr)
- {
- ref();
- }
-
- LLPointer(const LLPointer<Type>& ptr) :
- mPointer(ptr.mPointer)
- {
- ref();
- }
-
- // support conversion up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
- template<typename Subclass>
- LLPointer(const LLPointer<Subclass>& ptr) :
- mPointer(ptr.get())
- {
- ref();
- }
-
- ~LLPointer()
- {
- unref();
- }
-
- Type* get() const { return mPointer; }
- const Type* operator->() const { return mPointer; }
- Type* operator->() { return mPointer; }
- const Type& operator*() const { return *mPointer; }
- Type& operator*() { return *mPointer; }
-
- operator BOOL() const { return (mPointer != NULL); }
- operator bool() const { return (mPointer != NULL); }
- bool operator!() const { return (mPointer == NULL); }
- bool isNull() const { return (mPointer == NULL); }
- bool notNull() const { return (mPointer != NULL); }
-
- operator Type*() const { return mPointer; }
- operator const Type*() const { return mPointer; }
- bool operator !=(Type* ptr) const { return (mPointer != ptr); }
- bool operator ==(Type* ptr) const { return (mPointer == ptr); }
- bool operator ==(const LLPointer<Type>& ptr) const { return (mPointer == ptr.mPointer); }
- bool operator < (const LLPointer<Type>& ptr) const { return (mPointer < ptr.mPointer); }
- bool operator > (const LLPointer<Type>& ptr) const { return (mPointer > ptr.mPointer); }
-
- LLPointer<Type>& operator =(Type* ptr)
- {
- if( mPointer != ptr )
- {
- unref();
- mPointer = ptr;
- ref();
- }
-
- return *this;
- }
-
- LLPointer<Type>& operator =(const LLPointer<Type>& ptr)
- {
- if( mPointer != ptr.mPointer )
- {
- unref();
- mPointer = ptr.mPointer;
- ref();
- }
- return *this;
- }
-
- // support assignment up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
- template<typename Subclass>
- LLPointer<Type>& operator =(const LLPointer<Subclass>& ptr)
- {
- if( mPointer != ptr.get() )
- {
- unref();
- mPointer = ptr.get();
- ref();
- }
- return *this;
- }
-
- // Just exchange the pointers, which will not change the reference counts.
- static void swap(LLPointer<Type>& a, LLPointer<Type>& b)
- {
- Type* temp = a.mPointer;
- a.mPointer = b.mPointer;
- b.mPointer = temp;
- }
-
-protected:
- void ref()
- {
- if (mPointer)
- {
- mPointer->ref();
- }
- }
-
- void unref()
- {
- if (mPointer)
- {
- Type *tempp = mPointer;
- mPointer = NULL;
- tempp->unref();
- if (mPointer != NULL)
- {
- llwarns << "Unreference did assignment to non-NULL because of destructor" << llendl;
- unref();
- }
- }
- }
-
-protected:
- Type* mPointer;
-};
-
-//template <class Type>
-//class LLPointerTraits
-//{
-// static Type* null();
-//};
-//
-// Expands LLPointer to return a pointer to a special instance of class Type instead of NULL.
-// This is useful in instances where operations on NULL pointers are semantically safe and/or
-// when error checking occurs at a different granularity or in a different part of the code
-// than when referencing an object via a LLSafeHandle.
-//
+// LLRefCount moved to llrefcount.h
-template <class Type>
-class LLSafeHandle
-{
-public:
- LLSafeHandle() :
- mPointer(NULL)
- {
- }
-
- LLSafeHandle(Type* ptr) :
- mPointer(NULL)
- {
- assign(ptr);
- }
-
- LLSafeHandle(const LLSafeHandle<Type>& ptr) :
- mPointer(NULL)
- {
- assign(ptr.mPointer);
- }
-
- // support conversion up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
- template<typename Subclass>
- LLSafeHandle(const LLSafeHandle<Subclass>& ptr) :
- mPointer(NULL)
- {
- assign(ptr.get());
- }
-
- ~LLSafeHandle()
- {
- unref();
- }
-
- const Type* operator->() const { return nonNull(mPointer); }
- Type* operator->() { return nonNull(mPointer); }
-
- Type* get() const { return mPointer; }
- // we disallow these operations as they expose our null objects to direct manipulation
- // and bypass the reference counting semantics
- //const Type& operator*() const { return *nonNull(mPointer); }
- //Type& operator*() { return *nonNull(mPointer); }
-
- operator BOOL() const { return mPointer != NULL; }
- operator bool() const { return mPointer != NULL; }
- bool operator!() const { return mPointer == NULL; }
- bool isNull() const { return mPointer == NULL; }
- bool notNull() const { return mPointer != NULL; }
-
-
- operator Type*() const { return mPointer; }
- operator const Type*() const { return mPointer; }
- bool operator !=(Type* ptr) const { return (mPointer != ptr); }
- bool operator ==(Type* ptr) const { return (mPointer == ptr); }
- bool operator ==(const LLSafeHandle<Type>& ptr) const { return (mPointer == ptr.mPointer); }
- bool operator < (const LLSafeHandle<Type>& ptr) const { return (mPointer < ptr.mPointer); }
- bool operator > (const LLSafeHandle<Type>& ptr) const { return (mPointer > ptr.mPointer); }
-
- LLSafeHandle<Type>& operator =(Type* ptr)
- {
- assign(ptr);
- return *this;
- }
-
- LLSafeHandle<Type>& operator =(const LLSafeHandle<Type>& ptr)
- {
- assign(ptr.mPointer);
- return *this;
- }
-
- // support assignment up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
- template<typename Subclass>
- LLSafeHandle<Type>& operator =(const LLSafeHandle<Subclass>& ptr)
- {
- assign(ptr.get());
- return *this;
- }
-
-public:
- typedef Type* (*NullFunc)();
- static const NullFunc sNullFunc;
-
-protected:
- void ref()
- {
- if (mPointer)
- {
- mPointer->ref();
- }
- }
-
- void unref()
- {
- if (mPointer)
- {
- Type *tempp = mPointer;
- mPointer = NULL;
- tempp->unref();
- if (mPointer != NULL)
- {
- llwarns << "Unreference did assignment to non-NULL because of destructor" << llendl;
- unref();
- }
- }
- }
-
- void assign(Type* ptr)
- {
- if( mPointer != ptr )
- {
- unref();
- mPointer = ptr;
- ref();
- }
- }
-
- static Type* nonNull(Type* ptr)
- {
- return ptr == NULL ? sNullFunc() : ptr;
- }
-
-protected:
- Type* mPointer;
-};
-
-// LLInitializedPointer is just a pointer with a default constructor that initializes it to NULL
-// NOT a smart pointer like LLPointer<>
-// Useful for example in std::map<int,LLInitializedPointer<LLFoo> >
-// (std::map uses the default constructor for creating new entries)
-template <typename T> class LLInitializedPointer
-{
-public:
- LLInitializedPointer() : mPointer(NULL) {}
- ~LLInitializedPointer() { delete mPointer; }
-
- const T* operator->() const { return mPointer; }
- T* operator->() { return mPointer; }
- const T& operator*() const { return *mPointer; }
- T& operator*() { return *mPointer; }
- operator const T*() const { return mPointer; }
- operator T*() { return mPointer; }
- T* operator=(T* x) { return (mPointer = x); }
- operator bool() const { return mPointer != NULL; }
- bool operator!() const { return mPointer == NULL; }
- bool operator==(T* rhs) { return mPointer == rhs; }
- bool operator==(const LLInitializedPointer<T>* rhs) { return mPointer == rhs.mPointer; }
-
-protected:
- T* mPointer;
-};
-
-//----------------------------------------------------------------------------
-
-// LLSingleton implements the getInstance() method part of the Singleton
-// pattern. It can't make the derived class constructors protected, though, so
-// you have to do that yourself.
-//
-// There are two ways to use LLSingleton. The first way is to inherit from it
-// while using the typename that you'd like to be static as the template
-// parameter, like so:
-//
-// class Foo: public LLSingleton<Foo>{};
-//
-// Foo& instance = Foo::instance();
-//
-// The second way is to use the singleton class directly, without inheritance:
-//
-// typedef LLSingleton<Foo> FooSingleton;
-//
-// Foo& instance = FooSingleton::instance();
-//
-// In this case, the class being managed as a singleton needs to provide an
-// initSingleton() method since the LLSingleton virtual method won't be
-// available
-//
-// As currently written, it is not thread-safe.
-template <typename T>
-class LLSingleton
-{
-public:
- virtual ~LLSingleton() {}
-#ifdef LL_MSVC7
-// workaround for VC7 compiler bug
-// adapted from http://www.codeproject.com/KB/tips/VC2003MeyersSingletonBug.aspx
-// our version doesn't introduce a nested struct so that you can still declare LLSingleton<MyClass>
-// a friend and hide your constructor
- static T* getInstance()
- {
- LLSingleton<T> singleton;
- return singleton.vsHack();
- }
-
- T* vsHack()
-#else
- static T* getInstance()
-#endif
- {
- static T instance;
- static bool needs_init = true;
- if (needs_init)
- {
- needs_init = false;
- instance.initSingleton();
- }
- return &instance;
- }
-
- static T& instance()
- {
- return *getInstance();
- }
-
-private:
- virtual void initSingleton() {}
-};
+// LLPointer moved to llpointer.h
-//----------------------------------------------------------------------------
+// LLSafeHandle moved to llsafehandle.h
-// Return the resident set size of the current process, in bytes.
-// Return value is zero if not known.
-U64 getCurrentRSS();
+// LLSingleton moved to llsingleton.h
#endif
diff --git a/indra/llcommon/llmemtype.h b/indra/llcommon/llmemtype.h
index a9ebc2062f..b7cef4de4a 100644
--- a/indra/llcommon/llmemtype.h
+++ b/indra/llcommon/llmemtype.h
@@ -41,7 +41,10 @@ class LLMemType;
extern void* ll_allocate (size_t size);
extern void ll_release (void *p);
-#define MEM_TRACK_MEM 0
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// WARNING: Never commit with MEM_TRACK_MEM == 1
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+#define MEM_TRACK_MEM (0 && LL_WINDOWS)
#define MEM_TRACK_TYPE (1 && MEM_TRACK_MEM)
#if MEM_TRACK_TYPE
diff --git a/indra/llcommon/llpointer.h b/indra/llcommon/llpointer.h
new file mode 100644
index 0000000000..2c37eadcc6
--- /dev/null
+++ b/indra/llcommon/llpointer.h
@@ -0,0 +1,177 @@
+/**
+ * @file llpointer.h
+ * @brief A reference-counted pointer for objects derived from LLRefCount
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLPOINTER_H
+#define LLPOINTER_H
+
+#include "llerror.h" // *TODO: consider eliminating this
+
+//----------------------------------------------------------------------------
+// RefCount objects should generally only be accessed by way of LLPointer<>'s
+// NOTE: LLPointer<LLFoo> x = new LLFoo(); MAY NOT BE THREAD SAFE
+// if LLFoo::LLFoo() does anything like put itself in an update queue.
+// The queue may get accessed before it gets assigned to x.
+// The correct implementation is:
+// LLPointer<LLFoo> x = new LLFoo; // constructor does not do anything interesting
+// x->instantiate(); // does stuff like place x into an update queue
+
+// see llthread.h for LLThreadSafeRefCount
+
+//----------------------------------------------------------------------------
+
+// Note: relies on Type having ref() and unref() methods
+template <class Type> class LLPointer
+{
+public:
+
+ LLPointer() :
+ mPointer(NULL)
+ {
+ }
+
+ LLPointer(Type* ptr) :
+ mPointer(ptr)
+ {
+ ref();
+ }
+
+ LLPointer(const LLPointer<Type>& ptr) :
+ mPointer(ptr.mPointer)
+ {
+ ref();
+ }
+
+ // support conversion up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
+ template<typename Subclass>
+ LLPointer(const LLPointer<Subclass>& ptr) :
+ mPointer(ptr.get())
+ {
+ ref();
+ }
+
+ ~LLPointer()
+ {
+ unref();
+ }
+
+ Type* get() const { return mPointer; }
+ const Type* operator->() const { return mPointer; }
+ Type* operator->() { return mPointer; }
+ const Type& operator*() const { return *mPointer; }
+ Type& operator*() { return *mPointer; }
+
+ operator BOOL() const { return (mPointer != NULL); }
+ operator bool() const { return (mPointer != NULL); }
+ bool operator!() const { return (mPointer == NULL); }
+ bool isNull() const { return (mPointer == NULL); }
+ bool notNull() const { return (mPointer != NULL); }
+
+ operator Type*() const { return mPointer; }
+ operator const Type*() const { return mPointer; }
+ bool operator !=(Type* ptr) const { return (mPointer != ptr); }
+ bool operator ==(Type* ptr) const { return (mPointer == ptr); }
+ bool operator ==(const LLPointer<Type>& ptr) const { return (mPointer == ptr.mPointer); }
+ bool operator < (const LLPointer<Type>& ptr) const { return (mPointer < ptr.mPointer); }
+ bool operator > (const LLPointer<Type>& ptr) const { return (mPointer > ptr.mPointer); }
+
+ LLPointer<Type>& operator =(Type* ptr)
+ {
+ if( mPointer != ptr )
+ {
+ unref();
+ mPointer = ptr;
+ ref();
+ }
+
+ return *this;
+ }
+
+ LLPointer<Type>& operator =(const LLPointer<Type>& ptr)
+ {
+ if( mPointer != ptr.mPointer )
+ {
+ unref();
+ mPointer = ptr.mPointer;
+ ref();
+ }
+ return *this;
+ }
+
+ // support assignment up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
+ template<typename Subclass>
+ LLPointer<Type>& operator =(const LLPointer<Subclass>& ptr)
+ {
+ if( mPointer != ptr.get() )
+ {
+ unref();
+ mPointer = ptr.get();
+ ref();
+ }
+ return *this;
+ }
+
+ // Just exchange the pointers, which will not change the reference counts.
+ static void swap(LLPointer<Type>& a, LLPointer<Type>& b)
+ {
+ Type* temp = a.mPointer;
+ a.mPointer = b.mPointer;
+ b.mPointer = temp;
+ }
+
+protected:
+ void ref()
+ {
+ if (mPointer)
+ {
+ mPointer->ref();
+ }
+ }
+
+ void unref()
+ {
+ if (mPointer)
+ {
+ Type *tempp = mPointer;
+ mPointer = NULL;
+ tempp->unref();
+ if (mPointer != NULL)
+ {
+ llwarns << "Unreference did assignment to non-NULL because of destructor" << llendl;
+ unref();
+ }
+ }
+ }
+
+protected:
+ Type* mPointer;
+};
+
+#endif
diff --git a/indra/llcommon/llptrto.cpp b/indra/llcommon/llptrto.cpp
new file mode 100644
index 0000000000..ce93f09489
--- /dev/null
+++ b/indra/llcommon/llptrto.cpp
@@ -0,0 +1,108 @@
+/**
+ * @file llptrto.cpp
+ * @author Nat Goodspeed
+ * @date 2008-08-20
+ * @brief Test for llptrto.h
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// Precompiled header
+#include "linden_common.h"
+// associated header
+#include "llptrto.h"
+// STL headers
+// std headers
+// external library headers
+#include <boost/type_traits/is_same.hpp>
+#include <boost/static_assert.hpp>
+// other Linden headers
+#include "llmemory.h"
+
+// a refcounted class
+class RCFoo: public LLRefCount
+{
+public:
+ RCFoo() {}
+};
+
+// a refcounted subclass
+class RCSubFoo: public RCFoo
+{
+public:
+ RCSubFoo() {}
+};
+
+// a refcounted class using the other refcount base class
+class TSRCFoo: public LLThreadSafeRefCount
+{
+public:
+ TSRCFoo() {}
+};
+
+// a non-refcounted class
+class Bar
+{
+public:
+ Bar() {}
+};
+
+// a non-refcounted subclass
+class SubBar: public Bar
+{
+public:
+ SubBar() {}
+};
+
+int main(int argc, char *argv[])
+{
+ // test LLPtrTo<>
+ BOOST_STATIC_ASSERT((boost::is_same<LLPtrTo<RCFoo>::type, LLPointer<RCFoo> >::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLPtrTo<RCSubFoo>::type, LLPointer<RCSubFoo> >::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLPtrTo<TSRCFoo>::type, LLPointer<TSRCFoo> >::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLPtrTo<Bar>::type, Bar*>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLPtrTo<SubBar>::type, SubBar*>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLPtrTo<int>::type, int*>::value));
+
+ // Test LLRemovePointer<>. Note that we remove both pointer variants from
+ // each kind of type, regardless of whether the variant makes sense.
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer<RCFoo*>::type, RCFoo>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer< LLPointer<RCFoo> >::type, RCFoo>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer<RCSubFoo*>::type, RCSubFoo>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer< LLPointer<RCSubFoo> >::type, RCSubFoo>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer<TSRCFoo*>::type, TSRCFoo>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer< LLPointer<TSRCFoo> >::type, TSRCFoo>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer<Bar*>::type, Bar>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer< LLPointer<Bar> >::type, Bar>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer<SubBar*>::type, SubBar>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer< LLPointer<SubBar> >::type, SubBar>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer<int*>::type, int>::value));
+ BOOST_STATIC_ASSERT((boost::is_same<LLRemovePointer< LLPointer<int> >::type, int>::value));
+
+ return 0;
+}
diff --git a/indra/llcommon/llptrto.h b/indra/llcommon/llptrto.h
new file mode 100644
index 0000000000..74c117a7f6
--- /dev/null
+++ b/indra/llcommon/llptrto.h
@@ -0,0 +1,93 @@
+/**
+ * @file llptrto.h
+ * @author Nat Goodspeed
+ * @date 2008-08-19
+ * @brief LLPtrTo<TARGET> is a template helper to pick either TARGET* or -- when
+ * TARGET is a subclass of LLRefCount or LLThreadSafeRefCount --
+ * LLPointer<TARGET>. LLPtrTo<> chooses whichever pointer type is best.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#if ! defined(LL_LLPTRTO_H)
+#define LL_LLPTRTO_H
+
+#include "llpointer.h"
+#include "llrefcount.h" // LLRefCount
+#include "llthread.h" // LLThreadSafeRefCount
+#include <boost/type_traits/is_base_of.hpp>
+#include <boost/type_traits/remove_pointer.hpp>
+#include <boost/utility/enable_if.hpp>
+
+/**
+ * LLPtrTo<TARGET>::type is either of two things:
+ *
+ * * When TARGET is a subclass of either LLRefCount or LLThreadSafeRefCount,
+ * LLPtrTo<TARGET>::type is LLPointer<TARGET>.
+ * * Otherwise, LLPtrTo<TARGET>::type is TARGET*.
+ *
+ * This way, a class template can use LLPtrTo<TARGET>::type to select an
+ * appropriate pointer type to store.
+ */
+template <class T, class ENABLE=void>
+struct LLPtrTo
+{
+ typedef T* type;
+};
+
+/// specialize for subclasses of LLRefCount
+template <class T>
+struct LLPtrTo<T, typename boost::enable_if< boost::is_base_of<LLRefCount, T> >::type>
+{
+ typedef LLPointer<T> type;
+};
+
+/// specialize for subclasses of LLThreadSafeRefCount
+template <class T>
+struct LLPtrTo<T, typename boost::enable_if< boost::is_base_of<LLThreadSafeRefCount, T> >::type>
+{
+ typedef LLPointer<T> type;
+};
+
+/**
+ * LLRemovePointer<PTRTYPE>::type gets you the underlying (pointee) type.
+ */
+template <typename PTRTYPE>
+struct LLRemovePointer
+{
+ typedef typename boost::remove_pointer<PTRTYPE>::type type;
+};
+
+/// specialize for LLPointer<SOMECLASS>
+template <typename SOMECLASS>
+struct LLRemovePointer< LLPointer<SOMECLASS> >
+{
+ typedef SOMECLASS type;
+};
+
+#endif /* ! defined(LL_LLPTRTO_H) */
diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp
index cd53e701d2..3db5c36545 100644
--- a/indra/llcommon/llqueuedthread.cpp
+++ b/indra/llcommon/llqueuedthread.cpp
@@ -31,7 +31,9 @@
#include "linden_common.h"
#include "llqueuedthread.h"
+
#include "llstl.h"
+#include "lltimer.h" // ms_sleep()
//============================================================================
diff --git a/indra/llcommon/llrefcount.cpp b/indra/llcommon/llrefcount.cpp
new file mode 100644
index 0000000000..33b6875fb0
--- /dev/null
+++ b/indra/llcommon/llrefcount.cpp
@@ -0,0 +1,49 @@
+/**
+ * @file llrefcount.cpp
+ * @brief Base class for reference counted objects for use with LLPointer
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "linden_common.h"
+
+#include "llrefcount.h"
+
+#include "llerror.h"
+
+LLRefCount::LLRefCount() :
+ mRef(0)
+{
+}
+
+LLRefCount::~LLRefCount()
+{
+ if (mRef != 0)
+ {
+ llerrs << "deleting non-zero reference" << llendl;
+ }
+}
diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
new file mode 100644
index 0000000000..540a18b8a0
--- /dev/null
+++ b/indra/llcommon/llrefcount.h
@@ -0,0 +1,78 @@
+/**
+ * @file llrefcount.h
+ * @brief Base class for reference counted objects for use with LLPointer
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLREFCOUNT_H
+#define LLREFCOUNT_H
+
+//----------------------------------------------------------------------------
+// RefCount objects should generally only be accessed by way of LLPointer<>'s
+// see llthread.h for LLThreadSafeRefCount
+//----------------------------------------------------------------------------
+
+class LLRefCount
+{
+protected:
+ LLRefCount(const LLRefCount&); // not implemented
+private:
+ LLRefCount&operator=(const LLRefCount&); // not implemented
+
+protected:
+ virtual ~LLRefCount(); // use unref()
+
+public:
+ LLRefCount();
+
+ void ref()
+ {
+ mRef++;
+ }
+
+ S32 unref()
+ {
+ llassert(mRef >= 1);
+ if (0 == --mRef)
+ {
+ delete this;
+ return 0;
+ }
+ return mRef;
+ }
+
+ S32 getNumRefs() const
+ {
+ return mRef;
+ }
+
+private:
+ S32 mRef;
+};
+
+#endif
diff --git a/indra/llcommon/llsafehandle.h b/indra/llcommon/llsafehandle.h
new file mode 100644
index 0000000000..1f7c682fd1
--- /dev/null
+++ b/indra/llcommon/llsafehandle.h
@@ -0,0 +1,167 @@
+/**
+ * @file llsafehandle.h
+ * @brief Reference-counted object where Object() is valid, not NULL.
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLSAFEHANDLE_H
+#define LLSAFEHANDLE_H
+
+#include "llerror.h" // *TODO: consider eliminating this
+
+// Expands LLPointer to return a pointer to a special instance of class Type instead of NULL.
+// This is useful in instances where operations on NULL pointers are semantically safe and/or
+// when error checking occurs at a different granularity or in a different part of the code
+// than when referencing an object via a LLSafeHandle.
+
+template <class Type>
+class LLSafeHandle
+{
+public:
+ LLSafeHandle() :
+ mPointer(NULL)
+ {
+ }
+
+ LLSafeHandle(Type* ptr) :
+ mPointer(NULL)
+ {
+ assign(ptr);
+ }
+
+ LLSafeHandle(const LLSafeHandle<Type>& ptr) :
+ mPointer(NULL)
+ {
+ assign(ptr.mPointer);
+ }
+
+ // support conversion up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
+ template<typename Subclass>
+ LLSafeHandle(const LLSafeHandle<Subclass>& ptr) :
+ mPointer(NULL)
+ {
+ assign(ptr.get());
+ }
+
+ ~LLSafeHandle()
+ {
+ unref();
+ }
+
+ const Type* operator->() const { return nonNull(mPointer); }
+ Type* operator->() { return nonNull(mPointer); }
+
+ Type* get() const { return mPointer; }
+ // we disallow these operations as they expose our null objects to direct manipulation
+ // and bypass the reference counting semantics
+ //const Type& operator*() const { return *nonNull(mPointer); }
+ //Type& operator*() { return *nonNull(mPointer); }
+
+ operator BOOL() const { return mPointer != NULL; }
+ operator bool() const { return mPointer != NULL; }
+ bool operator!() const { return mPointer == NULL; }
+ bool isNull() const { return mPointer == NULL; }
+ bool notNull() const { return mPointer != NULL; }
+
+
+ operator Type*() const { return mPointer; }
+ operator const Type*() const { return mPointer; }
+ bool operator !=(Type* ptr) const { return (mPointer != ptr); }
+ bool operator ==(Type* ptr) const { return (mPointer == ptr); }
+ bool operator ==(const LLSafeHandle<Type>& ptr) const { return (mPointer == ptr.mPointer); }
+ bool operator < (const LLSafeHandle<Type>& ptr) const { return (mPointer < ptr.mPointer); }
+ bool operator > (const LLSafeHandle<Type>& ptr) const { return (mPointer > ptr.mPointer); }
+
+ LLSafeHandle<Type>& operator =(Type* ptr)
+ {
+ assign(ptr);
+ return *this;
+ }
+
+ LLSafeHandle<Type>& operator =(const LLSafeHandle<Type>& ptr)
+ {
+ assign(ptr.mPointer);
+ return *this;
+ }
+
+ // support assignment up the type hierarchy. See Item 45 in Effective C++, 3rd Ed.
+ template<typename Subclass>
+ LLSafeHandle<Type>& operator =(const LLSafeHandle<Subclass>& ptr)
+ {
+ assign(ptr.get());
+ return *this;
+ }
+
+public:
+ typedef Type* (*NullFunc)();
+ static const NullFunc sNullFunc;
+
+protected:
+ void ref()
+ {
+ if (mPointer)
+ {
+ mPointer->ref();
+ }
+ }
+
+ void unref()
+ {
+ if (mPointer)
+ {
+ Type *tempp = mPointer;
+ mPointer = NULL;
+ tempp->unref();
+ if (mPointer != NULL)
+ {
+ llwarns << "Unreference did assignment to non-NULL because of destructor" << llendl;
+ unref();
+ }
+ }
+ }
+
+ void assign(Type* ptr)
+ {
+ if( mPointer != ptr )
+ {
+ unref();
+ mPointer = ptr;
+ ref();
+ }
+ }
+
+ static Type* nonNull(Type* ptr)
+ {
+ return ptr == NULL ? sNullFunc() : ptr;
+ }
+
+protected:
+ Type* mPointer;
+};
+
+#endif
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 7a66d70d3f..cf337be161 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -34,7 +34,7 @@
#include "linden_common.h"
#include "llsdserialize.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llstreamtools.h" // for fullread
#include <iostream>
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index bb38b75d8f..7463d1e5dd 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -36,8 +36,9 @@
#define LL_LLSDSERIALIZE_H
#include <iosfwd>
+#include "llpointer.h"
+#include "llrefcount.h"
#include "llsd.h"
-#include "llmemory.h"
/**
* @class LLSDParser
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp
index aa0e0f3696..0202a033c3 100644
--- a/indra/llcommon/llsdutil.cpp
+++ b/indra/llcommon/llsdutil.cpp
@@ -171,6 +171,15 @@ char* ll_print_sd(const LLSD& sd)
return buffer;
}
+char* ll_pretty_print_sd_ptr(const LLSD* sd)
+{
+ if (sd)
+ {
+ return ll_pretty_print_sd(*sd);
+ }
+ return NULL;
+}
+
char* ll_pretty_print_sd(const LLSD& sd)
{
const U32 bufferSize = 10 * 1024;
diff --git a/indra/llcommon/llsdutil.h b/indra/llcommon/llsdutil.h
index b67ad521ea..501600f1d9 100644
--- a/indra/llcommon/llsdutil.h
+++ b/indra/llcommon/llsdutil.h
@@ -89,6 +89,7 @@ LLSD ll_binary_from_string(const LLSD& sd);
char* ll_print_sd(const LLSD& sd);
// Serializes sd to static buffer and returns pointer, using "pretty printing" mode.
+char* ll_pretty_print_sd_ptr(const LLSD* sd);
char* ll_pretty_print_sd(const LLSD& sd);
//compares the structure of an LLSD to a template LLSD and stores the
diff --git a/indra/llcommon/llsecondlifeurls.cpp b/indra/llcommon/llsecondlifeurls.cpp
index 36d8e8870f..6323d9d36b 100644
--- a/indra/llcommon/llsecondlifeurls.cpp
+++ b/indra/llcommon/llsecondlifeurls.cpp
@@ -32,57 +32,59 @@
#include "linden_common.h"
#include "llsecondlifeurls.h"
-
+/*
const std::string CREATE_ACCOUNT_URL (
"http://secondlife.com/registration/");
const std::string MANAGE_ACCOUNT (
- "http://secondlife.com/account/");
+ "http://secondlife.com/account/"); // *TODO: NOT USED
const std::string AUCTION_URL (
"http://secondlife.com/auctions/auction-detail.php?id=");
const std::string EVENTS_URL (
"http://secondlife.com/events/");
-
+*/
const std::string TIER_UP_URL (
- "http://secondlife.com/app/landtier");
+ "http://secondlife.com/app/landtier"); // *TODO: Translate (simulator)
+const std::string DIRECTX_9_URL (
+ "http://secondlife.com/support/"); // *TODO: NOT USED
+/*
const std::string LAND_URL (
- "http://secondlife.com/app/landtier");
+ "http://secondlife.com/app/landtier"); // *TODO: NOT USED
const std::string UPGRADE_TO_PREMIUM_URL (
- "http://secondlife.com/app/upgrade/");
-
-const std::string DIRECTX_9_URL (
- "http://secondlife.com/support/");
+ "http://secondlife.com/app/upgrade/"); // *TODO: NOT USED
const std::string AMD_AGP_URL (
- "http://secondlife.com/support/");
+ "http://secondlife.com/support/"); // *TODO: NOT USED
const std::string VIA_URL (
- "http://secondlife.com/support/");
+ "http://secondlife.com/support/"); // *TODO: NOT USED
const std::string SUPPORT_URL (
"http://secondlife.com/support/");
const std::string INTEL_CHIPSET_URL (
- "http://secondlife.com/support/");
+ "http://secondlife.com/support/"); // *TODO: NOT USED
const std::string SIS_CHIPSET_URL (
- "http://secondlife.com/support/");
+ "http://secondlife.com/support/"); // *TODO: NOT USED
const std::string BLOGS_URL (
- "http://blog.secondlife.com/");
+ "http://blog.secondlife.com/"); // *TODO: NOT USED
const std::string BUY_CURRENCY_URL (
"http://secondlife.com/app/currency/");
const std::string LSL_DOC_URL (
- "http://secondlife.com/app/lsldoc/");
+ "http://secondlife.com/app/lsldoc/"); // *TODO: NOT USED
const std::string SL_KB_URL (
- "http://secondlife.com/knowledgebase/");
+ "http://secondlife.com/knowledgebase/"); // *TODO: NOT USED
const std::string RELEASE_NOTES_BASE_URL (
"http://secondlife.com/app/releasenotes/");
+*/
+
diff --git a/indra/llcommon/llsecondlifeurls.h b/indra/llcommon/llsecondlifeurls.h
index 9fd75c363b..a2e5f0b9c6 100644
--- a/indra/llcommon/llsecondlifeurls.h
+++ b/indra/llcommon/llsecondlifeurls.h
@@ -32,7 +32,7 @@
#ifndef LL_LLSECONDLIFEURLS_H
#define LL_LLSECONDLIFEURLS_H
-
+/*
// Account registration web page
extern const std::string CREATE_ACCOUNT_URL;
@@ -42,18 +42,21 @@ extern const std::string MANAGE_ACCOUNT;
extern const std::string AUCTION_URL;
extern const std::string EVENTS_URL;
-
+*/
// Tier up to a new land level.
extern const std::string TIER_UP_URL;
+
// Tier up to a new land level.
extern const std::string LAND_URL;
+// How to get DirectX 9
+extern const std::string DIRECTX_9_URL;
+
+/*
// Upgrade from basic membership to premium membership
extern const std::string UPGRADE_TO_PREMIUM_URL;
-// How to get DirectX 9
-extern const std::string DIRECTX_9_URL;
// Out of date VIA chipset
extern const std::string VIA_URL;
@@ -75,5 +78,5 @@ extern const std::string SL_KB_URL;
// Release Notes Redirect URL for Server and Viewer
extern const std::string RELEASE_NOTES_BASE_URL;
-
+*/
#endif
diff --git a/indra/llcommon/llsingleton.h b/indra/llcommon/llsingleton.h
new file mode 100644
index 0000000000..dc1457e4f7
--- /dev/null
+++ b/indra/llcommon/llsingleton.h
@@ -0,0 +1,158 @@
+/**
+ * @file llsingleton.h
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLSINGLETON_H
+#define LLSINGLETON_H
+
+#include "llerror.h" // *TODO: eliminate this
+
+#include <boost/noncopyable.hpp>
+
+// LLSingleton implements the getInstance() method part of the Singleton
+// pattern. It can't make the derived class constructors protected, though, so
+// you have to do that yourself.
+//
+// There are two ways to use LLSingleton. The first way is to inherit from it
+// while using the typename that you'd like to be static as the template
+// parameter, like so:
+//
+// class Foo: public LLSingleton<Foo>{};
+//
+// Foo& instance = Foo::instance();
+//
+// The second way is to use the singleton class directly, without inheritance:
+//
+// typedef LLSingleton<Foo> FooSingleton;
+//
+// Foo& instance = FooSingleton::instance();
+//
+// In this case, the class being managed as a singleton needs to provide an
+// initSingleton() method since the LLSingleton virtual method won't be
+// available
+//
+// As currently written, it is not thread-safe.
+
+template <typename DERIVED_TYPE>
+class LLSingleton : private boost::noncopyable
+{
+
+private:
+ typedef enum e_init_state
+ {
+ UNINITIALIZED,
+ CONSTRUCTING,
+ INITIALIZING,
+ INITIALIZED,
+ DELETED
+ } EInitState;
+
+ static void deleteSingleton()
+ {
+ delete getData().mSingletonInstance;
+ getData().mSingletonInstance = NULL;
+ }
+
+ // stores pointer to singleton instance
+ // and tracks initialization state of singleton
+ struct SingletonInstanceData
+ {
+ EInitState mInitState;
+ DERIVED_TYPE* mSingletonInstance;
+
+ SingletonInstanceData()
+ : mSingletonInstance(NULL),
+ mInitState(UNINITIALIZED)
+ {}
+
+ ~SingletonInstanceData()
+ {
+ deleteSingleton();
+ }
+ };
+
+public:
+ virtual ~LLSingleton()
+ {
+ SingletonInstanceData& data = getData();
+ data.mSingletonInstance = NULL;
+ data.mInitState = DELETED;
+ }
+
+ static SingletonInstanceData& getData()
+ {
+ static SingletonInstanceData data;
+ return data;
+ }
+
+ static DERIVED_TYPE* getInstance()
+ {
+ SingletonInstanceData& data = getData();
+
+ if (data.mInitState == CONSTRUCTING)
+ {
+ llerrs << "Tried to access singleton " << typeid(DERIVED_TYPE).name() << " from singleton constructor!" << llendl;
+ }
+
+ if (data.mInitState == DELETED)
+ {
+ llwarns << "Trying to access deleted singleton " << typeid(DERIVED_TYPE).name() << " creating new instance" << llendl;
+ }
+
+ if (!data.mSingletonInstance)
+ {
+ data.mInitState = CONSTRUCTING;
+ data.mSingletonInstance = new DERIVED_TYPE();
+ data.mInitState = INITIALIZING;
+ data.mSingletonInstance->initSingleton();
+ data.mInitState = INITIALIZED;
+ }
+
+ return data.mSingletonInstance;
+ }
+
+ // Reference version of getInstance()
+ // Preferred over getInstance() as it disallows checking for NULL
+ static DERIVED_TYPE& instance()
+ {
+ return *getInstance();
+ }
+
+ // Has this singleton already been deleted?
+ // Use this to avoid accessing singletons from a static object's destructor
+ static bool destroyed()
+ {
+ return getData().mInitState == DELETED;
+ }
+
+private:
+ virtual void initSingleton() {}
+};
+
+#endif
diff --git a/indra/llcommon/llstat.cpp b/indra/llcommon/llstat.cpp
index e411a1c798..eab1241b5c 100644
--- a/indra/llcommon/llstat.cpp
+++ b/indra/llcommon/llstat.cpp
@@ -46,6 +46,7 @@
BOOL LLPerfBlock::sStatsEnabled = FALSE; // Flag for detailed information
LLPerfBlock::stat_map_t LLPerfBlock::sStatMap; // Map full path string to LLStatTime objects, tracks all active objects
std::string LLPerfBlock::sCurrentStatPath = ""; // Something like "/total_time/physics/physics step"
+LLStat::stat_map_t LLStat::sStatList;
//------------------------------------------------------------------------
// Live config file to trigger stats logging
@@ -724,28 +725,48 @@ void LLPerfBlock::addStatsToLLSDandReset( LLSD & stats,
LLTimer LLStat::sTimer;
LLFrameTimer LLStat::sFrameTimer;
-LLStat::LLStat(const U32 num_bins, const BOOL use_frame_timer)
+void LLStat::init()
{
- llassert(num_bins > 0);
- U32 i;
- mUseFrameTimer = use_frame_timer;
+ llassert(mNumBins > 0);
mNumValues = 0;
mLastValue = 0.f;
mLastTime = 0.f;
- mNumBins = num_bins;
mCurBin = (mNumBins-1);
mNextBin = 0;
mBins = new F32[mNumBins];
mBeginTime = new F64[mNumBins];
mTime = new F64[mNumBins];
mDT = new F32[mNumBins];
- for (i = 0; i < mNumBins; i++)
+ for (U32 i = 0; i < mNumBins; i++)
{
mBins[i] = 0.f;
mBeginTime[i] = 0.0;
mTime[i] = 0.0;
mDT[i] = 0.f;
}
+
+ if (!mName.empty())
+ {
+ stat_map_t::iterator iter = sStatList.find(mName);
+ if (iter != sStatList.end())
+ llwarns << "LLStat with duplicate name: " << mName << llendl;
+ sStatList.insert(std::make_pair(mName, this));
+ }
+}
+
+LLStat::LLStat(const U32 num_bins, const BOOL use_frame_timer)
+ : mUseFrameTimer(use_frame_timer),
+ mNumBins(num_bins)
+{
+ init();
+}
+
+LLStat::LLStat(std::string name, U32 num_bins, BOOL use_frame_timer)
+ : mUseFrameTimer(use_frame_timer),
+ mNumBins(num_bins),
+ mName(name)
+{
+ init();
}
LLStat::~LLStat()
@@ -754,6 +775,15 @@ LLStat::~LLStat()
delete[] mBeginTime;
delete[] mTime;
delete[] mDT;
+
+ if (!mName.empty())
+ {
+ // handle multiple entries with the same name
+ stat_map_t::iterator iter = sStatList.find(mName);
+ while (iter != sStatList.end() && iter->second != this)
+ ++iter;
+ sStatList.erase(iter);
+ }
}
void LLStat::reset()
diff --git a/indra/llcommon/llstat.h b/indra/llcommon/llstat.h
index 61aaac45bf..bad18f46a0 100644
--- a/indra/llcommon/llstat.h
+++ b/indra/llcommon/llstat.h
@@ -258,8 +258,15 @@ private:
// ----------------------------------------------------------------------------
class LLStat
{
+private:
+ typedef std::multimap<std::string, LLStat*> stat_map_t;
+ static stat_map_t sStatList;
+
+ void init();
+
public:
- LLStat(const U32 num_bins = 32, BOOL use_frame_timer = FALSE);
+ LLStat(U32 num_bins = 32, BOOL use_frame_timer = FALSE);
+ LLStat(std::string name, U32 num_bins = 32, BOOL use_frame_timer = FALSE);
~LLStat();
void reset();
@@ -322,8 +329,22 @@ private:
F32 *mDT;
S32 mCurBin;
S32 mNextBin;
+
+ std::string mName;
+
static LLTimer sTimer;
static LLFrameTimer sFrameTimer;
+
+public:
+ static LLStat* getStat(const std::string& name)
+ {
+ // return the first stat that matches 'name'
+ stat_map_t::iterator iter = sStatList.find(name);
+ if (iter != sStatList.end())
+ return iter->second;
+ else
+ return NULL;
+ }
};
-
+
#endif // LL_STAT_
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 1f653c159c..ec1718a8cb 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -71,6 +71,24 @@ U8 hex_as_nybble(char hex)
return 0; // uh - oh, not hex any more...
}
+bool iswindividual(llwchar elem)
+{
+ U32 cur_char = (U32)elem;
+ bool result = false;
+ if (0x2E80<= cur_char && cur_char <= 0x9FFF)
+ {
+ result = true;
+ }
+ else if (0xAC00<= cur_char && cur_char <= 0xD7A0 )
+ {
+ result = true;
+ }
+ else if (0xF900<= cur_char && cur_char <= 0xFA60 )
+ {
+ result = true;
+ }
+ return result;
+}
bool _read_file_into_string(std::string& str, const std::string& filename)
{
@@ -650,6 +668,11 @@ std::string ll_convert_wide_to_string(const wchar_t* in)
}
#endif // LL_WINDOWS
+long LLStringOps::sltOffset;
+long LLStringOps::localTimeOffset;
+bool LLStringOps::daylightSavings;
+std::map<std::string, std::string> LLStringOps::datetimeToCodes;
+
S32 LLStringOps::collate(const llwchar* a, const llwchar* b)
{
#if LL_WINDOWS
@@ -661,6 +684,59 @@ S32 LLStringOps::collate(const llwchar* a, const llwchar* b)
#endif
}
+void LLStringOps::setupDatetimeInfo (bool daylight)
+{
+ time_t nowT, localT, gmtT;
+ struct tm * tmpT;
+
+ nowT = time (NULL);
+
+ tmpT = localtime (&nowT);
+ localT = mktime (tmpT);
+
+ tmpT = gmtime (&nowT);
+ gmtT = mktime (tmpT);
+
+ localTimeOffset = (long) (gmtT - localT);
+
+
+ daylightSavings = daylight;
+ sltOffset = (daylightSavings? 7 : 8 ) * 60 * 60;
+
+ datetimeToCodes["wkday"] = "%a"; // Thu
+ datetimeToCodes["weekday"] = "%A"; // Thursday
+ datetimeToCodes["year4"] = "%Y"; // 2009
+ datetimeToCodes["year"] = "%Y"; // 2009
+ datetimeToCodes["year2"] = "%y"; // 09
+ datetimeToCodes["mth"] = "%b"; // Aug
+ datetimeToCodes["month"] = "%B"; // August
+ datetimeToCodes["mthnum"] = "%m"; // 08
+ datetimeToCodes["day"] = "%d"; // 31
+ datetimeToCodes["hour24"] = "%H"; // 14
+ datetimeToCodes["hour"] = "%H"; // 14
+ datetimeToCodes["hour12"] = "%I"; // 02
+ datetimeToCodes["min"] = "%M"; // 59
+ datetimeToCodes["ampm"] = "%p"; // AM
+ datetimeToCodes["second"] = "%S"; // 59
+ datetimeToCodes["timezone"] = "%Z"; // PST
+}
+
+std::string LLStringOps::getDatetimeCode (std::string key)
+{
+ std::map<std::string, std::string>::iterator iter;
+
+ iter = datetimeToCodes.find (key);
+ if (iter != datetimeToCodes.end())
+ {
+ return iter->second;
+ }
+ else
+ {
+ return std::string("");
+ }
+}
+
+
namespace LLStringFn
{
// NOTE - this restricts output to ascii
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 99a9b9e269..1aba001353 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -34,6 +34,10 @@
#define LL_LLSTRING_H
#include <string>
+#include <locale>
+#include <iomanip>
+#include <boost/regex.hpp>
+#include "llsd.h"
#if LL_LINUX || LL_SOLARIS
#include <wctype.h>
@@ -145,6 +149,12 @@ struct char_traits<U16>
class LLStringOps
{
+private:
+ static long sltOffset;
+ static long localTimeOffset;
+ static bool daylightSavings;
+ static std::map<std::string, std::string> datetimeToCodes;
+
public:
static char toUpper(char elem) { return toupper((unsigned char)elem); }
static llwchar toUpper(llwchar elem) { return towupper(elem); }
@@ -172,6 +182,12 @@ public:
static S32 collate(const char* a, const char* b) { return strcoll(a, b); }
static S32 collate(const llwchar* a, const llwchar* b);
+
+ static void setupDatetimeInfo (bool daylight);
+ static long getSltOffset (void) {return sltOffset;}
+ static long getLocalTimeOffset (void) {return localTimeOffset;}
+ static bool getDaylightSavings (void) {return daylightSavings;}
+ static std::string getDatetimeCode (std::string key);
};
/**
@@ -201,6 +217,9 @@ private:
template <class T>
class LLStringUtilBase
{
+private:
+ static std::string sLocale;
+
public:
typedef typename std::basic_string<T>::size_type size_type;
@@ -211,7 +230,14 @@ public:
static std::basic_string<T> null;
typedef std::map<LLFormatMapString, LLFormatMapString> format_map_t;
+ static void getTokens (std::basic_string<T> input, std::vector<std::basic_string<T> >& tokens);
+ static void formatNumber(std::basic_string<T>& numStr, std::basic_string<T> decimals);
+ static bool formatDatetime(std::basic_string<T>& replacement, std::basic_string<T> token, std::basic_string<T> param, const LLSD& substitutions);
+ static S32 format(std::basic_string<T>& s, const LLSD& substitutions);
static S32 format(std::basic_string<T>& s, const format_map_t& fmt_map);
+ static bool simpleReplacement(std::basic_string<T>& replacement, std::basic_string<T> token, const LLSD& substitutions);
+ static void setLocale (std::string inLocale) {sLocale = inLocale;};
+ static std::string getLocale (void) {return sLocale;};
static bool isValidIndex(const std::basic_string<T>& string, size_type i)
{
@@ -299,6 +325,7 @@ public:
};
template<class T> std::basic_string<T> LLStringUtilBase<T>::null;
+template<class T> std::string LLStringUtilBase<T>::sLocale;
typedef LLStringUtilBase<char> LLStringUtil;
typedef LLStringUtilBase<llwchar> LLWStringUtil;
@@ -360,6 +387,7 @@ U8 hex_as_nybble(char hex);
* @return Returns true on success. If false, str is unmodified.
*/
bool _read_file_into_string(std::string& str, const std::string& filename);
+bool iswindividual(llwchar elem);
/**
* Unicode support
@@ -546,63 +574,214 @@ namespace LLStringFn
////////////////////////////////////////////////////////////
-// LLStringBase::format()
-//
-// This function takes a string 's' and a map 'fmt_map' of strings-to-strings.
-// All occurances of strings in 's' from the left-hand side of 'fmt_map' are
-// then replaced with the corresponding right-hand side of 'fmt_map', non-
-// recursively. The function returns the number of substitutions made.
+//static
+template<class T>
+void LLStringUtilBase<T>::getTokens (std::basic_string<T> input, std::vector<std::basic_string<T> >& tokens)
+{
+ const std::basic_string<T> delims (",");
+ std::basic_string<T> currToken;
+ size_type begIdx, endIdx;
+
+ begIdx = input.find_first_not_of (delims);
+ while (begIdx != std::basic_string<T>::npos)
+ {
+ endIdx = input.find_first_of (delims, begIdx);
+ if (endIdx == std::basic_string<T>::npos)
+ {
+ endIdx = input.length();
+ }
+
+ currToken = input.substr(begIdx, endIdx - begIdx);
+ trim (currToken);
+ tokens.push_back(currToken);
+ begIdx = input.find_first_not_of (delims, endIdx);
+ }
+}
// static
template<class T>
S32 LLStringUtilBase<T>::format(std::basic_string<T>& s, const format_map_t& fmt_map)
{
- typedef typename std::basic_string<T>::size_type string_size_type_t;
- string_size_type_t scanstart = 0;
+ LLSD llsdMap;
+
+ for (format_map_t::const_iterator iter = fmt_map.begin();
+ iter != fmt_map.end();
+ ++iter)
+ {
+ llsdMap[iter->first] = iter->second;
+ }
+
+ return format (s, llsdMap);
+}
+
+//static
+template<class T>
+S32 LLStringUtilBase<T>::format(std::basic_string<T>& s, const LLSD& substitutions)
+{
S32 res = 0;
- // Look for the first match of any keyword, replace that keyword,
- // repeat from the end of the replacement string. This avoids
- // accidentally performing substitution on a substituted string.
- while (1)
+ if (!substitutions.isMap())
+ {
+ return res;
+ }
+
+ std::basic_ostringstream<T> output;
+ // match strings like [NAME,number,3]
+ const boost::regex key("\\[((\\s)*([0-9_A-Za-z]+)((\\s)*,(\\s)*[0-9_A-Za-z\\s]*){0,2}(\\s)*)]");
+
+
+ typename std::basic_string<T>::const_iterator start = s.begin();
+ typename std::basic_string<T>::const_iterator end = s.end();
+ boost::smatch match;
+
+
+ while (boost::regex_search(start, end, match, key, boost::match_default))
{
- string_size_type_t first_match_pos = scanstart;
- string_size_type_t first_match_str_length = 0;
- std::basic_string<T> first_match_str_replacement;
+ bool found_replacement = false;
+ std::vector<std::basic_string<T> > tokens;
+ std::basic_string<T> replacement;
- for (format_map_t::const_iterator iter = fmt_map.begin();
- iter != fmt_map.end();
- ++iter)
+ getTokens (std::basic_string<T>(match[1].first, match[1].second), tokens);
+
+ if (tokens.size() == 1)
{
- string_size_type_t n = s.find(iter->first, scanstart);
- if (n != std::basic_string<T>::npos &&
- (n < first_match_pos ||
- 0 == first_match_str_length))
- {
- first_match_pos = n;
- first_match_str_length = iter->first.length();
- first_match_str_replacement = iter->second;
- }
+ found_replacement = simpleReplacement (replacement, tokens[0], substitutions);
}
+ else if (tokens[1] == "number")
+ {
+ std::basic_string<T> param = "0";
- if (0 == first_match_str_length)
+ if (tokens.size() > 2) param = tokens[2];
+ found_replacement = simpleReplacement (replacement, tokens[0], substitutions);
+ if (found_replacement) formatNumber (replacement, param);
+ }
+ else if (tokens[1] == "datetime")
{
- // no more keys found to substitute from this point
- // in the string forward.
- break;
+ std::basic_string<T> param;
+ if (tokens.size() > 2) param = tokens[2];
+
+ found_replacement = formatDatetime (replacement, tokens[0], param, substitutions);
+ }
+
+ if (found_replacement)
+ {
+ output << std::basic_string<T>(start, match[0].first) << replacement;
+ res++;
}
else
{
- s.erase(first_match_pos, first_match_str_length);
- s.insert(first_match_pos, first_match_str_replacement);
- scanstart = first_match_pos +
- first_match_str_replacement.length();
- ++res;
+ // we had no replacement, so leave the string we searched for so that it gets noticed by QA
+ // "hello [NAME_NOT_FOUND]" is output
+ output << std::basic_string<T>(start, match[0].second);
}
+
+ // update search position
+ start = match[0].second;
}
+ // send the remainder of the string (with no further matches for bracketed names)
+ output << std::basic_string<T>(start, end);
+ s = output.str();
return res;
}
+// static
+template<class T>
+bool LLStringUtilBase<T>::simpleReplacement(std::basic_string<T> &replacement, std::basic_string<T> token, const LLSD &substitutions)
+{
+ // see if we have a replacement for the bracketed string (without the brackets)
+ // test first using has() because if we just look up with operator[] we get back an
+ // empty string even if the value is missing. We want to distinguish between
+ // missing replacements and deliberately empty replacement strings.
+ if (substitutions.has(token))
+ {
+ replacement = substitutions[token].asString();
+ return true;
+ }
+ // if not, see if there's one WITH brackets
+ else if (substitutions.has(std::basic_string<T>("[" + token + "]")))
+ {
+ replacement = substitutions[std::basic_string<T>("[" + token + "]")].asString();
+ return true;
+ }
+
+ return false;
+}
+
+// static
+template<class T>
+void LLStringUtilBase<T>::formatNumber(std::basic_string<T>& numStr, std::basic_string<T> decimals)
+{
+ typedef typename std::basic_string<T>::size_type string_size_type_t;
+ std::basic_stringstream<T> strStream;
+ S32 intDecimals = 0;
+
+ convertToS32 (decimals, intDecimals);
+ if (!sLocale.empty())
+ {
+ strStream.imbue (std::locale(sLocale.c_str()));
+ }
+
+ if (!intDecimals)
+ {
+ S32 intStr;
+
+ if (convertToS32(numStr, intStr))
+ {
+ strStream << intStr;
+ numStr = strStream.str();
+ }
+ }
+ else
+ {
+ F32 floatStr;
+
+ if (convertToF32(numStr, floatStr))
+ {
+ strStream << std::fixed << std::showpoint << std::setprecision(intDecimals) << floatStr;
+ numStr = strStream.str();
+ }
+ }
+}
+
+// static
+template<class T>
+bool LLStringUtilBase<T>::formatDatetime(std::basic_string<T>& replacement, std::basic_string<T> token,
+ std::basic_string<T> param, const LLSD& substitutions)
+{
+ S32 secFromEpoch = (long) substitutions["datetime"].asInteger();
+
+ if (param == "local")
+ {
+ secFromEpoch -= LLStringOps::getLocalTimeOffset();
+ }
+ else if (param != "utc")
+ {
+ secFromEpoch -= LLStringOps::getSltOffset();
+ }
+
+ if (secFromEpoch < 0) secFromEpoch = 0;
+
+ LLDate * datetime = new LLDate((F64)secFromEpoch);
+ std::string code = LLStringOps::getDatetimeCode (token);
+
+ // special case to handle timezone
+ if (code == "%Z") {
+ if (param == "utc") replacement = "GMT";
+ else if (param != "local") replacement = LLStringOps::getDaylightSavings()? "PDT" : "PST";
+ return true;
+ }
+
+ replacement = datetime->toHTTPDateString(code);
+ if (code.empty())
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+}
+
// static
template<class T>
S32 LLStringUtilBase<T>::compareStrings(const T* lhs, const T* rhs)
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index c8c9fd4eec..f25339f48d 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -35,7 +35,6 @@
#include "llapr.h"
#include "llapp.h"
-#include "llmemory.h"
#include "apr_thread_cond.h"
diff --git a/indra/llcommon/lltimer.cpp b/indra/llcommon/lltimer.cpp
index fa6efaf38e..f8066d56ed 100644
--- a/indra/llcommon/lltimer.cpp
+++ b/indra/llcommon/lltimer.cpp
@@ -561,32 +561,27 @@ void secondsToTimecodeString(F32 current_time, std::string& tcstring)
//
//////////////////////////////////////////////////////////////////////////////
-std::list<LLEventTimer*> LLEventTimer::sActiveList;
-
LLEventTimer::LLEventTimer(F32 period)
: mEventTimer()
{
mPeriod = period;
- sActiveList.push_back(this);
}
LLEventTimer::LLEventTimer(const LLDate& time)
: mEventTimer()
{
mPeriod = (F32)(time.secondsSinceEpoch() - LLDate::now().secondsSinceEpoch());
- sActiveList.push_back(this);
}
-LLEventTimer::~LLEventTimer()
+LLEventTimer::~LLEventTimer()
{
- sActiveList.remove(this);
}
void LLEventTimer::updateClass()
{
std::list<LLEventTimer*> completed_timers;
- for (std::list<LLEventTimer*>::iterator iter = sActiveList.begin(); iter != sActiveList.end(); )
+ for (instance_iter iter = instancesBegin(); iter != instancesEnd(); )
{
LLEventTimer* timer = *iter++;
F32 et = timer->mEventTimer.getElapsedTimeF32();
diff --git a/indra/llcommon/lltimer.h b/indra/llcommon/lltimer.h
index e2cf1c7689..0319bec45b 100644
--- a/indra/llcommon/lltimer.h
+++ b/indra/llcommon/lltimer.h
@@ -40,6 +40,7 @@
#include "stdtypes.h"
#include "lldate.h"
+#include "llinstancetracker.h"
#include <string>
#include <list>
@@ -171,13 +172,13 @@ void microsecondsToTimecodeString(U64 current_time, std::string& tcstring);
void secondsToTimecodeString(F32 current_time, std::string& tcstring);
// class for scheduling a function to be called at a given frequency (approximate, inprecise)
-class LLEventTimer
+class LLEventTimer : protected LLInstanceTracker<LLEventTimer>
{
public:
LLEventTimer(F32 period); // period is the amount of time between each call to tick() in seconds
LLEventTimer(const LLDate& time);
virtual ~LLEventTimer();
-
+
//function to be called at the supplied frequency
// Normally return FALSE; TRUE will delete the timer after the function returns.
virtual BOOL tick() = 0;
@@ -187,10 +188,6 @@ public:
protected:
LLTimer mEventTimer;
F32 mPeriod;
-
-private:
- //list of active timers
- static std::list<LLEventTimer*> sActiveList; // TODO should this be a vector
};
#endif
diff --git a/indra/llcommon/lltreeiterators.h b/indra/llcommon/lltreeiterators.h
new file mode 100644
index 0000000000..7ab94b0e6d
--- /dev/null
+++ b/indra/llcommon/lltreeiterators.h
@@ -0,0 +1,691 @@
+/**
+ * @file lltreeiterators.h
+ * @author Nat Goodspeed
+ * @date 2008-08-19
+ * @brief This file defines iterators useful for traversing arbitrary node
+ * classes, potentially polymorphic, linked into strict tree
+ * structures.
+ *
+ * Dereferencing any one of these iterators actually yields a @em
+ * pointer to the node in question. For example, given an
+ * LLLinkedIter<MyNode> <tt>li</tt>, <tt>*li</tt> gets you a pointer
+ * to MyNode, and <tt>**li</tt> gets you the MyNode instance itself.
+ * More commonly, instead of writing <tt>li->member</tt>, you write
+ * <tt>(*li)->member</tt> -- as you would if you were traversing an
+ * STL container of MyNode pointers.
+ *
+ * It would certainly be possible to build these iterators so that
+ * <tt>*iterator</tt> would return a reference to the node itself
+ * rather than a pointer to the node, and for many purposes it would
+ * even be more convenient. However, that would be insufficiently
+ * flexible. If you want to use an iterator range to (e.g.) initialize
+ * a std::vector collecting results -- you rarely want to actually @em
+ * copy the nodes in question. You're much more likely to want to copy
+ * <i>pointers to</i> the traversed nodes. Hence these iterators
+ * produce pointers.
+ *
+ * Though you specify the actual NODE class as the template parameter,
+ * these iterators internally use LLPtrTo<> to discover whether to
+ * store and return an LLPointer<NODE> or a simple NODE*.
+ *
+ * By strict tree structures, we mean that each child must have
+ * exactly one parent. This forbids a child claiming any ancestor as a
+ * child of its own. Child nodes with multiple parents will be visited
+ * once for each parent. Cycles in the graph will result in either an
+ * infinite loop or an out-of-memory crash. You Have Been Warned.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#if ! defined(LL_LLTREEITERATORS_H)
+#define LL_LLTREEITERATORS_H
+
+#include "llptrto.h"
+#include <vector>
+#include <deque>
+#include <boost/iterator/iterator_facade.hpp>
+#include <boost/function.hpp>
+#include <boost/static_assert.hpp>
+
+namespace LLTreeIter
+{
+ /// Discriminator between LLTreeUpIter and LLTreeDownIter
+ enum RootIter { UP, DOWN };
+ /// Discriminator between LLTreeDFSIter, LLTreeDFSPostIter and LLTreeBFSIter
+ enum WalkIter { DFS_PRE, DFS_POST, BFS };
+}
+
+/**
+ * LLBaseIter defines some machinery common to all these iterators. We use
+ * boost::iterator_facade to define the iterator boilerplate: the conventional
+ * operators and methods necessary to implement a standards-conforming
+ * iterator. That allows us to specify the actual iterator semantics in terms
+ * of equal(), dereference() and increment() methods.
+ */
+template <class SELFTYPE, class NODE>
+class LLBaseIter: public boost::iterator_facade<SELFTYPE,
+ // use pointer type as the
+ // reference type
+ typename LLPtrTo<NODE>::type,
+ boost::forward_traversal_tag>
+{
+protected:
+ /// LLPtrTo<NODE>::type is either NODE* or LLPointer<NODE>, as appropriate
+ typedef typename LLPtrTo<NODE>::type ptr_type;
+ /// function that advances from this node to next accepts a node pointer
+ /// and returns another
+ typedef boost::function<ptr_type(const ptr_type&)> func_type;
+ typedef SELFTYPE self_type;
+};
+
+/// Functor returning NULL, suitable for an end-iterator's 'next' functor
+template <class NODE>
+typename LLPtrTo<NODE>::type LLNullNextFunctor(const typename LLPtrTo<NODE>::type&)
+{
+ return typename LLPtrTo<NODE>::type();
+}
+
+/**
+ * LLLinkedIter is an iterator over an intrusive singly-linked list. The
+ * beginning of the list is represented by LLLinkedIter(list head); the end is
+ * represented by LLLinkedIter().
+ *
+ * The begin LLLinkedIter must be instantiated with a functor to extract the
+ * 'next' pointer from the current node. Supposing that the link pointer is @c
+ * public, something like:
+ *
+ * @code
+ * NODE* mNext;
+ * @endcode
+ *
+ * you can use (e.g.) <tt>boost::bind(&NODE::mNext, _1)</tt> for the purpose.
+ * Alternatively, you can bind whatever accessor method is normally used to
+ * advance to the next node, e.g. for:
+ *
+ * @code
+ * NODE* next() const;
+ * @endcode
+ *
+ * you can use <tt>boost::bind(&NODE::next, _1)</tt>.
+ */
+template <class NODE>
+class LLLinkedIter: public LLBaseIter<LLLinkedIter<NODE>, NODE>
+{
+ typedef LLBaseIter<LLLinkedIter<NODE>, NODE> super;
+protected:
+ /// some methods need to return a reference to self
+ typedef typename super::self_type self_type;
+ typedef typename super::ptr_type ptr_type;
+ typedef typename super::func_type func_type;
+public:
+ /// Instantiate an LLLinkedIter to start a range, or to end a range before
+ /// a particular list entry. Pass a functor to extract the 'next' pointer
+ /// from the current node.
+ LLLinkedIter(const ptr_type& entry, const func_type& nextfunc):
+ mCurrent(entry),
+ mNextFunc(nextfunc)
+ {}
+ /// Instantiate an LLLinkedIter to end a range at the end of the list
+ LLLinkedIter():
+ mCurrent(),
+ mNextFunc(LLNullNextFunctor<NODE>)
+ {}
+
+private:
+ /// leverage boost::iterator_facade
+ friend class boost::iterator_core_access;
+
+ /// advance
+ void increment()
+ {
+ mCurrent = mNextFunc(mCurrent);
+ }
+ /// equality
+ bool equal(const self_type& that) const { return this->mCurrent == that.mCurrent; }
+ /// dereference
+ ptr_type& dereference() const { return const_cast<ptr_type&>(mCurrent); }
+
+ ptr_type mCurrent;
+ func_type mNextFunc;
+};
+
+/**
+ * LLTreeUpIter walks from the node in hand to the root of the tree. The term
+ * "up" is applied to a tree visualized with the root at the top.
+ *
+ * LLTreeUpIter is an alias for LLLinkedIter, since any linked tree that you
+ * can navigate that way at all contains parent pointers.
+ */
+template <class NODE>
+class LLTreeUpIter: public LLLinkedIter<NODE>
+{
+ typedef LLLinkedIter<NODE> super;
+public:
+ /// Instantiate an LLTreeUpIter to start from a particular tree node, or
+ /// to end a parent traversal before reaching a particular ancestor. Pass
+ /// a functor to extract the 'parent' pointer from the current node.
+ LLTreeUpIter(const typename super::ptr_type& node,
+ const typename super::func_type& parentfunc):
+ super(node, parentfunc)
+ {}
+ /// Instantiate an LLTreeUpIter to end a range at the root of the tree
+ LLTreeUpIter():
+ super()
+ {}
+};
+
+/**
+ * LLTreeDownIter walks from the root of the tree to the node in hand. The
+ * term "down" is applied to a tree visualized with the root at the top.
+ *
+ * Though you instantiate the begin() LLTreeDownIter with a pointer to some
+ * node at an arbitrary location in the tree, the root will be the first node
+ * you dereference and the passed node will be the last node you dereference.
+ *
+ * On construction, LLTreeDownIter walks from the current node to the root,
+ * capturing the path. Then in use, it replays that walk in reverse. As with
+ * all traversals of interesting data structures, it is actively dangerous to
+ * modify the tree during an LLTreeDownIter walk.
+ */
+template <class NODE>
+class LLTreeDownIter: public LLBaseIter<LLTreeDownIter<NODE>, NODE>
+{
+ typedef LLBaseIter<LLTreeDownIter<NODE>, NODE> super;
+ typedef typename super::self_type self_type;
+protected:
+ typedef typename super::ptr_type ptr_type;
+ typedef typename super::func_type func_type;
+private:
+ typedef std::vector<ptr_type> list_type;
+public:
+ /// Instantiate an LLTreeDownIter to end at a particular tree node. Pass a
+ /// functor to extract the 'parent' pointer from the current node.
+ LLTreeDownIter(const ptr_type& node,
+ const func_type& parentfunc)
+ {
+ for (ptr_type n = node; n; n = parentfunc(n))
+ mParents.push_back(n);
+ }
+ /// Instantiate an LLTreeDownIter representing "here", the end of the loop
+ LLTreeDownIter() {}
+
+private:
+ /// leverage boost::iterator_facade
+ friend class boost::iterator_core_access;
+
+ /// advance
+ void increment()
+ {
+ mParents.pop_back();
+ }
+ /// equality
+ bool equal(const self_type& that) const { return this->mParents == that.mParents; }
+ /// implement dereference/indirection operators
+ ptr_type& dereference() const { return const_cast<ptr_type&>(mParents.back()); }
+
+ list_type mParents;
+};
+
+/**
+ * When you want to select between LLTreeUpIter and LLTreeDownIter with a
+ * compile-time discriminator, use LLTreeRootIter with an LLTreeIter::RootIter
+ * template arg.
+ */
+template <LLTreeIter::RootIter DISCRIM, class NODE>
+class LLTreeRootIter
+{
+ enum { use_a_valid_LLTreeIter_RootIter_value = false };
+public:
+ /// Bogus constructors for default (unrecognized discriminator) case
+ template <typename TYPE1, typename TYPE2>
+ LLTreeRootIter(TYPE1, TYPE2)
+ {
+ BOOST_STATIC_ASSERT(use_a_valid_LLTreeIter_RootIter_value);
+ }
+ LLTreeRootIter()
+ {
+ BOOST_STATIC_ASSERT(use_a_valid_LLTreeIter_RootIter_value);
+ }
+};
+
+/// Specialize for LLTreeIter::UP
+template <class NODE>
+class LLTreeRootIter<LLTreeIter::UP, NODE>: public LLTreeUpIter<NODE>
+{
+ typedef LLTreeUpIter<NODE> super;
+public:
+ /// forward begin ctor
+ LLTreeRootIter(const typename super::ptr_type& node,
+ const typename super::func_type& parentfunc):
+ super(node, parentfunc)
+ {}
+ /// forward end ctor
+ LLTreeRootIter():
+ super()
+ {}
+};
+
+/// Specialize for LLTreeIter::DOWN
+template <class NODE>
+class LLTreeRootIter<LLTreeIter::DOWN, NODE>: public LLTreeDownIter<NODE>
+{
+ typedef LLTreeDownIter<NODE> super;
+public:
+ /// forward begin ctor
+ LLTreeRootIter(const typename super::ptr_type& node,
+ const typename super::func_type& parentfunc):
+ super(node, parentfunc)
+ {}
+ /// forward end ctor
+ LLTreeRootIter():
+ super()
+ {}
+};
+
+/**
+ * Instantiated with a tree node, typically the root, LLTreeDFSIter "flattens"
+ * a depth-first tree walk through that node and all its descendants.
+ *
+ * The begin() LLTreeDFSIter must be instantiated with functors to obtain from
+ * a given node begin() and end() iterators for that node's children. For this
+ * reason, you must specify the type of the node's child iterator as an
+ * additional template parameter.
+ *
+ * Specifically, the begin functor must return an iterator whose dereferenced
+ * value is a @em pointer to a child tree node. For instance, if each node
+ * tracks its children in an STL container of node* pointers, you can simply
+ * return that container's begin() iterator.
+ *
+ * Alternatively, if a node tracks its children with a classic linked list,
+ * write a functor returning LLLinkedIter<NODE>.
+ *
+ * The end() LLTreeDFSIter must, of course, match the begin() iterator's
+ * template parameters, but is constructed without runtime parameters.
+ */
+template <class NODE, typename CHILDITER>
+class LLTreeDFSIter: public LLBaseIter<LLTreeDFSIter<NODE, CHILDITER>, NODE>
+{
+ typedef LLBaseIter<LLTreeDFSIter<NODE, CHILDITER>, NODE> super;
+ typedef typename super::self_type self_type;
+protected:
+ typedef typename super::ptr_type ptr_type;
+ // The func_type is different for this: from a NODE pointer, we must
+ // obtain a CHILDITER.
+ typedef boost::function<CHILDITER(const ptr_type&)> func_type;
+private:
+ typedef std::vector<ptr_type> list_type;
+public:
+ /// Instantiate an LLTreeDFSIter to start a depth-first walk. Pass
+ /// functors to extract the 'child begin' and 'child end' iterators from
+ /// each node.
+ LLTreeDFSIter(const ptr_type& node, const func_type& beginfunc, const func_type& endfunc):
+ mBeginFunc(beginfunc),
+ mEndFunc(endfunc),
+ mSkipChildren(false)
+ {
+ // Only push back this node if it's non-NULL!
+ if (node)
+ mPending.push_back(node);
+ }
+ /// Instantiate an LLTreeDFSIter to mark the end of the walk
+ LLTreeDFSIter() {}
+
+ /// flags iterator logic to skip traversing children of current node on next increment
+ void skipChildren(bool skip = true) { mSkipChildren = skip; }
+
+private:
+ /// leverage boost::iterator_facade
+ friend class boost::iterator_core_access;
+
+ /// advance
+ /// This implementation is due to http://en.wikipedia.org/wiki/Depth-first_search
+ void increment()
+ {
+ // Capture the node we were just looking at
+ ptr_type current = mPending.back();
+ // Remove it from mPending so we don't process it again later
+ mPending.pop_back();
+ if (!mSkipChildren)
+ {
+ // Add all its children to mPending
+ addChildren(current);
+ }
+ // reset flag after each step
+ mSkipChildren = false;
+ }
+ /// equality
+ bool equal(const self_type& that) const { return this->mPending == that.mPending; }
+ /// implement dereference/indirection operators
+ ptr_type& dereference() const { return const_cast<ptr_type&>(mPending.back()); }
+
+ /// Add the direct children of the specified node to mPending
+ void addChildren(const ptr_type& node)
+ {
+ // If we just use push_back() for each child in turn, we'll end up
+ // processing children in reverse order. We don't want to assume
+ // CHILDITER is reversible: some of the linked trees we'll be
+ // processing manage their children using singly-linked lists. So
+ // figure out how many children there are, grow mPending by that size
+ // and reverse-copy the children into the new space.
+ CHILDITER chi = mBeginFunc(node), chend = mEndFunc(node);
+ // grow mPending by the number of children
+ mPending.resize(mPending.size() + std::distance(chi, chend));
+ // reverse-copy the children into the newly-expanded space
+ std::copy(chi, chend, mPending.rbegin());
+ }
+
+ /// list of the nodes yet to be processed
+ list_type mPending;
+ /// functor to extract begin() child iterator
+ func_type mBeginFunc;
+ /// functor to extract end() child iterator
+ func_type mEndFunc;
+ /// flag which controls traversal of children (skip children of current node if true)
+ bool mSkipChildren;
+};
+
+/**
+ * Instantiated with a tree node, typically the root, LLTreeDFSPostIter
+ * "flattens" a depth-first tree walk through that node and all its
+ * descendants. Whereas LLTreeDFSIter visits each node before visiting any of
+ * its children, LLTreeDFSPostIter visits all of a node's children before
+ * visiting the node itself.
+ *
+ * The begin() LLTreeDFSPostIter must be instantiated with functors to obtain
+ * from a given node begin() and end() iterators for that node's children. For
+ * this reason, you must specify the type of the node's child iterator as an
+ * additional template parameter.
+ *
+ * Specifically, the begin functor must return an iterator whose dereferenced
+ * value is a @em pointer to a child tree node. For instance, if each node
+ * tracks its children in an STL container of node* pointers, you can simply
+ * return that container's begin() iterator.
+ *
+ * Alternatively, if a node tracks its children with a classic linked list,
+ * write a functor returning LLLinkedIter<NODE>.
+ *
+ * The end() LLTreeDFSPostIter must, of course, match the begin() iterator's
+ * template parameters, but is constructed without runtime parameters.
+ */
+template <class NODE, typename CHILDITER>
+class LLTreeDFSPostIter: public LLBaseIter<LLTreeDFSPostIter<NODE, CHILDITER>, NODE>
+{
+ typedef LLBaseIter<LLTreeDFSPostIter<NODE, CHILDITER>, NODE> super;
+ typedef typename super::self_type self_type;
+protected:
+ typedef typename super::ptr_type ptr_type;
+ // The func_type is different for this: from a NODE pointer, we must
+ // obtain a CHILDITER.
+ typedef boost::function<CHILDITER(const ptr_type&)> func_type;
+private:
+ // Upon reaching a given node in our pending list, we need to know whether
+ // we've already pushed that node's children, so we must associate a bool
+ // with each node pointer.
+ typedef std::vector< std::pair<ptr_type, bool> > list_type;
+public:
+ /// Instantiate an LLTreeDFSPostIter to start a depth-first walk. Pass
+ /// functors to extract the 'child begin' and 'child end' iterators from
+ /// each node.
+ LLTreeDFSPostIter(const ptr_type& node, const func_type& beginfunc, const func_type& endfunc):
+ mBeginFunc(beginfunc),
+ mEndFunc(endfunc)
+ {
+ if (! node)
+ return;
+ mPending.push_back(typename list_type::value_type(node, false));
+ makeCurrent();
+ }
+ /// Instantiate an LLTreeDFSPostIter to mark the end of the walk
+ LLTreeDFSPostIter() {}
+
+private:
+ /// leverage boost::iterator_facade
+ friend class boost::iterator_core_access;
+
+ /// advance
+ /// This implementation is due to http://en.wikipedia.org/wiki/Depth-first_search
+ void increment()
+ {
+ // Pop the previous current node
+ mPending.pop_back();
+ makeCurrent();
+ }
+ /// equality
+ bool equal(const self_type& that) const { return this->mPending == that.mPending; }
+ /// implement dereference/indirection operators
+ ptr_type& dereference() const { return const_cast<ptr_type&>(mPending.back().first); }
+
+ /// Call this each time we change mPending.back() -- that is, every time
+ /// we're about to change the value returned by dereference(). If we
+ /// haven't yet pushed the new node's children, do so now.
+ void makeCurrent()
+ {
+ // Once we've popped the last node, this becomes a no-op.
+ if (mPending.empty())
+ return;
+ // Here mPending.back() holds the node pointer we're proposing to
+ // dereference next. Have we pushed that node's children yet?
+ if (mPending.back().second)
+ return; // if so, it's okay to visit this node now
+ // We haven't yet pushed this node's children. Do so now. Remember
+ // that we did -- while the node in question is still back().
+ mPending.back().second = true;
+ addChildren(mPending.back().first);
+ // Now, because we've just changed mPending.back(), make that new node
+ // current.
+ makeCurrent();
+ }
+
+ /// Add the direct children of the specified node to mPending
+ void addChildren(const ptr_type& node)
+ {
+ // If we just use push_back() for each child in turn, we'll end up
+ // processing children in reverse order. We don't want to assume
+ // CHILDITER is reversible: some of the linked trees we'll be
+ // processing manage their children using singly-linked lists. So
+ // figure out how many children there are, grow mPending by that size
+ // and reverse-copy the children into the new space.
+ CHILDITER chi = mBeginFunc(node), chend = mEndFunc(node);
+ // grow mPending by the number of children
+ mPending.resize(mPending.size() + std::distance(chi, chend));
+ // Reverse-copy the children into the newly-expanded space. We can't
+ // just use std::copy() because the source is a ptr_type, whereas the
+ // dest is a pair of (ptr_type, bool).
+ for (typename list_type::reverse_iterator pi = mPending.rbegin(); chi != chend; ++chi, ++pi)
+ {
+ pi->first = *chi; // copy the child pointer
+ pi->second = false; // we haven't yet pushed this child's chldren
+ }
+ }
+
+ /// list of the nodes yet to be processed
+ list_type mPending;
+ /// functor to extract begin() child iterator
+ func_type mBeginFunc;
+ /// functor to extract end() child iterator
+ func_type mEndFunc;
+};
+
+/**
+ * Instantiated with a tree node, typically the root, LLTreeBFSIter "flattens"
+ * a breadth-first tree walk through that node and all its descendants.
+ *
+ * The begin() LLTreeBFSIter must be instantiated with functors to obtain from
+ * a given node the begin() and end() iterators of that node's children. For
+ * this reason, you must specify the type of the node's child iterator as an
+ * additional template parameter.
+ *
+ * Specifically, the begin functor must return an iterator whose dereferenced
+ * value is a @em pointer to a child tree node. For instance, if each node
+ * tracks its children in an STL container of node* pointers, you can simply
+ * return that container's begin() iterator.
+ *
+ * Alternatively, if a node tracks its children with a classic linked list,
+ * write a functor returning LLLinkedIter<NODE>.
+ *
+ * The end() LLTreeBFSIter must, of course, match the begin() iterator's
+ * template parameters, but is constructed without runtime parameters.
+ */
+template <class NODE, typename CHILDITER>
+class LLTreeBFSIter: public LLBaseIter<LLTreeBFSIter<NODE, CHILDITER>, NODE>
+{
+ typedef LLBaseIter<LLTreeBFSIter<NODE, CHILDITER>, NODE> super;
+ typedef typename super::self_type self_type;
+protected:
+ typedef typename super::ptr_type ptr_type;
+ // The func_type is different for this: from a NODE pointer, we must
+ // obtain a CHILDITER.
+ typedef boost::function<CHILDITER(const ptr_type&)> func_type;
+private:
+ // We need a FIFO queue rather than a LIFO stack. Use a deque rather than
+ // a vector, since vector can't implement pop_front() efficiently.
+ typedef std::deque<ptr_type> list_type;
+public:
+ /// Instantiate an LLTreeBFSIter to start a depth-first walk. Pass
+ /// functors to extract the 'child begin' and 'child end' iterators from
+ /// each node.
+ LLTreeBFSIter(const ptr_type& node, const func_type& beginfunc, const func_type& endfunc):
+ mBeginFunc(beginfunc),
+ mEndFunc(endfunc)
+ {
+ if (node)
+ mPending.push_back(node);
+ }
+ /// Instantiate an LLTreeBFSIter to mark the end of the walk
+ LLTreeBFSIter() {}
+
+private:
+ /// leverage boost::iterator_facade
+ friend class boost::iterator_core_access;
+
+ /// advance
+ /// This implementation is due to http://en.wikipedia.org/wiki/Breadth-first_search
+ void increment()
+ {
+ // Capture the node we were just looking at
+ ptr_type current = mPending.front();
+ // Remove it from mPending so we don't process it again later
+ mPending.pop_front();
+ // Add all its children to mPending
+ CHILDITER chend = mEndFunc(current);
+ for (CHILDITER chi = mBeginFunc(current); chi != chend; ++chi)
+ mPending.push_back(*chi);
+ }
+ /// equality
+ bool equal(const self_type& that) const { return this->mPending == that.mPending; }
+ /// implement dereference/indirection operators
+ ptr_type& dereference() const { return const_cast<ptr_type&>(mPending.front()); }
+
+ /// list of the nodes yet to be processed
+ list_type mPending;
+ /// functor to extract begin() child iterator
+ func_type mBeginFunc;
+ /// functor to extract end() child iterator
+ func_type mEndFunc;
+};
+
+/**
+ * When you want to select between LLTreeDFSIter, LLTreeDFSPostIter and
+ * LLTreeBFSIter with a compile-time discriminator, use LLTreeWalkIter with an
+ * LLTreeIter::WalkIter template arg.
+ */
+template <LLTreeIter::WalkIter DISCRIM, class NODE, typename CHILDITER>
+class LLTreeWalkIter
+{
+ enum { use_a_valid_LLTreeIter_WalkIter_value = false };
+public:
+ /// Bogus constructors for default (unrecognized discriminator) case
+ template <typename TYPE1, typename TYPE2>
+ LLTreeWalkIter(TYPE1, TYPE2)
+ {
+ BOOST_STATIC_ASSERT(use_a_valid_LLTreeIter_WalkIter_value);
+ }
+ LLTreeWalkIter()
+ {
+ BOOST_STATIC_ASSERT(use_a_valid_LLTreeIter_WalkIter_value);
+ }
+};
+
+/// Specialize for LLTreeIter::DFS_PRE
+template <class NODE, typename CHILDITER>
+class LLTreeWalkIter<LLTreeIter::DFS_PRE, NODE, CHILDITER>:
+ public LLTreeDFSIter<NODE, CHILDITER>
+{
+ typedef LLTreeDFSIter<NODE, CHILDITER> super;
+public:
+ /// forward begin ctor
+ LLTreeWalkIter(const typename super::ptr_type& node,
+ const typename super::func_type& beginfunc,
+ const typename super::func_type& endfunc):
+ super(node, beginfunc, endfunc)
+ {}
+ /// forward end ctor
+ LLTreeWalkIter():
+ super()
+ {}
+};
+
+/// Specialize for LLTreeIter::DFS_POST
+template <class NODE, typename CHILDITER>
+class LLTreeWalkIter<LLTreeIter::DFS_POST, NODE, CHILDITER>:
+ public LLTreeDFSPostIter<NODE, CHILDITER>
+{
+ typedef LLTreeDFSPostIter<NODE, CHILDITER> super;
+public:
+ /// forward begin ctor
+ LLTreeWalkIter(const typename super::ptr_type& node,
+ const typename super::func_type& beginfunc,
+ const typename super::func_type& endfunc):
+ super(node, beginfunc, endfunc)
+ {}
+ /// forward end ctor
+ LLTreeWalkIter():
+ super()
+ {}
+};
+
+/// Specialize for LLTreeIter::BFS
+template <class NODE, typename CHILDITER>
+class LLTreeWalkIter<LLTreeIter::BFS, NODE, CHILDITER>:
+ public LLTreeBFSIter<NODE, CHILDITER>
+{
+ typedef LLTreeBFSIter<NODE, CHILDITER> super;
+public:
+ /// forward begin ctor
+ LLTreeWalkIter(const typename super::ptr_type& node,
+ const typename super::func_type& beginfunc,
+ const typename super::func_type& endfunc):
+ super(node, beginfunc, endfunc)
+ {}
+ /// forward end ctor
+ LLTreeWalkIter():
+ super()
+ {}
+};
+
+#endif /* ! defined(LL_LLTREEITERATORS_H) */
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 78c4f8e742..822fb390f3 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -86,6 +86,7 @@ void LLCrashLoggerText::updateApplication(const std::string& message)
LLCrashLogger::LLCrashLogger() :
mCrashBehavior(CRASH_BEHAVIOR_ASK),
mCrashInPreviousExec(false),
+ mCrashSettings("CrashSettings"),
mSentCrashLogs(false),
mCrashHost("")
{
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
index bd609b638c..c0c81e9771 100644
--- a/indra/llimage/llimage.h
+++ b/indra/llimage/llimage.h
@@ -35,7 +35,7 @@
#include "lluuid.h"
#include "llstring.h"
-#include "llmemory.h"
+//#include "llmemory.h"
#include "llthread.h"
const S32 MIN_IMAGE_MIP = 2; // 4x4, only used for expand/contract power of 2
diff --git a/indra/llimage/llimagedxt.h b/indra/llimage/llimagedxt.h
index bc2d6522d2..1a297536b4 100644
--- a/indra/llimage/llimagedxt.h
+++ b/indra/llimage/llimagedxt.h
@@ -33,6 +33,7 @@
#define LL_LLIMAGEDXT_H
#include "llimage.h"
+#include "llpointer.h"
// This class decodes and encodes LL DXT files (which may unclude uncompressed RGB or RGBA mipped data)
diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp
index a6721bfa0f..d8f8003593 100644
--- a/indra/llimage/llimagetga.cpp
+++ b/indra/llimage/llimagetga.cpp
@@ -31,10 +31,12 @@
#include "linden_common.h"
-#include "lldir.h"
#include "llimagetga.h"
+
+#include "lldir.h"
#include "llerror.h"
#include "llmath.h"
+#include "llpointer.h"
// For expanding 5-bit pixel values to 8-bit with best rounding
// static
diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h
index 879fcf5565..0d66695d6e 100644
--- a/indra/llimage/llimageworker.h
+++ b/indra/llimage/llimageworker.h
@@ -34,6 +34,7 @@
#define LL_LLIMAGEWORKER_H
#include "llimage.h"
+#include "llpointer.h"
#include "llworkerthread.h"
class LLImageWorker : public LLWorkerClass
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index be6b6c817b..ec6264dcf5 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -37,7 +37,7 @@
#include "openjpeg.h"
#include "lltimer.h"
-#include "llmemory.h"
+//#include "llmemory.h"
const char* fallbackEngineInfoLLImageJ2CImpl()
{
diff --git a/indra/llinventory/lleconomy.h b/indra/llinventory/lleconomy.h
index 2e2adc4d45..e480085453 100644
--- a/indra/llinventory/lleconomy.h
+++ b/indra/llinventory/lleconomy.h
@@ -32,7 +32,7 @@
#ifndef LL_LLECONOMY_H
#define LL_LLECONOMY_H
-#include "llmemory.h"
+#include "llsingleton.h"
class LLMessageSystem;
class LLVector3;
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 2823cf7be9..ce2e4e9cfa 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1097,109 +1097,8 @@ fail:
}
-LLXMLNode *LLInventoryItem::exportFileXML(BOOL include_asset_key) const
-{
- LLMemType m1(LLMemType::MTYPE_INVENTORY);
- LLXMLNode *ret = new LLXMLNode("item", FALSE);
-
- ret->createChild("uuid", TRUE)->setUUIDValue(1, &mUUID);
- ret->createChild("parent_uuid", TRUE)->setUUIDValue(1, &mParentUUID);
-
- mPermissions.exportFileXML()->setParent(ret);
-
- // Check for permissions to see the asset id, and if so write it
- // out as an asset id. Otherwise, apply our cheesy encryption.
- if(include_asset_key)
- {
- U32 mask = mPermissions.getMaskBase();
- if(((mask & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
- || (mAssetUUID.isNull()))
- {
- ret->createChild("asset_id", FALSE)->setUUIDValue(1, &mAssetUUID);
- }
- else
- {
- LLUUID shadow_id(mAssetUUID);
- LLXORCipher cipher(MAGIC_ID.mData, UUID_BYTES);
- cipher.encrypt(shadow_id.mData, UUID_BYTES);
-
- ret->createChild("shadow_id", FALSE)->setUUIDValue(1, &shadow_id);
- }
- }
-
- std::string type_str = LLAssetType::lookup(mType);
- std::string inv_type_str = LLInventoryType::lookup(mInventoryType);
-
- ret->createChild("asset_type", FALSE)->setStringValue(type_str);
- ret->createChild("inventory_type", FALSE)->setStringValue(inv_type_str);
- S32 tmp_flags = (S32) mFlags;
- ret->createChild("flags", FALSE)->setByteValue(4, (U8*)(&tmp_flags), LLXMLNode::ENCODING_HEX);
-
- mSaleInfo.exportFileXML()->setParent(ret);
-
- std::string temp;
- temp.assign(mName);
- ret->createChild("name", FALSE)->setStringValue(temp);
- temp.assign(mDescription);
- ret->createChild("description", FALSE)->setStringValue(temp);
- S32 date = mCreationDate;
- ret->createChild("creation_date", FALSE)->setIntValue(1, &date);
-
- return ret;
-}
-
-BOOL LLInventoryItem::importXML(LLXMLNode* node)
-{
- BOOL success = FALSE;
- if (node)
- {
- success = TRUE;
- LLXMLNodePtr sub_node;
- if (node->getChild("uuid", sub_node))
- success = (1 == sub_node->getUUIDValue(1, &mUUID));
- if (node->getChild("parent_uuid", sub_node))
- success = success && (1 == sub_node->getUUIDValue(1, &mParentUUID));
- if (node->getChild("permissions", sub_node))
- success = success && mPermissions.importXML(sub_node);
- if (node->getChild("asset_id", sub_node))
- success = success && (1 == sub_node->getUUIDValue(1, &mAssetUUID));
- if (node->getChild("shadow_id", sub_node))
- {
- success = success && (1 == sub_node->getUUIDValue(1, &mAssetUUID));
- LLXORCipher cipher(MAGIC_ID.mData, UUID_BYTES);
- cipher.decrypt(mAssetUUID.mData, UUID_BYTES);
- }
- if (node->getChild("asset_type", sub_node))
- mType = LLAssetType::lookup(sub_node->getValue());
- if (node->getChild("inventory_type", sub_node))
- mInventoryType = LLInventoryType::lookup(sub_node->getValue());
- if (node->getChild("flags", sub_node))
- {
- S32 tmp_flags = 0;
- success = success && (1 == sub_node->getIntValue(1, &tmp_flags));
- mFlags = (U32) tmp_flags;
- }
- if (node->getChild("sale_info", sub_node))
- success = success && mSaleInfo.importXML(sub_node);
- if (node->getChild("name", sub_node))
- mName = sub_node->getValue();
- if (node->getChild("description", sub_node))
- mDescription = sub_node->getValue();
- if (node->getChild("creation_date", sub_node))
- {
- S32 date = 0;
- success = success && (1 == sub_node->getIntValue(1, &date));
- mCreationDate = date;
- }
-
- if (!success)
- {
- lldebugs << "LLInventory::importXML() failed for node named '"
- << node->getName() << "'" << llendl;
- }
- }
- return success;
-}
+// Deleted LLInventoryItem::exportFileXML() and LLInventoryItem::importXML()
+// because I can't find any non-test code references to it. 2009-05-04 JC
S32 LLInventoryItem::packBinaryBucket(U8* bin_bucket, LLPermissions* perm_override) const
{
diff --git a/indra/llinventory/llinventory.h b/indra/llinventory/llinventory.h
index d34046c310..bdf444d34f 100644
--- a/indra/llinventory/llinventory.h
+++ b/indra/llinventory/llinventory.h
@@ -40,6 +40,7 @@
#include "llinventorytype.h"
#include "llmemtype.h"
#include "llpermissions.h"
+#include "llrefcount.h"
#include "llsaleinfo.h"
#include "llsd.h"
#include "lluuid.h"
@@ -273,9 +274,6 @@ public:
virtual BOOL importLegacyStream(std::istream& input_stream);
virtual BOOL exportLegacyStream(std::ostream& output_stream, BOOL include_asset_key = TRUE) const;
- virtual LLXMLNode *exportFileXML(BOOL include_asset_key = TRUE) const;
- BOOL importXML(LLXMLNode* node);
-
// helper functions
// pack all information needed to reconstruct this item into the given binary bucket.
diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp
index a161a0ee00..d905fe3ea7 100644
--- a/indra/llinventory/llinventorytype.cpp
+++ b/indra/llinventory/llinventorytype.cpp
@@ -63,6 +63,7 @@ static const char* INVENTORY_TYPE_NAMES[LLInventoryType::IT_COUNT] =
"wearable",
"animation",
"gesture", // 20
+ "favorite" //21
};
// This table is meant for decoding to human readable form. Put any
@@ -91,6 +92,7 @@ static const char* INVENTORY_TYPE_HUMAN_NAMES[LLInventoryType::IT_COUNT] =
"wearable",
"animation",
"gesture", // 20
+ "favorite" // 21
};
// Maps asset types to the default inventory type for that kind of asset.
@@ -120,6 +122,7 @@ DEFAULT_ASSET_FOR_INV_TYPE[LLAssetType::AT_COUNT] =
LLInventoryType::IT_NONE, // AT_IMAGE_JPEG
LLInventoryType::IT_ANIMATION, // AT_ANIMATION
LLInventoryType::IT_GESTURE, // AT_GESTURE
+ LLInventoryType::IT_FAVORITE, // AT_FAVORITE
};
static const int MAX_POSSIBLE_ASSET_TYPES = 2;
@@ -147,6 +150,7 @@ INVENTORY_TO_ASSET_TYPE[LLInventoryType::IT_COUNT][MAX_POSSIBLE_ASSET_TYPES] =
{ LLAssetType::AT_CLOTHING, LLAssetType::AT_BODYPART }, // IT_WEARABLE
{ LLAssetType::AT_ANIMATION, LLAssetType::AT_NONE }, // IT_ANIMATION
{ LLAssetType::AT_GESTURE, LLAssetType::AT_NONE }, // IT_GESTURE
+ { LLAssetType::AT_FAVORITE, LLAssetType::AT_NONE }, // IT_FAVORITE
};
// static
diff --git a/indra/llinventory/llinventorytype.h b/indra/llinventory/llinventorytype.h
index d3effc0e6d..c9ba97d7b6 100644
--- a/indra/llinventory/llinventorytype.h
+++ b/indra/llinventory/llinventorytype.h
@@ -67,7 +67,8 @@ public:
IT_WEARABLE = 18,
IT_ANIMATION = 19,
IT_GESTURE = 20,
- IT_COUNT = 21,
+ IT_FAVORITE = 21,
+ IT_COUNT = 22,
IT_NONE = -1
};
diff --git a/indra/llinventory/llnotecard.h b/indra/llinventory/llnotecard.h
index b903f1fdb0..092ab2ce35 100644
--- a/indra/llinventory/llnotecard.h
+++ b/indra/llinventory/llnotecard.h
@@ -33,7 +33,7 @@
#ifndef LL_NOTECARD_H
#define LL_NOTECARD_H
-#include "llmemory.h"
+#include "llpointer.h"
#include "llinventory.h"
class LLNotecard
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp
index 9c27476b0a..60ebc44a3e 100644
--- a/indra/llinventory/llparcel.cpp
+++ b/indra/llinventory/llparcel.cpp
@@ -85,13 +85,13 @@ static const std::string PARCEL_CATEGORY_UI_STRING[LLParcel::C_COUNT + 1] =
"None",
"Linden Location",
"Adult",
- "Arts & Culture",
+ "Arts and Culture",
"Business",
"Educational",
"Gaming",
"Hangout",
"Newcomer Friendly",
- "Parks & Nature",
+ "Parks and Nature",
"Residential",
"Shopping",
"Stage",
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 6f5ae87ebd..021ad89e52 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -38,6 +38,7 @@
#include "lluuid.h"
#include "llparcelflags.h"
#include "llpermissions.h"
+#include "lltimer.h"
#include "v3math.h"
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index 328ed4588b..559a5631dc 100644
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -831,67 +831,8 @@ BOOL LLPermissions::exportLegacyStream(std::ostream& output_stream) const
return TRUE;
}
-
-LLXMLNode *LLPermissions::exportFileXML() const
-{
- LLXMLNode *ret = new LLXMLNode("permissions", FALSE);
-
- ret->createChild("group_owned", TRUE)->setBoolValue(mIsGroupOwned);
-
- ret->createChild("base_mask", FALSE)->setByteValue(4, (U8*)&mMaskBase, LLXMLNode::ENCODING_HEX);
- ret->createChild("owner_mask", FALSE)->setByteValue(4, (U8*)&mMaskOwner, LLXMLNode::ENCODING_HEX);
- ret->createChild("group_mask", FALSE)->setByteValue(4, (U8*)&mMaskGroup, LLXMLNode::ENCODING_HEX);
- ret->createChild("everyone_mask", FALSE)->setByteValue(4, (U8*)&mMaskEveryone, LLXMLNode::ENCODING_HEX);
- ret->createChild("next_owner_mask", FALSE)->setByteValue(4, (U8*)&mMaskNextOwner, LLXMLNode::ENCODING_HEX);
-
- ret->createChild("creator_id", FALSE)->setUUIDValue(1, &mCreator);
- ret->createChild("owner_id", FALSE)->setUUIDValue(1, &mOwner);
- ret->createChild("last_owner_id", FALSE)->setUUIDValue(1, &mLastOwner);
- ret->createChild("group_id", FALSE)->setUUIDValue(1, &mGroup);
-
- return ret;
-}
-
-bool LLPermissions::importXML(LLXMLNode* node)
-{
- bool success = false;
- if (node)
- {
- success = true;
- LLXMLNodePtr sub_node;
- if (node->getChild("base_mask", sub_node))
- success = success && (4 == sub_node->getByteValue(4, (U8*)&mMaskBase));
- if (node->getChild("owner_mask", sub_node))
- success = success && (4 == sub_node->getByteValue(4, (U8*)&mMaskOwner));
- if (node->getChild("group_mask", sub_node))
- success = success && (4 == sub_node->getByteValue(4, (U8*)&mMaskGroup));
- if (node->getChild("everyone_mask", sub_node))
- success = success && (4 == sub_node->getByteValue(4, (U8*)&mMaskEveryone));
- if (node->getChild("next_owner_mask", sub_node))
- success = success && (4 == sub_node->getByteValue(4, (U8*)&mMaskNextOwner));
-
- if (node->getChild("creator_id", sub_node))
- success = success && (1 == sub_node->getUUIDValue(1, &mCreator));
- if (node->getChild("owner_id", sub_node))
- success = success && (1 == sub_node->getUUIDValue(1, &mOwner));
- if (node->getChild("last_owner_id", sub_node))
- success = success && (1 == sub_node->getUUIDValue(1, &mLastOwner));
- if (node->getChild("group_id", sub_node))
- success = success && (1 == sub_node->getUUIDValue(1, &mGroup));
- if (node->getChild("group_owned", sub_node))
- {
- BOOL tmpbool = FALSE;
- success = success && (1 == sub_node->getBoolValue(1, &tmpbool));
- mIsGroupOwned = (bool)tmpbool;
- }
- if (!success)
- {
- lldebugs << "LLPermissions::importXML() failed for node named '"
- << node->getName() << "'" << llendl;
- }
- }
- return success;
-}
+// Deleted LLPermissions::exportFileXML() and LLPermissions::importXML()
+// because I can't find any non-test code references to it. 2009-05-04 JC
bool LLPermissions::operator==(const LLPermissions &rhs) const
{
diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h
index 5587f8c3c8..2035b57f5c 100644
--- a/indra/llinventory/llpermissions.h
+++ b/indra/llinventory/llpermissions.h
@@ -314,9 +314,6 @@ public:
BOOL importLegacyStream(std::istream& input_stream);
BOOL exportLegacyStream(std::ostream& output_stream) const;
- LLXMLNode *exportFileXML() const;
- bool importXML(LLXMLNode* node);
-
bool operator==(const LLPermissions &rhs) const;
bool operator!=(const LLPermissions &rhs) const;
diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp
index b7afb28adf..930901f309 100644
--- a/indra/llinventory/llsaleinfo.cpp
+++ b/indra/llinventory/llsaleinfo.cpp
@@ -135,38 +135,8 @@ bool LLSaleInfo::fromLLSD(const LLSD& sd, BOOL& has_perm_mask, U32& perm_mask)
return true;
}
-LLXMLNode *LLSaleInfo::exportFileXML() const
-{
- LLXMLNode *ret = new LLXMLNode("sale_info", FALSE);
- std::string type_str = ll_safe_string( lookup(mSaleType));
- ret->createChild("type", TRUE)->setStringValue(1, &type_str);
- ret->createChild("price", TRUE)->setIntValue(1, &mSalePrice);
- return ret;
-}
-
-BOOL LLSaleInfo::importXML(LLXMLNode* node)
-{
- BOOL success = FALSE;
- if (node)
- {
- success = TRUE;
- LLXMLNodePtr sub_node;
- if (node->getChild("type", sub_node))
- {
- mSaleType = lookup(sub_node->getValue().c_str());
- }
- if (node->getChild("price", sub_node))
- {
- success &= (1 == sub_node->getIntValue(1, &mSalePrice));
- }
- if (!success)
- {
- lldebugs << "LLSaleInfo::importXML() failed for node named '"
- << node->getName() << "'" << llendl;
- }
- }
- return success;
-}
+// Deleted LLSaleInfo::exportFileXML() and LLSaleInfo::importXML()
+// because I can't find any non-test code references to it. 2009-05-04 JC
BOOL LLSaleInfo::importFile(LLFILE* fp, BOOL& has_perm_mask, U32& perm_mask)
{
diff --git a/indra/llinventory/llsaleinfo.h b/indra/llinventory/llsaleinfo.h
index d546c49fd7..3461a128be 100644
--- a/indra/llinventory/llsaleinfo.h
+++ b/indra/llinventory/llsaleinfo.h
@@ -101,9 +101,6 @@ public:
bool fromLLSD(const LLSD& sd, BOOL& has_perm_mask, U32& perm_mask);
BOOL importLegacyStream(std::istream& input_stream, BOOL& has_perm_mask, U32& perm_mask);
- LLXMLNode *exportFileXML() const;
- BOOL importXML(LLXMLNode* node);
-
LLSD packMessage() const;
void unpackMessage(LLSD sales);
diff --git a/indra/llmath/llmath.h b/indra/llmath/llmath.h
index 66451b1a27..f85c4f39f4 100644
--- a/indra/llmath/llmath.h
+++ b/indra/llmath/llmath.h
@@ -36,8 +36,8 @@
#include <cmath>
#include <cstdlib>
#include "lldefs.h"
-#include "llstl.h" // *TODO: Remove when LLString is gone
-#include "llstring.h" // *TODO: Remove when LLString is gone
+//#include "llstl.h" // *TODO: Remove when LLString is gone
+//#include "llstring.h" // *TODO: Remove when LLString is gone
// lltut.h uses is_approx_equal_fraction(). This was moved to its own header
// file in llcommon so we can use lltut.h for llcommon tests without making
// llcommon depend on llmath.
diff --git a/indra/llmath/llrect.h b/indra/llmath/llrect.h
index 9eb58dbbe9..98aceb0597 100644
--- a/indra/llmath/llrect.h
+++ b/indra/llmath/llrect.h
@@ -271,8 +271,8 @@ public:
<< " W " << rect.getWidth() << " H " << rect.getHeight() << " }";
return s;
}
-
- bool operator==(const LLRectBase &b)
+
+ bool operator==(const LLRectBase &b) const
{
return ((mLeft == b.mLeft) &&
(mTop == b.mTop) &&
@@ -280,7 +280,7 @@ public:
(mBottom == b.mBottom));
}
- bool operator!=(const LLRectBase &b)
+ bool operator!=(const LLRectBase &b) const
{
return ((mLeft != b.mLeft) ||
(mTop != b.mTop) ||
diff --git a/indra/llmath/llsdutil_math.cpp b/indra/llmath/llsdutil_math.cpp
index 073cb2e3bd..c5176681ce 100644
--- a/indra/llmath/llsdutil_math.cpp
+++ b/indra/llmath/llsdutil_math.cpp
@@ -165,9 +165,6 @@ LLSD ll_sd_from_color4(const LLColor4& c)
LLColor4 ll_color4_from_sd(const LLSD& sd)
{
LLColor4 c;
- c.mV[0] = (F32)sd[0].asReal();
- c.mV[1] = (F32)sd[1].asReal();
- c.mV[2] = (F32)sd[2].asReal();
- c.mV[3] = (F32)sd[3].asReal();
+ c.setValue(sd);
return c;
}
diff --git a/indra/llmath/llvolume.h b/indra/llmath/llvolume.h
index e55fe52c91..af46da05d8 100644
--- a/indra/llmath/llvolume.h
+++ b/indra/llmath/llvolume.h
@@ -52,7 +52,7 @@ class LLVolume;
#include "llquaternion.h"
#include "llstrider.h"
#include "v4coloru.h"
-#include "llmemory.h"
+#include "llrefcount.h"
#include "llfile.h"
//============================================================================
diff --git a/indra/llmath/llvolumemgr.h b/indra/llmath/llvolumemgr.h
index e10ad94dba..57d789e73a 100644
--- a/indra/llmath/llvolumemgr.h
+++ b/indra/llmath/llvolumemgr.h
@@ -36,7 +36,7 @@
#include <map>
#include "llvolume.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llthread.h"
class LLVolumeParams;
diff --git a/indra/llmath/v4color.cpp b/indra/llmath/v4color.cpp
index 0cbfce07c9..34337b3ac8 100644
--- a/indra/llmath/v4color.cpp
+++ b/indra/llmath/v4color.cpp
@@ -227,6 +227,40 @@ const LLColor4& LLColor4::setVec(const LLColor3 &vec, F32 a)
return (*this);
}
+void LLColor4::setValue(const LLSD& sd)
+{
+#if 0
+ // Clamping on setValue from LLSD is inconsistent with other set behavior
+ F32 val;
+ bool out_of_range = false;
+ val = sd[0].asReal();
+ mV[0] = llclamp(val, 0.f, 1.f);
+ out_of_range = mV[0] != val;
+
+ val = sd[1].asReal();
+ mV[1] = llclamp(val, 0.f, 1.f);
+ out_of_range |= mV[1] != val;
+
+ val = sd[2].asReal();
+ mV[2] = llclamp(val, 0.f, 1.f);
+ out_of_range |= mV[2] != val;
+
+ val = sd[3].asReal();
+ mV[3] = llclamp(val, 0.f, 1.f);
+ out_of_range |= mV[3] != val;
+
+ if (out_of_range)
+ {
+ llwarns << "LLSD color value out of range!" << llendl;
+ }
+#else
+ mV[0] = (F32) sd[0].asReal();
+ mV[1] = (F32) sd[1].asReal();
+ mV[2] = (F32) sd[2].asReal();
+ mV[3] = (F32) sd[3].asReal();
+#endif
+}
+
const LLColor4& LLColor4::operator=(const LLColor3 &a)
{
mV[VX] = a.mV[VX];
diff --git a/indra/llmath/v4color.h b/indra/llmath/v4color.h
index 785b47dd37..f2a5cd39ed 100644
--- a/indra/llmath/v4color.h
+++ b/indra/llmath/v4color.h
@@ -72,13 +72,7 @@ class LLColor4
return ret;
}
- void setValue(const LLSD& sd)
- {
- mV[0] = (F32) sd[0].asReal();
- mV[1] = (F32) sd[1].asReal();
- mV[2] = (F32) sd[2].asReal();
- mV[3] = (F32) sd[3].asReal();
- }
+ void setValue(const LLSD& sd);
void calcHSL(F32* hue, F32* saturation, F32* luminance) const;
@@ -249,7 +243,7 @@ inline LLColor4::LLColor4(void)
inline LLColor4::LLColor4(const LLSD& sd)
{
- *this = sd;
+ this->setValue(sd);
}
inline LLColor4::LLColor4(F32 r, F32 g, F32 b)
@@ -641,10 +635,7 @@ void LLColor4::clamp()
inline const LLColor4& LLColor4::operator=(const LLSD& sd)
{
- mV[0] = (F32) sd[0].asReal();
- mV[1] = (F32) sd[1].asReal();
- mV[2] = (F32) sd[2].asReal();
- mV[3] = (F32) sd[3].asReal();
+ setValue(sd);
return *this;
}
diff --git a/indra/llmath/v4coloru.h b/indra/llmath/v4coloru.h
index 082d0efbb1..c0390fa0b2 100644
--- a/indra/llmath/v4coloru.h
+++ b/indra/llmath/v4coloru.h
@@ -138,6 +138,12 @@ public:
static BOOL parseColor4U(const std::string& buf, LLColor4U* value);
+ // conversion
+ operator const LLColor4() const
+ {
+ return LLColor4(*this);
+ }
+
static LLColor4U white;
static LLColor4U black;
static LLColor4U red;
diff --git a/indra/llmessage/llares.h b/indra/llmessage/llares.h
index 96d7f6dd31..c709a08499 100644
--- a/indra/llmessage/llares.h
+++ b/indra/llmessage/llares.h
@@ -45,7 +45,8 @@
# include <ares/ares.h>
#endif
-#include "llmemory.h"
+#include "llpointer.h"
+#include "llrefcount.h"
#include "lluri.h"
class LLQueryResponder;
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index 799bc83e20..629bd3836d 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -43,11 +43,6 @@
#include "lluuid.h"
#include "message.h"
-// Constants
-static const std::string CN_WAITING("(Loading...)"); // *TODO: translate
-static const std::string CN_NOBODY("(nobody)"); // *TODO: translate
-static const std::string CN_NONE("(none)"); // *TODO: translate
-
// llsd serialization constants
static const std::string AGENTS("agents");
static const std::string GROUPS("groups");
@@ -65,6 +60,7 @@ const S32 CN_FILE_VERSION = 2;
// Globals
LLCacheName* gCacheName = NULL;
+std::map<std::string, std::string> LLCacheName::sCacheName;
/// ---------------------------------------------------------------------------
/// class LLCacheNameEntry
@@ -92,17 +88,19 @@ class PendingReply
{
public:
LLUUID mID;
- LLCacheNameCallback mCallback;
+ LLCacheNameSignal mSignal;
LLHost mHost;
- void* mData;
- PendingReply(const LLUUID& id, LLCacheNameCallback callback, void* data = NULL)
- : mID(id), mCallback(callback), mData(data)
- { }
-
+
PendingReply(const LLUUID& id, const LLHost& host)
- : mID(id), mCallback(0), mHost(host)
- { }
-
+ : mID(id), mHost(host)
+ {
+ }
+
+ boost::signals::connection setCallback(const LLCacheNameCallback& cb)
+ {
+ return mSignal.connect(cb);
+ }
+
void done() { mID.setNull(); }
bool isDone() const { return mID.isNull() != FALSE; }
};
@@ -187,10 +185,9 @@ void ReplySender::flush()
typedef std::set<LLUUID> AskQueue;
-typedef std::vector<PendingReply> ReplyQueue;
+typedef std::list<PendingReply*> ReplyQueue;
typedef std::map<LLUUID,U32> PendingQueue;
typedef std::map<LLUUID, LLCacheNameEntry*> Cache;
-typedef std::vector<LLCacheNameCallback> Observers;
class LLCacheName::Impl
{
@@ -211,13 +208,16 @@ public:
ReplyQueue mReplyQueue;
// requests awaiting replies from us
- Observers mObservers;
+ LLCacheNameSignal mSignal;
LLFrameTimer mProcessTimer;
Impl(LLMessageSystem* msg);
~Impl();
-
+
+ boost::signals::connection addPending(const LLUUID& id, const LLCacheNameCallback& callback);
+ void addPending(const LLUUID& id, const LLHost& host);
+
void processPendingAsks();
void processPendingReplies();
void sendRequest(const char* msg_name, const AskQueue& queue);
@@ -231,8 +231,6 @@ public:
static void handleUUIDNameReply(LLMessageSystem* msg, void** userdata);
static void handleUUIDGroupNameRequest(LLMessageSystem* msg, void** userdata);
static void handleUUIDGroupNameReply(LLMessageSystem* msg, void** userdata);
-
- void notifyObservers(const LLUUID& id, const std::string& first, const std::string& last, BOOL group);
};
@@ -247,6 +245,9 @@ LLCacheName::LLCacheName(LLMessageSystem* msg)
LLCacheName::LLCacheName(LLMessageSystem* msg, const LLHost& upstream_host)
: impl(* new Impl(msg))
{
+ sCacheName["waiting"] = "(Loading...)";
+ sCacheName["nobody"] = "(nobody)";
+ sCacheName["none"] = "(none)";
setUpstream(upstream_host);
}
@@ -272,52 +273,31 @@ LLCacheName::Impl::Impl(LLMessageSystem* msg)
LLCacheName::Impl::~Impl()
{
for_each(mCache.begin(), mCache.end(), DeletePairedPointer());
+ for_each(mReplyQueue.begin(), mReplyQueue.end(), DeletePointer());
}
-
-void LLCacheName::setUpstream(const LLHost& upstream_host)
+boost::signals::connection LLCacheName::Impl::addPending(const LLUUID& id, const LLCacheNameCallback& callback)
{
- impl.mUpstreamHost = upstream_host;
+ PendingReply* reply = new PendingReply(id, LLHost());
+ boost::signals::connection res = reply->setCallback(callback);
+ mReplyQueue.push_back(reply);
+ return res;
}
-void LLCacheName::addObserver(LLCacheNameCallback callback)
+void LLCacheName::Impl::addPending(const LLUUID& id, const LLHost& host)
{
- impl.mObservers.push_back(callback);
+ PendingReply* reply = new PendingReply(id, host);
+ mReplyQueue.push_back(reply);
}
-void LLCacheName::removeObserver(LLCacheNameCallback callback)
+void LLCacheName::setUpstream(const LLHost& upstream_host)
{
- Observers::iterator it = impl.mObservers.begin();
- Observers::iterator end = impl.mObservers.end();
-
- for ( ; it != end; ++it)
- {
- const LLCacheNameCallback& cb = (*it);
- if (cb == callback)
- {
- impl.mObservers.erase(it);
- return;
- }
- }
+ impl.mUpstreamHost = upstream_host;
}
-void LLCacheName::cancelCallback(const LLUUID& id, LLCacheNameCallback callback, void* user_data)
+boost::signals::connection LLCacheName::addObserver(const LLCacheNameCallback& callback)
{
- ReplyQueue::iterator it = impl.mReplyQueue.begin();
- ReplyQueue::iterator end = impl.mReplyQueue.end();
-
- for(; it != end; ++it)
- {
- const PendingReply& reply = (*it);
-
- if ((callback == reply.mCallback)
- && (id == reply.mID)
- && (user_data == reply.mData) )
- {
- impl.mReplyQueue.erase(it);
- return;
- }
- }
+ return impl.mSignal.connect(callback);
}
void LLCacheName::importFile(LLFILE* fp)
@@ -493,7 +473,7 @@ BOOL LLCacheName::getName(const LLUUID& id, std::string& first, std::string& las
{
if(id.isNull())
{
- first = CN_NOBODY;
+ first = sCacheName["nobody"];
last.clear();
return FALSE;
}
@@ -507,7 +487,7 @@ BOOL LLCacheName::getName(const LLUUID& id, std::string& first, std::string& las
}
else
{
- first = CN_WAITING;
+ first = sCacheName["waiting"];
last.clear();
if (!impl.isRequestPending(id))
{
@@ -517,6 +497,14 @@ BOOL LLCacheName::getName(const LLUUID& id, std::string& first, std::string& las
}
}
+// static
+void LLCacheName::LocalizeCacheName(std::string key, std::string value)
+{
+ if (key!="" && value!= "" )
+ sCacheName[key]=value;
+ else
+ llwarns<< " Error localizing cache key " << key << " To "<< value<<llendl;
+}
BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
{
@@ -530,7 +518,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
{
if(id.isNull())
{
- group = CN_NONE;
+ group = sCacheName["none"];
return FALSE;
}
@@ -551,7 +539,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
}
else
{
- group = CN_WAITING;
+ group = sCacheName["waiting"];
if (!impl.isRequestPending(id))
{
impl.mAskGroupQueue.insert(id);
@@ -559,28 +547,38 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
return FALSE;
}
}
-
-// TODO: Make the cache name callback take a SINGLE std::string,
-// not a separate first and last name.
-void LLCacheName::get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callback, void* user_data)
+// This is a little bit kludgy. LLCacheNameCallback is a slot instead of a function pointer.
+// The reason it is a slot is so that the legacy get() function below can bind an old callback
+// and pass it as a slot. The reason it isn't a boost::function is so that trackable behavior
+// deson't get lost. As a result, we have to bind the slot to a signal to call it, even when
+// we call it immediately. -Steve
+// NOTE: Even though passing first and last name is a bit of extra overhead, it eliminates the
+// potential need for any parsing should any code need to handle first and last name independently.
+boost::signals::connection LLCacheName::get(const LLUUID& id, BOOL is_group, const LLCacheNameCallback& callback)
{
+ boost::signals::connection res;
+
if(id.isNull())
{
- callback(id, CN_NOBODY, "", is_group, user_data);
- return;
+ LLCacheNameSignal signal;
+ signal.connect(callback);
+ signal(id, sCacheName["nobody"], "", is_group);
+ return res;
}
LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id );
if (entry)
{
+ LLCacheNameSignal signal;
+ signal.connect(callback);
// id found in map therefore we can call the callback immediately.
if (entry->mIsGroup)
{
- callback(id, entry->mGroupName, "", entry->mIsGroup, user_data);
+ signal(id, entry->mGroupName, "", entry->mIsGroup);
}
else
{
- callback(id, entry->mFirstName, entry->mLastName, entry->mIsGroup, user_data);
+ signal(id, entry->mFirstName, entry->mLastName, entry->mIsGroup);
}
}
else
@@ -597,8 +595,14 @@ void LLCacheName::get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callb
impl.mAskNameQueue.insert(id);
}
}
- impl.mReplyQueue.push_back(PendingReply(id, callback, user_data));
+ res = impl.addPending(id, callback);
}
+ return res;
+}
+
+boost::signals::connection LLCacheName::get(const LLUUID& id, BOOL is_group, old_callback_t callback, void* user_data)
+{
+ return get(id, is_group, boost::bind(callback, _1, _2, _3, _4, user_data));
}
void LLCacheName::processPending()
@@ -684,14 +688,14 @@ void LLCacheName::dumpStats()
<< " AskGroup=" << impl.mAskGroupQueue.size()
<< " Pending=" << impl.mPendingQueue.size()
<< " Reply=" << impl.mReplyQueue.size()
- << " Observers=" << impl.mObservers.size()
+// << " Observers=" << impl.mSignal.size()
<< llendl;
}
//static
std::string LLCacheName::getDefaultName()
{
- return CN_WAITING;
+ return sCacheName["waiting"];
}
void LLCacheName::Impl::processPendingAsks()
@@ -704,50 +708,49 @@ void LLCacheName::Impl::processPendingAsks()
void LLCacheName::Impl::processPendingReplies()
{
- ReplyQueue::iterator it = mReplyQueue.begin();
- ReplyQueue::iterator end = mReplyQueue.end();
-
// First call all the callbacks, because they might send messages.
- for(; it != end; ++it)
+ for(ReplyQueue::iterator it = mReplyQueue.begin(); it != mReplyQueue.end(); ++it)
{
- LLCacheNameEntry* entry = get_ptr_in_map(mCache, it->mID);
+ PendingReply* reply = *it;
+ LLCacheNameEntry* entry = get_ptr_in_map(mCache, reply->mID);
if(!entry) continue;
- if (it->mCallback)
+ if (!entry->mIsGroup)
{
- if (!entry->mIsGroup)
- {
- (it->mCallback)(it->mID,
- entry->mFirstName, entry->mLastName,
- FALSE, it->mData);
- }
- else {
- (it->mCallback)(it->mID,
- entry->mGroupName, "",
- TRUE, it->mData);
- }
+ (reply->mSignal)(reply->mID, entry->mFirstName, entry->mLastName, FALSE);
+ }
+ else
+ {
+ (reply->mSignal)(reply->mID, entry->mGroupName, "", TRUE);
}
}
// Forward on all replies, if needed.
ReplySender sender(mMsg);
- for (it = mReplyQueue.begin(); it != end; ++it)
+ for(ReplyQueue::iterator it = mReplyQueue.begin(); it != mReplyQueue.end(); ++it)
{
- LLCacheNameEntry* entry = get_ptr_in_map(mCache, it->mID);
+ PendingReply* reply = *it;
+ LLCacheNameEntry* entry = get_ptr_in_map(mCache, reply->mID);
if(!entry) continue;
- if (it->mHost.isOk())
+ if (reply->mHost.isOk())
{
- sender.send(it->mID, *entry, it->mHost);
+ sender.send(reply->mID, *entry, reply->mHost);
}
- it->done();
+ reply->done();
+ }
+
+ for(ReplyQueue::iterator it = mReplyQueue.begin(); it != mReplyQueue.end(); )
+ {
+ ReplyQueue::iterator curit = it++;
+ PendingReply* reply = *curit;
+ if (reply->isDone())
+ {
+ delete reply;
+ mReplyQueue.erase(curit);
+ }
}
-
- mReplyQueue.erase(
- remove_if(mReplyQueue.begin(), mReplyQueue.end(),
- std::mem_fun_ref(&PendingReply::isDone)),
- mReplyQueue.end());
}
@@ -785,18 +788,6 @@ void LLCacheName::Impl::sendRequest(
}
}
-void LLCacheName::Impl::notifyObservers(const LLUUID& id,
- const std::string& first, const std::string& last, BOOL is_group)
-{
- for (Observers::const_iterator i = mObservers.begin(),
- end = mObservers.end();
- i != end;
- ++i)
- {
- (**i)(id, first, last, is_group, NULL);
- }
-}
-
bool LLCacheName::Impl::isRequestPending(const LLUUID& id)
{
U32 now = (U32)time(NULL);
@@ -863,7 +854,7 @@ void LLCacheName::Impl::processUUIDRequest(LLMessageSystem* msg, bool isGroup)
}
}
- mReplyQueue.push_back(PendingReply(id, fromHost));
+ addPending(id, fromHost);
}
}
}
@@ -901,11 +892,11 @@ void LLCacheName::Impl::processUUIDReply(LLMessageSystem* msg, bool isGroup)
if (!isGroup)
{
- notifyObservers(id, entry->mFirstName, entry->mLastName, FALSE);
+ mSignal(id, entry->mFirstName, entry->mLastName, FALSE);
}
else
{
- notifyObservers(id, entry->mGroupName, "", TRUE);
+ mSignal(id, entry->mGroupName, "", TRUE);
}
}
}
diff --git a/indra/llmessage/llcachename.h b/indra/llmessage/llcachename.h
index 2757b86a7c..414b6590f6 100644
--- a/indra/llmessage/llcachename.h
+++ b/indra/llmessage/llcachename.h
@@ -33,12 +33,22 @@
#ifndef LL_LLCACHENAME_H
#define LL_LLCACHENAME_H
+#include <boost/bind.hpp>
+#include <boost/signals.hpp>
+
class LLMessageSystem;
class LLHost;
class LLUUID;
-// agent_id/group_id, first_name, last_name, is_group, user_data
-typedef void (*LLCacheNameCallback)(const LLUUID&, const std::string&, const std::string&, BOOL, void*);
+
+typedef boost::signal<void (const LLUUID& id,
+ const std::string& first_name,
+ const std::string& last_name,
+ BOOL is_group)> LLCacheNameSignal;
+typedef LLCacheNameSignal::slot_type LLCacheNameCallback;
+
+// Old callback with user data for compatability
+typedef void (*old_callback_t)(const LLUUID&, const std::string&, const std::string&, BOOL, void*);
// Here's the theory:
// If you request a name that isn't in the cache, it returns "waiting"
@@ -59,10 +69,7 @@ public:
// for simulators, this is the data server
void setUpstream(const LLHost& upstream_host);
- void addObserver(LLCacheNameCallback callback);
- void removeObserver(LLCacheNameCallback callback);
-
- void cancelCallback(const LLUUID& id, LLCacheNameCallback callback, void* user_data = NULL);
+ boost::signals::connection addObserver(const LLCacheNameCallback& callback);
// janky old format. Remove after a while. Phoenix. 2008-01-30
void importFile(LLFILE* fp);
@@ -89,11 +96,10 @@ public:
// If the data is currently available, may call the callback immediatly
// otherwise, will request the data, and will call the callback when
// available. There is no garuntee the callback will ever be called.
- void get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callback, void* user_data = NULL);
+ boost::signals::connection get(const LLUUID& id, BOOL is_group, const LLCacheNameCallback& callback);
// LEGACY
- void getName(const LLUUID& id, LLCacheNameCallback callback, void* user_data = NULL)
- { get(id, FALSE, callback, user_data); }
+ boost::signals::connection get(const LLUUID& id, BOOL is_group, old_callback_t callback, void* user_data);
// This method needs to be called from time to time to send out
// requests.
@@ -107,7 +113,8 @@ public:
void dumpStats(); // Dumps the sizes of the cache and associated queues.
static std::string getDefaultName();
-
+ static void LocalizeCacheName(std::string key, std::string value);
+ static std::map<std::string, std::string> sCacheName;
private:
class Impl;
diff --git a/indra/llmessage/llhttpclientadapter.cpp b/indra/llmessage/llhttpclientadapter.cpp
index bbb56960df..b6988224ce 100644
--- a/indra/llmessage/llhttpclientadapter.cpp
+++ b/indra/llmessage/llhttpclientadapter.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
*
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * Copyright (c) 2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/llmessage/llhttpclientadapter.h b/indra/llmessage/llhttpclientadapter.h
index d5f3aeaf2c..7f76390d0c 100644
--- a/indra/llmessage/llhttpclientadapter.h
+++ b/indra/llmessage/llhttpclientadapter.h
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
@@ -33,7 +34,7 @@
#define LL_HTTPCLIENTADAPTER_H
#include "llhttpclientinterface.h"
-#include "llmemory.h" // LLSingleton<>
+#include "llsingleton.h" // LLSingleton<>
class LLHTTPClientAdapter : public LLHTTPClientInterface, public LLSingleton<LLHTTPClientAdapter>
{
diff --git a/indra/llmessage/llhttpclientinterface.h b/indra/llmessage/llhttpclientinterface.h
index 1f13d46447..42a8e5cd0a 100644
--- a/indra/llmessage/llhttpclientinterface.h
+++ b/indra/llmessage/llhttpclientinterface.h
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/llmessage/llhttpnode.h b/indra/llmessage/llhttpnode.h
index 17ffd66e8f..3f4da69a1d 100644
--- a/indra/llmessage/llhttpnode.h
+++ b/indra/llmessage/llhttpnode.h
@@ -33,7 +33,8 @@
#ifndef LL_LLHTTPNODE_H
#define LL_LLHTTPNODE_H
-#include "llmemory.h"
+#include "llpointer.h"
+#include "llrefcount.h"
#include "llsd.h"
class LLChainIOFactory;
diff --git a/indra/llmessage/llhttpnodeadapter.h b/indra/llmessage/llhttpnodeadapter.h
index 08b5664162..7c3e9d81d1 100644
--- a/indra/llmessage/llhttpnodeadapter.h
+++ b/indra/llmessage/llhttpnodeadapter.h
@@ -3,26 +3,27 @@
* @brief Declaration of llhttpnode adapter classes
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
- *
+ *
* Copyright (c) 2009, Linden Research, Inc.
- *
+ *
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
- *
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
- *
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
- *
+ *
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
diff --git a/indra/llmessage/llinstantmessage.cpp b/indra/llmessage/llinstantmessage.cpp
index 44be3ae388..aa64232e42 100644
--- a/indra/llmessage/llinstantmessage.cpp
+++ b/indra/llmessage/llinstantmessage.cpp
@@ -41,7 +41,7 @@
#include "llsd.h"
#include "llsdserialize.h"
#include "llsdutil.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "message.h"
#include "message.h"
diff --git a/indra/llmessage/llinstantmessage.h b/indra/llmessage/llinstantmessage.h
index 9ce6a10c80..272e753f3c 100644
--- a/indra/llmessage/llinstantmessage.h
+++ b/indra/llmessage/llinstantmessage.h
@@ -36,7 +36,8 @@
#include "llhost.h"
#include "lluuid.h"
#include "llsd.h"
-#include "llmemory.h"
+#include "llrefcount.h"
+#include "llpointer.h"
#include "v3math.h"
class LLMessageSystem;
diff --git a/indra/llmessage/llmessagesenderinterface.h b/indra/llmessage/llmessagesenderinterface.h
index 4082666339..119eb1d7f7 100644
--- a/indra/llmessage/llmessagesenderinterface.h
+++ b/indra/llmessage/llmessagesenderinterface.h
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/llmessage/llregionpresenceverifier.cpp b/indra/llmessage/llregionpresenceverifier.cpp
index 552cf4cbdb..0527d5cb8d 100644
--- a/indra/llmessage/llregionpresenceverifier.cpp
+++ b/indra/llmessage/llregionpresenceverifier.cpp
@@ -4,14 +4,25 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
- * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
- * this source code is governed by the Linden Lab Source Code Disclosure
- * Agreement ("Agreement") previously entered between you and Linden
- * Lab. By accessing, using, copying, modifying or distributing this
- * software, you acknowledge that you have been informed of your
- * obligations under the Agreement and agree to abide by those obligations.
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
diff --git a/indra/llmessage/llregionpresenceverifier.h b/indra/llmessage/llregionpresenceverifier.h
index d1de608ec6..10602450d8 100644
--- a/indra/llmessage/llregionpresenceverifier.h
+++ b/indra/llmessage/llregionpresenceverifier.h
@@ -4,14 +4,25 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
- * The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
- * this source code is governed by the Linden Lab Source Code Disclosure
- * Agreement ("Agreement") previously entered between you and Linden
- * Lab. By accessing, using, copying, modifying or distributing this
- * software, you acknowledge that you have been informed of your
- * obligations under the Agreement and agree to abide by those obligations.
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
diff --git a/indra/llmessage/llstoredmessage.cpp b/indra/llmessage/llstoredmessage.cpp
index 615eff405d..32cbb15cb3 100644
--- a/indra/llmessage/llstoredmessage.cpp
+++ b/indra/llmessage/llstoredmessage.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
*
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * Copyright (c) 2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/indra/llmessage/llstoredmessage.h b/indra/llmessage/llstoredmessage.h
index e817f19bd2..5069c2cb2e 100644
--- a/indra/llmessage/llstoredmessage.h
+++ b/indra/llmessage/llstoredmessage.h
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
*
- * Copyright (c) 2001-2009, Linden Research, Inc.
+ * Copyright (c) 2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
diff --git a/indra/llmessage/lltemplatemessagedispatcher.cpp b/indra/llmessage/lltemplatemessagedispatcher.cpp
index 3bbf3a058d..ab1beb362b 100644
--- a/indra/llmessage/lltemplatemessagedispatcher.cpp
+++ b/indra/llmessage/lltemplatemessagedispatcher.cpp
@@ -3,26 +3,27 @@
* @brief LLTemplateMessageDispatcher class
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
- *
- * Copyright (c) 2001-2009, Linden Research, Inc.
- *
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
- *
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
- *
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
- *
+ *
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
diff --git a/indra/llmessage/lltemplatemessagedispatcher.h b/indra/llmessage/lltemplatemessagedispatcher.h
index b1e74f47bb..fa861e4e42 100644
--- a/indra/llmessage/lltemplatemessagedispatcher.h
+++ b/indra/llmessage/lltemplatemessagedispatcher.h
@@ -3,26 +3,27 @@
* @brief LLTemplateMessageDispatcher class
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
- *
- * Copyright (c) 2001-2009, Linden Research, Inc.
- *
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
- *
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
- *
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
- *
+ *
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
diff --git a/indra/llmessage/lltransfersourceasset.cpp b/indra/llmessage/lltransfersourceasset.cpp
index a4d59275b9..059c1bdfa1 100644
--- a/indra/llmessage/lltransfersourceasset.cpp
+++ b/indra/llmessage/lltransfersourceasset.cpp
@@ -270,6 +270,7 @@ bool is_asset_fetch_by_id_allowed(LLAssetType::EType type)
case LLAssetType::AT_BODYPART:
case LLAssetType::AT_ANIMATION:
case LLAssetType::AT_GESTURE:
+ case LLAssetType::AT_FAVORITE:
rv = true;
break;
default:
@@ -292,6 +293,7 @@ bool is_asset_id_knowable(LLAssetType::EType type)
case LLAssetType::AT_BODYPART:
case LLAssetType::AT_ANIMATION:
case LLAssetType::AT_GESTURE:
+ case LLAssetType::AT_FAVORITE:
rv = true;
break;
default:
diff --git a/indra/llmessage/lltrustedmessageservice.cpp b/indra/llmessage/lltrustedmessageservice.cpp
index c1a6c437a7..505ece57b0 100644
--- a/indra/llmessage/lltrustedmessageservice.cpp
+++ b/indra/llmessage/lltrustedmessageservice.cpp
@@ -3,26 +3,27 @@
* @brief LLTrustedMessageService implementation
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
- *
- * Copyright (c) 2001-2009, Linden Research, Inc.
- *
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
- *
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
- *
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
- *
+ *
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
diff --git a/indra/llmessage/lltrustedmessageservice.h b/indra/llmessage/lltrustedmessageservice.h
index bc824565f1..dc37702471 100644
--- a/indra/llmessage/lltrustedmessageservice.h
+++ b/indra/llmessage/lltrustedmessageservice.h
@@ -3,26 +3,27 @@
* @brief LLTrustedMessageService class
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
- *
- * Copyright (c) 2001-2009, Linden Research, Inc.
- *
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
- *
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
- *
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
- *
+ *
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index b25b27eb0f..3d7d8984ad 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -59,10 +59,10 @@
#include "llhttpclient.h"
#include "llhttpnode.h"
#include "llpacketack.h"
+#include "llsingleton.h"
#include "message_prehash.h"
#include "llstl.h"
#include "llmsgvariabletype.h"
-#include "llmsgvariabletype.h"
#include "llmessagesenderinterface.h"
#include "llstoredmessage.h"
diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp
index 43b5f8e224..4e657067cd 100644
--- a/indra/llmessage/message_prehash.cpp
+++ b/indra/llmessage/message_prehash.cpp
@@ -405,7 +405,7 @@ char* _PREHASH_GlobalX = LLMessageStringTable::getInstance()->getString("GlobalX
char* _PREHASH_GlobalY = LLMessageStringTable::getInstance()->getString("GlobalY");
char* _PREHASH_CopyRotates = LLMessageStringTable::getInstance()->getString("CopyRotates");
char* _PREHASH_KickUserAck = LLMessageStringTable::getInstance()->getString("KickUserAck");
-char* _PREHASH_TopPick = LLMessageStringTable::getInstance()->getString("TopPick");
+char* _PREHASH_TopPick = LLMessageStringTable::getInstance()->getString("TopPick"); //legacy var need to be deleted -angela
char* _PREHASH_SessionID = LLMessageStringTable::getInstance()->getString("SessionID");
char* _PREHASH_GlobalZ = LLMessageStringTable::getInstance()->getString("GlobalZ");
char* _PREHASH_DeclineFriendship = LLMessageStringTable::getInstance()->getString("DeclineFriendship");
diff --git a/indra/llmessage/tests/commtest.h b/indra/llmessage/tests/commtest.h
index 7360230451..cf1461ed2b 100644
--- a/indra/llmessage/tests/commtest.h
+++ b/indra/llmessage/tests/commtest.h
@@ -5,7 +5,30 @@
* @brief
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
* Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
diff --git a/indra/llmessage/tests/llcurl_stub.cpp b/indra/llmessage/tests/llcurl_stub.cpp
index 9d1d3fa221..afd38b0655 100644
--- a/indra/llmessage/tests/llcurl_stub.cpp
+++ b/indra/llmessage/tests/llcurl_stub.cpp
@@ -3,16 +3,16 @@
* @brief stub class to allow unit testing
*
* $LicenseInfo:firstyear=2008&license=internal$
- *
- * Copyright (c) 2008, Linden Research, Inc.
- *
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
* The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
* this source code is governed by the Linden Lab Source Code Disclosure
- * Agreement ("Agreement") { }
+ * Agreement ("Agreement") previously entered between you and Linden
* Lab. By accessing, using, copying, modifying or distributing this
* software, you acknowledge that you have been informed of your
* obligations under the Agreement and agree to abide by those obligations.
- *
+ *
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
diff --git a/indra/llmessage/tests/llhttpclientadapter_test.cpp b/indra/llmessage/tests/llhttpclientadapter_test.cpp
index bde76db08b..250fa100b6 100644
--- a/indra/llmessage/tests/llhttpclientadapter_test.cpp
+++ b/indra/llmessage/tests/llhttpclientadapter_test.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp b/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
index a6f5659352..d57f17f270 100644
--- a/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
+++ b/indra/llmessage/tests/lltemplatemessagedispatcher_test.cpp
@@ -3,26 +3,27 @@
* @brief LLTrustedMessageService unit tests
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
- *
- * Copyright (c) 2001-2009, Linden Research, Inc.
- *
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
- *
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
- *
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
- *
+ *
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
diff --git a/indra/llmessage/tests/lltesthttpclientadapter.cpp b/indra/llmessage/tests/lltesthttpclientadapter.cpp
index 1140458918..9bb597feec 100644
--- a/indra/llmessage/tests/lltesthttpclientadapter.cpp
+++ b/indra/llmessage/tests/lltesthttpclientadapter.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=internal$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
* this source code is governed by the Linden Lab Source Code Disclosure
diff --git a/indra/llmessage/tests/lltesthttpclientadapter.h b/indra/llmessage/tests/lltesthttpclientadapter.h
index d032503685..8853fc44ec 100644
--- a/indra/llmessage/tests/lltesthttpclientadapter.h
+++ b/indra/llmessage/tests/lltesthttpclientadapter.h
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=internal$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
* this source code is governed by the Linden Lab Source Code Disclosure
diff --git a/indra/llmessage/tests/lltestmessagesender.cpp b/indra/llmessage/tests/lltestmessagesender.cpp
index a37aa4c566..2c8456e0a8 100644
--- a/indra/llmessage/tests/lltestmessagesender.cpp
+++ b/indra/llmessage/tests/lltestmessagesender.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=internal$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
* this source code is governed by the Linden Lab Source Code Disclosure
diff --git a/indra/llmessage/tests/lltestmessagesender.h b/indra/llmessage/tests/lltestmessagesender.h
index 83c0eff4d3..dfbef6be64 100644
--- a/indra/llmessage/tests/lltestmessagesender.h
+++ b/indra/llmessage/tests/lltestmessagesender.h
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=internal$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* The following source code is PROPRIETARY AND CONFIDENTIAL. Use of
* this source code is governed by the Linden Lab Source Code Disclosure
diff --git a/indra/llmessage/tests/lltrustedmessageservice_test.cpp b/indra/llmessage/tests/lltrustedmessageservice_test.cpp
index 44595391df..0a3da4b467 100644
--- a/indra/llmessage/tests/lltrustedmessageservice_test.cpp
+++ b/indra/llmessage/tests/lltrustedmessageservice_test.cpp
@@ -3,26 +3,27 @@
* @brief LLTrustedMessageService unit tests
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
- *
- * Copyright (c) 2001-2009, Linden Research, Inc.
- *
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
- *
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
- *
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
- *
+ *
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
diff --git a/indra/llmessage/tests/networkio.h b/indra/llmessage/tests/networkio.h
index 11c5cc07fc..0ebe369ea2 100644
--- a/indra/llmessage/tests/networkio.h
+++ b/indra/llmessage/tests/networkio.h
@@ -5,7 +5,30 @@
* @brief
*
* $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
* Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
diff --git a/indra/llprimitive/llmaterialtable.cpp b/indra/llprimitive/llmaterialtable.cpp
index 4c22203eb9..18787c47c5 100644
--- a/indra/llprimitive/llmaterialtable.cpp
+++ b/indra/llprimitive/llmaterialtable.cpp
@@ -124,6 +124,17 @@ LLMaterialTable::~LLMaterialTable()
mMaterialInfoList.clear();
}
+void LLMaterialTable::initTableTransNames(std::map<std::string, std::string> namemap)
+{
+ for (info_list_t::iterator iter = mMaterialInfoList.begin();
+ iter != mMaterialInfoList.end(); ++iter)
+ {
+ LLMaterialInfo *infop = *iter;
+ std::string name = infop->mName;
+ infop->mName = namemap[name];
+ }
+}
+
void LLMaterialTable::initBasicTable()
{
// *TODO: Translate
diff --git a/indra/llprimitive/llmaterialtable.h b/indra/llprimitive/llmaterialtable.h
index ca9017abd0..2c0b046fa7 100644
--- a/indra/llprimitive/llmaterialtable.h
+++ b/indra/llprimitive/llmaterialtable.h
@@ -147,6 +147,8 @@ public:
void initBasicTable();
+ void initTableTransNames(std::map<std::string, std::string> namemap);
+
BOOL add(U8 mcode, const std::string& name, const LLUUID &uuid);
BOOL addCollisionSound(U8 mcode, U8 mcode2, const LLUUID &uuid);
BOOL addSlidingSound(U8 mcode, U8 mcode2, const LLUUID &uuid);
diff --git a/indra/llprimitive/llprimitive.h b/indra/llprimitive/llprimitive.h
index c25df0a40f..b3a337ce5d 100644
--- a/indra/llprimitive/llprimitive.h
+++ b/indra/llprimitive/llprimitive.h
@@ -37,7 +37,7 @@
#include "v3math.h"
#include "xform.h"
#include "message.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llvolume.h"
#include "lltextureentry.h"
#include "llprimtexturelist.h"
diff --git a/indra/llprimitive/llprimtexturelist.cpp b/indra/llprimitive/llprimtexturelist.cpp
index c9632ebdad..d03150fc78 100644
--- a/indra/llprimitive/llprimtexturelist.cpp
+++ b/indra/llprimitive/llprimtexturelist.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008-2007, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/llprimitive/llprimtexturelist.h b/indra/llprimitive/llprimtexturelist.h
index 61285bd1bf..6254878b99 100644
--- a/indra/llprimitive/llprimtexturelist.h
+++ b/indra/llprimitive/llprimtexturelist.h
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008-2007, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/llrender/llfontbitmapcache.cpp b/indra/llrender/llfontbitmapcache.cpp
index f6321b0534..052510e6ed 100644
--- a/indra/llrender/llfontbitmapcache.cpp
+++ b/indra/llrender/llfontbitmapcache.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/llrender/llfontbitmapcache.h b/indra/llrender/llfontbitmapcache.h
index e5c09f8826..4beea0d026 100644
--- a/indra/llrender/llfontbitmapcache.h
+++ b/indra/llrender/llfontbitmapcache.h
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp
index beecb6b7c1..048bfe8e0d 100644
--- a/indra/llrender/llfontgl.cpp
+++ b/indra/llrender/llfontgl.cpp
@@ -32,16 +32,20 @@
#include "linden_common.h"
-#include <boost/tokenizer.hpp>
+#include "llfontgl.h"
+// Linden library includes
#include "llfont.h"
-#include "llfontgl.h"
#include "llfontbitmapcache.h"
#include "llfontregistry.h"
#include "llgl.h"
+#include "llimagegl.h"
#include "llrender.h"
-#include "v4color.h"
#include "llstl.h"
+#include "v4color.h"
+
+// Third party library includes
+#include <boost/tokenizer.hpp>
const S32 BOLD_OFFSET = 1;
@@ -102,14 +106,6 @@ U8 LLFontGL::getStyleFromString(const std::string &style)
{
ret |= UNDERLINE;
}
- if (style.find("SHADOW") != style.npos)
- {
- ret |= DROP_SHADOW;
- }
- if (style.find("SOFT_SHADOW") != style.npos)
- {
- ret |= DROP_SHADOW_SOFT;
- }
return ret;
}
@@ -215,11 +211,11 @@ bool findOrCreateFont(LLFontGL*& fontp, const LLFontDescriptor& desc)
}
// static
-BOOL LLFontGL::initDefaultFonts(F32 screen_dpi, F32 x_scale, F32 y_scale,
+void LLFontGL::initClass(F32 screen_dpi, F32 x_scale, F32 y_scale,
const std::string& app_dir,
- const std::vector<std::string>& xui_paths)
+ const std::vector<std::string>& xui_paths,
+ bool create_gl_textures)
{
- bool succ = true;
sVertDPI = (F32)llfloor(screen_dpi * y_scale);
sHorizDPI = (F32)llfloor(screen_dpi * x_scale);
sScaleX = x_scale;
@@ -229,24 +225,30 @@ BOOL LLFontGL::initDefaultFonts(F32 screen_dpi, F32 x_scale, F32 y_scale,
// Font registry init
if (!sFontRegistry)
{
- sFontRegistry = new LLFontRegistry(xui_paths);
+ sFontRegistry = new LLFontRegistry(xui_paths, create_gl_textures);
sFontRegistry->parseFontInfo("fonts.xml");
}
else
{
sFontRegistry->reset();
}
+}
- // Force standard fonts to get generated up front.
- // This is primarily for error detection purposes.
- succ &= (NULL != getFontSansSerifSmall());
- succ &= (NULL != getFontSansSerif());
- succ &= (NULL != getFontSansSerifBig());
- succ &= (NULL != getFontSansSerifHuge());
- succ &= (NULL != getFontSansSerifBold());
- succ &= (NULL != getFontMonospace());
+// Force standard fonts to get generated up front.
+// This is primarily for error detection purposes.
+// Don't do this during initClass because it can be slow and we want to get
+// the viewer window on screen first. JC
+// static
+bool LLFontGL::loadDefaultFonts()
+{
+ bool succ = true;
+ succ &= (NULL != getFontSansSerifSmall());
+ succ &= (NULL != getFontSansSerif());
+ succ &= (NULL != getFontSansSerifBig());
+ succ &= (NULL != getFontSansSerifHuge());
+ succ &= (NULL != getFontSansSerifBold());
+ succ &= (NULL != getFontMonospace());
succ &= (NULL != getFontExtChar());
-
return succ;
}
@@ -341,6 +343,34 @@ LLFontGL* LLFontGL::getFont(const LLFontDescriptor& desc)
return sFontRegistry->getFont(desc);
}
+//static
+LLFontGL* LLFontGL::getFontByName(const std::string& name)
+{
+ // check for most common fonts first
+ if (name == "SANSSERIF")
+ {
+ return getFontSansSerif();
+ }
+ else if (name == "SANSSERIF_SMALL")
+ {
+ return getFontSansSerifSmall();
+ }
+ else if (name == "SANSSERIF_BIG")
+ {
+ return getFontSansSerifBig();
+ }
+ else if (name == "SMALL" || name == "OCRA")
+ {
+ // *BUG: Should this be "MONOSPACE"? Do we use "OCRA" anymore?
+ // Does "SMALL" mean "SERIF"?
+ return getFontMonospace();
+ }
+ else
+ {
+ return NULL;
+ }
+}
+
BOOL LLFontGL::addChar(const llwchar wch) const
{
if (!LLFont::addChar(wch))
@@ -364,12 +394,13 @@ S32 LLFontGL::renderUTF8(const std::string &text, const S32 offset,
const LLColor4 &color,
const HAlign halign, const VAlign valign,
U8 style,
+ ShadowType shadow,
const S32 max_chars, const S32 max_pixels,
F32* right_x,
BOOL use_ellipses) const
{
LLWString wstr = utf8str_to_wstring(text);
- return render(wstr, offset, x, y, color, halign, valign, style, max_chars, max_pixels, right_x, FALSE, use_ellipses);
+ return render(wstr, offset, x, y, color, halign, valign, style, shadow, max_chars, max_pixels, right_x, FALSE, use_ellipses);
}
S32 LLFontGL::render(const LLWString &wstr,
@@ -378,6 +409,7 @@ S32 LLFontGL::render(const LLWString &wstr,
const LLColor4 &color,
const HAlign halign, const VAlign valign,
U8 style,
+ ShadowType shadow,
const S32 max_chars, S32 max_pixels,
F32* right_x,
BOOL use_embedded,
@@ -401,14 +433,14 @@ S32 LLFontGL::render(const LLWString &wstr,
style = style & (~getFontDesc().getStyle());
F32 drop_shadow_strength = 0.f;
- if (style & (DROP_SHADOW | DROP_SHADOW_SOFT))
+ if (shadow != NO_SHADOW)
{
F32 luminance;
color.calcHSL(NULL, NULL, &luminance);
drop_shadow_strength = clamp_rescale(luminance, 0.35f, 0.6f, 0.f, 1.f);
if (luminance < 0.35f)
{
- style = style & ~(DROP_SHADOW | DROP_SHADOW_SOFT);
+ shadow = NO_SHADOW;
}
}
@@ -547,7 +579,7 @@ S32 LLFontGL::render(const LLWString &wstr,
LLRectf uv_rect(0.f, 1.f, 1.f, 0.f);
LLRectf screen_rect(ext_x, ext_y + ext_height, ext_x + ext_width, ext_y);
- drawGlyph(screen_rect, uv_rect, LLColor4::white, style, drop_shadow_strength);
+ drawGlyph(screen_rect, uv_rect, LLColor4::white, style, shadow, drop_shadow_strength);
if (!label.empty())
{
@@ -559,7 +591,7 @@ S32 LLFontGL::render(const LLWString &wstr,
/*llfloor*/((ext_x + (F32)ext_image->getWidth() + EXT_X_BEARING) / sScaleX),
/*llfloor*/(cur_y / sScaleY),
color,
- halign, BASELINE, NORMAL, S32_MAX, S32_MAX, NULL,
+ halign, BASELINE, NORMAL, NO_SHADOW, S32_MAX, S32_MAX, NULL,
TRUE );
gGL.popMatrix();
}
@@ -613,7 +645,7 @@ S32 LLFontGL::render(const LLWString &wstr,
llround(cur_render_x + (F32)fgi->mXBearing) + (F32)fgi->mWidth,
llround(cur_render_y + (F32)fgi->mYBearing) - (F32)fgi->mHeight);
- drawGlyph(screen_rect, uv_rect, color, style, drop_shadow_strength);
+ drawGlyph(screen_rect, uv_rect, color, style, shadow, drop_shadow_strength);
chars_drawn++;
cur_x += fgi->mXAdvance;
@@ -671,6 +703,7 @@ S32 LLFontGL::render(const LLWString &wstr,
color,
LEFT, valign,
style,
+ shadow,
S32_MAX, max_pixels,
right_x,
FALSE);
@@ -838,13 +871,28 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch
{
if (iswspace(wch))
{
- in_word = FALSE;
+ if(wch !=(0x00A0))
+ {
+ in_word = FALSE;
+ }
+ }
+ if (iswindividual(wch))
+ {
+ if (iswpunct(wchars[i+1]))
+ {
+ in_word=TRUE;
+ }
+ else
+ {
+ in_word=FALSE;
+ start_of_last_word = i;
+ }
}
}
else
{
start_of_last_word = i;
- if (!iswspace(wch))
+ if (!iswspace(wch)||!iswindividual(wch))
{
in_word = TRUE;
}
@@ -1108,7 +1156,7 @@ void LLFontGL::renderQuad(const LLRectf& screen_rect, const LLRectf& uv_rect, F3
llfont_round_y(screen_rect.mBottom));
}
-void LLFontGL::drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, const LLColor4& color, U8 style, F32 drop_shadow_strength) const
+void LLFontGL::drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, const LLColor4& color, U8 style, ShadowType shadow, F32 drop_shadow_strength) const
{
F32 slant_offset;
slant_offset = ((style & ITALIC) ? ( -mAscender * 0.2f) : 0.f);
@@ -1128,7 +1176,7 @@ void LLFontGL::drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, con
renderQuad(screen_rect_offset, uv_rect, slant_offset);
}
}
- else if (style & DROP_SHADOW_SOFT)
+ else if (shadow == DROP_SHADOW_SOFT)
{
LLColor4 shadow_color = LLFontGL::sShadowColor;
shadow_color.mV[VALPHA] = color.mV[VALPHA] * drop_shadow_strength * DROP_SHADOW_SOFT_STRENGTH;
@@ -1161,7 +1209,7 @@ void LLFontGL::drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, con
gGL.color4fv(color.mV);
renderQuad(screen_rect, uv_rect, slant_offset);
}
- else if (style & DROP_SHADOW)
+ else if (shadow == DROP_SHADOW)
{
LLColor4 shadow_color = LLFontGL::sShadowColor;
shadow_color.mV[VALPHA] = color.mV[VALPHA] * drop_shadow_strength;
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h
index 6cb1727ff4..204c6908af 100644
--- a/indra/llrender/llfontgl.h
+++ b/indra/llrender/llfontgl.h
@@ -34,16 +34,15 @@
#ifndef LL_LLFONTGL_H
#define LL_LLFONTGL_H
-#include "llfont.h"
-#include "llimagegl.h"
-#include "v2math.h"
#include "llcoord.h"
-#include "llrect.h"
-
+#include "llfont.h"
#include "llfontregistry.h"
+#include "llpointer.h"
+#include "llrect.h"
+#include "v2math.h"
class LLColor4;
-
+class LLImageGL;
// Key used to request a font.
class LLFontDescriptor;
@@ -73,12 +72,18 @@ public:
enum StyleFlags
{
// text style to render. May be combined (these are bit flags)
+ // TODO:: Maybe change the value to 0x01 << 0 for 1 0x01 << 1 for 2, 0x01 << 2 for 4
NORMAL = 0,
BOLD = 1,
ITALIC = 2,
- UNDERLINE = 4,
- DROP_SHADOW = 8,
- DROP_SHADOW_SOFT = 16
+ UNDERLINE = 4
+ };
+
+ enum ShadowType
+ {
+ NO_SHADOW,
+ DROP_SHADOW,
+ DROP_SHADOW_SOFT
};
// Takes a string with potentially several flags, i.e. "NORMAL|BOLD|ITALIC"
@@ -93,10 +98,14 @@ public:
LLFontGL &operator=(const LLFontGL &source);
- static BOOL initDefaultFonts(F32 screen_dpi, F32 x_scale, F32 y_scale,
+ static void initClass(F32 screen_dpi, F32 x_scale, F32 y_scale,
const std::string& app_dir,
- const std::vector<std::string>& xui_paths);
+ const std::vector<std::string>& xui_paths,
+ bool create_gl_textures = true);
+ // Load sans-serif, sans-serif-small, etc.
+ // Slow, requires multiple seconds to load fonts.
+ static bool loadDefaultFonts();
static void destroyDefaultFonts();
static void destroyAllGL();
void destroyGL();
@@ -111,17 +120,17 @@ public:
const LLColor4 &color) const
{
return renderUTF8(text, begin_offset, (F32)x, (F32)y, color,
- LEFT, BASELINE, NORMAL,
- S32_MAX, S32_MAX, NULL, FALSE);
+ LEFT, BASELINE, NORMAL, NO_SHADOW,
+ S32_MAX, S32_MAX, NULL, FALSE);
}
S32 renderUTF8(const std::string &text, const S32 begin_offset,
S32 x, S32 y,
const LLColor4 &color,
- HAlign halign, VAlign valign, U8 style = NORMAL) const
+ HAlign halign, VAlign valign, U8 style = NORMAL, ShadowType shadow = NO_SHADOW) const
{
return renderUTF8(text, begin_offset, (F32)x, (F32)y, color,
- halign, valign, style,
+ halign, valign, style, shadow,
S32_MAX, S32_MAX, NULL, FALSE);
}
@@ -133,6 +142,7 @@ public:
HAlign halign,
VAlign valign,
U8 style,
+ ShadowType shadow,
S32 max_chars,
S32 max_pixels,
F32* right_x,
@@ -143,7 +153,7 @@ public:
const LLColor4 &color) const
{
return render(text, begin_offset, x, y, color,
- LEFT, BASELINE, NORMAL,
+ LEFT, BASELINE, NORMAL, NO_SHADOW,
S32_MAX, S32_MAX, NULL, FALSE, FALSE);
}
@@ -155,6 +165,7 @@ public:
HAlign halign = LEFT,
VAlign valign = BASELINE,
U8 style = NORMAL,
+ ShadowType shadow = NO_SHADOW,
S32 max_chars = S32_MAX,
S32 max_pixels = S32_MAX,
F32* right_x=NULL,
@@ -220,7 +231,7 @@ protected:
F32 getEmbeddedCharAdvance(const embedded_data_t* ext_data) const;
void clearEmbeddedChars();
void renderQuad(const LLRectf& screen_rect, const LLRectf& uv_rect, F32 slant_amt) const;
- void drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, const LLColor4& color, U8 style, F32 drop_shadow_fade) const;
+ void drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, const LLColor4& color, U8 style, ShadowType shadow, F32 drop_shadow_fade) const;
public:
static F32 sVertDPI;
@@ -238,6 +249,8 @@ public:
static LLFontGL* getFontSansSerifBold();
static LLFontGL* getFontExtChar();
static LLFontGL* getFont(const LLFontDescriptor& desc);
+ // Use with legacy names like "SANSSERIF_SMALL" or "OCRA"
+ static LLFontGL* getFontByName(const std::string& name);
static LLColor4 sShadowColor;
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 9b5bc5d0af..18e4a6915d 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -5,7 +5,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -13,12 +13,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
@@ -167,7 +168,9 @@ LLFontDescriptor LLFontDescriptor::normalize() const
return LLFontDescriptor(new_name,new_size,new_style,getFileNames());
}
-LLFontRegistry::LLFontRegistry(const string_vec_t& xui_paths)
+LLFontRegistry::LLFontRegistry(const string_vec_t& xui_paths,
+ bool create_gl_textures)
+: mCreateGLTextures(create_gl_textures)
{
// Propagate this down from LLUICtrlFactory so LLRender doesn't
// need an upstream dependency on LLUI.
@@ -215,8 +218,8 @@ bool LLFontRegistry::parseFontInfo(const std::string& xml_filename)
success = success || init_succ;
}
}
- if (success)
- dump();
+ //if (success)
+ // dump();
return success;
}
@@ -426,7 +429,9 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc)
{
LLFontGL *fontp = new LLFontGL;
std::string font_path = local_path + *file_name_it;
- BOOL is_fallback = !is_first_found;
+ // *HACK: Fallback fonts don't render, so we can use that to suppress
+ // creation of OpenGL textures for test apps. JC
+ BOOL is_fallback = !is_first_found || !mCreateGLTextures;
F32 extra_scale = (is_fallback)?fallback_scale:1.0;
if (!fontp->loadFace(font_path, extra_scale * point_size,
LLFontGL::sVertDPI, LLFontGL::sHorizDPI, 2, is_fallback))
diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h
index ed775eeed0..198ca0b920 100644
--- a/indra/llrender/llfontregistry.h
+++ b/indra/llrender/llfontregistry.h
@@ -5,7 +5,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -13,12 +13,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
@@ -70,7 +71,10 @@ private:
class LLFontRegistry
{
public:
- LLFontRegistry(const string_vec_t& xui_paths);
+ // create_gl_textures - set to false for test apps with no OpenGL window,
+ // such as llui_libtest
+ LLFontRegistry(const string_vec_t& xui_paths,
+ bool create_gl_textures);
~LLFontRegistry();
// Load standard font info from XML file(s).
@@ -108,6 +112,7 @@ private:
string_vec_t mUltimateFallbackList;
string_vec_t mXUIPaths;
+ bool mCreateGLTextures;
};
#endif // LL_LLFONTREGISTRY_H
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h
index 4f737bcaae..53b0b70cae 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -37,7 +37,8 @@
#include "llimage.h"
#include "llgltypes.h"
-#include "llmemory.h"
+#include "llpointer.h"
+#include "llrefcount.h"
#include "v2math.h"
#include "llrender.h"
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 437c715c2f..5b52fa1a52 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -44,7 +44,7 @@
#include "v3math.h"
#include "v4coloru.h"
#include "llstrider.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llglheaders.h"
class LLVertexBuffer;
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 5d88ea464d..fc2a6954c3 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -37,7 +37,6 @@
#include "llvertexbuffer.h"
// #include "llrender.h"
#include "llglheaders.h"
-#include "llmemory.h"
#include "llmemtype.h"
#include "llrender.h"
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h
index aad948e17f..b785a22976 100644
--- a/indra/llrender/llvertexbuffer.h
+++ b/indra/llrender/llvertexbuffer.h
@@ -39,7 +39,6 @@
#include "v4math.h"
#include "v4coloru.h"
#include "llstrider.h"
-#include "llmemory.h"
#include "llrender.h"
#include <set>
#include <vector>
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 5de8dc76af..f3595a7b05 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -31,17 +31,25 @@ set(llui_SOURCE_FILES
llcheckboxctrl.cpp
llclipboard.cpp
llcombobox.cpp
+ llconsole.cpp
+ llcontainerview.cpp
llctrlselectioninterface.cpp
lldraghandle.cpp
lleditmenuhandler.cpp
+ llf32uictrl.cpp
llfloater.cpp
+ llfloaterreg.cpp
+ llflyoutbutton.cpp
llfocusmgr.cpp
llfunctorregistry.cpp
lliconctrl.cpp
+ llinitparam.cpp
llkeywords.cpp
+ lllayoutstack.cpp
lllineeditor.cpp
llmenugl.cpp
llmodaldialog.cpp
+ llmultifloater.cpp
llmultislider.cpp
llmultisliderctrl.cpp
llnotifications.cpp
@@ -51,27 +59,35 @@ set(llui_SOURCE_FILES
llresizebar.cpp
llresizehandle.cpp
llresmgr.cpp
- llrootview.cpp
llscrollbar.cpp
llscrollcontainer.cpp
llscrollingpanellist.cpp
+ llscrolllistcell.cpp
+ llscrolllistcolumn.cpp
llscrolllistctrl.cpp
+ llscrolllistitem.cpp
+ llsdparam.cpp
+ llsearcheditor.cpp
llslider.cpp
llsliderctrl.cpp
llspinctrl.cpp
+ llstatbar.cpp
+ llstatgraph.cpp
+ llstatview.cpp
llstyle.cpp
lltabcontainer.cpp
- lltabcontainervertical.cpp
lltextbox.cpp
lltexteditor.cpp
lltextparser.cpp
+ lltrans.cpp
llui.cpp
lluictrl.cpp
lluictrlfactory.cpp
+ lluiimage.cpp
lluistring.cpp
- lluitrans.cpp
llundo.cpp
llviewborder.cpp
+ llviewmodel.cpp
llview.cpp
llviewquery.cpp
)
@@ -85,52 +101,68 @@ set(llui_HEADER_FILES
llcheckboxctrl.h
llclipboard.h
llcombobox.h
+ llconsole.h
+ llcontainerview.h
llctrlselectioninterface.h
lldraghandle.h
lleditmenuhandler.h
+ llf32uictrl.h
llfloater.h
+ llfloaterreg.h
+ llflyoutbutton.h
llfocusmgr.h
llfunctorregistry.h
llhtmlhelp.h
lliconctrl.h
+ llinitparam.h
llkeywords.h
+ lllayoutstack.h
+ lllazyvalue.h
lllineeditor.h
- llmemberlistener.h
llmenugl.h
llmodaldialog.h
+ llmultifloater.h
llmultisliderctrl.h
llmultislider.h
llnotifications.h
llpanel.h
llprogressbar.h
llradiogroup.h
+ llregistry.h
llresizebar.h
llresizehandle.h
llresmgr.h
- llrootview.h
+ llsearcheditor.h
llscrollbar.h
llscrollcontainer.h
llscrollingpanellist.h
+ llscrolllistcell.h
+ llscrolllistcolumn.h
llscrolllistctrl.h
+ llscrolllistitem.h
+ llsdparam.h
llsliderctrl.h
llslider.h
llspinctrl.h
+ llstatbar.h
+ llstatgraph.h
+ llstatview.h
llstyle.h
lltabcontainer.h
- lltabcontainervertical.h
lltextbox.h
lltexteditor.h
lltextparser.h
+ lltrans.h
lluiconstants.h
lluictrlfactory.h
lluictrl.h
lluifwd.h
llui.h
+ lluiimage.h
lluistring.h
- lluitrans.h
- lluixmltags.h
llundo.h
llviewborder.h
+ llviewmodel.h
llview.h
llviewquery.h
)
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 2c2c1c25d8..1f6cd6ddf9 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -32,6 +32,7 @@
#include "linden_common.h"
+#define INSTANTIATE_GETCHILD_BUTTON
#include "llbutton.h"
// Linden library includes
@@ -45,183 +46,167 @@
#include "lluiconstants.h"
#include "llresmgr.h"
#include "llcriticaldamp.h"
+#include "llfloater.h"
+#include "llfloaterreg.h"
#include "llfocusmgr.h"
#include "llwindow.h"
#include "llrender.h"
+#include "lluictrlfactory.h"
static LLRegisterWidget<LLButton> r("button");
// globals loaded from settings.xml
-S32 LLBUTTON_ORIG_H_PAD = 6; // Pre-zoomable UI
S32 LLBUTTON_H_PAD = 0;
S32 LLBUTTON_V_PAD = 0;
S32 BTN_HEIGHT_SMALL= 0;
S32 BTN_HEIGHT = 0;
-S32 BTN_GRID = 12;
-S32 BORDER_SIZE = 1;
-
-LLButton::LLButton( const std::string& name, const LLRect& rect, const std::string& control_name, void (*click_callback)(void*), void *callback_data)
-: LLUICtrl(name, rect, TRUE, NULL, NULL),
- mClickedCallback( click_callback ),
- mMouseDownCallback( NULL ),
- mMouseUpCallback( NULL ),
- mHeldDownCallback( NULL ),
- mGLFont( NULL ),
- mMouseDownFrame( 0 ),
- mHeldDownDelay( 0.5f ), // seconds until held-down callback is called
- mHeldDownFrameDelay( 0 ),
- mImageUnselected( NULL ),
- mImageSelected( NULL ),
- mImageHoverSelected( NULL ),
- mImageHoverUnselected( NULL ),
- mImageDisabled( NULL ),
- mImageDisabledSelected( NULL ),
- mToggleState( FALSE ),
- mIsToggle( FALSE ),
- mScaleImage( TRUE ),
- mDropShadowedText( TRUE ),
- mBorderEnabled( FALSE ),
- mFlashing( FALSE ),
- mHAlign( LLFontGL::HCENTER ),
- mLeftHPad( LLBUTTON_H_PAD ),
- mRightHPad( LLBUTTON_H_PAD ),
- mHoverGlowStrength(0.15f),
- mCurGlowStrength(0.f),
- mNeedsHighlight(FALSE),
- mCommitOnReturn(TRUE),
- mImagep( NULL )
+template LLButton* LLView::getChild<LLButton>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
+
+LLButton::Params::Params()
+: label_selected("label_selected"), // requires is_toggle true
+ label_dropshadow("label_shadow", true),
+ auto_resize("auto_resize", false),
+ image_unselected("image_unselected"),
+ image_selected("image_selected"),
+ image_hover_selected("image_hover_selected"),
+ image_hover_unselected("image_hover_unselected"),
+ image_disabled_selected("image_disabled_selected"),
+ image_disabled("image_disabled"),
+ image_overlay("image_overlay"),
+ image_overlay_alignment("image_overlay_alignment", std::string("center")),
+ label_color("label_color"),
+ label_color_selected("label_color_selected"), // requires is_toggle true
+ label_color_disabled("label_color_disabled"),
+ label_color_disabled_selected("label_color_disabled_selected"),
+ highlight_color("highlight_color"),
+ image_color("image_color"),
+ image_color_disabled("image_color_disabled"),
+ image_overlay_color("image_overlay_color", LLColor4::white),
+ flash_color("flash_color"),
+ pad_right("pad_right", LLUI::sSettingGroups["config"]->getS32("ButtonHPad")),
+ pad_left("pad_left", LLUI::sSettingGroups["config"]->getS32("ButtonHPad")),
+ click_callback("click_callback"),
+ mouse_down_callback("mouse_down_callback"),
+ mouse_up_callback("mouse_up_callback"),
+ mouse_held_callback("mouse_held_callback"),
+ mouse_held_once_callback("mouse_held_once_callback"),
+ is_toggle("is_toggle", false),
+ scale_image("scale_image", true),
+ help_url("help_url"),
+ hover_glow_amount("hover_glow_amount"),
+ commit_on_return("commit_on_return", true),
+ picture_style("picture_style", false)
{
- mUnselectedLabel = name;
- mSelectedLabel = name;
-
- setImageUnselected(std::string("button_enabled_32x128.tga"));
- setImageSelected(std::string("button_enabled_selected_32x128.tga"));
- setImageDisabled(std::string("button_disabled_32x128.tga"));
- setImageDisabledSelected(std::string("button_disabled_32x128.tga"));
-
- mImageColor = LLUI::sColorsGroup->getColor( "ButtonImageColor" );
- mDisabledImageColor = LLUI::sColorsGroup->getColor( "ButtonImageColor" );
-
- init(click_callback, callback_data, NULL, control_name);
+ addSynonym(is_toggle, "toggle");
+ held_down_delay.seconds = 0.5f;
+ initial_value.set(LLSD(false), false);
}
-LLButton::LLButton(const std::string& name, const LLRect& rect,
- const std::string &unselected_image_name,
- const std::string &selected_image_name,
- const std::string& control_name,
- void (*click_callback)(void*),
- void *callback_data,
- const LLFontGL *font,
- const std::string& unselected_label,
- const std::string& selected_label )
-: LLUICtrl(name, rect, TRUE, NULL, NULL),
- mClickedCallback( click_callback ),
- mMouseDownCallback( NULL ),
- mMouseUpCallback( NULL ),
- mHeldDownCallback( NULL ),
- mGLFont( NULL ),
- mMouseDownFrame( 0 ),
- mHeldDownDelay( 0.5f ), // seconds until held-down callback is called
- mHeldDownFrameDelay( 0 ),
- mImageUnselected( NULL ),
- mImageSelected( NULL ),
- mImageHoverSelected( NULL ),
- mImageHoverUnselected( NULL ),
- mImageDisabled( NULL ),
- mImageDisabledSelected( NULL ),
- mToggleState( FALSE ),
- mIsToggle( FALSE ),
- mScaleImage( TRUE ),
- mDropShadowedText( TRUE ),
+LLButton::LLButton(const LLButton::Params& p)
+: LLUICtrl(p),
+ mMouseDownFrame(0),
+ mMouseHeldDownCount(0),
mBorderEnabled( FALSE ),
mFlashing( FALSE ),
- mHAlign( LLFontGL::HCENTER ),
- mLeftHPad( LLBUTTON_H_PAD ),
- mRightHPad( LLBUTTON_H_PAD ),
- mHoverGlowStrength(0.25f),
mCurGlowStrength(0.f),
mNeedsHighlight(FALSE),
- mCommitOnReturn(TRUE),
- mImagep( NULL )
+ mImagep( NULL ),
+ mUnselectedLabel(p.label()),
+ mSelectedLabel(p.label_selected()),
+ mGLFont(p.font),
+ mHeldDownDelay(p.held_down_delay.seconds), // seconds until held-down callback is called
+ mHeldDownFrameDelay(p.held_down_delay.frames),
+ mImageUnselected(p.image_unselected),
+ mImageSelected(p.image_selected),
+ mImageDisabled(p.image_disabled),
+ mImageDisabledSelected(p.image_disabled_selected),
+ mImageHoverSelected(p.image_hover_selected),
+ mImageHoverUnselected(p.image_hover_unselected),
+ mUnselectedLabelColor(p.label_color()),
+ mSelectedLabelColor(p.label_color_selected()),
+ mDisabledLabelColor(p.label_color_disabled()),
+ mDisabledSelectedLabelColor(p.label_color_disabled_selected()),
+ mHighlightColor(p.highlight_color()),
+ mImageColor(p.image_color()),
+ mFlashBgColor(p.flash_color()),
+ mDisabledImageColor(p.image_color_disabled()),
+ mImageOverlay(p.image_overlay()),
+ mImageOverlayColor(p.image_overlay_color()),
+ mImageOverlayAlignment(LLFontGL::hAlignFromName(p.image_overlay_alignment)),
+ mIsToggle(p.is_toggle),
+ mScaleImage(p.scale_image),
+ mDropShadowedText(p.label_dropshadow),
+ mAutoResize(p.auto_resize),
+ mHAlign(p.font_halign),
+ mLeftHPad(p.pad_left),
+ mRightHPad(p.pad_right),
+ mHoverGlowStrength(p.hover_glow_amount),
+ mCommitOnReturn(p.commit_on_return),
+ mFadeWhenDisabled(FALSE)
{
- mUnselectedLabel = unselected_label;
- mSelectedLabel = selected_label;
+ static LLUICachedControl<S32> llbutton_orig_h_pad ("UIButtonOrigHPad", 0);
+ static LLButton::Params default_params(LLUICtrlFactory::getDefaultParams<LLButton::Params>());
- // by default, disabled color is same as enabled
- mImageColor = LLUI::sColorsGroup->getColor( "ButtonImageColor" );
- mDisabledImageColor = LLUI::sColorsGroup->getColor( "ButtonImageColor" );
-
- if( unselected_image_name != "" )
- {
- // user-specified image - don't use fixed borders unless requested
- setImageUnselected(unselected_image_name);
- setImageDisabled(unselected_image_name);
-
- mDisabledImageColor.mV[VALPHA] = 0.5f;
- mScaleImage = FALSE;
- }
- else
+ //if we aren't a picture_style button set label as name if not provided
+ if (!p.picture_style.isProvided() || !p.picture_style)
{
- setImageUnselected(std::string("button_enabled_32x128.tga"));
- setImageDisabled(std::string("button_disabled_32x128.tga"));
- }
-
- if( selected_image_name != "" )
- {
- // user-specified image - don't use fixed borders unless requested
- setImageSelected(selected_image_name);
- setImageDisabledSelected(selected_image_name);
-
- mDisabledImageColor.mV[VALPHA] = 0.5f;
- mScaleImage = FALSE;
- }
- else
- {
- setImageSelected(std::string("button_enabled_selected_32x128.tga"));
- setImageDisabledSelected(std::string("button_disabled_32x128.tga"));
+ if (!p.label.isProvided())
+ {
+ mUnselectedLabel = p.name();
+ }
+ if (!p.label_selected.isProvided())
+ {
+ mSelectedLabel = mUnselectedLabel.getString();
+ }
}
- init(click_callback, callback_data, font, control_name);
-}
-
-void LLButton::init(void (*click_callback)(void*), void *callback_data, const LLFontGL* font, const std::string& control_name)
-{
- mGLFont = ( font ? font : LLFontGL::getFontSansSerif());
-
// Hack to make sure there is space for at least one character
if (getRect().getWidth() - (mRightHPad + mLeftHPad) < mGLFont->getWidth(std::string(" ")))
{
// Use old defaults
- mLeftHPad = LLBUTTON_ORIG_H_PAD;
- mRightHPad = LLBUTTON_ORIG_H_PAD;
+ mLeftHPad = llbutton_orig_h_pad;
+ mRightHPad = llbutton_orig_h_pad;
}
- mCallbackUserData = callback_data;
mMouseDownTimer.stop();
- setControlName(control_name, NULL);
-
- mUnselectedLabelColor = ( LLUI::sColorsGroup->getColor( "ButtonLabelColor" ) );
- mSelectedLabelColor = ( LLUI::sColorsGroup->getColor( "ButtonLabelSelectedColor" ) );
- mDisabledLabelColor = ( LLUI::sColorsGroup->getColor( "ButtonLabelDisabledColor" ) );
- mDisabledSelectedLabelColor = ( LLUI::sColorsGroup->getColor( "ButtonLabelSelectedDisabledColor" ) );
- mHighlightColor = ( LLUI::sColorsGroup->getColor( "ButtonUnselectedFgColor" ) );
- mUnselectedBgColor = ( LLUI::sColorsGroup->getColor( "ButtonUnselectedBgColor" ) );
- mSelectedBgColor = ( LLUI::sColorsGroup->getColor( "ButtonSelectedBgColor" ) );
- mFlashBgColor = ( LLUI::sColorsGroup->getColor( "ButtonFlashBgColor" ) );
+ if (p.help_url.isProvided())
+ {
+ setHelpURLCallback(p.help_url);
+ }
- mImageOverlayAlignment = LLFontGL::HCENTER;
- mImageOverlayColor = LLColor4::white;
-}
+ // if custom unselected button image provided...
+ if (p.image_unselected != default_params.image_unselected)
+ {
+ //...fade it out for disabled image by default...
+ if (p.image_disabled() == default_params.image_disabled() )
+ {
+ mImageDisabled = p.image_unselected;
+ mFadeWhenDisabled = TRUE;
+ }
+ }
-LLButton::~LLButton()
-{
- if( hasMouseCapture() )
+ // if custom selected button image provided...
+ if (p.image_selected != default_params.image_selected)
{
- gFocusMgr.setMouseCapture( NULL );
+ //...fade it out for disabled image by default...
+ if (p.image_disabled_selected() == default_params.image_disabled_selected())
+ {
+ mImageDisabledSelected = p.image_selected;
+ mFadeWhenDisabled = TRUE;
+ }
}
+
+ if (p.click_callback.isProvided())
+ initCommitCallback(p.click_callback, mCommitSignal); // alias -> commit_callback
+ if (p.mouse_down_callback.isProvided())
+ initCommitCallback(p.mouse_down_callback, mMouseDownSignal);
+ if (p.mouse_up_callback.isProvided())
+ initCommitCallback(p.mouse_up_callback, mMouseUpSignal);
+ if (p.mouse_held_callback.isProvided())
+ initCommitCallback(p.mouse_held_callback, mHeldDownSignal);
}
// HACK: Committing a button is the same as instantly clicking it.
@@ -229,19 +214,12 @@ LLButton::~LLButton()
void LLButton::onCommit()
{
// WARNING: Sometimes clicking a button destroys the floater or
- // panel containing it. Therefore we need to call mClickedCallback
+ // panel containing it. Therefore we need to call LLUICtrl::onCommit()
// LAST, otherwise this becomes deleted memory.
- LLUICtrl::onCommit();
- if (mMouseDownCallback)
- {
- (*mMouseDownCallback)(mCallbackUserData);
- }
+ mMouseDownSignal(this, LLSD());
- if (mMouseUpCallback)
- {
- (*mMouseUpCallback)(mCallbackUserData);
- }
+ mMouseUpSignal(this, LLSD());
if (getSoundFlags() & MOUSE_DOWN)
{
@@ -259,14 +237,49 @@ void LLButton::onCommit()
}
// do this last, as it can result in destroying this button
- if (mClickedCallback)
- {
- (*mClickedCallback)( mCallbackUserData );
- }
+ LLUICtrl::onCommit();
}
+boost::signals::connection LLButton::setClickedCallback( const commit_signal_t::slot_type& cb )
+{
+ return mCommitSignal.connect(cb);
+}
+boost::signals::connection LLButton::setMouseDownCallback( const commit_signal_t::slot_type& cb )
+{
+ return mMouseDownSignal.connect(cb);
+}
+boost::signals::connection LLButton::setMouseUpCallback( const commit_signal_t::slot_type& cb )
+{
+ return mMouseUpSignal.connect(cb);
+}
+boost::signals::connection LLButton::setHeldDownCallback( const commit_signal_t::slot_type& cb )
+{
+ return mHeldDownSignal.connect(cb);
+}
+// *TODO: Deprecate (for backwards compatability only)
+boost::signals::connection LLButton::setClickedCallback( button_callback_t cb, void* data )
+{
+ return setClickedCallback(boost::bind(cb, data));
+}
+boost::signals::connection LLButton::setMouseDownCallback( button_callback_t cb, void* data )
+{
+ return setMouseDownCallback(boost::bind(cb, data));
+}
+boost::signals::connection LLButton::setMouseUpCallback( button_callback_t cb, void* data )
+{
+ return setMouseUpCallback(boost::bind(cb, data));
+}
+boost::signals::connection LLButton::setHeldDownCallback( button_callback_t cb, void* data )
+{
+ return setHeldDownCallback(boost::bind(cb, data));
+}
+BOOL LLButton::postBuild()
+{
+ autoResize();
+ return TRUE;
+}
BOOL LLButton::handleUnicodeCharHere(llwchar uni_char)
{
BOOL handled = FALSE;
@@ -278,10 +291,8 @@ BOOL LLButton::handleUnicodeCharHere(llwchar uni_char)
toggleState();
}
- if (mClickedCallback)
- {
- (*mClickedCallback)( mCallbackUserData );
- }
+ LLUICtrl::onCommit();
+
handled = TRUE;
}
return handled;
@@ -299,10 +310,7 @@ BOOL LLButton::handleKeyHere(KEY key, MASK mask )
handled = TRUE;
- if (mClickedCallback)
- {
- (*mClickedCallback)( mCallbackUserData );
- }
+ LLUICtrl::onCommit();
}
return handled;
}
@@ -318,13 +326,11 @@ BOOL LLButton::handleMouseDown(S32 x, S32 y, MASK mask)
setFocus(TRUE);
}
- if (mMouseDownCallback)
- {
- (*mMouseDownCallback)(mCallbackUserData);
- }
+ mMouseDownSignal(this, LLSD());
mMouseDownTimer.start();
mMouseDownFrame = (S32) LLFrameTimer::getFrameCount();
+ mMouseHeldDownCount = 0;
if (getSoundFlags() & MOUSE_DOWN)
{
@@ -344,13 +350,9 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask)
gFocusMgr.setMouseCapture( NULL );
// Regardless of where mouseup occurs, handle callback
- if (mMouseUpCallback)
- {
- (*mMouseUpCallback)(mCallbackUserData);
- }
+ mMouseUpSignal(this, LLSD());
- mMouseDownTimer.stop();
- mMouseDownTimer.reset();
+ resetMouseDownTimer();
// DO THIS AT THE VERY END to allow the button to be destroyed as a result of being clicked.
// If mouseup in the widget, it's been clicked
@@ -366,10 +368,7 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask)
toggleState();
}
- if (mClickedCallback)
- {
- (*mClickedCallback)( mCallbackUserData );
- }
+ LLUICtrl::onCommit();
}
}
@@ -377,20 +376,27 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask)
}
-BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
+void LLButton::onMouseEnter(S32 x, S32 y, MASK mask)
{
- LLMouseHandler* other_captor = gFocusMgr.getMouseCapture();
- mNeedsHighlight = other_captor == NULL ||
- other_captor == this ||
- // this following bit is to support modal dialogs
- (other_captor->isView() && hasAncestor((LLView*)other_captor));
+ if (getEnabled())
+ mNeedsHighlight = TRUE;
+}
- if (mMouseDownTimer.getStarted() && NULL != mHeldDownCallback)
+void LLButton::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+ mNeedsHighlight = FALSE;
+}
+
+BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
+{
+ if (mMouseDownTimer.getStarted())
{
F32 elapsed = getHeldDownTime();
if( mHeldDownDelay <= elapsed && mHeldDownFrameDelay <= (S32)LLFrameTimer::getFrameCount() - mMouseDownFrame)
{
- mHeldDownCallback( mCallbackUserData );
+ LLSD param;
+ param["count"] = mMouseHeldDownCount++;
+ mHeldDownSignal(this, param);
}
}
@@ -406,12 +412,15 @@ BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
void LLButton::draw()
{
BOOL flash = FALSE;
+ static LLUICachedControl<F32> button_flash_rate("ButtonFlashRate", 0);
+ static LLUICachedControl<S32> button_flash_count("ButtonFlashCount", 0);
+
if( mFlashing )
{
F32 elapsed = mFlashingTimer.getElapsedTimeF32();
- S32 flash_count = S32(elapsed * LLUI::sConfigGroup->getF32("ButtonFlashRate") * 2.f);
+ S32 flash_count = S32(elapsed * button_flash_rate * 2.f);
// flash on or off?
- flash = (flash_count % 2 == 0) || flash_count > S32((F32)LLUI::sConfigGroup->getS32("ButtonFlashCount") * 2.f);
+ flash = (flash_count % 2 == 0) || flash_count > S32((F32)button_flash_count * 2.f);
}
BOOL pressed_by_keyboard = FALSE;
@@ -427,7 +436,7 @@ void LLButton::draw()
BOOL pressed = pressed_by_keyboard
|| (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y))
- || mToggleState;
+ || getToggleState();
BOOL use_glow_effect = FALSE;
LLColor4 glow_color = LLColor4::white;
@@ -470,12 +479,14 @@ void LLButton::draw()
if (mFlashing)
{
+ LLColor4 flash_color = mFlashBgColor.get();
use_glow_effect = TRUE;
glow_type = LLRender::BT_ALPHA; // blend the glow
+
if (mNeedsHighlight) // highlighted AND flashing
- glow_color = (glow_color*0.5f + mFlashBgColor*0.5f) % 2.0f; // average between flash and highlight colour, with sum of the opacity
+ glow_color = (glow_color*0.5f + flash_color*0.5f) % 2.0f; // average between flash and highlight colour, with sum of the opacity
else
- glow_color = mFlashBgColor;
+ glow_color = flash_color;
}
// Override if more data is available
@@ -508,31 +519,31 @@ void LLButton::draw()
// label changes when button state changes, not when pressed
if ( getEnabled() )
{
- if ( mToggleState )
+ if ( getToggleState() )
{
- label_color = mSelectedLabelColor;
+ label_color = mSelectedLabelColor.get();
}
else
{
- label_color = mUnselectedLabelColor;
+ label_color = mUnselectedLabelColor.get();
}
}
else
{
- if ( mToggleState )
+ if ( getToggleState() )
{
- label_color = mDisabledSelectedLabelColor;
+ label_color = mDisabledSelectedLabelColor.get();
}
else
{
- label_color = mDisabledLabelColor;
+ label_color = mDisabledLabelColor.get();
}
}
// Unselected label assignments
LLWString label;
- if( mToggleState )
+ if( getToggleState() )
{
if( getEnabled() || mDisabledSelectedLabel.empty() )
{
@@ -578,9 +589,11 @@ void LLButton::draw()
// Otherwise draw basic rectangular button.
if (mImagep.notNull())
{
+ // apply automatic 50% alpha fade to disabled image
+ LLColor4 disabled_color = mFadeWhenDisabled ? mDisabledImageColor.get() % 0.5f : mDisabledImageColor.get();
if ( mScaleImage)
{
- mImagep->draw(getLocalRect(), getEnabled() ? mImageColor : mDisabledImageColor );
+ mImagep->draw(getLocalRect(), getEnabled() ? mImageColor.get() : disabled_color );
if (mCurGlowStrength > 0.01f)
{
gGL.setSceneBlendType(glow_type);
@@ -590,7 +603,7 @@ void LLButton::draw()
}
else
{
- mImagep->draw(0, 0, getEnabled() ? mImageColor : mDisabledImageColor );
+ mImagep->draw(0, 0, getEnabled() ? mImageColor.get() : disabled_color );
if (mCurGlowStrength > 0.01f)
{
gGL.setSceneBlendType(glow_type);
@@ -634,7 +647,7 @@ void LLButton::draw()
}
// fade out overlay images on disabled buttons
- LLColor4 overlay_color = mImageOverlayColor;
+ LLColor4 overlay_color = mImageOverlayColor.get();
if (!getEnabled())
{
overlay_color.mV[VALPHA] = 0.5f;
@@ -707,23 +720,18 @@ void LLButton::draw()
mGLFont->render(label, 0, (F32)x, (F32)(LLBUTTON_V_PAD + y_offset),
label_color,
mHAlign, LLFontGL::BOTTOM,
- mDropShadowedText ? LLFontGL::DROP_SHADOW_SOFT : LLFontGL::NORMAL,
+ LLFontGL::NORMAL,
+ mDropShadowedText ? LLFontGL::DROP_SHADOW_SOFT : LLFontGL::NO_SHADOW,
U32_MAX, text_width,
NULL, FALSE, FALSE);
}
- if (sDebugRects
- || (LLView::sEditingUI && this == LLView::sEditingUIView))
- {
- drawDebugRect();
- }
-
- // reset hover status for next frame
- mNeedsHighlight = FALSE;
+ LLView::draw();
}
void LLButton::drawBorder(const LLColor4& color, S32 size)
{
+ if (mImagep.isNull()) return;
if (mScaleImage)
{
mImagep->drawBorder(getLocalRect(), color, size);
@@ -734,22 +742,19 @@ void LLButton::drawBorder(const LLColor4& color, S32 size)
}
}
-void LLButton::setClickedCallback(void (*cb)(void*), void* userdata)
+BOOL LLButton::getToggleState() const
{
- mClickedCallback = cb;
- if (userdata)
- {
- mCallbackUserData = userdata;
- }
+ return getValue().asBoolean();
}
-
void LLButton::setToggleState(BOOL b)
{
- if( b != mToggleState )
+ if( b != getToggleState() )
{
setControlValue(b); // will fire LLControlVariable callbacks (if any)
- mToggleState = b; // may or may not be redundant
+ setValue(b); // may or may not be redundant
+ // Unselected label assignments
+ autoResize();
}
}
@@ -764,19 +769,11 @@ void LLButton::setFlashing( BOOL b )
BOOL LLButton::toggleState()
-{
- setToggleState( !mToggleState );
- return mToggleState;
-}
-
-void LLButton::setValue(const LLSD& value )
{
- mToggleState = value.asBoolean();
-}
+ bool flipped = ! getToggleState();
+ setToggleState(flipped);
-LLSD LLButton::getValue() const
-{
- return mToggleState == TRUE;
+ return flipped;
}
void LLButton::setLabel( const LLStringExplicit& label )
@@ -818,6 +815,49 @@ void LLButton::setImageUnselected(LLPointer<LLUIImage> image)
mImageUnselected = image;
}
+void LLButton::autoResize()
+{
+ LLUIString label;
+ if(getToggleState())
+ {
+ if( getEnabled() || mDisabledSelectedLabel.empty() )
+ {
+ label = mSelectedLabel;
+ }
+ else
+ {
+ label = mDisabledSelectedLabel;
+ }
+ }
+ else
+ {
+ if( getEnabled() || mDisabledLabel.empty() )
+ {
+ label = mUnselectedLabel;
+ }
+ else
+ {
+ label = mDisabledLabel;
+ }
+ }
+ resize(label);
+}
+
+void LLButton::resize(LLUIString label)
+{
+ // get label length
+ S32 label_width = mGLFont->getWidth(label.getString());
+ // get current btn length
+ S32 btn_width =getRect().getWidth();
+ // check if it need resize
+ if (mAutoResize == TRUE)
+ {
+ if (btn_width - (mRightHPad + mLeftHPad) < label_width)
+ {
+ setRect(LLRect( getRect().mLeft, getRect().mTop, getRect().mRight+ label_width + mLeftHPad + mRightHPad , getRect().mBottom));
+ }
+ }
+}
void LLButton::setImages( const std::string &image_name, const std::string &selected_name )
{
setImageUnselected(image_name);
@@ -845,14 +885,20 @@ void LLButton::setImageDisabled(LLPointer<LLUIImage> image)
{
mImageDisabled = image;
mDisabledImageColor = mImageColor;
- mDisabledImageColor.mV[VALPHA] *= 0.5f;
+ mFadeWhenDisabled = TRUE;
}
void LLButton::setImageDisabledSelected(LLPointer<LLUIImage> image)
{
mImageDisabledSelected = image;
mDisabledImageColor = mImageColor;
- mDisabledImageColor.mV[VALPHA] *= 0.5f;
+ mFadeWhenDisabled = TRUE;
+}
+
+void LLButton::setDisabledImages( const std::string &image_name, const std::string &selected_name)
+{
+ setDisabledImages( image_name, selected_name, mImageColor.get());
+ mFadeWhenDisabled = TRUE;
}
void LLButton::setDisabledImages( const std::string &image_name, const std::string &selected_name, const LLColor4& c )
@@ -867,13 +913,6 @@ void LLButton::setImageHoverSelected(LLPointer<LLUIImage> image)
mImageHoverSelected = image;
}
-void LLButton::setDisabledImages( const std::string &image_name, const std::string &selected_name)
-{
- LLColor4 clr = mImageColor;
- clr.mV[VALPHA] *= .5f;
- setDisabledImages( image_name, selected_name, clr );
-}
-
void LLButton::setImageHoverUnselected(LLPointer<LLUIImage> image)
{
mImageHoverUnselected = image;
@@ -899,11 +938,9 @@ void LLButton::setImageOverlay(const std::string& image_name, LLFontGL::HAlign a
}
}
-
void LLButton::onMouseCaptureLost()
{
- mMouseDownTimer.stop();
- mMouseDownTimer.reset();
+ resetMouseDownTimer();
}
//-------------------------------------------------------------------------
@@ -975,28 +1012,6 @@ void LLButton::addImageAttributeToXML(LLXMLNodePtr node,
}
}
-// virtual
-LLXMLNodePtr LLButton::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- node->createChild("label", TRUE)->setStringValue(getLabelUnselected());
- node->createChild("label_selected", TRUE)->setStringValue(getLabelSelected());
- node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mGLFont));
- node->createChild("halign", TRUE)->setStringValue(LLFontGL::nameFromHAlign(mHAlign));
-
- addImageAttributeToXML(node,mImageUnselectedName,mImageUnselectedID,std::string("image_unselected"));
- addImageAttributeToXML(node,mImageSelectedName,mImageSelectedID,std::string("image_selected"));
- addImageAttributeToXML(node,mImageHoverSelectedName,mImageHoverSelectedID,std::string("image_hover_selected"));
- addImageAttributeToXML(node,mImageHoverUnselectedName,mImageHoverUnselectedID,std::string("image_hover_unselected"));
- addImageAttributeToXML(node,mImageDisabledName,mImageDisabledID,std::string("image_disabled"));
- addImageAttributeToXML(node,mImageDisabledSelectedName,mImageDisabledSelectedID,std::string("image_disabled_selected"));
-
- node->createChild("scale_image", TRUE)->setBoolValue(mScaleImage);
-
- return node;
-}
-
void clicked_help(void* data)
{
LLButton* self = (LLButton*)data;
@@ -1010,114 +1025,53 @@ void clicked_help(void* data)
LLUI::sHtmlHelp->show(self->getHelpURL());
}
-// static
-LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
+void LLButton::setHelpURLCallback(const std::string &help_url)
{
- std::string name("button");
- node->getAttributeString("name", name);
-
- std::string label = name;
- node->getAttributeString("label", label);
-
- std::string label_selected = label;
- node->getAttributeString("label_selected", label_selected);
-
- LLFontGL* font = selectFont(node);
-
- std::string image_unselected;
- if (node->hasAttribute("image_unselected")) node->getAttributeString("image_unselected",image_unselected);
-
- std::string image_selected;
- if (node->hasAttribute("image_selected")) node->getAttributeString("image_selected",image_selected);
-
- std::string image_hover_selected;
- if (node->hasAttribute("image_hover_selected")) node->getAttributeString("image_hover_selected",image_hover_selected);
-
- std::string image_hover_unselected;
- if (node->hasAttribute("image_hover_unselected")) node->getAttributeString("image_hover_unselected",image_hover_unselected);
-
- std::string image_disabled_selected;
- if (node->hasAttribute("image_disabled_selected")) node->getAttributeString("image_disabled_selected",image_disabled_selected);
-
- std::string image_disabled;
- if (node->hasAttribute("image_disabled")) node->getAttributeString("image_disabled",image_disabled);
-
- std::string image_overlay;
- node->getAttributeString("image_overlay", image_overlay);
-
- LLFontGL::HAlign image_overlay_alignment = LLFontGL::HCENTER;
- std::string image_overlay_alignment_string;
- if (node->hasAttribute("image_overlay_alignment"))
- {
- node->getAttributeString("image_overlay_alignment", image_overlay_alignment_string);
- image_overlay_alignment = LLFontGL::hAlignFromName(image_overlay_alignment_string);
- }
-
-
- LLButton *button = new LLButton(name,
- LLRect(),
- image_unselected,
- image_selected,
- LLStringUtil::null,
- NULL,
- parent,
- font,
- label,
- label_selected);
-
- node->getAttributeS32("pad_right", button->mRightHPad);
- node->getAttributeS32("pad_left", button->mLeftHPad);
+ mHelpURL = help_url;
+ setClickedCallback(clicked_help,this);
+}
- BOOL is_toggle = button->getIsToggle();
- node->getAttributeBOOL("toggle", is_toggle);
- button->setIsToggle(is_toggle);
+// static
+void LLButton::toggleFloaterAndSetToggleState(LLUICtrl* ctrl, const LLSD& sdname)
+{
+ bool floater_vis = LLFloaterReg::toggleInstance(sdname.asString());
+ LLButton* button = dynamic_cast<LLButton*>(ctrl);
+ if (button)
+ button->setToggleState(floater_vis);
+}
- if(image_hover_selected != LLStringUtil::null) button->setImageHoverSelected(image_hover_selected);
-
- if(image_hover_unselected != LLStringUtil::null) button->setImageHoverUnselected(image_hover_unselected);
-
- if(image_disabled_selected != LLStringUtil::null) button->setImageDisabledSelected(image_disabled_selected );
-
- if(image_disabled != LLStringUtil::null) button->setImageDisabled(image_disabled);
-
- if(image_overlay != LLStringUtil::null) button->setImageOverlay(image_overlay, image_overlay_alignment);
+// static
+// Gets called once
+void LLButton::setFloaterToggle(LLUICtrl* ctrl, const LLSD& sdname)
+{
+ LLButton* button = dynamic_cast<LLButton*>(ctrl);
+ if (!button)
+ return;
+ // Get the visibility control name for the floater
+ std::string vis_control_name = LLFloaterReg::declareVisibilityControl(sdname.asString());
+ // Set the button control value (toggle state) to the floater visibility control (Sets the value as well)
+ button->setControlVariable(LLUI::sSettingGroups["floater"]->getControl(vis_control_name));
+ // Set the clicked callback to toggle the floater
+ button->setClickedCallback(boost::bind(&LLFloaterReg::toggleFloaterInstance, sdname));
+}
- if (node->hasAttribute("halign"))
- {
- LLFontGL::HAlign halign = selectFontHAlign(node);
- button->setHAlign(halign);
- }
+void LLButton::resetMouseDownTimer()
+{
+ mMouseDownTimer.stop();
+ mMouseDownTimer.reset();
+}
- if (node->hasAttribute("scale_image"))
- {
- BOOL needsScale = FALSE;
- node->getAttributeBOOL("scale_image",needsScale);
- button->setScaleImage( needsScale );
- }
- if(label.empty())
- {
- button->setLabelUnselected(node->getTextContents());
- }
- if (label_selected.empty())
- {
- button->setLabelSelected(node->getTextContents());
- }
-
- if (node->hasAttribute("help_url"))
+// *TODO: Remove this function after the initial XUI XML re-export pass.
+// static
+void LLButton::setupParamsForExport(Params& p, LLView* parent)
+{
+ std::string label = p.label;
+ if (label.empty())
{
- std::string help_url;
- node->getAttributeString("help_url",help_url);
- button->setHelpURLCallback(help_url);
+ //if our label is empty this is a picture style button
+ p.picture_style = true;
}
- button->initFromXML(node, parent);
-
- return button;
-}
-
-void LLButton::setHelpURLCallback(const std::string &help_url)
-{
- mHelpURL = help_url;
- setClickedCallback(clicked_help,this);
+ LLUICtrl::setupParamsForExport(p, parent);
}
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 724b77541a..f146ef9dc2 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -39,7 +39,7 @@
#include "v4color.h"
#include "llframetimer.h"
#include "llfontgl.h"
-#include "llimage.h"
+#include "lluiimage.h"
#include "lluistring.h"
//
@@ -53,9 +53,6 @@ extern S32 LLBUTTON_V_PAD;
extern S32 BTN_HEIGHT_SMALL;
extern S32 BTN_HEIGHT;
-// All button widths should be rounded up to this size
-extern S32 BTN_GRID;
-
//
// Helpful functions
//
@@ -72,36 +69,80 @@ class LLButton
: public LLUICtrl
{
public:
- // simple button with text label
- LLButton(const std::string& name, const LLRect &rect, const std::string& control_name = std::string(),
- void (*on_click)(void*) = NULL, void *data = NULL);
-
- LLButton(const std::string& name, const LLRect& rect,
- const std::string &unselected_image,
- const std::string &selected_image,
- const std::string& control_name,
- void (*click_callback)(void*),
- void *callback_data = NULL,
- const LLFontGL* mGLFont = NULL,
- const std::string& unselected_label = LLStringUtil::null,
- const std::string& selected_label = LLStringUtil::null );
-
- virtual ~LLButton();
- void init(void (*click_callback)(void*), void *callback_data, const LLFontGL* font, const std::string& control_name);
-
+ struct Params
+ : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ // text label
+ Optional<std::string> label_selected;
+ Optional<bool> label_dropshadow;
+ Optional<bool> auto_resize;
+
+ // images
+ Optional<LLUIImage*> image_unselected,
+ image_selected,
+ image_hover_selected,
+ image_hover_unselected,
+ image_disabled_selected,
+ image_disabled,
+ image_overlay;
+
+ Optional<std::string> image_overlay_alignment;
+
+ // colors
+ Optional<LLUIColor> label_color,
+ label_color_selected,
+ label_color_disabled,
+ label_color_disabled_selected,
+ highlight_color,
+ image_color,
+ image_color_disabled,
+ image_overlay_color,
+ flash_color;
+
+ // layout
+ Optional<S32> pad_right;
+ Optional<S32> pad_left;
+
+ // callbacks
+ Optional<CommitCallbackParam> click_callback, // alias -> commit_callback
+ mouse_down_callback,
+ mouse_up_callback,
+ mouse_held_callback,
+ mouse_held_once_callback;
+
+ // misc
+ Optional<bool> is_toggle,
+ scale_image,
+ commit_on_return,
+ picture_style; //if true, don't display label
+
+ Optional<std::string> help_url;
+ Optional<F32> hover_glow_amount;
+ Optional<TimeIntervalParam> held_down_delay;
+
+ Params();
+ };
+protected:
+ friend class LLUICtrlFactory;
+ LLButton(const Params&);
+
+public:
+ // For backward compatability only
+ typedef boost::function<void(void*)> button_callback_t;
+
void addImageAttributeToXML(LLXMLNodePtr node, const std::string& imageName,
const LLUUID& imageID,const std::string& xmlTagName) const;
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-
virtual BOOL handleUnicodeCharHere(llwchar uni_char);
virtual BOOL handleKeyHere(KEY key, MASK mask);
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
virtual BOOL handleHover(S32 x, S32 y, MASK mask);
virtual void draw();
+ /*virtual*/ BOOL postBuild();
+ virtual void onMouseEnter(S32 x, S32 y, MASK mask);
+ virtual void onMouseLeave(S32 x, S32 y, MASK mask);
virtual void onMouseCaptureLost();
virtual void onCommit();
@@ -109,18 +150,24 @@ public:
void setUnselectedLabelColor( const LLColor4& c ) { mUnselectedLabelColor = c; }
void setSelectedLabelColor( const LLColor4& c ) { mSelectedLabelColor = c; }
- void setClickedCallback( void (*cb)(void *data), void* data = NULL ); // mouse down and up within button
- void setMouseDownCallback( void (*cb)(void *data) ) { mMouseDownCallback = cb; } // mouse down within button
- void setMouseUpCallback( void (*cb)(void *data) ) { mMouseUpCallback = cb; } // mouse up, EVEN IF NOT IN BUTTON
- void setHeldDownCallback( void (*cb)(void *data) ) { mHeldDownCallback = cb; } // Mouse button held down and in button
+ boost::signals::connection setClickedCallback( const commit_signal_t::slot_type& cb ); // mouse down and up within button
+ boost::signals::connection setMouseDownCallback( const commit_signal_t::slot_type& cb );
+ boost::signals::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ); // mouse up, EVEN IF NOT IN BUTTON
+ // Passes a 'count' parameter in the commit param payload, i.e. param["count"])
+ boost::signals::connection setHeldDownCallback( const commit_signal_t::slot_type& cb ); // Mouse button held down and in button
+
+ // *TODO: Deprecate (for backwards compatability only)
+ boost::signals::connection setClickedCallback( button_callback_t cb, void* data );
+ boost::signals::connection setMouseDownCallback( button_callback_t cb, void* data );
+ boost::signals::connection setMouseUpCallback( button_callback_t cb, void* data );
+ boost::signals::connection setHeldDownCallback( button_callback_t cb, void* data );
+
void setHeldDownDelay( F32 seconds, S32 frames = 0) { mHeldDownDelay = seconds; mHeldDownFrameDelay = frames; }
-
+
F32 getHeldDownTime() const { return mMouseDownTimer.getElapsedTimeF32(); }
- BOOL getIsToggle() const { return mIsToggle; }
- void setIsToggle(BOOL is_toggle) { mIsToggle = is_toggle; }
BOOL toggleState();
- BOOL getToggleState() const { return mToggleState; }
+ BOOL getToggleState() const;
void setToggleState(BOOL b);
void setFlashing( BOOL b );
@@ -150,11 +197,9 @@ public:
void setImageOverlay(const std::string& image_name, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white);
LLPointer<LLUIImage> getImageOverlay() { return mImageOverlay; }
-
-
- virtual void setValue(const LLSD& value );
- virtual LLSD getValue() const;
+ void autoResize(); // resize with label of current btn state
+ void resize(LLUIString label); // resize with label input
void setLabel( const LLStringExplicit& label);
virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text );
void setLabelUnselected(const LLStringExplicit& label);
@@ -172,8 +217,6 @@ public:
void setBorderEnabled(BOOL b) { mBorderEnabled = b; }
- static void onHeldDown(void *userdata); // to be called by gIdleCallbacks
-
void setHoverGlowStrength(F32 strength) { mHoverGlowStrength = strength; }
void setImageUnselected(const std::string &image_name);
@@ -198,6 +241,10 @@ public:
void setHelpURLCallback(const std::string &help_url);
const std::string& getHelpURL() const { return mHelpURL; }
+ static void onHeldDown(void *userdata); // to be called by gIdleCallbacks
+ static void toggleFloaterAndSetToggleState(LLUICtrl* ctrl, const LLSD& sdname);
+ static void setFloaterToggle(LLUICtrl* ctrl, const LLSD& sdname);
+
protected:
virtual void drawBorder(const LLColor4& color, S32 size);
@@ -212,45 +259,48 @@ protected:
void setImageDisabledSelectedID(const LLUUID &image_id);
const LLPointer<LLUIImage>& getImageUnselected() const { return mImageUnselected; }
const LLPointer<LLUIImage>& getImageSelected() const { return mImageSelected; }
+ void resetMouseDownTimer();
LLFrameTimer mMouseDownTimer;
-private:
-
- void (*mClickedCallback)(void* data );
- void (*mMouseDownCallback)(void *data);
- void (*mMouseUpCallback)(void *data);
- void (*mHeldDownCallback)(void *data);
+ // If the label is empty, set the picture_style attribute
+ static void setupParamsForExport(Params& p, LLView* parent);
+private:
+ commit_signal_t mMouseDownSignal;
+ commit_signal_t mMouseUpSignal;
+ commit_signal_t mHeldDownSignal;
+
const LLFontGL *mGLFont;
S32 mMouseDownFrame;
- F32 mHeldDownDelay; // seconds, after which held-down callbacks get called
+ S32 mMouseHeldDownCount; // Counter for parameter passed to held-down callback
+ F32 mHeldDownDelay; // seconds, after which held-down callbacks get called
S32 mHeldDownFrameDelay; // frames, after which held-down callbacks get called
- LLPointer<LLUIImage> mImageOverlay;
- LLFontGL::HAlign mImageOverlayAlignment;
- LLColor4 mImageOverlayColor;
+ LLPointer<LLUIImage> mImageOverlay;
+ LLFontGL::HAlign mImageOverlayAlignment;
+ LLUIColor mImageOverlayColor;
- LLPointer<LLUIImage> mImageUnselected;
- LLUIString mUnselectedLabel;
- LLColor4 mUnselectedLabelColor;
+ LLPointer<LLUIImage> mImageUnselected;
+ LLUIString mUnselectedLabel;
+ LLUIColor mUnselectedLabelColor;
- LLPointer<LLUIImage> mImageSelected;
- LLUIString mSelectedLabel;
- LLColor4 mSelectedLabelColor;
+ LLPointer<LLUIImage> mImageSelected;
+ LLUIString mSelectedLabel;
+ LLUIColor mSelectedLabelColor;
- LLPointer<LLUIImage> mImageHoverSelected;
+ LLPointer<LLUIImage> mImageHoverSelected;
- LLPointer<LLUIImage> mImageHoverUnselected;
+ LLPointer<LLUIImage> mImageHoverUnselected;
- LLPointer<LLUIImage> mImageDisabled;
- LLUIString mDisabledLabel;
- LLColor4 mDisabledLabelColor;
+ LLPointer<LLUIImage> mImageDisabled;
+ LLUIString mDisabledLabel;
+ LLUIColor mDisabledLabelColor;
- LLPointer<LLUIImage> mImageDisabledSelected;
- LLUIString mDisabledSelectedLabel;
- LLColor4 mDisabledSelectedLabelColor;
+ LLPointer<LLUIImage> mImageDisabledSelected;
+ LLUIString mDisabledSelectedLabel;
+ LLUIColor mDisabledSelectedLabelColor;
LLUUID mImageUnselectedID;
LLUUID mImageSelectedID;
@@ -265,20 +315,17 @@ private:
std::string mImageDisabledName;
std::string mImageDisabledSelectedName;
- LLColor4 mHighlightColor;
- LLColor4 mUnselectedBgColor;
- LLColor4 mSelectedBgColor;
- LLColor4 mFlashBgColor;
+ LLUIColor mHighlightColor;
+ LLUIColor mFlashBgColor;
- LLColor4 mImageColor;
- LLColor4 mDisabledImageColor;
+ LLUIColor mImageColor;
+ LLUIColor mDisabledImageColor;
BOOL mIsToggle;
- BOOL mToggleState;
BOOL mScaleImage;
BOOL mDropShadowedText;
-
+ BOOL mAutoResize;
BOOL mBorderEnabled;
BOOL mFlashing;
@@ -292,6 +339,7 @@ private:
BOOL mNeedsHighlight;
BOOL mCommitOnReturn;
+ BOOL mFadeWhenDisabled;
std::string mHelpURL;
@@ -300,4 +348,11 @@ private:
LLFrameTimer mFlashingTimer;
};
+#ifdef LL_WINDOWS
+#ifndef INSTANTIATE_GETCHILD_BUTTON
+#pragma warning (disable : 4231)
+extern template LLButton* LLView::getChild<LLButton>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
+#endif
+#endif
+
#endif // LL_LLBUTTON_H
diff --git a/indra/llui/llcallbackmap.h b/indra/llui/llcallbackmap.h
index eadb9c98f3..97b1e2fc50 100644
--- a/indra/llui/llcallbackmap.h
+++ b/indra/llui/llcallbackmap.h
@@ -30,11 +30,11 @@
* $/LicenseInfo$
*/
-#ifndef LL_CALLBACK_MAP_H
-#define LL_CALLBACK_MAP_H
+#ifndef LLCALLBACKMAP_H
+#define LLCALLBACKMAP_H
#include <map>
-#include "llstring.h"
+#include <string>
class LLCallbackMap
{
@@ -45,12 +45,19 @@ public:
typedef std::map<std::string, LLCallbackMap> map_t;
typedef map_t::iterator map_iter_t;
typedef map_t::const_iterator map_const_iter_t;
-
+
+ template <class T>
+ static void* buildPanel(void* data)
+ {
+ T* panel = new T();
+ return (void*)panel;
+ }
+
LLCallbackMap() : mCallback(NULL), mData(NULL) { }
- LLCallbackMap(callback_t callback, void* data) : mCallback(callback), mData(data) { }
+ LLCallbackMap(callback_t callback, void* data = NULL) : mCallback(callback), mData(data) { }
callback_t mCallback;
void* mData;
};
-#endif // LL_CALLBACK_MAP_H
+#endif // LLCALLBACKMAP_H
diff --git a/indra/llui/llcheckboxctrl.cpp b/indra/llui/llcheckboxctrl.cpp
index eda9467d87..7b37344db7 100644
--- a/indra/llui/llcheckboxctrl.cpp
+++ b/indra/llui/llcheckboxctrl.cpp
@@ -31,6 +31,7 @@
*/
// The mutants are coming!
+#define INSTANTIATE_GETCHILD_CHECKBOX
#include "linden_common.h"
@@ -49,101 +50,88 @@
const U32 MAX_STRING_LENGTH = 10;
+template LLCheckBoxCtrl* LLView::getChild<LLCheckBoxCtrl>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
+
static LLRegisterWidget<LLCheckBoxCtrl> r("check_box");
-
-LLCheckBoxCtrl::LLCheckBoxCtrl(const std::string& name, const LLRect& rect,
- const std::string& label,
- const LLFontGL* font,
- void (*commit_callback)(LLUICtrl* ctrl, void* userdata),
- void* callback_user_data,
- BOOL initial_value,
- BOOL use_radio_style,
- const std::string& control_which)
-: LLUICtrl(name, rect, TRUE, commit_callback, callback_user_data, FOLLOWS_LEFT | FOLLOWS_TOP),
- mTextEnabledColor( LLUI::sColorsGroup->getColor( "LabelTextColor" ) ),
- mTextDisabledColor( LLUI::sColorsGroup->getColor( "LabelDisabledColor" ) ),
- mRadioStyle( use_radio_style ),
- mInitialValue( initial_value ),
- mSetValue( initial_value )
+LLCheckBoxCtrl::Params::Params()
+: text_enabled_color("text_enabled_color"),
+ text_disabled_color("text_disabled_color"),
+ initial_value("initial_value", false),
+ label_text("label_text"),
+ check_button("check_button"),
+ radio_style("radio_style")
+{}
+
+
+LLCheckBoxCtrl::LLCheckBoxCtrl(const LLCheckBoxCtrl::Params& p)
+: LLUICtrl(p),
+ mTextEnabledColor(p.text_enabled_color()),
+ mTextDisabledColor(p.text_disabled_color()),
+ mFont(p.font())
{
- if (font)
- {
- mFont = font;
- }
- else
- {
- mFont = LLFontGL::getFontSansSerifSmall();
- }
+ mViewModel->setValue(LLSD(p.initial_value));
+ mViewModel->resetDirty();
+ static LLUICachedControl<S32> llcheckboxctrl_spacing ("UICheckboxctrlSpacing", 0);
+ static LLUICachedControl<S32> llcheckboxctrl_hpad ("UICheckboxctrlHPad", 0);
+ static LLUICachedControl<S32> llcheckboxctrl_vpad ("UICheckboxctrlVPad", 0);
+ static LLUICachedControl<S32> llcheckboxctrl_btn_size ("UICheckboxctrlBtnSize", 0);
// must be big enough to hold all children
setUseBoundingRect(TRUE);
- mKeyboardFocusOnClick = TRUE;
-
// Label (add a little space to make sure text actually renders)
const S32 FUDGE = 10;
- S32 text_width = mFont->getWidth( label ) + FUDGE;
+ S32 text_width = mFont->getWidth( p.label ) + FUDGE;
S32 text_height = llround(mFont->getLineHeight());
LLRect label_rect;
label_rect.setOriginAndSize(
- LLCHECKBOXCTRL_HPAD + LLCHECKBOXCTRL_BTN_SIZE + LLCHECKBOXCTRL_SPACING,
- LLCHECKBOXCTRL_VPAD + 1, // padding to get better alignment
- text_width + LLCHECKBOXCTRL_HPAD,
+ llcheckboxctrl_hpad + llcheckboxctrl_btn_size + llcheckboxctrl_spacing,
+ llcheckboxctrl_vpad + 1, // padding to get better alignment
+ text_width + llcheckboxctrl_hpad,
text_height );
// *HACK Get rid of this with SL-55508...
// this allows blank check boxes and radio boxes for now
- std::string local_label = label;
+ std::string local_label = p.label;
if(local_label.empty())
{
local_label = " ";
}
- mLabel = new LLTextBox( std::string("CheckboxCtrl Label"), label_rect, local_label, mFont );
- mLabel->setFollowsLeft();
- mLabel->setFollowsBottom();
+ LLTextBox::Params tbparams = p.label_text;
+ tbparams.rect(label_rect);
+ tbparams.text(local_label);
+ if (p.font.isProvided())
+ {
+ tbparams.font(p.font);
+ }
+ mLabel = LLUICtrlFactory::create<LLTextBox> (tbparams);
+
addChild(mLabel);
// Button
// Note: button cover the label by extending all the way to the right.
LLRect btn_rect;
btn_rect.setOriginAndSize(
- LLCHECKBOXCTRL_HPAD,
- LLCHECKBOXCTRL_VPAD,
- LLCHECKBOXCTRL_BTN_SIZE + LLCHECKBOXCTRL_SPACING + text_width + LLCHECKBOXCTRL_HPAD,
- llmax( text_height, LLCHECKBOXCTRL_BTN_SIZE ) + LLCHECKBOXCTRL_VPAD);
+ llcheckboxctrl_hpad,
+ llcheckboxctrl_vpad,
+ llcheckboxctrl_btn_size + llcheckboxctrl_spacing + text_width + llcheckboxctrl_hpad,
+ llmax( text_height, llcheckboxctrl_btn_size() ) + llcheckboxctrl_vpad);
std::string active_true_id, active_false_id;
std::string inactive_true_id, inactive_false_id;
- if (mRadioStyle)
- {
- active_true_id = "UIImgRadioActiveSelectedUUID";
- active_false_id = "UIImgRadioActiveUUID";
- inactive_true_id = "UIImgRadioInactiveSelectedUUID";
- inactive_false_id = "UIImgRadioInactiveUUID";
- mButton = new LLButton(std::string("Radio control button"), btn_rect,
- active_false_id, active_true_id, control_which,
- &LLCheckBoxCtrl::onButtonPress, this, LLFontGL::getFontSansSerif() );
- mButton->setDisabledImages( inactive_false_id, inactive_true_id );
- mButton->setHoverGlowStrength(0.35f);
- }
- else
- {
- active_false_id = "UIImgCheckboxActiveUUID";
- active_true_id = "UIImgCheckboxActiveSelectedUUID";
- inactive_true_id = "UIImgCheckboxInactiveSelectedUUID";
- inactive_false_id = "UIImgCheckboxInactiveUUID";
- mButton = new LLButton(std::string("Checkbox control button"), btn_rect,
- active_false_id, active_true_id, control_which,
- &LLCheckBoxCtrl::onButtonPress, this, LLFontGL::getFontSansSerif() );
- mButton->setDisabledImages( inactive_false_id, inactive_true_id );
- mButton->setHoverGlowStrength(0.35f);
- }
- mButton->setIsToggle(TRUE);
- mButton->setToggleState( initial_value );
- mButton->setFollowsLeft();
- mButton->setFollowsBottom();
- mButton->setCommitOnReturn(FALSE);
+
+ LLButton::Params params = p.check_button;
+ params.rect(btn_rect);
+ //params.control_name(p.control_name);
+ params.click_callback.function(boost::bind(&LLCheckBoxCtrl::onButtonPress, this, _2));
+ params.commit_on_return(false);
+ // Checkboxes only allow boolean initial values, but buttons can
+ // take any LLSD.
+ params.initial_value(LLSD(p.initial_value));
+ params.follows.flags(FOLLOWS_LEFT | FOLLOWS_BOTTOM);
+
+ mButton = LLUICtrlFactory::create<LLButton>(params);
addChild(mButton);
}
@@ -154,24 +142,14 @@ LLCheckBoxCtrl::~LLCheckBoxCtrl()
// static
-void LLCheckBoxCtrl::onButtonPress( void *userdata )
+void LLCheckBoxCtrl::onButtonPress( const LLSD& data )
{
- LLCheckBoxCtrl* self = (LLCheckBoxCtrl*) userdata;
+ //if (mRadioStyle)
+ //{
+ // setValue(TRUE);
+ //}
- if (self->mRadioStyle)
- {
- self->setValue(TRUE);
- }
-
- self->setControlValue(self->getValue());
- // HACK: because buttons don't normally commit
- self->onCommit();
-
- if (self->mKeyboardFocusOnClick)
- {
- self->setFocus( TRUE );
- self->onFocusReceived();
- }
+ onCommit();
}
void LLCheckBoxCtrl::onCommit()
@@ -179,6 +157,7 @@ void LLCheckBoxCtrl::onCommit()
if( getEnabled() )
{
setTentative(FALSE);
+ setControlValue(getValue());
LLUICtrl::onCommit();
}
}
@@ -187,6 +166,15 @@ void LLCheckBoxCtrl::setEnabled(BOOL b)
{
LLView::setEnabled(b);
mButton->setEnabled(b);
+
+ if (b)
+ {
+ mLabel->setColor( mTextEnabledColor.get() );
+ }
+ else
+ {
+ mLabel->setColor( mTextDisabledColor.get() );
+ }
}
void LLCheckBoxCtrl::clear()
@@ -197,43 +185,33 @@ void LLCheckBoxCtrl::clear()
void LLCheckBoxCtrl::reshape(S32 width, S32 height, BOOL called_from_parent)
{
//stretch or shrink bounding rectangle of label when rebuilding UI at new scale
+ static LLUICachedControl<S32> llcheckboxctrl_spacing ("UICheckboxctrlSpacing", 0);
+ static LLUICachedControl<S32> llcheckboxctrl_hpad ("UICheckboxctrlHPad", 0);
+ static LLUICachedControl<S32> llcheckboxctrl_vpad ("UICheckboxctrlVPad", 0);
+ static LLUICachedControl<S32> llcheckboxctrl_btn_size ("UICheckboxctrlBtnSize", 0);
+
const S32 FUDGE = 10;
S32 text_width = mFont->getWidth( mLabel->getText() ) + FUDGE;
S32 text_height = llround(mFont->getLineHeight());
LLRect label_rect;
label_rect.setOriginAndSize(
- LLCHECKBOXCTRL_HPAD + LLCHECKBOXCTRL_BTN_SIZE + LLCHECKBOXCTRL_SPACING,
- LLCHECKBOXCTRL_VPAD,
+ llcheckboxctrl_hpad + llcheckboxctrl_btn_size + llcheckboxctrl_spacing,
+ llcheckboxctrl_vpad,
text_width,
text_height );
mLabel->setRect(label_rect);
LLRect btn_rect;
btn_rect.setOriginAndSize(
- LLCHECKBOXCTRL_HPAD,
- LLCHECKBOXCTRL_VPAD,
- LLCHECKBOXCTRL_BTN_SIZE + LLCHECKBOXCTRL_SPACING + text_width,
- llmax( text_height, LLCHECKBOXCTRL_BTN_SIZE ) );
+ llcheckboxctrl_hpad,
+ llcheckboxctrl_vpad,
+ llcheckboxctrl_btn_size + llcheckboxctrl_spacing + text_width,
+ llmax( text_height, llcheckboxctrl_btn_size() ) );
mButton->setRect( btn_rect );
LLUICtrl::reshape(width, height, called_from_parent);
}
-void LLCheckBoxCtrl::draw()
-{
- if (getEnabled())
- {
- mLabel->setColor( mTextEnabledColor );
- }
- else
- {
- mLabel->setColor( mTextDisabledColor );
- }
-
- // Draw children
- LLUICtrl::draw();
-}
-
//virtual
void LLCheckBoxCtrl::setValue(const LLSD& value )
{
@@ -246,6 +224,18 @@ LLSD LLCheckBoxCtrl::getValue() const
return mButton->getValue();
}
+//virtual
+void LLCheckBoxCtrl::setTentative(BOOL b)
+{
+ mButton->setTentative(b);
+}
+
+//virtual
+BOOL LLCheckBoxCtrl::getTentative() const
+{
+ return mButton->getTentative();
+}
+
void LLCheckBoxCtrl::setLabel( const LLStringExplicit& label )
{
mLabel->setText( label );
@@ -264,12 +254,6 @@ BOOL LLCheckBoxCtrl::setLabelArg( const std::string& key, const LLStringExplicit
return res;
}
-//virtual
-std::string LLCheckBoxCtrl::getControlName() const
-{
- return mButton->getControlName();
-}
-
// virtual
void LLCheckBoxCtrl::setControlName(const std::string& control_name, LLView* context)
{
@@ -282,7 +266,7 @@ BOOL LLCheckBoxCtrl::isDirty() const
{
if ( mButton )
{
- return (mSetValue != mButton->getToggleState());
+ return mButton->isDirty();
}
return FALSE; // Shouldn't get here
}
@@ -293,78 +277,6 @@ void LLCheckBoxCtrl::resetDirty()
{
if ( mButton )
{
- mSetValue = mButton->getToggleState();
- }
-}
-
-
-
-// virtual
-LLXMLNodePtr LLCheckBoxCtrl::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- node->createChild("label", TRUE)->setStringValue(mLabel->getText());
-
- std::string control_name = mButton->getControlName();
-
- node->createChild("initial_value", TRUE)->setBoolValue(mInitialValue);
-
- node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mFont));
-
- node->createChild("radio_style", TRUE)->setBoolValue(mRadioStyle);
-
- return node;
-}
-
-// static
-LLView* LLCheckBoxCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("checkbox");
- node->getAttributeString("name", name);
-
- std::string label("");
- node->getAttributeString("label", label);
-
- LLFontGL* font = LLView::selectFont(node);
-
- BOOL radio_style = FALSE;
- node->getAttributeBOOL("radio_style", radio_style);
-
- LLUICtrlCallback callback = NULL;
-
- if (label.empty())
- {
- label.assign(node->getTextContents());
+ mButton->resetDirty();
}
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- LLCheckBoxCtrl* checkbox = new LLCheckboxCtrl(name,
- rect,
- label,
- font,
- callback,
- NULL,
- FALSE,
- radio_style); // if true, draw radio button style icons
-
- BOOL initial_value = checkbox->getValue().asBoolean();
- node->getAttributeBOOL("initial_value", initial_value);
-
- LLColor4 color;
- color = LLUI::sColorsGroup->getColor( "LabelTextColor" );
- LLUICtrlFactory::getAttributeColor(node,"text_enabled_color", color);
- checkbox->setEnabledColor(color);
-
- color = LLUI::sColorsGroup->getColor( "LabelDisabledColor" );
- LLUICtrlFactory::getAttributeColor(node,"text_disabled_color", color);
- checkbox->setDisabledColor(color);
-
- checkbox->setValue(initial_value);
-
- checkbox->initFromXML(node, parent);
-
- return checkbox;
}
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h
index ff867f5193..fe719e3b6a 100644
--- a/indra/llui/llcheckboxctrl.h
+++ b/indra/llui/llcheckboxctrl.h
@@ -33,24 +33,14 @@
#ifndef LL_LLCHECKBOXCTRL_H
#define LL_LLCHECKBOXCTRL_H
-
-#include "stdtypes.h"
#include "lluictrl.h"
#include "llbutton.h"
+#include "lltextbox.h"
#include "v4color.h"
-#include "llrect.h"
//
// Constants
//
-const S32 LLCHECKBOXCTRL_BTN_SIZE = 13;
-const S32 LLCHECKBOXCTRL_VPAD = 2;
-const S32 LLCHECKBOXCTRL_HPAD = 2;
-const S32 LLCHECKBOXCTRL_SPACING = 5;
-const S32 LLCHECKBOXCTRL_HEIGHT = 16;
-
-// Deprecated, don't use.
-#define CHECKBOXCTRL_HEIGHT LLCHECKBOXCTRL_HEIGHT
const BOOL RADIO_STYLE = TRUE;
const BOOL CHECK_STYLE = FALSE;
@@ -59,30 +49,38 @@ const BOOL CHECK_STYLE = FALSE;
// Classes
//
class LLFontGL;
-class LLTextBox;
class LLViewBorder;
class LLCheckBoxCtrl
: public LLUICtrl
{
public:
- LLCheckBoxCtrl(const std::string& name, const LLRect& rect, const std::string& label,
- const LLFontGL* font = NULL,
- void (*commit_callback)(LLUICtrl*, void*) = NULL,
- void* callback_userdata = NULL,
- BOOL initial_value = FALSE,
- BOOL use_radio_style = FALSE, // if true, draw radio button style icons
- const std::string& control_which = LLStringUtil::null);
+ struct Params
+ : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<LLUIColor> text_enabled_color;
+ Optional<LLUIColor> text_disabled_color;
+ Optional<bool> initial_value; // override LLUICtrl initial_value
+
+ Optional<LLTextBox::Params> label_text;
+ Optional<LLButton::Params> check_button;
+
+ Deprecated radio_style;
+
+ Params();
+ };
+
virtual ~LLCheckBoxCtrl();
- // LLView interface
+protected:
+ LLCheckBoxCtrl(const Params&);
+ friend class LLUICtrlFactory;
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+public:
+ // LLView interface
virtual void setEnabled( BOOL b );
- virtual void draw();
virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
// LLUICtrl interface
@@ -91,8 +89,8 @@ public:
BOOL get() { return (BOOL)getValue().asBoolean(); }
void set(BOOL value) { setValue(value); }
- virtual void setTentative(BOOL b) { mButton->setTentative(b); }
- virtual BOOL getTentative() const { return mButton->getTentative(); }
+ virtual void setTentative(BOOL b);
+ virtual BOOL getTentative() const;
virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text );
@@ -108,10 +106,11 @@ public:
void setLabel( const LLStringExplicit& label );
std::string getLabel() const;
+ void setFont( const LLFontGL* font ) { mFont = font; }
+
virtual void setControlName(const std::string& control_name, LLView* context);
- virtual std::string getControlName() const;
- static void onButtonPress(void *userdata);
+ void onButtonPress(const LLSD& data);
virtual BOOL isDirty() const; // Returns TRUE if the user has modified this control.
virtual void resetDirty(); // Clear dirty state
@@ -121,19 +120,17 @@ protected:
LLButton* mButton;
LLTextBox* mLabel;
const LLFontGL* mFont;
- LLColor4 mTextEnabledColor;
- LLColor4 mTextDisabledColor;
- BOOL mRadioStyle;
- BOOL mInitialValue; // Value set in constructor
- BOOL mSetValue; // Value set programmatically
- BOOL mKeyboardFocusOnClick;
- LLViewBorder* mBorder;
-};
+ LLUIColor mTextEnabledColor;
+ LLUIColor mTextDisabledColor;
+};
-// HACK: fix old capitalization problem
-//typedef LLCheckBoxCtrl LLCheckboxCtrl;
-#define LLCheckboxCtrl LLCheckBoxCtrl
+#ifdef LL_WINDOWS
+#ifndef INSTANTIATE_GETCHILD_CHECKBOX
+#pragma warning (disable : 4231)
+extern template LLCheckBoxCtrl* LLView::getChild<LLCheckBoxCtrl>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
+#endif
+#endif
#endif // LL_LLCHECKBOXCTRL_H
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 28a05c13f5..09f7a6c813 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -33,6 +33,8 @@
// A control that displays the name of the chosen item, which when
// clicked shows a scrolling box of options.
+#define INSTANTIATE_GETCHILD_COMBOBOX
+
#include "linden_common.h"
// file includes
@@ -48,167 +50,128 @@
#include "llwindow.h"
#include "llfloater.h"
#include "llscrollbar.h"
+#include "llscrolllistcell.h"
+#include "llscrolllistitem.h"
#include "llcontrol.h"
#include "llfocusmgr.h"
#include "lllineeditor.h"
#include "v2math.h"
+#include "lluictrlfactory.h"
// Globals
S32 LLCOMBOBOX_HEIGHT = 0;
S32 LLCOMBOBOX_WIDTH = 0;
S32 MAX_COMBO_WIDTH = 500;
-static LLRegisterWidget<LLComboBox> r1("combo_box");
+template LLComboBox* LLView::getChild<LLComboBox>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-LLComboBox::LLComboBox( const std::string& name, const LLRect &rect, const std::string& label,
- void (*commit_callback)(LLUICtrl*,void*),
- void *callback_userdata
- )
-: LLUICtrl(name, rect, TRUE, commit_callback, callback_userdata,
- FOLLOWS_LEFT | FOLLOWS_TOP),
- mTextEntry(NULL),
- mArrowImage(NULL),
- mAllowTextEntry(FALSE),
- mMaxChars(20),
- mTextEntryTentative(TRUE),
- mListPosition(BELOW),
- mPrearrangeCallback( NULL ),
- mTextEntryCallback( NULL ),
- mLabel(label)
-{
- // Always use text box
- // Text label button
- mButton = new LLButton(mLabel,
- LLRect(),
- LLStringUtil::null,
- NULL, this);
- mButton->setImageUnselected(std::string("square_btn_32x128.tga"));
- mButton->setImageSelected(std::string("square_btn_selected_32x128.tga"));
- mButton->setImageDisabled(std::string("square_btn_32x128.tga"));
- mButton->setImageDisabledSelected(std::string("square_btn_selected_32x128.tga"));
- mButton->setScaleImage(TRUE);
-
- mButton->setMouseDownCallback(onButtonDown);
- mButton->setFont(LLFontGL::getFontSansSerifSmall());
- mButton->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
- mButton->setHAlign( LLFontGL::LEFT );
- mButton->setRightHPad(2);
- addChild(mButton);
+static LLRegisterWidget<LLComboBox> register_combo_box("combo_box");
- // disallow multiple selection
- mList = new LLScrollListCtrl(std::string("ComboBox"), LLRect(),
- &LLComboBox::onItemSelected, this, FALSE);
- mList->setVisible(FALSE);
- mList->setBgWriteableColor( LLColor4(1,1,1,1) );
- mList->setCommitOnKeyboardMovement(FALSE);
- addChild(mList);
-
- mArrowImage = LLUI::sImageProvider->getUIImage("combobox_arrow.tga");
- mButton->setImageOverlay("combobox_arrow.tga", LLFontGL::RIGHT);
+void LLComboBox::PreferredPositionValues::declareValues()
+{
+ declare("above", ABOVE);
+ declare("below", BELOW);
+}
- updateLayout();
+LLComboBox::ItemParams::ItemParams()
+: label("label")
+{
}
-LLComboBox::~LLComboBox()
+LLComboBox::Params::Params()
+: allow_text_entry("allow_text_entry", false),
+ show_text_as_tentative("show_text_as_tentative", true),
+ max_chars("max_chars", 20),
+ arrow_image("arrow_image"),
+ list_position("list_position", BELOW),
+ items("item"),
+ combo_button("combo_button"),
+ combo_list("combo_list"),
+ combo_editor("combo_editor")
{
- // children automatically deleted, including mMenu, mButton
+ addSynonym(items, "combo_item");
}
-// virtual
-LLXMLNodePtr LLComboBox::getXML(bool save_children) const
+
+LLComboBox::LLComboBox(const LLComboBox::Params& p)
+: LLUICtrl(p),
+ mTextEntry(NULL),
+ mTextEntryTentative(p.show_text_as_tentative),
+ mAllowTextEntry(p.allow_text_entry),
+ mMaxChars(p.max_chars),
+ mPrearrangeCallback(p.prearrange_callback()),
+ mTextEntryCallback(p.text_entry_callback()),
+ mSelectionCallback(p.selection_callback()),
+ mArrowImage(p.arrow_image),
+ mListPosition(p.list_position)
{
- LLXMLNodePtr node = LLUICtrl::getXML();
+ // Text label button
- // Attributes
+ LLButton::Params button_params = p.combo_button;
+ button_params.mouse_down_callback.function(boost::bind(&LLComboBox::onButtonDown, this));
+ button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM|FOLLOWS_RIGHT);
+ button_params.rect(p.rect);
+ button_params.pad_right(2);
- node->createChild("allow_text_entry", TRUE)->setBoolValue(mAllowTextEntry);
+ mButton = LLUICtrlFactory::create<LLButton>(button_params);
+ mButton->setRightHPad(2); //redo to compensate for button hack that leaves space for a character
+ addChild(mButton);
- node->createChild("max_chars", TRUE)->setIntValue(mMaxChars);
+ LLScrollListCtrl::Params params = p.combo_list;
+ params.name("ComboBox");
+ params.commit_callback.function(boost::bind(&LLComboBox::onItemSelected, this, _2));
+ params.visible(false);
+ params.commit_on_keyboard_movement(false);
- // Contents
+ mList = LLUICtrlFactory::create<LLScrollListCtrl>(params);
+ addChild(mList);
- std::vector<LLScrollListItem*> data_list = mList->getAllData();
- std::vector<LLScrollListItem*>::iterator data_itor;
- for (data_itor = data_list.begin(); data_itor != data_list.end(); ++data_itor)
+ for (LLInitParam::ParamIterator<ItemParams>::const_iterator it = p.items().begin();
+ it != p.items().end();
+ ++it)
{
- LLScrollListItem* item = *data_itor;
- LLScrollListCell* cell = item->getColumn(0);
- if (cell)
+ LLScrollListItem::Params item_params = *it;
+ if (it->label.isProvided())
{
- LLXMLNodePtr item_node = node->createChild("combo_item", FALSE);
- LLSD value = item->getValue();
- item_node->createChild("value", TRUE)->setStringValue(value.asString());
- item_node->createChild("enabled", TRUE)->setBoolValue(item->getEnabled());
- item_node->setStringValue(cell->getValue().asString());
+ item_params.cells.add().value(it->label());
}
+
+ mList->addRow(item_params);
}
- return node;
+ createLineEditor(p);
+
+ setTopLostCallback(boost::bind(&LLComboBox::hideList, this));
}
-// static
-LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
+void LLComboBox::initFromParams(const LLComboBox::Params& p)
{
- std::string name("combo_box");
- node->getAttributeString("name", name);
-
- std::string label("");
- node->getAttributeString("label", label);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- BOOL allow_text_entry = FALSE;
- node->getAttributeBOOL("allow_text_entry", allow_text_entry);
-
- S32 max_chars = 20;
- node->getAttributeS32("max_chars", max_chars);
-
- LLUICtrlCallback callback = NULL;
-
- LLComboBox* combo_box = new LLComboBox(name,
- rect,
- label,
- callback,
- NULL);
- combo_box->setAllowTextEntry(allow_text_entry, max_chars);
+ LLUICtrl::initFromParams(p);
- combo_box->initFromXML(node, parent);
-
- const std::string& contents = node->getValue();
-
- if (contents.find_first_not_of(" \n\t") != contents.npos)
- {
- llerrs << "Legacy combo box item format used! Please convert to <combo_item> tags!" << llendl;
- }
- else
+ if (!acceptsTextInput() && mLabel.empty())
{
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
- {
- if (child->hasName("combo_item"))
- {
- std::string label = child->getTextContents();
-
- std::string value = label;
- child->getAttributeString("value", value);
-
- combo_box->add(label, LLSD(value) );
- }
- }
+ selectFirstItem();
}
+}
- // if providing user text entry or descriptive label
- // don't select an item under the hood
- if (!combo_box->acceptsTextInput() && combo_box->mLabel.empty())
+// virtual
+BOOL LLComboBox::postBuild()
+{
+ if (mControlVariable)
{
- combo_box->selectFirstItem();
+ setValue(mControlVariable->getValue()); // selects the appropriate item
}
+ return TRUE;
+}
+
- return combo_box;
+LLComboBox::~LLComboBox()
+{
+ // children automatically deleted, including mMenu, mButton
}
+
void LLComboBox::setEnabled(BOOL enabled)
{
LLView::setEnabled(enabled);
@@ -237,6 +200,7 @@ void LLComboBox::onCommit()
mTextEntry->setValue(getSimple());
mTextEntry->setTentative(FALSE);
}
+ setControlValue(getValue());
LLUICtrl::onCommit();
}
@@ -431,6 +395,7 @@ BOOL LLComboBox::remove(S32 index)
if (index < mList->getItemCount())
{
mList->deleteSingleItem(index);
+ setLabel(mList->getSelectedItemLabel());
return TRUE;
}
return FALSE;
@@ -448,21 +413,17 @@ void LLComboBox::onFocusLost()
LLUICtrl::onFocusLost();
}
-void LLComboBox::onLostTop()
-{
- hideList();
-}
-
-
void LLComboBox::setButtonVisible(BOOL visible)
{
+ static LLUICachedControl<S32> drop_shadow_button ("DropShadowButton", 0);
+
mButton->setVisible(visible);
if (mTextEntry)
{
LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
if (visible)
{
- text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth()) + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
+ text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth()) + 2 * drop_shadow_button;
}
//mTextEntry->setRect(text_entry_rect);
mTextEntry->reshape(text_entry_rect.getWidth(), text_entry_rect.getHeight(), TRUE);
@@ -498,54 +459,48 @@ S32 LLComboBox::getCurrentIndex() const
}
-void LLComboBox::updateLayout()
+void LLComboBox::createLineEditor(const LLComboBox::Params& p)
{
+ static LLUICachedControl<S32> drop_shadow_button ("DropShadowButton", 0);
LLRect rect = getLocalRect();
if (mAllowTextEntry)
{
- S32 shadow_size = LLUI::sConfigGroup->getS32("DropShadowButton");
+ S32 shadow_size = drop_shadow_button;
mButton->setRect(LLRect( getRect().getWidth() - llmax(8,mArrowImage->getWidth()) - 2 * shadow_size,
rect.mTop, rect.mRight, rect.mBottom));
mButton->setTabStop(FALSE);
+ mButton->setHAlign(LLFontGL::HCENTER);
- if (!mTextEntry)
- {
- LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
- text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth()) + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
- // clear label on button
- std::string cur_label = mButton->getLabelSelected();
- mTextEntry = new LLLineEditor(std::string("combo_text_entry"),
- text_entry_rect,
- LLStringUtil::null,
- LLFontGL::getFontSansSerifSmall(),
- mMaxChars,
- onTextCommit,
- onTextEntry,
- NULL,
- this);
- mTextEntry->setSelectAllonFocusReceived(TRUE);
- mTextEntry->setHandleEditKeysDirectly(TRUE);
- mTextEntry->setCommitOnFocusLost(FALSE);
- mTextEntry->setText(cur_label);
- mTextEntry->setIgnoreTab(TRUE);
- mTextEntry->setFollowsAll();
- addChild(mTextEntry);
- }
- else
- {
- mTextEntry->setVisible(TRUE);
- mTextEntry->setMaxTextLength(mMaxChars);
- }
+ LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
+ text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth()) + 2 * drop_shadow_button;
+ // clear label on button
+ std::string cur_label = mButton->getLabelSelected();
+ LLLineEditor::Params params = p.combo_editor;
+ params.rect(text_entry_rect);
+ params.default_text(LLStringUtil::null);
+ params.max_length_bytes(mMaxChars);
+ params.commit_callback.function(boost::bind(&LLComboBox::onTextCommit, this, _2));
+ params.keystroke_callback(boost::bind(&LLComboBox::onTextEntry, this, _1));
+ params.focus_lost_callback(NULL);
+ params.select_on_focus(true);
+ params.handle_edit_keys_directly(true);
+ params.commit_on_focus_lost(false);
+ params.follows.flags(FOLLOWS_ALL);
+ mTextEntry = LLUICtrlFactory::create<LLLineEditor> (params);
+ mTextEntry->setText(cur_label);
+ mTextEntry->setIgnoreTab(TRUE);
+ addChild(mTextEntry);
// clear label on button
setLabel(LLStringUtil::null);
mButton->setFollows(FOLLOWS_BOTTOM | FOLLOWS_TOP | FOLLOWS_RIGHT);
}
- else if (!mAllowTextEntry)
+ else
{
mButton->setRect(rect);
mButton->setTabStop(TRUE);
+ mButton->setHAlign(LLFontGL::LEFT);
if (mTextEntry)
{
@@ -672,7 +627,7 @@ void LLComboBox::hideList()
mButton->setToggleState(FALSE);
mList->setVisible(FALSE);
- mList->highlightNthItem(-1);
+ mList->mouseOverHighlightNthItem(-1);
setUseBoundingRect(FALSE);
if( gFocusMgr.getTopCtrl() == this )
@@ -681,74 +636,74 @@ void LLComboBox::hideList()
}
}
-//------------------------------------------------------------------
-// static functions
-//------------------------------------------------------------------
-
-// static
-void LLComboBox::onButtonDown(void *userdata)
+void LLComboBox::onButtonDown()
{
- LLComboBox *self = (LLComboBox *)userdata;
-
- if (!self->mList->getVisible())
+ if (!mList->getVisible())
{
- LLScrollListItem* last_selected_item = self->mList->getLastSelectedItem();
+ LLScrollListItem* last_selected_item = mList->getLastSelectedItem();
if (last_selected_item)
{
// highlight the original selection before potentially selecting a new item
- self->mList->highlightNthItem(self->mList->getItemIndex(last_selected_item));
+ mList->mouseOverHighlightNthItem(mList->getItemIndex(last_selected_item));
}
- if( self->mPrearrangeCallback )
+ if( mPrearrangeCallback )
{
- self->mPrearrangeCallback( self, self->mCallbackUserData );
+ mPrearrangeCallback( this, LLSD() );
}
- if (self->mList->getItemCount() != 0)
+ if (mList->getItemCount() != 0)
{
- self->showList();
+ showList();
}
- self->setFocus( TRUE );
+ setFocus( TRUE );
// pass mouse capture on to list if button is depressed
- if (self->mButton->hasMouseCapture())
+ if (mButton->hasMouseCapture())
{
- gFocusMgr.setMouseCapture(self->mList);
+ gFocusMgr.setMouseCapture(mList);
}
}
else
{
- self->hideList();
+ hideList();
}
}
-// static
-void LLComboBox::onItemSelected(LLUICtrl* item, void *userdata)
-{
- // Note: item is the LLScrollListCtrl
- LLComboBox *self = (LLComboBox *) userdata;
- const std::string name = self->mList->getSelectedItemLabel();
+//------------------------------------------------------------------
+// static functions
+//------------------------------------------------------------------
- S32 cur_id = self->getCurrentIndex();
+void LLComboBox::onItemSelected(const LLSD& data)
+{
+ const std::string name = mList->getSelectedItemLabel();
+
+ S32 cur_id = getCurrentIndex();
if (cur_id != -1)
{
- self->setLabel(name);
+ setLabel(name);
- if (self->mAllowTextEntry)
+ if (mAllowTextEntry)
{
- gFocusMgr.setKeyboardFocus(self->mTextEntry);
- self->mTextEntry->selectAll();
+ gFocusMgr.setKeyboardFocus(mTextEntry);
+ mTextEntry->selectAll();
}
}
// hiding the list reasserts the old value stored in the text editor/dropdown button
- self->hideList();
+ hideList();
// commit does the reverse, asserting the value in the list
- self->onCommit();
+ onCommit();
+
+ // call the callback if it exists
+ if(mSelectionCallback)
+ {
+ mSelectionCallback(this, data);
+ }
}
BOOL LLComboBox::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
@@ -804,7 +759,7 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask)
if (last_selected_item)
{
// highlight the original selection before potentially selecting a new item
- mList->highlightNthItem(mList->getItemIndex(last_selected_item));
+ mList->mouseOverHighlightNthItem(mList->getItemIndex(last_selected_item));
}
result = mList->handleKeyHere(key, mask);
@@ -838,7 +793,7 @@ BOOL LLComboBox::handleUnicodeCharHere(llwchar uni_char)
if (last_selected_item)
{
// highlight the original selection before potentially selecting a new item
- mList->highlightNthItem(mList->getItemIndex(last_selected_item));
+ mList->mouseOverHighlightNthItem(mList->getItemIndex(last_selected_item));
}
result = mList->handleUnicodeCharHere(uni_char);
if (mList->getLastSelectedItem() != last_selected_item)
@@ -850,15 +805,6 @@ BOOL LLComboBox::handleUnicodeCharHere(llwchar uni_char)
return result;
}
-void LLComboBox::setAllowTextEntry(BOOL allow, S32 max_chars, BOOL set_tentative)
-{
- mAllowTextEntry = allow;
- mTextEntryTentative = set_tentative;
- mMaxChars = max_chars;
-
- updateLayout();
-}
-
void LLComboBox::setTextEntry(const LLStringExplicit& text)
{
if (mTextEntry)
@@ -868,28 +814,25 @@ void LLComboBox::setTextEntry(const LLStringExplicit& text)
}
}
-//static
-void LLComboBox::onTextEntry(LLLineEditor* line_editor, void* user_data)
+void LLComboBox::onTextEntry(LLLineEditor* line_editor)
{
- LLComboBox* self = (LLComboBox*)user_data;
-
- if (self->mTextEntryCallback)
+ if (mTextEntryCallback != NULL)
{
- (*self->mTextEntryCallback)(line_editor, self->mCallbackUserData);
+ (mTextEntryCallback)(line_editor, LLSD());
}
KEY key = gKeyboard->currentKey();
if (key == KEY_BACKSPACE ||
key == KEY_DELETE)
{
- if (self->mList->selectItemByLabel(line_editor->getText(), FALSE))
+ if (mList->selectItemByLabel(line_editor->getText(), FALSE))
{
line_editor->setTentative(FALSE);
}
else
{
- line_editor->setTentative(self->mTextEntryTentative);
- self->mList->deselectAllItems();
+ line_editor->setTentative(mTextEntryTentative);
+ mList->deselectAllItems();
}
return;
}
@@ -902,17 +845,17 @@ void LLComboBox::onTextEntry(LLLineEditor* line_editor, void* user_data)
if (key == KEY_DOWN)
{
- self->setCurrentByIndex(llmin(self->getItemCount() - 1, self->getCurrentIndex() + 1));
- if (!self->mList->getVisible())
+ setCurrentByIndex(llmin(getItemCount() - 1, getCurrentIndex() + 1));
+ if (!mList->getVisible())
{
- if( self->mPrearrangeCallback )
+ if( mPrearrangeCallback )
{
- self->mPrearrangeCallback( self, self->mCallbackUserData );
+ mPrearrangeCallback( this, LLSD() );
}
- if (self->mList->getItemCount() != 0)
+ if (mList->getItemCount() != 0)
{
- self->showList();
+ showList();
}
}
line_editor->selectAll();
@@ -920,17 +863,17 @@ void LLComboBox::onTextEntry(LLLineEditor* line_editor, void* user_data)
}
else if (key == KEY_UP)
{
- self->setCurrentByIndex(llmax(0, self->getCurrentIndex() - 1));
- if (!self->mList->getVisible())
+ setCurrentByIndex(llmax(0, getCurrentIndex() - 1));
+ if (!mList->getVisible())
{
- if( self->mPrearrangeCallback )
+ if( mPrearrangeCallback )
{
- self->mPrearrangeCallback( self, self->mCallbackUserData );
+ mPrearrangeCallback( this, LLSD() );
}
- if (self->mList->getItemCount() != 0)
+ if (mList->getItemCount() != 0)
{
- self->showList();
+ showList();
}
}
line_editor->selectAll();
@@ -939,7 +882,7 @@ void LLComboBox::onTextEntry(LLLineEditor* line_editor, void* user_data)
else
{
// RN: presumably text entry
- self->updateSelection();
+ updateSelection();
}
}
@@ -958,7 +901,7 @@ void LLComboBox::updateSelection()
{
if (mPrearrangeCallback)
{
- mPrearrangeCallback( this, mCallbackUserData );
+ mPrearrangeCallback( this, LLSD() );
}
}
@@ -983,14 +926,12 @@ void LLComboBox::updateSelection()
}
}
-//static
-void LLComboBox::onTextCommit(LLUICtrl* caller, void* user_data)
+void LLComboBox::onTextCommit(const LLSD& data)
{
- LLComboBox* self = (LLComboBox*)user_data;
- std::string text = self->mTextEntry->getText();
- self->setSimple(text);
- self->onCommit();
- self->mTextEntry->selectAll();
+ std::string text = mTextEntry->getText();
+ setSimple(text);
+ onCommit();
+ mTextEntry->selectAll();
}
void LLComboBox::setFocus(BOOL b)
@@ -1114,155 +1055,3 @@ BOOL LLComboBox::selectItemRange( S32 first, S32 last )
{
return mList->selectItemRange(first, last);
}
-
-
-//
-// LLFlyoutButton
-//
-
-static LLRegisterWidget<LLFlyoutButton> r2("flyout_button");
-
-const S32 FLYOUT_BUTTON_ARROW_WIDTH = 24;
-
-LLFlyoutButton::LLFlyoutButton(
- const std::string& name,
- const LLRect &rect,
- const std::string& label,
- void (*commit_callback)(LLUICtrl*, void*) ,
- void *callback_userdata)
-: LLComboBox(name, rect, LLStringUtil::null, commit_callback, callback_userdata),
- mToggleState(FALSE),
- mActionButton(NULL)
-{
- // Always use text box
- // Text label button
- mActionButton = new LLButton(label,
- LLRect(), LLStringUtil::null, NULL, this);
- mActionButton->setScaleImage(TRUE);
-
- mActionButton->setClickedCallback(onActionButtonClick);
- mActionButton->setFollowsAll();
- mActionButton->setHAlign( LLFontGL::HCENTER );
- mActionButton->setLabel(label);
- addChild(mActionButton);
-
- mActionButtonImage = LLUI::getUIImage("flyout_btn_left.tga");
- mExpanderButtonImage = LLUI::getUIImage("flyout_btn_right.tga");
- mActionButtonImageSelected = LLUI::getUIImage("flyout_btn_left_selected.tga");
- mExpanderButtonImageSelected = LLUI::getUIImage("flyout_btn_right_selected.tga");
- mActionButtonImageDisabled = LLUI::getUIImage("flyout_btn_left_disabled.tga");
- mExpanderButtonImageDisabled = LLUI::getUIImage("flyout_btn_right_disabled.tga");
-
- mActionButton->setImageSelected(mActionButtonImageSelected);
- mActionButton->setImageUnselected(mActionButtonImage);
- mActionButton->setImageDisabled(mActionButtonImageDisabled);
- mActionButton->setImageDisabledSelected(LLPointer<LLUIImage>(NULL));
-
- mButton->setImageSelected(mExpanderButtonImageSelected);
- mButton->setImageUnselected(mExpanderButtonImage);
- mButton->setImageDisabled(mExpanderButtonImageDisabled);
- mButton->setImageDisabledSelected(LLPointer<LLUIImage>(NULL));
- mButton->setRightHPad(6);
-
- updateLayout();
-}
-
-//static
-LLView* LLFlyoutButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name = "flyout_button";
- node->getAttributeString("name", name);
-
- std::string label("");
- node->getAttributeString("label", label);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- LLUICtrlCallback callback = NULL;
-
- LLFlyoutButton* flyout_button = new LLFlyoutButton(name,
- rect,
- label,
- callback,
- NULL);
-
- std::string list_position;
- node->getAttributeString("list_position", list_position);
- if (list_position == "below")
- {
- flyout_button->mListPosition = BELOW;
- }
- else if (list_position == "above")
- {
- flyout_button->mListPosition = ABOVE;
- }
-
-
- flyout_button->initFromXML(node, parent);
-
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
- {
- if (child->hasName("flyout_button_item"))
- {
- std::string label = child->getTextContents();
-
- std::string value = label;
- child->getAttributeString("value", value);
-
- flyout_button->add(label, LLSD(value) );
- }
- }
-
- flyout_button->updateLayout();
-
- return flyout_button;
-}
-
-void LLFlyoutButton::updateLayout()
-{
- LLComboBox::updateLayout();
-
- mButton->setOrigin(getRect().getWidth() - FLYOUT_BUTTON_ARROW_WIDTH, 0);
- mButton->reshape(FLYOUT_BUTTON_ARROW_WIDTH, getRect().getHeight());
- mButton->setFollows(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
- mButton->setTabStop(FALSE);
- mButton->setImageOverlay(mListPosition == BELOW ? "down_arrow.tga" : "up_arrow.tga", LLFontGL::RIGHT);
-
- mActionButton->setOrigin(0, 0);
- mActionButton->reshape(getRect().getWidth() - FLYOUT_BUTTON_ARROW_WIDTH, getRect().getHeight());
-}
-
-//static
-void LLFlyoutButton::onActionButtonClick(void *user_data)
-{
- LLFlyoutButton* buttonp = (LLFlyoutButton*)user_data;
- // remember last list selection?
- buttonp->mList->deselect();
- buttonp->onCommit();
-}
-
-void LLFlyoutButton::draw()
-{
- mActionButton->setToggleState(mToggleState);
- mButton->setToggleState(mToggleState);
-
- //FIXME: this should be an attribute of comboboxes, whether they have a distinct label or
- // the label reflects the last selected item, for now we have to manually remove the label
- mButton->setLabel(LLStringUtil::null);
- LLComboBox::draw();
-}
-
-void LLFlyoutButton::setEnabled(BOOL enabled)
-{
- mActionButton->setEnabled(enabled);
- LLComboBox::setEnabled(enabled);
-}
-
-
-void LLFlyoutButton::setToggleState(BOOL state)
-{
- mToggleState = state;
-}
-
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 33e1baa748..e7a864eb82 100644
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -41,14 +41,13 @@
#include "llctrlselectioninterface.h"
#include "llimagegl.h"
#include "llrect.h"
+#include "llscrolllistctrl.h"
+#include "lllineeditor.h"
+#include <boost/function.hpp>
// Classes
class LLFontGL;
-class LLButton;
-class LLSquareButton;
-class LLScrollListCtrl;
-class LLLineEditor;
class LLViewBorder;
extern S32 LLCOMBOBOX_HEIGHT;
@@ -57,30 +56,61 @@ extern S32 LLCOMBOBOX_WIDTH;
class LLComboBox
: public LLUICtrl, public LLCtrlListInterface
{
-public:
+public:
typedef enum e_preferred_position
{
ABOVE,
BELOW
} EPreferredPosition;
- LLComboBox(
- const std::string& name,
- const LLRect &rect,
- const std::string& label,
- void (*commit_callback)(LLUICtrl*, void*) = NULL,
- void *callback_userdata = NULL
- );
- virtual ~LLComboBox();
+ struct PreferredPositionValues : public LLInitParam::TypeValuesHelper<EPreferredPosition, PreferredPositionValues>
+ {
+ static void declareValues();
+ };
- // LLView interface
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+ struct ItemParams : public LLInitParam::Block<ItemParams, LLScrollListItem::Params>
+ {
+ Optional<std::string> label;
+ ItemParams();
+ };
+
+ struct Params
+ : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<bool> allow_text_entry,
+ show_text_as_tentative;
+ Optional<S32> max_chars;
+ Optional<commit_callback_t> prearrange_callback,
+ text_entry_callback,
+ selection_callback;
+ Optional<LLUIImage*> arrow_image;
+
+ Optional<EPreferredPosition, PreferredPositionValues> list_position;
+
+ // components
+ Optional<LLButton::Params> combo_button;
+ Optional<LLScrollListCtrl::Params> combo_list;
+ Optional<LLLineEditor::Params> combo_editor;
+
+ Multiple<ItemParams> items;
+
+ Params();
+ };
+
+ virtual ~LLComboBox();
+ /*virtual*/ BOOL postBuild();
+
+protected:
+ friend class LLUICtrlFactory;
+ LLComboBox(const Params&);
+ void initFromParams(const Params&);
+
+public:
+ // LLView interface
virtual void draw();
virtual void onFocusLost();
- virtual void onLostTop();
virtual void setEnabled(BOOL enabled);
@@ -105,7 +135,6 @@ public:
// items, this is just the label.
virtual LLSD getValue() const;
- void setAllowTextEntry(BOOL allow, S32 max_chars = 50, BOOL make_tentative = TRUE);
void setTextEntry(const LLStringExplicit& text);
LLScrollListItem* add(const std::string& name, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE); // add item "name" to menu
@@ -134,7 +163,7 @@ public:
BOOL setCurrentByIndex( S32 index );
S32 getCurrentIndex() const;
- virtual void updateLayout();
+ void createLineEditor(const Params&);
//========================================================================
LLCtrlSelectionInterface* getSelectionInterface() { return (LLCtrlSelectionInterface*)this; };
@@ -170,26 +199,28 @@ public:
void* getCurrentUserdata();
- void setPrearrangeCallback( void (*cb)(LLUICtrl*,void*) ) { mPrearrangeCallback = cb; }
- void setTextEntryCallback( void (*cb)(LLLineEditor*, void*) ) { mTextEntryCallback = cb; }
+ void setPrearrangeCallback( commit_callback_t cb ) { mPrearrangeCallback = cb; }
+ void setTextEntryCallback( commit_callback_t cb ) { mTextEntryCallback = cb; }
+ void setSelectionCallback( commit_callback_t cb ) { mSelectionCallback = cb; }
void setButtonVisible(BOOL visible);
- static void onButtonDown(void *userdata);
- static void onItemSelected(LLUICtrl* item, void *userdata);
- static void onTextEntry(LLLineEditor* line_editor, void* user_data);
- static void onTextCommit(LLUICtrl* caller, void* user_data);
+ void onButtonDown();
+ void onItemSelected(const LLSD& data);
+ void onTextCommit(const LLSD& data);
void updateSelection();
virtual void showList();
virtual void hideList();
-
+
+ void onTextEntry(LLLineEditor* line_editor);
+
protected:
LLButton* mButton;
LLScrollListCtrl* mList;
EPreferredPosition mListPosition;
LLPointer<LLUIImage> mArrowImage;
- std::string mLabel;
+ LLUIString mLabel;
private:
S32 mButtonPadding;
@@ -197,39 +228,16 @@ private:
BOOL mAllowTextEntry;
S32 mMaxChars;
BOOL mTextEntryTentative;
- void (*mPrearrangeCallback)(LLUICtrl*,void*);
- void (*mTextEntryCallback)(LLLineEditor*, void*);
+ commit_callback_t mPrearrangeCallback;
+ commit_callback_t mTextEntryCallback;
+ commit_callback_t mSelectionCallback;
};
-class LLFlyoutButton : public LLComboBox
-{
-public:
- LLFlyoutButton(
- const std::string& name,
- const LLRect &rect,
- const std::string& label,
- void (*commit_callback)(LLUICtrl*, void*) = NULL,
- void *callback_userdata = NULL);
-
- virtual void updateLayout();
- virtual void draw();
- virtual void setEnabled(BOOL enabled);
-
- void setToggleState(BOOL state);
-
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
- static void onActionButtonClick(void *userdata);
- static void onSelectAction(LLUICtrl* ctrl, void *userdata);
-
-protected:
- LLButton* mActionButton;
- LLPointer<LLUIImage> mActionButtonImage;
- LLPointer<LLUIImage> mExpanderButtonImage;
- LLPointer<LLUIImage> mActionButtonImageSelected;
- LLPointer<LLUIImage> mExpanderButtonImageSelected;
- LLPointer<LLUIImage> mActionButtonImageDisabled;
- LLPointer<LLUIImage> mExpanderButtonImageDisabled;
- BOOL mToggleState;
-};
+#ifdef LL_WINDOWS
+#ifndef INSTANTIATE_GETCHILD_COMBOBOX
+#pragma warning (disable : 4231)
+extern template LLComboBox* LLView::getChild<LLComboBox>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
+#endif
+#endif
#endif
diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp
new file mode 100644
index 0000000000..f1fc3d8f43
--- /dev/null
+++ b/indra/llui/llconsole.cpp
@@ -0,0 +1,393 @@
+/**
+ * @file llconsole.cpp
+ * @brief a scrolling console output device
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+//#include "llviewerprecompiledheaders.h"
+#include "linden_common.h"
+
+#include "llconsole.h"
+
+// linden library includes
+#include "llmath.h"
+//#include "llviewercontrol.h"
+#include "llcriticaldamp.h"
+#include "llfontgl.h"
+#include "llgl.h"
+#include "llui.h"
+#include "lluiimage.h"
+//#include "llviewerimage.h"
+//#include "llviewerimagelist.h"
+//#include "llviewerwindow.h"
+#include "llsd.h"
+#include "llfontgl.h"
+#include "llmath.h"
+
+//#include "llstartup.h"
+
+// Used for LCD display
+extern void AddNewDebugConsoleToLCD(const LLWString &newLine);
+
+LLConsole* gConsole = NULL; // Created and destroyed in LLViewerWindow.
+
+const F32 FADE_DURATION = 2.f;
+const S32 MIN_CONSOLE_WIDTH = 200;
+
+LLConsole::LLConsole(const LLConsole::Params& p)
+: LLView(p),
+ LLFixedBuffer(p.max_lines),
+ mLinePersistTime(p.persist_time), // seconds
+ mFont(p.font)
+{
+ if (p.font_size_index.isProvided())
+ {
+ setFontSize(p.font_size_index);
+ }
+ mFadeTime = mLinePersistTime - FADE_DURATION;
+ setMaxLines(LLUI::sSettingGroups["config"]->getS32("ConsoleMaxLines"));
+}
+
+void LLConsole::setLinePersistTime(F32 seconds)
+{
+ mLinePersistTime = seconds;
+ mFadeTime = mLinePersistTime - FADE_DURATION;
+}
+
+void LLConsole::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+ S32 new_width = llmax(50, llmin(getRect().getWidth(), width));
+ S32 new_height = llmax(llfloor(mFont->getLineHeight()) + 15, llmin(getRect().getHeight(), height));
+
+ if ( mConsoleWidth == new_width
+ && mConsoleHeight == new_height )
+ {
+ return;
+ }
+
+ mConsoleWidth = new_width;
+ mConsoleHeight= new_height;
+
+ LLView::reshape(new_width, new_height, called_from_parent);
+
+ for(paragraph_t::iterator paragraph_it = mParagraphs.begin(); paragraph_it != mParagraphs.end(); paragraph_it++)
+ {
+ (*paragraph_it).updateLines((F32)getRect().getWidth(), mFont, true);
+ }
+}
+
+void LLConsole::setFontSize(S32 size_index)
+{
+ if (-1 == size_index)
+ {
+ mFont = LLFontGL::getFontMonospace();
+ }
+ else if (0 == size_index)
+ {
+ mFont = LLFontGL::getFontSansSerif();
+ }
+ else if (1 == size_index)
+ {
+ mFont = LLFontGL::getFontSansSerifBig();
+ }
+ else
+ {
+ mFont = LLFontGL::getFontSansSerifHuge();
+ }
+
+ for(paragraph_t::iterator paragraph_it = mParagraphs.begin(); paragraph_it != mParagraphs.end(); paragraph_it++)
+ {
+ (*paragraph_it).updateLines((F32)getRect().getWidth(), mFont, true);
+ }
+}
+
+void LLConsole::draw()
+{
+ LLGLSUIDefault gls_ui;
+
+ // skip lines added more than mLinePersistTime ago
+ F32 cur_time = mTimer.getElapsedTimeF32();
+
+ F32 skip_time = cur_time - mLinePersistTime;
+ F32 fade_time = cur_time - mFadeTime;
+
+ if (mParagraphs.empty()) //No text to draw.
+ {
+ return;
+ }
+
+ U32 num_lines=0;
+
+ paragraph_t::reverse_iterator paragraph_it;
+ paragraph_it = mParagraphs.rbegin();
+ U32 paragraph_num=mParagraphs.size();
+
+ while (!mParagraphs.empty() && paragraph_it != mParagraphs.rend())
+ {
+ num_lines += (*paragraph_it).mLines.size();
+ if(num_lines > mMaxLines
+ || ( (mLinePersistTime > (F32)0.f) && ((*paragraph_it).mAddTime - skip_time)/(mLinePersistTime - mFadeTime) <= (F32)0.f))
+ { //All lines above here are done. Lose them.
+ for (U32 i=0;i<paragraph_num;i++)
+ {
+ if (!mParagraphs.empty())
+ mParagraphs.pop_front();
+ }
+ break;
+ }
+ paragraph_num--;
+ paragraph_it++;
+ }
+
+ if (mParagraphs.empty())
+ {
+ return;
+ }
+
+ // draw remaining lines
+ F32 y_pos = 0.f;
+
+ LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
+
+// F32 console_opacity = llclamp(gSavedSettings.getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
+ F32 console_opacity = llclamp(LLUI::sSettingGroups["config"]->getF32("ConsoleBackgroundOpacity"), 0.f, 1.f);
+// LLColor4 color = gSavedSkinSettings.getColor("ConsoleBackground");
+ LLColor4 color = LLUI::sSettingGroups["color"]->getColor("ConsoleBackground");
+ color.mV[VALPHA] *= console_opacity;
+
+ F32 line_height = mFont->getLineHeight();
+
+ for(paragraph_it = mParagraphs.rbegin(); paragraph_it != mParagraphs.rend(); paragraph_it++)
+ {
+ S32 target_height = llfloor( (*paragraph_it).mLines.size() * line_height + 8);
+ S32 target_width = llfloor( (*paragraph_it).mMaxWidth +15);
+
+ y_pos += ((*paragraph_it).mLines.size()) * line_height;
+ imagep->drawSolid(-14, (S32)(y_pos + line_height - target_height), target_width, target_height, color);
+
+ F32 y_off=0;
+
+ F32 alpha;
+
+ if ((mLinePersistTime > 0.f) && ((*paragraph_it).mAddTime < fade_time))
+ {
+ alpha = ((*paragraph_it).mAddTime - skip_time)/(mLinePersistTime - mFadeTime);
+ }
+ else
+ {
+ alpha = 1.0f;
+ }
+
+ if( alpha > 0.f )
+ {
+ for (lines_t::iterator line_it=(*paragraph_it).mLines.begin();
+ line_it != (*paragraph_it).mLines.end();
+ line_it ++)
+ {
+ for (line_color_segments_t::iterator seg_it = (*line_it).mLineColorSegments.begin();
+ seg_it != (*line_it).mLineColorSegments.end();
+ seg_it++)
+ {
+ mFont->render((*seg_it).mText, 0, (*seg_it).mXPosition - 8, y_pos - y_off,
+ LLColor4(
+ (*seg_it).mColor.mV[VRED],
+ (*seg_it).mColor.mV[VGREEN],
+ (*seg_it).mColor.mV[VBLUE],
+ (*seg_it).mColor.mV[VALPHA]*alpha),
+ LLFontGL::LEFT,
+ LLFontGL::BASELINE,
+ LLFontGL::NORMAL,
+ LLFontGL::DROP_SHADOW,
+ S32_MAX,
+ target_width
+ );
+ }
+ y_off += line_height;
+ }
+ }
+ y_pos += 8;
+ }
+}
+
+void LLConsole::addLine(const std::string& utf8line)
+{
+ LLWString wline = utf8str_to_wstring(utf8line);
+ addLine(wline, 0.f, LLColor4(1.f, 1.f, 1.f, 1.f));
+}
+
+void LLConsole::addLine(const LLWString& wline)
+{
+ addLine(wline, 0.f, LLColor4(1.f, 1.f, 1.f, 1.f));
+}
+
+void LLConsole::addLine(const std::string& utf8line, F32 size, const LLColor4 &color)
+{
+ LLWString wline = utf8str_to_wstring(utf8line);
+ addLine(wline, size, color);
+}
+
+//Generate highlight color segments for this paragraph. Pass in default color of paragraph.
+void LLConsole::Paragraph::makeParagraphColorSegments (const LLColor4 &color)
+{
+ LLSD paragraph_color_segments;
+ LLColor4 lcolor=color;
+
+ paragraph_color_segments[0]["text"] =wstring_to_utf8str(mParagraphText);
+ LLSD color_sd = color.getValue();
+ paragraph_color_segments[0]["color"]=color_sd;
+
+ for(LLSD::array_const_iterator color_segment_it = paragraph_color_segments.beginArray();
+ color_segment_it != paragraph_color_segments.endArray();
+ ++color_segment_it)
+ {
+ LLSD color_llsd = (*color_segment_it)["color"];
+ std::string color_str = (*color_segment_it)["text"].asString();
+
+ ParagraphColorSegment color_segment;
+
+ color_segment.mColor.setValue(color_llsd);
+ color_segment.mNumChars = color_str.length();
+
+ mParagraphColorSegments.push_back(color_segment);
+ }
+}
+
+//Called when a paragraph is added to the console or window is resized.
+void LLConsole::Paragraph::updateLines(F32 screen_width, const LLFontGL* font, bool force_resize)
+{
+ if ( !force_resize )
+ {
+ if ( mMaxWidth >= 0.0f
+ && mMaxWidth < screen_width )
+ {
+ return; //No resize required.
+ }
+ }
+
+ screen_width = screen_width - 30; //Margin for small windows.
+
+ if ( mParagraphText.empty()
+ || mParagraphColorSegments.empty()
+ || font == NULL)
+ {
+ return; //Not enough info to complete.
+ }
+
+ mLines.clear(); //Chuck everything.
+ mMaxWidth = 0.0f;
+
+ paragraph_color_segments_t::iterator current_color = mParagraphColorSegments.begin();
+ U32 current_color_length = (*current_color).mNumChars;
+
+ S32 paragraph_offset = 0; //Offset into the paragraph text.
+
+ // Wrap lines that are longer than the view is wide.
+ while( paragraph_offset < (S32)mParagraphText.length() )
+ {
+ S32 skip_chars; // skip '\n'
+ // Figure out if a word-wrapped line fits here.
+ LLWString::size_type line_end = mParagraphText.find_first_of(llwchar('\n'), paragraph_offset);
+ if (line_end != LLWString::npos)
+ {
+ skip_chars = 1; // skip '\n'
+ }
+ else
+ {
+ line_end = mParagraphText.size();
+ skip_chars = 0;
+ }
+
+ U32 drawable = font->maxDrawableChars(mParagraphText.c_str()+paragraph_offset, screen_width, line_end - paragraph_offset, TRUE);
+
+ if (drawable != 0)
+ {
+ F32 x_position = 0; //Screen X position of text.
+
+ mMaxWidth = llmax( mMaxWidth, (F32)font->getWidth( mParagraphText.substr( paragraph_offset, drawable ).c_str() ) );
+ Line line;
+
+ U32 left_to_draw = drawable;
+ U32 drawn = 0;
+
+ while (left_to_draw >= current_color_length
+ && current_color != mParagraphColorSegments.end() )
+ {
+ LLWString color_text = mParagraphText.substr( paragraph_offset + drawn, current_color_length );
+ line.mLineColorSegments.push_back( LineColorSegment( color_text, //Append segment to line.
+ (*current_color).mColor,
+ x_position ) );
+
+ x_position += font->getWidth( color_text.c_str() ); //Set up next screen position.
+
+ drawn += current_color_length;
+ left_to_draw -= current_color_length;
+
+ current_color++; //Goto next paragraph color record.
+
+ if (current_color != mParagraphColorSegments.end())
+ {
+ current_color_length = (*current_color).mNumChars;
+ }
+ }
+
+ if (left_to_draw > 0 && current_color != mParagraphColorSegments.end() )
+ {
+ LLWString color_text = mParagraphText.substr( paragraph_offset + drawn, left_to_draw );
+
+ line.mLineColorSegments.push_back( LineColorSegment( color_text, //Append segment to line.
+ (*current_color).mColor,
+ x_position ) );
+
+ current_color_length -= left_to_draw;
+ }
+ mLines.push_back(line); //Append line to paragraph line list.
+ }
+ paragraph_offset += (drawable + skip_chars);
+ }
+}
+
+//Pass in the string and the default color for this block of text.
+LLConsole::Paragraph::Paragraph (LLWString str, const LLColor4 &color, F32 add_time, const LLFontGL* font, F32 screen_width)
+ : mParagraphText(str), mAddTime(add_time), mMaxWidth(-1)
+{
+ makeParagraphColorSegments(color);
+ updateLines( screen_width, font );
+}
+
+void LLConsole::addLine(const LLWString& wline, F32 size, const LLColor4 &color)
+{
+ Paragraph paragraph(wline, color, mTimer.getElapsedTimeF32(), mFont, (F32)getRect().getWidth() );
+
+ mParagraphs.push_back ( paragraph );
+
+#if LL_WINDOWS && LL_LCD_COMPILE
+ // add to LCD screen
+ AddNewDebugConsoleToLCD(wline);
+#endif
+}
diff --git a/indra/llui/llconsole.h b/indra/llui/llconsole.h
new file mode 100644
index 0000000000..65149b217f
--- /dev/null
+++ b/indra/llui/llconsole.h
@@ -0,0 +1,162 @@
+/**
+ * @file llconsole.h
+ * @brief a simple console-style output device
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLCONSOLE_H
+#define LL_LLCONSOLE_H
+
+#include "llfixedbuffer.h"
+#include "llview.h"
+#include "v4color.h"
+#include <deque>
+
+class LLFontGL;
+class LLSD;
+
+class LLConsole : public LLFixedBuffer, public LLView
+{
+public:
+ typedef enum e_font_size
+ {
+ MONOSPACE = -1,
+ SMALL = 0,
+ BIG = 1
+ } EFontSize;
+
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Optional<U32> max_lines;
+ Optional<F32> persist_time;
+ Optional<S32> font_size_index;
+ Params()
+ : max_lines("max_lines", LLUI::sSettingGroups["config"]->getS32("ConsoleMaxLines")),
+ persist_time("persist_time", 0.f) // forever
+ {
+ mouse_opaque(false);
+ }
+ };
+protected:
+ LLConsole(const Params&);
+ friend class LLUICtrlFactory;
+
+public:
+ //A paragraph color segment defines the color of text in a line
+ //of text that was received for console display. It has no
+ //notion of line wraps, screen position, or the text it contains.
+ //It is only the number of characters that are a color and the
+ //color.
+ struct ParagraphColorSegment
+ {
+ S32 mNumChars;
+ LLColor4 mColor;
+ };
+
+ //A line color segment is a chunk of text, the color associated
+ //with it, and the X Position it was calculated to begin at
+ //on the screen. X Positions are re-calculated if the
+ //screen changes size.
+ class LineColorSegment
+ {
+ public:
+ LineColorSegment(LLWString text, LLColor4 color, F32 xpos) : mText(text), mColor(color), mXPosition(xpos) {}
+ public:
+ LLWString mText;
+ LLColor4 mColor;
+ F32 mXPosition;
+ };
+
+ typedef std::list<LineColorSegment> line_color_segments_t;
+
+ //A line is composed of one or more color segments.
+ class Line
+ {
+ public:
+ line_color_segments_t mLineColorSegments;
+ };
+
+ typedef std::list<Line> lines_t;
+ typedef std::list<ParagraphColorSegment> paragraph_color_segments_t;
+
+ //A paragraph is a processed element containing the entire text of the
+ //message (used for recalculating positions on screen resize)
+ //The time this message was added to the console output
+ //The visual screen width of the longest line in this block
+ //And a list of one or more lines which are used to display this message.
+ class Paragraph
+ {
+ public:
+ Paragraph (LLWString str, const LLColor4 &color, F32 add_time, const LLFontGL* font, F32 screen_width);
+ void makeParagraphColorSegments ( const LLColor4 &color);
+ void updateLines ( F32 screen_width, const LLFontGL* font, bool force_resize=false );
+ public:
+ LLWString mParagraphText; //The entire text of the paragraph
+ paragraph_color_segments_t mParagraphColorSegments;
+ F32 mAddTime; //Time this paragraph was added to the display.
+ F32 mMaxWidth; //Width of the widest line of text in this paragraph.
+ lines_t mLines;
+
+ };
+
+ //The console contains a deque of paragraphs which represent the individual messages.
+ typedef std::deque<Paragraph> paragraph_t;
+ paragraph_t mParagraphs;
+
+ ~LLConsole(){};
+
+ // each line lasts this long after being added
+ void setLinePersistTime(F32 seconds);
+
+ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+
+ // -1 = monospace, 0 means small, font size = 1 means big
+ void setFontSize(S32 size_index);
+
+ void addLine(const std::string& utf8line, F32 size, const LLColor4 &color);
+ void addLine(const LLWString& wline, F32 size, const LLColor4 &color);
+
+ // Overrides
+ /*virtual*/ void draw();
+ /*virtual*/ void addLine(const std::string& utf8line);
+ /*virtual*/ void addLine(const LLWString& line);
+private:
+ F32 mLinePersistTime; // Age at which to stop drawing.
+ F32 mFadeTime; // Age at which to start fading
+ const LLFontGL* mFont;
+ S32 mLastBoxHeight;
+ S32 mLastBoxWidth;
+ S32 mConsoleWidth;
+ S32 mConsoleHeight;
+
+};
+
+extern LLConsole* gConsole;
+
+#endif
diff --git a/indra/llui/llcontainerview.cpp b/indra/llui/llcontainerview.cpp
new file mode 100644
index 0000000000..a63023e35c
--- /dev/null
+++ b/indra/llui/llcontainerview.cpp
@@ -0,0 +1,301 @@
+/**
+ * @file llcontainerview.cpp
+ * @brief Container for all statistics info
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llcontainerview.h"
+
+#include "llerror.h"
+#include "llfontgl.h"
+#include "llgl.h"
+#include "llui.h"
+#include "llstring.h"
+#include "llscrollcontainer.h"
+#include "lluictrlfactory.h"
+
+static LLRegisterWidget<LLContainerView> r("container_view");
+
+LLContainerView::LLContainerView(const LLContainerView::Params& p)
+: LLView(p),
+ mShowLabel(p.show_label),
+ mLabel(p.label),
+ mDisplayChildren(p.display_children)
+{
+ mCollapsible = TRUE;
+ mScrollContainer = NULL;
+}
+
+LLContainerView::~LLContainerView()
+{
+ // Children all cleaned up by default view destructor.
+}
+
+BOOL LLContainerView::postBuild()
+{
+ setDisplayChildren(mDisplayChildren);
+ reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
+ return TRUE;
+}
+
+bool LLContainerView::addChild(LLView* child, S32 tab_group)
+{
+ bool res = LLView::addChild(child, tab_group);
+ if (res)
+ {
+ sendChildToBack(child);
+ }
+ return res;
+}
+
+BOOL LLContainerView::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+ BOOL handled = FALSE;
+ if (mDisplayChildren)
+ {
+ handled = (LLView::childrenHandleMouseDown(x, y, mask) != NULL);
+ }
+ if (!handled)
+ {
+ if( mCollapsible && mShowLabel && (y >= getRect().getHeight() - 10) )
+ {
+ setDisplayChildren(!mDisplayChildren);
+ reshape(getRect().getWidth(), getRect().getHeight(), FALSE);
+ handled = TRUE;
+ }
+ }
+ return handled;
+}
+
+BOOL LLContainerView::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+ BOOL handled = FALSE;
+ if (mDisplayChildren)
+ {
+ handled = (LLView::childrenHandleMouseUp(x, y, mask) != NULL);
+ }
+ return handled;
+}
+
+
+void LLContainerView::draw()
+{
+ {
+ gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+
+ gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, LLColor4(0.f, 0.f, 0.f, 0.25f));
+ }
+
+ // Draw the label
+ if (mShowLabel)
+ {
+ LLFontGL::getFontMonospace()->renderUTF8(
+ mLabel, 0, 2, getRect().getHeight() - 2, LLColor4(1,1,1,1), LLFontGL::LEFT, LLFontGL::TOP);
+ }
+
+ LLView::draw();
+}
+
+
+void LLContainerView::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+ S32 desired_width = width;
+ S32 desired_height = height;
+
+ if (mScrollContainer)
+ {
+ BOOL dum_bool;
+ mScrollContainer->calcVisibleSize(&desired_width, &desired_height, &dum_bool, &dum_bool);
+ }
+ else
+ {
+ // if we're uncontained - make height as small as possible
+ desired_height = 0;
+ }
+
+ arrange(desired_width, desired_height, called_from_parent);
+
+ // sometimes, after layout, our container will change size (scrollbars popping in and out)
+ // if so, attempt another layout
+ if (mScrollContainer)
+ {
+ S32 new_container_width;
+ S32 new_container_height;
+ BOOL dum_bool;
+ mScrollContainer->calcVisibleSize(&new_container_width, &new_container_height, &dum_bool, &dum_bool);
+
+ if ((new_container_width != desired_width) ||
+ (new_container_height != desired_height)) // the container size has changed, attempt to arrange again
+ {
+ arrange(new_container_width, new_container_height, called_from_parent);
+ }
+ }
+}
+
+void LLContainerView::arrange(S32 width, S32 height, BOOL called_from_parent)
+{
+ // Determine the sizes and locations of all contained views
+ S32 total_height = 0;
+ S32 top, left, right, bottom;
+ //LLView *childp;
+
+ // These will be used for the children
+ left = 4;
+ top = getRect().getHeight() - 4;
+ right = width - 2;
+ bottom = top;
+
+ // Leave some space for the top label/grab handle
+ if (mShowLabel)
+ {
+ total_height += 20;
+ }
+
+ if (mDisplayChildren)
+ {
+ // Determine total height
+ U32 child_height = 0;
+ for (child_list_const_iter_t child_iter = getChildList()->begin();
+ child_iter != getChildList()->end(); ++child_iter)
+ {
+ LLView *childp = *child_iter;
+ if (!childp->getVisible())
+ {
+ llwarns << "Incorrect visibility!" << llendl;
+ }
+ LLRect child_rect = childp->getRequiredRect();
+ child_height += child_rect.getHeight();
+ child_height += 2;
+ }
+ total_height += child_height;
+ }
+
+ if (total_height < height)
+ total_height = height;
+
+ if (followsTop())
+ {
+ // HACK: casting away const. Should use setRect or some helper function instead.
+ const_cast<LLRect&>(getRect()).mBottom = getRect().mTop - total_height;
+ }
+ else
+ {
+ // HACK: casting away const. Should use setRect or some helper function instead.
+ const_cast<LLRect&>(getRect()).mTop = getRect().mBottom + total_height;
+ }
+ // HACK: casting away const. Should use setRect or some helper function instead.
+ const_cast<LLRect&>(getRect()).mRight = getRect().mLeft + width;
+
+ top = total_height;
+ if (mShowLabel)
+ {
+ top -= 20;
+ }
+
+ bottom = top;
+
+ if (mDisplayChildren)
+ {
+ // Iterate through all children, and put in container from top down.
+ for (child_list_const_iter_t child_iter = getChildList()->begin();
+ child_iter != getChildList()->end(); ++child_iter)
+ {
+ LLView *childp = *child_iter;
+ LLRect child_rect = childp->getRequiredRect();
+ bottom -= child_rect.getHeight();
+ LLRect r(left, bottom + child_rect.getHeight(), right, bottom);
+ childp->setRect(r);
+ childp->reshape(right - left, top - bottom);
+ top = bottom - 2;
+ bottom = top;
+ }
+ }
+
+ if (!called_from_parent)
+ {
+ if (getParent())
+ {
+ getParent()->reshape(getParent()->getRect().getWidth(), getParent()->getRect().getHeight(), FALSE);
+ }
+ }
+
+}
+
+LLRect LLContainerView::getRequiredRect()
+{
+ LLRect req_rect;
+ //LLView *childp;
+ U32 total_height = 0;
+
+ // Determine the sizes and locations of all contained views
+
+ // Leave some space for the top label/grab handle
+
+ if (mShowLabel)
+ {
+ total_height = 20;
+ }
+
+
+ if (mDisplayChildren)
+ {
+ // Determine total height
+ U32 child_height = 0;
+ for (child_list_const_iter_t child_iter = getChildList()->begin();
+ child_iter != getChildList()->end(); ++child_iter)
+ {
+ LLView *childp = *child_iter;
+ LLRect child_rect = childp->getRequiredRect();
+ child_height += child_rect.getHeight();
+ child_height += 2;
+ }
+
+ total_height += child_height;
+ }
+ req_rect.mTop = total_height;
+ return req_rect;
+}
+
+void LLContainerView::setLabel(const std::string& label)
+{
+ mLabel = label;
+}
+
+void LLContainerView::setDisplayChildren(const BOOL displayChildren)
+{
+ mDisplayChildren = displayChildren;
+ for (child_list_const_iter_t child_iter = getChildList()->begin();
+ child_iter != getChildList()->end(); ++child_iter)
+ {
+ LLView *childp = *child_iter;
+ childp->setVisible(mDisplayChildren);
+ }
+}
diff --git a/indra/llui/llcontainerview.h b/indra/llui/llcontainerview.h
new file mode 100644
index 0000000000..9f3d1ac7ad
--- /dev/null
+++ b/indra/llui/llcontainerview.h
@@ -0,0 +1,92 @@
+/**
+ * @file llcontainerview.h
+ * @brief Container for all statistics info.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLCONTAINERVIEW_H
+#define LL_LLCONTAINERVIEW_H
+
+#include "stdtypes.h"
+#include "lltextbox.h"
+#include "llstatbar.h"
+
+class LLScrollContainer;
+
+class LLContainerView : public LLView
+{
+public:
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Optional<std::string> label;
+ Optional<bool> show_label;
+ Optional<bool> display_children;
+ Params()
+ : label("label"),
+ show_label("show_label", FALSE),
+ display_children("display_children", TRUE)
+ {
+ mouse_opaque(false);
+ }
+ };
+protected:
+ LLContainerView(const Params& p);
+ friend class LLUICtrlFactory;
+public:
+ ~LLContainerView();
+
+ /*virtual*/ BOOL postBuild();
+ /*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);
+
+ /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+
+ /*virtual*/ void draw();
+ /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+ /*virtual*/ LLRect getRequiredRect(); // Return the height of this object, given the set options.
+
+ void setLabel(const std::string& label);
+ void showLabel(BOOL show) { mShowLabel = show; }
+ void setDisplayChildren(const BOOL displayChildren);
+ BOOL getDisplayChildren() { return mDisplayChildren; }
+ void setScrollContainer(LLScrollContainer* scroll) {mScrollContainer = scroll;}
+
+ private:
+ LLScrollContainer* mScrollContainer;
+ void arrange(S32 width, S32 height, BOOL called_from_parent = TRUE);
+ BOOL mShowLabel;
+
+protected:
+ BOOL mDisplayChildren;
+ std::string mLabel;
+public:
+ BOOL mCollapsible;
+
+};
+#endif // LL_CONTAINERVIEW_
diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp
index 6c92ea1ff7..8ecbdb98e1 100644
--- a/indra/llui/lldraghandle.cpp
+++ b/indra/llui/lldraghandle.cpp
@@ -43,10 +43,10 @@
#include "llmenugl.h"
#include "lltextbox.h"
#include "llcontrol.h"
-#include "llresmgr.h"
#include "llfontgl.h"
#include "llwindow.h"
#include "llfocusmgr.h"
+#include "lluictrlfactory.h"
const S32 LEADING_PAD = 5;
const S32 TITLE_PAD = 8;
@@ -56,21 +56,33 @@ const S32 RIGHT_PAD = BORDER_PAD + 32; // HACK: space for close btn and minimize
S32 LLDragHandle::sSnapMargin = 5;
-LLDragHandle::LLDragHandle( const std::string& name, const LLRect& rect, const std::string& title )
-: LLView( name, rect, TRUE ),
+LLDragHandle::LLDragHandle(const LLDragHandle::Params& p)
+: LLView(p),
mDragLastScreenX( 0 ),
mDragLastScreenY( 0 ),
mLastMouseScreenX( 0 ),
mLastMouseScreenY( 0 ),
- mDragHighlightColor( LLUI::sColorsGroup->getColor( "DefaultHighlightLight" ) ),
- mDragShadowColor( LLUI::sColorsGroup->getColor( "DefaultShadowDark" ) ),
mTitleBox( NULL ),
mMaxTitleWidth( 0 ),
- mForeground( TRUE )
+ mForeground( TRUE ),
+ mDragHighlightColor(p.drag_highlight_color()),
+ mDragShadowColor(p.drag_shadow_color())
+
{
- sSnapMargin = LLUI::sConfigGroup->getS32("SnapMargin");
+ static LLUICachedControl<S32> snap_margin ("SnapMargin", 0);
+ sSnapMargin = snap_margin;
+}
- setSaveToXML(false);
+LLDragHandle::~LLDragHandle()
+{
+ removeChild(mTitleBox);
+ delete mTitleBox;
+}
+
+void LLDragHandle::initFromParams(const LLDragHandle::Params& p)
+{
+ LLView::initFromParams(p);
+ setTitle( p.label );
}
void LLDragHandle::setTitleVisible(BOOL visible)
@@ -81,58 +93,47 @@ void LLDragHandle::setTitleVisible(BOOL visible)
}
}
-void LLDragHandle::setTitleBox(LLTextBox* titlebox)
-{
+void LLDragHandleTop::setTitle(const std::string& title)
+{
+ std::string trimmed_title = title;
+ LLStringUtil::trim(trimmed_title);
+
if( mTitleBox )
{
- removeChild(mTitleBox);
- delete mTitleBox;
+ mTitleBox->setText(trimmed_title);
}
- mTitleBox = titlebox;
- if(mTitleBox)
+ else
{
+ const LLFontGL* font = LLFontGL::getFontSansSerif();
+ LLTextBox::Params params;
+ params.name("Drag Handle Title");
+ params.rect(getRect());
+ params.text(trimmed_title);
+ params.font(font);
+ params.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT | FOLLOWS_RIGHT);
+ params.font_shadow(LLFontGL::DROP_SHADOW_SOFT);
+ mTitleBox = LLUICtrlFactory::create<LLTextBox> (params);
addChild( mTitleBox );
}
-}
-
-LLDragHandleTop::LLDragHandleTop(const std::string& name, const LLRect &rect, const std::string& title)
-: LLDragHandle(name, rect, title)
-{
- setFollowsAll();
- setTitle( title );
-}
-
-LLDragHandleLeft::LLDragHandleLeft(const std::string& name, const LLRect &rect, const std::string& title)
-: LLDragHandle(name, rect, title)
-{
- setFollowsAll();
- setTitle( title );
-}
-
-void LLDragHandleTop::setTitle(const std::string& title)
-{
- std::string trimmed_title = title;
- LLStringUtil::trim(trimmed_title);
-
- const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
- LLTextBox* titlebox = new LLTextBox( std::string("Drag Handle Title"), getRect(), trimmed_title, font );
- titlebox->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT | FOLLOWS_RIGHT);
- titlebox->setFontStyle(LLFontGL::DROP_SHADOW_SOFT);
- setTitleBox(titlebox);
reshapeTitleBox();
}
const std::string& LLDragHandleTop::getTitle() const
{
- return getTitleBox() == NULL ? LLStringUtil::null : getTitleBox()->getText();
+ return mTitleBox == NULL ? LLStringUtil::null : mTitleBox->getText();
}
void LLDragHandleLeft::setTitle(const std::string& )
{
- setTitleBox(NULL);
+ if( mTitleBox )
+ {
+ removeChild(mTitleBox);
+ delete mTitleBox;
+ mTitleBox = NULL;
+ }
/* no title on left edge */
}
@@ -184,9 +185,9 @@ void LLDragHandleTop::draw()
*/
// Colorize the text to match the frontmost state
- if (getTitleBox())
+ if (mTitleBox)
{
- getTitleBox()->setEnabled(getForeground());
+ mTitleBox->setEnabled(getForeground());
}
LLView::draw();
@@ -229,9 +230,9 @@ void LLDragHandleLeft::draw()
*/
// Colorize the text to match the frontmost state
- if (getTitleBox())
+ if (mTitleBox)
{
- getTitleBox()->setEnabled(getForeground());
+ mTitleBox->setEnabled(getForeground());
}
LLView::draw();
@@ -239,12 +240,12 @@ void LLDragHandleLeft::draw()
void LLDragHandleTop::reshapeTitleBox()
{
- if( ! getTitleBox())
+ if( ! mTitleBox)
{
return;
}
- const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
- S32 title_width = font->getWidth( getTitleBox()->getText() ) + TITLE_PAD;
+ const LLFontGL* font = LLFontGL::getFontSansSerif();
+ S32 title_width = font->getWidth( mTitleBox->getText() ) + TITLE_PAD;
if (getMaxTitleWidth() > 0)
title_width = llmin(title_width, getMaxTitleWidth());
S32 title_height = llround(font->getLineHeight());
@@ -255,7 +256,7 @@ void LLDragHandleTop::reshapeTitleBox()
getRect().getWidth() - LEFT_PAD - RIGHT_PAD,
title_height);
- getTitleBox()->setRect( title_rect );
+ mTitleBox->setRect( title_rect );
}
void LLDragHandleTop::reshape(S32 width, S32 height, BOOL called_from_parent)
@@ -337,14 +338,14 @@ BOOL LLDragHandle::handleHover(S32 x, S32 y, MASK mask)
LLView* snap_view = getParent()->findSnapRect(new_rect, mouse_dir, SNAP_PARENT_AND_SIBLINGS, sSnapMargin);
- getParent()->snappedTo(snap_view);
+ getParent()->setSnappedTo(snap_view);
delta_x = new_rect.mLeft - pre_snap_x;
delta_y = new_rect.mBottom - pre_snap_y;
translated_rect.translate(delta_x, delta_y);
// restore original rect so delta are detected, then call user reshape method to handle snapped floaters, etc
getParent()->setRect(original_rect);
- getParent()->userSetShape(translated_rect);
+ getParent()->setShape(translated_rect, true);
mDragLastScreenX += delta_x;
mDragLastScreenY += delta_y;
diff --git a/indra/llui/lldraghandle.h b/indra/llui/lldraghandle.h
index 9eb3e55a6c..8b53c46ae9 100644
--- a/indra/llui/lldraghandle.h
+++ b/indra/llui/lldraghandle.h
@@ -45,8 +45,24 @@ class LLTextBox;
class LLDragHandle : public LLView
{
public:
- LLDragHandle(const std::string& name, const LLRect& rect, const std::string& title );
- virtual ~LLDragHandle() { setTitleBox(NULL); }
+ struct Params
+ : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Optional<std::string> label;
+ Optional<LLUIColor> drag_highlight_color;
+ Optional<LLUIColor> drag_shadow_color;
+
+ Params()
+ : drag_highlight_color("", LLUI::getCachedColorFunctor("DefaultHighlightLight")),
+ drag_shadow_color("", LLUI::getCachedColorFunctor("DefaultShadowDark"))
+ {
+ mouse_opaque(true);
+ follows.flags(FOLLOWS_ALL);
+ }
+ };
+ void initFromParams(const Params&);
+
+ virtual ~LLDragHandle();
virtual void setValue(const LLSD& value);
@@ -64,18 +80,20 @@ public:
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
protected:
- LLTextBox* getTitleBox() const { return mTitleBox; }
- void setTitleBox(LLTextBox*);
-
+ LLDragHandle(const Params&);
+ friend class LLUICtrlFactory;
+
+protected:
+ LLTextBox* mTitleBox;
+
private:
S32 mDragLastScreenX;
S32 mDragLastScreenY;
S32 mLastMouseScreenX;
S32 mLastMouseScreenY;
LLCoordGL mLastMouseDir;
- LLColor4 mDragHighlightColor;
- LLColor4 mDragShadowColor;
- LLTextBox* mTitleBox;
+ LLUIColor mDragHighlightColor;
+ LLUIColor mDragShadowColor;
S32 mMaxTitleWidth;
BOOL mForeground;
@@ -88,9 +106,10 @@ private:
class LLDragHandleTop
: public LLDragHandle
{
+protected:
+ LLDragHandleTop(const Params& p) : LLDragHandle(p) {}
+ friend class LLUICtrlFactory;
public:
- LLDragHandleTop(const std::string& name, const LLRect& rect, const std::string& title );
-
virtual void setTitle( const std::string& title );
virtual const std::string& getTitle() const;
virtual void draw();
@@ -105,9 +124,10 @@ private:
class LLDragHandleLeft
: public LLDragHandle
{
+protected:
+ LLDragHandleLeft(const Params& p) : LLDragHandle(p) {}
+ friend class LLUICtrlFactory;
public:
- LLDragHandleLeft(const std::string& name, const LLRect& rect, const std::string& title );
-
virtual void setTitle( const std::string& title );
virtual const std::string& getTitle() const;
virtual void draw();
diff --git a/indra/llui/llf32uictrl.cpp b/indra/llui/llf32uictrl.cpp
new file mode 100644
index 0000000000..0978005b78
--- /dev/null
+++ b/indra/llui/llf32uictrl.cpp
@@ -0,0 +1,57 @@
+/**
+ * @file llf32uictrl.cpp
+ * @author Nat Goodspeed
+ * @date 2008-09-08
+ * @brief Implementation for llf32uictrl.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// Precompiled header
+#include "linden_common.h"
+// associated header
+#include "llf32uictrl.h"
+// STL headers
+// std headers
+// external library headers
+// other Linden headers
+
+LLF32UICtrl::LLF32UICtrl(const Params& p)
+: LLUICtrl(p),
+ mInitialValue(p.initial_value().asReal()),
+ mMinValue(p.min_value),
+ mMaxValue(p.max_value),
+ mIncrement(p.increment)
+{
+ mViewModel->setValue(p.initial_value);
+}
+
+F32 LLF32UICtrl::getValueF32() const
+{
+ return mViewModel->getValue().asReal();
+}
diff --git a/indra/llui/llf32uictrl.h b/indra/llui/llf32uictrl.h
new file mode 100644
index 0000000000..0a54fe761b
--- /dev/null
+++ b/indra/llui/llf32uictrl.h
@@ -0,0 +1,83 @@
+/**
+ * @file llf32uictrl.h
+ * @author Nat Goodspeed
+ * @date 2008-09-08
+ * @brief Base class for float-valued LLUICtrl widgets
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#if ! defined(LL_LLF32UICTRL_H)
+#define LL_LLF32UICTRL_H
+
+#include "lluictrl.h"
+
+class LLF32UICtrl: public LLUICtrl
+{
+public:
+ struct Params: public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<F32> min_value,
+ max_value,
+ increment;
+
+ Params()
+ : min_value("min_val", 0.f),
+ max_value("max_val", 1.f),
+ increment("increment", 0.1f)
+ {}
+ };
+
+protected:
+ LLF32UICtrl(const Params& p);
+
+public:
+ virtual F32 getValueF32() const;
+
+ virtual void setValue(const LLSD& value ) { mViewModel->setValue(value); }
+ virtual LLSD getValue() const { return LLSD(getValueF32()); }
+
+ virtual void setMinValue(const LLSD& min_value) { setMinValue((F32)min_value.asReal()); }
+ virtual void setMaxValue(const LLSD& max_value) { setMaxValue((F32)max_value.asReal()); }
+
+ virtual F32 getInitialValue() const { return mInitialValue; }
+ virtual F32 getMinValue() const { return mMinValue; }
+ virtual F32 getMaxValue() const { return mMaxValue; }
+ virtual F32 getIncrement() const { return mIncrement; }
+ virtual void setMinValue(F32 min_value) { mMinValue = min_value; }
+ virtual void setMaxValue(F32 max_value) { mMaxValue = max_value; }
+ virtual void setIncrement(F32 increment) { mIncrement = increment;}
+
+protected:
+ F32 mInitialValue;
+ F32 mMinValue;
+ F32 mMaxValue;
+ F32 mIncrement;
+};
+
+#endif /* ! defined(LL_LLF32UICTRL_H) */
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 21f8f6e5f7..be7e050b58 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -43,11 +43,13 @@
#include "llbutton.h"
#include "llcheckboxctrl.h"
#include "lldraghandle.h"
+#include "llfloaterreg.h"
#include "llfocusmgr.h"
#include "llresizebar.h"
#include "llresizehandle.h"
#include "llkeyboard.h"
#include "llmenugl.h" // MENU_BAR_HEIGHT
+#include "llmodaldialog.h"
#include "lltextbox.h"
#include "llresmgr.h"
#include "llui.h"
@@ -56,37 +58,37 @@
#include "llcontrol.h"
#include "lltabcontainer.h"
#include "v2math.h"
+#include "lltrans.h"
+#include "llmultifloater.h"
-const S32 MINIMIZED_WIDTH = 160;
-const S32 CLOSE_BOX_FROM_TOP = 1;
// use this to control "jumping" behavior when Ctrl-Tabbing
const S32 TABBED_FLOATER_OFFSET = 0;
std::string LLFloater::sButtonActiveImageNames[BUTTON_COUNT] =
{
- "UIImgBtnCloseActiveUUID", //BUTTON_CLOSE
- "UIImgBtnRestoreActiveUUID", //BUTTON_RESTORE
- "UIImgBtnMinimizeActiveUUID", //BUTTON_MINIMIZE
- "UIImgBtnTearOffActiveUUID", //BUTTON_TEAR_OFF
- "UIImgBtnCloseActiveUUID", //BUTTON_EDIT
+ "closebox.tga", //BUTTON_CLOSE
+ "restore.tga", //BUTTON_RESTORE
+ "minimize.tga", //BUTTON_MINIMIZE
+ "tearoffbox.tga", //BUTTON_TEAR_OFF
+ "closebox.tga", //BUTTON_EDIT
};
std::string LLFloater::sButtonInactiveImageNames[BUTTON_COUNT] =
{
- "UIImgBtnCloseInactiveUUID", //BUTTON_CLOSE
- "UIImgBtnRestoreInactiveUUID", //BUTTON_RESTORE
- "UIImgBtnMinimizeInactiveUUID", //BUTTON_MINIMIZE
- "UIImgBtnTearOffInactiveUUID", //BUTTON_TEAR_OFF
- "UIImgBtnCloseInactiveUUID", //BUTTON_EDIT
+ "close_inactive_blue.tga", //BUTTON_CLOSE
+ "restore_inactive.tga", //BUTTON_RESTORE
+ "minimize_inactive.tga", //BUTTON_MINIMIZE
+ "tearoffbox.tga", //BUTTON_TEAR_OFF
+ "close_inactive_blue.tga", //BUTTON_EDIT
};
std::string LLFloater::sButtonPressedImageNames[BUTTON_COUNT] =
{
- "UIImgBtnClosePressedUUID", //BUTTON_CLOSE
- "UIImgBtnRestorePressedUUID", //BUTTON_RESTORE
- "UIImgBtnMinimizePressedUUID", //BUTTON_MINIMIZE
- "UIImgBtnTearOffPressedUUID", //BUTTON_TEAR_OFF
- "UIImgBtnClosePressedUUID", //BUTTON_EDIT
+ "close_in_blue.tga", //BUTTON_CLOSE
+ "restore_pressed.tga", //BUTTON_RESTORE
+ "minimize_pressed.tga", //BUTTON_MINIMIZE
+ "tearoff_pressed.tga", //BUTTON_TEAR_OFF
+ "close_in_blue.tga", //BUTTON_EDIT
};
std::string LLFloater::sButtonNames[BUTTON_COUNT] =
@@ -98,17 +100,20 @@ std::string LLFloater::sButtonNames[BUTTON_COUNT] =
"llfloater_edit_btn", //BUTTON_EDIT
};
-std::string LLFloater::sButtonToolTips[BUTTON_COUNT] =
+std::string LLFloater::sButtonToolTips[BUTTON_COUNT] = {};
+
+
+std::string LLFloater::sButtonToolTipsIndex[BUTTON_COUNT]=
{
#ifdef LL_DARWIN
- "Close (Cmd-W)", //BUTTON_CLOSE
+ "BUTTON_CLOSE_DARWIN",//LLTrans::getString("BUTTON_CLOSE_DARWIN"), //"Close (Cmd-W)", //BUTTON_CLOSE
#else
- "Close (Ctrl-W)", //BUTTON_CLOSE
+ "BUTTON_CLOSE_WIN", //LLTrans::getString("BUTTON_CLOSE_WIN"), //"Close (Ctrl-W)", //BUTTON_CLOSE
#endif
- "Restore", //BUTTON_RESTORE
- "Minimize", //BUTTON_MINIMIZE
- "Tear Off", //BUTTON_TEAR_OFF
- "Edit", //BUTTON_EDIT
+ "BUTTON_RESTORE",//LLTrans::getString("BUTTON_RESTORE"), //"Restore", //BUTTON_RESTORE
+ "BUTTON_MINIMIZE",//LLTrans::getString("BUTTON_MINIMIZE"), //"Minimize", //BUTTON_MINIMIZE
+ "BUTTON_TEAR_OFF",//LLTrans::getString("BUTTON_TEAR_OFF"), //"Tear Off", //BUTTON_TEAR_OFF
+ "BUTTON_EDIT", //LLTrans::getString("BUTTON_EDIT"), // "Edit", //BUTTON_EDIT
};
LLFloater::click_callback LLFloater::sButtonCallbacks[BUTTON_COUNT] =
@@ -126,59 +131,118 @@ LLFloater::handle_map_t LLFloater::sFloaterMap;
LLFloaterView* gFloaterView = NULL;
-LLFloater::LLFloater() :
- //FIXME: we should initialize *all* member variables here
- LLPanel(), mAutoFocus(TRUE),
- mResizable(FALSE),
- mDragOnLeft(FALSE),
- mMinWidth(0),
- mMinHeight(0)
-{
- // automatically take focus when opened
- mAutoFocus = TRUE;
+//static
+bool LLFloater::KeyCompare::compare(const LLSD& a, const LLSD& b)
+{
+ if (a.type() != b.type())
+ {
+ //llerrs << "Mismatched LLSD types: (" << a << ") mismatches (" << b << ")" << llendl;
+ return false;
+ }
+ else if (a.isUndefined())
+ return false;
+ else if (a.isInteger())
+ return a.asInteger() < b.asInteger();
+ else if (a.isReal())
+ return a.asReal() < b.asReal();
+ else if (a.isString())
+ return a.asString() < b.asString();
+ else if (a.isUUID())
+ return a.asUUID() < b.asUUID();
+ else if (a.isDate())
+ return a.asDate() < b.asDate();
+ else if (a.isURI())
+ return a.asString() < b.asString(); // compare URIs as strings
+ else if (a.isBoolean())
+ return a.asBoolean() < b.asBoolean();
+ else
+ return false; // no valid operation for Binary
+}
+
+bool LLFloater::KeyCompare::equate(const LLSD& a, const LLSD& b)
+{
+ if (a.type() != b.type())
+ {
+ //llerrs << "Mismatched LLSD types: (" << a << ") mismatches (" << b << ")" << llendl;
+ return false;
+ }
+ else if (a.isUndefined())
+ return true;
+ else if (a.isInteger())
+ return a.asInteger() == b.asInteger();
+ else if (a.isReal())
+ return a.asReal() == b.asReal();
+ else if (a.isString())
+ return a.asString() == b.asString();
+ else if (a.isUUID())
+ return a.asUUID() == b.asUUID();
+ else if (a.isDate())
+ return a.asDate() == b.asDate();
+ else if (a.isURI())
+ return a.asString() == b.asString(); // compare URIs as strings
+ else if (a.isBoolean())
+ return a.asBoolean() == b.asBoolean();
+ else
+ return false; // no valid operation for Binary
+}
+
+//************************************
+
+LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p)
+ : LLPanel(),
+ mDragHandle(NULL),
+ mTitle(p.title),
+ mShortTitle(p.short_title),
+ mSingleInstance(p.single_instance),
+ mKey(key),
+ mAutoTile(p.auto_tile),
+ mCanTearOff(p.can_tear_off),
+ mCanMinimize(p.can_minimize),
+ mCanClose(p.can_close),
+ mDragOnLeft(p.can_drag_on_left),
+ mResizable(p.can_resize),
+ mMinWidth(p.min_width),
+ mMinHeight(p.min_height),
+ mMinimized(FALSE),
+ mForeground(FALSE),
+ mFirstLook(TRUE),
+ mEditing(FALSE),
+ mButtonScale(1.0f),
+ mAutoFocus(TRUE), // automatically take focus when opened
+ mHasBeenDraggedWhileMinimized(FALSE),
+ mPreviousMinimizedBottom(0),
+ mPreviousMinimizedLeft(0),
+ mNotificationContext(NULL)
+{
+ static LLUICachedControl<LLColor4> default_background_color ("FloaterDefaultBackgroundColor", *(new LLColor4));
+ static LLUICachedControl<LLColor4> focus_background_color ("FloaterFocusBackgroundColor", *(new LLColor4));
+
for (S32 i = 0; i < BUTTON_COUNT; i++)
{
- mButtonsEnabled[i] = FALSE;
- mButtons[i] = NULL;
- }
- for (S32 i = 0; i < 4; i++)
- {
- mResizeBar[i] = NULL;
- mResizeHandle[i] = NULL;
+ sButtonToolTips[i] =LLTrans::getString( sButtonToolTipsIndex[i]);
}
- mDragHandle = NULL;
+
mHandle.bind(this);
mNotificationContext = new LLFloaterNotificationContext(getHandle());
-}
+ mBgColorAlpha = default_background_color;
+ mBgColorOpaque = focus_background_color;
-LLFloater::LLFloater(const std::string& name)
-: LLPanel(name), mAutoFocus(TRUE) // automatically take focus when opened
-{
- for (S32 i = 0; i < BUTTON_COUNT; i++)
- {
- mButtonsEnabled[i] = FALSE;
- mButtons[i] = NULL;
- }
for (S32 i = 0; i < 4; i++)
{
- mResizeBar[i] = NULL;
+ mResizeBar[i] = NULL;
mResizeHandle[i] = NULL;
}
- std::string title; // null string
- initFloater(title, FALSE, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT, FALSE, TRUE, TRUE); // defaults
-}
+ // Clicks stop here.
+ setMouseOpaque(TRUE);
+
+ // Floaters always draw their background, unlike every other panel.
+ setBackgroundVisible(TRUE);
-LLFloater::LLFloater(const std::string& name, const LLRect& rect, const std::string& title,
- BOOL resizable,
- S32 min_width,
- S32 min_height,
- BOOL drag_on_left,
- BOOL minimizable,
- BOOL close_btn,
- BOOL bordered)
-: LLPanel(name, rect, bordered), mAutoFocus(TRUE) // automatically take focus when opened
-{
+ // Floaters start not minimized. When minimized, they save their
+ // prior rectangle to be used on restore.
+ mExpandedRect.set(0,0,0,0);
+
for (S32 i = 0; i < BUTTON_COUNT; i++)
{
mButtonsEnabled[i] = FALSE;
@@ -189,259 +253,176 @@ LLFloater::LLFloater(const std::string& name, const LLRect& rect, const std::str
mResizeBar[i] = NULL;
mResizeHandle[i] = NULL;
}
- initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
-}
+
+ initFromParams(p);
+
+ // chrome floaters don't take focus at all
+ setFocusRoot(!getIsChrome());
-LLFloater::LLFloater(const std::string& name, const std::string& rect_control, const std::string& title,
- BOOL resizable,
- S32 min_width,
- S32 min_height,
- BOOL drag_on_left,
- BOOL minimizable,
- BOOL close_btn,
- BOOL bordered)
-: LLPanel(name, rect_control, bordered), mAutoFocus(TRUE) // automatically take focus when opened
-{
- for (S32 i = 0; i < BUTTON_COUNT; i++)
- {
- mButtonsEnabled[i] = FALSE;
- mButtons[i] = NULL;
- }
- for (S32 i = 0; i < 4; i++)
- {
- mResizeBar[i] = NULL;
- mResizeHandle[i] = NULL;
- }
- initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
+ initFloater();
}
-
// Note: Floaters constructed from XML call init() twice!
-void LLFloater::initFloater(const std::string& title,
- BOOL resizable, S32 min_width, S32 min_height,
- BOOL drag_on_left, BOOL minimizable, BOOL close_btn)
+void LLFloater::initFloater()
{
- mHandle.bind(this);
- mNotificationContext = new LLFloaterNotificationContext(getHandle());
-
- // Init function can be called more than once, so clear out old data.
- for (S32 i = 0; i < BUTTON_COUNT; i++)
- {
- mButtonsEnabled[i] = FALSE;
- if (mButtons[i] != NULL)
- {
- removeChild(mButtons[i]);
- delete mButtons[i];
- mButtons[i] = NULL;
- }
- }
- mButtonScale = 1.f;
+ addDragHandle();
+
+ addResizeCtrls();
- //sjb: Thia is a bit of a hack:
- BOOL need_border = hasBorder();
- // remove the border since deleteAllChildren() will also delete the border (but not clear mBorder)
- removeBorder();
- // this will delete mBorder too
- deleteAllChildren();
- // add the border back if we want it
- if (need_border)
+ // Close button.
+ if (mCanClose)
{
- addBorder();
+ mButtonsEnabled[BUTTON_CLOSE] = TRUE;
}
- // chrome floaters don't take focus at all
- setFocusRoot(!getIsChrome());
-
- // Reset cached pointers
- mDragHandle = NULL;
- for (S32 i = 0; i < 4; i++)
+ // Minimize button only for top draggers
+ if ( !mDragOnLeft && mCanMinimize )
{
- mResizeBar[i] = NULL;
- mResizeHandle[i] = NULL;
+ mButtonsEnabled[BUTTON_MINIMIZE] = TRUE;
}
- mCanTearOff = TRUE;
- mEditing = FALSE;
- // Clicks stop here.
- setMouseOpaque(TRUE);
+ buildButtons();
- mFirstLook = TRUE;
- mForeground = FALSE;
- mDragOnLeft = drag_on_left == TRUE;
+ // Floaters are created in the invisible state
+ setVisible(FALSE);
- // Floaters always draw their background, unlike every other panel.
- setBackgroundVisible(TRUE);
+ // add self to handle->floater map
+ sFloaterMap[mHandle] = this;
- // Floaters start not minimized. When minimized, they save their
- // prior rectangle to be used on restore.
- mMinimized = FALSE;
- mExpandedRect.set(0,0,0,0);
-
- S32 close_pad; // space to the right of close box
- S32 close_box_size; // For layout purposes, how big is the close box?
- if (close_btn)
- {
- close_box_size = LLFLOATER_CLOSE_BOX_SIZE;
- close_pad = 0;
- }
- else
+ if (!getParent())
{
- close_box_size = 0;
- close_pad = 0;
+ gFloaterView->addChild(this);
}
+}
- S32 minimize_box_size;
- S32 minimize_pad;
- if (minimizable && !drag_on_left)
- {
- minimize_box_size = LLFLOATER_CLOSE_BOX_SIZE;
- minimize_pad = 0;
- }
- else
+void LLFloater::addDragHandle()
+{
+ static LLUICachedControl<S32> floater_close_box_size ("UIFloaterCloseBoxSize", 0);
+ S32 close_box_size = mCanClose ? floater_close_box_size : 0;
+
+ if (!mDragHandle)
{
- minimize_box_size = 0;
- minimize_pad = 0;
+ if (mDragOnLeft)
+ {
+ LLDragHandleLeft::Params p;
+ p.name("drag");
+ p.follows.flags(FOLLOWS_ALL);
+ p.label(mTitle);
+ mDragHandle = LLUICtrlFactory::create<LLDragHandleLeft>(p);
+ }
+ else // drag on top
+ {
+ LLDragHandleTop::Params p;
+ p.name("Drag Handle");
+ p.follows.flags(FOLLOWS_ALL);
+ p.label(mTitle);
+ mDragHandle = LLUICtrlFactory::create<LLDragHandleTop>(p);
+ }
+ addChild(mDragHandle);
}
-
- // Drag Handle
- // Add first so it's in the background.
-// const S32 drag_pad = 2;
- if (drag_on_left)
+ LLRect rect;
+ if (mDragOnLeft)
{
- LLRect drag_handle_rect;
- drag_handle_rect.setOriginAndSize(
- 0, 0,
- DRAG_HANDLE_WIDTH,
- getRect().getHeight() - LLPANEL_BORDER_WIDTH - close_box_size);
- mDragHandle = new LLDragHandleLeft(std::string("drag"), drag_handle_rect, title );
+ rect.setLeftTopAndSize(0, 0, DRAG_HANDLE_WIDTH, getRect().getHeight() - LLPANEL_BORDER_WIDTH - close_box_size);
}
else // drag on top
{
- LLRect drag_handle_rect( 0, getRect().getHeight(), getRect().getWidth(), 0 );
- mDragHandle = new LLDragHandleTop( std::string("Drag Handle"), drag_handle_rect, title );
- }
- addChild(mDragHandle);
-
- // Resize Handle
- mResizable = resizable;
- mMinWidth = min_width;
- mMinHeight = min_height;
-
- if( mResizable )
- {
- // Resize bars (sides)
- const S32 RESIZE_BAR_THICKNESS = 3;
- mResizeBar[LLResizeBar::LEFT] = new LLResizeBar(
- std::string("resizebar_left"),
- this,
- LLRect( 0, getRect().getHeight(), RESIZE_BAR_THICKNESS, 0),
- min_width, S32_MAX, LLResizeBar::LEFT );
- addChild( mResizeBar[0] );
-
- mResizeBar[LLResizeBar::TOP] = new LLResizeBar(
- std::string("resizebar_top"),
- this,
- LLRect( 0, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_BAR_THICKNESS),
- min_height, S32_MAX, LLResizeBar::TOP );
- addChild( mResizeBar[1] );
-
- mResizeBar[LLResizeBar::RIGHT] = new LLResizeBar(
- std::string("resizebar_right"),
- this,
- LLRect( getRect().getWidth() - RESIZE_BAR_THICKNESS, getRect().getHeight(), getRect().getWidth(), 0),
- min_width, S32_MAX, LLResizeBar::RIGHT );
- addChild( mResizeBar[2] );
-
- mResizeBar[LLResizeBar::BOTTOM] = new LLResizeBar(
- std::string("resizebar_bottom"),
- this,
- LLRect( 0, RESIZE_BAR_THICKNESS, getRect().getWidth(), 0),
- min_height, S32_MAX, LLResizeBar::BOTTOM );
- addChild( mResizeBar[3] );
-
-
- // Resize handles (corners)
- mResizeHandle[0] = new LLResizeHandle(
- std::string("Resize Handle"),
- LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT, getRect().getWidth(), 0),
- min_width,
- min_height,
- LLResizeHandle::RIGHT_BOTTOM);
- addChild(mResizeHandle[0]);
-
- mResizeHandle[1] = new LLResizeHandle(
- std::string("resize"),
- LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_HANDLE_HEIGHT),
- min_width,
- min_height,
- LLResizeHandle::RIGHT_TOP );
- addChild(mResizeHandle[1]);
-
- mResizeHandle[2] = new LLResizeHandle( std::string("resize"),
- LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ),
- min_width,
- min_height,
- LLResizeHandle::LEFT_BOTTOM );
- addChild(mResizeHandle[2]);
-
- mResizeHandle[3] = new LLResizeHandle( std::string("resize"),
- LLRect( 0, getRect().getHeight(), RESIZE_HANDLE_WIDTH, getRect().getHeight() - RESIZE_HANDLE_HEIGHT ),
- min_width,
- min_height,
- LLResizeHandle::LEFT_TOP );
- addChild(mResizeHandle[3]);
+ rect = getLocalRect();
}
+ mDragHandle->setRect(rect);
+ updateButtons();
+ applyTitle();
+}
- // Close button.
- if (close_btn)
+void LLFloater::addResizeCtrls()
+{
+ for (S32 i = 0; i < 4; i++)
{
- mButtonsEnabled[BUTTON_CLOSE] = TRUE;
+ if (mResizeBar[i])
+ {
+ removeChild(mResizeBar[i]);
+ delete mResizeBar[i];
+ mResizeBar[i] = NULL;
+ }
+ if (mResizeHandle[i])
+ {
+ removeChild(mResizeHandle[i]);
+ delete mResizeHandle[i];
+ mResizeHandle[i] = NULL;
+ }
}
-
- // Minimize button only for top draggers
- if ( !drag_on_left && minimizable )
+ if( !mResizable )
{
- mButtonsEnabled[BUTTON_MINIMIZE] = TRUE;
+ return;
}
+
+ // Resize bars (sides)
+ const S32 RESIZE_BAR_THICKNESS = 3;
+ LLResizeBar::Params p;
+ p.name("resizebar_left");
+ p.resizing_view(this);
+ p.rect(LLRect( 0, getRect().getHeight(), RESIZE_BAR_THICKNESS, 0));
+ p.min_size(mMinWidth);
+ p.side(LLResizeBar::LEFT);
+ mResizeBar[LLResizeBar::LEFT] = LLUICtrlFactory::create<LLResizeBar>(p);
+ addChild( mResizeBar[LLResizeBar::LEFT] );
+
+ p.name("resizebar_top");
+ p.rect(LLRect( 0, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_BAR_THICKNESS));
+ p.min_size(mMinHeight);
+ p.side(LLResizeBar::TOP);
+
+ mResizeBar[LLResizeBar::TOP] = LLUICtrlFactory::create<LLResizeBar>(p);
+ addChild( mResizeBar[LLResizeBar::TOP] );
+
+ p.name("resizebar_right");
+ p.rect(LLRect(getRect().getWidth() - RESIZE_BAR_THICKNESS, getRect().getHeight(), getRect().getWidth(), 0));
+ p.min_size(mMinWidth);
+ p.side(LLResizeBar::RIGHT);
+
+ mResizeBar[LLResizeBar::RIGHT] = LLUICtrlFactory::create<LLResizeBar>(p);
+ addChild( mResizeBar[LLResizeBar::RIGHT] );
+
+ p.name("resizebar_bottom");
+ p.rect(LLRect(0, RESIZE_BAR_THICKNESS, getRect().getWidth(), 0));
+ p.min_size(mMinHeight);
+ p.side(LLResizeBar::BOTTOM);
+ mResizeBar[LLResizeBar::BOTTOM] = LLUICtrlFactory::create<LLResizeBar>(p);
+ addChild( mResizeBar[LLResizeBar::BOTTOM] );
+
+ // Resize handles (corners)
+ LLResizeHandle::Params handle_p;
+ handle_p.rect(LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT, getRect().getWidth(), 0));
+ handle_p.min_width(mMinWidth);
+ handle_p.min_height(mMinHeight);
+ handle_p.corner(LLResizeHandle::RIGHT_BOTTOM);
+ mResizeHandle[0] = LLUICtrlFactory::create<LLResizeHandle>(handle_p);
+ addChild(mResizeHandle[0]);
+
+ handle_p.rect(LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_HANDLE_HEIGHT));
+ handle_p.corner(LLResizeHandle::RIGHT_TOP);
+ mResizeHandle[1] = LLUICtrlFactory::create<LLResizeHandle>(handle_p);
+ addChild(mResizeHandle[1]);
+
+ handle_p.rect(LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ));
+ handle_p.corner(LLResizeHandle::LEFT_BOTTOM);
+ mResizeHandle[2] = LLUICtrlFactory::create<LLResizeHandle>(handle_p);
+ addChild(mResizeHandle[2]);
- // Keep track of whether this window has ever been dragged while it
- // was minimized. If it has, we'll remember its position for the
- // next time it's minimized.
- mHasBeenDraggedWhileMinimized = FALSE;
- mPreviousMinimizedLeft = 0;
- mPreviousMinimizedBottom = 0;
-
- buildButtons();
-
- // JC - Don't do this here, because many floaters first construct themselves,
- // then show themselves. Put it in setVisibleAndFrontmost.
- // make_ui_sound("UISndWindowOpen");
-
- // RN: floaters are created in the invisible state
- setVisible(FALSE);
-
- // add self to handle->floater map
- sFloaterMap[mHandle] = this;
-
- if (!getParent())
- {
- gFloaterView->addChild(this);
- }
+ handle_p.rect(LLRect( 0, getRect().getHeight(), RESIZE_HANDLE_WIDTH, getRect().getHeight() - RESIZE_HANDLE_HEIGHT ));
+ handle_p.corner(LLResizeHandle::LEFT_TOP);
+ mResizeHandle[3] = LLUICtrlFactory::create<LLResizeHandle>(handle_p);
+ addChild(mResizeHandle[3]);
}
// virtual
LLFloater::~LLFloater()
{
+ LLFloaterReg::removeInstance(mInstanceName, mKey);
+
delete mNotificationContext;
mNotificationContext = NULL;
- control_map_t::iterator itor;
- for (itor = mFloaterControls.begin(); itor != mFloaterControls.end(); ++itor)
- {
- delete itor->second;
- }
- mFloaterControls.clear();
-
//// am I not hosted by another floater?
//if (mHostHandle.isDead())
//{
@@ -469,8 +450,27 @@ LLFloater::~LLFloater()
delete mResizeBar[i];
delete mResizeHandle[i];
}
+
+ storeRectControl();
+ setVisible(false); // We're not visible if we're destroyed
+ storeVisibilityControl();
+}
+
+void LLFloater::storeRectControl()
+{
+ if( mRectControl.size() > 1 )
+ {
+ LLUI::sSettingGroups["floater"]->setRect( mRectControl, getRect() );
+ }
}
+void LLFloater::storeVisibilityControl()
+{
+ if( mVisibilityControl.size() > 1 )
+ {
+ LLUI::sSettingGroups["floater"]->setBOOL( mVisibilityControl, getVisible() );
+ }
+}
void LLFloater::setVisible( BOOL visible )
{
@@ -504,10 +504,25 @@ void LLFloater::setVisible( BOOL visible )
}
++dependent_it;
}
+
+ storeVisibilityControl();
+}
+
+// virtual
+void LLFloater::onVisibilityChange ( BOOL new_visibility )
+{
+ if (new_visibility)
+ {
+ if (getHost())
+ getHost()->setFloaterFlashing(this, FALSE);
+ }
+ LLPanel::onVisibilityChange ( new_visibility );
}
-void LLFloater::open() /* Flawfinder: ignore */
+void LLFloater::openFloater(const LLSD& key)
{
+ mKey = key; // in case we need to open ourselves again
+
if (getSoundFlags() != SILENT
// don't play open sound for hosted (tabbed) windows
&& !getHost()
@@ -525,9 +540,11 @@ void LLFloater::open() /* Flawfinder: ignore */
// only select tabs if window they are hosted in is visible
getFloaterHost()->addFloater(this, getFloaterHost()->getVisible());
}
- else if (getHost() != NULL)
+
+ if (getHost() != NULL)
{
- // already hosted
+ getHost()->setMinimized(FALSE);
+ getHost()->setVisibleAndFrontmost(mAutoFocus);
getHost()->showFloater(this);
}
else
@@ -536,10 +553,10 @@ void LLFloater::open() /* Flawfinder: ignore */
setVisibleAndFrontmost(mAutoFocus);
}
- onOpen();
+ onOpen(key);
}
-void LLFloater::close(bool app_quitting)
+void LLFloater::closeFloater(bool app_quitting)
{
// Always unminimize before trying to close.
// Most of the time the user will never see this state.
@@ -570,7 +587,7 @@ void LLFloater::close(bool app_quitting)
if (floaterp)
{
++dependent_it;
- floaterp->close();
+ floaterp->closeFloater(app_quitting);
}
else
{
@@ -597,7 +614,7 @@ void LLFloater::close(bool app_quitting)
}
}
}
-
+
// Let floater do cleanup.
onClose(app_quitting);
}
@@ -607,6 +624,7 @@ void LLFloater::close(bool app_quitting)
void LLFloater::reshape(S32 width, S32 height, BOOL called_from_parent)
{
LLPanel::reshape(width, height, called_from_parent);
+ storeRectControl();
}
void LLFloater::releaseFocus()
@@ -664,15 +682,23 @@ void LLFloater::center()
centerWithin(gFloaterView->getRect());
}
+LLMultiFloater* LLFloater::getHost()
+{
+ return (LLMultiFloater*)mHostHandle.get();
+}
+
void LLFloater::applyRectControl()
{
- if (!getRectControl().empty())
+ if (mRectControl.size() > 1)
{
- const LLRect& rect = LLUI::sConfigGroup->getRect(getRectControl());
- translate( rect.mLeft - getRect().mLeft, rect.mBottom - getRect().mBottom);
- if (mResizable)
+ const LLRect& rect = LLUI::sSettingGroups["floater"]->getRect(mRectControl);
+ if (rect.getWidth() > 0 && rect.getHeight() > 0)
{
- reshape(llmax(mMinWidth, rect.getWidth()), llmax(mMinHeight, rect.getHeight()));
+ translate( rect.mLeft - getRect().mLeft, rect.mBottom - getRect().mBottom);
+ if (mResizable)
+ {
+ reshape(llmax(mMinWidth, rect.getWidth()), llmax(mMinHeight, rect.getHeight()));
+ }
}
}
}
@@ -763,7 +789,7 @@ BOOL LLFloater::canSnapTo(const LLView* other_view)
return LLPanel::canSnapTo(other_view);
}
-void LLFloater::snappedTo(const LLView* snap_view)
+void LLFloater::setSnappedTo(const LLView* snap_view)
{
if (!snap_view || snap_view == getParent())
{
@@ -778,10 +804,10 @@ void LLFloater::snappedTo(const LLView* snap_view)
}
}
-void LLFloater::userSetShape(const LLRect& new_rect)
+void LLFloater::handleReshape(const LLRect& new_rect, bool by_user)
{
const LLRect old_rect = getRect();
- LLView::userSetShape(new_rect);
+ LLView::handleReshape(new_rect, by_user);
// if not minimized, adjust all snapped dependents to new shape
if (!isMinimized())
@@ -816,7 +842,7 @@ void LLFloater::userSetShape(const LLRect& new_rect)
delta_y += new_rect.mBottom - old_rect.mBottom;
dependent_rect.translate(delta_x, delta_y);
- floaterp->userSetShape(dependent_rect);
+ floaterp->setShape(dependent_rect, by_user);
}
}
}
@@ -834,6 +860,9 @@ void LLFloater::userSetShape(const LLRect& new_rect)
void LLFloater::setMinimized(BOOL minimize)
{
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+ static LLUICachedControl<S32> minimized_width ("UIMinimizedWidth", 0);
+
if (minimize == mMinimized) return;
if (minimize)
@@ -902,7 +931,7 @@ void LLFloater::setMinimized(BOOL minimize)
mMinimized = TRUE;
// Reshape *after* setting mMinimized
- reshape( MINIMIZED_WIDTH, LLFLOATER_HEADER_SIZE, TRUE);
+ reshape( minimized_width, floater_header_size, TRUE);
}
else
{
@@ -995,6 +1024,13 @@ void LLFloater::setFocus( BOOL b )
}
}
+// virtual
+void LLFloater::setRect(const LLRect &rect)
+{
+ LLPanel::setRect(rect);
+ addDragHandle(); // re-add drag handle, sized based on rect
+}
+
// virtual
void LLFloater::setIsChrome(BOOL is_chrome)
{
@@ -1276,19 +1312,18 @@ void LLFloater::setEditModeEnabled(BOOL enable)
// static
-void LLFloater::onClickMinimize(void *userdata)
+void LLFloater::onClickMinimize(LLFloater* self)
{
- LLFloater* self = (LLFloater*) userdata;
- if (!self) return;
-
+ if (!self)
+ return;
self->setMinimized( !self->isMinimized() );
}
-void LLFloater::onClickTearOff(void *userdata)
+void LLFloater::onClickTearOff(LLFloater* self)
{
- LLFloater* self = (LLFloater*) userdata;
- if (!self) return;
-
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+ if (!self)
+ return;
LLMultiFloater* host_floater = self->getHost();
if (host_floater) //Tear off
{
@@ -1297,12 +1332,12 @@ void LLFloater::onClickTearOff(void *userdata)
// reparent to floater view
gFloaterView->addChild(self);
- self->open(); /* Flawfinder: ignore */
+ self->openFloater(self->getKey());
// only force position for floaters that don't have that data saved
- if (self->getRectControl().empty())
+ if (self->mRectControl.size() <= 1)
{
- new_rect.setLeftTopAndSize(host_floater->getRect().mLeft + 5, host_floater->getRect().mTop - LLFLOATER_HEADER_SIZE - 5, self->getRect().getWidth(), self->getRect().getHeight());
+ new_rect.setLeftTopAndSize(host_floater->getRect().mLeft + 5, host_floater->getRect().mTop - floater_header_size - 5, self->getRect().getWidth(), self->getRect().getHeight());
self->setRect(new_rect);
}
gFloaterView->adjustToFitScreen(self, FALSE);
@@ -1317,17 +1352,16 @@ void LLFloater::onClickTearOff(void *userdata)
self->setMinimized(FALSE); // to reenable minimize button if it was minimized
new_host->showFloater(self);
// make sure host is visible
- new_host->open();
+ new_host->openFloater(new_host->getKey());
}
}
}
// static
-void LLFloater::onClickEdit(void *userdata)
+void LLFloater::onClickEdit(LLFloater* self)
{
- LLFloater* self = (LLFloater*) userdata;
- if (!self) return;
-
+ if (!self)
+ return;
self->mEditing = self->mEditing ? FALSE : TRUE;
}
@@ -1373,7 +1407,7 @@ void LLFloater::closeFocusedFloater()
LLFloater* floater_to_close = LLFloater::getClosableFloaterFromFocus();
if(floater_to_close)
{
- floater_to_close->close();
+ floater_to_close->closeFloater();
}
// if nothing took focus after closing focused floater
@@ -1388,12 +1422,11 @@ void LLFloater::closeFocusedFloater()
// static
-void LLFloater::onClickClose( void* userdata )
+void LLFloater::onClickClose( LLFloater* self )
{
- LLFloater* self = (LLFloater*) userdata;
- if (!self) return;
-
- self->close();
+ if (!self)
+ return;
+ self->closeFloater(false);
}
@@ -1408,8 +1441,11 @@ void LLFloater::draw()
S32 right = getRect().getWidth() - LLPANEL_BORDER_WIDTH;
S32 bottom = LLPANEL_BORDER_WIDTH;
- LLColor4 shadow_color = LLUI::sColorsGroup->getColor("ColorDropShadow");
- F32 shadow_offset = (F32)LLUI::sConfigGroup->getS32("DropShadowFloater");
+ static LLUICachedControl<S32> shadow_offset_S32 ("DropShadowFloater", 0);
+ static LLUICachedControl<LLColor4> shadow_color_cached ("ColorDropShadow", *(new LLColor4));
+ LLColor4 shadow_color = shadow_color_cached;
+ F32 shadow_offset = (F32)shadow_offset_S32;
+
if (!isBackgroundOpaque())
{
shadow_offset *= 0.2f;
@@ -1422,20 +1458,21 @@ void LLFloater::draw()
// No transparent windows in simple UI
if (isBackgroundOpaque())
{
- gl_rect_2d( left, top, right, bottom, getBackgroundColor() );
+ gl_rect_2d( left, top, right, bottom, mBgColorOpaque );
}
else
{
- gl_rect_2d( left, top, right, bottom, getTransparentColor() );
+ gl_rect_2d( left, top, right, bottom, mBgColorAlpha );
}
if(gFocusMgr.childHasKeyboardFocus(this) && !getIsChrome() && !getCurrentTitle().empty())
{
+ static LLUICachedControl<LLColor4> titlebar_focus_color ("TitleBarFocusColor", *(new LLColor4));
// draw highlight on title bar to indicate focus. RDW
- const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
+ const LLFontGL* font = LLFontGL::getFontSansSerif();
LLRect r = getRect();
gl_rect_2d_offset_local(0, r.getHeight(), r.getWidth(), r.getHeight() - (S32)font->getLineHeight() - 1,
- LLUI::sColorsGroup->getColor("TitleBarFocusColor"), 0, TRUE);
+ titlebar_focus_color, 0, TRUE);
}
}
@@ -1489,8 +1526,10 @@ void LLFloater::draw()
{
// add in a border to improve spacialized visual aclarity ;)
// use lines instead of gl_rect_2d so we can round the edges as per james' recommendation
+ static LLUICachedControl<LLColor4> focus_border_color ("FloaterFocusBorderColor", *(new LLColor4));
+ static LLUICachedControl<LLColor4> unfocus_border_color ("FloaterUnfocusBorderColor", *(new LLColor4));
LLUI::setLineWidth(1.5f);
- LLColor4 outlineColor = gFocusMgr.childHasKeyboardFocus(this) ? LLUI::sColorsGroup->getColor("FloaterFocusBorderColor") : LLUI::sColorsGroup->getColor("FloaterUnfocusBorderColor");
+ LLColor4 outlineColor = gFocusMgr.childHasKeyboardFocus(this) ? focus_border_color() : unfocus_border_color;
gl_rect_2d_offset_local(0, getRect().getHeight() + 1, getRect().getWidth() + 1, 0, outlineColor, -LLPANEL_BORDER_WIDTH, FALSE);
LLUI::setLineWidth(1.f);
}
@@ -1511,6 +1550,7 @@ void LLFloater::setCanMinimize(BOOL can_minimize)
{
// if removing minimize/restore button programmatically,
// go ahead and unminimize floater
+ mCanMinimize = can_minimize;
if (!can_minimize)
{
setMinimized(FALSE);
@@ -1524,6 +1564,7 @@ void LLFloater::setCanMinimize(BOOL can_minimize)
void LLFloater::setCanClose(BOOL can_close)
{
+ mCanClose = can_close;
mButtonsEnabled[BUTTON_CLOSE] = can_close;
updateButtons();
@@ -1538,83 +1579,10 @@ void LLFloater::setCanTearOff(BOOL can_tear_off)
}
-void LLFloater::setCanResize(BOOL can_resize)
+void LLFloater::setCanResize(BOOL can_resize)
{
- if (mResizable && !can_resize)
- {
- for (S32 i = 0; i < 4; i++)
- {
- removeChild(mResizeBar[i], TRUE);
- mResizeBar[i] = NULL;
-
- removeChild(mResizeHandle[i], TRUE);
- mResizeHandle[i] = NULL;
- }
- }
- else if (!mResizable && can_resize)
- {
- // Resize bars (sides)
- const S32 RESIZE_BAR_THICKNESS = 3;
- mResizeBar[0] = new LLResizeBar(
- std::string("resizebar_left"),
- this,
- LLRect( 0, getRect().getHeight(), RESIZE_BAR_THICKNESS, 0),
- mMinWidth, S32_MAX, LLResizeBar::LEFT );
- addChild( mResizeBar[0] );
-
- mResizeBar[1] = new LLResizeBar(
- std::string("resizebar_top"),
- this,
- LLRect( 0, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_BAR_THICKNESS),
- mMinHeight, S32_MAX, LLResizeBar::TOP );
- addChild( mResizeBar[1] );
-
- mResizeBar[2] = new LLResizeBar(
- std::string("resizebar_right"),
- this,
- LLRect( getRect().getWidth() - RESIZE_BAR_THICKNESS, getRect().getHeight(), getRect().getWidth(), 0),
- mMinWidth, S32_MAX, LLResizeBar::RIGHT );
- addChild( mResizeBar[2] );
-
- mResizeBar[3] = new LLResizeBar(
- std::string("resizebar_bottom"),
- this,
- LLRect( 0, RESIZE_BAR_THICKNESS, getRect().getWidth(), 0),
- mMinHeight, S32_MAX, LLResizeBar::BOTTOM );
- addChild( mResizeBar[3] );
-
-
- // Resize handles (corners)
- mResizeHandle[0] = new LLResizeHandle(
- std::string("Resize Handle"),
- LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT, getRect().getWidth(), 0),
- mMinWidth,
- mMinHeight,
- LLResizeHandle::RIGHT_BOTTOM);
- addChild(mResizeHandle[0]);
-
- mResizeHandle[1] = new LLResizeHandle( std::string("resize"),
- LLRect( getRect().getWidth() - RESIZE_HANDLE_WIDTH, getRect().getHeight(), getRect().getWidth(), getRect().getHeight() - RESIZE_HANDLE_HEIGHT),
- mMinWidth,
- mMinHeight,
- LLResizeHandle::RIGHT_TOP );
- addChild(mResizeHandle[1]);
-
- mResizeHandle[2] = new LLResizeHandle( std::string("resize"),
- LLRect( 0, RESIZE_HANDLE_HEIGHT, RESIZE_HANDLE_WIDTH, 0 ),
- mMinWidth,
- mMinHeight,
- LLResizeHandle::LEFT_BOTTOM );
- addChild(mResizeHandle[2]);
-
- mResizeHandle[3] = new LLResizeHandle( std::string("resize"),
- LLRect( 0, getRect().getHeight(), RESIZE_HANDLE_WIDTH, getRect().getHeight() - RESIZE_HANDLE_HEIGHT ),
- mMinWidth,
- mMinHeight,
- LLResizeHandle::LEFT_TOP );
- addChild(mResizeHandle[3]);
- }
mResizable = can_resize;
+ addResizeCtrls();
}
void LLFloater::setCanDrag(BOOL can_drag)
@@ -1633,6 +1601,8 @@ void LLFloater::setCanDrag(BOOL can_drag)
void LLFloater::updateButtons()
{
+ static LLUICachedControl<S32> floater_close_box_size ("UIFloaterCloseBoxSize", 0);
+ static LLUICachedControl<S32> close_box_from_top ("UICloseBoxFromTop", 0);
S32 button_count = 0;
for (S32 i = 0; i < BUTTON_COUNT; i++)
{
@@ -1652,17 +1622,17 @@ void LLFloater::updateButtons()
{
btn_rect.setLeftTopAndSize(
LLPANEL_BORDER_WIDTH,
- getRect().getHeight() - CLOSE_BOX_FROM_TOP - (LLFLOATER_CLOSE_BOX_SIZE + 1) * button_count,
- llround((F32)LLFLOATER_CLOSE_BOX_SIZE * mButtonScale),
- llround((F32)LLFLOATER_CLOSE_BOX_SIZE * mButtonScale));
+ getRect().getHeight() - close_box_from_top - (floater_close_box_size + 1) * button_count,
+ llround((F32)floater_close_box_size * mButtonScale),
+ llround((F32)floater_close_box_size * mButtonScale));
}
else
{
btn_rect.setLeftTopAndSize(
- getRect().getWidth() - LLPANEL_BORDER_WIDTH - (LLFLOATER_CLOSE_BOX_SIZE + 1) * button_count,
- getRect().getHeight() - CLOSE_BOX_FROM_TOP,
- llround((F32)LLFLOATER_CLOSE_BOX_SIZE * mButtonScale),
- llround((F32)LLFLOATER_CLOSE_BOX_SIZE * mButtonScale));
+ getRect().getWidth() - LLPANEL_BORDER_WIDTH - (floater_close_box_size + 1) * button_count,
+ getRect().getHeight() - close_box_from_top,
+ llround((F32)floater_close_box_size * mButtonScale),
+ llround((F32)floater_close_box_size * mButtonScale));
}
mButtons[i]->setRect(btn_rect);
@@ -1676,50 +1646,56 @@ void LLFloater::updateButtons()
}
}
if (mDragHandle)
- mDragHandle->setMaxTitleWidth(getRect().getWidth() - (button_count * (LLFLOATER_CLOSE_BOX_SIZE + 1)));
+ mDragHandle->setMaxTitleWidth(getRect().getWidth() - (button_count * (floater_close_box_size + 1)));
}
void LLFloater::buildButtons()
{
+ static LLUICachedControl<S32> floater_close_box_size ("UIFloaterCloseBoxSize", 0);
+ static LLUICachedControl<S32> close_box_from_top ("UICloseBoxFromTop", 0);
for (S32 i = 0; i < BUTTON_COUNT; i++)
{
+ if (mButtons[i])
+ {
+ removeChild(mButtons[i]);
+ delete mButtons[i];
+ mButtons[i] = NULL;
+ }
+
LLRect btn_rect;
if (mDragOnLeft)
{
btn_rect.setLeftTopAndSize(
LLPANEL_BORDER_WIDTH,
- getRect().getHeight() - CLOSE_BOX_FROM_TOP - (LLFLOATER_CLOSE_BOX_SIZE + 1) * (i + 1),
- llround(LLFLOATER_CLOSE_BOX_SIZE * mButtonScale),
- llround(LLFLOATER_CLOSE_BOX_SIZE * mButtonScale));
+ getRect().getHeight() - close_box_from_top - (floater_close_box_size + 1) * (i + 1),
+ llround(floater_close_box_size * mButtonScale),
+ llround(floater_close_box_size * mButtonScale));
}
else
{
btn_rect.setLeftTopAndSize(
- getRect().getWidth() - LLPANEL_BORDER_WIDTH - (LLFLOATER_CLOSE_BOX_SIZE + 1) * (i + 1),
- getRect().getHeight() - CLOSE_BOX_FROM_TOP,
- llround(LLFLOATER_CLOSE_BOX_SIZE * mButtonScale),
- llround(LLFLOATER_CLOSE_BOX_SIZE * mButtonScale));
- }
-
- LLButton* buttonp = new LLButton(
- sButtonNames[i],
- btn_rect,
- sButtonActiveImageNames[i],
- sButtonPressedImageNames[i],
- LLStringUtil::null,
- sButtonCallbacks[i],
- this,
- LLFontGL::getFontSansSerif());
-
- buttonp->setTabStop(FALSE);
- buttonp->setFollowsTop();
- buttonp->setFollowsRight();
- buttonp->setToolTip( sButtonToolTips[i] );
- buttonp->setImageColor(LLUI::sColorsGroup->getColor("FloaterButtonImageColor"));
- buttonp->setHoverImages(sButtonPressedImageNames[i],
- sButtonPressedImageNames[i]);
- buttonp->setScaleImage(TRUE);
- buttonp->setSaveToXML(false);
+ getRect().getWidth() - LLPANEL_BORDER_WIDTH - (floater_close_box_size + 1) * (i + 1),
+ getRect().getHeight() - close_box_from_top,
+ llround(floater_close_box_size * mButtonScale),
+ llround(floater_close_box_size * mButtonScale));
+ }
+
+ LLButton::Params p;
+ p.name(sButtonNames[i]);
+ p.rect(btn_rect);
+ p.label("");
+ p.image_unselected.name(sButtonActiveImageNames[i]);
+ p.image_selected.name(sButtonPressedImageNames[i]);
+ p.image_hover_selected.name(sButtonPressedImageNames[i]);
+ p.image_hover_unselected.name(sButtonPressedImageNames[i]);
+ p.click_callback.function(boost::bind(sButtonCallbacks[i], this));
+ p.tab_stop(false);
+ p.follows.flags(FOLLOWS_TOP|FOLLOWS_RIGHT);
+ p.tool_tip(sButtonToolTips[i]);
+ p.image_color(LLUI::getCachedColorFunctor("FloaterButtonImageColor"));
+ p.scale_image(true);
+
+ LLButton* buttonp = LLUICtrlFactory::create<LLButton>(p);
addChild(buttonp);
mButtons[i] = buttonp;
}
@@ -1730,13 +1706,11 @@ void LLFloater::buildButtons()
/////////////////////////////////////////////////////
// LLFloaterView
-LLFloaterView::LLFloaterView( const std::string& name, const LLRect& rect )
-: LLUICtrl( name, rect, FALSE, NULL, NULL, FOLLOWS_ALL ),
+LLFloaterView::LLFloaterView (const Params& p)
+: LLUICtrl (p),
mFocusCycleMode(FALSE),
mSnapOffsetBottom(0)
{
- setTabStop(FALSE);
- resetStartingFloaterPosition();
}
// By default, adjust vertical.
@@ -1830,69 +1804,6 @@ void LLFloaterView::restoreAll()
}
-void LLFloaterView::getNewFloaterPosition(S32* left,S32* top)
-{
- // Workaround: mRect may change between when this object is created and the first time it is used.
- static BOOL first = TRUE;
- if( first )
- {
- resetStartingFloaterPosition();
- first = FALSE;
- }
-
- const S32 FLOATER_PAD = 16;
- LLCoordWindow window_size;
- getWindow()->getSize(&window_size);
- LLRect full_window(0, window_size.mY, window_size.mX, 0);
- LLRect floater_creation_rect(
- 160,
- full_window.getHeight() - 2 * MENU_BAR_HEIGHT,
- full_window.getWidth() * 2 / 3,
- 130 );
- floater_creation_rect.stretch( -FLOATER_PAD );
-
- *left = mNextLeft;
- *top = mNextTop;
-
- const S32 STEP = 25;
- S32 bottom = floater_creation_rect.mBottom + 2 * STEP;
- S32 right = floater_creation_rect.mRight - 4 * STEP;
-
- mNextTop -= STEP;
- mNextLeft += STEP;
-
- if( (mNextTop < bottom ) || (mNextLeft > right) )
- {
- mColumn++;
- mNextTop = floater_creation_rect.mTop;
- mNextLeft = STEP * mColumn;
-
- if( (mNextTop < bottom) || (mNextLeft > right) )
- {
- // Advancing the column didn't work, so start back at the beginning
- resetStartingFloaterPosition();
- }
- }
-}
-
-void LLFloaterView::resetStartingFloaterPosition()
-{
- const S32 FLOATER_PAD = 16;
- LLCoordWindow window_size;
- getWindow()->getSize(&window_size);
- LLRect full_window(0, window_size.mY, window_size.mX, 0);
- LLRect floater_creation_rect(
- 160,
- full_window.getHeight() - 2 * MENU_BAR_HEIGHT,
- full_window.getWidth() * 2 / 3,
- 130 );
- floater_creation_rect.stretch( -FLOATER_PAD );
-
- mNextLeft = floater_creation_rect.mLeft;
- mNextTop = floater_creation_rect.mTop;
- mColumn = 0;
-}
-
LLRect LLFloaterView::findNeighboringPosition( LLFloater* reference_floater, LLFloater* neighbor )
{
LLRect base_rect = reference_floater->getRect();
@@ -2104,15 +2015,17 @@ void LLFloaterView::focusFrontFloater()
void LLFloaterView::getMinimizePosition(S32 *left, S32 *bottom)
{
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+ static LLUICachedControl<S32> minimized_width ("UIMinimizedWidth", 0);
S32 col = 0;
LLRect snap_rect_local = getLocalSnapRect();
for(S32 row = snap_rect_local.mBottom;
- row < snap_rect_local.getHeight() - LLFLOATER_HEADER_SIZE;
- row += LLFLOATER_HEADER_SIZE ) //loop rows
+ row < snap_rect_local.getHeight() - floater_header_size;
+ row += floater_header_size ) //loop rows
{
for(col = snap_rect_local.mLeft;
- col < snap_rect_local.getWidth() - MINIMIZED_WIDTH;
- col += MINIMIZED_WIDTH)
+ col < snap_rect_local.getWidth() - minimized_width;
+ col += minimized_width)
{
bool foundGap = TRUE;
for(child_list_const_iter_t child_it = getChildList()->begin();
@@ -2124,10 +2037,10 @@ void LLFloaterView::getMinimizePosition(S32 *left, S32 *bottom)
if(floater->isMinimized())
{
LLRect r = floater->getRect();
- if((r.mBottom < (row + LLFLOATER_HEADER_SIZE))
- && (r.mBottom > (row - LLFLOATER_HEADER_SIZE))
- && (r.mLeft < (col + MINIMIZED_WIDTH))
- && (r.mLeft > (col - MINIMIZED_WIDTH)))
+ if((r.mBottom < (row + floater_header_size))
+ && (r.mBottom > (row - floater_header_size))
+ && (r.mLeft < (col + minimized_width))
+ && (r.mLeft > (col - minimized_width)))
{
// needs the check for off grid. can't drag,
// but window resize makes them off
@@ -2179,7 +2092,7 @@ void LLFloaterView::closeAllChildren(bool app_quitting)
// dialogs to appear.
if (floaterp->canClose() && !floaterp->isDead())
{
- floaterp->close(app_quitting);
+ floaterp->closeFloater(app_quitting);
}
}
}
@@ -2202,14 +2115,13 @@ BOOL LLFloaterView::allChildrenClosed()
return true;
}
-
void LLFloaterView::refresh()
{
// Constrain children to be entirely on the screen
for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
{
- LLFloater* floaterp = (LLFloater*)*child_it;
- if( floaterp->getVisible() )
+ LLFloater* floaterp = dynamic_cast<LLFloater*>(*child_it);
+ if (floaterp && floaterp->getVisible() )
{
// minimized floaters are kept fully onscreen
adjustToFitScreen(floaterp, !floaterp->isMinimized());
@@ -2306,7 +2218,7 @@ LLRect LLFloaterView::getSnapRect() const
return snap_rect;
}
-LLFloater *LLFloaterView::getFocusedFloater()
+LLFloater *LLFloaterView::getFocusedFloater() const
{
for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
{
@@ -2319,7 +2231,7 @@ LLFloater *LLFloaterView::getFocusedFloater()
return NULL;
}
-LLFloater *LLFloaterView::getFrontmost()
+LLFloater *LLFloaterView::getFrontmost() const
{
for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
{
@@ -2332,7 +2244,7 @@ LLFloater *LLFloaterView::getFrontmost()
return NULL;
}
-LLFloater *LLFloaterView::getBackmost()
+LLFloater *LLFloaterView::getBackmost() const
{
LLFloater* back_most = NULL;
for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
@@ -2348,18 +2260,51 @@ LLFloater *LLFloaterView::getBackmost()
void LLFloaterView::syncFloaterTabOrder()
{
- // bring focused floater to front
- for ( child_list_const_reverse_iter_t child_it = getChildList()->rbegin(); child_it != getChildList()->rend(); ++child_it)
+ // look for a visible modal dialog, starting from first (should be only one)
+ LLModalDialog* modal_dialog = NULL;
+ for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
{
- LLFloater* floaterp = (LLFloater*)*child_it;
- if (gFocusMgr.childHasKeyboardFocus(floaterp))
+ LLModalDialog* dialog = dynamic_cast<LLModalDialog*>(*child_it);
+ if (dialog && dialog->isModal() && dialog->getVisible())
{
- bringToFront(floaterp, FALSE);
+ modal_dialog = dialog;
break;
}
}
- // then sync draw order to tab order
+ if (modal_dialog)
+ {
+ // If we have a visible modal dialog, make sure that it has focus
+ if( gFocusMgr.getTopCtrl() != modal_dialog )
+ {
+ gFocusMgr.setTopCtrl( modal_dialog );
+ }
+
+ if( !gFocusMgr.childHasKeyboardFocus( modal_dialog ) )
+ {
+ modal_dialog->setFocus(TRUE);
+ }
+
+ if( !gFocusMgr.childHasMouseCapture( modal_dialog ) )
+ {
+ gFocusMgr.setMouseCapture( modal_dialog );
+ }
+ }
+ else
+ {
+ // otherwise, make sure the focused floater is in the front of the child list
+ for ( child_list_const_reverse_iter_t child_it = getChildList()->rbegin(); child_it != getChildList()->rend(); ++child_it)
+ {
+ LLFloater* floaterp = (LLFloater*)*child_it;
+ if (gFocusMgr.childHasKeyboardFocus(floaterp))
+ {
+ bringToFront(floaterp, FALSE);
+ break;
+ }
+ }
+ }
+
+ // sync draw order to tab order
for ( child_list_const_reverse_iter_t child_it = getChildList()->rbegin(); child_it != getChildList()->rend(); ++child_it)
{
LLFloater* floaterp = (LLFloater*)*child_it;
@@ -2367,7 +2312,7 @@ void LLFloaterView::syncFloaterTabOrder()
}
}
-LLFloater* LLFloaterView::getParentFloater(LLView* viewp)
+LLFloater* LLFloaterView::getParentFloater(LLView* viewp) const
{
LLView* parentp = viewp->getParent();
@@ -2426,641 +2371,137 @@ void LLFloaterView::popVisibleAll(const skip_list_t& skip_list)
}
}
-//
-// LLMultiFloater
-//
-
-LLMultiFloater::LLMultiFloater() :
- mTabContainer(NULL),
- mTabPos(LLTabContainer::TOP),
- mAutoResize(TRUE),
- mOrigMinWidth(0),
- mOrigMinHeight(0)
-{
-
-}
-
-LLMultiFloater::LLMultiFloater(LLTabContainer::TabPosition tab_pos) :
- mTabContainer(NULL),
- mTabPos(tab_pos),
- mAutoResize(TRUE),
- mOrigMinWidth(0),
- mOrigMinHeight(0)
+void LLFloater::setInstanceName(const std::string& name)
{
-
-}
-
-LLMultiFloater::LLMultiFloater(const std::string &name) :
- LLFloater(name),
- mTabContainer(NULL),
- mTabPos(LLTabContainer::TOP),
- mAutoResize(FALSE),
- mOrigMinWidth(0),
- mOrigMinHeight(0)
-{
-}
-
-LLMultiFloater::LLMultiFloater(
- const std::string& name,
- const LLRect& rect,
- LLTabContainer::TabPosition tab_pos,
- BOOL auto_resize) :
- LLFloater(name, rect, name),
- mTabContainer(NULL),
- mTabPos(LLTabContainer::TOP),
- mAutoResize(auto_resize),
- mOrigMinWidth(0),
- mOrigMinHeight(0)
-{
- mTabContainer = new LLTabContainer(std::string("Preview Tabs"),
- LLRect(LLPANEL_BORDER_WIDTH, getRect().getHeight() - LLFLOATER_HEADER_SIZE, getRect().getWidth() - LLPANEL_BORDER_WIDTH, 0),
- mTabPos,
- FALSE,
- FALSE);
- mTabContainer->setFollowsAll();
- if (isResizable())
- {
- mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH);
- }
-
- addChild(mTabContainer);
-}
-
-LLMultiFloater::LLMultiFloater(
- const std::string& name,
- const std::string& rect_control,
- LLTabContainer::TabPosition tab_pos,
- BOOL auto_resize) :
- LLFloater(name, rect_control, name),
- mTabContainer(NULL),
- mTabPos(tab_pos),
- mAutoResize(auto_resize),
- mOrigMinWidth(0),
- mOrigMinHeight(0)
-{
- mTabContainer = new LLTabContainer(std::string("Preview Tabs"),
- LLRect(LLPANEL_BORDER_WIDTH, getRect().getHeight() - LLFLOATER_HEADER_SIZE, getRect().getWidth() - LLPANEL_BORDER_WIDTH, 0),
- mTabPos,
- FALSE,
- FALSE);
- mTabContainer->setFollowsAll();
- if (isResizable() && mTabPos == LLTabContainer::BOTTOM)
- {
- mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH);
- }
-
- addChild(mTabContainer);
-
-}
-
-
-void LLMultiFloater::open() /* Flawfinder: ignore */
-{
- if (mTabContainer->getTabCount() > 0)
- {
- LLFloater::open(); /* Flawfinder: ignore */
- }
- else
- {
- // for now, don't allow multifloaters
- // without any child floaters
- close();
- }
-}
-
-void LLMultiFloater::onClose(bool app_quitting)
-{
- if(closeAllFloaters() == TRUE)
- {
- LLFloater::onClose(app_quitting);
- }//else not all tabs could be closed...
-}
-
-void LLMultiFloater::draw()
-{
- if (mTabContainer->getTabCount() == 0)
- {
- //RN: could this potentially crash in draw hierarchy?
- close();
- }
- else
+ if (name == mInstanceName)
+ return;
+ llassert_always(mInstanceName.empty());
+ mInstanceName = name;
+ if (!mInstanceName.empty())
{
- for (S32 i = 0; i < mTabContainer->getTabCount(); i++)
+ // save_rect and save_visibility only apply to registered floaters
+ if (!mRectControl.empty())
{
- LLFloater* floaterp = (LLFloater*)mTabContainer->getPanelByIndex(i);
- if (floaterp->getShortTitle() != mTabContainer->getPanelTitle(i))
- {
- mTabContainer->setPanelTitle(i, floaterp->getShortTitle());
- }
+ mRectControl = LLFloaterReg::declareRectControl(mInstanceName);
}
- LLFloater::draw();
- }
-}
-
-BOOL LLMultiFloater::closeAllFloaters()
-{
- S32 tabToClose = 0;
- S32 lastTabCount = mTabContainer->getTabCount();
- while (tabToClose < mTabContainer->getTabCount())
- {
- LLFloater* first_floater = (LLFloater*)mTabContainer->getPanelByIndex(tabToClose);
- first_floater->close();
- if(lastTabCount == mTabContainer->getTabCount())
+ if (!mVisibilityControl.empty())
{
- //Tab did not actually close, possibly due to a pending Save Confirmation dialog..
- //so try and close the next one in the list...
- tabToClose++;
- }else
- {
- //Tab closed ok.
- lastTabCount = mTabContainer->getTabCount();
+ mVisibilityControl = LLFloaterReg::declareVisibilityControl(mInstanceName);
}
}
- if( mTabContainer->getTabCount() != 0 )
- return FALSE; // Couldn't close all the tabs (pending save dialog?) so return FALSE.
- return TRUE; //else all tabs were successfully closed...
}
-void LLMultiFloater::growToFit(S32 content_width, S32 content_height)
+void LLFloater::setKey(const LLSD& newkey)
{
- S32 new_width = llmax(getRect().getWidth(), content_width + LLPANEL_BORDER_WIDTH * 2);
- S32 new_height = llmax(getRect().getHeight(), content_height + LLFLOATER_HEADER_SIZE + TABCNTR_HEADER_HEIGHT);
-
- if (isMinimized())
- {
- LLRect newrect;
- newrect.setLeftTopAndSize(getExpandedRect().mLeft, getExpandedRect().mTop, new_width, new_height);
- setExpandedRect(newrect);
- }
- else
- {
- S32 old_height = getRect().getHeight();
- reshape(new_width, new_height);
- // keep top left corner in same position
- translate(0, old_height - new_height);
- }
+ // Note: We don't have to do anything special with registration when we change keys
+ mKey = newkey;
}
-/**
- void addFloater(LLFloater* floaterp, BOOL select_added_floater)
-
- Adds the LLFloater pointed to by floaterp to this.
- If floaterp is already hosted by this, then it is re-added to get
- new titles, etc.
- If select_added_floater is true, the LLFloater pointed to by floaterp will
- become the selected tab in this
-
- Affects: mTabContainer, floaterp
-**/
-void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater, LLTabContainer::eInsertionPoint insertion_point)
+void LLFloater::initFromParams(const LLFloater::Params& p)
{
- if (!floaterp)
- {
- return;
- }
-
- if (!mTabContainer)
- {
- llerrs << "Tab Container used without having been initialized." << llendl;
- return;
- }
-
- if (floaterp->getHost() == this)
- {
- // already hosted by me, remove
- // do this so we get updated title, etc.
- mFloaterDataMap.erase(floaterp->getHandle());
- mTabContainer->removeTabPanel(floaterp);
- }
- else if (floaterp->getHost())
- {
- // floaterp is hosted by somebody else and
- // this is adding it, so remove it from it's old host
- floaterp->getHost()->removeFloater(floaterp);
- }
- else if (floaterp->getParent() == gFloaterView)
- {
- // rehost preview floater as child panel
- gFloaterView->removeChild(floaterp);
- }
-
- // store original configuration
- LLFloaterData floater_data;
- floater_data.mWidth = floaterp->getRect().getWidth();
- floater_data.mHeight = floaterp->getRect().getHeight();
- floater_data.mCanMinimize = floaterp->isMinimizeable();
- floater_data.mCanResize = floaterp->isResizable();
-
- // remove minimize and close buttons
- floaterp->setCanMinimize(FALSE);
- floaterp->setCanResize(FALSE);
- floaterp->setCanDrag(FALSE);
- floaterp->storeRectControl();
- // avoid double rendering of floater background (makes it more opaque)
- floaterp->setBackgroundVisible(FALSE);
-
- if (mAutoResize)
- {
- growToFit(floater_data.mWidth, floater_data.mHeight);
- }
+ // control_name, tab_stop, focus_lost_callback, initial_value, rect, enabled, visible
+ LLPanel::initFromParams(p);
- //add the panel, add it to proper maps
- mTabContainer->addTabPanel(floaterp, floaterp->getShortTitle(), FALSE, onTabSelected, this, 0, FALSE, insertion_point);
- mFloaterDataMap[floaterp->getHandle()] = floater_data;
+ mTitle = p.title;
+ mShortTitle = p.short_title;
+ applyTitle();
- updateResizeLimits();
+ setCanTearOff(p.can_tear_off);
+ setCanMinimize(p.can_minimize);
+ setCanClose(p.can_close);
+
+ mDragOnLeft = p.can_drag_on_left;
+ mResizable = p.can_resize;
+ mMinWidth = p.min_width;
+ mMinHeight = p.min_height;
+ mSingleInstance = p.single_instance;
+ mAutoTile = p.auto_tile;
- if ( select_added_floater )
+ if (p.save_rect)
{
- mTabContainer->selectTabPanel(floaterp);
+ mRectControl = "t"; // flag to build mRectControl name once mInstanceName is set
}
- else
+ if (p.save_visibility)
{
- // reassert visible tab (hiding new floater if necessary)
- mTabContainer->selectTab(mTabContainer->getCurrentPanelIndex());
+ mVisibilityControl = "t"; // flag to build mVisibilityControl name once mInstanceName is set
}
-
- floaterp->setHost(this);
- if (isMinimized())
- {
- floaterp->setVisible(FALSE);
- }
-}
-
-/**
- BOOL selectFloater(LLFloater* floaterp)
-
- If the LLFloater pointed to by floaterp is hosted by this,
- then its tab is selected and returns true. Otherwise returns false.
-
- Affects: mTabContainer
-**/
-BOOL LLMultiFloater::selectFloater(LLFloater* floaterp)
-{
- return mTabContainer->selectTabPanel(floaterp);
-}
-
-// virtual
-void LLMultiFloater::selectNextFloater()
-{
- mTabContainer->selectNextTab();
}
-// virtual
-void LLMultiFloater::selectPrevFloater()
+void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, BOOL open_floater, LLXMLNodePtr output_node)
{
- mTabContainer->selectPrevTab();
-}
+ Params params(LLUICtrlFactory::getDefaultParams<LLFloater::Params>());
+ LLXUIParser::instance().readXUI(node, params);
-void LLMultiFloater::showFloater(LLFloater* floaterp)
-{
- // we won't select a panel that already is selected
- // it is hard to do this internally to tab container
- // as tab selection is handled via index and the tab at a given
- // index might have changed
- if (floaterp != mTabContainer->getCurrentPanel() &&
- !mTabContainer->selectTabPanel(floaterp))
+ if (output_node)
{
- addFloater(floaterp, TRUE);
+ Params output_params(params);
+ setupParamsForExport(output_params, parent);
+ Params default_params(LLUICtrlFactory::getDefaultParams<LLFloater::Params>());
+ output_node->setName(node->getName()->mString);
+ LLXUIParser::instance().writeXUI(
+ output_node, output_params, &default_params);
}
-}
-void LLMultiFloater::removeFloater(LLFloater* floaterp)
-{
- if ( floaterp->getHost() != this )
- return;
-
- floater_data_map_t::iterator found_data_it = mFloaterDataMap.find(floaterp->getHandle());
- if (found_data_it != mFloaterDataMap.end())
+ setupParams(params, parent);
+ initFromParams(params);
+
+ initFloater();
+
+ LLMultiFloater* last_host = LLFloater::getFloaterHost();
+ if (node->hasName("multi_floater"))
{
- LLFloaterData& floater_data = found_data_it->second;
- floaterp->setCanMinimize(floater_data.mCanMinimize);
- if (!floater_data.mCanResize)
- {
- // restore original size
- floaterp->reshape(floater_data.mWidth, floater_data.mHeight);
- }
- floaterp->setCanResize(floater_data.mCanResize);
- mFloaterDataMap.erase(found_data_it);
+ LLFloater::setFloaterHost((LLMultiFloater*) this);
}
- mTabContainer->removeTabPanel(floaterp);
- floaterp->setBackgroundVisible(TRUE);
- floaterp->setCanDrag(TRUE);
- floaterp->setHost(NULL);
- floaterp->applyRectControl();
-
- updateResizeLimits();
-
- tabOpen((LLFloater*)mTabContainer->getCurrentPanel(), false);
-}
-void LLMultiFloater::tabOpen(LLFloater* opened_floater, bool from_click)
-{
- // default implementation does nothing
-}
+ addChildren(node, output_node);
-void LLMultiFloater::tabClose()
-{
- if (mTabContainer->getTabCount() == 0)
+ if (node->hasName("multi_floater"))
{
- // no more children, close myself
- close();
+ LLFloater::setFloaterHost(last_host);
}
-}
-
-void LLMultiFloater::setVisible(BOOL visible)
-{
- // *FIX: shouldn't have to do this, fix adding to minimized multifloater
- LLFloater::setVisible(visible);
- if (mTabContainer)
- {
- LLPanel* cur_floaterp = mTabContainer->getCurrentPanel();
-
- if (cur_floaterp)
- {
- cur_floaterp->setVisible(visible);
- }
-
- // if no tab selected, and we're being shown,
- // select last tab to be added
- if (visible && !cur_floaterp)
- {
- mTabContainer->selectLastTab();
- }
- }
-}
+ BOOL result = postBuild();
-BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask)
-{
- if (key == 'W' && mask == MASK_CONTROL)
+ if (!result)
{
- LLFloater* floater = getActiveFloater();
- // is user closeable and is system closeable
- if (floater && floater->canClose() && floater->isCloseable())
- {
- floater->close();
- }
- return TRUE;
+ llerrs << "Failed to construct floater " << getName() << llendl;
}
- return LLFloater::handleKeyHere(key, mask);
-}
-
-LLFloater* LLMultiFloater::getActiveFloater()
-{
- return (LLFloater*)mTabContainer->getCurrentPanel();
-}
-
-S32 LLMultiFloater::getFloaterCount()
-{
- return mTabContainer->getTabCount();
-}
-
-/**
- BOOL isFloaterFlashing(LLFloater* floaterp)
-
- Returns true if the LLFloater pointed to by floaterp
- is currently in a flashing state and is hosted by this.
- False otherwise.
-
- Requires: floaterp != NULL
-**/
-BOOL LLMultiFloater::isFloaterFlashing(LLFloater* floaterp)
-{
- if ( floaterp && floaterp->getHost() == this )
- return mTabContainer->getTabPanelFlashing(floaterp);
-
- return FALSE;
-}
-
-/**
- BOOL setFloaterFlashing(LLFloater* floaterp, BOOL flashing)
-
- Sets the current flashing state of the LLFloater pointed
- to by floaterp to be the BOOL flashing if the LLFloater pointed
- to by floaterp is hosted by this.
-
- Requires: floaterp != NULL
-**/
-void LLMultiFloater::setFloaterFlashing(LLFloater* floaterp, BOOL flashing)
-{
- if ( floaterp && floaterp->getHost() == this )
- mTabContainer->setTabPanelFlashing(floaterp, flashing);
-}
-
-//static
-void LLMultiFloater::onTabSelected(void* userdata, bool from_click)
-{
- LLMultiFloater* floaterp = (LLMultiFloater*)userdata;
-
- floaterp->tabOpen((LLFloater*)floaterp->mTabContainer->getCurrentPanel(), from_click);
-}
+ applyRectControl(); // If we have a saved rect control, apply it
+ gFloaterView->adjustToFitScreen(this, FALSE); // Floaters loaded from XML should all fit on screen
-void LLMultiFloater::setCanResize(BOOL can_resize)
-{
- LLFloater::setCanResize(can_resize);
- if (isResizable() && mTabContainer->getTabPosition() == LLTabContainer::BOTTOM)
+ if (open_floater)
{
- mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH);
- }
- else
- {
- mTabContainer->setRightTabBtnOffset(0);
+ this->openFloater(getKey());
}
+
+ moveResizeHandlesToFront();
}
-BOOL LLMultiFloater::postBuild()
+// visibility methods
+bool VisibilityPolicy<LLFloater>::visible(LLFloater* instance, const LLSD& key)
{
- // remember any original xml minimum size
- getResizeLimits(&mOrigMinWidth, &mOrigMinHeight);
-
- if (mTabContainer)
- {
- return TRUE;
- }
-
- requires<LLTabContainer>("Preview Tabs");
- if (checkRequirements())
+ if (instance)
{
- mTabContainer = getChild<LLTabContainer>("Preview Tabs");
- return TRUE;
+ return !instance->isMinimized() && instance->isInVisibleChain();
}
-
return FALSE;
}
-void LLMultiFloater::updateResizeLimits()
+void VisibilityPolicy<LLFloater>::show(LLFloater* instance, const LLSD& key)
{
- // initialize minimum size constraint to the original xml values.
- S32 new_min_width = mOrigMinWidth;
- S32 new_min_height = mOrigMinHeight;
- // possibly increase minimum size constraint due to children's minimums.
- for (S32 tab_idx = 0; tab_idx < mTabContainer->getTabCount(); ++tab_idx)
+ if (instance)
{
- LLFloater* floaterp = (LLFloater*)mTabContainer->getPanelByIndex(tab_idx);
- if (floaterp)
+ instance->openFloater(key);
+ if (instance->getHost())
{
- new_min_width = llmax(new_min_width, floaterp->getMinWidth() + LLPANEL_BORDER_WIDTH * 2);
- new_min_height = llmax(new_min_height, floaterp->getMinHeight() + LLFLOATER_HEADER_SIZE + TABCNTR_HEADER_HEIGHT);
+ instance->getHost()->openFloater(key);
}
}
- setResizeLimits(new_min_width, new_min_height);
-
- S32 cur_height = getRect().getHeight();
- S32 new_width = llmax(getRect().getWidth(), new_min_width);
- S32 new_height = llmax(getRect().getHeight(), new_min_height);
-
- if (isMinimized())
- {
- const LLRect& expanded = getExpandedRect();
- LLRect newrect;
- newrect.setLeftTopAndSize(expanded.mLeft, expanded.mTop, llmax(expanded.getWidth(), new_width), llmax(expanded.getHeight(), new_height));
- setExpandedRect(newrect);
- }
- else
- {
- reshape(new_width, new_height);
-
- // make sure upper left corner doesn't move
- translate(0, cur_height - getRect().getHeight());
-
- // make sure this window is visible on screen when it has been modified
- // (tab added, etc)
- gFloaterView->adjustToFitScreen(this, TRUE);
- }
-}
-
-// virtual
-LLXMLNodePtr LLFloater::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLPanel::getXML();
-
- node->createChild("title", TRUE)->setStringValue(getCurrentTitle());
-
- node->createChild("can_resize", TRUE)->setBoolValue(isResizable());
-
- node->createChild("can_minimize", TRUE)->setBoolValue(isMinimizeable());
-
- node->createChild("can_close", TRUE)->setBoolValue(isCloseable());
-
- node->createChild("can_drag_on_left", TRUE)->setBoolValue(isDragOnLeft());
-
- node->createChild("min_width", TRUE)->setIntValue(getMinWidth());
-
- node->createChild("min_height", TRUE)->setIntValue(getMinHeight());
-
- node->createChild("can_tear_off", TRUE)->setBoolValue(mCanTearOff);
-
- return node;
}
-// static
-LLView* LLFloater::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
+void VisibilityPolicy<LLFloater>::hide(LLFloater* instance, const LLSD& key)
{
- std::string name("floater");
- node->getAttributeString("name", name);
-
- LLFloater *floaterp = new LLFloater(name);
-
- std::string filename;
- node->getAttributeString("filename", filename);
-
- if (filename.empty())
- {
- // Load from node
- floaterp->initFloaterXML(node, parent, factory);
- }
- else
- {
- // Load from file
- factory->buildFloater(floaterp, filename);
- }
-
- return floaterp;
+ if (instance) instance->closeFloater();
}
-void LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory, BOOL open) /* Flawfinder: ignore */
-{
- std::string name(getName());
- std::string title(getCurrentTitle());
- std::string short_title(getShortTitle());
- std::string rect_control("");
- BOOL resizable = isResizable();
- S32 min_width = getMinWidth();
- S32 min_height = getMinHeight();
- BOOL drag_on_left = isDragOnLeft();
- BOOL minimizable = isMinimizeable();
- BOOL close_btn = isCloseable();
- LLRect rect;
-
- node->getAttributeString("name", name);
- node->getAttributeString("title", title);
- node->getAttributeString("short_title", short_title);
- node->getAttributeString("rect_control", rect_control);
- node->getAttributeBOOL("can_resize", resizable);
- node->getAttributeBOOL("can_minimize", minimizable);
- node->getAttributeBOOL("can_close", close_btn);
- node->getAttributeBOOL("can_drag_on_left", drag_on_left);
- node->getAttributeS32("min_width", min_width);
- node->getAttributeS32("min_height", min_height);
-
- if (! rect_control.empty())
- {
- setRectControl(rect_control);
- }
-
- createRect(node, rect, parent, LLRect());
-
- setRect(rect);
- setName(name);
-
- initFloater(title,
- resizable,
- min_width,
- min_height,
- drag_on_left,
- minimizable,
- close_btn);
-
- setTitle(title);
- applyTitle ();
-
- setShortTitle(short_title);
-
- BOOL can_tear_off;
- if (node->getAttributeBOOL("can_tear_off", can_tear_off))
- {
- setCanTearOff(can_tear_off);
- }
-
- initFromXML(node, parent);
-
- LLMultiFloater* last_host = LLFloater::getFloaterHost();
- if (node->hasName("multi_floater"))
- {
- LLFloater::setFloaterHost((LLMultiFloater*) this);
- }
-
- initChildrenXML(node, factory);
-
- if (node->hasName("multi_floater"))
- {
- LLFloater::setFloaterHost(last_host);
- }
-
- BOOL result = postBuild();
-
- if (!result)
- {
- llerrs << "Failed to construct floater " << name << llendl;
- }
-
- applyRectControl();
- if (open) /* Flawfinder: ignore */
- {
- this->open(); /* Flawfinder: ignore */
- }
-
- moveResizeHandlesToFront();
-}
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 0e3d148b09..f6c783b0bf 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -39,7 +39,6 @@
#include "llpanel.h"
#include "lluuid.h"
-#include "lltabcontainer.h"
#include "llnotifications.h"
#include <set>
@@ -50,17 +49,10 @@ class LLButton;
class LLMultiFloater;
class LLFloater;
-const S32 LLFLOATER_VPAD = 6;
-const S32 LLFLOATER_HPAD = 6;
-const S32 LLFLOATER_CLOSE_BOX_SIZE = 16;
-const S32 LLFLOATER_HEADER_SIZE = 18;
const BOOL RESIZE_YES = TRUE;
const BOOL RESIZE_NO = FALSE;
-const S32 DEFAULT_MIN_WIDTH = 100;
-const S32 DEFAULT_MIN_HEIGHT = 100;
-
const BOOL DRAG_ON_TOP = FALSE;
const BOOL DRAG_ON_LEFT = TRUE;
@@ -87,11 +79,22 @@ private:
LLHandle<LLFloater> mFloaterHandle;
};
-
class LLFloater : public LLPanel
{
friend class LLFloaterView;
+friend class LLFloaterReg;
+friend class LLMultiFloater;
public:
+ struct KeyCompare
+ {
+ static bool compare(const LLSD& a, const LLSD& b);
+ static bool equate(const LLSD& a, const LLSD& b);
+ bool operator()(const LLSD& a, const LLSD& b) const
+ {
+ return compare(a, b);
+ }
+ };
+
enum EFloaterButtons
{
BUTTON_CLOSE,
@@ -102,49 +105,63 @@ public:
BUTTON_COUNT
};
- LLFloater();
- LLFloater(const std::string& name); //simple constructor for data-driven initialization
- LLFloater( const std::string& name, const LLRect& rect, const std::string& title,
- BOOL resizable = FALSE,
- S32 min_width = DEFAULT_MIN_WIDTH,
- S32 min_height = DEFAULT_MIN_HEIGHT,
- BOOL drag_on_left = FALSE,
- BOOL minimizable = TRUE,
- BOOL close_btn = TRUE,
- BOOL bordered = BORDER_NO);
-
- LLFloater( const std::string& name, const std::string& rect_control, const std::string& title,
- BOOL resizable = FALSE,
- S32 min_width = DEFAULT_MIN_WIDTH,
- S32 min_height = DEFAULT_MIN_HEIGHT,
- BOOL drag_on_left = FALSE,
- BOOL minimizable = TRUE,
- BOOL close_btn = TRUE,
- BOOL bordered = BORDER_NO);
+ struct Params
+ : public LLInitParam::Block<Params, LLPanel::Params>
+ {
+ Optional<std::string> title,
+ short_title;
+
+ Optional<bool> single_instance,
+ auto_tile,
+ can_resize,
+ can_minimize,
+ can_close,
+ can_drag_on_left,
+ can_tear_off,
+ save_rect,
+ save_visibility;
+
+ Params() :
+ title("title"),
+ short_title("short_title"),
+ single_instance("single_instance", false),
+ auto_tile("auto_tile", false),
+ can_resize("can_resize", false),
+ can_minimize("can_minimize", true),
+ can_close("can_close", true),
+ can_drag_on_left("can_drag_on_left", false),
+ can_tear_off("can_tear_off", true),
+ save_rect("save_rect", false),
+ save_visibility("save_visibility", false)
+ {
+ name = "floater";
+ // defaults that differ from LLPanel:
+ background_visible = true;
+ visible = false;
+ }
+ };
+
+ LLFloater(const LLSD& key = LLSD(), const LLFloater::Params& params = LLFloater::Params());
virtual ~LLFloater();
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
- void initFloaterXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory, BOOL open = TRUE);
+ void initFromParams(const LLFloater::Params& p);
+ void initFloaterXML(LLXMLNodePtr node, LLView *parent, BOOL open_floater = TRUE, LLXMLNodePtr output_node = NULL);
- /*virtual*/ void userSetShape(const LLRect& new_rect);
+ /*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false);
/*virtual*/ BOOL canSnapTo(const LLView* other_view);
- /*virtual*/ void snappedTo(const LLView* snap_view);
+ /*virtual*/ void setSnappedTo(const LLView* snap_view);
/*virtual*/ void setFocus( BOOL b );
/*virtual*/ void setIsChrome(BOOL is_chrome);
+ /*virtual*/ void setRect(const LLRect &rect);
- // Can be called multiple times to reset floater parameters.
- // Deletes all children of the floater.
- virtual void initFloater(const std::string& title, BOOL resizable,
- S32 min_width, S32 min_height, BOOL drag_on_left,
- BOOL minimizable, BOOL close_btn);
+ void initFloater();
- virtual void open(); /* Flawfinder: ignore */
+ void openFloater(const LLSD& key = LLSD());
// If allowed, close the floater cleanly, releasing focus.
// app_quitting is passed to onClose() below.
- virtual void close(bool app_quitting = false);
+ void closeFloater(bool app_quitting = false);
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
@@ -153,11 +170,8 @@ public:
// moves to center of gFloaterView
void center();
- // applies rectangle stored in mRectControl, if any
- void applyRectControl();
-
- LLMultiFloater* getHost() { return (LLMultiFloater*)mHostHandle.get(); }
+ LLMultiFloater* getHost();
void applyTitle();
const std::string& getCurrentTitle() const;
@@ -185,9 +199,8 @@ public:
void setResizeLimits( S32 min_width, S32 min_height );
void getResizeLimits( S32* min_width, S32* min_height ) { *min_width = mMinWidth; *min_height = mMinHeight; }
- bool isMinimizeable() const{ return mButtonsEnabled[BUTTON_MINIMIZE]; }
- // Does this window have a close button, NOT can we close it right now.
- bool isCloseable() const{ return (mButtonsEnabled[BUTTON_CLOSE]); }
+ bool isMinimizeable() const{ return mCanMinimize; }
+ bool isCloseable() const{ return mCanClose; }
bool isDragOnLeft() const{ return mDragOnLeft; }
S32 getMinWidth() const{ return mMinWidth; }
S32 getMinHeight() const{ return mMinHeight; }
@@ -198,7 +211,7 @@ public:
virtual BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask);
virtual void draw();
- virtual void onOpen() {}
+ virtual void onOpen(const LLSD& key) {}
// Call destroy() to free memory, or setVisible(FALSE) to keep it
// If app_quitting, you might not want to save your visibility.
@@ -210,8 +223,10 @@ public:
virtual BOOL canClose() { return TRUE; }
virtual void setVisible(BOOL visible);
+ virtual void onVisibilityChange ( BOOL curVisibilityIn );
+
void setFrontmost(BOOL take_focus = TRUE);
-
+
// Defaults to false.
virtual BOOL canSaveAs() const { return FALSE; }
@@ -222,6 +237,8 @@ public:
LLHandle<LLFloater> getSnapTarget() const { return mSnappedTo; }
LLHandle<LLFloater> getHandle() const { return mHandle; }
+ const LLSD& getKey() { return mKey; }
+ BOOL matchesKey(const LLSD& key) { return mSingleInstance || KeyCompare::equate(key, mKey); }
// Return a closeable floater, if any, given the current focus.
static LLFloater* getClosableFloaterFromFocus();
@@ -235,22 +252,30 @@ public:
return LLNotification::Params(name).context(mNotificationContext);
}
- static void onClickClose(void *userdata);
- static void onClickMinimize(void *userdata);
- static void onClickTearOff(void *userdata);
- static void onClickEdit(void *userdata);
+ static void onClickClose(LLFloater* floater);
+ static void onClickMinimize(LLFloater* floater);
+ static void onClickTearOff(LLFloater* floater);
+ static void onClickEdit(LLFloater* floater);
static void setFloaterHost(LLMultiFloater* hostp) {sHostp = hostp; }
static void setEditModeEnabled(BOOL enable);
static BOOL getEditModeEnabled() { return sEditModeEnabled; }
- static LLMultiFloater* getFloaterHost() {return sHostp; }
-
+ static LLMultiFloater* getFloaterHost() {return sHostp; }
+
protected:
+ void setRectControl(const std::string& rectname) { mRectControl = rectname; };
+ void applyRectControl();
+ void storeRectControl();
+ void storeVisibilityControl();
+
+ void setKey(const LLSD& key);
+ void setInstanceName(const std::string& name);
+
virtual void bringToFront(S32 x, S32 y);
virtual void setVisibleAndFrontmost(BOOL take_focus=TRUE);
- void setExpandedRect(const LLRect& rect) { mExpandedRect = rect; } // size when not minimized
+ void setExpandedRect(const LLRect& rect) { mExpandedRect = rect; } // size when not minimized
const LLRect& getExpandedRect() const { return mExpandedRect; }
void setAutoFocus(BOOL focus) { mAutoFocus = focus; } // whether to automatically take focus when opened
@@ -266,31 +291,48 @@ private:
void updateButtons();
void buildButtons();
BOOL offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButtons index);
-
+ void addResizeCtrls();
+ void addDragHandle();
+
+protected:
+ std::string mRectControl;
+ std::string mVisibilityControl;
+
+ LLSD mKey; // Key used for retrieving instances; set (for now) by LLFLoaterReg
+
+private:
LLRect mExpandedRect;
LLDragHandle* mDragHandle;
LLResizeBar* mResizeBar[4];
LLResizeHandle* mResizeHandle[4];
- LLButton *mMinimizeButton;
+
+ LLUIString mTitle;
+ LLUIString mShortTitle;
+
+ BOOL mSingleInstance; // TRUE if there is only ever one instance of the floater
+ std::string mInstanceName; // Store the instance name so we can remove ourselves from the list
+ BOOL mAutoTile; // TRUE if placement of new instances tiles
+
BOOL mCanTearOff;
+ BOOL mCanMinimize;
+ BOOL mCanClose;
+ BOOL mDragOnLeft;
+ BOOL mResizable;
+
+ S32 mMinWidth;
+ S32 mMinHeight;
+
BOOL mMinimized;
BOOL mForeground;
LLHandle<LLFloater> mDependeeHandle;
- std::string mTitle;
- std::string mShortTitle;
+
BOOL mFirstLook; // TRUE if the _next_ time this floater is visible will be the first time in the session that it is visible.
-
- BOOL mResizable;
- S32 mMinWidth;
- S32 mMinHeight;
-
BOOL mEditing;
typedef std::set<LLHandle<LLFloater> > handle_set_t;
typedef std::set<LLHandle<LLFloater> >::iterator handle_set_iter_t;
handle_set_t mDependents;
- bool mDragOnLeft;
BOOL mButtonsEnabled[BUTTON_COUNT];
LLButton* mButtons[BUTTON_COUNT];
@@ -308,7 +350,9 @@ private:
static std::string sButtonPressedImageNames[BUTTON_COUNT];
static std::string sButtonNames[BUTTON_COUNT];
static std::string sButtonToolTips[BUTTON_COUNT];
- typedef void (*click_callback)(void *);
+ static std::string sButtonToolTipsIndex[BUTTON_COUNT];
+
+ typedef void(*click_callback)(LLFloater*);
static click_callback sButtonCallbacks[BUTTON_COUNT];
typedef std::map<LLHandle<LLFloater>, LLFloater*> handle_map_t;
@@ -320,7 +364,10 @@ private:
BOOL mHasBeenDraggedWhileMinimized;
S32 mPreviousMinimizedBottom;
S32 mPreviousMinimizedLeft;
-
+
+ LLColor4 mBgColorAlpha;
+ LLColor4 mBgColorOpaque;
+
LLFloaterNotificationContext* mNotificationContext;
LLRootHandle<LLFloater> mHandle;
};
@@ -331,18 +378,18 @@ private:
class LLFloaterView : public LLUICtrl
{
-public:
- LLFloaterView( const std::string& name, const LLRect& rect );
+protected:
+ LLFloaterView (const Params& p);
+ friend class LLUICtrlFactory;
+public:
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
void reshapeFloater(S32 width, S32 height, BOOL called_from_parent, BOOL adjust_vertical);
/*virtual*/ void draw();
/*virtual*/ LLRect getSnapRect() const;
- void refresh();
+ /*virtual*/ void refresh();
- void getNewFloaterPosition( S32* left, S32* top );
- void resetStartingFloaterPosition();
LLRect findNeighboringPosition( LLFloater* reference_floater, LLFloater* neighbor );
// Given a child of gFloaterView, make sure this view can fit entirely onscreen.
@@ -365,10 +412,10 @@ public:
void closeAllChildren(bool app_quitting);
BOOL allChildrenClosed();
- LLFloater* getFrontmost();
- LLFloater* getBackmost();
- LLFloater* getParentFloater(LLView* viewp);
- LLFloater* getFocusedFloater();
+ LLFloater* getFrontmost() const;
+ LLFloater* getBackmost() const;
+ LLFloater* getParentFloater(LLView* viewp) const;
+ LLFloater* getFocusedFloater() const;
void syncFloaterTabOrder();
// Returns z order of child provided. 0 is closest, larger numbers
@@ -386,99 +433,23 @@ private:
S32 mSnapOffsetBottom;
};
-// https://wiki.lindenlab.com/mediawiki/index.php?title=LLMultiFloater&oldid=81376
-class LLMultiFloater : public LLFloater
-{
-public:
- LLMultiFloater();
- LLMultiFloater(LLTabContainer::TabPosition tab_pos);
- LLMultiFloater(const std::string& name);
- LLMultiFloater(const std::string& name, const LLRect& rect, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = TRUE);
- LLMultiFloater(const std::string& name, const std::string& rect_control, LLTabContainer::TabPosition tab_pos = LLTabContainer::TOP, BOOL auto_resize = TRUE);
- virtual ~LLMultiFloater() {};
-
- virtual BOOL postBuild();
- /*virtual*/ void open(); /* Flawfinder: ignore */
- /*virtual*/ void onClose(bool app_quitting);
- /*virtual*/ void draw();
- /*virtual*/ void setVisible(BOOL visible);
- /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
-
- virtual void setCanResize(BOOL can_resize);
- virtual void growToFit(S32 content_width, S32 content_height);
- virtual void addFloater(LLFloater* floaterp, BOOL select_added_floater, LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
-
- virtual void showFloater(LLFloater* floaterp);
- virtual void removeFloater(LLFloater* floaterp);
-
- virtual void tabOpen(LLFloater* opened_floater, bool from_click);
- virtual void tabClose();
-
- virtual BOOL selectFloater(LLFloater* floaterp);
- virtual void selectNextFloater();
- virtual void selectPrevFloater();
-
- virtual LLFloater* getActiveFloater();
- virtual BOOL isFloaterFlashing(LLFloater* floaterp);
- virtual S32 getFloaterCount();
-
- virtual void setFloaterFlashing(LLFloater* floaterp, BOOL flashing);
- virtual BOOL closeAllFloaters(); //Returns FALSE if the floater could not be closed due to pending confirmation dialogs
- void setTabContainer(LLTabContainer* tab_container) { if (!mTabContainer) mTabContainer = tab_container; }
- static void onTabSelected(void* userdata, bool);
-
- virtual void updateResizeLimits();
-
-protected:
- struct LLFloaterData
- {
- S32 mWidth;
- S32 mHeight;
- BOOL mCanMinimize;
- BOOL mCanResize;
- };
-
- LLTabContainer* mTabContainer;
-
- typedef std::map<LLHandle<LLFloater>, LLFloaterData> floater_data_map_t;
- floater_data_map_t mFloaterDataMap;
-
- LLTabContainer::TabPosition mTabPos;
- BOOL mAutoResize;
- S32 mOrigMinWidth, mOrigMinHeight; // logically const but initialized late
-};
+// singleton implementation for floaters
+// https://wiki.lindenlab.com/mediawiki/index.php?title=LLFloaterSingleton&oldid=164990
+//*******************************************************
+//* TO BE DEPRECATED
+//*******************************************************
// visibility policy specialized for floaters
template<>
class VisibilityPolicy<LLFloater>
{
public:
// visibility methods
- static bool visible(LLFloater* instance, const LLSD& key)
- {
- if (instance)
- {
- return !instance->isMinimized() && instance->isInVisibleChain();
- }
- return FALSE;
- }
+ static bool visible(LLFloater* instance, const LLSD& key);
- static void show(LLFloater* instance, const LLSD& key)
- {
- if (instance)
- {
- instance->open();
- if (instance->getHost())
- {
- instance->getHost()->open();
- }
- }
- }
+ static void show(LLFloater* instance, const LLSD& key);
- static void hide(LLFloater* instance, const LLSD& key)
- {
- if (instance) instance->close();
- }
+ static void hide(LLFloater* instance, const LLSD& key);
};
@@ -489,6 +460,10 @@ template <class T> class LLFloaterSingleton : public LLUISingleton<T, Visibility
{
};
+//
+// Globals
+//
+
extern LLFloaterView* gFloaterView;
#endif // LL_FLOATER_H
diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp
new file mode 100644
index 0000000000..faa763cea9
--- /dev/null
+++ b/indra/llui/llfloaterreg.cpp
@@ -0,0 +1,423 @@
+/**
+ * @file llfloaterreg.cpp
+ * @brief LLFloaterReg Floater Registration Class
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llfloaterreg.h"
+
+#include "llfloater.h"
+#include "llmultifloater.h"
+
+//*******************************************************
+
+//static
+LLFloaterReg::instance_list_t LLFloaterReg::sNullInstanceList;
+LLFloaterReg::instance_map_t LLFloaterReg::sInstanceMap;
+LLFloaterReg::build_map_t LLFloaterReg::sBuildMap;
+std::map<std::string,std::string> LLFloaterReg::sGroupMap;
+
+//*******************************************************
+
+//static
+void LLFloaterReg::add(const std::string& name, const std::string& filename, const LLFloaterBuildFunc& func, const std::string& groupname)
+{
+ sBuildMap[name].mFunc = func;
+ sBuildMap[name].mFile = filename;
+ sGroupMap[name] = groupname.empty() ? name : groupname;
+ sGroupMap[groupname] = groupname; // for referencing directly by group name
+}
+
+//static
+LLRect LLFloaterReg::getFloaterRect(const std::string& name)
+{
+ LLRect rect;
+ const std::string& groupname = sGroupMap[name];
+ if (!groupname.empty())
+ {
+ instance_list_t& list = sInstanceMap[groupname];
+ if (!list.empty())
+ {
+ static LLUICachedControl<S32> floater_offset ("UIFloaterOffset", 16);
+ LLFloater* last_floater = list.back();
+ if (last_floater->getHost())
+ {
+ rect = last_floater->getHost()->getRect();
+ }
+ else
+ {
+ rect = last_floater->getRect();
+ }
+ rect.translate(floater_offset, -floater_offset);
+ }
+ }
+ return rect;
+}
+
+//static
+LLFloater* LLFloaterReg::findInstance(const std::string& name, const LLSD& key)
+{
+ LLFloater* res = NULL;
+ const std::string& groupname = sGroupMap[name];
+ if (!groupname.empty())
+ {
+ instance_list_t& list = sInstanceMap[groupname];
+ for (instance_list_t::iterator iter = list.begin(); iter != list.end(); ++iter)
+ {
+ LLFloater* inst = *iter;
+ if (inst->matchesKey(key))
+ {
+ res = inst;
+ break;
+ }
+ }
+ }
+ return res;
+}
+
+//static
+LLFloater* LLFloaterReg::getInstance(const std::string& name, const LLSD& key)
+{
+ LLFloater* res = findInstance(name, key);
+ if (!res)
+ {
+ const LLFloaterBuildFunc& build_func = sBuildMap[name].mFunc;
+ const std::string& xui_file = sBuildMap[name].mFile;
+ if (build_func)
+ {
+ const std::string& groupname = sGroupMap[name];
+ if (!groupname.empty())
+ {
+ instance_list_t& list = sInstanceMap[groupname];
+ int index = list.size();
+
+ res = build_func(key);
+
+ const bool DONT_OPEN_FLOATER = false;
+ LLUICtrlFactory::getInstance()->buildFloater(res, xui_file, DONT_OPEN_FLOATER);
+
+ // Note: key should eventually be a non optional LLFloater arg; for now, set mKey to be safe
+ res->mKey = key;
+ res->setInstanceName(name);
+ res->applyRectControl(); // Can't apply rect control until setting instance name
+ if (res->mAutoTile && !res->getHost() && index > 0)
+ {
+ const LLRect& cur_rect = res->getRect();
+ LLRect next_rect = getFloaterRect(groupname);
+ next_rect.setLeftTopAndSize(next_rect.mLeft, next_rect.mTop, cur_rect.getWidth(), cur_rect.getHeight());
+ res->setRect(next_rect);
+ res->setRectControl(LLStringUtil::null); // don't save rect of tiled floaters
+ gFloaterView->adjustToFitScreen(res, true);
+ }
+ else
+ {
+ gFloaterView->adjustToFitScreen(res, false);
+ }
+ list.push_back(res);
+ }
+ }
+ if (!res)
+ {
+ llwarns << "Floater type: '" << name << "' not registered." << llendl;
+ }
+ }
+ return res;
+}
+
+//static
+LLFloater* LLFloaterReg::removeInstance(const std::string& name, const LLSD& key)
+{
+ LLFloater* res = NULL;
+ const std::string& groupname = sGroupMap[name];
+ if (!groupname.empty())
+ {
+ instance_list_t& list = sInstanceMap[groupname];
+ for (instance_list_t::iterator iter = list.begin(); iter != list.end(); ++iter)
+ {
+ LLFloater* inst = *iter;
+ if (inst->matchesKey(key))
+ {
+ res = inst;
+ list.erase(iter);
+ break;
+ }
+ }
+ }
+ return res;
+}
+
+//static
+// returns true if the instance existed
+bool LLFloaterReg::destroyInstance(const std::string& name, const LLSD& key)
+{
+ LLFloater* inst = removeInstance(name, key);
+ if (inst)
+ {
+ delete inst;
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+// Iterators
+//static
+LLFloaterReg::const_instance_list_t& LLFloaterReg::getFloaterList(const std::string& name)
+{
+ instance_map_t::iterator iter = sInstanceMap.find(name);
+ if (iter != sInstanceMap.end())
+ {
+ return iter->second;
+ }
+ else
+ {
+ return sNullInstanceList;
+ }
+}
+
+// Visibility Management
+
+//static
+LLFloater* LLFloaterReg::showInstance(const std::string& name, const LLSD& key, BOOL focus)
+{
+ LLFloater* instance = getInstance(name, key);
+ if (instance)
+ {
+ instance->openFloater(key);
+ if (focus)
+ instance->setFocus(TRUE);
+ }
+ return instance;
+}
+
+//static
+// returns true if the instance exists
+bool LLFloaterReg::hideInstance(const std::string& name, const LLSD& key)
+{
+ LLFloater* instance = findInstance(name, key);
+ if (instance)
+ {
+ // When toggling *visibility*, close the host instead of the floater when hosted
+ if (instance->getHost())
+ instance->getHost()->closeFloater();
+ else
+ instance->closeFloater();
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+//static
+// returns true if the instance is visible when completed
+bool LLFloaterReg::toggleInstance(const std::string& name, const LLSD& key)
+{
+ LLFloater* instance = findInstance(name, key);
+ if (instance && !instance->isMinimized() && instance->isInVisibleChain())
+ {
+ // When toggling *visibility*, close the host instead of the floater when hosted
+ if (instance->getHost())
+ instance->getHost()->closeFloater();
+ else
+ instance->closeFloater();
+ return false;
+ }
+ else
+ {
+ return showInstance(name, key, TRUE) ? true : false;
+ }
+}
+
+//static
+// returns true if the instance exists and is visible
+bool LLFloaterReg::instanceVisible(const std::string& name, const LLSD& key)
+{
+ LLFloater* instance = findInstance(name, key);
+ if (instance && !instance->isMinimized() && instance->isInVisibleChain())
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+}
+
+//static
+void LLFloaterReg::showInitialVisibleInstances()
+{
+ // Iterate through alll registered instance names and show any with a save visible state
+ for (build_map_t::iterator iter = sBuildMap.begin(); iter != sBuildMap.end(); ++iter)
+ {
+ const std::string& name = iter->first;
+ std::string controlname = getVisibilityControlName(name);
+ if (LLUI::sSettingGroups["floater"]->controlExists(controlname))
+ {
+ BOOL isvis = LLUI::sSettingGroups["floater"]->getBOOL(controlname);
+ if (isvis)
+ {
+ showInstance(name, LLSD()); // keyed floaters shouldn't set save_vis to true
+ }
+ }
+ }
+}
+
+//static
+void LLFloaterReg::hideVisibleInstances(const std::set<std::string>& exceptions)
+{
+ // Iterate through alll active instances and hide them
+ for (instance_map_t::iterator iter = sInstanceMap.begin(); iter != sInstanceMap.end(); ++iter)
+ {
+ const std::string& name = iter->first;
+ if (exceptions.find(name) != exceptions.end())
+ continue;
+ instance_list_t& list = iter->second;
+ for (instance_list_t::iterator iter = list.begin(); iter != list.end(); ++iter)
+ {
+ LLFloater* floater = *iter;
+ floater->pushVisible(FALSE);
+ }
+ }
+}
+
+//static
+void LLFloaterReg::restoreVisibleInstances()
+{
+ // Iterate through all active instances and restore visibility
+ for (instance_map_t::iterator iter = sInstanceMap.begin(); iter != sInstanceMap.end(); ++iter)
+ {
+ instance_list_t& list = iter->second;
+ for (instance_list_t::iterator iter = list.begin(); iter != list.end(); ++iter)
+ {
+ LLFloater* floater = *iter;
+ floater->popVisible();
+ }
+ }
+}
+
+//static
+std::string LLFloaterReg::getRectControlName(const std::string& name)
+{
+ std::string res = std::string("floater_rect_") + name;
+ LLStringUtil::replaceChar( res, ' ', '_' );
+ return res;
+}
+
+//static
+std::string LLFloaterReg::declareRectControl(const std::string& name)
+{
+ std::string controlname = getRectControlName(name);
+ LLUI::sSettingGroups["floater"]->declareRect(controlname, LLRect(),
+ llformat("Window Position and Size for %s", name.c_str()),
+ TRUE);
+ return controlname;
+}
+
+//static
+std::string LLFloaterReg::getVisibilityControlName(const std::string& name)
+{
+ std::string res = std::string("floater_vis_") + name;
+ LLStringUtil::replaceChar( res, ' ', '_' );
+ return res;
+}
+
+//static
+std::string LLFloaterReg::declareVisibilityControl(const std::string& name)
+{
+ std::string controlname = getVisibilityControlName(name);
+ LLUI::sSettingGroups["floater"]->declareBOOL(controlname, FALSE,
+ llformat("Window Visibility for %s", name.c_str()),
+ TRUE);
+ return controlname;
+}
+
+// Callbacks
+
+// static
+// Call once (i.e use for init callbacks)
+void LLFloaterReg::initUICtrlToFloaterVisibilityControl(LLUICtrl* ctrl, const LLSD& sdname)
+{
+ // Get the visibility control name for the floater
+ std::string vis_control_name = LLFloaterReg::declareVisibilityControl(sdname.asString());
+ // Set the control value to the floater visibility control (Sets the value as well)
+ ctrl->setControlVariable(LLUI::sSettingGroups["floater"]->getControl(vis_control_name));
+}
+
+// callback args may use "floatername.key" format
+static void parse_name_key(std::string& name, LLSD& key)
+{
+ std::string instname = name;
+ std::size_t dotpos = instname.find(".");
+ if (dotpos != std::string::npos)
+ {
+ name = instname.substr(0, dotpos);
+ key = LLSD(instname.substr(dotpos+1, std::string::npos));
+ }
+}
+
+//static
+void LLFloaterReg::showFloaterInstance(const LLSD& sdname)
+{
+ LLSD key;
+ std::string name = sdname.asString();
+ parse_name_key(name, key);
+ showInstance(name, key, TRUE);
+}
+//static
+void LLFloaterReg::hideFloaterInstance(const LLSD& sdname)
+{
+ LLSD key;
+ std::string name = sdname.asString();
+ parse_name_key(name, key);
+ hideInstance(name, key);
+}
+//static
+void LLFloaterReg::toggleFloaterInstance(const LLSD& sdname)
+{
+ LLSD key;
+ std::string name = sdname.asString();
+ parse_name_key(name, key);
+ toggleInstance(name, key);
+}
+
+//static
+bool LLFloaterReg::floaterInstanceVisible(const LLSD& sdname)
+{
+ LLSD key;
+ std::string name = sdname.asString();
+ parse_name_key(name, key);
+ return instanceVisible(name, key);
+}
+
diff --git a/indra/llui/llfloaterreg.h b/indra/llui/llfloaterreg.h
new file mode 100644
index 0000000000..af1bfc5ec1
--- /dev/null
+++ b/indra/llui/llfloaterreg.h
@@ -0,0 +1,149 @@
+/**
+ * @file llfloaterreg.h
+ * @brief LLFloaterReg Floater Registration Class
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+/// llcommon
+#include "llboost.h"
+#include "llrect.h"
+#include "llstl.h"
+#include "llsd.h"
+
+/// llui
+#include "lluictrl.h"
+
+#include <boost/function.hpp>
+
+//*******************************************************
+//
+// Floater Class Registry
+//
+
+class LLFloater;
+
+typedef boost::function<LLFloater* (const LLSD& key)> LLFloaterBuildFunc;
+
+class LLFloaterReg
+{
+public:
+ // We use a list of LLFloater's instead of a set for two reasons:
+ // 1) With a list we have a predictable ordering, useful for finding the last opened floater of a given type.
+ // 2) We can change the key of a floater without altering the list.
+ typedef std::list<LLFloater*> instance_list_t;
+ typedef const instance_list_t const_instance_list_t;
+ typedef std::map<std::string, instance_list_t> instance_map_t;
+
+ struct BuildData
+ {
+ LLFloaterBuildFunc mFunc;
+ std::string mFile;
+ };
+ typedef std::map<std::string, BuildData> build_map_t;
+
+private:
+ static instance_list_t sNullInstanceList;
+ static instance_map_t sInstanceMap;
+ static build_map_t sBuildMap;
+ static std::map<std::string,std::string> sGroupMap;
+
+public:
+ // Registration
+
+ // usage: LLFloaterClassRegistry::add("foo", (LLFloaterBuildFunc)&LLFloaterClassRegistry::build<LLFloaterFoo>);
+ template <class T>
+ static LLFloater* build(const LLSD& key)
+ {
+ T* floater = new T(key);
+ return floater;
+ }
+
+ static void add(const std::string& name, const std::string& file, const LLFloaterBuildFunc& func,
+ const std::string& groupname = LLStringUtil::null);
+
+ // Helpers
+ static LLRect getFloaterRect(const std::string& name);
+
+ // Find / get (create) / remove / destroy
+ static LLFloater* findInstance(const std::string& name, const LLSD& key = LLSD());
+ static LLFloater* getInstance(const std::string& name, const LLSD& key = LLSD());
+ static LLFloater* removeInstance(const std::string& name, const LLSD& key = LLSD());
+ static bool destroyInstance(const std::string& name, const LLSD& key = LLSD());
+
+ // Iterators
+ static const_instance_list_t& getFloaterList(const std::string& name);
+
+ // Visibility Management
+ // return NULL if instance not found or can't create instance (no builder)
+ static LLFloater* showInstance(const std::string& name, const LLSD& key = LLSD(), BOOL focus = FALSE);
+ // Close a floater (may destroy or set invisible)
+ // return false if can't find instance
+ static bool hideInstance(const std::string& name, const LLSD& key = LLSD());
+ // return true if instance is visible:
+ static bool toggleInstance(const std::string& name, const LLSD& key = LLSD());
+ static bool instanceVisible(const std::string& name, const LLSD& key = LLSD());
+
+ static void showInitialVisibleInstances();
+ static void hideVisibleInstances(const std::set<std::string>& exceptions = std::set<std::string>());
+ static void restoreVisibleInstances();
+
+ // Control Variables
+ static std::string getRectControlName(const std::string& name);
+ static std::string declareRectControl(const std::string& name);
+ static std::string getVisibilityControlName(const std::string& name);
+ static std::string declareVisibilityControl(const std::string& name);
+
+ // Callback wrappers
+ static void initUICtrlToFloaterVisibilityControl(LLUICtrl* ctrl, const LLSD& sdname);
+ static void showFloaterInstance(const LLSD& sdname);
+ static void hideFloaterInstance(const LLSD& sdname);
+ static void toggleFloaterInstance(const LLSD& sdname);
+ static bool floaterInstanceVisible(const LLSD& sdname);
+
+ // Typed find / get / show
+ template <class T>
+ static T* findTypedInstance(const std::string& name, const LLSD& key = LLSD())
+ {
+ return dynamic_cast<T*>(findInstance(name, key));
+ }
+
+ template <class T>
+ static T* getTypedInstance(const std::string& name, const LLSD& key = LLSD())
+ {
+ return dynamic_cast<T*>(getInstance(name, key));
+ }
+
+ template <class T>
+ static T* showTypedInstance(const std::string& name, const LLSD& key = LLSD(), BOOL focus = FALSE)
+ {
+ return dynamic_cast<T*>(showInstance(name, key, focus));
+ }
+
+};
+
diff --git a/indra/llui/llflyoutbutton.cpp b/indra/llui/llflyoutbutton.cpp
new file mode 100644
index 0000000000..6b7c174726
--- /dev/null
+++ b/indra/llui/llflyoutbutton.cpp
@@ -0,0 +1,94 @@
+/**
+ * @file llflyoutbutton.cpp
+ * @brief LLFlyoutButton base class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+// file includes
+#include "llflyoutbutton.h"
+
+static LLRegisterWidget<LLFlyoutButton> r2("flyout_button");
+
+const S32 FLYOUT_BUTTON_ARROW_WIDTH = 24;
+
+LLFlyoutButton::LLFlyoutButton(const Params& p)
+: LLComboBox(p),
+ mToggleState(FALSE),
+ mActionButton(NULL)
+{
+ // Always use text box
+ // Text label button
+ LLButton::Params bp(p.action_button);
+ bp.name(p.label);
+ bp.rect.left(0).bottom(0).width(getRect().getWidth() - FLYOUT_BUTTON_ARROW_WIDTH).height(getRect().getHeight());
+ bp.click_callback.function(boost::bind(&LLFlyoutButton::onActionButtonClick, this, _2));
+ bp.follows.flags(FOLLOWS_ALL);
+
+ mActionButton = LLUICtrlFactory::create<LLButton>(bp);
+ addChild(mActionButton);
+
+ mButton->setOrigin(getRect().getWidth() - FLYOUT_BUTTON_ARROW_WIDTH, 0);
+ mButton->reshape(FLYOUT_BUTTON_ARROW_WIDTH, getRect().getHeight());
+ mButton->setFollows(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
+ mButton->setImageOverlay(mListPosition == BELOW ? "down_arrow.tga" : "up_arrow.tga", LLFontGL::RIGHT);
+}
+
+void LLFlyoutButton::onActionButtonClick(const LLSD& data)
+{
+ // remember last list selection?
+ mList->deselect();
+ onCommit();
+}
+
+void LLFlyoutButton::draw()
+{
+ mActionButton->setToggleState(mToggleState);
+ mButton->setToggleState(mToggleState);
+
+ //FIXME: this should be an attribute of comboboxes, whether they have a distinct label or
+ // the label reflects the last selected item, for now we have to manually remove the label
+ mButton->setLabel(LLStringUtil::null);
+ LLComboBox::draw();
+}
+
+void LLFlyoutButton::setEnabled(BOOL enabled)
+{
+ mActionButton->setEnabled(enabled);
+ LLComboBox::setEnabled(enabled);
+}
+
+
+void LLFlyoutButton::setToggleState(BOOL state)
+{
+ mToggleState = state;
+}
+
+
diff --git a/indra/llui/llflyoutbutton.h b/indra/llui/llflyoutbutton.h
new file mode 100644
index 0000000000..f60fe1eb35
--- /dev/null
+++ b/indra/llui/llflyoutbutton.h
@@ -0,0 +1,71 @@
+/**
+ * @file llflyoutbutton.h
+ * @brief LLFlyoutButton base class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// A control that displays the name of the chosen item, which when clicked
+// shows a scrolling box of choices.
+
+#ifndef LL_LLFLYOUTBUTTON_H
+#define LL_LLFLYOUTBUTTON_H
+
+#include "llcombobox.h"
+
+// Classes
+
+class LLFlyoutButton : public LLComboBox
+{
+public:
+ struct Params : public LLInitParam::Block<Params, LLComboBox::Params>
+ {
+ Optional<LLButton::Params> action_button;
+
+ Params()
+ : action_button("action_button")
+ {}
+
+ };
+protected:
+ LLFlyoutButton(const Params&);
+ friend class LLUICtrlFactory;
+public:
+ virtual void draw();
+ virtual void setEnabled(BOOL enabled);
+
+ void setToggleState(BOOL state);
+
+ void onActionButtonClick(const LLSD& data);
+
+protected:
+ LLButton* mActionButton;
+ BOOL mToggleState;
+};
+
+#endif // LL_LLFLYOUTBUTTON_H
diff --git a/indra/llui/llfocusmgr.cpp b/indra/llui/llfocusmgr.cpp
index 661ffdd467..9a4ec7627e 100644
--- a/indra/llui/llfocusmgr.cpp
+++ b/indra/llui/llfocusmgr.cpp
@@ -220,24 +220,19 @@ void LLFocusMgr::setMouseCapture( LLMouseHandler* new_captor )
{
LLMouseHandler* old_captor = mMouseCaptor;
mMouseCaptor = new_captor;
- /*
- if (new_captor)
+
+ if (LLView::sDebugMouseHandling)
{
- if ( new_captor->getName() == "Stickto")
+ if (new_captor)
{
llinfos << "New mouse captor: " << new_captor->getName() << llendl;
}
else
{
- llinfos << "New mouse captor: " << new_captor->getName() << llendl;
+ llinfos << "New mouse captor: NULL" << llendl;
}
}
- else
- {
- llinfos << "New mouse captor: NULL" << llendl;
- }
- */
-
+
if( old_captor )
{
old_captor->onMouseCaptureLost();
@@ -295,7 +290,7 @@ void LLFocusMgr::setTopCtrl( LLUICtrl* new_top )
if (old_top)
{
- old_top->onLostTop();
+ old_top->onTopLost();
}
}
}
@@ -328,7 +323,8 @@ F32 LLFocusMgr::getFocusFlashAmt() const
LLColor4 LLFocusMgr::getFocusColor() const
{
- LLColor4 focus_color = lerp(LLUI::sColorsGroup->getColor( "FocusColor" ), LLColor4::white, getFocusFlashAmt());
+ static LLUICachedControl<LLColor4> focus_color_cached ("FocusColor", *(new LLColor4));
+ LLColor4 focus_color = lerp(focus_color_cached, LLColor4::white, getFocusFlashAmt());
// de-emphasize keyboard focus when app has lost focus (to avoid typing into wrong window problem)
if (!mAppHasFocus)
{
diff --git a/indra/llui/llfunctorregistry.h b/indra/llui/llfunctorregistry.h
index 8864f7af15..2c0bcc6012 100644
--- a/indra/llui/llfunctorregistry.h
+++ b/indra/llui/llfunctorregistry.h
@@ -40,7 +40,7 @@
#include <boost/function.hpp>
#include "llsd.h"
-#include "llmemory.h"
+#include "llsingleton.h"
/**
* @class LLFunctorRegistry
diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp
index cb3b2a3a62..d01679cd1c 100644
--- a/indra/llui/lliconctrl.cpp
+++ b/indra/llui/lliconctrl.cpp
@@ -40,65 +40,33 @@
#include "llcontrol.h"
#include "llui.h"
#include "lluictrlfactory.h"
-
-const F32 RESOLUTION_BUMP = 1.f;
+#include "lluiimage.h"
static LLRegisterWidget<LLIconCtrl> r("icon");
-LLIconCtrl::LLIconCtrl(const std::string& name, const LLRect &rect, const LLUUID &image_id)
-: LLUICtrl(name,
- rect,
- FALSE, // mouse opaque
- NULL, NULL,
- FOLLOWS_LEFT | FOLLOWS_TOP),
- mColor( LLColor4::white )
-{
- setImage( image_id );
- setTabStop(FALSE);
-}
-
-LLIconCtrl::LLIconCtrl(const std::string& name, const LLRect &rect, const std::string &image_name)
-: LLUICtrl(name,
- rect,
- FALSE, // mouse opaque
- NULL, NULL,
- FOLLOWS_LEFT | FOLLOWS_TOP),
- mColor( LLColor4::white ),
- mImageName(image_name)
-{
- setImage( image_name );
- setTabStop(FALSE);
-}
-
-
-LLIconCtrl::~LLIconCtrl()
+LLIconCtrl::Params::Params()
+: image("image_name"),
+ color("color"),
+ scale_image("scale_image")
{
- mImagep = NULL;
+ tab_stop = false;
+ mouse_opaque = false;
}
-
-void LLIconCtrl::setImage(const std::string& image_name)
+LLIconCtrl::LLIconCtrl(const LLIconCtrl::Params& p)
+: LLUICtrl(p),
+ mColor(p.color()),
+ mImagep(p.image)
{
- //RN: support UUIDs masquerading as strings
- if (LLUUID::validate(image_name))
- {
- mImageID = LLUUID(image_name);
-
- setImage(mImageID);
- }
- else
+ if (mImagep.notNull())
{
- mImageName = image_name;
- mImagep = LLUI::sImageProvider->getUIImage(image_name);
- mImageID.setNull();
+ LLUICtrl::setValue(mImagep->getName());
}
}
-void LLIconCtrl::setImage(const LLUUID& image_id)
+LLIconCtrl::~LLIconCtrl()
{
- mImageName.clear();
- mImagep = LLUI::sImageProvider->getUIImageByID(image_id);
- mImageID = image_id;
+ mImagep = NULL;
}
@@ -106,69 +74,37 @@ void LLIconCtrl::draw()
{
if( mImagep.notNull() )
{
- mImagep->draw(getLocalRect(), mColor );
+ mImagep->draw(getLocalRect(), mColor.get() );
}
LLUICtrl::draw();
}
// virtual
+// value might be a string or a UUID
void LLIconCtrl::setValue(const LLSD& value )
{
- if (value.isUUID())
+ LLSD tvalue(value);
+ if (value.isString() && LLUUID::validate(value.asString()))
{
- setImage(value.asUUID());
+ //RN: support UUIDs masquerading as strings
+ tvalue = LLSD(LLUUID(value.asString()));
}
- else
+ LLUICtrl::setValue(tvalue);
+ if (tvalue.isUUID())
{
- setImage(value.asString());
+ mImagep = LLUI::getUIImageByID(tvalue.asUUID());
}
-}
-
-// virtual
-LLSD LLIconCtrl::getValue() const
-{
- LLSD ret = getImage();
- return ret;
-}
-
-// virtual
-LLXMLNodePtr LLIconCtrl::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- if (mImageName != "")
+ else
{
- node->createChild("image_name", TRUE)->setStringValue(mImageName);
+ mImagep = LLUI::getUIImage(tvalue.asString());
}
-
- node->createChild("color", TRUE)->setFloatValue(4, mColor.mV);
-
- return node;
}
-LLView* LLIconCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
+std::string LLIconCtrl::getImageName() const
{
- std::string name("icon");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- std::string image_name;
- if (node->hasAttribute("image_name"))
- {
- node->getAttributeString("image_name", image_name);
- }
-
- LLColor4 color(LLColor4::white);
- LLUICtrlFactory::getAttributeColor(node,"color", color);
-
- LLIconCtrl* icon = new LLIconCtrl(name, rect, image_name);
-
- icon->setColor(color);
-
- icon->initFromXML(node, parent);
-
- return icon;
+ if (getValue().isString())
+ return getValue().asString();
+ else
+ return std::string();
}
diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h
index 50778cf226..ad0f6f563f 100644
--- a/indra/llui/lliconctrl.h
+++ b/indra/llui/lliconctrl.h
@@ -45,35 +45,37 @@ class LLUICtrlFactory;
//
// Classes
//
+
+//
class LLIconCtrl
: public LLUICtrl
{
public:
- LLIconCtrl(const std::string& name, const LLRect &rect, const LLUUID &image_id);
- LLIconCtrl(const std::string& name, const LLRect &rect, const std::string &image_name);
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<LLUIImage*> image;
+ Optional<LLUIColor> color;
+ Deprecated scale_image;
+ Params();
+ };
+protected:
+ LLIconCtrl(const Params&);
+ friend class LLUICtrlFactory;
+public:
virtual ~LLIconCtrl();
// llview overrides
virtual void draw();
- void setImage(const std::string& image_name);
- void setImage(const LLUUID& image_name);
- const LLUUID &getImage() const { return mImageID; }
- std::string getImageName() const { return mImageName; }
-
- // Takes a UUID, wraps get/setImage
+ // lluictrl overrides
virtual void setValue(const LLSD& value );
- virtual LLSD getValue() const;
- void setColor(const LLColor4& color) { mColor = color; }
+ std::string getImageName() const;
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+ void setColor(const LLColor4& color) { mColor = color; }
private:
- LLColor4 mColor;
- std::string mImageName;
- LLUUID mImageID;
+ LLUIColor mColor;
LLPointer<LLUIImage> mImagep;
};
diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp
index 51ef3dbacf..30796a5ab9 100644
--- a/indra/llui/llkeywords.cpp
+++ b/indra/llui/llkeywords.cpp
@@ -223,8 +223,8 @@ LLColor3 LLKeywords::readColor( const std::string& s )
{
F32 r, g, b;
r = g = b = 0.0f;
- S32 read = sscanf(s.c_str(), "%f, %f, %f]", &r, &g, &b );
- if( read != 3 ) /* Flawfinder: ignore */
+ S32 values_read = sscanf(s.c_str(), "%f, %f, %f]", &r, &g, &b );
+ if( values_read != 3 )
{
llinfos << " poorly formed color in keyword file" << llendl;
}
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
new file mode 100644
index 0000000000..483c1358ae
--- /dev/null
+++ b/indra/llui/lllayoutstack.cpp
@@ -0,0 +1,718 @@
+/**
+ * @file lllayoutstack.cpp
+ * @brief LLLayout class - dynamic stacking of UI elements
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// Opaque view with a background and a border. Can contain LLUICtrls.
+
+#include "linden_common.h"
+
+#include "lllayoutstack.h"
+#include "llresizebar.h"
+#include "llcriticaldamp.h"
+
+//
+// LLLayoutStack
+//
+struct LLLayoutStack::LLEmbeddedPanel
+{
+ LLEmbeddedPanel(LLPanel* panelp, ELayoutOrientation orientation, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize) : mPanel(panelp),
+ mMinWidth(min_width),
+ mMinHeight(min_height),
+ mAutoResize(auto_resize),
+ mUserResize(user_resize),
+ mOrientation(orientation),
+ mCollapsed(FALSE),
+ mCollapseAmt(0.f),
+ mVisibleAmt(1.f), // default to fully visible
+ mResizeBar(NULL)
+ {
+ LLResizeBar::Side side = (orientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM;
+ LLRect resize_bar_rect = panelp->getRect();
+
+ S32 min_dim;
+ if (orientation == HORIZONTAL)
+ {
+ min_dim = mMinHeight;
+ }
+ else
+ {
+ min_dim = mMinWidth;
+ }
+ LLResizeBar::Params p;
+ p.name("resize");
+ p.resizing_view(mPanel);
+ p.min_size(min_dim);
+ p.side(side);
+ p.snapping_enabled(false);
+ mResizeBar = LLUICtrlFactory::create<LLResizeBar>(p);
+ // panels initialized as hidden should not start out partially visible
+ if (!mPanel->getVisible())
+ {
+ mVisibleAmt = 0.f;
+ }
+ }
+
+ ~LLEmbeddedPanel()
+ {
+ // probably not necessary, but...
+ delete mResizeBar;
+ mResizeBar = NULL;
+ }
+
+ F32 getCollapseFactor()
+ {
+ if (mOrientation == HORIZONTAL)
+ {
+ F32 collapse_amt =
+ clamp_rescale(mCollapseAmt, 0.f, 1.f, 1.f, (F32)mMinWidth / (F32)llmax(1, mPanel->getRect().getWidth()));
+ return mVisibleAmt * collapse_amt;
+ }
+ else
+ {
+ F32 collapse_amt =
+ clamp_rescale(mCollapseAmt, 0.f, 1.f, 1.f, llmin(1.f, (F32)mMinHeight / (F32)llmax(1, mPanel->getRect().getHeight())));
+ return mVisibleAmt * collapse_amt;
+ }
+ }
+
+ LLPanel* mPanel;
+ S32 mMinWidth;
+ S32 mMinHeight;
+ BOOL mAutoResize;
+ BOOL mUserResize;
+ BOOL mCollapsed;
+ LLResizeBar* mResizeBar;
+ ELayoutOrientation mOrientation;
+ F32 mVisibleAmt;
+ F32 mCollapseAmt;
+};
+
+static LLRegisterWidget<LLLayoutStack> r2("layout_stack", &LLLayoutStack::fromXML);
+
+LLLayoutStack::Params::Params()
+: orientation("orientation", std::string("vertical")),
+ border_size("border_size", LLCachedControl<S32>(*LLUI::sSettingGroups["config"], "UIResizeBarHeight", 0))
+{
+ name="stack";
+}
+
+LLLayoutStack::LLLayoutStack(const LLLayoutStack::Params& p)
+: LLView(p),
+ mMinWidth(0),
+ mMinHeight(0),
+ mPanelSpacing(p.border_size),
+ mOrientation((p.orientation() == "vertical") ? VERTICAL : HORIZONTAL)
+{}
+
+LLLayoutStack::~LLLayoutStack()
+{
+ e_panel_list_t panels = mPanels; // copy list of panel pointers
+ mPanels.clear(); // clear so that removeChild() calls don't cause trouble
+ std::for_each(panels.begin(), panels.end(), DeletePointer());
+}
+
+void LLLayoutStack::draw()
+{
+ updateLayout();
+
+ e_panel_list_t::iterator panel_it;
+ for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
+ {
+ // clip to layout rectangle, not bounding rectangle
+ LLRect clip_rect = (*panel_it)->mPanel->getRect();
+ // scale clipping rectangle by visible amount
+ if (mOrientation == HORIZONTAL)
+ {
+ clip_rect.mRight = clip_rect.mLeft + llround((F32)clip_rect.getWidth() * (*panel_it)->getCollapseFactor());
+ }
+ else
+ {
+ clip_rect.mBottom = clip_rect.mTop - llround((F32)clip_rect.getHeight() * (*panel_it)->getCollapseFactor());
+ }
+
+ LLPanel* panelp = (*panel_it)->mPanel;
+
+ LLLocalClipRect clip(clip_rect);
+ // only force drawing invisible children if visible amount is non-zero
+ drawChild(panelp, 0, 0, !clip_rect.isNull());
+ }
+}
+
+void LLLayoutStack::removeChild(LLView* view)
+{
+ LLEmbeddedPanel* embedded_panelp = findEmbeddedPanel(dynamic_cast<LLPanel*>(view));
+
+ if (embedded_panelp)
+ {
+ mPanels.erase(std::find(mPanels.begin(), mPanels.end(), embedded_panelp));
+ delete embedded_panelp;
+ }
+
+ // need to update resizebars
+
+ calcMinExtents();
+
+ LLView::removeChild(view);
+}
+
+BOOL LLLayoutStack::postBuild()
+{
+ updateLayout();
+ return TRUE;
+}
+
+static void get_attribute_s32_and_write(LLXMLNodePtr node,
+ const char* name,
+ S32 *value,
+ S32 default_value,
+ LLXMLNodePtr output_child)
+{
+ BOOL has_attr = node->getAttributeS32(name, *value);
+ if (has_attr && *value != default_value && output_child)
+ {
+ // create an attribute child node
+ LLXMLNodePtr child_attr = output_child->createChild(name, TRUE);
+ child_attr->setIntValue(*value);
+ }
+}
+
+static void get_attribute_bool_and_write(LLXMLNodePtr node,
+ const char* name,
+ BOOL *value,
+ BOOL default_value,
+ LLXMLNodePtr output_child)
+{
+ BOOL has_attr = node->getAttributeBOOL(name, *value);
+ if (has_attr && *value != default_value && output_child)
+ {
+ LLXMLNodePtr child_attr = output_child->createChild(name, TRUE);
+ child_attr->setBoolValue(*value);
+ }
+}
+//static
+LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)
+{
+ LLLayoutStack::Params p(LLUICtrlFactory::getDefaultParams<LLLayoutStack::Params>());
+ LLXUIParser::instance().readXUI(node, p);
+ setupParams(p, parent);
+ LLLayoutStack* layout_stackp = LLUICtrlFactory::create<LLLayoutStack>(p);
+
+ if (parent && layout_stackp)
+ {
+ S32 tab_group = p.tab_group.isProvided() ? p.tab_group() : parent->getLastTabGroup();
+
+ parent->addChild(layout_stackp, tab_group);
+ }
+
+ if (output_node)
+ {
+ Params output_params(p);
+ setupParamsForExport(output_params, parent);
+ LLLayoutStack::Params default_params(LLUICtrlFactory::getDefaultParams<LLLayoutStack::Params>());
+ output_node->setName(node->getName()->mString);
+ LLXUIParser::instance().writeXUI(
+ output_node, output_params, &default_params);
+ }
+
+ for (LLXMLNodePtr child_node = node->getFirstChild(); child_node.notNull(); child_node = child_node->getNextSibling())
+ {
+ const S32 DEFAULT_MIN_WIDTH = 0;
+ const S32 DEFAULT_MIN_HEIGHT = 0;
+ const BOOL DEFAULT_AUTO_RESIZE = TRUE;
+
+ S32 min_width = DEFAULT_MIN_WIDTH;
+ S32 min_height = DEFAULT_MIN_HEIGHT;
+ BOOL auto_resize = DEFAULT_AUTO_RESIZE;
+
+ LLXMLNodePtr output_child;
+ if (output_node)
+ {
+ output_child = output_node->createChild("", FALSE);
+ }
+
+ // Layout stack allows child nodes to acquire additional attributes,
+ // such as "min_width" in: <button label="Foo" min_width="100"/>
+ // If these attributes exist and have non-default values, write them
+ // to the output node.
+ get_attribute_s32_and_write(child_node, "min_width", &min_width,
+ DEFAULT_MIN_WIDTH, output_child);
+ get_attribute_s32_and_write(child_node, "min_height", &min_height,
+ DEFAULT_MIN_HEIGHT, output_child);
+ get_attribute_bool_and_write(child_node, "auto_resize", &auto_resize,
+ DEFAULT_AUTO_RESIZE, output_child);
+
+ if (child_node->hasName("layout_panel"))
+ {
+ BOOL user_resize = TRUE;
+ get_attribute_bool_and_write(child_node, "user_resize", &user_resize,
+ TRUE, output_child);
+ LLPanel* panelp = (LLPanel*)LLPanel::fromXML(child_node, layout_stackp, output_child);
+ if (panelp)
+ {
+ panelp->setFollowsNone();
+ layout_stackp->addPanel(panelp, min_width, min_height, auto_resize, user_resize);
+ }
+ }
+ else
+ {
+ BOOL user_resize = FALSE;
+ get_attribute_bool_and_write(child_node, "user_resize", &user_resize,
+ FALSE, output_child);
+
+ LLPanel* panelp = new LLPanel();
+ LLView* new_child = LLUICtrlFactory::getInstance()->createFromXML(child_node, panelp, LLStringUtil::null, output_child);
+ if (new_child)
+ {
+ // put child in new embedded panel
+ layout_stackp->addPanel(panelp, min_width, min_height, auto_resize, user_resize);
+ // resize panel to contain widget and move widget to be contained in panel
+ panelp->setRect(new_child->getRect());
+ new_child->setOrigin(0, 0);
+ }
+ else
+ {
+ panelp->die();
+ }
+ }
+
+ if (output_child && !output_child->mChildren && output_child->mAttributes.empty() && output_child->getValue().empty())
+ {
+ output_node->deleteChild(output_child);
+ }
+ }
+
+ if (!layout_stackp->postBuild())
+ {
+ delete layout_stackp;
+ return NULL;
+ }
+
+ return layout_stackp;
+}
+
+S32 LLLayoutStack::getDefaultHeight(S32 cur_height)
+{
+ // if we are spanning our children (crude upward propagation of size)
+ // then don't enforce our size on our children
+ if (mOrientation == HORIZONTAL)
+ {
+ cur_height = llmax(mMinHeight, getRect().getHeight());
+ }
+
+ return cur_height;
+}
+
+S32 LLLayoutStack::getDefaultWidth(S32 cur_width)
+{
+ // if we are spanning our children (crude upward propagation of size)
+ // then don't enforce our size on our children
+ if (mOrientation == VERTICAL)
+ {
+ cur_width = llmax(mMinWidth, getRect().getWidth());
+ }
+
+ return cur_width;
+}
+
+void LLLayoutStack::addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, EAnimate animate, S32 index)
+{
+ // panel starts off invisible (collapsed)
+ if (animate == ANIMATE)
+ {
+ panel->setVisible(FALSE);
+ }
+ LLEmbeddedPanel* embedded_panel = new LLEmbeddedPanel(panel, mOrientation, min_width, min_height, auto_resize, user_resize);
+
+ mPanels.insert(mPanels.begin() + llclamp(index, 0, (S32)mPanels.size()), embedded_panel);
+
+ if (panel->getParent() != this)
+ {
+ addChild(panel);
+ }
+ addChild(embedded_panel->mResizeBar);
+
+ // bring all resize bars to the front so that they are clickable even over the panels
+ // with a bit of overlap
+ for (e_panel_list_t::iterator panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
+ {
+ LLResizeBar* resize_barp = (*panel_it)->mResizeBar;
+ sendChildToFront(resize_barp);
+ }
+
+ // start expanding panel animation
+ if (animate == ANIMATE)
+ {
+ panel->setVisible(TRUE);
+ }
+}
+
+void LLLayoutStack::removePanel(LLPanel* panel)
+{
+ removeChild(panel);
+}
+
+void LLLayoutStack::collapsePanel(LLPanel* panel, BOOL collapsed)
+{
+ LLEmbeddedPanel* panel_container = findEmbeddedPanel(panel);
+ if (!panel_container) return;
+
+ panel_container->mCollapsed = collapsed;
+}
+
+void LLLayoutStack::updateLayout(BOOL force_resize)
+{
+ static LLUICachedControl<S32> resize_bar_overlap ("UIResizeBarOverlap", 0);
+ calcMinExtents();
+
+ // calculate current extents
+ S32 total_width = 0;
+ S32 total_height = 0;
+
+ const F32 ANIM_OPEN_TIME = 0.02f;
+ const F32 ANIM_CLOSE_TIME = 0.03f;
+
+ e_panel_list_t::iterator panel_it;
+ for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
+ {
+ LLPanel* panelp = (*panel_it)->mPanel;
+ if (panelp->getVisible())
+ {
+ (*panel_it)->mVisibleAmt = lerp((*panel_it)->mVisibleAmt, 1.f, LLCriticalDamp::getInterpolant(ANIM_OPEN_TIME));
+ if ((*panel_it)->mVisibleAmt > 0.99f)
+ {
+ (*panel_it)->mVisibleAmt = 1.f;
+ }
+ }
+ else // not visible
+ {
+ (*panel_it)->mVisibleAmt = lerp((*panel_it)->mVisibleAmt, 0.f, LLCriticalDamp::getInterpolant(ANIM_CLOSE_TIME));
+ if ((*panel_it)->mVisibleAmt < 0.001f)
+ {
+ (*panel_it)->mVisibleAmt = 0.f;
+ }
+ }
+
+ if ((*panel_it)->mCollapsed)
+ {
+ (*panel_it)->mCollapseAmt = lerp((*panel_it)->mCollapseAmt, 1.f, LLCriticalDamp::getInterpolant(ANIM_CLOSE_TIME));
+ }
+ else
+ {
+ (*panel_it)->mCollapseAmt = lerp((*panel_it)->mCollapseAmt, 0.f, LLCriticalDamp::getInterpolant(ANIM_CLOSE_TIME));
+ }
+
+ if (mOrientation == HORIZONTAL)
+ {
+ // enforce minimize size constraint by default
+ if (panelp->getRect().getWidth() < (*panel_it)->mMinWidth)
+ {
+ panelp->reshape((*panel_it)->mMinWidth, panelp->getRect().getHeight());
+ }
+ total_width += llround(panelp->getRect().getWidth() * (*panel_it)->getCollapseFactor());
+ // want n-1 panel gaps for n panels
+ if (panel_it != mPanels.begin())
+ {
+ total_width += mPanelSpacing;
+ }
+ }
+ else //VERTICAL
+ {
+ // enforce minimize size constraint by default
+ if (panelp->getRect().getHeight() < (*panel_it)->mMinHeight)
+ {
+ panelp->reshape(panelp->getRect().getWidth(), (*panel_it)->mMinHeight);
+ }
+ total_height += llround(panelp->getRect().getHeight() * (*panel_it)->getCollapseFactor());
+ if (panel_it != mPanels.begin())
+ {
+ total_height += mPanelSpacing;
+ }
+ }
+ }
+
+ S32 num_resizable_panels = 0;
+ S32 shrink_headroom_available = 0;
+ S32 shrink_headroom_total = 0;
+ for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
+ {
+ // panels that are not fully visible do not count towards shrink headroom
+ if ((*panel_it)->getCollapseFactor() < 1.f)
+ {
+ continue;
+ }
+
+ // if currently resizing a panel or the panel is flagged as not automatically resizing
+ // only track total available headroom, but don't use it for automatic resize logic
+ if ((*panel_it)->mResizeBar->hasMouseCapture()
+ || (!(*panel_it)->mAutoResize
+ && !force_resize))
+ {
+ if (mOrientation == HORIZONTAL)
+ {
+ shrink_headroom_total += (*panel_it)->mPanel->getRect().getWidth() - (*panel_it)->mMinWidth;
+ }
+ else //VERTICAL
+ {
+ shrink_headroom_total += (*panel_it)->mPanel->getRect().getHeight() - (*panel_it)->mMinHeight;
+ }
+ }
+ else
+ {
+ num_resizable_panels++;
+ if (mOrientation == HORIZONTAL)
+ {
+ shrink_headroom_available += (*panel_it)->mPanel->getRect().getWidth() - (*panel_it)->mMinWidth;
+ shrink_headroom_total += (*panel_it)->mPanel->getRect().getWidth() - (*panel_it)->mMinWidth;
+ }
+ else //VERTICAL
+ {
+ shrink_headroom_available += (*panel_it)->mPanel->getRect().getHeight() - (*panel_it)->mMinHeight;
+ shrink_headroom_total += (*panel_it)->mPanel->getRect().getHeight() - (*panel_it)->mMinHeight;
+ }
+ }
+ }
+
+ // calculate how many pixels need to be distributed among layout panels
+ // positive means panels need to grow, negative means shrink
+ S32 pixels_to_distribute;
+ if (mOrientation == HORIZONTAL)
+ {
+ pixels_to_distribute = getRect().getWidth() - total_width;
+ }
+ else //VERTICAL
+ {
+ pixels_to_distribute = getRect().getHeight() - total_height;
+ }
+
+ // now we distribute the pixels...
+ S32 cur_x = 0;
+ S32 cur_y = getRect().getHeight();
+
+ for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
+ {
+ LLPanel* panelp = (*panel_it)->mPanel;
+
+ S32 cur_width = panelp->getRect().getWidth();
+ S32 cur_height = panelp->getRect().getHeight();
+ S32 new_width = llmax((*panel_it)->mMinWidth, cur_width);
+ S32 new_height = llmax((*panel_it)->mMinHeight, cur_height);
+
+ S32 delta_size = 0;
+
+ // if panel can automatically resize (not animating, and resize flag set)...
+ if ((*panel_it)->getCollapseFactor() == 1.f
+ && (force_resize || (*panel_it)->mAutoResize)
+ && !(*panel_it)->mResizeBar->hasMouseCapture())
+ {
+ if (mOrientation == HORIZONTAL)
+ {
+ // if we're shrinking
+ if (pixels_to_distribute < 0)
+ {
+ // shrink proportionally to amount over minimum
+ // so we can do this in one pass
+ delta_size = (shrink_headroom_available > 0) ? llround((F32)pixels_to_distribute * ((F32)(cur_width - (*panel_it)->mMinWidth) / (F32)shrink_headroom_available)) : 0;
+ shrink_headroom_available -= (cur_width - (*panel_it)->mMinWidth);
+ }
+ else
+ {
+ // grow all elements equally
+ delta_size = llround((F32)pixels_to_distribute / (F32)num_resizable_panels);
+ num_resizable_panels--;
+ }
+ pixels_to_distribute -= delta_size;
+ new_width = llmax((*panel_it)->mMinWidth, cur_width + delta_size);
+ }
+ else
+ {
+ new_width = getDefaultWidth(new_width);
+ }
+
+ if (mOrientation == VERTICAL)
+ {
+ if (pixels_to_distribute < 0)
+ {
+ // shrink proportionally to amount over minimum
+ // so we can do this in one pass
+ delta_size = (shrink_headroom_available > 0) ? llround((F32)pixels_to_distribute * ((F32)(cur_height - (*panel_it)->mMinHeight) / (F32)shrink_headroom_available)) : 0;
+ shrink_headroom_available -= (cur_height - (*panel_it)->mMinHeight);
+ }
+ else
+ {
+ delta_size = llround((F32)pixels_to_distribute / (F32)num_resizable_panels);
+ num_resizable_panels--;
+ }
+ pixels_to_distribute -= delta_size;
+ new_height = llmax((*panel_it)->mMinHeight, cur_height + delta_size);
+ }
+ else
+ {
+ new_height = getDefaultHeight(new_height);
+ }
+ }
+ else
+ {
+ if (mOrientation == HORIZONTAL)
+ {
+ new_height = getDefaultHeight(new_height);
+ }
+ else // VERTICAL
+ {
+ new_width = getDefaultWidth(new_width);
+ }
+ }
+
+ // adjust running headroom count based on new sizes
+ shrink_headroom_total += delta_size;
+
+ panelp->reshape(new_width, new_height);
+ panelp->setOrigin(cur_x, cur_y - new_height);
+
+ LLRect panel_rect = panelp->getRect();
+ LLRect resize_bar_rect = panel_rect;
+ if (mOrientation == HORIZONTAL)
+ {
+ resize_bar_rect.mLeft = panel_rect.mRight - resize_bar_overlap;
+ resize_bar_rect.mRight = panel_rect.mRight + mPanelSpacing + resize_bar_overlap;
+ }
+ else
+ {
+ resize_bar_rect.mTop = panel_rect.mBottom + resize_bar_overlap;
+ resize_bar_rect.mBottom = panel_rect.mBottom - mPanelSpacing - resize_bar_overlap;
+ }
+ (*panel_it)->mResizeBar->setRect(resize_bar_rect);
+
+ if (mOrientation == HORIZONTAL)
+ {
+ cur_x += llround(new_width * (*panel_it)->getCollapseFactor()) + mPanelSpacing;
+ }
+ else //VERTICAL
+ {
+ cur_y -= llround(new_height * (*panel_it)->getCollapseFactor()) + mPanelSpacing;
+ }
+ }
+
+ // update resize bars with new limits
+ LLResizeBar* last_resize_bar = NULL;
+ for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
+ {
+ LLPanel* panelp = (*panel_it)->mPanel;
+
+ if (mOrientation == HORIZONTAL)
+ {
+ (*panel_it)->mResizeBar->setResizeLimits(
+ (*panel_it)->mMinWidth,
+ (*panel_it)->mMinWidth + shrink_headroom_total);
+ }
+ else //VERTICAL
+ {
+ (*panel_it)->mResizeBar->setResizeLimits(
+ (*panel_it)->mMinHeight,
+ (*panel_it)->mMinHeight + shrink_headroom_total);
+ }
+
+ // toggle resize bars based on panel visibility, resizability, etc
+ BOOL resize_bar_enabled = panelp->getVisible() && (*panel_it)->mUserResize;
+ (*panel_it)->mResizeBar->setVisible(resize_bar_enabled);
+
+ if (resize_bar_enabled)
+ {
+ last_resize_bar = (*panel_it)->mResizeBar;
+ }
+ }
+
+ // hide last resize bar as there is nothing past it
+ // resize bars need to be in between two resizable panels
+ if (last_resize_bar)
+ {
+ last_resize_bar->setVisible(FALSE);
+ }
+
+ // not enough room to fit existing contents
+ if (force_resize == FALSE
+ // layout did not complete by reaching target position
+ && ((mOrientation == VERTICAL && cur_y != -mPanelSpacing)
+ || (mOrientation == HORIZONTAL && cur_x != getRect().getWidth() + mPanelSpacing)))
+ {
+ // do another layout pass with all stacked elements contributing
+ // even those that don't usually resize
+ llassert_always(force_resize == FALSE);
+ updateLayout(TRUE);
+ }
+} // end LLLayoutStack::updateLayout
+
+
+LLLayoutStack::LLEmbeddedPanel* LLLayoutStack::findEmbeddedPanel(LLPanel* panelp) const
+{
+ if (!panelp) return NULL;
+
+ e_panel_list_t::const_iterator panel_it;
+ for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
+ {
+ if ((*panel_it)->mPanel == panelp)
+ {
+ return *panel_it;
+ }
+ }
+ return NULL;
+}
+
+// Compute sum of min_width or min_height of children
+void LLLayoutStack::calcMinExtents()
+{
+ mMinWidth = 0;
+ mMinHeight = 0;
+
+ e_panel_list_t::iterator panel_it;
+ for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
+ {
+ if (mOrientation == HORIZONTAL)
+ {
+ mMinHeight = llmax( mMinHeight,
+ (*panel_it)->mMinHeight);
+ mMinWidth += (*panel_it)->mMinWidth;
+ if (panel_it != mPanels.begin())
+ {
+ mMinWidth += mPanelSpacing;
+ }
+ }
+ else //VERTICAL
+ {
+ mMinWidth = llmax( mMinWidth,
+ (*panel_it)->mMinWidth);
+ mMinHeight += (*panel_it)->mMinHeight;
+ if (panel_it != mPanels.begin())
+ {
+ mMinHeight += mPanelSpacing;
+ }
+ }
+ }
+}
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
new file mode 100644
index 0000000000..600690f67d
--- /dev/null
+++ b/indra/llui/lllayoutstack.h
@@ -0,0 +1,102 @@
+/**
+ * @file lllayoutstack.h
+ * @author Richard Nelson
+ * @brief LLLayout class - dynamic stacking of UI elements
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLLAYOUTSTACK_H
+#define LL_LLLAYOUTSTACK_H
+
+#include "llpanel.h"
+
+class LLLayoutStack : public LLView
+{
+public:
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Optional<std::string> orientation;
+ Optional<S32> border_size;
+ // mMinWidth and mMinHeight are calculated, not set in XML
+
+ Params();
+ };
+
+ typedef enum e_layout_orientation
+ {
+ HORIZONTAL,
+ VERTICAL
+ } ELayoutOrientation;
+
+ virtual ~LLLayoutStack();
+
+ /*virtual*/ void draw();
+ /*virtual*/ void removeChild(LLView*);
+ /*virtual*/ BOOL postBuild();
+
+ static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node = NULL);
+
+ S32 getMinWidth() const { return mMinWidth; }
+ S32 getMinHeight() const { return mMinHeight; }
+
+ typedef enum e_animate
+ {
+ NO_ANIMATE,
+ ANIMATE
+ } EAnimate;
+
+ void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, EAnimate animate = NO_ANIMATE, S32 index = S32_MAX);
+ void removePanel(LLPanel* panel);
+ void collapsePanel(LLPanel* panel, BOOL collapsed = TRUE);
+ S32 getNumPanels() { return mPanels.size(); }
+
+protected:
+ LLLayoutStack(const Params&);
+ friend class LLUICtrlFactory;
+
+private:
+ struct LLEmbeddedPanel;
+
+ void updateLayout(BOOL force_resize = FALSE);
+ void calcMinExtents();
+ S32 getDefaultHeight(S32 cur_height);
+ S32 getDefaultWidth(S32 cur_width);
+
+ const ELayoutOrientation mOrientation;
+
+ typedef std::vector<LLEmbeddedPanel*> e_panel_list_t;
+ e_panel_list_t mPanels;
+ LLEmbeddedPanel* findEmbeddedPanel(LLPanel* panelp) const;
+
+ S32 mMinWidth; // calculated by calcMinExtents
+ S32 mMinHeight; // calculated by calcMinExtents
+ S32 mPanelSpacing;
+}; // end class LLLayoutStack
+
+#endif
diff --git a/indra/llui/lllazyvalue.h b/indra/llui/lllazyvalue.h
new file mode 100644
index 0000000000..da0af6f522
--- /dev/null
+++ b/indra/llui/lllazyvalue.h
@@ -0,0 +1,83 @@
+/**
+ * @file lllazyvalue.h
+ * @brief generic functor/value abstraction for lazy evaluation of a value
+ * parsing construction parameters from xml and LLSD
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LAZY_VALUE_H
+#define LL_LAZY_VALUE_H
+
+#include <boost/function.hpp>
+
+// Holds on to a value of type T *or* calls a functor to generate a value of type T
+template<typename T>
+class LLLazyValue
+{
+public:
+ typedef typename boost::add_reference<typename boost::add_const<T>::type>::type T_const_ref;
+ typedef typename boost::function<T_const_ref (void)> function_type;
+
+public:
+ LLLazyValue(const function_type& value)
+ : mValueGetter(value)
+ {}
+ LLLazyValue(T_const_ref value)
+ : mValue(value)
+ {}
+ LLLazyValue()
+ : mValue()
+ {}
+
+ void set(const LLLazyValue& val)
+ {
+ mValueGetter = val.mValueGetter;
+ }
+
+ void set(T_const_ref val)
+ {
+ mValue = val;
+ mValueGetter = NULL;
+ }
+
+ T_const_ref get() const
+ {
+ if (!mValueGetter.empty())
+ {
+ return mValueGetter();
+ }
+ return mValue;
+ }
+
+private:
+ function_type mValueGetter;
+ T mValue;
+};
+
+#endif // LL_LAZY_VALUE_H
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 964254d93f..c03ef7968f 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -34,6 +34,8 @@
#include "linden_common.h"
+#define INSTANTIATE_GETCHILD_LINEEDITOR
+
#include "lllineeditor.h"
#include "lltexteditor.h"
@@ -64,79 +66,102 @@
// Constants
//
-const S32 UI_LINEEDITOR_CURSOR_THICKNESS = 2;
-const S32 UI_LINEEDITOR_H_PAD = 2;
-const S32 UI_LINEEDITOR_V_PAD = 1;
const F32 CURSOR_FLASH_DELAY = 1.0f; // in seconds
const S32 SCROLL_INCREMENT_ADD = 0; // make space for typing
const S32 SCROLL_INCREMENT_DEL = 4; // make space for baskspacing
const F32 AUTO_SCROLL_TIME = 0.05f;
-const F32 PREEDIT_MARKER_BRIGHTNESS = 0.4f;
-const S32 PREEDIT_MARKER_GAP = 1;
-const S32 PREEDIT_MARKER_POSITION = 2;
-const S32 PREEDIT_MARKER_THICKNESS = 1;
-const F32 PREEDIT_STANDOUT_BRIGHTNESS = 0.6f;
-const S32 PREEDIT_STANDOUT_GAP = 1;
-const S32 PREEDIT_STANDOUT_POSITION = 2;
-const S32 PREEDIT_STANDOUT_THICKNESS = 2;
-
static LLRegisterWidget<LLLineEditor> r1("line_editor");
-/* static */ LLPointer<LLUIImage> LLLineEditor::sImage;
+template LLLineEditor* LLView::getChild<LLLineEditor>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
//
// Member functions
//
-
-LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
- const std::string& default_text, const LLFontGL* font,
- S32 max_length_bytes,
- void (*commit_callback)(LLUICtrl* caller, void* user_data ),
- void (*keystroke_callback)(LLLineEditor* caller, void* user_data ),
- void (*focus_lost_callback)(LLFocusableElement* caller, void* user_data ),
- void* userdata,
- LLLinePrevalidateFunc prevalidate_func,
- LLViewBorder::EBevel border_bevel,
- LLViewBorder::EStyle border_style,
- S32 border_thickness)
- :
- LLUICtrl( name, rect, TRUE, commit_callback, userdata, FOLLOWS_TOP | FOLLOWS_LEFT ),
- mMaxLengthBytes(max_length_bytes),
- mCursorPos( 0 ),
- mScrollHPos( 0 ),
- mTextPadLeft(0),
- mTextPadRight(0),
- mCommitOnFocusLost( TRUE ),
- mRevertOnEsc( TRUE ),
- mKeystrokeCallback( keystroke_callback ),
- mIsSelecting( FALSE ),
- mSelectionStart( 0 ),
- mSelectionEnd( 0 ),
- mLastSelectionX(-1),
- mLastSelectionY(-1),
- mLastSelectionStart(-1),
- mLastSelectionEnd(-1),
- mPrevalidateFunc( prevalidate_func ),
- mCursorColor( LLUI::sColorsGroup->getColor( "TextCursorColor" ) ),
- mFgColor( LLUI::sColorsGroup->getColor( "TextFgColor" ) ),
- mReadOnlyFgColor( LLUI::sColorsGroup->getColor( "TextFgReadOnlyColor" ) ),
- mTentativeFgColor( LLUI::sColorsGroup->getColor( "TextFgTentativeColor" ) ),
- mWriteableBgColor( LLUI::sColorsGroup->getColor( "TextBgWriteableColor" ) ),
- mReadOnlyBgColor( LLUI::sColorsGroup->getColor( "TextBgReadOnlyColor" ) ),
- mFocusBgColor( LLUI::sColorsGroup->getColor( "TextBgFocusColor" ) ),
- mBorderThickness( border_thickness ),
- mIgnoreArrowKeys( FALSE ),
- mIgnoreTab( TRUE ),
- mDrawAsterixes( FALSE ),
- mHandleEditKeysDirectly( FALSE ),
- mSelectAllonFocusReceived( FALSE ),
- mPassDelete(FALSE),
- mReadOnly(FALSE),
- mImage( sImage ),
- mReplaceNewlinesWithSpaces( TRUE )
-{
- llassert( max_length_bytes > 0 );
+
+void LLLineEditor::PrevalidateNamedFuncs::declareValues()
+{
+ declare("ascii", LLLineEditor::prevalidateASCII);
+ declare("float", LLLineEditor::prevalidateFloat);
+ declare("int", LLLineEditor::prevalidateInt);
+ declare("positive_s32", LLLineEditor::prevalidatePositiveS32);
+ declare("non_negative_s32", LLLineEditor::prevalidateNonNegativeS32);
+ declare("alpha_num", LLLineEditor::prevalidateAlphaNum);
+ declare("alpha_num_space", LLLineEditor::prevalidateAlphaNumSpace);
+ declare("printable_not_pipe", LLLineEditor::prevalidatePrintableNotPipe);
+ declare("printable_no_space", LLLineEditor::prevalidatePrintableNoSpace);
+}
+
+LLLineEditor::Params::Params()
+: max_length_bytes("max_length", 254),
+ background_image("background_image"),
+ select_on_focus("select_on_focus", false),
+ handle_edit_keys_directly("handle_edit_keys_directly", false),
+ commit_on_focus_lost("commit_on_focus_lost", true),
+ ignore_tab("ignore_tab", true),
+ cursor_color("cursor_color"),
+ text_color("text_color"),
+ text_readonly_color("text_readonly_color"),
+ text_tentative_color("text_tentative_color"),
+ bg_readonly_color("bg_readonly_color"),
+ bg_writeable_color("bg_writeable_color"),
+ bg_focus_color("bg_focus_color"),
+ border(""),
+ is_unicode("is_unicode"),
+ drop_shadow_visible("drop_shadow_visible"),
+ border_drop_shadow_visible("border_drop_shadow_visible"),
+ bg_visible("bg_visible"),
+ text_pad_left("text_pad_left"),
+ text_pad_right("text_pad_right"),
+ default_text("default_text")
+{
+ mouse_opaque = true;
+ addSynonym(select_on_focus, "select_all_on_focus_received");
+ addSynonym(border, "border");
+}
+
+LLLineEditor::LLLineEditor(const LLLineEditor::Params& p)
+: LLUICtrl(p),
+ mMaxLengthBytes(p.max_length_bytes),
+ mCursorPos( 0 ),
+ mScrollHPos( 0 ),
+ mTextPadLeft(p.text_pad_left),
+ mTextPadRight(p.text_pad_right),
+ mCommitOnFocusLost( p.commit_on_focus_lost ),
+ mRevertOnEsc( TRUE ),
+ mKeystrokeCallback( p.keystroke_callback() ),
+ mIsSelecting( FALSE ),
+ mSelectionStart( 0 ),
+ mSelectionEnd( 0 ),
+ mLastSelectionX(-1),
+ mLastSelectionY(-1),
+ mLastSelectionStart(-1),
+ mLastSelectionEnd(-1),
+ mBorderThickness( 0 ),
+ mIgnoreArrowKeys( FALSE ),
+ mIgnoreTab( p.ignore_tab ),
+ mDrawAsterixes( FALSE ),
+ mHandleEditKeysDirectly(p.handle_edit_keys_directly),
+ mSelectAllonFocusReceived( p.select_on_focus ),
+ mPassDelete(FALSE),
+ mReadOnly(FALSE),
+ mImage( NULL ),
+ mReplaceNewlinesWithSpaces( TRUE ),
+ mLabel(p.label),
+ mCursorColor(p.cursor_color()),
+ mFgColor(p.text_color()),
+ mReadOnlyFgColor(p.text_readonly_color()),
+ mTentativeFgColor(p.text_tentative_color()),
+ mWriteableBgColor(p.bg_writeable_color()),
+ mReadOnlyBgColor(p.bg_readonly_color()),
+ mFocusBgColor(p.bg_focus_color()),
+ mGLFont(p.font),
+ mGLFontStyle(LLFontGL::getStyleFromString(p.font.style))
+{
+ llassert( mMaxLengthBytes > 0 );
+
+ mScrollTimer.reset();
+ setText(p.default_text());
// line history support:
// - initialize line history list
@@ -146,40 +171,24 @@ LLLineEditor::LLLineEditor(const std::string& name, const LLRect& rect,
// - reset current history line pointer
mCurrentHistoryLine = 0;
- if (font)
- {
- mGLFont = font;
- }
- else
- {
- mGLFont = LLFontGL::getFontSansSerifSmall();
- }
-
- setFocusLostCallback(focus_lost_callback);
-
- setTextPadding(0, 0);
-
- mScrollTimer.reset();
+ LLRect border_rect(getLocalRect());
+ // adjust for gl line drawing glitch
+ border_rect.mTop -= 1;
+ border_rect.mRight -=1;
+ LLViewBorder::Params border_p(p.border);
+ border_p.rect = border_rect;
+ border_p.follows.flags = FOLLOWS_ALL;
+ border_p.bevel_type = LLViewBorder::BEVEL_IN;
+ mBorder = LLUICtrlFactory::create<LLViewBorder>(border_p);
+ addChild( mBorder );
- setText(default_text);
-
+ // clamp text padding to current editor size
+ updateTextPadding();
setCursor(mText.length());
- // Scalable UI somehow made these rectangles off-by-one.
- // I don't know why. JC
- LLRect border_rect(0, getRect().getHeight()-1, getRect().getWidth()-1, 0);
- mBorder = new LLViewBorder( std::string("line ed border"), border_rect, border_bevel, border_style, mBorderThickness );
- addChild( mBorder );
- mBorder->setFollows(FOLLOWS_LEFT|FOLLOWS_RIGHT|FOLLOWS_TOP|FOLLOWS_BOTTOM);
-
- if( ! sImage)
- {
- sImage = LLUI::getUIImage("sm_rounded_corners_simple.tga");
- }
- mImage = sImage;
+ setPrevalidate(p.prevalidate_callback());
}
-
-
+
LLLineEditor::~LLLineEditor()
{
mCommitOnFocusLost = FALSE;
@@ -227,6 +236,7 @@ void LLLineEditor::onCommit()
// put current line into the line history
updateHistory();
+ setControlValue(getValue());
LLUICtrl::onCommit();
selectAll();
}
@@ -255,7 +265,7 @@ void LLLineEditor::updateHistory()
void LLLineEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
{
LLUICtrl::reshape(width, height, called_from_parent);
- setTextPadding(mTextPadLeft, mTextPadRight); // For clamping side-effect.
+ updateTextPadding(); // For clamping side-effect.
setCursor(mCursorPos); // For clamping side-effect.
}
@@ -273,11 +283,12 @@ void LLLineEditor::setMaxTextLength(S32 max_text_length)
mMaxLengthBytes = max_len;
}
-void LLLineEditor::setTextPadding(S32 left, S32 right)
+void LLLineEditor::updateTextPadding()
{
- mTextPadLeft = llclamp(left, 0, getRect().getWidth());
- mTextPadRight = llclamp(right, 0, getRect().getWidth());
- mMinHPixels = UI_LINEEDITOR_H_PAD + mTextPadLeft;
+ static LLUICachedControl<S32> line_editor_hpad ("UILineEditorHPad", 0);
+ mTextPadLeft = llclamp(mTextPadLeft, 0, getRect().getWidth());
+ mTextPadRight = llclamp(mTextPadRight, 0, getRect().getWidth());
+ mMinHPixels = line_editor_hpad + mTextPadLeft;
mMaxHPixels = getRect().getWidth() - mMinHPixels - mTextPadRight;
}
@@ -362,7 +373,7 @@ void LLLineEditor::setCursor( S32 pos )
{
S32 width_chars_to_left = mGLFont->getWidth(mText.getWString().c_str(), 0, mScrollHPos);
S32 last_visible_char = mGLFont->maxDrawableChars(mText.getWString().c_str(), llmax(0.f, (F32)(mMaxHPixels - mMinHPixels + width_chars_to_left)));
- S32 min_scroll = mGLFont->firstDrawableChar(mText.getWString().c_str(), (F32)(mMaxHPixels - mMinHPixels - UI_LINEEDITOR_CURSOR_THICKNESS - UI_LINEEDITOR_H_PAD), mText.length(), getCursor());
+ S32 min_scroll = mGLFont->firstDrawableChar(mText.getWString().c_str(), (F32)(mMaxHPixels - mMinHPixels), mText.length(), getCursor());
if (old_cursor_pos == last_visible_char)
{
mScrollHPos = llmin(mText.length(), llmax(min_scroll, mScrollHPos + SCROLL_INCREMENT_ADD));
@@ -936,7 +947,7 @@ void LLLineEditor::cut()
else
if( mKeystrokeCallback )
{
- mKeystrokeCallback( this, mCallbackUserData );
+ mKeystrokeCallback( this );
}
}
}
@@ -1057,7 +1068,7 @@ void LLLineEditor::pasteHelper(bool is_primary)
else
if( mKeystrokeCallback )
{
- mKeystrokeCallback( this, mCallbackUserData );
+ mKeystrokeCallback( this );
}
}
}
@@ -1370,7 +1381,7 @@ BOOL LLLineEditor::handleKeyHere(KEY key, MASK mask )
{
if (mKeystrokeCallback)
{
- mKeystrokeCallback(this, mCallbackUserData);
+ mKeystrokeCallback(this);
}
}
}
@@ -1420,7 +1431,7 @@ BOOL LLLineEditor::handleUnicodeCharHere(llwchar uni_char)
{
// HACK! The only usage of this callback doesn't do anything with the character.
// We'll have to do something about this if something ever changes! - Doug
- mKeystrokeCallback( this, mCallbackUserData );
+ mKeystrokeCallback( this );
}
}
}
@@ -1461,7 +1472,7 @@ void LLLineEditor::doDelete()
{
if( mKeystrokeCallback )
{
- mKeystrokeCallback( this, mCallbackUserData );
+ mKeystrokeCallback( this );
}
}
}
@@ -1471,6 +1482,16 @@ void LLLineEditor::doDelete()
void LLLineEditor::draw()
{
S32 text_len = mText.length();
+ static LLUICachedControl<S32> lineeditor_cursor_thickness ("UILineEditorCursorThickness", 0);
+ static LLUICachedControl<S32> lineeditor_v_pad ("UILineEditorVPad", 0);
+ static LLUICachedControl<F32> preedit_marker_brightness ("UIPreeditMarkerBrightness", 0);
+ static LLUICachedControl<S32> preedit_marker_gap ("UIPreeditMarkerGap", 0);
+ static LLUICachedControl<S32> preedit_marker_position ("UIPreeditMarkerPosition", 0);
+ static LLUICachedControl<S32> preedit_marker_thickness ("UIPreeditMarkerThickness", 0);
+ static LLUICachedControl<F32> preedit_standout_brightness ("UIPreeditStandoutBrightness", 0);
+ static LLUICachedControl<S32> preedit_standout_gap ("UIPreeditStandoutGap", 0);
+ static LLUICachedControl<S32> preedit_standout_position ("UIPreeditStandoutPosition", 0);
+ static LLUICachedControl<S32> preedit_standout_thickness ("UIPreeditStandoutThickness", 0);
std::string saved_text;
if (mDrawAsterixes)
@@ -1488,7 +1509,7 @@ void LLLineEditor::draw()
LLRect background( 0, getRect().getHeight(), getRect().getWidth(), 0 );
background.stretch( -mBorderThickness );
- LLColor4 bg_color = mReadOnlyBgColor;
+ LLColor4 bg_color = mReadOnlyBgColor.get();
#if 0 // for when we're ready for image art.
if( hasFocus())
@@ -1505,11 +1526,11 @@ void LLLineEditor::draw()
{
if( gFocusMgr.getKeyboardFocus() == this )
{
- bg_color = mFocusBgColor;
+ bg_color = mFocusBgColor.get();
}
else
{
- bg_color = mWriteableBgColor;
+ bg_color = mWriteableBgColor.get();
}
}
gl_rect_2d(background, bg_color);
@@ -1526,18 +1547,18 @@ void LLLineEditor::draw()
{
if (!getTentative())
{
- text_color = mFgColor;
+ text_color = mFgColor.get();
}
else
{
- text_color = mTentativeFgColor;
+ text_color = mTentativeFgColor.get();
}
}
else
{
- text_color = mReadOnlyFgColor;
+ text_color = mReadOnlyFgColor.get();
}
- LLColor4 label_color = mTentativeFgColor;
+ LLColor4 label_color = mTentativeFgColor.get();
if (hasPreeditString())
{
@@ -1556,19 +1577,19 @@ void LLLineEditor::draw()
}
if (mPreeditStandouts[i])
{
- gl_rect_2d(preedit_pixels_left + PREEDIT_STANDOUT_GAP,
- background.mBottom + PREEDIT_STANDOUT_POSITION,
- preedit_pixels_right - PREEDIT_STANDOUT_GAP - 1,
- background.mBottom + PREEDIT_STANDOUT_POSITION - PREEDIT_STANDOUT_THICKNESS,
- (text_color * PREEDIT_STANDOUT_BRIGHTNESS + bg_color * (1 - PREEDIT_STANDOUT_BRIGHTNESS)).setAlpha(1.0f));
+ gl_rect_2d(preedit_pixels_left + preedit_standout_gap,
+ background.mBottom + preedit_standout_position,
+ preedit_pixels_right - preedit_standout_gap - 1,
+ background.mBottom + preedit_standout_position - preedit_standout_thickness,
+ (text_color * preedit_standout_brightness + bg_color * (1 - preedit_standout_brightness)).setAlpha(1.0f));
}
else
{
- gl_rect_2d(preedit_pixels_left + PREEDIT_MARKER_GAP,
- background.mBottom + PREEDIT_MARKER_POSITION,
- preedit_pixels_right - PREEDIT_MARKER_GAP - 1,
- background.mBottom + PREEDIT_MARKER_POSITION - PREEDIT_MARKER_THICKNESS,
- (text_color * PREEDIT_MARKER_BRIGHTNESS + bg_color * (1 - PREEDIT_MARKER_BRIGHTNESS)).setAlpha(1.0f));
+ gl_rect_2d(preedit_pixels_left + preedit_marker_gap,
+ background.mBottom + preedit_marker_position,
+ preedit_pixels_right - preedit_marker_gap - 1,
+ background.mBottom + preedit_marker_position - preedit_marker_thickness,
+ (text_color * preedit_marker_brightness + bg_color * (1 - preedit_marker_brightness)).setAlpha(1.0f));
}
}
}
@@ -1576,7 +1597,7 @@ void LLLineEditor::draw()
S32 rendered_text = 0;
F32 rendered_pixels_right = (F32)mMinHPixels;
- F32 text_bottom = (F32)background.mBottom + (F32)UI_LINEEDITOR_V_PAD;
+ F32 text_bottom = (F32)background.mBottom + (F32)lineeditor_v_pad;
if( (gFocusMgr.getKeyboardFocus() == this) && hasSelection() )
{
@@ -1601,7 +1622,8 @@ void LLLineEditor::draw()
rendered_pixels_right, text_bottom,
text_color,
LLFontGL::LEFT, LLFontGL::BOTTOM,
- LLFontGL::NORMAL,
+ mGLFontStyle,
+ LLFontGL::NO_SHADOW,
select_left - mScrollHPos,
mMaxHPixels - llround(rendered_pixels_right),
&rendered_pixels_right);
@@ -1620,7 +1642,8 @@ void LLLineEditor::draw()
rendered_pixels_right, text_bottom,
LLColor4( 1.f - text_color.mV[0], 1.f - text_color.mV[1], 1.f - text_color.mV[2], 1 ),
LLFontGL::LEFT, LLFontGL::BOTTOM,
- LLFontGL::NORMAL,
+ mGLFontStyle,
+ LLFontGL::NO_SHADOW,
select_right - mScrollHPos - rendered_text,
mMaxHPixels - llround(rendered_pixels_right),
&rendered_pixels_right);
@@ -1634,7 +1657,8 @@ void LLLineEditor::draw()
rendered_pixels_right, text_bottom,
text_color,
LLFontGL::LEFT, LLFontGL::BOTTOM,
- LLFontGL::NORMAL,
+ mGLFontStyle,
+ LLFontGL::NO_SHADOW,
S32_MAX,
mMaxHPixels - llround(rendered_pixels_right),
&rendered_pixels_right);
@@ -1647,7 +1671,8 @@ void LLLineEditor::draw()
rendered_pixels_right, text_bottom,
text_color,
LLFontGL::LEFT, LLFontGL::BOTTOM,
- LLFontGL::NORMAL,
+ mGLFontStyle,
+ LLFontGL::NO_SHADOW,
S32_MAX,
mMaxHPixels - llround(rendered_pixels_right),
&rendered_pixels_right);
@@ -1667,8 +1692,8 @@ void LLLineEditor::draw()
if( (elapsed < CURSOR_FLASH_DELAY ) || (S32(elapsed * 2) & 1) )
{
S32 cursor_left = findPixelNearestPos();
- cursor_left -= UI_LINEEDITOR_CURSOR_THICKNESS / 2;
- S32 cursor_right = cursor_left + UI_LINEEDITOR_CURSOR_THICKNESS;
+ cursor_left -= lineeditor_cursor_thickness / 2;
+ S32 cursor_right = cursor_left + lineeditor_cursor_thickness;
if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection())
{
const LLWString space(utf8str_to_wstring(std::string(" ")));
@@ -1681,17 +1706,18 @@ void LLLineEditor::draw()
cursor_right, cursor_bottom, text_color);
if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode() && !hasSelection())
{
- mGLFont->render(mText, getCursor(), (F32)(cursor_left + UI_LINEEDITOR_CURSOR_THICKNESS / 2), text_bottom,
+ mGLFont->render(mText, getCursor(), (F32)(cursor_left + lineeditor_cursor_thickness / 2), text_bottom,
LLColor4( 1.f - text_color.mV[0], 1.f - text_color.mV[1], 1.f - text_color.mV[2], 1 ),
LLFontGL::LEFT, LLFontGL::BOTTOM,
- LLFontGL::NORMAL,
+ mGLFontStyle,
+ LLFontGL::NO_SHADOW,
1);
}
// Make sure the IME is in the right place
S32 pixels_after_scroll = findPixelNearestPos(); // RCalculcate for IME position
- LLRect screen_pos = getScreenRect();
- LLCoordGL ime_pos( screen_pos.mLeft + pixels_after_scroll, screen_pos.mTop - UI_LINEEDITOR_V_PAD );
+ LLRect screen_pos = calcScreenRect();
+ LLCoordGL ime_pos( screen_pos.mLeft + pixels_after_scroll, screen_pos.mTop - lineeditor_v_pad );
ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]);
ime_pos.mY = (S32) (ime_pos.mY * LLUI::sGLScaleFactor.mV[VY]);
@@ -1709,7 +1735,8 @@ void LLLineEditor::draw()
label_color,
LLFontGL::LEFT,
LLFontGL::BOTTOM,
- LLFontGL::NORMAL,
+ mGLFontStyle,
+ LLFontGL::NO_SHADOW,
S32_MAX,
mMaxHPixels - llround(rendered_pixels_right),
&rendered_pixels_right, FALSE);
@@ -1733,7 +1760,8 @@ void LLLineEditor::draw()
label_color,
LLFontGL::LEFT,
LLFontGL::BOTTOM,
- LLFontGL::NORMAL,
+ mGLFontStyle,
+ LLFontGL::NO_SHADOW,
S32_MAX,
mMaxHPixels - llround(rendered_pixels_right),
&rendered_pixels_right, FALSE);
@@ -1849,7 +1877,7 @@ void LLLineEditor::setRect(const LLRect& rect)
}
}
-void LLLineEditor::setPrevalidate(BOOL (*func)(const LLWString &))
+void LLLineEditor::setPrevalidate(LLLinePrevalidateFunc func)
{
mPrevalidateFunc = func;
updateAllowingLanguageInput();
@@ -2169,244 +2197,11 @@ void LLLineEditor::setSelectAllonFocusReceived(BOOL b)
}
-void LLLineEditor::setKeystrokeCallback(void (*keystroke_callback)(LLLineEditor* caller, void* user_data))
-{
- mKeystrokeCallback = keystroke_callback;
-}
-
-// virtual
-LLXMLNodePtr LLLineEditor::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- node->createChild("max_length", TRUE)->setIntValue(mMaxLengthBytes);
-
- node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mGLFont));
-
- if (mBorder)
- {
- std::string bevel;
- switch(mBorder->getBevel())
- {
- default:
- case LLViewBorder::BEVEL_NONE: bevel = "none"; break;
- case LLViewBorder::BEVEL_IN: bevel = "in"; break;
- case LLViewBorder::BEVEL_OUT: bevel = "out"; break;
- case LLViewBorder::BEVEL_BRIGHT:bevel = "bright"; break;
- }
- node->createChild("bevel_style", TRUE)->setStringValue(bevel);
-
- std::string style;
- switch(mBorder->getStyle())
- {
- default:
- case LLViewBorder::STYLE_LINE: style = "line"; break;
- case LLViewBorder::STYLE_TEXTURE: style = "texture"; break;
- }
- node->createChild("border_style", TRUE)->setStringValue(style);
-
- node->createChild("border_thickness", TRUE)->setIntValue(mBorder->getBorderWidth());
- }
-
- if (!mLabel.empty())
- {
- node->createChild("label", TRUE)->setStringValue(mLabel.getString());
- }
-
- node->createChild("select_all_on_focus_received", TRUE)->setBoolValue(mSelectAllonFocusReceived);
-
- node->createChild("handle_edit_keys_directly", TRUE)->setBoolValue(mHandleEditKeysDirectly );
-
- addColorXML(node, mCursorColor, "cursor_color", "TextCursorColor");
- addColorXML(node, mFgColor, "text_color", "TextFgColor");
- addColorXML(node, mReadOnlyFgColor, "text_readonly_color", "TextFgReadOnlyColor");
- addColorXML(node, mTentativeFgColor, "text_tentative_color", "TextFgTentativeColor");
- addColorXML(node, mReadOnlyBgColor, "bg_readonly_color", "TextBgReadOnlyColor");
- addColorXML(node, mWriteableBgColor, "bg_writeable_color", "TextBgWriteableColor");
- addColorXML(node, mFocusBgColor, "bg_focus_color", "TextBgFocusColor");
-
- node->createChild("select_on_focus", TRUE)->setBoolValue(mSelectAllonFocusReceived );
-
- return node;
-}
-
-// static
-LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("line_editor");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- S32 max_text_length = 128;
- node->getAttributeS32("max_length", max_text_length);
-
- LLFontGL* font = LLView::selectFont(node);
-
- std::string text = node->getTextContents().substr(0, max_text_length - 1);
-
- LLViewBorder::EBevel bevel_style = LLViewBorder::BEVEL_IN;
- LLViewBorder::getBevelFromAttribute(node, bevel_style);
-
- LLViewBorder::EStyle border_style = LLViewBorder::STYLE_LINE;
- std::string border_string;
- node->getAttributeString("border_style", border_string);
- LLStringUtil::toLower(border_string);
-
- if (border_string == "texture")
- {
- border_style = LLViewBorder::STYLE_TEXTURE;
- }
-
- S32 border_thickness = 1;
- node->getAttributeS32("border_thickness", border_thickness);
-
- LLUICtrlCallback commit_callback = NULL;
-
- LLLineEditor* line_editor = new LLLineEditor(name,
- rect,
- text,
- font,
- max_text_length,
- commit_callback,
- NULL,
- NULL,
- NULL,
- NULL,
- bevel_style,
- border_style,
- border_thickness);
-
- std::string label;
- if(node->getAttributeString("label", label))
- {
- line_editor->setLabel(label);
- }
- BOOL select_all_on_focus_received = FALSE;
- if (node->getAttributeBOOL("select_all_on_focus_received", select_all_on_focus_received))
- {
- line_editor->setSelectAllonFocusReceived(select_all_on_focus_received);
- }
- BOOL handle_edit_keys_directly = FALSE;
- if (node->getAttributeBOOL("handle_edit_keys_directly", handle_edit_keys_directly))
- {
- line_editor->setHandleEditKeysDirectly(handle_edit_keys_directly);
- }
- BOOL commit_on_focus_lost = TRUE;
- if (node->getAttributeBOOL("commit_on_focus_lost", commit_on_focus_lost))
- {
- line_editor->setCommitOnFocusLost(commit_on_focus_lost);
- }
-
- line_editor->setColorParameters(node);
-
- if(node->hasAttribute("select_on_focus"))
- {
- BOOL selectall = FALSE;
- node->getAttributeBOOL("select_on_focus", selectall);
- line_editor->setSelectAllonFocusReceived(selectall);
- }
-
- std::string prevalidate;
- if(node->getAttributeString("prevalidate", prevalidate))
- {
- LLStringUtil::toLower(prevalidate);
-
- if ("ascii" == prevalidate)
- {
- line_editor->setPrevalidate( LLLineEditor::prevalidateASCII );
- }
- else if ("float" == prevalidate)
- {
- line_editor->setPrevalidate( LLLineEditor::prevalidateFloat );
- }
- else if ("int" == prevalidate)
- {
- line_editor->setPrevalidate( LLLineEditor::prevalidateInt );
- }
- else if ("positive_s32" == prevalidate)
- {
- line_editor->setPrevalidate( LLLineEditor::prevalidatePositiveS32 );
- }
- else if ("non_negative_s32" == prevalidate)
- {
- line_editor->setPrevalidate( LLLineEditor::prevalidateNonNegativeS32 );
- }
- else if ("alpha_num" == prevalidate)
- {
- line_editor->setPrevalidate( LLLineEditor::prevalidateAlphaNum );
- }
- else if ("alpha_num_space" == prevalidate)
- {
- line_editor->setPrevalidate( LLLineEditor::prevalidateAlphaNumSpace );
- }
- else if ("printable_not_pipe" == prevalidate)
- {
- line_editor->setPrevalidate( LLLineEditor::prevalidatePrintableNotPipe );
- }
- else if ("printable_no_space" == prevalidate)
- {
- line_editor->setPrevalidate( LLLineEditor::prevalidatePrintableNoSpace );
- }
- }
-
- line_editor->initFromXML(node, parent);
-
- return line_editor;
-}
-
-//static
-void LLLineEditor::cleanupLineEditor()
-{
- sImage = NULL;
-}
-
-/* static */
-LLPointer<LLUIImage> LLLineEditor::parseImage(std::string name, LLXMLNodePtr from, LLPointer<LLUIImage> def)
+void LLLineEditor::setKeystrokeCallback(callback_t callback, void* user_data)
{
- std::string xml_name;
- if (from->hasAttribute(name.c_str())) from->getAttributeString(name.c_str(), xml_name);
- if (xml_name == LLStringUtil::null) return def;
- LLPointer<LLUIImage> image = LLUI::getUIImage(xml_name);
- return image.isNull() ? def : image;
+ mKeystrokeCallback = boost::bind(callback, _1, user_data);
}
-void LLLineEditor::setColorParameters(LLXMLNodePtr node)
-{
- // overrides default image if supplied.
- mImage = parseImage(std::string("image"), node, mImage);
-
- LLColor4 color;
- if (LLUICtrlFactory::getAttributeColor(node,"cursor_color", color))
- {
- setCursorColor(color);
- }
- if(node->hasAttribute("text_color"))
- {
- LLUICtrlFactory::getAttributeColor(node,"text_color", color);
- setFgColor(color);
- }
- if(node->hasAttribute("text_readonly_color"))
- {
- LLUICtrlFactory::getAttributeColor(node,"text_readonly_color", color);
- setReadOnlyFgColor(color);
- }
- if (LLUICtrlFactory::getAttributeColor(node,"text_tentative_color", color))
- {
- setTentativeFgColor(color);
- }
- if(node->hasAttribute("bg_readonly_color"))
- {
- LLUICtrlFactory::getAttributeColor(node,"bg_readonly_color", color);
- setReadOnlyBgColor(color);
- }
- if(node->hasAttribute("bg_writeable_color"))
- {
- LLUICtrlFactory::getAttributeColor(node,"bg_writeable_color", color);
- setWriteableBgColor(color);
- }
-}
BOOL LLLineEditor::setTextArg( const std::string& key, const LLStringExplicit& text )
{
@@ -2429,13 +2224,19 @@ void LLLineEditor::updateAllowingLanguageInput()
// fine on 1.15.0.2, since all prevalidate func reject any
// non-ASCII characters. I'm not sure on future versions,
// however...
+ LLWindow* window = getWindow();
+ if (!window)
+ {
+ // test app, no window available
+ return;
+ }
if (hasFocus() && !mReadOnly && !mDrawAsterixes && mPrevalidateFunc == NULL)
{
- getWindow()->allowLanguageTextInput(this, TRUE);
+ window->allowLanguageTextInput(this, TRUE);
}
else
{
- getWindow()->allowLanguageTextInput(this, FALSE);
+ window->allowLanguageTextInput(this, FALSE);
}
}
@@ -2513,7 +2314,7 @@ void LLLineEditor::updatePreedit(const LLWString &preedit_string,
mKeystrokeTimer.reset();
if( mKeystrokeCallback )
{
- mKeystrokeCallback( this, mCallbackUserData );
+ mKeystrokeCallback( this );
}
}
@@ -2656,146 +2457,19 @@ LLWString LLLineEditor::getConvertedText() const
return text;
}
-static LLRegisterWidget<LLSearchEditor> r2("search_editor");
-
-
-LLSearchEditor::LLSearchEditor(const std::string& name,
- const LLRect& rect,
- S32 max_length_bytes,
- void (*search_callback)(const std::string& search_string, void* user_data),
- void* userdata)
- :
- LLUICtrl(name, rect, TRUE, NULL, userdata),
- mSearchCallback(search_callback)
-{
- LLRect search_edit_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
- mSearchEdit = new LLLineEditor(std::string("search edit"),
- search_edit_rect,
- LLStringUtil::null,
- NULL,
- max_length_bytes,
- NULL,
- onSearchEdit,
- NULL,
- this);
-
- mSearchEdit->setFollowsAll();
- mSearchEdit->setSelectAllonFocusReceived(TRUE);
-
- addChild(mSearchEdit);
-
- S32 btn_width = rect.getHeight(); // button is square, and as tall as search editor
- LLRect clear_btn_rect(rect.getWidth() - btn_width, rect.getHeight(), rect.getWidth(), 0);
- mClearSearchButton = new LLButton(std::string("clear search"),
- clear_btn_rect,
- std::string("icn_clear_lineeditor.tga"),
- std::string("UIImgBtnCloseInactiveUUID"),
- LLStringUtil::null,
- onClearSearch,
- this,
- NULL,
- LLStringUtil::null);
- mClearSearchButton->setFollowsRight();
- mClearSearchButton->setFollowsTop();
- mClearSearchButton->setImageColor(LLUI::sColorsGroup->getColor("TextFgTentativeColor"));
- mClearSearchButton->setTabStop(FALSE);
- mSearchEdit->addChild(mClearSearchButton);
-
- mSearchEdit->setTextPadding(0, btn_width);
-}
-
-
-//virtual
-void LLSearchEditor::setValue(const LLSD& value )
-{
- mSearchEdit->setValue(value);
-}
-
-//virtual
-LLSD LLSearchEditor::getValue() const
+namespace LLInitParam
{
- return mSearchEdit->getValue();
-}
-
-//virtual
-BOOL LLSearchEditor::setTextArg( const std::string& key, const LLStringExplicit& text )
-{
- return mSearchEdit->setTextArg(key, text);
-}
-
-//virtual
-BOOL LLSearchEditor::setLabelArg( const std::string& key, const LLStringExplicit& text )
-{
- return mSearchEdit->setLabelArg(key, text);
-}
-
-//virtual
-void LLSearchEditor::clear()
-{
- if (mSearchEdit)
+ template<>
+ bool ParamCompare<LLLinePrevalidateFunc>::equals(const LLLinePrevalidateFunc &a, const LLLinePrevalidateFunc &b)
{
- mSearchEdit->clear();
+ return false;
}
-}
-
-void LLSearchEditor::draw()
-{
- mClearSearchButton->setVisible(!mSearchEdit->getWText().empty());
-
- LLUICtrl::draw();
-}
-
-//static
-void LLSearchEditor::onSearchEdit(LLLineEditor* caller, void* user_data )
-{
- LLSearchEditor* search_editor = (LLSearchEditor*)user_data;
- if (search_editor->mSearchCallback)
- {
- search_editor->mSearchCallback(caller->getText(), search_editor->mCallbackUserData);
- }
-}
-
-//static
-void LLSearchEditor::onClearSearch(void* user_data)
-{
- LLSearchEditor* search_editor = (LLSearchEditor*)user_data;
-
- search_editor->setText(LLStringUtil::null);
- if (search_editor->mSearchCallback)
- {
- search_editor->mSearchCallback(LLStringUtil::null, search_editor->mCallbackUserData);
- }
-}
-
-// static
-LLView* LLSearchEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("search_editor");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- S32 max_text_length = 128;
- node->getAttributeS32("max_length", max_text_length);
-
- std::string text = node->getValue().substr(0, max_text_length - 1);
-
- LLSearchEditor* search_editor = new LLSearchEditor(name,
- rect,
- max_text_length,
- NULL, NULL);
-
- std::string label;
- if(node->getAttributeString("label", label))
+ template<>
+ bool ParamCompare<boost::function<void (LLLineEditor *)> >::equals(
+ const boost::function<void (LLLineEditor *)> &a,
+ const boost::function<void (LLLineEditor *)> &b)
{
- search_editor->mSearchEdit->setLabel(label);
+ return false;
}
-
- search_editor->setText(text);
-
- search_editor->initFromXML(node, parent);
-
- return search_editor;
}
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index fc5fcc5b90..4c2a9b77b2 100644
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -51,39 +51,71 @@
#include "llviewborder.h"
#include "llpreeditor.h"
+#include <boost/function.hpp>
class LLFontGL;
class LLLineEditorRollback;
class LLButton;
-typedef BOOL (*LLLinePrevalidateFunc)(const LLWString &wstr);
-
+typedef boost::function<BOOL (const LLWString &wstr)> LLLinePrevalidateFunc;
class LLLineEditor
: public LLUICtrl, public LLEditMenuHandler, protected LLPreeditor
{
-
public:
- LLLineEditor(const std::string& name,
- const LLRect& rect,
- const std::string& default_text = LLStringUtil::null,
- const LLFontGL* glfont = NULL,
- S32 max_length_bytes = 254,
- void (*commit_callback)(LLUICtrl* caller, void* user_data) = NULL,
- void (*keystroke_callback)(LLLineEditor* caller, void* user_data) = NULL,
- void (*focus_lost_callback)(LLFocusableElement* caller, void* user_data) = NULL,
- void* userdata = NULL,
- LLLinePrevalidateFunc prevalidate_func = NULL,
- LLViewBorder::EBevel border_bevel = LLViewBorder::BEVEL_IN,
- LLViewBorder::EStyle border_style = LLViewBorder::STYLE_LINE,
- S32 border_thickness = 1);
- virtual ~LLLineEditor();
+ struct PrevalidateNamedFuncs
+ : public LLInitParam::TypeValuesHelper<LLLinePrevalidateFunc, PrevalidateNamedFuncs>
+
+ {
+ static void declareValues();
+ };
+
+ typedef boost::function<void (LLLineEditor* caller)> keystroke_callback_t;
+
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<std::string> default_text;
+ Optional<S32> max_length_bytes;
+
+ Optional<keystroke_callback_t> keystroke_callback;
+
+ Optional<LLLinePrevalidateFunc, PrevalidateNamedFuncs> prevalidate_callback;
+
+ Optional<LLViewBorder::Params> border;
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- void setColorParameters(LLXMLNodePtr node);
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
- static void cleanupLineEditor();
+ Optional<LLUIImage*> background_image;
+
+ Optional<bool> select_on_focus,
+ handle_edit_keys_directly,
+ commit_on_focus_lost,
+ ignore_tab;
+
+ // colors
+ Optional<LLUIColor> cursor_color,
+ text_color,
+ text_readonly_color,
+ text_tentative_color,
+ bg_readonly_color,
+ bg_writeable_color,
+ bg_focus_color;
+
+ Optional<S32> text_pad_left,
+ text_pad_right;
+
+ Deprecated is_unicode,
+ drop_shadow_visible,
+ border_drop_shadow_visible,
+ bg_visible;
+
+ Params();
+ };
+protected:
+ LLLineEditor(const Params&);
+ friend class LLUICtrlFactory;
+ friend class LLFloaterEditUI;
+public:
+ virtual ~LLLineEditor();
// mousehandler overrides
/*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
@@ -144,7 +176,7 @@ public:
void setText(const LLStringExplicit &new_text);
const std::string& getText() const { return mText.getString(); }
- const LLWString& getWText() const { return mText.getWString(); }
+ LLWString getWText() const { return mText.getWString(); }
LLWString getConvertedText() const; // trimmed text with paragraphs converted to newlines
S32 getLength() const { return mText.length(); }
@@ -160,7 +192,7 @@ public:
void setRevertOnEsc( BOOL b ) { mRevertOnEsc = b; }
void setCursorColor(const LLColor4& c) { mCursorColor = c; }
- const LLColor4& getCursorColor() const { return mCursorColor; }
+ const LLColor4& getCursorColor() const { return mCursorColor.get(); }
void setFgColor( const LLColor4& c ) { mFgColor = c; }
void setReadOnlyFgColor( const LLColor4& c ) { mReadOnlyFgColor = c; }
@@ -169,12 +201,12 @@ public:
void setReadOnlyBgColor( const LLColor4& c ) { mReadOnlyBgColor = c; }
void setFocusBgColor(const LLColor4& c) { mFocusBgColor = c; }
- const LLColor4& getFgColor() const { return mFgColor; }
- const LLColor4& getReadOnlyFgColor() const { return mReadOnlyFgColor; }
- const LLColor4& getTentativeFgColor() const { return mTentativeFgColor; }
- const LLColor4& getWriteableBgColor() const { return mWriteableBgColor; }
- const LLColor4& getReadOnlyBgColor() const { return mReadOnlyBgColor; }
- const LLColor4& getFocusBgColor() const { return mFocusBgColor; }
+ const LLColor4& getFgColor() const { return mFgColor.get(); }
+ const LLColor4& getReadOnlyFgColor() const { return mReadOnlyFgColor.get(); }
+ const LLColor4& getTentativeFgColor() const { return mTentativeFgColor.get(); }
+ const LLColor4& getWriteableBgColor() const { return mWriteableBgColor.get(); }
+ const LLColor4& getReadOnlyBgColor() const { return mReadOnlyBgColor.get(); }
+ const LLColor4& getFocusBgColor() const { return mFocusBgColor.get(); }
void setIgnoreArrowKeys(BOOL b) { mIgnoreArrowKeys = b; }
void setIgnoreTab(BOOL b) { mIgnoreTab = b; }
@@ -193,14 +225,14 @@ public:
void setHandleEditKeysDirectly( BOOL b ) { mHandleEditKeysDirectly = b; }
void setSelectAllonFocusReceived(BOOL b);
-
- void setKeystrokeCallback(void (*keystroke_callback)(LLLineEditor* caller, void* user_data));
+
+ typedef boost::function<void (LLLineEditor* caller, void* user_data)> callback_t;
+ void setKeystrokeCallback(callback_t callback, void* user_data);
void setMaxTextLength(S32 max_text_length);
- void setTextPadding(S32 left, S32 right); // Used to specify room for children before or after text.
// Prevalidation controls which keystrokes can affect the editor
- void setPrevalidate( BOOL (*func)(const LLWString &) );
+ void setPrevalidate( LLLinePrevalidateFunc func );
static BOOL prevalidateFloat(const LLWString &str );
static BOOL prevalidateInt(const LLWString &str );
static BOOL prevalidatePositiveS32(const LLWString &str);
@@ -233,6 +265,7 @@ private:
BOOL handleSelectionKey(KEY key, MASK mask);
BOOL handleControlKey(KEY key, MASK mask);
S32 handleCommitKey(KEY key, MASK mask);
+ void updateTextPadding();
//
// private data members
@@ -261,6 +294,7 @@ protected:
LLViewBorder* mBorder;
const LLFontGL* mGLFont;
+ U8 mGLFontStyle;
S32 mMaxLengthBytes; // Max length of the UTF8 string in bytes
S32 mCursorPos; // I-beam is just after the mCursorPos-th character.
S32 mScrollHPos; // Horizontal offset from the start of mText. Used for scrolling.
@@ -273,7 +307,7 @@ protected:
BOOL mCommitOnFocusLost;
BOOL mRevertOnEsc;
- void (*mKeystrokeCallback)( LLLineEditor* caller, void* userdata );
+ keystroke_callback_t mKeystrokeCallback;
BOOL mIsSelecting; // Selection for clipboard operations
S32 mSelectionStart;
@@ -283,18 +317,17 @@ protected:
S32 mLastSelectionStart;
S32 mLastSelectionEnd;
- S32 (*mPrevalidateFunc)(const LLWString &str);
+ LLLinePrevalidateFunc mPrevalidateFunc;
LLFrameTimer mKeystrokeTimer;
- LLColor4 mCursorColor;
-
- LLColor4 mFgColor;
- LLColor4 mReadOnlyFgColor;
- LLColor4 mTentativeFgColor;
- LLColor4 mWriteableBgColor;
- LLColor4 mReadOnlyBgColor;
- LLColor4 mFocusBgColor;
+ LLUIColor mCursorColor;
+ LLUIColor mFgColor;
+ LLUIColor mReadOnlyFgColor;
+ LLUIColor mTentativeFgColor;
+ LLUIColor mWriteableBgColor;
+ LLUIColor mReadOnlyBgColor;
+ LLUIColor mFocusBgColor;
S32 mBorderThickness;
@@ -314,11 +347,6 @@ protected:
LLPreeditor::standouts_t mPreeditStandouts;
private:
- // Utility on top of LLUI::getUIImage, looks up a named image in a given XML node and returns it if possible
- // or returns a given default image if anything in the process fails.
- static LLPointer<LLUIImage> parseImage(std::string name, LLXMLNodePtr from, LLPointer<LLUIImage> def);
- // Global instance used as default for member instance below.
- static LLPointer<LLUIImage> sImage;
// Instances that by default point to the statics but can be overidden in XML.
LLPointer<LLUIImage> mImage;
@@ -363,45 +391,22 @@ private:
}; // end class LLLineEditor
+#ifdef LL_WINDOWS
+#ifndef INSTANTIATE_GETCHILD_LINEEDITOR
+#pragma warning (disable : 4231)
+extern template LLLineEditor* LLView::getChild<LLLineEditor>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
+#endif
+#endif
-
-/*
- * @brief A line editor with a button to clear it and a callback to call on every edit event.
- */
-class LLSearchEditor : public LLUICtrl
+namespace LLInitParam
{
-public:
- LLSearchEditor(const std::string& name,
- const LLRect& rect,
- S32 max_length_bytes,
- void (*search_callback)(const std::string& search_string, void* user_data),
- void* userdata);
-
- virtual ~LLSearchEditor() {}
-
- /*virtual*/ void draw();
-
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-
- void setText(const LLStringExplicit &new_text) { mSearchEdit->setText(new_text); }
-
- void setSearchCallback(void (*search_callback)(const std::string& search_string, void* user_data), void* data) { mSearchCallback = search_callback; mCallbackUserData = data; }
-
- // LLUICtrl interface
- virtual void setValue(const LLSD& value );
- virtual LLSD getValue() const;
- virtual BOOL setTextArg( const std::string& key, const LLStringExplicit& text );
- virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text );
- virtual void clear();
-
-private:
- static void onSearchEdit(LLLineEditor* caller, void* user_data );
- static void onClearSearch(void* user_data);
-
- LLLineEditor* mSearchEdit;
- class LLButton* mClearSearchButton;
- void (*mSearchCallback)(const std::string& search_string, void* user_data);
-
-};
+ template<>
+ bool ParamCompare<LLLinePrevalidateFunc>::equals(
+ const LLLinePrevalidateFunc &a, const LLLinePrevalidateFunc &b);
+
+ template<>
+ bool ParamCompare<boost::function<void (LLLineEditor *)> >::equals(
+ const boost::function<void (LLLineEditor *)> &a, const boost::function<void (LLLineEditor *)> &b);
+}
#endif // LL_LINEEDITOR_
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 5fb0e57c06..a3588d9dae 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -59,8 +59,6 @@
#include "llresmgr.h"
#include "llui.h"
-#include "lluitrans.h"
-
#include "llstl.h"
#include "v2math.h"
@@ -78,7 +76,6 @@ S32 MENU_BAR_WIDTH = 0;
///============================================================================
const std::string SEPARATOR_NAME("separator");
-const std::string TEAROFF_SEPARATOR_LABEL( "~~~~~~~~~~~" );
const std::string SEPARATOR_LABEL( "-----------" );
const std::string VERTICAL_SEPARATOR_LABEL( "|" );
@@ -110,12 +107,6 @@ const F32 MAX_MOUSE_SLOPE_SUB_MENU = 0.9f;
const S32 PIE_GESTURE_ACTIVATE_DISTANCE = 10;
-LLColor4 LLMenuItemGL::sEnabledColor( 0.0f, 0.0f, 0.0f, 1.0f );
-LLColor4 LLMenuItemGL::sDisabledColor( 0.5f, 0.5f, 0.5f, 1.0f );
-LLColor4 LLMenuItemGL::sHighlightBackground( 0.0f, 0.0f, 0.7f, 1.0f );
-LLColor4 LLMenuItemGL::sHighlightForeground( 1.0f, 1.0f, 1.0f, 1.0f );
-
-LLColor4 LLMenuGL::sDefaultBackgroundColor( 0.25f, 0.25f, 0.25f, 0.75f );
BOOL LLMenuGL::sKeyboardMode = FALSE;
LLHandle<LLView> LLMenuHolderGL::sItemLastSelectedHandle;
@@ -131,69 +122,59 @@ const F32 ACTIVATE_HIGHLIGHT_TIME = 0.3f;
///============================================================================
/// Class LLMenuItemGL
///============================================================================
-
// Default constructor
-LLMenuItemGL::LLMenuItemGL( const std::string& name, const std::string& label, KEY key, MASK mask ) :
- LLView( name, TRUE ),
- mJumpKey(KEY_NONE),
- mAcceleratorKey( key ),
- mAcceleratorMask( mask ),
+LLMenuItemGL::LLMenuItemGL(const LLMenuItemGL::Params& p)
+: LLUICtrl(p),
+ mJumpKey(p.jump_key),
mAllowKeyRepeat(FALSE),
mHighlight( FALSE ),
mGotHover( FALSE ),
mBriefItem( FALSE ),
- mFont( LLFontGL::getFontSansSerif() ),
- mStyle(LLFontGL::NORMAL),
- mDrawTextDisabled( FALSE )
-{
- setLabel( label );
-}
-
-// virtual
-LLXMLNodePtr LLMenuItemGL::getXML(bool save_children) const
+ mDrawTextDisabled( FALSE ),
+ mFont(p.font),
+ mAcceleratorKey(KEY_NONE),
+ mAcceleratorMask(MASK_NONE),
+ mLabel(p.label.isProvided() ? p.label() : p.name()),
+ mEnabledColor(p.enabled_color()),
+ mDisabledColor(p.disabled_color()),
+ mHighlightBackground(p.highlight_bg_color()),
+ mHighlightForeground(p.highlight_fg_color())
{
- LLXMLNodePtr node = LLView::getXML();
-
- node->createChild("type", TRUE)->setStringValue(getType());
-
- node->createChild("label", TRUE)->setStringValue(mLabel);
-
- if (mAcceleratorKey != KEY_NONE)
+#ifdef LL_DARWIN
+ // See if this Mac accelerator should really use the ctrl key and not get mapped to cmd
+ BOOL useMacCtrl = p.use_mac_ctrl;
+#endif // LL_DARWIN
+
+ std::string shortcut = p.shortcut;
+ if (shortcut.find("control") != shortcut.npos)
{
- std::stringstream out;
- if (mAcceleratorMask & MASK_CONTROL)
- {
- out << "control|";
- }
- if (mAcceleratorMask & MASK_ALT)
- {
- out << "alt|";
- }
- if (mAcceleratorMask & MASK_SHIFT)
- {
- out << "shift|";
- }
- out << LLKeyboard::stringFromKey(mAcceleratorKey);
-
- node->createChild("shortcut", TRUE)->setStringValue(out.str());
-
#ifdef LL_DARWIN
- // Write in special tag if this key is really a ctrl combination on the Mac
- if (mAcceleratorMask & MASK_MAC_CONTROL)
+ if ( useMacCtrl )
{
- node->createChild("useMacCtrl", TRUE)->setBoolValue( TRUE );
+ mAcceleratorMask |= MASK_MAC_CONTROL;
}
#endif // LL_DARWIN
+ mAcceleratorMask |= MASK_CONTROL;
+ }
+ if (shortcut.find("alt") != shortcut.npos)
+ {
+ mAcceleratorMask |= MASK_ALT;
}
+ if (shortcut.find("shift") != shortcut.npos)
+ {
+ mAcceleratorMask |= MASK_SHIFT;
+ }
+ S32 pipe_pos = shortcut.rfind("|");
+ std::string key_str = shortcut.substr(pipe_pos+1);
- return node;
+ LLKeyboard::keyFromString(key_str, &mAcceleratorKey);
}
BOOL LLMenuItemGL::handleAcceleratorKey(KEY key, MASK mask)
{
if( getEnabled() && (!gKeyboard->getKeyRepeated(key) || mAllowKeyRepeat) && (key == mAcceleratorKey) && (mask == (mAcceleratorMask & MASK_NORMALKEYS)) )
{
- doIt();
+ onCommit();
return TRUE;
}
return FALSE;
@@ -269,24 +250,24 @@ void LLMenuItemGL::appendAcceleratorString( std::string& st ) const
{
if ( mAcceleratorMask & MASK_MAC_CONTROL )
{
- st.append( LLUITrans::getString("accel-mac-control") );
+ st.append( "Ctrl-" );
}
else
{
- st.append( LLUITrans::getString("accel-mac-command") ); // Symbol would be "\xE2\x8C\x98"
+ st.append( "Cmd-" ); // Symbol would be "\xE2\x8C\x98"
}
}
if( mAcceleratorMask & MASK_ALT )
- st.append( LLUITrans::getString("accel-mac-option") ); // Symbol would be "\xE2\x8C\xA5"
+ st.append( "Opt-" ); // Symbol would be "\xE2\x8C\xA5"
if( mAcceleratorMask & MASK_SHIFT )
- st.append( LLUITrans::getString("accel-mac-shift") ); // Symbol would be "\xE2\x8C\xA7"
+ st.append( "Shift-" ); // Symbol would be "\xE2\x8C\xA7"
#else
if( mAcceleratorMask & MASK_CONTROL )
- st.append( LLUITrans::getString("accel-win-control") );
+ st.append( "Ctrl-" );
if( mAcceleratorMask & MASK_ALT )
- st.append( LLUITrans::getString("accel-win-alt") );
+ st.append( "Alt-" );
if( mAcceleratorMask & MASK_SHIFT )
- st.append( LLUITrans::getString("accel-win-shift") );
+ st.append( "Shift-" );
#endif
std::string keystr = LLKeyboard::stringFromKey( mAcceleratorKey );
@@ -354,7 +335,7 @@ void LLMenuItemGL::buildDrawLabel( void )
mDrawAccelLabel = st;
}
-void LLMenuItemGL::doIt( void )
+void LLMenuItemGL::onCommit( void )
{
// close all open menus by default
// if parent menu is actually visible (and we are not triggering menu item via accelerator)
@@ -363,6 +344,8 @@ void LLMenuItemGL::doIt( void )
{
LLMenuGL::sMenuContainer->hideMenus();
}
+
+ LLUICtrl::onCommit();
}
// set the hover status (called by it's menu)
@@ -402,7 +385,7 @@ BOOL LLMenuItemGL::handleKeyHere( KEY key, MASK mask )
// switch to keyboard navigation mode
LLMenuGL::setKeyboardMode(TRUE);
- doIt();
+ onCommit();
return TRUE;
}
}
@@ -415,7 +398,7 @@ BOOL LLMenuItemGL::handleMouseUp( S32 x, S32 y, MASK )
// switch to mouse navigation mode
LLMenuGL::setKeyboardMode(FALSE);
- doIt();
+ onCommit();
make_ui_sound("UISndClickRelease");
return TRUE;
}
@@ -439,55 +422,58 @@ void LLMenuItemGL::draw( void )
// let disabled items be highlighted, just don't draw them as such
if( getEnabled() && getHighlight() && !mBriefItem)
{
- gGL.color4fv( sHighlightBackground.mV );
+ int debug_count = 0;
+ if (dynamic_cast<LLMenuItemCallGL*>(this))
+ debug_count++;
+ gGL.color4fv( mHighlightBackground.get().mV );
gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0 );
}
LLColor4 color;
- U8 font_style = mStyle;
+ LLFontGL::ShadowType shadow_style = LLFontGL::NO_SHADOW;
if (getEnabled() && !mDrawTextDisabled )
{
- font_style |= LLFontGL::DROP_SHADOW_SOFT;
+ shadow_style = LLFontGL::DROP_SHADOW_SOFT;
}
if ( getEnabled() && getHighlight() )
{
- color = sHighlightForeground;
+ color = mHighlightForeground.get();
}
else if( getEnabled() && !mDrawTextDisabled )
{
- color = sEnabledColor;
+ color = mEnabledColor.get();
}
else
{
- color = sDisabledColor;
+ color = mDisabledColor.get();
}
// Draw the text on top.
if (mBriefItem)
{
mFont->render( mLabel, 0, BRIEF_PAD_PIXELS / 2, 0, color,
- LLFontGL::LEFT, LLFontGL::BOTTOM, font_style );
+ LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, shadow_style );
}
else
{
if( !mDrawBoolLabel.empty() )
{
mFont->render( mDrawBoolLabel.getWString(), 0, (F32)LEFT_PAD_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f) + 1.f, color,
- LLFontGL::LEFT, LLFontGL::BOTTOM, font_style, S32_MAX, S32_MAX, NULL, FALSE );
+ LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, shadow_style, S32_MAX, S32_MAX, NULL, FALSE );
}
mFont->render( mLabel.getWString(), 0, (F32)LEFT_PLAIN_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f) + 1.f, color,
- LLFontGL::LEFT, LLFontGL::BOTTOM, font_style, S32_MAX, S32_MAX, NULL, FALSE );
+ LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, shadow_style, S32_MAX, S32_MAX, NULL, FALSE );
if( !mDrawAccelLabel.empty() )
{
mFont->render( mDrawAccelLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PLAIN_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f) + 1.f, color,
- LLFontGL::RIGHT, LLFontGL::BOTTOM, font_style, S32_MAX, S32_MAX, NULL, FALSE );
+ LLFontGL::RIGHT, LLFontGL::BOTTOM, LLFontGL::NORMAL, shadow_style, S32_MAX, S32_MAX, NULL, FALSE );
}
if( !mDrawBranchLabel.empty() )
{
mFont->render( mDrawBranchLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PAD_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f) + 1.f, color,
- LLFontGL::RIGHT, LLFontGL::BOTTOM, font_style, S32_MAX, S32_MAX, NULL, FALSE );
+ LLFontGL::RIGHT, LLFontGL::BOTTOM, LLFontGL::NORMAL, shadow_style, S32_MAX, S32_MAX, NULL, FALSE );
}
}
@@ -515,38 +501,41 @@ BOOL LLMenuItemGL::setLabelArg( const std::string& key, const LLStringExplicit&
return TRUE;
}
+void LLMenuItemGL::onVisibilityChange(BOOL new_visibility)
+{
+ if (getMenu())
+ {
+ getMenu()->needsArrange();
+ }
+}
+
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLMenuItemSeparatorGL
//
// This class represents a separator.
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+static LLRegisterWidget<LLMenuItemSeparatorGL> register_separator("menu_item_separator");
-class LLMenuItemSeparatorGL : public LLMenuItemGL
+LLMenuItemSeparatorGL::Params::Params()
{
-public:
- LLMenuItemSeparatorGL( const std::string &name = SEPARATOR_NAME );
-
- virtual std::string getType() const { return "separator"; }
-
- // doIt() - do the primary funcationality of the menu item.
- virtual void doIt( void ) {}
-
- virtual void draw( void );
- virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
- virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
- virtual BOOL handleHover(S32 x, S32 y, MASK mask);
+ name = "separator";
+ label = SEPARATOR_LABEL;
+}
- virtual U32 getNominalHeight( void ) const { return SEPARATOR_HEIGHT_PIXELS; }
-};
+LLMenuItemSeparatorGL::LLMenuItemSeparatorGL(const LLMenuItemSeparatorGL::Params& p) :
+ LLMenuItemGL( p )
+{
+}
-LLMenuItemSeparatorGL::LLMenuItemSeparatorGL( const std::string &name ) :
- LLMenuItemGL( name, SEPARATOR_LABEL )
+//virtual
+U32 LLMenuItemSeparatorGL::getNominalHeight( void ) const
{
+ return SEPARATOR_HEIGHT_PIXELS;
}
void LLMenuItemSeparatorGL::draw( void )
{
- gGL.color4fv( getDisabledColor().mV );
+ gGL.color4fv( mDisabledColor.get().mV );
const S32 y = getRect().getHeight() / 2;
const S32 PAD = 6;
gl_line_2d( PAD, y, getRect().getWidth() - PAD, y );
@@ -557,11 +546,13 @@ BOOL LLMenuItemSeparatorGL::handleMouseDown(S32 x, S32 y, MASK mask)
LLMenuGL* parent_menu = getMenu();
if (y > getRect().getHeight() / 2)
{
- return parent_menu->handleMouseDown(x + getRect().mLeft, getRect().mTop + 1, mask);
+ LLView* prev_menu_item = parent_menu->findPrevSibling(this);
+ return prev_menu_item ? prev_menu_item->handleMouseDown(x, prev_menu_item->getRect().getHeight(), mask) : FALSE;
}
else
{
- return parent_menu->handleMouseDown(x + getRect().mLeft, getRect().mBottom - 1, mask);
+ LLView* next_menu_item = parent_menu->findNextSibling(this);
+ return next_menu_item ? next_menu_item->handleMouseDown(x, 0, mask) : FALSE;
}
}
@@ -570,11 +561,13 @@ BOOL LLMenuItemSeparatorGL::handleMouseUp(S32 x, S32 y, MASK mask)
LLMenuGL* parent_menu = getMenu();
if (y > getRect().getHeight() / 2)
{
- return parent_menu->handleMouseUp(x + getRect().mLeft, getRect().mTop + 1, mask);
+ LLView* prev_menu_item = parent_menu->findPrevSibling(this);
+ return prev_menu_item ? prev_menu_item->handleMouseUp(x, prev_menu_item->getRect().getHeight(), mask) : FALSE;
}
else
{
- return parent_menu->handleMouseUp(x + getRect().mLeft, getRect().mBottom - 1, mask);
+ LLView* next_menu_item = parent_menu->findNextSibling(this);
+ return next_menu_item ? next_menu_item->handleMouseUp(x, 0, mask) : FALSE;
}
}
@@ -593,7 +586,6 @@ BOOL LLMenuItemSeparatorGL::handleHover(S32 x, S32 y, MASK mask)
}
}
-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLMenuItemVerticalSeparatorGL
//
@@ -617,19 +609,19 @@ LLMenuItemVerticalSeparatorGL::LLMenuItemVerticalSeparatorGL( void )
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLMenuItemTearOffGL
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-LLMenuItemTearOffGL::LLMenuItemTearOffGL(LLHandle<LLFloater> parent_floater_handle) :
- LLMenuItemGL(std::string("tear off"), TEAROFF_SEPARATOR_LABEL),
- mParentHandle(parent_floater_handle)
+LLMenuItemTearOffGL::LLMenuItemTearOffGL(const LLMenuItemTearOffGL::Params& p)
+: LLMenuItemGL(p),
+ mParentHandle(p.parent_floater_handle)
{
}
-void LLMenuItemTearOffGL::doIt()
+void LLMenuItemTearOffGL::onCommit()
{
if (getMenu()->getTornOff())
{
LLTearOffMenu* torn_off_menu = (LLTearOffMenu*)(getMenu()->getParent());
- torn_off_menu->close();
+ torn_off_menu->closeFloater();
}
else
{
@@ -639,7 +631,7 @@ void LLMenuItemTearOffGL::doIt()
getMenu()->highlightNextItem(this);
}
- getMenu()->arrange();
+ getMenu()->needsArrange();
LLFloater* parent_floater = mParentHandle.get();
LLFloater* tear_off_menu = LLTearOffMenu::create(getMenu());
@@ -656,7 +648,7 @@ void LLMenuItemTearOffGL::doIt()
tear_off_menu->setFocus(TRUE);
}
}
- LLMenuItemGL::doIt();
+ LLMenuItemGL::onCommit();
}
void LLMenuItemTearOffGL::draw()
@@ -664,17 +656,17 @@ void LLMenuItemTearOffGL::draw()
// disabled items can be highlighted, but shouldn't render as such
if( getEnabled() && getHighlight() && !isBriefItem())
{
- gGL.color4fv( getHighlightBGColor().mV );
+ gGL.color4fv( mHighlightBackground.get().mV );
gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0 );
}
if (getEnabled())
{
- gGL.color4fv( getEnabledColor().mV );
+ gGL.color4fv( mEnabledColor.get().mV );
}
else
{
- gGL.color4fv( getDisabledColor().mV );
+ gGL.color4fv( mDisabledColor.get().mV );
}
const S32 y = getRect().getHeight() / 3;
const S32 PAD = 6;
@@ -697,11 +689,16 @@ U32 LLMenuItemTearOffGL::getNominalHeight( void ) const
class LLMenuItemBlankGL : public LLMenuItemGL
{
public:
- LLMenuItemBlankGL( void ) : LLMenuItemGL( LLStringUtil::null, LLStringUtil::null )
+ struct Params : public LLInitParam::Block<Params, LLMenuItemGL::Params>
{
- setEnabled(FALSE);
- }
- virtual void doIt( void ) {}
+ Params()
+ {
+ name="";
+ enabled = false;
+ }
+ };
+ LLMenuItemBlankGL( const Params& p ) : LLMenuItemGL( p )
+ {}
virtual void draw( void ) {}
};
@@ -709,239 +706,117 @@ public:
///============================================================================
/// Class LLMenuItemCallGL
///============================================================================
+static LLRegisterWidget<LLMenuItemCallGL> register_menu_item_call_gl("menu_item_call");
-LLMenuItemCallGL::LLMenuItemCallGL( const std::string& name,
- const std::string& label,
- menu_callback clicked_cb,
- enabled_callback enabled_cb,
- void* user_data,
- KEY key, MASK mask,
- BOOL enabled,
- on_disabled_callback on_disabled_cb) :
- LLMenuItemGL( name, label, key, mask ),
- mCallback( clicked_cb ),
- mEnabledCallback( enabled_cb ),
- mLabelCallback(NULL),
- mUserData( user_data ),
- mOnDisabledCallback(on_disabled_cb)
-{
- if(!enabled) setEnabled(FALSE);
-}
-
-LLMenuItemCallGL::LLMenuItemCallGL( const std::string& name,
- menu_callback clicked_cb,
- enabled_callback enabled_cb,
- void* user_data,
- KEY key, MASK mask,
- BOOL enabled,
- on_disabled_callback on_disabled_cb) :
- LLMenuItemGL( name, name, key, mask ),
- mCallback( clicked_cb ),
- mEnabledCallback( enabled_cb ),
- mLabelCallback(NULL),
- mUserData( user_data ),
- mOnDisabledCallback(on_disabled_cb)
-{
- if(!enabled) setEnabled(FALSE);
-}
-
-LLMenuItemCallGL::LLMenuItemCallGL(const std::string& name,
- const std::string& label,
- menu_callback clicked_cb,
- enabled_callback enabled_cb,
- label_callback label_cb,
- void* user_data,
- KEY key, MASK mask,
- BOOL enabled,
- on_disabled_callback on_disabled_cb) :
- LLMenuItemGL(name, label, key, mask),
- mCallback(clicked_cb),
- mEnabledCallback(enabled_cb),
- mLabelCallback(label_cb),
- mUserData(user_data),
- mOnDisabledCallback(on_disabled_cb)
-{
- if(!enabled) setEnabled(FALSE);
-}
-
-LLMenuItemCallGL::LLMenuItemCallGL(const std::string& name,
- menu_callback clicked_cb,
- enabled_callback enabled_cb,
- label_callback label_cb,
- void* user_data,
- KEY key, MASK mask,
- BOOL enabled,
- on_disabled_callback on_disabled_cb) :
- LLMenuItemGL(name, name, key, mask),
- mCallback(clicked_cb),
- mEnabledCallback(enabled_cb),
- mLabelCallback(label_cb),
- mUserData(user_data),
- mOnDisabledCallback(on_disabled_cb)
-{
- if(!enabled) setEnabled(FALSE);
-}
-
-void LLMenuItemCallGL::setEnabledControl(std::string enabled_control, LLView *context)
-{
- // Register new listener
- if (!enabled_control.empty())
- {
- LLControlVariable *control = context->findControl(enabled_control);
- if (!control)
- {
- context->addBoolControl(enabled_control, getEnabled());
- control = context->findControl(enabled_control);
- llassert_always(control);
- }
- control->getSignal()->connect(boost::bind(&LLView::controlListener, _1, getHandle(), std::string("enabled")));
- setEnabled(control->getValue());
- }
-}
-
-void LLMenuItemCallGL::setVisibleControl(std::string visible_control, LLView *context)
+LLMenuItemCallGL::LLMenuItemCallGL(const LLMenuItemCallGL::Params& p)
+: LLMenuItemGL(p)
{
- // Register new listener
- if (!visible_control.empty())
- {
- LLControlVariable *control = context->findControl(visible_control);
- if (!control)
- {
- context->addBoolControl(visible_control, getVisible());
- control = context->findControl(visible_control);
- llassert_always(control);
- }
- control->getSignal()->connect(boost::bind(&LLView::controlListener, _1, getHandle(), std::string("visible")));
- setVisible(control->getValue());
- }
}
-// virtual
-LLXMLNodePtr LLMenuItemCallGL::getXML(bool save_children) const
+void LLMenuItemCallGL::initFromParams(const Params& p)
{
- LLXMLNodePtr node = LLMenuItemGL::getXML();
-
- // Contents
-
- std::vector<LLListenerEntry> listeners = mDispatcher->getListeners();
- std::vector<LLListenerEntry>::iterator itor;
- for (itor = listeners.begin(); itor != listeners.end(); ++itor)
+ if (p.on_enable.isProvided())
{
- std::string listener_name = findEventListener((LLSimpleListener*)itor->listener);
- if (!listener_name.empty())
+ initEnableCallback(p.on_enable, mEnableSignal);
+ // Set the enabled control variable (for backwards compatability)
+ if (p.on_enable.control_name.isProvided() && !p.on_enable.control_name().empty())
{
- LLXMLNodePtr child_node = node->createChild("on_click", FALSE);
- child_node->createChild("function", TRUE)->setStringValue(listener_name);
- child_node->createChild("filter", TRUE)->setStringValue(itor->filter.asString());
- child_node->createChild("userdata", TRUE)->setStringValue(itor->userdata.asString());
+ LLControlVariable* control = findControl(p.on_enable.control_name());
+ if (control)
+ setEnabledControlVariable(control);
}
}
-
- return node;
+ if (p.on_click.isProvided())
+ initCommitCallback(p.on_click, mCommitSignal);
+
+ LLUICtrl::initFromParams(p);
}
-// doIt() - Call the callback provided
-void LLMenuItemCallGL::doIt( void )
+void LLMenuItemCallGL::onCommit( void )
{
// RN: menu item can be deleted in callback, so beware
getMenu()->setItemLastSelected( this );
+
+ LLMenuItemGL::onCommit();
+}
- if( mCallback )
+void LLMenuItemCallGL::updateEnabled( void )
+{
+ if (mEnableSignal.num_slots() > 0)
{
- mCallback( mUserData );
+ bool enabled = mEnableSignal(this, LLSD());
+ if (mEnabledControlVariable)
+ {
+ if (!enabled)
+ mEnabledControlVariable->set(false); // callback overrides control variable; this will call setEnabled()
+ }
+ else
+ {
+ setEnabled(enabled);
+ }
}
- LLPointer<LLEvent> fired_event = new LLEvent(this);
- fireEvent(fired_event, "on_click");
- LLMenuItemGL::doIt();
}
void LLMenuItemCallGL::buildDrawLabel( void )
{
- LLPointer<LLEvent> fired_event = new LLEvent(this);
- fireEvent(fired_event, "on_build");
- if( mEnabledCallback )
- {
- setEnabled( mEnabledCallback( mUserData ) );
- }
- if(mLabelCallback)
- {
- std::string label;
- mLabelCallback(label, mUserData);
- mLabel = label;
- }
+ updateEnabled();
LLMenuItemGL::buildDrawLabel();
}
+BOOL LLMenuItemCallGL::handleKeyHere( KEY key, MASK mask )
+{
+ return LLMenuItemGL::handleKeyHere(key, mask);
+}
+
BOOL LLMenuItemCallGL::handleAcceleratorKey( KEY key, MASK mask )
{
- if( (!gKeyboard->getKeyRepeated(key) || getAllowKeyRepeat()) && (key == mAcceleratorKey) && (mask == (mAcceleratorMask & MASK_NORMALKEYS)) )
+ if( (!gKeyboard->getKeyRepeated(key) || getAllowKeyRepeat()) && (key == mAcceleratorKey) && (mask == (mAcceleratorMask & MASK_NORMALKEYS)) )
{
- LLPointer<LLEvent> fired_event = new LLEvent(this);
- fireEvent(fired_event, "on_build");
- if( mEnabledCallback )
+ updateEnabled();
+ if (getEnabled())
{
- setEnabled( mEnabledCallback( mUserData ) );
- }
- if( !getEnabled() )
- {
- if( mOnDisabledCallback )
- {
- mOnDisabledCallback( mUserData );
- }
+ onCommit();
+ return TRUE;
}
}
- return LLMenuItemGL::handleAcceleratorKey(key, mask);
+ return FALSE;
}
///============================================================================
/// Class LLMenuItemCheckGL
///============================================================================
+static LLRegisterWidget<LLMenuItemCheckGL> register_menu_item_check_gl("menu_item_check");
-LLMenuItemCheckGL::LLMenuItemCheckGL ( const std::string& name,
- const std::string& label,
- menu_callback clicked_cb,
- enabled_callback enabled_cb,
- check_callback check_cb,
- void* user_data,
- KEY key, MASK mask ) :
- LLMenuItemCallGL( name, label, clicked_cb, enabled_cb, user_data, key, mask ),
- mCheckCallback( check_cb ),
- mChecked(FALSE)
+LLMenuItemCheckGL::LLMenuItemCheckGL (const LLMenuItemCheckGL::Params& p)
+: LLMenuItemCallGL(p)
{
}
-LLMenuItemCheckGL::LLMenuItemCheckGL ( const std::string& name,
- menu_callback clicked_cb,
- enabled_callback enabled_cb,
- check_callback check_cb,
- void* user_data,
- KEY key, MASK mask ) :
- LLMenuItemCallGL( name, name, clicked_cb, enabled_cb, user_data, key, mask ),
- mCheckCallback( check_cb ),
- mChecked(FALSE)
+void LLMenuItemCheckGL::initFromParams(const Params& p)
{
+ if (p.on_check.isProvided())
+ {
+ initEnableCallback(p.on_check, mCheckSignal);
+ // Set the control name (for backwards compatability)
+ if (p.on_check.control_name.isProvided() && !p.on_check.control_name().empty())
+ {
+ setControlName(p.on_check.control_name());
+ }
+ }
+
+ LLMenuItemCallGL::initFromParams(p);
}
-LLMenuItemCheckGL::LLMenuItemCheckGL ( const std::string& name,
- const std::string& label,
- menu_callback clicked_cb,
- enabled_callback enabled_cb,
- std::string control_name,
- LLView *context,
- void* user_data,
- KEY key, MASK mask ) :
- LLMenuItemCallGL( name, label, clicked_cb, enabled_cb, user_data, key, mask ),
- mCheckCallback( NULL ),
- mChecked(FALSE)
+void LLMenuItemCheckGL::onCommit( void )
{
- setControlName(control_name, context);
+ LLMenuItemCallGL::onCommit();
}
//virtual
void LLMenuItemCheckGL::setValue(const LLSD& value)
{
- mChecked = value.asBoolean();
- if(mChecked)
+ LLUICtrl::setValue(value);
+ if(value.asBoolean())
{
mDrawBoolLabel = BOOLEAN_TRUE_PREFIX;
}
@@ -951,68 +826,21 @@ void LLMenuItemCheckGL::setValue(const LLSD& value)
}
}
-void LLMenuItemCheckGL::setCheckedControl(std::string checked_control, LLView *context)
-{
- // Register new listener
- if (!checked_control.empty())
- {
- LLControlVariable *control = context->findControl(checked_control);
- if (!control)
- {
- context->addBoolControl(checked_control, mChecked);
- control = context->findControl(checked_control);
- llassert_always(control);
- }
- control->getSignal()->connect(boost::bind(&LLView::controlListener, _1, getHandle(), std::string("value")));
- mChecked = control->getValue();
- }
-}
-
-// virtual
-LLXMLNodePtr LLMenuItemCheckGL::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLMenuItemCallGL::getXML();
- return node;
-}
-
// called to rebuild the draw label
void LLMenuItemCheckGL::buildDrawLabel( void )
{
- if(mChecked || (mCheckCallback && mCheckCallback( getUserData() ) ) )
+ // Note: mCheckSignal() returns true if no callbacks are set
+ bool checked = mCheckSignal(this, LLSD());
+ if (mControlVariable)
{
- mDrawBoolLabel = BOOLEAN_TRUE_PREFIX;
+ if (!checked)
+ setControlValue(false); // callback overrides control variable; this will call setValue()
}
else
{
- mDrawBoolLabel.clear();
+ setValue(checked);
}
- LLMenuItemCallGL::buildDrawLabel();
-}
-
-
-///============================================================================
-/// Class LLMenuItemToggleGL
-///============================================================================
-
-LLMenuItemToggleGL::LLMenuItemToggleGL( const std::string& name, const std::string& label, BOOL* toggle,
- KEY key, MASK mask ) :
- LLMenuItemGL( name, label, key, mask ),
- mToggle( toggle )
-{
-}
-
-LLMenuItemToggleGL::LLMenuItemToggleGL( const std::string& name, BOOL* toggle,
- KEY key, MASK mask ) :
- LLMenuItemGL( name, name, key, mask ),
- mToggle( toggle )
-{
-}
-
-
-// called to rebuild the draw label
-void LLMenuItemToggleGL::buildDrawLabel( void )
-{
- if( *mToggle )
+ if(getValue().asBoolean())
{
mDrawBoolLabel = BOOLEAN_TRUE_PREFIX;
}
@@ -1020,64 +848,48 @@ void LLMenuItemToggleGL::buildDrawLabel( void )
{
mDrawBoolLabel.clear();
}
- mDrawAccelLabel.clear();
- std::string st = mDrawAccelLabel;
- appendAcceleratorString( st );
- mDrawAccelLabel = st;
-}
-
-// doIt() - do the primary funcationality of the menu item.
-void LLMenuItemToggleGL::doIt( void )
-{
- getMenu()->setItemLastSelected( this );
- //llinfos << "LLMenuItemToggleGL::doIt " << mLabel.c_str() << llendl;
- *mToggle = !(*mToggle);
- buildDrawLabel();
- LLMenuItemGL::doIt();
+ LLMenuItemCallGL::buildDrawLabel();
}
-
-LLMenuItemBranchGL::LLMenuItemBranchGL( const std::string& name, const std::string& label, LLHandle<LLView> branch,
- KEY key, MASK mask ) :
- LLMenuItemGL( name, label, key, mask ),
- mBranch( branch )
+///============================================================================
+/// Class LLMenuItemBranchGL
+///============================================================================
+LLMenuItemBranchGL::LLMenuItemBranchGL(const LLMenuItemBranchGL::Params& p)
+ : LLMenuItemGL(p)
{
- if(!dynamic_cast<LLMenuGL*>(branch.get()))
+ LLMenuGL* branch = p.branch;
+ if (branch)
{
- llerrs << "Non-menu handle passed as branch reference." << llendl;
- }
-
- if(getBranch())
- {
- getBranch()->setVisible( FALSE );
- getBranch()->setParentMenuItem(this);
+ mBranchHandle = branch->getHandle();
+ branch->setVisible(FALSE);
+ branch->setParentMenuItem(this);
}
}
LLMenuItemBranchGL::~LLMenuItemBranchGL()
{
- LLView::deleteViewByHandle(mBranch);
+ LLView::deleteViewByHandle(mBranchHandle);
}
// virtual
LLView* LLMenuItemBranchGL::getChildView(const std::string& name, BOOL recurse, BOOL create_if_missing) const
{
+ LLMenuGL* branch = getBranch();
+ if (!branch)
+ return LLView::getChildView(name, recurse, create_if_missing);
+
// richard: this is redundant with parent, remove
- if (getBranch())
+ if (branch->getName() == name)
{
- if(getBranch()->getName() == name)
- {
- return getBranch();
- }
-
- // Always recurse on branches
- LLView* child = getBranch()->getChildView(name, recurse, FALSE);
- if(child)
- {
- return child;
- }
+ return branch;
+ }
+ // Always recurse on branches
+ LLView* child = branch->getChildView(name, recurse, FALSE);
+ if (!child)
+ {
+ child = LLView::getChildView(name, recurse, create_if_missing);
}
- return LLView::getChildView(name, recurse, create_if_missing);;
+ return child;
}
// virtual
@@ -1086,49 +898,35 @@ BOOL LLMenuItemBranchGL::handleMouseUp(S32 x, S32 y, MASK mask)
// switch to mouse navigation mode
LLMenuGL::setKeyboardMode(FALSE);
- doIt();
+ onCommit();
make_ui_sound("UISndClickRelease");
return TRUE;
}
BOOL LLMenuItemBranchGL::handleAcceleratorKey(KEY key, MASK mask)
{
- if(getBranch())
- {
- return getBranch()->handleAcceleratorKey(key, mask);
- }
- return FALSE;
-}
-
-// virtual
-LLXMLNodePtr LLMenuItemBranchGL::getXML(bool save_children) const
-{
- if (getBranch())
- {
- return getBranch()->getXML();
- }
-
- return LLMenuItemGL::getXML();
+ return getBranch() && getBranch()->handleAcceleratorKey(key, mask);
}
-
// This function checks to see if the accelerator key is already in use;
// if not, it will be added to the list
BOOL LLMenuItemBranchGL::addToAcceleratorList(std::list<LLKeyBinding*> *listp)
{
- if(getBranch())
- {
- U32 item_count = getBranch()->getItemCount();
- LLMenuItemGL *item;
+ LLMenuGL* branch = getBranch();
+ if (!branch)
+ return FALSE;
- while (item_count--)
+ U32 item_count = branch->getItemCount();
+ LLMenuItemGL *item;
+
+ while (item_count--)
+ {
+ if ((item = branch->getItem(item_count)))
{
- if ((item = getBranch()->getItem(item_count)))
- {
- return item->addToAcceleratorList(listp);
- }
+ return item->addToAcceleratorList(listp);
}
}
+
return FALSE;
}
@@ -1143,23 +941,24 @@ void LLMenuItemBranchGL::buildDrawLabel( void )
mDrawBranchLabel = BRANCH_SUFFIX;
}
-// doIt() - do the primary functionality of the menu item.
-void LLMenuItemBranchGL::doIt( void )
+void LLMenuItemBranchGL::onCommit( void )
{
openMenu();
// keyboard navigation automatically propagates highlight to sub-menu
// to facilitate fast menu control via jump keys
- if (getBranch() && LLMenuGL::getKeyboardMode() && !getBranch()->getHighlightedItem())
+ if (LLMenuGL::getKeyboardMode() && getBranch()&& !getBranch()->getHighlightedItem())
{
getBranch()->highlightNextItem(NULL);
}
+
+ LLUICtrl::onCommit();
}
BOOL LLMenuItemBranchGL::handleKey(KEY key, MASK mask, BOOL called_from_parent)
{
BOOL handled = FALSE;
- if (called_from_parent && getBranch())
+ if (getBranch() && called_from_parent)
{
handled = getBranch()->handleKey(key, mask, called_from_parent);
}
@@ -1175,7 +974,7 @@ BOOL LLMenuItemBranchGL::handleKey(KEY key, MASK mask, BOOL called_from_parent)
BOOL LLMenuItemBranchGL::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
{
BOOL handled = FALSE;
- if (called_from_parent && getBranch())
+ if (getBranch() && called_from_parent)
{
handled = getBranch()->handleUnicodeChar(uni_char, TRUE);
}
@@ -1191,21 +990,21 @@ BOOL LLMenuItemBranchGL::handleUnicodeChar(llwchar uni_char, BOOL called_from_pa
void LLMenuItemBranchGL::setHighlight( BOOL highlight )
{
- if (highlight == getHighlight()) return;
+ if (highlight == getHighlight())
+ return;
- if(!getBranch())
- {
+ LLMenuGL* branch = getBranch();
+ if (!branch)
return;
- }
- BOOL auto_open = getEnabled() && (!getBranch()->getVisible() || getBranch()->getTornOff());
+ BOOL auto_open = getEnabled() && (!branch->getVisible() || branch->getTornOff());
// torn off menus don't open sub menus on hover unless they have focus
if (getMenu()->getTornOff() && !((LLFloater*)getMenu()->getParent())->hasFocus())
{
auto_open = FALSE;
}
// don't auto open torn off sub-menus (need to explicitly active menu item to give them focus)
- if (getBranch()->getTornOff())
+ if (branch->getTornOff())
{
auto_open = FALSE;
}
@@ -1219,14 +1018,14 @@ void LLMenuItemBranchGL::setHighlight( BOOL highlight )
}
else
{
- if (getBranch()->getTornOff())
+ if (branch->getTornOff())
{
- ((LLFloater*)getBranch()->getParent())->setFocus(FALSE);
- getBranch()->clearHoverItem();
+ ((LLFloater*)branch->getParent())->setFocus(FALSE);
+ branch->clearHoverItem();
}
else
{
- getBranch()->setVisible( FALSE );
+ branch->setVisible( FALSE );
}
}
}
@@ -1260,15 +1059,19 @@ void LLMenuItemBranchGL::onVisibilityChange( BOOL new_visibility )
BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask )
{
- if (getMenu()->getVisible() && getBranch() && getBranch()->getVisible() && key == KEY_LEFT)
+ LLMenuGL* branch = getBranch();
+ if (!branch)
+ return LLMenuItemGL::handleKeyHere(key, mask);
+
+ if (getMenu()->getVisible() && branch->getVisible() && key == KEY_LEFT)
{
// switch to keyboard navigation mode
LLMenuGL::setKeyboardMode(TRUE);
- BOOL handled = getBranch()->clearHoverItem();
- if (getBranch()->getTornOff())
+ BOOL handled = branch->clearHoverItem();
+ if (branch->getTornOff())
{
- ((LLFloater*)getBranch()->getParent())->setFocus(FALSE);
+ ((LLFloater*)branch->getParent())->setFocus(FALSE);
}
if (handled && getMenu()->getTornOff())
{
@@ -1279,12 +1082,12 @@ BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask )
if (getHighlight() &&
getMenu()->isOpen() &&
- key == KEY_RIGHT && getBranch() && !getBranch()->getHighlightedItem())
+ key == KEY_RIGHT && !branch->getHighlightedItem())
{
// switch to keyboard navigation mode
LLMenuGL::setKeyboardMode(TRUE);
- LLMenuItemGL* itemp = getBranch()->highlightNextItem(NULL);
+ LLMenuItemGL* itemp = branch->highlightNextItem(NULL);
if (itemp)
{
return TRUE;
@@ -1296,39 +1099,41 @@ BOOL LLMenuItemBranchGL::handleKeyHere( KEY key, MASK mask )
void LLMenuItemBranchGL::openMenu()
{
- if(!getBranch()) return;
+ LLMenuGL* branch = getBranch();
+ if (!branch)
+ return;
- if (getBranch()->getTornOff())
+ if (branch->getTornOff())
{
- gFloaterView->bringToFront((LLFloater*)getBranch()->getParent());
+ gFloaterView->bringToFront((LLFloater*)branch->getParent());
// this might not be necessary, as torn off branches don't get focus and hence no highligth
- getBranch()->highlightNextItem(NULL);
+ branch->highlightNextItem(NULL);
}
- else if( !getBranch()->getVisible() )
+ else if( !branch->getVisible() )
{
// get valid rectangle for menus
const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getMenuRect();
- getBranch()->arrange();
+ branch->arrange();
- LLRect rect = getBranch()->getRect();
+ LLRect rect = branch->getRect();
// calculate root-view relative position for branch menu
S32 left = getRect().mRight;
S32 top = getRect().mTop - getRect().mBottom;
- localPointToOtherView(left, top, &left, &top, getBranch()->getParent());
+ localPointToOtherView(left, top, &left, &top, branch->getParent());
rect.setLeftTopAndSize( left, top,
rect.getWidth(), rect.getHeight() );
- if (getBranch()->getCanTearOff())
+ if (branch->getCanTearOff())
{
rect.translate(0, TEAROFF_SEPARATOR_HEIGHT_PIXELS);
}
- getBranch()->setRect( rect );
+ branch->setRect( rect );
S32 x = 0;
S32 y = 0;
- getBranch()->localPointToOtherView( 0, 0, &x, &y, getBranch()->getParent() );
+ branch->localPointToOtherView( 0, 0, &x, &y, branch->getParent() );
S32 delta_x = 0;
S32 delta_y = 0;
if( y < menu_region_rect.mBottom )
@@ -1342,9 +1147,9 @@ void LLMenuItemBranchGL::openMenu()
// move sub-menu over to left side
delta_x = llmax(-x, (-1 * (rect.getWidth() + getRect().getWidth())));
}
- getBranch()->translate( delta_x, delta_y );
- getBranch()->setVisible( TRUE );
- getBranch()->getParent()->sendChildToFront(getBranch());
+ branch->translate( delta_x, delta_y );
+ branch->setVisible( TRUE );
+ branch->getParent()->sendChildToFront(branch);
}
}
@@ -1361,10 +1166,7 @@ class LLMenuItemBranchDownGL : public LLMenuItemBranchGL
protected:
public:
- LLMenuItemBranchDownGL( const std::string& name, const std::string& label, LLHandle<LLView> branch,
- KEY key = KEY_NONE, MASK mask = MASK_NONE );
-
- virtual std::string getType() const { return "menu"; }
+ LLMenuItemBranchDownGL( const Params& );
// returns the normal width of this control in pixels - this is
// used for calculating the widest item, as well as for horizontal
@@ -1392,11 +1194,8 @@ public:
virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
};
-LLMenuItemBranchDownGL::LLMenuItemBranchDownGL( const std::string& name,
- const std::string& label,
- LLHandle<LLView> branch,
- KEY key, MASK mask ) :
- LLMenuItemBranchGL( name, label, branch, key, mask )
+LLMenuItemBranchDownGL::LLMenuItemBranchDownGL( const Params& p) :
+ LLMenuItemBranchGL(p)
{
}
@@ -1501,7 +1300,7 @@ BOOL LLMenuItemBranchDownGL::handleMouseDown( S32 x, S32 y, MASK mask )
{
// switch to mouse control mode
LLMenuGL::setKeyboardMode(FALSE);
- doIt();
+ onCommit();
make_ui_sound("UISndClick");
return TRUE;
}
@@ -1540,7 +1339,7 @@ BOOL LLMenuItemBranchDownGL::handleKeyHere(KEY key, MASK mask)
// open new menu only if previous menu was open
if (itemp && itemp->getEnabled() && menu_open)
{
- itemp->doIt();
+ itemp->onCommit();
}
return TRUE;
@@ -1554,7 +1353,7 @@ BOOL LLMenuItemBranchDownGL::handleKeyHere(KEY key, MASK mask)
// open new menu only if previous menu was open
if (itemp && itemp->getEnabled() && menu_open)
{
- itemp->doIt();
+ itemp->onCommit();
}
return TRUE;
@@ -1566,7 +1365,7 @@ BOOL LLMenuItemBranchDownGL::handleKeyHere(KEY key, MASK mask)
if (!isActive())
{
- doIt();
+ onCommit();
}
getBranch()->highlightNextItem(NULL);
return TRUE;
@@ -1578,7 +1377,7 @@ BOOL LLMenuItemBranchDownGL::handleKeyHere(KEY key, MASK mask)
if (!isActive())
{
- doIt();
+ onCommit();
}
getBranch()->highlightPrevItem(NULL);
return TRUE;
@@ -1598,31 +1397,31 @@ void LLMenuItemBranchDownGL::draw( void )
if( getHighlight() )
{
- gGL.color4fv( getHighlightBGColor().mV );
+ gGL.color4fv( mHighlightBackground.get().mV );
gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0 );
}
- U8 font_style = getFontStyle();
+ LLFontGL::ShadowType shadow_style = LLFontGL::NO_SHADOW;
if (getEnabled() && !getDrawTextDisabled() )
{
- font_style |= LLFontGL::DROP_SHADOW_SOFT;
+ shadow_style = LLFontGL::DROP_SHADOW_SOFT;
}
LLColor4 color;
if (getHighlight())
{
- color = getHighlightFGColor();
+ color = mHighlightForeground.get();
}
else if( getEnabled() )
{
- color = getEnabledColor();
+ color = mEnabledColor.get();
}
else
{
- color = getDisabledColor();
+ color = mDisabledColor.get();
}
getFont()->render( mLabel.getWString(), 0, (F32)getRect().getWidth() / 2.f, (F32)LABEL_BOTTOM_PAD_PIXELS, color,
- LLFontGL::HCENTER, LLFontGL::BOTTOM, font_style );
+ LLFontGL::HCENTER, LLFontGL::BOTTOM, LLFontGL::NORMAL, shadow_style );
// underline navigation key only when keyboard navigation has been initiated
@@ -1651,16 +1450,14 @@ void LLMenuItemBranchDownGL::draw( void )
static LLRegisterWidget<LLMenuGL> r1("menu");
-// Default constructor
-LLMenuGL::LLMenuGL( const std::string& name, const std::string& label, LLHandle<LLFloater> parent_floater_handle )
-: LLUICtrl( name, LLRect(), FALSE, NULL, NULL ),
- mBackgroundColor( sDefaultBackgroundColor ),
- mBgVisible( TRUE ),
- mParentMenuItem( NULL ),
- mLabel( label ),
- mDropShadowed( TRUE ),
- mHorizontalLayout( FALSE ),
- mKeepFixedSize( FALSE ),
+LLMenuGL::LLMenuGL(const LLMenuGL::Params& p)
+: LLUICtrl(p),
+ mBackgroundColor( p.bg_color() ),
+ mBgVisible( p.bg_visible ),
+ mDropShadowed( p.drop_shadow ),
+ mHorizontalLayout( p.horizontal_layout ),
+ mKeepFixedSize( p.keep_fixed_size ),
+ mLabel (p.label),
mLastMouseX(0),
mLastMouseY(0),
mMouseVelX(0),
@@ -1669,37 +1466,36 @@ LLMenuGL::LLMenuGL( const std::string& name, const std::string& label, LLHandle<
mTearOffItem(NULL),
mSpilloverBranch(NULL),
mSpilloverMenu(NULL),
- mParentFloaterHandle(parent_floater_handle),
- mJumpKey(KEY_NONE)
+ mJumpKey(p.jump_key),
+ mCreateJumpKeys(p.create_jump_keys),
+ mParentFloaterHandle(p.parent_floater),
+ mNeedsArrange(FALSE)
{
+ typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+ boost::char_separator<char> sep("_");
+ tokenizer tokens(p.label(), sep);
+ tokenizer::iterator token_iter;
+
+ S32 token_count = 0;
+ std::string new_menu_label;
+ for( token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
+ {
+ new_menu_label += (*token_iter);
+ if (token_count > 0)
+ {
+ setJumpKey((*token_iter).c_str()[0]);
+ }
+ ++token_count;
+ }
+ setLabel(new_menu_label);
+
mFadeTimer.stop();
- setCanTearOff(TRUE, parent_floater_handle);
- setTabStop(FALSE);
-}
-
-LLMenuGL::LLMenuGL( const std::string& label, LLHandle<LLFloater> parent_floater_handle )
-: LLUICtrl( label, LLRect(), FALSE, NULL, NULL ),
- mBackgroundColor( sDefaultBackgroundColor ),
- mBgVisible( TRUE ),
- mParentMenuItem( NULL ),
- mLabel( label ),
- mDropShadowed( TRUE ),
- mHorizontalLayout( FALSE ),
- mKeepFixedSize( FALSE ),
- mLastMouseX(0),
- mLastMouseY(0),
- mMouseVelX(0),
- mMouseVelY(0),
- mTornOff(FALSE),
- mTearOffItem(NULL),
- mSpilloverBranch(NULL),
- mSpilloverMenu(NULL),
- mParentFloaterHandle(parent_floater_handle),
- mJumpKey(KEY_NONE)
+}
+
+void LLMenuGL::initFromParams(const LLMenuGL::Params& p)
{
- mFadeTimer.stop();
- setCanTearOff(TRUE, parent_floater_handle);
- setTabStop(FALSE);
+ LLUICtrl::initFromParams(p);
+ setCanTearOff(p.can_tear_off, p.parent_floater);
}
// Destroys the object
@@ -1715,10 +1511,10 @@ void LLMenuGL::setCanTearOff(BOOL tear_off, LLHandle<LLFloater> parent_floater_h
{
if (tear_off && mTearOffItem == NULL)
{
- mTearOffItem = new LLMenuItemTearOffGL(parent_floater_handle);
- mItems.insert(mItems.begin(), mTearOffItem);
- addChildAtEnd(mTearOffItem);
- arrange();
+ LLMenuItemTearOffGL::Params p;
+ p.parent_floater_handle = parent_floater_handle;
+ mTearOffItem = LLUICtrlFactory::create<LLMenuItemTearOffGL>(p);
+ addChildInBack(mTearOffItem);
}
else if (!tear_off && mTearOffItem != NULL)
{
@@ -1726,337 +1522,68 @@ void LLMenuGL::setCanTearOff(BOOL tear_off, LLHandle<LLFloater> parent_floater_h
removeChild(mTearOffItem);
delete mTearOffItem;
mTearOffItem = NULL;
- arrange();
+ needsArrange();
}
}
-// virtual
-LLXMLNodePtr LLMenuGL::getXML(bool save_children) const
+bool LLMenuGL::addChild(LLView* view, S32 tab_group)
{
- LLXMLNodePtr node = LLView::getXML();
-
- // Attributes
-
- node->createChild("opaque", TRUE)->setBoolValue(mBgVisible);
-
- node->createChild("drop_shadow", TRUE)->setBoolValue(mDropShadowed);
-
- node->createChild("tear_off", TRUE)->setBoolValue((mTearOffItem != NULL));
-
- if (mBgVisible)
+ if (LLMenuGL* menup = dynamic_cast<LLMenuGL*>(view))
{
- // TomY TODO: this should save out the color control name
- node->createChild("color", TRUE)->setFloatValue(4, mBackgroundColor.mV);
+ appendMenu(menup);
+ return true;
}
-
- // Contents
- item_list_t::const_iterator item_iter;
- for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
+ else if (LLMenuItemGL* itemp = dynamic_cast<LLMenuItemGL*>(view))
{
- LLView* child = (*item_iter);
- LLMenuItemGL* item = (LLMenuItemGL*)child;
-
- LLXMLNodePtr child_node = item->getXML();
-
- node->addChild(child_node);
+ append(itemp);
+ return true;
}
-
- return node;
+ return false;
}
-void LLMenuGL::parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory *factory)
+void LLMenuGL::removeChild( LLView* ctrl)
{
- if (child->hasName(LL_MENU_GL_TAG))
+ LLMenuItemGL* itemp = dynamic_cast<LLMenuItemGL*>(ctrl);
+ if (itemp)
{
- // SUBMENU
- LLMenuGL *submenu = (LLMenuGL*)LLMenuGL::fromXML(child, parent, factory);
- appendMenu(submenu);
- if (LLMenuGL::sMenuContainer != NULL)
- {
- submenu->updateParent(LLMenuGL::sMenuContainer);
- }
- else
+ item_list_t::iterator found_it = std::find(mItems.begin(), mItems.end(), (itemp));
+ if (found_it != mItems.end())
{
- submenu->updateParent(parent);
+ mItems.erase(found_it);
}
}
- else if (child->hasName(LL_MENU_ITEM_CALL_GL_TAG) ||
- child->hasName(LL_MENU_ITEM_CHECK_GL_TAG) ||
- child->hasName(LL_MENU_ITEM_SEPARATOR_GL_TAG))
- {
- LLMenuItemGL *item = NULL;
+ return LLUICtrl::removeChild(ctrl);
+}
- std::string type;
- std::string item_name;
- std::string source_label;
- std::string item_label;
- KEY jump_key = KEY_NONE;
+BOOL LLMenuGL::postBuild()
+{
+ createJumpKeys();
+ return LLUICtrl::postBuild();
+}
- child->getAttributeString("type", type);
- child->getAttributeString("name", item_name);
- child->getAttributeString("label", source_label);
- // parse jump key out of label
- typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
- boost::char_separator<char> sep("_");
- tokenizer tokens(source_label, sep);
- tokenizer::iterator token_iter;
- S32 token_count = 0;
- for( token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
- {
- item_label += (*token_iter);
- if (token_count > 0)
- {
- jump_key = (*token_iter).c_str()[0];
- }
- ++token_count;
- }
+// are we the childmost active menu and hence our jump keys should be enabled?
+// or are we a free-standing torn-off menu (which uses jump keys too)
+BOOL LLMenuGL::jumpKeysActive()
+{
+ LLMenuItemGL* highlighted_item = getHighlightedItem();
+ BOOL active = getVisible() && getEnabled();
+ if (getTornOff())
+ {
+ // activation of jump keys on torn off menus controlled by keyboard focus
+ active = active && ((LLFloater*)getParent())->hasFocus();
-
- if (child->hasName(LL_MENU_ITEM_SEPARATOR_GL_TAG))
- {
- appendSeparator(item_name);
- }
- else
- {
- // ITEM
- if (child->hasName(LL_MENU_ITEM_CALL_GL_TAG) ||
- child->hasName(LL_MENU_ITEM_CHECK_GL_TAG))
- {
- MASK mask = 0;
-
-#ifdef LL_DARWIN
- // See if this Mac accelerator should really use the ctrl key and not get mapped to cmd
- BOOL useMacCtrl = FALSE;
- child->getAttributeBOOL("useMacCtrl", useMacCtrl);
-#endif // LL_DARWIN
-
- std::string shortcut;
- child->getAttributeString("shortcut", shortcut);
- if (shortcut.find("control") != shortcut.npos)
- {
-#ifdef LL_DARWIN
- if ( useMacCtrl )
- {
- mask |= MASK_MAC_CONTROL;
- }
-#endif // LL_DARWIN
- mask |= MASK_CONTROL;
- }
- if (shortcut.find("alt") != shortcut.npos)
- {
- mask |= MASK_ALT;
- }
- if (shortcut.find("shift") != shortcut.npos)
- {
- mask |= MASK_SHIFT;
- }
- S32 pipe_pos = shortcut.rfind("|");
- std::string key_str = shortcut.substr(pipe_pos+1);
-
- KEY key = KEY_NONE;
- LLKeyboard::keyFromString(key_str, &key);
-
- LLMenuItemCallGL *new_item;
- LLXMLNodePtr call_child;
-
- if (child->hasName(LL_MENU_ITEM_CHECK_GL_TAG))
- {
- std::string control_name;
- child->getAttributeString("control_name", control_name);
-
- new_item = new LLMenuItemCheckGL(item_name, item_label, 0, 0, control_name, parent, 0, key, mask);
-
- for (call_child = child->getFirstChild(); call_child.notNull(); call_child = call_child->getNextSibling())
- {
- if (call_child->hasName("on_check"))
- {
- std::string callback_name;
- std::string control_name;
- if (call_child->hasAttribute("function"))
- {
- call_child->getAttributeString("function", callback_name);
-
- control_name = callback_name;
-
- std::string callback_data = item_name;
- if (call_child->hasAttribute("userdata"))
- {
- call_child->getAttributeString("userdata", callback_data);
- if (!callback_data.empty())
- {
- control_name = llformat("%s(%s)", callback_name.c_str(), callback_data.c_str());
- }
- }
-
- LLSD userdata;
- userdata["control"] = control_name;
- userdata["data"] = callback_data;
-
- LLSimpleListener* callback = parent->getListenerByName(callback_name);
-
- if (!callback) continue;
-
- new_item->addListener(callback, "on_build", userdata);
- }
- else if (call_child->hasAttribute("control"))
- {
- call_child->getAttributeString("control", control_name);
- }
- else
- {
- continue;
- }
- LLControlVariable *control = parent->findControl(control_name);
- if (!control)
- {
- parent->addBoolControl(control_name, FALSE);
- }
- ((LLMenuItemCheckGL*)new_item)->setCheckedControl(control_name, parent);
- }
- }
- }
- else
- {
- new_item = new LLMenuItemCallGL(item_name, item_label, 0, 0, 0, 0, key, mask);
- }
-
- for (call_child = child->getFirstChild(); call_child.notNull(); call_child = call_child->getNextSibling())
- {
- if (call_child->hasName("on_click"))
- {
- std::string callback_name;
- call_child->getAttributeString("function", callback_name);
-
- std::string callback_data = item_name;
- if (call_child->hasAttribute("userdata"))
- {
- call_child->getAttributeString("userdata", callback_data);
- }
-
- LLSimpleListener* callback = parent->getListenerByName(callback_name);
-
- if (!callback) continue;
-
- new_item->addListener(callback, "on_click", callback_data);
- }
- if (call_child->hasName("on_enable"))
- {
- std::string callback_name;
- std::string control_name;
- if (call_child->hasAttribute("function"))
- {
- call_child->getAttributeString("function", callback_name);
-
- control_name = callback_name;
-
- std::string callback_data;
- if (call_child->hasAttribute("userdata"))
- {
- call_child->getAttributeString("userdata", callback_data);
- if (!callback_data.empty())
- {
- control_name = llformat("%s(%s)", callback_name.c_str(), callback_data.c_str());
- }
- }
-
- LLSD userdata;
- userdata["control"] = control_name;
- userdata["data"] = callback_data;
-
- LLSimpleListener* callback = parent->getListenerByName(callback_name);
-
- if (!callback) continue;
-
- new_item->addListener(callback, "on_build", userdata);
- }
- else if (call_child->hasAttribute("control"))
- {
- call_child->getAttributeString("control", control_name);
- }
- else
- {
- continue;
- }
- new_item->setEnabledControl(control_name, parent);
- }
- if (call_child->hasName("on_visible"))
- {
- std::string callback_name;
- std::string control_name;
- if (call_child->hasAttribute("function"))
- {
- call_child->getAttributeString("function", callback_name);
-
- control_name = callback_name;
-
- std::string callback_data;
- if (call_child->hasAttribute("userdata"))
- {
- call_child->getAttributeString("userdata", callback_data);
- if (!callback_data.empty())
- {
- control_name = llformat("%s(%s)", callback_name.c_str(), callback_data.c_str());
- }
- }
-
- LLSD userdata;
- userdata["control"] = control_name;
- userdata["data"] = callback_data;
-
- LLSimpleListener* callback = parent->getListenerByName(callback_name);
-
- if (!callback) continue;
-
- new_item->addListener(callback, "on_build", userdata);
- }
- else if (call_child->hasAttribute("control"))
- {
- call_child->getAttributeString("control", control_name);
- }
- else
- {
- continue;
- }
- new_item->setVisibleControl(control_name, parent);
- }
- }
- item = new_item;
- item->setLabel(item_label);
- if (jump_key != KEY_NONE)
- item->setJumpKey(jump_key);
- }
-
- if (item != NULL)
- {
- append(item);
- }
- }
- }
-}
-
-// are we the childmost active menu and hence our jump keys should be enabled?
-// or are we a free-standing torn-off menu (which uses jump keys too)
-BOOL LLMenuGL::jumpKeysActive()
-{
- LLMenuItemGL* highlighted_item = getHighlightedItem();
- BOOL active = getVisible() && getEnabled();
- if (getTornOff())
- {
- // activation of jump keys on torn off menus controlled by keyboard focus
- active = active && ((LLFloater*)getParent())->hasFocus();
-
- }
- else
- {
- // Are we the terminal active menu?
- // Yes, if parent menu item deems us to be active (just being visible is sufficient for top-level menus)
- // and we don't have a highlighted menu item pointing to an active sub-menu
- active = active && (!getParentMenuItem() || getParentMenuItem()->isActive()) // I have a parent that is active...
- && (!highlighted_item || !highlighted_item->isActive()); //... but no child that is active
- }
- return active;
-}
+ }
+ else
+ {
+ // Are we the terminal active menu?
+ // Yes, if parent menu item deems us to be active (just being visible is sufficient for top-level menus)
+ // and we don't have a highlighted menu item pointing to an active sub-menu
+ active = active && (!getParentMenuItem() || getParentMenuItem()->isActive()) // I have a parent that is active...
+ && (!highlighted_item || !highlighted_item->isActive()); //... but no child that is active
+ }
+ return active;
+}
BOOL LLMenuGL::isOpen()
{
@@ -2079,75 +1606,6 @@ BOOL LLMenuGL::isOpen()
return getVisible();
}
}
-// static
-LLView* LLMenuGL::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("menu");
- node->getAttributeString("name", name);
-
- std::string label = name;
- node->getAttributeString("label", label);
-
- // parse jump key out of label
- std::string new_menu_label;
-
- typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
- boost::char_separator<char> sep("_");
- tokenizer tokens(label, sep);
- tokenizer::iterator token_iter;
-
- KEY jump_key = KEY_NONE;
- S32 token_count = 0;
- for( token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
- {
- new_menu_label += (*token_iter);
- if (token_count > 0)
- {
- jump_key = (*token_iter).c_str()[0];
- }
- ++token_count;
- }
-
- BOOL opaque = FALSE;
- node->getAttributeBOOL("opaque", opaque);
-
- LLMenuGL *menu = new LLMenuGL(name, new_menu_label);
-
- menu->setJumpKey(jump_key);
-
- BOOL tear_off = FALSE;
- node->getAttributeBOOL("tear_off", tear_off);
- menu->setCanTearOff(tear_off);
-
- if (node->hasAttribute("drop_shadow"))
- {
- BOOL drop_shadow = FALSE;
- node->getAttributeBOOL("drop_shadow", drop_shadow);
- menu->setDropShadowed(drop_shadow);
- }
-
- menu->setBackgroundVisible(opaque);
- LLColor4 color(0,0,0,1);
- if (opaque && LLUICtrlFactory::getAttributeColor(node,"color", color))
- {
- menu->setBackgroundColor(color);
- }
-
- BOOL create_jump_keys = FALSE;
- node->getAttributeBOOL("create_jump_keys", create_jump_keys);
-
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
- {
- menu->parseChildXML(child, parent, factory);
- }
-
- if (create_jump_keys)
- {
- menu->createJumpKeys();
- }
- return menu;
-}
// rearrange the child rects so they fit the shape of the menu.
@@ -2169,7 +1627,7 @@ void LLMenuGL::arrange( void )
U32 max_width = getTornOff() ? U32_MAX : menu_region_rect.getWidth();
U32 max_height = getTornOff() ? U32_MAX : menu_region_rect.getHeight();
// *FIX: create the item first and then ask for its dimensions?
- S32 spillover_item_width = PLAIN_PAD_PIXELS + LLFontGL::getFontSansSerif()->getWidth( std::string("More") );
+ S32 spillover_item_width = PLAIN_PAD_PIXELS + LLFontGL::getFontSansSerif()->getWidth( std::string("More") ); // *TODO: Translate
S32 spillover_item_height = llround(LLFontGL::getFontSansSerif()->getLineHeight()) + MENU_ITEM_PADDING;
if (mHorizontalLayout)
@@ -2179,22 +1637,25 @@ void LLMenuGL::arrange( void )
{
if ((*item_iter)->getVisible())
{
- if (!getTornOff() && width + (*item_iter)->getNominalWidth() > max_width - spillover_item_width)
+ if (!getTornOff()
+ && *item_iter != mSpilloverBranch
+ && width + (*item_iter)->getNominalWidth() > max_width - spillover_item_width)
{
// no room for any more items
createSpilloverBranch();
- item_list_t::iterator spillover_iter;
- for (spillover_iter = item_iter; spillover_iter != mItems.end(); ++spillover_iter)
+ std::vector<LLMenuItemGL*> items_to_remove;
+ std::copy(item_iter, mItems.end(), std::back_inserter(items_to_remove));
+ std::vector<LLMenuItemGL*>::iterator spillover_iter;
+ for (spillover_iter= items_to_remove.begin(); spillover_iter != items_to_remove.end(); ++spillover_iter)
{
LLMenuItemGL* itemp = (*spillover_iter);
removeChild(itemp);
- mSpilloverMenu->append(itemp);
+ mSpilloverMenu->addChild(itemp);
}
- mItems.erase(item_iter, mItems.end());
-
- mItems.push_back(mSpilloverBranch);
+
addChild(mSpilloverBranch);
+
height = llmax(height, mSpilloverBranch->getNominalHeight());
width += mSpilloverBranch->getNominalWidth();
@@ -2216,21 +1677,26 @@ void LLMenuGL::arrange( void )
{
if ((*item_iter)->getVisible())
{
- if (!getTornOff() && height + (*item_iter)->getNominalHeight() > max_height - spillover_item_height)
+ if (!getTornOff()
+ && *item_iter != mSpilloverBranch
+ && height + (*item_iter)->getNominalHeight() > max_height - spillover_item_height)
{
// no room for any more items
createSpilloverBranch();
- item_list_t::iterator spillover_iter;
- for (spillover_iter= item_iter; spillover_iter != mItems.end(); ++spillover_iter)
+ std::vector<LLMenuItemGL*> items_to_remove;
+ std::copy(item_iter, mItems.end(), std::back_inserter(items_to_remove));
+ std::vector<LLMenuItemGL*>::iterator spillover_iter;
+ for (spillover_iter= items_to_remove.begin(); spillover_iter != items_to_remove.end(); ++spillover_iter)
{
LLMenuItemGL* itemp = (*spillover_iter);
removeChild(itemp);
- mSpilloverMenu->append(itemp);
+ mSpilloverMenu->addChild(itemp);
}
- mItems.erase(item_iter, mItems.end());
- mItems.push_back(mSpilloverBranch);
+
+
addChild(mSpilloverBranch);
+
height += mSpilloverBranch->getNominalHeight();
width = llmax( width, mSpilloverBranch->getNominalWidth() );
@@ -2278,6 +1744,15 @@ void LLMenuGL::arrange( void )
}
}
+void LLMenuGL::arrangeAndClear( void )
+{
+ if (mNeedsArrange)
+ {
+ arrange();
+ mNeedsArrange = FALSE;
+ }
+}
+
void LLMenuGL::createSpilloverBranch()
{
if (!mSpilloverBranch)
@@ -2286,14 +1761,24 @@ void LLMenuGL::createSpilloverBranch()
delete mSpilloverMenu;
// technically, you can't tear off spillover menus, but we're passing the handle
// along just to be safe
- mSpilloverMenu = new LLMenuGL(std::string("More"), std::string("More"), mParentFloaterHandle);
+ LLMenuGL::Params p;
+ p.name("More");
+ p.label("More"); // *TODO: Translate
+ p.parent_floater(mParentFloaterHandle);
+ p.bg_color(mBackgroundColor);
+ p.bg_visible(true);
+ p.can_tear_off(false);
+ mSpilloverMenu = new LLMenuGL(p);
mSpilloverMenu->updateParent(LLMenuGL::sMenuContainer);
- // Inherit colors
- mSpilloverMenu->setBackgroundColor( mBackgroundColor );
- mSpilloverMenu->setCanTearOff(FALSE);
- mSpilloverBranch = new LLMenuItemBranchGL(std::string("More"), std::string("More"), mSpilloverMenu->getHandle());
- mSpilloverBranch->setFontStyle(LLFontGL::ITALIC);
+ LLMenuItemBranchGL::Params branch_params;
+ branch_params.name = "More";
+ branch_params.label = "More"; // *TODO: Translate
+ branch_params.branch = mSpilloverMenu;
+ branch_params.font.style = "italic";
+
+
+ mSpilloverBranch = LLUICtrlFactory::create<LLMenuItemBranchGL>(branch_params);
}
}
@@ -2304,25 +1789,15 @@ void LLMenuGL::cleanupSpilloverBranch()
// head-recursion to propagate items back up to root menu
mSpilloverMenu->cleanupSpilloverBranch();
- removeChild(mSpilloverBranch);
-
- item_list_t::iterator found_iter = std::find(mItems.begin(), mItems.end(), mSpilloverBranch);
- if (found_iter != mItems.end())
- {
- mItems.erase(found_iter);
- }
-
// pop off spillover items
while (mSpilloverMenu->getItemCount())
{
LLMenuItemGL* itemp = mSpilloverMenu->getItem(0);
mSpilloverMenu->removeChild(itemp);
- mSpilloverMenu->mItems.erase(mSpilloverMenu->mItems.begin());
// put them at the end of our own list
- mItems.push_back(itemp);
addChild(itemp);
}
-
+
// Delete the branch, and since the branch will delete the menu,
// set the menu* to null.
delete mSpilloverBranch;
@@ -2333,6 +1808,9 @@ void LLMenuGL::cleanupSpilloverBranch()
void LLMenuGL::createJumpKeys()
{
+ if (!mCreateJumpKeys) return;
+ mCreateJumpKeys = FALSE;
+
mJumpKeys.clear();
std::set<std::string> unique_words;
@@ -2442,7 +1920,7 @@ void LLMenuGL::empty( void )
void LLMenuGL::setLeftAndBottom(S32 left, S32 bottom)
{
setRect(LLRect(left, getRect().mTop, getRect().mRight, bottom));
- arrange();
+ needsArrange();
}
BOOL LLMenuGL::handleJumpKey(KEY key)
@@ -2455,12 +1933,9 @@ BOOL LLMenuGL::handleJumpKey(KEY key)
// switch to keyboard navigation mode
LLMenuGL::setKeyboardMode(TRUE);
- // force highlight to close old menus and any open sub-menus
-
- //clearHoverItem();
// force highlight to close old menus and open and sub-menus
found_it->second->setHighlight(TRUE);
- found_it->second->doIt();
+ found_it->second->onCommit();
}
// if we are navigating the menus, we need to eat the keystroke
@@ -2472,21 +1947,18 @@ BOOL LLMenuGL::handleJumpKey(KEY key)
// Add the menu item to this menu.
BOOL LLMenuGL::append( LLMenuItemGL* item )
{
+ if (!item) return FALSE;
mItems.push_back( item );
- addChild( item );
- arrange();
+ LLUICtrl::addChild(item);
+ needsArrange();
return TRUE;
}
// add a separator to this menu
-BOOL LLMenuGL::appendSeparator( const std::string &separator_name )
+BOOL LLMenuGL::addSeparator()
{
- LLMenuItemGL* separator;
- if (separator_name.empty())
- separator = new LLMenuItemSeparatorGL(std::string("separator"));
- else
- separator = new LLMenuItemSeparatorGL(separator_name);
- return append( separator );
+ LLMenuItemGL* separator = new LLMenuItemSeparatorGL();
+ return addChild(separator);
}
// add a menu - this will create a cascading menu
@@ -2499,14 +1971,22 @@ BOOL LLMenuGL::appendMenu( LLMenuGL* menu )
}
BOOL success = TRUE;
- LLMenuItemBranchGL* branch = NULL;
- branch = new LLMenuItemBranchGL( menu->getName(), menu->getLabel(), menu->getHandle() );
- branch->setJumpKey(menu->getJumpKey());
+ LLMenuItemBranchGL::Params p;
+ p.name = menu->getName();
+ p.label = menu->getLabel();
+ p.branch = menu;
+ p.jump_key = menu->getJumpKey();
+ p.enabled_color=LLUI::getCachedColorFunctor("MenuItemEnabledColor");
+ p.disabled_color=LLUI::getCachedColorFunctor("MenuItemDisabledColor");
+ p.highlight_bg_color=LLUI::getCachedColorFunctor("MenuItemHighlightBgColor");
+ p.highlight_fg_color=LLUI::getCachedColorFunctor("MenuItemHighlightFgColor");
+
+ LLMenuItemBranchGL* branch = LLUICtrlFactory::create<LLMenuItemBranchGL>(p);
success &= append( branch );
// Inherit colors
menu->setBackgroundColor( mBackgroundColor );
-
+ menu->updateParent(LLMenuGL::sMenuContainer);
return success;
}
@@ -2544,6 +2024,7 @@ void LLMenuGL::setItemVisible( const std::string& name, BOOL visible )
if( (*item_iter)->getName() == name )
{
(*item_iter)->setVisible( visible );
+ needsArrange();
break;
}
}
@@ -2556,7 +2037,7 @@ void LLMenuGL::setItemLastSelected(LLMenuItemGL* item)
LLMenuHolderGL::setActivatedItem(item);
}
- // fix the checkmarks
+ // update enabled and checkmark status
item->buildDrawLabel();
}
@@ -2654,7 +2135,7 @@ LLMenuItemGL* LLMenuGL::highlightNextItem(LLMenuItemGL* cur_item, BOOL skip_disa
while(1)
{
// skip separators and disabled/invisible items
- if ((*next_item_iter)->getEnabled() && (*next_item_iter)->getVisible() && (*next_item_iter)->getType() != SEPARATOR_NAME)
+ if ((*next_item_iter)->getEnabled() && (*next_item_iter)->getVisible() && !dynamic_cast<LLMenuItemSeparatorGL*>(*next_item_iter))
{
if (cur_item)
{
@@ -2761,7 +2242,10 @@ void LLMenuGL::updateParent(LLView* parentp)
{
getParent()->removeChild(this);
}
- parentp->addChild(this);
+ if (parentp)
+ {
+ parentp->addChild(this);
+ }
item_list_t::iterator item_iter;
for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
{
@@ -2864,29 +2348,39 @@ BOOL LLMenuGL::handleHover( S32 x, S32 y, MASK mask )
}
}
getWindow()->setCursor(UI_CURSOR_ARROW);
+
+ //ProductEngine: what behavior is this addressing?
+ // *HACK Release the mouse capture
+ gFocusMgr.setMouseCapture( NULL );
+
return TRUE;
}
void LLMenuGL::draw( void )
{
+ if (mNeedsArrange)
+ {
+ arrange();
+ mNeedsArrange = FALSE;
+ }
if (mDropShadowed && !mTornOff)
{
+ static LLUICachedControl<S32> drop_shadow_floater ("DropShadowFloater", 0);
+ static LLUICachedControl<LLColor4> color_drop_shadow ("ColorDropShadow", *(new LLColor4));
gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0,
- LLUI::sColorsGroup->getColor("ColorDropShadow"),
- LLUI::sConfigGroup->getS32("DropShadowFloater") );
+ color_drop_shadow, drop_shadow_floater );
}
- LLColor4 bg_color = mBackgroundColor;
-
if( mBgVisible )
{
- gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0, mBackgroundColor );
+ gl_rect_2d( 0, getRect().getHeight(), getRect().getWidth(), 0, mBackgroundColor.get() );
}
LLView::draw();
}
-void LLMenuGL::drawBackground(LLMenuItemGL* itemp, LLColor4& color)
+void LLMenuGL::drawBackground(LLMenuItemGL* itemp, F32 alpha)
{
+ LLColor4 color = itemp->getHighlightBgColor() % alpha;
gGL.color4fv( color.mV );
LLRect item_rect = itemp->getRect();
gl_rect_2d( 0, item_rect.getHeight(), item_rect.getWidth(), 0);
@@ -2962,6 +2456,7 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getMenuRect();
const S32 HPAD = 2;
+ menu->arrangeAndClear(); // Fix menu rect if needed.
LLRect rect = menu->getRect();
//LLView* cur_view = spawning_view;
S32 left = x + HPAD;
@@ -3001,1461 +2496,956 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
menu->getParent()->sendChildToFront(menu);
}
-//-----------------------------------------------------------------------------
-// class LLPieMenuBranch
-// A branch to another pie menu
-//-----------------------------------------------------------------------------
-class LLPieMenuBranch : public LLMenuItemGL
-{
-public:
- LLPieMenuBranch(const std::string& name, const std::string& label, LLPieMenu* branch);
-
- // called to rebuild the draw label
- virtual void buildDrawLabel( void );
-
- // doIt() - do the primary funcationality of the menu item.
- virtual void doIt( void );
+///============================================================================
+/// Class LLMenuBarGL
+///============================================================================
- LLPieMenu* getBranch() { return mBranch; }
+static LLRegisterWidget<LLMenuBarGL> r2("menu_bar");
-protected:
- LLPieMenu* mBranch;
-};
+LLMenuBarGL::LLMenuBarGL( const Params& p )
+: LLMenuGL(p),
+ mAltKeyTrigger(FALSE)
+{}
-LLPieMenuBranch::LLPieMenuBranch(const std::string& name,
- const std::string& label,
- LLPieMenu* branch)
-: LLMenuItemGL( name, label, KEY_NONE, MASK_NONE ),
- mBranch( branch )
+// Default destructor
+LLMenuBarGL::~LLMenuBarGL()
{
- mBranch->hide(FALSE);
- mBranch->setParentMenuItem(this);
+ std::for_each(mAccelerators.begin(), mAccelerators.end(), DeletePointer());
+ mAccelerators.clear();
}
-// called to rebuild the draw label
-void LLPieMenuBranch::buildDrawLabel( void )
+
+BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask)
{
+ if (getHighlightedItem() && mask == MASK_NONE)
{
- // default enablement is this -- if any of the subitems are
- // enabled, this item is enabled. JC
- U32 sub_count = mBranch->getItemCount();
- U32 i;
- BOOL any_enabled = FALSE;
- for (i = 0; i < sub_count; i++)
- {
- LLMenuItemGL* item = mBranch->getItem(i);
- item->buildDrawLabel();
- if (item->getEnabled() && !item->getDrawTextDisabled() )
- {
- any_enabled = TRUE;
- break;
- }
- }
- setDrawTextDisabled(!any_enabled);
- setEnabled(TRUE);
+ // unmodified key accelerators are ignored when navigating menu
+ // (but are used as jump keys so will still work when appropriate menu is up)
+ return FALSE;
+ }
+ BOOL result = LLMenuGL::handleAcceleratorKey(key, mask);
+ if (result && mask & MASK_ALT)
+ {
+ // ALT key used to trigger hotkey, don't use as shortcut to open menu
+ mAltKeyTrigger = FALSE;
}
- mDrawAccelLabel.clear();
- std::string st = mDrawAccelLabel;
- appendAcceleratorString( st );
- mDrawAccelLabel = st;
-
- // No special branch suffix
- mDrawBranchLabel.clear();
-}
-
-// doIt() - do the primary funcationality of the menu item.
-void LLPieMenuBranch::doIt( void )
-{
- LLPieMenu *parent = (LLPieMenu *)getParent();
-
- LLRect rect = parent->getRect();
- S32 center_x;
- S32 center_y;
- parent->localPointToScreen(rect.getWidth() / 2, rect.getHeight() / 2, ¢er_x, ¢er_y);
-
- parent->hide(FALSE);
- mBranch->show( center_x, center_y, FALSE );
-}
-
-//-----------------------------------------------------------------------------
-// class LLPieMenu
-// A circular menu of items, icons, etc.
-//-----------------------------------------------------------------------------
-LLPieMenu::LLPieMenu(const std::string& name, const std::string& label)
-: LLMenuGL(name, label),
- mFirstMouseDown(FALSE),
- mUseInfiniteRadius(FALSE),
- mHoverItem(NULL),
- mHoverThisFrame(FALSE),
- mHoveredAnyItem(FALSE),
- mOuterRingAlpha(1.f),
- mCurRadius(0.f),
- mRightMouseDown(FALSE)
-{
- LLMenuGL::setVisible(FALSE);
- setCanTearOff(FALSE);
-}
-
-LLPieMenu::LLPieMenu(const std::string& name)
-: LLMenuGL(name, name),
- mFirstMouseDown(FALSE),
- mUseInfiniteRadius(FALSE),
- mHoverItem(NULL),
- mHoverThisFrame(FALSE),
- mHoveredAnyItem(FALSE),
- mOuterRingAlpha(1.f),
- mCurRadius(0.f),
- mRightMouseDown(FALSE)
-{
- LLMenuGL::setVisible(FALSE);
- setCanTearOff(FALSE);
-}
-
-
-void LLPieMenu::initXML(LLXMLNodePtr node, LLView *context, LLUICtrlFactory *factory)
-{
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
+ if(!result && (key == KEY_F10 && mask == MASK_CONTROL) && !gKeyboard->getKeyRepeated(key))
{
- if (child->hasName(LL_PIE_MENU_TAG))
+ if (getHighlightedItem())
{
- // SUBMENU
- std::string name("menu");
- child->getAttributeString("name", name);
- std::string label(name);
- child->getAttributeString("label", label);
-
- LLPieMenu *submenu = new LLPieMenu(name, label);
- appendPieMenu(submenu);
- submenu->initXML(child, context, factory);
+ clearHoverItem();
}
else
{
- parseChildXML(child, context, factory);
+ // close menus originating from other menu bars when first opening menu via keyboard
+ LLMenuGL::sMenuContainer->hideMenus();
+ highlightNextItem(NULL);
+ LLMenuGL::setKeyboardMode(TRUE);
}
+ return TRUE;
}
-}
-// virtual
-void LLPieMenu::setVisible(BOOL visible)
-{
- if (!visible)
- {
- hide(FALSE);
- }
+ return result;
}
-BOOL LLPieMenu::handleHover( S32 x, S32 y, MASK mask )
+BOOL LLMenuBarGL::handleKeyHere(KEY key, MASK mask)
{
- // This is mostly copied from the llview class, but it continues
- // the hover handle code after a hover handler has been found.
- BOOL handled = FALSE;
-
- // If we got a hover event, we've already moved the cursor
- // for any menu shifts, so subsequent mouseup messages will be in the
- // correct position. No need to correct them.
- //mShiftHoriz = 0;
- //mShiftVert = 0;
-
- // release mouse capture after short period of visibility if we're using a finite boundary
- // so that right click outside of boundary will trigger new pie menu
- if (hasMouseCapture() &&
- !mRightMouseDown &&
- mShrinkBorderTimer.getStarted() &&
- mShrinkBorderTimer.getElapsedTimeF32() >= PIE_SHRINK_TIME)
- {
- gFocusMgr.setMouseCapture(NULL);
- mUseInfiniteRadius = FALSE;
- }
-
- LLMenuItemGL *item = pieItemFromXY( x, y );
-
- if (item && item->getEnabled())
+ static LLUICachedControl<bool> use_altkey_for_menus ("UseAltKeyForMenus", 0);
+ if(key == KEY_ALT && !gKeyboard->getKeyRepeated(key) && use_altkey_for_menus)
{
- getWindow()->setCursor(UI_CURSOR_ARROW);
- lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
- handled = TRUE;
-
- if (item != mHoverItem)
- {
- if (mHoverItem)
- {
- mHoverItem->setHighlight( FALSE );
- }
- mHoverItem = item;
- mHoverItem->setHighlight( TRUE );
-
- switch(pieItemIndexFromXY(x, y))
- {
- case 0:
- make_ui_sound("UISndPieMenuSliceHighlight0");
- break;
- case 1:
- make_ui_sound("UISndPieMenuSliceHighlight1");
- break;
- case 2:
- make_ui_sound("UISndPieMenuSliceHighlight2");
- break;
- case 3:
- make_ui_sound("UISndPieMenuSliceHighlight3");
- break;
- case 4:
- make_ui_sound("UISndPieMenuSliceHighlight4");
- break;
- case 5:
- make_ui_sound("UISndPieMenuSliceHighlight5");
- break;
- case 6:
- make_ui_sound("UISndPieMenuSliceHighlight6");
- break;
- case 7:
- make_ui_sound("UISndPieMenuSliceHighlight7");
- break;
- default:
- make_ui_sound("UISndPieMenuSliceHighlight0");
- break;
- }
- }
- mHoveredAnyItem = TRUE;
+ mAltKeyTrigger = TRUE;
}
- else
+ else // if any key other than ALT hit, clear out waiting for Alt key mode
{
- // clear out our selection
- if (mHoverItem)
- {
- mHoverItem->setHighlight(FALSE);
- mHoverItem = NULL;
- }
+ mAltKeyTrigger = FALSE;
}
-
- if( !handled && pointInView( x, y ) )
+
+ if (key == KEY_ESCAPE && mask == MASK_NONE)
{
- getWindow()->setCursor(UI_CURSOR_ARROW);
- lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
- handled = TRUE;
+ LLMenuGL::setKeyboardMode(FALSE);
+ // if any menus are visible, this will return TRUE, stopping further processing of ESCAPE key
+ return LLMenuGL::sMenuContainer->hideMenus();
}
- mHoverThisFrame = TRUE;
+ // before processing any other key, check to see if ALT key has triggered menu access
+ checkMenuTrigger();
- return handled;
+ return LLMenuGL::handleKeyHere(key, mask);
}
-BOOL LLPieMenu::handleMouseDown( S32 x, S32 y, MASK mask )
+BOOL LLMenuBarGL::handleJumpKey(KEY key)
{
- BOOL handled = FALSE;
- // The click was somewhere within our rectangle
- LLMenuItemGL *item = pieItemFromXY( x, y );
-
- if (item)
+ // perform case-insensitive comparison
+ key = toupper(key);
+ navigation_key_map_t::iterator found_it = mJumpKeys.find(key);
+ if(found_it != mJumpKeys.end() && found_it->second->getEnabled())
{
- // lie to the item about where the click happened
- // to make sure it's within the item's rectangle
- handled = item->handleMouseDown( 0, 0, mask );
+ // switch to keyboard navigation mode
+ LLMenuGL::setKeyboardMode(TRUE);
+
+ found_it->second->setHighlight(TRUE);
+ found_it->second->onCommit();
}
- else if (!mRightMouseDown)
+ return TRUE;
+}
+
+BOOL LLMenuBarGL::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+ // clicks on menu bar closes existing menus from other contexts but leave
+ // own menu open so that we get toggle behavior
+ if (!getHighlightedItem() || !getHighlightedItem()->isActive())
{
- // call hidemenus to make sure transient selections get cleared
- ((LLMenuHolderGL*)getParent())->hideMenus();
+ LLMenuGL::sMenuContainer->hideMenus();
}
- // always handle mouse down as mouse up will close open menus
- return handled;
+ return LLMenuGL::handleMouseDown(x, y, mask);
}
-BOOL LLPieMenu::handleRightMouseDown(S32 x, S32 y, MASK mask)
+BOOL LLMenuBarGL::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
- BOOL handled = FALSE;
-
- mRightMouseDown = TRUE;
-
- // The click was somewhere within our rectangle
- LLMenuItemGL *item = pieItemFromXY( x, y );
- S32 delta_x = x /*+ mShiftHoriz*/ - getLocalRect().getCenterX();
- S32 delta_y = y /*+ mShiftVert*/ - getLocalRect().getCenterY();
- BOOL clicked_in_pie = ((delta_x * delta_x) + (delta_y * delta_y) < mCurRadius*mCurRadius) || mUseInfiniteRadius;
-
- // grab mouse if right clicking anywhere within pie (even deadzone in middle), to detect drag outside of pie
- if (clicked_in_pie)
- {
- // capture mouse cursor as if on initial menu show
- gFocusMgr.setMouseCapture(this);
- mShrinkBorderTimer.stop();
- mUseInfiniteRadius = TRUE;
- handled = TRUE;
- }
-
- if (item)
+ // clicks on menu bar closes existing menus from other contexts but leave
+ // own menu open so that we get toggle behavior
+ if (!getHighlightedItem() || !getHighlightedItem()->isActive())
{
- // lie to the item about where the click happened
- // to make sure it's within the item's rectangle
- if (item->handleMouseDown( 0, 0, mask ))
- {
- handled = TRUE;
- }
+ LLMenuGL::sMenuContainer->hideMenus();
}
- return handled;
+ return LLMenuGL::handleMouseDown(x, y, mask);
}
-BOOL LLPieMenu::handleRightMouseUp( S32 x, S32 y, MASK mask )
+
+void LLMenuBarGL::draw()
{
- // release mouse capture when right mouse button released, and we're past the shrink time
- if (mShrinkBorderTimer.getStarted() &&
- mShrinkBorderTimer.getElapsedTimeF32() > PIE_SHRINK_TIME)
+ LLMenuItemGL* itemp = getHighlightedItem();
+ // If we are in mouse-control mode and the mouse cursor is not hovering over
+ // the current highlighted menu item and it isn't open, then remove the
+ // highlight. This is done via a polling mechanism here, as we don't receive
+ // notifications when the mouse cursor moves off of us
+ if (itemp && !itemp->isOpen() && !itemp->getHover() && !LLMenuGL::getKeyboardMode())
{
- mUseInfiniteRadius = FALSE;
- gFocusMgr.setMouseCapture(NULL);
+ clearHoverItem();
}
- S32 delta_x = x /*+ mShiftHoriz*/ - getLocalRect().getCenterX();
- S32 delta_y = y /*+ mShiftVert*/ - getLocalRect().getCenterY();
- if (!mHoveredAnyItem && !mFirstMouseDown && (delta_x * delta_x) + (delta_y * delta_y) < PIE_CENTER_SIZE * PIE_CENTER_SIZE)
- {
- // user released right mouse button in middle of pie, interpret this as closing the menu
- sMenuContainer->hideMenus();
- return TRUE;
- }
+ checkMenuTrigger();
+ LLMenuGL::draw();
+}
- BOOL result = handleMouseUp( x, y, mask );
- mRightMouseDown = FALSE;
- mHoveredAnyItem = FALSE;
- return result;
+void LLMenuBarGL::checkMenuTrigger()
+{
+ // has the ALT key been pressed and subsequently released?
+ if (mAltKeyTrigger && !gKeyboard->getKeyDown(KEY_ALT))
+ {
+ // if alt key was released quickly, treat it as a menu access key
+ // otherwise it was probably an Alt-zoom or similar action
+ static LLUICachedControl<F32> menu_access_key_time ("MenuAccessKeyTime", 0);
+ if (gKeyboard->getKeyElapsedTime(KEY_ALT) <= menu_access_key_time ||
+ gKeyboard->getKeyElapsedFrameCount(KEY_ALT) < 2)
+ {
+ if (getHighlightedItem())
+ {
+ clearHoverItem();
+ }
+ else
+ {
+ // close menus originating from other menu bars
+ LLMenuGL::sMenuContainer->hideMenus();
+
+ highlightNextItem(NULL);
+ LLMenuGL::setKeyboardMode(TRUE);
+ }
+ }
+ mAltKeyTrigger = FALSE;
+ }
}
-BOOL LLPieMenu::handleMouseUp( S32 x, S32 y, MASK mask )
+BOOL LLMenuBarGL::jumpKeysActive()
{
- BOOL handled = FALSE;
-
- // The click was somewhere within our rectangle
- LLMenuItemGL *item = pieItemFromXY( x, y );
+ // require user to be in keyboard navigation mode to activate key triggers
+ // as menu bars are always visible and it is easy to leave the mouse cursor over them
+ return LLMenuGL::getKeyboardMode() && getHighlightedItem() && LLMenuGL::jumpKeysActive();
+}
- if (item)
+// rearrange the child rects so they fit the shape of the menu bar.
+void LLMenuBarGL::arrange( void )
+{
+ U32 pos = 0;
+ LLRect rect( 0, getRect().getHeight(), 0, 0 );
+ item_list_t::const_iterator item_iter;
+ for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
{
- // lie to the item about where the click happened
- // to make sure it's within the item's rectangle
- if (item->getEnabled())
+ LLMenuItemGL* item = *item_iter;
+ if (item->getVisible())
{
- handled = item->handleMouseUp( 0, 0, mask );
- hide(TRUE);
+ rect.mLeft = pos;
+ pos += item->getNominalWidth();
+ rect.mRight = pos;
+ item->setRect( rect );
+ item->buildDrawLabel();
}
}
- else if (!mRightMouseDown)
- {
- // call hidemenus to make sure transient selections get cleared
- ((LLMenuHolderGL*)getParent())->hideMenus();
- }
+ reshape(rect.mRight, rect.getHeight());
+}
- if (handled)
- {
- make_ui_sound("UISndClickRelease");
- }
- if (!handled && !mUseInfiniteRadius)
+S32 LLMenuBarGL::getRightmostMenuEdge()
+{
+ // Find the last visible menu
+ item_list_t::reverse_iterator item_iter;
+ for (item_iter = mItems.rbegin(); item_iter != mItems.rend(); ++item_iter)
{
- // call hidemenus to make sure transient selections get cleared
- sMenuContainer->hideMenus();
+ if ((*item_iter)->getVisible())
+ {
+ break;
+ }
}
- if (mFirstMouseDown)
- {
- make_ui_sound("UISndPieMenuAppear");
- mFirstMouseDown = FALSE;
- }
-
- // *FIX: is this necessary?
- if (!mShrinkBorderTimer.getStarted())
+ if (item_iter == mItems.rend())
{
- mShrinkBorderTimer.start();
+ return 0;
}
-
- return handled;
+ return (*item_iter)->getRect().mRight;
}
-
-// virtual
-void LLPieMenu::draw()
+// add a vertical separator to this menu
+BOOL LLMenuBarGL::addSeparator()
{
- // clear hover if mouse moved away
- if (!mHoverThisFrame && mHoverItem)
- {
- mHoverItem->setHighlight(FALSE);
- mHoverItem = NULL;
- }
-
- F32 width = (F32) getRect().getWidth();
- F32 height = (F32) getRect().getHeight();
- mCurRadius = PIE_SCALE_FACTOR * llmax( width/2, height/2 );
+ LLMenuItemGL* separator = new LLMenuItemVerticalSeparatorGL();
+ return append( separator );
+}
- mOuterRingAlpha = mUseInfiniteRadius ? 0.f : 1.f;
- if (mShrinkBorderTimer.getStarted())
+// add a menu - this will create a drop down menu.
+BOOL LLMenuBarGL::appendMenu( LLMenuGL* menu )
+{
+ if( menu == this )
{
- mOuterRingAlpha = clamp_rescale(mShrinkBorderTimer.getElapsedTimeF32(), 0.f, PIE_SHRINK_TIME, 0.f, 1.f);
- mCurRadius *= clamp_rescale(mShrinkBorderTimer.getElapsedTimeF32(), 0.f, PIE_SHRINK_TIME, 1.f, 1.f / PIE_SCALE_FACTOR);
+ llerrs << "** Attempt to attach menu to itself. This is certainly "
+ << "a logic error." << llendl;
}
- // correct for non-square pixels
- F32 center_x = width/2;
- F32 center_y = height/2;
- S32 steps = 100;
+ BOOL success = TRUE;
- gGL.pushMatrix();
- {
- gGL.translatef(center_x, center_y, 0.f);
+ // *TODO: Hack! Fix this
+ LLMenuItemBranchDownGL::Params p;
+ p.name = menu->getName();
+ p.label = menu->getLabel();
+ p.visible = menu->getVisible();
+ p.branch = menu;
+ p.enabled_color=LLUI::getCachedColorFunctor("MenuItemEnabledColor");
+ p.disabled_color=LLUI::getCachedColorFunctor("MenuItemDisabledColor");
+ p.highlight_bg_color=LLUI::getCachedColorFunctor("MenuItemHighlightBgColor");
+ p.highlight_fg_color=LLUI::getCachedColorFunctor("MenuItemHighlightFgColor");
+
+ LLMenuItemBranchDownGL* branch = LLUICtrlFactory::create<LLMenuItemBranchDownGL>(p);
+ success &= branch->addToAcceleratorList(&mAccelerators);
+ success &= append( branch );
+ branch->setJumpKey(branch->getJumpKey());
+ menu->updateParent(LLMenuGL::sMenuContainer);
+
+ return success;
+}
- F32 line_width = LLUI::sConfigGroup->getF32("PieMenuLineWidth");
- LLColor4 line_color = LLUI::sColorsGroup->getColor("PieMenuLineColor");
- LLColor4 bg_color = LLUI::sColorsGroup->getColor("PieMenuBgColor");
- LLColor4 selected_color = LLUI::sColorsGroup->getColor("PieMenuSelectedColor");
+BOOL LLMenuBarGL::handleHover( S32 x, S32 y, MASK mask )
+{
+ BOOL handled = FALSE;
+ LLView* active_menu = NULL;
- // main body
- LLColor4 outer_color = bg_color;
- outer_color.mV[VALPHA] *= mOuterRingAlpha;
- gl_washer_2d( mCurRadius, (F32) PIE_CENTER_SIZE, steps, bg_color, outer_color );
+ BOOL no_mouse_data = mLastMouseX == 0 && mLastMouseY == 0;
+ S32 mouse_delta_x = no_mouse_data ? 0 : x - mLastMouseX;
+ S32 mouse_delta_y = no_mouse_data ? 0 : y - mLastMouseY;
+ mMouseVelX = (mMouseVelX / 2) + (mouse_delta_x / 2);
+ mMouseVelY = (mMouseVelY / 2) + (mouse_delta_y / 2);
+ mLastMouseX = x;
+ mLastMouseY = y;
- // selected wedge
- item_list_t::iterator item_iter;
- S32 i = 0;
- for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
- {
- if ((*item_iter)->getHighlight())
- {
- F32 arc_size = F_PI * 0.25f;
-
- F32 start_radians = (i * arc_size) - (arc_size * 0.5f);
- F32 end_radians = start_radians + arc_size;
-
- LLColor4 outer_color = selected_color;
- outer_color.mV[VALPHA] *= mOuterRingAlpha;
- gl_washer_segment_2d( mCurRadius, (F32)PIE_CENTER_SIZE, start_radians, end_radians, steps / 8, selected_color, outer_color );
+ // if nothing currently selected or mouse has moved since last call, pick menu item via mouse
+ // otherwise let keyboard control it
+ if (!getHighlightedItem() || !LLMenuGL::getKeyboardMode() || llabs(mMouseVelX) > 0 || llabs(mMouseVelY) > 0)
+ {
+ // find current active menu
+ for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+ {
+ LLView* viewp = *child_it;
+ if (((LLMenuItemGL*)viewp)->isOpen())
+ {
+ active_menu = viewp;
}
- i++;
}
- LLUI::setLineWidth( line_width );
-
- // inner lines
- outer_color = line_color;
- outer_color.mV[VALPHA] *= mOuterRingAlpha;
- gl_washer_spokes_2d( mCurRadius, (F32)PIE_CENTER_SIZE, 8, line_color, outer_color );
-
- // inner circle
- gGL.color4fv( line_color.mV );
- gl_circle_2d( 0, 0, (F32)PIE_CENTER_SIZE, steps, FALSE );
-
- // outer circle
- gGL.color4fv( outer_color.mV );
- gl_circle_2d( 0, 0, mCurRadius, steps, FALSE );
-
- LLUI::setLineWidth(1.0f);
- }
- gGL.popMatrix();
-
- mHoverThisFrame = FALSE;
-
- LLView::draw();
-}
-
-void LLPieMenu::drawBackground(LLMenuItemGL* itemp, LLColor4& color)
-{
- F32 width = (F32) getRect().getWidth();
- F32 height = (F32) getRect().getHeight();
- F32 center_x = width/2;
- F32 center_y = height/2;
- S32 steps = 100;
-
- gGL.color4fv( color.mV );
- gGL.pushMatrix();
- {
- gGL.translatef(center_x - itemp->getRect().mLeft, center_y - itemp->getRect().mBottom, 0.f);
-
- item_list_t::iterator item_iter;
- S32 i = 0;
- for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
+ // check for new active menu
+ for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
{
- if ((*item_iter) == itemp)
+ LLView* viewp = *child_it;
+ S32 local_x = x - viewp->getRect().mLeft;
+ S32 local_y = y - viewp->getRect().mBottom;
+ if( viewp->getVisible() &&
+ viewp->getEnabled() &&
+ viewp->pointInView(local_x, local_y) &&
+ viewp->handleHover(local_x, local_y, mask))
{
- F32 arc_size = F_PI * 0.25f;
-
- F32 start_radians = (i * arc_size) - (arc_size * 0.5f);
- F32 end_radians = start_radians + arc_size;
+ ((LLMenuItemGL*)viewp)->setHighlight(TRUE);
+ handled = TRUE;
+ if (active_menu && active_menu != viewp)
+ {
+ ((LLMenuItemGL*)viewp)->onCommit();
+ LLMenuGL::setKeyboardMode(FALSE);
+ }
+ LLMenuGL::setKeyboardMode(FALSE);
+ }
+ }
- LLColor4 outer_color = color;
- outer_color.mV[VALPHA] *= mOuterRingAlpha;
- gl_washer_segment_2d( mCurRadius, (F32)PIE_CENTER_SIZE, start_radians, end_radians, steps / 8, color, outer_color );
+ if (handled)
+ {
+ // set hover false on inactive menus
+ for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+ {
+ LLView* viewp = *child_it;
+ S32 local_x = x - viewp->getRect().mLeft;
+ S32 local_y = y - viewp->getRect().mBottom;
+ if (!viewp->pointInView(local_x, local_y) && ((LLMenuItemGL*)viewp)->getHighlight())
+ {
+ ((LLMenuItemGL*)viewp)->setHighlight(FALSE);
+ }
}
- i++;
}
}
- gGL.popMatrix();
-}
-// virtual
-BOOL LLPieMenu::append(LLMenuItemGL *item)
-{
- item->setBriefItem(TRUE);
- item->setFont( LLFontGL::getFontSansSerifSmall() );
- return LLMenuGL::append(item);
+ getWindow()->setCursor(UI_CURSOR_ARROW);
+
+ return TRUE;
}
-// virtual
-BOOL LLPieMenu::appendSeparator(const std::string &separator_name)
+///============================================================================
+/// Class LLMenuHolderGL
+///============================================================================
+LLMenuHolderGL::LLMenuHolderGL()
+ : LLPanel()
{
- LLMenuItemGL* separator = new LLMenuItemBlankGL();
- separator->setFont( LLFontGL::getFontSansSerifSmall() );
- return append( separator );
+ setName("Menu Holder");
+ setMouseOpaque(FALSE);
+ sItemActivationTimer.stop();
+ mCanHide = TRUE;
}
-
-BOOL LLPieMenu::appendPieMenu(LLPieMenu *menu)
+void LLMenuHolderGL::draw()
{
- if (menu == this)
+ LLView::draw();
+ // now draw last selected item as overlay
+ LLMenuItemGL* selecteditem = (LLMenuItemGL*)sItemLastSelectedHandle.get();
+ if (selecteditem && sItemActivationTimer.getStarted() && sItemActivationTimer.getElapsedTimeF32() < ACTIVATE_HIGHLIGHT_TIME)
{
- llerrs << "Can't attach a pie menu to itself" << llendl;
+ // make sure toggle items, for example, show the proper state when fading out
+ selecteditem->buildDrawLabel();
+
+ LLRect item_rect;
+ selecteditem->localRectToOtherView(selecteditem->getLocalRect(), &item_rect, this);
+
+ F32 interpolant = sItemActivationTimer.getElapsedTimeF32() / ACTIVATE_HIGHLIGHT_TIME;
+
+ LLUI::pushMatrix();
+ {
+ LLUI::translate((F32)item_rect.mLeft, (F32)item_rect.mBottom, 0.f);
+ selecteditem->getMenu()->drawBackground(selecteditem, interpolant);
+ selecteditem->draw();
+ }
+ LLUI::popMatrix();
}
- LLPieMenuBranch *item;
- item = new LLPieMenuBranch(menu->getName(), menu->getLabel(), menu);
- getParent()->addChild(item->getBranch());
- item->setFont( LLFontGL::getFontSansSerifSmall() );
- return append( item );
}
-// virtual
-void LLPieMenu::arrange()
+BOOL LLMenuHolderGL::handleMouseDown( S32 x, S32 y, MASK mask )
{
- const S32 rect_height = 190;
- const S32 rect_width = 190;
-
- // all divide by 6
- const S32 CARD_X = 60;
- const S32 DIAG_X = 48;
- const S32 CARD_Y = 76;
- const S32 DIAG_Y = 42;
-
- const S32 ITEM_CENTER_X[] = { CARD_X, DIAG_X, 0, -DIAG_X, -CARD_X, -DIAG_X, 0, DIAG_X };
- const S32 ITEM_CENTER_Y[] = { 0, DIAG_Y, CARD_Y, DIAG_Y, 0, -DIAG_Y, -CARD_Y, -DIAG_Y };
-
- LLRect rect;
-
- S32 font_height = 0;
- if( mItems.size() )
+ BOOL handled = LLView::childrenHandleMouseDown(x, y, mask) != NULL;
+ if (!handled)
{
- font_height = (*mItems.begin())->getNominalHeight();
+ // clicked off of menu, hide them all
+ hideMenus();
}
- S32 item_width = 0;
-
-// F32 sin_delta = OO_SQRT2; // sin(45 deg)
-// F32 cos_delta = OO_SQRT2; // cos(45 deg)
-
- // TODO: Compute actual bounding rect for menu
-
- // HACK: casting away const. Should use setRect or some helper function instead.
- const_cast<LLRect&>(getRect()).setOriginAndSize(getRect().mLeft, getRect().mBottom, rect_width, rect_height );
+ return handled;
+}
- // place items around a circle, with item 0 at positive X,
- // rotating counter-clockwise
- item_list_t::iterator item_iter;
- S32 i = 0;
- for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
+BOOL LLMenuHolderGL::handleRightMouseDown( S32 x, S32 y, MASK mask )
+{
+ BOOL handled = LLView::childrenHandleRightMouseDown(x, y, mask) != NULL;
+ if (!handled)
{
- LLMenuItemGL *item = *item_iter;
-
- item_width = item->getNominalWidth();
-
- // Put in the right place around a circle centered at 0,0
- rect.setCenterAndSize(ITEM_CENTER_X[i],
- ITEM_CENTER_Y[i],
- item_width, font_height );
-
- // Correct for the actual rectangle size
- rect.translate( rect_width/2, rect_height/2 );
-
- item->setRect( rect );
-
- // Make sure enablement is correct
- item->buildDrawLabel();
- i++;
+ // clicked off of menu, hide them all
+ hideMenus();
}
+ return handled;
}
-LLMenuItemGL *LLPieMenu::pieItemFromXY(S32 x, S32 y)
+void LLMenuHolderGL::reshape(S32 width, S32 height, BOOL called_from_parent)
{
- // We might have shifted this menu on draw. If so, we need
- // to shift over mouseup events until we get a hover event.
- //x += mShiftHoriz;
- //y += mShiftVert;
-
- // An arc of the pie menu is 45 degrees
- const F32 ARC_DEG = 45.f;
- S32 delta_x = x - getRect().getWidth() / 2;
- S32 delta_y = y - getRect().getHeight() / 2;
-
- // circle safe zone in the center
- S32 dist_squared = delta_x*delta_x + delta_y*delta_y;
- if (dist_squared < PIE_CENTER_SIZE*PIE_CENTER_SIZE)
+ if (width != getRect().getWidth() || height != getRect().getHeight())
{
- return NULL;
+ hideMenus();
}
+ LLView::reshape(width, height, called_from_parent);
+}
- // infinite radius is only used with right clicks
- S32 radius = llmax( getRect().getWidth()/2, getRect().getHeight()/2 );
- if (!(mUseInfiniteRadius && mRightMouseDown) && dist_squared > radius * radius)
+BOOL LLMenuHolderGL::hasVisibleMenu() const
+{
+ for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
{
- return NULL;
+ LLView* viewp = *child_it;
+ if (viewp->getVisible() && dynamic_cast<LLMenuBarGL*>(viewp) == NULL)
+ {
+ return TRUE;
+ }
}
+ return FALSE;
+}
- F32 angle = RAD_TO_DEG * (F32) atan2((F32)delta_y, (F32)delta_x);
-
- // rotate marks CCW so that east = [0, ARC_DEG) instead of
- // [-ARC_DEG/2, ARC_DEG/2)
- angle += ARC_DEG / 2.f;
-
- // make sure we're only using positive angles
- if (angle < 0.f) angle += 360.f;
-
- S32 which = S32( angle / ARC_DEG );
- if (0 <= which && which < (S32)mItems.size() )
+BOOL LLMenuHolderGL::hideMenus()
+{
+ if (!mCanHide)
{
- item_list_t::iterator item_iter;
- for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
+ return FALSE;
+ }
+ BOOL menu_visible = hasVisibleMenu();
+ if (menu_visible)
+ {
+ LLMenuGL::setKeyboardMode(FALSE);
+ // clicked off of menu, hide them all
+ for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
{
- if (which == 0)
+ LLView* viewp = *child_it;
+ // clicks off of menu do not hide menu bar
+ if (dynamic_cast<LLMenuBarGL*>(viewp) == NULL && viewp->getVisible())
{
- return (*item_iter);
+ viewp->setVisible(FALSE);
}
- which--;
}
}
+ //if (gFocusMgr.childHasKeyboardFocus(this))
+ //{
+ // gFocusMgr.setKeyboardFocus(NULL);
+ //}
- return NULL;
+ return menu_visible;
}
-S32 LLPieMenu::pieItemIndexFromXY(S32 x, S32 y)
+void LLMenuHolderGL::setActivatedItem(LLMenuItemGL* item)
{
- // An arc of the pie menu is 45 degrees
- const F32 ARC_DEG = 45.f;
- // correct for non-square pixels
- S32 delta_x = x - getRect().getWidth() / 2;
- S32 delta_y = y - getRect().getHeight() / 2;
-
- // circle safe zone in the center
- if (delta_x*delta_x + delta_y*delta_y < PIE_CENTER_SIZE*PIE_CENTER_SIZE)
- {
- return -1;
- }
-
- F32 angle = RAD_TO_DEG * (F32) atan2((F32)delta_y, (F32)delta_x);
-
- // rotate marks CCW so that east = [0, ARC_DEG) instead of
- // [-ARC_DEG/2, ARC_DEG/2)
- angle += ARC_DEG / 2.f;
-
- // make sure we're only using positive angles
- if (angle < 0.f) angle += 360.f;
-
- S32 which = S32( angle / ARC_DEG );
- return which;
+ sItemLastSelectedHandle = item->getHandle();
+ sItemActivationTimer.start();
}
-void LLPieMenu::show(S32 x, S32 y, BOOL mouse_down)
+///============================================================================
+/// Class LLTearOffMenu
+///============================================================================
+LLTearOffMenu::LLTearOffMenu(LLMenuGL* menup) :
+ LLFloater()
{
- S32 width = getRect().getWidth();
- S32 height = getRect().getHeight();
-
- const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getMenuRect();
-
- LLView* parent_view = getParent();
- BOOL moved = FALSE;
-
- S32 local_x, local_y;
- parent_view->screenPointToLocal(x, y, &local_x, &local_y);
-
- // HACK: casting away const. Should use setRect or some helper function instead.
- const_cast<LLRect&>(getRect()).setCenterAndSize(local_x, local_y, width, height);
- arrange();
-
- // Adjust the pie rectangle to keep it on screen
- if (getRect().mLeft < menu_region_rect.mLeft)
- {
- //mShiftHoriz = menu_region_rect.mLeft - getRect().mLeft;
- //getRect().translate( mShiftHoriz, 0 );
- // HACK: casting away const. Should use setRect or some helper function instead.
- const_cast<LLRect&>(getRect()).translate( menu_region_rect.mLeft - getRect().mLeft, 0 );
- moved = TRUE;
- }
-
- if (getRect().mRight > menu_region_rect.mRight)
- {
- //mShiftHoriz = menu_region_rect.mRight - getRect().mRight;
- //getRect().translate( mShiftHoriz, 0);
- // HACK: casting away const. Should use setRect or some helper function instead.
- const_cast<LLRect&>(getRect()).translate( menu_region_rect.mRight - getRect().mRight, 0 );
- moved = TRUE;
- }
-
- if (getRect().mBottom < menu_region_rect.mBottom)
- {
- //mShiftVert = menu_region_rect.mBottom - getRect().mBottom;
- //getRect().translate( 0, mShiftVert );
- // HACK: casting away const. Should use setRect or some helper function instead.
- const_cast<LLRect&>(getRect()).translate( 0, menu_region_rect.mBottom - getRect().mBottom );
- moved = TRUE;
- }
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+ setName(menup->getName());
+ setTitle(menup->getLabel());
+ setCanMinimize(FALSE);
+ // flag menu as being torn off
+ menup->setTornOff(TRUE);
+ // update menu layout as torn off menu (no spillover menus)
+ menup->needsArrange();
- if (getRect().mTop > menu_region_rect.mTop)
- {
- //mShiftVert = menu_region_rect.mTop - getRect().mTop;
- //getRect().translate( 0, mShiftVert );
- // HACK: casting away const. Should use setRect or some helper function instead.
- const_cast<LLRect&>(getRect()).translate( 0, menu_region_rect.mTop - getRect().mTop );
- moved = TRUE;
- }
-
- // If we had to relocate the pie menu, put the cursor in the
- // center of its rectangle
- if (moved)
- {
- LLCoordGL center;
- center.mX = (getRect().mLeft + getRect().mRight) / 2;
- center.mY = (getRect().mTop + getRect().mBottom) / 2;
+ LLRect rect;
+ menup->localRectToOtherView(LLRect(-1, menup->getRect().getHeight(), menup->getRect().getWidth() + 3, 0), &rect, gFloaterView);
+ // make sure this floater is big enough for menu
+ mTargetHeight = (F32)(rect.getHeight() + floater_header_size + 5);
+ reshape(rect.getWidth(), rect.getHeight());
+ setRect(rect);
- LLUI::setCursorPositionLocal(getParent(), center.mX, center.mY);
- }
+ // attach menu to floater
+ menup->setFollowsAll();
+ mOldParent = menup->getParent();
+ addChild(menup);
+ menup->setVisible(TRUE);
+ menup->translate(-menup->getRect().mLeft + 1, -menup->getRect().mBottom + 1);
+ menup->setDropShadowed(FALSE);
- // *FIX: what happens when mouse buttons reversed?
- mRightMouseDown = mouse_down;
- mFirstMouseDown = mouse_down;
- mUseInfiniteRadius = TRUE;
- mHoveredAnyItem = FALSE;
+ mMenu = menup;
- if (!mFirstMouseDown)
- {
- make_ui_sound("UISndPieMenuAppear");
- }
+ // highlight first item (tear off item will be disabled)
+ mMenu->highlightNextItem(NULL);
+}
- LLView::setVisible(TRUE);
- // we want all mouse events in case user does quick right click again off of pie menu
- // rectangle, to support gestural menu traversal
- gFocusMgr.setMouseCapture(this);
+void LLTearOffMenu::draw()
+{
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+ mMenu->setBackgroundVisible(isBackgroundOpaque());
+ mMenu->needsArrange();
- if (mouse_down)
+ if (getRect().getHeight() != mTargetHeight)
{
- mShrinkBorderTimer.stop();
+ // animate towards target height
+ reshape(getRect().getWidth(), llceil(lerp((F32)getRect().getHeight(), mTargetHeight, LLCriticalDamp::getInterpolant(0.05f))));
}
- else
+ else
{
- mShrinkBorderTimer.start();
+ // when in stasis, remain big enough to hold menu contents
+ mTargetHeight = (F32)(mMenu->getRect().getHeight() + floater_header_size + 4);
+ reshape(mMenu->getRect().getWidth() + 3, mMenu->getRect().getHeight() + floater_header_size + 5);
}
+ LLFloater::draw();
}
-void LLPieMenu::hide(BOOL item_selected)
+void LLTearOffMenu::onFocusReceived()
{
- if (!getVisible()) return;
-
- if (mHoverItem)
+ // if nothing is highlighted, just highlight first item
+ if (!mMenu->getHighlightedItem())
{
- mHoverItem->setHighlight( FALSE );
- mHoverItem = NULL;
+ mMenu->highlightNextItem(NULL);
}
- make_ui_sound("UISndPieMenuHide");
-
- mFirstMouseDown = FALSE;
- mRightMouseDown = FALSE;
- mUseInfiniteRadius = FALSE;
- mHoveredAnyItem = FALSE;
-
- LLView::setVisible(FALSE);
-
- gFocusMgr.setMouseCapture(NULL);
-}
-
-///============================================================================
-/// Class LLMenuBarGL
-///============================================================================
-
-static LLRegisterWidget<LLMenuBarGL> r2("menu_bar");
-
-// Default constructor
-LLMenuBarGL::LLMenuBarGL( const std::string& name ) : LLMenuGL ( name, name )
-{
- mHorizontalLayout = TRUE;
- setCanTearOff(FALSE);
- mKeepFixedSize = TRUE;
- mAltKeyTrigger = FALSE;
-}
-
-// Default destructor
-LLMenuBarGL::~LLMenuBarGL()
-{
- std::for_each(mAccelerators.begin(), mAccelerators.end(), DeletePointer());
- mAccelerators.clear();
-}
-
-// virtual
-LLXMLNodePtr LLMenuBarGL::getXML(bool save_children) const
-{
- // Sorty of hacky: reparent items to this and then back at the end of the export
- LLView *orig_parent = NULL;
- item_list_t::const_iterator item_iter;
- for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
- {
- LLMenuItemGL* child = *item_iter;
- LLMenuItemBranchGL* branch = (LLMenuItemBranchGL*)child;
- LLMenuGL *menu = branch->getBranch();
- orig_parent = menu->getParent();
- menu->updateParent((LLView *)this);
- }
-
- LLXMLNodePtr node = LLMenuGL::getXML();
-
- for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
- {
- LLMenuItemGL* child = *item_iter;
- LLMenuItemBranchGL* branch = (LLMenuItemBranchGL*)child;
- LLMenuGL *menu = branch->getBranch();
- menu->updateParent(orig_parent);
- }
-
- return node;
-}
-
-LLView* LLMenuBarGL::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("menu");
- node->getAttributeString("name", name);
-
- BOOL opaque = FALSE;
- node->getAttributeBOOL("opaque", opaque);
-
- LLMenuBarGL *menubar = new LLMenuBarGL(name);
-
- LLHandle<LLFloater> parent_handle;
- LLFloater* parent_floater = dynamic_cast<LLFloater*>(parent);
- if (parent_floater)
- {
- parent_handle = parent_floater->getHandle();
- }
-
- // We need to have the rect early so that it's around when building
- // the menu items
- LLRect view_rect;
- createRect(node, view_rect, parent, menubar->getRequiredRect());
- menubar->setRect(view_rect);
-
- if (node->hasAttribute("drop_shadow"))
- {
- BOOL drop_shadow = FALSE;
- node->getAttributeBOOL("drop_shadow", drop_shadow);
- menubar->setDropShadowed(drop_shadow);
- }
-
- menubar->setBackgroundVisible(opaque);
- LLColor4 color(0,0,0,0);
- if (opaque && LLUICtrlFactory::getAttributeColor(node,"color", color))
- {
- menubar->setBackgroundColor(color);
- }
-
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
+ // parent menu items get highlights so navigation logic keeps working
+ LLMenuItemGL* parent_menu_item = mMenu->getParentMenuItem();
+ while(parent_menu_item)
{
- if (child->hasName("menu"))
+ if (parent_menu_item->getMenu()->getVisible())
{
- LLMenuGL *menu = (LLMenuGL*)LLMenuGL::fromXML(child, parent, factory);
- // because of lazy initialization, have to disable tear off functionality
- // and then re-enable with proper parent handle
- if (menu->getCanTearOff())
- {
- menu->setCanTearOff(FALSE);
- menu->setCanTearOff(TRUE, parent_handle);
- }
- menubar->appendMenu(menu);
- if (LLMenuGL::sMenuContainer != NULL)
- {
- menu->updateParent(LLMenuGL::sMenuContainer);
- }
- else
- {
- menu->updateParent(parent);
- }
+ parent_menu_item->setHighlight(TRUE);
+ parent_menu_item = parent_menu_item->getMenu()->getParentMenuItem();
+ }
+ else
+ {
+ break;
}
}
+ LLFloater::onFocusReceived();
+}
- menubar->initFromXML(node, parent);
-
- BOOL create_jump_keys = FALSE;
- node->getAttributeBOOL("create_jump_keys", create_jump_keys);
- if (create_jump_keys)
- {
- menubar->createJumpKeys();
- }
-
- return menubar;
+void LLTearOffMenu::onFocusLost()
+{
+ // remove highlight from parent item and our own menu
+ mMenu->clearHoverItem();
+ LLFloater::onFocusLost();
}
-BOOL LLMenuBarGL::handleAcceleratorKey(KEY key, MASK mask)
+BOOL LLTearOffMenu::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
{
- if (getHighlightedItem() && mask == MASK_NONE)
- {
- // unmodified key accelerators are ignored when navigating menu
- // (but are used as jump keys so will still work when appropriate menu is up)
- return FALSE;
- }
- BOOL result = LLMenuGL::handleAcceleratorKey(key, mask);
- if (result && mask & MASK_ALT)
- {
- // ALT key used to trigger hotkey, don't use as shortcut to open menu
- mAltKeyTrigger = FALSE;
- }
+ // pass keystrokes down to menu
+ return mMenu->handleUnicodeChar(uni_char, TRUE);
+}
- if(!result && (key == KEY_F10 && mask == MASK_CONTROL) && !gKeyboard->getKeyRepeated(key))
+BOOL LLTearOffMenu::handleKeyHere(KEY key, MASK mask)
+{
+ if (!mMenu->getHighlightedItem())
{
- if (getHighlightedItem())
+ if (key == KEY_UP)
{
- clearHoverItem();
+ mMenu->highlightPrevItem(NULL);
+ return TRUE;
}
- else
+ else if (key == KEY_DOWN)
{
- // close menus originating from other menu bars when first opening menu via keyboard
- LLMenuGL::sMenuContainer->hideMenus();
- highlightNextItem(NULL);
- LLMenuGL::setKeyboardMode(TRUE);
+ mMenu->highlightNextItem(NULL);
+ return TRUE;
}
- return TRUE;
}
-
- return result;
+ // pass keystrokes down to menu
+ return mMenu->handleKey(key, mask, TRUE);
}
-BOOL LLMenuBarGL::handleKeyHere(KEY key, MASK mask)
+void LLTearOffMenu::translate(S32 x, S32 y)
{
- if(key == KEY_ALT && !gKeyboard->getKeyRepeated(key) && LLUI::sConfigGroup->getBOOL("UseAltKeyForMenus"))
- {
- mAltKeyTrigger = TRUE;
- }
- else // if any key other than ALT hit, clear out waiting for Alt key mode
- {
- mAltKeyTrigger = FALSE;
- }
-
- if (key == KEY_ESCAPE && mask == MASK_NONE)
+ if (x != 0 && y != 0)
{
- LLMenuGL::setKeyboardMode(FALSE);
- // if any menus are visible, this will return TRUE, stopping further processing of ESCAPE key
- return LLMenuGL::sMenuContainer->hideMenus();
+ // hide open sub-menus by clearing current hover item
+ mMenu->clearHoverItem();
}
-
- // before processing any other key, check to see if ALT key has triggered menu access
- checkMenuTrigger();
-
- return LLMenuGL::handleKeyHere(key, mask);
+ LLFloater::translate(x, y);
}
-BOOL LLMenuBarGL::handleJumpKey(KEY key)
+//static
+LLTearOffMenu* LLTearOffMenu::create(LLMenuGL* menup)
{
- // perform case-insensitive comparison
- key = toupper(key);
- navigation_key_map_t::iterator found_it = mJumpKeys.find(key);
- if(found_it != mJumpKeys.end() && found_it->second->getEnabled())
- {
- // switch to keyboard navigation mode
- LLMenuGL::setKeyboardMode(TRUE);
+ LLTearOffMenu* tearoffp = new LLTearOffMenu(menup);
+ // keep onscreen
+ gFloaterView->adjustToFitScreen(tearoffp, FALSE);
+ tearoffp->openFloater(LLSD());
- found_it->second->setHighlight(TRUE);
- found_it->second->doIt();
- }
- return TRUE;
+ return tearoffp;
}
-BOOL LLMenuBarGL::handleMouseDown(S32 x, S32 y, MASK mask)
+void LLTearOffMenu::onClose(bool app_quitting)
{
- // clicks on menu bar closes existing menus from other contexts but leave
- // own menu open so that we get toggle behavior
- if (!getHighlightedItem() || !getHighlightedItem()->isActive())
- {
- LLMenuGL::sMenuContainer->hideMenus();
- }
-
- return LLMenuGL::handleMouseDown(x, y, mask);
+ removeChild(mMenu);
+ mOldParent->addChild(mMenu);
+ mMenu->clearHoverItem();
+ mMenu->setFollowsNone();
+ mMenu->setBackgroundVisible(TRUE);
+ mMenu->setVisible(FALSE);
+ mMenu->setTornOff(FALSE);
+ mMenu->setDropShadowed(TRUE);
+ destroy();
}
-BOOL LLMenuBarGL::handleRightMouseDown(S32 x, S32 y, MASK mask)
+
+//-----------------------------------------------------------------------------
+// class LLContextMenuBranch
+// A branch to another context menu
+//-----------------------------------------------------------------------------
+class LLContextMenuBranch : public LLMenuItemGL
{
- // clicks on menu bar closes existing menus from other contexts but leave
- // own menu open so that we get toggle behavior
- if (!getHighlightedItem() || !getHighlightedItem()->isActive())
+public:
+ struct Params : public LLInitParam::Block<Params, LLMenuItemGL::Params>
{
- LLMenuGL::sMenuContainer->hideMenus();
- }
-
- return LLMenuGL::handleMouseDown(x, y, mask);
-}
+ Mandatory<LLContextMenu*> branch;
+ };
+ LLContextMenuBranch(const Params&);
-void LLMenuBarGL::draw()
-{
- LLMenuItemGL* itemp = getHighlightedItem();
- // If we are in mouse-control mode and the mouse cursor is not hovering over
- // the current highlighted menu item and it isn't open, then remove the
- // highlight. This is done via a polling mechanism here, as we don't receive
- // notifications when the mouse cursor moves off of us
- if (itemp && !itemp->isOpen() && !itemp->getHover() && !LLMenuGL::getKeyboardMode())
- {
- clearHoverItem();
- }
+ // called to rebuild the draw label
+ virtual void buildDrawLabel( void );
- checkMenuTrigger();
+ // onCommit() - do the primary funcationality of the menu item.
+ virtual void onCommit( void );
- LLMenuGL::draw();
-}
+ LLContextMenu* getBranch() { return mBranch; }
+ void setHighlight( BOOL highlight );
-void LLMenuBarGL::checkMenuTrigger()
-{
- // has the ALT key been pressed and subsequently released?
- if (mAltKeyTrigger && !gKeyboard->getKeyDown(KEY_ALT))
- {
- // if alt key was released quickly, treat it as a menu access key
- // otherwise it was probably an Alt-zoom or similar action
- if (gKeyboard->getKeyElapsedTime(KEY_ALT) <= LLUI::sConfigGroup->getF32("MenuAccessKeyTime") ||
- gKeyboard->getKeyElapsedFrameCount(KEY_ALT) < 2)
- {
- if (getHighlightedItem())
- {
- clearHoverItem();
- }
- else
- {
- // close menus originating from other menu bars
- LLMenuGL::sMenuContainer->hideMenus();
+protected:
+ void showSubMenu();
- highlightNextItem(NULL);
- LLMenuGL::setKeyboardMode(TRUE);
- }
- }
- mAltKeyTrigger = FALSE;
- }
-}
+ LLContextMenu* mBranch;
+};
-BOOL LLMenuBarGL::jumpKeysActive()
+LLContextMenuBranch::LLContextMenuBranch(const LLContextMenuBranch::Params& p)
+: LLMenuItemGL(p),
+ mBranch( p.branch )
{
- // require user to be in keyboard navigation mode to activate key triggers
- // as menu bars are always visible and it is easy to leave the mouse cursor over them
- return LLMenuGL::getKeyboardMode() && getHighlightedItem() && LLMenuGL::jumpKeysActive();
+ mBranch->hide();
+ mBranch->setParentMenuItem(this);
}
-// rearrange the child rects so they fit the shape of the menu bar.
-void LLMenuBarGL::arrange( void )
+// called to rebuild the draw label
+void LLContextMenuBranch::buildDrawLabel( void )
{
- U32 pos = 0;
- LLRect rect( 0, getRect().getHeight(), 0, 0 );
- item_list_t::const_iterator item_iter;
- for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
{
- LLMenuItemGL* item = *item_iter;
- if (item->getVisible())
+ // default enablement is this -- if any of the subitems are
+ // enabled, this item is enabled. JC
+ U32 sub_count = mBranch->getItemCount();
+ U32 i;
+ BOOL any_enabled = FALSE;
+ for (i = 0; i < sub_count; i++)
{
- rect.mLeft = pos;
- pos += item->getNominalWidth();
- rect.mRight = pos;
- item->setRect( rect );
+ LLMenuItemGL* item = mBranch->getItem(i);
item->buildDrawLabel();
+ if (item->getEnabled() && !item->getDrawTextDisabled() )
+ {
+ any_enabled = TRUE;
+ break;
+ }
}
- }
- reshape(rect.mRight, rect.getHeight());
-}
-
-
-S32 LLMenuBarGL::getRightmostMenuEdge()
-{
- // Find the last visible menu
- item_list_t::reverse_iterator item_iter;
- for (item_iter = mItems.rbegin(); item_iter != mItems.rend(); ++item_iter)
- {
- if ((*item_iter)->getVisible())
- {
- break;
- }
+ setDrawTextDisabled(!any_enabled);
+ setEnabled(TRUE);
}
- if (item_iter == mItems.rend())
- {
- return 0;
- }
- return (*item_iter)->getRect().mRight;
+ mDrawAccelLabel.clear();
+ std::string st = mDrawAccelLabel;
+ appendAcceleratorString( st );
+ mDrawAccelLabel = st;
+
+ // No special branch suffix
+ mDrawBranchLabel.clear();
}
-// add a vertical separator to this menu
-BOOL LLMenuBarGL::appendSeparator( const std::string &separator_name )
+void LLContextMenuBranch::showSubMenu()
{
- LLMenuItemGL* separator = new LLMenuItemVerticalSeparatorGL();
- return append( separator );
+ S32 center_x;
+ S32 center_y;
+ localPointToScreen(getRect().getWidth(), getRect().getHeight() , ¢er_x, ¢er_y);
+ mBranch->show( center_x, center_y, FALSE);
}
-// add a menu - this will create a drop down menu.
-BOOL LLMenuBarGL::appendMenu( LLMenuGL* menu )
+// onCommit() - do the primary funcationality of the menu item.
+void LLContextMenuBranch::onCommit( void )
{
- if( menu == this )
- {
- llerrs << "** Attempt to attach menu to itself. This is certainly "
- << "a logic error." << llendl;
- }
-
- BOOL success = TRUE;
+ showSubMenu();
- LLMenuItemBranchGL* branch = NULL;
- branch = new LLMenuItemBranchDownGL( menu->getName(), menu->getLabel(), menu->getHandle());
- success &= branch->addToAcceleratorList(&mAccelerators);
- success &= append( branch );
- branch->setJumpKey(branch->getJumpKey());
- return success;
}
-
-BOOL LLMenuBarGL::handleHover( S32 x, S32 y, MASK mask )
+void LLContextMenuBranch::setHighlight( BOOL highlight )
{
- BOOL handled = FALSE;
- LLView* active_menu = NULL;
-
- BOOL no_mouse_data = mLastMouseX == 0 && mLastMouseY == 0;
- S32 mouse_delta_x = no_mouse_data ? 0 : x - mLastMouseX;
- S32 mouse_delta_y = no_mouse_data ? 0 : y - mLastMouseY;
- mMouseVelX = (mMouseVelX / 2) + (mouse_delta_x / 2);
- mMouseVelY = (mMouseVelY / 2) + (mouse_delta_y / 2);
- mLastMouseX = x;
- mLastMouseY = y;
-
- // if nothing currently selected or mouse has moved since last call, pick menu item via mouse
- // otherwise let keyboard control it
- if (!getHighlightedItem() || !LLMenuGL::getKeyboardMode() || llabs(mMouseVelX) > 0 || llabs(mMouseVelY) > 0)
+ if (highlight == getHighlight()) return;
+ LLMenuItemGL::setHighlight(highlight);
+ if( highlight )
{
- // find current active menu
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
- {
- LLView* viewp = *child_it;
- if (((LLMenuItemGL*)viewp)->isOpen())
- {
- active_menu = viewp;
- }
- }
+ showSubMenu();
+ }
+ else
+ {
+ mBranch->hide();
+ }
+}
- // check for new active menu
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
- {
- LLView* viewp = *child_it;
- S32 local_x = x - viewp->getRect().mLeft;
- S32 local_y = y - viewp->getRect().mBottom;
- if( viewp->getVisible() &&
- viewp->getEnabled() &&
- viewp->pointInView(local_x, local_y) &&
- viewp->handleHover(local_x, local_y, mask))
- {
- ((LLMenuItemGL*)viewp)->setHighlight(TRUE);
- handled = TRUE;
- if (active_menu && active_menu != viewp)
- {
- ((LLMenuItemGL*)viewp)->doIt();
- LLMenuGL::setKeyboardMode(FALSE);
- }
- LLMenuGL::setKeyboardMode(FALSE);
- }
- }
- if (handled)
- {
- // set hover false on inactive menus
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
- {
- LLView* viewp = *child_it;
- S32 local_x = x - viewp->getRect().mLeft;
- S32 local_y = y - viewp->getRect().mBottom;
- if (!viewp->pointInView(local_x, local_y) && ((LLMenuItemGL*)viewp)->getHighlight())
- {
- ((LLMenuItemGL*)viewp)->setHighlight(FALSE);
- }
- }
- }
- }
+///////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
+// class LLContextMenu
+// A context menu
+//-----------------------------------------------------------------------------
+static LLRegisterWidget<LLContextMenu> context_menu_register("context_menu");
- getWindow()->setCursor(UI_CURSOR_ARROW);
-
- return TRUE;
-}
+LLContextMenu::LLContextMenu(const Params& p)
+: LLMenuGL(p),
+ mHoveredAnyItem(FALSE),
+ mHoverItem(NULL)
-///============================================================================
-/// Class LLMenuHolderGL
-///============================================================================
-LLMenuHolderGL::LLMenuHolderGL()
- : LLPanel(std::string("Menu Holder"))
{
- setMouseOpaque(FALSE);
- sItemActivationTimer.stop();
- mCanHide = TRUE;
+ //setBackgroundVisible(TRUE);
}
-LLMenuHolderGL::LLMenuHolderGL(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows)
-: LLPanel(name, rect, FALSE)
+void LLContextMenu::setVisible(BOOL visible)
{
- setMouseOpaque(mouse_opaque);
- sItemActivationTimer.stop();
- mCanHide = TRUE;
+ if (!visible)
+ hide();
}
-
-void LLMenuHolderGL::draw()
+void LLContextMenu::show(S32 x, S32 y,BOOL adjustCursor)
{
- LLView::draw();
- // now draw last selected item as overlay
- LLMenuItemGL* selecteditem = (LLMenuItemGL*)sItemLastSelectedHandle.get();
- if (selecteditem && sItemActivationTimer.getStarted() && sItemActivationTimer.getElapsedTimeF32() < ACTIVATE_HIGHLIGHT_TIME)
- {
- // make sure toggle items, for example, show the proper state when fading out
- selecteditem->buildDrawLabel();
+ S32 width = getRect().getWidth();
+ S32 height = getRect().getHeight();
- LLRect item_rect;
- selecteditem->localRectToOtherView(selecteditem->getLocalRect(), &item_rect, this);
+ const LLRect menu_region_rect = LLMenuGL::sMenuContainer->getMenuRect();
- F32 interpolant = sItemActivationTimer.getElapsedTimeF32() / ACTIVATE_HIGHLIGHT_TIME;
- F32 alpha = lerp(LLMenuItemGL::getHighlightBGColor().mV[VALPHA], 0.f, interpolant);
- LLColor4 bg_color(LLMenuItemGL::getHighlightBGColor().mV[VRED],
- LLMenuItemGL::getHighlightBGColor().mV[VGREEN],
- LLMenuItemGL::getHighlightBGColor().mV[VBLUE],
- alpha);
-
- LLUI::pushMatrix();
- {
- LLUI::translate((F32)item_rect.mLeft, (F32)item_rect.mBottom, 0.f);
- selecteditem->getMenu()->drawBackground(selecteditem, bg_color);
- selecteditem->draw();
- }
- LLUI::popMatrix();
- }
-}
+ LLView* parent_view = getParent();
-BOOL LLMenuHolderGL::handleMouseDown( S32 x, S32 y, MASK mask )
-{
- BOOL handled = LLView::childrenHandleMouseDown(x, y, mask) != NULL;
- if (!handled)
- {
- // clicked off of menu, hide them all
- hideMenus();
- }
- return handled;
-}
+ S32 local_x, local_y;
+ parent_view->screenPointToLocal(x, y, &local_x, &local_y);
-BOOL LLMenuHolderGL::handleRightMouseDown( S32 x, S32 y, MASK mask )
-{
- BOOL handled = LLView::childrenHandleRightMouseDown(x, y, mask) != NULL;
- if (!handled)
- {
- // clicked off of menu, hide them all
- hideMenus();
- }
- return handled;
-}
+ // HACK: casting away const. Should use setRect or some helper function instead.
+ const_cast<LLRect&>(getRect()).setCenterAndSize(local_x + width/2, local_y - height/2, width, height);
+ arrange();
-void LLMenuHolderGL::reshape(S32 width, S32 height, BOOL called_from_parent)
-{
- if (width != getRect().getWidth() || height != getRect().getHeight())
+
+ if (translateIntoRect(menu_region_rect,FALSE) && adjustCursor)
{
- hideMenus();
+ LLUI::setCursorPositionLocal(getParent(), getRect().mLeft , getRect().mTop);
}
- LLView::reshape(width, height, called_from_parent);
+
+ LLView::setVisible(TRUE);
+
}
-BOOL LLMenuHolderGL::hasVisibleMenu() const
+void LLContextMenu::hide()
{
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+ if (!getVisible()) return;
+
+ LLView::setVisible(FALSE);
+
+ gFocusMgr.setMouseCapture(NULL);
+
+ if (mHoverItem)
{
- LLView* viewp = *child_it;
- if (viewp->getVisible() && dynamic_cast<LLMenuBarGL*>(viewp) == NULL)
- {
- return TRUE;
- }
+ mHoverItem->setHighlight( FALSE );
}
- return FALSE;
+ mHoverItem = NULL;
}
-BOOL LLMenuHolderGL::hideMenus()
+BOOL LLContextMenu::handleHover( S32 x, S32 y, MASK mask )
{
- if (!mCanHide)
- {
- return FALSE;
- }
- BOOL menu_visible = hasVisibleMenu();
- if (menu_visible)
+ BOOL handled = FALSE;
+
+ LLMenuItemGL *item = getItemFromXY( x, y );
+
+ if (item && item->getEnabled())
{
- LLMenuGL::setKeyboardMode(FALSE);
- // clicked off of menu, hide them all
- for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
+ getWindow()->setCursor(UI_CURSOR_ARROW);
+ handled = TRUE;
+
+ if (item != mHoverItem)
{
- LLView* viewp = *child_it;
- // clicks off of menu do not hide menu bar
- if (dynamic_cast<LLMenuBarGL*>(viewp) == NULL && viewp->getVisible())
+ if (mHoverItem)
{
- viewp->setVisible(FALSE);
+ mHoverItem->setHighlight( FALSE );
}
+ mHoverItem = item;
+ mHoverItem->setHighlight( TRUE );
+ }
+ mHoveredAnyItem = TRUE;
+ }
+ else
+ {
+ // clear out our selection
+ if (mHoverItem)
+ {
+ mHoverItem->setHighlight(FALSE);
+ mHoverItem = NULL;
}
}
- //if (gFocusMgr.childHasKeyboardFocus(this))
- //{
- // gFocusMgr.setKeyboardFocus(NULL);
- //}
- return menu_visible;
-}
+ if( !handled && pointInView( x, y ) )
+ {
+ getWindow()->setCursor(UI_CURSOR_ARROW);
+ handled = TRUE;
+ }
-void LLMenuHolderGL::setActivatedItem(LLMenuItemGL* item)
-{
- sItemLastSelectedHandle = item->getHandle();
- sItemActivationTimer.start();
+ return handled;
}
-///============================================================================
-/// Class LLTearOffMenu
-///============================================================================
-LLTearOffMenu::LLTearOffMenu(LLMenuGL* menup) :
- LLFloater(menup->getName(), LLRect(0, 100, 100, 0), menup->getLabel(), FALSE, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT, FALSE, FALSE)
+BOOL LLContextMenu::handleMouseDown( S32 x, S32 y, MASK mask )
{
- // flag menu as being torn off
- menup->setTornOff(TRUE);
- // update menu layout as torn off menu (no spillover menus)
- menup->arrange();
-
- LLRect rect;
- menup->localRectToOtherView(LLRect(-1, menup->getRect().getHeight(), menup->getRect().getWidth() + 3, 0), &rect, gFloaterView);
- // make sure this floater is big enough for menu
- mTargetHeight = (F32)(rect.getHeight() + LLFLOATER_HEADER_SIZE + 5);
- reshape(rect.getWidth(), rect.getHeight());
- setRect(rect);
-
- // attach menu to floater
- menup->setFollowsAll();
- mOldParent = menup->getParent();
- addChild(menup);
- menup->setVisible(TRUE);
- menup->translate(-menup->getRect().mLeft + 1, -menup->getRect().mBottom + 1);
- menup->setDropShadowed(FALSE);
+ BOOL handled = FALSE;
+ // The click was somewhere within our rectangle
+ LLMenuItemGL *item = getItemFromXY( x, y );
- mMenu = menup;
+ if (item)
+ {
+ // lie to the item about where the click happened
+ // to make sure it's within the item's rectangle
+ handled = item->handleMouseDown( 0, 0, mask );
+ }
+ else
+ {
+ // call hidemenus to make sure transient selections get cleared
+ ((LLMenuHolderGL*)getParent())->hideMenus();
+ }
- // highlight first item (tear off item will be disabled)
- mMenu->highlightNextItem(NULL);
+ // always handle mouse down as mouse up will close open menus
+ return handled;
}
-
-
-void LLTearOffMenu::draw()
+BOOL LLContextMenu::handleMouseUp( S32 x, S32 y, MASK mask )
{
- mMenu->setBackgroundVisible(isBackgroundOpaque());
- mMenu->arrange();
+ BOOL handled = FALSE;
- if (getRect().getHeight() != mTargetHeight)
+ // The click was somewhere within our rectangle
+ LLMenuItemGL *item = getItemFromXY( x, y );
+
+ if (item)
{
- // animate towards target height
- reshape(getRect().getWidth(), llceil(lerp((F32)getRect().getHeight(), mTargetHeight, LLCriticalDamp::getInterpolant(0.05f))));
+ // lie to the item about where the click happened
+ // to make sure it's within the item's rectangle
+ if (item->getEnabled())
+ {
+ handled = item->handleMouseUp( 0, 0, mask );
+ hide();
+ }
}
- else
+ else
{
- // when in stasis, remain big enough to hold menu contents
- mTargetHeight = (F32)(mMenu->getRect().getHeight() + LLFLOATER_HEADER_SIZE + 4);
- reshape(mMenu->getRect().getWidth() + 3, mMenu->getRect().getHeight() + LLFLOATER_HEADER_SIZE + 5);
+ // call hidemenus to make sure transient selections get cleared
+ ((LLMenuHolderGL*)getParent())->hideMenus();
}
- LLFloater::draw();
+
+ if (!handled)
+ {
+ // call hidemenus to make sure transient selections get cleared
+ sMenuContainer->hideMenus();
+ }
+
+ return handled;
}
-void LLTearOffMenu::onFocusReceived()
+BOOL LLContextMenu::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
- // if nothing is highlighted, just highlight first item
- if (!mMenu->getHighlightedItem())
+ BOOL handled = FALSE;
+
+ // The click was somewhere within our rectangle
+ LLMenuItemGL *item = getItemFromXY( x, y );
+
+ S32 local_x = x - getRect().mLeft;
+ S32 local_y = y - getRect().mBottom;
+
+ BOOL clicked_in_menu = pointInView(local_x, local_y) ;
+
+ // grab mouse if right clicking anywhere within pie (even deadzone in middle), to detect drag outside of pie
+ if (clicked_in_menu)
{
- mMenu->highlightNextItem(NULL);
+ // capture mouse cursor as if on initial menu show
+ handled = TRUE;
}
-
- // parent menu items get highlights so navigation logic keeps working
- LLMenuItemGL* parent_menu_item = mMenu->getParentMenuItem();
- while(parent_menu_item)
+
+ if (item)
{
- if (parent_menu_item->getMenu()->getVisible())
- {
- parent_menu_item->setHighlight(TRUE);
- parent_menu_item = parent_menu_item->getMenu()->getParentMenuItem();
- }
- else
+ // lie to the item about where the click happened
+ // to make sure it's within the item's rectangle
+ if (item->handleMouseDown( 0, 0, mask ))
{
- break;
+ handled = TRUE;
}
}
- LLFloater::onFocusReceived();
-}
-void LLTearOffMenu::onFocusLost()
-{
- // remove highlight from parent item and our own menu
- mMenu->clearHoverItem();
- LLFloater::onFocusLost();
+ return handled;
}
-BOOL LLTearOffMenu::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
+BOOL LLContextMenu::handleRightMouseUp( S32 x, S32 y, MASK mask )
{
- // pass keystrokes down to menu
- return mMenu->handleUnicodeChar(uni_char, TRUE);
-}
+ // release mouse capture when right mouse button released, and we're past the shrink time
-BOOL LLTearOffMenu::handleKeyHere(KEY key, MASK mask)
-{
- if (!mMenu->getHighlightedItem())
+ S32 local_x = x - getRect().mLeft;
+ S32 local_y = y - getRect().mBottom;
+
+ if (!mHoveredAnyItem && !pointInView(local_x, local_y))
{
- if (key == KEY_UP)
- {
- mMenu->highlightPrevItem(NULL);
- return TRUE;
- }
- else if (key == KEY_DOWN)
- {
- mMenu->highlightNextItem(NULL);
- return TRUE;
- }
+ gFocusMgr.setMouseCapture(NULL);
+ sMenuContainer->hideMenus();
+ return TRUE;
}
- // pass keystrokes down to menu
- return mMenu->handleKey(key, mask, TRUE);
+
+
+ BOOL result = handleMouseUp( x, y, mask );
+ mHoveredAnyItem = FALSE;
+
+ return result;
}
-void LLTearOffMenu::translate(S32 x, S32 y)
+LLMenuItemGL* LLContextMenu::getItemFromXY (S32 x, S32 y)
{
- if (x != 0 && y != 0)
+ item_list_t::iterator item_iter;
+ for (item_iter = mItems.begin(); item_iter != mItems.end(); ++item_iter)
{
- // hide open sub-menus by clearing current hover item
- mMenu->clearHoverItem();
+ S32 local_x = x - (**item_iter).getRect().mLeft;
+ S32 local_y = y - (**item_iter).getRect().mBottom;
+ if((**item_iter).pointInView(local_x,local_y))
+ return *item_iter;
}
- LLFloater::translate(x, y);
+ return NULL;
}
-//static
-LLTearOffMenu* LLTearOffMenu::create(LLMenuGL* menup)
+void LLContextMenu::draw ()
{
- LLTearOffMenu* tearoffp = new LLTearOffMenu(menup);
- // keep onscreen
- gFloaterView->adjustToFitScreen(tearoffp, FALSE);
- tearoffp->open(); /* Flawfinder: ignore */
+ LLMenuGL::draw();
+}
- return tearoffp;
+BOOL LLContextMenu::appendContextSubMenu(LLContextMenu *menu)
+{
+
+ if (menu == this)
+ {
+ llerrs << "Can't attach a context menu to itself" << llendl;
+ }
+
+ LLContextMenuBranch *item;
+ LLContextMenuBranch::Params p;
+ p.name = menu->getName();
+ p.label = menu->getLabel();
+ p.branch = menu;
+
+ item = LLUICtrlFactory::create<LLContextMenuBranch>(p);
+ LLMenuGL::sMenuContainer->addChild(item->getBranch());
+ item->setFont( LLFontGL::getFontSansSerifSmall() );
+
+ return append( item );
}
-void LLTearOffMenu::onClose(bool app_quitting)
+bool LLContextMenu::addChild(LLView* view, S32 tab_group)
{
- removeChild(mMenu);
- mOldParent->addChild(mMenu);
- mMenu->clearHoverItem();
- mMenu->setFollowsNone();
- mMenu->setBackgroundVisible(TRUE);
- mMenu->setVisible(FALSE);
- mMenu->setTornOff(FALSE);
- mMenu->setDropShadowed(TRUE);
- destroy();
+ LLContextMenu* context = dynamic_cast<LLContextMenu*>(view);
+ if (context)
+ return appendContextSubMenu(context);
+
+ LLMenuItemSeparatorGL* separator = dynamic_cast<LLMenuItemSeparatorGL*>(view);
+ if (separator)
+ return append(separator);
+
+ LLMenuItemGL* item = dynamic_cast<LLMenuItemGL*>(view);
+ if (item)
+ return append(item);
+
+ return false;
}
diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h
index a2ef968bcd..3cb76efce0 100644
--- a/indra/llui/llmenugl.h
+++ b/indra/llui/llmenugl.h
@@ -38,78 +38,87 @@
#include "llstring.h"
#include "v4color.h"
#include "llframetimer.h"
-#include "llevent.h"
#include "llkeyboard.h"
#include "llfloater.h"
#include "lluistring.h"
#include "llview.h"
-
+#include <boost/function.hpp>
extern S32 MENU_BAR_HEIGHT;
extern S32 MENU_BAR_WIDTH;
-// These callbacks are used by the LLMenuItemCallGL and LLMenuItemCheckGL
-// classes during their work.
-typedef void (*menu_callback)(void*);
-
-// These callbacks are used by the LLMenuItemCallGL
-// classes during their work.
-typedef void (*on_disabled_callback)(void*);
-
-// This callback is used by the LLMenuItemCallGL and LLMenuItemCheckGL
-// to determine if the current menu is enabled.
-typedef BOOL (*enabled_callback)(void*);
-
-// This callback is used by LLMenuItemCheckGL to determine it's
-// 'checked' state.
-typedef BOOL (*check_callback)(void*);
-
-// This callback is potentially used by LLMenuItemCallGL. If provided,
-// this function is called whenever it's time to determine the label's
-// contents. Put the contents of the label in the provided parameter.
-typedef void (*label_callback)(std::string&,void*);
-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLMenuItemGL
//
// The LLMenuItemGL represents a single menu item in a menu.
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLMenuItemGL : public LLView
+class LLMenuItemGL : public LLUICtrl
{
public:
- // static functions to control the global color scheme.
- static void setEnabledColor( const LLColor4& color ) { sEnabledColor = color; }
- static const LLColor4& getEnabledColor() { return sEnabledColor; }
- static void setDisabledColor( const LLColor4& color ) { sDisabledColor = color; }
- static const LLColor4& getDisabledColor() { return sDisabledColor; }
- static void setHighlightBGColor( const LLColor4& color ) { sHighlightBackground = color; }
- static const LLColor4& getHighlightBGColor() { return sHighlightBackground; }
- static void setHighlightFGColor( const LLColor4& color ) { sHighlightForeground = color; }
- static const LLColor4& getHighlightFGColor() { return sHighlightForeground; }
-
- LLMenuItemGL( const std::string& name, const std::string& label, KEY key = KEY_NONE, MASK = MASK_NONE );
- virtual ~LLMenuItemGL() {};
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<std::string> shortcut;
+ Optional<KEY> jump_key;
+ Optional<bool> use_mac_ctrl;
+
+ Deprecated rect,
+ left,
+ top,
+ right,
+ bottom,
+ width,
+ height,
+ bottom_delta,
+ left_delta;
+
+ Optional<LLUIColor> enabled_color,
+ disabled_color,
+ highlight_bg_color,
+ highlight_fg_color;
+
+
+ Params()
+ : shortcut("shortcut"),
+ jump_key("", KEY_NONE),
+ use_mac_ctrl("use_mac_ctrl", false),
+ rect("rect"),
+ left("left"),
+ top("top"),
+ right("right"),
+ bottom("bottom"),
+ width("width"),
+ height("height"),
+ bottom_delta("bottom_delta"),
+ left_delta("left_delta"),
+ enabled_color("enabled_color"),
+ disabled_color("disabled_color"),
+ highlight_bg_color("highlight_bg_color"),
+ highlight_fg_color("highlight_fg_color")
+ {
+ mouse_opaque = true;
+ }
+ };
+protected:
+ LLMenuItemGL(const Params&);
+ friend class LLUICtrlFactory;
+public:
virtual void setValue(const LLSD& value) { setLabel(value.asString()); }
-
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
-
- virtual std::string getType() const { return "item"; }
+ /*virtual*/ void onVisibilityChange(BOOL new_visibility);
virtual BOOL handleHover(S32 x, S32 y, MASK mask);
-
virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
+ LLColor4 getHighlightBgColor() { return mHighlightBackground.get(); }
+
void setJumpKey(KEY key);
KEY getJumpKey() const { return mJumpKey; }
// set the font used by this item.
void setFont(const LLFontGL* font) { mFont = font; }
const LLFontGL* getFont() const { return mFont; }
- void setFontStyle(U8 style) { mStyle = style; }
- U8 getFontStyle() const { return mStyle; }
// returns the height in pixels for the current font.
virtual U32 getNominalHeight( void ) const;
@@ -140,7 +149,7 @@ public:
// lead to visual errors if the state of the object changes
// without the knowledge of the menu item. For example, if a
// boolean being watched is changed outside of the menu item's
- // doIt() function, the draw buffer will not be updated and will
+ // onCommit() function, the draw buffer will not be updated and will
// reflect the wrong value. If this ever becomes an issue, there
// are ways to fix this.
// Returns the enabled state of the item.
@@ -149,8 +158,7 @@ public:
// for branching menu items, bring sub menus up to root level of menu hierarchy
virtual void updateBranchParent( LLView* parentp ){};
- // doIt() - do the primary funcationality of the menu item.
- virtual void doIt( void );
+ virtual void onCommit( void );
virtual void setHighlight( BOOL highlight );
virtual BOOL getHighlight() const { return mHighlight; }
@@ -180,7 +188,10 @@ protected:
// This function appends the character string representation of
// the current accelerator key and mask to the provided string.
void appendAcceleratorString( std::string& st ) const;
-
+
+ void initMenuEnableCallback(const EnableCallbackParam& cb, enable_signal_t& sig);
+
+protected:
KEY mAcceleratorKey;
MASK mAcceleratorMask;
// mLabel contains the actual label specified by the user.
@@ -193,13 +204,13 @@ protected:
LLUIString mDrawAccelLabel;
LLUIString mDrawBranchLabel;
+ LLUIColor mEnabledColor;
+ LLUIColor mDisabledColor;
+ LLUIColor mHighlightBackground;
+ LLUIColor mHighlightForeground;
+
BOOL mHighlight;
private:
- static LLColor4 sEnabledColor;
- static LLColor4 sDisabledColor;
- static LLColor4 sHighlightBackground;
- static LLColor4 sHighlightForeground;
-
// Keyboard and mouse variables
BOOL mAllowKeyRepeat;
BOOL mGotHover;
@@ -210,12 +221,32 @@ private:
// Font for this item
const LLFontGL* mFont;
- U8 mStyle;
BOOL mDrawTextDisabled;
KEY mJumpKey;
};
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLMenuItemSeparatorGL
+//
+// This class represents a separator.
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+class LLMenuItemSeparatorGL : public LLMenuItemGL
+{
+public:
+ struct Params : public LLInitParam::Block<Params, LLMenuItemGL::Params>
+ {
+ Params();
+ };
+ LLMenuItemSeparatorGL(const LLMenuItemSeparatorGL::Params& p = LLMenuItemSeparatorGL::Params());
+
+ /*virtual*/ void draw( void );
+ /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
+
+ /*virtual*/ U32 getNominalHeight( void ) const;
+};
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLMenuItemCallGL
@@ -224,78 +255,48 @@ private:
// calls a user defined callback.
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-class LLMenuItemCallGL : public LLMenuItemGL, public LLObservable
+class LLMenuItemCallGL : public LLMenuItemGL
{
public:
- // normal constructor
- LLMenuItemCallGL( const std::string& name,
- menu_callback clicked_cb,
- enabled_callback enabled_cb = NULL,
- void* user_data = NULL,
- KEY key = KEY_NONE, MASK mask = MASK_NONE,
- BOOL enabled = TRUE,
- on_disabled_callback on_disabled_cb = NULL);
- LLMenuItemCallGL( const std::string& name,
- const std::string& label,
- menu_callback clicked_cb,
- enabled_callback enabled_cb = NULL,
- void* user_data = NULL,
- KEY key = KEY_NONE, MASK mask = MASK_NONE,
- BOOL enabled = TRUE,
- on_disabled_callback on_disabled_cb = NULL);
-
- // constructor for when you want to trap the arrange method.
- LLMenuItemCallGL( const std::string& name,
- const std::string& label,
- menu_callback clicked_cb,
- enabled_callback enabled_cb,
- label_callback label_cb,
- void* user_data,
- KEY key = KEY_NONE, MASK mask = MASK_NONE,
- BOOL enabled = TRUE,
- on_disabled_callback on_disabled_c = NULL);
- LLMenuItemCallGL( const std::string& name,
- menu_callback clicked_cb,
- enabled_callback enabled_cb,
- label_callback label_cb,
- void* user_data,
- KEY key = KEY_NONE, MASK mask = MASK_NONE,
- BOOL enabled = TRUE,
- on_disabled_callback on_disabled_c = NULL);
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
-
- virtual std::string getType() const { return "call"; }
-
-
- void setEnabledControl(std::string enabled_control, LLView *context);
- void setVisibleControl(std::string enabled_control, LLView *context);
-
- void setMenuCallback(menu_callback callback, void* data) { mCallback = callback; mUserData = data; };
- menu_callback getMenuCallback() const { return mCallback; }
-
- void setEnabledCallback(enabled_callback callback) { mEnabledCallback = callback; };
-
- void setUserData(void *userdata) { mUserData = userdata; }
- void* getUserData() const { return mUserData; }
+ struct Params : public LLInitParam::Block<Params, LLMenuItemGL::Params>
+ {
+ Optional<EnableCallbackParam > on_enable;
+ Optional<CommitCallbackParam > on_click;
+ Params()
+ : on_enable("on_enable"),
+ on_click("on_click")
+ {}
+ };
+protected:
+ LLMenuItemCallGL(const Params&);
+ friend class LLUICtrlFactory;
+ void updateEnabled( void );
+public:
+ void initFromParams(const Params& p);
+
// called to rebuild the draw label
virtual void buildDrawLabel( void );
- // doIt() - do the primary funcationality of the menu item.
- virtual void doIt( void );
+ virtual void onCommit( void );
virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
-
+ virtual BOOL handleKeyHere(KEY key, MASK mask);
+
//virtual void draw();
-
-
+
+ boost::signals::connection setClickCallback( const commit_signal_t::slot_type& cb )
+ {
+ return setCommitCallback(cb);
+ }
+
+ boost::signals::connection setEnableCallback( const enable_signal_t::slot_type& cb )
+ {
+ return mEnableSignal.connect(cb);
+ }
+
private:
- menu_callback mCallback;
- // mEnabledCallback should return TRUE if the item should be enabled
- enabled_callback mEnabledCallback;
- label_callback mLabelCallback;
- void* mUserData;
- on_disabled_callback mOnDisabledCallback;
+ enable_signal_t mEnableSignal;
};
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -312,78 +313,37 @@ class LLMenuItemCheckGL
: public LLMenuItemCallGL
{
public:
- LLMenuItemCheckGL( const std::string& name,
- const std::string& label,
- menu_callback callback,
- enabled_callback enabled_cb,
- check_callback check,
- void* user_data,
- KEY key = KEY_NONE, MASK mask = MASK_NONE );
- LLMenuItemCheckGL( const std::string& name,
- menu_callback callback,
- enabled_callback enabled_cb,
- check_callback check,
- void* user_data,
- KEY key = KEY_NONE, MASK mask = MASK_NONE );
- LLMenuItemCheckGL( const std::string& name,
- const std::string& label,
- menu_callback callback,
- enabled_callback enabled_cb,
- std::string control_name,
- LLView *context,
- void* user_data,
- KEY key = KEY_NONE, MASK mask = MASK_NONE );
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
-
- void setCheckedControl(std::string checked_control, LLView *context);
-
- virtual void setValue(const LLSD& value);
-
- virtual std::string getType() const { return "check"; }
-
- // called to rebuild the draw label
- virtual void buildDrawLabel( void );
-
-private:
- check_callback mCheckCallback;
- BOOL mChecked;
-};
-
-
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// Class LLMenuItemToggleGL
-//
-// The LLMenuItemToggleGL is a menu item that wraps around a user
-// specified and controlled boolean.
-//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ struct Params : public LLInitParam::Block<Params, LLMenuItemCallGL::Params>
+ {
+ Optional<EnableCallbackParam > on_check;
+ Params()
+ : on_check("on_check")
+ {}
+ };
-class LLMenuItemToggleGL : public LLMenuItemGL
-{
+protected:
+ LLMenuItemCheckGL(const Params&);
+ friend class LLUICtrlFactory;
public:
- LLMenuItemToggleGL( const std::string& name, const std::string& label,
- BOOL* toggle,
- KEY key = KEY_NONE, MASK mask = MASK_NONE );
-
- LLMenuItemToggleGL( const std::string& name,
- BOOL* toggle,
- KEY key = KEY_NONE, MASK mask = MASK_NONE );
+
+ void initFromParams(const Params& p);
- virtual std::string getType() const { return "toggle"; }
+ virtual void onCommit( void );
+
+ virtual void setValue(const LLSD& value);
// called to rebuild the draw label
virtual void buildDrawLabel( void );
-
- // doIt() - do the primary funcationality of the menu item.
- virtual void doIt( void );
-
- // LLView Functionality
- //virtual void draw( void );
-
+
+ boost::signals::connection setCheckCallback( const enable_signal_t::slot_type& cb )
+ {
+ return mCheckSignal.connect(cb);
+ }
+
private:
- BOOL* mToggle;
+ enable_signal_t mCheckSignal;
};
-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLMenuGL
//
@@ -397,27 +357,55 @@ private:
class LLMenuGL
: public LLUICtrl
-// TODO: The menu and menu item classes share a great deal of functionality and perhaps should be united.
-// I think it may make the most sense to make LLMenuGL be a subclass of LLMenuItemGL. -MG
{
+public:
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<LLHandle<LLFloater> > parent_floater;
+ Optional<KEY> jump_key;
+ Optional<bool> horizontal_layout,
+ can_tear_off,
+ drop_shadow,
+ bg_visible,
+ create_jump_keys,
+ keep_fixed_size;
+ Optional<LLUIColor> bg_color;
+
+ Params()
+ : jump_key("", KEY_NONE),
+ can_tear_off("tear_off", false),
+ drop_shadow("drop_shadow", true),
+ bg_visible("bg_visible", true),
+ create_jump_keys("create_jump_keys", false),
+ bg_color("bg_color", LLUI::getCachedColorFunctor( "MenuDefaultBgColor" ))
+ {
+ addSynonym(bg_visible, "opaque");
+ addSynonym(bg_color, "color");
+
+ name = "menu";
+ }
+ };
+ void initFromParams(const Params&);
+
+protected:
+ LLMenuGL(const LLMenuGL::Params& p);
+ friend class LLUICtrlFactory;
// let branching menu items use my protected traversal methods
friend class LLMenuItemBranchGL;
public:
- LLMenuGL( const std::string& name, const std::string& label, LLHandle<LLFloater> parent_floater = LLHandle<LLFloater>());
- LLMenuGL( const std::string& label, LLHandle<LLFloater> parent_floater = LLHandle<LLFloater>() );
virtual ~LLMenuGL( void );
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-
- void parseChildXML(LLXMLNodePtr child, LLView *parent, LLUICtrlFactory *factory);
+ void parseChildXML(LLXMLNodePtr child, LLView* parent);
// LLView Functionality
- virtual BOOL handleUnicodeCharHere( llwchar uni_char );
- virtual BOOL handleHover( S32 x, S32 y, MASK mask );
- virtual void draw( void );
- virtual void drawBackground(LLMenuItemGL* itemp, LLColor4& color);
- virtual void setVisible(BOOL visible);
+ /*virtual*/ BOOL handleUnicodeCharHere( llwchar uni_char );
+ /*virtual*/ BOOL handleHover( S32 x, S32 y, MASK mask );
+ /*virtual*/ void draw( void );
+ /*virtual*/ void drawBackground(LLMenuItemGL* itemp, F32 alpha);
+ /*virtual*/ void setVisible(BOOL visible);
+ /*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);
+ /*virtual*/ void removeChild( LLView* ctrl);
+ /*virtual*/ BOOL postBuild();
virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
@@ -430,20 +418,13 @@ public:
void setLabel(const LLStringExplicit& label) { mLabel = label; }
// background colors
- static void setDefaultBackgroundColor( const LLColor4& color ) { sDefaultBackgroundColor = color; }
- void setBackgroundColor( const LLColor4& color ) { mBackgroundColor = color; }
- const LLColor4& getBackgroundColor() const { return mBackgroundColor; }
+ void setBackgroundColor( const LLUIColor& color ) { mBackgroundColor = color; }
+ const LLUIColor& getBackgroundColor() const { return mBackgroundColor; }
void setBackgroundVisible( BOOL b ) { mBgVisible = b; }
void setCanTearOff(BOOL tear_off, LLHandle<LLFloater> parent_floater_handle = LLHandle<LLFloater>());
- // Add the menu item to this menu.
- virtual BOOL append( LLMenuItemGL* item );
-
// add a separator to this menu
- virtual BOOL appendSeparator( const std::string &separator_name = LLStringUtil::null );
-
- // add a menu - this will create a cascading menu
- virtual BOOL appendMenu( LLMenuGL* menu );
+ virtual BOOL addSeparator();
// for branching menu items, bring sub menus up to root level of menu hierarchy
virtual void updateParent( LLView* parentp );
@@ -467,19 +448,17 @@ public:
virtual BOOL isOpen();
+ void needsArrange() { mNeedsArrange = TRUE; }
// Shape this menu to fit the current state of the children, and
// adjust the child rects to fit. This is called automatically
// when you add items. *FIX: We may need to deal with visibility
// arrangement.
virtual void arrange( void );
+ void arrangeAndClear( void );
// remove all items on the menu
void empty( void );
- // Rearrange the components, and do the right thing if the menu doesn't
- // fit in the bounds.
- // virtual void arrangeWithBounds(LLRect bounds);
-
void setItemLastSelected(LLMenuItemGL* item); // must be in menu
U32 getItemCount(); // number of menu items
LLMenuItemGL* getItem(S32 number); // 0 = first item
@@ -500,8 +479,8 @@ public:
// Whether to drop shadow menu bar
void setDropShadowed( const BOOL shadowed );
- void setParentMenuItem( LLMenuItemGL* parent_menu_item ) { mParentMenuItem = parent_menu_item; }
- LLMenuItemGL* getParentMenuItem() const { return mParentMenuItem; }
+ void setParentMenuItem( LLMenuItemGL* parent_menu_item ) { mParentMenuItem = parent_menu_item->getHandle(); }
+ LLMenuItemGL* getParentMenuItem() const { return dynamic_cast<LLMenuItemGL*>(mParentMenuItem.get()); }
void setTornOff(BOOL torn_off);
BOOL getTornOff() { return mTornOff; }
@@ -519,6 +498,11 @@ public:
protected:
void createSpilloverBranch();
void cleanupSpilloverBranch();
+ // Add the menu item to this menu.
+ virtual BOOL append( LLMenuItemGL* item );
+
+ // add a menu - this will create a cascading menu
+ virtual BOOL appendMenu( LLMenuGL* menu );
// TODO: create accessor methods for these?
typedef std::list< LLMenuItemGL* > item_list_t;
@@ -531,14 +515,17 @@ protected:
S32 mMouseVelY;
BOOL mHorizontalLayout;
BOOL mKeepFixedSize;
+ BOOL mNeedsArrange;
private:
+
+
static LLColor4 sDefaultBackgroundColor;
static BOOL sKeyboardMode;
- LLColor4 mBackgroundColor;
+ LLUIColor mBackgroundColor;
BOOL mBgVisible;
- LLMenuItemGL* mParentMenuItem;
+ LLHandle<LLView> mParentMenuItem;
LLUIString mLabel;
BOOL mDropShadowed; // Whether to drop shadow
BOOL mHasSelection;
@@ -549,6 +536,7 @@ private:
LLMenuGL* mSpilloverMenu;
LLHandle<LLFloater> mParentFloaterHandle;
KEY mJumpKey;
+ BOOL mCreateJumpKeys;
}; // end class LLMenuGL
@@ -563,15 +551,17 @@ private:
class LLMenuItemBranchGL : public LLMenuItemGL
{
public:
- LLMenuItemBranchGL( const std::string& name, const std::string& label, LLHandle<LLView> branch,
- KEY key = KEY_NONE, MASK mask = MASK_NONE );
+ struct Params : public LLInitParam::Block<Params, LLMenuItemGL::Params>
+ {
+ Optional<LLMenuGL*> branch;
+ };
+protected:
+ LLMenuItemBranchGL(const Params&);
+ friend class LLUICtrlFactory;
+public:
virtual ~LLMenuItemBranchGL();
-
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
-
- virtual std::string getType() const { return "menu"; }
-
+
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
@@ -582,8 +572,7 @@ public:
// called to rebuild the draw label
virtual void buildDrawLabel( void );
- // doIt() - do the primary funcationality of the menu item.
- virtual void doIt( void );
+ virtual void onCommit( void );
virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
@@ -594,11 +583,11 @@ public:
virtual BOOL handleKeyHere(KEY key, MASK mask);
- virtual BOOL isActive() const { return isOpen() && getBranch()->getHighlightedItem(); }
+ virtual BOOL isActive() const { return isOpen() && getBranch() && getBranch()->getHighlightedItem(); }
virtual BOOL isOpen() const { return getBranch() && getBranch()->isOpen(); }
- LLMenuGL *getBranch() const { return (LLMenuGL*)(mBranch.get()); }
+ LLMenuGL* getBranch() const { return (LLMenuGL*)mBranchHandle.get(); }
virtual void updateBranchParent( LLView* parentp );
@@ -607,77 +596,72 @@ public:
virtual void draw();
- virtual void setEnabledSubMenus(BOOL enabled) { if(getBranch()) getBranch()->setEnabledSubMenus(enabled); }
+ virtual void setEnabledSubMenus(BOOL enabled) { if (getBranch()) getBranch()->setEnabledSubMenus(enabled); }
virtual void openMenu();
virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
private:
- LLHandle<LLView> mBranch;
+ LLHandle<LLView> mBranchHandle;
}; // end class LLMenuItemBranchGL
-
//-----------------------------------------------------------------------------
-// class LLPieMenu
-// A circular menu of items, icons, etc.
+// class LLContextMenu
+// A context menu
//-----------------------------------------------------------------------------
-class LLPieMenu
+class LLContextMenu
: public LLMenuGL
{
public:
- LLPieMenu(const std::string& name, const std::string& label);
- LLPieMenu(const std::string& name);
- virtual ~LLPieMenu() {}
+ struct Params : public LLInitParam::Block<Params, LLMenuGL::Params>
+ {
+ Params()
+ {
+ visible = false;
+ }
+ };
- void initXML(LLXMLNodePtr node, LLView *context, LLUICtrlFactory *factory);
+protected:
+ LLContextMenu(const Params& p);
+ friend class LLUICtrlFactory;
+
+public:
+ virtual ~LLContextMenu() {}
// LLView Functionality
// can't set visibility directly, must call show or hide
- virtual void setVisible(BOOL visible);
+ virtual void setVisible (BOOL visible);
- virtual BOOL handleHover( S32 x, S32 y, MASK mask );
- virtual BOOL handleMouseDown( S32 x, S32 y, MASK mask );
- virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
- virtual BOOL handleRightMouseUp( S32 x, S32 y, MASK mask );
- virtual BOOL handleMouseUp( S32 x, S32 y, MASK mask );
- virtual void draw();
- virtual void drawBackground(LLMenuItemGL* itemp, LLColor4& color);
+ virtual void draw ();
+
+ virtual void show (S32 x, S32 y, BOOL adjustCursor = TRUE);
+ virtual void hide ();
- virtual BOOL append(LLMenuItemGL* item);
- virtual BOOL appendSeparator( const std::string &separator_name = LLStringUtil::null );
+
- BOOL appendPieMenu(LLPieMenu *menu);
+ virtual BOOL handleHover ( S32 x, S32 y, MASK mask );
+ virtual BOOL handleMouseDown ( S32 x, S32 y, MASK mask );
+ virtual BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
+ virtual BOOL handleRightMouseUp ( S32 x, S32 y, MASK mask );
+ virtual BOOL handleMouseUp ( S32 x, S32 y, MASK mask );
- virtual void arrange( void );
+ virtual bool addChild (LLView* view, S32 tab_group = 0);
- // Display the menu centered on this point on the screen.
- void show(S32 x, S32 y, BOOL mouse_down);
- void hide(BOOL item_selected);
+ BOOL appendContextSubMenu(LLContextMenu *menu);
-private:
- LLMenuItemGL *pieItemFromXY(S32 x, S32 y);
- S32 pieItemIndexFromXY(S32 x, S32 y);
-
- // These cause menu items to be spuriously selected by right-clicks
- // near the window edge at low frame rates. I don't think they are
- // needed unless you shift the menu position in the draw() function. JC
- //S32 mShiftHoriz; // non-zero if menu had to shift this frame
- //S32 mShiftVert; // non-zero if menu had to shift this frame
- BOOL mFirstMouseDown; // true from show until mouse up
- BOOL mUseInfiniteRadius; // allow picking pie menu items anywhere outside of center circle
- LLMenuItemGL* mHoverItem;
- BOOL mHoverThisFrame;
+protected:
+ LLMenuItemGL* getItemFromXY (S32 x, S32 y);
+
+protected:
BOOL mHoveredAnyItem;
- LLFrameTimer mShrinkBorderTimer;
- F32 mOuterRingAlpha; // for rendering pie menus as both bounded and unbounded
- F32 mCurRadius;
- BOOL mRightMouseDown;
+ LLMenuItemGL* mHoverItem;
};
+
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLMenuBarGL
//
@@ -687,10 +671,19 @@ private:
class LLMenuBarGL : public LLMenuGL
{
public:
- LLMenuBarGL( const std::string& name );
+ struct Params : public LLInitParam::Block<Params, LLMenuGL::Params>
+ {
+ Params()
+ {
+ can_tear_off = false;
+ keep_fixed_size = true;
+ horizontal_layout = true;
+ visible = true;
+ drop_shadow = false;
+ }
+ };
+ LLMenuBarGL( const Params& p );
virtual ~LLMenuBarGL();
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
virtual BOOL handleKeyHere(KEY key, MASK mask);
@@ -698,17 +691,11 @@ public:
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
- // rearrange the child rects so they fit the shape of the menu
- // bar.
- virtual void arrange( void );
virtual void draw();
virtual BOOL jumpKeysActive();
// add a vertical separator to this menu
- virtual BOOL appendSeparator( const std::string &separator_name = LLStringUtil::null );
-
- // add a menu - this will create a drop down menu.
- virtual BOOL appendMenu( LLMenuGL* menu );
+ virtual BOOL addSeparator();
// LLView Functionality
virtual BOOL handleHover( S32 x, S32 y, MASK mask );
@@ -719,6 +706,12 @@ public:
void resetMenuTrigger() { mAltKeyTrigger = FALSE; }
private:
+ // add a menu - this will create a drop down menu.
+ virtual BOOL appendMenu( LLMenuGL* menu );
+ // rearrange the child rects so they fit the shape of the menu
+ // bar.
+ virtual void arrange( void );
+
void checkMenuTrigger();
std::list <LLKeyBinding*> mAccelerators;
@@ -734,7 +727,6 @@ class LLMenuHolderGL : public LLPanel
{
public:
LLMenuHolderGL();
- LLMenuHolderGL(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows = FOLLOWS_NONE);
virtual ~LLMenuHolderGL() {}
virtual BOOL hideMenus();
@@ -794,11 +786,19 @@ private:
class LLMenuItemTearOffGL : public LLMenuItemGL
{
public:
- LLMenuItemTearOffGL( LLHandle<LLFloater> parent_floater_handle = LLHandle<LLFloater>());
-
- virtual std::string getType() const { return "tearoff_menu"; }
-
- virtual void doIt(void);
+ struct Params : public LLInitParam::Block<Params, LLMenuItemGL::Params>
+ {
+ Optional<LLHandle<LLFloater> > parent_floater_handle;
+ Params()
+ {
+ name = "tear off";
+ label = "~~~~~~~~~~~";
+ }
+ };
+
+ LLMenuItemTearOffGL( const Params& );
+
+ virtual void onCommit(void);
virtual void draw(void);
virtual U32 getNominalHeight() const;
@@ -820,4 +820,31 @@ private:
LLEditMenuHandlerMgr() {};
};
+
+// *TODO: Eliminate
+// For backwards compatability only; generally just use boost::bind
+class view_listener_t : public boost::signals::trackable
+{
+public:
+ virtual bool handleEvent(const LLSD& userdata) = 0;
+ virtual ~view_listener_t() {}
+
+ static void addEnable(view_listener_t* listener, const std::string& name)
+ {
+ LLUICtrl::EnableCallbackRegistry::currentRegistrar().add(name, boost::bind(&view_listener_t::handleEvent, listener, _2));
+ }
+
+ static void addCommit(view_listener_t* listener, const std::string& name)
+ {
+ LLUICtrl::CommitCallbackRegistry::currentRegistrar().add(name, boost::bind(&view_listener_t::handleEvent, listener, _2));
+ }
+
+ static void addMenu(view_listener_t* listener, const std::string& name)
+ {
+ // For now, add to both click and enable registries
+ addEnable(listener, name);
+ addCommit(listener, name);
+ }
+};
+
#endif // LL_LLMENUGL_H
diff --git a/indra/llui/llmodaldialog.cpp b/indra/llui/llmodaldialog.cpp
index 1662ff7db6..8779eee28d 100644
--- a/indra/llui/llmodaldialog.cpp
+++ b/indra/llui/llmodaldialog.cpp
@@ -45,17 +45,16 @@
std::list<LLModalDialog*> LLModalDialog::sModalStack;
LLModalDialog::LLModalDialog( const std::string& title, S32 width, S32 height, BOOL modal )
- : LLFloater( std::string("modal container"),
- LLRect( 0, height, width, 0 ),
- title,
- FALSE, // resizable
- DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT,
- FALSE, // drag_on_left
- modal ? FALSE : TRUE, // minimizable
- modal ? FALSE : TRUE, // close button
- TRUE), // bordered
+ : LLFloater(),
mModal( modal )
{
+ setRect(LLRect( 0, height, width, 0 ));
+ setTitle(title);
+ if (modal)
+ {
+ setCanMinimize(FALSE);
+ setCanClose(FALSE);
+ }
setVisible( FALSE );
setBackgroundVisible(TRUE);
setBackgroundOpaque(TRUE);
@@ -72,12 +71,12 @@ LLModalDialog::~LLModalDialog()
}
// virtual
-void LLModalDialog::open() /* Flawfinder: ignore */
+void LLModalDialog::openFloater(const LLSD& key)
{
// SJB: Hack! Make sure we don't ever host a modal dialog
LLMultiFloater* thost = LLFloater::getFloaterHost();
LLFloater::setFloaterHost(NULL);
- LLFloater::open();
+ LLFloater::openFloater(key);
LLFloater::setFloaterHost(thost);
}
@@ -229,7 +228,7 @@ BOOL LLModalDialog::handleKeyHere(KEY key, MASK mask )
BOOL enough_time_elapsed = mVisibleTime.getElapsedTimeF32() > 1.0f;
if (enough_time_elapsed && key == KEY_ESCAPE)
{
- close();
+ closeFloater();
return TRUE;
}
return FALSE;
@@ -245,32 +244,15 @@ void LLModalDialog::onClose(bool app_quitting)
// virtual
void LLModalDialog::draw()
{
- LLColor4 shadow_color = LLUI::sColorsGroup->getColor("ColorDropShadow");
- S32 shadow_lines = LLUI::sConfigGroup->getS32("DropShadowFloater");
+ static LLUICachedControl<LLColor4> shadow_color ("ColorDropShadow", *(new LLColor4));
+ static LLUICachedControl<S32> shadow_lines ("DropShadowFloater", 0);
gl_drop_shadow( 0, getRect().getHeight(), getRect().getWidth(), 0,
shadow_color, shadow_lines);
LLFloater::draw();
-
- if (mModal)
- {
- // If we've lost focus to a non-child, get it back ASAP.
- if( gFocusMgr.getTopCtrl() != this )
- {
- gFocusMgr.setTopCtrl( this );
- }
-
- if( !gFocusMgr.childHasKeyboardFocus( this ) )
- {
- setFocus(TRUE);
- }
-
- if( !gFocusMgr.childHasMouseCapture( this ) )
- {
- gFocusMgr.setMouseCapture( this );
- }
- }
+
+ // Focus retrieval moved to LLFloaterView::refresh()
}
void LLModalDialog::centerOnScreen()
diff --git a/indra/llui/llmodaldialog.h b/indra/llui/llmodaldialog.h
index f6abd0a7ac..dad92ab82a 100644
--- a/indra/llui/llmodaldialog.h
+++ b/indra/llui/llmodaldialog.h
@@ -48,7 +48,7 @@ public:
LLModalDialog( const std::string& title, S32 width, S32 height, BOOL modal = true );
/*virtual*/ ~LLModalDialog();
- /*virtual*/ void open(); /* Flawfinder: ignore */
+ /*virtual*/ void openFloater(const LLSD& key = LLSD());
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
diff --git a/indra/llui/llmultifloater.cpp b/indra/llui/llmultifloater.cpp
new file mode 100644
index 0000000000..c0fe7ff32d
--- /dev/null
+++ b/indra/llui/llmultifloater.cpp
@@ -0,0 +1,510 @@
+/**
+ * @file llmultifloater.cpp
+ * @brief LLFloater that hosts other floaters
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// Floating "windows" within the GL display, like the inventory floater,
+// mini-map floater, etc.
+
+#include "linden_common.h"
+
+#include "llmultifloater.h"
+#include "llresizehandle.h"
+
+//
+// LLMultiFloater
+//
+
+LLMultiFloater::LLMultiFloater(const LLFloater::Params& params)
+ : LLFloater(),
+ mTabContainer(NULL),
+ mTabPos(LLTabContainer::TOP),
+ mAutoResize(TRUE),
+ mOrigMinWidth(0),
+ mOrigMinHeight(0)
+{
+}
+
+void LLMultiFloater::buildTabContainer()
+{
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+
+ LLTabContainer::Params p;
+ p.name(std::string("Preview Tabs"));
+ p.rect(LLRect(LLPANEL_BORDER_WIDTH, getRect().getHeight() - floater_header_size, getRect().getWidth() - LLPANEL_BORDER_WIDTH, 0));
+ p.tab_position(mTabPos);
+ p.follows.flags(FOLLOWS_ALL);
+ p.commit_callback.function(boost::bind(&LLMultiFloater::onTabSelected, this));
+
+ mTabContainer = LLUICtrlFactory::create<LLTabContainer>(p);
+ addChild(mTabContainer);
+
+ if (isResizable())
+ {
+ mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH);
+ }
+}
+
+void LLMultiFloater::onOpen(const LLSD& key)
+{
+ if (mTabContainer->getTabCount() <= 0)
+ {
+ // for now, don't allow multifloaters
+ // without any child floaters
+ closeFloater();
+ }
+}
+
+void LLMultiFloater::onClose(bool app_quitting)
+{
+ if(closeAllFloaters() == TRUE)
+ {
+ LLFloater::onClose(app_quitting);
+ }//else not all tabs could be closed...
+}
+
+void LLMultiFloater::draw()
+{
+ if (mTabContainer->getTabCount() == 0)
+ {
+ //RN: could this potentially crash in draw hierarchy?
+ closeFloater();
+ }
+ else
+ {
+ for (S32 i = 0; i < mTabContainer->getTabCount(); i++)
+ {
+ LLFloater* floaterp = (LLFloater*)mTabContainer->getPanelByIndex(i);
+ if (floaterp->getShortTitle() != mTabContainer->getPanelTitle(i))
+ {
+ mTabContainer->setPanelTitle(i, floaterp->getShortTitle());
+ }
+ }
+ LLFloater::draw();
+ }
+}
+
+BOOL LLMultiFloater::closeAllFloaters()
+{
+ S32 tabToClose = 0;
+ S32 lastTabCount = mTabContainer->getTabCount();
+ while (tabToClose < mTabContainer->getTabCount())
+ {
+ LLFloater* first_floater = (LLFloater*)mTabContainer->getPanelByIndex(tabToClose);
+ first_floater->closeFloater();
+ if(lastTabCount == mTabContainer->getTabCount())
+ {
+ //Tab did not actually close, possibly due to a pending Save Confirmation dialog..
+ //so try and close the next one in the list...
+ tabToClose++;
+ }else
+ {
+ //Tab closed ok.
+ lastTabCount = mTabContainer->getTabCount();
+ }
+ }
+ if( mTabContainer->getTabCount() != 0 )
+ return FALSE; // Couldn't close all the tabs (pending save dialog?) so return FALSE.
+ return TRUE; //else all tabs were successfully closed...
+}
+
+void LLMultiFloater::growToFit(S32 content_width, S32 content_height)
+{
+ static LLUICachedControl<S32> tabcntr_close_btn_size ("UITabCntrCloseBtnSize", 0);
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+ S32 tabcntr_header_height = LLPANEL_BORDER_WIDTH + tabcntr_close_btn_size;
+ S32 new_width = llmax(getRect().getWidth(), content_width + LLPANEL_BORDER_WIDTH * 2);
+ S32 new_height = llmax(getRect().getHeight(), content_height + floater_header_size + tabcntr_header_height);
+
+ if (isMinimized())
+ {
+ LLRect newrect;
+ newrect.setLeftTopAndSize(getExpandedRect().mLeft, getExpandedRect().mTop, new_width, new_height);
+ setExpandedRect(newrect);
+ }
+ else
+ {
+ S32 old_height = getRect().getHeight();
+ reshape(new_width, new_height);
+ // keep top left corner in same position
+ translate(0, old_height - new_height);
+ }
+}
+
+/**
+ void addFloater(LLFloater* floaterp, BOOL select_added_floater)
+
+ Adds the LLFloater pointed to by floaterp to this.
+ If floaterp is already hosted by this, then it is re-added to get
+ new titles, etc.
+ If select_added_floater is true, the LLFloater pointed to by floaterp will
+ become the selected tab in this
+
+ Affects: mTabContainer, floaterp
+**/
+void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater, LLTabContainer::eInsertionPoint insertion_point)
+{
+ if (!floaterp)
+ {
+ return;
+ }
+
+ if (!mTabContainer)
+ {
+ llerrs << "Tab Container used without having been initialized." << llendl;
+ return;
+ }
+
+ if (floaterp->getHost() == this)
+ {
+ // already hosted by me, remove
+ // do this so we get updated title, etc.
+ mFloaterDataMap.erase(floaterp->getHandle());
+ mTabContainer->removeTabPanel(floaterp);
+ }
+ else if (floaterp->getHost())
+ {
+ // floaterp is hosted by somebody else and
+ // this is adding it, so remove it from it's old host
+ floaterp->getHost()->removeFloater(floaterp);
+ }
+ else if (floaterp->getParent() == gFloaterView)
+ {
+ // rehost preview floater as child panel
+ gFloaterView->removeChild(floaterp);
+ }
+
+ // store original configuration
+ LLFloaterData floater_data;
+ floater_data.mWidth = floaterp->getRect().getWidth();
+ floater_data.mHeight = floaterp->getRect().getHeight();
+ floater_data.mCanMinimize = floaterp->isMinimizeable();
+ floater_data.mCanResize = floaterp->isResizable();
+
+ // remove minimize and close buttons
+ floaterp->setCanMinimize(FALSE);
+ floaterp->setCanResize(FALSE);
+ floaterp->setCanDrag(FALSE);
+ floaterp->storeRectControl();
+ // avoid double rendering of floater background (makes it more opaque)
+ floaterp->setBackgroundVisible(FALSE);
+
+ if (mAutoResize)
+ {
+ growToFit(floater_data.mWidth, floater_data.mHeight);
+ }
+
+ //add the panel, add it to proper maps
+ mTabContainer->addTabPanel(
+ LLTabContainer::TabPanelParams()
+ .panel(floaterp)
+ .label(floaterp->getShortTitle())
+ .insert_at(insertion_point));
+ mFloaterDataMap[floaterp->getHandle()] = floater_data;
+
+ updateResizeLimits();
+
+ if ( select_added_floater )
+ {
+ mTabContainer->selectTabPanel(floaterp);
+ }
+ else
+ {
+ // reassert visible tab (hiding new floater if necessary)
+ mTabContainer->selectTab(mTabContainer->getCurrentPanelIndex());
+ }
+
+ floaterp->setHost(this);
+ if (isMinimized())
+ {
+ floaterp->setVisible(FALSE);
+ }
+}
+
+/**
+ BOOL selectFloater(LLFloater* floaterp)
+
+ If the LLFloater pointed to by floaterp is hosted by this,
+ then its tab is selected and returns true. Otherwise returns false.
+
+ Affects: mTabContainer
+**/
+BOOL LLMultiFloater::selectFloater(LLFloater* floaterp)
+{
+ return mTabContainer->selectTabPanel(floaterp);
+}
+
+// virtual
+void LLMultiFloater::selectNextFloater()
+{
+ mTabContainer->selectNextTab();
+}
+
+// virtual
+void LLMultiFloater::selectPrevFloater()
+{
+ mTabContainer->selectPrevTab();
+}
+
+void LLMultiFloater::showFloater(LLFloater* floaterp, LLTabContainer::eInsertionPoint insertion_point)
+{
+ // we won't select a panel that already is selected
+ // it is hard to do this internally to tab container
+ // as tab selection is handled via index and the tab at a given
+ // index might have changed
+ if (floaterp != mTabContainer->getCurrentPanel() &&
+ !mTabContainer->selectTabPanel(floaterp))
+ {
+ addFloater(floaterp, TRUE, insertion_point);
+ }
+}
+
+void LLMultiFloater::removeFloater(LLFloater* floaterp)
+{
+ if ( floaterp->getHost() != this )
+ return;
+
+ floater_data_map_t::iterator found_data_it = mFloaterDataMap.find(floaterp->getHandle());
+ if (found_data_it != mFloaterDataMap.end())
+ {
+ LLFloaterData& floater_data = found_data_it->second;
+ floaterp->setCanMinimize(floater_data.mCanMinimize);
+ if (!floater_data.mCanResize)
+ {
+ // restore original size
+ floaterp->reshape(floater_data.mWidth, floater_data.mHeight);
+ }
+ floaterp->setCanResize(floater_data.mCanResize);
+ mFloaterDataMap.erase(found_data_it);
+ }
+ mTabContainer->removeTabPanel(floaterp);
+ floaterp->setBackgroundVisible(TRUE);
+ floaterp->setCanDrag(TRUE);
+ floaterp->setHost(NULL);
+ floaterp->applyRectControl();
+
+ updateResizeLimits();
+
+ tabOpen((LLFloater*)mTabContainer->getCurrentPanel(), false);
+}
+
+void LLMultiFloater::tabOpen(LLFloater* opened_floater, bool from_click)
+{
+ // default implementation does nothing
+}
+
+void LLMultiFloater::tabClose()
+{
+ if (mTabContainer->getTabCount() == 0)
+ {
+ // no more children, close myself
+ closeFloater();
+ }
+}
+
+void LLMultiFloater::setVisible(BOOL visible)
+{
+ // *FIX: shouldn't have to do this, fix adding to minimized multifloater
+ LLFloater::setVisible(visible);
+
+ if (mTabContainer)
+ {
+ LLPanel* cur_floaterp = mTabContainer->getCurrentPanel();
+
+ if (cur_floaterp)
+ {
+ cur_floaterp->setVisible(visible);
+ }
+
+ // if no tab selected, and we're being shown,
+ // select last tab to be added
+ if (visible && !cur_floaterp)
+ {
+ mTabContainer->selectLastTab();
+ }
+ }
+}
+
+BOOL LLMultiFloater::handleKeyHere(KEY key, MASK mask)
+{
+ if (key == 'W' && mask == MASK_CONTROL)
+ {
+ LLFloater* floater = getActiveFloater();
+ // is user closeable and is system closeable
+ if (floater && floater->canClose() && floater->isCloseable())
+ {
+ floater->closeFloater();
+ }
+ return TRUE;
+ }
+
+ return LLFloater::handleKeyHere(key, mask);
+}
+
+bool LLMultiFloater::addChild(LLView* child, S32 tab_group)
+{
+ LLTabContainer* tab_container = dynamic_cast<LLTabContainer*>(child);
+ if (tab_container)
+ {
+ // store pointer to tab container
+ setTabContainer(tab_container);
+ }
+
+ // then go ahead and add child as usual
+ return LLFloater::addChild(child, tab_group);
+}
+
+LLFloater* LLMultiFloater::getActiveFloater()
+{
+ return (LLFloater*)mTabContainer->getCurrentPanel();
+}
+
+S32 LLMultiFloater::getFloaterCount()
+{
+ return mTabContainer->getTabCount();
+}
+
+/**
+ BOOL isFloaterFlashing(LLFloater* floaterp)
+
+ Returns true if the LLFloater pointed to by floaterp
+ is currently in a flashing state and is hosted by this.
+ False otherwise.
+
+ Requires: floaterp != NULL
+**/
+BOOL LLMultiFloater::isFloaterFlashing(LLFloater* floaterp)
+{
+ if ( floaterp && floaterp->getHost() == this )
+ return mTabContainer->getTabPanelFlashing(floaterp);
+
+ return FALSE;
+}
+
+/**
+ BOOL setFloaterFlashing(LLFloater* floaterp, BOOL flashing)
+
+ Sets the current flashing state of the LLFloater pointed
+ to by floaterp to be the BOOL flashing if the LLFloater pointed
+ to by floaterp is hosted by this.
+
+ Requires: floaterp != NULL
+**/
+void LLMultiFloater::setFloaterFlashing(LLFloater* floaterp, BOOL flashing)
+{
+ if ( floaterp && floaterp->getHost() == this )
+ mTabContainer->setTabPanelFlashing(floaterp, flashing);
+}
+
+void LLMultiFloater::onTabSelected()
+{
+ LLFloater* floaterp = dynamic_cast<LLFloater*>(mTabContainer->getCurrentPanel());
+ if (floaterp)
+ {
+ tabOpen(floaterp, true);
+ }
+}
+
+void LLMultiFloater::setCanResize(BOOL can_resize)
+{
+ LLFloater::setCanResize(can_resize);
+ if (isResizable() && mTabContainer->getTabPosition() == LLTabContainer::BOTTOM)
+ {
+ mTabContainer->setRightTabBtnOffset(RESIZE_HANDLE_WIDTH);
+ }
+ else
+ {
+ mTabContainer->setRightTabBtnOffset(0);
+ }
+}
+
+BOOL LLMultiFloater::postBuild()
+{
+ // remember any original xml minimum size
+ getResizeLimits(&mOrigMinWidth, &mOrigMinHeight);
+
+ if (mTabContainer)
+ {
+ return TRUE;
+ }
+
+ requires<LLTabContainer>("Preview Tabs");
+ if (checkRequirements())
+ {
+ mTabContainer = getChild<LLTabContainer>("Preview Tabs");
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+void LLMultiFloater::updateResizeLimits()
+{
+ static LLUICachedControl<S32> tabcntr_close_btn_size ("UITabCntrCloseBtnSize", 0);
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+ S32 tabcntr_header_height = LLPANEL_BORDER_WIDTH + tabcntr_close_btn_size;
+ // initialize minimum size constraint to the original xml values.
+ S32 new_min_width = mOrigMinWidth;
+ S32 new_min_height = mOrigMinHeight;
+ // possibly increase minimum size constraint due to children's minimums.
+ for (S32 tab_idx = 0; tab_idx < mTabContainer->getTabCount(); ++tab_idx)
+ {
+ LLFloater* floaterp = (LLFloater*)mTabContainer->getPanelByIndex(tab_idx);
+ if (floaterp)
+ {
+ new_min_width = llmax(new_min_width, floaterp->getMinWidth() + LLPANEL_BORDER_WIDTH * 2);
+ new_min_height = llmax(new_min_height, floaterp->getMinHeight() + floater_header_size + tabcntr_header_height);
+ }
+ }
+ setResizeLimits(new_min_width, new_min_height);
+
+ S32 cur_height = getRect().getHeight();
+ S32 new_width = llmax(getRect().getWidth(), new_min_width);
+ S32 new_height = llmax(getRect().getHeight(), new_min_height);
+
+ if (isMinimized())
+ {
+ const LLRect& expanded = getExpandedRect();
+ LLRect newrect;
+ newrect.setLeftTopAndSize(expanded.mLeft, expanded.mTop, llmax(expanded.getWidth(), new_width), llmax(expanded.getHeight(), new_height));
+ setExpandedRect(newrect);
+ }
+ else
+ {
+ reshape(new_width, new_height);
+
+ // make sure upper left corner doesn't move
+ translate(0, cur_height - getRect().getHeight());
+
+ // make sure this window is visible on screen when it has been modified
+ // (tab added, etc)
+ gFloaterView->adjustToFitScreen(this, TRUE);
+ }
+}
diff --git a/indra/llui/llmultifloater.h b/indra/llui/llmultifloater.h
new file mode 100644
index 0000000000..ea8a9841e3
--- /dev/null
+++ b/indra/llui/llmultifloater.h
@@ -0,0 +1,107 @@
+/**
+ * @file llmultifloater.h
+ * @brief LLFloater that hosts other floaters
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// Floating "windows" within the GL display, like the inventory floater,
+// mini-map floater, etc.
+
+
+#ifndef LL_MULTI_FLOATER_H
+#define LL_MULTI_FLOATER_H
+
+#include "llfloater.h"
+#include "lltabcontainer.h" // for LLTabContainer::eInsertionPoint
+
+// https://wiki.lindenlab.com/mediawiki/index.php?title=LLMultiFloater&oldid=81376
+class LLMultiFloater : public LLFloater
+{
+public:
+ LLMultiFloater(const LLFloater::Params& params = LLFloater::Params());
+ virtual ~LLMultiFloater() {};
+
+ void buildTabContainer();
+
+ virtual BOOL postBuild();
+ /*virtual*/ void onOpen(const LLSD& key);
+ /*virtual*/ void onClose(bool app_quitting);
+ /*virtual*/ void draw();
+ /*virtual*/ void setVisible(BOOL visible);
+ /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
+ /*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);
+
+ virtual void setCanResize(BOOL can_resize);
+ virtual void growToFit(S32 content_width, S32 content_height);
+ virtual void addFloater(LLFloater* floaterp, BOOL select_added_floater, LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
+
+ virtual void showFloater(LLFloater* floaterp, LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
+ virtual void removeFloater(LLFloater* floaterp);
+
+ virtual void tabOpen(LLFloater* opened_floater, bool from_click);
+ virtual void tabClose();
+
+ virtual BOOL selectFloater(LLFloater* floaterp);
+ virtual void selectNextFloater();
+ virtual void selectPrevFloater();
+
+ virtual LLFloater* getActiveFloater();
+ virtual BOOL isFloaterFlashing(LLFloater* floaterp);
+ virtual S32 getFloaterCount();
+
+ virtual void setFloaterFlashing(LLFloater* floaterp, BOOL flashing);
+ virtual BOOL closeAllFloaters(); //Returns FALSE if the floater could not be closed due to pending confirmation dialogs
+ void setTabContainer(LLTabContainer* tab_container) { if (!mTabContainer) mTabContainer = tab_container; }
+ void onTabSelected();
+
+ virtual void updateResizeLimits();
+
+protected:
+ struct LLFloaterData
+ {
+ S32 mWidth;
+ S32 mHeight;
+ BOOL mCanMinimize;
+ BOOL mCanResize;
+ };
+
+ LLTabContainer* mTabContainer;
+
+ typedef std::map<LLHandle<LLFloater>, LLFloaterData> floater_data_map_t;
+ floater_data_map_t mFloaterDataMap;
+
+ LLTabContainer::TabPosition mTabPos;
+ BOOL mAutoResize;
+ S32 mOrigMinWidth, mOrigMinHeight; // logically const but initialized late
+};
+
+#endif // LL_MULTI_FLOATER_H
+
+
+
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp
index c1487be553..24b83b0120 100644
--- a/indra/llui/llmultislider.cpp
+++ b/indra/llui/llmultislider.cpp
@@ -41,64 +41,59 @@
#include "llkeyboard.h" // for the MASK constants
#include "llcontrol.h"
#include "llimagegl.h"
+#include "lluictrlfactory.h"
#include <sstream>
static LLRegisterWidget<LLMultiSlider> r("multi_slider_bar");
-const S32 MULTI_THUMB_WIDTH = 8;
-const S32 MULTI_TRACK_HEIGHT = 6;
const F32 FLOAT_THRESHOLD = 0.00001f;
-const S32 EXTRA_TRIANGLE_WIDTH = 2;
-const S32 EXTRA_TRIANGLE_HEIGHT = -2;
S32 LLMultiSlider::mNameCounter = 0;
-LLMultiSlider::LLMultiSlider(
- const std::string& name,
- const LLRect& rect,
- void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata),
- void* callback_userdata,
- F32 initial_value,
- F32 min_value,
- F32 max_value,
- F32 increment,
- S32 max_sliders,
- BOOL allow_overlap,
- BOOL draw_track,
- BOOL use_triangle,
- const std::string& control_name)
- :
- LLUICtrl( name, rect, TRUE, on_commit_callback, callback_userdata,
- FOLLOWS_LEFT | FOLLOWS_TOP),
-
- mInitialValue( initial_value ),
- mMinValue( min_value ),
- mMaxValue( max_value ),
- mIncrement( increment ),
- mMaxNumSliders(max_sliders),
- mAllowOverlap(allow_overlap),
- mDrawTrack(draw_track),
- mUseTriangle(use_triangle),
+LLMultiSlider::Params::Params()
+: max_sliders("max_sliders", 1),
+ allow_overlap("allow_overlap", false),
+ draw_track("draw_track", true),
+ use_triangle("use_triangle", false),
+ track_color("track_color"),
+ thumb_disabled_color("thumb_disabled_color"),
+ thumb_outline_color("thumb_outline_color"),
+ thumb_center_color("thumb_center_color"),
+ thumb_center_selected_color("thumb_center_selected_color"),
+ triangle_color("triangle_color"),
+ mouse_down_callback("mouse_down_callback"),
+ mouse_up_callback("mouse_up_callback"),
+ thumb_width("thumb_width")
+{
+ name = "multi_slider_bar";
+ mouse_opaque(true);
+ follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
+}
+
+LLMultiSlider::LLMultiSlider(const LLMultiSlider::Params& p)
+: LLF32UICtrl(p),
mMouseOffset( 0 ),
- mDragStartThumbRect( 0, getRect().getHeight(), MULTI_THUMB_WIDTH, 0 ),
- mTrackColor( LLUI::sColorsGroup->getColor( "MultiSliderTrackColor" ) ),
- mThumbOutlineColor( LLUI::sColorsGroup->getColor( "MultiSliderThumbOutlineColor" ) ),
- mThumbCenterColor( LLUI::sColorsGroup->getColor( "MultiSliderThumbCenterColor" ) ),
- mThumbCenterSelectedColor( LLUI::sColorsGroup->getColor( "MultiSliderThumbCenterSelectedColor" ) ),
- mDisabledThumbColor(LLUI::sColorsGroup->getColor( "MultiSliderDisabledThumbColor" ) ),
- mTriangleColor(LLUI::sColorsGroup->getColor( "MultiSliderTriangleColor" ) ),
- mMouseDownCallback( NULL ),
- mMouseUpCallback( NULL )
+ mDragStartThumbRect( 0, getRect().getHeight(), p.thumb_width, 0 ),
+ mMaxNumSliders(p.max_sliders),
+ mAllowOverlap(p.allow_overlap),
+ mDrawTrack(p.draw_track),
+ mUseTriangle(p.use_triangle),
+ mTrackColor(p.track_color()),
+ mThumbOutlineColor(p.thumb_outline_color()),
+ mThumbCenterColor(p.thumb_center_color()),
+ mThumbCenterSelectedColor(p.thumb_center_selected_color()),
+ mDisabledThumbColor(p.thumb_disabled_color()),
+ mTriangleColor(p.triangle_color()),
+ mThumbWidth(p.thumb_width)
{
mValue.emptyMap();
mCurSlider = LLStringUtil::null;
-
- // properly handle setting the starting thumb rect
- // do it this way to handle both the operating-on-settings
- // and standalone ways of using this
- setControlName(control_name, NULL);
- setValue(getValue());
+
+ if (p.mouse_down_callback.isProvided())
+ initCommitCallback(p.mouse_down_callback, mMouseDownSignal);
+ if (p.mouse_up_callback.isProvided())
+ initCommitCallback(p.mouse_up_callback, mMouseUpSignal);
}
void LLMultiSlider::setSliderValue(const std::string& name, F32 value, BOOL from_event)
@@ -152,12 +147,12 @@ void LLMultiSlider::setSliderValue(const std::string& name, F32 value, BOOL from
F32 t = (newValue - mMinValue) / (mMaxValue - mMinValue);
- S32 left_edge = MULTI_THUMB_WIDTH/2;
- S32 right_edge = getRect().getWidth() - (MULTI_THUMB_WIDTH/2);
+ S32 left_edge = mThumbWidth/2;
+ S32 right_edge = getRect().getWidth() - (mThumbWidth/2);
S32 x = left_edge + S32( t * (right_edge - left_edge) );
- mThumbRects[name].mLeft = x - (MULTI_THUMB_WIDTH/2);
- mThumbRects[name].mRight = x + (MULTI_THUMB_WIDTH/2);
+ mThumbRects[name].mLeft = x - (mThumbWidth/2);
+ mThumbRects[name].mRight = x + (mThumbWidth/2);
}
void LLMultiSlider::setValue(const LLSD& value)
@@ -211,7 +206,7 @@ const std::string& LLMultiSlider::addSlider(F32 val)
}
// add a new thumb rect
- mThumbRects[newName.str()] = LLRect( 0, getRect().getHeight(), MULTI_THUMB_WIDTH, 0 );
+ mThumbRects[newName.str()] = LLRect( 0, getRect().getHeight(), mThumbWidth, 0 );
// add the value and set the current slider to this one
mValue.insert(newName.str(), initVal);
@@ -295,15 +290,15 @@ void LLMultiSlider::clear()
deleteCurSlider();
}
- LLUICtrl::clear();
+ LLF32UICtrl::clear();
}
BOOL LLMultiSlider::handleHover(S32 x, S32 y, MASK mask)
{
if( gFocusMgr.getMouseCapture() == this )
{
- S32 left_edge = MULTI_THUMB_WIDTH/2;
- S32 right_edge = getRect().getWidth() - (MULTI_THUMB_WIDTH/2);
+ S32 left_edge = mThumbWidth/2;
+ S32 right_edge = getRect().getWidth() - (mThumbWidth/2);
x += mMouseOffset;
x = llclamp( x, left_edge, right_edge );
@@ -331,10 +326,8 @@ BOOL LLMultiSlider::handleMouseUp(S32 x, S32 y, MASK mask)
{
gFocusMgr.setMouseCapture( NULL );
- if( mMouseUpCallback )
- {
- mMouseUpCallback( this, mCallbackUserData );
- }
+ mMouseUpSignal( this, LLSD() );
+
handled = TRUE;
make_ui_sound("UISndClickRelease");
}
@@ -353,10 +346,7 @@ BOOL LLMultiSlider::handleMouseDown(S32 x, S32 y, MASK mask)
{
setFocus(TRUE);
}
- if( mMouseDownCallback )
- {
- mMouseDownCallback( this, mCallbackUserData );
- }
+ mMouseDownSignal( this, LLSD() );
if (MASK_CONTROL & mask) // if CTRL is modifying
{
@@ -379,7 +369,7 @@ BOOL LLMultiSlider::handleMouseDown(S32 x, S32 y, MASK mask)
// Find the offset of the actual mouse location from the center of the thumb.
if (mThumbRects[mCurSlider].pointInRect(x,y))
{
- mMouseOffset = (mThumbRects[mCurSlider].mLeft + MULTI_THUMB_WIDTH/2) - x;
+ mMouseOffset = (mThumbRects[mCurSlider].mLeft + mThumbWidth/2) - x;
}
else
{
@@ -424,6 +414,8 @@ BOOL LLMultiSlider::handleKeyHere(KEY key, MASK mask)
void LLMultiSlider::draw()
{
+ static LLUICachedControl<S32> extra_triangle_height ("UIExtraTriangleHeight", 0);
+ static LLUICachedControl<S32> extra_triangle_width ("UIExtraTriangleWidth", 0);
LLColor4 curThumbColor;
std::map<std::string, LLRect>::iterator mIt;
@@ -439,16 +431,17 @@ void LLMultiSlider::draw()
F32 opacity = getEnabled() ? 1.f : 0.3f;
// Track
- LLUIImagePtr thumb_imagep = LLUI::sImageProvider->getUIImage("rounded_square.tga");
+ LLUIImagePtr thumb_imagep = LLUI::getUIImage("rounded_square.tga");
- S32 height_offset = (getRect().getHeight() - MULTI_TRACK_HEIGHT) / 2;
+ static LLUICachedControl<S32> multi_track_height ("UIMultiTrackHeight", 0);
+ S32 height_offset = (getRect().getHeight() - multi_track_height) / 2;
LLRect track_rect(0, getRect().getHeight() - height_offset, getRect().getWidth(), height_offset );
if(mDrawTrack)
{
track_rect.stretch(-1);
- thumb_imagep->draw(track_rect, mTrackColor % opacity);
+ thumb_imagep->draw(track_rect, mTrackColor.get() % opacity);
}
// if we're supposed to use a drawn triangle
@@ -458,13 +451,13 @@ void LLMultiSlider::draw()
for(mIt = mThumbRects.begin(); mIt != mThumbRects.end(); mIt++) {
gl_triangle_2d(
- mIt->second.mLeft - EXTRA_TRIANGLE_WIDTH,
- mIt->second.mTop + EXTRA_TRIANGLE_HEIGHT,
- mIt->second.mRight + EXTRA_TRIANGLE_WIDTH,
- mIt->second.mTop + EXTRA_TRIANGLE_HEIGHT,
+ mIt->second.mLeft - extra_triangle_width,
+ mIt->second.mTop + extra_triangle_height,
+ mIt->second.mRight + extra_triangle_width,
+ mIt->second.mTop + extra_triangle_height,
mIt->second.mLeft + mIt->second.getWidth() / 2,
- mIt->second.mBottom - EXTRA_TRIANGLE_HEIGHT,
- mTriangleColor, TRUE);
+ mIt->second.mBottom - extra_triangle_height,
+ mTriangleColor.get(), TRUE);
}
}
else if (!thumb_imagep)
@@ -474,7 +467,7 @@ void LLMultiSlider::draw()
for(mIt = mThumbRects.begin(); mIt != mThumbRects.end(); mIt++) {
// choose the color
- curThumbColor = mThumbCenterColor;
+ curThumbColor = mThumbCenterColor.get();
if(mIt->first == mCurSlider) {
curSldrIt = mIt;
@@ -488,19 +481,19 @@ void LLMultiSlider::draw()
// now draw the current slider
if(curSldrIt != mThumbRects.end()) {
- gl_rect_2d(curSldrIt->second, mThumbCenterSelectedColor, TRUE);
+ gl_rect_2d(curSldrIt->second, mThumbCenterSelectedColor.get(), TRUE);
}
// and draw the drag start
if (gFocusMgr.getMouseCapture() == this)
{
- gl_rect_2d(mDragStartThumbRect, mThumbCenterColor % opacity, FALSE);
+ gl_rect_2d(mDragStartThumbRect, mThumbCenterColor.get() % opacity, FALSE);
}
}
else if( gFocusMgr.getMouseCapture() == this )
{
// draw drag start
- thumb_imagep->drawSolid(mDragStartThumbRect, mThumbCenterColor % 0.3f);
+ thumb_imagep->drawSolid(mDragStartThumbRect, mThumbCenterColor.get() % 0.3f);
// draw the highlight
if (hasFocus())
@@ -513,7 +506,7 @@ void LLMultiSlider::draw()
for(mIt = mThumbRects.begin(); mIt != mThumbRects.end(); mIt++)
{
// choose the color
- curThumbColor = mThumbCenterColor;
+ curThumbColor = mThumbCenterColor.get();
if(mIt->first == mCurSlider)
{
// don't draw now, draw last
@@ -528,7 +521,7 @@ void LLMultiSlider::draw()
// draw cur slider last
if(curSldrIt != mThumbRects.end())
{
- thumb_imagep->drawSolid(curSldrIt->second, mThumbCenterSelectedColor);
+ thumb_imagep->drawSolid(curSldrIt->second, mThumbCenterSelectedColor.get());
}
}
@@ -546,7 +539,7 @@ void LLMultiSlider::draw()
{
// choose the color
- curThumbColor = mThumbCenterColor;
+ curThumbColor = mThumbCenterColor.get();
if(mIt->first == mCurSlider)
{
curSldrIt = mIt;
@@ -559,74 +552,9 @@ void LLMultiSlider::draw()
if(curSldrIt != mThumbRects.end())
{
- thumb_imagep->drawSolid(curSldrIt->second, mThumbCenterSelectedColor % opacity);
+ thumb_imagep->drawSolid(curSldrIt->second, mThumbCenterSelectedColor.get() % opacity);
}
}
- LLUICtrl::draw();
-}
-
-// virtual
-LLXMLNodePtr LLMultiSlider::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- node->createChild("initial_val", TRUE)->setFloatValue(getInitialValue());
- node->createChild("min_val", TRUE)->setFloatValue(getMinValue());
- node->createChild("max_val", TRUE)->setFloatValue(getMaxValue());
- node->createChild("increment", TRUE)->setFloatValue(getIncrement());
-
- return node;
-}
-
-
-//static
-LLView* LLMultiSlider::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("multi_slider_bar");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- F32 initial_value = 0.f;
- node->getAttributeF32("initial_val", initial_value);
-
- F32 min_value = 0.f;
- node->getAttributeF32("min_val", min_value);
-
- F32 max_value = 1.f;
- node->getAttributeF32("max_val", max_value);
-
- F32 increment = 0.1f;
- node->getAttributeF32("increment", increment);
-
- S32 max_sliders = 1;
- node->getAttributeS32("max_sliders", max_sliders);
-
- BOOL allow_overlap = FALSE;
- node->getAttributeBOOL("allow_overlap", allow_overlap);
-
- BOOL draw_track = TRUE;
- node->getAttributeBOOL("draw_track", draw_track);
-
- BOOL use_triangle = FALSE;
- node->getAttributeBOOL("use_triangle", use_triangle);
-
- LLMultiSlider* multiSlider = new LLMultiSlider(name,
- rect,
- NULL,
- NULL,
- initial_value,
- min_value,
- max_value,
- increment,
- max_sliders,
- allow_overlap,
- draw_track,
- use_triangle);
-
- multiSlider->initFromXML(node, parent);
-
- return multiSlider;
+ LLF32UICtrl::draw();
}
diff --git a/indra/llui/llmultislider.h b/indra/llui/llmultislider.h
index cdbdb597f9..9c01b528a7 100644
--- a/indra/llui/llmultislider.h
+++ b/indra/llui/llmultislider.h
@@ -33,32 +33,40 @@
#ifndef LL_MULTI_SLIDER_H
#define LL_MULTI_SLIDER_H
-#include "lluictrl.h"
+#include "llf32uictrl.h"
#include "v4color.h"
class LLUICtrlFactory;
-class LLMultiSlider : public LLUICtrl
+class LLMultiSlider : public LLF32UICtrl
{
public:
- LLMultiSlider(
- const std::string& name,
- const LLRect& rect,
- void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata),
- void* callback_userdata,
- F32 initial_value,
- F32 min_value,
- F32 max_value,
- F32 increment,
- S32 max_sliders,
- BOOL allow_overlap,
- BOOL draw_track,
- BOOL use_triangle,
- const std::string& control_name = LLStringUtil::null );
-
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+ struct Params : public LLInitParam::Block<Params, LLF32UICtrl::Params>
+ {
+ Optional<S32> max_sliders;
+ Optional<bool> allow_overlap,
+ draw_track,
+ use_triangle;
+
+ Optional<LLUIColor> track_color,
+ thumb_disabled_color,
+ thumb_outline_color,
+ thumb_center_color,
+ thumb_center_selected_color,
+ triangle_color;
+
+ Optional<CommitCallbackParam> mouse_down_callback,
+ mouse_up_callback;
+ Optional<S32> thumb_width;
+
+ Params();
+ };
+
+protected:
+ LLMultiSlider(const Params&);
+ friend class LLUICtrlFactory;
+public:
void setSliderValue(const std::string& name, F32 value, BOOL from_event = FALSE);
F32 getSliderValue(const std::string& name) const;
@@ -67,41 +75,27 @@ public:
void setCurSlider(const std::string& name);
void setCurSliderValue(F32 val, BOOL from_event = false) { setSliderValue(mCurSlider, val, from_event); }
- virtual void setValue(const LLSD& value);
- virtual LLSD getValue() const { return mValue; }
-
- virtual void setMinValue(LLSD min_value) { setMinValue((F32)min_value.asReal()); }
- virtual void setMaxValue(LLSD max_value) { setMaxValue((F32)max_value.asReal()); }
+ /*virtual*/ void setValue(const LLSD& value);
+ /*virtual*/ LLSD getValue() const { return mValue; }
- F32 getInitialValue() const { return mInitialValue; }
- F32 getMinValue() const { return mMinValue; }
- F32 getMaxValue() const { return mMaxValue; }
- F32 getIncrement() const { return mIncrement; }
- void setMinValue(F32 min_value) { mMinValue = min_value; }
- void setMaxValue(F32 max_value) { mMaxValue = max_value; }
- void setIncrement(F32 increment) { mIncrement = increment; }
- void setMouseDownCallback( void (*cb)(LLUICtrl* ctrl, void* userdata) ) { mMouseDownCallback = cb; }
- void setMouseUpCallback( void (*cb)(LLUICtrl* ctrl, void* userdata) ) { mMouseUpCallback = cb; }
+ boost::signals::connection setMouseDownCallback( const commit_signal_t::slot_type& cb ) { return mMouseDownSignal.connect(cb); }
+ boost::signals::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ) { return mMouseUpSignal.connect(cb); }
- bool findUnusedValue(F32& initVal);
+ bool findUnusedValue(F32& initVal);
const std::string& addSlider();
const std::string& addSlider(F32 val);
void deleteSlider(const std::string& name);
void deleteCurSlider() { deleteSlider(mCurSlider); }
void clear();
- virtual BOOL handleHover(S32 x, S32 y, MASK mask);
- virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
- virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
- virtual BOOL handleKeyHere(KEY key, MASK mask);
- virtual void draw();
+ /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
+ /*virtual*/ void draw();
protected:
LLSD mValue;
- F32 mInitialValue;
- F32 mMinValue;
- F32 mMaxValue;
- F32 mIncrement;
std::string mCurSlider;
static S32 mNameCounter;
@@ -112,17 +106,18 @@ protected:
S32 mMouseOffset;
LLRect mDragStartThumbRect;
+ S32 mThumbWidth;
std::map<std::string, LLRect> mThumbRects;
- LLColor4 mTrackColor;
- LLColor4 mThumbOutlineColor;
- LLColor4 mThumbCenterColor;
- LLColor4 mThumbCenterSelectedColor;
- LLColor4 mDisabledThumbColor;
- LLColor4 mTriangleColor;
+ LLUIColor mTrackColor;
+ LLUIColor mThumbOutlineColor;
+ LLUIColor mThumbCenterColor;
+ LLUIColor mThumbCenterSelectedColor;
+ LLUIColor mDisabledThumbColor;
+ LLUIColor mTriangleColor;
- void (*mMouseDownCallback)(LLUICtrl* ctrl, void* userdata);
- void (*mMouseUpCallback)(LLUICtrl* ctrl, void* userdata);
+ commit_signal_t mMouseDownSignal;
+ commit_signal_t mMouseUpSignal;
};
#endif // LL_LLSLIDER_H
diff --git a/indra/llui/llmultisliderctrl.cpp b/indra/llui/llmultisliderctrl.cpp
index 8bcf9f9b76..14584e6df5 100644
--- a/indra/llui/llmultisliderctrl.cpp
+++ b/indra/llui/llmultisliderctrl.cpp
@@ -50,90 +50,100 @@
#include "llcontrol.h"
#include "llfocusmgr.h"
#include "llresmgr.h"
+#include "lluictrlfactory.h"
static LLRegisterWidget<LLMultiSliderCtrl> r("multi_slider");
const U32 MAX_STRING_LENGTH = 10;
-
+LLMultiSliderCtrl::Params::Params()
+: text_width("text_width"),
+ label_width("label_width"),
+ show_text("show_text", true),
+ can_edit_text("can_edit_text", false),
+ max_sliders("max_sliders", 1),
+ allow_overlap("allow_overlap", false),
+ draw_track("draw_track", true),
+ use_triangle("use_triangle", false),
+ decimal_digits("decimal_digits", 3),
+ text_color("text_color"),
+ text_disabled_color("text_disabled_color"),
+ mouse_down_callback("mouse_down_callback"),
+ mouse_up_callback("mouse_up_callback")
+{
+ mouse_opaque = true;
+}
-LLMultiSliderCtrl::LLMultiSliderCtrl(const std::string& name, const LLRect& rect,
- const std::string& label,
- const LLFontGL* font,
- S32 label_width,
- S32 text_left,
- BOOL show_text,
- BOOL can_edit_text,
- void (*commit_callback)(LLUICtrl*, void*),
- void* callback_user_data,
- F32 initial_value, F32 min_value, F32 max_value, F32 increment,
- S32 max_sliders, BOOL allow_overlap,
- BOOL draw_track,
- BOOL use_triangle,
- const std::string& control_which)
- : LLUICtrl(name, rect, TRUE, commit_callback, callback_user_data ),
- mFont(font),
- mShowText( show_text ),
- mCanEditText( can_edit_text ),
- mPrecision( 3 ),
- mLabelBox( NULL ),
- mLabelWidth( label_width ),
-
- mEditor( NULL ),
- mTextBox( NULL ),
- mTextEnabledColor( LLUI::sColorsGroup->getColor( "LabelTextColor" ) ),
- mTextDisabledColor( LLUI::sColorsGroup->getColor( "LabelDisabledColor" ) ),
- mSliderMouseUpCallback( NULL ),
- mSliderMouseDownCallback( NULL )
+LLMultiSliderCtrl::LLMultiSliderCtrl(const LLMultiSliderCtrl::Params& p)
+: LLF32UICtrl(p),
+ mLabelBox( NULL ),
+ mEditor( NULL ),
+ mTextBox( NULL ),
+ mTextEnabledColor(p.text_color()),
+ mTextDisabledColor(p.text_disabled_color())
{
+ static LLUICachedControl<S32> multi_sliderctrl_spacing ("UIMultiSliderctrlSpacing", 0);
+
S32 top = getRect().getHeight();
S32 bottom = 0;
S32 left = 0;
+ S32 label_width = p.label_width;
+ S32 text_width = p.text_width;
+
// Label
- if( !label.empty() )
+ if( !p.label().empty() )
{
- if (label_width == 0)
+ if (p.label_width == 0)
{
- label_width = font->getWidth(label);
+ label_width = p.font()->getWidth(p.label);
}
LLRect label_rect( left, top, label_width, bottom );
- mLabelBox = new LLTextBox( std::string("MultiSliderCtrl Label"), label_rect, label, font );
+ LLTextBox::Params params;
+ params.name("MultiSliderCtrl Label");
+ params.rect(label_rect);
+ params.text(p.label);
+ params.font(p.font);
+ mLabelBox = LLUICtrlFactory::create<LLTextBox> (params);
addChild(mLabelBox);
}
S32 slider_right = getRect().getWidth();
- if( show_text )
- {
- slider_right = text_left - MULTI_SLIDERCTRL_SPACING;
- }
- S32 slider_left = label_width ? label_width + MULTI_SLIDERCTRL_SPACING : 0;
- LLRect slider_rect( slider_left, top, slider_right, bottom );
- mMultiSlider = new LLMultiSlider(
- std::string("multi_slider"),
- slider_rect,
- LLMultiSliderCtrl::onSliderCommit, this,
- initial_value, min_value, max_value, increment,
- max_sliders, allow_overlap, draw_track,
- use_triangle,
- control_which );
- addChild( mMultiSlider );
- mCurValue = mMultiSlider->getCurSliderValue();
-
- if( show_text )
+ if (p.show_text)
{
+ if (!p.text_width.isProvided())
+ {
+ text_width = 0;
+ // calculate the size of the text box (log max_value is number of digits - 1 so plus 1)
+ if ( p.max_value() )
+ text_width = p.font()->getWidth(std::string("0")) * ( static_cast < S32 > ( log10 ( p.max_value ) ) + p.decimal_digits + 1 );
+
+ if ( p.increment < 1.0f )
+ text_width += p.font()->getWidth(std::string(".")); // (mostly) take account of decimal point in value
+
+ if ( p.min_value < 0.0f || p.max_value < 0.0f )
+ text_width += p.font()->getWidth(std::string("-")); // (mostly) take account of minus sign
+
+ // padding to make things look nicer
+ text_width += 8;
+ }
+ S32 text_left = getRect().getWidth() - text_width;
+
+ slider_right = text_left - multi_sliderctrl_spacing;
+
LLRect text_rect( text_left, top, getRect().getWidth(), bottom );
- if( can_edit_text )
+ if( p.can_edit_text )
{
- mEditor = new LLLineEditor( std::string("MultiSliderCtrl Editor"), text_rect,
- LLStringUtil::null, font,
- MAX_STRING_LENGTH,
- &LLMultiSliderCtrl::onEditorCommit, NULL, NULL, this,
- &LLLineEditor::prevalidateFloat );
- mEditor->setFollowsLeft();
- mEditor->setFollowsBottom();
+ LLLineEditor::Params params;
+ params.name("MultiSliderCtrl Editor");
+ params.rect(text_rect);
+ params.font(p.font);
+ params.max_length_bytes(MAX_STRING_LENGTH);
+ params.commit_callback.function(LLMultiSliderCtrl::onEditorCommit);
+ params.prevalidate_callback(&LLLineEditor::prevalidateFloat);
+ params.follows.flags(FOLLOWS_LEFT | FOLLOWS_BOTTOM);
+ mEditor = LLUICtrlFactory::create<LLLineEditor> (params);
mEditor->setFocusReceivedCallback( &LLMultiSliderCtrl::onEditorGainFocus );
- mEditor->setIgnoreTab(TRUE);
// don't do this, as selecting the entire text is single clicking in some cases
// and double clicking in others
//mEditor->setSelectAllonFocusReceived(TRUE);
@@ -141,13 +151,37 @@ LLMultiSliderCtrl::LLMultiSliderCtrl(const std::string& name, const LLRect& rect
}
else
{
- mTextBox = new LLTextBox( std::string("MultiSliderCtrl Text"), text_rect, LLStringUtil::null, font);
- mTextBox->setFollowsLeft();
- mTextBox->setFollowsBottom();
+ LLTextBox::Params params;
+ params.name("MultiSliderCtrl Text");
+ params.rect(text_rect);
+ params.font(p.font);
+ params.follows.flags(FOLLOWS_LEFT | FOLLOWS_BOTTOM);
+ mTextBox = LLUICtrlFactory::create<LLTextBox> (params);
addChild(mTextBox);
}
}
+ S32 slider_left = label_width ? label_width + multi_sliderctrl_spacing : 0;
+ LLRect slider_rect( slider_left, top, slider_right, bottom );
+ LLMultiSlider::Params params;
+ params.rect(slider_rect);
+ params.commit_callback.function( LLMultiSliderCtrl::onSliderCommit );
+ params.mouse_down_callback( p.mouse_down_callback );
+ params.mouse_up_callback( p.mouse_up_callback );
+ params.initial_value(p.initial_value());
+ params.min_value(p.min_value);
+ params.max_value(p.max_value);
+ params.increment(p.increment);
+ params.max_sliders(p.max_sliders);
+ params.allow_overlap(p.allow_overlap);
+ params.draw_track(p.draw_track);
+ params.use_triangle(p.use_triangle);
+ params.control_name(p.control_name);
+ mMultiSlider = LLUICtrlFactory::create<LLMultiSlider> (params);
+ addChild( mMultiSlider );
+ mCurValue = mMultiSlider->getCurSliderValue();
+
+
updateText();
}
@@ -203,7 +237,8 @@ BOOL LLMultiSliderCtrl::setLabelArg( const std::string& key, const LLStringExpli
S32 delta = rect.mRight - prev_right;
rect = mMultiSlider->getRect();
S32 left = rect.mLeft + delta;
- left = llclamp(left, 0, rect.mRight-MULTI_SLIDERCTRL_SPACING);
+ static LLUICachedControl<S32> multi_slider_ctrl_spacing ("UIMultiSliderctrlSpacing", 0);
+ left = llclamp(left, 0, rect.mRight - multi_slider_ctrl_spacing);
rect.mLeft = left;
mMultiSlider->setRect(rect);
}
@@ -294,11 +329,12 @@ void LLMultiSliderCtrl::updateText()
}
// static
-void LLMultiSliderCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
+void LLMultiSliderCtrl::onEditorCommit( LLUICtrl* ctrl, const LLSD& userdata)
{
- LLMultiSliderCtrl* self = (LLMultiSliderCtrl*) userdata;
- llassert( caller == self->mEditor );
-
+ LLMultiSliderCtrl* self = dynamic_cast<LLMultiSliderCtrl*>(ctrl);
+ if (!ctrl)
+ return;
+
BOOL success = FALSE;
F32 val = self->mCurValue;
F32 saved_val = self->mCurValue;
@@ -310,17 +346,9 @@ void LLMultiSliderCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
val = (F32) atof( text.c_str() );
if( self->mMultiSlider->getMinValue() <= val && val <= self->mMultiSlider->getMaxValue() )
{
- if( self->mValidateCallback )
- {
- self->setCurSliderValue( val ); // set the value temporarily so that the callback can retrieve it.
- if( self->mValidateCallback( self, self->mCallbackUserData ) )
- {
- success = TRUE;
- }
- }
- else
+ self->setCurSliderValue( val ); // set the value temporarily so that the callback can retrieve it.
+ if( self->mValidateSignal( self, val ) )
{
- self->setCurSliderValue( val );
success = TRUE;
}
}
@@ -342,26 +370,19 @@ void LLMultiSliderCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
}
// static
-void LLMultiSliderCtrl::onSliderCommit( LLUICtrl* caller, void *userdata )
+void LLMultiSliderCtrl::onSliderCommit(LLUICtrl* ctrl, const LLSD& userdata)
{
- LLMultiSliderCtrl* self = (LLMultiSliderCtrl*) userdata;
- //llassert( caller == self->mSlider );
-
+ LLMultiSliderCtrl* self = dynamic_cast<LLMultiSliderCtrl*>(ctrl);
+ if (!self)
+ return;
+
BOOL success = FALSE;
F32 saved_val = self->mCurValue;
F32 new_val = self->mMultiSlider->getCurSliderValue();
- if( self->mValidateCallback )
+ self->mCurValue = new_val; // set the value temporarily so that the callback can retrieve it.
+ if( self->mValidateSignal( self, new_val ) )
{
- self->mCurValue = new_val; // set the value temporarily so that the callback can retrieve it.
- if( self->mValidateCallback( self, self->mCallbackUserData ) )
- {
- success = TRUE;
- }
- }
- else
- {
- self->mCurValue = new_val;
success = TRUE;
}
@@ -382,11 +403,11 @@ void LLMultiSliderCtrl::onSliderCommit( LLUICtrl* caller, void *userdata )
void LLMultiSliderCtrl::setEnabled(BOOL b)
{
- LLUICtrl::setEnabled( b );
+ LLF32UICtrl::setEnabled( b );
if( mLabelBox )
{
- mLabelBox->setColor( b ? mTextEnabledColor : mTextDisabledColor );
+ mLabelBox->setColor( b ? mTextEnabledColor.get() : mTextDisabledColor.get() );
}
mMultiSlider->setEnabled( b );
@@ -398,7 +419,7 @@ void LLMultiSliderCtrl::setEnabled(BOOL b)
if( mTextBox )
{
- mTextBox->setColor( b ? mTextEnabledColor : mTextDisabledColor );
+ mTextBox->setColor( b ? mTextEnabledColor.get() : mTextDisabledColor.get() );
}
}
@@ -409,7 +430,7 @@ void LLMultiSliderCtrl::setTentative(BOOL b)
{
mEditor->setTentative(b);
}
- LLUICtrl::setTentative(b);
+ LLF32UICtrl::setTentative(b);
}
@@ -422,7 +443,8 @@ void LLMultiSliderCtrl::onCommit()
mEditor->setTentative(FALSE);
}
- LLUICtrl::onCommit();
+ setControlValue(getValueF32());
+ LLF32UICtrl::onCommit();
}
@@ -438,37 +460,14 @@ void LLMultiSliderCtrl::setPrecision(S32 precision)
updateText();
}
-void LLMultiSliderCtrl::setSliderMouseDownCallback( void (*slider_mousedown_callback)(LLUICtrl* caller, void* userdata) )
-{
- mSliderMouseDownCallback = slider_mousedown_callback;
- mMultiSlider->setMouseDownCallback( LLMultiSliderCtrl::onSliderMouseDown );
-}
-
-// static
-void LLMultiSliderCtrl::onSliderMouseDown(LLUICtrl* caller, void* userdata)
+boost::signals::connection LLMultiSliderCtrl::setSliderMouseDownCallback( const commit_signal_t::slot_type& cb )
{
- LLMultiSliderCtrl* self = (LLMultiSliderCtrl*) userdata;
- if( self->mSliderMouseDownCallback )
- {
- self->mSliderMouseDownCallback( self, self->mCallbackUserData );
- }
+ return mMultiSlider->setMouseDownCallback( cb );
}
-
-void LLMultiSliderCtrl::setSliderMouseUpCallback( void (*slider_mouseup_callback)(LLUICtrl* caller, void* userdata) )
+boost::signals::connection LLMultiSliderCtrl::setSliderMouseUpCallback( const commit_signal_t::slot_type& cb )
{
- mSliderMouseUpCallback = slider_mouseup_callback;
- mMultiSlider->setMouseUpCallback( LLMultiSliderCtrl::onSliderMouseUp );
-}
-
-// static
-void LLMultiSliderCtrl::onSliderMouseUp(LLUICtrl* caller, void* userdata)
-{
- LLMultiSliderCtrl* self = (LLMultiSliderCtrl*) userdata;
- if( self->mSliderMouseUpCallback )
- {
- self->mSliderMouseUpCallback( self, self->mCallbackUserData );
- }
+ return mMultiSlider->setMouseUpCallback( cb );
}
void LLMultiSliderCtrl::onTabInto()
@@ -484,154 +483,9 @@ void LLMultiSliderCtrl::reportInvalidData()
make_ui_sound("UISndBadKeystroke");
}
-//virtual
-std::string LLMultiSliderCtrl::getControlName() const
-{
- return mMultiSlider->getControlName();
-}
-
// virtual
void LLMultiSliderCtrl::setControlName(const std::string& control_name, LLView* context)
{
mMultiSlider->setControlName(control_name, context);
}
-// virtual
-LLXMLNodePtr LLMultiSliderCtrl::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- node->createChild("show_text", TRUE)->setBoolValue(mShowText);
-
- node->createChild("can_edit_text", TRUE)->setBoolValue(mCanEditText);
-
- node->createChild("decimal_digits", TRUE)->setIntValue(mPrecision);
-
- if (mLabelBox)
- {
- node->createChild("label", TRUE)->setStringValue(mLabelBox->getText());
- }
-
- // TomY TODO: Do we really want to export the transient state of the slider?
- node->createChild("value", TRUE)->setFloatValue(mCurValue);
-
- if (mMultiSlider)
- {
- node->createChild("initial_val", TRUE)->setFloatValue(mMultiSlider->getInitialValue());
- node->createChild("min_val", TRUE)->setFloatValue(mMultiSlider->getMinValue());
- node->createChild("max_val", TRUE)->setFloatValue(mMultiSlider->getMaxValue());
- node->createChild("increment", TRUE)->setFloatValue(mMultiSlider->getIncrement());
- }
- addColorXML(node, mTextEnabledColor, "text_enabled_color", "LabelTextColor");
- addColorXML(node, mTextDisabledColor, "text_disabled_color", "LabelDisabledColor");
-
- return node;
-}
-
-LLView* LLMultiSliderCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("multi_slider");
- node->getAttributeString("name", name);
-
- std::string label;
- node->getAttributeString("label", label);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- LLFontGL* font = LLView::selectFont(node);
-
- // HACK: Font might not be specified.
- if (!font)
- {
- font = LLFontGL::getFontSansSerifSmall();
- }
-
- S32 label_width = 0;
- node->getAttributeS32("label_width", label_width);
-
- BOOL show_text = TRUE;
- node->getAttributeBOOL("show_text", show_text);
-
- BOOL can_edit_text = FALSE;
- node->getAttributeBOOL("can_edit_text", can_edit_text);
-
- BOOL allow_overlap = FALSE;
- node->getAttributeBOOL("allow_overlap", allow_overlap);
-
- BOOL draw_track = TRUE;
- node->getAttributeBOOL("draw_track", draw_track);
-
- BOOL use_triangle = FALSE;
- node->getAttributeBOOL("use_triangle", use_triangle);
-
- F32 initial_value = 0.f;
- node->getAttributeF32("initial_val", initial_value);
-
- F32 min_value = 0.f;
- node->getAttributeF32("min_val", min_value);
-
- F32 max_value = 1.f;
- node->getAttributeF32("max_val", max_value);
-
- F32 increment = 0.1f;
- node->getAttributeF32("increment", increment);
-
- U32 precision = 3;
- node->getAttributeU32("decimal_digits", precision);
-
- S32 max_sliders = 1;
- node->getAttributeS32("max_sliders", max_sliders);
-
-
- S32 text_left = 0;
- if (show_text)
- {
- // calculate the size of the text box (log max_value is number of digits - 1 so plus 1)
- if ( max_value )
- text_left = font->getWidth(std::string("0")) * ( static_cast < S32 > ( log10 ( max_value ) ) + precision + 1 );
-
- if ( increment < 1.0f )
- text_left += font->getWidth(std::string(".")); // (mostly) take account of decimal point in value
-
- if ( min_value < 0.0f || max_value < 0.0f )
- text_left += font->getWidth(std::string("-")); // (mostly) take account of minus sign
-
- // padding to make things look nicer
- text_left += 8;
- }
-
- LLUICtrlCallback callback = NULL;
-
- if (label.empty())
- {
- label.assign(node->getTextContents());
- }
-
- LLMultiSliderCtrl* slider = new LLMultiSliderCtrl(name,
- rect,
- label,
- font,
- label_width,
- rect.getWidth() - text_left,
- show_text,
- can_edit_text,
- callback,
- NULL,
- initial_value,
- min_value,
- max_value,
- increment,
- max_sliders,
- allow_overlap,
- draw_track,
- use_triangle);
-
- slider->setPrecision(precision);
-
- slider->initFromXML(node, parent);
-
- slider->updateText();
-
- return slider;
-}
diff --git a/indra/llui/llmultisliderctrl.h b/indra/llui/llmultisliderctrl.h
index b62b5ec323..85ba77b7df 100644
--- a/indra/llui/llmultisliderctrl.h
+++ b/indra/llui/llmultisliderctrl.h
@@ -33,17 +33,12 @@
#ifndef LL_MULTI_SLIDERCTRL_H
#define LL_MULTI_SLIDERCTRL_H
-#include "lluictrl.h"
+#include "llf32uictrl.h"
#include "v4color.h"
#include "llmultislider.h"
#include "lltextbox.h"
#include "llrect.h"
-//
-// Constants
-//
-const S32 MULTI_SLIDERCTRL_SPACING = 4; // space between label, slider, and text
-const S32 MULTI_SLIDERCTRL_HEIGHT = 16;
//
// Classes
@@ -53,27 +48,35 @@ class LLLineEditor;
class LLSlider;
-class LLMultiSliderCtrl : public LLUICtrl
+class LLMultiSliderCtrl : public LLF32UICtrl
{
public:
- LLMultiSliderCtrl(const std::string& name,
- const LLRect& rect,
- const std::string& label,
- const LLFontGL* font,
- S32 slider_left,
- S32 text_left,
- BOOL show_text,
- BOOL can_edit_text,
- void (*commit_callback)(LLUICtrl*, void*),
- void* callback_userdata,
- F32 initial_value, F32 min_value, F32 max_value, F32 increment,
- S32 max_sliders, BOOL allow_overlap, BOOL draw_track,
- BOOL use_triangle,
- const std::string& control_which = LLStringUtil::null );
-
+ struct Params : public LLInitParam::Block<Params, LLF32UICtrl::Params>
+ {
+ Optional<S32> label_width,
+ text_width;
+ Optional<bool> show_text,
+ can_edit_text;
+ Optional<S32> decimal_digits;
+ Optional<S32> max_sliders;
+ Optional<bool> allow_overlap,
+ draw_track,
+ use_triangle;
+
+ Optional<LLUIColor> text_color,
+ text_disabled_color;
+
+ Optional<CommitCallbackParam> mouse_down_callback,
+ mouse_up_callback;
+
+ Params();
+ };
+
+protected:
+ LLMultiSliderCtrl(const Params&);
+ friend class LLUICtrlFactory;
+public:
virtual ~LLMultiSliderCtrl();
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
F32 getSliderValue(const std::string& name) const;
void setSliderValue(const std::string& name, F32 v, BOOL from_event = FALSE);
@@ -112,8 +115,8 @@ public:
void setLabelColor(const LLColor4& c) { mTextEnabledColor = c; }
void setDisabledLabelColor(const LLColor4& c) { mTextDisabledColor = c; }
- void setSliderMouseDownCallback( void (*slider_mousedown_callback)(LLUICtrl* caller, void* userdata) );
- void setSliderMouseUpCallback( void (*slider_mouseup_callback)(LLUICtrl* caller, void* userdata) );
+ boost::signals::connection setSliderMouseDownCallback( const commit_signal_t::slot_type& cb );
+ boost::signals::connection setSliderMouseUpCallback( const commit_signal_t::slot_type& cb );
virtual void onTabInto();
@@ -121,13 +124,10 @@ public:
virtual void onCommit(); // mark not tentative, then commit
virtual void setControlName(const std::string& control_name, LLView* context);
- virtual std::string getControlName() const;
- static void onSliderCommit(LLUICtrl* caller, void* userdata);
- static void onSliderMouseDown(LLUICtrl* caller,void* userdata);
- static void onSliderMouseUp(LLUICtrl* caller,void* userdata);
-
- static void onEditorCommit(LLUICtrl* caller, void* userdata);
+ static void onSliderCommit(LLUICtrl* caller, const LLSD& userdata);
+
+ static void onEditorCommit(LLUICtrl* ctrl, const LLSD& userdata);
static void onEditorGainFocus(LLFocusableElement* caller, void *userdata);
static void onEditorChangeFocus(LLUICtrl* caller, S32 direction, void *userdata);
@@ -149,11 +149,8 @@ private:
LLLineEditor* mEditor;
LLTextBox* mTextBox;
- LLColor4 mTextEnabledColor;
- LLColor4 mTextDisabledColor;
-
- void (*mSliderMouseUpCallback)( LLUICtrl* ctrl, void* userdata );
- void (*mSliderMouseDownCallback)( LLUICtrl* ctrl, void* userdata );
+ LLUIColor mTextEnabledColor;
+ LLUIColor mTextDisabledColor;
};
#endif // LL_MULTI_SLIDERCTRL_H
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 2ae96726af..34ff21268e 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -31,11 +31,14 @@
*/
#include "linden_common.h"
+
+#include "llnotifications.h"
+
+#include "lluictrl.h"
#include "lluictrlfactory.h"
#include "lldir.h"
#include "llsdserialize.h"
-
-#include "llnotifications.h"
+#include "lltrans.h"
#include <algorithm>
#include <boost/regex.hpp>
@@ -161,7 +164,7 @@ bool filterIgnoredNotifications(LLNotificationPtr notification)
// Check to see if the user wants to ignore this alert
if (form->getIgnoreType() != LLNotificationForm::IGNORE_NO)
{
- return LLUI::sConfigGroup->getWarning(notification->getName());
+ return LLUI::sSettingGroups["ignores"]->getBOOL(notification->getName());
}
return true;
@@ -182,7 +185,7 @@ bool handleIgnoredNotification(const LLSD& payload)
response = pNotif->getResponseTemplate(LLNotification::WITH_DEFAULT_BUTTON);
break;
case LLNotificationForm::IGNORE_WITH_LAST_RESPONSE:
- response = LLUI::sIgnoresGroup->getLLSD("Default" + pNotif->getName());
+ response = LLUI::sSettingGroups["ignores"]->getLLSD("Default" + pNotif->getName());
break;
case LLNotificationForm::IGNORE_SHOW_AGAIN:
break;
@@ -240,10 +243,11 @@ LLNotificationForm::LLNotificationForm(const std::string& name, const LLXMLNodeP
{
// remember last option chosen by user and automatically respond with that in the future
mIgnore = IGNORE_WITH_LAST_RESPONSE;
- LLUI::sIgnoresGroup->declareLLSD(std::string("Default") + name, "", std::string("Default response for notification " + name));
+ LLUI::sSettingGroups["ignores"]->declareLLSD(std::string("Default") + name, "", std::string("Default response for notification " + name));
}
child->getAttributeString("text", mIgnoreMsg);
- LLUI::sIgnoresGroup->addWarning(name);
+ BOOL show_notification = TRUE;
+ LLUI::sSettingGroups["ignores"]->declareBOOL(name, show_notification, "Ignore notification with this name", TRUE);
}
else
{
@@ -339,13 +343,13 @@ void LLNotificationForm::formatElements(const LLSD& substitutions)
if ((*it).has("text"))
{
std::string text = (*it)["text"].asString();
- text = LLNotification::format(text, substitutions);
+ LLStringUtil::format(text, substitutions);
(*it)["text"] = text;
}
if ((*it)["type"].asString() == "text" && (*it).has("value"))
{
std::string value = (*it)["value"].asString();
- value = LLNotification::format(value, substitutions);
+ LLStringUtil::format(value, substitutions);
(*it)["value"] = value;
}
}
@@ -366,6 +370,7 @@ LLNotificationTemplate::LLNotificationTemplate() :
mExpireSeconds(0),
mExpireOption(-1),
mURLOption(-1),
+ mURLOpenExternally(-1),
mUnique(false),
mPriority(NOTIFICATION_PRIORITY_NORMAL)
{
@@ -377,13 +382,24 @@ LLNotification::LLNotification(const LLNotification::Params& p) :
mSubstitutions(p.substitutions),
mPayload(p.payload),
mExpiresAt(0),
- mResponseFunctorName(p.functor_name),
- mTemporaryResponder(p.mTemporaryResponder),
+ mTemporaryResponder(false),
mRespondedTo(false),
mPriority(p.priority),
mCancelled(false),
mIgnored(false)
{
+ if (p.functor.name.isChosen())
+ {
+ mResponseFunctorName = p.functor.name;
+ }
+ else if (p.functor.function.isChosen())
+ {
+ mResponseFunctorName = LLUUID::generateNewID().asString();
+ LLNotificationFunctorRegistry::instance().registerFunctor(mResponseFunctorName, p.functor.function());
+
+ mTemporaryResponder = true;
+ }
+
mId.generate();
init(p.name, p.form_elements);
}
@@ -525,7 +541,8 @@ std::string LLNotification::getSelectedOptionName(const LLSD& response)
void LLNotification::respond(const LLSD& response)
{
mRespondedTo = true;
- LLNotificationFunctorRegistry::instance().getFunctor(mResponseFunctorName)(asLLSD(), response);
+ LLNotificationResponder func = LLNotificationFunctorRegistry::instance().getFunctor(mResponseFunctorName);
+ func(asLLSD(), response);
if (mTemporaryResponder)
{
LLNotificationFunctorRegistry::instance().unregisterFunctor(mResponseFunctorName);
@@ -535,10 +552,11 @@ void LLNotification::respond(const LLSD& response)
if (mForm->getIgnoreType() != LLNotificationForm::IGNORE_NO)
{
- LLUI::sIgnoresGroup->setWarning(getName(), !mIgnored);
+ BOOL show_notification = mIgnored ? FALSE : TRUE;
+ LLUI::sSettingGroups["ignores"]->setBOOL(getName(), show_notification);
if (mIgnored && mForm->getIgnoreType() == LLNotificationForm::IGNORE_WITH_LAST_RESPONSE)
{
- LLUI::sIgnoresGroup->setLLSD("Default" + getName(), response);
+ LLUI::sSettingGroups["ignores"]->setLLSD("Default" + getName(), response);
}
}
@@ -596,8 +614,12 @@ void LLNotification::init(const std::string& template_name, const LLSD& form_ele
if (!mTemplatep) return;
// add default substitutions
- // TODO: change this to read from the translatable strings file!
- mSubstitutions["SECOND_LIFE"] = "Second Life";
+ const LLStringUtil::format_map_t& default_args = LLTrans::getDefaultArgs();
+ for (LLStringUtil::format_map_t::const_iterator iter = default_args.begin();
+ iter != default_args.end(); ++iter)
+ {
+ mSubstitutions[iter->first] = iter->second;
+ }
mSubstitutions["_URL"] = getURL();
mSubstitutions["_NAME"] = template_name;
// TODO: something like this so that a missing alert is sensible:
@@ -631,64 +653,6 @@ std::string LLNotification::summarize() const
return s;
}
-//static
-std::string LLNotification::format(const std::string& s, const LLSD& substitutions)
-{
- if (!substitutions.isMap())
- {
- return s;
- }
-
- std::ostringstream output;
- // match strings like [NAME]
- const boost::regex key("\\[([0-9_A-Z]+)]");
-
- std::string::const_iterator start = s.begin();
- std::string::const_iterator end = s.end();
- boost::smatch match;
-
- while (boost::regex_search(start, end, match, key, boost::match_default))
- {
- bool found_replacement = false;
- std::string replacement;
-
- // see if we have a replacement for the bracketed string (without the brackets)
- // test first using has() because if we just look up with operator[] we get back an
- // empty string even if the value is missing. We want to distinguish between
- // missing replacements and deliberately empty replacement strings.
- if (substitutions.has(std::string(match[1].first, match[1].second)))
- {
- replacement = substitutions[std::string(match[1].first, match[1].second)].asString();
- found_replacement = true;
- }
- // if not, see if there's one WITH brackets
- else if (substitutions.has(std::string(match[0].first, match[0].second)))
- {
- replacement = substitutions[std::string(match[0].first, match[0].second)].asString();
- found_replacement = true;
- }
-
- if (found_replacement)
- {
- // found a replacement
- // "hello world" is output
- output << std::string(start, match[0].first) << replacement;
- }
- else
- {
- // we had no replacement, so leave the string we searched for so that it gets noticed by QA
- // "hello [NAME_NOT_FOUND]" is output
- output << std::string(start, match[0].second);
- }
-
- // update search position
- start = match[0].second;
- }
- // send the remainder of the string (with no further matches for bracketed names)
- output << std::string(start, end);
- return output.str();
-}
-
std::string LLNotification::getMessage() const
{
// all our callers cache this result, so it gives us more flexibility
@@ -696,15 +660,27 @@ std::string LLNotification::getMessage() const
// cache it in the notification
if (!mTemplatep)
return std::string();
- return format(mTemplatep->mMessage, mSubstitutions);
+
+ std::string message = mTemplatep->mMessage;
+ LLStringUtil::format(message, mSubstitutions);
+ return message;
}
std::string LLNotification::getLabel() const
{
- return (mTemplatep ? format(mTemplatep->mLabel, mSubstitutions) : "");
+ std::string label = mTemplatep->mLabel;
+ LLStringUtil::format(label, mSubstitutions);
+ return (mTemplatep ? label : "");
}
-
+std::string LLNotification::getURL() const
+{
+ if (!mTemplatep)
+ return std::string();
+ std::string url = mTemplatep->mURL;
+ LLStringUtil::format(url, mSubstitutions);
+ return (mTemplatep ? url : "");
+}
// =========================================================
// LLNotificationChannel implementation
@@ -948,6 +924,7 @@ std::string LLNotificationChannel::summarize()
LLNotifications::LLNotifications() : LLNotificationChannelBase(LLNotificationFilters::includeEverything,
LLNotificationComparators::orderByUUID())
{
+ LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Notification.Show", boost::bind(&LLNotifications::addFromCallback, this, _2));
}
@@ -1097,9 +1074,6 @@ void LLNotifications::createDefaultChannels()
connectFailedFilter(&handleIgnoredNotification);
}
-static std::string sStringSkipNextTime("Skip this dialog next time");
-static std::string sStringAlwaysChoose("Always choose this option");
-
bool LLNotifications::addTemplate(const std::string &name,
LLNotificationTemplatePtr theTemplate)
{
@@ -1320,8 +1294,17 @@ bool LLNotifications::loadTemplates()
item->getAttributeString("sound", sound);
if (!sound.empty())
{
- // TODO: test for bad sound effect name / missing effect
- pTemplate->mSoundEffect = LLUUID(LLUI::sConfigGroup->getString(sound.c_str()));
+ // test for bad sound effect name / missing effect
+ if (LLUI::sSettingGroups["config"]->controlExists(sound))
+ {
+ pTemplate->mSoundEffect =
+ LLUUID(LLUI::sSettingGroups["config"]->getString(sound));
+ }
+ else
+ {
+ llwarns << "Unknown sound effect control name " << sound
+ << llendl;
+ }
}
for (LLXMLNodePtr child = item->getFirstChild();
@@ -1334,6 +1317,7 @@ bool LLNotifications::loadTemplates()
{
pTemplate->mURL = child->getTextContents();
child->getAttributeU32("option", pTemplate->mURLOption);
+ child->getAttributeU32("openexternally", pTemplate->mURLOpenExternally);
}
if (child->hasName("unique"))
@@ -1373,12 +1357,20 @@ bool LLNotifications::loadTemplates()
return true;
}
+// Add a simple notification (from XUI)
+void LLNotifications::addFromCallback(const LLSD& name)
+{
+ add(LLNotification::Params().name(name.asString()));
+}
+
// we provide a couple of simple add notification functions so that it's reasonable to create notifications in one line
LLNotificationPtr LLNotifications::add(const std::string& name,
const LLSD& substitutions,
const LLSD& payload)
{
- return add(LLNotification::Params(name).substitutions(substitutions).payload(payload));
+ LLNotification::Params::Functor functor_p;
+ functor_p.name = name;
+ return add(LLNotification::Params().name(name).substitutions(substitutions).payload(payload).functor(functor_p));
}
LLNotificationPtr LLNotifications::add(const std::string& name,
@@ -1386,7 +1378,9 @@ LLNotificationPtr LLNotifications::add(const std::string& name,
const LLSD& payload,
const std::string& functor_name)
{
- return add(LLNotification::Params(name).substitutions(substitutions).payload(payload).functor_name(functor_name));
+ LLNotification::Params::Functor functor_p;
+ functor_p.name = functor_name;
+ return add(LLNotification::Params().name(name).substitutions(substitutions).payload(payload).functor(functor_p));
}
LLNotificationPtr LLNotifications::add(const std::string& name,
@@ -1394,7 +1388,9 @@ LLNotificationPtr LLNotifications::add(const std::string& name,
const LLSD& payload,
LLNotificationFunctorRegistry::ResponseFunctor functor)
{
- return add(LLNotification::Params(name).substitutions(substitutions).payload(payload).functor(functor));
+ LLNotification::Params::Functor functor_p;
+ functor_p.function = functor;
+ return add(LLNotification::Params().name(name).substitutions(substitutions).payload(payload).functor(functor_p));
}
// generalized add function that takes a parameter block object for more complex instantiations
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index bb379121cc..de86f5daa2 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -100,6 +100,7 @@
// and we need this to manage the notification callbacks
#include "llfunctorregistry.h"
#include "llui.h"
+#include "llmemory.h"
class LLNotification;
typedef boost::shared_ptr<LLNotification> LLNotificationPtr;
@@ -280,6 +281,11 @@ struct LLNotificationTemplate
// that URL. Obsolete this and eliminate the buttons for affected
// messages when we allow clickable URLs in the UI
U32 mURLOption;
+
+ U32 mURLOpenExternally;
+ //This is a flag that tells if the url needs to open externally dispite
+ //what the user setting is.
+
// does this notification persist across sessions? if so, it will be
// serialized to disk on first receipt and read on startup
bool mPersist;
@@ -322,42 +328,49 @@ friend class LLNotifications;
public:
// parameter object used to instantiate a new notification
- class Params : public LLParamBlock<Params>
+ struct Params : public LLInitParam::Block<Params>
{
friend class LLNotification;
- public:
- Params(const std::string& _name)
- : name(_name),
- mTemporaryResponder(false),
- functor_name(_name),
- priority(NOTIFICATION_PRIORITY_UNSPECIFIED),
- timestamp(LLDate::now())
+
+ Mandatory<std::string> name;
+
+ // optional
+ Optional<LLSD> substitutions;
+ Optional<LLSD> payload;
+ Optional<ENotificationPriority> priority;
+ Optional<LLSD> form_elements;
+ Optional<LLDate> timestamp;
+ Optional<LLNotificationContext*> context;
+
+ struct Functor : public LLInitParam::Choice<Functor>
{
+ Option<std::string> name;
+ Option<LLNotificationFunctorRegistry::ResponseFunctor> function;
+
+ Functor()
+ : name("functor_name"),
+ function("functor")
+ {}
+ };
+ Optional<Functor> functor;
+
+ Params()
+ : name("name"),
+ priority("priority", NOTIFICATION_PRIORITY_UNSPECIFIED),
+ timestamp("time_stamp")
+ {
+ timestamp = LLDate::now();
}
- // pseudo-param
- Params& functor(LLNotificationFunctorRegistry::ResponseFunctor f)
- {
- functor_name = LLUUID::generateNewID().asString();
- LLNotificationFunctorRegistry::instance().registerFunctor(functor_name, f);
-
- mTemporaryResponder = true;
- return *this;
+ Params(const std::string& _name)
+ : name("name"),
+ priority("priority", NOTIFICATION_PRIORITY_UNSPECIFIED),
+ timestamp("time_stamp")
+ {
+ functor.name = _name;
+ name = _name;
+ timestamp = LLDate::now();
}
-
- LLMandatoryParam<std::string> name;
-
- // optional
- LLOptionalParam<LLSD> substitutions;
- LLOptionalParam<LLSD> payload;
- LLOptionalParam<ENotificationPriority> priority;
- LLOptionalParam<LLSD> form_elements;
- LLOptionalParam<LLDate> timestamp;
- LLOptionalParam<LLNotificationContext*> context;
- LLOptionalParam<std::string> functor_name;
-
- private:
- bool mTemporaryResponder;
};
private:
@@ -410,10 +423,6 @@ public:
// constructor from a saved notification
LLNotification(const LLSD& sd);
- // This is a string formatter for substituting into the message directly
- // from LLSD without going through the hopefully-to-be-obsoleted LLString
- static std::string format(const std::string& text, const LLSD& substitutions);
-
void setResponseFunctor(std::string const &responseFunctorName);
typedef enum e_response_template_type
@@ -505,16 +514,21 @@ public:
std::string getMessage() const;
std::string getLabel() const;
- std::string getURL() const
- {
- return (mTemplatep ? mTemplatep->mURL : "");
- }
+ std::string getURL() const;
+// {
+// return (mTemplatep ? mTemplatep->mURL : "");
+// }
S32 getURLOption() const
{
return (mTemplatep ? mTemplatep->mURLOption : -1);
}
-
+
+ S32 getURLOpenExternally() const
+ {
+ return(mTemplatep? mTemplatep->mURLOpenExternally : -1);
+ }
+
const LLNotificationFormPtr getForm();
const LLDate getExpiration() const
@@ -813,7 +827,10 @@ public:
// OK to call more than once because it will reload
bool loadTemplates();
LLXMLNodePtr checkForXMLTemplate(LLXMLNodePtr item);
-
+
+ // Add a simple notification (from XUI)
+ void addFromCallback(const LLSD& name);
+
// we provide a collection of simple add notification functions so that it's reasonable to create notifications in one line
LLNotificationPtr add(const std::string& name,
const LLSD& substitutions = LLSD(),
diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp
index 92d045d114..35871dc078 100644
--- a/indra/llui/llpanel.cpp
+++ b/indra/llui/llpanel.cpp
@@ -54,74 +54,47 @@
#include "lluictrlfactory.h"
#include "llviewborder.h"
#include "llbutton.h"
+#include "lltabcontainer.h"
-// LLLayoutStack
-#include "llresizebar.h"
-#include "llcriticaldamp.h"
+static LLRegisterWidget<LLPanel> r1("panel", &LLPanel::fromXML);
-const S32 RESIZE_BAR_OVERLAP = 1;
-const S32 RESIZE_BAR_HEIGHT = 3;
-
-static LLRegisterWidget<LLPanel> r1("panel");
-
-void LLPanel::init()
+LLPanel::Params::Params()
+: has_border("border", false),
+ bg_opaque_color("bg_opaque_color"),
+ bg_alpha_color("bg_alpha_color"),
+ background_visible("background_visible", false),
+ background_opaque("background_opaque", false),
+ min_width("min_width", 100),
+ min_height("min_height", 100),
+ strings("string"),
+ filename("filename")
{
- // mRectControl
- mBgColorAlpha = LLUI::sColorsGroup->getColor( "DefaultBackgroundColor" );
- mBgColorOpaque = LLUI::sColorsGroup->getColor( "FocusBackgroundColor" );
- mDefaultBtnHighlight = LLUI::sColorsGroup->getColor( "DefaultHighlightLight" );
- mBgVisible = FALSE;
- mBgOpaque = FALSE;
- mBorder = NULL;
- mDefaultBtn = NULL;
- setIsChrome(FALSE); //is this a decorator to a live window or a form?
- mLastTabGroup = 0;
-
- mPanelHandle.bind(this);
- setTabStop(FALSE);
+ name = "panel";
+ addSynonym(background_visible, "bg_visible");
+ addSynonym(has_border, "border_visible");
+ addSynonym(label, "title");
}
-LLPanel::LLPanel()
-: mRectControl()
-{
- init();
- setName(std::string("panel"));
-}
-LLPanel::LLPanel(const std::string& name)
-: LLUICtrl(name, LLRect(0, 0, 0, 0), TRUE, NULL, NULL),
- mRectControl()
+LLPanel::LLPanel(const LLPanel::Params& p)
+: LLUICtrl(p),
+ mBgColorAlpha(p.bg_alpha_color().get()),
+ mBgColorOpaque(p.bg_opaque_color().get()),
+ mBgVisible(p.background_visible),
+ mBgOpaque(p.background_opaque),
+ mDefaultBtn(NULL),
+ mBorder(NULL),
+ mLabel(p.label),
+ mCommitCallbackRegistrar(false)
{
- init();
-}
-
-
-LLPanel::LLPanel(const std::string& name, const LLRect& rect, BOOL bordered)
-: LLUICtrl(name, rect, TRUE, NULL, NULL),
- mRectControl()
-{
- init();
- if (bordered)
- {
- addBorder();
- }
-}
+ setIsChrome(FALSE);
-
-LLPanel::LLPanel(const std::string& name, const std::string& rect_control, BOOL bordered)
-: LLUICtrl(name, LLUI::sConfigGroup->getRect(rect_control), TRUE, NULL, NULL),
- mRectControl( rect_control )
-{
- init();
- if (bordered)
+ if (p.has_border)
{
- addBorder();
+ addBorder(p.border);
}
-}
-
-LLPanel::~LLPanel()
-{
- storeRectControl();
+
+ mPanelHandle.bind(this);
}
// virtual
@@ -130,27 +103,23 @@ BOOL LLPanel::isPanel() const
return TRUE;
}
-// virtual
-BOOL LLPanel::postBuild()
-{
- return TRUE;
-}
-
-void LLPanel::addBorder(LLViewBorder::EBevel border_bevel,
- LLViewBorder::EStyle border_style, S32 border_thickness)
+void LLPanel::addBorder(LLViewBorder::Params p)
{
removeBorder();
- mBorder = new LLViewBorder( std::string("panel border"),
- LLRect(0, getRect().getHeight(), getRect().getWidth(), 0),
- border_bevel, border_style, border_thickness );
- mBorder->setSaveToXML(false);
+ p.rect = getLocalRect();
+
+ mBorder = LLUICtrlFactory::create<LLViewBorder>(p);
addChild( mBorder );
}
void LLPanel::removeBorder()
{
- delete mBorder;
- mBorder = NULL;
+ if (mBorder)
+ {
+ removeChild(mBorder);
+ delete mBorder;
+ mBorder = NULL;
+ }
}
@@ -258,20 +227,6 @@ void LLPanel::setDefaultBtn(const std::string& id)
}
}
-void LLPanel::addCtrl( LLUICtrl* ctrl, S32 tab_group)
-{
- mLastTabGroup = tab_group;
-
- LLView::addCtrl(ctrl, tab_group);
-}
-
-void LLPanel::addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group)
-{
- mLastTabGroup = tab_group;
-
- LLView::addCtrlAtEnd(ctrl, tab_group);
-}
-
BOOL LLPanel::handleKeyHere( KEY key, MASK mask )
{
BOOL handled = FALSE;
@@ -364,12 +319,10 @@ void LLPanel::setFocus(BOOL b)
{
if (!gFocusMgr.childHasKeyboardFocus(this))
{
- //refresh();
- if (!focusFirstItem())
- {
- LLUICtrl::setFocus(TRUE);
- }
- onFocusReceived();
+ // give ourselves focus preemptively, to avoid infinite loop
+ LLUICtrl::setFocus(TRUE);
+ // then try to pass to first valid child
+ focusFirstItem();
}
}
else
@@ -399,191 +352,135 @@ void LLPanel::setBorderVisible(BOOL b)
}
}
-// virtual
-LLXMLNodePtr LLPanel::getXML(bool save_children) const
+LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLXMLNodePtr output_node)
{
- LLXMLNodePtr node = LLView::getXML();
+ std::string name("panel");
+ node->getAttributeString("name", name);
- if (mBorder && mBorder->getVisible())
- {
- node->createChild("border", TRUE)->setBoolValue(TRUE);
- }
+ LLPanel* panelp = LLUICtrlFactory::getInstance()->createFactoryPanel(name);
- if (!mRectControl.empty())
+ // factory panels may have registered their own factory maps
+ if (!panelp->getFactoryMap().empty())
{
- node->createChild("rect_control", TRUE)->setStringValue(mRectControl);
+ LLUICtrlFactory::instance().pushFactoryFunctions(&panelp->getFactoryMap());
}
+ panelp->mCommitCallbackRegistrar.pushScope(); // for local registry callbacks; define in constructor, referenced in XUI or postBuild
- if (!mLabel.empty())
- {
- node->createChild("label", TRUE)->setStringValue(mLabel);
- }
+ panelp->initPanelXML(node, parent, output_node);
+
+ panelp->mCommitCallbackRegistrar.popScope();
- if (save_children)
+ if (panelp && !panelp->getFactoryMap().empty())
{
- LLView::child_list_const_reverse_iter_t rit;
- for (rit = getChildList()->rbegin(); rit != getChildList()->rend(); ++rit)
- {
- LLView* childp = *rit;
-
- if (childp->getSaveToXML())
- {
- LLXMLNodePtr xml_node = childp->getXML();
-
- node->addChild(xml_node);
- }
- }
+ LLUICtrlFactory::instance().popFactoryFunctions();
}
- return node;
+ return panelp;
}
-LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory *factory)
+void LLPanel::initFromParams(const LLPanel::Params& p)
{
- std::string name("panel");
- node->getAttributeString("name", name);
+ // control_name, tab_stop, focus_lost_callback, initial_value, rect, enabled, visible
+ LLUICtrl::initFromParams(p);
- LLPanel* panelp = factory->createFactoryPanel(name);
- // Fall back on a default panel, if there was no special factory.
- if (!panelp)
- {
- LLRect rect;
- createRect(node, rect, parent, LLRect());
- // create a new panel without a border, by default
- panelp = new LLPanel(name, rect, FALSE);
- panelp->initPanelXML(node, parent, factory);
- // preserve panel's width and height, but override the location
- const LLRect& panelrect = panelp->getRect();
- S32 w = panelrect.getWidth();
- S32 h = panelrect.getHeight();
- rect.setLeftTopAndSize(rect.mLeft, rect.mTop, w, h);
- panelp->setRect(rect);
- }
- else
+ for (LLInitParam::ParamIterator<LocalizedString>::const_iterator it = p.strings().begin();
+ it != p.strings().end();
+ ++it)
{
- panelp->initPanelXML(node, parent, factory);
+ mUIStrings[it->name] = it->text;
}
- return panelp;
-}
-
-BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name = getName();
- node->getAttributeString("name", name);
- setName(name);
-
- setPanelParameters(node, parent);
+ setName(p.name());
+ setLabel(p.label());
- initChildrenXML(node, factory);
+ setShape(p.rect);
+ parseFollowsFlags(p);
- std::string xml_filename;
- node->getAttributeString("filename", xml_filename);
-
- BOOL didPost;
-
- if (!xml_filename.empty())
+ setEnabled(p.enabled);
+ setVisible(p.visible);
+ setToolTip(p.tool_tip());
+ setSaveToXML(p.serializable);
+
+ mHoverCursor = getCursorFromString(p.hover_cursor);
+
+ if (p.has_border)
{
- didPost = factory->buildPanel(this, xml_filename, NULL);
-
- LLRect new_rect = getRect();
- // override rectangle with embedding parameters as provided
- createRect(node, new_rect, parent);
- setOrigin(new_rect.mLeft, new_rect.mBottom);
- reshape(new_rect.getWidth(), new_rect.getHeight());
- // optionally override follows flags from including nodes
- parseFollowsFlags(node);
+ addBorder(p.border);
}
- else
+ // let constructors set this value if not provided
+ if (p.use_bounding_rect.isProvided())
{
- didPost = FALSE;
+ setUseBoundingRect(p.use_bounding_rect);
}
+ setDefaultTabGroup(p.default_tab_group);
+ setMouseOpaque(p.mouse_opaque);
+
+ setBackgroundVisible(p.background_visible);
+ setBackgroundOpaque(p.background_opaque);
+ setBackgroundColor(p.bg_opaque_color().get());
+ setTransparentColor(p.bg_alpha_color().get());
- if (!didPost)
- {
- postBuild();
- didPost = TRUE;
- }
-
- return didPost;
}
-void LLPanel::initChildrenXML(LLXMLNodePtr node, LLUICtrlFactory* factory)
+BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)
{
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
+ const LLPanel::Params& default_params(LLUICtrlFactory::getDefaultParams<LLPanel::Params>());
+ Params params(default_params);
+
+ LLXMLNodePtr referenced_xml;
+ std::string xml_filename;
+ node->getAttributeString("filename", xml_filename);
+
+ if (!xml_filename.empty())
{
- // look for string declarations for programmatic text
- if (child->hasName("string"))
+ if (!LLUICtrlFactory::getLayeredXMLNode(xml_filename, referenced_xml))
{
- std::string string_name;
- child->getAttributeString("name", string_name);
- if (!string_name.empty())
- {
- mUIStrings[string_name] = child->getTextContents();
- }
- }
- else
- {
- factory->createWidget(this, child);
+ llwarns << "Couldn't parse panel from: " << xml_filename << llendl;
+
+ return FALSE;
}
- }
-}
-void LLPanel::setPanelParameters(LLXMLNodePtr node, LLView* parent)
-{
- /////// Rect, follows, tool_tip, enabled, visible attributes ///////
- initFromXML(node, parent);
+ LLXUIParser::instance().readXUI(referenced_xml, params);
- /////// Border attributes ///////
- BOOL border = mBorder != NULL;
- node->getAttributeBOOL("border", border);
- if (border)
- {
- LLViewBorder::EBevel bevel_style = LLViewBorder::BEVEL_OUT;
- LLViewBorder::getBevelFromAttribute(node, bevel_style);
+ // add children using dimensions from referenced xml for consistent layout
+ setShape(params.rect);
+ addChildren(referenced_xml);
+ }
- LLViewBorder::EStyle border_style = LLViewBorder::STYLE_LINE;
- std::string border_string;
- node->getAttributeString("border_style", border_string);
- LLStringUtil::toLower(border_string);
+ LLXUIParser::instance().readXUI(node, params);
- if (border_string == "texture")
- {
- border_style = LLViewBorder::STYLE_TEXTURE;
- }
+ if (output_node)
+ {
+ Params output_params(params);
+ setupParamsForExport(output_params, parent);
+ output_node->setName(node->getName()->mString);
+ LLXUIParser::instance().writeXUI(
+ output_node, output_params, &default_params);
+ }
+
+ setupParams(params, parent);
+ initFromParams(params);
- S32 border_thickness = LLPANEL_BORDER_WIDTH;
- node->getAttributeS32("border_thickness", border_thickness);
+ // add children
+ addChildren(node, output_node);
- addBorder(bevel_style, border_style, border_thickness);
- }
- else
+ // Connect to parent after children are built, because tab containers
+ // do a reshape() on their child panels, which requires that the children
+ // be built/added. JC
+ if (parent)
{
- removeBorder();
+ S32 tab_group = params.tab_group.isProvided() ? params.tab_group() : -1;
+ parent->addChild(this, tab_group);
}
- /////// Background attributes ///////
- BOOL background_visible = mBgVisible;
- node->getAttributeBOOL("background_visible", background_visible);
- setBackgroundVisible(background_visible);
-
- BOOL background_opaque = mBgOpaque;
- node->getAttributeBOOL("background_opaque", background_opaque);
- setBackgroundOpaque(background_opaque);
-
- LLColor4 color;
- color = mBgColorOpaque;
- LLUICtrlFactory::getAttributeColor(node,"bg_opaque_color", color);
- setBackgroundColor(color);
-
- color = mBgColorAlpha;
- LLUICtrlFactory::getAttributeColor(node,"bg_alpha_color", color);
- setTransparentColor(color);
-
- std::string label = getLabel();
- node->getAttributeString("label", label);
- setLabel(label);
+ postBuild();
+
+ return TRUE;
+}
+
+bool LLPanel::hasString(const std::string& name)
+{
+ return mUIStrings.find(name) != mUIStrings.end();
}
std::string LLPanel::getString(const std::string& name, const LLStringUtil::format_map_t& args) const
@@ -597,9 +494,7 @@ std::string LLPanel::getString(const std::string& name, const LLStringUtil::form
return formatted_string.getString();
}
std::string err_str("Failed to find string " + name + " in panel " + getName()); //*TODO: Translate
- // *TODO: once the QAR-369 ui-cleanup work on settings is in we need to change the following line to be
- //if(LLUI::sConfigGroup->getBOOL("QAMode"))
- if(LLUI::sQAMode)
+ if(LLUI::sSettingGroups["config"]->getBOOL("QAMode"))
{
llerrs << err_str << llendl;
}
@@ -618,7 +513,7 @@ std::string LLPanel::getString(const std::string& name) const
return found_it->second;
}
std::string err_str("Failed to find string " + name + " in panel " + getName()); //*TODO: Translate
- if(LLUI::sQAMode)
+ if(LLUI::sSettingGroups["config"]->getBOOL("QAMode"))
{
llerrs << err_str << llendl;
}
@@ -632,7 +527,7 @@ std::string LLPanel::getString(const std::string& name) const
void LLPanel::childSetVisible(const std::string& id, bool visible)
{
- LLView* child = getChild<LLView>(id);
+ LLView* child = findChild<LLView>(id);
if (child)
{
child->setVisible(visible);
@@ -641,7 +536,7 @@ void LLPanel::childSetVisible(const std::string& id, bool visible)
bool LLPanel::childIsVisible(const std::string& id) const
{
- LLView* child = getChild<LLView>(id);
+ LLView* child = findChild<LLView>(id);
if (child)
{
return (bool)child->getVisible();
@@ -651,7 +546,7 @@ bool LLPanel::childIsVisible(const std::string& id) const
void LLPanel::childSetEnabled(const std::string& id, bool enabled)
{
- LLView* child = getChild<LLView>(id);
+ LLView* child = findChild<LLView>(id);
if (child)
{
child->setEnabled(enabled);
@@ -660,7 +555,7 @@ void LLPanel::childSetEnabled(const std::string& id, bool enabled)
void LLPanel::childSetTentative(const std::string& id, bool tentative)
{
- LLView* child = getChild<LLView>(id);
+ LLView* child = findChild<LLView>(id);
if (child)
{
child->setTentative(tentative);
@@ -669,7 +564,7 @@ void LLPanel::childSetTentative(const std::string& id, bool tentative)
bool LLPanel::childIsEnabled(const std::string& id) const
{
- LLView* child = getChild<LLView>(id);
+ LLView* child = findChild<LLView>(id);
if (child)
{
return (bool)child->getEnabled();
@@ -680,7 +575,7 @@ bool LLPanel::childIsEnabled(const std::string& id) const
void LLPanel::childSetToolTip(const std::string& id, const std::string& msg)
{
- LLView* child = getChild<LLView>(id);
+ LLView* child = findChild<LLView>(id);
if (child)
{
child->setToolTip(msg);
@@ -689,7 +584,7 @@ void LLPanel::childSetToolTip(const std::string& id, const std::string& msg)
void LLPanel::childSetRect(const std::string& id, const LLRect& rect)
{
- LLView* child = getChild<LLView>(id);
+ LLView* child = findChild<LLView>(id);
if (child)
{
child->setRect(rect);
@@ -698,7 +593,7 @@ void LLPanel::childSetRect(const std::string& id, const LLRect& rect)
bool LLPanel::childGetRect(const std::string& id, LLRect& rect) const
{
- LLView* child = getChild<LLView>(id);
+ LLView* child = findChild<LLView>(id);
if (child)
{
rect = child->getRect();
@@ -709,7 +604,7 @@ bool LLPanel::childGetRect(const std::string& id, LLRect& rect) const
void LLPanel::childSetFocus(const std::string& id, BOOL focus)
{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
child->setFocus(focus);
@@ -718,7 +613,7 @@ void LLPanel::childSetFocus(const std::string& id, BOOL focus)
BOOL LLPanel::childHasFocus(const std::string& id)
{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
return child->hasFocus();
@@ -730,60 +625,28 @@ BOOL LLPanel::childHasFocus(const std::string& id)
}
}
-
-void LLPanel::childSetFocusChangedCallback(const std::string& id, void (*cb)(LLFocusableElement*, void*), void* user_data)
-{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
- if (child)
- {
- child->setFocusChangedCallback(cb, user_data);
- }
-}
-
-void LLPanel::childSetCommitCallback(const std::string& id, void (*cb)(LLUICtrl*, void*), void *userdata )
-{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
- if (child)
- {
- child->setCommitCallback(cb);
- child->setCallbackUserData(userdata);
- }
-}
-
-void LLPanel::childSetDoubleClickCallback(const std::string& id, void (*cb)(void*), void *userdata )
+// *TODO: Deprecate; for backwards compatability only:
+void LLPanel::childSetCommitCallback(const std::string& id, boost::function<void (LLUICtrl*,void*)> cb, void* data)
{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
- child->setDoubleClickCallback(cb);
- if (userdata)
- {
- child->setCallbackUserData(userdata);
- }
+ child->setCommitCallback(boost::bind(cb, child, data));
}
}
-void LLPanel::childSetValidate(const std::string& id, BOOL (*cb)(LLUICtrl*, void*))
+void LLPanel::childSetValidate(const std::string& id, boost::function<bool (const LLSD& data)> cb)
{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
child->setValidateBeforeCommit(cb);
}
}
-void LLPanel::childSetUserData(const std::string& id, void* userdata)
-{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
- if (child)
- {
- child->setCallbackUserData(userdata);
- }
-}
-
void LLPanel::childSetColor(const std::string& id, const LLColor4& color)
{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
child->setColor(color);
@@ -792,7 +655,7 @@ void LLPanel::childSetColor(const std::string& id, const LLColor4& color)
LLCtrlSelectionInterface* LLPanel::childGetSelectionInterface(const std::string& id) const
{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
return child->getSelectionInterface();
@@ -802,7 +665,7 @@ LLCtrlSelectionInterface* LLPanel::childGetSelectionInterface(const std::string&
LLCtrlListInterface* LLPanel::childGetListInterface(const std::string& id) const
{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
return child->getListInterface();
@@ -812,7 +675,7 @@ LLCtrlListInterface* LLPanel::childGetListInterface(const std::string& id) const
LLCtrlScrollInterface* LLPanel::childGetScrollInterface(const std::string& id) const
{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
return child->getScrollInterface();
@@ -822,7 +685,7 @@ LLCtrlScrollInterface* LLPanel::childGetScrollInterface(const std::string& id) c
void LLPanel::childSetValue(const std::string& id, LLSD value)
{
- LLView* child = getChild<LLView>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
child->setValue(value);
@@ -831,7 +694,7 @@ void LLPanel::childSetValue(const std::string& id, LLSD value)
LLSD LLPanel::childGetValue(const std::string& id) const
{
- LLView* child = getChild<LLView>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
return child->getValue();
@@ -842,7 +705,7 @@ LLSD LLPanel::childGetValue(const std::string& id) const
BOOL LLPanel::childSetTextArg(const std::string& id, const std::string& key, const LLStringExplicit& text)
{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
return child->setTextArg(key, text);
@@ -852,7 +715,7 @@ BOOL LLPanel::childSetTextArg(const std::string& id, const std::string& key, con
BOOL LLPanel::childSetLabelArg(const std::string& id, const std::string& key, const LLStringExplicit& text)
{
- LLView* child = getChild<LLView>(id);
+ LLView* child = findChild<LLView>(id);
if (child)
{
return child->setLabelArg(key, text);
@@ -862,7 +725,7 @@ BOOL LLPanel::childSetLabelArg(const std::string& id, const std::string& key, co
BOOL LLPanel::childSetToolTipArg(const std::string& id, const std::string& key, const LLStringExplicit& text)
{
- LLView* child = getChildView(id, true, FALSE);
+ LLView* child = findChild<LLView>(id);
if (child)
{
return child->setToolTipArg(key, text);
@@ -872,7 +735,7 @@ BOOL LLPanel::childSetToolTipArg(const std::string& id, const std::string& key,
void LLPanel::childSetMinValue(const std::string& id, LLSD min_value)
{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
child->setMinValue(min_value);
@@ -881,7 +744,7 @@ void LLPanel::childSetMinValue(const std::string& id, LLSD min_value)
void LLPanel::childSetMaxValue(const std::string& id, LLSD max_value)
{
- LLUICtrl* child = getChild<LLUICtrl>(id, true);
+ LLUICtrl* child = findChild<LLUICtrl>(id);
if (child)
{
child->setMaxValue(max_value);
@@ -890,7 +753,7 @@ void LLPanel::childSetMaxValue(const std::string& id, LLSD max_value)
void LLPanel::childShowTab(const std::string& id, const std::string& tabname, bool visible)
{
- LLTabContainer* child = getChild<LLTabContainer>(id);
+ LLTabContainer* child = findChild<LLTabContainer>(id);
if (child)
{
child->selectTabByName(tabname);
@@ -899,7 +762,7 @@ void LLPanel::childShowTab(const std::string& id, const std::string& tabname, bo
LLPanel *LLPanel::childGetVisibleTab(const std::string& id) const
{
- LLTabContainer* child = getChild<LLTabContainer>(id);
+ LLTabContainer* child = findChild<LLTabContainer>(id);
if (child)
{
return child->getCurrentPanel();
@@ -907,40 +770,9 @@ LLPanel *LLPanel::childGetVisibleTab(const std::string& id) const
return NULL;
}
-void LLPanel::childSetTabChangeCallback(const std::string& id, const std::string& tabname, void (*on_tab_clicked)(void*, bool), void *userdata, void (*on_precommit)(void*,bool))
-{
- LLTabContainer* child = getChild<LLTabContainer>(id);
- if (child)
- {
- LLPanel *panel = child->getPanelByName(tabname);
- if (panel)
- {
- child->setTabChangeCallback(panel, on_tab_clicked);
- child->setTabUserData(panel, userdata);
- if (on_precommit)
- {
- child->setTabPrecommitChangeCallback(panel, on_precommit);
- }
- }
- }
-}
-
-void LLPanel::childSetKeystrokeCallback(const std::string& id, void (*keystroke_callback)(LLLineEditor* caller, void* user_data), void *user_data)
-{
- LLLineEditor* child = getChild<LLLineEditor>(id);
- if (child)
- {
- child->setKeystrokeCallback(keystroke_callback);
- if (user_data)
- {
- child->setCallbackUserData(user_data);
- }
- }
-}
-
void LLPanel::childSetPrevalidate(const std::string& id, BOOL (*func)(const LLWString &) )
{
- LLLineEditor* child = getChild<LLLineEditor>(id);
+ LLLineEditor* child = findChild<LLLineEditor>(id);
if (child)
{
child->setPrevalidate(func);
@@ -949,7 +781,7 @@ void LLPanel::childSetPrevalidate(const std::string& id, BOOL (*func)(const LLWS
void LLPanel::childSetWrappedText(const std::string& id, const std::string& text, bool visible)
{
- LLTextBox* child = getChild<LLTextBox>(id);
+ LLTextBox* child = findChild<LLTextBox>(id);
if (child)
{
child->setVisible(visible);
@@ -957,18 +789,18 @@ void LLPanel::childSetWrappedText(const std::string& id, const std::string& text
}
}
-void LLPanel::childSetAction(const std::string& id, void(*function)(void*), void* value)
+void LLPanel::childSetAction(const std::string& id, boost::function<void(void*)> function, void* value)
{
- LLButton* button = getChild<LLButton>(id);
+ LLButton* button = findChild<LLButton>(id);
if (button)
{
- button->setClickedCallback(function, value);
+ button->setClickedCallback(boost::bind(function, value));
}
}
void LLPanel::childSetActionTextbox(const std::string& id, void(*function)(void*), void* value)
{
- LLTextBox* textbox = getChild<LLTextBox>(id);
+ LLTextBox* textbox = findChild<LLTextBox>(id);
if (textbox)
{
textbox->setClickedCallback(function, value);
@@ -977,7 +809,7 @@ void LLPanel::childSetActionTextbox(const std::string& id, void(*function)(void*
void LLPanel::childSetControlName(const std::string& id, const std::string& control_name)
{
- LLView* view = getChild<LLView>(id);
+ LLUICtrl* view = findChild<LLUICtrl>(id);
if (view)
{
view->setControlName(control_name, NULL);
@@ -995,7 +827,11 @@ LLView* LLPanel::getChildView(const std::string& name, BOOL recurse, BOOL create
}
if (!view && create_if_missing)
{
- view = createDummyWidget<LLView>(name);
+ view = getDummyWidget<LLView>(name);
+ if (!view)
+ {
+ view = LLUICtrlFactory::createDummyWidget<LLView>(name);
+ }
}
return view;
}
@@ -1028,617 +864,8 @@ void LLPanel::childDisplayNotFound()
LLNotifications::instance().add("FloaterNotFound", args);
}
-void LLPanel::storeRectControl()
+void LLPanel::requires(const std::string& name)
{
- if( !mRectControl.empty() )
- {
- LLUI::sConfigGroup->setRect( mRectControl, getRect() );
- }
+ requires<LLView>(name);
}
-
-//
-// LLLayoutStack
-//
-struct LLLayoutStack::LLEmbeddedPanel
-{
- LLEmbeddedPanel(LLPanel* panelp, eLayoutOrientation orientation, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize) :
- mPanel(panelp),
- mMinWidth(min_width),
- mMinHeight(min_height),
- mAutoResize(auto_resize),
- mUserResize(user_resize),
- mOrientation(orientation),
- mCollapsed(FALSE),
- mCollapseAmt(0.f),
- mVisibleAmt(1.f) // default to fully visible
- {
- LLResizeBar::Side side = (orientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM;
- LLRect resize_bar_rect = panelp->getRect();
-
- S32 min_dim;
- if (orientation == HORIZONTAL)
- {
- min_dim = mMinHeight;
- }
- else
- {
- min_dim = mMinWidth;
- }
- mResizeBar = new LLResizeBar(std::string("resizer"), mPanel, LLRect(), min_dim, S32_MAX, side);
- mResizeBar->setEnableSnapping(FALSE);
- // panels initialized as hidden should not start out partially visible
- if (!mPanel->getVisible())
- {
- mVisibleAmt = 0.f;
- }
- }
-
- ~LLEmbeddedPanel()
- {
- // probably not necessary, but...
- delete mResizeBar;
- mResizeBar = NULL;
- }
-
- F32 getCollapseFactor()
- {
- if (mOrientation == HORIZONTAL)
- {
- return mVisibleAmt * clamp_rescale(mCollapseAmt, 0.f, 1.f, 1.f, (F32)mMinWidth / (F32)mPanel->getRect().getWidth());
- }
- else
- {
- return mVisibleAmt * clamp_rescale(mCollapseAmt, 0.f, 1.f, 1.f, (F32)mMinHeight / (F32)mPanel->getRect().getHeight());
- }
- }
-
- LLPanel* mPanel;
- S32 mMinWidth;
- S32 mMinHeight;
- BOOL mAutoResize;
- BOOL mUserResize;
- BOOL mCollapsed;
- LLResizeBar* mResizeBar;
- eLayoutOrientation mOrientation;
- F32 mVisibleAmt;
- F32 mCollapseAmt;
-};
-
-static LLRegisterWidget<LLLayoutStack> r2("layout_stack");
-
-LLLayoutStack::LLLayoutStack(eLayoutOrientation orientation) :
- mOrientation(orientation),
- mMinWidth(0),
- mMinHeight(0),
- mPanelSpacing(RESIZE_BAR_HEIGHT)
-{
-}
-
-LLLayoutStack::~LLLayoutStack()
-{
- std::for_each(mPanels.begin(), mPanels.end(), DeletePointer());
-}
-
-void LLLayoutStack::draw()
-{
- updateLayout();
-
- e_panel_list_t::iterator panel_it;
- for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
- {
- // clip to layout rectangle, not bounding rectangle
- LLRect clip_rect = (*panel_it)->mPanel->getRect();
- // scale clipping rectangle by visible amount
- if (mOrientation == HORIZONTAL)
- {
- clip_rect.mRight = clip_rect.mLeft + llround((F32)clip_rect.getWidth() * (*panel_it)->getCollapseFactor());
- }
- else
- {
- clip_rect.mBottom = clip_rect.mTop - llround((F32)clip_rect.getHeight() * (*panel_it)->getCollapseFactor());
- }
-
- LLPanel* panelp = (*panel_it)->mPanel;
-
- LLLocalClipRect clip(clip_rect);
- // only force drawing invisible children if visible amount is non-zero
- drawChild(panelp, 0, 0, !clip_rect.isNull());
- }
-}
-
-void LLLayoutStack::removeCtrl(LLUICtrl* ctrl)
-{
- LLEmbeddedPanel* embedded_panelp = findEmbeddedPanel((LLPanel*)ctrl);
-
- if (embedded_panelp)
- {
- mPanels.erase(std::find(mPanels.begin(), mPanels.end(), embedded_panelp));
- delete embedded_panelp;
- }
-
- // need to update resizebars
-
- calcMinExtents();
-
- LLView::removeCtrl(ctrl);
-}
-
-LLXMLNodePtr LLLayoutStack::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLView::getXML();
- return node;
-}
-
-//static
-LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string orientation_string("vertical");
- node->getAttributeString("orientation", orientation_string);
-
- eLayoutOrientation orientation = VERTICAL;
-
- if (orientation_string == "horizontal")
- {
- orientation = HORIZONTAL;
- }
- else if (orientation_string == "vertical")
- {
- orientation = VERTICAL;
- }
- else
- {
- llwarns << "Unknown orientation " << orientation_string << ", using vertical" << llendl;
- }
-
- LLLayoutStack* layout_stackp = new LLLayoutStack(orientation);
-
- node->getAttributeS32("border_size", layout_stackp->mPanelSpacing);
- // don't allow negative spacing values
- layout_stackp->mPanelSpacing = llmax(layout_stackp->mPanelSpacing, 0);
-
- std::string name("stack");
- node->getAttributeString("name", name);
-
- layout_stackp->setName(name);
- layout_stackp->initFromXML(node, parent);
-
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
- {
- S32 min_width = 0;
- S32 min_height = 0;
- BOOL auto_resize = TRUE;
-
- child->getAttributeS32("min_width", min_width);
- child->getAttributeS32("min_height", min_height);
- child->getAttributeBOOL("auto_resize", auto_resize);
-
- if (child->hasName("layout_panel"))
- {
- BOOL user_resize = TRUE;
- child->getAttributeBOOL("user_resize", user_resize);
- LLPanel* panelp = (LLPanel*)LLPanel::fromXML(child, layout_stackp, factory);
- if (panelp)
- {
- panelp->setFollowsNone();
- layout_stackp->addPanel(panelp, min_width, min_height, auto_resize, user_resize);
- }
- }
- else
- {
- BOOL user_resize = FALSE;
- child->getAttributeBOOL("user_resize", user_resize);
-
- LLPanel* panelp = new LLPanel(std::string("auto_panel"));
- LLView* new_child = factory->createWidget(panelp, child);
- if (new_child)
- {
- // put child in new embedded panel
- layout_stackp->addPanel(panelp, min_width, min_height, auto_resize, user_resize);
- // resize panel to contain widget and move widget to be contained in panel
- panelp->setRect(new_child->getRect());
- new_child->setOrigin(0, 0);
- }
- else
- {
- panelp->die();
- }
- }
- }
- layout_stackp->updateLayout();
-
- return layout_stackp;
-}
-
-S32 LLLayoutStack::getDefaultHeight(S32 cur_height)
-{
- // if we are spanning our children (crude upward propagation of size)
- // then don't enforce our size on our children
- if (mOrientation == HORIZONTAL)
- {
- cur_height = llmax(mMinHeight, getRect().getHeight());
- }
-
- return cur_height;
-}
-
-S32 LLLayoutStack::getDefaultWidth(S32 cur_width)
-{
- // if we are spanning our children (crude upward propagation of size)
- // then don't enforce our size on our children
- if (mOrientation == VERTICAL)
- {
- cur_width = llmax(mMinWidth, getRect().getWidth());
- }
-
- return cur_width;
-}
-
-void LLLayoutStack::addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, EAnimate animate, S32 index)
-{
- // panel starts off invisible (collapsed)
- if (animate == ANIMATE)
- {
- panel->setVisible(FALSE);
- }
- LLEmbeddedPanel* embedded_panel = new LLEmbeddedPanel(panel, mOrientation, min_width, min_height, auto_resize, user_resize);
-
- mPanels.insert(mPanels.begin() + llclamp(index, 0, (S32)mPanels.size()), embedded_panel);
-
- addChild(panel);
- addChild(embedded_panel->mResizeBar);
-
- // bring all resize bars to the front so that they are clickable even over the panels
- // with a bit of overlap
- for (e_panel_list_t::iterator panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
- {
- LLResizeBar* resize_barp = (*panel_it)->mResizeBar;
- sendChildToFront(resize_barp);
- }
-
- // start expanding panel animation
- if (animate == ANIMATE)
- {
- panel->setVisible(TRUE);
- }
-}
-
-void LLLayoutStack::removePanel(LLPanel* panel)
-{
- removeChild(panel);
-}
-
-void LLLayoutStack::collapsePanel(LLPanel* panel, BOOL collapsed)
-{
- LLEmbeddedPanel* panel_container = findEmbeddedPanel(panel);
- if (!panel_container) return;
-
- panel_container->mCollapsed = collapsed;
-}
-
-void LLLayoutStack::updateLayout(BOOL force_resize)
-{
- calcMinExtents();
-
- // calculate current extents
- S32 total_width = 0;
- S32 total_height = 0;
-
- const F32 ANIM_OPEN_TIME = 0.02f;
- const F32 ANIM_CLOSE_TIME = 0.03f;
-
- e_panel_list_t::iterator panel_it;
- for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
- {
- LLPanel* panelp = (*panel_it)->mPanel;
- if (panelp->getVisible())
- {
- (*panel_it)->mVisibleAmt = lerp((*panel_it)->mVisibleAmt, 1.f, LLCriticalDamp::getInterpolant(ANIM_OPEN_TIME));
- if ((*panel_it)->mVisibleAmt > 0.99f)
- {
- (*panel_it)->mVisibleAmt = 1.f;
- }
- }
- else // not visible
- {
- (*panel_it)->mVisibleAmt = lerp((*panel_it)->mVisibleAmt, 0.f, LLCriticalDamp::getInterpolant(ANIM_CLOSE_TIME));
- if ((*panel_it)->mVisibleAmt < 0.001f)
- {
- (*panel_it)->mVisibleAmt = 0.f;
- }
- }
-
- if ((*panel_it)->mCollapsed)
- {
- (*panel_it)->mCollapseAmt = lerp((*panel_it)->mCollapseAmt, 1.f, LLCriticalDamp::getInterpolant(ANIM_CLOSE_TIME));
- }
- else
- {
- (*panel_it)->mCollapseAmt = lerp((*panel_it)->mCollapseAmt, 0.f, LLCriticalDamp::getInterpolant(ANIM_CLOSE_TIME));
- }
-
- if (mOrientation == HORIZONTAL)
- {
- // enforce minimize size constraint by default
- if (panelp->getRect().getWidth() < (*panel_it)->mMinWidth)
- {
- panelp->reshape((*panel_it)->mMinWidth, panelp->getRect().getHeight());
- }
- total_width += llround(panelp->getRect().getWidth() * (*panel_it)->getCollapseFactor());
- // want n-1 panel gaps for n panels
- if (panel_it != mPanels.begin())
- {
- total_width += mPanelSpacing;
- }
- }
- else //VERTICAL
- {
- // enforce minimize size constraint by default
- if (panelp->getRect().getHeight() < (*panel_it)->mMinHeight)
- {
- panelp->reshape(panelp->getRect().getWidth(), (*panel_it)->mMinHeight);
- }
- total_height += llround(panelp->getRect().getHeight() * (*panel_it)->getCollapseFactor());
- if (panel_it != mPanels.begin())
- {
- total_height += mPanelSpacing;
- }
- }
- }
-
- S32 num_resizable_panels = 0;
- S32 shrink_headroom_available = 0;
- S32 shrink_headroom_total = 0;
- for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
- {
- // panels that are not fully visible do not count towards shrink headroom
- if ((*panel_it)->getCollapseFactor() < 1.f)
- {
- continue;
- }
-
- // if currently resizing a panel or the panel is flagged as not automatically resizing
- // only track total available headroom, but don't use it for automatic resize logic
- if ((*panel_it)->mResizeBar->hasMouseCapture()
- || (!(*panel_it)->mAutoResize
- && !force_resize))
- {
- if (mOrientation == HORIZONTAL)
- {
- shrink_headroom_total += (*panel_it)->mPanel->getRect().getWidth() - (*panel_it)->mMinWidth;
- }
- else //VERTICAL
- {
- shrink_headroom_total += (*panel_it)->mPanel->getRect().getHeight() - (*panel_it)->mMinHeight;
- }
- }
- else
- {
- num_resizable_panels++;
- if (mOrientation == HORIZONTAL)
- {
- shrink_headroom_available += (*panel_it)->mPanel->getRect().getWidth() - (*panel_it)->mMinWidth;
- shrink_headroom_total += (*panel_it)->mPanel->getRect().getWidth() - (*panel_it)->mMinWidth;
- }
- else //VERTICAL
- {
- shrink_headroom_available += (*panel_it)->mPanel->getRect().getHeight() - (*panel_it)->mMinHeight;
- shrink_headroom_total += (*panel_it)->mPanel->getRect().getHeight() - (*panel_it)->mMinHeight;
- }
- }
- }
-
- // calculate how many pixels need to be distributed among layout panels
- // positive means panels need to grow, negative means shrink
- S32 pixels_to_distribute;
- if (mOrientation == HORIZONTAL)
- {
- pixels_to_distribute = getRect().getWidth() - total_width;
- }
- else //VERTICAL
- {
- pixels_to_distribute = getRect().getHeight() - total_height;
- }
-
- // now we distribute the pixels...
- S32 cur_x = 0;
- S32 cur_y = getRect().getHeight();
-
- for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
- {
- LLPanel* panelp = (*panel_it)->mPanel;
-
- S32 cur_width = panelp->getRect().getWidth();
- S32 cur_height = panelp->getRect().getHeight();
- S32 new_width = llmax((*panel_it)->mMinWidth, cur_width);
- S32 new_height = llmax((*panel_it)->mMinHeight, cur_height);
-
- S32 delta_size = 0;
-
- // if panel can automatically resize (not animating, and resize flag set)...
- if ((*panel_it)->getCollapseFactor() == 1.f
- && (force_resize || (*panel_it)->mAutoResize)
- && !(*panel_it)->mResizeBar->hasMouseCapture())
- {
- if (mOrientation == HORIZONTAL)
- {
- // if we're shrinking
- if (pixels_to_distribute < 0)
- {
- // shrink proportionally to amount over minimum
- // so we can do this in one pass
- delta_size = (shrink_headroom_available > 0) ? llround((F32)pixels_to_distribute * ((F32)(cur_width - (*panel_it)->mMinWidth) / (F32)shrink_headroom_available)) : 0;
- shrink_headroom_available -= (cur_width - (*panel_it)->mMinWidth);
- }
- else
- {
- // grow all elements equally
- delta_size = llround((F32)pixels_to_distribute / (F32)num_resizable_panels);
- num_resizable_panels--;
- }
- pixels_to_distribute -= delta_size;
- new_width = llmax((*panel_it)->mMinWidth, cur_width + delta_size);
- }
- else
- {
- new_width = getDefaultWidth(new_width);
- }
-
- if (mOrientation == VERTICAL)
- {
- if (pixels_to_distribute < 0)
- {
- // shrink proportionally to amount over minimum
- // so we can do this in one pass
- delta_size = (shrink_headroom_available > 0) ? llround((F32)pixels_to_distribute * ((F32)(cur_height - (*panel_it)->mMinHeight) / (F32)shrink_headroom_available)) : 0;
- shrink_headroom_available -= (cur_height - (*panel_it)->mMinHeight);
- }
- else
- {
- delta_size = llround((F32)pixels_to_distribute / (F32)num_resizable_panels);
- num_resizable_panels--;
- }
- pixels_to_distribute -= delta_size;
- new_height = llmax((*panel_it)->mMinHeight, cur_height + delta_size);
- }
- else
- {
- new_height = getDefaultHeight(new_height);
- }
- }
- else
- {
- if (mOrientation == HORIZONTAL)
- {
- new_height = getDefaultHeight(new_height);
- }
- else // VERTICAL
- {
- new_width = getDefaultWidth(new_width);
- }
- }
-
- // adjust running headroom count based on new sizes
- shrink_headroom_total += delta_size;
-
- panelp->reshape(new_width, new_height);
- panelp->setOrigin(cur_x, cur_y - new_height);
-
- LLRect panel_rect = panelp->getRect();
- LLRect resize_bar_rect = panel_rect;
- if (mOrientation == HORIZONTAL)
- {
- resize_bar_rect.mLeft = panel_rect.mRight - RESIZE_BAR_OVERLAP;
- resize_bar_rect.mRight = panel_rect.mRight + mPanelSpacing + RESIZE_BAR_OVERLAP;
- }
- else
- {
- resize_bar_rect.mTop = panel_rect.mBottom + RESIZE_BAR_OVERLAP;
- resize_bar_rect.mBottom = panel_rect.mBottom - mPanelSpacing - RESIZE_BAR_OVERLAP;
- }
- (*panel_it)->mResizeBar->setRect(resize_bar_rect);
-
- if (mOrientation == HORIZONTAL)
- {
- cur_x += llround(new_width * (*panel_it)->getCollapseFactor()) + mPanelSpacing;
- }
- else //VERTICAL
- {
- cur_y -= llround(new_height * (*panel_it)->getCollapseFactor()) + mPanelSpacing;
- }
- }
-
- // update resize bars with new limits
- LLResizeBar* last_resize_bar = NULL;
- for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
- {
- LLPanel* panelp = (*panel_it)->mPanel;
-
- if (mOrientation == HORIZONTAL)
- {
- (*panel_it)->mResizeBar->setResizeLimits(
- (*panel_it)->mMinWidth,
- (*panel_it)->mMinWidth + shrink_headroom_total);
- }
- else //VERTICAL
- {
- (*panel_it)->mResizeBar->setResizeLimits(
- (*panel_it)->mMinHeight,
- (*panel_it)->mMinHeight + shrink_headroom_total);
- }
-
- // toggle resize bars based on panel visibility, resizability, etc
- BOOL resize_bar_enabled = panelp->getVisible() && (*panel_it)->mUserResize;
- (*panel_it)->mResizeBar->setVisible(resize_bar_enabled);
-
- if (resize_bar_enabled)
- {
- last_resize_bar = (*panel_it)->mResizeBar;
- }
- }
-
- // hide last resize bar as there is nothing past it
- // resize bars need to be in between two resizable panels
- if (last_resize_bar)
- {
- last_resize_bar->setVisible(FALSE);
- }
-
- // not enough room to fit existing contents
- if (force_resize == FALSE
- // layout did not complete by reaching target position
- && ((mOrientation == VERTICAL && cur_y != -mPanelSpacing)
- || (mOrientation == HORIZONTAL && cur_x != getRect().getWidth() + mPanelSpacing)))
- {
- // do another layout pass with all stacked elements contributing
- // even those that don't usually resize
- llassert_always(force_resize == FALSE);
- updateLayout(TRUE);
- }
-} // end LLLayoutStack::updateLayout
-
-
-LLLayoutStack::LLEmbeddedPanel* LLLayoutStack::findEmbeddedPanel(LLPanel* panelp) const
-{
- e_panel_list_t::const_iterator panel_it;
- for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
- {
- if ((*panel_it)->mPanel == panelp)
- {
- return *panel_it;
- }
- }
- return NULL;
-}
-
-void LLLayoutStack::calcMinExtents()
-{
- mMinWidth = 0;
- mMinHeight = 0;
-
- e_panel_list_t::iterator panel_it;
- for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
- {
- if (mOrientation == HORIZONTAL)
- {
- mMinHeight = llmax( mMinHeight,
- (*panel_it)->mMinHeight);
- mMinWidth += (*panel_it)->mMinWidth;
- if (panel_it != mPanels.begin())
- {
- mMinWidth += mPanelSpacing;
- }
- }
- else //VERTICAL
- {
- mMinWidth = llmax( mMinWidth,
- (*panel_it)->mMinWidth);
- mMinHeight += (*panel_it)->mMinHeight;
- if (panel_it != mPanels.begin())
- {
- mMinHeight += mPanelSpacing;
- }
- }
- }
-}
diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h
index 756d02ef7d..5f4f8d16e7 100644
--- a/indra/llui/llpanel.h
+++ b/indra/llui/llpanel.h
@@ -56,42 +56,70 @@ const BOOL BORDER_NO = FALSE;
* With or without border,
* Can contain LLUICtrls.
*/
-class LLPanel : public LLUICtrl, public boost::signals::trackable
+class LLPanel : public LLUICtrl
{
public:
+ struct LocalizedString : public LLInitParam::Block<LocalizedString>
+ {
+ Mandatory<std::string> name;
+ Mandatory<std::string> text;
+
+ LocalizedString()
+ : name("name"),
+ text("value")
+ {}
+ };
+
+ struct Params
+ : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<bool> has_border;
+ Optional<LLViewBorder::Params> border;
+
+ Optional<LLUIColor> bg_opaque_color,
+ bg_alpha_color;
+
+ Optional<bool> background_visible,
+ background_opaque;
+
+ Optional<S32> min_width,
+ min_height;
+
+ Optional<std::string> filename;
- // minimal constructor for data-driven initialization
- LLPanel();
- LLPanel(const std::string& name);
+ Multiple<LocalizedString> strings;
- // Position and size not saved
- LLPanel(const std::string& name, const LLRect& rect, BOOL bordered = TRUE);
+ Params();
+ };
- // Position and size are saved to rect_control
- LLPanel(const std::string& name, const std::string& rect_control, BOOL bordered = TRUE);
+ // RN: for some reason you can't just use LLUICtrlFactory::getDefaultParams as a default argument in VC8
+ static const Params& defaultParams() { return LLUICtrlFactory::getDefaultParams<LLPanel::Params>(); }
+
+ // Panels can get constructed directly
+ LLPanel(const Params& params = defaultParams());
- /*virtual*/ ~LLPanel();
+public:
+// LLPanel(const std::string& name, const LLRect& rect = LLRect(), BOOL bordered = TRUE);
+ /*virtual*/ ~LLPanel() {}
// LLView interface
/*virtual*/ BOOL isPanel() const;
/*virtual*/ void draw();
/*virtual*/ BOOL handleKeyHere( KEY key, MASK mask );
- /*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
+
// Override to set not found list:
- virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+ /*virtual*/ LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
// From LLFocusableElement
/*virtual*/ void setFocus( BOOL b );
// New virtuals
virtual void refresh(); // called in setFocus()
- virtual BOOL postBuild();
virtual void clearCtrls(); // overridden in LLPanelObject and LLPanelVolume
// Border controls
- void addBorder( LLViewBorder::EBevel border_bevel = LLViewBorder::BEVEL_OUT,
- LLViewBorder::EStyle border_style = LLViewBorder::STYLE_LINE,
- S32 border_thickness = LLPANEL_BORDER_WIDTH );
+ void addBorder( LLViewBorder::Params p);
+ void addBorder() { LLViewBorder::Params p; p.border_thickness(LLPANEL_BORDER_WIDTH); addBorder(p); }
void removeBorder();
BOOL hasBorder() const { return mBorder != NULL; }
void setBorderVisible( BOOL b );
@@ -106,10 +134,7 @@ public:
}
// requires LLView by default
- void requires(const std::string& name)
- {
- requires<LLView>(name);
- }
+ void requires(const std::string& name);
BOOL checkRequirements();
void setBackgroundColor( const LLColor4& color ) { mBgColorOpaque = color; }
@@ -126,22 +151,18 @@ public:
void setLabel(const LLStringExplicit& label) { mLabel = label; }
std::string getLabel() const { return mLabel; }
- void setRectControl(const std::string& rect_control) { mRectControl.assign(rect_control); }
- const std::string& getRectControl() const { return mRectControl; }
- void storeRectControl();
-
void setCtrlsEnabled(BOOL b);
LLHandle<LLPanel> getHandle() const { return mPanelHandle; }
- S32 getLastTabGroup() const { return mLastTabGroup; }
-
const LLCallbackMap::map_t& getFactoryMap() const { return mFactoryMap; }
-
- BOOL initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
- void initChildrenXML(LLXMLNodePtr node, LLUICtrlFactory* factory);
- void setPanelParameters(LLXMLNodePtr node, LLView *parentp);
-
+
+ CommitCallbackRegistry::ScopedRegistrar& getCommitCallbackRegistrar() { return mCommitCallbackRegistrar; }
+
+ void initFromParams(const Params& p);
+ BOOL initPanelXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node = NULL);
+
+ bool hasString(const std::string& name);
std::string getString(const std::string& name, const LLStringUtil::format_map_t& args) const;
std::string getString(const std::string& name) const;
@@ -166,12 +187,10 @@ public:
// LLUICtrl
void childSetFocus(const std::string& id, BOOL focus = TRUE);
BOOL childHasFocus(const std::string& id);
- void childSetFocusChangedCallback(const std::string& id, void (*cb)(LLFocusableElement*, void*), void* user_data = NULL);
- void childSetCommitCallback(const std::string& id, void (*cb)(LLUICtrl*, void*), void* userdata = NULL );
- void childSetDoubleClickCallback(const std::string& id, void (*cb)(void*), void* userdata = NULL );
- void childSetValidate(const std::string& id, BOOL (*cb)(LLUICtrl*, void*) );
- void childSetUserData(const std::string& id, void* userdata);
+ // *TODO: Deprecate; for backwards compatability only:
+ void childSetCommitCallback(const std::string& id, boost::function<void (LLUICtrl*,void*)> cb, void* data);
+ void childSetValidate(const std::string& id, boost::function<bool (const LLSD& data)> cb );
void childSetColor(const std::string& id, const LLColor4& color);
@@ -196,21 +215,21 @@ public:
// LLTabContainer
void childShowTab(const std::string& id, const std::string& tabname, bool visible = true);
LLPanel *childGetVisibleTab(const std::string& id) const;
- void childSetTabChangeCallback(const std::string& id, const std::string& tabname, void (*on_tab_clicked)(void*, bool), void *userdata, void (*on_precommit)(void*,bool) = NULL);
// LLTextBox
void childSetWrappedText(const std::string& id, const std::string& text, bool visible = true);
// LLTextBox/LLTextEditor/LLLineEditor
void childSetText(const std::string& id, const LLStringExplicit& text) { childSetValue(id, LLSD(text)); }
+
+ // *NOTE: Does not return text from <string> tags, use getString()
std::string childGetText(const std::string& id) const { return childGetValue(id).asString(); }
// LLLineEditor
- void childSetKeystrokeCallback(const std::string& id, void (*keystroke_callback)(LLLineEditor* caller, void* user_data), void *user_data);
void childSetPrevalidate(const std::string& id, BOOL (*func)(const LLWString &) );
// LLButton
- void childSetAction(const std::string& id, void(*function)(void*), void* value);
+ void childSetAction(const std::string& id, boost::function<void(void*)> function, void* value = NULL);
void childSetActionTextbox(const std::string& id, void(*function)(void*), void* value = NULL);
void childSetControlName(const std::string& id, const std::string& control_name);
@@ -218,36 +237,27 @@ public:
void childNotFound(const std::string& id) const;
void childDisplayNotFound();
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+ static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node = NULL);
protected:
// Override to set not found list
LLButton* getDefaultButton() { return mDefaultBtn; }
LLCallbackMap::map_t mFactoryMap;
-
+ CommitCallbackRegistry::ScopedRegistrar mCommitCallbackRegistrar;
+
private:
- // common construction logic
- void init();
-
- // From LLView
- virtual void addCtrl( LLUICtrl* ctrl, S32 tab_group );
- virtual void addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group);
-
// Unified error reporting for the child* functions
typedef std::set<std::string> expected_members_list_t;
mutable expected_members_list_t mExpectedMembers;
mutable expected_members_list_t mNewExpectedMembers;
- std::string mRectControl;
LLColor4 mBgColorAlpha;
LLColor4 mBgColorOpaque;
- LLColor4 mDefaultBtnHighlight;
BOOL mBgVisible;
BOOL mBgOpaque;
LLViewBorder* mBorder;
LLButton* mDefaultBtn;
- std::string mLabel;
- S32 mLastTabGroup;
+ LLUIString mLabel;
LLRootHandle<LLPanel> mPanelHandle;
typedef std::map<std::string, std::string> ui_string_map_t;
@@ -257,56 +267,4 @@ private:
}; // end class LLPanel
-
-class LLLayoutStack : public LLView
-{
-public:
- typedef enum e_layout_orientation
- {
- HORIZONTAL,
- VERTICAL
- } eLayoutOrientation;
-
- LLLayoutStack(eLayoutOrientation orientation);
- virtual ~LLLayoutStack();
-
- /*virtual*/ void draw();
- /*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
- /*virtual*/ void removeCtrl(LLUICtrl* ctrl);
-
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-
- S32 getMinWidth() const { return mMinWidth; }
- S32 getMinHeight() const { return mMinHeight; }
-
- typedef enum e_animate
- {
- NO_ANIMATE,
- ANIMATE
- } EAnimate;
-
- void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, EAnimate animate = NO_ANIMATE, S32 index = S32_MAX);
- void removePanel(LLPanel* panel);
- void collapsePanel(LLPanel* panel, BOOL collapsed = TRUE);
- S32 getNumPanels() { return mPanels.size(); }
-
-private:
- struct LLEmbeddedPanel;
-
- void updateLayout(BOOL force_resize = FALSE);
- void calcMinExtents();
- S32 getDefaultHeight(S32 cur_height);
- S32 getDefaultWidth(S32 cur_width);
-
- const eLayoutOrientation mOrientation;
-
- typedef std::vector<LLEmbeddedPanel*> e_panel_list_t;
- e_panel_list_t mPanels;
- LLEmbeddedPanel* findEmbeddedPanel(LLPanel* panelp) const;
-
- S32 mMinWidth;
- S32 mMinHeight;
- S32 mPanelSpacing;
-}; // end class LLLayoutStack
-
#endif
diff --git a/indra/llui/llprogressbar.cpp b/indra/llui/llprogressbar.cpp
index 8833494af8..693c331797 100644
--- a/indra/llui/llprogressbar.cpp
+++ b/indra/llui/llprogressbar.cpp
@@ -44,26 +44,32 @@
#include "llglheaders.h"
#include "llfocusmgr.h"
+#include "lluictrlfactory.h"
static LLRegisterWidget<LLProgressBar> r("progress_bar");
-LLProgressBar::LLProgressBar(const std::string& name, const LLRect &rect)
- : LLView(name, rect, FALSE),
- mImageBar( NULL ),
- mImageShadow( NULL )
-{
- mPercentDone = 0.f;
-
- // Defaults:
-
- setImageBar("rounded_square.tga");
- setImageShadow("rounded_square_soft.tga");
-
- mColorBackground = LLColor4(0.3254f, 0.4000f, 0.5058f, 1.0f);
- mColorBar = LLColor4(0.5764f, 0.6627f, 0.8352f, 1.0f);
- mColorBar2 = LLColor4(0.5764f, 0.6627f, 0.8352f, 1.0f);
- mColorShadow = LLColor4(0.2000f, 0.2000f, 0.4000f, 1.0f);
-}
+LLProgressBar::Params::Params()
+: image_bar("image_bar"),
+ image_fill("image_fill"),
+ image_shadow("image_shadow"),
+ color_bar("color_bar"),
+ color_bar2("color_bar2"),
+ color_shadow("color_shadow"),
+ color_bg("color_bg")
+{}
+
+
+LLProgressBar::LLProgressBar(const LLProgressBar::Params& p)
+: LLView(p),
+ mImageBar(p.image_bar),
+ mImageShadow(p.image_shadow),
+ mImageFill(p.image_fill),
+ mColorBackground(p.color_bg()),
+ mColorBar(p.color_bar()),
+ mColorBar2(p.color_bar2()),
+ mColorShadow(p.color_shadow()),
+ mPercentDone(0.f)
+{}
LLProgressBar::~LLProgressBar()
{
@@ -74,108 +80,19 @@ void LLProgressBar::draw()
{
static LLTimer timer;
- LLUIImagePtr shadow_imagep = LLUI::getUIImage("rounded_square_soft.tga");
LLUIImagePtr bar_fg_imagep = LLUI::getUIImage("progressbar_fill.tga");
- LLUIImagePtr bar_bg_imagep = LLUI::getUIImage("progressbar_track.tga");
- LLUIImagePtr bar_imagep = LLUI::getUIImage("rounded_square.tga");
- LLColor4 background_color = LLUI::sColorsGroup->getColor("LoginProgressBarBgColor");
- bar_bg_imagep->draw(getLocalRect(),
- background_color);
+ mImageBar->draw(getLocalRect(), mColorBackground.get());
F32 alpha = 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32()));
- LLColor4 bar_color = LLUI::sColorsGroup->getColor("LoginProgressBarFgColor");
+ LLColor4 bar_color = mColorBar.get();
bar_color.mV[3] = alpha;
LLRect progress_rect = getLocalRect();
progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f));
- bar_fg_imagep->draw(progress_rect);
+ mImageFill->draw(progress_rect);
}
void LLProgressBar::setPercent(const F32 percent)
{
mPercentDone = llclamp(percent, 0.f, 100.f);
}
-
-void LLProgressBar::setImageBar( const std::string &bar_name )
-{
- mImageBar = LLUI::sImageProvider->getUIImage(bar_name)->getImage();
-}
-
-void LLProgressBar::setImageShadow(const std::string &shadow_name)
-{
- mImageShadow = LLUI::sImageProvider->getUIImage(shadow_name)->getImage();
-}
-
-void LLProgressBar::setColorBar(const LLColor4 &c)
-{
- mColorBar = c;
-}
-void LLProgressBar::setColorBar2(const LLColor4 &c)
-{
- mColorBar2 = c;
-}
-void LLProgressBar::setColorShadow(const LLColor4 &c)
-{
- mColorShadow = c;
-}
-void LLProgressBar::setColorBackground(const LLColor4 &c)
-{
- mColorBackground = c;
-}
-
-
-// static
-LLView* LLProgressBar::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("progress_bar");
- node->getAttributeString("name", name);
-
- LLProgressBar *progress = new LLProgressBar(name, LLRect());
-
-
- std::string image_bar;
- if (node->hasAttribute("image_bar")) node->getAttributeString("image_bar",image_bar);
- if (image_bar != LLStringUtil::null) progress->setImageBar(image_bar);
-
-
- std::string image_shadow;
- if (node->hasAttribute("image_shadow")) node->getAttributeString("image_shadow",image_shadow);
- if (image_shadow != LLStringUtil::null) progress->setImageShadow(image_shadow);
-
-
- LLColor4 color_bar;
- if (node->hasAttribute("color_bar"))
- {
- node->getAttributeColor4("color_bar",color_bar);
- progress->setColorBar(color_bar);
- }
-
-
- LLColor4 color_bar2;
- if (node->hasAttribute("color_bar2"))
- {
- node->getAttributeColor4("color_bar2",color_bar2);
- progress->setColorBar2(color_bar2);
- }
-
-
- LLColor4 color_shadow;
- if (node->hasAttribute("color_shadow"))
- {
- node->getAttributeColor4("color_shadow",color_shadow);
- progress->setColorShadow(color_shadow);
- }
-
-
- LLColor4 color_bg;
- if (node->hasAttribute("color_bg"))
- {
- node->getAttributeColor4("color_bg",color_bg);
- progress->setColorBackground(color_bg);
- }
-
-
- progress->initFromXML(node, parent);
-
- return progress;
-}
diff --git a/indra/llui/llprogressbar.h b/indra/llui/llprogressbar.h
index 00ad61d540..5c2f73ef9e 100644
--- a/indra/llui/llprogressbar.h
+++ b/indra/llui/llprogressbar.h
@@ -40,37 +40,38 @@ class LLProgressBar
: public LLView
{
public:
- LLProgressBar(const std::string& name, const LLRect &rect);
- virtual ~LLProgressBar();
-
- void setPercent(const F32 percent);
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Optional<LLUIImage*> image_bar,
+ image_fill,
+ image_shadow;
- void setImageBar(const std::string &bar_name);
- void setImageShadow(const std::string &shadow_name);
+ Optional<LLUIColor> color_bar,
+ color_bar2,
+ color_shadow,
+ color_bg;
- void setColorBar(const LLColor4 &c);
- void setColorBar2(const LLColor4 &c);
- void setColorShadow(const LLColor4 &c);
- void setColorBackground(const LLColor4 &c);
+ Params();
+ };
+ LLProgressBar(const Params&);
+ virtual ~LLProgressBar();
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+ void setPercent(const F32 percent);
/*virtual*/ void draw();
-protected:
+private:
F32 mPercentDone;
- LLPointer<LLImageGL> mImageBar;
- //LLUUID mImageBarID;
- //LLString mImageBarName;
- LLColor4 mColorBar;
- LLColor4 mColorBar2;
+ LLPointer<LLUIImage> mImageBar;
+ LLUIColor mColorBar;
+ LLUIColor mColorBar2;
- LLPointer<LLImageGL> mImageShadow;
- //LLUUID mImageShadowID;
- //LLString mImageShadowName;
- LLColor4 mColorShadow;
- LLColor4 mColorBackground;
+ LLPointer<LLUIImage> mImageShadow;
+ LLUIColor mColorShadow;
+ LLUIColor mColorBackground;
+
+ LLPointer<LLUIImage> mImageFill;
};
#endif // LL_LLPROGRESSBAR_H
diff --git a/indra/llui/llradiogroup.cpp b/indra/llui/llradiogroup.cpp
index 33b93985d7..7d34841431 100644
--- a/indra/llui/llradiogroup.cpp
+++ b/indra/llui/llradiogroup.cpp
@@ -42,52 +42,49 @@
#include "llcontrol.h"
#include "llui.h"
#include "llfocusmgr.h"
+#include "lluictrlfactory.h"
-static LLRegisterWidget<LLRadioGroup> r("radio_group");
+static LLRegisterWidget<LLRadioGroup> r1("radio_group");
+static LLRegisterWidget<LLRadioCtrl> r2("radio_item");
-LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect,
- const std::string& control_name,
- LLUICtrlCallback callback,
- void* userdata,
- BOOL border)
-: LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP),
- mSelectedIndex(0)
+LLRadioGroup::Params::Params()
+: has_border("draw_border")
{
- setControlName(control_name, NULL);
- init(border);
+ name = "radio_group";
+ mouse_opaque = true;
+ follows.flags = FOLLOWS_LEFT | FOLLOWS_TOP;
}
-LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect,
- S32 initial_index,
- LLUICtrlCallback callback,
- void* userdata,
- BOOL border) :
- LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP),
- mSelectedIndex(initial_index)
-{
- init(border);
-}
-
-void LLRadioGroup::init(BOOL border)
-{
- if (border)
+LLRadioGroup::LLRadioGroup(const LLRadioGroup::Params& p)
+: LLUICtrl(p),
+ mFont(p.font.isProvided() ? p.font() : LLFontGL::getFontSansSerifSmall()),
+ mSelectedIndex(-1),
+ mHasBorder(p.has_border)
+{
+ if (mHasBorder)
{
- addChild( new LLViewBorder( std::string("radio group border"),
- LLRect(0, getRect().getHeight(), getRect().getWidth(), 0),
- LLViewBorder::BEVEL_NONE,
- LLViewBorder::STYLE_LINE,
- 1 ) );
+ LLViewBorder::Params params;
+ params.name("radio group border");
+ params.rect(LLRect(0, getRect().getHeight(), getRect().getWidth(), 0));
+ params.bevel_type(LLViewBorder::BEVEL_NONE);
+ LLViewBorder * vb = LLUICtrlFactory::create<LLViewBorder> (params);
+ addChild (vb);
}
- mHasBorder = border;
}
-
-
-
LLRadioGroup::~LLRadioGroup()
{
}
+// virtual
+BOOL LLRadioGroup::postBuild()
+{
+ if (mControlVariable)
+ {
+ setSelectedIndex(mControlVariable->getValue().asInteger());
+ }
+ return TRUE;
+}
// virtual
void LLRadioGroup::setEnabled(BOOL enabled)
@@ -250,48 +247,52 @@ void LLRadioGroup::draw()
LLView::draw();
}
-
-// When adding a button, we need to ensure that the radio
+// When adding a child button, we need to ensure that the radio
// group gets a message when the button is clicked.
-LLRadioCtrl* LLRadioGroup::addRadioButton(const std::string& name, const std::string& label, const LLRect& rect, const LLFontGL* font )
+
+/*virtual*/
+bool LLRadioGroup::addChild(LLView* view, S32 tab_group)
{
- // Highlight will get fixed in draw method above
- LLRadioCtrl* radio = new LLRadioCtrl(name, rect, label, font,
- onClickButton, this);
- addChild(radio);
- mRadioButtons.push_back(radio);
- return radio;
+ bool res = LLView::addChild(view, tab_group);
+ if (res)
+ {
+ LLRadioCtrl* radio_ctrl = dynamic_cast<LLRadioCtrl*>(view);
+ if (radio_ctrl)
+ {
+ radio_ctrl->setFont(mFont);
+ radio_ctrl->setCommitCallback(boost::bind(&LLRadioGroup::onClickButton, this, _1));
+ mRadioButtons.push_back(radio_ctrl);
+ }
+ }
+ return res;
}
// Handle one button being clicked. All child buttons must have this
// function as their callback function.
-// static
-void LLRadioGroup::onClickButton(LLUICtrl* ui_ctrl, void* userdata)
+void LLRadioGroup::onClickButton(LLUICtrl* ctrl)
{
// llinfos << "LLRadioGroup::onClickButton" << llendl;
-
- LLRadioCtrl* clickedRadio = (LLRadioCtrl*) ui_ctrl;
- LLRadioGroup* self = (LLRadioGroup*) userdata;
-
- S32 counter = 0;
- for (button_list_t::iterator iter = self->mRadioButtons.begin();
- iter != self->mRadioButtons.end(); ++iter)
+ LLRadioCtrl* clicked_radio = dynamic_cast<LLRadioCtrl*>(ctrl);
+ if (!clicked_radio)
+ return;
+ S32 index = 0;
+ for (button_list_t::iterator iter = mRadioButtons.begin();
+ iter != mRadioButtons.end(); ++iter)
{
LLRadioCtrl* radio = *iter;
- if (radio == clickedRadio)
+ if (radio == clicked_radio)
{
- // llinfos << "clicked button " << counter << llendl;
- self->setSelectedIndex(counter);
- self->setControlValue(counter);
+ // llinfos << "clicked button " << index << llendl;
+ setSelectedIndex(index);
// BUG: Calls click callback even if button didn't actually change
- self->onCommit();
+ onCommit();
return;
}
- counter++;
+ index++;
}
llwarns << "LLRadioGroup::onClickButton - clicked button that isn't a child" << llendl;
@@ -340,107 +341,6 @@ LLSD LLRadioGroup::getValue() const
return LLSD();
}
-// virtual
-LLXMLNodePtr LLRadioGroup::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- // Attributes
-
- node->createChild("draw_border", TRUE)->setBoolValue(mHasBorder);
-
- // Contents
-
- for (button_list_t::const_iterator iter = mRadioButtons.begin();
- iter != mRadioButtons.end(); ++iter)
- {
- LLRadioCtrl* radio = *iter;
-
- LLXMLNodePtr child_node = radio->LLView::getXML();
- child_node->setStringValue(radio->getLabel());
- child_node->setName(std::string("radio_item"));
-
- node->addChild(child_node);
- }
-
- return node;
-}
-
-// static
-LLView* LLRadioGroup::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("radio_group");
- node->getAttributeString("name", name);
-
- U32 initial_value = 0;
- node->getAttributeU32("initial_value", initial_value);
-
- BOOL draw_border = TRUE;
- node->getAttributeBOOL("draw_border", draw_border);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- LLRadioGroup* radio_group = new LLRadioGroup(name,
- rect,
- initial_value,
- NULL,
- NULL,
- draw_border);
-
- const std::string& contents = node->getValue();
-
- LLRect group_rect = radio_group->getRect();
-
- LLFontGL *font = LLView::selectFont(node);
-
- if (contents.find_first_not_of(" \n\t") != contents.npos)
- {
- // ...old school default vertical layout
- typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
- boost::char_separator<char> sep("\t\n");
- tokenizer tokens(contents, sep);
- tokenizer::iterator token_iter = tokens.begin();
-
- const S32 HPAD = 4, VPAD = 4;
- S32 cur_y = group_rect.getHeight() - VPAD;
-
- while(token_iter != tokens.end())
- {
- const std::string& line = *token_iter;
- LLRect rect(HPAD, cur_y, group_rect.getWidth() - (2 * HPAD), cur_y - 15);
- cur_y -= VPAD + 15;
- radio_group->addRadioButton(std::string("radio"), line, rect, font);
- ++token_iter;
- }
- llwarns << "Legacy radio group format used! Please convert to use <radio_item> tags!" << llendl;
- }
- else
- {
- // ...per pixel layout
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
- {
- if (child->hasName("radio_item"))
- {
- LLRect item_rect;
- createRect(child, item_rect, radio_group, rect);
-
- std::string radioname("radio");
- child->getAttributeString("name", radioname);
- std::string item_label = child->getTextContents();
- LLRadioCtrl* radio = radio_group->addRadioButton(radioname, item_label, item_rect, font);
-
- radio->initFromXML(child, radio_group);
- }
- }
- }
-
- radio_group->initFromXML(node, parent);
-
- return radio_group;
-}
-
// LLCtrlSelectionInterface functions
BOOL LLRadioGroup::setCurrentByID( const LLUUID& id )
{
@@ -504,6 +404,22 @@ BOOL LLRadioGroup::operateOnAll(EOperation op)
return FALSE;
}
+LLRadioCtrl::LLRadioCtrl(const LLRadioCtrl::Params& p)
+ : LLCheckBoxCtrl(p)
+{
+}
+
+BOOL LLRadioCtrl::postBuild()
+{
+ // Old-style radio_item used the text contents to indicate the label,
+ // but new-style radio_item uses label attribute.
+ std::string value = getValue().asString();
+ if (!value.empty())
+ {
+ setLabel(value);
+ }
+ return TRUE;
+}
LLRadioCtrl::~LLRadioCtrl()
{
@@ -515,3 +431,19 @@ void LLRadioCtrl::setValue(const LLSD& value)
mButton->setTabStop(value.asBoolean());
}
+// *TODO: Remove this function after the initial XUI XML re-export pass.
+// static
+void LLRadioCtrl::setupParamsForExport(Params& p, LLView* parent)
+{
+ std::string label = p.label;
+ if (label.empty())
+ {
+ // We don't have a label attribute, so move the text contents
+ // stored in "value" into the label
+ std::string initial_value = p.LLUICtrl::Params::initial_value();
+ p.label = initial_value;
+ p.LLUICtrl::Params::initial_value = LLSD();
+ }
+
+ LLCheckBoxCtrl::setupParamsForExport(p, parent);
+}
diff --git a/indra/llui/llradiogroup.h b/indra/llui/llradiogroup.h
index 3410b74104..3dfab9b2b3 100644
--- a/indra/llui/llradiogroup.h
+++ b/indra/llui/llradiogroup.h
@@ -39,20 +39,35 @@
/*
- * A checkbox control with use_radio_style == true.
+ * An invisible view containing multiple mutually exclusive toggling
+ * buttons (usually radio buttons). Automatically handles the mutex
+ * condition by highlighting only one button at a time.
*/
class LLRadioCtrl : public LLCheckBoxCtrl
{
public:
- LLRadioCtrl(const std::string& name, const LLRect& rect, const std::string& label, const LLFontGL* font = NULL,
- void (*commit_callback)(LLUICtrl*, void*) = NULL, void* callback_userdata = NULL) :
- LLCheckBoxCtrl(name, rect, label, font, commit_callback, callback_userdata, FALSE, RADIO_STYLE)
+ struct Params : public LLInitParam::Block<Params, LLCheckBoxCtrl::Params>
{
- setTabStop(FALSE);
- }
- /*virtual*/ ~LLRadioCtrl();
+ Deprecated length;
+ Deprecated type;
+
+ Params()
+ : length("length"),
+ type("type")
+ {}
+ };
+ /*virtual*/ ~LLRadioCtrl();
/*virtual*/ void setValue(const LLSD& value);
+
+ /*virtual*/ BOOL postBuild();
+
+ // Ensure label is in an attribute, not the contents
+ static void setupParamsForExport(Params& p, LLView* parent);
+
+protected:
+ LLRadioCtrl(const Params& p);
+ friend class LLUICtrlFactory;
};
@@ -65,30 +80,26 @@ class LLRadioGroup
: public LLUICtrl, public LLCtrlSelectionInterface
{
public:
- // Build a radio group. The number (0...n-1) of the currently selected
- // element will be stored in the named control. After the control is
- // changed the callback will be called.
- LLRadioGroup(const std::string& name, const LLRect& rect,
- const std::string& control_name,
- LLUICtrlCallback callback = NULL,
- void* userdata = NULL,
- BOOL border = TRUE);
-
- // Another radio group constructor, but this one doesn't rely on
- // needing a control
- LLRadioGroup(const std::string& name, const LLRect& rect,
- S32 initial_index,
- LLUICtrlCallback callback = NULL,
- void* userdata = NULL,
- BOOL border = TRUE);
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<bool> has_border;
+ Params();
+ };
- virtual ~LLRadioGroup();
+protected:
+ LLRadioGroup(const Params&);
+ friend class LLUICtrlFactory;
+public:
+ virtual ~LLRadioGroup();
+
+ virtual BOOL postBuild();
+
+ virtual bool addChild(LLView* view, S32 tab_group = 0);
+
virtual BOOL handleKeyHere(KEY key, MASK mask);
virtual void setEnabled(BOOL enabled);
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
void setIndexEnabled(S32 index, BOOL enabled);
// return the index value of the selected item
@@ -104,13 +115,8 @@ public:
// Draw the group, but also fix the highlighting based on the control.
void draw();
- // You must use this method to add buttons to a radio group.
- // Don't use addChild -- it won't set the callback function
- // correctly.
- LLRadioCtrl* addRadioButton(const std::string& name, const std::string& label, const LLRect& rect, const LLFontGL* font);
- LLRadioCtrl* getRadioButton(const S32& index) { return mRadioButtons[index]; }
// Update the control as needed. Userdata must be a pointer to the button.
- static void onClickButton(LLUICtrl* radio, void* userdata);
+ void onClickButton(LLUICtrl* clicked_radio);
//========================================================================
LLCtrlSelectionInterface* getSelectionInterface() { return (LLCtrlSelectionInterface*)this; };
@@ -131,9 +137,7 @@ public:
/*virtual*/ BOOL operateOnAll(EOperation op);
private:
- // protected function shared by the two constructors.
- void init(BOOL border);
-
+ const LLFontGL* mFont;
S32 mSelectedIndex;
typedef std::vector<LLRadioCtrl*> button_list_t;
button_list_t mRadioButtons;
diff --git a/indra/llui/llresizebar.cpp b/indra/llui/llresizebar.cpp
index 5b9fe72e99..304ac64f31 100644
--- a/indra/llui/llresizebar.cpp
+++ b/indra/llui/llresizebar.cpp
@@ -40,22 +40,22 @@
#include "llfocusmgr.h"
#include "llwindow.h"
-LLResizeBar::LLResizeBar( const std::string& name, LLView* resizing_view, const LLRect& rect, S32 min_size, S32 max_size, Side side )
- :
- LLView( name, rect, TRUE ),
+LLResizeBar::LLResizeBar(const LLResizeBar::Params& p)
+: LLView(p),
mDragLastScreenX( 0 ),
mDragLastScreenY( 0 ),
mLastMouseScreenX( 0 ),
mLastMouseScreenY( 0 ),
- mMinSize( min_size ),
- mMaxSize( max_size ),
- mSide( side ),
- mSnappingEnabled(TRUE),
- mAllowDoubleClickSnapping(TRUE),
- mResizingView(resizing_view)
+ mMinSize( p.min_size ),
+ mMaxSize( p.max_size ),
+ mSide( p.side ),
+ mSnappingEnabled(p.snapping_enabled),
+ mAllowDoubleClickSnapping(p.allow_double_click_snapping),
+ mResizingView(p.resizing_view)
{
+ setFollowsNone();
// set up some generically good follow code.
- switch( side )
+ switch( mSide )
{
case LEFT:
setFollowsLeft();
@@ -80,8 +80,6 @@ LLResizeBar::LLResizeBar( const std::string& name, LLView* resizing_view, const
default:
break;
}
- // this is just a decorator
- setSaveToXML(FALSE);
}
@@ -185,30 +183,31 @@ BOOL LLResizeBar::handleHover(S32 x, S32 y, MASK mask)
if (mSnappingEnabled)
{
+ static LLUICachedControl<S32> snap_margin ("SnapMargin", 0);
switch( mSide )
{
case LEFT:
- snap_view = mResizingView->findSnapEdge(scaled_rect.mLeft, mouse_dir, SNAP_LEFT, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
+ snap_view = mResizingView->findSnapEdge(scaled_rect.mLeft, mouse_dir, SNAP_LEFT, SNAP_PARENT_AND_SIBLINGS, snap_margin);
break;
case TOP:
- snap_view = mResizingView->findSnapEdge(scaled_rect.mTop, mouse_dir, SNAP_TOP, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
+ snap_view = mResizingView->findSnapEdge(scaled_rect.mTop, mouse_dir, SNAP_TOP, SNAP_PARENT_AND_SIBLINGS, snap_margin);
break;
case RIGHT:
- snap_view = mResizingView->findSnapEdge(scaled_rect.mRight, mouse_dir, SNAP_RIGHT, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
+ snap_view = mResizingView->findSnapEdge(scaled_rect.mRight, mouse_dir, SNAP_RIGHT, SNAP_PARENT_AND_SIBLINGS, snap_margin);
break;
case BOTTOM:
- snap_view = mResizingView->findSnapEdge(scaled_rect.mBottom, mouse_dir, SNAP_BOTTOM, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
+ snap_view = mResizingView->findSnapEdge(scaled_rect.mBottom, mouse_dir, SNAP_BOTTOM, SNAP_PARENT_AND_SIBLINGS, snap_margin);
break;
}
}
// register "snap" behavior with snapped view
- mResizingView->snappedTo(snap_view);
+ mResizingView->setSnappedTo(snap_view);
// restore original rectangle so the appropriate changes are detected
mResizingView->setRect(orig_rect);
// change view shape as user operation
- mResizingView->userSetShape(scaled_rect);
+ mResizingView->setShape(scaled_rect, true);
// update last valid mouse cursor position based on resized view's actual size
LLRect new_rect = mResizingView->getRect();
@@ -284,7 +283,7 @@ BOOL LLResizeBar::handleDoubleClick(S32 x, S32 y, MASK mask)
break;
}
- mResizingView->userSetShape(scaled_rect);
+ mResizingView->setShape(scaled_rect, true);
}
return TRUE;
diff --git a/indra/llui/llresizebar.h b/indra/llui/llresizebar.h
index b9fc40593d..4ad3d5035a 100644
--- a/indra/llui/llresizebar.h
+++ b/indra/llui/llresizebar.h
@@ -41,7 +41,31 @@ class LLResizeBar : public LLView
public:
enum Side { LEFT, TOP, RIGHT, BOTTOM };
- LLResizeBar(const std::string& name, LLView* resizing_view, const LLRect& rect, S32 min_size, S32 max_size, Side side );
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Mandatory<LLView*> resizing_view;
+ Mandatory<Side> side;
+
+ Optional<S32> min_size;
+ Optional<S32> max_size;
+ Optional<bool> snapping_enabled;
+ Optional<bool> allow_double_click_snapping;
+
+ Params()
+ : max_size("", S32_MAX),
+ snapping_enabled("", true),
+ resizing_view("resizing_view"),
+ side("side"),
+ allow_double_click_snapping("", true)
+ {
+ name = "resize_bar";
+ }
+ };
+
+protected:
+ LLResizeBar(const LLResizeBar::Params& p);
+ friend class LLUICtrlFactory;
+public:
// virtual void draw(); No appearance
virtual BOOL handleHover(S32 x, S32 y, MASK mask);
diff --git a/indra/llui/llresizehandle.cpp b/indra/llui/llresizehandle.cpp
index c5d57d8d6c..943e2f55f1 100644
--- a/indra/llui/llresizehandle.cpp
+++ b/indra/llui/llresizehandle.cpp
@@ -44,37 +44,37 @@
const S32 RESIZE_BORDER_WIDTH = 3;
-LLResizeHandle::LLResizeHandle( const std::string& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner )
- :
- LLView( name, rect, TRUE ),
+LLResizeHandle::Params::Params()
+: corner("corner")
+{
+ name = "resize_handle";
+}
+
+LLResizeHandle::LLResizeHandle(const LLResizeHandle::Params& p)
+: LLView(p),
mDragLastScreenX( 0 ),
mDragLastScreenY( 0 ),
mLastMouseScreenX( 0 ),
mLastMouseScreenY( 0 ),
mImage( NULL ),
- mMinWidth( min_width ),
- mMinHeight( min_height ),
- mCorner( corner )
+ mMinWidth( p.min_width ),
+ mMinHeight( p.min_height ),
+ mCorner( p.corner )
{
- setSaveToXML(false);
-
if( RIGHT_BOTTOM == mCorner)
{
- mImage = LLUI::sImageProvider->getUIImage("UIImgResizeBottomRightUUID");
+ mImage = LLUI::getUIImage("resize_handle_bottom_right_blue.tga");
}
-
- switch( mCorner )
+ switch( p.corner )
{
- case LEFT_TOP: setFollows( FOLLOWS_LEFT | FOLLOWS_TOP ); break;
- case LEFT_BOTTOM: setFollows( FOLLOWS_LEFT | FOLLOWS_BOTTOM ); break;
- case RIGHT_TOP: setFollows( FOLLOWS_RIGHT | FOLLOWS_TOP ); break;
- case RIGHT_BOTTOM: setFollows( FOLLOWS_RIGHT | FOLLOWS_BOTTOM ); break;
+ case LEFT_TOP: setFollows( FOLLOWS_LEFT | FOLLOWS_TOP ); break;
+ case LEFT_BOTTOM: setFollows( FOLLOWS_LEFT | FOLLOWS_BOTTOM ); break;
+ case RIGHT_TOP: setFollows( FOLLOWS_RIGHT | FOLLOWS_TOP ); break;
+ case RIGHT_BOTTOM: setFollows( FOLLOWS_RIGHT | FOLLOWS_BOTTOM ); break;
}
-
- // decorator object, don't serialize
- setSaveToXML(FALSE);
}
+
BOOL LLResizeHandle::handleMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = FALSE;
@@ -205,36 +205,37 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask)
LLView* snap_view = NULL;
LLView* test_view = NULL;
+ static LLUICachedControl<S32> snap_margin ("SnapMargin", 0);
// now do snapping
switch(mCorner)
{
case LEFT_TOP:
- snap_view = resizing_view->findSnapEdge(scaled_rect.mLeft, mouse_dir, SNAP_LEFT, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
- test_view = resizing_view->findSnapEdge(scaled_rect.mTop, mouse_dir, SNAP_TOP, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
+ snap_view = resizing_view->findSnapEdge(scaled_rect.mLeft, mouse_dir, SNAP_LEFT, SNAP_PARENT_AND_SIBLINGS, snap_margin);
+ test_view = resizing_view->findSnapEdge(scaled_rect.mTop, mouse_dir, SNAP_TOP, SNAP_PARENT_AND_SIBLINGS, snap_margin);
if (!snap_view)
{
snap_view = test_view;
}
break;
case LEFT_BOTTOM:
- snap_view = resizing_view->findSnapEdge(scaled_rect.mLeft, mouse_dir, SNAP_LEFT, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
- test_view = resizing_view->findSnapEdge(scaled_rect.mBottom, mouse_dir, SNAP_BOTTOM, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
+ snap_view = resizing_view->findSnapEdge(scaled_rect.mLeft, mouse_dir, SNAP_LEFT, SNAP_PARENT_AND_SIBLINGS, snap_margin);
+ test_view = resizing_view->findSnapEdge(scaled_rect.mBottom, mouse_dir, SNAP_BOTTOM, SNAP_PARENT_AND_SIBLINGS, snap_margin);
if (!snap_view)
{
snap_view = test_view;
}
break;
case RIGHT_TOP:
- snap_view = resizing_view->findSnapEdge(scaled_rect.mRight, mouse_dir, SNAP_RIGHT, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
- test_view = resizing_view->findSnapEdge(scaled_rect.mTop, mouse_dir, SNAP_TOP, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
+ snap_view = resizing_view->findSnapEdge(scaled_rect.mRight, mouse_dir, SNAP_RIGHT, SNAP_PARENT_AND_SIBLINGS, snap_margin);
+ test_view = resizing_view->findSnapEdge(scaled_rect.mTop, mouse_dir, SNAP_TOP, SNAP_PARENT_AND_SIBLINGS, snap_margin);
if (!snap_view)
{
snap_view = test_view;
}
break;
case RIGHT_BOTTOM:
- snap_view = resizing_view->findSnapEdge(scaled_rect.mRight, mouse_dir, SNAP_RIGHT, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
- test_view = resizing_view->findSnapEdge(scaled_rect.mBottom, mouse_dir, SNAP_BOTTOM, SNAP_PARENT_AND_SIBLINGS, LLUI::sConfigGroup->getS32("SnapMargin"));
+ snap_view = resizing_view->findSnapEdge(scaled_rect.mRight, mouse_dir, SNAP_RIGHT, SNAP_PARENT_AND_SIBLINGS, snap_margin);
+ test_view = resizing_view->findSnapEdge(scaled_rect.mBottom, mouse_dir, SNAP_BOTTOM, SNAP_PARENT_AND_SIBLINGS, snap_margin);
if (!snap_view)
{
snap_view = test_view;
@@ -243,13 +244,13 @@ BOOL LLResizeHandle::handleHover(S32 x, S32 y, MASK mask)
}
// register "snap" behavior with snapped view
- resizing_view->snappedTo(snap_view);
+ resizing_view->setSnappedTo(snap_view);
// reset parent rect
resizing_view->setRect(orig_rect);
// translate and scale to new shape
- resizing_view->userSetShape(scaled_rect);
+ resizing_view->setShape(scaled_rect, true);
// update last valid mouse cursor position based on resized view's actual size
LLRect new_rect = resizing_view->getRect();
diff --git a/indra/llui/llresizehandle.h b/indra/llui/llresizehandle.h
index 0e23d526fa..e4e3c81cec 100644
--- a/indra/llui/llresizehandle.h
+++ b/indra/llui/llresizehandle.h
@@ -44,9 +44,18 @@ class LLResizeHandle : public LLView
public:
enum ECorner { LEFT_TOP, LEFT_BOTTOM, RIGHT_TOP, RIGHT_BOTTOM };
-
- LLResizeHandle(const std::string& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner = RIGHT_BOTTOM );
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Mandatory<ECorner> corner;
+ Optional<S32> min_width;
+ Optional<S32> min_height;
+ Params();
+ };
+protected:
+ LLResizeHandle(const LLResizeHandle::Params&);
+ friend class LLUICtrlFactory;
+public:
virtual void draw();
virtual BOOL handleHover(S32 x, S32 y, MASK mask);
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp
index 141b08c39d..a4e23a605b 100644
--- a/indra/llui/llresmgr.cpp
+++ b/indra/llui/llresmgr.cpp
@@ -43,106 +43,8 @@
LLResMgr::LLResMgr()
{
- U32 i;
-
- // Init values for each locale.
- // Note: This is only the most bare-bones version. In the future, load these dynamically, on demand.
-
- //////////////////////////////////////////////////////////////////////////////
- // USA
- // USA Fonts
- for( i=0; i<LLFONT_COUNT; i++ )
- {
- mUSAFonts[i] = NULL;
- }
- mUSAFonts[ LLFONT_OCRA ] = LLFontGL::getFontMonospace();
- mUSAFonts[ LLFONT_SANSSERIF ] = LLFontGL::getFontSansSerif();
- mUSAFonts[ LLFONT_SANSSERIF_SMALL ] = LLFontGL::getFontSansSerifSmall();
- mUSAFonts[ LLFONT_SANSSERIF_BIG ] = LLFontGL::getFontSansSerifBig();
- mUSAFonts[ LLFONT_SMALL ] = LLFontGL::getFontMonospace();
-/*
- // USA Strings
- for( i=0; i<LLSTR_COUNT; i++ )
- {
- mUSAStrings[i] = "";
- }
- mUSAStrings[ LLSTR_HELLO ] = "hello";
- mUSAStrings[ LLSTR_GOODBYE ] = "goodbye";
- mUSAStrings[ LLSTR_CHAT_LABEL ] = "Chat";
- mUSAStrings[ LLSTR_STATUS_LABEL ] = "Properties";
- mUSAStrings[ LLSTR_X ] = "X";
- mUSAStrings[ LLSTR_Y ] = "Y";
- mUSAStrings[ LLSTR_Z ] = "Z";
- mUSAStrings[ LLSTR_POSITION ] = "Position (meters)";
- mUSAStrings[ LLSTR_SCALE ] = "Size (meters)";
- mUSAStrings[ LLSTR_ROTATION ] = "Rotation (degrees)";
- mUSAStrings[ LLSTR_HAS_PHYSICS ] = "Has Physics";
- mUSAStrings[ LLSTR_SCRIPT ] = "Script";
- mUSAStrings[ LLSTR_HELP ] = "Help";
- mUSAStrings[ LLSTR_REMOVE ] = "Remove";
- mUSAStrings[ LLSTR_CLEAR ] = "Clear";
- mUSAStrings[ LLSTR_APPLY ] = "Apply";
- mUSAStrings[ LLSTR_CANCEL ] = "Cancel";
- mUSAStrings[ LLSTR_MATERIAL ] = "Material";
- mUSAStrings[ LLSTR_FACE ] = "Face";
- mUSAStrings[ LLSTR_TEXTURE ] = "Texture";
- mUSAStrings[ LLSTR_TEXTURE_SIZE ] = "Repeats per Face";
- mUSAStrings[ LLSTR_TEXTURE_OFFSET ] = "Offset";
- mUSAStrings[ LLSTR_TEXTURE_ROTATION ] = "Rotation (degrees)";
- mUSAStrings[ LLSTR_U ] = "U";
- mUSAStrings[ LLSTR_V ] = "V";
- mUSAStrings[ LLSTR_OWNERSHIP ] = "Ownership";
- mUSAStrings[ LLSTR_PUBLIC ] = "Public";
- mUSAStrings[ LLSTR_PRIVATE ] = "Private";
- mUSAStrings[ LLSTR_REVERT ] = "Revert";
- mUSAStrings[ LLSTR_INSERT_SAMPLE ] = "Insert Sample";
- mUSAStrings[ LLSTR_SET_TEXTURE ] = "Set Texture";
- mUSAStrings[ LLSTR_EDIT_SCRIPT ] = "Edit Script...";
- mUSAStrings[ LLSTR_MOUSELOOK_INSTRUCTIONS ] = "Press ESC to leave Mouselook.";
- mUSAStrings[ LLSTR_EDIT_FACE_INSTRUCTIONS ] = "Click on face to select part. Click and hold on a picture to look more like that. Press ESC to leave Face Edit Mode.";
- mUSAStrings[ LLSTR_CLOSE ] = "Close";
- mUSAStrings[ LLSTR_MOVE ] = "Move";
- mUSAStrings[ LLSTR_ROTATE ] = "Rotate";
- mUSAStrings[ LLSTR_RESIZE ] = "Resize";
- mUSAStrings[ LLSTR_PLACE_BOX ] = "Place Box";
- mUSAStrings[ LLSTR_PLACE_PRISM ] = "Place Prism";
- mUSAStrings[ LLSTR_PLACE_PYRAMID ] = "Place Pyramid";
- mUSAStrings[ LLSTR_PLACE_TETRAHEDRON ] = "Place Tetrahedron";
- mUSAStrings[ LLSTR_PLACE_CYLINDER ] = "Place Cylinder";
- mUSAStrings[ LLSTR_PLACE_HALF_CYLINDER ] = "Place Half-Cylinder";
- mUSAStrings[ LLSTR_PLACE_CONE ] = "Place Cone";
- mUSAStrings[ LLSTR_PLACE_HALF_CONE ] = "Place Half-Cone";
- mUSAStrings[ LLSTR_PLACE_SPHERE ] = "Place Sphere";
- mUSAStrings[ LLSTR_PLACE_HALF_SPHERE ] = "Place Half-Sphere";
- mUSAStrings[ LLSTR_PLACE_BIRD ] = "Place Bird";
- mUSAStrings[ LLSTR_PLACE_SNAKE ] = "Place Silly Snake";
- mUSAStrings[ LLSTR_PLACE_ROCK ] = "Place Rock";
- mUSAStrings[ LLSTR_PLACE_TREE ] = "Place Tree";
- mUSAStrings[ LLSTR_PLACE_GRASS ] = "Place Grass";
- mUSAStrings[ LLSTR_MODIFY_LAND ] = "Modify Land";
-*/
- //////////////////////////////////////////////////////////////////////////////
- // UK
- // The Brits are a lot like us Americans, so initially assume we're the same and only code the exceptions.
-
- // UK Fonts
- for( i=0; i<LLFONT_COUNT; i++ )
- {
- mUKFonts[i] = mUSAFonts[i];
- }
-/*
- // UK Strings
- for( i=0; i<LLSTR_COUNT; i++ )
- {
- mUKStrings[i] = mUSAStrings[i];
- }
- mUKStrings[ LLSTR_HELLO ] = "hullo";
- mUKStrings[ LLSTR_GOODBYE ] = "cheerio";
-*/
- //////////////////////////////////////////////////////////////////////////////
// Set default
setLocale( LLLOCALE_USA );
-
}
@@ -151,9 +53,9 @@ void LLResMgr::setLocale( LLLOCALE_ID locale_id )
mLocale = locale_id;
//RN: for now, use normal 'C' locale for everything but specific UI input/output routines
- switch( locale_id )
- {
- case LLLOCALE_USA:
+// switch( locale_id )
+// {
+// case LLLOCALE_USA:
//#if LL_WINDOWS
// // Windows doesn't use ISO country codes.
// llinfos << "Setting locale to " << setlocale( LC_ALL, "english-usa" ) << llendl;
@@ -161,11 +63,8 @@ void LLResMgr::setLocale( LLLOCALE_ID locale_id )
// // posix version should work everywhere else.
// llinfos << "Setting locale to " << setlocale( LC_ALL, "en_US" ) << llendl;
//#endif
-
-// mStrings = mUSAStrings;
- mFonts = mUSAFonts;
- break;
- case LLLOCALE_UK:
+// break;
+// case LLLOCALE_UK:
//#if LL_WINDOWS
// // Windows doesn't use ISO country codes.
// llinfos << "Setting locale to " << setlocale( LC_ALL, "english-uk" ) << llendl;
@@ -173,15 +72,12 @@ void LLResMgr::setLocale( LLLOCALE_ID locale_id )
// // posix version should work everywhere else.
// llinfos << "Setting locale to " << setlocale( LC_ALL, "en_GB" ) << llendl;
//#endif
-
-// mStrings = mUKStrings;
- mFonts = mUKFonts;
- break;
- default:
- llassert(0);
- setLocale(LLLOCALE_USA);
- break;
- }
+// break;
+// default:
+// llassert(0);
+// setLocale(LLLOCALE_USA);
+// break;
+// }
}
char LLResMgr::getDecimalPoint() const
@@ -418,27 +314,6 @@ void LLResMgr::getIntegerString( std::string& output, S32 input ) const
}
}
-const std::string LLFONT_ID_NAMES[] =
-{
- std::string("OCRA"),
- std::string("SANSSERIF"),
- std::string("SANSSERIF_SMALL"),
- std::string("SANSSERIF_BIG"),
- std::string("SMALL"),
-};
-
-const LLFontGL* LLResMgr::getRes( std::string font_id ) const
-{
- for (S32 i=0; i<LLFONT_COUNT; ++i)
- {
- if (LLFONT_ID_NAMES[i] == font_id)
- {
- return getRes((LLFONT_ID)i);
- }
- }
- return NULL;
-}
-
#if LL_WINDOWS
const std::string LLLocale::USER_LOCALE("English_United States.1252");// = LLStringUtil::null;
const std::string LLLocale::SYSTEM_LOCALE("English_United States.1252");
diff --git a/indra/llui/llresmgr.h b/indra/llui/llresmgr.h
index d54505c503..c8fa340990 100644
--- a/indra/llui/llresmgr.h
+++ b/indra/llui/llresmgr.h
@@ -37,7 +37,7 @@
#include "locale.h"
#include "stdtypes.h"
#include "llstring.h"
-#include "llmemory.h"
+#include "llsingleton.h"
enum LLLOCALE_ID
{
@@ -46,18 +46,6 @@ enum LLLOCALE_ID
LLLOCALE_COUNT // Number of values in this enum. Keep at end.
};
-enum LLFONT_ID
-{
- LLFONT_OCRA,
- LLFONT_SANSSERIF,
- LLFONT_SANSSERIF_SMALL,
- LLFONT_SANSSERIF_BIG,
- LLFONT_SMALL,
- LLFONT_COUNT // Number of values in this enum. Keep at end.
-};
-
-class LLFontGL;
-
class LLResMgr : public LLSingleton<LLResMgr>
{
public:
@@ -74,20 +62,9 @@ public:
std::string getMonetaryString( S32 input ) const;
void getIntegerString( std::string& output, S32 input ) const;
-// const char* getRes( LLSTR_ID string_id ) const { return mStrings[ string_id ]; }
- const LLFontGL* getRes( LLFONT_ID font_id ) const { return mFonts[ font_id ]; }
- const LLFontGL* getRes( std::string font_id ) const;
private:
LLLOCALE_ID mLocale;
-// const char** mStrings;
- const LLFontGL** mFonts;
-
-// const char* mUSAStrings[LLSTR_COUNT];
- const LLFontGL* mUSAFonts[LLFONT_COUNT];
-
-// const char* mUKStrings[LLSTR_COUNT];
- const LLFontGL* mUKFonts[LLFONT_COUNT];
};
class LLLocale
diff --git a/indra/llui/llscrollbar.cpp b/indra/llui/llscrollbar.cpp
index 65086d833d..1a2603420b 100644
--- a/indra/llui/llscrollbar.cpp
+++ b/indra/llui/llscrollbar.cpp
@@ -46,101 +46,84 @@
#include "llwindow.h"
#include "llcontrol.h"
#include "llrender.h"
+#include "lluictrlfactory.h"
+
+static LLRegisterWidget<LLScrollbar> register_scrollbar("scroll_bar");
+
+LLScrollbar::Params::Params()
+: orientation ("orientation", HORIZONTAL),
+ doc_size ("doc_size", 0),
+ doc_pos ("doc_pos", 0),
+ page_size ("page_size", 0),
+ step_size ("step_size", 1),
+ thumb_image("thumb_image"),
+ track_image("track_image"),
+ track_color("track_color"),
+ thumb_color("thumb_color"),
+ thickness("thickness"),
+ up_button("up_button"),
+ down_button("down_button")
+{
+ tab_stop = false;
+}
-LLScrollbar::LLScrollbar(
- const std::string& name, LLRect rect,
- LLScrollbar::ORIENTATION orientation,
- S32 doc_size, S32 doc_pos, S32 page_size,
- void (*change_callback)( S32 new_pos, LLScrollbar* self, void* userdata ),
- void* callback_user_data,
- S32 step_size)
-: LLUICtrl( name, rect, TRUE, NULL, NULL ),
-
- mChangeCallback( change_callback ),
- mCallbackUserData( callback_user_data ),
- mOrientation( orientation ),
- mDocSize( doc_size ),
- mDocPos( doc_pos ),
- mPageSize( page_size ),
- mStepSize( step_size ),
+LLScrollbar::LLScrollbar(const Params & p)
+: LLUICtrl(p),
+ mChangeCallback( p.change_callback() ),
+ mOrientation( p.orientation ),
+ mDocSize( p.doc_size ),
+ mDocPos( p.doc_pos ),
+ mPageSize( p.page_size ),
+ mStepSize( p.step_size ),
mDocChanged(FALSE),
mDragStartX( 0 ),
mDragStartY( 0 ),
mHoverGlowStrength(0.15f),
mCurGlowStrength(0.f),
- mTrackColor( LLUI::sColorsGroup->getColor("ScrollbarTrackColor") ),
- mThumbColor ( LLUI::sColorsGroup->getColor("ScrollbarThumbColor") ),
- mHighlightColor ( LLUI::sColorsGroup->getColor("DefaultHighlightLight") ),
- mShadowColor ( LLUI::sColorsGroup->getColor("DefaultShadowLight") ),
+ mTrackColor( p.track_color() ),
+ mThumbColor ( p.thumb_color() ),
mOnScrollEndCallback( NULL ),
- mOnScrollEndData( NULL )
+ mOnScrollEndData( NULL ),
+ mThumbImage(p.thumb_image),
+ mTrackImage(p.track_image),
+ mThickness(p.thickness.isProvided() ? p.thickness : LLUI::sSettingGroups["config"]->getS32("UIScrollbarSize"))
{
- //llassert( 0 <= mDocSize );
- //llassert( 0 <= mDocPos && mDocPos <= mDocSize );
-
- setTabStop(FALSE);
updateThumbRect();
// Page up and page down buttons
LLRect line_up_rect;
- std::string line_up_img;
- std::string line_up_selected_img;
- std::string line_down_img;
- std::string line_down_selected_img;
-
LLRect line_down_rect;
- if( LLScrollbar::VERTICAL == mOrientation )
+ if( VERTICAL == mOrientation )
{
- line_up_rect.setLeftTopAndSize( 0, getRect().getHeight(), SCROLLBAR_SIZE, SCROLLBAR_SIZE );
- line_up_img="UIImgBtnScrollUpOutUUID";
- line_up_selected_img="UIImgBtnScrollUpInUUID";
-
- line_down_rect.setOriginAndSize( 0, 0, SCROLLBAR_SIZE, SCROLLBAR_SIZE );
- line_down_img="UIImgBtnScrollDownOutUUID";
- line_down_selected_img="UIImgBtnScrollDownInUUID";
+ line_up_rect.setLeftTopAndSize( 0, getRect().getHeight(), mThickness, mThickness );
+ line_down_rect.setOriginAndSize( 0, 0, mThickness, mThickness );
}
- else
+ else // HORIZONTAL
{
- // Horizontal
- line_up_rect.setOriginAndSize( 0, 0, SCROLLBAR_SIZE, SCROLLBAR_SIZE );
- line_up_img="UIImgBtnScrollLeftOutUUID";
- line_up_selected_img="UIImgBtnScrollLeftInUUID";
-
- line_down_rect.setOriginAndSize( getRect().getWidth() - SCROLLBAR_SIZE, 0, SCROLLBAR_SIZE, SCROLLBAR_SIZE );
- line_down_img="UIImgBtnScrollRightOutUUID";
- line_down_selected_img="UIImgBtnScrollRightInUUID";
+ line_up_rect.setOriginAndSize( 0, 0, mThickness, mThickness );
+ line_down_rect.setOriginAndSize( getRect().getWidth() - mThickness, 0, mThickness, mThickness );
}
- LLButton* line_up_btn = new LLButton(std::string("Line Up"), line_up_rect,
- line_up_img, line_up_selected_img, LLStringUtil::null,
- &LLScrollbar::onLineUpBtnPressed, this, LLFontGL::getFontSansSerif() );
- if( LLScrollbar::VERTICAL == mOrientation )
- {
- line_up_btn->setFollowsRight();
- line_up_btn->setFollowsTop();
- }
- else
- {
- // horizontal
- line_up_btn->setFollowsLeft();
- line_up_btn->setFollowsBottom();
- }
- line_up_btn->setHeldDownCallback( &LLScrollbar::onLineUpBtnPressed );
- line_up_btn->setTabStop(FALSE);
- line_up_btn->setScaleImage(TRUE);
-
- addChild(line_up_btn);
-
- LLButton* line_down_btn = new LLButton(std::string("Line Down"), line_down_rect,
- line_down_img, line_down_selected_img, LLStringUtil::null,
- &LLScrollbar::onLineDownBtnPressed, this, LLFontGL::getFontSansSerif() );
- line_down_btn->setFollowsRight();
- line_down_btn->setFollowsBottom();
- line_down_btn->setHeldDownCallback( &LLScrollbar::onLineDownBtnPressed );
- line_down_btn->setTabStop(FALSE);
- line_down_btn->setScaleImage(TRUE);
- addChild(line_down_btn);
+ LLButton::Params up_btn(mOrientation == VERTICAL ? p.up_button : p.left_button);
+ up_btn.name(std::string("Line Up"));
+ up_btn.rect(line_up_rect);
+ up_btn.click_callback.function(boost::bind(&LLScrollbar::onLineUpBtnPressed, this, _2));
+ up_btn.mouse_held_callback.function(boost::bind(&LLScrollbar::onLineUpBtnPressed, this, _2));
+ up_btn.tab_stop(false);
+ up_btn.follows.flags = (mOrientation == VERTICAL ? (FOLLOWS_RIGHT | FOLLOWS_TOP) : (FOLLOWS_LEFT | FOLLOWS_BOTTOM));
+
+ addChild(LLUICtrlFactory::create<LLButton>(up_btn));
+
+ LLButton::Params down_btn(mOrientation == VERTICAL ? p.down_button : p.right_button);
+ down_btn.name(std::string("Line Down"));
+ down_btn.rect(line_down_rect);
+ down_btn.follows.flags(FOLLOWS_RIGHT|FOLLOWS_BOTTOM);
+ down_btn.click_callback.function(boost::bind(&LLScrollbar::onLineDownBtnPressed, this, _2));
+ down_btn.mouse_held_callback.function(boost::bind(&LLScrollbar::onLineDownBtnPressed, this, _2));
+ down_btn.tab_stop(false);
+
+ addChild(LLUICtrlFactory::create<LLButton>(down_btn));
}
@@ -168,7 +151,7 @@ void LLScrollbar::setDocPos(S32 pos, BOOL update_thumb)
if( mChangeCallback )
{
- mChangeCallback( mDocPos, this, mCallbackUserData );
+ mChangeCallback( mDocPos, this );
}
if( update_thumb )
@@ -221,7 +204,7 @@ void LLScrollbar::updateThumbRect()
const S32 THUMB_MIN_LENGTH = 16;
S32 window_length = (mOrientation == LLScrollbar::HORIZONTAL) ? getRect().getWidth() : getRect().getHeight();
- S32 thumb_bg_length = llmax(0, window_length - 2 * SCROLLBAR_SIZE);
+ S32 thumb_bg_length = llmax(0, window_length - 2 * mThickness);
S32 visible_lines = llmin( mDocSize, mPageSize );
S32 thumb_length = mDocSize ? llmin(llmax( visible_lines * thumb_bg_length / mDocSize, THUMB_MIN_LENGTH), thumb_bg_length) : thumb_bg_length;
@@ -229,24 +212,24 @@ void LLScrollbar::updateThumbRect()
if( mOrientation == LLScrollbar::VERTICAL )
{
- S32 thumb_start_max = thumb_bg_length + SCROLLBAR_SIZE;
- S32 thumb_start_min = SCROLLBAR_SIZE + THUMB_MIN_LENGTH;
+ S32 thumb_start_max = thumb_bg_length + mThickness;
+ S32 thumb_start_min = mThickness + THUMB_MIN_LENGTH;
S32 thumb_start = variable_lines ? llmin( llmax(thumb_start_max - (mDocPos * (thumb_bg_length - thumb_length)) / variable_lines, thumb_start_min), thumb_start_max ) : thumb_start_max;
mThumbRect.mLeft = 0;
mThumbRect.mTop = thumb_start;
- mThumbRect.mRight = SCROLLBAR_SIZE;
+ mThumbRect.mRight = mThickness;
mThumbRect.mBottom = thumb_start - thumb_length;
}
else
{
// Horizontal
- S32 thumb_start_max = thumb_bg_length + SCROLLBAR_SIZE - thumb_length;
- S32 thumb_start_min = SCROLLBAR_SIZE;
+ S32 thumb_start_max = thumb_bg_length + mThickness - thumb_length;
+ S32 thumb_start_min = mThickness;
S32 thumb_start = variable_lines ? llmin(llmax( thumb_start_min + (mDocPos * (thumb_bg_length - thumb_length)) / variable_lines, thumb_start_min), thumb_start_max ) : thumb_start_min;
mThumbRect.mLeft = thumb_start;
- mThumbRect.mTop = SCROLLBAR_SIZE;
+ mThumbRect.mTop = mThickness;
mThumbRect.mRight = thumb_start + thumb_length;
mThumbRect.mBottom = 0;
}
@@ -318,21 +301,21 @@ BOOL LLScrollbar::handleHover(S32 x, S32 y, MASK mask)
// S32 old_pos = mThumbRect.mTop;
S32 delta_pixels = y - mDragStartY;
- if( mOrigRect.mBottom + delta_pixels < SCROLLBAR_SIZE )
+ if( mOrigRect.mBottom + delta_pixels < mThickness )
{
- delta_pixels = SCROLLBAR_SIZE - mOrigRect.mBottom - 1;
+ delta_pixels = mThickness - mOrigRect.mBottom - 1;
}
else
- if( mOrigRect.mTop + delta_pixels > height - SCROLLBAR_SIZE )
+ if( mOrigRect.mTop + delta_pixels > height - mThickness )
{
- delta_pixels = height - SCROLLBAR_SIZE - mOrigRect.mTop + 1;
+ delta_pixels = height - mThickness - mOrigRect.mTop + 1;
}
mThumbRect.mTop = mOrigRect.mTop + delta_pixels;
mThumbRect.mBottom = mOrigRect.mBottom + delta_pixels;
S32 thumb_length = mThumbRect.getHeight();
- S32 thumb_track_length = height - 2 * SCROLLBAR_SIZE;
+ S32 thumb_track_length = height - 2 * mThickness;
if( delta_pixels != mLastDelta || mDocChanged)
@@ -343,7 +326,7 @@ BOOL LLScrollbar::handleHover(S32 x, S32 y, MASK mask)
{
S32 variable_lines = getDocPosMax();
S32 pos = mThumbRect.mTop;
- F32 ratio = F32(pos - SCROLLBAR_SIZE - thumb_length) / usable_track_length;
+ F32 ratio = F32(pos - mThickness - thumb_length) / usable_track_length;
S32 new_pos = llclamp( S32(variable_lines - ratio * variable_lines + 0.5f), 0, variable_lines );
// Note: we do not call updateThumbRect() here. Instead we let the thumb and the document go slightly
@@ -362,21 +345,21 @@ BOOL LLScrollbar::handleHover(S32 x, S32 y, MASK mask)
S32 delta_pixels = x - mDragStartX;
- if( mOrigRect.mLeft + delta_pixels < SCROLLBAR_SIZE )
+ if( mOrigRect.mLeft + delta_pixels < mThickness )
{
- delta_pixels = SCROLLBAR_SIZE - mOrigRect.mLeft - 1;
+ delta_pixels = mThickness - mOrigRect.mLeft - 1;
}
else
- if( mOrigRect.mRight + delta_pixels > width - SCROLLBAR_SIZE )
+ if( mOrigRect.mRight + delta_pixels > width - mThickness )
{
- delta_pixels = width - SCROLLBAR_SIZE - mOrigRect.mRight + 1;
+ delta_pixels = width - mThickness - mOrigRect.mRight + 1;
}
mThumbRect.mLeft = mOrigRect.mLeft + delta_pixels;
mThumbRect.mRight = mOrigRect.mRight + delta_pixels;
S32 thumb_length = mThumbRect.getWidth();
- S32 thumb_track_length = width - 2 * SCROLLBAR_SIZE;
+ S32 thumb_track_length = width - 2 * mThickness;
if( delta_pixels != mLastDelta || mDocChanged)
{
@@ -386,7 +369,7 @@ BOOL LLScrollbar::handleHover(S32 x, S32 y, MASK mask)
{
S32 variable_lines = getDocPosMax();
S32 pos = mThumbRect.mLeft;
- F32 ratio = F32(pos - SCROLLBAR_SIZE) / usable_track_length;
+ F32 ratio = F32(pos - mThickness) / usable_track_length;
S32 new_pos = llclamp( S32(ratio * variable_lines + 0.5f), 0, variable_lines);
@@ -475,14 +458,14 @@ void LLScrollbar::reshape(S32 width, S32 height, BOOL called_from_parent)
if (mOrientation == VERTICAL)
{
- up_button->reshape(up_button->getRect().getWidth(), llmin(getRect().getHeight() / 2, SCROLLBAR_SIZE));
- down_button->reshape(down_button->getRect().getWidth(), llmin(getRect().getHeight() / 2, SCROLLBAR_SIZE));
+ up_button->reshape(up_button->getRect().getWidth(), llmin(getRect().getHeight() / 2, mThickness));
+ down_button->reshape(down_button->getRect().getWidth(), llmin(getRect().getHeight() / 2, mThickness));
up_button->setOrigin(up_button->getRect().mLeft, getRect().getHeight() - up_button->getRect().getHeight());
}
else
{
- up_button->reshape(llmin(getRect().getWidth() / 2, SCROLLBAR_SIZE), up_button->getRect().getHeight());
- down_button->reshape(llmin(getRect().getWidth() / 2, SCROLLBAR_SIZE), down_button->getRect().getHeight());
+ up_button->reshape(llmin(getRect().getWidth() / 2, mThickness), up_button->getRect().getHeight());
+ down_button->reshape(llmin(getRect().getWidth() / 2, mThickness), down_button->getRect().getHeight());
down_button->setOrigin(getRect().getWidth() - down_button->getRect().getWidth(), down_button->getRect().mBottom);
}
updateThumbRect();
@@ -507,28 +490,25 @@ void LLScrollbar::draw()
mCurGlowStrength = lerp(mCurGlowStrength, 0.f, LLCriticalDamp::getInterpolant(0.05f));
}
-
// Draw background and thumb.
- LLUIImage* rounded_rect_imagep = LLUI::sImageProvider->getUIImage("rounded_square.tga");
-
- if (!rounded_rect_imagep)
+ if (mTrackImage.isNull() || mThumbImage.isNull())
{
- gl_rect_2d(mOrientation == HORIZONTAL ? SCROLLBAR_SIZE : 0,
- mOrientation == VERTICAL ? getRect().getHeight() - 2 * SCROLLBAR_SIZE : getRect().getHeight(),
- mOrientation == HORIZONTAL ? getRect().getWidth() - 2 * SCROLLBAR_SIZE : getRect().getWidth(),
- mOrientation == VERTICAL ? SCROLLBAR_SIZE : 0, mTrackColor, TRUE);
+ gl_rect_2d(mOrientation == HORIZONTAL ? mThickness : 0,
+ mOrientation == VERTICAL ? getRect().getHeight() - 2 * mThickness : getRect().getHeight(),
+ mOrientation == HORIZONTAL ? getRect().getWidth() - 2 * mThickness : getRect().getWidth(),
+ mOrientation == VERTICAL ? mThickness : 0, mTrackColor.get(), TRUE);
- gl_rect_2d(mThumbRect, mThumbColor, TRUE);
+ gl_rect_2d(mThumbRect, mThumbColor.get(), TRUE);
}
else
{
// Background
- rounded_rect_imagep->drawSolid(mOrientation == HORIZONTAL ? SCROLLBAR_SIZE : 0,
- mOrientation == VERTICAL ? SCROLLBAR_SIZE : 0,
- mOrientation == HORIZONTAL ? getRect().getWidth() - 2 * SCROLLBAR_SIZE : getRect().getWidth(),
- mOrientation == VERTICAL ? getRect().getHeight() - 2 * SCROLLBAR_SIZE : getRect().getHeight(),
- mTrackColor);
+ mTrackImage->drawSolid(mOrientation == HORIZONTAL ? mThickness : 0,
+ mOrientation == VERTICAL ? mThickness : 0,
+ mOrientation == HORIZONTAL ? getRect().getWidth() - 2 * mThickness : getRect().getWidth(),
+ mOrientation == VERTICAL ? getRect().getHeight() - 2 * mThickness : getRect().getHeight(),
+ mTrackColor.get());
// Thumb
LLRect outline_rect = mThumbRect;
@@ -536,14 +516,14 @@ void LLScrollbar::draw()
if (gFocusMgr.getKeyboardFocus() == this)
{
- rounded_rect_imagep->draw(outline_rect, gFocusMgr.getFocusColor());
+ mTrackImage->draw(outline_rect, gFocusMgr.getFocusColor());
}
- rounded_rect_imagep->draw(mThumbRect, mThumbColor);
+ mThumbImage->draw(mThumbRect, mThumbColor.get());
if (mCurGlowStrength > 0.01f)
{
gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
- rounded_rect_imagep->drawSolid(mThumbRect, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
+ mThumbImage->drawSolid(mThumbRect, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
gGL.setSceneBlendType(LLRender::BT_ALPHA);
}
@@ -625,19 +605,24 @@ void LLScrollbar::pageDown(S32 overlap)
}
}
-// static
-void LLScrollbar::onLineUpBtnPressed( void* userdata )
+void LLScrollbar::onLineUpBtnPressed( const LLSD& data )
{
- LLScrollbar* self = (LLScrollbar*) userdata;
-
- self->changeLine( - self->mStepSize, TRUE );
+ changeLine( -mStepSize, TRUE );
}
-// static
-void LLScrollbar::onLineDownBtnPressed( void* userdata )
+void LLScrollbar::onLineDownBtnPressed( const LLSD& data )
{
- LLScrollbar* self = (LLScrollbar*) userdata;
- self->changeLine( self->mStepSize, TRUE );
+ changeLine( mStepSize, TRUE );
}
+namespace LLInitParam
+{
+ template<>
+ bool ParamCompare<boost::function<void (S32, LLScrollbar*)> >::equals(
+ const boost::function<void (S32, LLScrollbar*)> &a,
+ const boost::function<void (S32, LLScrollbar*)> &b)
+ {
+ return false;
+ }
+}
diff --git a/indra/llui/llscrollbar.h b/indra/llui/llscrollbar.h
index 0bbf8662aa..43604d37b7 100644
--- a/indra/llui/llscrollbar.h
+++ b/indra/llui/llscrollbar.h
@@ -36,12 +36,7 @@
#include "stdtypes.h"
#include "lluictrl.h"
#include "v4color.h"
-
-//
-// Constants
-//
-const S32 SCROLLBAR_SIZE = 16;
-
+#include "llbutton.h"
//
// Classes
@@ -50,15 +45,41 @@ class LLScrollbar
: public LLUICtrl
{
public:
+
enum ORIENTATION { HORIZONTAL, VERTICAL };
+
+ typedef boost::function<void (S32, LLScrollbar*)> callback_t;
+ struct Params
+ : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Mandatory<ORIENTATION> orientation;
+ Mandatory<S32> doc_size;
+ Mandatory<S32> doc_pos;
+ Mandatory<S32> page_size;
+
+ Optional<callback_t> change_callback;
+ Optional<S32> step_size;
+ Optional<S32> thickness;
+
+ Optional<LLUIImage*> thumb_image,
+ track_image;
- LLScrollbar(const std::string& name, LLRect rect,
- ORIENTATION orientation,
- S32 doc_size, S32 doc_pos, S32 page_size,
- void(*change_callback)( S32 new_pos, LLScrollbar* self, void* userdata ),
- void* callback_user_data = NULL,
- S32 step_size = 1);
+ Optional<LLUIColor> track_color,
+ thumb_color;
+ Optional<LLButton::Params> up_button;
+ Optional<LLButton::Params> down_button;
+ Optional<LLButton::Params> left_button;
+ Optional<LLButton::Params> right_button;
+
+ Params();
+ };
+
+protected:
+ LLScrollbar (const Params & p);
+ friend class LLUICtrlFactory;
+
+public:
virtual ~LLScrollbar();
virtual void setValue(const LLSD& value);
@@ -101,13 +122,11 @@ public:
void pageUp(S32 overlap);
void pageDown(S32 overlap);
- static void onLineUpBtnPressed(void* userdata);
- static void onLineDownBtnPressed(void* userdata);
+ void onLineUpBtnPressed(const LLSD& data);
+ void onLineDownBtnPressed(const LLSD& data);
void setTrackColor( const LLColor4& color ) { mTrackColor = color; }
void setThumbColor( const LLColor4& color ) { mThumbColor = color; }
- void setHighlightColor( const LLColor4& color ) { mHighlightColor = color; }
- void setShadowColor( const LLColor4& color ) { mShadowColor = color; }
void setOnScrollEndCallback(void (*callback)(void*), void* userdata) { mOnScrollEndCallback = callback; mOnScrollEndData = userdata;}
@@ -115,8 +134,7 @@ private:
void updateThumbRect();
void changeLine(S32 delta, BOOL update_thumb );
- void (*mChangeCallback)( S32 new_pos, LLScrollbar* self, void* userdata );
- void* mCallbackUserData;
+ callback_t mChangeCallback;
const ORIENTATION mOrientation;
S32 mDocSize; // Size of the document that the scrollbar is modeling. Units depend on the user. 0 <= mDocSize.
@@ -134,16 +152,24 @@ private:
LLRect mOrigRect;
S32 mLastDelta;
- LLColor4 mTrackColor;
- LLColor4 mThumbColor;
- LLColor4 mFocusColor;
- LLColor4 mHighlightColor;
- LLColor4 mShadowColor;
+ LLUIColor mTrackColor;
+ LLUIColor mThumbColor;
+
+ LLUIImagePtr mThumbImage;
+ LLUIImagePtr mTrackImage;
+
+ S32 mThickness;
void (*mOnScrollEndCallback)(void*);
void *mOnScrollEndData;
};
+namespace LLInitParam
+{
+ template<>
+ bool ParamCompare<boost::function<void (S32, LLScrollbar*)> >::equals(
+ const boost::function<void (S32, LLScrollbar*)> &a, const boost::function<void (S32, LLScrollbar*)> &b);
+}
#endif // LL_SCROLLBAR_H
diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index cf03259879..dfe3ef29fc 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -1,6 +1,6 @@
/**
* @file llscrollcontainer.cpp
- * @brief LLScrollableContainerView base class
+ * @brief LLScrollContainer base class
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
@@ -33,8 +33,12 @@
#include "linden_common.h"
-#include "llrender.h"
#include "llscrollcontainer.h"
+
+#include "llrender.h"
+#include "llcontainerview.h"
+// #include "llfolderview.h"
+#include "llscrollingpanellist.h"
#include "llscrollbar.h"
#include "llui.h"
#include "llkeyboard.h"
@@ -42,6 +46,7 @@
#include "llfocusmgr.h"
#include "llframetimer.h"
#include "lluictrlfactory.h"
+#include "llpanel.h"
#include "llfontgl.h"
///----------------------------------------------------------------------------
@@ -55,98 +60,79 @@ static const F32 MAX_AUTO_SCROLL_RATE = 500.f;
static const F32 AUTO_SCROLL_RATE_ACCEL = 120.f;
///----------------------------------------------------------------------------
-/// Class LLScrollableContainerView
+/// Class LLScrollContainer
///----------------------------------------------------------------------------
-static LLRegisterWidget<LLScrollableContainerView> r("scroll_container");
+static LLRegisterWidget<LLScrollContainer> r("scroll_container");
-// Default constructor
-LLScrollableContainerView::LLScrollableContainerView( const std::string& name,
- const LLRect& rect,
- LLView* scrolled_view,
- BOOL is_opaque,
- const LLColor4& bg_color ) :
- LLUICtrl( name, rect, FALSE, NULL, NULL ),
- mScrolledView( scrolled_view ),
- mIsOpaque( is_opaque ),
- mBackgroundColor( bg_color ),
- mReserveScrollCorner( FALSE ),
- mAutoScrolling( FALSE ),
- mAutoScrollRate( 0.f )
+LLScrollContainer::Params::Params()
+: is_opaque("opaque"),
+ bg_color("color"),
+ reserve_scroll_corner("reserve_scroll_corner", false)
{
- if( mScrolledView )
- {
- addChild( mScrolledView );
- }
-
- init();
+ name = "scroll_container";
+ mouse_opaque(true);
+ tab_stop(false);
}
-// LLUICtrl constructor
-LLScrollableContainerView::LLScrollableContainerView( const std::string& name, const LLRect& rect,
- LLUICtrl* scrolled_ctrl, BOOL is_opaque,
- const LLColor4& bg_color) :
- LLUICtrl( name, rect, FALSE, NULL, NULL ),
- mScrolledView( scrolled_ctrl ),
- mIsOpaque( is_opaque ),
- mBackgroundColor( bg_color ),
- mReserveScrollCorner( FALSE ),
- mAutoScrolling( FALSE ),
- mAutoScrollRate( 0.f )
-{
- if( scrolled_ctrl )
- {
- addChild( scrolled_ctrl );
- }
- init();
-}
-
-void LLScrollableContainerView::init()
+// Default constructor
+LLScrollContainer::LLScrollContainer(const LLScrollContainer::Params& p)
+: LLUICtrl(p),
+ mAutoScrolling( FALSE ),
+ mAutoScrollRate( 0.f ),
+ mBackgroundColor(p.bg_color()),
+ mIsOpaque(p.is_opaque),
+ mReserveScrollCorner(p.reserve_scroll_corner),
+ mScrolledView(NULL)
{
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
LLRect border_rect( 0, getRect().getHeight(), getRect().getWidth(), 0 );
- mBorder = new LLViewBorder( std::string("scroll border"), border_rect, LLViewBorder::BEVEL_IN );
- addChild( mBorder );
+ LLViewBorder::Params params;
+ params.name("scroll border");
+ params.rect(border_rect);
+ params.bevel_type(LLViewBorder::BEVEL_IN);
+ mBorder = LLUICtrlFactory::create<LLViewBorder> (params);
+ LLView::addChild( mBorder );
mInnerRect.set( 0, getRect().getHeight(), getRect().getWidth(), 0 );
mInnerRect.stretch( -mBorder->getBorderWidth() );
LLRect vertical_scroll_rect = mInnerRect;
- vertical_scroll_rect.mLeft = vertical_scroll_rect.mRight - SCROLLBAR_SIZE;
- mScrollbar[VERTICAL] = new LLScrollbar( std::string("scrollable vertical"),
- vertical_scroll_rect,
- LLScrollbar::VERTICAL,
- mInnerRect.getHeight(),
- 0,
- mInnerRect.getHeight(),
- NULL, this,
- VERTICAL_MULTIPLE);
- addChild( mScrollbar[VERTICAL] );
+ vertical_scroll_rect.mLeft = vertical_scroll_rect.mRight - scrollbar_size;
+ LLScrollbar::Params sbparams;
+ sbparams.name("scrollable vertical");
+ sbparams.rect(vertical_scroll_rect);
+ sbparams.orientation(LLScrollbar::VERTICAL);
+ sbparams.doc_size(mInnerRect.getHeight());
+ sbparams.doc_pos(0);
+ sbparams.page_size(mInnerRect.getHeight());
+ sbparams.step_size(VERTICAL_MULTIPLE);
+ mScrollbar[VERTICAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams);
+ LLView::addChild( mScrollbar[VERTICAL] );
mScrollbar[VERTICAL]->setVisible( FALSE );
mScrollbar[VERTICAL]->setFollowsRight();
mScrollbar[VERTICAL]->setFollowsTop();
mScrollbar[VERTICAL]->setFollowsBottom();
LLRect horizontal_scroll_rect = mInnerRect;
- horizontal_scroll_rect.mTop = horizontal_scroll_rect.mBottom + SCROLLBAR_SIZE;
- mScrollbar[HORIZONTAL] = new LLScrollbar( std::string("scrollable horizontal"),
- horizontal_scroll_rect,
- LLScrollbar::HORIZONTAL,
- mInnerRect.getWidth(),
- 0,
- mInnerRect.getWidth(),
- NULL, this,
- HORIZONTAL_MULTIPLE);
- addChild( mScrollbar[HORIZONTAL] );
+ horizontal_scroll_rect.mTop = horizontal_scroll_rect.mBottom + scrollbar_size;
+ sbparams.name("scrollable horizontal");
+ sbparams.rect(horizontal_scroll_rect);
+ sbparams.orientation(LLScrollbar::HORIZONTAL);
+ sbparams.doc_size(mInnerRect.getWidth());
+ sbparams.doc_pos(0);
+ sbparams.page_size(mInnerRect.getWidth());
+ sbparams.step_size(VERTICAL_MULTIPLE);
+ mScrollbar[HORIZONTAL] = LLUICtrlFactory::create<LLScrollbar> (sbparams);
+ LLView::addChild( mScrollbar[HORIZONTAL] );
mScrollbar[HORIZONTAL]->setVisible( FALSE );
mScrollbar[HORIZONTAL]->setFollowsLeft();
mScrollbar[HORIZONTAL]->setFollowsRight();
-
- setTabStop(FALSE);
}
// Destroys the object
-LLScrollableContainerView::~LLScrollableContainerView( void )
+LLScrollContainer::~LLScrollContainer( void )
{
// mScrolledView and mScrollbar are child views, so the LLView
// destructor takes care of memory deallocation.
@@ -159,9 +145,9 @@ LLScrollableContainerView::~LLScrollableContainerView( void )
// internal scrollbar handlers
// virtual
-void LLScrollableContainerView::scrollHorizontal( S32 new_pos )
+void LLScrollContainer::scrollHorizontal( S32 new_pos )
{
- //llinfos << "LLScrollableContainerView::scrollHorizontal()" << llendl;
+ //llinfos << "LLScrollContainer::scrollHorizontal()" << llendl;
if( mScrolledView )
{
LLRect doc_rect = mScrolledView->getRect();
@@ -171,9 +157,9 @@ void LLScrollableContainerView::scrollHorizontal( S32 new_pos )
}
// virtual
-void LLScrollableContainerView::scrollVertical( S32 new_pos )
+void LLScrollContainer::scrollVertical( S32 new_pos )
{
- // llinfos << "LLScrollableContainerView::scrollVertical() " << new_pos << llendl;
+ // llinfos << "LLScrollContainer::scrollVertical() " << new_pos << llendl;
if( mScrolledView )
{
LLRect doc_rect = mScrolledView->getRect();
@@ -183,7 +169,7 @@ void LLScrollableContainerView::scrollVertical( S32 new_pos )
}
// LLView functionality
-void LLScrollableContainerView::reshape(S32 width, S32 height,
+void LLScrollContainer::reshape(S32 width, S32 height,
BOOL called_from_parent)
{
LLUICtrl::reshape( width, height, called_from_parent );
@@ -209,7 +195,7 @@ void LLScrollableContainerView::reshape(S32 width, S32 height,
}
}
-BOOL LLScrollableContainerView::handleKeyHere(KEY key, MASK mask)
+BOOL LLScrollContainer::handleKeyHere(KEY key, MASK mask)
{
for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
{
@@ -222,7 +208,7 @@ BOOL LLScrollableContainerView::handleKeyHere(KEY key, MASK mask)
return FALSE;
}
-BOOL LLScrollableContainerView::handleScrollWheel( S32 x, S32 y, S32 clicks )
+BOOL LLScrollContainer::handleScrollWheel( S32 x, S32 y, S32 clicks )
{
for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
{
@@ -239,7 +225,7 @@ BOOL LLScrollableContainerView::handleScrollWheel( S32 x, S32 y, S32 clicks )
return TRUE;
}
-BOOL LLScrollableContainerView::needsToScroll(S32 x, S32 y, LLScrollableContainerView::SCROLL_ORIENTATION axis) const
+BOOL LLScrollContainer::needsToScroll(S32 x, S32 y, LLScrollContainer::SCROLL_ORIENTATION axis) const
{
if(mScrollbar[axis]->getVisible())
{
@@ -247,7 +233,8 @@ BOOL LLScrollableContainerView::needsToScroll(S32 x, S32 y, LLScrollableContaine
const S32 AUTOSCROLL_SIZE = 10;
if(mScrollbar[axis]->getVisible())
{
- inner_rect_local.mRight -= SCROLLBAR_SIZE;
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+ inner_rect_local.mRight -= scrollbar_size;
inner_rect_local.mTop += AUTOSCROLL_SIZE;
inner_rect_local.mBottom = inner_rect_local.mTop - AUTOSCROLL_SIZE;
}
@@ -260,13 +247,14 @@ BOOL LLScrollableContainerView::needsToScroll(S32 x, S32 y, LLScrollableContaine
return FALSE;
}
-BOOL LLScrollableContainerView::handleDragAndDrop(S32 x, S32 y, MASK mask,
+BOOL LLScrollContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,
BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg)
{
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
// Scroll folder view if needed. Never accepts a drag or drop.
*accept = ACCEPT_NO;
BOOL handled = FALSE;
@@ -278,11 +266,11 @@ BOOL LLScrollableContainerView::handleDragAndDrop(S32 x, S32 y, MASK mask,
LLRect inner_rect_local( 0, mInnerRect.getHeight(), mInnerRect.getWidth(), 0 );
if( mScrollbar[HORIZONTAL]->getVisible() )
{
- inner_rect_local.mBottom += SCROLLBAR_SIZE;
+ inner_rect_local.mBottom += scrollbar_size;
}
if( mScrollbar[VERTICAL]->getVisible() )
{
- inner_rect_local.mRight -= SCROLLBAR_SIZE;
+ inner_rect_local.mRight -= scrollbar_size;
}
if( mScrollbar[HORIZONTAL]->getVisible() )
@@ -337,7 +325,7 @@ BOOL LLScrollableContainerView::handleDragAndDrop(S32 x, S32 y, MASK mask,
}
-BOOL LLScrollableContainerView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect)
+BOOL LLScrollContainer::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect)
{
S32 local_x, local_y;
for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
@@ -364,14 +352,15 @@ BOOL LLScrollableContainerView::handleToolTip(S32 x, S32 y, std::string& msg, LL
return TRUE;
}
-void LLScrollableContainerView::calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const
+void LLScrollContainer::calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const
{
const LLRect& rect = mScrolledView->getRect();
calcVisibleSize(rect, visible_width, visible_height, show_h_scrollbar, show_v_scrollbar);
}
-void LLScrollableContainerView::calcVisibleSize( const LLRect& doc_rect, S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const
+void LLScrollContainer::calcVisibleSize( const LLRect& doc_rect, S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const
{
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
S32 doc_width = doc_rect.getWidth();
S32 doc_height = doc_rect.getHeight();
@@ -382,26 +371,28 @@ void LLScrollableContainerView::calcVisibleSize( const LLRect& doc_rect, S32 *vi
if( *visible_height < doc_height )
{
*show_v_scrollbar = TRUE;
- *visible_width -= SCROLLBAR_SIZE;
+ *visible_width -= scrollbar_size;
}
*show_h_scrollbar = FALSE;
if( *visible_width < doc_width )
{
*show_h_scrollbar = TRUE;
- *visible_height -= SCROLLBAR_SIZE;
+ *visible_height -= scrollbar_size;
// Must retest now that visible_height has changed
if( !*show_v_scrollbar && (*visible_height < doc_height) )
{
*show_v_scrollbar = TRUE;
- *visible_width -= SCROLLBAR_SIZE;
+ *visible_width -= scrollbar_size;
}
}
}
+
-void LLScrollableContainerView::draw()
+void LLScrollContainer::draw()
{
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
if (mAutoScrolling)
{
// add acceleration to autoscroll
@@ -427,7 +418,7 @@ void LLScrollableContainerView::draw()
if( mIsOpaque )
{
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
- gGL.color4fv( mBackgroundColor.mV );
+ gGL.color4fv( mBackgroundColor.get().mV );
gl_rect_2d( mInnerRect );
}
@@ -448,9 +439,9 @@ void LLScrollableContainerView::draw()
calcVisibleSize( mScrolledView->getRect(), &visible_width, &visible_height, &show_h_scrollbar, &show_v_scrollbar );
LLLocalClipRect clip(LLRect(mInnerRect.mLeft,
- mInnerRect.mBottom + (show_h_scrollbar ? SCROLLBAR_SIZE : 0) + visible_height,
+ mInnerRect.mBottom + (show_h_scrollbar ? scrollbar_size : 0) + visible_height,
visible_width,
- mInnerRect.mBottom + (show_h_scrollbar ? SCROLLBAR_SIZE : 0)
+ mInnerRect.mBottom + (show_h_scrollbar ? scrollbar_size : 0)
));
drawChild(mScrolledView);
}
@@ -487,10 +478,44 @@ void LLScrollableContainerView::draw()
drawDebugRect();
}
+ //// *HACK: also draw debug rectangles around currently-being-edited LLView, and any elements that are being highlighted by GUI preview code (see LLFloaterUIPreview)
+ //std::set<LLView*>::iterator iter = std::find(sPreviewHighlightedElements.begin(), sPreviewHighlightedElements.end(), this);
+ //if ((sEditingUI && this == sEditingUIView) || (iter != sPreviewHighlightedElements.end() && sDrawPreviewHighlights))
+ //{
+ // drawDebugRect();
+ //}
+
} // end draw
-void LLScrollableContainerView::updateScroll()
+bool LLScrollContainer::addChild(LLView* view, S32 tab_group)
{
+ if (!mScrolledView)
+ {
+ //*TODO: Move LLFolderView to llui and enable this check
+// if (dynamic_cast<LLPanel*>(view) || dynamic_cast<LLContainerView*>(view) || dynamic_cast<LLScrollingPanelList*>(view) || dynamic_cast<LLFolderView*>(view))
+ {
+ // Use the first panel or container as the scrollable view (bit of a hack)
+ mScrolledView = view;
+ }
+ }
+
+ bool ret_val = LLView::addChild(view, tab_group);
+
+ //bring the scrollbars to the front
+ sendChildToFront( mScrollbar[HORIZONTAL] );
+ sendChildToFront( mScrollbar[VERTICAL] );
+
+ return ret_val;
+}
+
+
+void LLScrollContainer::updateScroll()
+{
+ if (!mScrolledView)
+ {
+ return;
+ }
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
LLRect doc_rect = mScrolledView->getRect();
S32 doc_width = doc_rect.getWidth();
S32 doc_height = doc_rect.getHeight();
@@ -514,15 +539,15 @@ void LLScrollableContainerView::updateScroll()
S32 v_scrollbar_height = visible_height;
if( !show_h_scrollbar && mReserveScrollCorner )
{
- v_scrollbar_height -= SCROLLBAR_SIZE;
+ v_scrollbar_height -= scrollbar_size;
}
- mScrollbar[VERTICAL]->reshape( SCROLLBAR_SIZE, v_scrollbar_height, TRUE );
+ mScrollbar[VERTICAL]->reshape( scrollbar_size, v_scrollbar_height, TRUE );
// Make room for the horizontal scrollbar (or not)
S32 v_scrollbar_offset = 0;
if( show_h_scrollbar || mReserveScrollCorner )
{
- v_scrollbar_offset = SCROLLBAR_SIZE;
+ v_scrollbar_offset = scrollbar_size;
}
LLRect r = mScrollbar[VERTICAL]->getRect();
r.translate( 0, mInnerRect.mBottom - r.mBottom + v_scrollbar_offset );
@@ -552,9 +577,9 @@ void LLScrollableContainerView::updateScroll()
S32 h_scrollbar_width = visible_width;
if( !show_v_scrollbar && mReserveScrollCorner )
{
- h_scrollbar_width -= SCROLLBAR_SIZE;
+ h_scrollbar_width -= scrollbar_size;
}
- mScrollbar[HORIZONTAL]->reshape( h_scrollbar_width, SCROLLBAR_SIZE, TRUE );
+ mScrollbar[HORIZONTAL]->reshape( h_scrollbar_width, scrollbar_size, TRUE );
}
else
{
@@ -571,17 +596,17 @@ void LLScrollableContainerView::updateScroll()
mScrollbar[VERTICAL]->setPageSize( visible_height );
} // end updateScroll
-void LLScrollableContainerView::setBorderVisible(BOOL b)
+void LLScrollContainer::setBorderVisible(BOOL b)
{
mBorder->setVisible( b );
}
// Scroll so that as much of rect as possible is showing (where rect is defined in the space of scroller view, not scrolled)
-void LLScrollableContainerView::scrollToShowRect(const LLRect& rect, const LLCoordGL& desired_offset)
+void LLScrollContainer::scrollToShowRect(const LLRect& rect, const LLCoordGL& desired_offset)
{
if (!mScrolledView)
{
- llwarns << "LLScrollableContainerView::scrollToShowRect with no view!" << llendl;
+ llwarns << "LLScrollContainer::scrollToShowRect with no view!" << llendl;
return;
}
@@ -646,27 +671,27 @@ void LLScrollableContainerView::scrollToShowRect(const LLRect& rect, const LLCoo
updateScroll();
}
-void LLScrollableContainerView::pageUp(S32 overlap)
+void LLScrollContainer::pageUp(S32 overlap)
{
mScrollbar[VERTICAL]->pageUp(overlap);
}
-void LLScrollableContainerView::pageDown(S32 overlap)
+void LLScrollContainer::pageDown(S32 overlap)
{
mScrollbar[VERTICAL]->pageDown(overlap);
}
-void LLScrollableContainerView::goToTop()
+void LLScrollContainer::goToTop()
{
mScrollbar[VERTICAL]->setDocPos(0);
}
-void LLScrollableContainerView::goToBottom()
+void LLScrollContainer::goToBottom()
{
mScrollbar[VERTICAL]->setDocPos(mScrollbar[VERTICAL]->getDocSize());
}
-S32 LLScrollableContainerView::getBorderWidth() const
+S32 LLScrollContainer::getBorderWidth() const
{
if (mBorder)
{
@@ -676,73 +701,3 @@ S32 LLScrollableContainerView::getBorderWidth() const
return 0;
}
-// virtual
-LLXMLNodePtr LLScrollableContainerView::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLView::getXML();
-
- // Attributes
-
- node->createChild("opaque", TRUE)->setBoolValue(mIsOpaque);
-
- if (mIsOpaque)
- {
- node->createChild("color", TRUE)->setFloatValue(4, mBackgroundColor.mV);
- }
-
- // Contents
-
- LLXMLNodePtr child_node = mScrolledView->getXML();
-
- node->addChild(child_node);
-
- return node;
-}
-
-LLView* LLScrollableContainerView::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("scroll_container");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- BOOL opaque = FALSE;
- node->getAttributeBOOL("opaque", opaque);
-
- LLColor4 color(0,0,0,0);
- LLUICtrlFactory::getAttributeColor(node,"color", color);
-
- // Create the scroll view
- LLScrollableContainerView *ret = new LLScrollableContainerView(name, rect, (LLPanel*)NULL, opaque, color);
-
- LLPanel* panelp = NULL;
-
- // Find a child panel to add
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
- {
- LLView *control = factory->createCtrlWidget(panelp, child);
- if (control && control->isPanel())
- {
- if (panelp)
- {
- llinfos << "Warning! Attempting to put multiple panels into a scrollable container view!" << llendl;
- delete control;
- }
- else
- {
- panelp = (LLPanel*)control;
- }
- }
- }
-
- if (panelp == NULL)
- {
- panelp = new LLPanel(std::string("dummy"), LLRect::null, FALSE);
- }
-
- ret->mScrolledView = panelp;
-
- return ret;
-}
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index 70fc9087d7..7e207645ff 100644
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -1,6 +1,6 @@
/**
* @file llscrollcontainer.h
- * @brief LLScrollableContainerView class header file.
+ * @brief LLScrollContainer class header file.
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
@@ -53,24 +53,28 @@ class LLUICtrlFactory;
* the width and height of the view you're scrolling.
*
*****************************************************************************/
-class LLScrollableContainerView : public LLUICtrl
+class LLScrollContainer : public LLUICtrl
{
public:
// Note: vertical comes before horizontal because vertical
// scrollbars have priority for mouse and keyboard events.
enum SCROLL_ORIENTATION { VERTICAL, HORIZONTAL, SCROLLBAR_COUNT };
- LLScrollableContainerView( const std::string& name, const LLRect& rect,
- LLView* scrolled_view, BOOL is_opaque = FALSE,
- const LLColor4& bg_color = LLColor4(0,0,0,0) );
- LLScrollableContainerView( const std::string& name, const LLRect& rect,
- LLUICtrl* scrolled_ctrl, BOOL is_opaque = FALSE,
- const LLColor4& bg_color = LLColor4(0,0,0,0) );
- virtual ~LLScrollableContainerView( void );
-
- void setScrolledView(LLView* view) { mScrolledView = view; }
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<bool> is_opaque;
+ Optional<LLUIColor> bg_color;
+ Optional<bool> reserve_scroll_corner;
+
+ Params();
+ };
+protected:
+ LLScrollContainer(const Params&);
+ friend class LLUICtrlFactory;
+public:
+ virtual ~LLScrollContainer( void );
- virtual void setValue(const LLSD& value) { mInnerRect.setValue(value); }
+ virtual void setValue(const LLSD& value) { mInnerRect.setValue(value); }
void calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const;
void calcVisibleSize( const LLRect& doc_rect, S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const;
@@ -99,13 +103,9 @@ public:
virtual BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
virtual void draw();
-
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+ virtual bool addChild(LLView* view, S32 tab_group = 0);
private:
- void init();
-
// internal scrollbar handlers
virtual void scrollHorizontal( S32 new_pos );
virtual void scrollVertical( S32 new_pos );
@@ -115,7 +115,7 @@ private:
LLView* mScrolledView;
S32 mSize;
BOOL mIsOpaque;
- LLColor4 mBackgroundColor;
+ LLUIColor mBackgroundColor;
LLRect mInnerRect;
LLViewBorder* mBorder;
BOOL mReserveScrollCorner;
diff --git a/indra/llui/llscrollingpanellist.cpp b/indra/llui/llscrollingpanellist.cpp
index 05d0c6f753..bfeb35704a 100644
--- a/indra/llui/llscrollingpanellist.cpp
+++ b/indra/llui/llscrollingpanellist.cpp
@@ -52,9 +52,9 @@ void LLScrollingPanelList::clearPanels()
void LLScrollingPanelList::addPanel( LLScrollingPanel* panel )
{
- addChildAtEnd( panel );
+ addChildInBack( panel );
mPanelList.push_front( panel );
-
+
const S32 GAP_BETWEEN_PANELS = 6;
// Resize this view
@@ -82,7 +82,48 @@ void LLScrollingPanelList::addPanel( LLScrollingPanel* panel )
cur_y -= GAP_BETWEEN_PANELS;
}
}
-
+
+void LLScrollingPanelList::removePanel( U32 panel_index )
+{
+ if ( mPanelList.empty() || panel_index >= mPanelList.size() )
+ {
+ llwarns << "Panel index " << panel_index << " is out of range!" << llendl;
+ return;
+ }
+ else
+ {
+ removeChild( mPanelList.at(panel_index) );
+ mPanelList.erase( mPanelList.begin() + panel_index );
+ }
+
+ const S32 GAP_BETWEEN_PANELS = 6;
+
+ // Resize this view
+ S32 total_height = 0;
+ S32 max_width = 0;
+ S32 cur_gap = 0;
+ for (std::deque<LLScrollingPanel*>::iterator iter = mPanelList.begin();
+ iter != mPanelList.end(); ++iter)
+ {
+ LLScrollingPanel *childp = *iter;
+ total_height += childp->getRect().getHeight() + cur_gap;
+ max_width = llmax( max_width, childp->getRect().getWidth() );
+ cur_gap = GAP_BETWEEN_PANELS;
+ }
+ reshape( max_width, total_height, FALSE );
+
+ // Reposition each of the child views
+ S32 cur_y = total_height;
+ for (std::deque<LLScrollingPanel*>::iterator iter = mPanelList.begin();
+ iter != mPanelList.end(); ++iter)
+ {
+ LLScrollingPanel *childp = *iter;
+ cur_y -= childp->getRect().getHeight();
+ childp->translate( -childp->getRect().mLeft, cur_y - childp->getRect().mBottom);
+ cur_y -= GAP_BETWEEN_PANELS;
+ }
+}
+
void LLScrollingPanelList::updatePanels(BOOL allow_modify)
{
for (std::deque<LLScrollingPanel*>::iterator iter = mPanelList.begin();
@@ -138,18 +179,3 @@ void LLScrollingPanelList::draw()
LLUICtrl::draw();
}
-
-// static
-LLView* LLScrollingPanelList::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("scrolling_panel_list");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- LLScrollingPanelList* scrolling_panel_list = new LLScrollingPanelList(name, rect);
- scrolling_panel_list->initFromXML(node, parent);
- return scrolling_panel_list;
-}
-
diff --git a/indra/llui/llscrollingpanellist.h b/indra/llui/llscrollingpanellist.h
index b9d730978f..5dc23facda 100644
--- a/indra/llui/llscrollingpanellist.h
+++ b/indra/llui/llscrollingpanellist.h
@@ -29,6 +29,9 @@
* $/LicenseInfo$
*/
+#ifndef LL_LLSCROLLINGPANELLIST_H
+#define LL_LLSCROLLINGPANELLIST_H
+
#include <vector>
#include "llui.h"
@@ -42,7 +45,7 @@
class LLScrollingPanel : public LLPanel
{
public:
- LLScrollingPanel(const std::string& name, const LLRect& rect) : LLPanel(name, rect) { }
+ LLScrollingPanel(const LLPanel::Params& params) : LLPanel(params) {}
virtual void updatePanel(BOOL allow_modify) = 0;
};
@@ -53,23 +56,34 @@ public:
class LLScrollingPanelList : public LLUICtrl
{
public:
- LLScrollingPanelList(const std::string& name, const LLRect& rect)
- : LLUICtrl(name, rect, TRUE, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_BOTTOM ) {}
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Params()
+ {
+ name = "scrolling_panel_list";
+ follows.flags = FOLLOWS_LEFT | FOLLOWS_BOTTOM;
+ }
+ };
+ LLScrollingPanelList(const Params& p)
+ : LLUICtrl(p)
+ {}
+
+ typedef std::deque<LLScrollingPanel*> panel_list_t;
virtual void setValue(const LLSD& value) {};
- virtual LLXMLNodePtr getXML(bool save_children) const { return LLUICtrl::getXML(); }
-
virtual void draw();
void clearPanels();
void addPanel( LLScrollingPanel* panel );
+ void removePanel( U32 panel_index );
void updatePanels(BOOL allow_modify);
+ const panel_list_t& getPanelList() { return mPanelList; }
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-
private:
void updatePanelVisiblilty();
- std::deque<LLScrollingPanel*> mPanelList;
+ panel_list_t mPanelList;
};
+
+#endif //LL_LLSCROLLINGPANELLIST_H
diff --git a/indra/llui/llscrolllistcell.cpp b/indra/llui/llscrolllistcell.cpp
new file mode 100644
index 0000000000..4e6de24160
--- /dev/null
+++ b/indra/llui/llscrolllistcell.cpp
@@ -0,0 +1,413 @@
+/**
+ * @file llscrolllistcell.cpp
+ * @brief Scroll lists are composed of rows (items), each of which
+ * contains columns (cells).
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llscrolllistcell.h"
+
+#include "llcheckboxctrl.h"
+#include "llui.h" // LLUIImage
+#include "lluictrlfactory.h"
+
+//static
+LLScrollListCell* LLScrollListCell::create(const LLScrollListCell::Params& cell_p)
+{
+ LLScrollListCell* cell = NULL;
+
+ if (cell_p.type() == "icon")
+ {
+ cell = new LLScrollListIcon(cell_p);
+ }
+ else if (cell_p.type() == "checkbox")
+ {
+ cell = new LLScrollListCheck(cell_p);
+ }
+ else if (cell_p.type() == "date")
+ {
+ cell = new LLScrollListDate(cell_p);
+ }
+ else // default is "text"
+ {
+ cell = new LLScrollListText(cell_p);
+ }
+
+ if (cell_p.value.isProvided())
+ {
+ cell->setValue(cell_p.value);
+ }
+
+ return cell;
+}
+
+
+LLScrollListCell::LLScrollListCell(const LLScrollListCell::Params& p)
+: mWidth(p.width)
+{}
+
+// virtual
+const LLSD LLScrollListCell::getValue() const
+{
+ return LLStringUtil::null;
+}
+
+//
+// LLScrollListIcon
+//
+LLScrollListIcon::LLScrollListIcon(const LLScrollListCell::Params& p)
+: LLScrollListCell(p),
+ mIcon(LLUI::getUIImage(p.value().asString())),
+ mColor(p.color),
+ mAlignment(p.font_halign)
+{}
+
+LLScrollListIcon::~LLScrollListIcon()
+{
+}
+
+/*virtual*/
+S32 LLScrollListIcon::getHeight() const
+{ return mIcon ? mIcon->getHeight() : 0; }
+
+/*virtual*/
+const LLSD LLScrollListIcon::getValue() const
+{ return mIcon.isNull() ? LLStringUtil::null : mIcon->getName(); }
+
+void LLScrollListIcon::setValue(const LLSD& value)
+{
+ if (value.isUUID())
+ {
+ // don't use default image specified by LLUUID::null, use no image in that case
+ LLUUID image_id = value.asUUID();
+ mIcon = image_id.notNull() ? LLUI::getUIImageByID(image_id) : LLUIImagePtr(NULL);
+ }
+ else
+ {
+ std::string value_string = value.asString();
+ if (LLUUID::validate(value_string))
+ {
+ setValue(LLUUID(value_string));
+ }
+ else if (!value_string.empty())
+ {
+ mIcon = LLUI::getUIImage(value.asString());
+ }
+ else
+ {
+ mIcon = NULL;
+ }
+ }
+}
+
+
+void LLScrollListIcon::setColor(const LLColor4& color)
+{
+ mColor = color;
+}
+
+S32 LLScrollListIcon::getWidth() const
+{
+ // if no specified fix width, use width of icon
+ if (LLScrollListCell::getWidth() == 0 && mIcon.notNull())
+ {
+ return mIcon->getWidth();
+ }
+ return LLScrollListCell::getWidth();
+}
+
+
+void LLScrollListIcon::draw(const LLColor4& color, const LLColor4& highlight_color) const
+{
+ if (mIcon)
+ {
+ switch(mAlignment)
+ {
+ case LLFontGL::LEFT:
+ mIcon->draw(0, 0, mColor);
+ break;
+ case LLFontGL::RIGHT:
+ mIcon->draw(getWidth() - mIcon->getWidth(), 0, mColor);
+ break;
+ case LLFontGL::HCENTER:
+ mIcon->draw((getWidth() - mIcon->getWidth()) / 2, 0, mColor);
+ break;
+ default:
+ break;
+ }
+ }
+}
+
+//
+// LLScrollListText
+//
+U32 LLScrollListText::sCount = 0;
+
+LLScrollListText::LLScrollListText(const LLScrollListCell::Params& p)
+: LLScrollListCell(p),
+ mText(p.value().asString()),
+ mFont(p.font),
+ mColor(p.color),
+ mUseColor(p.color.isProvided()),
+ mFontStyle(LLFontGL::NORMAL),
+ mFontAlignment(p.font_halign),
+ mVisible(p.visible),
+ mHighlightCount( 0 ),
+ mHighlightOffset( 0 )
+{
+ sCount++;
+
+ // initialize rounded rect image
+ if (!mRoundedRectImage)
+ {
+ mRoundedRectImage = LLUI::getUIImage("rounded_square.tga");
+ }
+}
+
+//virtual
+void LLScrollListText::highlightText(S32 offset, S32 num_chars)
+{
+ mHighlightOffset = offset;
+ mHighlightCount = num_chars;
+}
+
+//virtual
+BOOL LLScrollListText::isText() const
+{
+ return TRUE;
+}
+
+//virtual
+BOOL LLScrollListText::getVisible() const
+{
+ return mVisible;
+}
+
+//virtual
+S32 LLScrollListText::getHeight() const
+{
+ return llround(mFont->getLineHeight());
+}
+
+
+LLScrollListText::~LLScrollListText()
+{
+ sCount--;
+}
+
+S32 LLScrollListText::getContentWidth() const
+{
+ return mFont->getWidth(mText.getString());
+}
+
+
+void LLScrollListText::setColor(const LLColor4& color)
+{
+ mColor = color;
+ mUseColor = TRUE;
+}
+
+void LLScrollListText::setText(const LLStringExplicit& text)
+{
+ mText = text;
+}
+
+//virtual
+void LLScrollListText::setValue(const LLSD& text)
+{
+ setText(text.asString());
+}
+
+//virtual
+const LLSD LLScrollListText::getValue() const
+{
+ return LLSD(mText.getString());
+}
+
+
+void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_color) const
+{
+ LLColor4 display_color;
+ if (mUseColor)
+ {
+ display_color = mColor;
+ }
+ else
+ {
+ display_color = color;
+ }
+
+ if (mHighlightCount > 0)
+ {
+ S32 left = 0;
+ switch(mFontAlignment)
+ {
+ case LLFontGL::LEFT:
+ left = mFont->getWidth(mText.getString(), 0, mHighlightOffset);
+ break;
+ case LLFontGL::RIGHT:
+ left = getWidth() - mFont->getWidth(mText.getString(), mHighlightOffset, S32_MAX);
+ break;
+ case LLFontGL::HCENTER:
+ left = (getWidth() - mFont->getWidth(mText.getString())) / 2;
+ break;
+ }
+ LLRect highlight_rect(left - 2,
+ llround(mFont->getLineHeight()) + 1,
+ left + mFont->getWidth(mText.getString(), mHighlightOffset, mHighlightCount) + 1,
+ 1);
+ mRoundedRectImage->draw(highlight_rect, highlight_color);
+ }
+
+ // Try to draw the entire string
+ F32 right_x;
+ U32 string_chars = mText.length();
+ F32 start_x = 0.f;
+ switch(mFontAlignment)
+ {
+ case LLFontGL::LEFT:
+ start_x = 0.f;
+ break;
+ case LLFontGL::RIGHT:
+ start_x = (F32)getWidth();
+ break;
+ case LLFontGL::HCENTER:
+ start_x = (F32)getWidth() * 0.5f;
+ break;
+ }
+ mFont->render(mText.getWString(), 0,
+ start_x, 2.f,
+ display_color,
+ mFontAlignment,
+ LLFontGL::BOTTOM,
+ mFontStyle,
+ LLFontGL::NO_SHADOW,
+ string_chars,
+ getWidth(),
+ &right_x,
+ FALSE,
+ TRUE);
+}
+
+//
+// LLScrollListCheck
+//
+LLScrollListCheck::LLScrollListCheck(const LLScrollListCell::Params& p)
+: LLScrollListCell(p)
+{
+ LLCheckBoxCtrl::Params checkbox_p;
+ checkbox_p.name("checkbox");
+ checkbox_p.rect.left(0).bottom(0).width(p.width).height(p.width);
+ checkbox_p.enabled(p.enabled);
+ checkbox_p.initial_value(p.value());
+
+ mCheckBox = LLUICtrlFactory::create<LLCheckBoxCtrl>(checkbox_p);
+
+ LLRect rect(mCheckBox->getRect());
+ if (p.width)
+ {
+ rect.mRight = rect.mLeft + p.width;
+ mCheckBox->setRect(rect);
+ setWidth(p.width);
+ }
+ else
+ {
+ setWidth(rect.getWidth()); //check_box->getWidth();
+ }
+
+ mCheckBox->setColor(p.color);
+}
+
+
+LLScrollListCheck::~LLScrollListCheck()
+{
+ delete mCheckBox;
+ mCheckBox = NULL;
+}
+
+void LLScrollListCheck::draw(const LLColor4& color, const LLColor4& highlight_color) const
+{
+ mCheckBox->draw();
+}
+
+BOOL LLScrollListCheck::handleClick()
+{
+ if (mCheckBox->getEnabled())
+ {
+ mCheckBox->toggle();
+ }
+ // don't change selection when clicking on embedded checkbox
+ return TRUE;
+}
+
+/*virtual*/
+const LLSD LLScrollListCheck::getValue() const
+{
+ return mCheckBox->getValue();
+}
+
+/*virtual*/
+void LLScrollListCheck::setValue(const LLSD& value)
+{
+ mCheckBox->setValue(value);
+}
+
+/*virtual*/
+void LLScrollListCheck::onCommit()
+{
+ mCheckBox->onCommit();
+}
+
+/*virtual*/
+void LLScrollListCheck::setEnabled(BOOL enable)
+{
+ mCheckBox->setEnabled(enable);
+}
+
+//
+// LLScrollListDate
+//
+
+LLScrollListDate::LLScrollListDate( const LLScrollListCell::Params& p)
+: LLScrollListText(p),
+ mDate(p.value().asDate())
+{}
+
+void LLScrollListDate::setValue(const LLSD& value)
+{
+ mDate = value.asDate();
+ LLScrollListText::setValue(mDate.asRFC1123());
+}
+
+const LLSD LLScrollListDate::getValue() const
+{
+ return mDate;
+}
diff --git a/indra/llui/llscrolllistcell.h b/indra/llui/llscrolllistcell.h
new file mode 100644
index 0000000000..2ab13f7618
--- /dev/null
+++ b/indra/llui/llscrolllistcell.h
@@ -0,0 +1,223 @@
+/**
+ * @file llscrolllistcell.h
+ * @brief Scroll lists are composed of rows (items), each of which
+ * contains columns (cells).
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LLSCROLLLISTCELL_H
+#define LLSCROLLLISTCELL_H
+
+#include "llfontgl.h" // HAlign
+#include "llpointer.h" // LLPointer<>
+#include "lluistring.h"
+#include "v4color.h"
+#include "llui.h"
+
+class LLCheckBoxCtrl;
+class LLSD;
+class LLUIImage;
+
+/*
+ * Represents a cell in a scrollable table.
+ *
+ * Sub-classes must return height and other properties
+ * though width accessors are implemented by the base class.
+ * It is therefore important for sub-class constructors to call
+ * setWidth() with realistic values.
+ */
+class LLScrollListCell
+{
+public:
+ struct Params : public LLInitParam::Block<Params>
+ {
+ Optional<std::string> type,
+ column;
+
+ Optional<S32> width;
+ Optional<bool> enabled,
+ visible;
+
+ Optional<void*> userdata;
+ Optional<LLSD> value;
+
+ Optional<const LLFontGL*> font;
+ Optional<LLColor4> font_color;
+ Optional<LLFontGL::HAlign> font_halign;
+
+ Optional<LLColor4> color;
+
+ Params()
+ : type("type", "text"),
+ column("column"),
+ width("width"),
+ enabled("enabled", true),
+ visible("visible", true),
+ value("value"),
+ font("font", LLFontGL::getFontSansSerifSmall()),
+ font_color("font_color", LLColor4::black),
+ color("color", LLColor4::white),
+ font_halign("halign", LLFontGL::LEFT)
+ {
+ addSynonym(column, "name");
+ addSynonym(font_color, "font-color");
+ }
+ };
+
+ static LLScrollListCell* create(const Params&);
+
+ LLScrollListCell(const LLScrollListCell::Params&);
+ virtual ~LLScrollListCell() {};
+ virtual void draw(const LLColor4& color, const LLColor4& highlight_color) const = 0; // truncate to given width, if possible
+ virtual S32 getWidth() const {return mWidth;}
+ virtual S32 getContentWidth() const { return 0; }
+ virtual S32 getHeight() const = 0;
+ virtual const LLSD getValue() const;
+ virtual void setValue(const LLSD& value) { }
+ virtual BOOL getVisible() const { return TRUE; }
+ virtual void setWidth(S32 width) { mWidth = width; }
+ virtual void highlightText(S32 offset, S32 num_chars) {}
+ virtual BOOL isText() const = 0;
+ virtual void setColor(const LLColor4&) {}
+ virtual void onCommit() {};
+
+ virtual BOOL handleClick() { return FALSE; }
+ virtual void setEnabled(BOOL enable) { }
+
+private:
+ S32 mWidth;
+};
+
+class LLScrollListSpacer : public LLScrollListCell
+{
+public:
+ LLScrollListSpacer(const LLScrollListCell::Params& p) : LLScrollListCell(p) {}
+ /*virtual*/ ~LLScrollListSpacer() {};
+ /*virtual*/ void draw(const LLColor4& color, const LLColor4& highlight_color) const {}
+ /*virtual*/ S32 getHeight() const { return 0; }
+ /*virtual*/ BOOL isText() const { return FALSE; }
+};
+
+/*
+ * Cell displaying a text label.
+ */
+class LLScrollListText : public LLScrollListCell
+{
+public:
+ LLScrollListText(const LLScrollListCell::Params&);
+ /*virtual*/ ~LLScrollListText();
+
+ /*virtual*/ void draw(const LLColor4& color, const LLColor4& highlight_color) const;
+ /*virtual*/ S32 getContentWidth() const;
+ /*virtual*/ S32 getHeight() const;
+ /*virtual*/ void setValue(const LLSD& value);
+ /*virtual*/ const LLSD getValue() const;
+ /*virtual*/ BOOL getVisible() const;
+ /*virtual*/ void highlightText(S32 offset, S32 num_chars);
+
+ /*virtual*/ void setColor(const LLColor4&);
+ /*virtual*/ BOOL isText() const;
+
+ void setText(const LLStringExplicit& text);
+ void setFontStyle(const U8 font_style) { mFontStyle = font_style; }
+
+private:
+ LLUIString mText;
+ const LLFontGL* mFont;
+ LLColor4 mColor;
+ U8 mUseColor;
+ U8 mFontStyle;
+ LLFontGL::HAlign mFontAlignment;
+ BOOL mVisible;
+ S32 mHighlightCount;
+ S32 mHighlightOffset;
+
+ LLPointer<LLUIImage> mRoundedRectImage;
+
+ static U32 sCount;
+};
+
+/*
+ * Cell displaying an image.
+ */
+class LLScrollListIcon : public LLScrollListCell
+{
+public:
+ LLScrollListIcon(const LLScrollListCell::Params& p);
+ /*virtual*/ ~LLScrollListIcon();
+ /*virtual*/ void draw(const LLColor4& color, const LLColor4& highlight_color) const;
+ /*virtual*/ S32 getWidth() const;
+ /*virtual*/ S32 getHeight() const;
+ /*virtual*/ const LLSD getValue() const;
+ /*virtual*/ void setColor(const LLColor4&);
+ /*virtual*/ BOOL isText()const { return FALSE; }
+ /*virtual*/ void setValue(const LLSD& value);
+
+private:
+ LLPointer<LLUIImage> mIcon;
+ LLColor4 mColor;
+ LLFontGL::HAlign mAlignment;
+};
+
+/*
+ * An interactive cell containing a check box.
+ */
+class LLScrollListCheck : public LLScrollListCell
+{
+public:
+ LLScrollListCheck( const LLScrollListCell::Params&);
+ /*virtual*/ ~LLScrollListCheck();
+ /*virtual*/ void draw(const LLColor4& color, const LLColor4& highlight_color) const;
+ /*virtual*/ S32 getHeight() const { return 0; }
+ /*virtual*/ const LLSD getValue() const;
+ /*virtual*/ void setValue(const LLSD& value);
+ /*virtual*/ void onCommit();
+
+ /*virtual*/ BOOL handleClick();
+ /*virtual*/ void setEnabled(BOOL enable);
+
+ LLCheckBoxCtrl* getCheckBox() { return mCheckBox; }
+ /*virtual*/ BOOL isText() const { return FALSE; }
+
+private:
+ LLCheckBoxCtrl* mCheckBox;
+};
+
+class LLScrollListDate : public LLScrollListText
+{
+public:
+ LLScrollListDate( const LLScrollListCell::Params& p );
+ virtual void setValue(const LLSD& value);
+ virtual const LLSD getValue() const;
+
+private:
+ LLDate mDate;
+};
+
+#endif
diff --git a/indra/llui/llscrolllistcolumn.cpp b/indra/llui/llscrolllistcolumn.cpp
new file mode 100644
index 0000000000..48fddbfb71
--- /dev/null
+++ b/indra/llui/llscrolllistcolumn.cpp
@@ -0,0 +1,320 @@
+/**
+ * @file llscrollcolumnheader.cpp
+ * @brief Scroll lists are composed of rows (items), each of which
+ * contains columns (cells).
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llscrolllistcolumn.h"
+
+#include "llbutton.h"
+#include "llresizebar.h"
+#include "llscrolllistcell.h"
+#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "lluictrlfactory.h"
+
+const S32 MIN_COLUMN_WIDTH = 20;
+
+//---------------------------------------------------------------------------
+// LLScrollColumnHeader
+//---------------------------------------------------------------------------
+
+LLScrollColumnHeader::LLScrollColumnHeader(const LLScrollColumnHeader::Params& p)
+: LLButton(p), // use combobox params to steal images
+ mColumn(p.column),
+ mHasResizableElement(FALSE)
+{
+ setClickedCallback(boost::bind(&LLScrollColumnHeader::onClick, this, _2));
+
+ // resize handles on left and right
+ const S32 RESIZE_BAR_THICKNESS = 3;
+ LLResizeBar::Params resize_bar_p;
+ resize_bar_p.resizing_view(this);
+ resize_bar_p.rect(LLRect(getRect().getWidth() - RESIZE_BAR_THICKNESS, getRect().getHeight(), getRect().getWidth(), 0));
+ resize_bar_p.min_size(MIN_COLUMN_WIDTH);
+ resize_bar_p.side(LLResizeBar::RIGHT);
+ resize_bar_p.enabled(false);
+ mResizeBar = LLUICtrlFactory::create<LLResizeBar>(resize_bar_p);
+ addChild(mResizeBar);
+
+ setToolTip(p.label());
+}
+
+LLScrollColumnHeader::~LLScrollColumnHeader()
+{}
+
+void LLScrollColumnHeader::draw()
+{
+ std::string sort_column = mColumn->mParentCtrl->getSortColumnName();
+ BOOL draw_arrow = !mColumn->mLabel.empty()
+ && mColumn->mParentCtrl->isSorted()
+ // check for indirect sorting column as well as column's sorting name
+ && (sort_column == mColumn->mSortingColumn || sort_column == mColumn->mName);
+
+ BOOL is_ascending = mColumn->mParentCtrl->getSortAscending();
+ setImageOverlay(is_ascending ? "up_arrow.tga" : "down_arrow.tga", LLFontGL::RIGHT, draw_arrow ? LLColor4::white : LLColor4::transparent);
+
+ // Draw children
+ LLButton::draw();
+}
+
+BOOL LLScrollColumnHeader::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+ if (canResize() && mResizeBar->getRect().pointInRect(x, y))
+ {
+ // reshape column to max content width
+ LLRect column_rect = getRect();
+ column_rect.mRight = column_rect.mLeft + mColumn->mMaxContentWidth;
+ setShape(column_rect, true);
+ }
+ else
+ {
+ onClick(LLSD());
+ }
+ return TRUE;
+}
+
+void LLScrollColumnHeader::onClick(const LLSD& data)
+{
+ if (mColumn)
+ {
+ LLScrollListCtrl::onClickColumn(mColumn);
+ }
+}
+
+LLView* LLScrollColumnHeader::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding)
+{
+ // this logic assumes dragging on right
+ llassert(snap_edge == SNAP_RIGHT);
+
+ // use higher snap threshold for column headers
+ threshold = llmin(threshold, 10);
+
+ LLRect snap_rect = getSnapRect();
+
+ S32 snap_delta = mColumn->mMaxContentWidth - snap_rect.getWidth();
+
+ // x coord growing means column growing, so same signs mean we're going in right direction
+ if (llabs(snap_delta) <= threshold && mouse_dir.mX * snap_delta > 0 )
+ {
+ new_edge_val = snap_rect.mRight + snap_delta;
+ }
+ else
+ {
+ LLScrollListColumn* next_column = mColumn->mParentCtrl->getColumn(mColumn->mIndex + 1);
+ while (next_column)
+ {
+ if (next_column->mHeader)
+ {
+ snap_delta = (next_column->mHeader->getSnapRect().mRight - next_column->mMaxContentWidth) - snap_rect.mRight;
+ if (llabs(snap_delta) <= threshold && mouse_dir.mX * snap_delta > 0 )
+ {
+ new_edge_val = snap_rect.mRight + snap_delta;
+ }
+ break;
+ }
+ next_column = mColumn->mParentCtrl->getColumn(next_column->mIndex + 1);
+ }
+ }
+
+ return this;
+}
+
+void LLScrollColumnHeader::handleReshape(const LLRect& new_rect, bool by_user)
+{
+ S32 new_width = new_rect.getWidth();
+ S32 delta_width = new_width - (getRect().getWidth() /*+ mColumn->mParentCtrl->getColumnPadding()*/);
+
+ if (delta_width != 0)
+ {
+ S32 remaining_width = -delta_width;
+ S32 col;
+ for (col = mColumn->mIndex + 1; col < mColumn->mParentCtrl->getNumColumns(); col++)
+ {
+ LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
+ if (!columnp) continue;
+
+ if (columnp->mHeader && columnp->mHeader->canResize())
+ {
+ // how many pixels in width can this column afford to give up?
+ S32 resize_buffer_amt = llmax(0, columnp->getWidth() - MIN_COLUMN_WIDTH);
+
+ // user shrinking column, need to add width to other columns
+ if (delta_width < 0)
+ {
+ if (columnp->getWidth() > 0)
+ {
+ // statically sized column, give all remaining width to this column
+ columnp->setWidth(columnp->getWidth() + remaining_width);
+ if (columnp->mRelWidth > 0.f)
+ {
+ columnp->mRelWidth = (F32)columnp->getWidth() / (F32)mColumn->mParentCtrl->getItemListRect().getWidth();
+ }
+ // all padding went to this widget, we're done
+ break;
+ }
+ }
+ else
+ {
+ // user growing column, need to take width from other columns
+ remaining_width += resize_buffer_amt;
+
+ if (columnp->getWidth() > 0)
+ {
+ columnp->setWidth(columnp->getWidth() - llmin(columnp->getWidth() - MIN_COLUMN_WIDTH, delta_width));
+ if (columnp->mRelWidth > 0.f)
+ {
+ columnp->mRelWidth = (F32)columnp->getWidth() / (F32)mColumn->mParentCtrl->getItemListRect().getWidth();
+ }
+ }
+
+ if (remaining_width >= 0)
+ {
+ // width sucked up from neighboring columns, done
+ break;
+ }
+ }
+ }
+ }
+
+ // clamp resize amount to maximum that can be absorbed by other columns
+ if (delta_width > 0)
+ {
+ delta_width += llmin(remaining_width, 0);
+ }
+
+ // propagate constrained delta_width to new width for this column
+ new_width = getRect().getWidth() + delta_width - mColumn->mParentCtrl->getColumnPadding();
+
+ // use requested width
+ mColumn->setWidth(new_width);
+
+ // update proportional spacing
+ if (mColumn->mRelWidth > 0.f)
+ {
+ mColumn->mRelWidth = (F32)new_width / (F32)mColumn->mParentCtrl->getItemListRect().getWidth();
+ }
+
+ // tell scroll list to layout columns again
+ // do immediate update to get proper feedback to resize handle
+ // which needs to know how far the resize actually went
+ mColumn->mParentCtrl->updateColumns();
+ }
+}
+
+void LLScrollColumnHeader::setHasResizableElement(BOOL resizable)
+{
+ if (mHasResizableElement != resizable)
+ {
+ mColumn->mParentCtrl->dirtyColumns();
+ mHasResizableElement = resizable;
+ }
+}
+
+void LLScrollColumnHeader::updateResizeBars()
+{
+ S32 num_resizable_columns = 0;
+ S32 col;
+ for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
+ {
+ LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
+ if (columnp->mHeader && columnp->mHeader->canResize())
+ {
+ num_resizable_columns++;
+ }
+ }
+
+ S32 num_resizers_enabled = 0;
+
+ // now enable/disable resize handles on resizable columns if we have at least two
+ for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
+ {
+ LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
+ if (!columnp->mHeader) continue;
+ BOOL enable = num_resizable_columns >= 2 && num_resizers_enabled < (num_resizable_columns - 1) && columnp->mHeader->canResize();
+ columnp->mHeader->enableResizeBar(enable);
+ if (enable)
+ {
+ num_resizers_enabled++;
+ }
+ }
+}
+
+void LLScrollColumnHeader::enableResizeBar(BOOL enable)
+{
+ mResizeBar->setEnabled(enable);
+}
+
+BOOL LLScrollColumnHeader::canResize()
+{
+ return getVisible() && (mHasResizableElement || mColumn->mDynamicWidth);
+}
+
+void LLScrollListColumn::SortNames::declareValues()
+{
+ declare("ascending", LLScrollListColumn::ASCENDING);
+ declare("descending", LLScrollListColumn::DESCENDING);
+}
+
+LLScrollListColumn::LLScrollListColumn(const Params& p, LLScrollListCtrl* parent)
+: mWidth(0),
+ mIndex (-1),
+ mParentCtrl(parent),
+ mName(p.name),
+ mLabel(p.header.label),
+ mHeader(NULL),
+ mMaxContentWidth(0),
+ mDynamicWidth(p.width.dynamic_width),
+ mRelWidth(p.width.relative_width),
+ mFontAlignment(p.halign),
+ mSortingColumn(p.sort_column)
+{
+ if (p.sort_ascending.isProvided())
+ {
+ mSortDirection = p.sort_ascending() ? ASCENDING : DESCENDING;
+ }
+ else
+ {
+ mSortDirection = p.sort_direction;
+ }
+
+ setWidth(p.width.pixel_width);
+}
+
+void LLScrollListColumn::setWidth(S32 width)
+{
+ if (!mDynamicWidth && mRelWidth <= 0.f)
+ {
+ mParentCtrl->updateStaticColumnWidth(this, width);
+ }
+ mWidth = width;
+}
diff --git a/indra/llui/llscrolllistcolumn.h b/indra/llui/llscrolllistcolumn.h
new file mode 100644
index 0000000000..c1bb86577f
--- /dev/null
+++ b/indra/llui/llscrolllistcolumn.h
@@ -0,0 +1,189 @@
+/**
+ * @file llscrollcolumnheader.h
+ * @brief Scroll lists are composed of rows (items), each of which
+ * contains columns (cells).
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LLSCROLLLISTCOLUMN_H
+#define LLSCROLLLISTCOLUMN_H
+
+#include "llrect.h"
+#include "lluistring.h"
+#include "llbutton.h"
+#include "llinitparam.h"
+
+class LLScrollListColumn;
+class LLResizeBar;
+class LLScrollListCtrl;
+
+class LLScrollColumnHeader : public LLButton
+{
+public:
+ struct Params : public LLInitParam::Block<Params, LLButton::Params>
+ {
+ Mandatory<LLScrollListColumn*> column;
+
+ Params()
+ : column("column")
+ {
+ name = "column_header";
+ image_unselected.name("square_btn_32x128.tga");
+ image_selected.name("square_btn_selected_32x128.tga");
+ image_disabled.name("square_btn_32x128.tga");
+ image_disabled_selected.name("square_btn_selected_32x128.tga");
+ image_overlay.name("combobox_arrow.tga");
+ image_overlay_alignment("right");
+ font_halign = LLFontGL::LEFT;
+ tab_stop(false);
+ scale_image(true);
+ }
+ };
+ LLScrollColumnHeader(const Params&);
+ ~LLScrollColumnHeader();
+
+ /*virtual*/ void draw();
+ /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+
+ /*virtual*/ LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding);
+ /*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false);
+
+ LLScrollListColumn* getColumn() { return mColumn; }
+ void setHasResizableElement(BOOL resizable);
+ void updateResizeBars();
+ BOOL canResize();
+ void enableResizeBar(BOOL enable);
+
+ void onClick(const LLSD& data);
+
+private:
+ LLScrollListColumn* mColumn;
+ LLResizeBar* mResizeBar;
+ BOOL mHasResizableElement;
+};
+
+/*
+ * A simple data class describing a column within a scroll list.
+ */
+class LLScrollListColumn
+{
+public:
+ typedef enum e_sort_direction
+ {
+ DESCENDING,
+ ASCENDING
+ } ESortDirection;
+
+ struct SortNames
+ : public LLInitParam::TypeValuesHelper<LLScrollListColumn::ESortDirection, SortNames>
+ {
+ static void declareValues();
+ };
+
+ struct Params : public LLInitParam::Block<Params>
+ {
+ Optional<std::string> name,
+ tool_tip;
+ Optional<std::string> sort_column;
+ Optional<ESortDirection, SortNames> sort_direction;
+ Optional<bool> sort_ascending;
+
+ struct Width : public LLInitParam::Choice<Width>
+ {
+ Option<bool> dynamic_width;
+ Option<S32> pixel_width;
+ Option<F32> relative_width;
+
+ Width()
+ : dynamic_width("dynamicwidth", false),
+ pixel_width("width"),
+ relative_width("relative_width", -1.f)
+ {
+ addSynonym(relative_width, "relwidth");
+ }
+ };
+ Optional<Width> width;
+
+ // either an image or label is used in column header
+ struct Header : public LLInitParam::Choice<Header>
+ {
+ Option<std::string> label;
+ Option<LLUIImage*> image;
+
+ Header()
+ : label("label"),
+ image("image")
+ {}
+ };
+ Optional<Header> header;
+
+ Optional<LLFontGL::HAlign> halign;
+
+ Params()
+ : name("name"),
+ tool_tip("tool_tip"),
+ sort_column("sort_column"),
+ sort_direction("sort_direction"),
+ sort_ascending("sort_ascending", true),
+ halign("halign", LLFontGL::LEFT)
+ {
+ // default choice to "dynamic_width"
+ width.dynamic_width = true;
+
+ addSynonym(sort_column, "sort");
+ }
+ };
+
+ //NOTE: this is default constructible so we can store it in a map.
+ LLScrollListColumn(const Params& p = Params(), LLScrollListCtrl* = NULL);
+
+ void setWidth(S32 width);
+ S32 getWidth() const { return mWidth; }
+
+public:
+ // Public data is fine so long as this remains a simple struct-like data class.
+ // If it ever gets any smarter than that, these should all become private
+ // with protected or public accessor methods added as needed. -MG
+ std::string mName;
+ std::string mSortingColumn;
+ ESortDirection mSortDirection;
+ LLUIString mLabel;
+ F32 mRelWidth;
+ BOOL mDynamicWidth;
+ S32 mMaxContentWidth;
+ S32 mIndex;
+ LLScrollListCtrl* mParentCtrl;
+ LLScrollColumnHeader* mHeader;
+ LLFontGL::HAlign mFontAlignment;
+
+private:
+ S32 mWidth;
+};
+
+#endif
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 5dd4e2d0ee..6f484b1875 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1,6 +1,7 @@
/**
* @file llscrolllistctrl.cpp
- * @brief LLScrollListCtrl base class
+ * @brief Scroll lists are composed of rows (items), each of which
+ * contains columns (cells).
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
@@ -30,32 +31,36 @@
* $/LicenseInfo$
*/
-#include <algorithm>
+#define INSTANTIATE_GETCHILD_SCROLLLIST
#include "linden_common.h"
-#include "llstl.h"
-#include "llboost.h"
#include "llscrolllistctrl.h"
-#include "indra_constants.h"
+#include <algorithm>
+
+#include "llstl.h"
+#include "llboost.h"
+//#include "indra_constants.h"
#include "llcheckboxctrl.h"
#include "llclipboard.h"
#include "llfocusmgr.h"
-#include "llrender.h"
+//#include "llrender.h"
#include "llresmgr.h"
#include "llscrollbar.h"
+#include "llscrolllistcell.h"
#include "llstring.h"
#include "llui.h"
#include "lluictrlfactory.h"
#include "llwindow.h"
#include "llcontrol.h"
#include "llkeyboard.h"
-#include "llresizebar.h"
+#include "llviewborder.h"
+#include "lltextbox.h"
+#include "llsdparam.h"
-const S32 MIN_COLUMN_WIDTH = 20;
-const S32 LIST_SNAP_PADDING = 5;
+template LLScrollListCtrl* LLView::getChild<LLScrollListCtrl>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
static LLRegisterWidget<LLScrollListCtrl> r("scroll_list");
@@ -96,510 +101,89 @@ struct SortScrollListItem
const sort_order_t& mSortOrders;
};
-
-//
-// LLScrollListIcon
-//
-LLScrollListIcon::LLScrollListIcon(LLUIImagePtr icon, S32 width)
- : LLScrollListCell(width),
- mIcon(icon),
- mColor(LLColor4::white)
-{
-}
-
-LLScrollListIcon::LLScrollListIcon(const LLSD& value, S32 width)
- : LLScrollListCell(width),
- mColor(LLColor4::white)
-{
- setValue(value);
-}
-
-
-LLScrollListIcon::~LLScrollListIcon()
-{
-}
-
-void LLScrollListIcon::setValue(const LLSD& value)
-{
- if (value.isUUID())
- {
- // don't use default image specified by LLUUID::null, use no image in that case
- LLUUID image_id = value.asUUID();
- mIcon = image_id.notNull() ? LLUI::sImageProvider->getUIImageByID(image_id) : LLUIImagePtr(NULL);
- }
- else
- {
- std::string value_string = value.asString();
- if (LLUUID::validate(value_string))
- {
- setValue(LLUUID(value_string));
- }
- else if (!value_string.empty())
- {
- mIcon = LLUI::getUIImage(value.asString());
- }
- else
- {
- mIcon = NULL;
- }
- }
-}
-
-
-void LLScrollListIcon::setColor(const LLColor4& color)
-{
- mColor = color;
-}
-
-S32 LLScrollListIcon::getWidth() const
-{
- // if no specified fix width, use width of icon
- if (LLScrollListCell::getWidth() == 0 && mIcon.notNull())
- {
- return mIcon->getWidth();
- }
- return LLScrollListCell::getWidth();
-}
-
-
-void LLScrollListIcon::draw(const LLColor4& color, const LLColor4& highlight_color) const
-{
- if (mIcon)
- {
- mIcon->draw(0, 0, mColor);
- }
-}
-
-//
-// LLScrollListCheck
-//
-LLScrollListCheck::LLScrollListCheck(LLCheckBoxCtrl* check_box, S32 width)
-{
- mCheckBox = check_box;
- LLRect rect(mCheckBox->getRect());
- if (width)
- {
-
- rect.mRight = rect.mLeft + width;
- mCheckBox->setRect(rect);
- setWidth(width);
- }
- else
- {
- setWidth(rect.getWidth()); //check_box->getWidth();
- }
-}
-
-LLScrollListCheck::~LLScrollListCheck()
-{
- delete mCheckBox;
-}
-
-void LLScrollListCheck::draw(const LLColor4& color, const LLColor4& highlight_color) const
-{
- mCheckBox->draw();
-}
-
-BOOL LLScrollListCheck::handleClick()
-{
- if (mCheckBox->getEnabled())
- {
- mCheckBox->toggle();
- }
- // don't change selection when clicking on embedded checkbox
- return TRUE;
-}
-
-//
-// LLScrollListSeparator
-//
-LLScrollListSeparator::LLScrollListSeparator(S32 width) : LLScrollListCell(width)
-{
-}
-
-//virtual
-S32 LLScrollListSeparator::getHeight() const
-{
- return 5;
-}
-
-
-void LLScrollListSeparator::draw(const LLColor4& color, const LLColor4& highlight_color) const
-{
- //*FIXME: use dynamic item heights and make separators narrow, and inactive
- gl_line_2d(5, 8, llmax(5, getWidth() - 5), 8, color);
-}
-
-//
-// LLScrollListText
-//
-U32 LLScrollListText::sCount = 0;
-
-LLScrollListText::LLScrollListText( const std::string& text, const LLFontGL* font, S32 width, U8 font_style, LLFontGL::HAlign font_alignment, LLColor4& color, BOOL use_color, BOOL visible)
-: LLScrollListCell(width),
- mText( text ),
- mFont( font ),
- mColor(color),
- mUseColor(use_color),
- mFontStyle( font_style ),
- mFontAlignment( font_alignment ),
- mVisible( visible ),
- mHighlightCount( 0 ),
- mHighlightOffset( 0 )
-{
- sCount++;
-
- // initialize rounded rect image
- if (!mRoundedRectImage)
- {
- mRoundedRectImage = LLUI::sImageProvider->getUIImage("rounded_square.tga");
- }
-}
-//virtual
-void LLScrollListText::highlightText(S32 offset, S32 num_chars)
-{
- mHighlightOffset = offset;
- mHighlightCount = num_chars;
-}
-
-//virtual
-BOOL LLScrollListText::isText() const
-{
- return TRUE;
-}
-
-//virtual
-BOOL LLScrollListText::getVisible() const
-{
- return mVisible;
-}
-
-//virtual
-S32 LLScrollListText::getHeight() const
-{
- return llround(mFont->getLineHeight());
-}
-
-
-LLScrollListText::~LLScrollListText()
-{
- sCount--;
-}
-
-S32 LLScrollListText::getContentWidth() const
-{
- return mFont->getWidth(mText.getString());
-}
-
-
-void LLScrollListText::setColor(const LLColor4& color)
-{
- mColor = color;
- mUseColor = TRUE;
-}
-
-void LLScrollListText::setText(const LLStringExplicit& text)
-{
- mText = text;
-}
-
-//virtual
-void LLScrollListText::setValue(const LLSD& text)
-{
- setText(text.asString());
-}
-
-//virtual
-const LLSD LLScrollListText::getValue() const
-{
- return LLSD(mText.getString());
-}
-
-
-void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_color) const
-{
- LLColor4 display_color;
- if (mUseColor)
- {
- display_color = mColor;
- }
- else
- {
- display_color = color;
- }
-
- if (mHighlightCount > 0)
- {
- S32 left = 0;
- switch(mFontAlignment)
- {
- case LLFontGL::LEFT:
- left = mFont->getWidth(mText.getString(), 0, mHighlightOffset);
- break;
- case LLFontGL::RIGHT:
- left = getWidth() - mFont->getWidth(mText.getString(), mHighlightOffset, S32_MAX);
- break;
- case LLFontGL::HCENTER:
- left = (getWidth() - mFont->getWidth(mText.getString())) / 2;
- break;
- }
- LLRect highlight_rect(left - 2,
- llround(mFont->getLineHeight()) + 1,
- left + mFont->getWidth(mText.getString(), mHighlightOffset, mHighlightCount) + 1,
- 1);
- mRoundedRectImage->draw(highlight_rect, highlight_color);
- }
-
- // Try to draw the entire string
- F32 right_x;
- U32 string_chars = mText.length();
- F32 start_x = 0.f;
- switch(mFontAlignment)
- {
- case LLFontGL::LEFT:
- start_x = 0.f;
- break;
- case LLFontGL::RIGHT:
- start_x = (F32)getWidth();
- break;
- case LLFontGL::HCENTER:
- start_x = (F32)getWidth() * 0.5f;
- break;
- }
- mFont->render(mText.getWString(), 0,
- start_x, 2.f,
- display_color,
- mFontAlignment,
- LLFontGL::BOTTOM,
- mFontStyle,
- string_chars,
- getWidth(),
- &right_x,
- FALSE,
- TRUE);
-}
-
-LLScrollListDate::LLScrollListDate( const LLDate& date, const LLFontGL* font, S32 width, U8 font_style, LLFontGL::HAlign font_alignment, LLColor4& color, BOOL use_color, BOOL visible)
-: LLScrollListText(date.asRFC1123(), font, width, font_style, font_alignment, color, use_color, visible),
- mDate(date)
-{
-}
-
-void LLScrollListDate::setValue(const LLSD& value)
-{
- mDate = value.asDate();
- LLScrollListText::setValue(mDate.asRFC1123());
-}
-
-const LLSD LLScrollListDate::getValue() const
-{
- return mDate;
-}
-
-LLScrollListItem::~LLScrollListItem()
-{
- std::for_each(mColumns.begin(), mColumns.end(), DeletePointer());
-}
-
-void LLScrollListItem::setNumColumns(S32 columns)
-{
- S32 prev_columns = mColumns.size();
- if (columns < prev_columns)
- {
- std::for_each(mColumns.begin()+columns, mColumns.end(), DeletePointer());
- }
-
- mColumns.resize(columns);
-
- for (S32 col = prev_columns; col < columns; ++col)
- {
- mColumns[col] = NULL;
- }
-}
-
-void LLScrollListItem::setColumn( S32 column, LLScrollListCell *cell )
-{
- if (column < (S32)mColumns.size())
- {
- delete mColumns[column];
- mColumns[column] = cell;
- }
- else
- {
- llerrs << "LLScrollListItem::setColumn: bad column: " << column << llendl;
- }
-}
-
-std::string LLScrollListItem::getContentsCSV() const
-{
- std::string ret;
-
- S32 count = getNumColumns();
- for (S32 i=0; i<count; ++i)
- {
- ret += getColumn(i)->getValue().asString();
- if (i < count-1)
- {
- ret += ", ";
- }
- }
-
- return ret;
-}
-
-void LLScrollListItem::draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding)
-{
- // draw background rect
- LLRect bg_rect = rect;
- {
- gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
- gGL.color4fv(bg_color.mV);
- gl_rect_2d( bg_rect );
- }
-
- S32 cur_x = rect.mLeft;
- S32 num_cols = getNumColumns();
- S32 cur_col = 0;
-
- for (LLScrollListCell* cell = getColumn(0); cur_col < num_cols; cell = getColumn(++cur_col))
- {
- // Two ways a cell could be hidden
- if (cell->getWidth() < 0
- || !cell->getVisible()) continue;
-
- LLUI::pushMatrix();
- {
- LLUI::translate((F32) cur_x, (F32) rect.mBottom, 0.0f);
-
- cell->draw( fg_color, highlight_color );
- }
- LLUI::popMatrix();
-
- cur_x += cell->getWidth() + column_padding;
- }
-}
-
-
-void LLScrollListItem::setEnabled(BOOL b)
-{
- mEnabled = b;
-}
-
-//---------------------------------------------------------------------------
-// LLScrollListItemComment
-//---------------------------------------------------------------------------
-LLScrollListItemComment::LLScrollListItemComment(const std::string& comment_string, const LLColor4& color)
-: LLScrollListItem(FALSE),
- mColor(color)
-{
- addColumn( comment_string, LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ) );
-}
-
-void LLScrollListItemComment::draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding)
-{
- LLScrollListCell* cell = getColumn(0);
- if (cell)
- {
- // Two ways a cell could be hidden
- if (cell->getWidth() < 0
- || !cell->getVisible()) return;
-
- LLUI::pushMatrix();
- {
- LLUI::translate((F32)rect.mLeft, (F32)rect.mBottom, 0.0f);
-
- // force first cell to be width of entire item
- cell->setWidth(rect.getWidth());
- cell->draw( mColor, highlight_color );
- }
- LLUI::popMatrix();
- }
-}
-
-//---------------------------------------------------------------------------
-// LLScrollListItemSeparator
-//---------------------------------------------------------------------------
-LLScrollListItemSeparator::LLScrollListItemSeparator()
-: LLScrollListItem(FALSE)
-{
- LLScrollListSeparator* cell = new LLScrollListSeparator(0);
- setNumColumns(1);
- setColumn(0, cell);
-}
-
-void LLScrollListItemSeparator::draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding)
-{
- //TODO* move LLScrollListSeparator::draw into here and get rid of it
- LLScrollListCell* cell = getColumn(0);
- if (cell)
- {
- // Two ways a cell could be hidden
- if (cell->getWidth() < 0
- || !cell->getVisible()) return;
-
- LLUI::pushMatrix();
- {
- LLUI::translate((F32)rect.mLeft, (F32)rect.mBottom, 0.0f);
-
- // force first cell to be width of entire item
- cell->setWidth(rect.getWidth());
- cell->draw( fg_color, highlight_color );
- }
- LLUI::popMatrix();
- }
-}
-
//---------------------------------------------------------------------------
// LLScrollListCtrl
//---------------------------------------------------------------------------
-LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
- void (*commit_callback)(LLUICtrl* ctrl, void* userdata),
- void* callback_user_data,
- BOOL allow_multiple_selection,
- BOOL show_border
- )
- : LLUICtrl(name, rect, TRUE, commit_callback, callback_user_data),
+LLScrollListCtrl::Contents::Contents()
+: columns("columns"),
+ rows("rows")
+{
+ addSynonym(columns, "column");
+ addSynonym(rows, "row");
+}
+
+LLScrollListCtrl::Params::Params()
+: multi_select("multi_select", false),
+ has_border("draw_border"),
+ draw_heading("draw_heading"),
+ search_column("search_column", 0),
+ sort_column("sort_column", -1),
+ sort_ascending("sort_ascending", true),
+ commit_on_keyboard_movement("commit_on_keyboard_movement", true),
+ heading_height("heading_height"),
+ background_visible("background_visible"),
+ draw_stripes("draw_stripes"),
+ column_padding("column_padding"),
+ fg_unselected_color("fg_unselected_color"),
+ fg_selected_color("fg_selected_color"),
+ bg_selected_color("bg_selected_color"),
+ fg_disable_color("fg_disable_color"),
+ bg_writeable_color("bg_writeable_color"),
+ bg_read_only_color("bg_read_only_color"),
+ bg_stripe_color("bg_stripe_color"),
+ hovered_color("hovered_color"),
+ highlighted_color("highlighted_color")
+{
+ name = "scroll_list";
+ mouse_opaque = true;
+}
+
+LLScrollListCtrl::LLScrollListCtrl(const LLScrollListCtrl::Params& p)
+: LLUICtrl(p),
mLineHeight(0),
mScrollLines(0),
mPageLines(0),
- mHeadingHeight(20),
mMaxSelectable(0),
- mAllowMultipleSelection( allow_multiple_selection ),
mAllowKeyboardMovement(TRUE),
- mCommitOnKeyboardMovement(TRUE),
+ mCommitOnKeyboardMovement(p.commit_on_keyboard_movement),
mCommitOnSelectionChange(FALSE),
mSelectionChanged(FALSE),
mNeedsScroll(FALSE),
mCanSelect(TRUE),
- mDisplayColumnHeaders(FALSE),
mColumnsDirty(FALSE),
mMaxItemCount(INT_MAX),
mMaxContentWidth(0),
- mBackgroundVisible( TRUE ),
- mDrawStripes(TRUE),
- mBgWriteableColor( LLUI::sColorsGroup->getColor( "ScrollBgWriteableColor" ) ),
- mBgReadOnlyColor( LLUI::sColorsGroup->getColor( "ScrollBgReadOnlyColor" ) ),
- mBgSelectedColor( LLUI::sColorsGroup->getColor("ScrollSelectedBGColor") ),
- mBgStripeColor( LLUI::sColorsGroup->getColor("ScrollBGStripeColor") ),
- mFgSelectedColor( LLUI::sColorsGroup->getColor("ScrollSelectedFGColor") ),
- mFgUnselectedColor( LLUI::sColorsGroup->getColor("ScrollUnselectedColor") ),
- mFgDisabledColor( LLUI::sColorsGroup->getColor("ScrollDisabledColor") ),
- mHighlightedColor( LLUI::sColorsGroup->getColor("ScrollHighlightedColor") ),
mBorderThickness( 2 ),
mOnDoubleClickCallback( NULL ),
mOnMaximumSelectCallback( NULL ),
mOnSortChangedCallback( NULL ),
mHighlightedItem(-1),
mBorder(NULL),
- mSearchColumn(0),
mNumDynamicWidthColumns(0),
mTotalStaticColumnWidth(0),
mTotalColumnPadding(0),
- mSorted(TRUE),
+ mSorted(FALSE),
mDirty(FALSE),
mOriginalSelection(-1),
- mDrewSelected(FALSE)
+ mDrewSelected(FALSE),
+ mLastSelected(NULL),
+ mHeadingHeight(p.heading_height),
+ mAllowMultipleSelection(p.multi_select),
+ mDisplayColumnHeaders(p.draw_heading),
+ mBackgroundVisible(p.background_visible),
+ mDrawStripes(p.draw_stripes),
+ mBgWriteableColor(p.bg_writeable_color()),
+ mBgReadOnlyColor(p.bg_read_only_color()),
+ mBgSelectedColor(p.bg_selected_color()),
+ mBgStripeColor(p.bg_stripe_color()),
+ mFgSelectedColor(p.fg_selected_color()),
+ mFgUnselectedColor(p.fg_unselected_color()),
+ mFgDisabledColor(p.fg_disable_color()),
+ mHighlightedColor(p.highlighted_color()),
+ mHoveredColor(p.hovered_color()),
+ mSearchColumn(p.search_column),
+ mColumnPadding(p.column_padding)
{
mItemListRect.setOriginAndSize(
mBorderThickness,
@@ -612,37 +196,73 @@ LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
mPageLines = mLineHeight? (mItemListRect.getHeight()) / mLineHeight : 0;
// Init the scrollbar
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+
LLRect scroll_rect;
scroll_rect.setOriginAndSize(
- getRect().getWidth() - mBorderThickness - SCROLLBAR_SIZE,
+ getRect().getWidth() - mBorderThickness - scrollbar_size,
mItemListRect.mBottom,
- SCROLLBAR_SIZE,
+ scrollbar_size,
mItemListRect.getHeight());
- mScrollbar = new LLScrollbar( std::string("Scrollbar"), scroll_rect,
- LLScrollbar::VERTICAL,
- getItemCount(),
- mScrollLines,
- mPageLines,
- &LLScrollListCtrl::onScrollChange, this );
- mScrollbar->setFollowsRight();
- mScrollbar->setFollowsTop();
- mScrollbar->setFollowsBottom();
- mScrollbar->setEnabled( TRUE );
- // scrollbar is visible only when needed
- mScrollbar->setVisible(FALSE);
+
+ LLScrollbar::Params sbparams;
+ sbparams.name("Scrollbar");
+ sbparams.rect(scroll_rect);
+ sbparams.orientation(LLScrollbar::VERTICAL);
+ sbparams.doc_size(getItemCount());
+ sbparams.doc_pos(mScrollLines);
+ sbparams.page_size(mPageLines);
+ sbparams.change_callback(boost::bind(&LLScrollListCtrl::onScrollChange, this, _1, _2));
+ sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
+ sbparams.visible(false);
+ mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
addChild(mScrollbar);
// Border
- if (show_border)
- {
- LLRect border_rect( 0, getRect().getHeight(), getRect().getWidth(), 0 );
- mBorder = new LLViewBorder( std::string("dlg border"), border_rect, LLViewBorder::BEVEL_IN, LLViewBorder::STYLE_LINE, 1 );
+ if (p.has_border)
+ {
+ LLRect border_rect = getLocalRect();
+ LLViewBorder::Params params;
+ params.name("dig border");
+ params.rect(border_rect);
+ params.bevel_type(LLViewBorder::BEVEL_IN);
+ mBorder = LLUICtrlFactory::create<LLViewBorder> (params);
addChild(mBorder);
}
- mColumnPadding = 5;
+ // set border *after* rect is fully initialized
+ if (mBorder)
+ {
+ mBorder->setRect(getLocalRect());
+ mBorder->reshape(getRect().getWidth(), getRect().getHeight());
+ }
+
+ if (p.sort_column >= 0)
+ {
+ sortByColumnIndex(p.sort_column, p.sort_ascending);
+ }
- mLastSelected = NULL;
+
+ for (LLInitParam::ParamIterator<LLScrollListColumn::Params>::const_iterator row_it = p.contents.columns().begin();
+ row_it != p.contents.columns().end();
+ ++row_it)
+ {
+ addColumn(*row_it);
+ }
+
+ for (LLInitParam::ParamIterator<LLScrollListItem::Params>::const_iterator row_it = p.contents.rows().begin();
+ row_it != p.contents.rows().end();
+ ++row_it)
+ {
+ addRow(*row_it);
+ }
+
+ LLTextBox::Params text_p;
+ text_p.name("comment_text");
+ text_p.border_visible(false);
+ text_p.rect(mItemListRect);
+ text_p.follows.flags(FOLLOWS_ALL);
+ addChild(LLUICtrlFactory::create<LLTextBox>(text_p));
}
S32 LLScrollListCtrl::getSearchColumn()
@@ -666,6 +286,18 @@ S32 LLScrollListCtrl::getSearchColumn()
}
return llclamp(mSearchColumn, 0, getNumColumns());
}
+/*virtual*/
+bool LLScrollListCtrl::preProcessChildNode(LLXMLNodePtr child)
+{
+ if (child->hasName("column") || child->hasName("row"))
+ {
+ return true; // skip
+ }
+ else
+ {
+ return false;
+ }
+}
LLScrollListCtrl::~LLScrollListCtrl()
{
@@ -818,6 +450,7 @@ void LLScrollListCtrl::reshape( S32 width, S32 height, BOOL called_from_parent )
void LLScrollListCtrl::updateLayout()
{
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
// reserve room for column headers, if needed
S32 heading_size = (mDisplayColumnHeaders ? mHeadingHeight : 0);
mItemListRect.setOriginAndSize(
@@ -826,22 +459,19 @@ void LLScrollListCtrl::updateLayout()
getRect().getWidth() - 2 * mBorderThickness,
getRect().getHeight() - (2 * mBorderThickness ) - heading_size );
+ getChildView("comment_text")->setShape(mItemListRect);
+
// how many lines of content in a single "page"
mPageLines = mLineHeight? mItemListRect.getHeight() / mLineHeight : 0;
BOOL scrollbar_visible = getItemCount() > mPageLines;
if (scrollbar_visible)
{
// provide space on the right for scrollbar
- mItemListRect.mRight = getRect().getWidth() - mBorderThickness - SCROLLBAR_SIZE;
+ mItemListRect.mRight = getRect().getWidth() - mBorderThickness - scrollbar_size;
}
- // don't allow scrolling off bottom
- if (mScrollLines + mPageLines > getItemCount())
- {
- setScrollPos(llmax(0, getItemCount() - mPageLines));
- }
-
- mScrollbar->reshape(SCROLLBAR_SIZE, mItemListRect.getHeight() + (mDisplayColumnHeaders ? mHeadingHeight : 0));
+ mScrollbar->setOrigin(getRect().getWidth() - mBorderThickness - scrollbar_size, mItemListRect.mBottom);
+ mScrollbar->reshape(scrollbar_size, mItemListRect.getHeight() + (mDisplayColumnHeaders ? mHeadingHeight : 0));
mScrollbar->setPageSize( mPageLines );
mScrollbar->setDocSize( getItemCount() );
mScrollbar->setVisible(scrollbar_visible);
@@ -916,11 +546,11 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL r
// create new column on demand
if (mColumns.empty() && requires_column)
{
- LLSD new_column;
- new_column["name"] = "default_column";
- new_column["label"] = "";
- new_column["dynamicwidth"] = TRUE;
- addColumn(new_column);
+ LLScrollListColumn::Params col_params;
+ col_params.name = "default_column";
+ col_params.header.label = "";
+ col_params.width.dynamic_width = true;
+ addColumn(col_params);
}
updateLineHeightInsert(item);
@@ -1017,7 +647,7 @@ void LLScrollListCtrl::updateColumns()
// update column headers
std::vector<LLScrollListColumn*>::iterator column_ordered_it;
S32 left = mItemListRect.mLeft;
- LLColumnHeader* last_header = NULL;
+ LLScrollColumnHeader* last_header = NULL;
for (column_ordered_it = mColumnsIndexed.begin(); column_ordered_it != mColumnsIndexed.end(); ++column_ordered_it)
{
if ((*column_ordered_it)->getWidth() < 0)
@@ -1052,7 +682,7 @@ void LLScrollListCtrl::updateColumns()
}
// expand last column header we encountered to full list width
- if (last_header && last_header->canResize())
+ if (last_header)
{
S32 new_width = llmax(0, mItemListRect.mRight - last_header->getRect().mLeft);
last_header->reshape(new_width, last_header->getRect().getHeight());
@@ -1077,13 +707,6 @@ void LLScrollListCtrl::updateColumns()
}
-void LLScrollListCtrl::setDisplayHeading(BOOL display)
-{
- mDisplayColumnHeaders = display;
-
- updateLayout();
-}
-
void LLScrollListCtrl::setHeadingHeight(S32 heading_height)
{
mHeadingHeight = heading_height;
@@ -1275,7 +898,15 @@ void LLScrollListCtrl::deleteSelectedItems()
dirtyColumns();
}
-void LLScrollListCtrl::highlightNthItem(S32 target_index)
+void LLScrollListCtrl::clearHighlightedItems()
+{
+ for (item_list::iterator iter = mItemList.begin(); iter != mItemList.end(); ++iter)
+ {
+ (*iter)->setHighlighted(false);
+ }
+}
+
+void LLScrollListCtrl::mouseOverHighlightNthItem(S32 target_index)
{
if (mHighlightedItem != target_index)
{
@@ -1283,14 +914,14 @@ void LLScrollListCtrl::highlightNthItem(S32 target_index)
}
}
-S32 LLScrollListCtrl::selectMultiple( LLDynamicArray<LLUUID> ids )
+S32 LLScrollListCtrl::selectMultiple( std::vector<LLUUID> ids )
{
item_list::iterator iter;
S32 count = 0;
for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
{
LLScrollListItem* item = *iter;
- LLDynamicArray<LLUUID>::iterator iditr;
+ std::vector<LLUUID>::iterator iditr;
for(iditr = ids.begin(); iditr != ids.end(); ++iditr)
{
if (item->getEnabled() && (item->getUUID() == (*iditr)))
@@ -1446,35 +1077,51 @@ void LLScrollListCtrl::deselectAllItems(BOOL no_commit_on_change)
///////////////////////////////////////////////////////////////////////////////////////////////////
// Use this to add comment text such as "Searching", which ignores column settings of list
-LLScrollListItem* LLScrollListCtrl::addCommentText(const std::string& comment_text, EAddPosition pos)
+void LLScrollListCtrl::setCommentText(const std::string& comment_text)
{
- LLScrollListItem* item = NULL;
- if (getItemCount() < mMaxItemCount)
- {
- // always draw comment text with "enabled" color
- item = new LLScrollListItemComment( comment_text, mFgUnselectedColor );
- addItem( item, pos, FALSE );
- }
- return item;
+ getChild<LLTextBox>("comment_text")->setValue(comment_text);
}
LLScrollListItem* LLScrollListCtrl::addSeparator(EAddPosition pos)
{
- LLScrollListItem* item = new LLScrollListItemSeparator();
- addItem(item, pos, FALSE);
- return item;
+ LLScrollListItem::Params separator_params;
+ separator_params.enabled(false);
+ LLScrollListCell::Params cell_params;
+ cell_params.type = "icon";
+ cell_params.value = "menu_separator";
+ cell_params.color = LLColor4(0.f, 0.f, 0.f, 0.7f);
+ cell_params.font_halign = LLFontGL::HCENTER;
+ separator_params.cells.add(cell_params);
+ return addRow( separator_params, pos );
}
// Selects first enabled item of the given name.
// Returns false if item not found.
+// Calls getItemByLabel in order to combine functionality
BOOL LLScrollListCtrl::selectItemByLabel(const std::string& label, BOOL case_sensitive)
{
- // ensure that no stale items are selected, even if we don't find a match
- deselectAllItems(TRUE);
- //RN: assume no empty items
- if (label.empty())
+ deselectAllItems(TRUE); // ensure that no stale items are selected, even if we don't find a match
+ LLScrollListItem* item = getItemByLabel(label, case_sensitive);
+
+ bool found = NULL != item;
+ if(found)
{
- return FALSE;
+ selectItem(item);
+ }
+
+ if (mCommitOnSelectionChange)
+ {
+ commitIfChanged();
+ }
+
+ return found;
+}
+
+LLScrollListItem* LLScrollListCtrl::getItemByLabel(const std::string& label, BOOL case_sensitive, S32 column)
+{
+ if (label.empty()) //RN: assume no empty items
+ {
+ return NULL;
}
std::string target_text = label;
@@ -1483,34 +1130,21 @@ BOOL LLScrollListCtrl::selectItemByLabel(const std::string& label, BOOL case_sen
LLStringUtil::toLower(target_text);
}
- BOOL found = FALSE;
-
item_list::iterator iter;
- S32 index = 0;
for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
{
LLScrollListItem* item = *iter;
- // Only select enabled items with matching names
- std::string item_text = item->getColumn(0)->getValue().asString();
+ std::string item_text = item->getColumn(column)->getValue().asString(); // Only select enabled items with matching names
if (!case_sensitive)
{
LLStringUtil::toLower(item_text);
}
- BOOL select = !found && item->getEnabled() && item_text == target_text;
- if (select)
+ if(item_text == target_text)
{
- selectItem(item);
+ return item;
}
- found = found || select;
- index++;
}
-
- if (mCommitOnSelectionChange)
- {
- commitIfChanged();
- }
-
- return found;
+ return NULL;
}
@@ -1614,14 +1248,16 @@ const std::string LLScrollListCtrl::getSelectedItemLabel(S32 column) const
LLScrollListItem* LLScrollListCtrl::addStringUUIDItem(const std::string& item_text, const LLUUID& id, EAddPosition pos, BOOL enabled, S32 column_width)
{
- LLScrollListItem* item = NULL;
if (getItemCount() < mMaxItemCount)
{
- item = new LLScrollListItem( enabled, NULL, id );
- item->addColumn(item_text, LLResMgr::getInstance()->getRes(LLFONT_SANSSERIF_SMALL), column_width);
- addItem( item, pos );
+ LLScrollListItem::Params item_p;
+ item_p.enabled(enabled);
+ item_p.value(id);
+ item_p.cells.add().value(item_text).width(column_width).type("text");
+
+ return addRow( item_p, pos );
}
- return item;
+ return NULL;
}
// Select the line or lines that match this UUID
@@ -1726,7 +1362,7 @@ void LLScrollListCtrl::drawItems()
S32 max_columns = 0;
LLColor4 highlight_color = LLColor4::white;
- F32 type_ahead_timeout = LLUI::sConfigGroup->getF32("TypeAheadTimeout");
+ static LLUICachedControl<F32> type_ahead_timeout ("TypeAheadTimeout", 0);
highlight_color.mV[VALPHA] = clamp_rescale(mSearchTimer.getElapsedTimeF32(), type_ahead_timeout * 0.7f, type_ahead_timeout, 0.4f, 0.f);
item_list::iterator iter;
@@ -1754,27 +1390,46 @@ void LLScrollListCtrl::drawItems()
if( mScrollLines <= line && line < mScrollLines + num_page_lines )
{
- fg_color = (item->getEnabled() ? mFgUnselectedColor : mFgDisabledColor);
+ fg_color = (item->getEnabled() ? mFgUnselectedColor.get() : mFgDisabledColor.get());
if( item->getSelected() && mCanSelect)
{
- bg_color = mBgSelectedColor;
- fg_color = (item->getEnabled() ? mFgSelectedColor : mFgDisabledColor);
+ if(item->getHighlighted()) // if it's highlighted, average the colors
+ {
+ bg_color = lerp(mBgSelectedColor.get(), mHighlightedColor.get(), 0.5f);
+ }
+ else // otherwise just select-highlight it
+ {
+ bg_color = mBgSelectedColor.get();
+ }
+
+ fg_color = (item->getEnabled() ? mFgSelectedColor.get() : mFgDisabledColor.get());
}
else if (mHighlightedItem == line && mCanSelect)
{
- bg_color = mHighlightedColor;
+ if(item->getHighlighted()) // if it's highlighted, average the colors
+ {
+ bg_color = lerp(mHoveredColor.get(), mHighlightedColor.get(), 0.5f);
+ }
+ else // otherwise just hover-highlight it
+ {
+ bg_color = mHoveredColor.get();
+ }
+ }
+ else if (item->getHighlighted())
+ {
+ bg_color = mHighlightedColor.get();
}
else
{
if (mDrawStripes && (line % 2 == 0) && (max_columns > 1))
{
- bg_color = mBgStripeColor;
+ bg_color = mBgStripeColor.get();
}
}
if (!item->getEnabled())
{
- bg_color = mBgReadOnlyColor;
+ bg_color = mBgReadOnlyColor.get();
}
item->draw(item_rect, fg_color, bg_color, highlight_color, mColumnPadding);
@@ -1807,8 +1462,7 @@ void LLScrollListCtrl::draw()
if (mBackgroundVisible)
{
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
- gGL.color4fv( getEnabled() ? mBgWriteableColor.mV : mBgReadOnlyColor.mV );
- gl_rect_2d(background);
+ gl_rect_2d(background, getEnabled() ? mBgWriteableColor.get() : mBgReadOnlyColor.get() );
}
if (mColumnsDirty)
@@ -1817,6 +1471,8 @@ void LLScrollListCtrl::draw()
mColumnsDirty = FALSE;
}
+ getChildView("comment_text")->setVisible(mItemList.empty());
+
drawItems();
if (mBorder)
@@ -1879,7 +1535,7 @@ BOOL LLScrollListCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sti
}
// otherwise, look for a tooltip associated with this column
- LLColumnHeader* headerp = columnp->mHeader;
+ LLScrollColumnHeader* headerp = columnp->mHeader;
if (headerp && !handled)
{
headerp->handleToolTip(x, y, msg, sticky_rect_screen);
@@ -1922,7 +1578,7 @@ BOOL LLScrollListCtrl::selectItemAt(S32 x, S32 y, MASK mask)
{
if(mOnMaximumSelectCallback)
{
- mOnMaximumSelectCallback(mCallbackUserData);
+ mOnMaximumSelectCallback();
}
break;
}
@@ -1960,7 +1616,7 @@ BOOL LLScrollListCtrl::selectItemAt(S32 x, S32 y, MASK mask)
{
if(mOnMaximumSelectCallback)
{
- mOnMaximumSelectCallback(mCallbackUserData);
+ mOnMaximumSelectCallback();
}
}
}
@@ -2051,7 +1707,7 @@ BOOL LLScrollListCtrl::handleDoubleClick(S32 x, S32 y, MASK mask)
{
if( mCanSelect && mOnDoubleClickCallback )
{
- mOnDoubleClickCallback( mCallbackUserData );
+ mOnDoubleClickCallback();
}
}
}
@@ -2221,11 +1877,11 @@ BOOL LLScrollListCtrl::handleHover(S32 x,S32 y,MASK mask)
LLScrollListItem* item = hitItem(x, y);
if (item)
{
- highlightNthItem(getItemIndex(item));
+ mouseOverHighlightNthItem(getItemIndex(item));
}
else
{
- highlightNthItem(-1);
+ mouseOverHighlightNthItem(-1);
}
}
@@ -2234,6 +1890,11 @@ BOOL LLScrollListCtrl::handleHover(S32 x,S32 y,MASK mask)
return handled;
}
+void LLScrollListCtrl::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+ // clear mouse highlight
+ mouseOverHighlightNthItem(-1);
+}
BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask )
{
@@ -2378,7 +2039,8 @@ BOOL LLScrollListCtrl::handleUnicodeCharHere(llwchar uni_char)
}
// perform incremental search based on keyboard input
- if (mSearchTimer.getElapsedTimeF32() > LLUI::sConfigGroup->getF32("TypeAheadTimeout"))
+ static LLUICachedControl<F32> type_ahead_timeout ("TypeAheadTimeout", 0);
+ if (mSearchTimer.getElapsedTimeF32() > type_ahead_timeout)
{
mSearchString.clear();
}
@@ -2554,7 +2216,7 @@ BOOL LLScrollListCtrl::setSort(S32 column_idx, BOOL ascending)
LLScrollListColumn* sort_column = getColumn(column_idx);
if (!sort_column) return FALSE;
- sort_column->mSortAscending = ascending;
+ sort_column->mSortDirection = ascending ? LLScrollListColumn::ASCENDING : LLScrollListColumn::DESCENDING;
sort_column_t new_sort_column(column_idx, ascending);
@@ -2579,11 +2241,9 @@ BOOL LLScrollListCtrl::setSort(S32 column_idx, BOOL ascending)
}
// Called by scrollbar
-//static
-void LLScrollListCtrl::onScrollChange( S32 new_pos, LLScrollbar* scrollbar, void* userdata )
+void LLScrollListCtrl::onScrollChange( S32 new_pos, LLScrollbar* scrollbar )
{
- LLScrollListCtrl* self = (LLScrollListCtrl*) userdata;
- self->mScrollLines = new_pos;
+ mScrollLines = new_pos;
}
@@ -2656,7 +2316,7 @@ void LLScrollListCtrl::setScrollPos( S32 pos )
{
mScrollbar->setDocPos( pos );
- onScrollChange(mScrollbar->getDocPos(), mScrollbar, this);
+ onScrollChange(mScrollbar->getDocPos(), mScrollbar);
}
@@ -2706,293 +2366,6 @@ void LLScrollListCtrl::updateStaticColumnWidth(LLScrollListColumn* col, S32 new_
mTotalStaticColumnWidth += llmax(0, new_width) - llmax(0, col->getWidth());
}
-
-// virtual
-LLXMLNodePtr LLScrollListCtrl::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- // Attributes
-
- node->createChild("multi_select", TRUE)->setBoolValue(mAllowMultipleSelection);
-
- node->createChild("draw_border", TRUE)->setBoolValue((mBorder != NULL));
-
- node->createChild("draw_heading", TRUE)->setBoolValue(mDisplayColumnHeaders);
-
- node->createChild("background_visible", TRUE)->setBoolValue(mBackgroundVisible);
-
- node->createChild("draw_stripes", TRUE)->setBoolValue(mDrawStripes);
-
- node->createChild("column_padding", TRUE)->setIntValue(mColumnPadding);
-
- addColorXML(node, mBgWriteableColor, "bg_writeable_color", "ScrollBgWriteableColor");
- addColorXML(node, mBgReadOnlyColor, "bg_read_only_color", "ScrollBgReadOnlyColor");
- addColorXML(node, mBgSelectedColor, "bg_selected_color", "ScrollSelectedBGColor");
- addColorXML(node, mBgStripeColor, "bg_stripe_color", "ScrollBGStripeColor");
- addColorXML(node, mFgSelectedColor, "fg_selected_color", "ScrollSelectedFGColor");
- addColorXML(node, mFgUnselectedColor, "fg_unselected_color", "ScrollUnselectedColor");
- addColorXML(node, mFgDisabledColor, "fg_disable_color", "ScrollDisabledColor");
- addColorXML(node, mHighlightedColor, "highlighted_color", "ScrollHighlightedColor");
-
- // Contents
-
- std::map<std::string, LLScrollListColumn>::const_iterator itor;
- std::vector<const LLScrollListColumn*> sorted_list;
- sorted_list.resize(mColumns.size());
- for (itor = mColumns.begin(); itor != mColumns.end(); ++itor)
- {
- sorted_list[itor->second.mIndex] = &itor->second;
- }
-
- std::vector<const LLScrollListColumn*>::iterator itor2;
- for (itor2 = sorted_list.begin(); itor2 != sorted_list.end(); ++itor2)
- {
- LLXMLNodePtr child_node = node->createChild("column", FALSE);
- const LLScrollListColumn *column = *itor2;
-
- child_node->createChild("name", TRUE)->setStringValue(column->mName);
- child_node->createChild("label", TRUE)->setStringValue(column->mLabel);
- child_node->createChild("width", TRUE)->setIntValue(column->getWidth());
- }
-
- return node;
-}
-
-void LLScrollListCtrl::setScrollListParameters(LLXMLNodePtr node)
-{
- // James: This is not a good way to do colors. We need a central "UI style"
- // manager that sets the colors for ALL scroll lists, buttons, etc.
-
- LLColor4 color;
- if(node->hasAttribute("fg_unselected_color"))
- {
- LLUICtrlFactory::getAttributeColor(node,"fg_unselected_color", color);
- setFgUnselectedColor(color);
- }
- if(node->hasAttribute("fg_selected_color"))
- {
- LLUICtrlFactory::getAttributeColor(node,"fg_selected_color", color);
- setFgSelectedColor(color);
- }
- if(node->hasAttribute("bg_selected_color"))
- {
- LLUICtrlFactory::getAttributeColor(node,"bg_selected_color", color);
- setBgSelectedColor(color);
- }
- if(node->hasAttribute("fg_disable_color"))
- {
- LLUICtrlFactory::getAttributeColor(node,"fg_disable_color", color);
- setFgDisableColor(color);
- }
- if(node->hasAttribute("bg_writeable_color"))
- {
- LLUICtrlFactory::getAttributeColor(node,"bg_writeable_color", color);
- setBgWriteableColor(color);
- }
- if(node->hasAttribute("bg_read_only_color"))
- {
- LLUICtrlFactory::getAttributeColor(node,"bg_read_only_color", color);
- setReadOnlyBgColor(color);
- }
- if (LLUICtrlFactory::getAttributeColor(node,"bg_stripe_color", color))
- {
- setBgStripeColor(color);
- }
- if (LLUICtrlFactory::getAttributeColor(node,"highlighted_color", color))
- {
- setHighlightedColor(color);
- }
-
- if(node->hasAttribute("background_visible"))
- {
- BOOL background_visible;
- node->getAttributeBOOL("background_visible", background_visible);
- setBackgroundVisible(background_visible);
- }
-
- if(node->hasAttribute("draw_stripes"))
- {
- BOOL draw_stripes;
- node->getAttributeBOOL("draw_stripes", draw_stripes);
- setDrawStripes(draw_stripes);
- }
-
- if(node->hasAttribute("column_padding"))
- {
- S32 column_padding;
- node->getAttributeS32("column_padding", column_padding);
- setColumnPadding(column_padding);
- }
-}
-
-// static
-LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("scroll_list");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- BOOL multi_select = FALSE;
- node->getAttributeBOOL("multi_select", multi_select);
-
- BOOL draw_border = TRUE;
- node->getAttributeBOOL("draw_border", draw_border);
-
- BOOL draw_heading = FALSE;
- node->getAttributeBOOL("draw_heading", draw_heading);
-
- S32 search_column = 0;
- node->getAttributeS32("search_column", search_column);
-
- S32 sort_column = -1;
- node->getAttributeS32("sort_column", sort_column);
-
- BOOL sort_ascending = TRUE;
- node->getAttributeBOOL("sort_ascending", sort_ascending);
-
- LLUICtrlCallback callback = NULL;
-
- LLScrollListCtrl* scroll_list = new LLScrollListCtrl(
- name,
- rect,
- callback,
- NULL,
- multi_select,
- draw_border);
-
- scroll_list->setDisplayHeading(draw_heading);
- if (node->hasAttribute("heading_height"))
- {
- S32 heading_height;
- node->getAttributeS32("heading_height", heading_height);
- scroll_list->setHeadingHeight(heading_height);
- }
-
- scroll_list->setScrollListParameters(node);
-
- scroll_list->initFromXML(node, parent);
-
- scroll_list->setSearchColumn(search_column);
-
- LLSD columns;
- S32 index = 0;
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
- {
- if (child->hasName("column"))
- {
- std::string labelname("");
- child->getAttributeString("label", labelname);
-
- std::string columnname(labelname);
- child->getAttributeString("name", columnname);
-
- std::string sortname(columnname);
- child->getAttributeString("sort", sortname);
-
- BOOL sort_ascending = TRUE;
- child->getAttributeBOOL("sort_ascending", sort_ascending);
-
- std::string imagename;
- child->getAttributeString("image", imagename);
-
- BOOL columndynamicwidth = FALSE;
- child->getAttributeBOOL("dynamicwidth", columndynamicwidth);
-
- S32 columnwidth = -1;
- child->getAttributeS32("width", columnwidth);
-
- std::string tooltip;
- child->getAttributeString("tool_tip", tooltip);
-
- F32 columnrelwidth = 0.f;
- child->getAttributeF32("relwidth", columnrelwidth);
-
- LLFontGL::HAlign h_align = LLFontGL::LEFT;
- h_align = LLView::selectFontHAlign(child);
-
- columns[index]["name"] = columnname;
- columns[index]["sort"] = sortname;
- columns[index]["sort_ascending"] = sort_ascending;
- columns[index]["image"] = imagename;
- columns[index]["label"] = labelname;
- columns[index]["width"] = columnwidth;
- columns[index]["relwidth"] = columnrelwidth;
- columns[index]["dynamicwidth"] = columndynamicwidth;
- columns[index]["halign"] = (S32)h_align;
- columns[index]["tool_tip"] = tooltip;
-
- index++;
- }
- }
- scroll_list->setColumnHeadings(columns);
-
- if (sort_column >= 0)
- {
- scroll_list->sortByColumnIndex(sort_column, sort_ascending);
- }
-
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
- {
- if (child->hasName("row"))
- {
- LLUUID id;
- child->getAttributeUUID("id", id);
-
- LLSD row;
-
- row["id"] = id;
-
- S32 column_idx = 0;
- LLXMLNodePtr row_child;
- for (row_child = child->getFirstChild(); row_child.notNull(); row_child = row_child->getNextSibling())
- {
- if (row_child->hasName("column"))
- {
- std::string value = row_child->getTextContents();
-
- std::string columnname("");
- row_child->getAttributeString("name", columnname);
-
- std::string font("");
- row_child->getAttributeString("font", font);
-
- std::string font_style("");
- row_child->getAttributeString("font-style", font_style);
-
- row["columns"][column_idx]["column"] = columnname;
- row["columns"][column_idx]["value"] = value;
- row["columns"][column_idx]["font"] = font;
- row["columns"][column_idx]["font-style"] = font_style;
- column_idx++;
- }
- }
- scroll_list->addElement(row);
- }
- }
-
- std::string contents = node->getTextContents();
- if (!contents.empty())
- {
- typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
- boost::char_separator<char> sep("\t\n");
- tokenizer tokens(contents, sep);
- tokenizer::iterator token_iter = tokens.begin();
-
- while(token_iter != tokens.end())
- {
- const std::string& line = *token_iter;
- scroll_list->addSimpleElement(line);
- ++token_iter;
- }
- }
-
- return scroll_list;
-}
-
// LLEditMenuHandler functions
// virtual
@@ -3068,20 +2441,27 @@ BOOL LLScrollListCtrl::canDeselect() const
void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
{
- std::string name = column["name"].asString();
+ LLScrollListColumn::Params p;
+ LLParamSDParser::instance().readSD(column, p);
+ addColumn(p, pos);
+}
+
+void LLScrollListCtrl::addColumn(const LLScrollListColumn::Params& column_params, EAddPosition pos)
+{
+ if (!column_params.validateBlock()) return;
+
+ std::string name = column_params.name;
// if no column name provided, just use ordinal as name
if (name.empty())
{
- std::ostringstream new_name;
- new_name << mColumnsIndexed.size();
- name = new_name.str();
+ name = llformat("%d", mColumnsIndexed.size());
}
+
if (mColumns.find(name) == mColumns.end())
{
// Add column
- mColumns[name] = LLScrollListColumn(column, this);
+ mColumns[name] = LLScrollListColumn(column_params, this);
LLScrollListColumn* new_column = &mColumns[name];
- new_column->mParentCtrl = this;
new_column->mIndex = mColumns.size()-1;
// Add button
@@ -3101,44 +2481,47 @@ void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
new_column->setWidth((mItemListRect.getWidth() - mTotalStaticColumnWidth - mTotalColumnPadding) / mNumDynamicWidthColumns);
}
S32 top = mItemListRect.mTop;
+
S32 left = mItemListRect.mLeft;
+ for (std::map<std::string, LLScrollListColumn>::iterator itor = mColumns.begin();
+ itor != mColumns.end();
+ ++itor)
{
- std::map<std::string, LLScrollListColumn>::iterator itor;
- for (itor = mColumns.begin(); itor != mColumns.end(); ++itor)
+ if (itor->second.mIndex < new_column->mIndex &&
+ itor->second.getWidth() > 0)
{
- if (itor->second.mIndex < new_column->mIndex &&
- itor->second.getWidth() > 0)
- {
- left += itor->second.getWidth() + mColumnPadding;
- }
+ left += itor->second.getWidth() + mColumnPadding;
}
}
- std::string button_name = "btn_" + name;
+
S32 right = left+new_column->getWidth();
if (new_column->mIndex != (S32)mColumns.size()-1)
{
right += mColumnPadding;
}
+
LLRect temp_rect = LLRect(left,top+mHeadingHeight,right,top);
- new_column->mHeader = new LLColumnHeader(button_name, temp_rect, new_column);
- if(column["image"].asString() != "")
+
+ LLScrollColumnHeader::Params params;
+ params.name = "btn_" + name;
+ params.rect = temp_rect;
+ params.column = new_column;
+ params.tool_tip = column_params.tool_tip;
+ params.tab_stop = false;
+ params.visible = mDisplayColumnHeaders;
+
+ if(column_params.header.image.isProvided())
{
- //new_column->mHeader->setScaleImage(false);
- new_column->mHeader->setImage(column["image"].asString());
+ params.image_selected = column_params.header.image;
+ params.image_unselected = column_params.header.image;
}
else
{
- new_column->mHeader->setLabel(new_column->mLabel);
- //new_column->mHeader->setLabel(new_column->mLabel);
+ params.label = column_params.header.label;
}
- new_column->mHeader->setToolTip(column["tool_tip"].asString());
-
- //RN: although it might be useful to change sort order with the keyboard,
- // mixing tab stops on child items along with the parent item is not supported yet
- new_column->mHeader->setTabStop(FALSE);
+ new_column->mHeader = LLUICtrlFactory::create<LLScrollColumnHeader>(params);
addChild(new_column->mHeader);
- new_column->mHeader->setVisible(mDisplayColumnHeaders);
sendChildToFront(mScrollbar);
}
@@ -3159,7 +2542,7 @@ void LLScrollListCtrl::onClickColumn(void *userdata)
S32 column_index = info->mIndex;
LLScrollListColumn* column = parent->mColumnsIndexed[info->mIndex];
- bool ascending = column->mSortAscending;
+ bool ascending = column->mSortDirection == LLScrollListColumn::ASCENDING;
if (column->mSortingColumn != column->mName
&& parent->mColumns.find(column->mSortingColumn) != parent->mColumns.end())
{
@@ -3178,7 +2561,7 @@ void LLScrollListCtrl::onClickColumn(void *userdata)
if (parent->mOnSortChangedCallback)
{
- parent->mOnSortChangedCallback(parent->getCallbackUserData());
+ parent->mOnSortChangedCallback();
}
}
@@ -3200,7 +2583,7 @@ void LLScrollListCtrl::clearColumns()
std::map<std::string, LLScrollListColumn>::iterator itor;
for (itor = mColumns.begin(); itor != mColumns.end(); ++itor)
{
- LLColumnHeader *header = itor->second.mHeader;
+ LLScrollColumnHeader *header = itor->second.mHeader;
if (header)
{
removeChild(header);
@@ -3215,13 +2598,13 @@ void LLScrollListCtrl::clearColumns()
void LLScrollListCtrl::setColumnLabel(const std::string& column, const std::string& label)
{
- std::map<std::string, LLScrollListColumn>::iterator itor = mColumns.find(column);
- if (itor != mColumns.end())
+ LLScrollListColumn* columnp = getColumn(column);
+ if (columnp)
{
- itor->second.mLabel = label;
- if (itor->second.mHeader)
+ columnp->mLabel = label;
+ if (columnp->mHeader)
{
- itor->second.mHeader->setLabel(label);
+ columnp->mHeader->setLabel(label);
}
}
}
@@ -3235,74 +2618,62 @@ LLScrollListColumn* LLScrollListCtrl::getColumn(S32 index)
return mColumnsIndexed[index];
}
-void LLScrollListCtrl::setColumnHeadings(LLSD headings)
+LLScrollListColumn* LLScrollListCtrl::getColumn(const std::string& name)
{
- mColumns.clear();
- LLSD::array_const_iterator itor;
- for (itor = headings.beginArray(); itor != headings.endArray(); ++itor)
+ column_map_t::iterator column_itor = mColumns.find(name);
+ if (column_itor != mColumns.end())
{
- addColumn(*itor);
+ return &column_itor->second;
}
+ return NULL;
}
-LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition pos, void* userdata)
+
+LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& element, EAddPosition pos, void* userdata)
{
- // ID
- LLSD id = value["id"];
+ LLScrollListItem::Params item_params;
+ LLParamSDParser::instance().readSD(element, item_params);
+ item_params.userdata = userdata;
+ return addRow(item_params, pos);
+}
- LLScrollListItem *new_item = new LLScrollListItem(id, userdata);
- if (value.has("enabled"))
- {
- new_item->setEnabled( value["enabled"].asBoolean() );
- }
+LLScrollListItem* LLScrollListCtrl::addRow(const LLScrollListItem::Params& item_p, EAddPosition pos)
+{
+ if (!item_p.validateBlock()) return NULL;
+ LLScrollListItem *new_item = new LLScrollListItem(item_p);
new_item->setNumColumns(mColumns.size());
// Add any columns we don't already have
- LLSD columns = value["columns"];
- LLSD::array_const_iterator itor;
- S32 col_index = 0 ;
- for (itor = columns.beginArray(); itor != columns.endArray(); ++itor)
- {
- if (itor->isUndefined())
- {
- // skip unused columns in item passed in
- continue;
- }
- std::string column = (*itor)["column"].asString();
+ S32 col_index = 0;
- LLScrollListColumn* columnp = NULL;
+ for(LLInitParam::ParamIterator<LLScrollListCell::Params>::const_iterator itor = item_p.cells().begin();
+ itor != item_p.cells().end();
+ ++itor)
+ {
+ LLScrollListCell::Params cell_p = *itor;
+ std::string column = cell_p.column;
// empty columns strings index by ordinal
if (column.empty())
{
- std::ostringstream new_name;
- new_name << col_index;
- column = new_name.str();
+ column = llformat("%d", col_index);
}
- std::map<std::string, LLScrollListColumn>::iterator column_itor;
- column_itor = mColumns.find(column);
- if (column_itor != mColumns.end())
- {
- columnp = &column_itor->second;
- }
+ LLScrollListColumn* columnp = getColumn(column);
// create new column on demand
if (!columnp)
{
- LLSD new_column;
- new_column["name"] = column;
- new_column["label"] = column;
+ LLScrollListColumn::Params new_column;
+ new_column.name = column;
+ new_column.header.label = column;
+
// if width supplied for column, use it, otherwise
// use adaptive width
- if (itor->has("width"))
- {
- new_column["width"] = (*itor)["width"];
- }
- else
+ if (cell_p.width.isProvided())
{
- new_column["dynamicwidth"] = true;
+ new_column.width.pixel_width = cell_p.width;
}
addColumn(new_column);
columnp = &mColumns[column];
@@ -3310,91 +2681,48 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
}
S32 index = columnp->mIndex;
- S32 width = columnp->getWidth();
- LLFontGL::HAlign font_alignment = columnp->mFontAlignment;
- LLColor4 fcolor = LLColor4::black;
-
- LLSD value = (*itor)["value"];
- std::string fontname = (*itor)["font"].asString();
- std::string fontstyle = (*itor)["font-style"].asString();
- std::string type = (*itor)["type"].asString();
-
- if ((*itor).has("font-color"))
- {
- LLSD sd_color = (*itor)["font-color"];
- fcolor.setValue(sd_color);
- }
-
- BOOL has_color = (*itor).has("color");
- LLColor4 color = ((*itor)["color"]);
- BOOL enabled = !(*itor).has("enabled") || (*itor)["enabled"].asBoolean() == true;
+ cell_p.width.setIfNotProvided(columnp->getWidth());
- const LLFontGL *font = LLResMgr::getInstance()->getRes(fontname);
- if (!font)
- {
- font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
- }
- U8 font_style = LLFontGL::getStyleFromString(fontstyle);
+ LLScrollListCell* cell = LLScrollListCell::create(cell_p);
- if (type == "icon")
+ if (cell)
{
- LLScrollListIcon* cell = new LLScrollListIcon(value, width);
- if (has_color)
- {
- cell->setColor(color);
- }
new_item->setColumn(index, cell);
- }
- else if (type == "checkbox")
- {
- LLCheckBoxCtrl* ctrl = new LLCheckBoxCtrl(std::string("check"),
- LLRect(0, width, width, 0), std::string(" "));
- ctrl->setEnabled(enabled);
- ctrl->setValue(value);
- LLScrollListCheck* cell = new LLScrollListCheck(ctrl,width);
- if (has_color)
+ if (columnp->mHeader
+ && cell->isText()
+ && !cell->getValue().asString().empty())
{
- cell->setColor(color);
- }
- new_item->setColumn(index, cell);
- }
- else if (type == "separator")
- {
- LLScrollListSeparator* cell = new LLScrollListSeparator(width);
- if (has_color)
- {
- cell->setColor(color);
+ columnp->mHeader->setHasResizableElement(TRUE);
}
- new_item->setColumn(index, cell);
}
- else if (type == "date")
+
+ col_index++;
+ }
+
+ if (item_p.cells().empty())
+ {
+ if (mColumns.empty())
{
- LLScrollListDate* cell = new LLScrollListDate(value.asDate(), font, width, font_style, font_alignment);
- if (has_color)
- {
- cell->setColor(color);
- }
- new_item->setColumn(index, cell);
- if (columnp->mHeader && !value.asString().empty())
- {
- columnp->mHeader->setHasResizableElement(TRUE);
- }
+ LLScrollListColumn::Params new_column;
+ new_column.name = "0";
+
+ addColumn(new_column);
+ new_item->setNumColumns(mColumns.size());
}
- else
+
+ LLScrollListCell* cell = LLScrollListCell::create(LLScrollListCell::Params().value(item_p.value));
+ if (cell)
{
- LLScrollListText* cell = new LLScrollListText(value.asString(), font, width, font_style, font_alignment, fcolor, TRUE);
- if (has_color)
- {
- cell->setColor(color);
- }
- new_item->setColumn(index, cell);
- if (columnp->mHeader && !value.asString().empty())
+ LLScrollListColumn* columnp = &(mColumns.begin()->second);
+
+ new_item->setColumn(0, cell);
+ if (columnp->mHeader
+ && cell->isText()
+ && !cell->getValue().asString().empty())
{
columnp->mHeader->setHasResizableElement(TRUE);
}
}
-
- col_index++;
}
// add dummy cells for missing columns
@@ -3404,12 +2732,14 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
if (new_item->getColumn(column_idx) == NULL)
{
LLScrollListColumn* column_ptr = &column_it->second;
- new_item->setColumn(column_idx, new LLScrollListText(LLStringUtil::null, LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ), column_ptr->getWidth(), LLFontGL::NORMAL));
+ LLScrollListCell::Params cell_p;
+ cell_p.width = column_ptr->getWidth();
+
+ new_item->setColumn(column_idx, new LLScrollListSpacer(cell_p));
}
}
addItem(new_item, pos);
-
return new_item;
}
@@ -3422,14 +2752,13 @@ LLScrollListItem* LLScrollListCtrl::addSimpleElement(const std::string& value, E
entry_id = value;
}
- LLScrollListItem *new_item = new LLScrollListItem(entry_id);
-
- const LLFontGL *font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
-
- new_item->addColumn(value, font, getRect().getWidth());
-
- addItem(new_item, pos);
- return new_item;
+ LLScrollListItem::Params item_params;
+ item_params.value(entry_id);
+ item_params.cells.add()
+ .value(value)
+ .font(LLFontGL::getFontSansSerifSmall());
+
+ return addRow(item_params, pos);
}
void LLScrollListCtrl::setValue(const LLSD& value )
@@ -3530,484 +2859,3 @@ void LLScrollListCtrl::onFocusLost()
LLUICtrl::onFocusLost();
}
-LLColumnHeader::LLColumnHeader(const std::string& label, const LLRect &rect, LLScrollListColumn* column, const LLFontGL* fontp) :
- LLComboBox(label, rect, label, NULL, NULL),
- mColumn(column),
- mOrigLabel(label),
- mShowSortOptions(FALSE),
- mHasResizableElement(FALSE)
-{
- mListPosition = LLComboBox::ABOVE;
- setCommitCallback(onSelectSort);
- setCallbackUserData(this);
- mButton->setTabStop(FALSE);
- // require at least two frames between mouse down and mouse up event to capture intentional "hold" not just bad framerate
- mButton->setHeldDownDelay(LLUI::sConfigGroup->getF32("ColumnHeaderDropDownDelay"), 2);
- mButton->setHeldDownCallback(onHeldDown);
- mButton->setClickedCallback(onClick);
- mButton->setMouseDownCallback(onMouseDown);
-
- mButton->setCallbackUserData(this);
- mButton->setToolTip(label);
-
- mAscendingText = std::string("[LOW]...[HIGH](Ascending)"); // *TODO: Translate
- mDescendingText = std::string("[HIGH]...[LOW](Descending)"); // *TODO: Translate
-
- mList->reshape(llmax(mList->getRect().getWidth(), 110, getRect().getWidth()), mList->getRect().getHeight());
-
- // resize handles on left and right
- const S32 RESIZE_BAR_THICKNESS = 3;
- mResizeBar = new LLResizeBar(
- std::string("resizebar"),
- this,
- LLRect( getRect().getWidth() - RESIZE_BAR_THICKNESS, getRect().getHeight(), getRect().getWidth(), 0),
- MIN_COLUMN_WIDTH, S32_MAX, LLResizeBar::RIGHT );
- addChild(mResizeBar);
-
- mResizeBar->setEnabled(FALSE);
-}
-
-LLColumnHeader::~LLColumnHeader()
-{
-}
-
-void LLColumnHeader::draw()
-{
- BOOL draw_arrow = !mColumn->mLabel.empty() && mColumn->mParentCtrl->isSorted() && mColumn->mParentCtrl->getSortColumnName() == mColumn->mSortingColumn;
-
- BOOL is_ascending = mColumn->mParentCtrl->getSortAscending();
- mButton->setImageOverlay(is_ascending ? "up_arrow.tga" : "down_arrow.tga", LLFontGL::RIGHT, draw_arrow ? LLColor4::white : LLColor4::transparent);
- mArrowImage = mButton->getImageOverlay();
-
- //BOOL clip = getRect().mRight > mColumn->mParentCtrl->getItemListRect().getWidth();
- //LLGLEnable scissor_test(clip ? GL_SCISSOR_TEST : GL_FALSE);
-
- //LLRect column_header_local_rect(-getRect().mLeft, getRect().getHeight(), mColumn->mParentCtrl->getItemListRect().getWidth() - getRect().mLeft, 0);
- //LLUI::setScissorRegionLocal(column_header_local_rect);
-
- // Draw children
- LLComboBox::draw();
-
- if (mList->getVisible())
- {
- // sync sort order with list selection every frame
- mColumn->mParentCtrl->sortByColumn(mColumn->mSortingColumn, getCurrentIndex() == 0);
- }
-}
-
-BOOL LLColumnHeader::handleDoubleClick(S32 x, S32 y, MASK mask)
-{
- if (canResize() && mResizeBar->getRect().pointInRect(x, y))
- {
- // reshape column to max content width
- LLRect column_rect = getRect();
- column_rect.mRight = column_rect.mLeft + mColumn->mMaxContentWidth;
- userSetShape(column_rect);
- }
- else
- {
- onClick(this);
- }
- return TRUE;
-}
-
-void LLColumnHeader::setImage(const std::string &image_name)
-{
- if (mButton)
- {
- mButton->setImageSelected(image_name);
- mButton->setImageUnselected(image_name);
- }
-}
-
-//static
-void LLColumnHeader::onClick(void* user_data)
-{
- LLColumnHeader* headerp = (LLColumnHeader*)user_data;
- if (!headerp) return;
-
- LLScrollListColumn* column = headerp->mColumn;
- if (!column) return;
-
- if (headerp->mList->getVisible())
- {
- headerp->hideList();
- }
-
- LLScrollListCtrl::onClickColumn(column);
-
- // propagate new sort order to sort order list
- headerp->mList->selectNthItem(column->mParentCtrl->getSortAscending() ? 0 : 1);
-}
-
-//static
-void LLColumnHeader::onMouseDown(void* user_data)
-{
- // for now, do nothing but block the normal showList() behavior
- return;
-}
-
-//static
-void LLColumnHeader::onHeldDown(void* user_data)
-{
- LLColumnHeader* headerp = (LLColumnHeader*)user_data;
- headerp->showList();
-}
-
-void LLColumnHeader::showList()
-{
- if (mShowSortOptions)
- {
- //LLSD item_val = mColumn->mParentCtrl->getFirstData()->getValue();
- mOrigLabel = mButton->getLabelSelected();
-
- // move sort column over to this column and do initial sort
- mColumn->mParentCtrl->sortByColumn(mColumn->mSortingColumn, mColumn->mParentCtrl->getSortAscending());
-
- std::string low_item_text;
- std::string high_item_text;
-
- LLScrollListItem* itemp = mColumn->mParentCtrl->getFirstData();
- if (itemp)
- {
- LLScrollListCell* cell = itemp->getColumn(mColumn->mIndex);
- if (cell && cell->isText())
- {
- if (mColumn->mParentCtrl->getSortAscending())
- {
- low_item_text = cell->getValue().asString();
- }
- else
- {
- high_item_text = cell->getValue().asString();
- }
- }
- }
-
- itemp = mColumn->mParentCtrl->getLastData();
- if (itemp)
- {
- LLScrollListCell* cell = itemp->getColumn(mColumn->mIndex);
- if (cell && cell->isText())
- {
- if (mColumn->mParentCtrl->getSortAscending())
- {
- high_item_text = cell->getValue().asString();
- }
- else
- {
- low_item_text = cell->getValue().asString();
- }
- }
- }
-
- LLStringUtil::truncate(low_item_text, 3);
- LLStringUtil::truncate(high_item_text, 3);
-
- std::string ascending_string;
- std::string descending_string;
-
- if (low_item_text.empty() || high_item_text.empty())
- {
- ascending_string = "Ascending";
- descending_string = "Descending";
- }
- else
- {
- mAscendingText.setArg("[LOW]", low_item_text);
- mAscendingText.setArg("[HIGH]", high_item_text);
- mDescendingText.setArg("[LOW]", low_item_text);
- mDescendingText.setArg("[HIGH]", high_item_text);
- ascending_string = mAscendingText.getString();
- descending_string = mDescendingText.getString();
- }
-
- S32 text_width = LLFontGL::getFontSansSerifSmall()->getWidth(ascending_string);
- text_width = llmax(text_width, LLFontGL::getFontSansSerifSmall()->getWidth(descending_string)) + 10;
- text_width = llmax(text_width, getRect().getWidth() - 30);
-
- mList->getColumn(0)->setWidth(text_width);
- ((LLScrollListText*)mList->getFirstData()->getColumn(0))->setText(ascending_string);
- ((LLScrollListText*)mList->getLastData()->getColumn(0))->setText(descending_string);
-
- mList->reshape(llmax(text_width + 30, 110, getRect().getWidth()), mList->getRect().getHeight());
-
- LLComboBox::showList();
- }
-}
-
-//static
-void LLColumnHeader::onSelectSort(LLUICtrl* ctrl, void* user_data)
-{
- LLColumnHeader* headerp = (LLColumnHeader*)user_data;
- if (!headerp) return;
-
- LLScrollListColumn* column = headerp->mColumn;
- if (!column) return;
- LLScrollListCtrl *parent = column->mParentCtrl;
- if (!parent) return;
-
- if (headerp->getCurrentIndex() == 0)
- {
- // ascending
- parent->sortByColumn(column->mSortingColumn, TRUE);
- }
- else
- {
- // descending
- parent->sortByColumn(column->mSortingColumn, FALSE);
- }
-
- // restore original column header
- headerp->setLabel(headerp->mOrigLabel);
-}
-
-LLView* LLColumnHeader::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding)
-{
- // this logic assumes dragging on right
- llassert(snap_edge == SNAP_RIGHT);
-
- // use higher snap threshold for column headers
- threshold = llmin(threshold, 10);
-
- LLRect snap_rect = getSnapRect();
-
- S32 snap_delta = mColumn->mMaxContentWidth - snap_rect.getWidth();
-
- // x coord growing means column growing, so same signs mean we're going in right direction
- if (llabs(snap_delta) <= threshold && mouse_dir.mX * snap_delta > 0 )
- {
- new_edge_val = snap_rect.mRight + snap_delta;
- }
- else
- {
- LLScrollListColumn* next_column = mColumn->mParentCtrl->getColumn(mColumn->mIndex + 1);
- while (next_column)
- {
- if (next_column->mHeader)
- {
- snap_delta = (next_column->mHeader->getSnapRect().mRight - next_column->mMaxContentWidth) - snap_rect.mRight;
- if (llabs(snap_delta) <= threshold && mouse_dir.mX * snap_delta > 0 )
- {
- new_edge_val = snap_rect.mRight + snap_delta;
- }
- break;
- }
- next_column = mColumn->mParentCtrl->getColumn(next_column->mIndex + 1);
- }
- }
-
- return this;
-}
-
-void LLColumnHeader::userSetShape(const LLRect& new_rect)
-{
- S32 new_width = new_rect.getWidth();
- S32 delta_width = new_width - (getRect().getWidth() /*+ mColumn->mParentCtrl->getColumnPadding()*/);
-
- if (delta_width != 0)
- {
- S32 remaining_width = -delta_width;
- S32 col;
- for (col = mColumn->mIndex + 1; col < mColumn->mParentCtrl->getNumColumns(); col++)
- {
- LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
- if (!columnp) continue;
-
- if (columnp->mHeader && columnp->mHeader->canResize())
- {
- // how many pixels in width can this column afford to give up?
- S32 resize_buffer_amt = llmax(0, columnp->getWidth() - MIN_COLUMN_WIDTH);
-
- // user shrinking column, need to add width to other columns
- if (delta_width < 0)
- {
- if (/*!columnp->mDynamicWidth && */columnp->getWidth() > 0)
- {
- // statically sized column, give all remaining width to this column
- columnp->setWidth(columnp->getWidth() + remaining_width);
- if (columnp->mRelWidth > 0.f)
- {
- columnp->mRelWidth = (F32)columnp->getWidth() / (F32)mColumn->mParentCtrl->getItemListRect().getWidth();
- }
- // all padding went to this widget, we're done
- break;
- }
- }
- else
- {
- // user growing column, need to take width from other columns
- remaining_width += resize_buffer_amt;
-
- if (/*!columnp->mDynamicWidth && */columnp->getWidth() > 0)
- {
- columnp->setWidth(columnp->getWidth() - llmin(columnp->getWidth() - MIN_COLUMN_WIDTH, delta_width));
- if (columnp->mRelWidth > 0.f)
- {
- columnp->mRelWidth = (F32)columnp->getWidth() / (F32)mColumn->mParentCtrl->getItemListRect().getWidth();
- }
- }
-
- if (remaining_width >= 0)
- {
- // width sucked up from neighboring columns, done
- break;
- }
- }
- }
- }
-
- // clamp resize amount to maximum that can be absorbed by other columns
- if (delta_width > 0)
- {
- delta_width += llmin(remaining_width, 0);
- }
-
- // propagate constrained delta_width to new width for this column
- new_width = getRect().getWidth() + delta_width - mColumn->mParentCtrl->getColumnPadding();
-
- // use requested width
- mColumn->setWidth(new_width);
-
- // update proportional spacing
- if (mColumn->mRelWidth > 0.f)
- {
- mColumn->mRelWidth = (F32)new_width / (F32)mColumn->mParentCtrl->getItemListRect().getWidth();
- }
-
- // tell scroll list to layout columns again
- // do immediate update to get proper feedback to resize handle
- // which needs to know how far the resize actually went
- mColumn->mParentCtrl->updateColumns();
- }
-}
-
-void LLColumnHeader::setHasResizableElement(BOOL resizable)
-{
- // for now, dynamically spaced columns can't be resized
-// if (mColumn->mDynamicWidth) return;
-
- if (mHasResizableElement != resizable)
- {
- mColumn->mParentCtrl->dirtyColumns();
- mHasResizableElement = resizable;
- }
-}
-
-void LLColumnHeader::updateResizeBars()
-{
- S32 num_resizable_columns = 0;
- S32 col;
- for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
- {
- LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
- if (columnp->mHeader && columnp->mHeader->canResize())
- {
- num_resizable_columns++;
- }
- }
-
- S32 num_resizers_enabled = 0;
-
- // now enable/disable resize handles on resizable columns if we have at least two
- for (col = 0; col < mColumn->mParentCtrl->getNumColumns(); col++)
- {
- LLScrollListColumn* columnp = mColumn->mParentCtrl->getColumn(col);
- if (!columnp->mHeader) continue;
- BOOL enable = num_resizable_columns >= 2 && num_resizers_enabled < (num_resizable_columns - 1) && columnp->mHeader->canResize();
- columnp->mHeader->enableResizeBar(enable);
- if (enable)
- {
- num_resizers_enabled++;
- }
- }
-}
-
-void LLColumnHeader::enableResizeBar(BOOL enable)
-{
- // for now, dynamically spaced columns can't be resized
- //if (!mColumn->mDynamicWidth)
- {
- mResizeBar->setEnabled(enable);
- }
-}
-
-BOOL LLColumnHeader::canResize()
-{
- return getVisible() && (mHasResizableElement || mColumn->mDynamicWidth);
-}
-
-void LLScrollListColumn::setWidth(S32 width)
-{
- if (!mDynamicWidth && mRelWidth <= 0.f)
- {
- mParentCtrl->updateStaticColumnWidth(this, width);
- }
- mWidth = width;
-}
-
-// Default constructor
-LLScrollListColumn::LLScrollListColumn() :
- mName(),
- mSortingColumn(),
- mSortAscending(TRUE),
- mLabel(),
- mWidth(-1),
- mRelWidth(-1.0),
- mDynamicWidth(FALSE),
- mMaxContentWidth(0),
- mIndex(-1),
- mParentCtrl(NULL),
- mHeader(NULL),
- mFontAlignment(LLFontGL::LEFT)
-{ }
-
-LLScrollListColumn::LLScrollListColumn(const LLSD &sd, LLScrollListCtrl* parent) :
- mWidth(0),
- mIndex (-1),
- mParentCtrl(parent),
- mHeader(NULL),
- mMaxContentWidth(0),
- mDynamicWidth(FALSE),
- mRelWidth(-1.f)
-{
- mName = sd.get("name").asString();
- mSortingColumn = mName;
- if (sd.has("sort"))
- {
- mSortingColumn = sd.get("sort").asString();
- }
- mSortAscending = TRUE;
- if (sd.has("sort_ascending"))
- {
- mSortAscending = sd.get("sort_ascending").asBoolean();
- }
- mLabel = sd.get("label").asString();
- if (sd.has("relwidth") && (F32)sd.get("relwidth").asReal() > 0)
- {
- mRelWidth = (F32)sd.get("relwidth").asReal();
- if (mRelWidth < 0) mRelWidth = 0;
- if (mRelWidth > 1) mRelWidth = 1;
- mDynamicWidth = FALSE;
- }
- else if(sd.has("dynamicwidth") && (BOOL)sd.get("dynamicwidth").asBoolean() == TRUE)
- {
- mDynamicWidth = TRUE;
- mRelWidth = -1;
- }
- else
- {
-
- setWidth(sd.get("width").asInteger());
- }
-
- if (sd.has("halign"))
- {
- mFontAlignment = (LLFontGL::HAlign)llclamp(sd.get("halign").asInteger(), (S32)LLFontGL::LEFT, (S32)LLFontGL::HCENTER);
- }
- else
- {
- mFontAlignment = LLFontGL::LEFT;
- }
-
-}
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index 72d8894afa..461df6760f 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -1,5 +1,8 @@
/**
* @file llscrolllistctrl.h
+ * @brief A scrolling list of items. This is the one you want to use
+ * in UI code. LLScrollListCell, LLScrollListItem, etc. are utility
+ * classes.
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
@@ -37,346 +40,109 @@
#include "lluictrl.h"
#include "llctrlselectioninterface.h"
-#include "lldarray.h"
+//#include "lldarray.h"
#include "llfontgl.h"
#include "llui.h"
-#include "llstring.h"
-#include "llimagegl.h"
+#include "llstring.h" // LLWString
+//#include "llimagegl.h"
#include "lleditmenuhandler.h"
#include "llframetimer.h"
-#include "llcheckboxctrl.h"
-#include "llcombobox.h"
+
#include "llscrollbar.h"
-#include "llresizebar.h"
#include "lldate.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcolumn.h"
-/*
- * Represents a cell in a scrollable table.
- *
- * Sub-classes must return height and other properties
- * though width accessors are implemented by the base class.
- * It is therefore important for sub-class constructors to call
- * setWidth() with realistic values.
- */
-class LLScrollListCell
-{
-public:
- LLScrollListCell(S32 width = 0) : mWidth(width) {};
- virtual ~LLScrollListCell() {};
- virtual void draw(const LLColor4& color, const LLColor4& highlight_color) const = 0; // truncate to given width, if possible
- virtual S32 getWidth() const {return mWidth;}
- virtual S32 getContentWidth() const { return 0; }
- virtual S32 getHeight() const = 0;
- virtual const LLSD getValue() const { return LLStringUtil::null; }
- virtual void setValue(const LLSD& value) { }
- virtual BOOL getVisible() const { return TRUE; }
- virtual void setWidth(S32 width) { mWidth = width; }
- virtual void highlightText(S32 offset, S32 num_chars) {}
- virtual BOOL isText() const = 0;
- virtual void setColor(const LLColor4&) {}
- virtual void onCommit() {};
-
- virtual BOOL handleClick() { return FALSE; }
- virtual void setEnabled(BOOL enable) { }
-
-private:
- S32 mWidth;
-};
-
-/*
- * Draws a horizontal line.
- */
-class LLScrollListSeparator : public LLScrollListCell
-{
-public:
- LLScrollListSeparator(S32 width);
- virtual ~LLScrollListSeparator() {};
- virtual void draw(const LLColor4& color, const LLColor4& highlight_color) const; // truncate to given width, if possible
- virtual S32 getHeight() const;
- virtual BOOL isText() const { return FALSE; }
-};
-
-/*
- * Cell displaying a text label.
- */
-class LLScrollListText : public LLScrollListCell
-{
-public:
- LLScrollListText( const std::string& text, const LLFontGL* font, S32 width = 0, U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, LLColor4& color = LLColor4::black, BOOL use_color = FALSE, BOOL visible = TRUE);
- /*virtual*/ ~LLScrollListText();
-
- virtual void draw(const LLColor4& color, const LLColor4& highlight_color) const;
- virtual S32 getContentWidth() const;
- virtual S32 getHeight() const;
- virtual void setValue(const LLSD& value);
- virtual const LLSD getValue() const;
- virtual BOOL getVisible() const;
- virtual void highlightText(S32 offset, S32 num_chars);
-
- virtual void setColor(const LLColor4&);
- virtual BOOL isText() const;
-
- void setText(const LLStringExplicit& text);
- void setFontStyle(const U8 font_style) { mFontStyle = font_style; }
-
-private:
- LLUIString mText;
- const LLFontGL* mFont;
- LLColor4 mColor;
- U8 mUseColor;
- U8 mFontStyle;
- LLFontGL::HAlign mFontAlignment;
- BOOL mVisible;
- S32 mHighlightCount;
- S32 mHighlightOffset;
-
- LLPointer<LLUIImage> mRoundedRectImage;
-
- static U32 sCount;
-};
-
+class LLScrollListCell;
+class LLTextBox;
-class LLScrollListDate : public LLScrollListText
-{
-public:
- LLScrollListDate( const LLDate& date, const LLFontGL* font, S32 width=0, U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, LLColor4& color = LLColor4::black, BOOL use_color = FALSE, BOOL visible = TRUE);
- virtual void setValue(const LLSD& value);
- virtual const LLSD getValue() const;
-
-private:
- LLDate mDate;
-};
-
-/*
- * Cell displaying an image.
- */
-class LLScrollListIcon : public LLScrollListCell
-{
-public:
- LLScrollListIcon( LLUIImagePtr icon, S32 width = 0);
- LLScrollListIcon(const LLSD& value, S32 width = 0);
- /*virtual*/ ~LLScrollListIcon();
- virtual void draw(const LLColor4& color, const LLColor4& highlight_color) const;
- virtual S32 getWidth() const;
- virtual S32 getHeight() const { return mIcon ? mIcon->getHeight() : 0; }
- virtual const LLSD getValue() const { return mIcon.isNull() ? LLStringUtil::null : mIcon->getName(); }
- virtual void setColor(const LLColor4&);
- virtual BOOL isText()const { return FALSE; }
- virtual void setValue(const LLSD& value);
-
-private:
- LLUIImagePtr mIcon;
- LLColor4 mColor;
-};
-
-/*
- * An interactive cell containing a check box.
- */
-class LLScrollListCheck : public LLScrollListCell
-{
-public:
- LLScrollListCheck( LLCheckBoxCtrl* check_box, S32 width = 0);
- /*virtual*/ ~LLScrollListCheck();
- virtual void draw(const LLColor4& color, const LLColor4& highlight_color) const;
- virtual S32 getHeight() const { return 0; }
- virtual const LLSD getValue() const { return mCheckBox->getValue(); }
- virtual void setValue(const LLSD& value) { mCheckBox->setValue(value); }
- virtual void onCommit() { mCheckBox->onCommit(); }
-
- virtual BOOL handleClick();
- virtual void setEnabled(BOOL enable) { mCheckBox->setEnabled(enable); }
-
- LLCheckBoxCtrl* getCheckBox() { return mCheckBox; }
- virtual BOOL isText() const { return FALSE; }
-
-private:
- LLCheckBoxCtrl* mCheckBox;
-};
-
-/*
- * A simple data class describing a column within a scroll list.
- */
-class LLScrollListColumn
-{
-public:
- LLScrollListColumn();
- LLScrollListColumn(const LLSD &sd, LLScrollListCtrl* parent);
-
- void setWidth(S32 width);
- S32 getWidth() const { return mWidth; }
-
- // Public data is fine so long as this remains a simple struct-like data class.
- // If it ever gets any smarter than that, these should all become private
- // with protected or public accessor methods added as needed. -MG
- std::string mName;
- std::string mSortingColumn;
- BOOL mSortAscending;
- std::string mLabel;
- F32 mRelWidth;
- BOOL mDynamicWidth;
- S32 mMaxContentWidth;
- S32 mIndex;
- LLScrollListCtrl* mParentCtrl;
- class LLColumnHeader* mHeader;
- LLFontGL::HAlign mFontAlignment;
-
-private:
- S32 mWidth;
-
-};
-
-class LLColumnHeader : public LLComboBox
-{
-public:
- LLColumnHeader(const std::string& label, const LLRect &rect, LLScrollListColumn* column, const LLFontGL *font = NULL);
- ~LLColumnHeader();
-
- /*virtual*/ void draw();
- /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
-
- /*virtual*/ void showList();
- /*virtual*/ LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding);
- /*virtual*/ void userSetShape(const LLRect& new_rect);
-
- void setImage(const std::string &image_name);
- LLScrollListColumn* getColumn() { return mColumn; }
- void setHasResizableElement(BOOL resizable);
- void updateResizeBars();
- BOOL canResize();
- void enableResizeBar(BOOL enable);
- std::string getLabel() { return mOrigLabel; }
-
- static void onSelectSort(LLUICtrl* ctrl, void* user_data);
- static void onClick(void* user_data);
- static void onMouseDown(void* user_data);
- static void onHeldDown(void* user_data);
-
-private:
- LLScrollListColumn* mColumn;
- LLResizeBar* mResizeBar;
- std::string mOrigLabel;
- LLUIString mAscendingText;
- LLUIString mDescendingText;
- BOOL mShowSortOptions;
- BOOL mHasResizableElement;
-};
-
-class LLScrollListItem
+class LLScrollListCtrl : public LLUICtrl, public LLEditMenuHandler,
+ public LLCtrlListInterface, public LLCtrlScrollInterface
{
public:
- LLScrollListItem( BOOL enabled = TRUE, void* userdata = NULL, const LLUUID& uuid = LLUUID::null )
- : mSelected(FALSE), mEnabled( enabled ), mUserdata( userdata ), mItemValue( uuid ), mColumns() {}
- LLScrollListItem( LLSD item_value, void* userdata = NULL )
- : mSelected(FALSE), mEnabled( TRUE ), mUserdata( userdata ), mItemValue( item_value ), mColumns() {}
-
- virtual ~LLScrollListItem();
-
- void setSelected( BOOL b ) { mSelected = b; }
- BOOL getSelected() const { return mSelected; }
-
- void setEnabled( BOOL b );
- BOOL getEnabled() const { return mEnabled; }
-
- void setUserdata( void* userdata ) { mUserdata = userdata; }
- void* getUserdata() const { return mUserdata; }
+ struct Contents : public LLInitParam::Block<Contents>
+ {
+ Multiple<LLScrollListColumn::Params> columns;
+ Multiple<LLScrollListItem::Params> rows;
- LLUUID getUUID() const { return mItemValue.asUUID(); }
- LLSD getValue() const { return mItemValue; }
+ //Multiple<Contents> groups;
- // If width = 0, just use the width of the text. Otherwise override with
- // specified width in pixels.
- void addColumn( const std::string& text, const LLFontGL* font, S32 width = 0 , U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, BOOL visible = TRUE)
- { mColumns.push_back( new LLScrollListText(text, font, width, font_style, font_alignment, LLColor4::black, FALSE, visible) ); }
+ Contents();
+ };
- void addColumn( LLUIImagePtr icon, S32 width = 0 )
- { mColumns.push_back( new LLScrollListIcon(icon, width) ); }
-
- void addColumn( LLCheckBoxCtrl* check, S32 width = 0 )
- { mColumns.push_back( new LLScrollListCheck(check,width) ); }
-
- void setNumColumns(S32 columns);
-
- void setColumn( S32 column, LLScrollListCell *cell );
+ // *TODO: Add callbacks to Params
+ typedef boost::function<void (void)> callback_t;
- S32 getNumColumns() const { return mColumns.size(); }
-
- LLScrollListCell *getColumn(const S32 i) const { if (0 <= i && i < (S32)mColumns.size()) { return mColumns[i]; } return NULL; }
-
- std::string getContentsCSV() const;
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ // behavioral flags
+ Optional<bool> multi_select,
+ commit_on_keyboard_movement;
+
+ // display flags
+ Optional<bool> has_border,
+ draw_heading,
+ draw_stripes,
+ background_visible;
+
+ // layout
+ Optional<S32> column_padding,
+ heading_height;
+
+ // sort and search behavior
+ Optional<S32> search_column,
+ sort_column;
+ Optional<bool> sort_ascending;
+
+ // colors
+ Optional<LLUIColor> fg_unselected_color,
+ fg_selected_color,
+ bg_selected_color,
+ fg_disable_color,
+ bg_writeable_color,
+ bg_read_only_color,
+ bg_stripe_color,
+ hovered_color,
+ highlighted_color;
+
+ Optional<Contents> contents;
+
+ Params();
+ };
- virtual void draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding);
+protected:
+ friend class LLUICtrlFactory;
-private:
- BOOL mSelected;
- BOOL mEnabled;
- void* mUserdata;
- LLSD mItemValue;
- std::vector<LLScrollListCell *> mColumns;
-};
-
-/*
- * A graphical control representing a scrollable table.
- * Cells in the table can be simple text or more complicated things
- * such as icons or even interactive elements like check boxes.
- */
-class LLScrollListItemComment : public LLScrollListItem
-{
-public:
- LLScrollListItemComment(const std::string& comment_string, const LLColor4& color);
+ LLScrollListCtrl(const Params&);
- /*virtual*/ void draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding);
-private:
- LLColor4 mColor;
-};
-
-class LLScrollListItemSeparator : public LLScrollListItem
-{
public:
- LLScrollListItemSeparator();
-
- /*virtual*/ void draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding);
-};
-
-class LLScrollListCtrl : public LLUICtrl, public LLEditMenuHandler,
- public LLCtrlListInterface, public LLCtrlScrollInterface
-{
-public:
- LLScrollListCtrl(
- const std::string& name,
- const LLRect& rect,
- void (*commit_callback)(LLUICtrl*, void*),
- void* callback_userdata,
- BOOL allow_multiple_selection,
- BOOL draw_border = TRUE);
-
virtual ~LLScrollListCtrl();
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- void setScrollListParameters(LLXMLNodePtr node);
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-
S32 isEmpty() const;
void deleteAllItems() { clearRows(); }
// Sets an array of column descriptors
- void setColumnHeadings(LLSD headings);
+ void setColumnHeadings(const LLSD& headings);
void sortByColumnIndex(U32 column, BOOL ascending);
// LLCtrlListInterface functions
virtual S32 getItemCount() const;
// Adds a single column descriptor: ["name" : string, "label" : string, "width" : integer, "relwidth" : integer ]
- virtual void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM);
+ virtual void addColumn(const LLScrollListColumn::Params& column, EAddPosition pos = ADD_BOTTOM);
+ virtual void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM);
virtual void clearColumns();
virtual void setColumnLabel(const std::string& column, const std::string& label);
-
+ virtual bool preProcessChildNode(LLXMLNodePtr child);
virtual LLScrollListColumn* getColumn(S32 index);
+ virtual LLScrollListColumn* getColumn(const std::string& name);
virtual S32 getNumColumns() const { return mColumnsIndexed.size(); }
// Adds a single element, from an array of:
// "columns" => [ "column" => column name, "value" => value, "type" => type, "font" => font, "font-style" => style ], "id" => uuid
// Creates missing columns automatically.
- virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
+ virtual LLScrollListItem* addElement(const LLSD& element, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
+ virtual LLScrollListItem* addRow(const LLScrollListItem::Params& value, EAddPosition pos = ADD_BOTTOM);
// Simple add element. Takes a single array of:
// [ "value" => value, "font" => font, "font-style" => style ]
virtual void clearRows(); // clears all elements
@@ -421,10 +187,14 @@ public:
void deleteSelectedItems();
void deselectAllItems(BOOL no_commit_on_change = FALSE); // by default, go ahead and commit on selection change
- void highlightNthItem( S32 index );
- void setDoubleClickCallback( void (*cb)(void*) ) { mOnDoubleClickCallback = cb; }
- void setMaximumSelectCallback( void (*cb)(void*) ) { mOnMaximumSelectCallback = cb; }
- void setSortChangedCallback( void (*cb)(void*) ) { mOnSortChangedCallback = cb; }
+ void clearHighlightedItems();
+ void mouseOverHighlightNthItem( S32 index );
+
+ void setDoubleClickCallback( callback_t cb ) { mOnDoubleClickCallback = cb; }
+ void setMaximumSelectCallback( callback_t cb) { mOnMaximumSelectCallback = cb; }
+ void setSortChangedCallback( callback_t cb) { mOnSortChangedCallback = cb; }
+ // Convenience function; *TODO: replace with setter above + boost::bind() in calling code
+ void setDoubleClickCallback( boost::function<void (void* userdata)> cb, void* userdata) { mOnDoubleClickCallback = boost::bind(cb, userdata); }
void swapWithNext(S32 index);
void swapWithPrevious(S32 index);
@@ -435,21 +205,21 @@ public:
S32 getItemIndex( LLScrollListItem* item ) const;
S32 getItemIndex( const LLUUID& item_id ) const;
- LLScrollListItem* addCommentText( const std::string& comment_text, EAddPosition pos = ADD_BOTTOM);
+ void setCommentText( const std::string& comment_text);
LLScrollListItem* addSeparator(EAddPosition pos);
// "Simple" interface: use this when you're creating a list that contains only unique strings, only
// one of which can be selected at a time.
virtual LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos = ADD_BOTTOM, const LLSD& id = LLSD());
-
BOOL selectItemByLabel( const std::string& item, BOOL case_sensitive = TRUE ); // FALSE if item not found
BOOL selectItemByPrefix(const std::string& target, BOOL case_sensitive = TRUE);
BOOL selectItemByPrefix(const LLWString& target, BOOL case_sensitive = TRUE);
+ LLScrollListItem* getItemByLabel( const std::string& item, BOOL case_sensitive = TRUE, S32 column = 0 );
const std::string getSelectedItemLabel(S32 column = 0) const;
LLSD getSelectedValue();
- // DEPRECATED: Use LLSD versions of addCommentText() and getSelectedValue().
+ // DEPRECATED: Use LLSD versions of setCommentText() and getSelectedValue().
// "StringUUID" interface: use this when you're creating a list that contains non-unique strings each of which
// has an associated, unique UUID, and only one of which can be selected at a time.
LLScrollListItem* addStringUUIDItem(const std::string& item_text, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE, S32 column_width = 0);
@@ -475,7 +245,8 @@ public:
void setBgStripeColor(const LLColor4& c) { mBgStripeColor = c; }
void setFgSelectedColor(const LLColor4 &c) { mFgSelectedColor = c; }
void setFgUnselectedColor(const LLColor4 &c){ mFgUnselectedColor = c; }
- void setHighlightedColor(const LLColor4 &c) { mHighlightedColor = c; }
+ void setHoveredColor(const LLColor4 &c) { mHoveredColor = c; }
+ void setHighlightedColor(const LLColor4 &c) { mHighlightedColor = c; }
void setFgDisableColor(const LLColor4 &c) { mFgDisabledColor = c; }
void setBackgroundVisible(BOOL b) { mBackgroundVisible = b; }
@@ -514,6 +285,7 @@ public:
/*virtual*/ void setFocus( BOOL b );
/*virtual*/ void onFocusReceived();
/*virtual*/ void onFocusLost();
+ /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
virtual BOOL isDirty() const;
@@ -528,15 +300,14 @@ public:
LLRect getItemListRect() { return mItemListRect; }
// Used "internally" by the scroll bar.
- static void onScrollChange( S32 new_pos, LLScrollbar* src, void* userdata );
+ void onScrollChange( S32 new_pos, LLScrollbar* src );
static void onClickColumn(void *userdata);
- void updateColumns();
+ virtual void updateColumns();
void calcColumnWidths();
S32 getMaxContentWidth() { return mMaxContentWidth; }
- void setDisplayHeading(BOOL display);
void setHeadingHeight(S32 heading_height);
void setCollapseEmptyColumns(BOOL collapse);
@@ -561,7 +332,7 @@ public:
BOOL getSortAscending() { return mSortColumns.empty() ? TRUE : mSortColumns.back().second; }
BOOL needsSorting();
- S32 selectMultiple( LLDynamicArray<LLUUID> ids );
+ S32 selectMultiple( std::vector<LLUUID> ids );
void sortItems();
// sorts a list without affecting the permanent sort order (so further list insertions can be unsorted, for example)
void sortOnce(S32 column, BOOL ascending);
@@ -604,7 +375,6 @@ private:
void commitIfChanged();
BOOL setSort(S32 column, BOOL ascending);
-
S32 mCurIndex; // For get[First/Next]Data
S32 mCurSelectedIndex; // For get[First/Next]Selected
@@ -621,7 +391,7 @@ private:
BOOL mSelectionChanged;
BOOL mNeedsScroll;
BOOL mCanSelect;
- BOOL mDisplayColumnHeaders;
+ const BOOL mDisplayColumnHeaders;
BOOL mColumnsDirty;
item_list mItemList;
@@ -637,19 +407,20 @@ private:
BOOL mBackgroundVisible;
BOOL mDrawStripes;
- LLColor4 mBgWriteableColor;
- LLColor4 mBgReadOnlyColor;
- LLColor4 mBgSelectedColor;
- LLColor4 mBgStripeColor;
- LLColor4 mFgSelectedColor;
- LLColor4 mFgUnselectedColor;
- LLColor4 mFgDisabledColor;
- LLColor4 mHighlightedColor;
+ LLUIColor mBgWriteableColor;
+ LLUIColor mBgReadOnlyColor;
+ LLUIColor mBgSelectedColor;
+ LLUIColor mBgStripeColor;
+ LLUIColor mFgSelectedColor;
+ LLUIColor mFgUnselectedColor;
+ LLUIColor mFgDisabledColor;
+ LLUIColor mHoveredColor;
+ LLUIColor mHighlightedColor;
S32 mBorderThickness;
- void (*mOnDoubleClickCallback)(void* userdata);
- void (*mOnMaximumSelectCallback)(void* userdata );
- void (*mOnSortChangedCallback)(void* userdata);
+ callback_t mOnDoubleClickCallback;
+ callback_t mOnMaximumSelectCallback;
+ callback_t mOnSortChangedCallback;
S32 mHighlightedItem;
class LLViewBorder* mBorder;
@@ -678,7 +449,15 @@ private:
// HACK: Did we draw one selected item this frame?
BOOL mDrewSelected;
+
+ LLTextBox* mCommentTextBox;
}; // end class LLScrollListCtrl
+#ifdef LL_WINDOWS
+#ifndef INSTANTIATE_GETCHILD_SCROLLLIST
+#pragma warning (disable : 4231)
+extern template LLScrollListCtrl* LLView::getChild<LLScrollListCtrl>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
+#endif
+#endif
#endif // LL_SCROLLLISTCTRL_H
diff --git a/indra/llui/llscrolllistitem.cpp b/indra/llui/llscrolllistitem.cpp
new file mode 100644
index 0000000000..2ac6925c78
--- /dev/null
+++ b/indra/llui/llscrolllistitem.cpp
@@ -0,0 +1,157 @@
+/**
+ * @file llscrolllistitem.cpp
+ * @brief Scroll lists are composed of rows (items), each of which
+ * contains columns (cells).
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llscrolllistitem.h"
+
+#include "llrect.h"
+#include "llresmgr.h" // LLFONT_SANSSERIF_SMALL
+#include "llui.h"
+
+
+//---------------------------------------------------------------------------
+// LLScrollListItem
+//---------------------------------------------------------------------------
+
+LLScrollListItem::LLScrollListItem( const Params& p )
+: mSelected(FALSE),
+ mHighlighted(FALSE),
+ mEnabled(p.enabled),
+ mUserdata(p.userdata),
+ mItemValue(p.value)
+{
+}
+
+
+LLScrollListItem::~LLScrollListItem()
+{
+ std::for_each(mColumns.begin(), mColumns.end(), DeletePointer());
+}
+
+void LLScrollListItem::addColumn(const LLScrollListCell::Params& p)
+{
+ mColumns.push_back(LLScrollListCell::create(p));
+}
+
+void LLScrollListItem::setNumColumns(S32 columns)
+{
+ S32 prev_columns = mColumns.size();
+ if (columns < prev_columns)
+ {
+ std::for_each(mColumns.begin()+columns, mColumns.end(), DeletePointer());
+ }
+
+ mColumns.resize(columns);
+
+ for (S32 col = prev_columns; col < columns; ++col)
+ {
+ mColumns[col] = NULL;
+ }
+}
+
+void LLScrollListItem::setColumn( S32 column, LLScrollListCell *cell )
+{
+ if (column < (S32)mColumns.size())
+ {
+ delete mColumns[column];
+ mColumns[column] = cell;
+ }
+ else
+ {
+ llerrs << "LLScrollListItem::setColumn: bad column: " << column << llendl;
+ }
+}
+
+
+S32 LLScrollListItem::getNumColumns() const
+{
+ return mColumns.size();
+}
+
+LLScrollListCell* LLScrollListItem::getColumn(const S32 i) const
+{
+ if (0 <= i && i < (S32)mColumns.size())
+ {
+ return mColumns[i];
+ }
+ return NULL;
+}
+
+std::string LLScrollListItem::getContentsCSV() const
+{
+ std::string ret;
+
+ S32 count = getNumColumns();
+ for (S32 i=0; i<count; ++i)
+ {
+ ret += getColumn(i)->getValue().asString();
+ if (i < count-1)
+ {
+ ret += ", ";
+ }
+ }
+
+ return ret;
+}
+
+
+void LLScrollListItem::draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding)
+{
+ // draw background rect
+ gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+ LLRect bg_rect = rect;
+ gl_rect_2d( bg_rect, bg_color );
+
+ S32 cur_x = rect.mLeft;
+ S32 num_cols = getNumColumns();
+ S32 cur_col = 0;
+
+ for (LLScrollListCell* cell = getColumn(0); cur_col < num_cols; cell = getColumn(++cur_col))
+ {
+ // Two ways a cell could be hidden
+ if (cell->getWidth() < 0
+ || !cell->getVisible()) continue;
+
+ LLUI::pushMatrix();
+ {
+ LLUI::translate((F32) cur_x, (F32) rect.mBottom, 0.0f);
+
+ cell->draw( fg_color, highlight_color );
+ }
+ LLUI::popMatrix();
+
+ cur_x += cell->getWidth() + column_padding;
+ }
+}
+
diff --git a/indra/llui/llscrolllistitem.h b/indra/llui/llscrolllistitem.h
new file mode 100644
index 0000000000..8d87137c3a
--- /dev/null
+++ b/indra/llui/llscrolllistitem.h
@@ -0,0 +1,129 @@
+/**
+ * @file llscrolllistitem.h
+ * @brief Scroll lists are composed of rows (items), each of which
+ * contains columns (cells).
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LLSCROLLLISTITEM_H
+#define LLSCROLLLISTITEM_H
+
+#include "llfontgl.h" // LLFontGL::HAlign
+#include "llpointer.h" // LLPointer<>
+#include "llsd.h"
+#include "lluistring.h"
+#include "v4color.h"
+#include "llinitparam.h"
+#include "llscrolllistcell.h"
+
+#include <vector>
+
+class LLCoordGL;
+class LLCheckBoxCtrl;
+class LLResizeBar;
+class LLScrollListCtrl;
+class LLScrollColumnHeader;
+class LLUIImage;
+
+//---------------------------------------------------------------------------
+// LLScrollListItem
+//---------------------------------------------------------------------------
+class LLScrollListItem
+{
+ friend class LLScrollListCtrl;
+public:
+ struct Params : public LLInitParam::Block<Params>
+ {
+ Optional<bool> enabled;
+ Optional<void*> userdata;
+ Optional<LLSD> value;
+
+ Deprecated name; // use for localization tools
+ Deprecated type;
+ Deprecated length;
+
+ Multiple<LLScrollListCell::Params> cells;
+
+ Params()
+ : enabled("enabled", true),
+ value("value"),
+ name("name"),
+ type("type"),
+ length("length"),
+ cells("columns")
+ {
+ addSynonym(cells, "column");
+ addSynonym(value, "id");
+ }
+ };
+
+ virtual ~LLScrollListItem();
+
+ void setSelected( BOOL b ) { mSelected = b; }
+ BOOL getSelected() const { return mSelected; }
+
+ void setEnabled( BOOL b ) { mEnabled = b; }
+ BOOL getEnabled() const { return mEnabled; }
+
+ void setHighlighted( BOOL b ) { mHighlighted = b; }
+ BOOL getHighlighted() const { return mHighlighted; }
+
+ void setUserdata( void* userdata ) { mUserdata = userdata; }
+ void* getUserdata() const { return mUserdata; }
+
+ LLUUID getUUID() const { return mItemValue.asUUID(); }
+ LLSD getValue() const { return mItemValue; }
+
+ void addColumn( const LLScrollListCell::Params& p );
+
+ void setNumColumns(S32 columns);
+
+ void setColumn( S32 column, LLScrollListCell *cell );
+
+ S32 getNumColumns() const;
+
+ LLScrollListCell *getColumn(const S32 i) const;
+
+ std::string getContentsCSV() const;
+
+ virtual void draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding);
+
+protected:
+ LLScrollListItem( const Params& );
+
+private:
+ BOOL mSelected;
+ BOOL mHighlighted;
+ BOOL mEnabled;
+ void* mUserdata;
+ LLSD mItemValue;
+ std::vector<LLScrollListCell *> mColumns;
+};
+
+#endif
diff --git a/indra/llui/llsdparam.cpp b/indra/llui/llsdparam.cpp
new file mode 100644
index 0000000000..1b0f3c9885
--- /dev/null
+++ b/indra/llui/llsdparam.cpp
@@ -0,0 +1,158 @@
+/**
+ * @file llsdparam.cpp
+ * @brief parameter block abstraction for creating complex objects and
+ * parsing construction parameters from xml and LLSD
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+// Project includes
+#include "llsdparam.h"
+
+//
+// LLParamSDParser
+//
+LLParamSDParser::LLParamSDParser()
+{
+ using boost::bind;
+
+ registerParserFuncs<S32>(bind(&LLParamSDParser::readTypedValue<S32>, this, _1, &LLSD::asInteger),
+ bind(&LLParamSDParser::writeTypedValue<S32>, this, _1, _2));
+ registerParserFuncs<U32>(bind(&LLParamSDParser::readTypedValue<U32>, this, _1, &LLSD::asInteger),
+ bind(&LLParamSDParser::writeU32Param, this, _1, _2));
+ registerParserFuncs<F32>(bind(&LLParamSDParser::readTypedValue<F32>, this, _1, &LLSD::asReal),
+ bind(&LLParamSDParser::writeTypedValue<F32>, this, _1, _2));
+ registerParserFuncs<F64>(bind(&LLParamSDParser::readTypedValue<F64>, this, _1, &LLSD::asReal),
+ bind(&LLParamSDParser::writeTypedValue<F64>, this, _1, _2));
+ registerParserFuncs<bool>(bind(&LLParamSDParser::readTypedValue<F32>, this, _1, &LLSD::asBoolean),
+ bind(&LLParamSDParser::writeTypedValue<F32>, this, _1, _2));
+ registerParserFuncs<std::string>(bind(&LLParamSDParser::readTypedValue<std::string>, this, _1, &LLSD::asString),
+ bind(&LLParamSDParser::writeTypedValue<std::string>, this, _1, _2));
+ registerParserFuncs<LLUUID>(bind(&LLParamSDParser::readTypedValue<LLUUID>, this, _1, &LLSD::asUUID),
+ bind(&LLParamSDParser::writeTypedValue<LLUUID>, this, _1, _2));
+ registerParserFuncs<LLDate>(bind(&LLParamSDParser::readTypedValue<LLDate>, this, _1, &LLSD::asDate),
+ bind(&LLParamSDParser::writeTypedValue<LLDate>, this, _1, _2));
+ registerParserFuncs<LLURI>(bind(&LLParamSDParser::readTypedValue<LLURI>, this, _1, &LLSD::asURI),
+ bind(&LLParamSDParser::writeTypedValue<LLURI>, this, _1, _2));
+ registerParserFuncs<LLSD>(bind(&LLParamSDParser::readSDParam, this, _1),
+ bind(&LLParamSDParser::writeTypedValue<LLSD>, this, _1, _2));
+}
+
+bool LLParamSDParser::readSDParam(void* value_ptr)
+{
+ if (!mCurReadSD) return false;
+ *((LLSD*)value_ptr) = *mCurReadSD;
+ return true;
+}
+
+// special case handling of U32 due to ambiguous LLSD::assign overload
+bool LLParamSDParser::writeU32Param(const void* val_ptr, const parser_t::name_stack_t& name_stack)
+{
+ if (!mWriteSD) return false;
+
+ LLSD* sd_to_write = getSDWriteNode(name_stack);
+ if (!sd_to_write) return false;
+
+ sd_to_write->assign((S32)*((const U32*)val_ptr));
+ return true;
+}
+
+void LLParamSDParser::readSD(const LLSD& sd, LLInitParam::BaseBlock& block, bool silent)
+{
+ mCurReadSD = NULL;
+ mNameStack.clear();
+ setParseSilently(silent);
+
+ // must have named elements at top level to submit for parsing
+ if (sd.isMap())
+ {
+ readSDValues(sd, block);
+ }
+ else
+ {
+ parserWarning("Top level map required for LLSD->Block conversion");
+ }
+}
+
+void LLParamSDParser::writeSD(LLSD& sd, const LLInitParam::BaseBlock& block)
+{
+ mWriteSD = &sd;
+ block.serializeBlock(*this);
+}
+
+void LLParamSDParser::readSDValues(const LLSD& sd, LLInitParam::BaseBlock& block)
+{
+ if (sd.isMap())
+ {
+ for (LLSD::map_const_iterator it = sd.beginMap();
+ it != sd.endMap();
+ ++it)
+ {
+ mNameStack.push_back(make_pair(it->first, newParseGeneration()));
+ readSDValues(it->second, block);
+ mNameStack.pop_back();
+ }
+ }
+ else if (sd.isArray())
+ {
+ for (LLSD::array_const_iterator it = sd.beginArray();
+ it != sd.endArray();
+ ++it)
+ {
+ mNameStack.back().second = newParseGeneration();
+ readSDValues(*it, block);
+ }
+ }
+ else
+ {
+ mCurReadSD = &sd;
+ block.submitValue(mNameStack, *this);
+ }
+}
+
+/*virtual*/ std::string LLParamSDParser::getCurrentElementName()
+{
+ std::string full_name = "sd";
+ for (name_stack_t::iterator it = mNameStack.begin();
+ it != mNameStack.end();
+ ++it)
+ {
+ full_name += llformat("[%s]", it->first.c_str());
+ }
+
+ return full_name;
+}
+
+LLSD* LLParamSDParser::getSDWriteNode(const parser_t::name_stack_t& name_stack)
+{
+ //TODO: implement nested LLSD writing
+ return mWriteSD;
+}
+
diff --git a/indra/llui/llsdparam.h b/indra/llui/llsdparam.h
new file mode 100644
index 0000000000..12f28f876f
--- /dev/null
+++ b/indra/llui/llsdparam.h
@@ -0,0 +1,107 @@
+/**
+ * @file llsdparam.h
+ * @brief parameter block abstraction for creating complex objects and
+ * parsing construction parameters from xml and LLSD
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSDPARAM_H
+#define LL_LLSDPARAM_H
+
+#include "llinitparam.h"
+
+class LLParamSDParser
+: public LLInitParam::Parser,
+ public LLSingleton<LLParamSDParser>
+{
+LOG_CLASS(LLParamSDParser);
+
+typedef LLInitParam::Parser parser_t;
+
+protected:
+ LLParamSDParser();
+ friend class LLSingleton<LLParamSDParser>;
+public:
+ void readSD(const LLSD& sd, LLInitParam::BaseBlock& block, bool silent = false);
+ void writeSD(LLSD& sd, const LLInitParam::BaseBlock& block);
+
+ /*virtual*/ std::string getCurrentElementName();
+
+private:
+ void readSDValues(const LLSD& sd, LLInitParam::BaseBlock& block);
+
+ template<typename T>
+ bool readTypedValue(void* val_ptr, boost::function<T(const LLSD&)> parser_func)
+ {
+ if (!mCurReadSD) return false;
+
+ *((T*)val_ptr) = parser_func(*mCurReadSD);
+ return true;
+ }
+
+ template<typename T>
+ bool writeTypedValue(const void* val_ptr, const parser_t::name_stack_t& name_stack)
+ {
+ if (!mWriteSD) return false;
+
+ LLSD* sd_to_write = getSDWriteNode(name_stack);
+ if (!sd_to_write) return false;
+
+ sd_to_write->assign(*((const T*)val_ptr));
+ return true;
+ }
+
+ LLSD* getSDWriteNode(const parser_t::name_stack_t& name_stack);
+
+ bool readSDParam(void* value_ptr);
+ bool writeU32Param(const void* value_ptr, const parser_t::name_stack_t& name_stack);
+
+ Parser::name_stack_t mNameStack;
+ const LLSD* mCurReadSD;
+ LLSD* mWriteSD;
+};
+
+template<typename T>
+class LLSDParamAdapter : public T
+ {
+ public:
+ LLSDParamAdapter() {}
+ LLSDParamAdapter(const LLSD& sd)
+ {
+ LLParamSDParser::instance().readSD(sd, *this);
+ }
+
+ LLSDParamAdapter(const T& val)
+ {
+ T::operator=(val);
+ }
+ };
+
+#endif // LL_LLSDPARAM_H
+
diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp
new file mode 100644
index 0000000000..62b204fd56
--- /dev/null
+++ b/indra/llui/llsearcheditor.cpp
@@ -0,0 +1,124 @@
+/**
+ * @file lllineeditor.cpp
+ * @brief LLLineEditor base class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// Text editor widget to let users enter a single line.
+
+#include "linden_common.h"
+
+#include "llsearcheditor.h"
+
+static LLRegisterWidget<LLSearchEditor> r2("search_editor");
+
+LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p)
+: LLUICtrl(p)
+{
+ LLLineEditor::Params line_editor_p(p);
+ line_editor_p.name("search edit box");
+ line_editor_p.rect(getLocalRect());
+ line_editor_p.follows.flags(FOLLOWS_ALL);
+ line_editor_p.text_pad_right(getRect().getHeight());
+ line_editor_p.keystroke_callback(boost::bind(&LLSearchEditor::onSearchEdit, this, _1));
+
+ mSearchEdit = LLUICtrlFactory::create<LLLineEditor>(line_editor_p);
+ addChild(mSearchEdit);
+
+ S32 btn_width = getRect().getHeight(); // button is square, and as tall as search editor
+ LLRect clear_btn_rect(getRect().getWidth() - btn_width, getRect().getHeight(), getRect().getWidth(), 0);
+ LLButton::Params button_params(p.clear_search_button);
+ button_params.name(std::string("clear search"));
+ button_params.rect(clear_btn_rect) ;
+ button_params.follows.flags(FOLLOWS_RIGHT|FOLLOWS_TOP);
+ button_params.tab_stop(false);
+ button_params.click_callback.function(boost::bind(&LLSearchEditor::onClearSearch, this, _2));
+
+ mClearSearchButton = LLUICtrlFactory::create<LLButton>(button_params);
+ mSearchEdit->addChild(mClearSearchButton);
+}
+
+//virtual
+void LLSearchEditor::setValue(const LLSD& value )
+{
+ mSearchEdit->setValue(value);
+}
+
+//virtual
+LLSD LLSearchEditor::getValue() const
+{
+ return mSearchEdit->getValue();
+}
+
+//virtual
+BOOL LLSearchEditor::setTextArg( const std::string& key, const LLStringExplicit& text )
+{
+ return mSearchEdit->setTextArg(key, text);
+}
+
+//virtual
+BOOL LLSearchEditor::setLabelArg( const std::string& key, const LLStringExplicit& text )
+{
+ return mSearchEdit->setLabelArg(key, text);
+}
+
+//virtual
+void LLSearchEditor::clear()
+{
+ if (mSearchEdit)
+ {
+ mSearchEdit->clear();
+ }
+}
+
+void LLSearchEditor::draw()
+{
+ mClearSearchButton->setVisible(!mSearchEdit->getWText().empty());
+
+ LLUICtrl::draw();
+}
+
+
+void LLSearchEditor::onSearchEdit(LLLineEditor* caller )
+{
+ if (mSearchCallback)
+ {
+ mSearchCallback(caller->getText());
+ }
+}
+
+void LLSearchEditor::onClearSearch(const LLSD& data)
+{
+ setText(LLStringUtil::null);
+ if (mSearchCallback)
+ {
+ mSearchCallback(LLStringUtil::null);
+ }
+}
+
diff --git a/indra/llui/llsearcheditor.h b/indra/llui/llsearcheditor.h
new file mode 100644
index 0000000000..d8c5093fbf
--- /dev/null
+++ b/indra/llui/llsearcheditor.h
@@ -0,0 +1,98 @@
+/**
+ * @file llsearcheditor.h
+ * @brief Text editor widget that represents a search operation
+ *
+ * Features:
+ * Text entry of a single line (text, delete, left and right arrow, insert, return).
+ * Callbacks either on every keystroke or just on the return key.
+ * Focus (allow multiple text entry widgets)
+ * Clipboard (cut, copy, and paste)
+ * Horizontal scrolling to allow strings longer than widget size allows
+ * Pre-validation (limit which keys can be used)
+ * Optional line history so previous entries can be recalled by CTRL UP/DOWN
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSEARCHEDITOR_H
+#define LL_LLSEARCHEDITOR_H
+
+#include "lllineeditor.h"
+#include "llbutton.h"
+
+#include <boost/function.hpp>
+
+/*
+ * @brief A line editor with a button to clear it and a callback to call on every edit event.
+ */
+class LLSearchEditor : public LLUICtrl
+{
+public:
+ struct Params : public LLInitParam::Block<Params, LLLineEditor::Params>
+ {
+ Optional<boost::function<void(const std::string&, void*)> > search_callback;
+
+ Optional<LLButton::Params> clear_search_button;
+
+ Params()
+ : clear_search_button("clear_search_button")
+ {
+ name = "search_editor";
+ }
+ };
+
+protected:
+ LLSearchEditor(const Params&);
+ friend class LLUICtrlFactory;
+public:
+ virtual ~LLSearchEditor() {}
+
+ /*virtual*/ void draw();
+
+ void setText(const LLStringExplicit &new_text) { mSearchEdit->setText(new_text); }
+
+ typedef boost::function<void (const std::string& search_string)> search_callback_t;
+ void setSearchCallback(search_callback_t cb) { mSearchCallback = cb; }
+
+ // LLUICtrl interface
+ virtual void setValue(const LLSD& value );
+ virtual LLSD getValue() const;
+ virtual BOOL setTextArg( const std::string& key, const LLStringExplicit& text );
+ virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text );
+ virtual void clear();
+
+private:
+ void onSearchEdit(LLLineEditor* caller );
+ void onClearSearch(const LLSD& data);
+
+ LLLineEditor* mSearchEdit;
+ LLButton* mClearSearchButton;
+ search_callback_t mSearchCallback;
+};
+
+#endif // LL_LLSEARCHEDITOR_H
diff --git a/indra/llui/llslider.cpp b/indra/llui/llslider.cpp
index 4dfc904581..ff2f5d3da0 100644
--- a/indra/llui/llslider.cpp
+++ b/indra/llui/llslider.cpp
@@ -41,53 +41,48 @@
#include "llkeyboard.h" // for the MASK constants
#include "llcontrol.h"
#include "llimagegl.h"
+#include "lluictrlfactory.h"
static LLRegisterWidget<LLSlider> r1("slider_bar");
+//FIXME: make this into an unregistered template so that code constructed sliders don't
+// have ambigious template lookup problem
static LLRegisterWidget<LLSlider> r2("volume_slider");
+LLSlider::Params::Params()
+: track_color("track_color"),
+ thumb_outline_color("thumb_outline_color"),
+ thumb_center_color("thumb_center_color"),
+ thumb_image("thumb_image"),
+ track_image("track_image"),
+ track_highlight_image("track_highlight_image"),
+ mouse_down_callback("mouse_down_callback"),
+ mouse_up_callback("mouse_up_callback")
+{
+ follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
+}
-LLSlider::LLSlider(
- const std::string& name,
- const LLRect& rect,
- void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata),
- void* callback_userdata,
- F32 initial_value,
- F32 min_value,
- F32 max_value,
- F32 increment,
- BOOL volume,
- const std::string& control_name)
- :
- LLUICtrl( name, rect, TRUE, on_commit_callback, callback_userdata,
- FOLLOWS_LEFT | FOLLOWS_TOP),
- mValue( initial_value ),
- mInitialValue( initial_value ),
- mMinValue( min_value ),
- mMaxValue( max_value ),
- mIncrement( increment ),
- mVolumeSlider( volume ),
+LLSlider::LLSlider(const LLSlider::Params& p)
+: LLF32UICtrl(p),
mMouseOffset( 0 ),
- mTrackColor( LLUI::sColorsGroup->getColor( "SliderTrackColor" ) ),
- mThumbOutlineColor( LLUI::sColorsGroup->getColor( "SliderThumbOutlineColor" ) ),
- mThumbCenterColor( LLUI::sColorsGroup->getColor( "SliderThumbCenterColor" ) ),
- mMouseDownCallback( NULL ),
- mMouseUpCallback( NULL )
+ mTrackColor(p.track_color()),
+ mThumbOutlineColor(p.thumb_outline_color()),
+ mThumbCenterColor(p.thumb_center_color()),
+ mThumbImage(p.thumb_image),
+ mTrackImage(p.track_image),
+ mTrackHighlightImage(p.track_highlight_image)
{
- mThumbImage = LLUI::sImageProvider->getUIImage("icn_slide-thumb_dark.tga");
- mTrackImage = LLUI::sImageProvider->getUIImage("icn_slide-groove_dark.tga");
- mTrackHighlightImage = LLUI::sImageProvider->getUIImage("icn_slide-highlight.tga");
-
- // properly handle setting the starting thumb rect
- // do it this way to handle both the operating-on-settings
- // and standalone ways of using this
- setControlName(control_name, NULL);
- setValue(getValueF32());
-
+ mViewModel->setValue(p.initial_value);
updateThumbRect();
mDragStartThumbRect = mThumbRect;
+ setControlName(p.control_name, NULL);
+ setValue(getValueF32());
+
+ if (p.mouse_down_callback.isProvided())
+ initCommitCallback(p.mouse_down_callback, mMouseDownSignal);
+ if (p.mouse_up_callback.isProvided())
+ initCommitCallback(p.mouse_up_callback, mMouseUpSignal);
}
-
void LLSlider::setValue(F32 value, BOOL from_event)
{
value = llclamp( value, mMinValue, mMaxValue );
@@ -98,21 +93,22 @@ void LLSlider::setValue(F32 value, BOOL from_event)
value -= fmod(value, mIncrement);
value += mMinValue;
- if (!from_event && mValue != value)
+ if (!from_event && getValueF32() != value)
{
setControlValue(value);
}
- mValue = value;
+ LLF32UICtrl::setValue(value);
updateThumbRect();
}
void LLSlider::updateThumbRect()
{
- F32 t = (mValue - mMinValue) / (mMaxValue - mMinValue);
+ const S32 DEFAULT_THUMB_SIZE = 16;
+ F32 t = (getValueF32() - mMinValue) / (mMaxValue - mMinValue);
- S32 thumb_width = mThumbImage->getWidth();
- S32 thumb_height = mThumbImage->getHeight();
+ S32 thumb_width = mThumbImage ? mThumbImage->getWidth() : DEFAULT_THUMB_SIZE;
+ S32 thumb_height = mThumbImage ? mThumbImage->getHeight() : DEFAULT_THUMB_SIZE;
S32 left_edge = (thumb_width / 2);
S32 right_edge = getRect().getWidth() - (thumb_width / 2);
@@ -126,10 +122,10 @@ void LLSlider::updateThumbRect()
void LLSlider::setValueAndCommit(F32 value)
{
- F32 old_value = mValue;
+ F32 old_value = getValueF32();
setValue(value);
- if (mValue != old_value)
+ if (getValueF32() != old_value)
{
onCommit();
}
@@ -169,10 +165,8 @@ BOOL LLSlider::handleMouseUp(S32 x, S32 y, MASK mask)
{
gFocusMgr.setMouseCapture( NULL );
- if( mMouseUpCallback )
- {
- mMouseUpCallback( this, mCallbackUserData );
- }
+ mMouseUpSignal( this, getValueF32() );
+
handled = TRUE;
make_ui_sound("UISndClickRelease");
}
@@ -191,10 +185,7 @@ BOOL LLSlider::handleMouseDown(S32 x, S32 y, MASK mask)
{
setFocus(TRUE);
}
- if( mMouseDownCallback )
- {
- mMouseDownCallback( this, mCallbackUserData );
- }
+ mMouseDownSignal( this, getValueF32() );
if (MASK_CONTROL & mask) // if CTRL is modifying
{
@@ -257,8 +248,8 @@ void LLSlider::draw()
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
F32 opacity = getEnabled() ? 1.f : 0.3f;
- LLColor4 center_color = (mThumbCenterColor % opacity);
- LLColor4 track_color = (mTrackColor % opacity);
+ LLColor4 center_color = (mThumbCenterColor.get() % opacity);
+ LLColor4 track_color = (mTrackColor.get() % opacity);
// Track
LLRect track_rect(mThumbImage->getWidth() / 2,
@@ -273,7 +264,7 @@ void LLSlider::draw()
if( hasMouseCapture() )
{
// Show ghost where thumb was before dragging began.
- mThumbImage->draw(mDragStartThumbRect, mThumbCenterColor % 0.3f);
+ mThumbImage->draw(mDragStartThumbRect, mThumbCenterColor.get() % 0.3f);
}
if (hasFocus())
{
@@ -281,61 +272,7 @@ void LLSlider::draw()
mThumbImage->drawBorder(mThumbRect, gFocusMgr.getFocusColor(), gFocusMgr.getFocusFlashWidth());
}
// Fill in the thumb.
- mThumbImage->draw(mThumbRect, hasMouseCapture() ? mThumbOutlineColor : center_color);
+ mThumbImage->draw(mThumbRect, hasMouseCapture() ? mThumbOutlineColor.get() : center_color);
LLUICtrl::draw();
}
-
-// virtual
-LLXMLNodePtr LLSlider::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- node->createChild("initial_val", TRUE)->setFloatValue(getInitialValue());
- node->createChild("min_val", TRUE)->setFloatValue(getMinValue());
- node->createChild("max_val", TRUE)->setFloatValue(getMaxValue());
- node->createChild("increment", TRUE)->setFloatValue(getIncrement());
- node->createChild("volume", TRUE)->setBoolValue(mVolumeSlider);
-
- return node;
-}
-
-
-//static
-LLView* LLSlider::fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory)
-{
- std::string name("slider_bar");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- F32 initial_value = 0.f;
- node->getAttributeF32("initial_val", initial_value);
-
- F32 min_value = 0.f;
- node->getAttributeF32("min_val", min_value);
-
- F32 max_value = 1.f;
- node->getAttributeF32("max_val", max_value);
-
- F32 increment = 0.1f;
- node->getAttributeF32("increment", increment);
-
- BOOL volume = node->hasName("volume_slider") ? TRUE : FALSE;
- node->getAttributeBOOL("volume", volume);
-
- LLSlider* slider = new LLSlider(name,
- rect,
- NULL,
- NULL,
- initial_value,
- min_value,
- max_value,
- increment,
- volume);
-
- slider->initFromXML(node, parent);
-
- return slider;
-}
diff --git a/indra/llui/llslider.h b/indra/llui/llslider.h
index 154685fac1..39c55afd8c 100644
--- a/indra/llui/llslider.h
+++ b/indra/llui/llslider.h
@@ -33,47 +33,42 @@
#ifndef LL_LLSLIDER_H
#define LL_LLSLIDER_H
-#include "lluictrl.h"
+#include "llf32uictrl.h"
#include "v4color.h"
class LLImageGL;
-class LLSlider : public LLUICtrl
+class LLSlider : public LLF32UICtrl
{
public:
- LLSlider(
- const std::string& name,
- const LLRect& rect,
- void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata),
- void* callback_userdata,
- F32 initial_value,
- F32 min_value,
- F32 max_value,
- F32 increment,
- BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no? -MG
- const std::string& control_name = LLStringUtil::null );
+ struct Params : public LLInitParam::Block<Params, LLF32UICtrl::Params>
+ {
+ Optional<LLUIColor> track_color,
+ thumb_outline_color,
+ thumb_center_color;
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
+ Optional<LLUIImage*> thumb_image,
+ track_image,
+ track_highlight_image;
- void setValue( F32 value, BOOL from_event = FALSE );
- F32 getValueF32() const { return mValue; }
+ Optional<CommitCallbackParam> mouse_down_callback,
+ mouse_up_callback;
- virtual void setValue(const LLSD& value ) { setValue((F32)value.asReal(), TRUE); }
- virtual LLSD getValue() const { return LLSD(getValueF32()); }
- virtual void setMinValue(LLSD min_value) { setMinValue((F32)min_value.asReal()); }
- virtual void setMaxValue(LLSD max_value) { setMaxValue((F32)max_value.asReal()); }
+ Params();
+ };
+protected:
+ LLSlider(const Params&);
+ friend class LLUICtrlFactory;
+public:
+ void setValue( F32 value, BOOL from_event = FALSE );
+ // overrides for LLF32UICtrl methods
+ virtual void setValue(const LLSD& value ) { setValue((F32)value.asReal(), TRUE); }
+ virtual void setMinValue(F32 min_value) { LLF32UICtrl::setMinValue(min_value); updateThumbRect(); }
+ virtual void setMaxValue(F32 max_value) { LLF32UICtrl::setMaxValue(max_value); updateThumbRect(); }
- F32 getInitialValue() const { return mInitialValue; }
- F32 getMinValue() const { return mMinValue; }
- F32 getMaxValue() const { return mMaxValue; }
- F32 getIncrement() const { return mIncrement; }
- void setMinValue(F32 min_value) {mMinValue = min_value; updateThumbRect(); }
- void setMaxValue(F32 max_value) {mMaxValue = max_value; updateThumbRect(); }
- void setIncrement(F32 increment) {mIncrement = increment;}
- void setMouseDownCallback( void (*cb)(LLUICtrl* ctrl, void* userdata) ) { mMouseDownCallback = cb; }
- void setMouseUpCallback( void (*cb)(LLUICtrl* ctrl, void* userdata) ) { mMouseUpCallback = cb; }
+ boost::signals::connection setMouseDownCallback( const commit_signal_t::slot_type& cb ) { return mMouseDownSignal.connect(cb); }
+ boost::signals::connection setMouseUpCallback( const commit_signal_t::slot_type& cb ) { return mMouseUpSignal.connect(cb); }
virtual BOOL handleHover(S32 x, S32 y, MASK mask);
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
@@ -85,12 +80,6 @@ private:
void setValueAndCommit(F32 value);
void updateThumbRect();
- F32 mValue;
- F32 mInitialValue;
- F32 mMinValue;
- F32 mMaxValue;
- F32 mIncrement;
-
BOOL mVolumeSlider;
S32 mMouseOffset;
LLRect mDragStartThumbRect;
@@ -100,12 +89,12 @@ private:
LLUIImage* mTrackHighlightImage;
LLRect mThumbRect;
- LLColor4 mTrackColor;
- LLColor4 mThumbOutlineColor;
- LLColor4 mThumbCenterColor;
+ LLUIColor mTrackColor;
+ LLUIColor mThumbOutlineColor;
+ LLUIColor mThumbCenterColor;
- void (*mMouseDownCallback)(LLUICtrl* ctrl, void* userdata);
- void (*mMouseUpCallback)(LLUICtrl* ctrl, void* userdata);
+ commit_signal_t mMouseDownSignal;
+ commit_signal_t mMouseUpSignal;
};
#endif // LL_LLSLIDER_H
diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp
index 31baddd7cc..d5053478a6 100644
--- a/indra/llui/llsliderctrl.cpp
+++ b/indra/llui/llsliderctrl.cpp
@@ -49,84 +49,103 @@
#include "llcontrol.h"
#include "llfocusmgr.h"
#include "llresmgr.h"
+#include "lluictrlfactory.h"
const U32 MAX_STRING_LENGTH = 10;
static LLRegisterWidget<LLSliderCtrl> r("slider");
-
-LLSliderCtrl::LLSliderCtrl(const std::string& name, const LLRect& rect,
- const std::string& label,
- const LLFontGL* font,
- S32 label_width,
- S32 text_left,
- BOOL show_text,
- BOOL can_edit_text,
- BOOL volume,
- void (*commit_callback)(LLUICtrl*, void*),
- void* callback_user_data,
- F32 initial_value, F32 min_value, F32 max_value, F32 increment,
- const std::string& control_which)
- : LLUICtrl(name, rect, TRUE, commit_callback, callback_user_data ),
- mFont(font),
- mShowText( show_text ),
- mCanEditText( can_edit_text ),
- mVolumeSlider( volume ),
- mPrecision( 3 ),
- mLabelBox( NULL ),
- mLabelWidth( label_width ),
- mValue( initial_value ),
- mEditor( NULL ),
- mTextBox( NULL ),
- mTextEnabledColor( LLUI::sColorsGroup->getColor( "LabelTextColor" ) ),
- mTextDisabledColor( LLUI::sColorsGroup->getColor( "LabelDisabledColor" ) ),
- mSliderMouseUpCallback( NULL ),
- mSliderMouseDownCallback( NULL )
+
+LLSliderCtrl::LLSliderCtrl(const LLSliderCtrl::Params& p)
+: LLF32UICtrl(p),
+ mLabelBox( NULL ),
+ mEditor( NULL ),
+ mTextBox( NULL ),
+ mFont(p.font),
+ mShowText(p.show_text),
+ mCanEditText(p.can_edit_text),
+ mPrecision(p.decimal_digits),
+ mTextEnabledColor(p.text_color()),
+ mTextDisabledColor(p.text_disabled_color())
{
S32 top = getRect().getHeight();
S32 bottom = 0;
S32 left = 0;
+ S32 label_width = p.label_width;
+ S32 text_width = p.text_width;
+
// Label
- if( !label.empty() )
+ if( !p.label().empty() )
{
- if (label_width == 0)
+ if (!p.label_width.isProvided())
{
- label_width = font->getWidth(label);
+ label_width = p.font()->getWidth(p.label);
}
LLRect label_rect( left, top, label_width, bottom );
- mLabelBox = new LLTextBox( std::string("SliderCtrl Label"), label_rect, label, font );
+ LLTextBox::Params params(p.slider_label);
+ params.rect.setIfNotProvided(label_rect);
+ params.font.setIfNotProvided(p.font);
+ params.text(p.label);
+ mLabelBox = LLUICtrlFactory::create<LLTextBox> (params);
addChild(mLabelBox);
}
+ if (p.show_text && !p.text_width.isProvided())
+ {
+ // calculate the size of the text box (log max_value is number of digits - 1 so plus 1)
+ if ( p.max_value )
+ text_width = p.font()->getWidth(std::string("0")) * ( static_cast < S32 > ( log10 ( p.max_value ) ) + p.decimal_digits + 1 );
+
+ if ( p.increment < 1.0f )
+ text_width += p.font()->getWidth(std::string(".")); // (mostly) take account of decimal point in value
+
+ if ( p.min_value < 0.0f || p.max_value < 0.0f )
+ text_width += p.font()->getWidth(std::string("-")); // (mostly) take account of minus sign
+
+ // padding to make things look nicer
+ text_width += 8;
+ }
+
+
+ S32 text_left = getRect().getWidth() - text_width;
+ static LLUICachedControl<S32> sliderctrl_spacing ("UISliderctrlSpacing", 0);
+
S32 slider_right = getRect().getWidth();
- if( show_text )
+ if( p.show_text )
{
- slider_right = text_left - SLIDERCTRL_SPACING;
+ slider_right = text_left - sliderctrl_spacing;
}
- S32 slider_left = label_width ? label_width + SLIDERCTRL_SPACING : 0;
- LLRect slider_rect( slider_left, top, slider_right, bottom );
- mSlider = new LLSlider(std::string("slider"),
- slider_rect,
- LLSliderCtrl::onSliderCommit, this,
- initial_value, min_value, max_value, increment, volume,
- control_which );
+ S32 slider_left = label_width ? label_width + sliderctrl_spacing : 0;
+ LLSlider::Params slider_p(p.slider_bar);
+ slider_p.name("slider_bar");
+ slider_p.rect.setIfNotProvided(LLRect(slider_left,top,slider_right,bottom));
+ slider_p.initial_value.setIfNotProvided(p.initial_value().asReal());
+ slider_p.min_value.setIfNotProvided(p.min_value);
+ slider_p.max_value.setIfNotProvided(p.max_value);
+ slider_p.increment.setIfNotProvided(p.increment);
+
+ slider_p.commit_callback.function(&LLSliderCtrl::onSliderCommit);
+ slider_p.control_name(p.control_name);
+ slider_p.mouse_down_callback( p.mouse_down_callback );
+ slider_p.mouse_up_callback( p.mouse_up_callback );
+ mSlider = LLUICtrlFactory::create<LLSlider> (slider_p);
+
addChild( mSlider );
- if( show_text )
+ if( p.show_text() )
{
LLRect text_rect( text_left, top, getRect().getWidth(), bottom );
- if( can_edit_text )
+ if( p.can_edit_text() )
{
- mEditor = new LLLineEditor( std::string("SliderCtrl Editor"), text_rect,
- LLStringUtil::null, font,
- MAX_STRING_LENGTH,
- &LLSliderCtrl::onEditorCommit, NULL, NULL, this,
- &LLLineEditor::prevalidateFloat );
- mEditor->setFollowsLeft();
- mEditor->setFollowsBottom();
+ LLLineEditor::Params line_p(p.value_editor);
+ line_p.rect.setIfNotProvided(text_rect);
+ line_p.font.setIfNotProvided(p.font);
+ line_p.commit_callback.function(&LLSliderCtrl::onEditorCommit);
+ line_p.prevalidate_callback(&LLLineEditor::prevalidateFloat);
+ mEditor = LLUICtrlFactory::create<LLLineEditor>(line_p);
+
mEditor->setFocusReceivedCallback( &LLSliderCtrl::onEditorGainFocus, this );
- mEditor->setIgnoreTab(TRUE);
// don't do this, as selecting the entire text is single clicking in some cases
// and double clicking in others
//mEditor->setSelectAllonFocusReceived(TRUE);
@@ -134,9 +153,10 @@ LLSliderCtrl::LLSliderCtrl(const std::string& name, const LLRect& rect,
}
else
{
- mTextBox = new LLTextBox( std::string("SliderCtrl Text"), text_rect, LLStringUtil::null, font);
- mTextBox->setFollowsLeft();
- mTextBox->setFollowsBottom();
+ LLTextBox::Params text_p(p.value_text);
+ text_p.rect.setIfNotProvided(text_rect);
+ text_p.font.setIfNotProvided(p.font);
+ mTextBox = LLUICtrlFactory::create<LLTextBox>(text_p);
addChild(mTextBox);
}
}
@@ -144,7 +164,6 @@ LLSliderCtrl::LLSliderCtrl(const std::string& name, const LLRect& rect,
updateText();
}
-
// static
void LLSliderCtrl::onEditorGainFocus( LLFocusableElement* caller, void *userdata )
{
@@ -179,7 +198,8 @@ BOOL LLSliderCtrl::setLabelArg( const std::string& key, const LLStringExplicit&
S32 delta = rect.mRight - prev_right;
rect = mSlider->getRect();
S32 left = rect.mLeft + delta;
- left = llclamp(left, 0, rect.mRight-SLIDERCTRL_SPACING);
+ static LLUICachedControl<S32> sliderctrl_spacing ("UISliderctrlSpacing", 0);
+ left = llclamp(left, 0, rect.mRight - sliderctrl_spacing);
rect.mLeft = left;
mSlider->setRect(rect);
}
@@ -224,10 +244,11 @@ void LLSliderCtrl::updateText()
}
// static
-void LLSliderCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
+void LLSliderCtrl::onEditorCommit( LLUICtrl* ctrl, const LLSD& userdata )
{
- LLSliderCtrl* self = (LLSliderCtrl*) userdata;
- llassert( caller == self->mEditor );
+ LLSliderCtrl* self = dynamic_cast<LLSliderCtrl*>(ctrl->getParent());
+ if (!self)
+ return;
BOOL success = FALSE;
F32 val = self->mValue;
@@ -240,17 +261,9 @@ void LLSliderCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
val = (F32) atof( text.c_str() );
if( self->mSlider->getMinValue() <= val && val <= self->mSlider->getMaxValue() )
{
- if( self->mValidateCallback )
+ self->setValue( val ); // set the value temporarily so that the callback can retrieve it.
+ if( self->mValidateSignal( self, val ) )
{
- self->setValue( val ); // set the value temporarily so that the callback can retrieve it.
- if( self->mValidateCallback( self, self->mCallbackUserData ) )
- {
- success = TRUE;
- }
- }
- else
- {
- self->setValue( val );
success = TRUE;
}
}
@@ -272,26 +285,19 @@ void LLSliderCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
}
// static
-void LLSliderCtrl::onSliderCommit( LLUICtrl* caller, void *userdata )
+void LLSliderCtrl::onSliderCommit( LLUICtrl* ctrl, const LLSD& userdata )
{
- LLSliderCtrl* self = (LLSliderCtrl*) userdata;
- llassert( caller == self->mSlider );
+ LLSliderCtrl* self = dynamic_cast<LLSliderCtrl*>(ctrl->getParent());
+ if (!self)
+ return;
BOOL success = FALSE;
F32 saved_val = self->mValue;
F32 new_val = self->mSlider->getValueF32();
- if( self->mValidateCallback )
+ self->mValue = new_val; // set the value temporarily so that the callback can retrieve it.
+ if( self->mValidateSignal( self, new_val ) )
{
- self->mValue = new_val; // set the value temporarily so that the callback can retrieve it.
- if( self->mValidateCallback( self, self->mCallbackUserData ) )
- {
- success = TRUE;
- }
- }
- else
- {
- self->mValue = new_val;
success = TRUE;
}
@@ -316,7 +322,7 @@ void LLSliderCtrl::setEnabled(BOOL b)
if( mLabelBox )
{
- mLabelBox->setColor( b ? mTextEnabledColor : mTextDisabledColor );
+ mLabelBox->setColor( b ? mTextEnabledColor.get() : mTextDisabledColor.get() );
}
mSlider->setEnabled( b );
@@ -328,7 +334,7 @@ void LLSliderCtrl::setEnabled(BOOL b)
if( mTextBox )
{
- mTextBox->setColor( b ? mTextEnabledColor : mTextDisabledColor );
+ mTextBox->setColor( b ? mTextEnabledColor.get() : mTextDisabledColor.get() );
}
}
@@ -339,7 +345,7 @@ void LLSliderCtrl::setTentative(BOOL b)
{
mEditor->setTentative(b);
}
- LLUICtrl::setTentative(b);
+ LLF32UICtrl::setTentative(b);
}
@@ -351,8 +357,9 @@ void LLSliderCtrl::onCommit()
{
mEditor->setTentative(FALSE);
}
-
- LLUICtrl::onCommit();
+
+ setControlValue(getValueF32());
+ LLF32UICtrl::onCommit();
}
@@ -368,37 +375,14 @@ void LLSliderCtrl::setPrecision(S32 precision)
updateText();
}
-void LLSliderCtrl::setSliderMouseDownCallback( void (*slider_mousedown_callback)(LLUICtrl* caller, void* userdata) )
-{
- mSliderMouseDownCallback = slider_mousedown_callback;
- mSlider->setMouseDownCallback( LLSliderCtrl::onSliderMouseDown );
-}
-
-// static
-void LLSliderCtrl::onSliderMouseDown(LLUICtrl* caller, void* userdata)
-{
- LLSliderCtrl* self = (LLSliderCtrl*) userdata;
- if( self->mSliderMouseDownCallback )
- {
- self->mSliderMouseDownCallback( self, self->mCallbackUserData );
- }
-}
-
-
-void LLSliderCtrl::setSliderMouseUpCallback( void (*slider_mouseup_callback)(LLUICtrl* caller, void* userdata) )
+boost::signals::connection LLSliderCtrl::setSliderMouseDownCallback( const commit_signal_t::slot_type& cb )
{
- mSliderMouseUpCallback = slider_mouseup_callback;
- mSlider->setMouseUpCallback( LLSliderCtrl::onSliderMouseUp );
+ return mSlider->setMouseDownCallback( cb );
}
-// static
-void LLSliderCtrl::onSliderMouseUp(LLUICtrl* caller, void* userdata)
+boost::signals::connection LLSliderCtrl::setSliderMouseUpCallback( const commit_signal_t::slot_type& cb )
{
- LLSliderCtrl* self = (LLSliderCtrl*) userdata;
- if( self->mSliderMouseUpCallback )
- {
- self->mSliderMouseUpCallback( self, self->mCallbackUserData );
- }
+ return mSlider->setMouseUpCallback( cb );
}
void LLSliderCtrl::onTabInto()
@@ -414,131 +398,4 @@ void LLSliderCtrl::reportInvalidData()
make_ui_sound("UISndBadKeystroke");
}
-// virtual
-LLXMLNodePtr LLSliderCtrl::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- node->createChild("show_text", TRUE)->setBoolValue(mShowText);
-
- node->createChild("can_edit_text", TRUE)->setBoolValue(mCanEditText);
-
- node->createChild("volume", TRUE)->setBoolValue(mVolumeSlider);
-
- node->createChild("decimal_digits", TRUE)->setIntValue(mPrecision);
-
- if (mLabelBox)
- {
- node->createChild("label", TRUE)->setStringValue(mLabelBox->getText());
- }
-
- // TomY TODO: Do we really want to export the transient state of the slider?
- node->createChild("value", TRUE)->setFloatValue(mValue);
-
- if (mSlider)
- {
- node->createChild("initial_val", TRUE)->setFloatValue(mSlider->getInitialValue());
- node->createChild("min_val", TRUE)->setFloatValue(mSlider->getMinValue());
- node->createChild("max_val", TRUE)->setFloatValue(mSlider->getMaxValue());
- node->createChild("increment", TRUE)->setFloatValue(mSlider->getIncrement());
- }
- addColorXML(node, mTextEnabledColor, "text_enabled_color", "LabelTextColor");
- addColorXML(node, mTextDisabledColor, "text_disabled_color", "LabelDisabledColor");
-
- return node;
-}
-
-LLView* LLSliderCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("slider");
- node->getAttributeString("name", name);
-
- std::string label;
- node->getAttributeString("label", label);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- LLFontGL* font = LLView::selectFont(node);
-
- // HACK: Font might not be specified.
- if (!font)
- {
- font = LLFontGL::getFontSansSerifSmall();
- }
-
- S32 label_width = 0;
- node->getAttributeS32("label_width", label_width);
- BOOL show_text = TRUE;
- node->getAttributeBOOL("show_text", show_text);
-
- BOOL can_edit_text = FALSE;
- node->getAttributeBOOL("can_edit_text", can_edit_text);
-
- BOOL volume = FALSE;
- node->getAttributeBOOL("volume", volume);
-
- F32 initial_value = 0.f;
- node->getAttributeF32("initial_val", initial_value);
-
- F32 min_value = 0.f;
- node->getAttributeF32("min_val", min_value);
-
- F32 max_value = 1.f;
- node->getAttributeF32("max_val", max_value);
-
- F32 increment = 0.1f;
- node->getAttributeF32("increment", increment);
-
- U32 precision = 3;
- node->getAttributeU32("decimal_digits", precision);
-
- S32 text_left = 0;
- if (show_text)
- {
- // calculate the size of the text box (log max_value is number of digits - 1 so plus 1)
- if ( max_value )
- text_left = font->getWidth(std::string("0")) * ( static_cast < S32 > ( log10 ( max_value ) ) + precision + 1 );
-
- if ( increment < 1.0f )
- text_left += font->getWidth(std::string(".")); // (mostly) take account of decimal point in value
-
- if ( min_value < 0.0f || max_value < 0.0f )
- text_left += font->getWidth(std::string("-")); // (mostly) take account of minus sign
-
- // padding to make things look nicer
- text_left += 8;
- }
-
- LLUICtrlCallback callback = NULL;
-
- if (label.empty())
- {
- label.assign(node->getTextContents());
- }
-
- LLSliderCtrl* slider = new LLSliderCtrl(name,
- rect,
- label,
- font,
- label_width,
- rect.getWidth() - text_left,
- show_text,
- can_edit_text,
- volume,
- callback,
- NULL,
- initial_value,
- min_value,
- max_value,
- increment);
-
- slider->setPrecision(precision);
-
- slider->initFromXML(node, parent);
-
- slider->updateText();
-
- return slider;
-}
diff --git a/indra/llui/llsliderctrl.h b/indra/llui/llsliderctrl.h
index 272dd7ffd3..0bcb1ccc9b 100644
--- a/indra/llui/llsliderctrl.h
+++ b/indra/llui/llsliderctrl.h
@@ -38,54 +38,71 @@
#include "llslider.h"
#include "lltextbox.h"
#include "llrect.h"
+#include "lllineeditor.h"
-//
-// Constants
-//
-const S32 SLIDERCTRL_SPACING = 4; // space between label, slider, and text
-const S32 SLIDERCTRL_HEIGHT = 16;
-
-class LLSliderCtrl : public LLUICtrl
+class LLSliderCtrl : public LLF32UICtrl
{
public:
- LLSliderCtrl(const std::string& name,
- const LLRect& rect,
- const std::string& label,
- const LLFontGL* font,
- S32 slider_left,
- S32 text_left,
- BOOL show_text,
- BOOL can_edit_text,
- BOOL volume, //TODO: create a "volume" slider sub-class or just use image art, no? -MG
- void (*commit_callback)(LLUICtrl*, void*),
- void* callback_userdata,
- F32 initial_value, F32 min_value, F32 max_value, F32 increment,
- const std::string& control_which = LLStringUtil::null );
-
+ struct Params : public LLInitParam::Block<Params, LLF32UICtrl::Params>
+ {
+ Optional<S32> label_width;
+ Optional<S32> text_width;
+ Optional<bool> show_text;
+ Optional<bool> can_edit_text;
+ Optional<bool> is_volume_slider;
+ Optional<S32> decimal_digits;
+
+ Optional<LLUIColor> text_color,
+ text_disabled_color;
+
+ Optional<CommitCallbackParam> mouse_down_callback,
+ mouse_up_callback;
+
+ Optional<LLSlider::Params> slider_bar;
+ Optional<LLLineEditor::Params> value_editor;
+ Optional<LLTextBox::Params> value_text;
+ Optional<LLTextBox::Params> slider_label;
+
+ Params()
+ : text_width("text_width"),
+ label_width("label_width"),
+ show_text("show_text"),
+ can_edit_text("can_edit_text"),
+ is_volume_slider("volume"),
+ decimal_digits("decimal_digits", 3),
+ text_color("text_color"),
+ text_disabled_color("text_disabled_color"),
+ slider_bar("slider_bar"),
+ value_editor("value_editor"),
+ value_text("value_text"),
+ slider_label("slider_label"),
+ mouse_down_callback("mouse_down_callback"),
+ mouse_up_callback("mouse_up_callback")
+ {}
+ };
+protected:
+ LLSliderCtrl(const Params&);
+ friend class LLUICtrlFactory;
+public:
virtual ~LLSliderCtrl() {} // Children all cleaned up by default view destructor.
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-
- F32 getValueF32() const { return mSlider->getValueF32(); }
+ /*virtual*/ F32 getValueF32() const { return mSlider->getValueF32(); }
void setValue(F32 v, BOOL from_event = FALSE);
- virtual void setValue(const LLSD& value) { setValue((F32)value.asReal(), TRUE); }
- virtual LLSD getValue() const { return LLSD(getValueF32()); }
- virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text );
-
- virtual void setMinValue(LLSD min_value) { setMinValue((F32)min_value.asReal()); }
- virtual void setMaxValue(LLSD max_value) { setMaxValue((F32)max_value.asReal()); }
+ /*virtual*/ void setValue(const LLSD& value) { setValue((F32)value.asReal(), TRUE); }
+ /*virtual*/ LLSD getValue() const { return LLSD(getValueF32()); }
+ /*virtual*/ BOOL setLabelArg( const std::string& key, const LLStringExplicit& text );
BOOL isMouseHeldDown() const { return mSlider->hasMouseCapture(); }
- virtual void setEnabled( BOOL b );
- virtual void clear();
virtual void setPrecision(S32 precision);
- void setMinValue(F32 min_value) { mSlider->setMinValue(min_value); updateText(); }
- void setMaxValue(F32 max_value) { mSlider->setMaxValue(max_value); updateText(); }
- void setIncrement(F32 increment) { mSlider->setIncrement(increment);}
+
+ /*virtual*/ void setEnabled( BOOL b );
+ /*virtual*/ void clear();
+ /*virtual*/ void setMinValue(F32 min_value) { mSlider->setMinValue(min_value); updateText(); }
+ /*virtual*/ void setMaxValue(F32 max_value) { mSlider->setMaxValue(max_value); updateText(); }
+ /*virtual*/ void setIncrement(F32 increment) { mSlider->setIncrement(increment);}
F32 getMinValue() { return mSlider->getMinValue(); }
F32 getMaxValue() { return mSlider->getMaxValue(); }
@@ -94,27 +111,23 @@ public:
void setLabelColor(const LLColor4& c) { mTextEnabledColor = c; }
void setDisabledLabelColor(const LLColor4& c) { mTextDisabledColor = c; }
- void setSliderMouseDownCallback( void (*slider_mousedown_callback)(LLUICtrl* caller, void* userdata) );
- void setSliderMouseUpCallback( void (*slider_mouseup_callback)(LLUICtrl* caller, void* userdata) );
+ boost::signals::connection setSliderMouseDownCallback( const commit_signal_t::slot_type& cb );
+ boost::signals::connection setSliderMouseUpCallback( const commit_signal_t::slot_type& cb );
- virtual void onTabInto();
+ /*virtual*/ void onTabInto();
- virtual void setTentative(BOOL b); // marks value as tentative
- virtual void onCommit(); // mark not tentative, then commit
+ /*virtual*/ void setTentative(BOOL b); // marks value as tentative
+ /*virtual*/ void onCommit(); // mark not tentative, then commit
- virtual void setControlName(const std::string& control_name, LLView* context)
+ /*virtual*/ void setControlName(const std::string& control_name, LLView* context)
{
- LLView::setControlName(control_name, context);
+ LLUICtrl::setControlName(control_name, context);
mSlider->setControlName(control_name, context);
}
- virtual std::string getControlName() const { return mSlider->getControlName(); }
+ static void onSliderCommit(LLUICtrl* caller, const LLSD& userdata);
- static void onSliderCommit(LLUICtrl* caller, void* userdata);
- static void onSliderMouseDown(LLUICtrl* caller,void* userdata);
- static void onSliderMouseUp(LLUICtrl* caller,void* userdata);
-
- static void onEditorCommit(LLUICtrl* caller, void* userdata);
+ static void onEditorCommit(LLUICtrl* ctrl, const LLSD& userdata);
static void onEditorGainFocus(LLFocusableElement* caller, void *userdata);
static void onEditorChangeFocus(LLUICtrl* caller, S32 direction, void *userdata);
@@ -125,7 +138,6 @@ private:
const LLFontGL* mFont;
BOOL mShowText;
BOOL mCanEditText;
- BOOL mVolumeSlider;
S32 mPrecision;
LLTextBox* mLabelBox;
@@ -136,11 +148,8 @@ private:
class LLLineEditor* mEditor;
LLTextBox* mTextBox;
- LLColor4 mTextEnabledColor;
- LLColor4 mTextDisabledColor;
-
- void (*mSliderMouseUpCallback)( LLUICtrl* ctrl, void* userdata );
- void (*mSliderMouseDownCallback)( LLUICtrl* ctrl, void* userdata );
+ LLUIColor mTextEnabledColor;
+ LLUIColor mTextDisabledColor;
};
#endif // LL_LLSLIDERCTRL_H
diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp
index c54a2cd140..ac4b528aac 100644
--- a/indra/llui/llspinctrl.cpp
+++ b/indra/llui/llspinctrl.cpp
@@ -49,97 +49,119 @@
#include "llcontrol.h"
#include "llfocusmgr.h"
#include "llresmgr.h"
+#include "lluictrlfactory.h"
const U32 MAX_STRING_LENGTH = 32;
static LLRegisterWidget<LLSpinCtrl> r2("spinner");
-
-LLSpinCtrl::LLSpinCtrl( const std::string& name, const LLRect& rect, const std::string& label, const LLFontGL* font,
- void (*commit_callback)(LLUICtrl*, void*),
- void* callback_user_data,
- F32 initial_value, F32 min_value, F32 max_value, F32 increment,
- const std::string& control_name,
- S32 label_width)
- :
- LLUICtrl(name, rect, TRUE, commit_callback, callback_user_data, FOLLOWS_LEFT | FOLLOWS_TOP ),
- mValue( initial_value ),
- mInitialValue( initial_value ),
- mMaxValue( max_value ),
- mMinValue( min_value ),
- mIncrement( increment ),
- mPrecision( 3 ),
- mLabelBox( NULL ),
- mTextEnabledColor( LLUI::sColorsGroup->getColor( "LabelTextColor" ) ),
- mTextDisabledColor( LLUI::sColorsGroup->getColor( "LabelDisabledColor" ) ),
- mbHasBeenSet( FALSE )
+
+LLSpinCtrl::Params::Params()
+: label_width("label_width"),
+ decimal_digits("decimal_digits"),
+ allow_text_entry("allow_text_entry", true),
+ text_enabled_color("text_enabled_color"),
+ text_disabled_color("text_disabled_color")
+{}
+
+LLSpinCtrl::LLSpinCtrl(const LLSpinCtrl::Params& p)
+: LLF32UICtrl(p),
+ mLabelBox(NULL),
+ mbHasBeenSet( FALSE ),
+ mPrecision(p.decimal_digits),
+ mTextEnabledColor(p.text_enabled_color()),
+ mTextDisabledColor(p.text_disabled_color())
{
+ static LLUICachedControl<S32> spinctrl_spacing ("UISpinctrlSpacing", 0);
+ static LLUICachedControl<S32> spinctrl_btn_width ("UISpinctrlBtnWidth", 0);
+ static LLUICachedControl<S32> spinctrl_btn_height ("UISpinctrlBtnHeight", 0);
S32 top = getRect().getHeight();
- S32 bottom = top - 2 * SPINCTRL_BTN_HEIGHT;
+ S32 bottom = top - 2 * spinctrl_btn_height;
S32 centered_top = top;
S32 centered_bottom = bottom;
S32 btn_left = 0;
+ // reserve space for spinner
+ S32 label_width = llclamp(p.label_width(), 0, llmax(0, getRect().getWidth() - 40));
// Label
- if( !label.empty() )
+ if( !p.label().empty() )
{
LLRect label_rect( 0, centered_top, label_width, centered_bottom );
- mLabelBox = new LLTextBox( std::string("SpinCtrl Label"), label_rect, label, font );
+ LLTextBox::Params params;
+ params.name("SpinCtrl Label");
+ params.rect(label_rect);
+ params.text(p.label);
+ if (p.font.isProvided())
+ {
+ params.font(p.font);
+ }
+ mLabelBox = LLUICtrlFactory::create<LLTextBox> (params);
addChild(mLabelBox);
- btn_left += label_rect.mRight + SPINCTRL_SPACING;
+ btn_left += label_rect.mRight + spinctrl_spacing;
}
- S32 btn_right = btn_left + SPINCTRL_BTN_WIDTH;
+ S32 btn_right = btn_left + spinctrl_btn_width;
// Spin buttons
- LLRect up_rect( btn_left, top, btn_right, top - SPINCTRL_BTN_HEIGHT );
- std::string out_id = "UIImgBtnSpinUpOutUUID";
- std::string in_id = "UIImgBtnSpinUpInUUID";
- mUpBtn = new LLButton(std::string("SpinCtrl Up"), up_rect,
- out_id,
- in_id,
- LLStringUtil::null,
- &LLSpinCtrl::onUpBtn, this, LLFontGL::getFontSansSerif() );
- mUpBtn->setFollowsLeft();
- mUpBtn->setFollowsBottom();
- mUpBtn->setHeldDownCallback( &LLSpinCtrl::onUpBtn );
- mUpBtn->setTabStop(FALSE);
+ LLButton::Params up_button_params;
+ up_button_params.name(std::string("SpinCtrl Up"));
+ up_button_params.rect
+ .left(btn_left)
+ .top(top)
+ .right(btn_right)
+ .height(spinctrl_btn_height);
+ up_button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM);
+ up_button_params.image_unselected.name("spin_up_out_blue.tga");
+ up_button_params.image_selected.name("spin_up_in_blue.tga");
+ up_button_params.click_callback.function(boost::bind(&LLSpinCtrl::onUpBtn, this, _2));
+ up_button_params.mouse_held_callback.function(boost::bind(&LLSpinCtrl::onUpBtn, this, _2));
+ up_button_params.tab_stop(false);
+
+ mUpBtn = LLUICtrlFactory::create<LLButton>(up_button_params);
addChild(mUpBtn);
- LLRect down_rect( btn_left, top - SPINCTRL_BTN_HEIGHT, btn_right, bottom );
- out_id = "UIImgBtnSpinDownOutUUID";
- in_id = "UIImgBtnSpinDownInUUID";
- mDownBtn = new LLButton(std::string("SpinCtrl Down"), down_rect,
- out_id,
- in_id,
- LLStringUtil::null,
- &LLSpinCtrl::onDownBtn, this, LLFontGL::getFontSansSerif() );
- mDownBtn->setFollowsLeft();
- mDownBtn->setFollowsBottom();
- mDownBtn->setHeldDownCallback( &LLSpinCtrl::onDownBtn );
- mDownBtn->setTabStop(FALSE);
+ LLRect down_rect( btn_left, top - spinctrl_btn_height, btn_right, bottom );
+
+ LLButton::Params down_button_params;
+ down_button_params.name(std::string("SpinCtrl Down"));
+ down_button_params.rect
+ .left(btn_left)
+ .right(btn_right)
+ .bottom(bottom)
+ .height(spinctrl_btn_height);
+ down_button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM);
+ down_button_params.image_unselected.name("spin_down_out_blue.tga");
+ down_button_params.image_selected.name("spin_down_in_blue.tga");
+ down_button_params.click_callback.function(boost::bind(&LLSpinCtrl::onDownBtn, this, _2));
+ down_button_params.mouse_held_callback.function(boost::bind(&LLSpinCtrl::onDownBtn, this, _2));
+ down_button_params.tab_stop(false);
+ mDownBtn = LLUICtrlFactory::create<LLButton>(down_button_params);
addChild(mDownBtn);
LLRect editor_rect( btn_right + 1, centered_top, getRect().getWidth(), centered_bottom );
- mEditor = new LLLineEditor( std::string("SpinCtrl Editor"), editor_rect, LLStringUtil::null, font,
- MAX_STRING_LENGTH,
- &LLSpinCtrl::onEditorCommit, NULL, NULL, this,
- &LLLineEditor::prevalidateFloat );
- mEditor->setFollowsLeft();
- mEditor->setFollowsBottom();
+ LLLineEditor::Params params;
+ params.name("SpinCtrl Editor");
+ params.rect(editor_rect);
+ if (p.font.isProvided())
+ {
+ params.font(p.font);
+ }
+ params.max_length_bytes(MAX_STRING_LENGTH);
+ params.commit_callback.function((boost::bind(&LLSpinCtrl::onEditorCommit, this, _2)));
+ params.prevalidate_callback(&LLLineEditor::prevalidateFloat);
+ params.follows.flags(FOLLOWS_LEFT | FOLLOWS_BOTTOM);
+ mEditor = LLUICtrlFactory::create<LLLineEditor> (params);
mEditor->setFocusReceivedCallback( &LLSpinCtrl::onEditorGainFocus, this );
//RN: this seems to be a BAD IDEA, as it makes the editor behavior different when it has focus
// than when it doesn't. Instead, if you always have to double click to select all the text,
// it's easier to understand
//mEditor->setSelectAllonFocusReceived(TRUE);
- mEditor->setIgnoreTab(TRUE);
addChild(mEditor);
updateEditor();
setUseBoundingRect( TRUE );
}
-
F32 clamp_precision(F32 value, S32 decimal_precision)
{
// pow() isn't perfect
@@ -157,69 +179,50 @@ F32 clamp_precision(F32 value, S32 decimal_precision)
}
-// static
-void LLSpinCtrl::onUpBtn( void *userdata )
+void LLSpinCtrl::onUpBtn( const LLSD& data )
{
- LLSpinCtrl* self = (LLSpinCtrl*) userdata;
- if( self->getEnabled() )
+ if( getEnabled() )
{
// use getValue()/setValue() to force reload from/to control
- F32 val = (F32)self->getValue().asReal() + self->mIncrement;
- val = clamp_precision(val, self->mPrecision);
- val = llmin( val, self->mMaxValue );
+ F32 val = (F32)getValue().asReal() + mIncrement;
+ val = clamp_precision(val, mPrecision);
+ val = llmin( val, mMaxValue );
- if( self->mValidateCallback )
+ F32 saved_val = (F32)getValue().asReal();
+ setValue(val);
+ if( !mValidateSignal( this, val ) )
{
- F32 saved_val = (F32)self->getValue().asReal();
- self->setValue(val);
- if( !self->mValidateCallback( self, self->mCallbackUserData ) )
- {
- self->setValue( saved_val );
- self->reportInvalidData();
- self->updateEditor();
- return;
- }
- }
- else
- {
- self->setValue(val);
+ setValue( saved_val );
+ reportInvalidData();
+ updateEditor();
+ return;
}
- self->updateEditor();
- self->onCommit();
+ updateEditor();
+ onCommit();
}
}
-// static
-void LLSpinCtrl::onDownBtn( void *userdata )
+void LLSpinCtrl::onDownBtn( const LLSD& data )
{
- LLSpinCtrl* self = (LLSpinCtrl*) userdata;
-
- if( self->getEnabled() )
+ if( getEnabled() )
{
- F32 val = (F32)self->getValue().asReal() - self->mIncrement;
- val = clamp_precision(val, self->mPrecision);
- val = llmax( val, self->mMinValue );
+ F32 val = (F32)getValue().asReal() - mIncrement;
+ val = clamp_precision(val, mPrecision);
+ val = llmax( val, mMinValue );
- if( self->mValidateCallback )
- {
- F32 saved_val = (F32)self->getValue().asReal();
- self->setValue(val);
- if( !self->mValidateCallback( self, self->mCallbackUserData ) )
- {
- self->setValue( saved_val );
- self->reportInvalidData();
- self->updateEditor();
- return;
- }
- }
- else
+ F32 saved_val = (F32)getValue().asReal();
+ setValue(val);
+ if( !mValidateSignal( this, val ) )
{
- self->setValue(val);
+ setValue( saved_val );
+ reportInvalidData();
+ updateEditor();
+ return;
}
- self->updateEditor();
- self->onCommit();
+ updateEditor();
+ onCommit();
}
}
@@ -235,10 +238,10 @@ void LLSpinCtrl::onEditorGainFocus( LLFocusableElement* caller, void *userdata )
void LLSpinCtrl::setValue(const LLSD& value )
{
F32 v = (F32)value.asReal();
- if (mValue != v || !mbHasBeenSet)
+ if (getValueF32() != v || !mbHasBeenSet)
{
mbHasBeenSet = TRUE;
- mValue = v;
+ LLF32UICtrl::setValue(value);
if (!mEditor->hasFocus())
{
@@ -251,10 +254,10 @@ void LLSpinCtrl::setValue(const LLSD& value )
void LLSpinCtrl::forceSetValue(const LLSD& value )
{
F32 v = (F32)value.asReal();
- if (mValue != v || !mbHasBeenSet)
+ if (getValueF32() != v || !mbHasBeenSet)
{
mbHasBeenSet = TRUE;
- mValue = v;
+ LLF32UICtrl::setValue(value);
updateEditor();
}
@@ -286,55 +289,43 @@ void LLSpinCtrl::updateEditor()
mEditor->setText( text );
}
-void LLSpinCtrl::onEditorCommit( LLUICtrl* caller, void *userdata )
+void LLSpinCtrl::onEditorCommit( const LLSD& data )
{
BOOL success = FALSE;
- LLSpinCtrl* self = (LLSpinCtrl*) userdata;
- llassert( caller == self->mEditor );
-
- std::string text = self->mEditor->getText();
+ std::string text = mEditor->getText();
if( LLLineEditor::postvalidateFloat( text ) )
{
LLLocale locale(LLLocale::USER_LOCALE);
F32 val = (F32) atof(text.c_str());
- if (val < self->mMinValue) val = self->mMinValue;
- if (val > self->mMaxValue) val = self->mMaxValue;
+ if (val < mMinValue) val = mMinValue;
+ if (val > mMaxValue) val = mMaxValue;
- if( self->mValidateCallback )
+ F32 saved_val = getValueF32();
+ setValue(val);
+ if( mValidateSignal( this, val ) )
{
- F32 saved_val = self->mValue;
- self->mValue = val;
- if( self->mValidateCallback( self, self->mCallbackUserData ) )
- {
- success = TRUE;
- self->onCommit();
- }
- else
- {
- self->mValue = saved_val;
- }
+ success = TRUE;
+ onCommit();
}
else
{
- self->mValue = val;
- self->onCommit();
- success = TRUE;
+ setValue(saved_val);
}
}
- self->updateEditor();
+ updateEditor();
if( !success )
{
- self->reportInvalidData();
+ reportInvalidData();
}
}
void LLSpinCtrl::forceEditorCommit()
{
- onEditorCommit(mEditor, this);
+ onEditorCommit( LLSD() );
}
@@ -348,6 +339,10 @@ void LLSpinCtrl::setEnabled(BOOL b)
{
LLView::setEnabled( b );
mEditor->setEnabled( b );
+ if( mLabelBox )
+ {
+ mLabelBox->setColor( b ? mTextEnabledColor.get() : mTextDisabledColor.get() );
+ }
}
@@ -368,8 +363,8 @@ BOOL LLSpinCtrl::isMouseHeldDown() const
void LLSpinCtrl::onCommit()
{
setTentative(FALSE);
- setControlValue(mValue);
- LLUICtrl::onCommit();
+ setControlValue(getValueF32());
+ LLF32UICtrl::onCommit();
}
@@ -414,29 +409,19 @@ void LLSpinCtrl::reportInvalidData()
make_ui_sound("UISndBadKeystroke");
}
-void LLSpinCtrl::draw()
-{
- if( mLabelBox )
- {
- mLabelBox->setColor( getEnabled() ? mTextEnabledColor : mTextDisabledColor );
- }
- LLUICtrl::draw();
-}
-
-
BOOL LLSpinCtrl::handleScrollWheel(S32 x, S32 y, S32 clicks)
{
if( clicks > 0 )
{
while( clicks-- )
{
- LLSpinCtrl::onDownBtn(this);
+ onDownBtn(getValue());
}
}
else
while( clicks++ )
{
- LLSpinCtrl::onUpBtn(this);
+ onUpBtn(getValue());
}
return TRUE;
@@ -456,105 +441,15 @@ BOOL LLSpinCtrl::handleKeyHere(KEY key, MASK mask)
}
if(key == KEY_UP)
{
- LLSpinCtrl::onUpBtn(this);
+ onUpBtn(getValue());
return TRUE;
}
if(key == KEY_DOWN)
{
- LLSpinCtrl::onDownBtn(this);
+ onDownBtn(getValue());
return TRUE;
}
}
return FALSE;
}
-// virtual
-LLXMLNodePtr LLSpinCtrl::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- node->createChild("decimal_digits", TRUE)->setIntValue(mPrecision);
-
- if (mLabelBox)
- {
- node->createChild("label", TRUE)->setStringValue(mLabelBox->getText());
-
- node->createChild("label_width", TRUE)->setIntValue(mLabelBox->getRect().getWidth());
- }
-
- node->createChild("initial_val", TRUE)->setFloatValue(mInitialValue);
-
- node->createChild("min_val", TRUE)->setFloatValue(mMinValue);
-
- node->createChild("max_val", TRUE)->setFloatValue(mMaxValue);
-
- node->createChild("increment", TRUE)->setFloatValue(mIncrement);
-
- addColorXML(node, mTextEnabledColor, "text_enabled_color", "LabelTextColor");
- addColorXML(node, mTextDisabledColor, "text_disabled_color", "LabelDisabledColor");
-
- return node;
-}
-
-LLView* LLSpinCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("spinner");
- node->getAttributeString("name", name);
-
- std::string label;
- node->getAttributeString("label", label);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- LLFontGL* font = LLView::selectFont(node);
-
- F32 initial_value = 0.f;
- node->getAttributeF32("initial_val", initial_value);
-
- F32 min_value = 0.f;
- node->getAttributeF32("min_val", min_value);
-
- F32 max_value = 1.f;
- node->getAttributeF32("max_val", max_value);
-
- F32 increment = 0.1f;
- node->getAttributeF32("increment", increment);
-
- U32 precision = 3;
- node->getAttributeU32("decimal_digits", precision);
-
- S32 label_width = llmin(40, rect.getWidth() - 40);
- node->getAttributeS32("label_width", label_width);
-
- BOOL allow_text_entry = TRUE;
- node->getAttributeBOOL("allow_text_entry", allow_text_entry);
-
- LLUICtrlCallback callback = NULL;
-
- if(label.empty())
- {
- label.assign( node->getValue() );
- }
-
- LLSpinCtrl* spinner = new LLSpinCtrl(name,
- rect,
- label,
- font,
- callback,
- NULL,
- initial_value,
- min_value,
- max_value,
- increment,
- LLStringUtil::null,
- label_width);
-
- spinner->setPrecision(precision);
-
- spinner->initFromXML(node, parent);
- spinner->setAllowEdit(allow_text_entry);
-
- return spinner;
-}
-
diff --git a/indra/llui/llspinctrl.h b/indra/llui/llspinctrl.h
index dfd0eb3ac1..eb1a2eb8a7 100644
--- a/indra/llui/llspinctrl.h
+++ b/indra/llui/llspinctrl.h
@@ -35,62 +35,46 @@
#include "stdtypes.h"
-#include "lluictrl.h"
+#include "llf32uictrl.h"
#include "v4color.h"
#include "llrect.h"
-//
-// Constants
-//
-const S32 SPINCTRL_BTN_HEIGHT = 8;
-const S32 SPINCTRL_BTN_WIDTH = 16;
-const S32 SPINCTRL_SPACING = 2; // space between label right and button left
-const S32 SPINCTRL_HEIGHT = 2 * SPINCTRL_BTN_HEIGHT;
-const S32 SPINCTRL_DEFAULT_LABEL_WIDTH = 10;
-
class LLSpinCtrl
-: public LLUICtrl
+: public LLF32UICtrl
{
public:
- LLSpinCtrl(const std::string& name, const LLRect& rect,
- const std::string& label,
- const LLFontGL* font,
- void (*commit_callback)(LLUICtrl*, void*),
- void* callback_userdata,
- F32 initial_value, F32 min_value, F32 max_value, F32 increment,
- const std::string& control_name = std::string(),
- S32 label_width = SPINCTRL_DEFAULT_LABEL_WIDTH );
-
+ struct Params : public LLInitParam::Block<Params, LLF32UICtrl::Params>
+ {
+ Optional<S32> label_width;
+ Optional<U32> decimal_digits;
+ Optional<bool> allow_text_entry;
+
+ Optional<LLUIColor> text_enabled_color;
+ Optional<LLUIColor> text_disabled_color;
+
+ Params();
+ };
+protected:
+ LLSpinCtrl(const Params&);
+ friend class LLUICtrlFactory;
+public:
virtual ~LLSpinCtrl() {} // Children all cleaned up by default view destructor.
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
-
virtual void forceSetValue(const LLSD& value ) ;
virtual void setValue(const LLSD& value );
- virtual LLSD getValue() const { return mValue; }
- F32 get() const { return (F32)getValue().asReal(); }
+ F32 get() const { return getValueF32(); }
void set(F32 value) { setValue(value); mInitialValue = value; }
- virtual void setMinValue(LLSD min_value) { setMinValue((F32)min_value.asReal()); }
- virtual void setMaxValue(LLSD max_value) { setMaxValue((F32)max_value.asReal()); }
-
BOOL isMouseHeldDown() const;
virtual void setEnabled( BOOL b );
virtual void setFocus( BOOL b );
virtual void clear();
- virtual BOOL isDirty() const { return( mValue != mInitialValue ); }
- virtual void resetDirty() { mInitialValue = mValue; }
+ virtual BOOL isDirty() const { return( getValueF32() != mInitialValue ); }
+ virtual void resetDirty() { mInitialValue = getValueF32(); }
virtual void setPrecision(S32 precision);
- virtual void setMinValue(F32 min) { mMinValue = min; }
- virtual void setMaxValue(F32 max) { mMaxValue = max; }
- virtual void setIncrement(F32 inc) { mIncrement = inc; }
- virtual F32 getMinValue() { return mMinValue ; }
- virtual F32 getMaxValue() { return mMaxValue ; }
- virtual F32 getIncrement() { return mIncrement ; }
void setLabel(const LLStringExplicit& label);
void setLabelColor(const LLColor4& c) { mTextEnabledColor = c; }
@@ -107,31 +91,23 @@ public:
virtual BOOL handleScrollWheel(S32 x,S32 y,S32 clicks);
virtual BOOL handleKeyHere(KEY key, MASK mask);
- virtual void draw();
-
- static void onEditorCommit(LLUICtrl* caller, void* userdata);
+ void onEditorCommit(const LLSD& data);
static void onEditorGainFocus(LLFocusableElement* caller, void *userdata);
static void onEditorChangeFocus(LLUICtrl* caller, S32 direction, void *userdata);
- static void onUpBtn(void *userdata);
- static void onDownBtn(void *userdata);
+ void onUpBtn(const LLSD& data);
+ void onDownBtn(const LLSD& data);
private:
void updateEditor();
void reportInvalidData();
- F32 mValue;
- F32 mInitialValue;
- F32 mMaxValue;
- F32 mMinValue;
- F32 mIncrement;
-
S32 mPrecision;
class LLTextBox* mLabelBox;
class LLLineEditor* mEditor;
- LLColor4 mTextEnabledColor;
- LLColor4 mTextDisabledColor;
+ LLUIColor mTextEnabledColor;
+ LLUIColor mTextDisabledColor;
class LLButton* mUpBtn;
class LLButton* mDownBtn;
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
new file mode 100644
index 0000000000..b5383c34ea
--- /dev/null
+++ b/indra/llui/llstatbar.cpp
@@ -0,0 +1,295 @@
+/**
+ * @file llstatbar.cpp
+ * @brief A little map of the world with network information
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+//#include "llviewerprecompiledheaders.h"
+#include "linden_common.h"
+
+#include "llstatbar.h"
+
+#include "llmath.h"
+#include "llui.h"
+#include "llgl.h"
+#include "llfontgl.h"
+
+#include "llstat.h"
+#include "lluictrlfactory.h"
+
+static LLRegisterWidget<LLStatBar> r1("stat_bar");
+
+///////////////////////////////////////////////////////////////////////////////////
+
+LLStatBar::LLStatBar(const Params& p)
+ : LLView(p),
+ mLabel(p.label),
+ mUnitLabel(p.unit_label),
+ mMinBar(p.bar_min),
+ mMaxBar(p.bar_max),
+ mStatp(LLStat::getStat(p.stat)),
+ mTickSpacing(p.tick_spacing),
+ mLabelSpacing(p.label_spacing),
+ mPrecision(p.precision),
+ mUpdatesPerSec(p.update_rate),
+ mPerSec(p.show_per_sec),
+ mDisplayBar(p.show_bar),
+ mDisplayHistory(p.show_history),
+ mDisplayMean(p.show_mean)
+{
+}
+
+BOOL LLStatBar::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+ if (mDisplayBar)
+ {
+ if (mDisplayHistory)
+ {
+ mDisplayBar = FALSE;
+ mDisplayHistory = FALSE;
+ }
+ else
+ {
+ mDisplayHistory = TRUE;
+ }
+ }
+ else
+ {
+ mDisplayBar = TRUE;
+ }
+
+ LLView* parent = getParent();
+ parent->reshape(parent->getRect().getWidth(), parent->getRect().getHeight(), FALSE);
+
+ return FALSE;
+}
+
+void LLStatBar::draw()
+{
+ if (!mStatp)
+ {
+// llinfos << "No stats for statistics bar!" << llendl;
+ return;
+ }
+
+ // Get the values.
+ F32 current, min, max, mean;
+ if (mPerSec)
+ {
+ current = mStatp->getCurrentPerSec();
+ min = mStatp->getMinPerSec();
+ max = mStatp->getMaxPerSec();
+ mean = mStatp->getMeanPerSec();
+ }
+ else
+ {
+ current = mStatp->getCurrent();
+ min = mStatp->getMin();
+ max = mStatp->getMax();
+ mean = mStatp->getMean();
+ }
+
+
+ if ((mUpdatesPerSec == 0.f) || (mUpdateTimer.getElapsedTimeF32() > 1.f/mUpdatesPerSec) || (mValue == 0.f))
+ {
+ if (mDisplayMean)
+ {
+ mValue = mean;
+ }
+ else
+ {
+ mValue = current;
+ }
+ mUpdateTimer.reset();
+ }
+
+ S32 width = getRect().getWidth() - 40;
+ S32 max_width = width;
+ S32 bar_top = getRect().getHeight() - 15; // 16 pixels from top.
+ S32 bar_height = bar_top - 20;
+ S32 tick_height = 4;
+ S32 tick_width = 1;
+ S32 left, top, right, bottom;
+
+ F32 value_scale = max_width/(mMaxBar - mMinBar);
+
+ LLFontGL::getFontMonospace()->renderUTF8(mLabel, 0, 0, getRect().getHeight(), LLColor4(1.f, 1.f, 1.f, 1.f),
+ LLFontGL::LEFT, LLFontGL::TOP);
+
+ std::string value_format;
+ std::string value_str;
+ if (!mUnitLabel.empty())
+ {
+ value_format = llformat( "%%.%df%%s", mPrecision);
+ value_str = llformat( value_format.c_str(), mValue, mUnitLabel.c_str());
+ }
+ else
+ {
+ value_format = llformat( "%%.%df", mPrecision);
+ value_str = llformat( value_format.c_str(), mValue);
+ }
+
+ // Draw the value.
+ LLFontGL::getFontMonospace()->renderUTF8(value_str, 0, width, getRect().getHeight(),
+ LLColor4(1.f, 1.f, 1.f, 0.5f),
+ LLFontGL::RIGHT, LLFontGL::TOP);
+
+ value_format = llformat( "%%.%df", mPrecision);
+ if (mDisplayBar)
+ {
+ std::string tick_label;
+
+ // Draw the tick marks.
+ F32 tick_value;
+ top = bar_top;
+ bottom = bar_top - bar_height - tick_height/2;
+
+ LLGLSUIDefault gls_ui;
+ gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+
+ for (tick_value = mMinBar; tick_value <= mMaxBar; tick_value += mTickSpacing)
+ {
+ left = llfloor((tick_value - mMinBar)*value_scale);
+ right = left + tick_width;
+ gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.1f));
+ }
+
+ // Draw the tick labels (and big ticks).
+ bottom = bar_top - bar_height - tick_height;
+ for (tick_value = mMinBar; tick_value <= mMaxBar; tick_value += mLabelSpacing)
+ {
+ left = llfloor((tick_value - mMinBar)*value_scale);
+ right = left + tick_width;
+ gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 1.f, 1.f, 0.25f));
+
+ tick_label = llformat( value_format.c_str(), tick_value);
+ // draw labels for the tick marks
+ LLFontGL::getFontMonospace()->renderUTF8(tick_label, 0, left - 1, bar_top - bar_height - tick_height,
+ LLColor4(1.f, 1.f, 1.f, 0.5f),
+ LLFontGL::LEFT, LLFontGL::TOP);
+ }
+
+ // Now, draw the bars
+ top = bar_top;
+ bottom = bar_top - bar_height;
+
+ // draw background bar.
+ left = 0;
+ right = width;
+ gl_rect_2d(left, top, right, bottom, LLColor4(0.f, 0.f, 0.f, 0.25f));
+
+ if (mStatp->getNumValues() == 0)
+ {
+ // No data, don't draw anything...
+ return;
+ }
+ // draw min and max
+ left = (S32) ((min - mMinBar) * value_scale);
+
+ if (left < 0)
+ {
+ left = 0;
+ llwarns << "Min:" << min << llendl;
+ }
+
+ right = (S32) ((max - mMinBar) * value_scale);
+ gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 0.f, 0.f, 0.25f));
+
+ S32 num_values = mStatp->getNumValues() - 1;
+ if (mDisplayHistory)
+ {
+ S32 i;
+ for (i = 0; i < num_values; i++)
+ {
+ if (i == mStatp->getNextBin())
+ {
+ continue;
+ }
+ if (mPerSec)
+ {
+ left = (S32)((mStatp->getPrevPerSec(i) - mMinBar) * value_scale);
+ right = (S32)((mStatp->getPrevPerSec(i) - mMinBar) * value_scale) + 1;
+ gl_rect_2d(left, bottom+i+1, right, bottom+i, LLColor4(1.f, 0.f, 0.f, 1.f));
+ }
+ else
+ {
+ left = (S32)((mStatp->getPrev(i) - mMinBar) * value_scale);
+ right = (S32)((mStatp->getPrev(i) - mMinBar) * value_scale) + 1;
+ gl_rect_2d(left, bottom+i+1, right, bottom+i, LLColor4(1.f, 0.f, 0.f, 1.f));
+ }
+ }
+ }
+ else
+ {
+ // draw current
+ left = (S32) ((current - mMinBar) * value_scale) - 1;
+ right = (S32) ((current - mMinBar) * value_scale) + 1;
+ gl_rect_2d(left, top, right, bottom, LLColor4(1.f, 0.f, 0.f, 1.f));
+ }
+
+ // draw mean bar
+ top = bar_top + 2;
+ bottom = bar_top - bar_height - 2;
+ left = (S32) ((mean - mMinBar) * value_scale) - 1;
+ right = (S32) ((mean - mMinBar) * value_scale) + 1;
+ gl_rect_2d(left, top, right, bottom, LLColor4(0.f, 1.f, 0.f, 1.f));
+ }
+
+ LLView::draw();
+}
+
+void LLStatBar::setRange(F32 bar_min, F32 bar_max, F32 tick_spacing, F32 label_spacing)
+{
+ mMinBar = bar_min;
+ mMaxBar = bar_max;
+ mTickSpacing = tick_spacing;
+ mLabelSpacing = label_spacing;
+}
+
+LLRect LLStatBar::getRequiredRect()
+{
+ LLRect rect;
+
+ if (mDisplayBar)
+ {
+ if (mDisplayHistory)
+ {
+ rect.mTop = 67;
+ }
+ else
+ {
+ rect.mTop = 40;
+ }
+ }
+ else
+ {
+ rect.mTop = 14;
+ }
+ return rect;
+}
diff --git a/indra/llui/llstatbar.h b/indra/llui/llstatbar.h
new file mode 100644
index 0000000000..7de782a24f
--- /dev/null
+++ b/indra/llui/llstatbar.h
@@ -0,0 +1,108 @@
+/**
+ * @file llstatbar.h
+ * @brief A little map of the world with network information
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSTATBAR_H
+#define LL_LLSTATBAR_H
+
+#include "llview.h"
+#include "llframetimer.h"
+
+class LLStat;
+
+class LLStatBar : public LLView
+{
+public:
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Optional<std::string> label;
+ Optional<std::string> unit_label;
+ Optional<F32> bar_min;
+ Optional<F32> bar_max;
+ Optional<F32> tick_spacing;
+ Optional<F32> label_spacing;
+ Optional<U32> precision;
+ Optional<F32> update_rate;
+ Optional<bool> show_per_sec;
+ Optional<bool> show_bar;
+ Optional<bool> show_history;
+ Optional<bool> show_mean;
+ Optional<std::string> stat;
+ Params()
+ : label("label"),
+ unit_label("unit_label"),
+ bar_min("bar_min", 0.0f),
+ bar_max("bar_max", 50.0f),
+ tick_spacing("tick_spacing", 10.0f),
+ label_spacing("label_spacing", 10.0f),
+ precision("precision", 0),
+ update_rate("update_rate", 5.0f),
+ show_per_sec("show_per_sec", TRUE),
+ show_bar("show_bar", TRUE),
+ show_history("show_history", FALSE),
+ show_mean("show_mean", TRUE),
+ stat("stat")
+ {
+ follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT);
+ }
+ };
+ LLStatBar(const Params&);
+
+ virtual void draw();
+ virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+
+ void setStat(LLStat* stat) { mStatp = stat; }
+ void setRange(F32 bar_min, F32 bar_max, F32 tick_spacing, F32 label_spacing);
+ void getRange(F32& bar_min, F32& bar_max) { bar_min = mMinBar; bar_max = mMaxBar; }
+
+ /*virtual*/ LLRect getRequiredRect(); // Return the height of this object, given the set options.
+
+private:
+ F32 mMinBar;
+ F32 mMaxBar;
+ F32 mTickSpacing;
+ F32 mLabelSpacing;
+ U32 mPrecision;
+ F32 mUpdatesPerSec;
+ BOOL mPerSec; // Use the per sec stats.
+ BOOL mDisplayBar; // Display the bar graph.
+ BOOL mDisplayHistory;
+ BOOL mDisplayMean; // If true, display mean, if false, display current value
+
+ LLStat* mStatp;
+
+ LLFrameTimer mUpdateTimer;
+ LLUIString mLabel;
+ std::string mUnitLabel;
+ F32 mValue;
+};
+
+#endif
diff --git a/indra/llui/llstatgraph.cpp b/indra/llui/llstatgraph.cpp
new file mode 100644
index 0000000000..3bd2c9f9e7
--- /dev/null
+++ b/indra/llui/llstatgraph.cpp
@@ -0,0 +1,163 @@
+/**
+ * @file llstatgraph.cpp
+ * @brief Simpler compact stat graph with tooltip
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+//#include "llviewerprecompiledheaders.h"
+#include "linden_common.h"
+
+#include "llstatgraph.h"
+#include "llrender.h"
+
+#include "llmath.h"
+#include "llui.h"
+#include "llstat.h"
+#include "llgl.h"
+#include "llglheaders.h"
+//#include "llviewercontrol.h"
+
+///////////////////////////////////////////////////////////////////////////////////
+
+LLStatGraph::LLStatGraph(const LLView::Params& p)
+: LLView(p)
+{
+ mStatp = NULL;
+ setToolTip(p.name());
+ mNumThresholds = 3;
+ mThresholdColors[0] = LLColor4(0.f, 1.f, 0.f, 1.f);
+ mThresholdColors[1] = LLColor4(1.f, 1.f, 0.f, 1.f);
+ mThresholdColors[2] = LLColor4(1.f, 0.f, 0.f, 1.f);
+ mThresholdColors[3] = LLColor4(1.f, 0.f, 0.f, 1.f);
+ mThresholds[0] = 50.f;
+ mThresholds[1] = 75.f;
+ mThresholds[2] = 100.f;
+ mMin = 0.f;
+ mMax = 125.f;
+ mPerSec = TRUE;
+ mValue = 0.f;
+ mPrecision = 0;
+}
+
+void LLStatGraph::draw()
+{
+ F32 range, frac;
+ range = mMax - mMin;
+ if (mStatp)
+ {
+ if (mPerSec)
+ {
+ mValue = mStatp->getMeanPerSec();
+ }
+ else
+ {
+ mValue = mStatp->getMean();
+ }
+ }
+ frac = (mValue - mMin) / range;
+ frac = llmax(0.f, frac);
+ frac = llmin(1.f, frac);
+
+ if (mUpdateTimer.getElapsedTimeF32() > 0.5f)
+ {
+ std::string format_str;
+ std::string tmp_str;
+ format_str = llformat("%%s%%.%df%%s", mPrecision);
+ tmp_str = llformat(format_str.c_str(), mLabel.c_str(), mValue, mUnits.c_str());
+ setToolTip(tmp_str);
+
+ mUpdateTimer.reset();
+ }
+
+ LLColor4 color;
+
+ S32 i;
+ for (i = 0; i < mNumThresholds - 1; i++)
+ {
+ if (mThresholds[i] > mValue)
+ {
+ break;
+ }
+ }
+
+ //gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0,
+ // gSavedSkinSettings.getColor("ColorDropShadow"),
+ // (S32) gSavedSettings.getF32("DropShadowFloater") );
+
+ color = LLUI::sSettingGroups["color"]->getColor( "MenuDefaultBgColor" );
+ gGL.color4fv(color.mV);
+ gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, TRUE);
+
+ gGL.color4fv(LLColor4::black.mV);
+ gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0, FALSE);
+
+ color = mThresholdColors[i];
+ gGL.color4fv(color.mV);
+ gl_rect_2d(1, llround(frac*getRect().getHeight()), getRect().getWidth() - 1, 0, TRUE);
+}
+
+void LLStatGraph::setValue(const LLSD& value)
+{
+ mValue = (F32)value.asReal();
+}
+
+void LLStatGraph::setMin(const F32 min)
+{
+ mMin = min;
+}
+
+void LLStatGraph::setMax(const F32 max)
+{
+ mMax = max;
+}
+
+void LLStatGraph::setStat(LLStat *statp)
+{
+ mStatp = statp;
+}
+
+void LLStatGraph::setLabel(const std::string& label)
+{
+ mLabel = label;
+}
+
+void LLStatGraph::setUnits(const std::string& units)
+{
+ mUnits = units;
+}
+
+void LLStatGraph::setPrecision(const S32 precision)
+{
+ mPrecision = precision;
+}
+
+void LLStatGraph::setThreshold(const S32 i, F32 value)
+{
+ mThresholds[i] = value;
+}
diff --git a/indra/llui/llstatgraph.h b/indra/llui/llstatgraph.h
new file mode 100644
index 0000000000..dd38050b1b
--- /dev/null
+++ b/indra/llui/llstatgraph.h
@@ -0,0 +1,76 @@
+/**
+ * @file llstatgraph.h
+ * @brief Simpler compact stat graph with tooltip
+ *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSTATGRAPH_H
+#define LL_LLSTATGRAPH_H
+
+#include "llview.h"
+#include "llframetimer.h"
+#include "v4color.h"
+
+class LLStat;
+
+class LLStatGraph : public LLView
+{
+public:
+ LLStatGraph(const LLView::Params&);
+
+ virtual void draw();
+
+ void setLabel(const std::string& label);
+ void setUnits(const std::string& units);
+ void setPrecision(const S32 precision);
+ void setStat(LLStat *statp);
+ void setThreshold(const S32 i, F32 value);
+ void setMin(const F32 min);
+ void setMax(const F32 max);
+
+ /*virtual*/ void setValue(const LLSD& value);
+
+ LLStat *mStatp;
+ BOOL mPerSec;
+private:
+ F32 mValue;
+
+ F32 mMin;
+ F32 mMax;
+ LLFrameTimer mUpdateTimer;
+ std::string mLabel;
+ std::string mUnits;
+ S32 mPrecision; // Num of digits of precision after dot
+
+ S32 mNumThresholds;
+ F32 mThresholds[4];
+ LLColor4 mThresholdColors[4];
+};
+
+#endif // LL_LLSTATGRAPH_H
diff --git a/indra/llui/llstatview.cpp b/indra/llui/llstatview.cpp
new file mode 100644
index 0000000000..e16f2c450e
--- /dev/null
+++ b/indra/llui/llstatview.cpp
@@ -0,0 +1,66 @@
+/**
+ * @file llstatview.cpp
+ * @brief Container for all statistics info.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llstatview.h"
+
+#include "llerror.h"
+#include "llstatbar.h"
+#include "llfontgl.h"
+#include "llgl.h"
+#include "llui.h"
+
+#include "llstatbar.h"
+
+LLStatView::LLStatView(const LLStatView::Params& p)
+: LLContainerView(p),
+ mSetting(p.setting)
+{
+ BOOL isopen = getDisplayChildren();
+ if (mSetting.length() > 0)
+ {
+ isopen = LLUI::sSettingGroups["config"]->getBOOL(mSetting);
+ }
+ setDisplayChildren(isopen);
+}
+
+LLStatView::~LLStatView()
+{
+ // Children all cleaned up by default view destructor.
+ if (mSetting.length() > 0)
+ {
+ BOOL isopen = getDisplayChildren();
+ LLUI::sSettingGroups["config"]->setBOOL(mSetting, isopen);
+ }
+}
+
diff --git a/indra/llui/llstatview.h b/indra/llui/llstatview.h
new file mode 100644
index 0000000000..0197c7ceb3
--- /dev/null
+++ b/indra/llui/llstatview.h
@@ -0,0 +1,63 @@
+/**
+ * @file llstatview.h
+ * @brief Container for all statistics info.
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLSTATVIEW_H
+#define LL_LLSTATVIEW_H
+
+#include "llstatbar.h"
+#include "llcontainerview.h"
+#include <vector>
+
+class LLStatBar;
+
+class LLStatView : public LLContainerView
+{
+public:
+ struct Params : public LLInitParam::Block<Params, LLContainerView::Params>
+ {
+ Optional<std::string> setting;
+ Params()
+ : setting("setting")
+ {
+ follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT);
+ }
+ };
+ ~LLStatView();
+
+protected:
+ LLStatView(const Params&);
+ friend class LLUICtrlFactory;
+
+protected:
+ std::string mSetting;
+};
+#endif // LL_STATVIEW_
diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp
index a716cbbaec..432d54dfee 100644
--- a/indra/llui/llstyle.cpp
+++ b/indra/llui/llstyle.cpp
@@ -33,10 +33,11 @@
#include "linden_common.h"
#include "llstyle.h"
+
+#include "llfontgl.h"
#include "llstring.h"
#include "llui.h"
-//#include "llviewerimagelist.h"
LLStyle::LLStyle()
{
@@ -110,7 +111,13 @@ LLStyle &LLStyle::operator=(const LLStyle &rhs)
return *this;
}
+//virtual
+const std::string& LLStyle::getFontString() const
+{
+ return mFontName;
+}
+//virtual
void LLStyle::setFontName(const std::string& fontname)
{
mFontName = fontname;
@@ -118,26 +125,35 @@ void LLStyle::setFontName(const std::string& fontname)
std::string fontname_lc = fontname;
LLStringUtil::toLower(fontname_lc);
- mFontID = LLFONT_OCRA; // default
-
+ // cache the font pointer for speed when rendering text
if ((fontname_lc == "sansserif") || (fontname_lc == "sans-serif"))
{
- mFontID = LLFONT_SANSSERIF;
+ mFont = LLFontGL::getFontSansSerif();
}
else if ((fontname_lc == "serif"))
{
- mFontID = LLFONT_SMALL;
+ // *TODO: Do we have a real serif font?
+ mFont = LLFontGL::getFontMonospace();
}
else if ((fontname_lc == "sansserifbig"))
{
- mFontID = LLFONT_SANSSERIF_BIG;
+ mFont = LLFontGL::getFontSansSerifBig();
}
else if (fontname_lc == "small")
{
- mFontID = LLFONT_SANSSERIF_SMALL;
+ mFont = LLFontGL::getFontSansSerifSmall();
+ }
+ else
+ {
+ mFont = LLFontGL::getFontMonospace();
}
}
+//virtual
+LLFontGL* LLStyle::getFont() const
+{
+ return mFont;
+}
void LLStyle::setLinkHREF(const std::string& href)
{
@@ -166,7 +182,7 @@ LLUIImagePtr LLStyle::getImage() const
void LLStyle::setImage(const LLUUID& src)
{
- mImagep = LLUI::sImageProvider->getUIImageByID(src);
+ mImagep = LLUI::getUIImageByID(src);
}
diff --git a/indra/llui/llstyle.h b/indra/llui/llstyle.h
index 3ad379cdd9..890abc7d67 100644
--- a/indra/llui/llstyle.h
+++ b/indra/llui/llstyle.h
@@ -34,10 +34,11 @@
#define LL_LLSTYLE_H
#include "v4color.h"
-#include "llresmgr.h"
#include "llfont.h"
#include "llui.h"
+class LLFontGL;
+
class LLStyle : public LLRefCount
{
public:
@@ -55,9 +56,9 @@ public:
virtual BOOL isVisible() const;
virtual void setVisible(BOOL is_visible);
- virtual const std::string& getFontString() const { return mFontName; }
+ virtual const std::string& getFontString() const;
virtual void setFontName(const std::string& fontname);
- virtual LLFONT_ID getFontID() const { return mFontID; }
+ virtual LLFontGL* getFont() const;
virtual const std::string& getLinkHREF() const { return mLink; }
virtual void setLinkHREF(const std::string& href);
@@ -107,7 +108,7 @@ private:
BOOL mVisible;
LLColor4 mColor;
std::string mFontName;
- LLFONT_ID mFontID;
+ LLFontGL* mFont; // cached for performance
std::string mLink;
LLUIImagePtr mImagep;
BOOL mIsEmbeddedItem;
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index f4169488d4..5b24131c90 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -35,73 +35,127 @@
#include "llfocusmgr.h"
#include "llbutton.h"
#include "llrect.h"
-#include "llresmgr.h"
#include "llresizehandle.h"
#include "lltextbox.h"
#include "llcriticaldamp.h"
#include "lluictrlfactory.h"
-#include "lltabcontainervertical.h"
#include "llrender.h"
+#include "llfloater.h"
+
+//----------------------------------------------------------------------------
+
+// Implementation Notes:
+// - Each tab points to a LLPanel (see LLTabTuple below)
+// - When a tab is selected, the validation callback
+// (LLUICtrl::mValidateSignal) is called
+// - If the validation callback returns true (or none is provided),
+// the tab is changed and the commit callback
+// (LLUICtrl::mCommitSignal) is called
+// - Callbacks pass the LLTabContainer as the control,
+// and the NAME of the selected PANEL as the LLSD data
+
+//----------------------------------------------------------------------------
const F32 SCROLL_STEP_TIME = 0.4f;
const F32 SCROLL_DELAY_TIME = 0.5f;
-const S32 TAB_PADDING = 15;
-const S32 TABCNTR_TAB_MIN_WIDTH = 60;
-const S32 TABCNTR_VERT_TAB_MIN_WIDTH = 100;
-const S32 TABCNTR_TAB_MAX_WIDTH = 150;
-const S32 TABCNTR_TAB_PARTIAL_WIDTH = 12; // When tabs are parially obscured, how much can you still see.
-const S32 TABCNTR_TAB_HEIGHT = 16;
-const S32 TABCNTR_ARROW_BTN_SIZE = 16;
-const S32 TABCNTR_BUTTON_PANEL_OVERLAP = 1; // how many pixels the tab buttons and tab panels overlap.
-const S32 TABCNTR_TAB_H_PAD = 4;
-
-const S32 TABCNTR_CLOSE_BTN_SIZE = 16;
-const S32 TABCNTR_HEADER_HEIGHT = LLPANEL_BORDER_WIDTH + TABCNTR_CLOSE_BTN_SIZE;
-
-const S32 TABCNTRV_CLOSE_BTN_SIZE = 16;
-const S32 TABCNTRV_HEADER_HEIGHT = LLPANEL_BORDER_WIDTH + TABCNTRV_CLOSE_BTN_SIZE;
-//const S32 TABCNTRV_TAB_WIDTH = 100;
-const S32 TABCNTRV_ARROW_BTN_SIZE = 16;
-const S32 TABCNTRV_PAD = 0;
-
-static LLRegisterWidget<LLTabContainer> r("tab_container");
-
-LLTabContainer::LLTabContainer(const std::string& name, const LLRect& rect, TabPosition pos,
- BOOL bordered, BOOL is_vertical )
- :
- LLPanel(name, rect, bordered),
+
+void LLTabContainer::TabPositions::declareValues()
+{
+ declare("top", LLTabContainer::TOP);
+ declare("bottom", LLTabContainer::BOTTOM);
+ declare("left", LLTabContainer::LEFT);
+}
+
+//----------------------------------------------------------------------------
+
+// Structure used to map tab buttons to and from tab panels
+class LLTabTuple
+{
+public:
+ LLTabTuple( LLTabContainer* c, LLPanel* p, LLButton* b, LLTextBox* placeholder = NULL)
+ :
+ mTabContainer(c),
+ mTabPanel(p),
+ mButton(b),
+ mOldState(FALSE),
+ mPlaceholderText(placeholder),
+ mPadding(0)
+ {}
+
+ LLTabContainer* mTabContainer;
+ LLPanel* mTabPanel;
+ LLButton* mButton;
+ BOOL mOldState;
+ LLTextBox* mPlaceholderText;
+ S32 mPadding;
+};
+
+//----------------------------------------------------------------------------
+
+struct LLPlaceHolderPanel : public LLPanel
+{
+ // create dummy param block to register with "placeholder" nane
+ struct Params : public LLPanel::Params{};
+ LLPlaceHolderPanel(const Params& p) : LLPanel(p)
+ {}
+};
+static LLRegisterWidget<LLPlaceHolderPanel> r1("placeholder");
+static LLRegisterWidget<LLTabContainer> r2("tab_container");
+
+LLTabContainer::Params::Params()
+: tab_width("tab_width"),
+ tab_position("tab_position"),
+ tab_min_width("tab_min_width"),
+ tab_max_width("tab_max_width"),
+ hide_tabs("hide_tabs", false)
+{
+ name(std::string("tab_container"));
+ mouse_opaque = false;
+}
+
+LLTabContainer::LLTabContainer(const LLTabContainer::Params& p)
+: LLPanel(p),
mCurrentTabIdx(-1),
- mNextTabIdx(-1),
- mTabsHidden(FALSE),
+ mTabsHidden(p.hide_tabs),
mScrolled(FALSE),
mScrollPos(0),
mScrollPosPixels(0),
mMaxScrollPos(0),
- mCloseCallback( NULL ),
- mCallbackUserdata( NULL ),
mTitleBox(NULL),
mTopBorderHeight(LLPANEL_BORDER_WIDTH),
- mTabPosition(pos),
mLockedTabCount(0),
- mMinTabWidth(TABCNTR_TAB_MIN_WIDTH),
- mMaxTabWidth(TABCNTR_TAB_MAX_WIDTH),
+ mMinTabWidth(0),
+ mMaxTabWidth(p.tab_max_width),
mPrevArrowBtn(NULL),
mNextArrowBtn(NULL),
- mIsVertical(is_vertical),
+ mIsVertical( p.tab_position == LEFT ),
// Horizontal Specific
mJumpPrevArrowBtn(NULL),
mJumpNextArrowBtn(NULL),
- mRightTabBtnOffset(0),
- mTotalTabWidth(0)
-{
- //RN: HACK to support default min width for legacy vertical tab containers
- if (mIsVertical)
+ mRightTabBtnOffset(p.tab_padding_right),
+ mTotalTabWidth(0),
+ mTabPosition(p.tab_position)
+{
+ static LLUICachedControl<S32> tabcntr_vert_tab_min_width ("UITabCntrVertTabMinWidth", 0);
+
+ mDragAndDropDelayTimer.stop();
+
+ if (p.tab_width.isProvided())
+ {
+ mMinTabWidth = p.tab_width;
+ }
+ else if (!mIsVertical)
{
- mMinTabWidth = TABCNTR_VERT_TAB_MIN_WIDTH;
+ mMinTabWidth = p.tab_min_width;
}
- setMouseOpaque(FALSE);
+ else
+ {
+ // *HACK: support default min width for legacy vertical
+ // tab containers
+ mMinTabWidth = tabcntr_vert_tab_min_width;
+ }
+
initButtons( );
- mDragAndDropDelayTimer.stop();
}
LLTabContainer::~LLTabContainer()
@@ -150,16 +204,45 @@ LLView* LLTabContainer::getChildView(const std::string& name, BOOL recurse, BOOL
return LLView::getChildView(name, recurse, create_if_missing);
}
+bool LLTabContainer::addChild(LLView* view, S32 tab_group)
+{
+ LLPanel* panelp = dynamic_cast<LLPanel*>(view);
+
+ if (panelp)
+ {
+ panelp->setSaveToXML(TRUE);
+
+ addTabPanel(TabPanelParams().panel(panelp).label(panelp->getLabel()).is_placeholder(dynamic_cast<LLPlaceHolderPanel*>(view) != NULL));
+ return true;
+ }
+ else
+ {
+ return LLUICtrl::addChild(view, tab_group);
+ }
+}
+
+BOOL LLTabContainer::postBuild()
+{
+ selectFirstTab();
+
+ return TRUE;
+}
+
// virtual
void LLTabContainer::draw()
{
+ static LLUICachedControl<S32> tabcntrv_pad ("UITabCntrvPad", 0);
+ static LLUICachedControl<S32> tabcntrv_arrow_btn_size ("UITabCntrvArrowBtnSize", 0);
+ static LLUICachedControl<S32> tabcntr_tab_h_pad ("UITabCntrTabHPad", 0);
+ static LLUICachedControl<S32> tabcntr_arrow_btn_size ("UITabCntrArrowBtnSize", 0);
+ static LLUICachedControl<S32> tabcntr_tab_partial_width ("UITabCntrTabPartialWidth", 0);
S32 target_pixel_scroll = 0;
S32 cur_scroll_pos = getScrollPos();
if (cur_scroll_pos > 0)
{
+ S32 available_width_with_arrows = getRect().getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + tabcntr_arrow_btn_size + tabcntr_arrow_btn_size + 1);
if (!mIsVertical)
{
- S32 available_width_with_arrows = getRect().getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE + TABCNTR_ARROW_BTN_SIZE + 1);
for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
{
if (cur_scroll_pos == 0)
@@ -171,26 +254,10 @@ void LLTabContainer::draw()
}
// Show part of the tab to the left of what is fully visible
- target_pixel_scroll -= TABCNTR_TAB_PARTIAL_WIDTH;
+ target_pixel_scroll -= tabcntr_tab_partial_width;
// clamp so that rightmost tab never leaves right side of screen
target_pixel_scroll = llmin(mTotalTabWidth - available_width_with_arrows, target_pixel_scroll);
}
- else
- {
- S32 available_height_with_arrows = getRect().getHeight() - getTopBorderHeight() - (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE + TABCNTR_ARROW_BTN_SIZE + 1);
- for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
- {
- if (cur_scroll_pos==0)
- {
- break;
- }
- target_pixel_scroll += (*iter)->mButton->getRect().getHeight();
- cur_scroll_pos--;
- }
- S32 total_tab_height = (BTN_HEIGHT + TABCNTRV_PAD) * getTabCount() + TABCNTRV_PAD;
- // clamp so that the bottom tab never leaves bottom of panel
- target_pixel_scroll = llmin(total_tab_height - available_height_with_arrows, target_pixel_scroll);
- }
}
setScrollPosPixels((S32)lerp((F32)getScrollPosPixels(), (F32)target_pixel_scroll, LLCriticalDamp::getInterpolant(0.08f)));
@@ -207,13 +274,13 @@ void LLTabContainer::draw()
S32 left = 0, top = 0;
if (mIsVertical)
{
- top = getRect().getHeight() - getTopBorderHeight() - LLPANEL_BORDER_WIDTH - 1 - (has_scroll_arrows ? TABCNTRV_ARROW_BTN_SIZE : 0);
+ top = getRect().getHeight() - getTopBorderHeight() - LLPANEL_BORDER_WIDTH - 1 - (has_scroll_arrows ? tabcntrv_arrow_btn_size : 0);
top += getScrollPosPixels();
}
else
{
// Set the leftmost position of the tab buttons.
- left = LLPANEL_BORDER_WIDTH + (has_scroll_arrows ? (TABCNTR_ARROW_BTN_SIZE * 2) : TABCNTR_TAB_H_PAD);
+ left = LLPANEL_BORDER_WIDTH + (has_scroll_arrows ? (tabcntr_arrow_btn_size * 2) : tabcntr_tab_h_pad);
left -= getScrollPosPixels();
}
@@ -243,8 +310,8 @@ void LLTabContainer::draw()
// ...but clip them.
if (mIsVertical)
{
- clip_rect.mBottom = mNextArrowBtn->getRect().mTop + 3*TABCNTRV_PAD;
- clip_rect.mTop = mPrevArrowBtn->getRect().mBottom - 3*TABCNTRV_PAD;
+ clip_rect.mBottom = mNextArrowBtn->getRect().mTop + 3*tabcntrv_pad;
+ clip_rect.mTop = mPrevArrowBtn->getRect().mBottom - 3*tabcntrv_pad;
}
else
{
@@ -262,7 +329,7 @@ void LLTabContainer::draw()
tuple->mButton->translate( left ? left - tuple->mButton->getRect().mLeft : 0,
top ? top - tuple->mButton->getRect().mTop : 0 );
- if (top) top -= BTN_HEIGHT + TABCNTRV_PAD;
+ if (top) top -= BTN_HEIGHT + tabcntrv_pad;
if (left) left += tuple->mButton->getRect().getWidth();
if (!mIsVertical)
@@ -316,6 +383,7 @@ void LLTabContainer::draw()
// virtual
BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
{
+ static LLUICachedControl<S32> tabcntrv_pad ("UITabCntrvPad", 0);
BOOL handled = FALSE;
BOOL has_scroll_arrows = (getMaxScrollPos() > 0);
@@ -359,9 +427,9 @@ BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
if (mIsVertical)
{
tab_rect = LLRect(firsttuple->mButton->getRect().mLeft,
- has_scroll_arrows ? mPrevArrowBtn->getRect().mBottom - TABCNTRV_PAD : mPrevArrowBtn->getRect().mTop,
+ has_scroll_arrows ? mPrevArrowBtn->getRect().mBottom - tabcntrv_pad : mPrevArrowBtn->getRect().mTop,
firsttuple->mButton->getRect().mRight,
- has_scroll_arrows ? mNextArrowBtn->getRect().mTop + TABCNTRV_PAD : mNextArrowBtn->getRect().mBottom );
+ has_scroll_arrows ? mNextArrowBtn->getRect().mTop + tabcntrv_pad : mNextArrowBtn->getRect().mBottom );
}
else
{
@@ -483,6 +551,7 @@ BOOL LLTabContainer::handleMouseUp( S32 x, S32 y, MASK mask )
// virtual
BOOL LLTabContainer::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rect )
{
+ static LLUICachedControl<S32> tabcntrv_pad ("UITabCntrvPad", 0);
BOOL handled = LLPanel::handleToolTip( x, y, msg, sticky_rect );
if (!handled && getTabCount() > 0)
{
@@ -493,9 +562,9 @@ BOOL LLTabContainer::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* stic
if (mIsVertical)
{
clip = LLRect(firsttuple->mButton->getRect().mLeft,
- has_scroll_arrows ? mPrevArrowBtn->getRect().mBottom - TABCNTRV_PAD : mPrevArrowBtn->getRect().mTop,
+ has_scroll_arrows ? mPrevArrowBtn->getRect().mBottom - tabcntrv_pad : mPrevArrowBtn->getRect().mTop,
firsttuple->mButton->getRect().mRight,
- has_scroll_arrows ? mNextArrowBtn->getRect().mTop + TABCNTRV_PAD : mNextArrowBtn->getRect().mBottom );
+ has_scroll_arrows ? mNextArrowBtn->getRect().mTop + tabcntrv_pad : mNextArrowBtn->getRect().mBottom );
}
else
{
@@ -616,14 +685,6 @@ BOOL LLTabContainer::handleKeyHere(KEY key, MASK mask)
return handled;
}
-// virtual
-LLXMLNodePtr LLTabContainer::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLPanel::getXML();
- node->createChild("tab_position", TRUE)->setStringValue((getTabPosition() == TOP ? "top" : "bottom"));
- return node;
-}
-
// virtual
BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType type, void* cargo_data, EAcceptance *accept, std::string &tooltip)
{
@@ -676,21 +737,33 @@ BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDrag
return LLView::handleDragAndDrop(x, y, mask, drop, type, cargo_data, accept, tooltip);
}
-void LLTabContainer::addTabPanel(LLPanel* child,
- const std::string& label,
- BOOL select,
- void (*on_tab_clicked)(void*, bool),
- void* userdata,
- S32 indent,
- BOOL placeholder,
- eInsertionPoint insertion_point)
+void LLTabContainer::addTabPanel(LLPanel* panelp)
+{
+ addTabPanel(TabPanelParams().panel(panelp));
+}
+
+void LLTabContainer::addTabPanel(const TabPanelParams& panel)
{
+ LLPanel* child = panel.panel();
+ const std::string& label = panel.label.isProvided()
+ ? panel.label()
+ : panel.panel()->getLabel();
+ BOOL select = panel.select_tab();
+ S32 indent = panel.indent();
+ BOOL placeholder = panel.is_placeholder;
+ eInsertionPoint insertion_point = panel.insert_at();
+
+ static LLUICachedControl<S32> tabcntrv_pad ("UITabCntrvPad", 0);
+ static LLUICachedControl<S32> tabcntr_button_panel_overlap ("UITabCntrButtonPanelOverlap", 0);
+ static LLUICachedControl<S32> tabcntr_tab_height ("UITabCntrTabHeight", 0);
+ static LLUICachedControl<S32> tab_padding ("UITabPadding", 0);
if (child->getParent() == this)
{
// already a child of mine
return;
}
- const LLFontGL* font = LLResMgr::getInstance()->getRes( mIsVertical ? LLFONT_SANSSERIF : LLFONT_SANSSERIF_SMALL );
+ const LLFontGL* font =
+ (mIsVertical ? LLFontGL::getFontSansSerif() : LLFontGL::getFontSansSerifSmall());
// Store the original label for possible xml export.
child->setLabel(label);
@@ -700,7 +773,7 @@ void LLTabContainer::addTabPanel(LLPanel* child,
S32 button_width = mMinTabWidth;
if (!mIsVertical)
{
- button_width = llclamp(font->getWidth(trimmed_label) + TAB_PADDING, mMinTabWidth, mMaxTabWidth);
+ button_width = llclamp(font->getWidth(trimmed_label) + tab_padding, mMinTabWidth, mMaxTabWidth);
}
// Tab panel
@@ -708,20 +781,20 @@ void LLTabContainer::addTabPanel(LLPanel* child,
S32 tab_panel_bottom;
if( getTabPosition() == LLTabContainer::TOP )
{
- S32 tab_height = mIsVertical ? BTN_HEIGHT : TABCNTR_TAB_HEIGHT;
- tab_panel_top = getRect().getHeight() - getTopBorderHeight() - (tab_height - TABCNTR_BUTTON_PANEL_OVERLAP);
+ S32 tab_height = mIsVertical ? BTN_HEIGHT : tabcntr_tab_height;
+ tab_panel_top = getRect().getHeight() - getTopBorderHeight() - (tab_height - tabcntr_button_panel_overlap);
tab_panel_bottom = LLPANEL_BORDER_WIDTH;
}
else
{
tab_panel_top = getRect().getHeight() - getTopBorderHeight();
- tab_panel_bottom = (TABCNTR_TAB_HEIGHT - TABCNTR_BUTTON_PANEL_OVERLAP); // Run to the edge, covering up the border
+ tab_panel_bottom = (tabcntr_tab_height - tabcntr_button_panel_overlap); // Run to the edge, covering up the border
}
LLRect tab_panel_rect;
if (mIsVertical)
{
- tab_panel_rect = LLRect(mMinTabWidth + (LLPANEL_BORDER_WIDTH * 2) + TABCNTRV_PAD,
+ tab_panel_rect = LLRect(mMinTabWidth + (LLPANEL_BORDER_WIDTH * 2) + tabcntrv_pad,
getRect().getHeight() - LLPANEL_BORDER_WIDTH,
getRect().getWidth() - LLPANEL_BORDER_WIDTH,
LLPANEL_BORDER_WIDTH);
@@ -750,20 +823,20 @@ void LLTabContainer::addTabPanel(LLPanel* child,
if (mIsVertical)
{
- btn_rect.setLeftTopAndSize(TABCNTRV_PAD + LLPANEL_BORDER_WIDTH + 2, // JC - Fudge factor
- (getRect().getHeight() - getTopBorderHeight() - LLPANEL_BORDER_WIDTH - 1) - ((BTN_HEIGHT + TABCNTRV_PAD) * getTabCount()),
+ btn_rect.setLeftTopAndSize(tabcntrv_pad + LLPANEL_BORDER_WIDTH + 2, // JC - Fudge factor
+ (getRect().getHeight() - getTopBorderHeight() - LLPANEL_BORDER_WIDTH - 1) - ((BTN_HEIGHT + tabcntrv_pad) * getTabCount()),
mMinTabWidth,
BTN_HEIGHT);
}
else if( getTabPosition() == LLTabContainer::TOP )
{
- btn_rect.setLeftTopAndSize( 0, getRect().getHeight() - getTopBorderHeight() + tab_fudge, button_width, TABCNTR_TAB_HEIGHT );
+ btn_rect.setLeftTopAndSize( 0, getRect().getHeight() - getTopBorderHeight() + tab_fudge, button_width, tabcntr_tab_height );
tab_img = "tab_top_blue.tga";
tab_selected_img = "tab_top_selected_blue.tga";
}
else
{
- btn_rect.setOriginAndSize( 0, 0 + tab_fudge, button_width, TABCNTR_TAB_HEIGHT );
+ btn_rect.setOriginAndSize( 0, 0 + tab_fudge, button_width, tabcntr_tab_height );
tab_img = "tab_bottom_blue.tga";
tab_selected_img = "tab_bottom_selected_blue.tga";
}
@@ -774,31 +847,38 @@ void LLTabContainer::addTabPanel(LLPanel* child,
if (placeholder)
{
btn_rect.translate(0, -LLBUTTON_V_PAD-2);
- textbox = new LLTextBox(trimmed_label, btn_rect, trimmed_label, font);
+ LLTextBox::Params params;
+ params.name(trimmed_label);
+ params.rect(btn_rect);
+ params.text(trimmed_label);
+ params.font(font);
+ textbox = LLUICtrlFactory::create<LLTextBox> (params);
- btn = new LLButton(LLStringUtil::null, LLRect(0,0,0,0));
+ LLButton::Params p;
+ p.name("");
+ btn = LLUICtrlFactory::create<LLButton>(p);
}
else
{
if (mIsVertical)
{
- btn = new LLButton(std::string("vert tab button"),
- btn_rect,
- LLStringUtil::null,
- LLStringUtil::null,
- LLStringUtil::null,
- &LLTabContainer::onTabBtn, NULL,
- font,
- trimmed_label, trimmed_label);
- btn->setImages(std::string("tab_left.tga"), std::string("tab_left_selected.tga"));
- btn->setScaleImage(TRUE);
- btn->setHAlign(LLFontGL::LEFT);
- btn->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
- btn->setTabStop(FALSE);
+ LLButton::Params p;
+ p.name(std::string("vert tab button"));
+ p.rect(btn_rect);
+ p.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT);
+ p.click_callback.function(boost::bind(&LLTabContainer::onTabBtn, this, _2, child));
+ p.font(font);
+ p.label(trimmed_label);
+ p.image_unselected.name("tab_left.tga");
+ p.image_selected.name("tab_left_selected.tga");
+ p.scale_image(true);
+ p.font_halign = LLFontGL::LEFT;
+ p.tab_stop(false);
if (indent)
{
- btn->setLeftHPad(indent);
+ p.pad_left(indent);
}
+ btn = LLUICtrlFactory::create<LLButton>(p);
}
else
{
@@ -806,39 +886,44 @@ void LLTabContainer::addTabPanel(LLPanel* child,
tooltip += "\nAlt-Left arrow for previous tab";
tooltip += "\nAlt-Right arrow for next tab";
- btn = new LLButton(std::string(child->getName()) + " tab",
- btn_rect,
- LLStringUtil::null, LLStringUtil::null, LLStringUtil::null,
- &LLTabContainer::onTabBtn, NULL, // set userdata below
- font,
- trimmed_label, trimmed_label );
- btn->setVisible( FALSE );
- btn->setToolTip( tooltip );
- btn->setScaleImage(TRUE);
- btn->setImages(tab_img, tab_selected_img);
-
+ LLButton::Params p;
+ p.name(std::string(child->getName()) + " tab");
+ p.rect(btn_rect);
+ p.click_callback.function(boost::bind(&LLTabContainer::onTabBtn, this, _2, child));
+ p.font(font);
+ p.label(trimmed_label);
+ p.visible(false);
+ p.tool_tip(tooltip);
+ p.scale_image(true);
+ p.image_unselected.name(tab_img);
+ p.image_selected.name(tab_selected_img);
+ p.tab_stop(false);
// Try to squeeze in a bit more text
- btn->setLeftHPad( 4 );
- btn->setRightHPad( 2 );
- btn->setHAlign(LLFontGL::LEFT);
- btn->setTabStop(FALSE);
+ p.pad_left(4);
+ p.pad_right(2);
+ p.font_halign = LLFontGL::LEFT;
+ p.follows.flags = FOLLOWS_LEFT;
+ p.follows.flags = FOLLOWS_LEFT;
+
if (indent)
{
- btn->setLeftHPad(indent);
+ p.pad_left(indent);
}
if( getTabPosition() == TOP )
{
- btn->setFollowsTop();
+ p.follows.flags = p.follows.flags() | FOLLOWS_TOP;
}
else
{
- btn->setFollowsBottom();
+ p.follows.flags = p.follows.flags() | FOLLOWS_BOTTOM;
}
+
+ btn = LLUICtrlFactory::create<LLButton>(p);
}
}
- LLTabTuple* tuple = new LLTabTuple( this, child, btn, on_tab_clicked, userdata, textbox );
+ LLTabTuple* tuple = new LLTabTuple( this, child, btn, textbox );
insertTuple( tuple, insertion_point );
if (textbox)
@@ -849,12 +934,11 @@ void LLTabContainer::addTabPanel(LLPanel* child,
if (btn)
{
btn->setSaveToXML(false);
- btn->setCallbackUserData( tuple );
addChild( btn, 0 );
}
if (child)
{
- addChild(child, 1);
+ LLUICtrl::addChild(child, 1);
}
if( select )
@@ -867,11 +951,12 @@ void LLTabContainer::addTabPanel(LLPanel* child,
void LLTabContainer::addPlaceholder(LLPanel* child, const std::string& label)
{
- addTabPanel(child, label, FALSE, NULL, NULL, 0, TRUE);
+ addTabPanel(TabPanelParams().panel(child).label(label).is_placeholder(true));
}
void LLTabContainer::removeTabPanel(LLPanel* child)
{
+ static LLUICachedControl<S32> tabcntrv_pad ("UITabCntrvPad", 0);
if (mIsVertical)
{
// Fix-up button sizes
@@ -880,8 +965,8 @@ void LLTabContainer::removeTabPanel(LLPanel* child)
{
LLTabTuple* tuple = *iter;
LLRect rect;
- rect.setLeftTopAndSize(TABCNTRV_PAD + LLPANEL_BORDER_WIDTH + 2, // JC - Fudge factor
- (getRect().getHeight() - LLPANEL_BORDER_WIDTH - 1) - ((BTN_HEIGHT + TABCNTRV_PAD) * (tab_count)),
+ rect.setLeftTopAndSize(tabcntrv_pad + LLPANEL_BORDER_WIDTH + 2, // JC - Fudge factor
+ (getRect().getHeight() - LLPANEL_BORDER_WIDTH - 1) - ((BTN_HEIGHT + tabcntrv_pad) * (tab_count)),
mMinTabWidth,
BTN_HEIGHT);
if (tuple->mPlaceholderText)
@@ -1044,7 +1129,7 @@ S32 LLTabContainer::getPanelIndexByTitle(const std::string& title)
return -1;
}
-LLPanel *LLTabContainer::getPanelByName(const std::string& name)
+LLPanel* LLTabContainer::getPanelByName(const std::string& name)
{
for (S32 index = 0 ; index < (S32)mTabList.size(); index++)
{
@@ -1138,42 +1223,36 @@ BOOL LLTabContainer::selectTabPanel(LLPanel* child)
BOOL LLTabContainer::selectTab(S32 which)
{
- if (which >= getTabCount()) return FALSE;
- if (which < 0) return FALSE;
-
- //if( gFocusMgr.childHasKeyboardFocus( this ) )
- //{
- // gFocusMgr.setKeyboardFocus( NULL );
- //}
+ if (which >= getTabCount() || which < 0)
+ return FALSE;
LLTabTuple* selected_tuple = getTab(which);
if (!selected_tuple)
{
return FALSE;
}
+
+ LLSD cbdata;
+ if (selected_tuple->mTabPanel)
+ cbdata = selected_tuple->mTabPanel->getName();
- if (!selected_tuple->mPrecommitChangeCallback)
+ BOOL res = FALSE;
+ if( mValidateSignal( this, cbdata ) )
{
- return setTab(which);
+ res = setTab(which);
+ if (res)
+ {
+ mCommitSignal(this, cbdata);
+ }
}
-
- mNextTabIdx = which;
- selected_tuple->mPrecommitChangeCallback(selected_tuple->mUserData, false);
- return TRUE;
+
+ return res;
}
+// private
BOOL LLTabContainer::setTab(S32 which)
{
- if (which == -1)
- {
- if (mNextTabIdx == -1)
- {
- return FALSE;
- }
- which = mNextTabIdx;
- mNextTabIdx = -1;
- }
-
+ static LLUICachedControl<S32> tabcntr_arrow_btn_size ("UITabCntrArrowBtnSize", 0);
LLTabTuple* selected_tuple = getTab(which);
if (!selected_tuple)
{
@@ -1196,7 +1275,7 @@ BOOL LLTabContainer::setTab(S32 which)
// RN: this limits tab-stops to active button only, which would require arrow keys to switch tabs
tuple->mButton->setTabStop( is_selected );
- if( is_selected && (mIsVertical || (getMaxScrollPos() > 0)))
+ if (is_selected)
{
// Make sure selected tab is within scroll region
if (mIsVertical)
@@ -1212,7 +1291,7 @@ BOOL LLTabContainer::setTab(S32 which)
is_visible = FALSE;
}
}
- else
+ else if (getMaxScrollPos() > 0)
{
if( i < getScrollPos() )
{
@@ -1220,7 +1299,7 @@ BOOL LLTabContainer::setTab(S32 which)
}
else
{
- S32 available_width_with_arrows = getRect().getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE + TABCNTR_ARROW_BTN_SIZE + 1);
+ S32 available_width_with_arrows = getRect().getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + tabcntr_arrow_btn_size + tabcntr_arrow_btn_size + 1);
S32 running_tab_width = tuple->mButton->getRect().getWidth();
S32 j = i - 1;
S32 min_scroll_pos = i;
@@ -1243,13 +1322,13 @@ BOOL LLTabContainer::setTab(S32 which)
}
is_visible = TRUE;
}
+ else
+ {
+ is_visible = TRUE;
+ }
}
i++;
}
- if( selected_tuple->mOnChangeCallback )
- {
- selected_tuple->mOnChangeCallback( selected_tuple->mUserData, false );
- }
}
if (mIsVertical && getCurrentPanelIndex() >= 0)
{
@@ -1295,6 +1374,7 @@ void LLTabContainer::setTabPanelFlashing(LLPanel* child, BOOL state )
void LLTabContainer::setTabImage(LLPanel* child, std::string image_name, const LLColor4& color)
{
+ static LLUICachedControl<S32> tab_padding ("UITabPadding", 0);
LLTabTuple* tuple = getTabByPanel(child);
if( tuple )
{
@@ -1302,7 +1382,7 @@ void LLTabContainer::setTabImage(LLPanel* child, std::string image_name, const L
if (!mIsVertical)
{
- const LLFontGL* fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
+ const LLFontGL* fontp = LLFontGL::getFontSansSerifSmall();
// remove current width from total tab strip width
mTotalTabWidth -= tuple->mButton->getRect().getWidth();
@@ -1313,7 +1393,7 @@ void LLTabContainer::setTabImage(LLPanel* child, std::string image_name, const L
tuple->mPadding = image_overlay_width;
tuple->mButton->setRightHPad(6);
- tuple->mButton->reshape(llclamp(fontp->getWidth(tuple->mButton->getLabelSelected()) + TAB_PADDING + tuple->mPadding, mMinTabWidth, mMaxTabWidth),
+ tuple->mButton->reshape(llclamp(fontp->getWidth(tuple->mButton->getLabelSelected()) + tab_padding + tuple->mPadding, mMinTabWidth, mMaxTabWidth),
tuple->mButton->getRect().getHeight());
// add back in button width to total tab strip width
mTotalTabWidth += tuple->mButton->getRect().getWidth();
@@ -1352,33 +1432,6 @@ S32 LLTabContainer::getTopBorderHeight() const
return mTopBorderHeight;
}
-void LLTabContainer::setTabChangeCallback(LLPanel* tab, void (*on_tab_clicked)(void*, bool))
-{
- LLTabTuple* tuplep = getTabByPanel(tab);
- if (tuplep)
- {
- tuplep->mOnChangeCallback = on_tab_clicked;
- }
-}
-
-void LLTabContainer::setTabPrecommitChangeCallback(LLPanel* tab, void (*on_precommit)(void*, bool))
-{
- LLTabTuple* tuplep = getTabByPanel(tab);
- if (tuplep)
- {
- tuplep->mPrecommitChangeCallback = on_precommit;
- }
-}
-
-void LLTabContainer::setTabUserData(LLPanel* tab, void* userdata)
-{
- LLTabTuple* tuplep = getTabByPanel(tab);
- if (tuplep)
- {
- tuplep->mUserData = userdata;
- }
-}
-
void LLTabContainer::setRightTabBtnOffset(S32 offset)
{
mNextArrowBtn->translate( -offset - mRightTabBtnOffset, 0 );
@@ -1388,13 +1441,15 @@ void LLTabContainer::setRightTabBtnOffset(S32 offset)
void LLTabContainer::setPanelTitle(S32 index, const std::string& title)
{
+ static LLUICachedControl<S32> tab_padding ("UITabPadding", 0);
+
if (index >= 0 && index < getTabCount())
{
LLTabTuple* tuple = getTab(index);
LLButton* tab_button = tuple->mButton;
- const LLFontGL* fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
+ const LLFontGL* fontp = LLFontGL::getFontSansSerifSmall();
mTotalTabWidth -= tab_button->getRect().getWidth();
- tab_button->reshape(llclamp(fontp->getWidth(title) + TAB_PADDING + tuple->mPadding, mMinTabWidth, mMaxTabWidth), tab_button->getRect().getHeight());
+ tab_button->reshape(llclamp(fontp->getWidth(title) + tab_padding + tuple->mPadding, mMinTabWidth, mMaxTabWidth), tab_button->getRect().getHeight());
mTotalTabWidth += tab_button->getRect().getWidth();
tab_button->setLabelSelected(title);
tab_button->setLabelUnselected(title);
@@ -1403,184 +1458,62 @@ void LLTabContainer::setPanelTitle(S32 index, const std::string& title)
}
-// static
-void LLTabContainer::onTabBtn( void* userdata )
+void LLTabContainer::onTabBtn( const LLSD& data, LLPanel* panel )
{
- LLTabTuple* tuple = (LLTabTuple*) userdata;
- LLTabContainer* self = tuple->mTabContainer;
- self->selectTabPanel( tuple->mTabPanel );
+ LLTabTuple* tuple = getTabByPanel(panel);
+ selectTabPanel( panel );
tuple->mTabPanel->setFocus(TRUE);
}
-// static
-void LLTabContainer::onCloseBtn( void* userdata )
-{
- LLTabContainer* self = (LLTabContainer*) userdata;
- if( self->mCloseCallback )
- {
- self->mCloseCallback( self->mCallbackUserdata );
- }
-}
-
-// static
-void LLTabContainer::onNextBtn( void* userdata )
+void LLTabContainer::onNextBtn( const LLSD& data )
{
- // Scroll tabs to the left
- LLTabContainer* self = (LLTabContainer*) userdata;
- if (!self->mScrolled)
+ if (!mScrolled)
{
- self->scrollNext();
+ scrollNext();
}
- self->mScrolled = FALSE;
+ mScrolled = FALSE;
}
-// static
-void LLTabContainer::onNextBtnHeld( void* userdata )
+void LLTabContainer::onNextBtnHeld( const LLSD& data )
{
- LLTabContainer* self = (LLTabContainer*) userdata;
- if (self->mScrollTimer.getElapsedTimeF32() > SCROLL_STEP_TIME)
+ if (mScrollTimer.getElapsedTimeF32() > SCROLL_STEP_TIME)
{
- self->mScrollTimer.reset();
- self->scrollNext();
- self->mScrolled = TRUE;
+ mScrollTimer.reset();
+ scrollNext();
+ mScrolled = TRUE;
}
}
-// static
-void LLTabContainer::onPrevBtn( void* userdata )
+void LLTabContainer::onPrevBtn( const LLSD& data )
{
- LLTabContainer* self = (LLTabContainer*) userdata;
- if (!self->mScrolled)
+ if (!mScrolled)
{
- self->scrollPrev();
+ scrollPrev();
}
- self->mScrolled = FALSE;
+ mScrolled = FALSE;
}
-// static
-void LLTabContainer::onJumpFirstBtn( void* userdata )
+void LLTabContainer::onJumpFirstBtn( const LLSD& data )
{
- LLTabContainer* self = (LLTabContainer*) userdata;
- self->mScrollPos = 0;
+ mScrollPos = 0;
}
-// static
-void LLTabContainer::onJumpLastBtn( void* userdata )
+void LLTabContainer::onJumpLastBtn( const LLSD& data )
{
- LLTabContainer* self = (LLTabContainer*) userdata;
- self->mScrollPos = self->mMaxScrollPos;
+ mScrollPos = mMaxScrollPos;
}
-// static
-void LLTabContainer::onPrevBtnHeld( void* userdata )
+void LLTabContainer::onPrevBtnHeld( const LLSD& data )
{
- LLTabContainer* self = (LLTabContainer*) userdata;
- if (self->mScrollTimer.getElapsedTimeF32() > SCROLL_STEP_TIME)
+ if (mScrollTimer.getElapsedTimeF32() > SCROLL_STEP_TIME)
{
- self->mScrollTimer.reset();
- self->scrollPrev();
- self->mScrolled = TRUE;
+ mScrollTimer.reset();
+ scrollPrev();
+ mScrolled = TRUE;
}
}
-// static
-LLView* LLTabContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("tab_container");
- node->getAttributeString("name", name);
-
- // Figure out if we are creating a vertical or horizontal tab container.
- bool is_vertical = false;
- LLTabContainer::TabPosition tab_position = LLTabContainer::TOP;
- if (node->hasAttribute("tab_position"))
- {
- std::string tab_position_string;
- node->getAttributeString("tab_position", tab_position_string);
- LLStringUtil::toLower(tab_position_string);
-
- if ("top" == tab_position_string)
- {
- tab_position = LLTabContainer::TOP;
- is_vertical = false;
- }
- else if ("bottom" == tab_position_string)
- {
- tab_position = LLTabContainer::BOTTOM;
- is_vertical = false;
- }
- else if ("left" == tab_position_string)
- {
- is_vertical = true;
- }
- }
- BOOL border = FALSE;
- node->getAttributeBOOL("border", border);
-
- LLTabContainer* tab_container = new LLTabContainer(name, LLRect::null, tab_position, border, is_vertical);
-
- S32 tab_min_width = tab_container->mMinTabWidth;
- if (node->hasAttribute("tab_width"))
- {
- node->getAttributeS32("tab_width", tab_min_width);
- }
- else if( node->hasAttribute("tab_min_width"))
- {
- node->getAttributeS32("tab_min_width", tab_min_width);
- }
-
- S32 tab_max_width = tab_container->mMaxTabWidth;
- if (node->hasAttribute("tab_max_width"))
- {
- node->getAttributeS32("tab_max_width", tab_max_width);
- }
-
- tab_container->setMinTabWidth(tab_min_width);
- tab_container->setMaxTabWidth(tab_max_width);
-
- BOOL hidden(tab_container->getTabsHidden());
- node->getAttributeBOOL("hide_tabs", hidden);
- tab_container->setTabsHidden(hidden);
-
- tab_container->setPanelParameters(node, parent);
-
- if (LLFloater::getFloaterHost())
- {
- LLFloater::getFloaterHost()->setTabContainer(tab_container);
- }
-
- //parent->addChild(tab_container);
-
- // Add all tab panels.
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
- {
- LLView *control = factory->createCtrlWidget(tab_container, child);
- if (control && control->isPanel())
- {
- LLPanel* panelp = (LLPanel*)control;
- std::string label;
- child->getAttributeString("label", label);
- if (label.empty())
- {
- label = panelp->getLabel();
- }
- BOOL placeholder = FALSE;
- child->getAttributeBOOL("placeholder", placeholder);
- tab_container->addTabPanel(panelp, label, false,
- NULL, NULL, 0, placeholder);
- }
- }
-
- tab_container->selectFirstTab();
-
- tab_container->postBuild();
-
- tab_container->initButtons(); // now that we have the correct rect
-
- return tab_container;
-}
-
// private
void LLTabContainer::initButtons()
@@ -1591,99 +1524,105 @@ void LLTabContainer::initButtons()
return; // Don't have a rect yet or already got called
}
- std::string out_id;
- std::string in_id;
-
if (mIsVertical)
{
+ static LLUICachedControl<S32> tabcntrv_arrow_btn_size ("UITabCntrvArrowBtnSize", 0);
// Left and right scroll arrows (for when there are too many tabs to show all at once).
S32 btn_top = getRect().getHeight();
- S32 btn_top_lower = getRect().mBottom+TABCNTRV_ARROW_BTN_SIZE;
+ S32 btn_top_lower = getRect().mBottom+tabcntrv_arrow_btn_size;
LLRect up_arrow_btn_rect;
- up_arrow_btn_rect.setLeftTopAndSize( mMinTabWidth/2 , btn_top, TABCNTRV_ARROW_BTN_SIZE, TABCNTRV_ARROW_BTN_SIZE );
+ up_arrow_btn_rect.setLeftTopAndSize( mMinTabWidth/2 , btn_top, tabcntrv_arrow_btn_size, tabcntrv_arrow_btn_size );
LLRect down_arrow_btn_rect;
- down_arrow_btn_rect.setLeftTopAndSize( mMinTabWidth/2 , btn_top_lower, TABCNTRV_ARROW_BTN_SIZE, TABCNTRV_ARROW_BTN_SIZE );
-
- out_id = "UIImgBtnScrollUpOutUUID";
- in_id = "UIImgBtnScrollUpInUUID";
- mPrevArrowBtn = new LLButton(std::string("Up Arrow"), up_arrow_btn_rect,
- out_id, in_id, LLStringUtil::null,
- &onPrevBtn, this, NULL );
- mPrevArrowBtn->setFollowsTop();
- mPrevArrowBtn->setFollowsLeft();
-
- out_id = "UIImgBtnScrollDownOutUUID";
- in_id = "UIImgBtnScrollDownInUUID";
- mNextArrowBtn = new LLButton(std::string("Down Arrow"), down_arrow_btn_rect,
- out_id, in_id, LLStringUtil::null,
- &onNextBtn, this, NULL );
- mNextArrowBtn->setFollowsBottom();
- mNextArrowBtn->setFollowsLeft();
+ down_arrow_btn_rect.setLeftTopAndSize( mMinTabWidth/2 , btn_top_lower, tabcntrv_arrow_btn_size, tabcntrv_arrow_btn_size );
+
+ LLButton::Params prev_btn_params;
+ prev_btn_params.name(std::string("Up Arrow"));
+ prev_btn_params.rect(up_arrow_btn_rect);
+ prev_btn_params.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT);
+ prev_btn_params.image_unselected.name("scrollbutton_up_out_blue.tga");
+ prev_btn_params.image_selected.name("scrollbutton_up_in_blue.tga");
+ prev_btn_params.click_callback.function(boost::bind(&LLTabContainer::onPrevBtn, this, _2));
+ mPrevArrowBtn = LLUICtrlFactory::create<LLButton>(prev_btn_params);
+
+ LLButton::Params next_btn_params;
+ next_btn_params.name(std::string("Down Arrow"));
+ next_btn_params.rect(down_arrow_btn_rect);
+ next_btn_params.follows.flags(FOLLOWS_BOTTOM | FOLLOWS_LEFT);
+ next_btn_params.image_unselected.name("scrollbutton_down_out_blue.tga");
+ next_btn_params.image_selected.name("scrollbutton_down_in_blue.tga");
+ next_btn_params.click_callback.function(boost::bind(&LLTabContainer::onNextBtn, this, _2));
+ mNextArrowBtn = LLUICtrlFactory::create<LLButton>(next_btn_params);
}
else // Horizontal
{
+ static LLUICachedControl<S32> tabcntr_arrow_btn_size ("UITabCntrArrowBtnSize", 0);
S32 arrow_fudge = 1; // match new art better
- // tabs on bottom reserve room for resize handle (just in case)
- if (getTabPosition() == BOTTOM)
- {
- mRightTabBtnOffset = RESIZE_HANDLE_WIDTH;
- }
-
// Left and right scroll arrows (for when there are too many tabs to show all at once).
- S32 btn_top = (getTabPosition() == TOP ) ? getRect().getHeight() - getTopBorderHeight() : TABCNTR_ARROW_BTN_SIZE + 1;
+ S32 btn_top = (getTabPosition() == TOP ) ? getRect().getHeight() - getTopBorderHeight() : tabcntr_arrow_btn_size + 1;
LLRect left_arrow_btn_rect;
- left_arrow_btn_rect.setLeftTopAndSize( LLPANEL_BORDER_WIDTH+1+TABCNTR_ARROW_BTN_SIZE, btn_top + arrow_fudge, TABCNTR_ARROW_BTN_SIZE, TABCNTR_ARROW_BTN_SIZE );
+ left_arrow_btn_rect.setLeftTopAndSize( LLPANEL_BORDER_WIDTH+1+tabcntr_arrow_btn_size, btn_top + arrow_fudge, tabcntr_arrow_btn_size, tabcntr_arrow_btn_size );
LLRect jump_left_arrow_btn_rect;
- jump_left_arrow_btn_rect.setLeftTopAndSize( LLPANEL_BORDER_WIDTH+1, btn_top + arrow_fudge, TABCNTR_ARROW_BTN_SIZE, TABCNTR_ARROW_BTN_SIZE );
+ jump_left_arrow_btn_rect.setLeftTopAndSize( LLPANEL_BORDER_WIDTH+1, btn_top + arrow_fudge, tabcntr_arrow_btn_size, tabcntr_arrow_btn_size );
- S32 right_pad = TABCNTR_ARROW_BTN_SIZE + LLPANEL_BORDER_WIDTH + 1;
+ S32 right_pad = tabcntr_arrow_btn_size + LLPANEL_BORDER_WIDTH + 1;
LLRect right_arrow_btn_rect;
- right_arrow_btn_rect.setLeftTopAndSize( getRect().getWidth() - mRightTabBtnOffset - right_pad - TABCNTR_ARROW_BTN_SIZE,
+ right_arrow_btn_rect.setLeftTopAndSize( getRect().getWidth() - mRightTabBtnOffset - right_pad - tabcntr_arrow_btn_size,
btn_top + arrow_fudge,
- TABCNTR_ARROW_BTN_SIZE, TABCNTR_ARROW_BTN_SIZE );
+ tabcntr_arrow_btn_size, tabcntr_arrow_btn_size );
LLRect jump_right_arrow_btn_rect;
jump_right_arrow_btn_rect.setLeftTopAndSize( getRect().getWidth() - mRightTabBtnOffset - right_pad,
btn_top + arrow_fudge,
- TABCNTR_ARROW_BTN_SIZE, TABCNTR_ARROW_BTN_SIZE );
-
- out_id = "UIImgBtnJumpLeftOutUUID";
- in_id = "UIImgBtnJumpLeftInUUID";
- mJumpPrevArrowBtn = new LLButton(std::string("Jump Left Arrow"), jump_left_arrow_btn_rect,
- out_id, in_id, LLStringUtil::null,
- &LLTabContainer::onJumpFirstBtn, this, LLFontGL::getFontSansSerif() );
- mJumpPrevArrowBtn->setFollowsLeft();
-
- out_id = "UIImgBtnScrollLeftOutUUID";
- in_id = "UIImgBtnScrollLeftInUUID";
- mPrevArrowBtn = new LLButton(std::string("Left Arrow"), left_arrow_btn_rect,
- out_id, in_id, LLStringUtil::null,
- &LLTabContainer::onPrevBtn, this, LLFontGL::getFontSansSerif() );
- mPrevArrowBtn->setHeldDownCallback(onPrevBtnHeld);
- mPrevArrowBtn->setFollowsLeft();
-
- out_id = "UIImgBtnJumpRightOutUUID";
- in_id = "UIImgBtnJumpRightInUUID";
- mJumpNextArrowBtn = new LLButton(std::string("Jump Right Arrow"), jump_right_arrow_btn_rect,
- out_id, in_id, LLStringUtil::null,
- &LLTabContainer::onJumpLastBtn, this,
- LLFontGL::getFontSansSerif());
- mJumpNextArrowBtn->setFollowsRight();
-
- out_id = "UIImgBtnScrollRightOutUUID";
- in_id = "UIImgBtnScrollRightInUUID";
- mNextArrowBtn = new LLButton(std::string("Right Arrow"), right_arrow_btn_rect,
- out_id, in_id, LLStringUtil::null,
- &LLTabContainer::onNextBtn, this,
- LLFontGL::getFontSansSerif());
- mNextArrowBtn->setFollowsRight();
+ tabcntr_arrow_btn_size, tabcntr_arrow_btn_size );
+
+ LLButton::Params p;
+ p.name(std::string("Jump Left Arrow"));
+ p.image_unselected.name("jump_left_out.tga");
+ p.image_selected.name("jump_left_in.tga");
+ p.click_callback.function(boost::bind(&LLTabContainer::onJumpFirstBtn, this, _2));
+ p.rect(jump_left_arrow_btn_rect);
+ p.follows.flags(FOLLOWS_LEFT);
+
+ mJumpPrevArrowBtn = LLUICtrlFactory::create<LLButton>(p);
+
+ p = LLButton::Params();
+ p.name(std::string("Left Arrow"));
+ p.rect(left_arrow_btn_rect);
+ p.follows.flags(FOLLOWS_LEFT);
+ p.image_unselected.name("scrollbutton_left_out_blue.tga");
+ p.image_selected.name("scrollbutton_left_in_blue.tga");
+ p.click_callback.function(boost::bind(&LLTabContainer::onPrevBtn, this, _2));
+ p.mouse_held_callback.function(boost::bind(&LLTabContainer::onPrevBtnHeld, this, _2));
+
+ mPrevArrowBtn = LLUICtrlFactory::create<LLButton>(p);
+
+ p = LLButton::Params();
+ p.name(std::string("Jump Right Arrow"));
+ p.rect(jump_right_arrow_btn_rect);
+ p.follows.flags(FOLLOWS_RIGHT);
+ p.image_unselected.name("jump_right_out.tga");
+ p.image_selected.name("jump_right_in.tga");
+ p.click_callback.function(boost::bind(&LLTabContainer::onJumpLastBtn, this, _2));
+
+ mJumpNextArrowBtn = LLUICtrlFactory::create<LLButton>(p);
+
+ p = LLButton::Params();
+ p.name(std::string("Right Arrow"));
+ p.rect(right_arrow_btn_rect);
+ p.follows.flags(FOLLOWS_RIGHT);
+ p.image_unselected.name("scrollbutton_right_out_blue.tga");
+ p.image_selected.name("scrollbutton_right_in_blue.tga");
+ p.click_callback.function(boost::bind(&LLTabContainer::onNextBtn, this, _2));
+ p.mouse_held_callback.function(boost::bind(&LLTabContainer::onNextBtnHeld, this, _2));
+
+ mNextArrowBtn = LLUICtrlFactory::create<LLButton>(p);
if( getTabPosition() == TOP )
{
@@ -1701,12 +1640,10 @@ void LLTabContainer::initButtons()
}
}
- mPrevArrowBtn->setHeldDownCallback(onPrevBtnHeld);
mPrevArrowBtn->setSaveToXML(false);
mPrevArrowBtn->setTabStop(FALSE);
addChild(mPrevArrowBtn);
- mNextArrowBtn->setHeldDownCallback(onNextBtnHeld);
mNextArrowBtn->setSaveToXML(false);
mNextArrowBtn->setTabStop(FALSE);
addChild(mNextArrowBtn);
@@ -1729,7 +1666,17 @@ void LLTabContainer::initButtons()
setDefaultTabGroup(1);
}
-LLTabContainer::LLTabTuple* LLTabContainer::getTabByPanel(LLPanel* child)
+//this is a work around for the current LLPanel::initFromParams hack
+//so that it doesn't overwrite the default tab group.
+//will be removed when LLPanel is fixed soon.
+void LLTabContainer::initFromParams(const LLPanel::Params& p)
+{
+ LLPanel::initFromParams(p);
+
+ setDefaultTabGroup(1);
+}
+
+LLTabTuple* LLTabContainer::getTabByPanel(LLPanel* child)
{
for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
{
@@ -1775,14 +1722,16 @@ void LLTabContainer::insertTuple(LLTabTuple * tuple, eInsertionPoint insertion_p
void LLTabContainer::updateMaxScrollPos()
{
+ static LLUICachedControl<S32> tabcntrv_pad ("UITabCntrvPad", 0);
BOOL no_scroll = TRUE;
if (mIsVertical)
{
- S32 tab_total_height = (BTN_HEIGHT + TABCNTRV_PAD) * getTabCount();
+ S32 tab_total_height = (BTN_HEIGHT + tabcntrv_pad) * getTabCount();
S32 available_height = getRect().getHeight() - getTopBorderHeight();
if( tab_total_height > available_height )
{
- S32 available_height_with_arrows = getRect().getHeight() - 2*(TABCNTRV_ARROW_BTN_SIZE + 3*TABCNTRV_PAD);
+ static LLUICachedControl<S32> tabcntrv_arrow_btn_size ("UITabCntrvArrowBtnSize", 0);
+ S32 available_height_with_arrows = getRect().getHeight() - 2*(tabcntrv_arrow_btn_size + 3*tabcntrv_pad);
S32 additional_needed = tab_total_height - available_height_with_arrows;
setMaxScrollPos((S32) ceil(additional_needed / float(BTN_HEIGHT) ) );
no_scroll = FALSE;
@@ -1790,16 +1739,19 @@ void LLTabContainer::updateMaxScrollPos()
}
else
{
+ static LLUICachedControl<S32> tabcntr_tab_h_pad ("UITabCntrTabHPad", 0);
+ static LLUICachedControl<S32> tabcntr_arrow_btn_size ("UITabCntrArrowBtnSize", 0);
+ static LLUICachedControl<S32> tabcntr_tab_partial_width ("UITabCntrTabPartialWidth", 0);
S32 tab_space = 0;
S32 available_space = 0;
tab_space = mTotalTabWidth;
- available_space = getRect().getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_TAB_H_PAD);
+ available_space = getRect().getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + tabcntr_tab_h_pad);
if( tab_space > available_space )
{
- S32 available_width_with_arrows = getRect().getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE + TABCNTR_ARROW_BTN_SIZE + 1);
+ S32 available_width_with_arrows = getRect().getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + tabcntr_arrow_btn_size + tabcntr_arrow_btn_size + 1);
// subtract off reserved portion on left
- available_width_with_arrows -= TABCNTR_TAB_PARTIAL_WIDTH;
+ available_width_with_arrows -= tabcntr_tab_partial_width;
S32 running_tab_width = 0;
setMaxScrollPos(getTabCount());
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h
index 8117cdee9b..7ed1a0f4bf 100644
--- a/indra/llui/lltabcontainer.h
+++ b/indra/llui/lltabcontainer.h
@@ -37,7 +37,7 @@
#include "lltextbox.h"
#include "llframetimer.h"
-extern const S32 TABCNTR_HEADER_HEIGHT;
+class LLTabTuple;
class LLTabContainer : public LLPanel
{
@@ -56,8 +56,31 @@ public:
RIGHT_OF_CURRENT
} eInsertionPoint;
- LLTabContainer( const std::string& name, const LLRect& rect, TabPosition pos,
- BOOL bordered, BOOL is_vertical);
+ struct TabPositions : public LLInitParam::TypeValuesHelper<LLTabContainer::TabPosition, TabPositions>
+ {
+ static void declareValues();
+ };
+
+ struct Params
+ : public LLInitParam::Block<Params, LLPanel::Params>
+ {
+ Optional<TabPosition, TabPositions> tab_position;
+ Optional<S32> tab_width,
+ tab_min_width,
+ tab_max_width;
+ Optional<bool> hide_tabs;
+ Optional<S32> tab_padding_right;
+
+ Params();
+ };
+
+protected:
+ LLTabContainer(const Params&);
+ friend class LLUICtrlFactory;
+
+public:
+ //LLTabContainer( const std::string& name, const LLRect& rect, TabPosition pos,
+ // BOOL bordered, BOOL is_vertical);
/*virtual*/ ~LLTabContainer();
@@ -74,17 +97,30 @@ public:
/*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType type, void* cargo_data,
EAcceptance* accept, std::string& tooltip);
- /*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
/*virtual*/ LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+ /*virtual*/ void initFromParams(const LLPanel::Params& p);
+ /*virtual*/ bool addChild(LLView* view, S32 tab_group = 0);
+ /*virtual*/ BOOL postBuild();
+
+ struct TabPanelParams : public LLInitParam::Block<TabPanelParams>
+ {
+ Mandatory<LLPanel*> panel;
+
+ Optional<std::string> label;
+ Optional<bool> select_tab,
+ is_placeholder;
+ Optional<S32> indent;
+ Optional<eInsertionPoint> insert_at;
+ Optional<void*> user_data;
+
+ TabPanelParams()
+ : panel("panel", NULL),
+ insert_at("insert_at", END)
+ {}
+ };
- void addTabPanel(LLPanel* child,
- const std::string& label,
- BOOL select = FALSE,
- void (*on_tab_clicked)(void*, bool) = NULL,
- void* userdata = NULL,
- S32 indent = 0,
- BOOL placeholder = FALSE,
- eInsertionPoint insertion_point = END);
+ void addTabPanel(LLPanel* panel);
+ void addTabPanel(const TabPanelParams& panel);
void addPlaceholder(LLPanel* child, const std::string& label);
void removeTabPanel( LLPanel* child );
void lockTabs(S32 num_tabs = 0);
@@ -108,7 +144,6 @@ public:
BOOL selectTabPanel( LLPanel* child );
BOOL selectTab(S32 which);
BOOL selectTabByName(const std::string& title);
- BOOL setTab(S32 which);
BOOL getTabPanelFlashing(LLPanel* child);
void setTabPanelFlashing(LLPanel* child, BOOL state);
@@ -119,10 +154,6 @@ public:
void setTopBorderHeight(S32 height);
S32 getTopBorderHeight() const;
- void setTabChangeCallback(LLPanel* tab, void (*on_tab_clicked)(void*,bool));
- void setTabPrecommitChangeCallback(LLPanel* tab, void (*on_precommit)(void*, bool));
- void setTabUserData(LLPanel* tab, void* userdata);
-
void setRightTabBtnOffset( S32 offset );
void setPanelTitle(S32 index, const std::string& title);
@@ -134,51 +165,20 @@ public:
void startDragAndDropDelayTimer() { mDragAndDropDelayTimer.start(); }
- static void onCloseBtn(void* userdata);
- static void onTabBtn(void* userdata);
- static void onNextBtn(void* userdata);
- static void onNextBtnHeld(void* userdata);
- static void onPrevBtn(void* userdata);
- static void onPrevBtnHeld(void* userdata);
- static void onJumpFirstBtn( void* userdata );
- static void onJumpLastBtn( void* userdata );
-
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+ void onTabBtn( const LLSD& data, LLPanel* panel );
+ void onNextBtn(const LLSD& data);
+ void onNextBtnHeld(const LLSD& data);
+ void onPrevBtn(const LLSD& data);
+ void onPrevBtnHeld(const LLSD& data);
+ void onJumpFirstBtn( const LLSD& data );
+ void onJumpLastBtn( const LLSD& data );
private:
- // Structure used to map tab buttons to and from tab panels
- struct LLTabTuple
- {
- LLTabTuple( LLTabContainer* c, LLPanel* p, LLButton* b,
- void (*cb)(void*,bool), void* userdata, LLTextBox* placeholder = NULL,
- void (*pcb)(void*,bool) = NULL)
- :
- mTabContainer(c),
- mTabPanel(p),
- mButton(b),
- mOnChangeCallback( cb ),
- mPrecommitChangeCallback( pcb ),
- mUserData( userdata ),
- mOldState(FALSE),
- mPlaceholderText(placeholder),
- mPadding(0)
- {}
-
- LLTabContainer* mTabContainer;
- LLPanel* mTabPanel;
- LLButton* mButton;
- void (*mOnChangeCallback)(void*, bool);
- void (*mPrecommitChangeCallback)(void*,bool); // Precommit callback gets called before tab is changed and
- // can prevent it from being changed. onChangeCallback is called
- // immediately after tab is actually changed - Nyx
- void* mUserData;
- BOOL mOldState;
- LLTextBox* mPlaceholderText;
- S32 mPadding;
- };
void initButtons();
+ BOOL setTab(S32 which);
+
LLTabTuple* getTab(S32 index) { return mTabList[index]; }
LLTabTuple* getTabByPanel(LLPanel* child);
void insertTuple(LLTabTuple * tuple, eInsertionPoint insertion_point);
@@ -207,7 +207,6 @@ private:
tuple_list_t mTabList;
S32 mCurrentTabIdx;
- S32 mNextTabIdx;
BOOL mTabsHidden;
BOOL mScrolled;
@@ -216,9 +215,6 @@ private:
S32 mScrollPosPixels;
S32 mMaxScrollPos;
- void (*mCloseCallback)(void*);
- void* mCallbackUserdata;
-
LLTextBox* mTitleBox;
S32 mTopBorderHeight;
@@ -242,5 +238,4 @@ private:
LLFrameTimer mDragAndDropDelayTimer;
};
-
#endif // LL_TABCONTAINER_H
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp
index 89893bcf8d..95990bbfc2 100644
--- a/indra/llui/lltextbox.cpp
+++ b/indra/llui/lltextbox.cpp
@@ -30,65 +30,66 @@
* $/LicenseInfo$
*/
+#define INSTANTIATE_GETCHILD_TEXTBOX
+
#include "linden_common.h"
#include "lltextbox.h"
#include "lluictrlfactory.h"
#include "llfocusmgr.h"
#include "llwindow.h"
-static LLRegisterWidget<LLTextBox> r("text");
-
-LLTextBox::LLTextBox(const std::string& name, const LLRect& rect, const std::string& text,
- const LLFontGL* font, BOOL mouse_opaque)
-: LLUICtrl(name, rect, mouse_opaque, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP ),
- mFontGL(font ? font : LLFontGL::getFontSansSerifSmall())
-{
- initDefaults();
- setText( text );
- setTabStop(FALSE);
-}
-
-LLTextBox::LLTextBox(const std::string& name, const std::string& text, F32 max_width,
- const LLFontGL* font, BOOL mouse_opaque) :
- LLUICtrl(name, LLRect(0, 0, 1, 1), mouse_opaque, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP),
- mFontGL(font ? font : LLFontGL::getFontSansSerifSmall())
-{
- initDefaults();
- setWrappedText(text, max_width);
- reshapeToFitText();
- setTabStop(FALSE);
-}
+template LLTextBox* LLView::getChild<LLTextBox>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
-LLTextBox::LLTextBox(const std::string& name_and_label, const LLRect& rect) :
- LLUICtrl(name_and_label, rect, TRUE, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP),
- mFontGL(LLFontGL::getFontSansSerifSmall())
-{
- initDefaults();
- setText( name_and_label );
- setTabStop(FALSE);
-}
+static LLRegisterWidget<LLTextBox> r("text");
-void LLTextBox::initDefaults()
+LLTextBox::Params::Params()
+: text_color("text_color"),
+ length("length"),
+ type("type"),
+ highlight_on_hover("hover", false),
+ border_visible("border_visible", false),
+ border_drop_shadow_visible("border_drop_shadow_visible", false),
+ bg_visible("bg_visible", false),
+ use_ellipses("use_ellipses"),
+ word_wrap("word_wrap", false),
+ drop_shadow_visible("drop_shadow_visible"),
+ hover_color("hover_color"),
+ disabled_color("disabled_color"),
+ background_color("background_color"),
+ border_color("border_color"),
+ v_pad("v_pad", 0),
+ h_pad("h_pad", 0),
+ line_spacing("line_spacing", 0),
+ text("text"),
+ font_shadow("font_shadow", LLFontGL::NO_SHADOW)
+{}
+
+LLTextBox::LLTextBox(const LLTextBox::Params& p)
+: LLUICtrl(p),
+ mFontGL(p.font),
+ mHoverActive( p.highlight_on_hover ),
+ mHasHover( FALSE ),
+ mBackgroundVisible( p.bg_visible ),
+ mBorderVisible( p.border_visible ),
+ mShadowType( p.font_shadow ),
+ mBorderDropShadowVisible( p.border_drop_shadow_visible ),
+ mUseEllipses( p.use_ellipses ),
+ mHPad(p.h_pad),
+ mVPad(p.v_pad),
+ mVAlign( LLFontGL::TOP ),
+ mClickedCallback(NULL),
+ mTextColor(p.text_color()),
+ mDisabledColor(p.disabled_color()),
+ mBackgroundColor(p.background_color()),
+ mBorderColor(p.border_color()),
+ mHoverColor(p.hover_color()),
+ mHAlign(p.font_halign),
+ mLineSpacing(p.line_spacing),
+ mWordWrap( p.word_wrap ),
+ mDidWordWrap(FALSE),
+ mFontStyle(LLFontGL::getStyleFromString(p.font.style))
{
- mTextColor = LLUI::sColorsGroup->getColor("LabelTextColor");
- mDisabledColor = LLUI::sColorsGroup->getColor("LabelDisabledColor");
- mBackgroundColor = LLUI::sColorsGroup->getColor("DefaultBackgroundColor");
- mBorderColor = LLUI::sColorsGroup->getColor("DefaultHighlightLight");
- mHoverColor = LLUI::sColorsGroup->getColor( "LabelSelectedColor" );
- mHoverActive = FALSE;
- mHasHover = FALSE;
- mBackgroundVisible = FALSE;
- mBorderVisible = FALSE;
- mFontStyle = LLFontGL::DROP_SHADOW_SOFT;
- mBorderDropShadowVisible = FALSE;
- mUseEllipses = FALSE;
- mLineSpacing = 0;
- mHPad = 0;
- mVPad = 0;
- mHAlign = LLFontGL::LEFT;
- mVAlign = LLFontGL::TOP;
- mClickedCallback = NULL;
- mCallbackUserData = NULL;
+ setText( p.text() );
}
BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask)
@@ -113,7 +114,6 @@ BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask)
return handled;
}
-
BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask)
{
BOOL handled = FALSE;
@@ -139,7 +139,7 @@ BOOL LLTextBox::handleMouseUp(S32 x, S32 y, MASK mask)
// If mouseup in the widget, it's been clicked
if (mClickedCallback)
{
- (*mClickedCallback)( mCallbackUserData );
+ mClickedCallback();
}
}
@@ -160,8 +160,15 @@ BOOL LLTextBox::handleHover(S32 x, S32 y, MASK mask)
void LLTextBox::setText(const LLStringExplicit& text)
{
- mText.assign(text);
- setLineLengths();
+ if(mWordWrap && !mDidWordWrap)
+ {
+ setWrappedText(text);
+ }
+ else
+ {
+ mText.assign(text);
+ setLineLengths();
+ }
}
void LLTextBox::setLineLengths()
@@ -193,7 +200,7 @@ void LLTextBox::setLineLengths()
void LLTextBox::setWrappedText(const LLStringExplicit& in_text, F32 max_width)
{
- if (max_width < 0.0)
+ if (max_width < 0.0f)
{
max_width = (F32)getRect().getWidth();
}
@@ -203,7 +210,8 @@ void LLTextBox::setWrappedText(const LLStringExplicit& in_text, F32 max_width)
LLWString::size_type cur = 0;;
LLWString::size_type len = wtext.size();
-
+ F32 line_height = mFontGL->getLineHeight();
+ S32 line_num = 1;
while (cur < len)
{
LLWString::size_type end = wtext.find('\n', cur);
@@ -221,6 +229,8 @@ void LLTextBox::setWrappedText(const LLStringExplicit& in_text, F32 max_width)
final_wtext.append(wtext, cur, useLen);
cur += useLen;
+ // not enough room to add any more characters
+ if (useLen == 0) break;
}
if (cur < len)
@@ -229,12 +239,22 @@ void LLTextBox::setWrappedText(const LLStringExplicit& in_text, F32 max_width)
{
cur += 1;
}
- final_wtext += '\n';
+ line_num +=1;
+ // Don't wrap the last line if the text is going to spill off
+ // the bottom of the rectangle. Assume we prefer to run off
+ // the right edge.
+ // *TODO: Is this the right behavior?
+ if((line_num-1)*line_height <= (F32)getRect().getHeight())
+ {
+ final_wtext += '\n';
+ }
}
}
-
+
+ mDidWordWrap = TRUE;
std::string final_text = wstring_to_utf8str(final_wtext);
setText(final_text);
+
}
S32 LLTextBox::getTextPixelWidth()
@@ -272,6 +292,11 @@ S32 LLTextBox::getTextPixelHeight()
return (S32)(num_lines * mFontGL->getLineHeight());
}
+void LLTextBox::setValue(const LLSD& value )
+{
+ mDidWordWrap = FALSE;
+ setText(value.asString());
+}
BOOL LLTextBox::setTextArg( const std::string& key, const LLStringExplicit& text )
{
@@ -289,8 +314,8 @@ void LLTextBox::draw()
if( mBorderDropShadowVisible )
{
- static LLColor4 color_drop_shadow = LLUI::sColorsGroup->getColor("ColorDropShadow");
- static S32 drop_shadow_tooltip = LLUI::sConfigGroup->getS32("DropShadowTooltip");
+ static LLUICachedControl<LLColor4> color_drop_shadow ("ColorDropShadow", *(new LLColor4));
+ static LLUICachedControl<S32> drop_shadow_tooltip ("DropShadowTooltip", 0);
gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0,
color_drop_shadow, drop_shadow_tooltip);
}
@@ -298,7 +323,7 @@ void LLTextBox::draw()
if (mBackgroundVisible)
{
LLRect r( 0, getRect().getHeight(), getRect().getWidth(), 0 );
- gl_rect_2d( r, mBackgroundColor );
+ gl_rect_2d( r, mBackgroundColor.get() );
}
S32 text_x = 0;
@@ -321,16 +346,16 @@ void LLTextBox::draw()
{
if(mHasHover)
{
- drawText( text_x, text_y, mHoverColor );
+ drawText( text_x, text_y, mHoverColor.get() );
}
else
{
- drawText( text_x, text_y, mTextColor );
+ drawText( text_x, text_y, mTextColor.get() );
}
}
else
{
- drawText( text_x, text_y, mDisabledColor );
+ drawText( text_x, text_y, mDisabledColor.get() );
}
if (sDebugRects)
@@ -338,6 +363,13 @@ void LLTextBox::draw()
drawDebugRect();
}
+ //// *HACK: also draw debug rectangles around currently-being-edited LLView, and any elements that are being highlighted by GUI preview code (see LLFloaterUIPreview)
+ //std::set<LLView*>::iterator iter = std::find(sPreviewHighlightedElements.begin(), sPreviewHighlightedElements.end(), this);
+ //if ((sEditingUI && this == sEditingUIView) || (iter != sPreviewHighlightedElements.end() && sDrawPreviewHighlights))
+ //{
+ // drawDebugRect();
+ //}
+
mHasHover = FALSE; // This is reset every frame.
}
@@ -355,6 +387,7 @@ void LLTextBox::drawText( S32 x, S32 y, const LLColor4& color )
mFontGL->render(mText.getWString(), 0, (F32)x, (F32)y, color,
mHAlign, mVAlign,
mFontStyle,
+ mShadowType,
S32_MAX, getRect().getWidth(), NULL, TRUE, mUseEllipses);
}
else
@@ -367,6 +400,7 @@ void LLTextBox::drawText( S32 x, S32 y, const LLColor4& color )
mFontGL->render(mText.getWString(), cur_pos, (F32)x, (F32)y, color,
mHAlign, mVAlign,
mFontStyle,
+ mShadowType,
line_length, getRect().getWidth(), NULL, TRUE, mUseEllipses );
cur_pos += line_length + 1;
y -= llfloor(mFontGL->getLineHeight()) + mLineSpacing;
@@ -380,86 +414,3 @@ void LLTextBox::reshapeToFitText()
S32 height = getTextPixelHeight();
reshape( width + 2 * mHPad, height + 2 * mVPad );
}
-
-// virtual
-LLXMLNodePtr LLTextBox::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- // Attributes
- node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mFontGL));
- node->createChild("halign", TRUE)->setStringValue(LLFontGL::nameFromHAlign(mHAlign));
- addColorXML(node, mTextColor, "text_color", "LabelTextColor");
- addColorXML(node, mDisabledColor, "disabled_color", "LabelDisabledColor");
- addColorXML(node, mBackgroundColor, "bg_color", "DefaultBackgroundColor");
- addColorXML(node, mBorderColor, "border_color", "DefaultHighlightLight");
- node->createChild("bg_visible", TRUE)->setBoolValue(mBackgroundVisible);
- node->createChild("border_visible", TRUE)->setBoolValue(mBorderVisible);
- node->createChild("border_drop_shadow_visible", TRUE)->setBoolValue(mBorderDropShadowVisible);
- node->createChild("h_pad", TRUE)->setIntValue(mHPad);
- node->createChild("v_pad", TRUE)->setIntValue(mVPad);
-
- // Contents
- node->setStringValue(mText);
-
- return node;
-}
-
-// static
-LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("text_box");
- node->getAttributeString("name", name);
- LLFontGL* font = LLView::selectFont(node);
-
- std::string text = node->getTextContents();
-
- LLTextBox* text_box = new LLTextBox(name,
- LLRect(),
- text,
- font,
- FALSE);
-
-
- LLFontGL::HAlign halign = LLView::selectFontHAlign(node);
- text_box->setHAlign(halign);
-
- text_box->initFromXML(node, parent);
-
- node->getAttributeS32("line_spacing", text_box->mLineSpacing);
-
- std::string font_style;
- if (node->getAttributeString("font-style", font_style))
- {
- text_box->mFontStyle = LLFontGL::getStyleFromString(font_style);
- }
-
- BOOL mouse_opaque = text_box->getMouseOpaque();
- if (node->getAttributeBOOL("mouse_opaque", mouse_opaque))
- {
- text_box->setMouseOpaque(mouse_opaque);
- }
-
- if(node->hasAttribute("text_color"))
- {
- LLColor4 color;
- LLUICtrlFactory::getAttributeColor(node, "text_color", color);
- text_box->setColor(color);
- }
-
- if(node->hasAttribute("hover_color"))
- {
- LLColor4 color;
- LLUICtrlFactory::getAttributeColor(node, "hover_color", color);
- text_box->setHoverColor(color);
- text_box->setHoverActive(true);
- }
-
- BOOL hover_active = FALSE;
- if(node->getAttributeBOOL("hover", hover_active))
- {
- text_box->setHoverActive(hover_active);
- }
-
- return text_box;
-}
diff --git a/indra/llui/lltextbox.h b/indra/llui/lltextbox.h
index 07a6aa3622..aae538a221 100644
--- a/indra/llui/lltextbox.h
+++ b/indra/llui/lltextbox.h
@@ -43,27 +43,46 @@ class LLTextBox
: public LLUICtrl
{
public:
- // By default, follows top and left and is mouse-opaque.
- // If no text, text = name.
- // If no font, uses default system font.
- LLTextBox(const std::string& name, const LLRect& rect, const std::string& text,
- const LLFontGL* font = NULL, BOOL mouse_opaque = TRUE );
+
+ // *TODO: Add callback to Params
+ typedef boost::function<void (void)> callback_t;
+
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<std::string> text;
- // Construct a textbox which handles word wrapping for us.
- LLTextBox(const std::string& name, const std::string& text, F32 max_width = 200,
- const LLFontGL* font = NULL, BOOL mouse_opaque = TRUE );
+ Optional<bool> highlight_on_hover,
+ border_visible,
+ border_drop_shadow_visible,
+ bg_visible,
+ use_ellipses,
+ word_wrap;
- // "Simple" constructors for text boxes that have the same name and label *TO BE DEPRECATED*
- LLTextBox(const std::string& name_and_label, const LLRect& rect);
+ Optional<LLFontGL::ShadowType> font_shadow;
- // Consolidate common member initialization
- // 20+ initializers times 3+ constructors is unmaintainable.
- void initDefaults();
+ Deprecated drop_shadow_visible,
+ type,
+ length;
- virtual ~LLTextBox() {}
+ Optional<LLUIColor> text_color,
+ hover_color,
+ disabled_color,
+ background_color,
+ border_color;
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
+ Optional<S32> v_pad,
+ h_pad,
+ line_spacing;
+
+ Params();
+ };
+
+protected:
+ LLTextBox(const Params&);
+ friend class LLUICtrlFactory;
+
+public:
+ virtual ~LLTextBox() {}
virtual void draw();
virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
@@ -81,18 +100,17 @@ public:
void setHoverActive( BOOL active ) { mHoverActive = active; }
void setText( const LLStringExplicit& text );
- void setWrappedText(const LLStringExplicit& text, F32 max_width = -1.0); // -1 means use existing control width
+ void setWrappedText(const LLStringExplicit& text, F32 max_width = -1.f); // -1 means use existing control width
void setUseEllipses( BOOL use_ellipses ) { mUseEllipses = use_ellipses; }
void setBackgroundVisible(BOOL visible) { mBackgroundVisible = visible; }
void setBorderVisible(BOOL visible) { mBorderVisible = visible; }
- void setFontStyle(U8 style) { mFontStyle = style; }
void setBorderDropshadowVisible(BOOL visible){ mBorderDropShadowVisible = visible; }
void setHPad(S32 pixels) { mHPad = pixels; }
void setVPad(S32 pixels) { mVPad = pixels; }
void setRightAlign() { mHAlign = LLFontGL::RIGHT; }
void setHAlign( LLFontGL::HAlign align ) { mHAlign = align; }
- void setClickedCallback( void (*cb)(void *data), void* data = NULL ){ mClickedCallback = cb; mCallbackUserData = data; } // mouse down and up within button
+ void setClickedCallback( boost::function<void (void*)> cb, void* userdata = NULL ){ mClickedCallback = boost::bind(cb, userdata); } // mouse down and up within button
const LLFontGL* getFont() const { return mFontGL; }
@@ -102,7 +120,7 @@ public:
S32 getTextPixelWidth();
S32 getTextPixelHeight();
- virtual void setValue(const LLSD& value ) { setText(value.asString()); }
+ virtual void setValue(const LLSD& value );
virtual LLSD getValue() const { return LLSD(getText()); }
virtual BOOL setTextArg( const std::string& key, const LLStringExplicit& text );
@@ -112,18 +130,21 @@ private:
LLUIString mText;
const LLFontGL* mFontGL;
- LLColor4 mTextColor;
- LLColor4 mDisabledColor;
- LLColor4 mBackgroundColor;
- LLColor4 mBorderColor;
- LLColor4 mHoverColor;
+ LLUIColor mTextColor;
+ LLUIColor mDisabledColor;
+ LLUIColor mBackgroundColor;
+ LLUIColor mBorderColor;
+ LLUIColor mHoverColor;
BOOL mHoverActive;
BOOL mHasHover;
BOOL mBackgroundVisible;
BOOL mBorderVisible;
+ BOOL mWordWrap;
+ BOOL mDidWordWrap;
U8 mFontStyle; // style bit flags for font
+ LLFontGL::ShadowType mShadowType;
BOOL mBorderDropShadowVisible;
BOOL mUseEllipses;
@@ -135,8 +156,14 @@ private:
LLFontGL::VAlign mVAlign;
std::vector<S32> mLineLengthList;
- void (*mClickedCallback)(void* data );
- void* mCallbackUserData;
+ callback_t mClickedCallback;
};
+#ifdef LL_WINDOWS
+#ifndef INSTANTIATE_GETCHILD_TEXTBOX
+#pragma warning (disable : 4231)
+extern template LLTextBox* LLView::getChild<LLTextBox>( const std::string& name, BOOL recurse, BOOL create_if_missing ) const;
+#endif
+#endif
+
#endif
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 5e54c7a307..44d98e75c8 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -65,30 +65,15 @@
//
static LLRegisterWidget<LLTextEditor> r("simple_text_editor");
-BOOL gDebugTextEditorTips = FALSE;
-
//
// Constants
//
-const S32 UI_TEXTEDITOR_BUFFER_BLOCK_SIZE = 512;
-const S32 UI_TEXTEDITOR_BORDER = 1;
-const S32 UI_TEXTEDITOR_H_PAD = 4;
-const S32 UI_TEXTEDITOR_V_PAD_TOP = 4;
const S32 UI_TEXTEDITOR_LINE_NUMBER_MARGIN = 32;
const S32 UI_TEXTEDITOR_LINE_NUMBER_DIGITS = 4;
const F32 CURSOR_FLASH_DELAY = 1.0f; // in seconds
const S32 CURSOR_THICKNESS = 2;
const S32 SPACES_PER_TAB = 4;
-const F32 PREEDIT_MARKER_BRIGHTNESS = 0.4f;
-const S32 PREEDIT_MARKER_GAP = 1;
-const S32 PREEDIT_MARKER_POSITION = 2;
-const S32 PREEDIT_MARKER_THICKNESS = 1;
-const F32 PREEDIT_STANDOUT_BRIGHTNESS = 0.6f;
-const S32 PREEDIT_STANDOUT_GAP = 1;
-const S32 PREEDIT_STANDOUT_POSITION = 2;
-const S32 PREEDIT_STANDOUT_THICKNESS = 2;
-
LLColor4 LLTextEditor::mLinkColor = LLColor4::blue;
void (* LLTextEditor::mURLcallback)(const std::string&) = NULL;
@@ -243,18 +228,9 @@ private:
///////////////////////////////////////////////////////////////////
-
-LLTextEditor::LLTextEditor(
- const std::string& name,
- const LLRect& rect,
- S32 max_length, // In bytes
- const std::string &default_text,
- const LLFontGL* font,
- BOOL allow_embedded_items)
- :
- LLUICtrl( name, rect, TRUE, NULL, NULL, FOLLOWS_TOP | FOLLOWS_LEFT ),
- mTextIsUpToDate(TRUE),
- mMaxTextByteLength( max_length ),
+LLTextEditor::LLTextEditor(const LLTextEditor::Params& p)
+ : LLUICtrl(p, LLTextViewModelPtr(new LLTextViewModel)),
+ mMaxTextByteLength( p.max_text_length ),
mBaseDocIsPristine(TRUE),
mPristineCmd( NULL ),
mLastCmd( NULL ),
@@ -265,45 +241,40 @@ LLTextEditor::LLTextEditor(
mScrolledToBottom( TRUE ),
mOnScrollEndCallback( NULL ),
mOnScrollEndData( NULL ),
- mCursorColor( LLUI::sColorsGroup->getColor( "TextCursorColor" ) ),
- mFgColor( LLUI::sColorsGroup->getColor( "TextFgColor" ) ),
- mDefaultColor( LLUI::sColorsGroup->getColor( "TextDefaultColor" ) ),
- mReadOnlyFgColor( LLUI::sColorsGroup->getColor( "TextFgReadOnlyColor" ) ),
- mWriteableBgColor( LLUI::sColorsGroup->getColor( "TextBgWriteableColor" ) ),
- mReadOnlyBgColor( LLUI::sColorsGroup->getColor( "TextBgReadOnlyColor" ) ),
- mFocusBgColor( LLUI::sColorsGroup->getColor( "TextBgFocusColor" ) ),
- mReadOnly(FALSE),
- mWordWrap( FALSE ),
+ mCursorColor( p.cursor_color() ),
+ mFgColor( p.text_color() ),
+ mDefaultColor( p.default_color() ),
+ mReadOnlyFgColor( p.text_readonly_color() ),
+ mWriteableBgColor( p.bg_writeable_color() ),
+ mReadOnlyBgColor( p.bg_readonly_color() ),
+ mFocusBgColor( p.bg_focus_color() ),
+ mReadOnly(p.read_only),
+ mWordWrap( p.word_wrap ),
mShowLineNumbers ( FALSE ),
- mTabsToNextField( TRUE ),
mCommitOnFocusLost( FALSE ),
mHideScrollbarForShortDocs( FALSE ),
- mTakesNonScrollClicks( TRUE ),
- mTrackBottom( FALSE ),
- mAllowEmbeddedItems( allow_embedded_items ),
+ mTakesNonScrollClicks( p.takes_non_scroll_clicks ),
+ mTrackBottom( p.track_bottom ),
+ mAllowEmbeddedItems( p.allow_embedded_items ),
mAcceptCallingCardNames(FALSE),
mHandleEditKeysDirectly( FALSE ),
mMouseDownX(0),
mMouseDownY(0),
mLastSelectionX(-1),
- mLastSelectionY(-1),
mReflowNeeded(FALSE),
- mScrollNeeded(FALSE)
+ mScrollNeeded(FALSE),
+ mLastSelectionY(-1),
+ mTabsToNextField(p.ignore_tab),
+ mGLFont(p.font),
+ mGLFontStyle(LLFontGL::getStyleFromString(p.font.style))
{
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+
mSourceID.generate();
// reset desired x cursor position
mDesiredXPixel = -1;
- if (font)
- {
- mGLFont = font;
- }
- else
- {
- mGLFont = LLFontGL::getFontSansSerif();
- }
-
updateTextRect();
S32 line_height = llround( mGLFont->getLineHeight() );
@@ -312,36 +283,57 @@ LLTextEditor::LLTextEditor(
// Init the scrollbar
LLRect scroll_rect;
scroll_rect.setOriginAndSize(
- getRect().getWidth() - SCROLLBAR_SIZE,
+ getRect().getWidth() - scrollbar_size,
1,
- SCROLLBAR_SIZE,
+ scrollbar_size,
getRect().getHeight() - 1);
S32 lines_in_doc = getLineCount();
- mScrollbar = new LLScrollbar( std::string("Scrollbar"), scroll_rect,
- LLScrollbar::VERTICAL,
- lines_in_doc,
- 0,
- page_size,
- NULL, this );
- mScrollbar->setFollowsRight();
- mScrollbar->setFollowsTop();
- mScrollbar->setFollowsBottom();
- mScrollbar->setEnabled( TRUE );
- mScrollbar->setVisible( TRUE );
+ LLScrollbar::Params sbparams;
+ sbparams.name("Scrollbar");
+ sbparams.rect(scroll_rect);
+ sbparams.orientation(LLScrollbar::VERTICAL);
+ sbparams.doc_size(lines_in_doc);
+ sbparams.doc_pos(0);
+ sbparams.page_size(page_size);
+ sbparams.follows.flags(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
+ mScrollbar = LLUICtrlFactory::create<LLScrollbar> (sbparams);
mScrollbar->setOnScrollEndCallback(mOnScrollEndCallback, mOnScrollEndData);
addChild(mScrollbar);
- mBorder = new LLViewBorder( std::string("text ed border"), LLRect(0, getRect().getHeight(), getRect().getWidth(), 0), LLViewBorder::BEVEL_IN, LLViewBorder::STYLE_LINE, UI_TEXTEDITOR_BORDER );
+ static LLUICachedControl<S32> text_editor_border ("UITextEditorBorder", 0);
+ LLViewBorder::Params params;
+ params.name("text ed border");
+ params.rect(getLocalRect());
+ params.bevel_type(LLViewBorder::BEVEL_IN);
+ params.border_thickness(text_editor_border);
+ mBorder = LLUICtrlFactory::create<LLViewBorder> (params);
addChild( mBorder );
+ mBorder->setVisible(!p.hide_border);
- appendText(default_text, FALSE, FALSE);
-
- resetDirty(); // Update saved text state
+ appendText(p.default_text, FALSE, FALSE);
+
+ setHideScrollbarForShortDocs(p.hide_scrollbar);
mParseHTML=FALSE;
mHTML.clear();
}
+void LLTextEditor::initFromParams( const LLTextEditor::Params& p)
+{
+ resetDirty(); // Update saved text state
+ LLUICtrl::initFromParams(p);
+ // HACK: work around enabled == readonly design bug -- RN
+ // setEnabled will modify our read only status, so do this after
+ // LLUICtrl::initFromParams
+ if (p.read_only.isProvided())
+ {
+ mReadOnly = p.read_only;
+ updateSegments();
+ updateAllowingLanguageInput();
+ }
+ // HACK: text editors always need to be enabled so that we can scroll
+ LLView::setEnabled(true);
+}
LLTextEditor::~LLTextEditor()
{
@@ -360,6 +352,11 @@ LLTextEditor::~LLTextEditor()
std::for_each(mUndoStack.begin(), mUndoStack.end(), DeletePointer());
}
+LLTextViewModel* LLTextEditor::getViewModel() const
+{
+ return (LLTextViewModel*)mViewModel.get();
+}
+
void LLTextEditor::setTrackColor( const LLColor4& color )
{
mScrollbar->setTrackColor(color);
@@ -370,16 +367,6 @@ void LLTextEditor::setThumbColor( const LLColor4& color )
mScrollbar->setThumbColor(color);
}
-void LLTextEditor::setHighlightColor( const LLColor4& color )
-{
- mScrollbar->setHighlightColor(color);
-}
-
-void LLTextEditor::setShadowColor( const LLColor4& color )
-{
- mScrollbar->setShadowColor(color);
-}
-
void LLTextEditor::updateLineStartList(S32 startpos)
{
updateSegments();
@@ -400,7 +387,8 @@ void LLTextEditor::updateLineStartList(S32 startpos)
seg_offset = iter->mOffset;
mLineStartList.erase(iter, mLineStartList.end());
}
-
+
+ LLWString text(getWText());
while( seg_idx < seg_num )
{
mLineStartList.push_back(line_info(seg_idx,seg_offset));
@@ -412,7 +400,7 @@ void LLTextEditor::updateLineStartList(S32 startpos)
LLTextSegment* segment = mSegments[seg_idx];
S32 start_idx = segment->getStart() + seg_offset;
S32 end_idx = start_idx;
- while (end_idx < segment->getEnd() && mWText[end_idx] != '\n')
+ while (end_idx < segment->getEnd() && text[end_idx] != '\n')
{
end_idx++;
}
@@ -433,7 +421,7 @@ void LLTextEditor::updateLineStartList(S32 startpos)
}
else
{
- const llwchar* str = mWText.c_str() + start_idx;
+ const llwchar* str = text.c_str() + start_idx;
S32 drawn = mGLFont->maxDrawableChars(str, (F32)abs(mTextRect.getWidth()) - line_width,
end_idx - start_idx, mWordWrap, mAllowEmbeddedItems );
if( 0 == drawn && line_width == start_x)
@@ -447,7 +435,7 @@ void LLTextEditor::updateLineStartList(S32 startpos)
if (end_idx < segment->getEnd())
{
line_ended = TRUE;
- if (mWText[end_idx] == '\n')
+ if (text[end_idx] == '\n')
{
seg_offset++; // skip newline
}
@@ -490,17 +478,17 @@ BOOL LLTextEditor::truncate()
BOOL did_truncate = FALSE;
// First rough check - if we're less than 1/4th the size, we're OK
- if (mWText.size() >= (size_t) (mMaxTextByteLength / 4))
+ if (getLength() >= S32(mMaxTextByteLength / 4))
{
// Have to check actual byte size
- S32 utf8_byte_size = wstring_utf8_length( mWText );
+ LLWString text(getWText());
+ S32 utf8_byte_size = wstring_utf8_length(text);
if ( utf8_byte_size > mMaxTextByteLength )
{
// Truncate safely in UTF-8
- std::string temp_utf8_text = wstring_to_utf8str( mWText );
+ std::string temp_utf8_text = wstring_to_utf8str(text);
temp_utf8_text = utf8str_truncate( temp_utf8_text, mMaxTextByteLength );
- mWText = utf8str_to_wstring( temp_utf8_text );
- mTextIsUpToDate = FALSE;
+ getViewModel()->setDisplay(utf8str_to_wstring( temp_utf8_text ));
did_truncate = TRUE;
}
}
@@ -511,10 +499,7 @@ BOOL LLTextEditor::truncate()
void LLTextEditor::setText(const LLStringExplicit &utf8str)
{
// LLStringUtil::removeCRLF(utf8str);
- mUTF8Text = utf8str_removeCRLF(utf8str);
- // mUTF8Text = utf8str;
- mWText = utf8str_to_wstring(mUTF8Text);
- mTextIsUpToDate = TRUE;
+ mViewModel->setValue(utf8str_removeCRLF(utf8str));
truncate();
blockUndo();
@@ -529,9 +514,7 @@ void LLTextEditor::setText(const LLStringExplicit &utf8str)
void LLTextEditor::setWText(const LLWString &wtext)
{
- mWText = wtext;
- mUTF8Text.clear();
- mTextIsUpToDate = FALSE;
+ getViewModel()->setDisplay(wtext);
truncate();
blockUndo();
@@ -550,24 +533,13 @@ void LLTextEditor::setValue(const LLSD& value)
setText(value.asString());
}
-const std::string& LLTextEditor::getText() const
+std::string LLTextEditor::getText() const
{
- if (!mTextIsUpToDate)
+ if (mAllowEmbeddedItems)
{
- if (mAllowEmbeddedItems)
- {
- llwarns << "getText() called on text with embedded items (not supported)" << llendl;
- }
- mUTF8Text = wstring_to_utf8str(mWText);
- mTextIsUpToDate = TRUE;
+ llwarns << "getText() called on text with embedded items (not supported)" << llendl;
}
- return mUTF8Text;
-}
-
-// virtual
-LLSD LLTextEditor::getValue() const
-{
- return LLSD(getText());
+ return mViewModel->getValue().asString();
}
void LLTextEditor::setWordWrap(BOOL b)
@@ -709,7 +681,7 @@ void LLTextEditor::setCursorAtLocalPos( S32 local_x, S32 local_y, BOOL round )
S32 LLTextEditor::prevWordPos(S32 cursorPos) const
{
- const LLWString& wtext = mWText;
+ LLWString wtext(getWText());
while( (cursorPos > 0) && (wtext[cursorPos-1] == ' ') )
{
cursorPos--;
@@ -723,7 +695,7 @@ S32 LLTextEditor::prevWordPos(S32 cursorPos) const
S32 LLTextEditor::nextWordPos(S32 cursorPos) const
{
- const LLWString& wtext = mWText;
+ LLWString wtext(getWText());
while( (cursorPos < getLength()) && isPartOfWord( wtext[cursorPos] ) )
{
cursorPos++;
@@ -849,12 +821,13 @@ S32 LLTextEditor::getCursorPosFromLocalCoord( S32 local_x, S32 local_y, BOOL rou
{
S32 line_len = line_end - line_start;
S32 pos;
+ LLWString text(getWText());
if (mAllowEmbeddedItems)
{
// Figure out which character we're nearest to.
bindEmbeddedChars(mGLFont);
- pos = mGLFont->charFromPixelOffset(mWText.c_str(), line_start,
+ pos = mGLFont->charFromPixelOffset(text.c_str(), line_start,
(F32)(local_x - mTextRect.mLeft),
(F32)(mTextRect.getWidth()),
line_len,
@@ -863,7 +836,7 @@ S32 LLTextEditor::getCursorPosFromLocalCoord( S32 local_x, S32 local_y, BOOL rou
}
else
{
- pos = mGLFont->charFromPixelOffset(mWText.c_str(), line_start,
+ pos = mGLFont->charFromPixelOffset(text.c_str(), line_start,
(F32)(local_x - mTextRect.mLeft),
(F32)mTextRect.getWidth(),
line_len,
@@ -876,14 +849,15 @@ S32 LLTextEditor::getCursorPosFromLocalCoord( S32 local_x, S32 local_y, BOOL rou
void LLTextEditor::setCursor(S32 row, S32 column)
{
- const llwchar* doc = mWText.c_str();
+ LLWString text(getWText());
+ const llwchar* doc = text.c_str();
const char CR = 10;
while(row--)
{
while (CR != *doc++);
}
doc += column;
- setCursorPos(doc - mWText.c_str());
+ setCursorPos(doc - text.c_str());
}
void LLTextEditor::setCursorPos(S32 offset)
@@ -935,7 +909,7 @@ BOOL LLTextEditor::selectionContainsLineBreaks()
S32 left = llmin(mSelectionStart, mSelectionEnd);
S32 right = left + llabs(mSelectionStart - mSelectionEnd);
- const LLWString &wtext = mWText;
+ LLWString wtext = getWText();
for( S32 i = left; i < right; i++ )
{
if (wtext[i] == '\n')
@@ -972,7 +946,7 @@ S32 LLTextEditor::indentLine( S32 pos, S32 spaces )
// Unindent
for(S32 i=0; i < -spaces; i++)
{
- const LLWString &wtext = mWText;
+ LLWString wtext = getWText();
if (wtext[pos] == ' ')
{
delta_spaces += remove( pos, 1, FALSE );
@@ -987,7 +961,7 @@ void LLTextEditor::indentSelectedLines( S32 spaces )
{
if( hasSelection() )
{
- const LLWString &text = mWText;
+ LLWString text = getWText();
S32 left = llmin( mSelectionStart, mSelectionEnd );
S32 right = left + llabs( mSelectionStart - mSelectionEnd );
BOOL cursor_on_right = (mSelectionEnd > mSelectionStart);
@@ -1217,6 +1191,7 @@ BOOL LLTextEditor::handleMiddleMouseDown(S32 x, S32 y, MASK mask)
BOOL LLTextEditor::handleHover(S32 x, S32 y, MASK mask)
{
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
BOOL handled = FALSE;
mHoverSegment = NULL;
@@ -1291,7 +1266,7 @@ BOOL LLTextEditor::handleHover(S32 x, S32 y, MASK mask)
if( !handled )
{
lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (inactive)" << llendl;
- if (!mScrollbar->getVisible() || x < getRect().getWidth() - SCROLLBAR_SIZE)
+ if (!mScrollbar->getVisible() || x < getRect().getWidth() - scrollbar_size)
{
getWindow()->setCursor(UI_CURSOR_IBEAM);
}
@@ -1374,7 +1349,7 @@ BOOL LLTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
setCursorAtLocalPos( x, y, FALSE );
deselect();
- const LLWString &text = mWText;
+ LLWString text = getWText();
if( isPartOfWord( text[mCursorPos] ) )
{
@@ -1471,12 +1446,12 @@ S32 LLTextEditor::remove(const S32 pos, const S32 length, const BOOL group_with_
S32 LLTextEditor::append(const LLWString &wstr, const BOOL group_with_next_op)
{
- return insert(mWText.length(), wstr, group_with_next_op);
+ return insert(getLength(), wstr, group_with_next_op);
}
S32 LLTextEditor::overwriteChar(S32 pos, llwchar wc)
{
- if ((S32)mWText.length() == pos)
+ if ((S32)getLength() == pos)
{
return addChar(pos, wc);
}
@@ -1498,7 +1473,7 @@ void LLTextEditor::removeCharOrTab()
{
S32 chars_to_remove = 1;
- const LLWString &text = mWText;
+ LLWString text = getWText();
if (text[mCursorPos - 1] == ' ')
{
// Try to remove a "tab"
@@ -1563,7 +1538,7 @@ void LLTextEditor::removeChar()
// Add a single character to the text
S32 LLTextEditor::addChar(S32 pos, llwchar wc)
{
- if ( (wstring_utf8_length( mWText ) + wchar_utf8_length( wc )) >= mMaxTextByteLength)
+ if ( (wstring_utf8_length( getWText() ) + wchar_utf8_length( wc )) >= mMaxTextByteLength)
{
make_ui_sound("UISndBadKeystroke");
return 0;
@@ -1865,7 +1840,7 @@ void LLTextEditor::cut()
}
S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
S32 length = llabs( mSelectionStart - mSelectionEnd );
- gClipboard.copyFromSubstring( mWText, left_pos, length, mSourceID );
+ gClipboard.copyFromSubstring( getWText(), left_pos, length, mSourceID );
deleteSelection( FALSE );
needsReflow();
@@ -1885,7 +1860,7 @@ void LLTextEditor::copy()
}
S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
S32 length = llabs( mSelectionStart - mSelectionEnd );
- gClipboard.copyFromSubstring(mWText, left_pos, length, mSourceID);
+ gClipboard.copyFromSubstring(getWText(), left_pos, length, mSourceID);
}
BOOL LLTextEditor::canPaste() const
@@ -1986,7 +1961,7 @@ void LLTextEditor::copyPrimary()
}
S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
S32 length = llabs( mSelectionStart - mSelectionEnd );
- gClipboard.copyFromPrimarySubstring(mWText, left_pos, length, mSourceID);
+ gClipboard.copyFromPrimarySubstring(getWText(), left_pos, length, mSourceID);
}
BOOL LLTextEditor::canPastePrimary() const
@@ -2237,7 +2212,7 @@ void LLTextEditor::unindentLineBeforeCloseBrace()
{
if( mCursorPos >= 1 )
{
- const LLWString &text = mWText;
+ LLWString text = getWText();
if( ' ' == text[ mCursorPos - 1 ] )
{
removeCharOrTab();
@@ -2401,7 +2376,7 @@ void LLTextEditor::doDelete()
{
S32 i;
S32 chars_to_remove = 1;
- const LLWString &text = mWText;
+ LLWString text = getWText();
if( (text[ mCursorPos ] == ' ') && (mCursorPos + SPACES_PER_TAB < getLength()) )
{
// Try to remove a full tab's worth of spaces
@@ -2565,10 +2540,10 @@ void LLTextEditor::drawBackground()
S32 right = getRect().getWidth();
S32 bottom = 0;
- LLColor4 bg_color = mReadOnly ? mReadOnlyBgColor
- : gFocusMgr.getKeyboardFocus() == this ? mFocusBgColor : mWriteableBgColor;
+ LLColor4 bg_color = mReadOnly ? mReadOnlyBgColor.get()
+ : gFocusMgr.getKeyboardFocus() == this ? mFocusBgColor.get() : mWriteableBgColor.get();
if( mShowLineNumbers ) {
- gl_rect_2d(left, top, UI_TEXTEDITOR_LINE_NUMBER_MARGIN, bottom, mReadOnlyBgColor ); // line number area always read-only
+ gl_rect_2d(left, top, UI_TEXTEDITOR_LINE_NUMBER_MARGIN, bottom, mReadOnlyBgColor.get() ); // line number area always read-only
gl_rect_2d(UI_TEXTEDITOR_LINE_NUMBER_MARGIN, top, right, bottom, bg_color); // body text area to the right of line numbers
gl_rect_2d(UI_TEXTEDITOR_LINE_NUMBER_MARGIN, top, UI_TEXTEDITOR_LINE_NUMBER_MARGIN-1, bottom, LLColor4::grey3); // separator
} else {
@@ -2584,7 +2559,7 @@ void LLTextEditor::drawSelectionBackground()
// Draw selection even if we don't have keyboard focus for search/replace
if( hasSelection() )
{
- const LLWString &text = mWText;
+ LLWString text = getWText();
const S32 text_len = getLength();
std::queue<S32> line_endings;
@@ -2683,7 +2658,7 @@ void LLTextEditor::drawSelectionBackground()
if( selection_visible )
{
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
- const LLColor4& color = mReadOnly ? mReadOnlyBgColor : mWriteableBgColor;
+ const LLColor4& color = mReadOnly ? mReadOnlyBgColor.get() : mWriteableBgColor.get();
F32 alpha = hasFocus() ? 1.f : 0.5f;
gGL.color4f( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], alpha );
S32 margin_offset = mShowLineNumbers ? UI_TEXTEDITOR_LINE_NUMBER_MARGIN : 0;
@@ -2735,7 +2710,7 @@ void LLTextEditor::drawCursor()
if( gFocusMgr.getKeyboardFocus() == this
&& gShowTextEditCursor && !mReadOnly)
{
- const LLWString &text = mWText;
+ LLWString text = getWText();
const S32 text_len = getLength();
// Skip through the lines we aren't drawing.
@@ -2819,7 +2794,7 @@ void LLTextEditor::drawCursor()
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
- gGL.color4fv( mCursorColor.mV );
+ gGL.color4fv( mCursorColor.get().mV );
gl_rect_2d(llfloor(cursor_left), llfloor(cursor_top),
llfloor(cursor_right), llfloor(cursor_bottom));
@@ -2834,21 +2809,22 @@ void LLTextEditor::drawCursor()
}
else if (mReadOnly)
{
- text_color = mReadOnlyFgColor;
+ text_color = mReadOnlyFgColor.get();
}
else
{
- text_color = mFgColor;
+ text_color = mFgColor.get();
}
mGLFont->render(text, mCursorPos, next_char_left, cursor_bottom + line_height,
LLColor4(1.f - text_color.mV[VRED], 1.f - text_color.mV[VGREEN], 1.f - text_color.mV[VBLUE], 1.f),
LLFontGL::LEFT, LLFontGL::TOP,
LLFontGL::NORMAL,
+ LLFontGL::NO_SHADOW,
1);
}
// Make sure the IME is in the right place
- LLRect screen_pos = getScreenRect();
+ LLRect screen_pos = calcScreenRect();
LLCoordGL ime_pos( screen_pos.mLeft + llfloor(cursor_left), screen_pos.mBottom + llfloor(cursor_top) );
ime_pos.mX = (S32) (ime_pos.mX * LLUI::sGLScaleFactor.mV[VX]);
@@ -2861,12 +2837,22 @@ void LLTextEditor::drawCursor()
void LLTextEditor::drawPreeditMarker()
{
+ static LLUICachedControl<F32> preedit_marker_brightness ("UIPreeditMarkerBrightness", 0);
+ static LLUICachedControl<S32> preedit_marker_gap ("UIPreeditMarkerGap", 0);
+ static LLUICachedControl<S32> preedit_marker_position ("UIPreeditMarkerPosition", 0);
+ static LLUICachedControl<S32> preedit_marker_thickness ("UIPreeditMarkerThickness", 0);
+ static LLUICachedControl<F32> preedit_standout_brightness ("UIPreeditStandoutBrightness", 0);
+ static LLUICachedControl<S32> preedit_standout_gap ("UIPreeditStandoutGap", 0);
+ static LLUICachedControl<S32> preedit_standout_position ("UIPreeditStandoutPosition", 0);
+ static LLUICachedControl<S32> preedit_standout_thickness ("UIPreeditStandoutThickness", 0);
+
if (!hasPreeditString())
{
return;
}
- const llwchar *text = mWText.c_str();
+ const LLWString textString(getWText());
+ const llwchar *text = textString.c_str();
const S32 text_len = getLength();
const S32 num_lines = getLineCount();
@@ -2929,19 +2915,19 @@ void LLTextEditor::drawPreeditMarker()
if (mPreeditStandouts[i])
{
- gl_rect_2d(preedit_left + PREEDIT_STANDOUT_GAP,
- line_y + PREEDIT_STANDOUT_POSITION,
- preedit_right - PREEDIT_STANDOUT_GAP - 1,
- line_y + PREEDIT_STANDOUT_POSITION - PREEDIT_STANDOUT_THICKNESS,
- (mCursorColor * PREEDIT_STANDOUT_BRIGHTNESS + mWriteableBgColor * (1 - PREEDIT_STANDOUT_BRIGHTNESS)).setAlpha(1.0f));
+ gl_rect_2d(preedit_left + preedit_standout_gap,
+ line_y + preedit_standout_position,
+ preedit_right - preedit_standout_gap - 1,
+ line_y + preedit_standout_position - preedit_standout_thickness,
+ (mCursorColor.get() * preedit_standout_brightness + mWriteableBgColor.get() * (1 - preedit_standout_brightness)).setAlpha(1.0f));
}
else
{
- gl_rect_2d(preedit_left + PREEDIT_MARKER_GAP,
- line_y + PREEDIT_MARKER_POSITION,
- preedit_right - PREEDIT_MARKER_GAP - 1,
- line_y + PREEDIT_MARKER_POSITION - PREEDIT_MARKER_THICKNESS,
- (mCursorColor * PREEDIT_MARKER_BRIGHTNESS + mWriteableBgColor * (1 - PREEDIT_MARKER_BRIGHTNESS)).setAlpha(1.0f));
+ gl_rect_2d(preedit_left + preedit_marker_gap,
+ line_y + preedit_marker_position,
+ preedit_right - preedit_marker_gap - 1,
+ line_y + preedit_marker_position - preedit_marker_thickness,
+ (mCursorColor.get() * preedit_marker_brightness + mWriteableBgColor.get() * (1 - preedit_marker_brightness)).setAlpha(1.0f));
}
}
}
@@ -2956,9 +2942,12 @@ void LLTextEditor::drawPreeditMarker()
void LLTextEditor::drawText()
{
- const LLWString &text = mWText;
+ LLWString text = getWText();
const S32 text_len = getLength();
- if( text_len <= 0 ) return;
+ if( text_len <= 0 )
+ {
+ return;
+ }
S32 selection_left = -1;
S32 selection_right = -1;
// Draw selection even if we don't have keyboard focus for search/replace
@@ -2970,26 +2959,14 @@ void LLTextEditor::drawText()
LLGLSUIDefault gls_ui;
- // There are several concepts that are important for understanding the following drawing code.
- // The document is logically a sequence of characters (stored in a LLWString).
- // Variables below with "start" or "end" in their names refer to positions or offsets into it.
- // Next there are two kinds of "line" variables to understand. Newline characters in the
- // character sequence represent logical lines. These are what get numbered and so variables
- // representing this kind of line have "num" in their names.
- // The others represent line fragments or displayed lines which the scrollbar deals with.
- // When the "show line numbers" property is turned on, we draw line numbers to the left of the
- // beginning of each logical line and not in front of wrapped "continuation" display lines. -MG
-
- S32 cur_line = mScrollbar->getDocPos(); // scrollbar counts each wrap as a new line.
+ S32 cur_line = mScrollbar->getDocPos();
S32 num_lines = getLineCount();
- if (cur_line >= num_lines) return;
- S32 line_start = getLineStart(cur_line);
- S32 prev_start = getLineStart(cur_line-1);
- S32 cur_line_num = getLineForPosition(line_start); // doesn't count wraps. i.e. only counts newlines.
- S32 prev_line_num = getLineForPosition(prev_start);
- BOOL cur_line_is_continuation = cur_line_num > 0 && cur_line_num == prev_line_num;
- BOOL line_wraps = FALSE;
+ if (cur_line >= num_lines)
+ {
+ return;
+ }
+ S32 line_start = getLineStart(cur_line);
LLTextSegment t(line_start);
segment_list_t::iterator seg_iter;
seg_iter = std::upper_bound(mSegments.begin(), mSegments.end(), &t, LLTextSegment::compare());
@@ -3008,36 +2985,12 @@ void LLTextEditor::drawText()
next_start = getLineStart(cur_line + 1);
line_end = next_start;
}
- line_wraps = text[line_end-1] != '\n';
- if ( ! line_wraps )
+ if ( text[line_end-1] == '\n' )
{
- --line_end; // don't attempt to draw the newline char.
+ --line_end;
}
- F32 text_start = (F32)mTextRect.mLeft;
- F32 text_x = text_start + (mShowLineNumbers ? UI_TEXTEDITOR_LINE_NUMBER_MARGIN : 0);
-
- // draw the line numbers
- if( mShowLineNumbers && !cur_line_is_continuation)
- {
- const LLFontGL *num_font = LLFontGL::getFontMonospace();
- F32 y_top = text_y + ((F32)llround(num_font->getLineHeight()) / 2);
- const LLWString ltext = utf8str_to_wstring(llformat("%*d", UI_TEXTEDITOR_LINE_NUMBER_DIGITS, cur_line_num ));
- BOOL is_cur_line = getCurrentLine() == cur_line_num;
- const U8 style = is_cur_line ? LLFontGL::BOLD : LLFontGL::NORMAL;
- const LLColor4 fg_color = is_cur_line ? mCursorColor : mReadOnlyFgColor;
- num_font->render(
- ltext, // string to draw
- 0, // begin offset
- 3., // x
- y_top, // y
- fg_color,
- LLFontGL::LEFT, // horizontal alignment
- LLFontGL::VCENTER, // vertical alignment
- style,
- S32_MAX, // max chars
- UI_TEXTEDITOR_LINE_NUMBER_MARGIN); // max pixels
- }
+ F32 text_x = (F32)mTextRect.mLeft;
S32 seg_start = line_start;
while( seg_start < line_end )
@@ -3082,31 +3035,20 @@ void LLTextEditor::drawText()
drawClippedSegment( text, seg_start, clipped_end, text_x, text_y, selection_left, selection_right, style, &text_x );
- if( text_x == text_start && mShowLineNumbers )
- {
- text_x += UI_TEXTEDITOR_LINE_NUMBER_MARGIN;
- }
-
// Note: text_x is incremented by drawClippedSegment()
seg_start += clipped_len;
}
}
- // move down one line
- text_y -= (F32)line_height;
-
- if( line_wraps )
- {
- cur_line_num--;
- }
- cur_line_is_continuation = line_wraps; // so as to not not number the continuation lines
+ // move down one line
+ text_y -= (F32)line_height;
line_start = next_start;
cur_line++;
- cur_line_num++;
}
}
+
// Draws a single text segment, reversing the color for selection if needed.
void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32 seg_end, F32 x, F32 y, S32 selection_left, S32 selection_right, const LLStyleSP& style, F32* right_x )
{
@@ -3121,7 +3063,7 @@ void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32
if ( style->getFontString()[0] )
{
- font = LLResMgr::getInstance()->getRes(style->getFontID());
+ font = style->getFont();
}
U8 font_flags = LLFontGL::NORMAL;
@@ -3141,13 +3083,15 @@ void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32
if (style->getIsEmbeddedItem())
{
+ static LLUICachedControl<LLColor4> text_embedded_item_readonly_color ("TextEmbeddedItemReadOnlyColor", *(new LLColor4));
+ static LLUICachedControl<LLColor4> text_embedded_item_color ("TextEmbeddedItemColor", *(new LLColor4));
if (mReadOnly)
{
- color = LLUI::sColorsGroup->getColor("TextEmbeddedItemReadOnlyColor");
+ color = text_embedded_item_readonly_color;
}
else
{
- color = LLUI::sColorsGroup->getColor("TextEmbeddedItemColor");
+ color = text_embedded_item_color;
}
}
@@ -3159,7 +3103,7 @@ void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32
S32 start = seg_start;
S32 end = llmin( selection_left, seg_end );
S32 length = end - start;
- font->render(text, start, x, y_top, color, LLFontGL::LEFT, LLFontGL::TOP, font_flags, length, S32_MAX, right_x, mAllowEmbeddedItems);
+ font->render(text, start, x, y_top, color, LLFontGL::LEFT, LLFontGL::TOP, mGLFontStyle, LLFontGL::NO_SHADOW, length, S32_MAX, right_x, mAllowEmbeddedItems);
}
x = *right_x;
@@ -3172,7 +3116,7 @@ void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32
font->render(text, start, x, y_top,
LLColor4( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], 1.f ),
- LLFontGL::LEFT, LLFontGL::TOP, font_flags, length, S32_MAX, right_x, mAllowEmbeddedItems);
+ LLFontGL::LEFT, LLFontGL::TOP, mGLFontStyle, LLFontGL::NO_SHADOW, length, S32_MAX, right_x, mAllowEmbeddedItems);
}
x = *right_x;
if( selection_right < seg_end )
@@ -3181,7 +3125,7 @@ void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32
S32 start = llmax( selection_right, seg_start );
S32 end = seg_end;
S32 length = end - start;
- font->render(text, start, x, y_top, color, LLFontGL::LEFT, LLFontGL::TOP, font_flags, length, S32_MAX, right_x, mAllowEmbeddedItems);
+ font->render(text, start, x, y_top, color, LLFontGL::LEFT, LLFontGL::TOP, mGLFontStyle, LLFontGL::NO_SHADOW, length, S32_MAX, right_x, mAllowEmbeddedItems);
}
}
@@ -3203,17 +3147,18 @@ void LLTextEditor::draw()
}
{
- LLLocalClipRect clip(LLRect(0, getRect().getHeight(), getRect().getWidth() - (mScrollbar->getVisible() ? SCROLLBAR_SIZE : 0), 0));
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+ LLLocalClipRect clip(LLRect(0, getRect().getHeight(), getRect().getWidth() - (mScrollbar->getVisible() ? scrollbar_size : 0), 0));
- bindEmbeddedChars(mGLFont);
+ bindEmbeddedChars( mGLFont );
- drawBackground();
- drawSelectionBackground();
- drawPreeditMarker();
- drawText();
- drawCursor();
+ drawBackground();
+ drawSelectionBackground();
+ drawPreeditMarker();
+ drawText();
+ drawCursor();
- unbindEmbeddedChars(mGLFont);
+ unbindEmbeddedChars( mGLFont );
//RN: the decision was made to always show the orange border for keyboard focus but do not put an insertion caret
// when in readonly mode
@@ -3346,7 +3291,8 @@ void LLTextEditor::changeLine( S32 delta )
// if remembered position was reset (thus -1), calculate new one here
if( desired_x_pixel == -1 )
{
- desired_x_pixel = mGLFont->getWidth(mWText.c_str(), line_start, offset, mAllowEmbeddedItems );
+ LLWString text(getWText());
+ desired_x_pixel = mGLFont->getWidth(text.c_str(), line_start, offset, mAllowEmbeddedItems );
}
S32 new_line = 0;
@@ -3376,7 +3322,8 @@ void LLTextEditor::changeLine( S32 delta )
S32 new_line_len = new_line_end - new_line_start;
S32 new_offset;
- new_offset = mGLFont->charFromPixelOffset(mWText.c_str(), new_line_start,
+ LLWString text(getWText());
+ new_offset = mGLFont->charFromPixelOffset(text.c_str(), new_line_start,
(F32)desired_x_pixel,
(F32)mTextRect.getWidth(),
new_line_len,
@@ -3424,7 +3371,7 @@ void LLTextEditor::getLineAndColumnForPosition( S32 position, S32* line, S32* co
}
else
{
- const LLWString &text = mWText;
+ LLWString text = getWText();
S32 line_count = 0;
S32 line_start = 0;
S32 i;
@@ -3561,7 +3508,7 @@ void LLTextEditor::autoIndent()
S32 space_count = 0;
S32 i;
- const LLWString &text = mWText;
+ LLWString text = getWText();
while( ' ' == text[line_start] )
{
space_count++;
@@ -3813,17 +3760,18 @@ void LLTextEditor::removeTextFromEnd(S32 num_chars)
S32 LLTextEditor::insertStringNoUndo(const S32 pos, const LLWString &wstr)
{
- S32 old_len = mWText.length(); // length() returns character length
+ LLWString text(getWText());
+ S32 old_len = text.length(); // length() returns character length
S32 insert_len = wstr.length();
- mWText.insert(pos, wstr);
- mTextIsUpToDate = FALSE;
+ text.insert(pos, wstr);
+ getViewModel()->setDisplay(text);
if ( truncate() )
{
// The user's not getting everything he's hoping for
make_ui_sound("UISndBadKeystroke");
- insert_len = mWText.length() - old_len;
+ insert_len = getLength() - old_len;
}
return insert_len;
@@ -3831,19 +3779,21 @@ S32 LLTextEditor::insertStringNoUndo(const S32 pos, const LLWString &wstr)
S32 LLTextEditor::removeStringNoUndo(S32 pos, S32 length)
{
- mWText.erase(pos, length);
- mTextIsUpToDate = FALSE;
+ LLWString text(getWText());
+ text.erase(pos, length);
+ getViewModel()->setDisplay(text);
return -length; // This will be wrong if someone calls removeStringNoUndo with an excessive length
}
S32 LLTextEditor::overwriteCharNoUndo(S32 pos, llwchar wc)
{
- if (pos > (S32)mWText.length())
+ if (pos > (S32)getLength())
{
return 0;
}
- mWText[pos] = wc;
- mTextIsUpToDate = FALSE;
+ LLWString text(getWText());
+ text[pos] = wc;
+ getViewModel()->setDisplay(text);
return 1;
}
@@ -3912,11 +3862,16 @@ BOOL LLTextEditor::tryToRevertToPristineState()
void LLTextEditor::updateTextRect()
{
+ static LLUICachedControl<S32> texteditor_border ("UITextEditorBorder", 0);
+ static LLUICachedControl<S32> texteditor_h_pad ("UITextEditorHPad", 0);
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
+ static LLUICachedControl<S32> texteditor_vpad_top ("UITextEditorVPadTop", 0);
+
mTextRect.setOriginAndSize(
- UI_TEXTEDITOR_BORDER + UI_TEXTEDITOR_H_PAD,
- UI_TEXTEDITOR_BORDER,
- getRect().getWidth() - SCROLLBAR_SIZE - 2 * (UI_TEXTEDITOR_BORDER + UI_TEXTEDITOR_H_PAD),
- getRect().getHeight() - 2 * UI_TEXTEDITOR_BORDER - UI_TEXTEDITOR_V_PAD_TOP );
+ texteditor_border + texteditor_h_pad,
+ texteditor_border,
+ getRect().getWidth() - scrollbar_size - 2 * (texteditor_border + texteditor_h_pad),
+ getRect().getHeight() - 2 * texteditor_border - texteditor_vpad_top );
}
void LLTextEditor::loadKeywords(const std::string& filename,
@@ -3933,7 +3888,7 @@ void LLTextEditor::loadKeywords(const std::string& filename,
mKeywords.addToken(LLKeywordToken::WORD, name, color, tooltips[i] );
}
- mKeywords.findSegments( &mSegments, mWText, mDefaultColor );
+ mKeywords.findSegments( &mSegments, getWText(), mDefaultColor.get() );
llassert( mSegments.front()->getStart() == 0 );
llassert( mSegments.back()->getEnd() == getLength() );
@@ -3945,7 +3900,7 @@ void LLTextEditor::updateSegments()
if (mKeywords.isLoaded())
{
// HACK: No non-ascii keywords for now
- mKeywords.findSegments(&mSegments, mWText, mDefaultColor);
+ mKeywords.findSegments(&mSegments, getWText(), mDefaultColor.get());
}
else if (mAllowEmbeddedItems)
{
@@ -3960,8 +3915,8 @@ void LLTextEditor::updateSegments()
}
if (mSegments.empty())
{
- LLColor4& text_color = ( mReadOnly ? mReadOnlyFgColor : mFgColor );
- LLTextSegment* default_segment = new LLTextSegment( text_color, 0, mWText.length() );
+ LLColor4 text_color = ( mReadOnly ? mReadOnlyFgColor.get() : mFgColor.get() );
+ LLTextSegment* default_segment = new LLTextSegment( text_color, 0, getLength() );
default_segment->setIsDefault(TRUE);
mSegments.push_back(default_segment);
}
@@ -3971,7 +3926,7 @@ void LLTextEditor::updateSegments()
// *NOTE: Using this will invalidate references to mSegments from mLineStartList.
void LLTextEditor::pruneSegments()
{
- S32 len = mWText.length();
+ S32 len = getLength();
// Find and update the first valid segment
segment_list_t::iterator iter = mSegments.end();
while(iter != mSegments.begin())
@@ -4008,7 +3963,7 @@ void LLTextEditor::findEmbeddedItemSegments()
mSegments.clear();
BOOL found_embedded_items = FALSE;
- const LLWString &text = mWText;
+ LLWString text = getWText();
S32 idx = 0;
while( text[idx] )
{
@@ -4029,7 +3984,7 @@ void LLTextEditor::findEmbeddedItemSegments()
BOOL in_text = FALSE;
- LLColor4& text_color = ( mReadOnly ? mReadOnlyFgColor : mFgColor );
+ LLColor4 text_color = ( mReadOnly ? mReadOnlyFgColor.get() : mFgColor.get() );
if( idx > 0 )
{
@@ -4222,7 +4177,7 @@ BOOL LLTextEditor::exportBuffer(std::string &buffer )
outstream << "Linden text version 1\n";
outstream << "{\n";
- outstream << llformat("Text length %d\n", mWText.length() );
+ outstream << llformat("Text length %d\n", getLength() );
outstream << getText();
outstream << "}\n";
@@ -4297,103 +4252,6 @@ void LLTextSegment::dump() const
}
-// virtual
-LLXMLNodePtr LLTextEditor::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- // Attributes
-
- node->createChild("max_length", TRUE)->setIntValue(getMaxLength());
- node->createChild("embedded_items", TRUE)->setBoolValue(mAllowEmbeddedItems);
- node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mGLFont));
- node->createChild("word_wrap", TRUE)->setBoolValue(mWordWrap);
- node->createChild("hide_scrollbar", TRUE)->setBoolValue(mHideScrollbarForShortDocs);
-
- addColorXML(node, mCursorColor, "cursor_color", "TextCursorColor");
- addColorXML(node, mFgColor, "text_color", "TextFgColor");
- addColorXML(node, mDefaultColor, "text_default_color", "TextDefaultColor");
- addColorXML(node, mReadOnlyFgColor, "text_readonly_color", "TextFgReadOnlyColor");
- addColorXML(node, mReadOnlyBgColor, "bg_readonly_color", "TextBgReadOnlyColor");
- addColorXML(node, mWriteableBgColor, "bg_writeable_color", "TextBgWriteableColor");
- addColorXML(node, mFocusBgColor, "bg_focus_color", "TextBgFocusColor");
-
- // Contents
- node->setStringValue(getText());
-
- return node;
-}
-
-// static
-LLView* LLTextEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("text_editor");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- U32 max_text_length = 255;
- node->getAttributeU32("max_length", max_text_length);
-
- BOOL allow_embedded_items;
- node->getAttributeBOOL("embedded_items", allow_embedded_items);
-
- LLFontGL* font = LLView::selectFont(node);
-
- std::string text = node->getTextContents().substr(0, max_text_length - 1);
-
- LLTextEditor* text_editor = new LLTextEditor(name,
- rect,
- max_text_length,
- text,
- font,
- allow_embedded_items);
-
- text_editor->setTextEditorParameters(node);
-
- BOOL hide_scrollbar = FALSE;
- node->getAttributeBOOL("hide_scrollbar",hide_scrollbar);
- text_editor->setHideScrollbarForShortDocs(hide_scrollbar);
-
- text_editor->initFromXML(node, parent);
-
- return text_editor;
-}
-
-void LLTextEditor::setTextEditorParameters(LLXMLNodePtr node)
-{
- BOOL word_wrap = FALSE;
- node->getAttributeBOOL("word_wrap", word_wrap);
- setWordWrap(word_wrap);
-
- node->getAttributeBOOL("show_line_numbers", mShowLineNumbers);
-
- node->getAttributeBOOL("track_bottom", mTrackBottom);
-
- LLColor4 color;
- if (LLUICtrlFactory::getAttributeColor(node,"cursor_color", color))
- {
- setCursorColor(color);
- }
- if(LLUICtrlFactory::getAttributeColor(node,"text_color", color))
- {
- setFgColor(color);
- }
- if(LLUICtrlFactory::getAttributeColor(node,"text_readonly_color", color))
- {
- setReadOnlyFgColor(color);
- }
- if(LLUICtrlFactory::getAttributeColor(node,"bg_readonly_color", color))
- {
- setReadOnlyBgColor(color);
- }
- if(LLUICtrlFactory::getAttributeColor(node,"bg_writeable_color", color))
- {
- setWriteableBgColor(color);
- }
-}
-
///////////////////////////////////////////////////////////////////
// Refactoring note: We may eventually want to replace this with boost::regex or
// boost::tokenizer capabilities since we've already fixed at least two JIRAs
@@ -4559,13 +4417,19 @@ BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end) const
void LLTextEditor::updateAllowingLanguageInput()
{
+ LLWindow* window = getWindow();
+ if (!window)
+ {
+ // test app, no window available
+ return;
+ }
if (hasFocus() && !mReadOnly)
{
- getWindow()->allowLanguageTextInput(this, TRUE);
+ window->allowLanguageTextInput(this, TRUE);
}
else
{
- getWindow()->allowLanguageTextInput(this, FALSE);
+ window->allowLanguageTextInput(this, FALSE);
}
}
@@ -4694,7 +4558,8 @@ BOOL LLTextEditor::getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect
current_line++;
}
- const llwchar * const text = mWText.c_str();
+ const LLWString textString(getWText());
+ const llwchar * const text = textString.c_str();
const S32 line_height = llround(mGLFont->getLineHeight());
if (coord)
@@ -4772,7 +4637,7 @@ void LLTextEditor::markAsPreedit(S32 position, S32 length)
{
llwarns << "markAsPreedit invoked when hasPreeditString is true." << llendl;
}
- mPreeditWString = LLWString( mWText, position, length );
+ mPreeditWString = LLWString( getWText(), position, length );
if (length > 0)
{
mPreeditPositions.resize(2);
@@ -4800,3 +4665,8 @@ S32 LLTextEditor::getPreeditFontSize() const
{
return llround(mGLFont->getLineHeight() * LLUI::sGLScaleFactor.mV[VY]);
}
+
+LLWString LLTextEditor::getWText() const
+{
+ return getViewModel()->getDisplay();
+}
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 9291e1c436..efedb30f47 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -43,18 +43,79 @@
#include "llstyle.h"
#include "lleditmenuhandler.h"
#include "lldarray.h"
+#include "llviewborder.h" // for params
#include "llpreeditor.h"
+#include "llcontrol.h"
class LLFontGL;
class LLScrollbar;
-class LLViewBorder;
class LLKeywordToken;
class LLTextCmd;
class LLUICtrlFactory;
class LLTextEditor : public LLUICtrl, LLEditMenuHandler, protected LLPreeditor
{
+public:
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<std::string> default_text;
+ Optional<S32> max_text_length;
+
+ Optional<bool> read_only,
+ allow_embedded_items,
+ hide_scrollbar,
+ word_wrap,
+ ignore_tab,
+ hide_border,
+ track_bottom,
+ takes_non_scroll_clicks;
+
+ //colors
+ Optional<LLUIColor> cursor_color,
+ default_color,
+ text_color,
+ text_readonly_color,
+ bg_readonly_color,
+ bg_writeable_color,
+ bg_focus_color;
+
+ Optional<LLViewBorder::Params> border;
+
+ Deprecated type,
+ length,
+ is_unicode;
+
+
+ Params()
+ : max_text_length("max_length", 255),
+ read_only("read_only", false),
+ allow_embedded_items("embedded_items", false),
+ hide_scrollbar("hide_scrollbar", false),
+ hide_border("hide_border", false),
+ word_wrap("word_wrap", false),
+ ignore_tab("ignore_tab", true),
+ track_bottom("track_bottom", false),
+ takes_non_scroll_clicks("takes_non_scroll_clicks", true),
+ cursor_color("cursor_color"),
+ default_color("default_color"),
+ text_color("text_color"),
+ text_readonly_color("text_readonly_color"),
+ bg_readonly_color("bg_readonly_color"),
+ bg_writeable_color("bg_writeable_color"),
+ bg_focus_color("bg_focus_color"),
+ length("length"),
+ type("type"),
+ is_unicode("is_unicode")
+ {}
+
+
+ };
+
+ void initFromParams(const Params&);
+protected:
+ LLTextEditor(const Params&);
+ friend class LLUICtrlFactory;
public:
//
// Constants
@@ -63,18 +124,8 @@ public:
static const llwchar LAST_EMBEDDED_CHAR = 0x10ffff;
static const S32 MAX_EMBEDDED_ITEMS = LAST_EMBEDDED_CHAR - FIRST_EMBEDDED_CHAR + 1;
- LLTextEditor(const std::string& name,
- const LLRect& rect,
- S32 max_length,
- const std::string &default_text,
- const LLFontGL* glfont = NULL,
- BOOL allow_embedded_items = FALSE);
-
virtual ~LLTextEditor();
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
- void setTextEditorParameters(LLXMLNodePtr node);
void setParseHTML(BOOL parsing) {mParseHTML=parsing;}
void setParseHighlights(BOOL parsing) {mParseHighlights=parsing;}
@@ -195,8 +246,6 @@ public:
void setReadOnlyBgColor( const LLColor4& c ) { mReadOnlyBgColor = c; }
void setTrackColor( const LLColor4& color );
void setThumbColor( const LLColor4& color );
- void setHighlightColor( const LLColor4& color );
- void setShadowColor( const LLColor4& color );
// Hacky methods to make it into a word-wrapping, potentially scrolling,
// read-only text box.
@@ -235,9 +284,8 @@ public:
// new methods
void setValue(const LLSD& value);
- LLSD getValue() const;
- const std::string& getText() const;
+ std::string getText() const;
// Non-undoable
void setText(const LLStringExplicit &utf8str);
@@ -255,9 +303,9 @@ public:
BOOL isScrolledToBottom();
// Getters
- const LLWString& getWText() const { return mWText; }
- llwchar getWChar(S32 pos) const { return mWText[pos]; }
- LLWString getWSubString(S32 pos, S32 len) const { return mWText.substr(pos, len); }
+ LLWString getWText() const;
+ llwchar getWChar(S32 pos) const { return getWText()[pos]; }
+ LLWString getWSubString(S32 pos, S32 len) const { return getWText().substr(pos, len); }
const LLTextSegment* getCurrentSegment() const { return getSegmentAtOffset(mCursorPos); }
const LLTextSegment* getPreviousSegment() const;
@@ -270,7 +318,7 @@ protected:
// Methods
//
- S32 getLength() const { return mWText.length(); }
+ S32 getLength() const { return getWText().length(); }
void getSegmentAndOffset( S32 startpos, S32* segidxp, S32* offsetp ) const;
void drawPreeditMarker();
@@ -439,8 +487,10 @@ private:
//
// Methods
//
- void pasteHelper(bool is_primary);
+ void pasteHelper(bool is_primary);
+ virtual LLTextViewModel* getViewModel() const;
+
void updateSegments();
void pruneSegments();
@@ -473,13 +523,10 @@ private:
class LLTextCmdOverwriteChar;
class LLTextCmdRemove;
- LLWString mWText;
- mutable std::string mUTF8Text;
- mutable BOOL mTextIsUpToDate;
-
S32 mMaxTextByteLength; // Maximum length mText is allowed to be in bytes
const LLFontGL* mGLFont;
+ U8 mGLFontStyle; // the font style from xml
class LLViewBorder* mBorder;
@@ -519,14 +566,13 @@ private:
LLFrameTimer mKeystrokeTimer;
- LLColor4 mCursorColor;
-
- LLColor4 mFgColor;
- LLColor4 mDefaultColor;
- LLColor4 mReadOnlyFgColor;
- LLColor4 mWriteableBgColor;
- LLColor4 mReadOnlyBgColor;
- LLColor4 mFocusBgColor;
+ LLUIColor mCursorColor;
+ LLUIColor mFgColor;
+ LLUIColor mDefaultColor;
+ LLUIColor mReadOnlyFgColor;
+ LLUIColor mWriteableBgColor;
+ LLUIColor mReadOnlyBgColor;
+ LLUIColor mFocusBgColor;
BOOL mReadOnly;
BOOL mWordWrap;
diff --git a/indra/llui/lltextparser.cpp b/indra/llui/lltextparser.cpp
index 227d24a865..707dd0afdd 100644
--- a/indra/llui/lltextparser.cpp
+++ b/indra/llui/lltextparser.cpp
@@ -1,10 +1,9 @@
/**
- * @file lltexteditor.cpp
- * @brief LLTextEditor base class
+ * @file lltextparser.cpp
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
- * Copyright (c) 2001-2007, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +11,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
@@ -31,6 +31,8 @@
#include "linden_common.h"
+#include "lltextparser.h"
+
#include "llsd.h"
#include "llsdserialize.h"
#include "llerror.h"
@@ -39,22 +41,12 @@
#include "message.h"
#include "llmath.h"
#include "v4color.h"
-#include "audioengine.h"
-#include "llwindow.h"
#include "lldir.h"
-#include "lltextparser.h"
-//#include "lltexttospeech.h"
-
// Routines used for parsing text for TextParsers and html
LLTextParser* LLTextParser::sInstance = NULL;
-//
-// Constants
-//
-const F32 SOUND_GAIN = 1.0f;
-
//
// Member Functions
//
@@ -75,38 +67,7 @@ LLTextParser* LLTextParser::getInstance()
return sInstance;
}
-void LLTextParser::triggerAlerts(LLUUID agent_id, LLVector3d position, std::string text, LLWindow* viewer_window)
-{
-// bool spoken=FALSE;
- for (S32 i=0;i<mHighlights.size();i++)
- {
- if (findPattern(text,mHighlights[i]) >= 0 )
- {
- if(gAudiop)
- {
- if ((std::string)mHighlights[i]["sound_lluuid"] != LLUUID::null.asString())
- {
- gAudiop->triggerSound(mHighlights[i]["sound_lluuid"].asUUID(), agent_id, SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_UI, position);
- }
-/*
- if (!spoken)
- {
- LLTextToSpeech* text_to_speech = NULL;
- text_to_speech = LLTextToSpeech::getInstance();
- spoken = text_to_speech->speak((LLString)mHighlights[i]["voice"],text);
- }
- */
- }
- if (mHighlights[i]["flash"])
- {
- if (viewer_window && viewer_window->getMinimized())
- {
- viewer_window->flashIcon(5.f);
- }
- }
- }
- }
-}
+// Moved triggerAlerts() to llfloaterchat.cpp to break llui/llaudio library dependency.
S32 LLTextParser::findPattern(const std::string &text, LLSD highlight)
{
diff --git a/indra/llui/lltextparser.h b/indra/llui/lltextparser.h
index 5c5c3f3301..fb1a7758b7 100644
--- a/indra/llui/lltextparser.h
+++ b/indra/llui/lltextparser.h
@@ -3,6 +3,30 @@
* @brief GUI for user-defined highlights
*
* $LicenseInfo:firstyear=2002&license=viewergpl$
+ *
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*
*/
@@ -10,12 +34,10 @@
#ifndef LL_LLTEXTPARSER_H
#define LL_LLTEXTPARSER_H
-#include <vector>
-#include "linden_common.h"
-
#include "lltextparser.h"
-class LLSD;
+#include "llsd.h"
+
class LLUUID;
class LLVector3d;
class LLColor4;
@@ -35,13 +57,13 @@ public:
S32 findPattern(const std::string &text, LLSD highlight);
LLSD parsePartialLineHighlights(const std::string &text,const LLColor4 &color,S32 part=WHOLE, S32 index=0);
bool parseFullLineHighlights(const std::string &text, LLColor4 *color);
- void triggerAlerts(LLUUID agent_id, LLVector3d position, std::string text, LLWindow* viewer_window);
std::string getFileName();
LLSD loadFromDisk();
bool saveToDisk(LLSD highlights);
+
public:
- LLSD mHighlights;
+ LLSD mHighlights;
private:
static LLTextParser* sInstance;
};
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 57ce13c9c6..dfe435d2e3 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -52,8 +52,15 @@
#include "llui.h"
#include "llview.h"
#include "lllineeditor.h"
+#include "llfloater.h"
+#include "llfloaterreg.h"
+#include "llmenugl.h"
#include "llwindow.h"
+// for XUIParse
+#include "llquaternion.h"
+#include <boost/tokenizer.hpp>
+
//
// Globals
//
@@ -65,18 +72,18 @@ BOOL gShowTextEditCursor = TRUE;
// Language for UI construction
std::map<std::string, std::string> gTranslation;
std::list<std::string> gUntranslated;
+/*static*/ LLUI::settings_map_t LLUI::sSettingGroups;
+/*static*/ LLImageProviderInterface* LLUI::sImageProvider = NULL;
+/*static*/ LLUIAudioCallback LLUI::sAudioCallback = NULL;
+/*static*/ LLVector2 LLUI::sGLScaleFactor(1.f, 1.f);
+/*static*/ LLWindow* LLUI::sWindow = NULL;
+/*static*/ LLHtmlHelp* LLUI::sHtmlHelp = NULL;
+/*static*/ LLView* LLUI::sRootView = NULL;
+/*static*/ BOOL LLUI::sShowXUINames = FALSE;
+/*static*/ std::stack<LLRect> LLScreenClipRect::sClipRectStack;
+
+/*static*/ std::vector<std::string> LLUI::sXUIPaths;
-LLControlGroup* LLUI::sConfigGroup = NULL;
-LLControlGroup* LLUI::sIgnoresGroup = NULL;
-LLControlGroup* LLUI::sColorsGroup = NULL;
-LLImageProviderInterface* LLUI::sImageProvider = NULL;
-LLUIAudioCallback LLUI::sAudioCallback = NULL;
-LLVector2 LLUI::sGLScaleFactor(1.f, 1.f);
-LLWindow* LLUI::sWindow = NULL;
-LLHtmlHelp* LLUI::sHtmlHelp = NULL;
-BOOL LLUI::sShowXUINames = FALSE;
-std::stack<LLRect> LLScreenClipRect::sClipRectStack;
-BOOL LLUI::sQAMode = FALSE;
//
// Functions
@@ -84,18 +91,18 @@ BOOL LLUI::sQAMode = FALSE;
void make_ui_sound(const char* namep)
{
std::string name = ll_safe_string(namep);
- if (!LLUI::sConfigGroup->controlExists(name))
+ if (!LLUI::sSettingGroups["config"]->controlExists(name))
{
llwarns << "tried to make ui sound for unknown sound name: " << name << llendl;
}
else
{
- LLUUID uuid(LLUI::sConfigGroup->getString(name));
+ LLUUID uuid(LLUI::sSettingGroups["config"]->getString(name));
if (uuid.isNull())
{
- if (LLUI::sConfigGroup->getString(name) == LLUUID::null.asString())
+ if (LLUI::sSettingGroups["config"]->getString(name) == LLUUID::null.asString())
{
- if (LLUI::sConfigGroup->getBOOL("UISndDebugSpamToggle"))
+ if (LLUI::sSettingGroups["config"]->getBOOL("UISndDebugSpamToggle"))
{
llinfos << "ui sound name: " << name << " triggered but silent (null uuid)" << llendl;
}
@@ -108,7 +115,7 @@ void make_ui_sound(const char* namep)
}
else if (LLUI::sAudioCallback != NULL)
{
- if (LLUI::sConfigGroup->getBOOL("UISndDebugSpamToggle"))
+ if (LLUI::sSettingGroups["config"]->getBOOL("UISndDebugSpamToggle"))
{
llinfos << "ui sound name: " << name << llendl;
}
@@ -1554,21 +1561,18 @@ bool handleShowXUINamesChanged(const LLSD& newvalue)
return true;
}
-void LLUI::initClass(LLControlGroup* config,
- LLControlGroup* ignores,
- LLControlGroup* colors,
+void LLUI::initClass(const settings_map_t& settings,
LLImageProviderInterface* image_provider,
LLUIAudioCallback audio_callback,
const LLVector2* scale_factor,
const std::string& language)
{
- sConfigGroup = config;
- sIgnoresGroup = ignores;
- sColorsGroup = colors;
+ sSettingGroups = settings;
- if (sConfigGroup == NULL
- || sIgnoresGroup == NULL
- || sColorsGroup == NULL)
+ if ((get_ptr_in_map(sSettingGroups, std::string("config")) == NULL) ||
+ (get_ptr_in_map(sSettingGroups, std::string("color")) == NULL) ||
+ (get_ptr_in_map(sSettingGroups, std::string("floater")) == NULL) ||
+ (get_ptr_in_map(sSettingGroups, std::string("ignores")) == NULL))
{
llerrs << "Failure to initialize configuration groups" << llendl;
}
@@ -1577,16 +1581,31 @@ void LLUI::initClass(LLControlGroup* config,
sAudioCallback = audio_callback;
sGLScaleFactor = (scale_factor == NULL) ? LLVector2(1.f, 1.f) : *scale_factor;
sWindow = NULL; // set later in startup
- LLFontGL::sShadowColor = colors->getColor("ColorDropShadow");
+ LLFontGL::sShadowColor = LLUI::sSettingGroups["color"]->getColor("ColorDropShadow");
- LLUI::sShowXUINames = LLUI::sConfigGroup->getBOOL("ShowXUINames");
- LLUI::sConfigGroup->getControl("ShowXUINames")->getSignal()->connect(&handleShowXUINamesChanged);
+ static LLUICachedControl<bool> show_xui_names ("ShowXUINames", false);
+ LLUI::sShowXUINames = show_xui_names;
+ LLUI::sSettingGroups["config"]->getControl("ShowXUINames")->getSignal()->connect(boost::bind(&handleShowXUINamesChanged, _2));
+
+ // Callbacks for associating controls with floater visibilty:
+ LLUICtrl::CommitCallbackRegistry::defaultRegistrar().add("Floater.Toggle", boost::bind(&LLFloaterReg::toggleFloaterInstance, _2));
+ LLUICtrl::CommitCallbackRegistry::defaultRegistrar().add("Floater.Show", boost::bind(&LLFloaterReg::showFloaterInstance, _2));
+ LLUICtrl::CommitCallbackRegistry::defaultRegistrar().add("Floater.Hide", boost::bind(&LLFloaterReg::hideFloaterInstance, _2));
+ LLUICtrl::CommitCallbackRegistry::defaultRegistrar().add("Floater.InitToVisibilityControl", boost::bind(&LLFloaterReg::initUICtrlToFloaterVisibilityControl, _1, _2));
+
+ // Button initialization callback for toggle buttons
+ LLUICtrl::CommitCallbackRegistry::defaultRegistrar().add("Button.SetFloaterToggle", boost::bind(&LLButton::setFloaterToggle, _1, _2));
+
+ // Currently unused, but kept for reference:
+ LLUICtrl::CommitCallbackRegistry::defaultRegistrar().add("Button.ToggleFloater", boost::bind(&LLButton::toggleFloaterAndSetToggleState, _1, _2));
+
+ // Used by menus along with Floater.Toggle to display visibility as a checkmark
+ LLUICtrl::EnableCallbackRegistry::defaultRegistrar().add("Floater.Visible", boost::bind(&LLFloaterReg::floaterInstanceVisible, _2));
}
void LLUI::cleanupClass()
{
sImageProvider->cleanUp();
- LLLineEditor::cleanupLineEditor();
}
@@ -1679,16 +1698,16 @@ void LLUI::getCursorPositionLocal(const LLView* viewp, S32 *x, S32 *y)
std::string LLUI::getLanguage()
{
std::string language = "en-us";
- if (sConfigGroup)
+ if (sSettingGroups["config"])
{
- language = sConfigGroup->getString("Language");
+ language = sSettingGroups["config"]->getString("Language");
if (language.empty() || language == "default")
{
- language = sConfigGroup->getString("InstallLanguage");
+ language = sSettingGroups["config"]->getString("InstallLanguage");
}
if (language.empty() || language == "default")
{
- language = sConfigGroup->getString("SystemLanguage");
+ language = sSettingGroups["config"]->getString("SystemLanguage");
}
if (language.empty() || language == "default")
{
@@ -1698,6 +1717,40 @@ std::string LLUI::getLanguage()
return language;
}
+//static
+void LLUI::setupPaths()
+{
+ std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "paths.xml");
+
+ LLXMLNodePtr root;
+ BOOL success = LLXMLNode::parseFile(filename, root, NULL);
+ sXUIPaths.clear();
+
+ if (success)
+ {
+ LLStringUtil::format_map_t path_args;
+ path_args["[LANGUAGE]"] = LLUI::getLanguage();
+
+ for (LLXMLNodePtr path = root->getFirstChild(); path.notNull(); path = path->getNextSibling())
+ {
+ std::string path_val_ui(path->getValue());
+ LLStringUtil::format(path_val_ui, path_args);
+ if (std::find(sXUIPaths.begin(), sXUIPaths.end(), path_val_ui) == sXUIPaths.end())
+ {
+ sXUIPaths.push_back(path_val_ui);
+ }
+ }
+ }
+ else // parsing failed
+ {
+ std::string slash = gDirUtilp->getDirDelimiter();
+ std::string dir = "xui" + slash + "en-us";
+ llwarns << "XUI::config file unable to open: " << filename << llendl;
+ sXUIPaths.push_back(dir);
+ }
+}
+
+
//static
std::string LLUI::locateSkin(const std::string& filename)
{
@@ -1707,7 +1760,7 @@ std::string LLUI::locateSkin(const std::string& filename)
{
found_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, filename); // Should be CUSTOM_SKINS?
}
- if (sConfigGroup && sConfigGroup->controlExists("Language"))
+ if (sSettingGroups["config"] && sSettingGroups["config"]->controlExists("Language"))
{
if (!gDirUtilp->fileExists(found_file))
{
@@ -1765,10 +1818,23 @@ void LLUI::glRectToScreen(const LLRect& gl, LLRect *screen)
glPointToScreen(gl.mRight, gl.mBottom, &screen->mRight, &screen->mBottom);
}
+//static
+LLPointer<LLUIImage> LLUI::getUIImageByID(const LLUUID& image_id)
+{
+ if (sImageProvider)
+ {
+ return sImageProvider->getUIImageByID(image_id);
+ }
+ else
+ {
+ return NULL;
+ }
+}
+
//static
-LLUIImage* LLUI::getUIImage(const std::string& name)
+LLPointer<LLUIImage> LLUI::getUIImage(const std::string& name)
{
- if (!name.empty())
+ if (!name.empty() && sImageProvider)
return sImageProvider->getUIImage(name);
else
return NULL;
@@ -1780,10 +1846,23 @@ void LLUI::setHtmlHelp(LLHtmlHelp* html_help)
LLUI::sHtmlHelp = html_help;
}
-//static
-void LLUI::setQAMode(BOOL b)
+// static
+boost::function<const LLColor4&()> LLUI::getCachedColorFunctor(const std::string& color_name)
+{
+ return LLCachedControl<LLColor4>(*sSettingGroups["color"], color_name, LLColor4::magenta);
+}
+
+// static
+LLControlGroup& LLUI::getControlControlGroup (const std::string& controlname)
{
- LLUI::sQAMode = b;
+ for (settings_map_t::iterator itor = sSettingGroups.begin();
+ itor != sSettingGroups.end(); ++itor)
+ {
+ if (sSettingGroups[(itor->first)]->controlExists(controlname))
+ return *sSettingGroups[(itor->first)];
+ }
+
+ return *sSettingGroups["config"]; // default group
}
LLScreenClipRect::LLScreenClipRect(const LLRect& rect, BOOL enabled) : mScissorState(GL_SCISSOR_TEST), mEnabled(enabled)
@@ -1849,102 +1928,163 @@ LLLocalClipRect::LLLocalClipRect(const LLRect &rect, BOOL enabled)
{
}
-
-//
-// LLUIImage
-//
-
-LLUIImage::LLUIImage(const std::string& name, LLPointer<LLImageGL> image) :
- mName(name),
- mImage(image),
- mScaleRegion(0.f, 1.f, 1.f, 0.f),
- mClipRegion(0.f, 1.f, 1.f, 0.f),
- mUniformScaling(TRUE),
- mNoClip(TRUE)
+namespace LLInitParam
{
-}
+ TypedParam<LLUIColor >::TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLUIColor& value, ParamDescriptor::validation_func_t func)
+ : super_t(descriptor, name, value, func),
+ red("red"),
+ green("green"),
+ blue("blue"),
+ alpha("alpha"),
+ control("")
+ {}
-void LLUIImage::setClipRegion(const LLRectf& region)
-{
- mClipRegion = region;
- mNoClip = mClipRegion.mLeft == 0.f
- && mClipRegion.mRight == 1.f
- && mClipRegion.mBottom == 0.f
- && mClipRegion.mTop == 1.f;
-}
+ LLUIColor TypedParam<LLUIColor>::getValueFromBlock() const
+ {
+ if (control.isProvided())
+ {
+ return LLUI::getCachedColorFunctor(control);
+ }
+ else
+ {
+ return LLColor4(red, green, blue, alpha);
+ }
+ }
-void LLUIImage::setScaleRegion(const LLRectf& region)
-{
- mScaleRegion = region;
- mUniformScaling = mScaleRegion.mLeft == 0.f
- && mScaleRegion.mRight == 1.f
- && mScaleRegion.mBottom == 0.f
- && mScaleRegion.mTop == 1.f;
-}
+ void TypeValues<LLUIColor>::declareValues()
+ {
+ declare("white", LLColor4::white);
+ declare("black", LLColor4::black);
+ declare("red", LLColor4::red);
+ declare("green", LLColor4::green);
+ declare("blue", LLColor4::blue);
+ }
-//TODO: move drawing implementation inside class
-void LLUIImage::draw(S32 x, S32 y, const LLColor4& color) const
-{
- gl_draw_image(x, y, mImage, color, mClipRegion);
-}
+ TypedParam<const LLFontGL*>::TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLFontGL*const value, ParamDescriptor::validation_func_t func)
+ : super_t(descriptor, name, value, func),
+ name("", std::string("")),
+ size("size", std::string("")),
+ style("style", std::string(""))
+ {}
-void LLUIImage::draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const
-{
- if (mUniformScaling)
+ const LLFontGL* TypedParam<const LLFontGL*>::getValueFromBlock() const
{
- gl_draw_scaled_image(x, y, width, height, mImage, color, mClipRegion);
+ if (name.isProvided())
+ {
+ const LLFontGL* res_fontp = LLFontGL::getFontByName(name);
+ if (res_fontp)
+ {
+ return res_fontp;
+ }
+
+ U8 fontstyle = 0;
+ fontstyle = LLFontGL::getStyleFromString(style());
+ LLFontDescriptor desc(name(), size(), fontstyle);
+ const LLFontGL* fontp = LLFontGL::getFont(desc);
+ if (fontp)
+ {
+ return fontp;
+ }
+ }
+
+ // default to current value
+ return mData.mValue;
}
- else
+
+ TypedParam<LLRect>::TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLRect& value, ParamDescriptor::validation_func_t func)
+ : super_t(descriptor, name, value, func),
+ left("left"),
+ top("top"),
+ right("right"),
+ bottom("bottom"),
+ width("width"),
+ height("height")
+ {}
+
+ LLRect TypedParam<LLRect>::getValueFromBlock() const
{
- gl_draw_scaled_image_with_border(
- x, y,
- width, height,
- mImage,
- color,
- FALSE,
- mClipRegion,
- mScaleRegion);
- }
-}
+ LLRect rect;
-void LLUIImage::drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const
-{
- gl_draw_scaled_image_with_border(
- x, y,
- width, height,
- mImage,
- color,
- TRUE,
- mClipRegion,
- mScaleRegion);
-}
+ //calculate from params
+ // prefer explicit left and right
+ if (left.isProvided() && right.isProvided())
+ {
+ rect.mLeft = left;
+ rect.mRight = right;
+ }
+ // otherwise use width along with specified side, if any
+ else if (width.isProvided())
+ {
+ // only right + width provided
+ if (right.isProvided())
+ {
+ rect.mRight = right;
+ rect.mLeft = right - width;
+ }
+ else // left + width, or just width
+ {
+ rect.mLeft = left;
+ rect.mRight = left + width;
+ }
+ }
+ // just left, just right, or none
+ else
+ {
+ rect.mLeft = left;
+ rect.mRight = right;
+ }
-void LLUIImage::drawBorder(S32 x, S32 y, S32 width, S32 height, const LLColor4& color, S32 border_width) const
-{
- LLRect border_rect;
- border_rect.setOriginAndSize(x, y, width, height);
- border_rect.stretch(border_width, border_width);
- drawSolid(border_rect, color);
-}
+ // prefer explicit bottom and top
+ if (bottom.isProvided() && top.isProvided())
+ {
+ rect.mBottom = bottom;
+ rect.mTop = top;
+ }
+ // otherwise height along with specified side, if any
+ else if (height.isProvided())
+ {
+ // top + height provided
+ if (top.isProvided())
+ {
+ rect.mTop = top;
+ rect.mBottom = top - height;
+ }
+ // bottom + height or just height
+ else
+ {
+ rect.mBottom = bottom;
+ rect.mTop = bottom + height;
+ }
+ }
+ // just bottom, just top, or none
+ else
+ {
+ rect.mBottom = bottom;
+ rect.mTop = top;
+ }
+ return rect;
+ }
-S32 LLUIImage::getWidth() const
-{
- // return clipped dimensions of actual image area
- return llround((F32)mImage->getWidth(0) * mClipRegion.getWidth());
-}
+ void TypeValues<LLFontGL::HAlign>::declareValues()
+ {
+ declare("left", LLFontGL::LEFT);
+ declare("right", LLFontGL::RIGHT);
+ declare("center", LLFontGL::HCENTER);
+ }
-S32 LLUIImage::getHeight() const
-{
- // return clipped dimensions of actual image area
- return llround((F32)mImage->getHeight(0) * mClipRegion.getHeight());
-}
+ void TypeValues<LLFontGL::VAlign>::declareValues()
+ {
+ declare("top", LLFontGL::TOP);
+ declare("center", LLFontGL::VCENTER);
+ declare("baseline", LLFontGL::BASELINE);
+ declare("bottom", LLFontGL::BOTTOM);
+ }
-S32 LLUIImage::getTextureWidth() const
-{
- return mImage->getWidth(0);
+ void TypeValues<LLFontGL::ShadowType>::declareValues()
+ {
+ declare("none", LLFontGL::NO_SHADOW);
+ declare("hard", LLFontGL::DROP_SHADOW);
+ declare("soft", LLFontGL::DROP_SHADOW_SOFT);
+ }
}
-S32 LLUIImage::getTextureHeight() const
-{
- return mImage->getHeight(0);
-}
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index ebcc7304b1..b5a42bce13 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -35,28 +35,34 @@
#ifndef LL_LLUI_H
#define LL_LLUI_H
+#include "llpointer.h" // LLPointer<>
#include "llrect.h"
#include "llcontrol.h"
-#include "llrect.h"
#include "llcoord.h"
//#include "llhtmlhelp.h"
#include "llgl.h" // *TODO: break this dependency
#include <stack>
-//#include "llimagegl.h"
+#include "lluiimage.h" // *TODO: break this dependency, need to add #include "lluiimage.h" to all widgets that hold an Optional<LLUIImage*> in their paramblocks
+#include "llinitparam.h"
+#include "llregistry.h"
#include <boost/signal.hpp>
+#include "lllazyvalue.h"
// LLUIFactory
#include "llsd.h"
+// for initparam specialization
+#include "llfontgl.h"
+
class LLColor4;
class LLHtmlHelp;
class LLImageGL;
class LLVector3;
class LLVector2;
+class LLUIImage;
class LLUUID;
class LLWindow;
class LLView;
-class LLUIImage;
// UI colors
extern const LLColor4 UI_VERTEX_COLOR;
@@ -157,9 +163,8 @@ public:
//
// Methods
//
- static void initClass(LLControlGroup* config,
- LLControlGroup* ignores,
- LLControlGroup* colors,
+ typedef std::map<std::string, LLControlGroup*> settings_map_t;
+ static void initClass(const settings_map_t& settings,
LLImageProviderInterface* image_provider,
LLUIAudioCallback audio_callback = NULL,
const LLVector2 *scale_factor = NULL,
@@ -174,41 +179,45 @@ public:
// Return the ISO639 language name ("en", "ko", etc.) for the viewer UI.
// http://www.loc.gov/standards/iso639-2/php/code_list.php
static std::string getLanguage();
-
+
+ static void setupPaths();
+ static const std::vector<std::string>& getXUIPaths() { return sXUIPaths; }
+ static std::string getSkinPath() { return sXUIPaths.front(); }
+
//helper functions (should probably move free standing rendering helper functions here)
+ static LLView* getRootView() { return sRootView; }
+ static void setRootView(LLView* view) { sRootView = view; }
static std::string locateSkin(const std::string& filename);
static void setCursorPositionScreen(S32 x, S32 y);
static void setCursorPositionLocal(const LLView* viewp, S32 x, S32 y);
static void getCursorPositionLocal(const LLView* viewp, S32 *x, S32 *y);
static void setScaleFactor(const LLVector2& scale_factor);
static void setLineWidth(F32 width);
- static LLUIImage* getUIImage(const std::string& name);
+ static LLPointer<LLUIImage> getUIImageByID(const LLUUID& image_id);
+ static LLPointer<LLUIImage> getUIImage(const std::string& name);
static LLVector2 getWindowSize();
static void screenPointToGL(S32 screen_x, S32 screen_y, S32 *gl_x, S32 *gl_y);
static void glPointToScreen(S32 gl_x, S32 gl_y, S32 *screen_x, S32 *screen_y);
static void screenRectToGL(const LLRect& screen, LLRect *gl);
static void glRectToScreen(const LLRect& gl, LLRect *screen);
static void setHtmlHelp(LLHtmlHelp* html_help);
-
+ static boost::function<const LLColor4&()> getCachedColorFunctor(const std::string& color_name);
+ // Returns the control group containing the control name, or the default group
+ static LLControlGroup& getControlControlGroup (const std::string& controlname);
+
//
// Data
//
- static LLControlGroup* sConfigGroup;
- static LLControlGroup* sIgnoresGroup;
- static LLControlGroup* sColorsGroup;
- static LLImageProviderInterface* sImageProvider;
+ static settings_map_t sSettingGroups;
static LLUIAudioCallback sAudioCallback;
static LLVector2 sGLScaleFactor;
static LLWindow* sWindow;
static BOOL sShowXUINames;
static LLHtmlHelp* sHtmlHelp;
-
- // *TODO: remove the following when QAR-369 settings clean-up work is in.
- // Also remove the call to this method which will then be obsolete.
- // Search for QAR-369 below to enable the proper accessing of this feature. -MG
- static void setQAMode(BOOL b);
- static BOOL sQAMode;
-
+ static LLView* sRootView;
+private:
+ static LLImageProviderInterface* sImageProvider;
+ static std::vector<std::string> sXUIPaths;
};
// FactoryPolicy is a static class that controls the creation and lookup of UI elements,
@@ -365,7 +374,6 @@ protected:
// T must derive from LLUISingleton<T>
LLUISingleton() { sInstance = static_cast<T*>(this); }
-
~LLUISingleton() { sInstance = NULL; }
public:
@@ -383,6 +391,12 @@ public:
return sInstance;
}
+ static void destroyInstance()
+ {
+ delete sInstance;
+ sInstance = NULL;
+ }
+
private:
static T* sInstance;
};
@@ -413,49 +427,6 @@ public:
LLLocalClipRect(const LLRect& rect, BOOL enabled = TRUE);
};
-class LLUIImage : public LLRefCount
-{
-public:
- LLUIImage(const std::string& name, LLPointer<LLImageGL> image);
-
- void setClipRegion(const LLRectf& region);
- void setScaleRegion(const LLRectf& region);
-
- LLPointer<LLImageGL> getImage() { return mImage; }
- const LLPointer<LLImageGL>& getImage() const { return mImage; }
-
- void draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color = UI_VERTEX_COLOR) const;
- void draw(S32 x, S32 y, const LLColor4& color = UI_VERTEX_COLOR) const;
- void draw(const LLRect& rect, const LLColor4& color = UI_VERTEX_COLOR) const { draw(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color); }
-
- void drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const;
- void drawSolid(const LLRect& rect, const LLColor4& color) const { drawSolid(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color); }
- void drawSolid(S32 x, S32 y, const LLColor4& color) const { drawSolid(x, y, mImage->getWidth(0), mImage->getHeight(0), color); }
-
- void drawBorder(S32 x, S32 y, S32 width, S32 height, const LLColor4& color, S32 border_width) const;
- void drawBorder(const LLRect& rect, const LLColor4& color, S32 border_width) const { drawBorder(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color, border_width); }
- void drawBorder(S32 x, S32 y, const LLColor4& color, S32 border_width) const { drawBorder(x, y, mImage->getWidth(0), mImage->getHeight(0), color, border_width); }
-
- const std::string& getName() const { return mName; }
-
- S32 getWidth() const;
- S32 getHeight() const;
-
- // returns dimensions of underlying textures, which might not be equal to ui image portion
- S32 getTextureWidth() const;
- S32 getTextureHeight() const;
-
-protected:
- std::string mName;
- LLRectf mScaleRegion;
- LLRectf mClipRegion;
- LLPointer<LLImageGL> mImage;
- BOOL mUniformScaling;
- BOOL mNoClip;
-};
-
-typedef LLPointer<LLUIImage> LLUIImagePtr;
-
template <typename T>
class LLTombStone : public LLRefCount
{
@@ -593,71 +564,15 @@ private:
//RN: maybe this needs to moved elsewhere?
class LLImageProviderInterface
{
-public:
+protected:
LLImageProviderInterface() {};
virtual ~LLImageProviderInterface() {};
-
- virtual LLUIImagePtr getUIImage(const std::string& name) = 0;
- virtual LLUIImagePtr getUIImageByID(const LLUUID& id) = 0;
- virtual void cleanUp() = 0;
-};
-
-// This mix-in class adds support for tracking all instances of the specificed class parameter T
-// The (optional) key associates a value of type KEY with a given instance of T, for quick lookup
-// If KEY is not provided, then instances are stored in a simple list
-template<typename T, typename KEY = T*>
-class LLInstanceTracker : boost::noncopyable
-{
public:
- typedef typename std::map<KEY, T*>::iterator instance_iter;
- typedef typename std::map<KEY, T*>::const_iterator instance_const_iter;
-
- static T* getInstance(KEY k) { instance_iter found = sInstances.find(k); return (found == sInstances.end()) ? NULL : found->second; }
-
- static instance_iter beginInstances() { return sInstances.begin(); }
- static instance_iter endInstances() { return sInstances.end(); }
- static S32 instanceCount() { return sInstances.size(); }
-protected:
- LLInstanceTracker(KEY key) { add(key); }
- virtual ~LLInstanceTracker() { remove(); }
- virtual void setKey(KEY key) { remove(); add(key); }
- virtual const KEY& getKey() const { return mKey; }
-
-private:
- void add(KEY key)
- {
- mKey = key;
- sInstances[key] = static_cast<T*>(this);
- }
- void remove() { sInstances.erase(mKey); }
-
-private:
-
- KEY mKey;
- static std::map<KEY, T*> sInstances;
-};
-
-template<typename T>
-class LLInstanceTracker<T, T*> : boost::noncopyable
-{
-public:
- typedef typename std::set<T*>::iterator instance_iter;
- typedef typename std::set<T*>::const_iterator instance_const_iter;
-
- static instance_iter instancesBegin() { return sInstances.begin(); }
- static instance_iter instancesEnd() { return sInstances.end(); }
- static S32 instanceCount() { return sInstances.size(); }
-
-protected:
- LLInstanceTracker() { sInstances.insert(static_cast<T*>(this)); }
- virtual ~LLInstanceTracker() { sInstances.erase(static_cast<T*>(this)); }
-
- static std::set<T*> sInstances;
+ virtual LLPointer<LLUIImage> getUIImage(const std::string& name) = 0;
+ virtual LLPointer<LLUIImage> getUIImageByID(const LLUUID& id) = 0;
+ virtual void cleanUp() = 0;
};
-template <typename T, typename KEY> std::map<KEY, T*> LLInstanceTracker<T, KEY>::sInstances;
-template <typename T> std::set<T*> LLInstanceTracker<T, T*>::sInstances;
-
class LLCallbackRegistry
{
public:
@@ -746,93 +661,116 @@ private:
template <typename T> LLRegisterWith<LLInitClassList> LLInitClass<T>::sRegister(&T::initClass);
template <typename T> LLRegisterWith<LLDestroyClassList> LLDestroyClass<T>::sRegister(&T::destroyClass);
+// useful parameter blocks
+struct TimeIntervalParam : public LLInitParam::Choice<TimeIntervalParam>
+{
+ Option<F32> seconds;
+ Option<S32> frames;
+ TimeIntervalParam()
+ : seconds("seconds"),
+ frames("frames")
+ {}
+};
-template <typename DERIVED>
-class LLParamBlock
+template <class T>
+class LLUICachedControl : public LLCachedControl<T>
{
-protected:
- LLParamBlock() { sBlock = (DERIVED*)this; }
+public:
+ // This constructor will declare a control if it doesn't exist in the contol group
+ LLUICachedControl(const std::string& name,
+ const T& default_value,
+ const std::string& comment = "Declared In Code")
+ : LLCachedControl<T>(LLUI::getControlControlGroup(name), name, default_value, comment)
+ {}
+
+ // This constructor will signal an error if the control doesn't exist in the control group
+ LLUICachedControl(const std::string& name)
+ : LLCachedControl<T>(LLUI::getControlControlGroup(name), name)
+ {}
+};
- typedef typename boost::add_const<DERIVED>::type Tconst;
+typedef LLLazyValue<LLColor4> LLUIColor;
- template <typename T>
- class LLMandatoryParam
+namespace LLInitParam
+{
+ template<>
+ class TypedParam<LLRect>
+ : public BlockValue<LLRect>
{
+ typedef BlockValue<LLRect> super_t;
public:
- typedef typename boost::add_const<T>::type T_const;
+ Optional<S32> left,
+ top,
+ right,
+ bottom,
+ width,
+ height;
- LLMandatoryParam(T_const initial_val) : mVal(initial_val), mBlock(sBlock) {}
- LLMandatoryParam(const LLMandatoryParam<T>& other) : mVal(other.mVal) {}
+ TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLRect& value, ParamDescriptor::validation_func_t func);
- DERIVED& operator ()(T_const set_value) { mVal = set_value; return *mBlock; }
- operator T() const { return mVal; }
- T operator=(T_const set_value) { mVal = set_value; return mVal; }
+ LLRect getValueFromBlock() const;
+ };
- private:
- T mVal;
- DERIVED* mBlock;
+ template<>
+ struct TypeValues<LLUIColor> : public TypeValuesHelper<LLUIColor>
+ {
+ static void declareValues();
};
- template <typename T>
- class LLOptionalParam
+ template<>
+ class TypedParam<LLUIColor>
+ : public BlockValue<LLUIColor>
{
+ typedef BlockValue<LLUIColor> super_t;
public:
- typedef typename boost::add_const<T>::type T_const;
-
- LLOptionalParam(T_const initial_val) : mVal(initial_val), mBlock(sBlock) {}
- LLOptionalParam() : mBlock(sBlock) {}
- LLOptionalParam(const LLOptionalParam<T>& other) : mVal(other.mVal) {}
-
- DERIVED& operator ()(T_const set_value) { mVal = set_value; return *mBlock; }
- operator T() const { return mVal; }
- T operator=(T_const set_value) { mVal = set_value; return mVal; }
-
- private:
- T mVal;
- DERIVED* mBlock;
+ Optional<F32> red;
+ Optional<F32> green;
+ Optional<F32> blue;
+ Optional<F32> alpha;
+ Optional<std::string> control;
+
+ TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLUIColor& value, ParamDescriptor::validation_func_t func);
+ LLUIColor getValueFromBlock() const;
};
- // specialization that requires initialization for reference types
- template <typename T>
- class LLOptionalParam <T&>
+ template<>
+ class TypedParam<const LLFontGL*>
+ : public BlockValue<const LLFontGL*>
{
+ typedef BlockValue<const LLFontGL*> super_t;
public:
- typedef typename boost::add_const<T&>::type T_const;
+ Optional<std::string> name;
+ Optional<std::string> size;
+ Optional<std::string> style;
- LLOptionalParam(T_const initial_val) : mVal(initial_val), mBlock(sBlock) {}
- LLOptionalParam(const LLOptionalParam<T&>& other) : mVal(other.mVal) {}
-
- DERIVED& operator ()(T_const set_value) { mVal = set_value; return *mBlock; }
- operator T&() const { return mVal; }
- T& operator=(T_const set_value) { mVal = set_value; return mVal; }
+ TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLFontGL* const value, ParamDescriptor::validation_func_t func);
+ const LLFontGL* getValueFromBlock() const;
+ };
- private:
- T& mVal;
- DERIVED* mBlock;
+ template<>
+ struct TypeValues<LLFontGL::HAlign> : public TypeValuesHelper<LLFontGL::HAlign>
+ {
+ static void declareValues();
};
- // specialization that initializes pointer params to NULL
- template<typename T>
- class LLOptionalParam<T*>
+ template<>
+ struct TypeValues<LLFontGL::VAlign> : public TypeValuesHelper<LLFontGL::VAlign>
{
- public:
- typedef typename boost::add_const<T*>::type T_const;
-
- LLOptionalParam(T_const initial_val) : mVal(initial_val), mBlock(sBlock) {}
- LLOptionalParam() : mVal((T*)NULL), mBlock(sBlock) {}
- LLOptionalParam(const LLOptionalParam<T*>& other) : mVal(other.mVal) {}
-
- DERIVED& operator ()(T_const set_value) { mVal = set_value; return *mBlock; }
- operator T*() const { return mVal; }
- T* operator=(T_const set_value) { mVal = set_value; return mVal; }
- private:
- T* mVal;
- DERIVED* mBlock;
+ static void declareValues();
};
- static DERIVED* sBlock;
-};
+ template<>
+ struct TypeValues<LLFontGL::ShadowType> : public TypeValuesHelper<LLFontGL::ShadowType>
+ {
+ static void declareValues();
+ };
+}
-template <typename T> T* LLParamBlock<T>::sBlock = NULL;
+namespace LLInitParam
+{
+ template<>
+ bool ParamCompare<LLLazyValue<LLColor4> >::equals(
+ const LLLazyValue<LLColor4> &a, const LLLazyValue<LLColor4> &b);
+}
#endif
diff --git a/indra/llui/lluictrl.cpp b/indra/llui/lluictrl.cpp
index 9d97312ab0..da0db0424a 100644
--- a/indra/llui/lluictrl.cpp
+++ b/indra/llui/lluictrl.cpp
@@ -36,13 +36,30 @@
#include "lluictrl.h"
#include "llfocusmgr.h"
#include "llpanel.h"
+#include "lluictrlfactory.h"
static LLRegisterWidget<LLUICtrl> r("ui_ctrl");
+LLUICtrl::Params::Params()
+: tab_stop("tab_stop", true),
+ label("label"),
+ initial_value("initial_value"),
+ init_callback("init_callback"),
+ commit_callback("commit_callback"),
+ validate_callback("validate_callback"),
+ control_name("control_name"),
+ enabled_control("enabled_control")
+{
+ addSynonym(initial_value, "initial_val");
+ // this is the canonical name for text contents of an xml node
+ addSynonym(initial_value, "value");
+}
+
LLFocusableElement::LLFocusableElement()
: mFocusLostCallback(NULL),
mFocusReceivedCallback(NULL),
mFocusChangedCallback(NULL),
+ mTopLostCallback(NULL),
mFocusCallbackUserData(NULL)
{
}
@@ -77,6 +94,14 @@ void LLFocusableElement::onFocusLost()
}
}
+void LLFocusableElement::onTopLost()
+{
+ if (mTopLostCallback)
+ {
+ mTopLostCallback(this, mFocusCallbackUserData);
+ }
+}
+
BOOL LLFocusableElement::hasFocus() const
{
return FALSE;
@@ -86,36 +111,61 @@ void LLFocusableElement::setFocus(BOOL b)
{
}
-
-
-LLUICtrl::LLUICtrl() :
- mCommitCallback(NULL),
- mLostTopCallback(NULL),
- mValidateCallback(NULL),
- mCallbackUserData(NULL),
+LLUICtrl::LLUICtrl(const LLUICtrl::Params& p, const LLViewModelPtr& viewmodel)
+: LLView(p),
mTentative(FALSE),
- mTabStop(TRUE),
- mIsChrome(FALSE)
+ mIsChrome(FALSE),
+ mViewModel(viewmodel),
+ mControlVariable(NULL),
+ mEnabledControlVariable(NULL)
{
+ mUICtrlHandle.bind(this);
}
-LLUICtrl::LLUICtrl(const std::string& name, const LLRect& rect, BOOL mouse_opaque,
- void (*on_commit_callback)(LLUICtrl*, void*),
- void* callback_userdata,
- U32 reshape)
-: // can't make this automatically follow top and left, breaks lots
- // of buttons in the UI. JC 7/20/2002
- LLView( name, rect, mouse_opaque, reshape ),
- mCommitCallback( on_commit_callback) ,
- mLostTopCallback( NULL ),
- mValidateCallback( NULL ),
- mCallbackUserData( callback_userdata ),
- mTentative( FALSE ),
- mTabStop( TRUE ),
- mIsChrome(FALSE)
+void LLUICtrl::initFromParams(const Params& p)
{
+ LLView::initFromParams(p);
+
+ setControlName(p.control_name);
+ if (p.enabled_control.isProvided())
+ {
+ LLControlVariable* control = findControl(p.enabled_control);
+ if (control)
+ setEnabledControlVariable(control);
+ }
+ setTabStop(p.tab_stop);
+ setFocusLostCallback(p.focus_lost_callback());
+
+ if (p.initial_value.isProvided()
+ && !p.control_name.isProvided())
+ {
+ setValue(p.initial_value);
+ }
+
+ if (p.commit_callback.isProvided())
+ initCommitCallback(p.commit_callback, mCommitSignal);
+
+ if (p.validate_callback.isProvided())
+ initEnableCallback(p.validate_callback, mValidateSignal);
+
+ if (p.init_callback.isProvided())
+ {
+ if (p.init_callback.function.isProvided())
+ {
+ p.init_callback.function()(this, p.init_callback.parameter);
+ }
+ else
+ {
+ commit_callback_t* initfunc = (CallbackRegistry<commit_callback_t>::getValue(p.init_callback.function_name));
+ if (initfunc)
+ {
+ (*initfunc)(this, p.init_callback.parameter);
+ }
+ }
+ }
}
+
LLUICtrl::~LLUICtrl()
{
gFocusMgr.releaseFocusIfNeeded( this ); // calls onCommit()
@@ -127,24 +177,178 @@ LLUICtrl::~LLUICtrl()
}
}
-void LLUICtrl::onCommit()
+void LLUICtrl::initCommitCallback(const CommitCallbackParam& cb, commit_signal_t& sig)
{
- if( mCommitCallback )
+ if (cb.function.isProvided())
{
- mCommitCallback( this, mCallbackUserData );
+ if (cb.parameter.isProvided())
+ sig.connect(boost::bind(cb.function(), _1, cb.parameter));
+ else
+ sig.connect(cb.function());
+ }
+ else
+ {
+ std::string function_name = cb.function_name;
+ commit_callback_t* func = (CallbackRegistry<commit_callback_t>::getValue(function_name));
+ if (func)
+ {
+ if (cb.parameter.isProvided())
+ sig.connect(boost::bind((*func), _1, cb.parameter));
+ else
+ sig.connect(*func);
+ }
+ else if (!function_name.empty())
+ {
+ llwarns << "No callback found for: '" << function_name << "' in control: " << getName() << llendl;
+ }
}
}
+void LLUICtrl::initEnableCallback(const EnableCallbackParam& cb, enable_signal_t& sig)
+{
+ // Set the callback function
+ if (cb.function.isProvided())
+ {
+ if (cb.parameter.isProvided())
+ sig.connect(boost::bind(cb.function(), this, cb.parameter));
+ else
+ sig.connect(cb.function());
+ }
+ else
+ {
+ enable_callback_t* func = (EnableCallbackRegistry::getValue(cb.function_name));
+ if (func)
+ {
+ if (cb.parameter.isProvided())
+ sig.connect(boost::bind((*func), this, cb.parameter));
+ else
+ sig.connect(*func);
+ }
+ }
+}
+
+
+void LLUICtrl::onCommit()
+{
+ mCommitSignal(this, getValue());
+}
+
//virtual
BOOL LLUICtrl::isCtrl() const
{
return TRUE;
}
+//virtual
+void LLUICtrl::setValue(const LLSD& value)
+{
+ mViewModel->setValue(value);
+}
+
//virtual
LLSD LLUICtrl::getValue() const
{
- return LLSD();
+ return mViewModel->getValue();
+}
+
+/// When two widgets are displaying the same data (e.g. during a skin
+/// change), share their ViewModel.
+void LLUICtrl::shareViewModelFrom(const LLUICtrl& other)
+{
+ // Because mViewModel is an LLViewModelPtr, this assignment will quietly
+ // dispose of the previous LLViewModel -- unless it's already shared by
+ // somebody else.
+ mViewModel = other.mViewModel;
+}
+
+//virtual
+LLViewModel* LLUICtrl::getViewModel() const
+{
+ return mViewModel;
+}
+
+bool LLUICtrl::setControlValue(const LLSD& value)
+{
+ if (mControlVariable)
+ {
+ mControlVariable->set(value);
+ return true;
+ }
+ return false;
+}
+
+void LLUICtrl::setControlVariable(LLControlVariable* control)
+{
+ if (mControlVariable)
+ {
+ //RN: this will happen in practice, should we try to avoid it?
+ //llwarns << "setControlName called twice on same control!" << llendl;
+ mControlConnection.disconnect(); // disconnect current signal
+ mControlVariable = NULL;
+ }
+
+ if (control)
+ {
+ mControlVariable = control;
+ mControlConnection = mControlVariable->getSignal()->connect(boost::bind(&controlListener, _2, getUICtrlHandle(), std::string("value")));
+ setValue(mControlVariable->getValue());
+ }
+}
+
+//virtual
+void LLUICtrl::setControlName(const std::string& control_name, LLView *context)
+{
+ if (context == NULL)
+ {
+ context = this;
+ }
+
+ // Register new listener
+ if (!control_name.empty())
+ {
+ LLControlVariable* control = context->findControl(control_name);
+ setControlVariable(control);
+ }
+}
+
+void LLUICtrl::setEnabledControlVariable(LLControlVariable* control)
+{
+ if (mEnabledControlVariable)
+ {
+ mEnabledControlConnection.disconnect(); // disconnect current signal
+ mEnabledControlVariable = NULL;
+ }
+ if (control)
+ {
+ mEnabledControlVariable = control;
+ mEnabledControlConnection = mEnabledControlVariable->getSignal()->connect(boost::bind(&controlListener, _2, getUICtrlHandle(), std::string("enabled")));
+ setEnabled(mEnabledControlVariable->getValue().asBoolean());
+ }
+}
+
+// static
+bool LLUICtrl::controlListener(const LLSD& newvalue, LLHandle<LLUICtrl> handle, std::string type)
+{
+ LLUICtrl* ctrl = handle.get();
+ if (ctrl)
+ {
+ if (type == "value")
+ {
+ ctrl->setValue(newvalue);
+ return true;
+ }
+ else if (type == "enabled")
+ {
+ ctrl->setEnabled(newvalue.asBoolean());
+ return true;
+ }
+ else if (type == "visible")
+ {
+ ctrl->setVisible(newvalue.asBoolean());
+ return true;
+ }
+ }
+ return false;
}
// virtual
@@ -248,12 +452,10 @@ void LLUICtrl::onFocusLost()
}
}
-void LLUICtrl::onLostTop()
+void LLUICtrl::onTopLost()
{
- if (mLostTopCallback)
- {
- mLostTopCallback(this, mCallbackUserData);
- }
+ // trigger callbacks
+ LLFocusableElement::onTopLost();
}
@@ -278,12 +480,13 @@ BOOL LLUICtrl::acceptsTextInput() const
//virtual
BOOL LLUICtrl::isDirty() const
{
- return FALSE;
+ return mViewModel->isDirty();
};
//virtual
void LLUICtrl::resetDirty()
{
+ mViewModel->resetDirty();
}
// virtual
@@ -456,7 +659,8 @@ BOOL LLUICtrl::focusNextItem(BOOL text_fields_only)
{
// this assumes that this method is called on the focus root.
LLCtrlQuery query = getTabOrderQuery();
- if(text_fields_only || LLUI::sConfigGroup->getBOOL("TabToTextFieldsOnly"))
+ static LLUICachedControl<bool> tab_to_text_fields_only ("TabToTextFieldsOnly", false);
+ if(text_fields_only || tab_to_text_fields_only)
{
query.addPreFilter(LLUICtrl::LLTextInputFilter::getInstance());
}
@@ -468,7 +672,8 @@ BOOL LLUICtrl::focusPrevItem(BOOL text_fields_only)
{
// this assumes that this method is called on the focus root.
LLCtrlQuery query = getTabOrderQuery();
- if(text_fields_only || LLUI::sConfigGroup->getBOOL("TabToTextFieldsOnly"))
+ static LLUICachedControl<bool> tab_to_text_fields_only ("TabToTextFieldsOnly", false);
+ if(text_fields_only || tab_to_text_fields_only)
{
query.addPreFilter(LLUICtrl::LLTextInputFilter::getInstance());
}
@@ -524,33 +729,6 @@ BOOL LLUICtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect
return handled;
}*/
-void LLUICtrl::initFromXML(LLXMLNodePtr node, LLView* parent)
-{
- BOOL has_tab_stop = hasTabStop();
- node->getAttributeBOOL("tab_stop", has_tab_stop);
-
- setTabStop(has_tab_stop);
-
- LLView::initFromXML(node, parent);
-}
-
-LLXMLNodePtr LLUICtrl::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLView::getXML(save_children);
- node->createChild("tab_stop", TRUE)->setBoolValue(hasTabStop());
-
- return node;
-}
-
-//static
-LLView* LLUICtrl::fromXML(LLXMLNodePtr node, LLView* parent, class LLUICtrlFactory* factory)
-{
- LLUICtrl* ctrl = new LLUICtrl();
- ctrl->initFromXML(node, parent);
- return ctrl;
-}
-
-
// Skip over any parents that are not LLUICtrl's
// Used in focus logic since only LLUICtrl elements can have focus
LLUICtrl* LLUICtrl::getParentUICtrl() const
@@ -570,6 +748,16 @@ LLUICtrl* LLUICtrl::getParentUICtrl() const
return NULL;
}
+// *TODO: Deprecate; for backwards compatability only:
+boost::signals::connection LLUICtrl::setCommitCallback( boost::function<void (LLUICtrl*,void*)> cb, void* data)
+{
+ return setCommitCallback( boost::bind(cb, _1, data));
+}
+boost::signals::connection LLUICtrl::setValidateBeforeCommit( boost::function<bool (const LLSD& data)> cb )
+{
+ return mValidateSignal.connect(boost::bind(cb, _2));
+}
+
// virtual
void LLUICtrl::setTentative(BOOL b)
{
@@ -582,11 +770,6 @@ BOOL LLUICtrl::getTentative() const
return mTentative;
}
-// virtual
-void LLUICtrl::setDoubleClickCallback( void (*cb)(void*) )
-{
-}
-
// virtual
void LLUICtrl::setColor(const LLColor4& color)
{ }
@@ -598,3 +781,40 @@ void LLUICtrl::setMinValue(LLSD min_value)
// virtual
void LLUICtrl::setMaxValue(LLSD max_value)
{ }
+
+
+
+namespace LLInitParam
+{
+ template<>
+ bool ParamCompare<LLUICtrl::commit_callback_t>::equals(
+ const LLUICtrl::commit_callback_t &a,
+ const LLUICtrl::commit_callback_t &b)
+ {
+ return false;
+ }
+
+ template<>
+ bool ParamCompare<LLUICtrl::focus_callback_t>::equals(
+ const LLUICtrl::focus_callback_t &a,
+ const LLUICtrl::focus_callback_t &b)
+ {
+ return false;
+ }
+
+ template<>
+ bool ParamCompare<LLUICtrl::enable_callback_t>::equals(
+ const LLUICtrl::enable_callback_t &a,
+ const LLUICtrl::enable_callback_t &b)
+ {
+ return false;
+ }
+
+ template<>
+ bool ParamCompare<LLLazyValue<LLColor4> >::equals(
+ const LLLazyValue<LLColor4> &a,
+ const LLLazyValue<LLColor4> &b)
+ {
+ return a.get() == b.get();
+ }
+}
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index db41af8470..e82102d531 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -34,10 +34,17 @@
#ifndef LL_LLUICTRL_H
#define LL_LLUICTRL_H
-#include "llview.h"
+#include "llboost.h"
#include "llrect.h"
#include "llsd.h"
+#include <boost/function.hpp>
+
+#include "llinitparam.h"
+#include "llview.h"
+#include "llviewmodel.h"
+const BOOL TAKE_FOCUS_YES = TRUE;
+const BOOL TAKE_FOCUS_NO = FALSE;
class LLFocusableElement
{
@@ -49,39 +56,104 @@ public:
virtual void setFocus( BOOL b );
virtual BOOL hasFocus() const;
- void setFocusLostCallback(void (*cb)(LLFocusableElement* caller, void*), void* user_data = NULL) { mFocusLostCallback = cb; mFocusCallbackUserData = user_data; }
- void setFocusReceivedCallback( void (*cb)(LLFocusableElement*, void*), void* user_data = NULL) { mFocusReceivedCallback = cb; mFocusCallbackUserData = user_data; }
- void setFocusChangedCallback( void (*cb)(LLFocusableElement*, void*), void* user_data = NULL ) { mFocusChangedCallback = cb; mFocusCallbackUserData = user_data; }
+ typedef boost::function<void(LLFocusableElement*, void*)> focus_callback_t;
+ void setFocusLostCallback(focus_callback_t cb, void* user_data = NULL) { mFocusLostCallback = cb; mFocusCallbackUserData = user_data; }
+ void setFocusReceivedCallback(focus_callback_t cb, void* user_data = NULL) { mFocusReceivedCallback = cb; mFocusCallbackUserData = user_data; }
+ void setFocusChangedCallback(focus_callback_t cb, void* user_data = NULL ) { mFocusChangedCallback = cb; mFocusCallbackUserData = user_data; }
+ void setTopLostCallback(focus_callback_t cb, void* user_data = NULL ) { mTopLostCallback = cb; mFocusCallbackUserData = user_data; }
protected:
virtual void onFocusReceived();
virtual void onFocusLost();
- void (*mFocusLostCallback)( LLFocusableElement* caller, void* userdata );
- void (*mFocusReceivedCallback)( LLFocusableElement* ctrl, void* userdata );
- void (*mFocusChangedCallback)( LLFocusableElement* ctrl, void* userdata );
+ virtual void onTopLost(); // called when registered as top ctrl and user clicks elsewhere
+ focus_callback_t mFocusLostCallback;
+ focus_callback_t mFocusReceivedCallback;
+ focus_callback_t mFocusChangedCallback;
+ focus_callback_t mTopLostCallback;
void* mFocusCallbackUserData;
};
class LLUICtrl
-: public LLView, public LLFocusableElement
+ : public LLView, public LLFocusableElement, public boost::signals::trackable
{
public:
- typedef void (*LLUICtrlCallback)(LLUICtrl* ctrl, void* userdata);
- typedef BOOL (*LLUICtrlValidate)(LLUICtrl* ctrl, void* userdata);
-
- LLUICtrl();
- LLUICtrl( const std::string& name, const LLRect& rect, BOOL mouse_opaque,
- LLUICtrlCallback callback,
- void* callback_userdata,
- U32 reshape=FOLLOWS_NONE);
+
+
+ typedef boost::function<void (LLUICtrl* ctrl, const LLSD& param)> commit_callback_t;
+ typedef boost::signal<void (LLUICtrl* ctrl, const LLSD& param)> commit_signal_t;
+
+ typedef boost::function<bool (LLUICtrl* ctrl, const LLSD& param)> enable_callback_t;
+ typedef boost::signal<bool (LLUICtrl* ctrl, const LLSD& param), boost_boolean_combiner> enable_signal_t;
+
+ struct CallbackParam : public LLInitParam::Block<CallbackParam>
+ {
+ Deprecated name;
+
+ Optional<std::string> function_name;
+ Optional<LLSD> parameter;
+
+ Optional<std::string> control_name;
+
+ CallbackParam()
+ : name("name"),
+ function_name("function"),
+ parameter("parameter"),
+ control_name("control") // Shortcut to control -> "control_name" for backwards compatability
+ {
+ addSynonym(parameter, "userdata");
+ }
+ };
+
+ struct CommitCallbackParam : public LLInitParam::Block<CommitCallbackParam, CallbackParam >
+ {
+ Optional<commit_callback_t> function;
+ };
+
+ struct EnableCallbackParam : public LLInitParam::Block<EnableCallbackParam, CallbackParam >
+ {
+ Optional<enable_callback_t> function;
+ };
+
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Optional<std::string> label;
+ Optional<bool> tab_stop;
+ Optional<LLSD> initial_value;
+
+ Optional<CommitCallbackParam> init_callback,
+ commit_callback;
+ Optional<EnableCallbackParam> validate_callback;
+
+ Optional<focus_callback_t> focus_lost_callback;
+
+ Optional<std::string> control_name;
+ Optional<std::string> enabled_control;
+
+ Params();
+ };
+
/*virtual*/ ~LLUICtrl();
+ void initFromParams(const Params& p);
+protected:
+ friend class LLUICtrlFactory;
+ LLUICtrl(const Params& p = LLUICtrl::Params(),
+ const LLViewModelPtr& viewmodel=LLViewModelPtr(new LLViewModel));
+
+ void initCommitCallback(const CommitCallbackParam& cb, commit_signal_t& sig);
+ void initEnableCallback(const EnableCallbackParam& cb, enable_signal_t& sig);
+
+ // We need this virtual so we can override it with derived versions
+ virtual LLViewModel* getViewModel() const;
+ // We shouldn't ever need to set this directly
+ //virtual void setViewModel(const LLViewModelPtr&);
+
+public:
// LLView interface
- /*virtual*/ void initFromXML(LLXMLNodePtr node, LLView* parent);
- /*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
/*virtual*/ BOOL setLabelArg( const std::string& key, const LLStringExplicit& text );
/*virtual*/ void onFocusReceived();
/*virtual*/ void onFocusLost();
+ /*virtual*/ void onTopLost();
/*virtual*/ BOOL isCtrl() const;
/*virtual*/ void setTentative(BOOL b);
/*virtual*/ BOOL getTentative() const;
@@ -97,7 +169,20 @@ public:
virtual class LLCtrlListInterface* getListInterface();
virtual class LLCtrlScrollInterface* getScrollInterface();
+ bool setControlValue(const LLSD& value);
+ void setControlVariable(LLControlVariable* control);
+ virtual void setControlName(const std::string& control, LLView *context = NULL);
+
+ LLControlVariable* getControlVariable() { return mControlVariable; }
+
+ void setEnabledControlVariable(LLControlVariable* control);
+
+ virtual void setValue(const LLSD& value);
virtual LLSD getValue() const;
+ /// When two widgets are displaying the same data (e.g. during a skin
+ /// change), share their ViewModel.
+ virtual void shareViewModelFrom(const LLUICtrl& other);
+
virtual BOOL setTextArg( const std::string& key, const LLStringExplicit& text );
virtual void setIsChrome(BOOL is_chrome);
@@ -108,14 +193,12 @@ public:
virtual BOOL isDirty() const; // Defauls to false
virtual void resetDirty(); //Defaults to no-op
- // Call appropriate callbacks
- virtual void onLostTop(); // called when registered as top ctrl and user clicks elsewhere
+ // Call appropriate callback
virtual void onCommit();
// Default to no-op:
virtual void onTabInto();
virtual void clear();
- virtual void setDoubleClickCallback( void (*cb)(void*) );
virtual void setColor(const LLColor4& color);
virtual void setMinValue(LLSD min_value);
virtual void setMaxValue(LLSD max_value);
@@ -126,6 +209,7 @@ public:
BOOL focusLastItem(BOOL prefer_text_fields = FALSE);
// Non Virtuals
+ LLHandle<LLUICtrl> getUICtrlHandle() const { return mUICtrlHandle; }
BOOL getIsChrome() const;
void setTabStop( BOOL b );
@@ -133,16 +217,14 @@ public:
LLUICtrl* getParentUICtrl() const;
- void* getCallbackUserData() const { return mCallbackUserData; }
- void setCallbackUserData( void* data ) { mCallbackUserData = data; }
+ boost::signals::connection setCommitCallback( const commit_signal_t::slot_type& cb ) { return mCommitSignal.connect(cb); }
+ boost::signals::connection setValidateCallback( const enable_signal_t::slot_type& cb ) { return mValidateSignal.connect(cb); }
- void setCommitCallback( void (*cb)(LLUICtrl*, void*) ) { mCommitCallback = cb; }
- void setValidateBeforeCommit( BOOL(*cb)(LLUICtrl*, void*) ) { mValidateCallback = cb; }
- void setLostTopCallback( void (*cb)(LLUICtrl*, void*) ) { mLostTopCallback = cb; }
+ // *TODO: Deprecate; for backwards compatability only:
+ boost::signals::connection setCommitCallback( boost::function<void (LLUICtrl*,void*)> cb, void* data);
+ boost::signals::connection setValidateBeforeCommit( boost::function<bool (const LLSD& data)> cb );
- static LLView* fromXML(LLXMLNodePtr node, LLView* parent, class LLUICtrlFactory* factory);
-
- LLUICtrl* findRootMostFocusRoot();
+ LLUICtrl* findRootMostFocusRoot();
class LLTextInputFilter : public LLQueryFilter, public LLSingleton<LLTextInputFilter>
{
@@ -151,22 +233,53 @@ public:
return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl *>(view)->acceptsTextInput(), TRUE);
}
};
+
+ template <typename F> class CallbackRegistry : public LLRegistrySingleton<std::string, F, CallbackRegistry<F> >
+ {};
+ typedef CallbackRegistry<commit_callback_t> CommitCallbackRegistry;
+ typedef CallbackRegistry<enable_callback_t> EnableCallbackRegistry;
+
protected:
- void (*mCommitCallback)( LLUICtrl* ctrl, void* userdata );
- void (*mLostTopCallback)( LLUICtrl* ctrl, void* userdata );
- BOOL (*mValidateCallback)( LLUICtrl* ctrl, void* userdata );
+ static bool controlListener(const LLSD& newvalue, LLHandle<LLUICtrl> handle, std::string type);
+
+ commit_signal_t mCommitSignal;
+ enable_signal_t mValidateSignal;
- void* mCallbackUserData;
+ LLViewModelPtr mViewModel;
+
+ LLControlVariable* mControlVariable;
+ boost::signals::connection mControlConnection;
+ LLControlVariable* mEnabledControlVariable;
+ boost::signals::connection mEnabledControlConnection;
private:
BOOL mTabStop;
BOOL mIsChrome;
BOOL mTentative;
+ LLRootHandle<LLUICtrl> mUICtrlHandle;
class DefaultTabGroupFirstSorter;
};
+namespace LLInitParam
+{
+ template<>
+ bool ParamCompare<LLUICtrl::commit_callback_t>::equals(
+ const LLUICtrl::commit_callback_t &a,
+ const LLUICtrl::commit_callback_t &b);
+
+ template<>
+ bool ParamCompare<LLUICtrl::enable_callback_t>::equals(
+ const LLUICtrl::enable_callback_t &a,
+ const LLUICtrl::enable_callback_t &b);
+
+ template<>
+ bool ParamCompare<LLUICtrl::focus_callback_t>::equals(
+ const LLUICtrl::focus_callback_t &a,
+ const LLUICtrl::focus_callback_t &b);
+}
+
#endif // LL_LLUICTRL_H
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp
index 983cc53f69..1f487bdb7e 100644
--- a/indra/llui/lluictrlfactory.cpp
+++ b/indra/llui/lluictrlfactory.cpp
@@ -41,6 +41,8 @@
#include "llcontrol.h"
#include "lldir.h"
#include "v4color.h"
+#include "v3dmath.h"
+#include "llquaternion.h"
// this library includes
#include "llbutton.h"
@@ -64,7 +66,6 @@
#include "llmultisliderctrl.h"
#include "llspinctrl.h"
#include "lltabcontainer.h"
-#include "lltabcontainervertical.h"
#include "lltextbox.h"
#include "lltexteditor.h"
#include "llui.h"
@@ -77,27 +78,32 @@ const S32 VPAD = 4;
const S32 FLOATER_H_MARGIN = 15;
const S32 MIN_WIDGET_HEIGHT = 10;
-std::vector<std::string> LLUICtrlFactory::sXUIPaths;
+//-----------------------------------------------------------------------------
+// Register widgets that are purely data driven here so they get linked in
+#include "llstatview.h"
+static LLRegisterWidget<LLStatView> register_stat_view("stat_view");
+
+//-----------------------------------------------------------------------------
// UI Ctrl class for padding
class LLUICtrlLocate : public LLUICtrl
{
public:
- LLUICtrlLocate() : LLUICtrl(std::string("locate"), LLRect(0,0,0,0), FALSE, NULL, NULL) { setTabStop(FALSE); }
- virtual void draw() { }
-
- static LLView *fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
{
- std::string name("pad");
- node->getAttributeString("name", name);
+ Params()
+ {
+ name = "locate";
+ tab_stop = false;
+ }
+ };
+
+ LLUICtrlLocate(const Params& p) : LLUICtrl(p) {}
+ virtual void draw() { }
- LLUICtrlLocate *new_ctrl = new LLUICtrlLocate();
- new_ctrl->setName(name);
- new_ctrl->initFromXML(node, parent);
- return new_ctrl;
- }
};
+//FIXME: this created an ambiguous lookup of template (locate.xml or pad.xml?)
static LLRegisterWidget<LLUICtrlLocate> r1("locate");
static LLRegisterWidget<LLUICtrlLocate> r2("pad");
@@ -105,9 +111,8 @@ static LLRegisterWidget<LLUICtrlLocate> r2("pad");
// LLUICtrlFactory()
//-----------------------------------------------------------------------------
LLUICtrlFactory::LLUICtrlFactory()
- : mDummyPanel(NULL)
+ : mDummyPanel(NULL) // instantiated when first needed
{
- setupPaths();
}
LLUICtrlFactory::~LLUICtrlFactory()
@@ -116,43 +121,15 @@ LLUICtrlFactory::~LLUICtrlFactory()
mDummyPanel = NULL;
}
-void LLUICtrlFactory::setupPaths()
+void LLUICtrlFactory::loadWidgetTemplate(const std::string& widget_tag, LLInitParam::BaseBlock& block)
{
- std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "paths.xml");
+ std::string filename = std::string("widgets") + gDirUtilp->getDirDelimiter() + widget_tag + ".xml";
+ LLXMLNodePtr root_node;
- LLXMLNodePtr root;
- BOOL success = LLXMLNode::parseFile(filename, root, NULL);
- sXUIPaths.clear();
-
- if (success)
+ if (LLUICtrlFactory::getLayeredXMLNode(filename, root_node))
{
- LLXMLNodePtr path;
-
- for (path = root->getFirstChild(); path.notNull(); path = path->getNextSibling())
- {
- LLUIString path_val_ui(path->getValue());
- std::string language = LLUI::getLanguage();
- path_val_ui.setArg("[LANGUAGE]", language);
-
- if (std::find(sXUIPaths.begin(), sXUIPaths.end(), path_val_ui.getString()) == sXUIPaths.end())
- {
- sXUIPaths.push_back(path_val_ui.getString());
- }
- }
+ LLXUIParser::instance().readXUI(root_node, block);
}
- else // parsing failed
- {
- std::string slash = gDirUtilp->getDirDelimiter();
- std::string dir = "xui" + slash + "en-us";
- llwarns << "XUI::config file unable to open: " << filename << llendl;
- sXUIPaths.push_back(dir);
- }
-}
-
-// static
-const std::vector<std::string>& LLUICtrlFactory::getXUIPaths()
-{
- return sXUIPaths;
}
//-----------------------------------------------------------------------------
@@ -160,97 +137,61 @@ const std::vector<std::string>& LLUICtrlFactory::getXUIPaths()
//-----------------------------------------------------------------------------
bool LLUICtrlFactory::getLayeredXMLNode(const std::string &xui_filename, LLXMLNodePtr& root)
{
- std::string full_filename = gDirUtilp->findSkinnedFilename(sXUIPaths.front(), xui_filename);
- if (full_filename.empty())
- {
- llwarns << "Couldn't find UI description file: " << sXUIPaths.front() + gDirUtilp->getDirDelimiter() + xui_filename << llendl;
- return false;
- }
-
- if (!LLXMLNode::parseFile(full_filename, root, NULL))
- {
- // try filename as passed in since sometimes we load an xml file from a user-supplied path
- if (!LLXMLNode::parseFile(xui_filename, root, NULL))
- {
- llwarns << "Problem reading UI description file: " << xui_filename << llendl;
- return false;
- }
- }
-
- LLXMLNodePtr updateRoot;
-
- std::vector<std::string>::const_iterator itor;
-
- for (itor = sXUIPaths.begin(), ++itor; itor != sXUIPaths.end(); ++itor)
- {
- std::string nodeName;
- std::string updateName;
-
- std::string layer_filename = gDirUtilp->findSkinnedFilename((*itor), xui_filename);
- if(layer_filename.empty())
- {
- // no localized version of this file, that's ok, keep looking
- continue;
- }
-
- if (!LLXMLNode::parseFile(layer_filename, updateRoot, NULL))
- {
- llwarns << "Problem reading localized UI description file: " << (*itor) + gDirUtilp->getDirDelimiter() + xui_filename << llendl;
- return false;
- }
-
- updateRoot->getAttributeString("name", updateName);
- root->getAttributeString("name", nodeName);
-
- if (updateName == nodeName)
- {
- LLXMLNode::updateNode(root, updateRoot);
- }
- }
-
- return true;
+ return LLXMLNode::getLayeredXMLNode(xui_filename, root, LLUI::getXUIPaths());
}
-
//-----------------------------------------------------------------------------
// buildFloater()
//-----------------------------------------------------------------------------
-void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const std::string& filename,
- const LLCallbackMap::map_t* factory_map, BOOL open) /* Flawfinder: ignore */
+void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const std::string& filename, BOOL open_floater, LLXMLNodePtr output_node)
{
LLXMLNodePtr root;
if (!LLUICtrlFactory::getLayeredXMLNode(filename, root))
{
+ llwarns << "Couldn't parse floater from: " << LLUI::getSkinPath() + gDirUtilp->getDirDelimiter() + filename << llendl;
return;
}
// root must be called floater
- if( !(root->hasName("floater") || root->hasName("multi_floater") ) )
+ if( !(root->hasName("floater") || root->hasName("multi_floater")) )
{
llwarns << "Root node should be named floater in: " << filename << llendl;
return;
}
- if (factory_map)
+ lldebugs << "Building floater " << filename << llendl;
+ mFileNames.push_back(gDirUtilp->findSkinnedFilename(LLUI::getSkinPath(), filename));
{
- mFactoryStack.push_front(factory_map);
- }
-
- floaterp->initFloaterXML(root, NULL, this, open); /* Flawfinder: ignore */
-
- if (LLUI::sShowXUINames)
- {
- floaterp->setToolTip(filename);
- }
+ if (!floaterp->getFactoryMap().empty())
+ {
+ mFactoryStack.push_front(&floaterp->getFactoryMap());
+ }
+
+ floaterp->getCommitCallbackRegistrar().pushScope(); // for local registry callbacks; define in constructor, referenced in XUI or postBuild
+
+ floaterp->initFloaterXML(root, floaterp->getParent(), open_floater, output_node);
- if (factory_map)
- {
- mFactoryStack.pop_front();
+ if (LLUI::sShowXUINames)
+ {
+ floaterp->setToolTip(filename);
+ }
+
+ floaterp->getCommitCallbackRegistrar().popScope();
+
+ if (!floaterp->getFactoryMap().empty())
+ {
+ mFactoryStack.pop_front();
+ }
}
+ mFileNames.pop_back();
+}
- LLHandle<LLFloater> handle = floaterp->getHandle();
- mBuiltFloaters[handle] = filename;
+LLFloater* LLUICtrlFactory::buildFloaterFromXML(const std::string& filename, BOOL open_floater)
+{
+ LLFloater* floater = new LLFloater();
+ buildFloater(floater, filename, open_floater);
+ return floater;
}
//-----------------------------------------------------------------------------
@@ -258,34 +199,20 @@ void LLUICtrlFactory::buildFloater(LLFloater* floaterp, const std::string& filen
//-----------------------------------------------------------------------------
S32 LLUICtrlFactory::saveToXML(LLView* viewp, const std::string& filename)
{
- llofstream out(filename);
- if (!out.good())
- {
- llwarns << "Unable to open " << filename << " for output." << llendl;
- return 1;
- }
-
- out << XML_HEADER;
-
- LLXMLNodePtr xml_node = viewp->getXML();
-
- xml_node->writeToOstream(out);
-
- out.close();
return 0;
}
//-----------------------------------------------------------------------------
// buildPanel()
//-----------------------------------------------------------------------------
-BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const std::string& filename,
- const LLCallbackMap::map_t* factory_map)
+BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const std::string& filename, LLXMLNodePtr output_node)
{
BOOL didPost = FALSE;
LLXMLNodePtr root;
if (!LLUICtrlFactory::getLayeredXMLNode(filename, root))
{
+ llwarns << "Couldn't parse panel from: " << LLUI::getSkinPath() + gDirUtilp->getDirDelimiter() + filename << llendl;
return didPost;
}
@@ -296,246 +223,733 @@ BOOL LLUICtrlFactory::buildPanel(LLPanel* panelp, const std::string& filename,
return didPost;
}
- if (factory_map)
+ lldebugs << "Building panel " << filename << llendl;
+
+ mFileNames.push_back(gDirUtilp->findSkinnedFilename(LLUI::getSkinPath(), filename));
{
- mFactoryStack.push_front(factory_map);
+ if (!panelp->getFactoryMap().empty())
+ {
+ mFactoryStack.push_front(&panelp->getFactoryMap());
+ }
+
+ didPost = panelp->initPanelXML(root, NULL, output_node);
+
+ if (LLUI::sShowXUINames)
+ {
+ panelp->setToolTip(filename);
+ }
+
+ if (!panelp->getFactoryMap().empty())
+ {
+ mFactoryStack.pop_front();
+ }
}
+ mFileNames.pop_back();
+ return didPost;
+}
- didPost = panelp->initPanelXML(root, NULL, this);
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+
+LLView *LLUICtrlFactory::createFromXML(LLXMLNodePtr node, LLView* parent, const std::string& filename, LLXMLNodePtr output_node)
+{
+ std::string ctrl_type = node->getName()->mString;
+ LLStringUtil::toLower(ctrl_type);
- if (LLUI::sShowXUINames)
+ LLWidgetCreatorFunc* funcp = LLWidgetCreatorRegistry::getInstance()->getValue(ctrl_type);
+
+ if (funcp == NULL)
{
- panelp->setToolTip(filename);
+ return NULL;
}
- LLHandle<LLPanel> handle = panelp->getHandle();
- mBuiltPanels[handle] = filename;
-
- if (factory_map)
+ if (parent == NULL)
+ {
+ if (mDummyPanel == NULL)
+ {
+ mDummyPanel = new LLPanel();
+ }
+ parent = mDummyPanel;
+ }
+ LLView *view = (*funcp)(node, parent, output_node);
+ if (LLUI::sShowXUINames && view && !filename.empty())
{
- mFactoryStack.pop_front();
+ view->setToolTip(filename);
}
-
- return didPost;
+
+ return view;
}
//-----------------------------------------------------------------------------
-// buildMenu()
+// createFactoryPanel()
//-----------------------------------------------------------------------------
-LLMenuGL *LLUICtrlFactory::buildMenu(const std::string &filename, LLView* parentp)
+LLPanel* LLUICtrlFactory::createFactoryPanel(const std::string& name)
{
- // TomY TODO: Break this function into buildMenu and buildMenuBar
- LLXMLNodePtr root;
- LLMenuGL* menu;
-
- if (!LLUICtrlFactory::getLayeredXMLNode(filename, root))
+ std::deque<const LLCallbackMap::map_t*>::iterator itor;
+ for (itor = mFactoryStack.begin(); itor != mFactoryStack.end(); ++itor)
{
- return NULL;
+ const LLCallbackMap::map_t* factory_map = *itor;
+
+ // Look up this panel's name in the map.
+ LLCallbackMap::map_const_iter_t iter = factory_map->find( name );
+ if (iter != factory_map->end())
+ {
+ // Use the factory to create the panel, instead of using a default LLPanel.
+ LLPanel *ret = (LLPanel*) iter->second.mCallback( iter->second.mData );
+ return ret;
+ }
}
+ return new LLPanel();
+}
- // root must be called panel
- if( !root->hasName( "menu_bar" ) && !root->hasName( "menu" ))
+//-----------------------------------------------------------------------------
+
+//static
+BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const std::string& name, LLColor4& color)
+{
+ std::string colorstring;
+ BOOL res = node->getAttributeString(name.c_str(), colorstring);
+ if (res && LLUI::sSettingGroups["color"])
{
- llwarns << "Root node should be named menu bar or menu in : " << filename << llendl;
- return NULL;
+ if (LLUI::sSettingGroups["color"]->controlExists(colorstring))
+ {
+ color.setVec(LLUI::sSettingGroups["color"]->getColor(colorstring));
+ }
+ else
+ {
+ res = FALSE;
+ }
+ }
+ if (!res)
+ {
+ res = LLColor4::parseColor(colorstring, &color);
+ }
+ if (!res)
+ {
+ res = node->getAttributeColor(name.c_str(), color);
}
+ return res;
+}
- if (root->hasName("menu"))
+//static
+void LLUICtrlFactory::setCtrlParent(LLView* view, LLView* parent, S32 tab_group)
+{
+ if (tab_group < 0) tab_group = parent->getLastTabGroup();
+ parent->addChild(view, tab_group);
+}
+
+
+// Avoid directly using LLUI and LLDir in the template code
+//static
+std::string LLUICtrlFactory::findSkinnedFilename(const std::string& filename)
+{
+ return gDirUtilp->findSkinnedFilename(LLUI::getSkinPath(), filename);
+}
+
+void LLUICtrlFactory::pushFactoryFunctions(const LLCallbackMap::map_t* map)
+{
+ mFactoryStack.push_back(map);
+}
+
+void LLUICtrlFactory::popFactoryFunctions()
+{
+ if (!mFactoryStack.empty())
{
- menu = (LLMenuGL*)LLMenuGL::fromXML(root, parentp, this);
+ mFactoryStack.pop_back();
}
- else
+}
+
+
+//
+// LLXUIParser
+//
+LLXUIParser::LLXUIParser()
+: mLastWriteGeneration(-1)
+{
+ registerParserFuncs<bool>(boost::bind(&LLXUIParser::readBoolValue, this, _1),
+ boost::bind(&LLXUIParser::writeBoolValue, this, _1, _2));
+ registerParserFuncs<std::string>(boost::bind(&LLXUIParser::readStringValue, this, _1),
+ boost::bind(&LLXUIParser::writeStringValue, this, _1, _2));
+ registerParserFuncs<U8>(boost::bind(&LLXUIParser::readU8Value, this, _1),
+ boost::bind(&LLXUIParser::writeU8Value, this, _1, _2));
+ registerParserFuncs<S8>(boost::bind(&LLXUIParser::readS8Value, this, _1),
+ boost::bind(&LLXUIParser::writeS8Value, this, _1, _2));
+ registerParserFuncs<U16>(boost::bind(&LLXUIParser::readU16Value, this, _1),
+ boost::bind(&LLXUIParser::writeU16Value, this, _1, _2));
+ registerParserFuncs<S16>(boost::bind(&LLXUIParser::readS16Value, this, _1),
+ boost::bind(&LLXUIParser::writeS16Value, this, _1, _2));
+ registerParserFuncs<U32>(boost::bind(&LLXUIParser::readU32Value, this, _1),
+ boost::bind(&LLXUIParser::writeU32Value, this, _1, _2));
+ registerParserFuncs<S32>(boost::bind(&LLXUIParser::readS32Value, this, _1),
+ boost::bind(&LLXUIParser::writeS32Value, this, _1, _2));
+ registerParserFuncs<F32>(boost::bind(&LLXUIParser::readF32Value, this, _1),
+ boost::bind(&LLXUIParser::writeF32Value, this, _1, _2));
+ registerParserFuncs<F64>(boost::bind(&LLXUIParser::readF64Value, this, _1),
+ boost::bind(&LLXUIParser::writeF64Value, this, _1, _2));
+ registerParserFuncs<LLColor4>(boost::bind(&LLXUIParser::readColor4Value, this, _1),
+ boost::bind(&LLXUIParser::writeColor4Value, this, _1, _2));
+ registerParserFuncs<LLUIColor>(boost::bind(&LLXUIParser::readUIColorValue, this, _1),
+ boost::bind(&LLXUIParser::writeUIColorValue, this, _1, _2));
+ registerParserFuncs<LLUUID>(boost::bind(&LLXUIParser::readUUIDValue, this, _1),
+ boost::bind(&LLXUIParser::writeUUIDValue, this, _1, _2));
+ registerParserFuncs<LLSD>(boost::bind(&LLXUIParser::readSDValue, this, _1),
+ boost::bind(&LLXUIParser::writeSDValue, this, _1, _2));
+}
+
+void LLXUIParser::readXUI(LLXMLNodePtr node, LLInitParam::BaseBlock& block, bool silent)
+{
+ mNameStack.clear();
+ setParseSilently(silent);
+
+ if (node.isNull())
{
- menu = (LLMenuGL*)LLMenuBarGL::fromXML(root, parentp, this);
+ parserWarning("Invalid node");
}
-
- if (LLUI::sShowXUINames)
+ else
{
- menu->setToolTip(filename);
+ readXUIImpl(node, std::string(node->getName()->mString), block);
}
+}
- return menu;
+void LLXUIParser::writeXUI(LLXMLNodePtr node, const LLInitParam::BaseBlock &block, const LLInitParam::BaseBlock* diff_block)
+{
+ mLastWriteGeneration = -1;
+ mWriteRootNode = node;
+ block.serializeBlock(*this, Parser::name_stack_t(), diff_block);
}
-//-----------------------------------------------------------------------------
-// buildMenu()
-//-----------------------------------------------------------------------------
-LLPieMenu *LLUICtrlFactory::buildPieMenu(const std::string &filename, LLView* parentp)
+// go from a stack of names to a specific XML node
+LLXMLNodePtr LLXUIParser::getNode(const name_stack_t& stack)
{
- LLXMLNodePtr root;
+ if (stack.empty() || mWriteRootNode.isNull()) return NULL;
+
+ std::string attribute_name = stack.front().first;
+
+ // heuristic to make font always attribute of parent node
+ bool is_font = (attribute_name == "font");
+ // XML spec says that attributes have their whitespace normalized
+ // on parse: http://www.w3.org/TR/REC-xml/#AVNormalize
+ // Therefore text-oriented widgets that might have carriage returns
+ // have their values serialized as text contents, not the
+ // initial_value attribute. JC
+ if (attribute_name == "initial_value")
+ {
+ const char* root_node_name = mWriteRootNode->getName()->mString;
+ if (!strcmp(root_node_name, "text") // LLTextBox
+ || !strcmp(root_node_name, "text_editor")
+ || !strcmp(root_node_name, "line_editor")) // for consistency
+ {
+ // writeStringValue will write to this node
+ return mWriteRootNode;
+ }
+ }
- if (!LLUICtrlFactory::getLayeredXMLNode(filename, root))
+ for (name_stack_t::const_iterator it = ++stack.begin();
+ it != stack.end();
+ ++it)
{
- return NULL;
+ attribute_name += ".";
+ attribute_name += it->first;
}
- // root must be called panel
- if( !root->hasName( LL_PIE_MENU_TAG ))
+ LLXMLNodePtr attribute_node;
+
+ const char* attribute_cstr = attribute_name.c_str();
+ if (stack.size() != 1
+ && !is_font)
{
- llwarns << "Root node should be named " << LL_PIE_MENU_TAG << " in : " << filename << llendl;
- return NULL;
- }
+ std::string child_node_name(mWriteRootNode->getName()->mString);
+ child_node_name += ".";
+ child_node_name += stack.front().first;
+
+ LLXMLNodePtr child_node;
- std::string name("menu");
- root->getAttributeString("name", name);
+ if (mLastWriteGeneration == stack.front().second)
+ {
+ child_node = mLastWrittenChild;
+ }
+ else
+ {
+ mLastWriteGeneration = stack.front().second;
+ child_node = mWriteRootNode->createChild(child_node_name.c_str(), false);
+ }
+
+ mLastWrittenChild = child_node;
- LLPieMenu *menu = new LLPieMenu(name);
- parentp->addChild(menu);
- menu->initXML(root, parentp, this);
+ name_stack_t::const_iterator it = ++stack.begin();
+ std::string short_attribute_name(it->first);
+
+ for (++it;
+ it != stack.end();
+ ++it)
+ {
+ short_attribute_name += ".";
+ short_attribute_name += it->first;
+ }
+
+ if (child_node->hasAttribute(short_attribute_name.c_str()))
+ {
+ llerrs << "Attribute " << short_attribute_name << " already exists!" << llendl;
+ }
- if (LLUI::sShowXUINames)
+ attribute_node = child_node->createChild(short_attribute_name.c_str(), true);
+ }
+ else
{
- menu->setToolTip(filename);
+ if (mWriteRootNode->hasAttribute(attribute_cstr))
+ {
+ mWriteRootNode->getAttribute(attribute_cstr, attribute_node);
+ }
+ else
+ {
+ attribute_node = mWriteRootNode->createChild(attribute_name.c_str(), true);
+ }
}
- return menu;
+ return attribute_node;
}
-//-----------------------------------------------------------------------------
-// rebuild()
-//-----------------------------------------------------------------------------
-void LLUICtrlFactory::rebuild()
+
+bool LLXUIParser::readXUIImpl(LLXMLNodePtr nodep, const std::string& scope, LLInitParam::BaseBlock& block)
{
- built_panel_t::iterator built_panel_it;
- for (built_panel_it = mBuiltPanels.begin();
- built_panel_it != mBuiltPanels.end();
- ++built_panel_it)
- {
- std::string filename = built_panel_it->second;
- LLPanel* panelp = built_panel_it->first.get();
- if (!panelp)
+ typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+ boost::char_separator<char> sep(".");
+
+ bool values_parsed = false;
+
+ // submit attributes for current node
+ values_parsed |= readAttributes(nodep, block);
+
+ // treat text contents of xml node as "value" parameter
+ std::string text_contents = nodep->getSanitizedValue();
+ if (!text_contents.empty())
+ {
+ mCurReadNode = nodep;
+ mNameStack.push_back(std::make_pair(std::string("value"), newParseGeneration()));
+ block.submitValue(mNameStack, *this);
+ mNameStack.pop_back();
+ }
+
+ // then traverse children
+ // child node must start with last name of parent node (our "scope")
+ // for example: "<button><button.param nested_param1="foo"><param.nested_param2 nested_param3="bar"/></button.param></button>"
+ // which equates to the following nesting:
+ // button
+ // param
+ // nested_param1
+ // nested_param2
+ // nested_param3
+ for(LLXMLNodePtr childp = nodep->getFirstChild(); childp.notNull();)
+ {
+ std::string child_name(childp->getName()->mString);
+ S32 num_tokens_pushed = 0;
+
+ // for non "dotted" child nodes check to see if child node maps to another widget type
+ // and if not, treat as a child element of the current node
+ // e.g. <button><rect left="10"/></button> will interpret <rect> as "button.rect"
+ // since there is no widget named "rect"
+ if (child_name.find(".") == std::string::npos)
{
- continue;
+ // skip over children with registered names
+ if (LLWidgetCreatorRegistry::instance().exists(child_name))
+ {
+ childp = childp->getNextSibling();
+ continue;
+ }
+
+ mNameStack.push_back(std::make_pair(child_name, newParseGeneration()));
+ num_tokens_pushed++;
}
- llinfos << "Rebuilding UI panel " << panelp->getName()
- << " from " << filename
- << llendl;
- BOOL visible = panelp->getVisible();
- panelp->setVisible(FALSE);
- panelp->setFocus(FALSE);
- panelp->deleteAllChildren();
+ else
+ {
+ // parse out "dotted" name into individual tokens
+ tokenizer name_tokens(child_name, sep);
+
+ tokenizer::iterator name_token_it = name_tokens.begin();
+ if(name_token_it == name_tokens.end())
+ {
+ childp = childp->getNextSibling();
+ continue;
+ }
- buildPanel(panelp, filename.c_str(), &panelp->getFactoryMap());
- panelp->setVisible(visible);
+ // check for proper nesting
+ if(!scope.empty() && *name_token_it != scope)
+ {
+ childp = childp->getNextSibling();
+ continue;
+ }
+
+ // now ignore first token
+ ++name_token_it;
+
+ // copy remaining tokens on to our running token list
+ for(tokenizer::iterator token_to_push = name_token_it; token_to_push != name_tokens.end(); ++token_to_push)
+ {
+ mNameStack.push_back(std::make_pair(*token_to_push, newParseGeneration()));
+ num_tokens_pushed++;
+ }
+ }
+
+ // recurse and visit children XML nodes
+ if(readXUIImpl(childp, mNameStack.empty() ? scope : mNameStack.back().first, block))
+ {
+ // child node successfully parsed, remove from DOM
+
+ values_parsed = true;
+ LLXMLNodePtr node_to_remove = childp;
+ childp = childp->getNextSibling();
+
+ nodep->deleteChild(node_to_remove);
+ }
+ else
+ {
+ childp = childp->getNextSibling();
+ }
+
+ while(num_tokens_pushed-- > 0)
+ {
+ mNameStack.pop_back();
+ }
}
+ return values_parsed;
+}
+
+bool LLXUIParser::readAttributes(LLXMLNodePtr nodep, LLInitParam::BaseBlock& block)
+{
+ typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+ boost::char_separator<char> sep(".");
- built_floater_t::iterator built_floater_it;
- for (built_floater_it = mBuiltFloaters.begin();
- built_floater_it != mBuiltFloaters.end();
- ++built_floater_it)
+ bool any_parsed = false;
+
+ for(LLXMLAttribList::const_iterator attribute_it = nodep->mAttributes.begin();
+ attribute_it != nodep->mAttributes.end();
+ ++attribute_it)
{
- LLFloater* floaterp = built_floater_it->first.get();
- if (!floaterp)
+ S32 num_tokens_pushed = 0;
+ std::string attribute_name(attribute_it->first->mString);
+ mCurReadNode = attribute_it->second;
+
+ tokenizer name_tokens(attribute_name, sep);
+ // copy remaining tokens on to our running token list
+ for(tokenizer::iterator token_to_push = name_tokens.begin(); token_to_push != name_tokens.end(); ++token_to_push)
{
- continue;
+ mNameStack.push_back(std::make_pair(*token_to_push, newParseGeneration()));
+ num_tokens_pushed++;
}
- std::string filename = built_floater_it->second;
- llinfos << "Rebuilding UI floater " << floaterp->getName()
- << " from " << filename
- << llendl;
- BOOL visible = floaterp->getVisible();
- floaterp->setVisible(FALSE);
- floaterp->setFocus(FALSE);
- floaterp->deleteAllChildren();
- gFloaterView->removeChild(floaterp);
- buildFloater(floaterp, filename, &floaterp->getFactoryMap());
- floaterp->setVisible(visible);
+ any_parsed |= block.submitValue(mNameStack, *this);
+
+ while(num_tokens_pushed-- > 0)
+ {
+ mNameStack.pop_back();
+ }
}
+
+ return any_parsed;
}
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+bool LLXUIParser::readBoolValue(void* val_ptr)
+{
+ S32 value;
+ bool success = mCurReadNode->getBoolValue(1, &value);
+ *((bool*)val_ptr) = (value != FALSE);
+ return success;
+}
-LLView *LLUICtrlFactory::createCtrlWidget(LLPanel *parent, LLXMLNodePtr node)
+bool LLXUIParser::writeBoolValue(const void* val_ptr, const name_stack_t& stack)
{
- std::string ctrl_type = node->getName()->mString;
- LLStringUtil::toLower(ctrl_type);
-
- LLWidgetClassRegistry::factory_func_t func = LLWidgetClassRegistry::getInstance()->getCreatorFunc(ctrl_type);
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
+ {
+ node->setBoolValue(*((bool*)val_ptr));
+ return true;
+ }
+ return false;
+}
- if (func == NULL)
+bool LLXUIParser::readStringValue(void* val_ptr)
+{
+ *((std::string*)val_ptr) = mCurReadNode->getSanitizedValue();
+ return true;
+}
+
+bool LLXUIParser::writeStringValue(const void* val_ptr, const name_stack_t& stack)
+{
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
{
- llwarns << "Unknown control type " << ctrl_type << llendl;
- return NULL;
+ node->setStringValue(*((std::string*)val_ptr));
+ return true;
}
+ return false;
+}
- if (parent == NULL)
+bool LLXUIParser::readU8Value(void* val_ptr)
+{
+ return mCurReadNode->getByteValue(1, (U8*)val_ptr);
+}
+
+bool LLXUIParser::writeU8Value(const void* val_ptr, const name_stack_t& stack)
+{
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
{
- if (mDummyPanel == NULL)
- {
- mDummyPanel = new LLPanel;
- }
- parent = mDummyPanel;
+ node->setUnsignedValue(*((U8*)val_ptr));
+ return true;
}
- LLView *ctrl = func(node, parent, this);
+ return false;
+}
- return ctrl;
+bool LLXUIParser::readS8Value(void* val_ptr)
+{
+ S32 value;
+ if(mCurReadNode->getIntValue(1, &value))
+ {
+ *((S8*)val_ptr) = value;
+ return true;
+ }
+ return false;
}
-LLView* LLUICtrlFactory::createWidget(LLPanel *parent, LLXMLNodePtr node)
+bool LLXUIParser::writeS8Value(const void* val_ptr, const name_stack_t& stack)
{
- LLView* view = createCtrlWidget(parent, node);
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
+ {
+ node->setIntValue(*((S8*)val_ptr));
+ return true;
+ }
+ return false;
+}
- S32 tab_group = parent->getLastTabGroup();
- node->getAttributeS32("tab_group", tab_group);
+bool LLXUIParser::readU16Value(void* val_ptr)
+{
+ U32 value;
+ if(mCurReadNode->getUnsignedValue(1, &value))
+ {
+ *((U16*)val_ptr) = value;
+ return true;
+ }
+ return false;
+}
- if (view)
+bool LLXUIParser::writeU16Value(const void* val_ptr, const name_stack_t& stack)
+{
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
{
- parent->addChild(view, tab_group);
+ node->setUnsignedValue(*((U16*)val_ptr));
+ return true;
}
+ return false;
+}
- return view;
+bool LLXUIParser::readS16Value(void* val_ptr)
+{
+ S32 value;
+ if(mCurReadNode->getIntValue(1, &value))
+ {
+ *((S16*)val_ptr) = value;
+ return true;
+ }
+ return false;
}
-//-----------------------------------------------------------------------------
-// createFactoryPanel()
-//-----------------------------------------------------------------------------
-LLPanel* LLUICtrlFactory::createFactoryPanel(const std::string& name)
+bool LLXUIParser::writeS16Value(const void* val_ptr, const name_stack_t& stack)
{
- std::deque<const LLCallbackMap::map_t*>::iterator itor;
- for (itor = mFactoryStack.begin(); itor != mFactoryStack.end(); ++itor)
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
{
- const LLCallbackMap::map_t* factory_map = *itor;
+ node->setIntValue(*((S16*)val_ptr));
+ return true;
+ }
+ return false;
+}
- // Look up this panel's name in the map.
- LLCallbackMap::map_const_iter_t iter = factory_map->find( name );
- if (iter != factory_map->end())
- {
- // Use the factory to create the panel, instead of using a default LLPanel.
- LLPanel *ret = (LLPanel*) iter->second.mCallback( iter->second.mData );
- return ret;
- }
+bool LLXUIParser::readU32Value(void* val_ptr)
+{
+ return mCurReadNode->getUnsignedValue(1, (U32*)val_ptr);
+}
+
+bool LLXUIParser::writeU32Value(const void* val_ptr, const name_stack_t& stack)
+{
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
+ {
+ node->setUnsignedValue(*((U32*)val_ptr));
+ return true;
}
- return NULL;
+ return false;
}
-//-----------------------------------------------------------------------------
+bool LLXUIParser::readS32Value(void* val_ptr)
+{
+ return mCurReadNode->getIntValue(1, (S32*)val_ptr);
+}
-//static
-BOOL LLUICtrlFactory::getAttributeColor(LLXMLNodePtr node, const std::string& name, LLColor4& color)
+bool LLXUIParser::writeS32Value(const void* val_ptr, const name_stack_t& stack)
{
- std::string colorstring;
- BOOL res = node->getAttributeString(name.c_str(), colorstring);
- if (res && LLUI::sColorsGroup)
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
{
- if (LLUI::sColorsGroup->controlExists(colorstring))
- {
- color.setVec(LLUI::sColorsGroup->getColor(colorstring));
- }
- else
- {
- res = FALSE;
- }
+ node->setIntValue(*((S32*)val_ptr));
+ return true;
}
- if (!res)
+ return false;
+}
+
+bool LLXUIParser::readF32Value(void* val_ptr)
+{
+ return mCurReadNode->getFloatValue(1, (F32*)val_ptr);
+}
+
+bool LLXUIParser::writeF32Value(const void* val_ptr, const name_stack_t& stack)
+{
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
{
- res = LLColor4::parseColor(colorstring, &color);
- }
- if (!res)
+ node->setFloatValue(*((F32*)val_ptr));
+ return true;
+ }
+ return false;
+}
+
+bool LLXUIParser::readF64Value(void* val_ptr)
+{
+ return mCurReadNode->getDoubleValue(1, (F64*)val_ptr);
+}
+
+bool LLXUIParser::writeF64Value(const void* val_ptr, const name_stack_t& stack)
+{
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
{
- res = node->getAttributeColor(name.c_str(), color);
+ node->setDoubleValue(*((F64*)val_ptr));
+ return true;
}
- return res;
+ return false;
}
+bool LLXUIParser::readColor4Value(void* val_ptr)
+{
+ LLColor4* colorp = (LLColor4*)val_ptr;
+ if(mCurReadNode->getFloatValue(4, colorp->mV) >= 3)
+ {
+ return true;
+ }
+
+ return false;
+}
+
+bool LLXUIParser::writeColor4Value(const void* val_ptr, const name_stack_t& stack)
+{
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
+ {
+ LLColor4 color = *((LLColor4*)val_ptr);
+ node->setFloatValue(4, color.mV);
+ return true;
+ }
+ return false;
+}
+
+bool LLXUIParser::readUIColorValue(void* val_ptr)
+{
+ LLUIColor* param = (LLUIColor*)val_ptr;
+ LLColor4 color;
+ bool success = mCurReadNode->getFloatValue(4, color.mV) >= 3;
+ if (success)
+ {
+ param->set(color);
+ return true;
+ }
+ return false;
+}
+
+bool LLXUIParser::writeUIColorValue(const void* val_ptr, const name_stack_t& stack)
+{
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
+ {
+ LLUIColor color = *((LLUIColor*)val_ptr);
+ node->setFloatValue(4, color.get().mV);
+ return true;
+ }
+ return false;
+}
+
+bool LLXUIParser::readUUIDValue(void* val_ptr)
+{
+ LLUUID temp_id;
+ // LLUUID::set is destructive, so use temporary value
+ if (temp_id.set(mCurReadNode->getSanitizedValue()))
+ {
+ *(LLUUID*)(val_ptr) = temp_id;
+ return true;
+ }
+ return false;
+}
+
+bool LLXUIParser::writeUUIDValue(const void* val_ptr, const name_stack_t& stack)
+{
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
+ {
+ node->setStringValue(((LLUUID*)val_ptr)->asString());
+ return true;
+ }
+ return false;
+}
+
+bool LLXUIParser::readSDValue(void* val_ptr)
+{
+ *((LLSD*)val_ptr) = LLSD(mCurReadNode->getSanitizedValue());
+ return true;
+}
+
+bool LLXUIParser::writeSDValue(const void* val_ptr, const name_stack_t& stack)
+{
+ LLXMLNodePtr node = getNode(stack);
+ if (node.notNull())
+ {
+ node->setStringValue(((LLSD*)val_ptr)->asString());
+ return true;
+ }
+ return false;
+}
+
+/*virtual*/ std::string LLXUIParser::getCurrentElementName()
+{
+ std::string full_name;
+ for (name_stack_t::iterator it = mNameStack.begin();
+ it != mNameStack.end();
+ ++it)
+ {
+ full_name += it->first + "."; // build up dotted names: "button.param.nestedparam."
+ }
+
+ return full_name;
+}
+
+void LLXUIParser::parserWarning(const std::string& message)
+{
+#ifdef LL_WINDOWS
+ // use Visual Studo friendly formatting of output message for easy access to originating xml
+ llutf16string utf16str = utf8str_to_utf16str(llformat("%s(%d):\t%s", LLUICtrlFactory::getInstance()->getCurFileName().c_str(), mCurReadNode->getLineNumber(), message.c_str()).c_str());
+ utf16str += '\n';
+ OutputDebugString(utf16str.c_str());
+#else
+ Parser::parserWarning(message);
+#endif
+}
+
+void LLXUIParser::parserError(const std::string& message)
+{
+#ifdef LL_WINDOWS
+ llutf16string utf16str = utf8str_to_utf16str(llformat("%s(%d):\t%s", LLUICtrlFactory::getInstance()->getCurFileName().c_str(), mCurReadNode->getLineNumber(), message.c_str()).c_str());
+ utf16str += '\n';
+ OutputDebugString(utf16str.c_str());
+#else
+ Parser::parserError(message);
+#endif
+}
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index 5e7c24efc0..5b04557368 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -33,68 +33,326 @@
#ifndef LLUICTRLFACTORY_H
#define LLUICTRLFACTORY_H
+#include "llcallbackmap.h"
+#include "llinitparam.h"
+#include "llxmlnode.h"
+
+#include <boost/function.hpp>
#include <iosfwd>
#include <stack>
-#include "llcallbackmap.h"
-#include "llfloater.h"
-
-class LLView;
class LLPanel;
+class LLFloater;
+class LLView;
-class LLUICtrlFactory : public LLSingleton<LLUICtrlFactory>
+class LLXUIParser : public LLInitParam::Parser, public LLSingleton<LLXUIParser>
{
+LOG_CLASS(LLXUIParser);
+
+protected:
+ LLXUIParser();
+ friend class LLSingleton<LLXUIParser>;
public:
+ typedef LLInitParam::Parser::name_stack_t name_stack_t;
+
+ /*virtual*/ std::string getCurrentElementName();
+ /*virtual*/ void parserWarning(const std::string& message);
+ /*virtual*/ void parserError(const std::string& message);
+
+ void readXUI(LLXMLNodePtr node, LLInitParam::BaseBlock& block, bool silent=false);
+ void writeXUI(LLXMLNodePtr node, const LLInitParam::BaseBlock& block, const LLInitParam::BaseBlock* diff_block = NULL);
+
+private:
+ typedef std::list<std::pair<std::string, bool> > token_list_t;
+
+ bool readXUIImpl(LLXMLNodePtr node, const std::string& scope, LLInitParam::BaseBlock& block);
+ bool readAttributes(LLXMLNodePtr nodep, LLInitParam::BaseBlock& block);
+
+ //reader helper functions
+ bool readBoolValue(void* val_ptr);
+ bool readStringValue(void* val_ptr);
+ bool readU8Value(void* val_ptr);
+ bool readS8Value(void* val_ptr);
+ bool readU16Value(void* val_ptr);
+ bool readS16Value(void* val_ptr);
+ bool readU32Value(void* val_ptr);
+ bool readS32Value(void* val_ptr);
+ bool readF32Value(void* val_ptr);
+ bool readF64Value(void* val_ptr);
+ bool readColor4Value(void* val_ptr);
+ bool readUIColorValue(void* val_ptr);
+ bool readUUIDValue(void* val_ptr);
+ bool readSDValue(void* val_ptr);
+
+ //writer helper functions
+ bool writeBoolValue(const void* val_ptr, const name_stack_t&);
+ bool writeStringValue(const void* val_ptr, const name_stack_t&);
+ bool writeU8Value(const void* val_ptr, const name_stack_t&);
+ bool writeS8Value(const void* val_ptr, const name_stack_t&);
+ bool writeU16Value(const void* val_ptr, const name_stack_t&);
+ bool writeS16Value(const void* val_ptr, const name_stack_t&);
+ bool writeU32Value(const void* val_ptr, const name_stack_t&);
+ bool writeS32Value(const void* val_ptr, const name_stack_t&);
+ bool writeF32Value(const void* val_ptr, const name_stack_t&);
+ bool writeF64Value(const void* val_ptr, const name_stack_t&);
+ bool writeColor4Value(const void* val_ptr, const name_stack_t&);
+ bool writeUIColorValue(const void* val_ptr, const name_stack_t&);
+ bool writeUUIDValue(const void* val_ptr, const name_stack_t&);
+ bool writeSDValue(const void* val_ptr, const name_stack_t&);
+
+ LLXMLNodePtr getNode(const name_stack_t& stack);
+
+private:
+ Parser::name_stack_t mNameStack;
+ LLXMLNodePtr mCurReadNode;
+ // Root of the widget XML sub-tree, for example, "line_editor"
+ LLXMLNodePtr mWriteRootNode;
+ S32 mLastWriteGeneration;
+ LLXMLNodePtr mLastWrittenChild;
+};
+
+// global static instance for registering all widget types
+typedef boost::function<LLView* (LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)> LLWidgetCreatorFunc;
+
+class LLWidgetCreatorRegistry : public LLRegistrySingleton<std::string, LLWidgetCreatorFunc, LLWidgetCreatorRegistry>
+{
+protected:
+ LLWidgetCreatorRegistry() {}
+
+private:
+ friend class LLSingleton<LLWidgetCreatorRegistry>;
+};
+
+struct LLCompareTypeID
+{
+ bool operator()(const std::type_info* lhs, const std::type_info* rhs) const
+ {
+ return lhs->before(*rhs);
+ }
+};
+
+
+class LLWidgetTemplateRegistry
+: public LLRegistrySingleton<const std::type_info*, std::string, LLWidgetTemplateRegistry, LLCompareTypeID>
+{
+
+};
+
+// local static instance for registering a particular widget
+template<typename T, typename PARAM_BLOCK = typename T::Params>
+class LLRegisterWidget
+: public LLWidgetCreatorRegistry::StaticRegistrar
+{
+public:
+ // register with either the provided builder, or the generic templated builder
+ LLRegisterWidget(const char* tag, LLWidgetCreatorFunc func = NULL);
+};
+
+class LLUICtrlFactory : public LLSingleton<LLUICtrlFactory>
+{
+private:
+ friend class LLSingleton<LLUICtrlFactory>;
LLUICtrlFactory();
- // do not call! needs to be public so run-time can clean up the singleton
- virtual ~LLUICtrlFactory();
+ ~LLUICtrlFactory();
+
+ // only partial specialization allowed in inner classes, so use extra dummy parameter
+ template <typename T, int DUMMY>
+ class ParamDefaults : public LLSingleton<ParamDefaults<T, DUMMY> >
+ {
+ public:
+ ParamDefaults()
+ {
+ // recursively initialize from base class param block
+ ((typename T::base_block_t&)mPrototype).fillFrom(ParamDefaults<typename T::base_block_t, DUMMY>::instance().get());
+ // after initializing base classes, look up template file for this param block
+ std::string* param_block_tag = LLWidgetTemplateRegistry::instance().getValue(&typeid(T));
+ if (param_block_tag)
+ {
+ LLUICtrlFactory::loadWidgetTemplate(*param_block_tag, mPrototype);
+ }
+ }
- void setupPaths();
+ const T& get() { return mPrototype; }
- void buildFloater(LLFloater* floaterp, const std::string &filename,
- const LLCallbackMap::map_t* factory_map = NULL, BOOL open = TRUE);
- BOOL buildPanel(LLPanel* panelp, const std::string &filename,
- const LLCallbackMap::map_t* factory_map = NULL);
+ private:
+ T mPrototype;
+ };
- void removePanel(LLPanel* panelp) { mBuiltPanels.erase(panelp->getHandle()); }
- void removeFloater(LLFloater* floaterp) { mBuiltFloaters.erase(floaterp->getHandle()); }
+ // base case for recursion, there are NO base classes of LLInitParam::BaseBlock
+ template<int DUMMY>
+ class ParamDefaults<LLInitParam::BaseBlock, DUMMY> : public LLSingleton<ParamDefaults<LLInitParam::BaseBlock, DUMMY> >
+ {
+ public:
+ const LLInitParam::BaseBlock& get() { return mBaseBlock; }
+ private:
+ LLInitParam::BaseBlock mBaseBlock;
+ };
- class LLMenuGL *buildMenu(const std::string &filename, LLView* parentp);
- class LLPieMenu *buildPieMenu(const std::string &filename, LLView* parentp);
+public:
+
+ template<typename T>
+ static const T& getDefaultParams()
+ {
+ //#pragma message("Generating ParamDefaults")
+ return ParamDefaults<T, 0>::instance().get();
+ }
+
+ void buildFloater(LLFloater* floaterp, const std::string &filename, BOOL open_floater = TRUE, LLXMLNodePtr output_node = NULL);
+ LLFloater* buildFloaterFromXML(const std::string& filename, BOOL open_floater = TRUE);
+ BOOL buildPanel(LLPanel* panelp, const std::string &filename, LLXMLNodePtr output_node = NULL);
// Does what you want for LLFloaters and LLPanels
// Returns 0 on success
S32 saveToXML(LLView* viewp, const std::string& filename);
- // Rebuilds all currently built panels.
- void rebuild();
+ std::string getCurFileName() { return mFileNames.empty() ? "" : mFileNames.back(); }
static BOOL getAttributeColor(LLXMLNodePtr node, const std::string& name, LLColor4& color);
LLPanel* createFactoryPanel(const std::string& name);
- virtual LLView* createCtrlWidget(LLPanel *parent, LLXMLNodePtr node);
- virtual LLView* createWidget(LLPanel *parent, LLXMLNodePtr node);
+ void pushFactoryFunctions(const LLCallbackMap::map_t* map);
+ void popFactoryFunctions();
- static bool getLayeredXMLNode(const std::string &filename, LLXMLNodePtr& root);
+ template<typename T>
+ static T* create(typename T::Params& params, LLView* parent = NULL)
+ {
+ //#pragma message("Generating LLUICtrlFactory::create")
+ params.fillFrom(ParamDefaults<typename T::Params, 0>::instance().get());
+ //S32 foo = "test";
- static const std::vector<std::string>& getXUIPaths();
+ if (!params.validateBlock())
+ {
+ llwarns << getInstance()->getCurFileName() << ": Invalid parameter block for " << typeid(T).name() << llendl;
+ }
+ T* widget = new T(params);
+ widget->initFromParams(params);
+ if (parent)
+ widget->setParent(parent);
+ return widget;
+ }
-private:
- bool getLayeredXMLNodeImpl(const std::string &filename, LLXMLNodePtr& root);
+ LLView* createFromXML(LLXMLNodePtr node, LLView* parent, const std::string& filename = LLStringUtil::null, LLXMLNodePtr output_node = NULL);
+
+ template<typename T>
+ static T* createFromFile(const std::string &filename, LLView *parent)
+ {
+ //#pragma message("Generating LLUICtrlFactory::createFromFile")
+ T* widget = NULL;
+
+ std::string skinned_filename = findSkinnedFilename(filename);
+ getInstance()->mFileNames.push_back(skinned_filename);
+ {
+ LLXMLNodePtr root_node;
+
+ if (LLUICtrlFactory::getLayeredXMLNode(filename, root_node))
+ {
+ LLView* view = getInstance()->createFromXML(root_node, parent, filename);
+ if (view)
+ {
+ widget = dynamic_cast<T*>(view);
+ // not of right type, so delete it
+ if (!widget)
+ {
+ delete view;
+ view = NULL;
+ }
+
+ }
+ }
+ else
+ {
+ llwarns << "Couldn't parse XUI file: " << skinned_filename << llendl;
+ }
+ }
+ getInstance()->mFileNames.pop_back();
- typedef std::map<LLHandle<LLPanel>, std::string> built_panel_t;
- built_panel_t mBuiltPanels;
+ return widget;
+ }
- typedef std::map<LLHandle<LLFloater>, std::string> built_floater_t;
- built_floater_t mBuiltFloaters;
+ template <class T>
+ static T* createDummyWidget(const std::string& name)
+ {
+ //#pragma message("Generating LLUICtrlFactory::createDummyWidget")
+ typename T::Params params;
+ params.name(name);
+
+ return create<T>(params);
+ }
- std::deque<const LLCallbackMap::map_t*> mFactoryStack;
+ template<typename T, typename PARAM_BLOCK>
+ static T* defaultBuilder(LLXMLNodePtr node, LLView *parent, LLXMLNodePtr output_node)
+ {
+ //#pragma message("Generating LLUICtrlFactory::defaultBuilder")
+ PARAM_BLOCK params(getDefaultParams<PARAM_BLOCK>());
- static std::vector<std::string> sXUIPaths;
+ LLXUIParser::instance().readXUI(node, params);
- LLPanel* mDummyPanel;
+ if (output_node)
+ {
+ // We always want to output top-left coordinates
+ PARAM_BLOCK output_params(params);
+ T::setupParamsForExport(output_params, parent);
+ // Export only the differences between this any default params
+ PARAM_BLOCK default_params(getDefaultParams<PARAM_BLOCK>());
+ output_node->setName(node->getName()->mString);
+ LLXUIParser::instance().writeXUI(
+ output_node, output_params, &default_params);
+ }
+
+ // Apply layout transformations, usually munging rect
+ T::setupParams(params, parent);
+
+ if (!params.validateBlock())
+ {
+ llwarns << getInstance()->getCurFileName() << ": Invalid parameter block for " << typeid(T).name() << llendl;
+ }
+ T* widget = new T(params);
+ widget->initFromParams(params);
+
+ if (parent)
+ {
+ S32 tab_group = params.tab_group.isProvided() ? params.tab_group() : -1;
+ setCtrlParent(widget, parent, tab_group);
+ }
+
+ widget->addChildren(node, output_node);
+
+ if (!widget->postBuild())
+ {
+ delete widget;
+ return NULL;
+ }
+
+ return widget;
+ }
+
+ static bool getLayeredXMLNode(const std::string &filename, LLXMLNodePtr& root);
+
+ static void loadWidgetTemplate(const std::string& widget_tag, LLInitParam::BaseBlock& block);
+
+private:
+ //static void setCtrlValue(LLView* view, LLXMLNodePtr node);
+ static void setCtrlParent(LLView* view, LLView* parent, S32 tab_group);
+
+ // Avoid directly using LLUI and LLDir in the template code
+ static std::string findSkinnedFilename(const std::string& filename);
+
+ typedef std::deque<const LLCallbackMap::map_t*> factory_stack_t;
+ factory_stack_t mFactoryStack;
+
+ LLPanel* mDummyPanel;
+ std::vector<std::string> mFileNames;
};
+// this is here to make gcc happy with reference to LLUICtrlFactory
+template<typename T, typename PARAM_BLOCK>
+LLRegisterWidget<T, PARAM_BLOCK>::LLRegisterWidget(const char* tag, LLWidgetCreatorFunc func)
+: LLWidgetCreatorRegistry::StaticRegistrar(tag, func.empty() ? (LLWidgetCreatorFunc)&LLUICtrlFactory::defaultBuilder<T, PARAM_BLOCK> : func)
+{
+ //FIXME: inventory_panel will register itself with LLPanel::Params but it does have its own params...:(
+ LLWidgetTemplateRegistry::instance().defaultRegistrar().add(&typeid(PARAM_BLOCK), tag);
+}
+
#endif //LLUICTRLFACTORY_H
diff --git a/indra/llui/lluifwd.h b/indra/llui/lluifwd.h
index 32d5c9b44f..f99bb39fdd 100644
--- a/indra/llui/lluifwd.h
+++ b/indra/llui/lluifwd.h
@@ -53,7 +53,6 @@ class LLSlider;
class LLSliderCtrl;
class LLSpinCtrl;
class LLTabContainer;
-class LLTabContainerVertical;
class LLTextBox;
class LLTextEditor;
class LLTextureCtrl;
diff --git a/indra/llui/lluiimage.cpp b/indra/llui/lluiimage.cpp
new file mode 100644
index 0000000000..0ed2283742
--- /dev/null
+++ b/indra/llui/lluiimage.cpp
@@ -0,0 +1,158 @@
+/**
+ * @file lluiimage.cpp
+ * @brief UI implementation
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// Utilities functions the user interface needs
+
+//#include "llviewerprecompiledheaders.h"
+#include "linden_common.h"
+
+// Project includes
+#include "lluiimage.h"
+#include "llui.h"
+
+LLUIImage::LLUIImage(const std::string& name, LLPointer<LLImageGL> image) :
+ mName(name),
+ mImage(image),
+ mScaleRegion(0.f, 1.f, 1.f, 0.f),
+ mClipRegion(0.f, 1.f, 1.f, 0.f),
+ mUniformScaling(TRUE),
+ mNoClip(TRUE)
+{
+}
+
+void LLUIImage::setClipRegion(const LLRectf& region)
+{
+ mClipRegion = region;
+ mNoClip = mClipRegion.mLeft == 0.f
+ && mClipRegion.mRight == 1.f
+ && mClipRegion.mBottom == 0.f
+ && mClipRegion.mTop == 1.f;
+}
+
+void LLUIImage::setScaleRegion(const LLRectf& region)
+{
+ mScaleRegion = region;
+ mUniformScaling = mScaleRegion.mLeft == 0.f
+ && mScaleRegion.mRight == 1.f
+ && mScaleRegion.mBottom == 0.f
+ && mScaleRegion.mTop == 1.f;
+}
+
+//TODO: move drawing implementation inside class
+void LLUIImage::draw(S32 x, S32 y, const LLColor4& color) const
+{
+ gl_draw_image(x, y, mImage, color, mClipRegion);
+}
+
+void LLUIImage::draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const
+{
+ if (mUniformScaling)
+ {
+ gl_draw_scaled_image(x, y, width, height, mImage, color, mClipRegion);
+ }
+ else
+ {
+ gl_draw_scaled_image_with_border(
+ x, y,
+ width, height,
+ mImage,
+ color,
+ FALSE,
+ mClipRegion,
+ mScaleRegion);
+ }
+}
+
+void LLUIImage::drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const
+{
+ gl_draw_scaled_image_with_border(
+ x, y,
+ width, height,
+ mImage,
+ color,
+ TRUE,
+ mClipRegion,
+ mScaleRegion);
+}
+
+void LLUIImage::drawBorder(S32 x, S32 y, S32 width, S32 height, const LLColor4& color, S32 border_width) const
+{
+ LLRect border_rect;
+ border_rect.setOriginAndSize(x, y, width, height);
+ border_rect.stretch(border_width, border_width);
+ drawSolid(border_rect, color);
+}
+
+S32 LLUIImage::getWidth() const
+{
+ // return clipped dimensions of actual image area
+ return llround((F32)mImage->getWidth(0) * mClipRegion.getWidth());
+}
+
+S32 LLUIImage::getHeight() const
+{
+ // return clipped dimensions of actual image area
+ return llround((F32)mImage->getHeight(0) * mClipRegion.getHeight());
+}
+
+S32 LLUIImage::getTextureWidth() const
+{
+ return mImage->getWidth(0);
+}
+
+S32 LLUIImage::getTextureHeight() const
+{
+ return mImage->getHeight(0);
+}
+
+namespace LLInitParam
+{
+ LLUIImage* TypedParam<LLUIImage*>::getValueFromBlock() const
+ {
+ LLUIImage* imagep = LLUI::getUIImage(name());
+ if (!imagep)
+ {
+ // default to current value
+ imagep = mData.mValue;
+ }
+ return imagep;
+ }
+
+ template<>
+ bool ParamCompare<LLUIImage*>::equals(
+ LLUIImage* const &a,
+ LLUIImage* const &b)
+ {
+ // force all LLUIImages for XML UI export to be "non-default"
+ return false;
+ }
+}
diff --git a/indra/llui/lluiimage.h b/indra/llui/lluiimage.h
new file mode 100644
index 0000000000..cd660a0954
--- /dev/null
+++ b/indra/llui/lluiimage.h
@@ -0,0 +1,113 @@
+/**
+ * @file lluiimage.h
+ * @brief wrapper for images used in the UI that handles smart scaling, etc.
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLUIIMAGE_H
+#define LL_LLUIIMAGE_H
+
+#include "llgl.h"
+#include "llimagegl.h"
+#include "llrefcount.h"
+#include "llrect.h"
+#include <boost/function.hpp>
+#include "llinitparam.h"
+
+extern const LLColor4 UI_VERTEX_COLOR;
+
+class LLUIImage : public LLRefCount
+{
+public:
+ LLUIImage(const std::string& name, LLPointer<LLImageGL> image);
+
+ void setClipRegion(const LLRectf& region);
+ void setScaleRegion(const LLRectf& region);
+
+ LLPointer<LLImageGL> getImage() { return mImage; }
+ const LLPointer<LLImageGL>& getImage() const { return mImage; }
+
+ void draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color = UI_VERTEX_COLOR) const;
+ void draw(S32 x, S32 y, const LLColor4& color = UI_VERTEX_COLOR) const;
+ void draw(const LLRect& rect, const LLColor4& color = UI_VERTEX_COLOR) const { draw(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color); }
+
+ void drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color) const;
+ void drawSolid(const LLRect& rect, const LLColor4& color) const { drawSolid(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color); }
+ void drawSolid(S32 x, S32 y, const LLColor4& color) const { drawSolid(x, y, mImage->getWidth(0), mImage->getHeight(0), color); }
+
+ void drawBorder(S32 x, S32 y, S32 width, S32 height, const LLColor4& color, S32 border_width) const;
+ void drawBorder(const LLRect& rect, const LLColor4& color, S32 border_width) const { drawBorder(rect.mLeft, rect.mBottom, rect.getWidth(), rect.getHeight(), color, border_width); }
+ void drawBorder(S32 x, S32 y, const LLColor4& color, S32 border_width) const { drawBorder(x, y, mImage->getWidth(0), mImage->getHeight(0), color, border_width); }
+
+ const std::string& getName() const { return mName; }
+
+ S32 getWidth() const;
+ S32 getHeight() const;
+
+ // returns dimensions of underlying textures, which might not be equal to ui image portion
+ S32 getTextureWidth() const;
+ S32 getTextureHeight() const;
+
+protected:
+ std::string mName;
+ LLRectf mScaleRegion;
+ LLRectf mClipRegion;
+ LLPointer<LLImageGL> mImage;
+ BOOL mUniformScaling;
+ BOOL mNoClip;
+};
+
+namespace LLInitParam
+{
+ template<>
+ class TypedParam<LLUIImage*, TypeValues<LLUIImage*>, false>
+ : public BlockValue<LLUIImage*>
+ {
+ typedef boost::add_reference<boost::add_const<LLUIImage*>::type>::type T_const_ref;
+ typedef BlockValue<LLUIImage*> super_t;
+ public:
+ Optional<std::string> name;
+
+ TypedParam(BlockDescriptor& descriptor, const std::string& name, super_t::value_assignment_t value, ParamDescriptor::validation_func_t func)
+ : super_t(descriptor, name, value, func)
+ {
+ }
+
+ LLUIImage* getValueFromBlock() const;
+ };
+
+ // Need custom comparison function for our test app, which only loads
+ // LLUIImage* as NULL.
+ template<>
+ bool ParamCompare<LLUIImage*>::equals(
+ LLUIImage* const &a, LLUIImage* const &b);
+}
+
+typedef LLPointer<LLUIImage> LLUIImagePtr;
+#endif
diff --git a/indra/llui/lluistring.cpp b/indra/llui/lluistring.cpp
index 0b76b8e814..ce73990d27 100644
--- a/indra/llui/lluistring.cpp
+++ b/indra/llui/lluistring.cpp
@@ -33,6 +33,7 @@
#include "linden_common.h"
#include "lluistring.h"
#include "llsd.h"
+#include "lltrans.h"
const LLStringUtil::format_map_t LLUIString::sNullArgs;
@@ -112,6 +113,10 @@ void LLUIString::clear()
void LLUIString::format()
{
mResult = mOrig;
- LLStringUtil::format(mResult, mArgs);
+
+ // get the defailt args + local args
+ LLStringUtil::format_map_t combined_args = LLTrans::getDefaultArgs();
+ combined_args.insert(mArgs.begin(), mArgs.end());
+ LLStringUtil::format(mResult, combined_args);
mWResult = utf8str_to_wstring(mResult);
}
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 2350ea6050..462fd16b60 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -56,17 +56,18 @@
#include "lltexteditor.h"
#include "lltextbox.h"
-//HACK: this allows you to instantiate LLView from xml with "<view/>" which we don't want
-static LLRegisterWidget<LLView> r("view");
-
BOOL LLView::sDebugRects = FALSE;
BOOL LLView::sDebugKeys = FALSE;
S32 LLView::sDepth = 0;
BOOL LLView::sDebugMouseHandling = FALSE;
std::string LLView::sMouseHandlerMessage;
-BOOL LLView::sEditingUI = FALSE;
+//BOOL LLView::sEditingUI = FALSE;
BOOL LLView::sForceReshape = FALSE;
-LLView* LLView::sEditingUIView = NULL;
+//LLView* LLView::sEditingUIView = NULL;
+std::set<LLView*> LLView::sPreviewHighlightedElements;
+BOOL LLView::sHighlightingDiffs = FALSE;
+LLView* LLView::sPreviewClickedElement = NULL;
+BOOL LLView::sDrawPreviewHighlights = FALSE;
S32 LLView::sLastLeftXML = S32_MIN;
S32 LLView::sLastBottomXML = S32_MIN;
@@ -74,77 +75,76 @@ S32 LLView::sLastBottomXML = S32_MIN;
BOOL LLView::sIsDrawing = FALSE;
#endif
-LLView::LLView() :
- mParentView(NULL),
- mReshapeFlags(FOLLOWS_NONE),
- mDefaultTabGroup(0),
- mEnabled(TRUE),
- mMouseOpaque(TRUE),
- mSoundFlags(MOUSE_UP), // default to only make sound on mouse up
- mSaveToXML(TRUE),
- mIsFocusRoot(FALSE),
- mLastVisible(TRUE),
- mUseBoundingRect(FALSE),
- mVisible(TRUE),
- mNextInsertionOrdinal(0),
- mHoverCursor(UI_CURSOR_ARROW)
-{
-}
-
-LLView::LLView(const std::string& name, BOOL mouse_opaque) :
+LLView::Params::Params()
+: name("name", std::string("unnamed")),
+ enabled("enabled", true),
+ visible("visible", true),
+ mouse_opaque("mouse_opaque", true),
+ follows("follows"),
+ hover_cursor("hover_cursor", "UI_CURSOR_ARROW"),
+ use_bounding_rect("use_bounding_rect", false),
+ tab_group("tab_group", 0),
+ default_tab_group("default_tab_group"),
+ tool_tip("tool_tip"),
+ sound_flags("sound_flags", MOUSE_UP),
+ font("font", LLFontGL::getFontSansSerif()),
+ font_halign("halign"),
+ font_valign("valign"),
+ layout("layout"),
+ rect("rect"),
+ bottom_delta("bottom_delta", S32_MAX),
+ left_delta("left_delta", S32_MAX),
+ top_delta("top_delta"),
+ right_delta("right_delta"),
+ center_horiz("center_horiz", false),
+ center_vert("center_vert", false),
+ serializable("", false),
+ user_resize("user_resize"),
+ auto_resize("auto_resize"),
+ needs_translate("translate")
+{
+ addSynonym(rect, "");
+}
+
+LLView::LLView(const LLView::Params& p)
+: mName(p.name),
mParentView(NULL),
- mName(name),
mReshapeFlags(FOLLOWS_NONE),
- mDefaultTabGroup(0),
- mEnabled(TRUE),
- mMouseOpaque(mouse_opaque),
- mSoundFlags(MOUSE_UP), // default to only make sound on mouse up
- mSaveToXML(TRUE),
- mIsFocusRoot(FALSE),
- mLastVisible(TRUE),
- mUseBoundingRect(FALSE),
- mVisible(TRUE),
- mNextInsertionOrdinal(0),
- mHoverCursor(UI_CURSOR_ARROW)
-{
-}
-
-
-LLView::LLView(
- const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 reshape) :
- mParentView(NULL),
- mName(name),
- mRect(rect),
- mBoundingRect(rect),
- mReshapeFlags(reshape),
- mDefaultTabGroup(0),
- mEnabled(TRUE),
- mMouseOpaque(mouse_opaque),
- mSoundFlags(MOUSE_UP), // default to only make sound on mouse up
- mSaveToXML(TRUE),
+ mSaveToXML(p.serializable),
mIsFocusRoot(FALSE),
- mLastVisible(TRUE),
- mUseBoundingRect(FALSE),
- mVisible(TRUE),
+ mLastVisible(FALSE),
mNextInsertionOrdinal(0),
- mHoverCursor(UI_CURSOR_ARROW)
+ mHoverCursor(getCursorFromString(p.hover_cursor)),
+ mEnabled(p.enabled),
+ mVisible(p.visible),
+ mMouseOpaque(p.mouse_opaque),
+ mSoundFlags(p.sound_flags),
+ mUseBoundingRect(p.use_bounding_rect),
+ mDefaultTabGroup(p.default_tab_group),
+ mLastTabGroup(0),
+ mToolTipMsg((LLStringExplicit)p.tool_tip())
{
+ // create rect first, as this will supply initial follows flags
+ setShape(p.rect);
+ parseFollowsFlags(p);
}
-
LLView::~LLView()
{
//llinfos << "Deleting view " << mName << ":" << (void*) this << llendl;
// llassert(LLView::sIsDrawing == FALSE);
+
+// llassert_always(sDepth == 0); // avoid deleting views while drawing! It can subtly break list iterators
+
if( gFocusMgr.getKeyboardFocus() == this )
{
- llwarns << "View holding keyboard focus deleted: " << getName() << ". Keyboard focus removed." << llendl;
+ //llwarns << "View holding keyboard focus deleted: " << getName() << ". Keyboard focus removed." << llendl;
gFocusMgr.removeKeyboardFocusWithoutCallback( this );
}
if( hasMouseCapture() )
{
- llwarns << "View holding mouse capture deleted: " << getName() << ". Mouse capture removed." << llendl;
+ //llwarns << "View holding mouse capture deleted: " << getName() << ". Mouse capture removed." << llendl;
gFocusMgr.removeMouseCaptureWithoutCallback( this );
}
@@ -155,14 +155,6 @@ LLView::~LLView()
mParentView->removeChild(this);
}
- dispatch_list_t::iterator itor;
- for (itor = mDispatchList.begin(); itor != mDispatchList.end(); ++itor)
- {
- (*itor).second->clearDispatchers();
- }
-
- std::for_each(mFloaterControls.begin(), mFloaterControls.end(),
- DeletePairedPointer());
std::for_each(mDummyWidgets.begin(), mDummyWidgets.end(),
DeletePairedPointer());
}
@@ -185,7 +177,6 @@ BOOL LLView::isPanel() const
return FALSE;
}
-// virtual
void LLView::setToolTip(const LLStringExplicit& msg)
{
mToolTipMsg = msg;
@@ -232,19 +223,31 @@ const std::string& LLView::getName() const
void LLView::sendChildToFront(LLView* child)
{
+// llassert_always(sDepth == 0); // Avoid re-ordering while drawing; it can cause subtle iterator bugs
if (child && child->getParent() == this)
{
- mChildList.remove( child );
- mChildList.push_front(child);
+ // minor optimization, but more importantly,
+ // won't temporarily create an empty list
+ if (child != mChildList.front())
+ {
+ mChildList.remove( child );
+ mChildList.push_front(child);
+ }
}
}
void LLView::sendChildToBack(LLView* child)
{
+// llassert_always(sDepth == 0); // Avoid re-ordering while drawing; it can cause subtle iterator bugs
if (child && child->getParent() == this)
{
- mChildList.remove( child );
- mChildList.push_back(child);
+ // minor optimization, but more importantly,
+ // won't temporarily create an empty list
+ if (child != mChildList.back())
+ {
+ mChildList.remove( child );
+ mChildList.push_back(child);
+ }
}
}
@@ -264,12 +267,46 @@ void LLView::moveChildToBackOfTabGroup(LLUICtrl* child)
}
}
-void LLView::addChild(LLView* child, S32 tab_group)
+void LLView::addChildren(LLXMLNodePtr node, LLXMLNodePtr output_node)
+{
+ if (node.isNull()) return;
+
+ for (LLXMLNodePtr child_node = node->getFirstChild(); child_node.notNull(); child_node = child_node->getNextSibling())
+ {
+ LLXMLNodePtr outputChild;
+ if (output_node)
+ {
+ outputChild = output_node->createChild("", FALSE);
+ }
+
+ if (!LLUICtrlFactory::getInstance()->createFromXML(child_node, this, LLStringUtil::null, outputChild))
+ {
+ std::string child_name = std::string(child_node->getName()->mString);
+ if (child_name.find(".") == std::string::npos)
+ {
+ llwarns << "Could not create widget named " << child_node->getName()->mString << llendl;
+ }
+ }
+
+ if (outputChild && !outputChild->mChildren && outputChild->mAttributes.empty() && outputChild->getValue().empty())
+ {
+ output_node->deleteChild(outputChild);
+ }
+ }
+}
+
+// virtual
+bool LLView::addChild(LLView* child, S32 tab_group)
{
+ if (!child)
+ {
+ return false;
+ }
if (mParentView == child)
{
llerrs << "Adding view " << child->getName() << " as child of itself" << llendl;
}
+
// remove from current parent
if (child->mParentView)
{
@@ -282,55 +319,46 @@ void LLView::addChild(LLView* child, S32 tab_group)
// add to ctrl list if is LLUICtrl
if (child->isCtrl())
{
- // controls are stored in reverse order from render order
- addCtrlAtEnd((LLUICtrl*) child, tab_group);
+ LLUICtrl* ctrl = static_cast<LLUICtrl*>(child);
+ mCtrlOrder.insert(tab_order_pair_t(ctrl,
+ tab_order_t(tab_group, mNextInsertionOrdinal)));
+
+ mNextInsertionOrdinal++;
}
child->mParentView = this;
updateBoundingRect();
+ mLastTabGroup = tab_group;
+ return true;
}
-void LLView::addChildAtEnd(LLView* child, S32 tab_group)
+bool LLView::addChildInBack(LLView* child, S32 tab_group)
{
- if (mParentView == child)
- {
- llerrs << "Adding view " << child->getName() << " as child of itself" << llendl;
- }
- // remove from current parent
- if (child->mParentView)
+ if(addChild(child, tab_group))
{
- child->mParentView->removeChild(child);
+ sendChildToBack(child);
+ return true;
}
- // add to back of child list
- mChildList.push_back(child);
-
- // add to ctrl list if is LLUICtrl
- if (child->isCtrl())
- {
- // controls are stored in reverse order from render order
- addCtrl((LLUICtrl*) child, tab_group);
- }
-
- child->mParentView = this;
- updateBoundingRect();
+ return false;
}
// remove the specified child from the view, and set it's parent to NULL.
-void LLView::removeChild(LLView* child, BOOL deleteIt)
+void LLView::removeChild(LLView* child)
{
+ //llassert_always(sDepth == 0); // Avoid re-ordering while drawing; it can cause subtle iterator bugs
if (child->mParentView == this)
{
mChildList.remove( child );
child->mParentView = NULL;
if (child->isCtrl())
{
- removeCtrl((LLUICtrl*)child);
- }
- if (deleteIt)
- {
- delete child;
+ child_tab_order_t::iterator found = mCtrlOrder.find(static_cast<LLUICtrl*>(child));
+ if(found != mCtrlOrder.end())
+ {
+ mCtrlOrder.erase(found);
+ }
}
}
else
@@ -340,28 +368,6 @@ void LLView::removeChild(LLView* child, BOOL deleteIt)
updateBoundingRect();
}
-void LLView::addCtrlAtEnd(LLUICtrl* ctrl, S32 tab_group)
-{
- mCtrlOrder.insert(tab_order_pair_t(ctrl,
- tab_order_t(tab_group, mNextInsertionOrdinal++)));
-}
-
-void LLView::addCtrl( LLUICtrl* ctrl, S32 tab_group)
-{
- // add to front of list by using negative ordinal, which monotonically increases
- mCtrlOrder.insert(tab_order_pair_t(ctrl,
- tab_order_t(tab_group, -1 * mNextInsertionOrdinal++)));
-}
-
-void LLView::removeCtrl(LLUICtrl* ctrl)
-{
- child_tab_order_t::iterator found = mCtrlOrder.find(ctrl);
- if(found != mCtrlOrder.end())
- {
- mCtrlOrder.erase(found);
- }
-}
-
LLView::ctrl_list_t LLView::getCtrlList() const
{
ctrl_list_t controls;
@@ -651,7 +657,7 @@ BOOL LLView::canSnapTo(const LLView* other_view)
}
// virtual
-void LLView::snappedTo(const LLView* snap_view)
+void LLView::setSnappedTo(const LLView* snap_view)
{
}
@@ -669,6 +675,17 @@ BOOL LLView::handleHover(S32 x, S32 y, MASK mask)
return handled;
}
+void LLView::onMouseEnter(S32 x, S32 y, MASK mask)
+{
+ //llinfos << "Mouse entered " << getName() << llendl;
+}
+
+void LLView::onMouseLeave(S32 x, S32 y, MASK mask)
+{
+ //llinfos << "Mouse left " << getName() << llendl;
+}
+
+
std::string LLView::getShowNamesToolTip()
{
LLView* view = getParent();
@@ -729,23 +746,14 @@ BOOL LLView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_s
// get our own tooltip
tool_tip = mToolTipMsg.getString();
- if (
- LLUI::sShowXUINames
+
+ if (LLUI::sShowXUINames
&& (tool_tip.find(".xml", 0) == std::string::npos)
&& (mName.find("Drag", 0) == std::string::npos))
{
tool_tip = getShowNamesToolTip();
}
- BOOL show_names_text_box = LLUI::sShowXUINames && dynamic_cast<LLTextBox*>(this) != NULL;
-
- // don't allow any siblings to handle this event
- // even if we don't have a tooltip
- if (getMouseOpaque() || show_names_text_box)
- {
- handled = TRUE;
- }
-
if(!tool_tip.empty())
{
msg = tool_tip;
@@ -757,7 +765,13 @@ BOOL LLView::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_s
localPointToScreen(
mRect.getWidth(), mRect.getHeight(),
&(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) );
-
+ }
+ // don't allow any siblings to handle this event
+ // even if we don't have a tooltip
+ if (getMouseOpaque() ||
+ (!tool_tip.empty() &&
+ (!LLUI::sShowXUINames || dynamic_cast<LLTextBox*>(this))))
+ {
handled = TRUE;
}
@@ -923,22 +937,22 @@ BOOL LLView::handleMouseDown(S32 x, S32 y, MASK mask)
handled_view = this;
}
- // HACK If we're editing UI, select the leaf view that ate the click.
- if (sEditingUI && handled_view)
- {
- // need to find leaf views, big hack
- LLButton* buttonp = dynamic_cast<LLButton*>(handled_view);
- LLLineEditor* line_editorp = dynamic_cast<LLLineEditor*>(handled_view);
- LLTextEditor* text_editorp = dynamic_cast<LLTextEditor*>(handled_view);
- LLTextBox* text_boxp = dynamic_cast<LLTextBox*>(handled_view);
- if (buttonp
- || line_editorp
- || text_editorp
- || text_boxp)
- {
- sEditingUIView = handled_view;
- }
- }
+ //// HACK If we're editing UI, select the leaf view that ate the click.
+ //if (sEditingUI && handled_view)
+ //{
+ // // need to find leaf views, big hack
+ // LLButton* buttonp = dynamic_cast<LLButton*>(handled_view);
+ // LLLineEditor* line_editorp = dynamic_cast<LLLineEditor*>(handled_view);
+ // LLTextEditor* text_editorp = dynamic_cast<LLTextEditor*>(handled_view);
+ // LLTextBox* text_boxp = dynamic_cast<LLTextBox*>(handled_view);
+ // if (buttonp
+ // || line_editorp
+ // || text_editorp
+ // || text_boxp)
+ // {
+ // sEditingUIView = handled_view;
+ // }
+ //}
return handled;
}
@@ -1164,6 +1178,7 @@ LLView* LLView::childrenHandleRightMouseDown(S32 x, S32 y, MASK mask)
{
sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
}
+
handled_view = viewp;
break;
}
@@ -1326,55 +1341,58 @@ void LLView::draw()
}
}
- LLRect rootRect = getRootView()->getRect();
- LLRect screenRect;
-
- // draw focused control on top of everything else
- LLView* focus_view = gFocusMgr.getKeyboardFocus();
- if (focus_view && focus_view->getParent() != this)
+ if (!mChildList.empty())
{
- focus_view = NULL;
- }
+ LLRect rootRect = getRootView()->getRect();
+ LLRect screenRect;
- ++sDepth;
- for (child_list_reverse_iter_t child_iter = mChildList.rbegin(); child_iter != mChildList.rend(); ++child_iter)
- {
- LLView *viewp = *child_iter;
+ // draw focused control on top of everything else
+ LLView* focus_view = gFocusMgr.getKeyboardFocus();
+ if (focus_view && focus_view->getParent() != this)
+ {
+ focus_view = NULL;
+ }
+
+ ++sDepth;
- if (viewp->getVisible() && viewp != focus_view && viewp->getRect().isValid())
+ for (child_list_reverse_iter_t child_iter = mChildList.rbegin(); child_iter != mChildList.rend();) // ++child_iter)
{
- // Only draw views that are within the root view
- localRectToScreen(viewp->getRect(),&screenRect);
- if ( rootRect.rectInRect(&screenRect) )
+ child_list_reverse_iter_t child = child_iter++;
+ LLView *viewp = *child;
+
+ if (viewp->getVisible() && viewp != focus_view && viewp->getRect().isValid())
{
- glMatrixMode(GL_MODELVIEW);
- LLUI::pushMatrix();
+ // Only draw views that are within the root view
+ localRectToScreen(viewp->getRect(),&screenRect);
+ if ( rootRect.rectInRect(&screenRect) )
{
- LLUI::translate((F32)viewp->getRect().mLeft, (F32)viewp->getRect().mBottom, 0.f);
- viewp->draw();
+ glMatrixMode(GL_MODELVIEW);
+ LLUI::pushMatrix();
+ {
+ LLUI::translate((F32)viewp->getRect().mLeft, (F32)viewp->getRect().mBottom, 0.f);
+ viewp->draw();
+ }
+ LLUI::popMatrix();
}
- LLUI::popMatrix();
}
- }
- }
- --sDepth;
+ }
+ --sDepth;
- if (focus_view && focus_view->getVisible())
- {
- drawChild(focus_view);
+ if (focus_view && focus_view->getVisible())
+ {
+ drawChild(focus_view);
+ }
}
- // HACK
- if (sEditingUI && this == sEditingUIView)
- {
- drawDebugRect();
- }
+ gGL.getTexUnit(0)->disable();
}
//Draw a box for debugging.
void LLView::drawDebugRect()
{
+ std::set<LLView*>::iterator preview_iter = std::find(sPreviewHighlightedElements.begin(), sPreviewHighlightedElements.end(), this); // figure out if it's a previewed element
+
LLUI::pushMatrix();
{
// drawing solids requires texturing be disabled
@@ -1389,9 +1407,21 @@ void LLView::drawDebugRect()
// draw red rectangle for the border
LLColor4 border_color(0.f, 0.f, 0.f, 1.f);
- if (sEditingUI)
+ //if (sEditingUI)
+ //{
+ // border_color.mV[0] = 1.f;
+ //}
+ if(preview_iter != sPreviewHighlightedElements.end())
{
- border_color.mV[0] = 1.f;
+ if(LLView::sPreviewClickedElement && this == sPreviewClickedElement)
+ {
+ border_color = LLColor4::red;
+ }
+ else
+ {
+ static LLUICachedControl<LLColor4> scroll_highlighted_color ("ScrollHighlightedColor", *(new LLColor4));
+ border_color = scroll_highlighted_color;
+ }
}
else
{
@@ -1414,8 +1444,8 @@ void LLView::drawDebugRect()
gGL.vertex2i(0, debug_rect.getHeight() - 1);
gGL.end();
- // Draw the name if it's not a leaf node
- if (mChildList.size() && !sEditingUI)
+ // Draw the name if it's not a leaf node or not in editing or preview mode
+ if (mChildList.size() && preview_iter == sPreviewHighlightedElements.end())
{
//char temp[256];
S32 x, y;
@@ -1425,7 +1455,7 @@ void LLView::drawDebugRect()
std::string debug_text = llformat("%s (%d x %d)", getName().c_str(),
debug_rect.getWidth(), debug_rect.getHeight());
LLFontGL::getFontSansSerifSmall()->renderUTF8(debug_text, 0, (F32)x, (F32)y, border_color,
- LLFontGL::HCENTER, LLFontGL::BASELINE, LLFontGL::NORMAL,
+ LLFontGL::HCENTER, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
S32_MAX, S32_MAX, NULL, FALSE);
}
}
@@ -1581,15 +1611,28 @@ void LLView::updateBoundingRect()
}
}
-LLRect LLView::getScreenRect() const
+LLRect LLView::calcScreenRect() const
{
- // *FIX: check for one-off error
LLRect screen_rect;
localPointToScreen(0, 0, &screen_rect.mLeft, &screen_rect.mBottom);
localPointToScreen(getRect().getWidth(), getRect().getHeight(), &screen_rect.mRight, &screen_rect.mTop);
return screen_rect;
}
+LLRect LLView::calcScreenBoundingRect() const
+{
+ LLRect screen_rect;
+ // get bounding rect, if used
+ LLRect bounding_rect = mUseBoundingRect ? mBoundingRect : mRect;
+
+ // convert to local coordinates, as defined by mRect
+ bounding_rect.translate(-mRect.mLeft, -mRect.mBottom);
+
+ localPointToScreen(bounding_rect.mLeft, bounding_rect.mBottom, &screen_rect.mLeft, &screen_rect.mBottom);
+ localPointToScreen(bounding_rect.mRight, bounding_rect.mTop, &screen_rect.mRight, &screen_rect.mTop);
+ return screen_rect;
+}
+
LLRect LLView::getLocalBoundingRect() const
{
LLRect local_bounding_rect = getBoundingRect();
@@ -1688,7 +1731,12 @@ LLView* LLView::getChildView(const std::string& name, BOOL recurse, BOOL create_
if (create_if_missing)
{
- return createDummyWidget<LLView>(name);
+ LLView* view = getDummyWidget<LLView>(name);
+ if (!view)
+ {
+ view = LLUICtrlFactory::createDummyWidget<LLView>(name);
+ }
+ return view;
}
return NULL;
}
@@ -1777,12 +1825,32 @@ LLView* LLView::getRootView()
return view;
}
-BOOL LLView::deleteViewByHandle(LLHandle<LLView> handle)
+LLView* LLView::findPrevSibling(LLView* child)
+{
+ child_list_t::iterator prev_it = std::find(mChildList.begin(), mChildList.end(), child);
+ if (prev_it != mChildList.end() && prev_it != mChildList.begin())
+ {
+ return *(--prev_it);
+ }
+ return NULL;
+}
+
+LLView* LLView::findNextSibling(LLView* child)
+{
+ child_list_t::iterator next_it = std::find(mChildList.begin(), mChildList.end(), child);
+ if (next_it != mChildList.end())
+ {
+ next_it++;
+ }
+
+ return (next_it != mChildList.end()) ? *next_it : NULL;
+}
+
+void LLView::deleteViewByHandle(LLHandle<LLView> handle)
{
LLView* viewp = handle.get();
delete viewp;
- return viewp != NULL;
}
@@ -1943,132 +2011,6 @@ BOOL LLView::localRectToOtherView( const LLRect& local, LLRect* other, LLView* o
return FALSE;
}
-// virtual
-LLXMLNodePtr LLView::getXML(bool save_children) const
-{
- //FIXME: need to provide actual derived type tag, probably outside this method
- LLXMLNodePtr node = new LLXMLNode("view", FALSE);
-
- node->createChild("name", TRUE)->setStringValue(getName());
- node->createChild("width", TRUE)->setIntValue(getRect().getWidth());
- node->createChild("height", TRUE)->setIntValue(getRect().getHeight());
-
- LLView* parent = getParent();
- S32 left = getRect().mLeft;
- S32 bottom = getRect().mBottom;
- if (parent) bottom -= parent->getRect().getHeight();
-
- node->createChild("left", TRUE)->setIntValue(left);
- node->createChild("bottom", TRUE)->setIntValue(bottom);
-
- U32 follows_flags = getFollows();
- if (follows_flags)
- {
- std::stringstream buffer;
- bool pipe = false;
- if (followsLeft())
- {
- buffer << "left";
- pipe = true;
- }
- if (followsTop())
- {
- if (pipe) buffer << "|";
- buffer << "top";
- pipe = true;
- }
- if (followsRight())
- {
- if (pipe) buffer << "|";
- buffer << "right";
- pipe = true;
- }
- if (followsBottom())
- {
- if (pipe) buffer << "|";
- buffer << "bottom";
- }
- node->createChild("follows", TRUE)->setStringValue(buffer.str());
- }
- // Export all widgets as enabled and visible - code must disable.
- node->createChild("mouse_opaque", TRUE)->setBoolValue(mMouseOpaque );
- if (!mToolTipMsg.getString().empty())
- {
- node->createChild("tool_tip", TRUE)->setStringValue(mToolTipMsg.getString());
- }
- if (mSoundFlags != MOUSE_UP)
- {
- node->createChild("sound_flags", TRUE)->setIntValue((S32)mSoundFlags);
- }
-
- node->createChild("enabled", TRUE)->setBoolValue(getEnabled());
-
- if (!mControlName.empty())
- {
- node->createChild("control_name", TRUE)->setStringValue(mControlName);
- }
- return node;
-}
-
-//static
-LLView* LLView::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- LLView* viewp = new LLView();
- viewp->initFromXML(node, parent);
- return viewp;
-}
-
-// static
-void LLView::addColorXML(LLXMLNodePtr node, const LLColor4& color,
- const char* xml_name, const char* control_name)
-{
- if (color != LLUI::sColorsGroup->getColor(ll_safe_string(control_name)))
- {
- node->createChild(xml_name, TRUE)->setFloatValue(4, color.mV);
- }
-}
-
-//static
-std::string LLView::escapeXML(const std::string& xml, std::string& indent)
-{
- std::string ret = indent + "\"" + LLXMLNode::escapeXML(xml);
-
- //replace every newline with a close quote, new line, indent, open quote
- size_t index = ret.size()-1;
- size_t fnd;
-
- while ((fnd = ret.rfind("\n", index)) != std::string::npos)
- {
- ret.replace(fnd, 1, "\"\n" + indent + "\"");
- index = fnd-1;
- }
-
- //append close quote
- ret.append("\"");
-
- return ret;
-}
-
-// static
-LLWString LLView::escapeXML(const LLWString& xml)
-{
- LLWString out;
- for (LLWString::size_type i = 0; i < xml.size(); ++i)
- {
- llwchar c = xml[i];
- switch(c)
- {
- case '"': out.append(utf8string_to_wstring(""")); break;
- case '\'': out.append(utf8string_to_wstring("'")); break;
- case '&': out.append(utf8string_to_wstring("&")); break;
- case '<': out.append(utf8string_to_wstring("<")); break;
- case '>': out.append(utf8string_to_wstring(">")); break;
- default: out.push_back(c); break;
- }
- }
- return out;
-}
-
// static
const LLCtrlQuery & LLView::getTabOrderQuery()
{
@@ -2105,7 +2047,12 @@ const LLCtrlQuery & LLView::getFocusRootsQuery()
}
-void LLView::userSetShape(const LLRect& new_rect)
+void LLView::setShape(const LLRect& new_rect, bool by_user)
+{
+ handleReshape(new_rect, by_user);
+}
+
+void LLView::handleReshape(const LLRect& new_rect, bool by_user)
{
reshape(new_rect.getWidth(), new_rect.getHeight());
translate(new_rect.mLeft - getRect().mLeft, new_rect.mBottom - getRect().mBottom);
@@ -2353,306 +2300,52 @@ LLView* LLView::findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESna
// Listener dispatch functions
//-----------------------------------------------------------------------------
-void LLView::registerEventListener(std::string name, LLSimpleListener* function)
-{
- mDispatchList.insert(std::pair<std::string, LLSimpleListener*>(name, function));
-}
-
-void LLView::deregisterEventListener(std::string name)
-{
- dispatch_list_t::iterator itor = mDispatchList.find(name);
- if (itor != mDispatchList.end())
- {
- mDispatchList.erase(itor);
- }
-}
-
-std::string LLView::findEventListener(LLSimpleListener *listener) const
-{
- dispatch_list_t::const_iterator itor;
- for (itor = mDispatchList.begin(); itor != mDispatchList.end(); ++itor)
- {
- if (itor->second == listener)
- {
- return itor->first;
- }
- }
- if (mParentView)
- {
- return mParentView->findEventListener(listener);
- }
- return LLStringUtil::null;
-}
-
-LLSimpleListener* LLView::getListenerByName(const std::string& callback_name)
-{
- LLSimpleListener* callback = NULL;
- dispatch_list_t::iterator itor = mDispatchList.find(callback_name);
- if (itor != mDispatchList.end())
- {
- callback = itor->second;
- }
- else if (mParentView)
- {
- callback = mParentView->getListenerByName(callback_name);
- }
- return callback;
-}
LLControlVariable *LLView::findControl(const std::string& name)
{
- control_map_t::iterator itor = mFloaterControls.find(name);
- if (itor != mFloaterControls.end())
+ LLControlVariable* control;
+ control = LLUI::sSettingGroups["color"]->getControl(name);
+ if (control)
{
- return itor->second;
+ return control;
}
- if (mParentView)
- {
- return mParentView->findControl(name);
- }
- return LLUI::sConfigGroup->getControl(name);
+
+ return LLUI::sSettingGroups["config"]->getControl(name);
}
const S32 FLOATER_H_MARGIN = 15;
const S32 MIN_WIDGET_HEIGHT = 10;
const S32 VPAD = 4;
-// static
-U32 LLView::createRect(LLXMLNodePtr node, LLRect &rect, LLView* parent_view, const LLRect &required_rect)
-{
- U32 follows = 0;
- S32 x = rect.mLeft;
- S32 y = rect.mBottom;
- S32 w = rect.getWidth();
- S32 h = rect.getHeight();
-
- U32 last_x = 0;
- U32 last_y = 0;
- if (parent_view)
- {
- last_y = parent_view->getRect().getHeight();
- child_list_t::const_iterator itor = parent_view->getChildList()->begin();
- if (itor != parent_view->getChildList()->end())
- {
- LLView *last_view = (*itor);
- if (last_view->getSaveToXML())
- {
- last_x = last_view->getRect().mLeft;
- last_y = last_view->getRect().mBottom;
- }
- }
- }
-
- std::string rect_control;
- node->getAttributeString("rect_control", rect_control);
- if (! rect_control.empty())
- {
- LLRect rect = LLUI::sConfigGroup->getRect(rect_control);
- x = rect.mLeft;
- y = rect.mBottom;
- w = rect.getWidth();
- h = rect.getHeight();
- }
-
- if (node->hasAttribute("left"))
- {
- node->getAttributeS32("left", x);
- }
- if (node->hasAttribute("bottom"))
- {
- node->getAttributeS32("bottom", y);
- }
-
- // Make your width the width of the containing
- // view if you don't specify a width.
- if (parent_view)
- {
- if(w == 0)
- {
- w = llmax(required_rect.getWidth(), parent_view->getRect().getWidth() - (FLOATER_H_MARGIN) - x);
- }
-
- if(h == 0)
- {
- h = llmax(MIN_WIDGET_HEIGHT, required_rect.getHeight());
- }
- }
-
- if (node->hasAttribute("width"))
- {
- node->getAttributeS32("width", w);
- }
- if (node->hasAttribute("height"))
- {
- node->getAttributeS32("height", h);
- }
-
- if (parent_view)
- {
- if (node->hasAttribute("left_delta"))
- {
- S32 left_delta = 0;
- node->getAttributeS32("left_delta", left_delta);
- x = last_x + left_delta;
- }
- else if (node->hasAttribute("left") && node->hasAttribute("right"))
- {
- // compute width based on left and right
- S32 right = 0;
- node->getAttributeS32("right", right);
- if (right < 0)
- {
- right = parent_view->getRect().getWidth() + right;
- }
- w = right - x;
- }
- else if (node->hasAttribute("left"))
- {
- if (x < 0)
- {
- x = parent_view->getRect().getWidth() + x;
- follows |= FOLLOWS_RIGHT;
- }
- else
- {
- follows |= FOLLOWS_LEFT;
- }
- }
- else if (node->hasAttribute("width") && node->hasAttribute("right"))
- {
- S32 right = 0;
- node->getAttributeS32("right", right);
- if (right < 0)
- {
- right = parent_view->getRect().getWidth() + right;
- }
- x = right - w;
- }
- else
- {
- // left not specified, same as last
- x = last_x;
- }
-
- if (node->hasAttribute("bottom_delta"))
- {
- S32 bottom_delta = 0;
- node->getAttributeS32("bottom_delta", bottom_delta);
- y = last_y + bottom_delta;
- }
- else if (node->hasAttribute("top"))
- {
- // compute height based on top
- S32 top = 0;
- node->getAttributeS32("top", top);
- if (top < 0)
- {
- top = parent_view->getRect().getHeight() + top;
- }
- h = top - y;
- }
- else if (node->hasAttribute("bottom"))
- {
- if (y < 0)
- {
- y = parent_view->getRect().getHeight() + y;
- follows |= FOLLOWS_TOP;
- }
- else
- {
- follows |= FOLLOWS_BOTTOM;
- }
- }
- else
- {
- // if bottom not specified, generate automatically
- if (last_y == 0)
- {
- // treat first child as "bottom"
- y = parent_view->getRect().getHeight() - (h + VPAD);
- follows |= FOLLOWS_TOP;
- }
- else
- {
- // treat subsequent children as "bottom_delta"
- y = last_y - (h + VPAD);
- }
- }
- }
- else
- {
- x = llmax(x, 0);
- y = llmax(y, 0);
- follows = FOLLOWS_LEFT | FOLLOWS_TOP;
- }
- rect.setOriginAndSize(x, y, w, h);
-
- return follows;
-}
-
-void LLView::initFromXML(LLXMLNodePtr node, LLView* parent)
+void LLView::initFromParams(const LLView::Params& params)
{
- // create rect first, as this will supply initial follows flags
- LLRect view_rect;
- U32 follows_flags = createRect(node, view_rect, parent, getRequiredRect());
- // call reshape in case there are any child elements that need to be layed out
- reshape(view_rect.getWidth(), view_rect.getHeight());
- setRect(view_rect);
- setFollows(follows_flags);
-
- parseFollowsFlags(node);
+ LLRect required_rect = getRequiredRect();
- if (node->hasAttribute("control_name"))
- {
- std::string control_name;
- node->getAttributeString("control_name", control_name);
- setControlName(control_name, NULL);
- }
+ S32 width = llmax(getRect().getWidth(), required_rect.getWidth());
+ S32 height = llmax(getRect().getHeight(), required_rect.getHeight());
- if (node->hasAttribute("tool_tip"))
- {
- std::string tool_tip_msg;
- node->getAttributeString("tool_tip", tool_tip_msg);
- setToolTip(tool_tip_msg);
- }
+ reshape(width, height);
- if (node->hasAttribute("enabled"))
- {
- BOOL enabled;
- node->getAttributeBOOL("enabled", enabled);
- setEnabled(enabled);
- }
-
- if (node->hasAttribute("visible"))
- {
- BOOL visible;
- node->getAttributeBOOL("visible", visible);
- setVisible(visible);
- }
+ // call virtual methods with most recent data
+ // use getters because these values might not come through parameter block
+ setEnabled(getEnabled());
+ setVisible(getVisible());
- if (node->hasAttribute("hover_cursor"))
+ if (!params.name().empty())
{
- std::string cursor_string;
- node->getAttributeString("hover_cursor", cursor_string);
- mHoverCursor = getCursorFromString(cursor_string);
+ setName(params.name());
}
-
- node->getAttributeBOOL("use_bounding_rect", mUseBoundingRect);
- node->getAttributeBOOL("mouse_opaque", mMouseOpaque);
- node->getAttributeS32("default_tab_group", mDefaultTabGroup);
-
- reshape(view_rect.getWidth(), view_rect.getHeight());
+ mLayout = params.layout();
}
-void LLView::parseFollowsFlags(LLXMLNodePtr node)
+void LLView::parseFollowsFlags(const LLView::Params& params)
{
- if (node->hasAttribute("follows"))
+ if (params.follows.string.isProvided())
{
- setFollowsNone();
+ setFollows(FOLLOWS_NONE);
- std::string follows;
- node->getAttributeString("follows", follows);
+ std::string follows = params.follows.string;
typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
boost::char_separator<char> sep("|");
@@ -2685,45 +2378,13 @@ void LLView::parseFollowsFlags(LLXMLNodePtr node)
++token_iter;
}
}
-}
-
-// static
-LLFontGL* LLView::selectFont(LLXMLNodePtr node)
-{
- std::string font_name, font_size, font_style;
- U8 style = 0;
-
- if (node->hasAttribute("font"))
- {
- node->getAttributeString("font", font_name);
- }
-
- if (node->hasAttribute("font_size"))
- {
- node->getAttributeString("font_size", font_size);
- }
-
- if (node->hasAttribute("font_style"))
- {
- node->getAttributeString("font_style", font_style);
- style = LLFontGL::getStyleFromString(font_style);
- }
-
- if (node->hasAttribute("font-style"))
+ else if (params.follows.flags.isProvided())
{
- node->getAttributeString("font-style", font_style);
- style = LLFontGL::getStyleFromString(font_style);
+ setFollows(params.follows.flags);
}
-
- if (font_name.empty())
- return NULL;
-
- LLFontDescriptor desc(font_name, font_size, style);
- LLFontGL* gl_font = LLFontGL::getFont(desc);
-
- return gl_font;
}
+
// static
LLFontGL::HAlign LLView::selectFontHAlign(LLXMLNodePtr node)
{
@@ -2738,175 +2399,216 @@ LLFontGL::HAlign LLView::selectFontHAlign(LLXMLNodePtr node)
return gl_hfont_align;
}
-// static
-LLFontGL::VAlign LLView::selectFontVAlign(LLXMLNodePtr node)
+//static
+void LLView::setupParams(LLView::Params& p, LLView* parent)
{
- LLFontGL::VAlign gl_vfont_align = LLFontGL::BASELINE;
+ const S32 VPAD = 4;
+ const S32 MIN_WIDGET_HEIGHT = 10;
+
+ p.serializable(true);
+
+ // *NOTE: Do not inherit layout from parent until we re-export
+ // all nodes and make topleft the default. JC
+ //if (p.layout().empty() && parent)
+ // p.layout = parent->getLayout();
- if (node->hasAttribute("valign"))
+ if (parent)
{
- std::string vert_align_name;
- node->getAttributeString("valign", vert_align_name);
- gl_vfont_align = LLFontGL::vAlignFromName(vert_align_name);
- }
- return gl_vfont_align;
-}
+ LLRect parent_rect = parent->getLocalRect();
+ // overwrite uninitialized rect params, using context
+ LLRect last_rect = parent->getLocalRect();
-// static
-LLFontGL::StyleFlags LLView::selectFontStyle(LLXMLNodePtr node)
-{
- LLFontGL::StyleFlags gl_font_style = LLFontGL::NORMAL;
+ bool layout_topleft = (p.layout() == "topleft");
+ if (layout_topleft)
+ {
+ //invert top to bottom
+ if (p.rect.top.isProvided()) p.rect.top = parent_rect.getHeight() - p.rect.top;
+ if (p.rect.bottom.isProvided()) p.rect.bottom = parent_rect.getHeight() - p.rect.bottom;
+ }
- if (node->hasAttribute("style"))
- {
- std::string style_flags_name;
- node->getAttributeString("style", style_flags_name);
+ // convert negative or centered coordinates to parent relative values
+ // Note: some of this logic matches the logic in TypedParam<LLRect>::getValueFromBlock()
- if (style_flags_name == "normal")
+ if (p.center_horiz)
{
- gl_font_style = LLFontGL::NORMAL;
+ if (p.rect.left.isProvided() && p.rect.right.isProvided())
+ {
+ S32 width = p.rect.right - p.rect.left;
+ width = llmax(width, 0);
+ S32 offset = parent_rect.getWidth()/2 - width/2;
+ p.rect.left = p.rect.left + offset;
+ p.rect.right = p.rect.right + offset;
+ }
+ else
+ {
+ p.rect.left = p.rect.left + parent_rect.getWidth()/2 - p.rect.width/2;
+ }
}
- else if (style_flags_name == "bold")
+ else
{
- gl_font_style = LLFontGL::BOLD;
+ if (p.rect.left < 0) p.rect.left = p.rect.left + parent_rect.getWidth();
+ if (p.rect.right < 0) p.rect.right = p.rect.right + parent_rect.getWidth();
}
- else if (style_flags_name == "italic")
+ if (p.center_vert)
{
- gl_font_style = LLFontGL::ITALIC;
+ if (p.rect.bottom.isProvided() && p.rect.top.isProvided())
+ {
+ S32 height = p.rect.top - p.rect.bottom;
+ height = llmax(height, 0);
+ S32 offset = parent_rect.getHeight()/2 - height/2;
+ p.rect.bottom = p.rect.bottom + offset;
+ p.rect.top = p.rect.top + offset;
+ }
+ else
+ {
+ p.rect.bottom = p.rect.bottom + parent_rect.getHeight()/2 - p.rect.height/2;
+ }
}
- else if (style_flags_name == "underline")
+ else
{
- gl_font_style = LLFontGL::UNDERLINE;
+ if (p.rect.bottom < 0) p.rect.bottom = p.rect.bottom + parent_rect.getHeight();
+ if (p.rect.top < 0) p.rect.top = p.rect.top + parent_rect.getHeight();
}
- //else leave left
- }
- return gl_font_style;
-}
-
-bool LLView::setControlValue(const LLSD& value)
-{
- std::string ctrlname = getControlName();
- if (!ctrlname.empty())
- {
- LLUI::sConfigGroup->setValue(ctrlname, value);
- return true;
- }
- return false;
-}
-//virtual
-void LLView::setControlName(const std::string& control_name, LLView *context)
-{
- if (context == NULL)
- {
- context = this;
- }
- if (!mControlName.empty())
- {
- llwarns << "setControlName called twice on same control!" << llendl;
- mControlConnection.disconnect(); // disconnect current signal
- mControlName.clear();
- }
-
- // Register new listener
- if (!control_name.empty())
- {
- LLControlVariable *control = context->findControl(control_name);
- if (control)
+ // DEPRECATE: automatically fall back to height of MIN_WIDGET_HEIGHT pixels
+ if (!p.rect.height.isProvided() && !p.rect.top.isProvided())
{
- mControlName = control_name;
- mControlConnection = control->getSignal()->connect(boost::bind(&controlListener, _1, getHandle(), std::string("value")));
- setValue(control->getValue());
+ p.rect.height = MIN_WIDGET_HEIGHT;
}
- }
-}
-// static
-bool LLView::controlListener(const LLSD& newvalue, LLHandle<LLView> handle, std::string type)
-{
- LLView* view = handle.get();
- if (view)
- {
- if (type == "value")
+ last_rect.translate(0, last_rect.getHeight());
+
+ LLView::child_list_t::const_iterator itor = parent->getChildList()->begin();
+ for (;itor != parent->getChildList()->end(); ++itor)
{
- view->setValue(newvalue);
- return true;
+ LLView *last_view = (*itor);
+ if (last_view->getSaveToXML())
+ {
+ last_rect = last_view->getRect();
+ break;
+ }
}
- else if (type == "enabled")
+
+ if (layout_topleft)
{
- view->setEnabled(newvalue.asBoolean());
- return true;
+ S32 left_delta = 0;
+ p.bottom_delta.setIfNotProvided(0, false);
+
+ // Invert the sense of bottom_delta for topleft layout
+ if (p.bottom_delta.isProvided())
+ {
+ p.bottom_delta = -p.bottom_delta;
+ }
+ else if (p.top_delta.isProvided())
+ {
+ p.bottom_delta = -(p.rect.height + p.top_delta);
+ }
+ else if (!p.left_delta.isProvided() && !p.right_delta.isProvided() && !p.top_delta.isProvided())
+ {
+ // set default position is just below last rect
+ p.bottom_delta.setIfNotProvided(-(p.rect.height + VPAD), false);
+ }
+
+ // *TODO: Add left_pad for padding off the last widget's right edge
+ // if (p.left_pad.isProvided())
+ //{
+ // left_delta = p.left_pad + last_rect.getWidth();
+ //}
+ //else if ...
+ if (p.left_delta.isProvided())
+ {
+ left_delta = p.left_delta;
+ }
+ else if (p.right_delta.isProvided())
+ {
+ left_delta = -(p.right_delta + p.rect.width);
+ }
+
+ last_rect.translate(left_delta, p.bottom_delta);
}
- else if (type == "visible")
- {
- view->setVisible(newvalue.asBoolean());
- return true;
+ else
+ {
+ // set default position is just below last rect
+ p.bottom_delta.setIfNotProvided(-(p.rect.height + VPAD), false);
+ p.left_delta.setIfNotProvided(0, false);
+ last_rect.translate(p.left_delta, p.bottom_delta);
}
- }
- return false;
-}
-void LLView::addBoolControl(const std::string& name, bool initial_value)
-{
- mFloaterControls[name] = new LLControlVariable(name, TYPE_BOOLEAN, initial_value, std::string("Internal floater control"));
-}
+ // this handles case where *both* x and x_delta are provided
+ // ignore x in favor of default x + x_delta
+ if (p.bottom_delta.isProvided()) p.rect.bottom.set(0, false);
+ if (p.left_delta.isProvided()) p.rect.left.set(0, false);
-LLControlVariable *LLView::getControl(const std::string& name)
-{
- control_map_t::iterator itor = mFloaterControls.find(name);
- if (itor != mFloaterControls.end())
- {
- return itor->second;
+ // selectively apply rectangle defaults, making sure that
+ // params are not flagged as having been "provided"
+ // as rect params are overconstrained and rely on provided flags
+ p.rect.left.setIfNotProvided(last_rect.mLeft, false);
+ p.rect.bottom.setIfNotProvided(last_rect.mBottom, false);
+ p.rect.top.setIfNotProvided(last_rect.mTop, false);
+ p.rect.right.setIfNotProvided(last_rect.mRight, false);
+ p.rect.width.setIfNotProvided(last_rect.getWidth(), false);
+ p.rect.height.setIfNotProvided(last_rect.getHeight(), false);
}
- return NULL;
-}
-
-//virtual
-void LLView::setValue(const LLSD& value)
-{
}
-//virtual
-LLSD LLView::getValue() const
+static S32 invert_vertical(S32 y, LLView* parent)
{
- return LLSD();
+ if (y < 0)
+ {
+ // already based on top-left, just invert
+ return -y;
+ }
+ else if (parent)
+ {
+ // use parent to flip coordinate
+ S32 parent_height = parent->getRect().getHeight();
+ return parent_height - y;
+ }
+ else
+ {
+ llwarns << "Attempting to convert layout to top-left with no parent" << llendl;
+ return y;
+ }
}
-LLView* LLView::createWidget(LLXMLNodePtr xml_node) const
+//static
+void LLView::setupParamsForExport(Params& p, LLView* parent)
{
- // forward requests to ui ctrl factory
- return LLUICtrlFactory::getInstance()->createCtrlWidget(NULL, xml_node);
-}
-
-//
-// LLWidgetClassRegistry
-//
-
-LLWidgetClassRegistry::LLWidgetClassRegistry()
-{
-}
+ // Don't convert if already top-left based
+ if (p.layout() == "topleft")
+ {
+ return;
+ }
-void LLWidgetClassRegistry::registerCtrl(const std::string& tag, LLWidgetClassRegistry::factory_func_t function)
-{
- std::string lower_case_tag = tag;
- LLStringUtil::toLower(lower_case_tag);
-
- mCreatorFunctions[lower_case_tag] = function;
+ if (p.rect.top.isProvided())
+ {
+ p.rect.top = invert_vertical(p.rect.top, parent);
+ }
+ if (p.top_delta.isProvided())
+ {
+ p.top_delta = -p.top_delta;
+ }
+ if (p.rect.bottom.isProvided())
+ {
+ p.rect.bottom = invert_vertical(p.rect.bottom, parent);
+ }
+ if (p.bottom_delta.isProvided())
+ {
+ p.bottom_delta = -p.bottom_delta;
+ }
+ p.layout = "topleft";
}
-BOOL LLWidgetClassRegistry::isTagRegistered(const std::string &tag)
+LLView::tree_iterator_t LLView::beginTree()
{
- return mCreatorFunctions.find(tag) != mCreatorFunctions.end();
+ return tree_iterator_t(this,
+ boost::bind(boost::mem_fn(&LLView::beginChild), _1),
+ boost::bind(boost::mem_fn(&LLView::endChild), _1));
}
-LLWidgetClassRegistry::factory_func_t LLWidgetClassRegistry::getCreatorFunc(const std::string& ctrl_type)
+LLView::tree_iterator_t LLView::endTree()
{
- factory_map_t::const_iterator found_it = mCreatorFunctions.find(ctrl_type);
- if (found_it == mCreatorFunctions.end())
- {
- return NULL;
- }
- return found_it->second;
+ // an empty iterator is an "end" iterator
+ return tree_iterator_t();
}
-
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index e0e0f6ba47..69ae7dd993 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -47,12 +47,15 @@
#include "llrect.h"
#include "llui.h"
#include "lluistring.h"
-#include "lluixmltags.h"
#include "llviewquery.h"
#include "llxmlnode.h"
#include "stdenums.h"
#include "lluistring.h"
#include "llcursortypes.h"
+#include "lluictrlfactory.h"
+#include "lltreeiterators.h"
+
+#include <list>
const U32 FOLLOWS_NONE = 0x00;
const U32 FOLLOWS_LEFT = 0x01;
@@ -75,9 +78,6 @@ virtual BOOL isPanel();
LLPanel
virtual void setRect(const LLRect &rect);
LLLineEditor
-virtual void addCtrl( LLUICtrl* ctrl, S32 tab_group);
-virtual void addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group);
-virtual void removeCtrl( LLUICtrl* ctrl);
LLPanel
virtual BOOL canFocusChildren() const { return TRUE; }
LLFolderView
@@ -103,7 +103,7 @@ virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
LLUICtrl, et. al.
virtual void translate( S32 x, S32 y );
LLMenuGL
-virtual void userSetShape(const LLRect& new_rect);
+virtual void setShape(const LLRect& new_rect, bool by_user);
LLFloater, LLScrollLIstVtrl
virtual LLView* findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0);
virtual LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0);
@@ -121,10 +121,6 @@ virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,EDragAndDropTy
virtual void draw();
*
- *
-virtual LLXMLNodePtr getXML(bool save_children = true) const;
- *
-virtual void initFromXML(LLXMLNodePtr node, LLView* parent);
*
virtual void onFocusLost() {}
LLUICtrl, LLScrollListCtrl, LLMenuGL, LLLineEditor, LLComboBox
@@ -132,14 +128,8 @@ virtual void onFocusReceived() {}
LLUICtrl, LLTextEditor, LLScrollListVtrl, LLMenuGL, LLLineEditor
virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
LLTabContainer, LLPanel, LLMenuGL
-virtual void setControlName(const std::string& control, LLView *context);
- LLSliderCtrl, LLCheckBoxCtrl
-virtual std::string getControlName() const { return mControlName; }
- LLSliderCtrl, LLCheckBoxCtrl
virtual bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
LLMenuItem
-virtual void setValue(const LLSD& value);
- *
protected:
virtual BOOL handleKeyHere(KEY key, MASK mask);
@@ -148,67 +138,65 @@ virtual BOOL handleUnicodeCharHere(llwchar uni_char);
*
*/
-class LLUICtrlFactory;
-
-// maps xml strings to widget classes
-class LLWidgetClassRegistry : public LLSingleton<LLWidgetClassRegistry>
+class LLView : public LLMouseHandler, public LLMortician
{
- friend class LLSingleton<LLWidgetClassRegistry>;
public:
- typedef LLView* (*factory_func_t)(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
- typedef std::map<std::string, factory_func_t> factory_map_t;
-
- void registerCtrl(const std::string& xml_tag, factory_func_t function);
- BOOL isTagRegistered(const std::string& xml_tag);
- factory_func_t getCreatorFunc(const std::string& xml_tag);
-
- // get (first) xml tag for a given class
- template <class T> std::string getTag()
+ struct Follows : public LLInitParam::Choice<Follows>
{
- factory_map_t::iterator it;
- for(it = mCreatorFunctions.begin(); it != mCreatorFunctions.end(); ++it)
- {
- if (it->second == T::fromXML)
- {
- return it->first;
- }
- }
-
- return "";
- }
-
-private:
- LLWidgetClassRegistry();
- virtual ~LLWidgetClassRegistry() {};
-
- typedef std::set<std::string> ctrl_name_set_t;
- ctrl_name_set_t mUICtrlNames;
+ Option<std::string> string;
+ Option<U32> flags;
- // map of xml tags to widget creator functions
- factory_map_t mCreatorFunctions;
-};
+ Follows()
+ : string(""),
+ flags("flags", FOLLOWS_LEFT | FOLLOWS_TOP)
+ {}
+ };
-template<class T>
-class LLRegisterWidget
-{
-public:
- LLRegisterWidget(const std::string& tag)
+ struct Params : public LLInitParam::Block<Params>
{
- LLWidgetClassRegistry* registry = LLWidgetClassRegistry::getInstance();
- if (registry->isTagRegistered(tag))
- {
- //error!
- llerrs << "Widget named " << tag << " already registered!" << llendl;
- }
- else
- {
- registry->registerCtrl(tag, T::fromXML);
- }
- }
-};
+ Mandatory<std::string> name;
+
+ Optional<bool> enabled,
+ visible;
+ Optional<bool> mouse_opaque;
+ Optional<bool> use_bounding_rect;
+ Optional<S32> tab_group,
+ default_tab_group;
+ Optional<std::string> tool_tip;
+
+ Optional<S32> sound_flags;
+ Optional<bool> serializable;
+ Optional<Follows> follows;
+ Optional<std::string> hover_cursor;
+
+ // font params
+ Optional<const LLFontGL*> font;
+ Optional<LLFontGL::HAlign> font_halign;
+ Optional<LLFontGL::VAlign> font_valign;
+
+ Optional<std::string> layout;
+ Optional<LLRect> rect;
+ Optional<S32> top_delta,
+ bottom_delta,
+ right_delta,
+ left_delta;
+
+ Optional<bool> center_horiz,
+ center_vert;
+
+ // these are nested attributes for LLLayoutPanel
+ //FIXME: get parent context involved in parsing traversal
+ Deprecated user_resize,
+ auto_resize,
+ needs_translate;
+
+ Params();
+ };
+ void initFromParams(const LLView::Params&);
-class LLView : public LLMouseHandler, public LLMortician
-{
+protected:
+ LLView(const LLView::Params&);
+ friend class LLUICtrlFactory;
public:
#if LL_DEBUG
@@ -253,10 +241,6 @@ public:
typedef child_tab_order_t::reverse_iterator child_tab_order_reverse_iter_t;
typedef child_tab_order_t::const_reverse_iterator child_tab_order_const_reverse_iter_t;
- LLView();
- LLView(const std::string& name, BOOL mouse_opaque);
- LLView(const std::string& name, const LLRect& rect, BOOL mouse_opaque, U32 follows=FOLLOWS_NONE);
-
virtual ~LLView();
// Hack to support LLFocusMgr (from LLMouseHandler)
@@ -300,15 +284,21 @@ public:
void sendChildToBack(LLView* child);
void moveChildToFrontOfTabGroup(LLUICtrl* child);
void moveChildToBackOfTabGroup(LLUICtrl* child);
+
+ void addChildren(LLXMLNodePtr node, LLXMLNodePtr output_node = NULL);
+
+ virtual bool addChild(LLView* view, S32 tab_group = 0);
+
+ // implemented in terms of addChild()
+ bool addChildInBack(LLView* view, S32 tab_group = 0);
- void addChild(LLView* view, S32 tab_group = 0);
- void addChildAtEnd(LLView* view, S32 tab_group = 0);
// remove the specified child from the view, and set it's parent to NULL.
- void removeChild(LLView* view, BOOL deleteIt = FALSE);
+ virtual void removeChild(LLView* view);
+
+ // helper function for lluictrlfactory.h create<> template
+ void setParent(LLView* parent) { if (parent) parent->addChild(this); }
- virtual void addCtrl( LLUICtrl* ctrl, S32 tab_group);
- virtual void addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group);
- virtual void removeCtrl( LLUICtrl* ctrl);
+ virtual BOOL postBuild() { return TRUE; }
child_tab_order_t getCtrlOrder() const { return mCtrlOrder; }
ctrl_list_t getCtrlList() const;
@@ -316,6 +306,7 @@ public:
void setDefaultTabGroup(S32 d) { mDefaultTabGroup = d; }
S32 getDefaultTabGroup() const { return mDefaultTabGroup; }
+ S32 getLastTabGroup() { return mLastTabGroup; }
BOOL isInVisibleChain() const;
BOOL isInEnabledChain() const;
@@ -347,7 +338,7 @@ public:
virtual void onVisibilityChange ( BOOL curVisibilityIn );
void pushVisible(BOOL visible) { mLastVisible = mVisible; setVisible(visible); }
- void popVisible() { setVisible(mLastVisible); mLastVisible = TRUE; }
+ void popVisible() { setVisible(mLastVisible); }
LLHandle<LLView> getHandle() { mHandle.bind(this); return mHandle; }
@@ -361,11 +352,14 @@ public:
const LLRect& getRect() const { return mRect; }
const LLRect& getBoundingRect() const { return mBoundingRect; }
LLRect getLocalBoundingRect() const;
- LLRect getScreenRect() const;
+ LLRect calcScreenRect() const;
+ LLRect calcScreenBoundingRect() const;
LLRect getLocalRect() const;
virtual LLRect getSnapRect() const;
LLRect getLocalSnapRect() const;
+ std::string getLayout() { return mLayout; }
+
// Override and return required size for this object. 0 for width/height means don't care.
virtual LLRect getRequiredRect();
void updateBoundingRect();
@@ -373,12 +367,17 @@ public:
LLView* getRootView();
LLView* getParent() const { return mParentView; }
LLView* getFirstChild() const { return (mChildList.empty()) ? NULL : *(mChildList.begin()); }
+ LLView* findPrevSibling(LLView* child);
+ LLView* findNextSibling(LLView* child);
S32 getChildCount() const { return (S32)mChildList.size(); }
template<class _Pr3> void sortChildren(_Pr3 _Pred) { mChildList.sort(_Pred); }
BOOL hasAncestor(const LLView* parentp) const;
BOOL hasChild(const std::string& childname, BOOL recurse = FALSE) const;
BOOL childHasKeyboardFocus( const std::string& childname ) const;
-
+
+ typedef LLTreeDFSIter<LLView, child_list_const_iter_t> tree_iterator_t;
+ tree_iterator_t beginTree();
+ tree_iterator_t endTree();
//
// UTILITIES
@@ -391,13 +390,11 @@ public:
BOOL translateIntoRect( const LLRect& constraint, BOOL allow_partial_outside );
void centerWithin(const LLRect& bounds);
- virtual void userSetShape(const LLRect& new_rect);
+ void setShape(const LLRect& new_rect, bool by_user = false);
virtual LLView* findSnapRect(LLRect& new_rect, const LLCoordGL& mouse_dir, LLView::ESnapType snap_type, S32 threshold, S32 padding = 0);
virtual LLView* findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding = 0);
-
virtual BOOL canSnapTo(const LLView* other_view);
-
- virtual void snappedTo(const LLView* snap_view);
+ virtual void setSnappedTo(const LLView* snap_view);
virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
@@ -407,15 +404,11 @@ public:
EAcceptance* accept,
std::string& tooltip_msg);
- std::string getShowNamesToolTip();
+ virtual std::string getShowNamesToolTip();
virtual void draw();
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- //FIXME: make LLView non-instantiable from XML
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
- virtual void initFromXML(LLXMLNodePtr node, LLView* parent);
- void parseFollowsFlags(LLXMLNodePtr node);
+ void parseFollowsFlags(const LLView::Params& params);
// Some widgets, like close box buttons, don't need to be saved
BOOL getSaveToXML() const { return mSaveToXML; }
@@ -440,25 +433,16 @@ public:
void screenRectToLocal( const LLRect& screen, LLRect* local ) const;
void localRectToScreen( const LLRect& local, LLRect* screen ) const;
- // Listener dispatching functions (Dispatcher deletes pointers to listeners on deregistration or destruction)
- LLSimpleListener* getListenerByName(const std::string& callback_name);
- void registerEventListener(std::string name, LLSimpleListener* function);
- void deregisterEventListener(std::string name);
- std::string findEventListener(LLSimpleListener *listener) const;
- void addListenerToControl(LLEventDispatcher *observer, const std::string& name, LLSD filter, LLSD userdata);
-
- void addBoolControl(const std::string& name, bool initial_value);
- LLControlVariable *getControl(const std::string& name);
LLControlVariable *findControl(const std::string& name);
- bool setControlValue(const LLSD& value);
- virtual void setControlName(const std::string& control, LLView *context);
- virtual std::string getControlName() const { return mControlName; }
+ // Moved setValue(), getValue(), setControlValue(), setControlName(),
+ // controlListener() to LLUICtrl because an LLView is NOT assumed to
+ // contain a value. If that's what you want, use LLUICtrl instead.
// virtual bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
- virtual void setValue(const LLSD& value);
- virtual LLSD getValue() const;
const child_list_t* getChildList() const { return &mChildList; }
+ const child_list_const_iter_t beginChild() { return mChildList.begin(); }
+ const child_list_const_iter_t endChild() { return mChildList.end(); }
// LLMouseHandler functions
// Default behavior is to pass events to children
@@ -479,26 +463,20 @@ public:
/*virtual*/ void screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const;
/*virtual*/ void localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const;
- template <class T> T* getChild(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const
+ // view-specific handlers
+ virtual void onMouseEnter(S32 x, S32 y, MASK mask);
+ virtual void onMouseLeave(S32 x, S32 y, MASK mask);
+
+
+ template <class T> T* findChild(const std::string& name, BOOL recurse = TRUE) const
{
LLView* child = getChildView(name, recurse, FALSE);
T* result = dynamic_cast<T*>(child);
- if (!result)
- {
- // did we find *something* with that name?
- if (child)
- {
- llwarns << "Found child named " << name << " but of wrong type " << typeid(child).name() << ", expecting " << typeid(T).name() << llendl;
- }
- if (create_if_missing)
- {
- // create dummy widget instance here
- result = createDummyWidget<T>(name);
- }
- }
return result;
}
+ template <class T> T* getChild(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
+
template <class T> T& getChildRef(const std::string& name, BOOL recurse = TRUE) const
{
return *getChild<T>(name, recurse, TRUE);
@@ -506,39 +484,6 @@ public:
virtual LLView* getChildView(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const;
- template <class T> T* createDummyWidget(const std::string& name) const
- {
- T* widget = getDummyWidget<T>(name);
- if (!widget)
- {
- // get xml tag name corresponding to requested widget type (e.g. "button")
- std::string xml_tag = LLWidgetClassRegistry::getInstance()->getTag<T>();
- if (xml_tag.empty())
- {
- llwarns << "No xml tag registered for this class " << llendl;
- return NULL;
- }
- // create dummy xml node (<button name="foo"/>)
- LLXMLNodePtr new_node_ptr = new LLXMLNode(xml_tag.c_str(), FALSE);
- new_node_ptr->createChild("name", TRUE)->setStringValue(name);
-
- widget = dynamic_cast<T*>(createWidget(new_node_ptr));
- if (widget)
- {
- // need non-const to update private dummy widget cache
- llwarns << "Making dummy " << xml_tag << " named " << name << " in " << getName() << llendl;
- mDummyWidgets.insert(std::make_pair(name, widget));
- }
- else
- {
- // dynamic cast will fail if T::fromXML only registered for base class
- llwarns << "Failed to create dummy widget of requested type " << llendl;
- return NULL;
- }
- }
- return widget;
- }
-
template <class T> T* getDummyWidget(const std::string& name) const
{
dummy_widget_map_t::const_iterator found_it = mDummyWidgets.find(name);
@@ -549,29 +494,11 @@ public:
return dynamic_cast<T*>(found_it->second);
}
- LLView* createWidget(LLXMLNodePtr xml_node) const;
-
-
+ //////////////////////////////////////////////
// statics
- static U32 createRect(LLXMLNodePtr node, LLRect &rect, LLView* parent_view, const LLRect &required_rect = LLRect());
-
- static LLFontGL* selectFont(LLXMLNodePtr node);
+ //////////////////////////////////////////////
static LLFontGL::HAlign selectFontHAlign(LLXMLNodePtr node);
- static LLFontGL::VAlign selectFontVAlign(LLXMLNodePtr node);
- static LLFontGL::StyleFlags selectFontStyle(LLXMLNodePtr node);
-
-
- // Only saves color if different from default setting.
- static void addColorXML(LLXMLNodePtr node, const LLColor4& color,
- const char* xml_name, const char* control_name);
- // Escapes " (quot) ' (apos) & (amp) < (lt) > (gt)
- //static std::string escapeXML(const std::string& xml);
- static LLWString escapeXML(const LLWString& xml);
- //same as above, but wraps multiple lines in quotes and prepends
- //indent as leading white space on each line
- static std::string escapeXML(const std::string& xml, std::string& indent);
-
// focuses the item in the list after the currently-focused item, wrapping if necessary
static BOOL focusNext(LLView::child_list_t & result);
// focuses the item in the list before the currently-focused item, wrapping if necessary
@@ -582,14 +509,24 @@ public:
// return query for iterating over focus roots in tab order
static const LLCtrlQuery & getFocusRootsQuery();
- static BOOL deleteViewByHandle(LLHandle<LLView> handle);
+ static void deleteViewByHandle(LLHandle<LLView> handle);
static LLWindow* getWindow(void) { return LLUI::sWindow; }
+ // Set up params after XML load before calling new(),
+ // usually to adjust layout.
+ static void setupParams(Params& p, LLView* parent);
+
+ // For re-export of floaters and panels, convert the coordinate system
+ // to be top-left based.
+ static void setupParamsForExport(Params& p, LLView* parent);
protected:
+ //virtual BOOL addChildFromParam(const LLInitParam::BaseBlock& params) { return TRUE; }
virtual BOOL handleKeyHere(KEY key, MASK mask);
virtual BOOL handleUnicodeCharHere(llwchar uni_char);
+ virtual void handleReshape(const LLRect& rect, bool by_user);
+
void drawDebugRect();
void drawChild(LLView* childp, S32 x_offset = 0, S32 y_offset = 0, BOOL force_draw = FALSE);
@@ -612,11 +549,8 @@ protected:
LLView* childrenHandleRightMouseDown(S32 x, S32 y, MASK mask);
LLView* childrenHandleRightMouseUp(S32 x, S32 y, MASK mask);
- static bool controlListener(const LLSD& newvalue, LLHandle<LLView> handle, std::string type);
-
- typedef std::map<std::string, LLControlVariable*> control_map_t;
- control_map_t mFloaterControls;
-
+ ECursorType mHoverCursor;
+
private:
LLView* mParentView;
child_list_t mChildList;
@@ -625,11 +559,13 @@ private:
// location in pixels, relative to surrounding structure, bottom,left=0,0
LLRect mRect;
LLRect mBoundingRect;
+ std::string mLayout;
U32 mReshapeFlags;
child_tab_order_t mCtrlOrder;
S32 mDefaultTabGroup;
+ S32 mLastTabGroup;
BOOL mEnabled; // Enabled means "accepts input that has an effect on the state of the application."
// A disabled view, for example, may still have a scrollbar that responds to mouse events.
@@ -651,18 +587,9 @@ private:
static LLWindow* sWindow; // All root views must know about their window.
- typedef std::map<std::string, LLPointer<LLSimpleListener> > dispatch_list_t;
- dispatch_list_t mDispatchList;
-
- std::string mControlName;
-
typedef std::map<std::string, LLView*> dummy_widget_map_t;
mutable dummy_widget_map_t mDummyWidgets;
- boost::signals::connection mControlConnection;
-
- ECursorType mHoverCursor;
-
public:
static BOOL sDebugRects; // Draw debug rects behind everything.
static BOOL sDebugKeys;
@@ -670,8 +597,12 @@ public:
static BOOL sDebugMouseHandling;
static std::string sMouseHandlerMessage;
static S32 sSelectID;
- static BOOL sEditingUI;
- static LLView* sEditingUIView;
+// static BOOL sEditingUI;
+// static LLView* sEditingUIView;
+ static std::set<LLView*> sPreviewHighlightedElements; // DEV-16869
+ static BOOL sHighlightingDiffs; // DEV-16869
+ static LLView* sPreviewClickedElement; // DEV-16869
+ static BOOL sDrawPreviewHighlights;
static S32 sLastLeftXML;
static S32 sLastBottomXML;
static BOOL sForceReshape;
@@ -688,5 +619,39 @@ private:
LLView::child_tab_order_t mTabOrder;
};
+template <class T> T* LLView::getChild(const std::string& name, BOOL recurse, BOOL create_if_missing) const
+{
+ LLView* child = getChildView(name, recurse, FALSE);
+ T* result = dynamic_cast<T*>(child);
+ if (!result)
+ {
+ // did we find *something* with that name?
+ if (child)
+ {
+ llwarns << "Found child named " << name << " but of wrong type " << typeid(child).name() << ", expecting " << typeid(T*).name() << llendl;
+ }
+ if (create_if_missing)
+ {
+ result = getDummyWidget<T>(name);
+ if (!result)
+ {
+ result = LLUICtrlFactory::createDummyWidget<T>(name);
+
+ if (result)
+ {
+ llwarns << "Making dummy " << typeid(T).name() << " named \"" << name << "\" in " << getName() << llendl;
+ }
+ else
+ {
+ llwarns << "Failed to create dummy " << typeid(T).name() << llendl;
+ return NULL;
+ }
+
+ mDummyWidgets[name] = result;
+ }
+ }
+ }
+ return result;
+}
#endif //LL_LLVIEW_H
diff --git a/indra/llui/llviewborder.cpp b/indra/llui/llviewborder.cpp
index d4a9e9d1bf..540a9f7513 100644
--- a/indra/llui/llviewborder.cpp
+++ b/indra/llui/llviewborder.cpp
@@ -33,25 +33,52 @@
#include "llviewborder.h"
#include "llrender.h"
#include "llfocusmgr.h"
+#include "lluictrlfactory.h"
static LLRegisterWidget<LLViewBorder> r("view_border");
-LLViewBorder::LLViewBorder( const std::string& name, const LLRect& rect, EBevel bevel, EStyle style, S32 width )
- :
- LLView( name, rect, FALSE ),
- mBevel( bevel ),
- mStyle( style ),
- mHighlightLight( LLUI::sColorsGroup->getColor( "DefaultHighlightLight" ) ),
- mHighlightDark( LLUI::sColorsGroup->getColor( "DefaultHighlightDark" ) ),
- mShadowLight( LLUI::sColorsGroup->getColor( "DefaultShadowLight" ) ),
- mShadowDark( LLUI::sColorsGroup->getColor( "DefaultShadowDark" ) ),
- mBorderWidth( width ),
- mTexture( NULL ),
- mHasKeyboardFocus( FALSE )
+void LLViewBorder::BevelValues::declareValues()
+{
+ declare("in", LLViewBorder::BEVEL_IN);
+ declare("out", LLViewBorder::BEVEL_OUT);
+ declare("bright", LLViewBorder::BEVEL_BRIGHT);
+ declare("none", LLViewBorder::BEVEL_NONE);
+}
+
+void LLViewBorder::StyleValues::declareValues()
+{
+ declare("line", LLViewBorder::STYLE_LINE);
+ declare("texture", LLViewBorder::STYLE_TEXTURE);
+}
+
+LLViewBorder::Params::Params()
+: bevel_type("bevel_style", BEVEL_OUT),
+ render_style("border_style", STYLE_LINE),
+ border_thickness("border_thickness"),
+ highlight_light_color("highlight_light_color"),
+ highlight_dark_color("highlight_dark_color"),
+ shadow_light_color("shadow_light_color"),
+ shadow_dark_color("shadow_dark_color")
{
- setFollowsAll();
+ name = "view_border";
+ mouse_opaque = false;
+ follows.flags = FOLLOWS_ALL;
}
+
+LLViewBorder::LLViewBorder(const LLViewBorder::Params& p)
+: LLView(p),
+ mTexture( NULL ),
+ mHasKeyboardFocus( FALSE ),
+ mBorderWidth(p.border_thickness),
+ mHighlightLight(p.highlight_light_color()),
+ mHighlightDark(p.highlight_dark_color()),
+ mShadowLight(p.shadow_light_color()),
+ mShadowDark(p.shadow_dark_color()),
+ mBevel(p.bevel_type),
+ mStyle(p.render_style)
+{}
+
void LLViewBorder::setColors( const LLColor4& shadow_dark, const LLColor4& highlight_light )
{
mShadowDark = shadow_dark;
@@ -69,7 +96,7 @@ void LLViewBorder::setColorsExtended( const LLColor4& shadow_light, const LLColo
void LLViewBorder::setTexture( const LLUUID &image_id )
{
- mTexture = LLUI::sImageProvider->getUIImageByID(image_id);
+ mTexture = LLUI::getUIImageByID(image_id);
}
@@ -114,17 +141,17 @@ void LLViewBorder::drawOnePixelLines()
{
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
- LLColor4 top_color = mHighlightLight;
- LLColor4 bottom_color = mHighlightLight;
+ LLColor4 top_color = mHighlightLight.get();
+ LLColor4 bottom_color = mHighlightLight.get();
switch( mBevel )
{
case BEVEL_OUT:
- top_color = mHighlightLight;
- bottom_color = mShadowDark;
+ top_color = mHighlightLight.get();
+ bottom_color = mShadowDark.get();
break;
case BEVEL_IN:
- top_color = mShadowDark;
- bottom_color = mHighlightLight;
+ top_color = mShadowDark.get();
+ bottom_color = mHighlightLight.get();
break;
case BEVEL_NONE:
// use defaults
@@ -163,31 +190,36 @@ void LLViewBorder::drawTwoPixelLines()
LLColor4 focus_color = gFocusMgr.getFocusColor();
- F32* top_in_color = mShadowDark.mV;
- F32* top_out_color = mShadowDark.mV;
- F32* bottom_in_color = mShadowDark.mV;
- F32* bottom_out_color = mShadowDark.mV;
+ LLColor4 top_in_color;
+ LLColor4 top_out_color;
+ LLColor4 bottom_in_color;
+ LLColor4 bottom_out_color;
+
switch( mBevel )
{
case BEVEL_OUT:
- top_in_color = mHighlightLight.mV;
- top_out_color = mHighlightDark.mV;
- bottom_in_color = mShadowLight.mV;
- bottom_out_color = mShadowDark.mV;
+ top_in_color = mHighlightLight.get();
+ top_out_color = mHighlightDark.get();
+ bottom_in_color = mShadowLight.get();
+ bottom_out_color = mShadowDark.get();
break;
case BEVEL_IN:
- top_in_color = mShadowDark.mV;
- top_out_color = mShadowLight.mV;
- bottom_in_color = mHighlightDark.mV;
- bottom_out_color = mHighlightLight.mV;
+ top_in_color = mShadowDark.get();
+ top_out_color = mShadowLight.get();
+ bottom_in_color = mHighlightDark.get();
+ bottom_out_color = mHighlightLight.get();
break;
case BEVEL_BRIGHT:
- top_in_color = mHighlightLight.mV;
- top_out_color = mHighlightLight.mV;
- bottom_in_color = mHighlightLight.mV;
- bottom_out_color = mHighlightLight.mV;
+ top_in_color = mHighlightLight.get();
+ top_out_color = mHighlightLight.get();
+ bottom_in_color = mHighlightLight.get();
+ bottom_out_color = mHighlightLight.get();
break;
case BEVEL_NONE:
+ top_in_color = mShadowDark.get();
+ top_out_color = mShadowDark.get();
+ bottom_in_color = mShadowDark.get();
+ bottom_out_color = mShadowDark.get();
// use defaults
break;
default:
@@ -196,8 +228,8 @@ void LLViewBorder::drawTwoPixelLines()
if( mHasKeyboardFocus )
{
- top_out_color = focus_color.mV;
- bottom_out_color = focus_color.mV;
+ top_out_color = focus_color;
+ bottom_out_color = focus_color;
}
S32 left = 0;
@@ -206,19 +238,19 @@ void LLViewBorder::drawTwoPixelLines()
S32 bottom = 0;
// draw borders
- gGL.color3fv( top_out_color );
+ gGL.color3fv( top_out_color.mV );
gl_line_2d(left, bottom, left, top-1);
gl_line_2d(left, top-1, right, top-1);
- gGL.color3fv( top_in_color );
+ gGL.color3fv( top_in_color.mV );
gl_line_2d(left+1, bottom+1, left+1, top-2);
gl_line_2d(left+1, top-2, right-1, top-2);
- gGL.color3fv( bottom_out_color );
+ gGL.color3fv( bottom_out_color.mV );
gl_line_2d(right-1, top-1, right-1, bottom);
gl_line_2d(left, bottom, right, bottom);
- gGL.color3fv( bottom_in_color );
+ gGL.color3fv( bottom_in_color.mV );
gl_line_2d(right-2, top-2, right-2, bottom+1);
gl_line_2d(left+1, bottom+1, right-1, bottom+1);
}
@@ -302,26 +334,3 @@ BOOL LLViewBorder::getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel
return FALSE;
}
-
-// static
-LLView* LLViewBorder::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("view_border");
- node->getAttributeString("name", name);
-
- LLViewBorder::EBevel bevel_style = LLViewBorder::BEVEL_IN;
- getBevelFromAttribute(node, bevel_style);
-
- S32 border_thickness = 1;
- node->getAttributeS32("border_thickness", border_thickness);
-
- LLViewBorder* border = new LLViewBorder(name,
- LLRect(),
- bevel_style,
- LLViewBorder::STYLE_LINE,
- border_thickness);
-
- border->initFromXML(node, parent);
-
- return border;
-}
diff --git a/indra/llui/llviewborder.h b/indra/llui/llviewborder.h
index a40e6534a8..37e13fb181 100644
--- a/indra/llui/llviewborder.h
+++ b/indra/llui/llviewborder.h
@@ -35,15 +35,41 @@
#include "llview.h"
-
class LLViewBorder : public LLView
{
public:
- enum EBevel { BEVEL_IN, BEVEL_OUT, BEVEL_BRIGHT, BEVEL_NONE };
- enum EStyle { STYLE_LINE, STYLE_TEXTURE };
-
- LLViewBorder( const std::string& name, const LLRect& rect, EBevel bevel = BEVEL_OUT, EStyle style = STYLE_LINE, S32 width = 1 );
-
+ typedef enum e_bevel { BEVEL_IN, BEVEL_OUT, BEVEL_BRIGHT, BEVEL_NONE } EBevel ;
+ typedef enum e_style { STYLE_LINE, STYLE_TEXTURE } EStyle;
+
+ struct BevelValues
+ : public LLInitParam::TypeValuesHelper<LLViewBorder::EBevel, BevelValues>
+ {
+ static void declareValues();
+ };
+
+ struct StyleValues
+ : public LLInitParam::TypeValuesHelper<LLViewBorder::EStyle, StyleValues>
+ {
+ static void declareValues();
+ };
+
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Optional<EBevel, BevelValues> bevel_type;
+ Optional<EStyle, StyleValues> render_style;
+ Optional<S32> border_thickness;
+
+ Optional<LLUIColor> highlight_light_color,
+ highlight_dark_color,
+ shadow_light_color,
+ shadow_dark_color;
+
+ Params();
+ };
+protected:
+ LLViewBorder(const Params&);
+ friend class LLUICtrlFactory;
+public:
virtual void setValue(const LLSD& val) { setRect(LLRect(val)); }
virtual BOOL isCtrl() const { return FALSE; }
@@ -51,7 +77,6 @@ public:
// llview functionality
virtual void draw();
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
static BOOL getBevelFromAttribute(LLXMLNodePtr node, LLViewBorder::EBevel& bevel_style);
void setBorderWidth(S32 width) { mBorderWidth = width; }
@@ -63,8 +88,8 @@ public:
const LLColor4& highlight_light, const LLColor4& highlight_dark );
void setTexture( const class LLUUID &image_id );
- LLColor4 getHighlightLight() {return mHighlightLight;}
- LLColor4 getShadowDark() {return mHighlightDark;}
+ LLColor4 getHighlightLight() {return mHighlightLight.get();}
+ LLColor4 getShadowDark() {return mHighlightDark.get();}
EStyle getStyle() const { return mStyle; }
@@ -77,14 +102,14 @@ private:
void drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32 start_x, F32 start_y );
EBevel mBevel;
- const EStyle mStyle;
- LLColor4 mHighlightLight;
- LLColor4 mHighlightDark;
- LLColor4 mShadowLight;
- LLColor4 mShadowDark;
- LLColor4 mBackgroundColor;
+ EStyle mStyle;
+ LLUIColor mHighlightLight;
+ LLUIColor mHighlightDark;
+ LLUIColor mShadowLight;
+ LLUIColor mShadowDark;
+ LLUIColor mBackgroundColor;
S32 mBorderWidth;
- LLUIImagePtr mTexture;
+ LLPointer<LLUIImage> mTexture;
BOOL mHasKeyboardFocus;
};
diff --git a/indra/llui/llviewmodel.cpp b/indra/llui/llviewmodel.cpp
new file mode 100644
index 0000000000..4107289e85
--- /dev/null
+++ b/indra/llui/llviewmodel.cpp
@@ -0,0 +1,163 @@
+/**
+ * @file llviewmodel.cpp
+ * @author Nat Goodspeed
+ * @date 2008-08-08
+ * @brief Implementation for llviewmodel.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// Precompiled header
+#include "linden_common.h"
+// associated header
+#include "llviewmodel.h"
+// STL headers
+// std headers
+// external library headers
+// other Linden headers
+
+///
+LLViewModel::LLViewModel()
+ : mDirty(false)
+{
+}
+
+/// Instantiate an LLViewModel with an existing data value
+LLViewModel::LLViewModel(const LLSD& value)
+ : mDirty(false)
+{
+ setValue(value);
+}
+
+/// Update the stored value
+void LLViewModel::setValue(const LLSD& value)
+{
+ mValue = value;
+ mDirty = true;
+}
+
+LLSD LLViewModel::getValue() const
+{
+ return mValue;
+}
+
+////////////////////////////////////////////////////////////////////////////
+
+///
+LLTextViewModel::LLTextViewModel()
+ : LLViewModel(false),
+ mUpdateFromDisplay(false)
+{
+}
+
+/// Instantiate an LLViewModel with an existing data value
+LLTextViewModel::LLTextViewModel(const LLSD& value)
+ : LLViewModel(value),
+ mUpdateFromDisplay(false)
+{
+}
+
+/// Update the stored value
+void LLTextViewModel::setValue(const LLSD& value)
+{
+ LLViewModel::setValue(value);
+ mDisplay = utf8str_to_wstring(value.asString());
+ // mDisplay and mValue agree
+ mUpdateFromDisplay = false;
+}
+
+void LLTextViewModel::setDisplay(const LLWString& value)
+{
+ // This is the strange way to alter the value. Normally we'd setValue()
+ // and do the utf8str_to_wstring() to get the corresponding mDisplay
+ // value. But a text editor might want to edit the display string
+ // directly, then convert back to UTF8 on commit.
+ mDisplay = value;
+ mDirty = true;
+ // Don't immediately convert to UTF8 -- do it lazily -- we expect many
+ // more setDisplay() calls than getValue() calls. Just flag that it needs
+ // doing.
+ mUpdateFromDisplay = true;
+}
+
+LLSD LLTextViewModel::getValue() const
+{
+ // Has anyone called setDisplay() since the last setValue()? If so, have
+ // to convert mDisplay back to UTF8.
+ if (mUpdateFromDisplay)
+ {
+ // The fact that we're lazily updating fields in this object should be
+ // transparent to clients, which is why this method is left
+ // conventionally const. Nor do we particularly want to make these
+ // members mutable. Just cast away constness in this one place.
+ LLTextViewModel* nthis = const_cast<LLTextViewModel*>(this);
+ nthis->mUpdateFromDisplay = false;
+ nthis->mValue = wstring_to_utf8str(mDisplay);
+ }
+ return LLViewModel::getValue();
+}
+
+
+////////////////////////////////////////////////////////////////////////////
+
+LLListViewModel::LLListViewModel(const LLSD& values)
+ : LLViewModel()
+{
+}
+
+void LLListViewModel::addColumn(const LLSD& column, EAddPosition pos)
+{
+}
+
+void LLListViewModel::clearColumns()
+{
+}
+
+void LLListViewModel::setColumnLabel(const std::string& column, const std::string& label)
+{
+}
+
+LLScrollListItem* LLListViewModel::addElement(const LLSD& value, EAddPosition pos,
+ void* userdata)
+{
+ return NULL;
+}
+
+LLScrollListItem* LLListViewModel::addSimpleElement(const std::string& value, EAddPosition pos,
+ const LLSD& id)
+{
+ return NULL;
+}
+
+void LLListViewModel::clearRows()
+{
+}
+
+void LLListViewModel::sortByColumn(const std::string& name, bool ascending)
+{
+}
diff --git a/indra/llui/llviewmodel.h b/indra/llui/llviewmodel.h
new file mode 100644
index 0000000000..c8a9b52cca
--- /dev/null
+++ b/indra/llui/llviewmodel.h
@@ -0,0 +1,219 @@
+/**
+ * @file llviewmodel.h
+ * @author Nat Goodspeed
+ * @date 2008-08-08
+ * @brief Define "View Model" classes intended to store data values for use
+ * by LLUICtrl subclasses. The phrase is borrowed from Microsoft
+ * terminology, in which "View Model" means the storage object
+ * underlying a specific widget object -- as in our case -- rather
+ * than the business "model" object underlying the overall "view"
+ * presented by the collection of widgets.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#if ! defined(LL_LLVIEWMODEL_H)
+#define LL_LLVIEWMODEL_H
+
+#include "llpointer.h"
+#include "llsd.h"
+#include "llrefcount.h"
+#include "stdenums.h"
+#include "llstring.h"
+#include <string>
+
+class LLScrollListItem;
+
+class LLViewModel;
+class LLTextViewModel;
+class LLListViewModel;
+// Because LLViewModel is derived from LLRefCount, always pass, store
+// and return LLViewModelPtr rather than plain LLViewModel*.
+typedef LLPointer<LLViewModel> LLViewModelPtr;
+typedef LLPointer<LLTextViewModel> LLTextViewModelPtr;
+typedef LLPointer<LLListViewModel> LLListViewModelPtr;
+
+/**
+ * LLViewModel stores a scalar LLSD data item, the current display value of a
+ * scalar LLUICtrl widget. LLViewModel subclasses are used to store data
+ * collections used for aggregate widgets. LLViewModel is ref-counted because
+ * -- for multiple skins -- we may have distinct widgets sharing the same
+ * LLViewModel data. This way, the LLViewModel is quietly deleted when the
+ * last referencing widget is destroyed.
+ */
+class LLViewModel: public LLRefCount
+{
+public:
+ LLViewModel();
+ /// Instantiate an LLViewModel with an existing data value
+ LLViewModel(const LLSD& value);
+
+ /// Update the stored value
+ virtual void setValue(const LLSD& value);
+ /// Get the stored value, in appropriate type.
+ virtual LLSD getValue() const;
+
+ /// Has the value been changed since last time we checked?
+ bool isDirty() const { return mDirty; }
+ /// Once the value has been saved to a file, or otherwise consumed by the
+ /// app, we no longer need to enable the Save button
+ void resetDirty() { mDirty = false; }
+ //
+ void setDirty() { mDirty = true; }
+
+protected:
+ LLSD mValue;
+ bool mDirty;
+};
+
+/**
+ * LLTextViewModel stores a value displayed as text.
+ */
+class LLTextViewModel: public LLViewModel
+{
+public:
+ LLTextViewModel();
+ /// Instantiate an LLViewModel with an existing data value
+ LLTextViewModel(const LLSD& value);
+
+ // LLViewModel functions
+ virtual void setValue(const LLSD& value);
+ virtual LLSD getValue() const;
+
+ // New functions
+ /// Get the stored value in string form
+ LLWString getDisplay() const { return mDisplay; }
+ /**
+ * Set the display string directly (see LLTextEditor). What the user is
+ * editing is actually the LLWString value rather than the underlying
+ * UTF-8 value.
+ */
+ void setDisplay(const LLWString& value);
+
+private:
+ /// To avoid converting every widget's stored value from LLSD to LLWString
+ /// every frame, cache the converted value
+ LLWString mDisplay;
+ /// As the user edits individual characters (setDisplay()), defer
+ /// LLWString-to-UTF8 conversions until s/he's done.
+ bool mUpdateFromDisplay;
+};
+
+/**
+ * LLListViewModel stores a list of data items. The semantics are borrowed
+ * from LLScrollListCtrl.
+ */
+class LLListViewModel: public LLViewModel
+{
+public:
+ LLListViewModel() {}
+ LLListViewModel(const LLSD& values);
+
+ virtual void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM);
+ virtual void clearColumns();
+ virtual void setColumnLabel(const std::string& column, const std::string& label);
+ virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM,
+ void* userdata = NULL);
+ virtual LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos,
+ const LLSD& id);
+ virtual void clearRows();
+ virtual void sortByColumn(const std::string& name, bool ascending);
+};
+
+//namespace LLViewModel
+//{
+// class Value
+// {
+// public:
+// Value(const LLSD& value = LLSD());
+//
+// LLSD getValue() const { return mValue; }
+// void setValue(const LLSD& value) { mValue = value; }
+//
+// bool isAvailable() const { return false; }
+// bool isReadOnly() const { return false; }
+//
+// bool undo() { return false; }
+// bool redo() { return false; }
+//
+// /// Has the value been changed since last time we checked?
+// bool isDirty() const { return mDirty; }
+// /// Once the value has been saved to a file, or otherwise consumed by the
+// /// app, we no longer need to enable the Save button
+// void resetDirty() { mDirty = false; }
+// //
+// void setDirty() { mDirty = true; }
+//
+// protected:
+// LLSD mValue;
+// bool mDirty;
+// };
+//
+// class Numeric : public Value
+// {
+// public:
+// Numeric(S32 value = 0);
+// Numeric(F32 value);
+//
+// F32 getPrecision();
+// F32 getMin();
+// F32 getMax();
+//
+// void increment();
+// void decrement();
+// };
+//
+// class MultipleValues : public Value
+// {
+// class Selector
+// {};
+//
+// MultipleValues();
+// virtual S32 numElements();
+// };
+//
+// class Tuple : public MultipleValues
+// {
+// Tuple(S32 size);
+// LLSD getValue(S32 which) const;
+// void setValue(S32 which, const LLSD& value);
+// };
+//
+// class List : public MultipleValues
+// {
+// List();
+//
+// void add(const ValueModel& value);
+// bool remove(const Selector& item);
+//
+// void setSortElement(const Selector& element);
+// void sort();
+// };
+//
+//};
+#endif /* ! defined(LL_LLVIEWMODEL_H) */
diff --git a/indra/llui/llviewquery.h b/indra/llui/llviewquery.h
index e87795f9a3..98d9bf8796 100644
--- a/indra/llui/llviewquery.h
+++ b/indra/llui/llviewquery.h
@@ -35,7 +35,7 @@
#include <list>
-#include "llmemory.h"
+#include "llsingleton.h"
#include "llui.h"
class LLView;
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp
index d6a6eca341..54af8b43ad 100644
--- a/indra/llvfs/lldir.cpp
+++ b/indra/llvfs/lldir.cpp
@@ -41,7 +41,9 @@
#endif
#include "lldir.h"
+
#include "llerror.h"
+#include "lltimer.h" // ms_sleep()
#include "lluuid.h"
#if LL_WINDOWS
@@ -125,16 +127,20 @@ S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask)
}
const std::string LLDir::findFile(const std::string &filename,
- const std::string searchPath1,
- const std::string searchPath2,
- const std::string searchPath3) const
+ const std::string& searchPath1,
+ const std::string& searchPath2,
+ const std::string& searchPath3) const
{
std::vector<std::string> search_paths;
search_paths.push_back(searchPath1);
search_paths.push_back(searchPath2);
search_paths.push_back(searchPath3);
+ return findFile(filename, search_paths);
+}
- std::vector<std::string>::iterator search_path_iter;
+const std::string LLDir::findFile(const std::string& filename, const std::vector<std::string> search_paths) const
+{
+ std::vector<std::string>::const_iterator search_path_iter;
for (search_path_iter = search_paths.begin();
search_path_iter != search_paths.end();
++search_path_iter)
@@ -319,19 +325,13 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
prefix += mDirDelimiter;
prefix += "app_settings";
break;
-
+
case LL_PATH_CHARACTER:
prefix = getAppRODataDir();
prefix += mDirDelimiter;
prefix += "character";
break;
- case LL_PATH_MOTIONS:
- prefix = getAppRODataDir();
- prefix += mDirDelimiter;
- prefix += "motions";
- break;
-
case LL_PATH_HELP:
prefix = "help";
break;
@@ -372,17 +372,29 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd
prefix = getSkinDir();
break;
+ case LL_PATH_DEFAULT_SKIN:
+ prefix = getDefaultSkinDir();
+ break;
+
+ case LL_PATH_USER_SKIN:
+ prefix = getOSUserAppDir();
+ prefix += mDirDelimiter;
+ prefix += "user_settings";
+ prefix += mDirDelimiter;
+ prefix += "skins";
+ break;
+
case LL_PATH_SKINS:
prefix = getAppRODataDir();
prefix += mDirDelimiter;
prefix += "skins";
break;
- //case LL_PATH_HTML:
- // prefix = getSkinDir();
- // prefix += mDirDelimiter;
- // prefix += "html";
- // break;
+ case LL_PATH_LOCAL_ASSETS:
+ prefix = getAppRODataDir();
+ prefix += mDirDelimiter;
+ prefix += "local_assets";
+ break;
case LL_PATH_MOZILLA_PROFILE:
prefix = getOSUserAppDir();
@@ -488,11 +500,14 @@ std::string LLDir::findSkinnedFilename(const std::string &subdir1, const std::st
std::string subdirs = ((subdir1.empty() ? "" : mDirDelimiter) + subdir1)
+ ((subdir2.empty() ? "" : mDirDelimiter) + subdir2);
- std::string found_file = findFile(filename,
- getUserSkinDir() + subdirs, // first look in user skin override
- getSkinDir() + subdirs, // then in current skin
- getDefaultSkinDir() + subdirs); // and last in default skin
+ std::vector<std::string> search_paths;
+
+ search_paths.push_back(getUserSkinDir() + subdirs); // first look in user skin override
+ search_paths.push_back(getSkinDir() + subdirs); // then in current skin
+ search_paths.push_back(getDefaultSkinDir() + subdirs); // then default skin
+ search_paths.push_back(getCacheDir() + subdirs); // and last in preload directory
+ std::string found_file = findFile(filename, search_paths);
return found_file;
}
diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h
index 760b6512a5..a33f7a2914 100644
--- a/indra/llvfs/lldir.h
+++ b/indra/llvfs/lldir.h
@@ -47,17 +47,19 @@ typedef enum ELLPath
LL_PATH_PER_SL_ACCOUNT = 3,
LL_PATH_CACHE = 4,
LL_PATH_CHARACTER = 5,
- LL_PATH_MOTIONS = 6,
- LL_PATH_HELP = 7,
- LL_PATH_LOGS = 8,
- LL_PATH_TEMP = 9,
- LL_PATH_SKINS = 10,
- LL_PATH_TOP_SKIN = 11,
- LL_PATH_CHAT_LOGS = 12,
- LL_PATH_PER_ACCOUNT_CHAT_LOGS = 13,
- LL_PATH_MOZILLA_PROFILE = 14,
-// LL_PATH_HTML = 15,
+ LL_PATH_HELP = 6,
+ LL_PATH_LOGS = 7,
+ LL_PATH_TEMP = 8,
+ LL_PATH_SKINS = 9,
+ LL_PATH_TOP_SKIN = 10,
+ LL_PATH_CHAT_LOGS = 11,
+ LL_PATH_PER_ACCOUNT_CHAT_LOGS = 12,
+ LL_PATH_MOZILLA_PROFILE = 13,
+ LL_PATH_USER_SKIN = 14,
+ LL_PATH_LOCAL_ASSETS = 15,
+// LL_PATH_HTML = 16,
LL_PATH_EXECUTABLE = 16,
+ LL_PATH_DEFAULT_SKIN = 17,
LL_PATH_LAST
} ELLPath;
@@ -68,8 +70,13 @@ class LLDir
LLDir();
virtual ~LLDir();
- virtual void initAppDirs(const std::string &app_name) = 0;
- public:
+ // app_name - Usually SecondLife, used for creating settings directories
+ // in OS-specific location, such as C:\Documents and Settings
+ // app_read_only_data_dir - Usually the source code directory, used
+ // for test applications to read newview data files.
+ virtual void initAppDirs(const std::string &app_name,
+ const std::string& app_read_only_data_dir = "") = 0;
+
virtual S32 deleteFilesInDir(const std::string &dirname, const std::string &mask);
// pure virtual functions
@@ -79,7 +86,8 @@ class LLDir
virtual std::string getCurPath() = 0;
virtual BOOL fileExists(const std::string &filename) const = 0;
- const std::string findFile(const std::string &filename, const std::string searchPath1 = "", const std::string searchPath2 = "", const std::string searchPath3 = "") const;
+ const std::string findFile(const std::string& filename, const std::vector<std::string> filenames) const;
+ const std::string findFile(const std::string& filename, const std::string& searchPath1 = "", const std::string& searchPath2 = "", const std::string& searchPath3 = "") const;
const std::string &getExecutablePathAndName() const; // Full pathname of the executable
const std::string &getAppName() const; // install directory under progams/ ie "SecondLife"
const std::string &getExecutableDir() const; // Directory where the executable is located
diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp
index 8ff8c5d1c6..2d724f0f9f 100644
--- a/indra/llvfs/lldir_linux.cpp
+++ b/indra/llvfs/lldir_linux.cpp
@@ -139,8 +139,14 @@ LLDir_Linux::~LLDir_Linux()
// Implementation
-void LLDir_Linux::initAppDirs(const std::string &app_name)
+void LLDir_Linux::initAppDirs(const std::string &app_name,
+ const std::string& app_read_only_data_dir)
{
+ // Allow override so test apps can read newview directory
+ if (!app_read_only_data_dir.empty())
+ {
+ mAppRODataDir = app_read_only_data_dir;
+ }
mAppName = app_name;
std::string upper_app_name(app_name);
diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h
index 20b408f8dc..a78a9854ff 100644
--- a/indra/llvfs/lldir_linux.h
+++ b/indra/llvfs/lldir_linux.h
@@ -44,7 +44,8 @@ public:
LLDir_Linux();
virtual ~LLDir_Linux();
- virtual void initAppDirs(const std::string &app_name);
+ /*virtual*/ void initAppDirs(const std::string &app_name,
+ const std::string& app_read_only_data_dir);
public:
virtual std::string getCurPath();
virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask);
diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp
index d4dee5a02e..04577bfc3b 100644
--- a/indra/llvfs/lldir_mac.cpp
+++ b/indra/llvfs/lldir_mac.cpp
@@ -203,8 +203,14 @@ LLDir_Mac::~LLDir_Mac()
// Implementation
-void LLDir_Mac::initAppDirs(const std::string &app_name)
+void LLDir_Mac::initAppDirs(const std::string &app_name,
+ const std::string& app_read_only_data_dir)
{
+ // Allow override so test apps can read newview directory
+ if (!app_read_only_data_dir.empty())
+ {
+ mAppRODataDir = app_read_only_data_dir;
+ }
mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem");
//dumpCurrentDirectories();
diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h
index 28d48a0b6a..82ac94ed4c 100644
--- a/indra/llvfs/lldir_mac.h
+++ b/indra/llvfs/lldir_mac.h
@@ -43,7 +43,8 @@ public:
LLDir_Mac();
virtual ~LLDir_Mac();
- virtual void initAppDirs(const std::string &app_name);
+ /*virtual*/ void initAppDirs(const std::string &app_name,
+ const std::string& app_read_only_data_dir);
public:
virtual S32 deleteFilesInDir(const std::string &dirname, const std::string &mask);
virtual std::string getCurPath();
diff --git a/indra/llvfs/lldir_solaris.cpp b/indra/llvfs/lldir_solaris.cpp
index 9553d923aa..ba71bc0eb4 100644
--- a/indra/llvfs/lldir_solaris.cpp
+++ b/indra/llvfs/lldir_solaris.cpp
@@ -172,8 +172,14 @@ LLDir_Solaris::~LLDir_Solaris()
// Implementation
-void LLDir_Solaris::initAppDirs(const std::string &app_name)
+void LLDir_Solaris::initAppDirs(const std::string &app_name,
+ const std::string& app_read_only_data_dir)
{
+ // Allow override so test apps can read newview directory
+ if (!app_read_only_data_dir.empty())
+ {
+ mAppRODataDir = app_read_only_data_dir;
+ }
mAppName = app_name;
std::string upper_app_name(app_name);
diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h
index 139754ba28..1fa8348355 100644
--- a/indra/llvfs/lldir_solaris.h
+++ b/indra/llvfs/lldir_solaris.h
@@ -44,7 +44,8 @@ public:
LLDir_Solaris();
virtual ~LLDir_Solaris();
- virtual void initAppDirs(const std::string &app_name);
+ /*virtual*/ void initAppDirs(const std::string &app_name,
+ const std::string& app_read_only_data_dir);
public:
virtual std::string getCurPath();
virtual U32 countFilesInDir(const std::string &dirname, const std::string &mask);
diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp
index 19b9bcc6ea..1fdd31c635 100644
--- a/indra/llvfs/lldir_win32.cpp
+++ b/indra/llvfs/lldir_win32.cpp
@@ -151,8 +151,14 @@ LLDir_Win32::~LLDir_Win32()
// Implementation
-void LLDir_Win32::initAppDirs(const std::string &app_name)
+void LLDir_Win32::initAppDirs(const std::string &app_name,
+ const std::string& app_read_only_data_dir)
{
+ // Allow override so test apps can read newview directory
+ if (!app_read_only_data_dir.empty())
+ {
+ mAppRODataDir = app_read_only_data_dir;
+ }
mAppName = app_name;
mOSUserAppDir = mOSUserDir;
mOSUserAppDir += "\\";
@@ -205,7 +211,14 @@ void LLDir_Win32::initAppDirs(const std::string &app_name)
llwarns << "Couldn't create LL_PATH_MOZILLA_PROFILE dir " << getExpandedFilename(LL_PATH_MOZILLA_PROFILE,"") << llendl;
}
}
-
+ res = LLFile::mkdir(getExpandedFilename(LL_PATH_USER_SKIN,""));
+ if (res == -1)
+ {
+ if (errno != EEXIST)
+ {
+ llwarns << "Couldn't create LL_PATH_SKINS dir " << getExpandedFilename(LL_PATH_USER_SKIN,"") << llendl;
+ }
+ }
mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem");
}
diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h
index 8710ca50e1..d2497901e4 100644
--- a/indra/llvfs/lldir_win32.h
+++ b/indra/llvfs/lldir_win32.h
@@ -41,7 +41,8 @@ public:
LLDir_Win32();
virtual ~LLDir_Win32();
- /*virtual*/ void initAppDirs(const std::string &app_name);
+ /*virtual*/ void initAppDirs(const std::string &app_name,
+ const std::string& app_read_only_data_dir);
/*virtual*/ std::string getCurPath();
/*virtual*/ U32 countFilesInDir(const std::string &dirname, const std::string &mask);
diff --git a/indra/llvfs/lllfsthread.h b/indra/llvfs/lllfsthread.h
index 5a11cb33d7..3139693302 100644
--- a/indra/llvfs/lllfsthread.h
+++ b/indra/llvfs/lllfsthread.h
@@ -39,7 +39,7 @@
#include <set>
#include "llapr.h"
-
+#include "llpointer.h"
#include "llqueuedthread.h"
//============================================================================
diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp
index e231002a52..93ac120302 100755
--- a/indra/llvfs/llpidlock.cpp
+++ b/indra/llvfs/llpidlock.cpp
@@ -5,7 +5,7 @@
*
* $LicenseInfo:firstyear=2007&license=viewergpl$
*
- * Copyright (c) 2007, Linden Research, Inc.
+ * Copyright (c) 2007-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -13,12 +13,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/llvfs/llpidlock.h b/indra/llvfs/llpidlock.h
index 44ed8caf46..42aee4dc4f 100755
--- a/indra/llvfs/llpidlock.h
+++ b/indra/llvfs/llpidlock.h
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
- * Copyright (c) 2001-2007, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp
index ef8c4d6c7f..9ce1e75d06 100644
--- a/indra/llvfs/llvfs.cpp
+++ b/indra/llvfs/llvfs.cpp
@@ -46,7 +46,9 @@
#endif
#include "llvfs.h"
+
#include "llstl.h"
+#include "lltimer.h"
const S32 FILE_BLOCK_MASK = 0x000003FF; // 1024-byte blocks
const S32 VFS_CLEANUP_SIZE = 5242880; // how much space we free up in a single stroke
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index e1f7406287..f5d06b7258 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -37,7 +37,7 @@ set(llwindow_SOURCE_FILES
llwindowheadless.cpp
)
-set(llwindows_HEADER_FILES
+set(llwindow_HEADER_FILES
CMakeLists.txt
llkeyboard.h
@@ -47,10 +47,12 @@ set(llwindows_HEADER_FILES
set(viewer_SOURCE_FILES
llwindow.cpp
llmousehandler.cpp
+ llwindowcallbacks.cpp
)
set(viewer_HEADER_FILES
llwindow.h
+ llwindowcallbacks.h
llpreeditor.h
llmousehandler.h
)
@@ -143,7 +145,7 @@ if (SERVER AND NOT WINDOWS AND NOT DARWIN)
${llwindow_SOURCE_FILES}
${server_SOURCE_FILES}
)
- # *TODO: This should probably have target_link_libraries
+ target_link_libraries (llwindowheadless ${llwindow_LINK_LIBRARIES})
endif (SERVER AND NOT WINDOWS AND NOT DARWIN)
if (llwindow_HEADER_FILES)
diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp
index beab131856..d33a0a6eea 100644
--- a/indra/llwindow/lldxhardware.cpp
+++ b/indra/llwindow/lldxhardware.cpp
@@ -47,6 +47,7 @@
#include "llstring.h"
#include "llstl.h"
+#include "lltimer.h"
void (*gWriteDebug)(const char* msg) = NULL;
LLDXHardware gDXHardware;
diff --git a/indra/llwindow/llkeyboard.cpp b/indra/llwindow/llkeyboard.cpp
index 02b4ed17c2..f0f618aef1 100644
--- a/indra/llwindow/llkeyboard.cpp
+++ b/indra/llwindow/llkeyboard.cpp
@@ -34,7 +34,7 @@
#include "indra_constants.h"
#include "llkeyboard.h"
-#include "llwindow.h"
+#include "llwindowcallbacks.h"
//
diff --git a/indra/llwindow/llkeyboardmacosx.cpp b/indra/llwindow/llkeyboardmacosx.cpp
index ec82032161..f53773c393 100644
--- a/indra/llwindow/llkeyboardmacosx.cpp
+++ b/indra/llwindow/llkeyboardmacosx.cpp
@@ -34,7 +34,7 @@
#include "linden_common.h"
#include "llkeyboardmacosx.h"
-#include "llwindow.h"
+#include "llwindowcallbacks.h"
#include <Carbon/Carbon.h>
diff --git a/indra/llwindow/llkeyboardsdl.cpp b/indra/llwindow/llkeyboardsdl.cpp
index 8a6b6d6298..8a0b1de98c 100644
--- a/indra/llwindow/llkeyboardsdl.cpp
+++ b/indra/llwindow/llkeyboardsdl.cpp
@@ -34,7 +34,7 @@
#include "linden_common.h"
#include "llkeyboardsdl.h"
-#include "llwindow.h"
+#include "llwindowcallbacks.h"
#include "SDL/SDL.h"
LLKeyboardSDL::LLKeyboardSDL()
diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp
index a06f19149c..ea11e0537e 100644
--- a/indra/llwindow/llkeyboardwin32.cpp
+++ b/indra/llwindow/llkeyboardwin32.cpp
@@ -34,14 +34,16 @@
#include "linden_common.h"
-#include "llkeyboardwin32.h"
-
-#include "llwindow.h"
-
#define WIN32_LEAN_AND_MEAN
#include <winsock2.h>
#include <windows.h>
+#include "llkeyboardwin32.h"
+
+#include "llwindowcallbacks.h"
+
+
+
LLKeyboardWin32::LLKeyboardWin32()
{
// Set up key mapping for windows - eventually can read this from a file?
diff --git a/indra/llwindow/llpreeditor.h b/indra/llwindow/llpreeditor.h
index 370f76cb85..dd63a98606 100644
--- a/indra/llwindow/llpreeditor.h
+++ b/indra/llwindow/llpreeditor.h
@@ -94,7 +94,7 @@ public:
// Get the contents of this preeditor as a LLWString. If there is an active preedit,
// the returned LLWString contains it.
- virtual const LLWString & getWText() const = 0;
+ virtual LLWString getWText() const = 0;
// Handle a UTF-32 char on this preeditor, i.e., add the character
// to the contents.
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index 7e412a14de..1c6c9e6e9d 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -46,14 +46,12 @@
#include "llerror.h"
#include "llkeyboard.h"
#include "linked_lists.h"
+#include "llwindowcallbacks.h"
-//static instance for default callbacks
-LLWindowCallbacks LLWindow::sDefaultCallbacks;
//
-// LLWindowCallbacks
+// Globals
//
-
LLSplashScreen *gSplashScreenp = NULL;
BOOL gDebugClicks = FALSE;
BOOL gDebugWindowProc = FALSE;
@@ -67,158 +65,6 @@ const std::string gURLProtocolWhitelist[] = { "file:", "http:", "https:" };
// Important - these lists should match - protocol to handler
const std::string gURLProtocolWhitelistHandler[] = { "http", "http", "https" };
-BOOL LLWindowCallbacks::handleTranslatedKeyDown(const KEY key, const MASK mask, BOOL repeated)
-{
- return FALSE;
-}
-
-
-BOOL LLWindowCallbacks::handleTranslatedKeyUp(const KEY key, const MASK mask)
-{
- return FALSE;
-}
-
-void LLWindowCallbacks::handleScanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level)
-{
-}
-
-BOOL LLWindowCallbacks::handleUnicodeChar(llwchar uni_char, MASK mask)
-{
- return FALSE;
-}
-
-
-BOOL LLWindowCallbacks::handleMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
- return FALSE;
-}
-
-BOOL LLWindowCallbacks::handleMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
- return FALSE;
-}
-
-void LLWindowCallbacks::handleMouseLeave(LLWindow *window)
-{
- return;
-}
-
-BOOL LLWindowCallbacks::handleCloseRequest(LLWindow *window)
-{
- //allow the window to close
- return TRUE;
-}
-
-void LLWindowCallbacks::handleQuit(LLWindow *window)
-{
- if(LLWindowManager::destroyWindow(window) == FALSE)
- {
- llerrs << "LLWindowCallbacks::handleQuit() : Couldn't destroy window" << llendl;
- }
-}
-
-BOOL LLWindowCallbacks::handleRightMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
- return FALSE;
-}
-
-BOOL LLWindowCallbacks::handleRightMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
- return FALSE;
-}
-
-BOOL LLWindowCallbacks::handleMiddleMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
- return FALSE;
-}
-
-BOOL LLWindowCallbacks::handleMiddleMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
- return FALSE;
-}
-
-BOOL LLWindowCallbacks::handleActivate(LLWindow *window, BOOL activated)
-{
- return FALSE;
-}
-
-BOOL LLWindowCallbacks::handleActivateApp(LLWindow *window, BOOL activating)
-{
- return FALSE;
-}
-
-void LLWindowCallbacks::handleMouseMove(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
-}
-
-void LLWindowCallbacks::handleScrollWheel(LLWindow *window, S32 clicks)
-{
-}
-
-void LLWindowCallbacks::handleResize(LLWindow *window, const S32 width, const S32 height)
-{
-}
-
-void LLWindowCallbacks::handleFocus(LLWindow *window)
-{
-}
-
-void LLWindowCallbacks::handleFocusLost(LLWindow *window)
-{
-}
-
-void LLWindowCallbacks::handleMenuSelect(LLWindow *window, const S32 menu_item)
-{
-}
-
-BOOL LLWindowCallbacks::handlePaint(LLWindow *window, const S32 x, const S32 y,
- const S32 width, const S32 height)
-{
- return FALSE;
-}
-
-BOOL LLWindowCallbacks::handleDoubleClick(LLWindow *window, const LLCoordGL pos, MASK mask)
-{
- return FALSE;
-}
-
-void LLWindowCallbacks::handleWindowBlock(LLWindow *window)
-{
-}
-
-void LLWindowCallbacks::handleWindowUnblock(LLWindow *window)
-{
-}
-
-void LLWindowCallbacks::handleDataCopy(LLWindow *window, S32 data_type, void *data)
-{
-}
-
-BOOL LLWindowCallbacks::handleTimerEvent(LLWindow *window)
-{
- return FALSE;
-}
-
-BOOL LLWindowCallbacks::handleDeviceChange(LLWindow *window)
-{
- return FALSE;
-}
-
-void LLWindowCallbacks::handlePingWatchdog(LLWindow *window, const char * msg)
-{
-
-}
-
-void LLWindowCallbacks::handlePauseWatchdog(LLWindow *window)
-{
-
-}
-
-void LLWindowCallbacks::handleResumeWatchdog(LLWindow *window)
-{
-
-}
-
S32 OSMessageBox(const std::string& text, const std::string& caption, U32 type)
{
@@ -257,8 +103,8 @@ S32 OSMessageBox(const std::string& text, const std::string& caption, U32 type)
// LLWindow
//
-LLWindow::LLWindow(BOOL fullscreen, U32 flags)
- : mCallbacks(&sDefaultCallbacks),
+LLWindow::LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags)
+ : mCallbacks(callbacks),
mPostQuit(TRUE),
mFullscreen(fullscreen),
mFullscreenWidth(0),
@@ -275,9 +121,23 @@ LLWindow::LLWindow(BOOL fullscreen, U32 flags)
mHideCursorPermanent(FALSE),
mFlags(flags),
mHighSurrogate(0)
+{ }
+
+LLWindow::~LLWindow()
+{ }
+
+//virtual
+BOOL LLWindow::isValid()
{
+ return TRUE;
}
-
+
+//virtual
+BOOL LLWindow::canDelete()
+{
+ return TRUE;
+}
+
// virtual
void LLWindow::incBusyCount()
{
@@ -293,13 +153,28 @@ void LLWindow::decBusyCount()
}
}
-void LLWindow::setCallbacks(LLWindowCallbacks *callbacks)
+//virtual
+void LLWindow::resetBusyCount()
{
- mCallbacks = callbacks;
- if (gKeyboard)
- {
- gKeyboard->setCallbacks(callbacks);
- }
+ mBusyCount = 0;
+}
+
+//virtual
+S32 LLWindow::getBusyCount() const
+{
+ return mBusyCount;
+}
+
+//virtual
+ECursorType LLWindow::getCursor() const
+{
+ return mCurrentCursor;
+}
+
+//virtual
+BOOL LLWindow::dialogColorPicker(F32 *r, F32 *g, F32 *b)
+{
+ return FALSE;
}
void *LLWindow::getMediaWindow()
@@ -462,23 +337,7 @@ void LLSplashScreen::hide()
static std::set<LLWindow*> sWindowList;
LLWindow* LLWindowManager::createWindow(
- const std::string& title,
- const std::string& name,
- LLCoordScreen upper_left,
- LLCoordScreen size,
- U32 flags,
- BOOL fullscreen,
- BOOL clearBg,
- BOOL disable_vsync,
- BOOL use_gl,
- BOOL ignore_pixel_depth)
-{
- return createWindow(
- title, name, upper_left.mX, upper_left.mY, size.mX, size.mY, flags,
- fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
-}
-
-LLWindow* LLWindowManager::createWindow(
+ LLWindowCallbacks* callbacks,
const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height, U32 flags,
BOOL fullscreen,
BOOL clearBg,
@@ -492,26 +351,26 @@ LLWindow* LLWindowManager::createWindow(
if (use_gl)
{
#if LL_MESA_HEADLESS
- new_window = new LLWindowMesaHeadless(
+ new_window = new LLWindowMesaHeadless(callbacks,
title, name, x, y, width, height, flags,
fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
#elif LL_SDL
- new_window = new LLWindowSDL(
+ new_window = new LLWindowSDL(callbacks,
title, x, y, width, height, flags,
fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
#elif LL_WINDOWS
- new_window = new LLWindowWin32(
+ new_window = new LLWindowWin32(callbacks,
title, name, x, y, width, height, flags,
fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
#elif LL_DARWIN
- new_window = new LLWindowMacOSX(
+ new_window = new LLWindowMacOSX(callbacks,
title, name, x, y, width, height, flags,
fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples);
#endif
}
else
{
- new_window = new LLWindowHeadless(
+ new_window = new LLWindowHeadless(callbacks,
title, name, x, y, width, height, flags,
fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth);
}
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 8361771b66..8602225108 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -39,52 +39,8 @@
#include "llcursortypes.h"
class LLSplashScreen;
-
-class LLWindow;
-
class LLPreeditor;
-
-class LLWindowCallbacks
-{
-public:
- virtual ~LLWindowCallbacks() {}
- virtual BOOL handleTranslatedKeyDown(KEY key, MASK mask, BOOL repeated);
- virtual BOOL handleTranslatedKeyUp(KEY key, MASK mask);
- virtual void handleScanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level);
- virtual BOOL handleUnicodeChar(llwchar uni_char, MASK mask);
-
- virtual BOOL handleMouseDown(LLWindow *window, LLCoordGL pos, MASK mask);
- virtual BOOL handleMouseUp(LLWindow *window, LLCoordGL pos, MASK mask);
- virtual void handleMouseLeave(LLWindow *window);
- // return TRUE to allow window to close, which will then cause handleQuit to be called
- virtual BOOL handleCloseRequest(LLWindow *window);
- // window is about to be destroyed, clean up your business
- virtual void handleQuit(LLWindow *window);
- virtual BOOL handleRightMouseDown(LLWindow *window, LLCoordGL pos, MASK mask);
- virtual BOOL handleRightMouseUp(LLWindow *window, LLCoordGL pos, MASK mask);
- virtual BOOL handleMiddleMouseDown(LLWindow *window, LLCoordGL pos, MASK mask);
- virtual BOOL handleMiddleMouseUp(LLWindow *window, LLCoordGL pos, MASK mask);
- virtual BOOL handleActivate(LLWindow *window, BOOL activated);
- virtual BOOL handleActivateApp(LLWindow *window, BOOL activating);
- virtual void handleMouseMove(LLWindow *window, LLCoordGL pos, MASK mask);
- virtual void handleScrollWheel(LLWindow *window, S32 clicks);
- virtual void handleResize(LLWindow *window, S32 width, S32 height);
- virtual void handleFocus(LLWindow *window);
- virtual void handleFocusLost(LLWindow *window);
- virtual void handleMenuSelect(LLWindow *window, S32 menu_item);
- virtual BOOL handlePaint(LLWindow *window, S32 x, S32 y, S32 width, S32 height);
- virtual BOOL handleDoubleClick(LLWindow *window, LLCoordGL pos, MASK mask); // double-click of left mouse button
- virtual void handleWindowBlock(LLWindow *window); // window is taking over CPU for a while
- virtual void handleWindowUnblock(LLWindow *window); // window coming back after taking over CPU for a while
- virtual void handleDataCopy(LLWindow *window, S32 data_type, void *data);
- virtual BOOL handleTimerEvent(LLWindow *window);
- virtual BOOL handleDeviceChange(LLWindow *window);
-
- virtual void handlePingWatchdog(LLWindow *window, const char * msg);
- virtual void handlePauseWatchdog(LLWindow *window);
- virtual void handleResumeWatchdog(LLWindow *window);
-
-};
+class LLWindowCallbacks;
// Refer to llwindow_test in test/common/llwindow for usage example
@@ -134,12 +90,12 @@ public:
// arrow/hour if busycount > 0.
virtual void incBusyCount();
virtual void decBusyCount();
- virtual void resetBusyCount() { mBusyCount = 0; }
- virtual S32 getBusyCount() const { return mBusyCount; }
+ virtual void resetBusyCount();
+ virtual S32 getBusyCount() const;
// Sets cursor, may set to arrow+hourglass
virtual void setCursor(ECursorType cursor) = 0;
- virtual ECursorType getCursor() const { return mCurrentCursor; }
+ virtual ECursorType getCursor() const;
virtual void captureMouse() = 0;
virtual void releaseMouse() = 0;
@@ -183,13 +139,12 @@ public:
virtual F32 getPixelAspectRatio() = 0;
virtual void setNativeAspectRatio(F32 aspect) = 0;
- void setCallbacks(LLWindowCallbacks *callbacks);
-
virtual void beforeDialog() {}; // prepare to put up an OS dialog (if special measures are required, such as in fullscreen mode)
virtual void afterDialog() {}; // undo whatever was done in beforeDialog()
-// opens system default color picker
- virtual BOOL dialog_color_picker (F32 *r, F32 *g, F32 *b) { return FALSE; };
+ // opens system default color picker, modally
+ // Returns TRUE if valid color selected
+ virtual BOOL dialogColorPicker(F32 *r, F32 *g, F32 *b);
// return a platform-specific window reference (HWND on Windows, WindowRef on the Mac, Gtk window on Linux)
virtual void *getPlatformWindow() = 0;
@@ -207,12 +162,12 @@ public:
static std::vector<std::string> getDynamicFallbackFontList();
protected:
- LLWindow(BOOL fullscreen, U32 flags);
- virtual ~LLWindow() {}
- virtual BOOL isValid() {return TRUE;}
- virtual BOOL canDelete() {return TRUE;}
-protected:
- static LLWindowCallbacks sDefaultCallbacks;
+ LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags);
+ virtual ~LLWindow();
+ // Defaults to true
+ virtual BOOL isValid();
+ // Defaults to true
+ virtual BOOL canDelete();
protected:
LLWindowCallbacks* mCallbacks;
@@ -294,18 +249,8 @@ const S32 OSBTN_CANCEL = 3;
class LLWindowManager
{
public:
- static LLWindow* createWindow(
- const std::string& title,
- const std::string& name,
- LLCoordScreen upper_left = LLCoordScreen(10, 10),
- LLCoordScreen size = LLCoordScreen(320, 240),
- U32 flags = 0,
- BOOL fullscreen = FALSE,
- BOOL clearBg = FALSE,
- BOOL disable_vsync = TRUE,
- BOOL use_gl = TRUE,
- BOOL ignore_pixel_depth = FALSE);
static LLWindow *createWindow(
+ LLWindowCallbacks* callbacks,
const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
U32 flags = 0,
BOOL fullscreen = FALSE,
diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp
new file mode 100644
index 0000000000..72f9997149
--- /dev/null
+++ b/indra/llwindow/llwindowcallbacks.cpp
@@ -0,0 +1,201 @@
+/**
+ * @file llwindowcallbacks.cpp
+ * @brief OS event callback class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+
+#include "llwindowcallbacks.h"
+
+#include "llcoord.h"
+
+//
+// LLWindowCallbacks
+//
+
+BOOL LLWindowCallbacks::handleTranslatedKeyDown(const KEY key, const MASK mask, BOOL repeated)
+{
+ return FALSE;
+}
+
+
+BOOL LLWindowCallbacks::handleTranslatedKeyUp(const KEY key, const MASK mask)
+{
+ return FALSE;
+}
+
+void LLWindowCallbacks::handleScanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level)
+{
+}
+
+BOOL LLWindowCallbacks::handleUnicodeChar(llwchar uni_char, MASK mask)
+{
+ return FALSE;
+}
+
+
+BOOL LLWindowCallbacks::handleMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+ return FALSE;
+}
+
+BOOL LLWindowCallbacks::handleMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+ return FALSE;
+}
+
+void LLWindowCallbacks::handleMouseLeave(LLWindow *window)
+{
+ return;
+}
+
+BOOL LLWindowCallbacks::handleCloseRequest(LLWindow *window)
+{
+ //allow the window to close
+ return TRUE;
+}
+
+void LLWindowCallbacks::handleQuit(LLWindow *window)
+{
+}
+
+BOOL LLWindowCallbacks::handleRightMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+ return FALSE;
+}
+
+BOOL LLWindowCallbacks::handleRightMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+ return FALSE;
+}
+
+BOOL LLWindowCallbacks::handleMiddleMouseDown(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+ return FALSE;
+}
+
+BOOL LLWindowCallbacks::handleMiddleMouseUp(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+ return FALSE;
+}
+
+BOOL LLWindowCallbacks::handleActivate(LLWindow *window, BOOL activated)
+{
+ return FALSE;
+}
+
+BOOL LLWindowCallbacks::handleActivateApp(LLWindow *window, BOOL activating)
+{
+ return FALSE;
+}
+
+void LLWindowCallbacks::handleMouseMove(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+}
+
+void LLWindowCallbacks::handleScrollWheel(LLWindow *window, S32 clicks)
+{
+}
+
+void LLWindowCallbacks::handleResize(LLWindow *window, const S32 width, const S32 height)
+{
+}
+
+void LLWindowCallbacks::handleFocus(LLWindow *window)
+{
+}
+
+void LLWindowCallbacks::handleFocusLost(LLWindow *window)
+{
+}
+
+void LLWindowCallbacks::handleMenuSelect(LLWindow *window, const S32 menu_item)
+{
+}
+
+BOOL LLWindowCallbacks::handlePaint(LLWindow *window, const S32 x, const S32 y,
+ const S32 width, const S32 height)
+{
+ return FALSE;
+}
+
+BOOL LLWindowCallbacks::handleDoubleClick(LLWindow *window, const LLCoordGL pos, MASK mask)
+{
+ return FALSE;
+}
+
+void LLWindowCallbacks::handleWindowBlock(LLWindow *window)
+{
+}
+
+void LLWindowCallbacks::handleWindowUnblock(LLWindow *window)
+{
+}
+
+void LLWindowCallbacks::handleDataCopy(LLWindow *window, S32 data_type, void *data)
+{
+}
+
+BOOL LLWindowCallbacks::handleTimerEvent(LLWindow *window)
+{
+ return FALSE;
+}
+
+BOOL LLWindowCallbacks::handleDeviceChange(LLWindow *window)
+{
+ return FALSE;
+}
+
+void LLWindowCallbacks::handlePingWatchdog(LLWindow *window, const char * msg)
+{
+
+}
+
+void LLWindowCallbacks::handlePauseWatchdog(LLWindow *window)
+{
+
+}
+
+void LLWindowCallbacks::handleResumeWatchdog(LLWindow *window)
+{
+
+}
+
+std::string LLWindowCallbacks::translateString(const char* tag)
+{
+ return std::string();
+}
+
+//virtual
+std::string LLWindowCallbacks::translateString(const char* tag,
+ const std::map<std::string, std::string>& args)
+{
+ return std::string();
+}
diff --git a/indra/llwindow/llwindowcallbacks.h b/indra/llwindow/llwindowcallbacks.h
new file mode 100644
index 0000000000..abc66c42a2
--- /dev/null
+++ b/indra/llwindow/llwindowcallbacks.h
@@ -0,0 +1,85 @@
+/**
+ * @file llwindowcallbacks.h
+ * @brief OS event callback class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#ifndef LLWINDOWCALLBACKS_H
+#define LLWINDOWCALLBACKS_H
+
+class LLCoordGL;
+class LLWindow;
+
+class LLWindowCallbacks
+{
+public:
+ virtual ~LLWindowCallbacks() {}
+ virtual BOOL handleTranslatedKeyDown(KEY key, MASK mask, BOOL repeated);
+ virtual BOOL handleTranslatedKeyUp(KEY key, MASK mask);
+ virtual void handleScanKey(KEY key, BOOL key_down, BOOL key_up, BOOL key_level);
+ virtual BOOL handleUnicodeChar(llwchar uni_char, MASK mask);
+
+ virtual BOOL handleMouseDown(LLWindow *window, LLCoordGL pos, MASK mask);
+ virtual BOOL handleMouseUp(LLWindow *window, LLCoordGL pos, MASK mask);
+ virtual void handleMouseLeave(LLWindow *window);
+ // return TRUE to allow window to close, which will then cause handleQuit to be called
+ virtual BOOL handleCloseRequest(LLWindow *window);
+ // window is about to be destroyed, clean up your business
+ virtual void handleQuit(LLWindow *window);
+ virtual BOOL handleRightMouseDown(LLWindow *window, LLCoordGL pos, MASK mask);
+ virtual BOOL handleRightMouseUp(LLWindow *window, LLCoordGL pos, MASK mask);
+ virtual BOOL handleMiddleMouseDown(LLWindow *window, LLCoordGL pos, MASK mask);
+ virtual BOOL handleMiddleMouseUp(LLWindow *window, LLCoordGL pos, MASK mask);
+ virtual BOOL handleActivate(LLWindow *window, BOOL activated);
+ virtual BOOL handleActivateApp(LLWindow *window, BOOL activating);
+ virtual void handleMouseMove(LLWindow *window, LLCoordGL pos, MASK mask);
+ virtual void handleScrollWheel(LLWindow *window, S32 clicks);
+ virtual void handleResize(LLWindow *window, S32 width, S32 height);
+ virtual void handleFocus(LLWindow *window);
+ virtual void handleFocusLost(LLWindow *window);
+ virtual void handleMenuSelect(LLWindow *window, S32 menu_item);
+ virtual BOOL handlePaint(LLWindow *window, S32 x, S32 y, S32 width, S32 height);
+ virtual BOOL handleDoubleClick(LLWindow *window, LLCoordGL pos, MASK mask); // double-click of left mouse button
+ virtual void handleWindowBlock(LLWindow *window); // window is taking over CPU for a while
+ virtual void handleWindowUnblock(LLWindow *window); // window coming back after taking over CPU for a while
+ virtual void handleDataCopy(LLWindow *window, S32 data_type, void *data);
+ virtual BOOL handleTimerEvent(LLWindow *window);
+ virtual BOOL handleDeviceChange(LLWindow *window);
+
+ virtual void handlePingWatchdog(LLWindow *window, const char * msg);
+ virtual void handlePauseWatchdog(LLWindow *window);
+ virtual void handleResumeWatchdog(LLWindow *window);
+
+ // Look up a localized string, usually for an error message
+ virtual std::string translateString(const char* tag);
+ virtual std::string translateString(const char* tag,
+ const std::map<std::string, std::string>& args);
+};
+
+
+#endif
diff --git a/indra/llwindow/llwindowheadless.cpp b/indra/llwindow/llwindowheadless.cpp
index 3742846440..b4e9009321 100644
--- a/indra/llwindow/llwindowheadless.cpp
+++ b/indra/llwindow/llwindowheadless.cpp
@@ -38,10 +38,10 @@
//
// LLWindowHeadless
//
-LLWindowHeadless::LLWindowHeadless(const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
- U32 flags, BOOL fullscreen, BOOL clearBg,
+LLWindowHeadless::LLWindowHeadless(LLWindowCallbacks* callbacks, const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
+ U32 flags, BOOL fullscreen, BOOL clear_background,
BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth)
- : LLWindow(fullscreen, flags)
+ : LLWindow(callbacks, fullscreen, flags)
{
}
diff --git a/indra/llwindow/llwindowheadless.h b/indra/llwindow/llwindowheadless.h
index 4353d157b5..3cffd2bbf6 100644
--- a/indra/llwindow/llwindowheadless.h
+++ b/indra/llwindow/llwindowheadless.h
@@ -94,9 +94,12 @@ public:
/*virtual*/ void *getPlatformWindow() { return 0; };
/*virtual*/ void bringToFront() {};
- LLWindowHeadless(const std::string& title, const std::string& name, S32 x, S32 y, S32 width, S32 height,
- U32 flags, BOOL fullscreen, BOOL clearBg,
- BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth);
+ LLWindowHeadless(LLWindowCallbacks* callbacks,
+ const std::string& title, const std::string& name,
+ S32 x, S32 y,
+ S32 width, S32 height,
+ U32 flags, BOOL fullscreen, BOOL clear_background,
+ BOOL disable_vsync, BOOL use_gl, BOOL ignore_pixel_depth);
virtual ~LLWindowHeadless();
private:
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 65a40dcef4..82dc5e4a13 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -32,19 +32,21 @@
#include "linden_common.h"
-#include <Carbon/Carbon.h>
-#include <OpenGL/OpenGL.h>
-
#include "llwindowmacosx.h"
+
#include "llkeyboardmacosx.h"
+#include "llwindowcallbacks.h"
+#include "llwindowmacosx-objc.h"
+#include "llpreeditor.h"
+
#include "llerror.h"
#include "llgl.h"
#include "llstring.h"
#include "lldir.h"
#include "indra_constants.h"
-#include "llwindowmacosx-objc.h"
-#include "llpreeditor.h"
+#include <Carbon/Carbon.h>
+#include <OpenGL/OpenGL.h>
extern BOOL gDebugWindowProc;
@@ -214,19 +216,27 @@ static LLWindowMacOSX *gWindowImplementation = NULL;
-LLWindowMacOSX::LLWindowMacOSX(const std::string& title, const std::string& name, S32 x, S32 y, S32 width,
+LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks,
+ const std::string& title, const std::string& name, S32 x, S32 y, S32 width,
S32 height, U32 flags,
BOOL fullscreen, BOOL clearBg,
BOOL disable_vsync, BOOL use_gl,
BOOL ignore_pixel_depth,
U32 fsaa_samples)
- : LLWindow(fullscreen, flags)
+ : LLWindow(NULL, fullscreen, flags)
{
+ // *HACK: During window construction we get lots of OS events for window
+ // reshape, activate, etc. that the viewer isn't ready to handle.
+ // Route them to a dummy callback structure until the end of constructor.
+ LLWindowCallbacks null_callbacks;
+ mCallbacks = &null_callbacks;
+
// Voodoo for calling cocoa from carbon (see llwindowmacosx-objc.mm).
setupCocoa();
// Initialize the keyboard
gKeyboard = new LLKeyboardMacOSX();
+ gKeyboard->setCallbacks(callbacks);
// Ignore use_gl for now, only used for drones on PC
mWindow = NULL;
@@ -315,6 +325,7 @@ LLWindowMacOSX::LLWindowMacOSX(const std::string& title, const std::string& name
setCursor( UI_CURSOR_ARROW );
}
+ mCallbacks = callbacks;
stop_glerror();
}
@@ -3202,7 +3213,7 @@ void LLWindowMacOSX::spawnWebBrowser(const std::string& escaped_url)
}
-BOOL LLWindowMacOSX::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
+BOOL LLWindowMacOSX::dialogColorPicker( F32 *r, F32 *g, F32 *b)
{
BOOL retval = FALSE;
OSErr error = noErr;
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
index 3886782732..17074080eb 100644
--- a/indra/llwindow/llwindowmacosx.h
+++ b/indra/llwindow/llwindowmacosx.h
@@ -35,6 +35,8 @@
#include "llwindow.h"
+#include "lltimer.h"
+
#include <Carbon/Carbon.h>
#include <AGL/agl.h>
@@ -103,7 +105,7 @@ public:
/*virtual*/ void beforeDialog();
/*virtual*/ void afterDialog();
- /*virtual*/ BOOL dialog_color_picker(F32 *r, F32 *g, F32 *b);
+ /*virtual*/ BOOL dialogColorPicker(F32 *r, F32 *g, F32 *b);
/*virtual*/ void *getPlatformWindow();
/*virtual*/ void *getMediaWindow();
@@ -116,7 +118,7 @@ public:
static std::vector<std::string> getDynamicFallbackFontList();
protected:
- LLWindowMacOSX(
+ LLWindowMacOSX(LLWindowCallbacks* callbacks,
const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags,
BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
BOOL ignore_pixel_depth,
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 24bd70d57f..3c203d9f5c 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -36,15 +36,16 @@
#include "linden_common.h"
#include "llwindowsdl.h"
+
+#include "llwindowcallbacks.h"
#include "llkeyboardsdl.h"
+
#include "llerror.h"
#include "llgl.h"
#include "llstring.h"
#include "lldir.h"
#include "llfindlocale.h"
-#include "indra_constants.h"
-
#if LL_GTK
extern "C" {
# include "gtk/gtk.h"
@@ -187,16 +188,19 @@ Display* LLWindowSDL::get_SDL_Display(void)
#endif // LL_X11
-LLWindowSDL::LLWindowSDL(const std::string& title, S32 x, S32 y, S32 width,
+LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks,
+ const std::string& title, S32 x, S32 y, S32 width,
S32 height, U32 flags,
BOOL fullscreen, BOOL clearBg,
BOOL disable_vsync, BOOL use_gl,
BOOL ignore_pixel_depth, U32 fsaa_samples)
- : LLWindow(fullscreen, flags), Lock_Display(NULL),
+ : LLWindow(callbacks, fullscreen, flags),
+ Lock_Display(NULL),
Unlock_Display(NULL), mGamma(1.0f)
{
// Initialize the keyboard
gKeyboard = new LLKeyboardSDL();
+ gKeyboard->setCallbacks(callbacks);
// Note that we can't set up key-repeat until after SDL has init'd video
// Ignore use_gl for now, only used for drones on PC
@@ -2229,7 +2233,7 @@ static void color_changed_callback(GtkWidget *widget,
gtk_color_selection_get_current_color(colorsel, colorp);
}
-BOOL LLWindowSDL::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
+BOOL LLWindowSDL::dialogColorPicker( F32 *r, F32 *g, F32 *b)
{
BOOL rtn = FALSE;
@@ -2306,7 +2310,7 @@ S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 typ
return 0;
}
-BOOL LLWindowSDL::dialog_color_picker ( F32 *r, F32 *g, F32 *b)
+BOOL LLWindowSDL::dialogColorPicker( F32 *r, F32 *g, F32 *b)
{
return (FALSE);
}
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index 632d8fc1fa..1e4dffd7a6 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -36,6 +36,7 @@
// Simple Directmedia Layer (http://libsdl.org/) implementation of LLWindow class
#include "llwindow.h"
+#include "lltimer.h"
#include "SDL/SDL.h"
#include "SDL/SDL_endian.h"
@@ -118,7 +119,7 @@ public:
/*virtual*/ void beforeDialog();
/*virtual*/ void afterDialog();
- /*virtual*/ BOOL dialog_color_picker(F32 *r, F32 *g, F32 *b);
+ /*virtual*/ BOOL dialogColorPicker(F32 *r, F32 *g, F32 *b);
/*virtual*/ void *getPlatformWindow();
/*virtual*/ void bringToFront();
@@ -147,7 +148,7 @@ public:
#endif // LL_X11
protected:
- LLWindowSDL(
+ LLWindowSDL(LLWindowCallbacks* callbacks,
const std::string& title, int x, int y, int width, int height, U32 flags,
BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
BOOL ignore_pixel_depth, U32 fsaa_samples);
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 6280868dfb..b60740c7e4 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -36,6 +36,17 @@
#include "llwindowwin32.h"
+// LLWindow library includes
+#include "llkeyboardwin32.h"
+#include "llpreeditor.h"
+#include "llwindowcallbacks.h"
+
+// Linden library includes
+#include "llerror.h"
+#include "llgl.h"
+#include "llstring.h"
+
+// System includes
#include <commdlg.h>
#include <WinUser.h>
#include <mapi.h>
@@ -49,16 +60,6 @@
#include <dinput.h>
#include <Dbt.h.>
-#include "llkeyboardwin32.h"
-#include "llerror.h"
-#include "llgl.h"
-#include "llstring.h"
-#include "lldir.h"
-
-#include "indra_constants.h"
-
-#include "llpreeditor.h"
-
// culled from winuser.h
#ifndef WM_MOUSEWHEEL /* Added to be compatible with later SDK's */
const S32 WM_MOUSEWHEEL = 0x020A;
@@ -358,13 +359,14 @@ LLWinImm::~LLWinImm()
}
-LLWindowWin32::LLWindowWin32(const std::string& title, const std::string& name, S32 x, S32 y, S32 width,
+LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
+ const std::string& title, const std::string& name, S32 x, S32 y, S32 width,
S32 height, U32 flags,
BOOL fullscreen, BOOL clearBg,
BOOL disable_vsync, BOOL use_gl,
BOOL ignore_pixel_depth,
U32 fsaa_samples)
- : LLWindow(fullscreen, flags)
+ : LLWindow(callbacks, fullscreen, flags)
{
mFSAASamples = fsaa_samples;
mIconResource = gIconResource;
@@ -378,6 +380,7 @@ LLWindowWin32::LLWindowWin32(const std::string& title, const std::string& name,
// Initialize the keyboard
gKeyboard = new LLKeyboardWin32();
+ gKeyboard->setCallbacks(callbacks);
// Initialize (boot strap) the Language text input management,
// based on the system's (user's) default settings.
@@ -481,7 +484,8 @@ LLWindowWin32::LLWindowWin32(const std::string& title, const std::string& name,
if (!RegisterClass(&wc))
{
- OSMessageBox("RegisterClass failed", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBRegClassFailed"),
+ mCallbacks->translateString("MBError"), OSMB_OK);
return;
}
sIsClassRegistered = TRUE;
@@ -572,8 +576,11 @@ LLWindowWin32::LLWindowWin32(const std::string& title, const std::string& name,
mFullscreenBits = -1;
mFullscreenRefresh = -1;
- std::string error = llformat("Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);
- OSMessageBox(error, "Error", OSMB_OK);
+ std::map<std::string,std::string> args;
+ args["[WIDTH]"] = llformat("%d", width);
+ args["[HEIGHT]"] = llformat ("%d", height);
+ OSMessageBox(mCallbacks->translateString("MBFullScreenErr", args),
+ mCallbacks->translateString("MBError"), OSMB_OK);
}
}
@@ -712,7 +719,9 @@ void LLWindowWin32::close()
// This causes WM_DESTROY to be sent *immediately*
if (!DestroyWindow(mWindowHandle))
{
- OSMessageBox("DestroyWindow(mWindowHandle) failed", "Shutdown Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBDestroyWinFailed"),
+ mCallbacks->translateString("MBShutdownErr"),
+ OSMB_OK);
}
mWindowHandle = NULL;
@@ -1015,14 +1024,16 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
if (!(mhDC = GetDC(mWindowHandle)))
{
close();
- OSMessageBox("Can't make GL device context", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBDevContextErr"),
+ mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
if (!(pixel_format = ChoosePixelFormat(mhDC, &pfd)))
{
close();
- OSMessageBox("Can't find suitable pixel format", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBPixelFmtErr"),
+ mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
@@ -1031,57 +1042,48 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
&pfd))
{
close();
- OSMessageBox("Can't get pixel format description", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBPixelFmtDescErr"),
+ mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
if (pfd.cColorBits < 32)
{
close();
- OSMessageBox(
- "Second Life requires True Color (32-bit) to run in a window.\n"
- "Please go to Control Panels -> Display -> Settings and\n"
- "set the screen to 32-bit color.\n"
- "Alternately, if you choose to run fullscreen, Second Life\n"
- "will automatically adjust the screen each time it runs.",
- "Error",
- OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBTrueColorWindow"),
+ mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
if (pfd.cAlphaBits < 8)
{
close();
- OSMessageBox(
- "Second Life is unable to run because it can't get an 8 bit alpha\n"
- "channel. Usually this is due to video card driver issues.\n"
- "Please make sure you have the latest video card drivers installed.\n"
- "Also be sure your monitor is set to True Color (32-bit) in\n"
- "Control Panels -> Display -> Settings.\n"
- "If you continue to receive this message, contact customer service.",
- "Error",
- OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBAlpha"),
+ mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
if (!SetPixelFormat(mhDC, pixel_format, &pfd))
{
close();
- OSMessageBox("Can't set pixel format", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBPixelFmtSetErr"),
+ mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
if (!(mhRC = wglCreateContext(mhDC)))
{
close();
- OSMessageBox("Can't create GL rendering context", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBGLContextErr"),
+ mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
if (!wglMakeCurrent(mhDC, mhRC))
{
close();
- OSMessageBox("Can't activate GL rendering context", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBGLContextActErr"),
+ mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
@@ -1243,14 +1245,15 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
if (!(mhDC = GetDC(mWindowHandle)))
{
close();
- OSMessageBox("Can't make GL device context", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBDevContextErr"), mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
if (!SetPixelFormat(mhDC, pixel_format, &pfd))
{
close();
- OSMessageBox("Can't set pixel format", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBPixelFmtSetErr"),
+ mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
@@ -1287,7 +1290,7 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
&pfd))
{
close();
- OSMessageBox("Can't get pixel format description", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBPixelFmtDescErr"), mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
@@ -1300,57 +1303,35 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
if (pfd.cColorBits < 32 || GetDeviceCaps(mhDC, BITSPIXEL) < 32)
{
close();
- OSMessageBox(
- "Second Life requires True Color (32-bit) to run in a window.\n"
- "Please go to Control Panels -> Display -> Settings and\n"
- "set the screen to 32-bit color.\n"
- "Alternately, if you choose to run fullscreen, Second Life\n"
- "will automatically adjust the screen each time it runs.",
- "Error",
- OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBTrueColorWindow"), mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
if (pfd.cAlphaBits < 8)
{
close();
- OSMessageBox(
- "Second Life is unable to run because it can't get an 8 bit alpha\n"
- "channel. Usually this is due to video card driver issues.\n"
- "Please make sure you have the latest video card drivers installed.\n"
- "Also be sure your monitor is set to True Color (32-bit) in\n"
- "Control Panels -> Display -> Settings.\n"
- "If you continue to receive this message, contact customer service.",
- "Error",
- OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBAlpha"), mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
if (!(mhRC = wglCreateContext(mhDC)))
{
close();
- OSMessageBox("Can't create GL rendering context", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBGLContextErr"), mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
if (!wglMakeCurrent(mhDC, mhRC))
{
close();
- OSMessageBox("Can't activate GL rendering context", "Error", OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBGLContextActErr"), mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
if (!gGLManager.initGL())
{
close();
- OSMessageBox(
- "Second Life is unable to run because your video card drivers\n"
- "did not install properly, are out of date, or are for unsupported\n"
- "hardware. Please make sure you have the latest video card drivers\n"
- "and even if you do have the latest, try reinstalling them.\n\n"
- "If you continue to receive this message, contact customer service.",
- "Error",
- OSMB_OK);
+ OSMessageBox(mCallbacks->translateString("MBVideoDrvErr"), mCallbacks->translateString("MBError"), OSMB_OK);
return FALSE;
}
@@ -3030,7 +3011,7 @@ void LLWindowWin32::spawnWebBrowser(const std::string& escaped_url )
}
-BOOL LLWindowWin32::dialog_color_picker ( F32 *r, F32 *g, F32 *b )
+BOOL LLWindowWin32::dialogColorPicker( F32 *r, F32 *g, F32 *b )
{
BOOL retval = FALSE;
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index 237f834318..e14324c9f1 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -100,7 +100,7 @@ public:
/*virtual*/ F32 getPixelAspectRatio();
/*virtual*/ void setNativeAspectRatio(F32 ratio) { mOverrideAspectRatio = ratio; }
- /*virtual*/ BOOL dialog_color_picker (F32 *r, F32 *g, F32 *b );
+ /*virtual*/ BOOL dialogColorPicker(F32 *r, F32 *g, F32 *b );
/*virtual*/ void *getPlatformWindow();
/*virtual*/ void bringToFront();
@@ -115,7 +115,7 @@ public:
static std::vector<std::string> getDynamicFallbackFontList();
protected:
- LLWindowWin32(
+ LLWindowWin32(LLWindowCallbacks* callbacks,
const std::string& title, const std::string& name, int x, int y, int width, int height, U32 flags,
BOOL fullscreen, BOOL clearBg, BOOL disable_vsync, BOOL use_gl,
BOOL ignore_pixel_depth, U32 fsaa_samples);
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
index dc7787beea..b1ac85812c 100644
--- a/indra/llxml/CMakeLists.txt
+++ b/indra/llxml/CMakeLists.txt
@@ -5,11 +5,13 @@ project(llxml)
include(00-Common)
include(LLCommon)
include(LLMath)
+include(LLVFS)
include(LLXML)
include_directories(
${LLCOMMON_INCLUDE_DIRS}
${LLMATH_INCLUDE_DIRS}
+ ${LLVFS_INCLUDE_DIRS}
)
set(llxml_SOURCE_FILES
@@ -38,6 +40,7 @@ add_library (llxml ${llxml_SOURCE_FILES})
# Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level
target_link_libraries( llxml
+ llvfs
llmath
${BOOST_SIGNALS_LIBRARY}
${EXPAT_LIBRARIES}
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp
index d9ed45ab9d..2271c02cd0 100644
--- a/indra/llxml/llcontrol.cpp
+++ b/indra/llxml/llcontrol.cpp
@@ -56,6 +56,45 @@
#define CONTROL_ERRS LL_WARNS("ControlErrors")
#endif
+
+template <> eControlType get_control_type<U32>();
+template <> eControlType get_control_type<S32>();
+template <> eControlType get_control_type<F32>();
+template <> eControlType get_control_type<bool>();
+// Yay BOOL, its really an S32.
+//template <> eControlType get_control_type<BOOL> () ;
+template <> eControlType get_control_type<std::string>();
+
+template <> eControlType get_control_type<LLVector3>();
+template <> eControlType get_control_type<LLVector3d>();
+template <> eControlType get_control_type<LLRect>();
+template <> eControlType get_control_type<LLColor4>();
+template <> eControlType get_control_type<LLColor3>();
+template <> eControlType get_control_type<LLColor4U>();
+template <> eControlType get_control_type<LLSD>();
+
+template <> LLSD convert_to_llsd<U32>(const U32& in);
+template <> LLSD convert_to_llsd<LLVector3>(const LLVector3& in);
+template <> LLSD convert_to_llsd<LLVector3d>(const LLVector3d& in);
+template <> LLSD convert_to_llsd<LLRect>(const LLRect& in);
+template <> LLSD convert_to_llsd<LLColor4>(const LLColor4& in);
+template <> LLSD convert_to_llsd<LLColor3>(const LLColor3& in);
+template <> LLSD convert_to_llsd<LLColor4U>(const LLColor4U& in);
+
+template <> bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> LLWString convert_from_llsd<LLWString>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> LLColor4 convert_from_llsd<LLColor4>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> LLColor4U convert_from_llsd<LLColor4U>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, const std::string& control_name);
+template <> LLSD convert_from_llsd<LLSD>(const LLSD& sd, eControlType type, const std::string& control_name);
+
//this defines the current version of the settings file
const S32 CURRENT_VERSION = 101;
@@ -87,9 +126,6 @@ bool LLControlVariable::llsd_compare(const LLSD& a, const LLSD & b)
case TYPE_COL3:
result = LLColor3(a) == LLColor3(b);
break;
- case TYPE_COL4U:
- result = LLColor4U(a) == LLColor4U(b);
- break;
case TYPE_STRING:
result = a.asString() == b.asString();
break;
@@ -148,9 +184,15 @@ LLSD LLControlVariable::getComparableValue(const LLSD& value)
return storable_value;
}
-void LLControlVariable::setValue(const LLSD& value, bool saved_value)
+void LLControlVariable::setValue(const LLSD& new_value, bool saved_value)
{
- LLSD storable_value = getComparableValue(value);
+ if (mValidateSignal(this, new_value) == false)
+ {
+ // can not set new value, exit
+ return;
+ }
+
+ LLSD storable_value = getComparableValue(new_value);
bool value_changed = llsd_compare(getValue(), storable_value) == FALSE;
if(saved_value)
{
@@ -163,7 +205,7 @@ void LLControlVariable::setValue(const LLSD& value, bool saved_value)
}
else
{
- // This is a unsaved value. Its needs to reside at
+ // This is an unsaved value. Its needs to reside at
// mValues[2] (or greater). It must not affect
// the result of getSaveValue()
if (llsd_compare(mValues.back(), storable_value) == FALSE)
@@ -185,10 +227,9 @@ void LLControlVariable::setValue(const LLSD& value, bool saved_value)
}
}
-
if(value_changed)
{
- mSignal(storable_value);
+ mCommitSignal(this, storable_value);
}
}
@@ -262,7 +303,8 @@ LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name)
////////////////////////////////////////////////////////////////////////////
-LLControlGroup::LLControlGroup()
+LLControlGroup::LLControlGroup(const std::string& name)
+: LLInstanceTracker<LLControlGroup, std::string>(name)
{
mTypeString[TYPE_U32] = "U32";
mTypeString[TYPE_S32] = "S32";
@@ -274,7 +316,6 @@ LLControlGroup::LLControlGroup()
mTypeString[TYPE_RECT] = "Rect";
mTypeString[TYPE_COL4] = "Color4";
mTypeString[TYPE_COL3] = "Color3";
- mTypeString[TYPE_COL4U] = "Color4u";
mTypeString[TYPE_LLSD] = "LLSD";
}
@@ -309,10 +350,13 @@ BOOL LLControlGroup::declareControl(const std::string& name, eControlType type,
{
if (persist && existing_control->isType(type))
{
- // Sometimes we need to declare a control *after* it has been loaded from a settings file.
- LLSD cur_value = existing_control->getValue(); // get the current value
- existing_control->setDefaultValue(initial_val); // set the default to the declared value
- existing_control->setValue(cur_value); // now set to the loaded value
+ if (!existing_control->llsd_compare(existing_control->getDefault(), initial_val))
+ {
+ // Sometimes we need to declare a control *after* it has been loaded from a settings file.
+ LLSD cur_value = existing_control->getValue(); // get the current value
+ existing_control->setDefaultValue(initial_val); // set the default to the declared value
+ existing_control->setValue(cur_value); // now set to the loaded value
+ }
}
else
{
@@ -367,11 +411,6 @@ BOOL LLControlGroup::declareRect(const std::string& name, const LLRect &initial_
return declareControl(name, TYPE_RECT, initial_val.getValue(), comment, persist);
}
-BOOL LLControlGroup::declareColor4U(const std::string& name, const LLColor4U &initial_val, const std::string& comment, BOOL persist )
-{
- return declareControl(name, TYPE_COL4U, initial_val.getValue(), comment, persist);
-}
-
BOOL LLControlGroup::declareColor4(const std::string& name, const LLColor4 &initial_val, const std::string& comment, BOOL persist )
{
return declareControl(name, TYPE_COL4, initial_val.getValue(), comment, persist);
@@ -389,81 +428,32 @@ BOOL LLControlGroup::declareLLSD(const std::string& name, const LLSD &initial_va
BOOL LLControlGroup::getBOOL(const std::string& name)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_BOOLEAN))
- return control->get().asBoolean();
- else
- {
- CONTROL_ERRS << "Invalid BOOL control " << name << llendl;
- return FALSE;
- }
+ return (BOOL)get<bool>(name);
}
S32 LLControlGroup::getS32(const std::string& name)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_S32))
- return control->get().asInteger();
- else
- {
- CONTROL_ERRS << "Invalid S32 control " << name << llendl;
- return 0;
- }
+ return get<S32>(name);
}
U32 LLControlGroup::getU32(const std::string& name)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_U32))
- return control->get().asInteger();
- else
- {
- CONTROL_ERRS << "Invalid U32 control " << name << llendl;
- return 0;
- }
+ return get<U32>(name);
}
F32 LLControlGroup::getF32(const std::string& name)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_F32))
- return (F32) control->get().asReal();
- else
- {
- CONTROL_ERRS << "Invalid F32 control " << name << llendl;
- return 0.0f;
- }
-}
-
-std::string LLControlGroup::findString(const std::string& name)
-{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_STRING))
- return control->get().asString();
- return LLStringUtil::null;
+ return get<F32>(name);
}
std::string LLControlGroup::getString(const std::string& name)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_STRING))
- return control->get().asString();
- else
- {
- CONTROL_ERRS << "Invalid string control " << name << llendl;
- return LLStringUtil::null;
- }
+ return get<std::string>(name);
}
LLWString LLControlGroup::getWString(const std::string& name)
{
- return utf8str_to_wstring(getString(name));
+ return get<LLWString>(name);
}
std::string LLControlGroup::getText(const std::string& name)
@@ -476,123 +466,38 @@ std::string LLControlGroup::getText(const std::string& name)
LLVector3 LLControlGroup::getVector3(const std::string& name)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_VEC3))
- return control->get();
- else
- {
- CONTROL_ERRS << "Invalid LLVector3 control " << name << llendl;
- return LLVector3::zero;
- }
+ return get<LLVector3>(name);
}
LLVector3d LLControlGroup::getVector3d(const std::string& name)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_VEC3D))
- return control->get();
- else
- {
- CONTROL_ERRS << "Invalid LLVector3d control " << name << llendl;
- return LLVector3d::zero;
- }
+ return get<LLVector3d>(name);
}
LLRect LLControlGroup::getRect(const std::string& name)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_RECT))
- return control->get();
- else
- {
- CONTROL_ERRS << "Invalid rect control " << name << llendl;
- return LLRect::null;
- }
+ return get<LLRect>(name);
}
LLColor4 LLControlGroup::getColor(const std::string& name)
{
- ctrl_name_table_t::const_iterator i = mNameTable.find(name);
-
- if (i != mNameTable.end())
- {
- LLControlVariable* control = i->second;
-
- switch(control->mType)
- {
- case TYPE_COL4:
- {
- return LLColor4(control->get());
- }
- case TYPE_COL4U:
- {
- return LLColor4(LLColor4U(control->get()));
- }
- default:
- {
- CONTROL_ERRS << "Control " << name << " not a color" << llendl;
- return LLColor4::white;
- }
- }
- }
- else
- {
- CONTROL_ERRS << "Invalid getColor control " << name << llendl;
- return LLColor4::white;
- }
-}
-
-LLColor4U LLControlGroup::getColor4U(const std::string& name)
-{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_COL4U))
- return control->get();
- else
- {
- CONTROL_ERRS << "Invalid LLColor4 control " << name << llendl;
- return LLColor4U::white;
- }
+ return get<LLColor4>(name);
}
LLColor4 LLControlGroup::getColor4(const std::string& name)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_COL4))
- return control->get();
- else
- {
- CONTROL_ERRS << "Invalid LLColor4 control " << name << llendl;
- return LLColor4::white;
- }
+ return get<LLColor4>(name);
}
LLColor3 LLControlGroup::getColor3(const std::string& name)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_COL3))
- return control->get();
- else
- {
- CONTROL_ERRS << "Invalid LLColor3 control " << name << llendl;
- return LLColor3::white;
- }
+ return get<LLColor3>(name);
}
LLSD LLControlGroup::getLLSD(const std::string& name)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_LLSD))
- return control->getValue();
- CONTROL_ERRS << "Invalid LLSD control " << name << llendl;
- return LLSD();
+ return get<LLSD>(name);
}
BOOL LLControlGroup::controlExists(const std::string& name)
@@ -601,170 +506,67 @@ BOOL LLControlGroup::controlExists(const std::string& name)
return iter != mNameTable.end();
}
+
//-------------------------------------------------------------------
// Set functions
//-------------------------------------------------------------------
void LLControlGroup::setBOOL(const std::string& name, BOOL val)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_BOOLEAN))
- {
- control->set(val);
- }
- else
- {
- CONTROL_ERRS << "Invalid control " << name << llendl;
- }
+ set<bool>(name, val);
}
void LLControlGroup::setS32(const std::string& name, S32 val)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_S32))
- {
- control->set(val);
- }
- else
- {
- CONTROL_ERRS << "Invalid control " << name << llendl;
- }
+ set(name, val);
}
void LLControlGroup::setF32(const std::string& name, F32 val)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_F32))
- {
- control->set(val);
- }
- else
- {
- CONTROL_ERRS << "Invalid control " << name << llendl;
- }
+ set(name, val);
}
void LLControlGroup::setU32(const std::string& name, U32 val)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_U32))
- {
- control->set((LLSD::Integer) val);
- }
- else
- {
- CONTROL_ERRS << "Invalid control " << name << llendl;
- }
+ set(name, val);
}
void LLControlGroup::setString(const std::string& name, const std::string &val)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_STRING))
- {
- control->set(val);
- }
- else
- {
- CONTROL_ERRS << "Invalid control " << name << llendl;
- }
+ set(name, val);
}
void LLControlGroup::setVector3(const std::string& name, const LLVector3 &val)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_VEC3))
- {
- control->set(val.getValue());
- }
- else
- {
- CONTROL_ERRS << "Invalid control " << name << llendl;
- }
+ set(name, val);
}
void LLControlGroup::setVector3d(const std::string& name, const LLVector3d &val)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_VEC3D))
- {
- control->set(val.getValue());
- }
- else
- {
- CONTROL_ERRS << "Invalid control " << name << llendl;
- }
+ set(name, val);
}
void LLControlGroup::setRect(const std::string& name, const LLRect &val)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_RECT))
- {
- control->set(val.getValue());
- }
- else
- {
- CONTROL_ERRS << "Invalid rect control " << name << llendl;
- }
-}
-
-void LLControlGroup::setColor4U(const std::string& name, const LLColor4U &val)
-{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_COL4U))
- {
- control->set(val.getValue());
- }
- else
- {
- CONTROL_ERRS << "Invalid LLColor4 control " << name << llendl;
- }
+ set(name, val);
}
void LLControlGroup::setColor4(const std::string& name, const LLColor4 &val)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_COL4))
- {
- control->set(val.getValue());
- }
- else
- {
- CONTROL_ERRS << "Invalid LLColor4 control " << name << llendl;
- }
+ set(name, val);
}
void LLControlGroup::setLLSD(const std::string& name, const LLSD& val)
{
- LLControlVariable* control = getControl(name);
-
- if (control && control->isType(TYPE_LLSD))
- {
- setValue(name, val);
- }
- else
- {
- CONTROL_ERRS << "Invalid LLSD control " << name << llendl;
- }
+ set(name, val);
}
-void LLControlGroup::setValue(const std::string& name, const LLSD& val)
+void LLControlGroup::setUntypedValue(const std::string& name, const LLSD& val)
{
if (name.empty())
{
@@ -775,7 +577,7 @@ void LLControlGroup::setValue(const std::string& name, const LLSD& val)
if (control)
{
- control->set(val);
+ control->setValue(val);
}
else
{
@@ -783,6 +585,7 @@ void LLControlGroup::setValue(const std::string& name, const LLSD& val)
}
}
+
//---------------------------------------------------------------
// Load and save
//---------------------------------------------------------------
@@ -851,9 +654,6 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require
case TYPE_COL4:
declareColor4(name, LLColor4::white, LLStringUtil::null, NO_PERSIST);
break;
- case TYPE_COL4U:
- declareColor4U(name, LLColor4U::white, LLStringUtil::null, NO_PERSIST);
- break;
case TYPE_STRING:
default:
declareString(name, LLStringUtil::null, LLStringUtil::null, NO_PERSIST);
@@ -951,15 +751,6 @@ U32 LLControlGroup::loadFromFileLegacy(const std::string& filename, BOOL require
validitems++;
}
break;
- case TYPE_COL4U:
- {
- LLColor4U color;
-
- child_nodep->getAttributeColor4U("value", color);
- control->set(color.getValue());
- validitems++;
- }
- break;
case TYPE_COL4:
{
LLColor4 color;
@@ -1059,10 +850,11 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
}
U32 validitems = 0;
- bool persist = true;
bool hidefromsettingseditor = false;
+
for(LLSD::map_const_iterator itr = settings.beginMap(); itr != settings.endMap(); ++itr)
{
+ bool persist = true;
name = (*itr).first;
control_map = (*itr).second;
@@ -1152,55 +944,6 @@ void LLControlGroup::applyToAll(ApplyFunctor* func)
}
}
-//============================================================================
-// First-use
-
-static std::string get_warn_name(const std::string& name)
-{
- std::string warnname = "Warn" + name;
- for (std::string::iterator iter = warnname.begin(); iter != warnname.end(); ++iter)
- {
- char c = *iter;
- if (!isalnum(c))
- {
- *iter = '_';
- }
- }
- return warnname;
-}
-
-void LLControlGroup::addWarning(const std::string& name)
-{
- std::string warnname = get_warn_name(name);
- if(mNameTable.find(warnname) == mNameTable.end())
- {
- std::string comment = std::string("Enables ") + name + std::string(" warning dialog");
- declareBOOL(warnname, TRUE, comment);
- mWarnings.insert(warnname);
- }
-}
-
-BOOL LLControlGroup::getWarning(const std::string& name)
-{
- std::string warnname = get_warn_name(name);
- return getBOOL(warnname);
-}
-
-void LLControlGroup::setWarning(const std::string& name, BOOL val)
-{
- std::string warnname = get_warn_name(name);
- setBOOL(warnname, val);
-}
-
-void LLControlGroup::resetWarnings()
-{
- for (std::set<std::string>::iterator iter = mWarnings.begin();
- iter != mWarnings.end(); ++iter)
- {
- setBOOL(*iter, TRUE);
- }
-}
-
//============================================================================
#ifdef TEST_HARNESS
@@ -1265,4 +1008,297 @@ void main()
#endif
+template <> eControlType get_control_type<U32>()
+{
+ return TYPE_U32;
+}
+
+template <> eControlType get_control_type<S32>()
+{
+ return TYPE_S32;
+}
+
+template <> eControlType get_control_type<F32>()
+{
+ return TYPE_F32;
+}
+
+template <> eControlType get_control_type<bool> ()
+{
+ return TYPE_BOOLEAN;
+}
+/*
+// Yay BOOL, its really an S32.
+template <> eControlType get_control_type<BOOL> ()
+{
+ return TYPE_BOOLEAN;
+}
+*/
+template <> eControlType get_control_type<std::string>()
+{
+ return TYPE_STRING;
+}
+
+template <> eControlType get_control_type<LLVector3>()
+{
+ return TYPE_VEC3;
+}
+
+template <> eControlType get_control_type<LLVector3d>()
+{
+ return TYPE_VEC3D;
+}
+
+template <> eControlType get_control_type<LLRect>()
+{
+ return TYPE_RECT;
+}
+
+template <> eControlType get_control_type<LLColor4>()
+{
+ return TYPE_COL4;
+}
+
+template <> eControlType get_control_type<LLColor3>()
+{
+ return TYPE_COL3;
+}
+
+template <> eControlType get_control_type<LLSD>()
+{
+ return TYPE_LLSD;
+}
+
+
+template <> LLSD convert_to_llsd<U32>(const U32& in)
+{
+ return (LLSD::Integer)in;
+}
+
+template <> LLSD convert_to_llsd<LLVector3>(const LLVector3& in)
+{
+ return in.getValue();
+}
+
+template <> LLSD convert_to_llsd<LLVector3d>(const LLVector3d& in)
+{
+ return in.getValue();
+}
+
+template <> LLSD convert_to_llsd<LLRect>(const LLRect& in)
+{
+ return in.getValue();
+}
+
+template <> LLSD convert_to_llsd<LLColor4>(const LLColor4& in)
+{
+ return in.getValue();
+}
+
+template <> LLSD convert_to_llsd<LLColor3>(const LLColor3& in)
+{
+ return in.getValue();
+}
+
+template <> LLSD convert_to_llsd<LLColor4U>(const LLColor4U& in)
+{
+ return in.getValue();
+}
+
+
+template<>
+bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ if (type == TYPE_BOOLEAN)
+ return sd.asBoolean();
+ else
+ {
+ CONTROL_ERRS << "Invalid BOOL value" << llendl;
+ return FALSE;
+ }
+}
+
+template<>
+S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ if (type == TYPE_S32)
+ return sd.asInteger();
+ else
+ {
+ CONTROL_ERRS << "Invalid S32 value" << llendl;
+ return 0;
+ }
+}
+
+template<>
+U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ if (type == TYPE_U32)
+ return sd.asInteger();
+ else
+ {
+ CONTROL_ERRS << "Invalid U32 value" << llendl;
+ return 0;
+ }
+}
+
+template<>
+F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ if (type == TYPE_F32)
+ return (F32) sd.asReal();
+ else
+ {
+ CONTROL_ERRS << "Invalid F32 value" << llendl;
+ return 0.0f;
+ }
+}
+
+template<>
+std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ if (type == TYPE_STRING)
+ return sd.asString();
+ else
+ {
+ CONTROL_ERRS << "Invalid string value" << llendl;
+ return LLStringUtil::null;
+ }
+}
+
+template<>
+LLWString convert_from_llsd<LLWString>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ return utf8str_to_wstring(convert_from_llsd<std::string>(sd, type, control_name));
+}
+
+template<>
+LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ if (type == TYPE_VEC3)
+ return sd;
+ else
+ {
+ CONTROL_ERRS << "Invalid LLVector3 value" << llendl;
+ return LLVector3::zero;
+ }
+}
+
+template<>
+LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ if (type == TYPE_VEC3D)
+ return sd;
+ else
+ {
+ CONTROL_ERRS << "Invalid LLVector3d value" << llendl;
+ return LLVector3d::zero;
+ }
+}
+
+template<>
+LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ if (type == TYPE_RECT)
+ return sd;
+ else
+ {
+ CONTROL_ERRS << "Invalid rect value" << llendl;
+ return LLRect::null;
+ }
+}
+
+
+template<>
+LLColor4 convert_from_llsd<LLColor4>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ if (type == TYPE_COL4)
+ {
+ LLColor4 color(sd);
+ if (color.mV[VRED] < 0.f || color.mV[VRED] > 1.f)
+ {
+ llwarns << "Color " << control_name << " value out of range " << llendl;
+ }
+ else if (color.mV[VGREEN] < 0.f || color.mV[VGREEN] > 1.f)
+ {
+ llwarns << "Color " << control_name << " value out of range " << llendl;
+ }
+ else if (color.mV[VBLUE] < 0.f || color.mV[VBLUE] > 1.f)
+ {
+ llwarns << "Color " << control_name << " value out of range " << llendl;
+ }
+ else if (color.mV[VALPHA] < 0.f || color.mV[VALPHA] > 1.f)
+ {
+ llwarns << "Color " << control_name << " value out of range " << llendl;
+ }
+
+ return LLColor4(sd);
+ }
+ else
+ {
+ CONTROL_ERRS << "Control " << control_name << " not a color" << llendl;
+ return LLColor4::white;
+ }
+}
+
+template<>
+LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ if (type == TYPE_COL3)
+ return sd;
+ else
+ {
+ CONTROL_ERRS << "Invalid LLColor3 value" << llendl;
+ return LLColor3::white;
+ }
+}
+
+template<>
+LLSD convert_from_llsd<LLSD>(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ return sd;
+}
+
+
+#if TEST_CACHED_CONTROL
+
+#define DECL_LLCC(T, V) static LLCachedControl<T> mySetting_##T("TestCachedControl"#T, V)
+DECL_LLCC(U32, (U32)666);
+DECL_LLCC(S32, (S32)-666);
+DECL_LLCC(F32, (F32)-666.666);
+DECL_LLCC(bool, true);
+DECL_LLCC(BOOL, FALSE);
+static LLCachedControl<std::string> mySetting_string("TestCachedControlstring", "Default String Value");
+DECL_LLCC(LLVector3, LLVector3(1.0f, 2.0f, 3.0f));
+DECL_LLCC(LLVector3d, LLVector3d(6.0f, 5.0f, 4.0f));
+DECL_LLCC(LLRect, LLRect(0, 0, 100, 500));
+DECL_LLCC(LLColor4, LLColor4(0.0f, 0.5f, 1.0f));
+DECL_LLCC(LLColor3, LLColor3(1.0f, 0.f, 0.5f));
+DECL_LLCC(LLColor4U, LLColor4U(255, 200, 100, 255));
+
+LLSD test_llsd = LLSD()["testing1"] = LLSD()["testing2"];
+DECL_LLCC(LLSD, test_llsd);
+
+static LLCachedControl<std::string> test_BrowserHomePage("BrowserHomePage", "hahahahahha", "Not the real comment");
+
+void test_cached_control()
+{
+#define TEST_LLCC(T, V) if((T)mySetting_##T != V) llerrs << "Fail "#T << llendl
+ TEST_LLCC(U32, 666);
+ TEST_LLCC(S32, (S32)-666);
+ TEST_LLCC(F32, (F32)-666.666);
+ TEST_LLCC(bool, true);
+ TEST_LLCC(BOOL, FALSE);
+ if((std::string)mySetting_string != "Default String Value") llerrs << "Fail string" << llendl;
+ TEST_LLCC(LLVector3, LLVector3(1.0f, 2.0f, 3.0f));
+ TEST_LLCC(LLVector3d, LLVector3d(6.0f, 5.0f, 4.0f));
+ TEST_LLCC(LLRect, LLRect(0, 0, 100, 500));
+ TEST_LLCC(LLColor4, LLColor4(0.0f, 0.5f, 1.0f));
+ TEST_LLCC(LLColor3, LLColor3(1.0f, 0.f, 0.5f));
+ TEST_LLCC(LLColor4U, LLColor4U(255, 200, 100, 255));
+//There's no LLSD comparsion for LLCC yet. TEST_LLCC(LLSD, test_llsd);
+
+ if((std::string)test_BrowserHomePage != "http://www.secondlife.com") llerrs << "Fail BrowserHomePage" << llendl;
+}
+#endif // TEST_CACHED_CONTROL
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h
index ba0a1c7cbf..1782c20a7e 100644
--- a/indra/llxml/llcontrol.h
+++ b/indra/llxml/llcontrol.h
@@ -33,11 +33,14 @@
#ifndef LL_LLCONTROL_H
#define LL_LLCONTROL_H
+#include "llboost.h"
#include "llevent.h"
#include "llnametable.h"
#include "llmap.h"
#include "llstring.h"
#include "llrect.h"
+#include "llrefcount.h"
+#include "llinstancetracker.h"
#include "llcontrolgroupreader.h"
@@ -65,7 +68,6 @@ class LLVector3;
class LLVector3d;
class LLColor4;
class LLColor3;
-class LLColor4U;
const BOOL NO_PERSIST = FALSE;
@@ -81,15 +83,17 @@ typedef enum e_control_type
TYPE_RECT,
TYPE_COL4,
TYPE_COL3,
- TYPE_COL4U,
TYPE_LLSD,
TYPE_COUNT
} eControlType;
-class LLControlVariable : public LLRefCount
+class LLControlVariable : public LLRefCount, boost::noncopyable
{
friend class LLControlGroup;
- typedef boost::signal<void(const LLSD&)> signal_t;
+
+public:
+ typedef boost::signal<bool(LLControlVariable* control, const LLSD&), boost_boolean_combiner> validate_signal_t;
+ typedef boost::signal<void(LLControlVariable* control, const LLSD&)> commit_signal_t;
private:
std::string mName;
@@ -99,7 +103,8 @@ private:
bool mHideFromSettingsEditor;
std::vector<LLSD> mValues;
- signal_t mSignal;
+ commit_signal_t mCommitSignal;
+ validate_signal_t mValidateSignal;
public:
LLControlVariable(const std::string& name, eControlType type,
@@ -116,7 +121,9 @@ public:
void resetToDefault(bool fire_signal = false);
- signal_t* getSignal() { return &mSignal; }
+ commit_signal_t* getSignal() { return &mCommitSignal; } // shorthand for commit signal
+ commit_signal_t* getCommitSignal() { return &mCommitSignal; }
+ validate_signal_t* getValidateSignal() { return &mValidateSignal; }
bool isDefault() { return (mValues.size() == 1); }
bool isSaveValueDefault();
@@ -136,31 +143,55 @@ public:
void firePropertyChanged()
{
- mSignal(mValues.back());
+ mCommitSignal(this, mValues.back());
}
private:
LLSD getComparableValue(const LLSD& value);
bool llsd_compare(const LLSD& a, const LLSD & b);
-
};
+typedef LLPointer<LLControlVariable> LLControlVariablePtr;
+
+//! Helper functions for converting between static types and LLControl values
+template <class T>
+eControlType get_control_type()
+{
+ llwarns << "Usupported control type: " << typeid(T).name() << "." << llendl;
+ return TYPE_COUNT;
+}
+
+template <class T>
+LLSD convert_to_llsd(const T& in)
+{
+ // default implementation
+ return LLSD(in);
+}
+
+template <class T>
+T convert_from_llsd(const LLSD& sd, eControlType type, const std::string& control_name)
+{
+ // needs specialization
+ return T(sd);
+}
+
//const U32 STRING_CACHE_SIZE = 10000;
-class LLControlGroup : public LLControlGroupReader
+class LLControlGroup : public LLInstanceTracker<LLControlGroup, std::string>
{
protected:
- typedef std::map<std::string, LLPointer<LLControlVariable> > ctrl_name_table_t;
+ typedef std::map<std::string, LLControlVariablePtr > ctrl_name_table_t;
ctrl_name_table_t mNameTable;
- std::set<std::string> mWarnings;
std::string mTypeString[TYPE_COUNT];
eControlType typeStringToEnum(const std::string& typestr);
std::string typeEnumToString(eControlType typeenum);
public:
- LLControlGroup();
+ LLControlGroup(const std::string& name);
~LLControlGroup();
void cleanup();
- LLPointer<LLControlVariable> getControl(const std::string& name);
+ typedef LLInstanceTracker<LLControlGroup, std::string>::instance_iter instance_iter;
+
+ LLControlVariablePtr getControl(const std::string& name);
struct ApplyFunctor
{
@@ -178,33 +209,47 @@ public:
BOOL declareVec3(const std::string& name, const LLVector3 &initial_val,const std::string& comment, BOOL persist = TRUE);
BOOL declareVec3d(const std::string& name, const LLVector3d &initial_val, const std::string& comment, BOOL persist = TRUE);
BOOL declareRect(const std::string& name, const LLRect &initial_val, const std::string& comment, BOOL persist = TRUE);
- BOOL declareColor4U(const std::string& name, const LLColor4U &initial_val, const std::string& comment, BOOL persist = TRUE);
BOOL declareColor4(const std::string& name, const LLColor4 &initial_val, const std::string& comment, BOOL persist = TRUE);
BOOL declareColor3(const std::string& name, const LLColor3 &initial_val, const std::string& comment, BOOL persist = TRUE);
BOOL declareLLSD(const std::string& name, const LLSD &initial_val, const std::string& comment, BOOL persist = TRUE);
-
- std::string findString(const std::string& name);
- std::string getString(const std::string& name);
- LLWString getWString(const std::string& name);
- std::string getText(const std::string& name);
- LLVector3 getVector3(const std::string& name);
- LLVector3d getVector3d(const std::string& name);
- LLRect getRect(const std::string& name);
+ std::string getString(const std::string& name);
+ std::string getText(const std::string& name);
BOOL getBOOL(const std::string& name);
S32 getS32(const std::string& name);
F32 getF32(const std::string& name);
U32 getU32(const std::string& name);
+
+ LLWString getWString(const std::string& name);
+ LLVector3 getVector3(const std::string& name);
+ LLVector3d getVector3d(const std::string& name);
+ LLRect getRect(const std::string& name);
LLSD getLLSD(const std::string& name);
- // Note: If an LLColor4U control exists, it will cast it to the correct
- // LLColor4 for you.
LLColor4 getColor(const std::string& name);
- LLColor4U getColor4U(const std::string& name);
LLColor4 getColor4(const std::string& name);
LLColor3 getColor3(const std::string& name);
+ // generic getter
+ template<typename T> T get(const std::string& name)
+ {
+ LLControlVariable* control = getControl(name);
+ LLSD value;
+ eControlType type = TYPE_COUNT;
+
+ if (control)
+ {
+ value = control->get();
+ type = control->type();
+ }
+ else
+ {
+ llwarns << "Control " << name << " not found." << llendl;
+ }
+ return convert_from_llsd<T>(value, type, name);
+ }
+
void setBOOL(const std::string& name, BOOL val);
void setS32(const std::string& name, S32 val);
void setF32(const std::string& name, F32 val);
@@ -213,12 +258,26 @@ public:
void setVector3(const std::string& name, const LLVector3 &val);
void setVector3d(const std::string& name, const LLVector3d &val);
void setRect(const std::string& name, const LLRect &val);
- void setColor4U(const std::string& name, const LLColor4U &val);
void setColor4(const std::string& name, const LLColor4 &val);
- void setColor3(const std::string& name, const LLColor3 &val);
void setLLSD(const std::string& name, const LLSD& val);
- void setValue(const std::string& name, const LLSD& val);
+
+ // type agnostic setter that takes LLSD
+ void setUntypedValue(const std::string& name, const LLSD& val);
+
+ // generic setter
+ template<typename T> void set(const std::string& name, const T& val)
+ {
+ LLControlVariable* control = getControl(name);
+ if (control && control->isType(get_control_type<T>()))
+ {
+ control->set(convert_to_llsd(val));
+ }
+ else
+ {
+ llwarns << "Invalid control " << name << llendl;
+ }
+ }
BOOL controlExists(const std::string& name);
@@ -229,17 +288,170 @@ public:
U32 saveToFile(const std::string& filename, BOOL nondefault_only);
U32 loadFromFile(const std::string& filename, bool default_values = false);
void resetToDefaults();
+};
+
+//! Publish/Subscribe object to interact with LLControlGroups.
+
+//! Use an LLCachedControl instance to connect to a LLControlVariable
+//! without have to manually create and bind a listener to a local
+//! object.
+template <class T>
+class LLControlCache : public LLRefCount, public LLInstanceTracker<LLControlCache<T>, std::string>
+{
+public:
+ // This constructor will declare a control if it doesn't exist in the contol group
+ LLControlCache(LLControlGroup& group,
+ const std::string& name,
+ const T& default_value,
+ const std::string& comment)
+ : LLInstanceTracker<LLControlCache<T>, std::string >(name)
+ {
+ if(!group.controlExists(name))
+ {
+ if(!declareTypedControl(group, name, default_value, comment))
+ {
+ llerrs << "The control could not be created!!!" << llendl;
+ }
+ }
+
+ bindToControl(group, name);
+ }
+
+ LLControlCache(LLControlGroup& group,
+ const std::string& name)
+ : LLInstanceTracker<LLControlCache<T>, std::string >(name)
+ {
+ if(!group.controlExists(name))
+ {
+ llerrs << "Control named " << name << "not found." << llendl;
+ }
+
+ bindToControl(group, name);
+ }
+
+ ~LLControlCache()
+ {
+ if(mConnection.connected())
+ {
+ mConnection.disconnect();
+ }
+ }
+
+ const T& getValue() const { return mCachedValue; }
- // Ignorable Warnings
-
- // Add a config variable to be reset on resetWarnings()
- void addWarning(const std::string& name);
- BOOL getWarning(const std::string& name);
- void setWarning(const std::string& name, BOOL val);
-
- // Resets all ignorables
- void resetWarnings();
+private:
+ void bindToControl(LLControlGroup& group, const std::string& name)
+ {
+ LLControlVariablePtr controlp = group.getControl(name);
+ mType = controlp->type();
+ mCachedValue = convert_from_llsd<T>(controlp->get(), mType, name);
+
+ // Add a listener to the controls signal...
+ mConnection = controlp->getSignal()->connect(
+ boost::bind(&LLControlCache<T>::handleValueChange, this, _2)
+ );
+ mType = controlp->type();
+ }
+ bool declareTypedControl(LLControlGroup& group,
+ const std::string& name,
+ const T& default_value,
+ const std::string& comment)
+ {
+ LLSD init_value;
+ eControlType type = get_control_type<T>();
+ init_value = convert_to_llsd(default_value);
+ if(type < TYPE_COUNT)
+ {
+ group.declareControl(name, type, init_value, comment, FALSE);
+ return true;
+ }
+ return false;
+ }
+
+ bool handleValueChange(const LLSD& newvalue)
+ {
+ mCachedValue = convert_from_llsd<T>(newvalue, mType, "");
+ return true;
+ }
+
+private:
+ T mCachedValue;
+ eControlType mType;
+ boost::signals::connection mConnection;
+};
+
+template <typename T>
+class LLCachedControl
+{
+public:
+ LLCachedControl(LLControlGroup& group,
+ const std::string& name,
+ const T& default_value,
+ const std::string& comment = "Declared In Code")
+ {
+ mCachedControlPtr = LLControlCache<T>::getInstance(name);
+ if (mCachedControlPtr.isNull())
+ {
+ mCachedControlPtr = new LLControlCache<T>(group, name, default_value, comment);
+ }
+ }
+
+ LLCachedControl(LLControlGroup& group,
+ const std::string& name)
+ {
+ mCachedControlPtr = LLControlCache<T>::getInstance(name);
+ if (mCachedControlPtr.isNull())
+ {
+ mCachedControlPtr = new LLControlCache<T>(group, name);
+ }
+ }
+
+ operator const T&() const { return mCachedControlPtr->getValue(); }
+ operator boost::function<const T&()> () const { return boost::function<const T&()>(*this); }
+ const T& operator()() { return mCachedControlPtr->getValue(); }
+
+private:
+ LLPointer<LLControlCache<T> > mCachedControlPtr;
};
+template <> eControlType get_control_type<U32>();
+template <> eControlType get_control_type<S32>();
+template <> eControlType get_control_type<F32>();
+template <> eControlType get_control_type<bool>();
+// Yay BOOL, its really an S32.
+//template <> eControlType get_control_type<BOOL> ()
+template <> eControlType get_control_type<std::string>();
+template <> eControlType get_control_type<LLVector3>();
+template <> eControlType get_control_type<LLVector3d>();
+template <> eControlType get_control_type<LLRect>();
+template <> eControlType get_control_type<LLColor4>();
+template <> eControlType get_control_type<LLColor3>();
+template <> eControlType get_control_type<LLSD>();
+
+template <> LLSD convert_to_llsd<U32>(const U32& in);
+template <> LLSD convert_to_llsd<LLVector3>(const LLVector3& in);
+template <> LLSD convert_to_llsd<LLVector3d>(const LLVector3d& in);
+template <> LLSD convert_to_llsd<LLRect>(const LLRect& in);
+template <> LLSD convert_to_llsd<LLColor4>(const LLColor4& in);
+template <> LLSD convert_to_llsd<LLColor3>(const LLColor3& in);
+
+template<> std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, const std::string& control_name);
+template<> LLWString convert_from_llsd<LLWString>(const LLSD& sd, eControlType type, const std::string& control_name);
+template<> LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, const std::string& control_name);
+template<> LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, const std::string& control_name);
+template<> LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, const std::string& control_name);
+template<> bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, const std::string& control_name);
+template<> S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, const std::string& control_name);
+template<> F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, const std::string& control_name);
+template<> U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, const std::string& control_name);
+template<> LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, const std::string& control_name);
+template<> LLColor4 convert_from_llsd<LLColor4>(const LLSD& sd, eControlType type, const std::string& control_name);
+template<> LLSD convert_from_llsd<LLSD>(const LLSD& sd, eControlType type, const std::string& control_name);
+
+//#define TEST_CACHED_CONTROL 1
+#ifdef TEST_CACHED_CONTROL
+void test_cached_control();
+#endif // TEST_CACHED_CONTROL
+
#endif
diff --git a/indra/llxml/llcontrolgroupreader.h b/indra/llxml/llcontrolgroupreader.h
index 960b19036e..116ea2eae0 100644
--- a/indra/llxml/llcontrolgroupreader.h
+++ b/indra/llxml/llcontrolgroupreader.h
@@ -3,7 +3,30 @@
* @brief Interface providing readonly access to LLControlGroup (intended for unit testing)
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
* Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
@@ -13,9 +36,11 @@
#include "stdtypes.h"
#include <string>
-// Many of the types below are commented out because for the purposes of the early testing we're doing,
-// we don't need them and we don't want to pull in all the machinery to support them.
-// But the model is here for future unit test extensions.
+#include "v3math.h"
+#include "v3dmath.h"
+#include "v3color.h"
+#include "v4color.h"
+#include "llrect.h"
class LLControlGroupReader
{
@@ -23,22 +48,32 @@ public:
LLControlGroupReader() {}
virtual ~LLControlGroupReader() {}
- virtual std::string getString(const std::string& name) = 0;
- //virtual LLWString getWString(const std::string& name) = 0;
- virtual std::string getText(const std::string& name) = 0;
- //virtual LLVector3 getVector3(const std::string& name) = 0;
- //virtual LLVector3d getVector3d(const std::string& name) = 0;
- //virtual LLRect getRect(const std::string& name) = 0;
- virtual BOOL getBOOL(const std::string& name) = 0;
- virtual S32 getS32(const std::string& name) = 0;
- virtual F32 getF32(const std::string& name) = 0;
- virtual U32 getU32(const std::string& name) = 0;
- //virtual LLSD getLLSD(const std::string& name) = 0;
-
- //virtual LLColor4 getColor(const std::string& name) = 0;
- //virtual LLColor4U getColor4U(const std::string& name) = 0;
- //virtual LLColor4 getColor4(const std::string& name) = 0;
- //virtual LLColor3 getColor3(const std::string& name) = 0;
+ virtual std::string getString(const std::string& name) { return ""; }
+ virtual LLWString getWString(const std::string& name) { return LLWString(); }
+ virtual std::string getText(const std::string& name) { return ""; }
+ virtual LLVector3 getVector3(const std::string& name) { return LLVector3(); }
+ virtual LLVector3d getVector3d(const std::string& name) { return LLVector3d(); }
+ virtual LLRect getRect(const std::string& name) { return LLRect(); }
+ virtual BOOL getBOOL(const std::string& name) { return FALSE; }
+ virtual S32 getS32(const std::string& name) { return 0; }
+ virtual F32 getF32(const std::string& name) {return 0.0f; }
+ virtual U32 getU32(const std::string& name) {return 0; }
+ virtual LLSD getLLSD(const std::string& name) { return LLSD(); }
+
+ virtual LLColor4 getColor(const std::string& name) { return LLColor4(); }
+ virtual LLColor4 getColor4(const std::string& name) { return LLColor4(); }
+ virtual LLColor3 getColor3(const std::string& name) { return LLColor3(); }
+
+ virtual void setBOOL(const std::string& name, BOOL val) {}
+ virtual void setS32(const std::string& name, S32 val) {}
+ virtual void setF32(const std::string& name, F32 val) {}
+ virtual void setU32(const std::string& name, U32 val) {}
+ virtual void setString(const std::string& name, const std::string& val) {}
+ virtual void setVector3(const std::string& name, const LLVector3 &val) {}
+ virtual void setVector3d(const std::string& name, const LLVector3d &val) {}
+ virtual void setRect(const std::string& name, const LLRect &val) {}
+ virtual void setColor4(const std::string& name, const LLColor4 &val) {}
+ virtual void setLLSD(const std::string& name, const LLSD& val) {}
};
#endif /* LL_LLCONTROLGROUPREADER_H */
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp
index 800b13573f..e97aa55190 100644
--- a/indra/llxml/llxmlnode.cpp
+++ b/indra/llxml/llxmlnode.cpp
@@ -47,6 +47,7 @@
#include "llquaternion.h"
#include "llstring.h"
#include "lluuid.h"
+#include "lldir.h"
const S32 MAX_COLUMN_WIDTH = 80;
@@ -64,6 +65,7 @@ LLXMLNode::LLXMLNode() :
mPrecision(64),
mType(TYPE_CONTAINER),
mEncoding(ENCODING_DEFAULT),
+ mLineNumber(-1),
mParent(NULL),
mChildren(NULL),
mAttributes(),
@@ -85,6 +87,7 @@ LLXMLNode::LLXMLNode(const char* name, BOOL is_attribute) :
mPrecision(64),
mType(TYPE_CONTAINER),
mEncoding(ENCODING_DEFAULT),
+ mLineNumber(-1),
mParent(NULL),
mChildren(NULL),
mAttributes(),
@@ -106,6 +109,7 @@ LLXMLNode::LLXMLNode(LLStringTableEntry* name, BOOL is_attribute) :
mPrecision(64),
mType(TYPE_CONTAINER),
mEncoding(ENCODING_DEFAULT),
+ mLineNumber(-1),
mParent(NULL),
mChildren(NULL),
mAttributes(),
@@ -226,6 +230,10 @@ BOOL LLXMLNode::removeChild(LLXMLNode *target_child)
{
mChildren->head = target_child->mNext;
}
+ if (target_child == mChildren->tail)
+ {
+ mChildren->tail = target_child->mPrev;
+ }
LLXMLNodePtr prev = target_child->mPrev;
LLXMLNodePtr next = target_child->mNext;
@@ -387,6 +395,7 @@ void XMLCALL StartXMLNode(void *userData,
{
// Create a new node
LLXMLNode *new_node_ptr = new LLXMLNode(name, FALSE);
+
LLXMLNodePtr new_node = new_node_ptr;
new_node->mID.clear();
LLXMLNodePtr ptr_new_node = new_node;
@@ -401,7 +410,8 @@ void XMLCALL StartXMLNode(void *userData,
}
new_node_ptr->mParser = parent->mParser;
-
+ new_node_ptr->setLineNumber(XML_GetCurrentLineNumber(*new_node_ptr->mParser));
+
// Set the current active node to the new node
XML_Parser *parser = parent->mParser;
XML_SetUserData(*parser, (void *)new_node_ptr);
@@ -492,6 +502,7 @@ void XMLCALL StartXMLNode(void *userData,
if (!new_node->getAttribute(attr_name.c_str(), attr_node, FALSE))
{
attr_node = new LLXMLNode(attr_name.c_str(), TRUE);
+ attr_node->setLineNumber(XML_GetCurrentLineNumber(*new_node_ptr->mParser));
}
attr_node->setValue(attr_value);
new_node->addChild(attr_node);
@@ -836,12 +847,66 @@ BOOL LLXMLNode::isFullyDefault()
}
// static
-void LLXMLNode::writeHeaderToFile(LLFILE *fOut)
+bool LLXMLNode::getLayeredXMLNode(const std::string &xui_filename, LLXMLNodePtr& root,
+ const std::vector<std::string>& paths)
+{
+ std::string full_filename = gDirUtilp->findSkinnedFilename(paths.front(), xui_filename);
+ if (full_filename.empty())
+ {
+ return false;
+ }
+
+ if (!LLXMLNode::parseFile(full_filename, root, NULL))
+ {
+ // try filename as passed in since sometimes we load an xml file from a user-supplied path
+ if (!LLXMLNode::parseFile(xui_filename, root, NULL))
+ {
+ llwarns << "Problem reading UI description file: " << xui_filename << llendl;
+ return false;
+ }
+ }
+
+ LLXMLNodePtr updateRoot;
+
+ std::vector<std::string>::const_iterator itor;
+
+ for (itor = paths.begin(), ++itor; itor != paths.end(); ++itor)
+ {
+ std::string nodeName;
+ std::string updateName;
+
+ std::string layer_filename = gDirUtilp->findSkinnedFilename((*itor), xui_filename);
+ if(layer_filename.empty())
+ {
+ // no localized version of this file, that's ok, keep looking
+ continue;
+ }
+
+ if (!LLXMLNode::parseFile(layer_filename, updateRoot, NULL))
+ {
+ llwarns << "Problem reading localized UI description file: " << (*itor) + gDirUtilp->getDirDelimiter() + xui_filename << llendl;
+ return false;
+ }
+
+ updateRoot->getAttributeString("name", updateName);
+ root->getAttributeString("name", nodeName);
+
+ if (updateName == nodeName)
+ {
+ LLXMLNode::updateNode(root, updateRoot);
+ }
+ }
+
+ return true;
+}
+
+// static
+void LLXMLNode::writeHeaderToFile(LLFILE *out_file)
{
- fprintf(fOut, "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>\n");
+ fprintf(out_file, "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>\n");
}
-void LLXMLNode::writeToFile(LLFILE *fOut, const std::string& indent)
+void LLXMLNode::writeToFile(LLFILE *out_file, const std::string& indent)
{
if (isFullyDefault())
{
@@ -852,7 +917,8 @@ void LLXMLNode::writeToFile(LLFILE *fOut, const std::string& indent)
std::ostringstream ostream;
writeToOstream(ostream, indent);
std::string outstring = ostream.str();
- if (fwrite(outstring.c_str(), 1, outstring.length(), fOut) != outstring.length())
+ size_t written = fwrite(outstring.c_str(), 1, outstring.length(), out_file);
+ if (written != outstring.length())
{
llwarns << "Short write" << llendl;
}
@@ -872,12 +938,12 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const std::string& i
BOOL has_default_length = mDefault.isNull()?FALSE:(mLength == mDefault->mLength);
// stream the name
- output_stream << indent << "<" << mName->mString;
+ output_stream << indent << "<" << mName->mString << "\n";
// ID
if (mID != "")
{
- output_stream << " id=\"" << mID << "\"";
+ output_stream << indent << " id=\"" << mID << "\"\n";
}
// Type
@@ -886,22 +952,22 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const std::string& i
switch (mType)
{
case TYPE_BOOLEAN:
- output_stream << " type=\"boolean\"";
+ output_stream << indent << " type=\"boolean\"\n";
break;
case TYPE_INTEGER:
- output_stream << " type=\"integer\"";
+ output_stream << indent << " type=\"integer\"\n";
break;
case TYPE_FLOAT:
- output_stream << " type=\"float\"";
+ output_stream << indent << " type=\"float\"\n";
break;
case TYPE_STRING:
- output_stream << " type=\"string\"";
+ output_stream << indent << " type=\"string\"\n";
break;
case TYPE_UUID:
- output_stream << " type=\"uuid\"";
+ output_stream << indent << " type=\"uuid\"\n";
break;
case TYPE_NODEREF:
- output_stream << " type=\"noderef\"";
+ output_stream << indent << " type=\"noderef\"\n";
break;
default:
// default on switch(enum) eliminates a warning on linux
@@ -915,13 +981,13 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const std::string& i
switch (mEncoding)
{
case ENCODING_DECIMAL:
- output_stream << " encoding=\"decimal\"";
+ output_stream << indent << " encoding=\"decimal\"\n";
break;
case ENCODING_HEX:
- output_stream << " encoding=\"hex\"";
+ output_stream << indent << " encoding=\"hex\"\n";
break;
/*case ENCODING_BASE32:
- output_stream << " encoding=\"base32\"";
+ output_stream << indent << " encoding=\"base32\"\n";
break;*/
default:
// default on switch(enum) eliminates a warning on linux
@@ -932,24 +998,23 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const std::string& i
// Precision
if (!has_default_precision && (mType == TYPE_INTEGER || mType == TYPE_FLOAT))
{
- output_stream << " precision=\"" << mPrecision << "\"";
+ output_stream << indent << " precision=\"" << mPrecision << "\"\n";
}
// Version
if (mVersionMajor > 0 || mVersionMinor > 0)
{
- output_stream << " version=\"" << mVersionMajor << "." << mVersionMinor << "\"";
+ output_stream << indent << " version=\"" << mVersionMajor << "." << mVersionMinor << "\"\n";
}
// Array length
if (!has_default_length && mLength > 0)
{
- output_stream << " length=\"" << mLength << "\"";
+ output_stream << indent << " length=\"" << mLength << "\"\n";
}
{
// Write out attributes
- S32 col_pos = 0;
LLXMLAttribList::const_iterator attr_itr;
LLXMLAttribList::const_iterator attr_end = mAttributes.end();
for (attr_itr = mAttributes.begin(); attr_itr != attr_end; ++attr_itr)
@@ -971,17 +1036,14 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const std::string& i
std::string attr_str = llformat(" %s=\"%s\"",
attr.c_str(),
escapeXML(child->mValue).c_str());
- if (col_pos + (S32)attr_str.length() > MAX_COLUMN_WIDTH)
- {
- output_stream << "\n" << indent << " ";
- col_pos = 4;
- }
- col_pos += attr_str.length();
- output_stream << attr_str;
+ output_stream << indent << attr_str << "\n";
}
}
}
+ // erase last \n before attaching final > or />
+ output_stream.seekp(-1, std::ios::cur);
+
if (mChildren.isNull() && mValue == "")
{
output_stream << " />\n";
@@ -993,7 +1055,7 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const std::string& i
if (mChildren.notNull())
{
// stream non-attributes
- std::string next_indent = indent + "\t";
+ std::string next_indent = indent + " ";
for (LLXMLNode* child = getFirstChild(); child; child = child->getNextSibling())
{
child->writeToOstream(output_stream, next_indent);
@@ -1002,7 +1064,7 @@ void LLXMLNode::writeToOstream(std::ostream& output_stream, const std::string& i
if (!mValue.empty())
{
std::string contents = getTextContents();
- output_stream << indent << "\t" << escapeXML(contents) << "\n";
+ output_stream << indent << " " << escapeXML(contents) << "\n";
}
output_stream << indent << "</" << mName->mString << ">\n";
}
@@ -2475,14 +2537,15 @@ std::string LLXMLNode::escapeXML(const std::string& xml)
return out;
}
-void LLXMLNode::setStringValue(U32 length, const std::string *array)
+void LLXMLNode::setStringValue(U32 length, const std::string *strings)
{
if (length == 0) return;
std::string new_value;
for (U32 pos=0; pos<length; ++pos)
{
- new_value.append(escapeXML(array[pos]));
+ // *NOTE: Do not escape strings here - do it on output
+ new_value.append( strings[pos] );
if (pos < length-1) new_value.append(" ");
}
@@ -3150,6 +3213,19 @@ LLXMLNodePtr LLXMLNode::getNextSibling() const
return ret;
}
+std::string LLXMLNode::getSanitizedValue() const
+{
+ if (mIsAttribute)
+ {
+ return getValue() ;
+ }
+ else
+ {
+ return getTextContents();
+ }
+}
+
+
std::string LLXMLNode::getTextContents() const
{
std::string msg;
@@ -3215,3 +3291,13 @@ std::string LLXMLNode::getTextContents() const
}
return msg;
}
+
+void LLXMLNode::setLineNumber(S32 line_number)
+{
+ mLineNumber = line_number;
+}
+
+S32 LLXMLNode::getLineNumber()
+{
+ return mLineNumber;
+}
diff --git a/indra/llxml/llxmlnode.h b/indra/llxml/llxmlnode.h
index d4e127b05c..c983a14410 100644
--- a/indra/llxml/llxmlnode.h
+++ b/indra/llxml/llxmlnode.h
@@ -44,8 +44,8 @@
#include <map>
#include "indra_constants.h"
-#include "llmemory.h"
-#include "llthread.h"
+#include "llpointer.h"
+#include "llthread.h" // LLThreadSafeRefCount
#include "llstring.h"
#include "llstringtable.h"
@@ -153,8 +153,18 @@ public:
LLXMLNodePtr& node,
LLXMLNodePtr& update_node);
static LLXMLNodePtr replaceNode(LLXMLNodePtr node, LLXMLNodePtr replacement_node);
- static void writeHeaderToFile(LLFILE *fOut);
- void writeToFile(LLFILE *fOut, const std::string& indent = std::string());
+
+ static bool getLayeredXMLNode(const std::string &xui_filename, LLXMLNodePtr& root,
+ const std::vector<std::string>& paths);
+
+
+ // Write standard XML file header:
+ // <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+ static void writeHeaderToFile(LLFILE *out_file);
+
+ // Write XML to file with one attribute per line.
+ // XML escapes values as they are written.
+ void writeToFile(LLFILE *out_file, const std::string& indent = std::string());
void writeToOstream(std::ostream& output_stream, const std::string& indent = std::string());
// Utility
@@ -207,6 +217,7 @@ public:
U32 getLength() const { return mLength; }
U32 getPrecision() const { return mPrecision; }
const std::string& getValue() const { return mValue; }
+ std::string getSanitizedValue() const;
std::string getTextContents() const;
const LLStringTableEntry* getName() const { return mName; }
BOOL hasName(const char* name) const { return mName == gStringTable.checkStringEntry(name); }
@@ -227,6 +238,8 @@ public:
bool getAttribute(const char* name, LLXMLNodePtr& node, BOOL use_default_if_missing = TRUE);
bool getAttribute(const LLStringTableEntry* name, LLXMLNodePtr& node, BOOL use_default_if_missing = TRUE);
+ S32 getLineNumber();
+
// The following skip over attributes
LLXMLNodePtr getFirstChild() const;
LLXMLNodePtr getNextSibling() const;
@@ -262,6 +275,8 @@ public:
void setName(const std::string& name);
void setName(LLStringTableEntry* name);
+ void setLineNumber(S32 line_number);
+
// Escapes " (quot) ' (apos) & (amp) < (lt) > (gt)
static std::string escapeXML(const std::string& xml);
@@ -300,6 +315,7 @@ public:
U32 mPrecision; // The number of BITS per array item
ValueType mType; // The value type
Encoding mEncoding; // The value encoding
+ S32 mLineNumber; // line number in source file, if applicable
LLXMLNode* mParent; // The parent node
LLXMLChildrenPtr mChildren; // The child nodes
@@ -312,7 +328,11 @@ public:
protected:
LLStringTableEntry *mName; // The name of this node
- std::string mValue; // The value of this node (use getters/setters only)
+
+ // The value of this node (use getters/setters only)
+ // Values are not XML-escaped in memory
+ // They may contain " (quot) ' (apos) & (amp) < (lt) > (gt)
+ std::string mValue;
LLXMLNodePtr mDefault; // Mirror node in the default tree
diff --git a/indra/lscript/lscript_execute.h b/indra/lscript/lscript_execute.h
index 9a631c4c8f..245fc320d1 100644
--- a/indra/lscript/lscript_execute.h
+++ b/indra/lscript/lscript_execute.h
@@ -37,6 +37,8 @@
#include "linked_lists.h"
#include "lscript_library.h"
+class LLTimer;
+
// Return values for run() methods
const U32 NO_DELETE_FLAG = 0x0000;
const U32 DELETE_FLAG = 0x0001;
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 668b710c22..9533281688 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -74,6 +74,8 @@ set(viewer_SOURCE_FILES
llassetuploadresponders.cpp
llassetuploadqueue.cpp
llaudiosourcevo.cpp
+ llavatariconctrl.cpp
+ llavatarpropertiesprocessor.cpp
llbbox.cpp
llbox.cpp
llcallbacklist.cpp
@@ -83,15 +85,11 @@ set(viewer_SOURCE_FILES
llclassifiedinfo.cpp
llclassifiedstatsresponder.cpp
llcloud.cpp
- llcolorscheme.cpp
llcolorswatch.cpp
llcommandhandler.cpp
llcommandlineparser.cpp
- llcompass.cpp
llcompilequeue.cpp
llconfirmationmanager.cpp
- llconsole.cpp
- llcontainerview.cpp
llcurrencyuimanager.cpp
llcylinder.cpp
lldebugmessagebox.cpp
@@ -118,6 +116,7 @@ set(viewer_SOURCE_FILES
lleventpoll.cpp
llface.cpp
llfasttimerview.cpp
+ llfavoritesbar.cpp
llfeaturemanager.cpp
llfilepicker.cpp
llfirstuse.cpp
@@ -137,6 +136,7 @@ set(viewer_SOURCE_FILES
llfloaterbuy.cpp
llfloaterbuycurrency.cpp
llfloaterbuyland.cpp
+ llfloatercall.cpp
llfloatercamera.cpp
llfloaterchat.cpp
llfloaterchatterbox.cpp
@@ -145,7 +145,6 @@ set(viewer_SOURCE_FILES
llfloatercustomize.cpp
llfloaterdaycycle.cpp
llfloaterdirectory.cpp
- llfloatereditui.cpp
llfloaterenvsettings.cpp
llfloaterevent.cpp
llfloaterfriends.cpp
@@ -168,17 +167,14 @@ set(viewer_SOURCE_FILES
llfloaterlagmeter.cpp
llfloaterland.cpp
llfloaterlandholdings.cpp
- llfloaterlandmark.cpp
llfloatermap.cpp
llfloatermemleak.cpp
llfloatermute.cpp
llfloaternamedesc.cpp
- llfloaternewim.cpp
llfloaternotificationsconsole.cpp
llfloaterobjectiminfo.cpp
llfloateropenobject.cpp
llfloaterparcel.cpp
- llfloaterpermissionsmgr.cpp
llfloaterperms.cpp
llfloaterpostcard.cpp
llfloaterpostprocess.cpp
@@ -190,12 +186,11 @@ set(viewer_SOURCE_FILES
llfloatersellland.cpp
llfloatersettingsdebug.cpp
llfloatersnapshot.cpp
- llfloaterstats.cpp
llfloatertelehub.cpp
- llfloatertest.cpp
llfloatertools.cpp
llfloatertopobjects.cpp
llfloatertos.cpp
+ llfloateruipreview.cpp
llfloaterurldisplay.cpp
llfloaterurlentry.cpp
llfloatervoicedevicesettings.cpp
@@ -204,8 +199,6 @@ set(viewer_SOURCE_FILES
llfloaterworldmap.cpp
llfolderview.cpp
llfollowcam.cpp
- llframestats.cpp
- llframestatview.cpp
llgesturemgr.cpp
llgivemoney.cpp
llglsandbox.cpp
@@ -233,6 +226,8 @@ set(viewer_SOURCE_FILES
llinventoryview.cpp
lljoystickbutton.cpp
lllandmarklist.cpp
+ lllocationhistory.cpp
+ lllocationinputctrl.cpp
lllogchat.cpp
llloginhandler.cpp
llmanip.cpp
@@ -250,15 +245,17 @@ set(viewer_SOURCE_FILES
llnamebox.cpp
llnameeditor.cpp
llnamelistctrl.cpp
+ llnavigationbar.cpp
llnetmap.cpp
llnotify.cpp
+ lloutputmonitorctrl.cpp
lloverlaybar.cpp
llpanelaudioprefs.cpp
llpanelaudiovolume.cpp
llpanelavatar.cpp
+ llpanelavatarrow.cpp
llpanelclassified.cpp
llpanelcontents.cpp
- llpaneldebug.cpp
llpaneldirbrowser.cpp
llpaneldirclassified.cpp
llpaneldirevents.cpp
@@ -267,7 +264,6 @@ set(viewer_SOURCE_FILES
llpaneldirland.cpp
llpaneldirpeople.cpp
llpaneldirplaces.cpp
- llpaneldirpopular.cpp
llpaneldisplay.cpp
llpanelevent.cpp
llpanelface.cpp
@@ -282,16 +278,14 @@ set(viewer_SOURCE_FILES
llpanelinventory.cpp
llpanelland.cpp
llpanellandmedia.cpp
- llpanellandobjects.cpp
- llpanellandoptions.cpp
llpanellogin.cpp
- llpanelmorph.cpp
llpanelmsgs.cpp
llpanelnetwork.cpp
llpanelobject.cpp
llpanelpermissions.cpp
llpanelpick.cpp
llpanelplace.cpp
+ llpanelshower.cpp
llpanelskins.cpp
llpanelvolume.cpp
llpanelweb.cpp
@@ -317,17 +311,16 @@ set(viewer_SOURCE_FILES
llsavedsettingsglue.cpp
llselectmgr.cpp
llsky.cpp
+ llslurl.cpp
llspatialpartition.cpp
llsprite.cpp
llsrv.cpp
llstartup.cpp
- llstatbar.cpp
- llstatgraph.cpp
llstatusbar.cpp
- llstatview.cpp
llstylemap.cpp
llsurface.cpp
llsurfacepatch.cpp
+ llteleporthistory.cpp
lltexlayer.cpp
lltexturecache.cpp
lltexturectrl.cpp
@@ -352,9 +345,7 @@ set(viewer_SOURCE_FILES
lltoolselect.cpp
lltoolselectland.cpp
lltoolselectrect.cpp
- lltoolview.cpp
lltracker.cpp
- lltrans.cpp
lluploaddialog.cpp
llurl.cpp
llurldispatcher.cpp
@@ -363,13 +354,13 @@ set(viewer_SOURCE_FILES
llurlwhitelist.cpp
lluserauth.cpp
llvectorperfoptions.cpp
- llvelocitybar.cpp
llviewchildren.cpp
llviewerassetstorage.cpp
llvieweraudio.cpp
llviewercamera.cpp
llviewercontrol.cpp
llviewerdisplay.cpp
+ llviewerfloaterreg.cpp
llviewergenericmessage.cpp
llviewergesture.cpp
llviewerimage.cpp
@@ -477,6 +468,8 @@ set(viewer_HEADER_FILES
llassetuploadresponders.h
llassetuploadqueue.h
llaudiosourcevo.h
+ llavatariconctrl.h
+ llavatarpropertiesprocessor.h
llbbox.h
llbox.h
llcallbacklist.h
@@ -486,15 +479,11 @@ set(viewer_HEADER_FILES
llclassifiedinfo.h
llclassifiedstatsresponder.h
llcloud.h
- llcolorscheme.h
llcolorswatch.h
llcommandhandler.h
llcommandlineparser.h
- llcompass.h
llcompilequeue.h
llconfirmationmanager.h
- llconsole.h
- llcontainerview.h
llcurrencyuimanager.h
llcylinder.h
lldebugmessagebox.h
@@ -522,6 +511,7 @@ set(viewer_HEADER_FILES
lleventpoll.h
llface.h
llfasttimerview.h
+ llfavoritesbar.h
llfeaturemanager.h
llfilepicker.h
llfirstuse.h
@@ -541,6 +531,7 @@ set(viewer_HEADER_FILES
llfloaterbuycontents.h
llfloaterbuycurrency.h
llfloaterbuyland.h
+ llfloatercall.h
llfloatercamera.h
llfloaterchat.h
llfloaterchatterbox.h
@@ -549,7 +540,6 @@ set(viewer_HEADER_FILES
llfloatercustomize.h
llfloaterdaycycle.h
llfloaterdirectory.h
- llfloatereditui.h
llfloaterenvsettings.h
llfloaterevent.h
llfloaterfonttest.h
@@ -572,17 +562,14 @@ set(viewer_HEADER_FILES
llfloaterlagmeter.h
llfloaterland.h
llfloaterlandholdings.h
- llfloaterlandmark.h
llfloatermap.h
llfloatermemleak.h
llfloatermute.h
llfloaternamedesc.h
- llfloaternewim.h
llfloaternotificationsconsole.h
llfloaterobjectiminfo.h
llfloateropenobject.h
llfloaterparcel.h
- llfloaterpermissionsmgr.h
llfloaterpostcard.h
llfloaterpostprocess.h
llfloaterpreference.h
@@ -594,12 +581,11 @@ set(viewer_HEADER_FILES
llfloatersellland.h
llfloatersettingsdebug.h
llfloatersnapshot.h
- llfloaterstats.h
llfloatertelehub.h
- llfloatertest.h
llfloatertools.h
llfloatertopobjects.h
llfloatertos.h
+ llfloateruipreview.h
llfloaterurldisplay.h
llfloaterurlentry.h
llfloatervoicedevicesettings.h
@@ -608,8 +594,6 @@ set(viewer_HEADER_FILES
llfloaterworldmap.h
llfolderview.h
llfollowcam.h
- llframestats.h
- llframestatview.h
llgesturemgr.h
llgivemoney.h
llgroupmgr.h
@@ -636,6 +620,8 @@ set(viewer_HEADER_FILES
lljoystickbutton.h
lllandmarklist.h
lllightconstants.h
+ lllocationhistory.h
+ lllocationinputctrl.h
lllogchat.h
llloginhandler.h
llmanip.h
@@ -653,15 +639,17 @@ set(viewer_HEADER_FILES
llnamebox.h
llnameeditor.h
llnamelistctrl.h
+ llnavigationbar.h
llnetmap.h
llnotify.h
+ lloutputmonitorctrl.h
lloverlaybar.h
llpanelaudioprefs.h
llpanelaudiovolume.h
llpanelavatar.h
+ llpanelavatarrow.h
llpanelclassified.h
llpanelcontents.h
- llpaneldebug.h
llpaneldirbrowser.h
llpaneldirclassified.h
llpaneldirevents.h
@@ -670,7 +658,6 @@ set(viewer_HEADER_FILES
llpaneldirland.h
llpaneldirpeople.h
llpaneldirplaces.h
- llpaneldirpopular.h
llpaneldisplay.h
llpanelevent.h
llpanelface.h
@@ -685,17 +672,14 @@ set(viewer_HEADER_FILES
llpanelinventory.h
llpanelland.h
llpanellandmedia.h
- llpanellandobjects.h
- llpanellandoptions.h
- llpanelLCD.h
llpanellogin.h
- llpanelmorph.h
llpanelmsgs.h
llpanelnetwork.h
llpanelobject.h
llpanelpermissions.h
llpanelpick.h
llpanelplace.h
+ llpanelshower.h
llpanelskins.h
llpanelvolume.h
llpanelweb.h
@@ -722,18 +706,17 @@ set(viewer_HEADER_FILES
llsavedsettingsglue.h
llselectmgr.h
llsky.h
+ llslurl.h
llspatialpartition.h
llsprite.h
llsrv.h
llstartup.h
- llstatbar.h
- llstatgraph.h
llstatusbar.h
- llstatview.h
llstylemap.h
llsurface.h
llsurfacepatch.h
lltable.h
+ llteleporthistory.h
lltexlayer.h
lltexturecache.h
lltexturectrl.h
@@ -758,9 +741,7 @@ set(viewer_HEADER_FILES
lltoolselect.h
lltoolselectland.h
lltoolselectrect.h
- lltoolview.h
lltracker.h
- lltrans.h
lluiconstants.h
lluploaddialog.h
llurl.h
@@ -770,7 +751,6 @@ set(viewer_HEADER_FILES
llurlwhitelist.h
lluserauth.h
llvectorperfoptions.h
- llvelocitybar.h
llviewchildren.h
llviewerassetstorage.h
llvieweraudio.h
@@ -778,6 +758,7 @@ set(viewer_HEADER_FILES
llviewercamera.h
llviewercontrol.h
llviewerdisplay.h
+ llviewerfloaterreg.h
llviewergenericmessage.h
llviewergesture.h
llviewerimage.h
@@ -935,6 +916,10 @@ if (WINDOWS)
)
endforeach( src_file ${viewer_SOURCE_FILES} )
list(APPEND viewer_SOURCE_FILES llviewerprecompiledheaders.cpp)
+ # llstartup.cpp needs special symbols for audio libraries, so it resets
+ # COMPILE_FLAGS below. Make sure it maintains precompiled header settings.
+ set(LLSTARTUP_COMPILE_FLAGS
+ "${LLSTARTUP_COMPILE_FLAGS} /Yullviewerprecompiledheaders.h")
# Add resource files to the project.
# viewerRes.rc is the only buildable file, but
@@ -1031,16 +1016,27 @@ endif (WINDOWS)
# Add the xui files. This is handy for searching for xui elements
# from within the IDE.
-
-file(GLOB viewer_XUI_FILE_GLOB_LIST
- ${CMAKE_CURRENT_SOURCE_DIR}/skins/default/xui/en-us/*.xml)
-
set(viewer_XUI_FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/skins/default/colors.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/skins/default/colors_base.xml
+ skins/default/colors.xml
+ skins/default/textures/textures.xml
)
+file(GLOB DEFAULT_XUI_FILE_GLOB_LIST
+ ${CMAKE_CURRENT_SOURCE_DIR}/skins/default/xui/en-us/*.xml)
+list(APPEND viewer_XUI_FILES ${DEFAULT_XUI_FILE_GLOB_LIST})
+
+file(GLOB DEFAULT_WIDGET_FILE_GLOB_LIST
+ ${CMAKE_CURRENT_SOURCE_DIR}/skins/default/xui/en-us/widgets/*.xml)
+list(APPEND viewer_XUI_FILES ${DEFAULT_WIDGET_FILE_GLOB_LIST})
+
+file(GLOB SILVER_XUI_FILE_GLOB_LIST
+ ${CMAKE_CURRENT_SOURCE_DIR}/skins/silver/xui/en-us/*.xml)
+list(APPEND viewer_XUI_FILES ${SILVER_XUI_FILE_GLOB_LIST})
+
+# Cannot append empty lists in CMake, wait until we have files here.
+#file(GLOB SILVER_WIDGET_FILE_GLOB_LIST
+# ${CMAKE_CURRENT_SOURCE_DIR}/skins/silver/xui/en-us/widgets/*.xml)
+#list(APPEND viewer_XUI_FILES ${SILVER_WIDGET_FILE_GLOB_LIST})
-list(APPEND viewer_XUI_FILES ${viewer_XUI_FILE_GLOB_LIST})
list(SORT viewer_XUI_FILES)
source_group("XUI Files" FILES ${viewer_XUI_FILES})
@@ -1164,7 +1160,7 @@ if (WINDOWS)
set_target_properties(${VIEWER_BINARY_NAME}
PROPERTIES
LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS"
- LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\""
+ LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO"
LINK_FLAGS_RELEASE ${release_flags}
)
diff --git a/indra/newview/app_settings/ignorable_dialogs.xml b/indra/newview/app_settings/ignorable_dialogs.xml
new file mode 100644
index 0000000000..669235af1b
--- /dev/null
+++ b/indra/newview/app_settings/ignorable_dialogs.xml
@@ -0,0 +1,291 @@
+<?xml version="1.0" ?>
+<llsd>
+<map>
+ <key>FirstAppearance</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstAppearance warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstAttach</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstAttach warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstBalanceDecrease</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstBalanceDecrease warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstBalanceIncrease</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstBalanceIncrease warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstBuild</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstBuild warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstDebugMenus</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstDebugMenus warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstFlexible</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstFlexible warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstGoTo</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstGoTo warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstInventory</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstInventory warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstLeftClickNoHit</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstLeftClickNoHit warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstMap</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstMap warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstMedia</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstMedia warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstOverrideKeys</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstOverrideKeys warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstSandbox</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstSandbox warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstSculptedPrim</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstSculptedPrim warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstSit</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstSit warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstStreamingMusic</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstStreamingMusic warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstStreamingVideo</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstStreamingVideo warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstTeleport</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstTeleport warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>FirstVoice</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables FirstVoice warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>AboutDirectX9</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables AboutDirectX9 warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>BrowserLaunch</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables BrowserLaunch warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>DeedObject</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables DeedObject warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>NewClassified</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables NewClassified warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>QuickTimeInstalled</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables QuickTimeInstalled warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>ReturnToOwner</key>
+ <map>
+ <key>Comment</key>
+ <string>Enables ReturnToOwner warning dialog</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ </map>
+</llsd>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0081893869..f396226165 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -23,38 +23,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>UserChatColor</key>
- <map>
- <key>Comment</key>
- <string>Color of your chat messages</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Color4</string>
- <key>Value</key>
- <array>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
- </map>
- <key>AgentChatColor</key>
- <map>
- <key>Comment</key>
- <string>Color of chat messages from other residents</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Color4</string>
- <key>Value</key>
- <array>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
- </map>
<key>AlertedUnsupportedHardware</key>
<map>
<key>Comment</key>
@@ -594,22 +562,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>BackgroundChatColor</key>
- <map>
- <key>Comment</key>
- <string>Color of chat bubble background</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Color4</string>
- <key>Value</key>
- <array>
- <real>0.0</real>
- <real>0.0</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
- </map>
<key>BackgroundYieldTime</key>
<map>
<key>Comment</key>
@@ -621,38 +573,6 @@
<key>Value</key>
<integer>40</integer>
</map>
- <key>BackwardBtnRect</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>45</integer>
- <integer>29</integer>
- <integer>66</integer>
- <integer>4</integer>
- </array>
- </map>
- <key>BasicHelpRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for help window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>404</integer>
- <integer>467</integer>
- <integer>0</integer>
- </array>
- </map>
<key>BeaconAlwaysOn</key>
<map>
<key>Comment</key>
@@ -884,6 +804,17 @@
<key>Value</key>
<integer>0</integer>
</map>
+ <key>BuildBtnEnabled</key>
+ <map>
+ <key>Comment</key>
+ <string />
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
<key>BuildFeathering</key>
<map>
<key>Comment</key>
@@ -1391,22 +1322,6 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>ChatterboxRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for chatterbox window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>400</integer>
- <integer>350</integer>
- <integer>0</integer>
- </array>
- </map>
<key>CheesyBeacon</key>
<map>
<key>Comment</key>
@@ -1421,7 +1336,7 @@
<key>ClientSettingsFile</key>
<map>
<key>Comment</key>
- <string>Persisted client settings file name (per install).</string>
+ <string>Client settings file name (per install).</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -1497,777 +1412,623 @@
<string />
</array>
</map>
- <key>ColorPaletteEntry01</key>
+ <key>CompressSnapshotsToDisk</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Compress snapshots saved to disk (Using JPEG 2000)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>0.0</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
- </map>
- <key>ColorPaletteEntry02</key>
+ <integer>0</integer>
+ </map>
+ <key>ConnectAsGod</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Log in a god if you have god access.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.5</real>
- <real>0.5</real>
- <real>0.5</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>ColorPaletteEntry03</key>
+ <key>ConnectionPort</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Custom connection port number</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>U32</string>
<key>Value</key>
- <array>
- <real>0.5</real>
- <real>0.0</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
+ <integer>13000</integer>
</map>
- <key>ColorPaletteEntry04</key>
+ <key>ConnectionPortEnabled</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Use the custom connection port?</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.5</real>
- <real>0.5</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>ColorPaletteEntry05</key>
+ <key>ConsoleBackgroundOpacity</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Opacity of chat console (0.0 = completely transparent, 1.0 = completely opaque)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>0.5</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
+ <real>0.700</real>
</map>
- <key>ColorPaletteEntry06</key>
+ <key>ConsoleBufferSize</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Size of chat console history (lines of chat)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>0.5</real>
- <real>0.5</real>
- <real>1.0</real>
- </array>
+ <integer>40</integer>
</map>
- <key>ColorPaletteEntry07</key>
+ <key>ConsoleMaxLines</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Max number of lines of chat text visible in console.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>0.0</real>
- <real>0.5</real>
- <real>1.0</real>
- </array>
+ <integer>40</integer>
</map>
- <key>ColorPaletteEntry08</key>
+ <key>ContactsTornOff</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Show contacts window separately from Communicate window.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.5</real>
- <real>0.0</real>
- <real>0.5</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>ColorPaletteEntry09</key>
+ <key>CookiesEnabled</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Accept cookies from Web sites?</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.5</real>
- <real>0.5</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
+ <integer>1</integer>
</map>
- <key>ColorPaletteEntry10</key>
+ <key>CreateToolCopyCenters</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string />
<key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
<integer>1</integer>
+ </map>
+ <key>CreateToolCopyRotates</key>
+ <map>
+ <key>Comment</key>
+ <string />
+ <key>Persist</key>
+ <integer>0</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>0.25</real>
- <real>0.25</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>ColorPaletteEntry11</key>
+ <key>CreateToolCopySelection</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>0.5</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>ColorPaletteEntry12</key>
+ <key>CreateToolKeepSelected</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>After using create tool, keep the create tool active</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>0.25</real>
- <real>0.5</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>ColorPaletteEntry13</key>
+ <key>Cursor3D</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Tread Joystick values as absolute positions (not deltas).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.5</real>
- <real>0.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>1</integer>
</map>
- <key>ColorPaletteEntry14</key>
+ <key>CustomServer</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Specifies IP address or hostname of grid to which you connect</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>String</string>
<key>Value</key>
- <array>
- <real>0.5</real>
- <real>0.25</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
+ <string />
</map>
- <key>ColorPaletteEntry15</key>
+ <key>DebugBeaconLineWidth</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Size of lines for Debug Beacons</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>1</integer>
</map>
- <key>ColorPaletteEntry16</key>
+ <key>DebugInventoryFilters</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Turn on debugging display for inventory filtering</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>ColorPaletteEntry17</key>
+ <key>DebugPermissions</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Log permissions for selected inventory items</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>ColorPaletteEntry18</key>
+ <key>DebugShowColor</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Show color under cursor</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.75</real>
- <real>0.75</real>
- <real>0.75</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>ColorPaletteEntry19</key>
+ <key>DebugShowRenderInfo</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Show depth buffer contents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>0.0</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>ColorPaletteEntry20</key>
+ <key>DebugShowRenderMatrices</key>
+ <map>
+ <key>Comment</key>
+ <string>Display values of current view and projection matrices.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>DebugShowTime</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Show depth buffer contents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>1.0</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>ColorPaletteEntry21</key>
+ <key>DebugStatModeFPS</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>1.0</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColorPaletteEntry22</key>
+ <key>DebugStatModeBandwidth</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColorPaletteEntry23</key>
+ <key>DebugStatModePacketLoss</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>0.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColorPaletteEntry24</key>
+ <key>DebugStatMode</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>0.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColorPaletteEntry25</key>
+ <key>DebugStatModeKTrisDrawnFr</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>1.0</real>
- <real>0.5</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColorPaletteEntry26</key>
+ <key>DebugStatModeKTrisDrawnSec</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>1.0</real>
- <real>0.5</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColorPaletteEntry27</key>
+ <key>DebugStatModeTotalObjs</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>0.5</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColorPaletteEntry28</key>
+ <key>DebugStatModeNewObjs</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>0.5</real>
- <real>0.5</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColorPaletteEntry29</key>
+ <key>DebugStatModeTextureCount</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>0.0</real>
- <real>0.5</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColorPaletteEntry30</key>
+ <key>DebugStatModeRawCount</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>0.5</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColorPaletteEntry31</key>
+ <key>DebugStatModeGLMem</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColorPaletteEntry32</key>
+ <key>DebugStatModeFormattedMem</key>
<map>
<key>Comment</key>
- <string>Color picker palette entry</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>-1</integer>
</map>
- <key>ColumnHeaderDropDownDelay</key>
+ <key>DebugStatModeRawMem</key>
<map>
<key>Comment</key>
- <string>Time in seconds of mouse click before column header shows sort options list</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>0.300000011921</real>
+ <integer>-1</integer>
</map>
- <key>CompileOutputRect</key>
+ <key>DebugStatModeBoundMem</key>
<map>
<key>Comment</key>
- <string>Rectangle for script Recompile Everything output window</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>400</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
+ <integer>-1</integer>
</map>
- <key>ConnectAsGod</key>
+ <key>DebugStatModePacketsIn</key>
<map>
<key>Comment</key>
- <string>Log in a god if you have god access.</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>-1</integer>
</map>
- <key>ConnectionPort</key>
+ <key>DebugStatModePacketsOut</key>
<map>
<key>Comment</key>
- <string>Custom connection port number</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>U32</string>
+ <string>S32</string>
<key>Value</key>
- <integer>13000</integer>
+ <integer>-1</integer>
</map>
- <key>ConnectionPortEnabled</key>
+ <key>DebugStatModeObjects</key>
<map>
<key>Comment</key>
- <string>Use the custom connection port?</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>-1</integer>
</map>
- <key>ConsoleBackgroundOpacity</key>
+ <key>DebugStatModeTexture</key>
<map>
<key>Comment</key>
- <string>Opacity of chat console (0.0 = completely transparent, 1.0 = completely opaque)</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>0.700</real>
+ <integer>-1</integer>
</map>
- <key>ConsoleBufferSize</key>
+ <key>DebugStatModeAsset</key>
<map>
<key>Comment</key>
- <string>Size of chat console history (lines of chat)</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>40</integer>
+ <integer>-1</integer>
</map>
- <key>ConsoleMaxLines</key>
+ <key>DebugStatModeLayers</key>
<map>
<key>Comment</key>
- <string>Max number of lines of chat text visible in console.</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>40</integer>
+ <integer>-1</integer>
</map>
- <key>ContactsTornOff</key>
+ <key>DebugStatModeActualIn</key>
<map>
<key>Comment</key>
- <string>Show contacts window separately from Communicate window.</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>-1</integer>
</map>
- <key>CookiesEnabled</key>
+ <key>DebugStatModeActualOut</key>
<map>
<key>Comment</key>
- <string>Accept cookies from Web sites?</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>-1</integer>
</map>
- <key>CreateToolCopyCenters</key>
+ <key>DebugStatModeVFSPendingOps</key>
<map>
<key>Comment</key>
- <string />
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>-1</integer>
</map>
- <key>CreateToolCopyRotates</key>
+ <key>DebugStatModeTimeDialation</key>
<map>
<key>Comment</key>
- <string />
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>-1</integer>
</map>
- <key>CreateToolCopySelection</key>
+ <key>DebugStatModeSimFPS</key>
<map>
<key>Comment</key>
- <string />
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>-1</integer>
</map>
- <key>CreateToolKeepSelected</key>
+ <key>DebugStatModePhysicsFPS</key>
<map>
<key>Comment</key>
- <string>After using create tool, keep the create tool active</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>-1</integer>
</map>
- <key>Cursor3D</key>
+ <key>DebugStatModePinnedObjects</key>
<map>
<key>Comment</key>
- <string>Tread Joystick values as absolute positions (not deltas).</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>-1</integer>
</map>
- <key>CustomServer</key>
+ <key>DebugStatModeLowLODObjects</key>
<map>
<key>Comment</key>
- <string>Specifies IP address or hostname of grid to which you connect</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string />
+ <integer>-1</integer>
</map>
- <key>DebugBeaconLineWidth</key>
+ <key>DebugStatModeMemoryAllocated</key>
<map>
<key>Comment</key>
- <string>Size of lines for Debug Beacons</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>-1</integer>
</map>
- <key>DebugInventoryFilters</key>
+ <key>DebugStatModeAgentUpdatesSec</key>
<map>
<key>Comment</key>
- <string>Turn on debugging display for inventory filtering</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>-1</integer>
</map>
- <key>DebugPermissions</key>
+ <key>DebugStatModeMainAgents</key>
<map>
<key>Comment</key>
- <string>Log permissions for selected inventory items</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>-1</integer>
</map>
- <key>DebugShowColor</key>
+ <key>DebugStatModeChildAgents</key>
<map>
<key>Comment</key>
- <string>Show color under cursor</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>-1</integer>
</map>
- <key>DebugShowRenderInfo</key>
+ <key>DebugStatModeSimObjects</key>
<map>
<key>Comment</key>
- <string>Show depth buffer contents</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>-1</integer>
</map>
- <key>DebugShowRenderMatrices</key>
- <map>
- <key>Comment</key>
- <string>Display values of current view and projection matrices.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>DebugShowTime</key>
+ <key>DebugStatModeSimActiveObjects</key>
<map>
<key>Comment</key>
- <string>Show depth buffer contents</string>
+ <string>Mode of stat in Statistics floater</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>-1</integer>
</map>
- <key>DebugStatModeFPS</key>
+ <key>DebugStatModeSimActiveScripts</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2278,7 +2039,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeBandwidth</key>
+ <key>DebugStatModeSimScriptEvents</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2289,7 +2050,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModePacketLoss</key>
+ <key>DebugStatModeSimInPPS</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2300,7 +2061,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatMode</key>
+ <key>DebugStatModeSimOutPPS</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2311,7 +2072,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeKTrisDrawnFr</key>
+ <key>DebugStatModeSimPendingDownloads</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2322,7 +2083,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeKTrisDrawnSec</key>
+ <key>SimPendingUploads</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2333,7 +2094,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeTotalObjs</key>
+ <key>DebugStatModeSimTotalUnackedBytes</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2344,7 +2105,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeNewObjs</key>
+ <key>DebugStatModeSimFrameMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2355,7 +2116,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeTextureCount</key>
+ <key>DebugStatModeSimNetMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2366,7 +2127,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeRawCount</key>
+ <key>DebugStatModeSimSimPhysicsMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2377,7 +2138,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeGLMem</key>
+ <key>DebugStatModeSimSimOtherMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2388,7 +2149,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeFormattedMem</key>
+ <key>DebugStatModeSimAgentMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2399,7 +2160,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeRawMem</key>
+ <key>DebugStatModeSimImagesMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2410,7 +2171,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeBoundMem</key>
+ <key>DebugStatModeSimScriptMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2421,7 +2182,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModePacketsIn</key>
+ <key>DebugStatModeSimSpareMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2432,7 +2193,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModePacketsOut</key>
+ <key>DebugStatModeSimSimPhysicsStepMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2443,7 +2204,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeObjects</key>
+ <key>DebugStatModeSimSimPhysicsShapeUpdateMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2454,7 +2215,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeTexture</key>
+ <key>DebugStatModeSimSimPhysicsOtherMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2465,7 +2226,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeAsset</key>
+ <key>DebugStatModeSimSleepMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2476,7 +2237,7 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeLayers</key>
+ <key>DebugStatModeSimPumpIOMsec</key>
<map>
<key>Comment</key>
<string>Mode of stat in Statistics floater</string>
@@ -2487,384 +2248,384 @@
<key>Value</key>
<integer>-1</integer>
</map>
- <key>DebugStatModeActualIn</key>
+ <key>DebugViews</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Display debugging info for views.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>0</integer>
</map>
- <key>DebugStatModeActualOut</key>
+ <key>DebugWindowProc</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Log windows messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>0</integer>
</map>
- <key>DebugStatModeVFSPendingOps</key>
+ <key>DefaultObjectTexture</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Texture used as 'Default' in texture picker. (UUID texture reference)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>String</string>
<key>Value</key>
- <integer>-1</integer>
+ <string>89556747-24cb-43ed-920b-47caed15465f</string>
</map>
- <key>DebugStatModeTimeDialation</key>
+ <key>DisableCameraConstraints</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Disable the normal bounds put on the camera by avatar position</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>0</integer>
</map>
- <key>DebugStatModeSimFPS</key>
+ <key>DisableRendering</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Disable GL rendering and GUI (load testing)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>0</integer>
</map>
- <key>DebugStatModePhysicsFPS</key>
+ <key>DisableVerticalSync</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Update frames as fast as possible (FALSE = update frames between display scans)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>1</integer>
</map>
- <key>DebugStatModePinnedObjects</key>
+ <key>DisplayAvatarAgentTarget</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Show avatar positioning locators (animation debug)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>0</integer>
</map>
- <key>DebugStatModeLowLODObjects</key>
+ <key>DisplayChat</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Display Latest Chat message on LCD</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>1</integer>
</map>
- <key>DebugStatModeMemoryAllocated</key>
+ <key>DisplayDebug</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Display Network Information on LCD</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>1</integer>
</map>
- <key>DebugStatModeAgentUpdatesSec</key>
+ <key>DisplayDebugConsole</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Display Console Debug Information on LCD</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>1</integer>
</map>
- <key>DebugStatModeMainAgents</key>
+ <key>DisplayIM</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Display Latest IM message on LCD</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>1</integer>
</map>
- <key>DebugStatModeChildAgents</key>
+ <key>DisplayLinden</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Display Account Information on LCD</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>1</integer>
</map>
- <key>DebugStatModeSimObjects</key>
+ <key>DisplayRegion</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Display Location information on LCD</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>1</integer>
</map>
- <key>DebugStatModeSimActiveObjects</key>
+ <key>DisplayTimecode</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Display timecode on screen</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>0</integer>
</map>
- <key>DebugStatModeSimActiveScripts</key>
+ <key>Disregard128DefaultDrawDistance</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Whether to use the auto default to 128 draw distance</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>1</integer>
</map>
- <key>DebugStatModeSimScriptEvents</key>
+ <key>Disregard96DefaultDrawDistance</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Whether to use the auto default to 96 draw distance</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>1</integer>
</map>
- <key>DebugStatModeSimInPPS</key>
+ <key>DoubleClickAutoPilot</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Enable double-click auto pilot</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>0</integer>
</map>
- <key>DebugStatModeSimOutPPS</key>
+ <key>DragAndDropToolTipDelay</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Seconds before displaying tooltip when performing drag and drop operation</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>-1</integer>
+ <real>0.10000000149</real>
</map>
- <key>DebugStatModeSimPendingDownloads</key>
+ <key>DropShadowButton</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Drop shadow width for buttons (pixels)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>2</integer>
</map>
- <key>SimPendingUploads</key>
+ <key>DropShadowFloater</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Drop shadow width for floaters (pixels)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>5</integer>
</map>
- <key>DebugStatModeSimTotalUnackedBytes</key>
+ <key>DropShadowSlider</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Drop shadow width for sliders (pixels)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>3</integer>
</map>
- <key>DebugStatModeSimFrameMsec</key>
+ <key>DropShadowTooltip</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Drop shadow width for tooltips (pixels)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>4</integer>
</map>
- <key>DebugStatModeSimNetMsec</key>
+ <key>DynamicCameraStrength</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Amount camera lags behind avatar motion (0 = none, 30 = avatar velocity)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>-1</integer>
+ <real>2.0</real>
</map>
- <key>DebugStatModeSimSimPhysicsMsec</key>
+ <key>EditCameraMovement</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>When entering build mode, camera moves up above avatar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>0</integer>
</map>
- <key>DebugStatModeSimSimOtherMsec</key>
+ <key>EditLinkedParts</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Select individual parts of linked objects</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>0</integer>
</map>
- <key>DebugStatModeSimAgentMsec</key>
+ <key>EnableRippleWater</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Whether to use ripple water shader or not</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
- </map>
- <key>DebugStatModeSimImagesMsec</key>
- <map>
- <key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
- <key>Persist</key>
<integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>-1</integer>
</map>
- <key>DebugStatModeSimScriptMsec</key>
+ <key>EnableVoiceChat</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Enable talking to other residents with a microphone</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
- </map>
- <key>DebugStatModeSimSpareMsec</key>
- <map>
- <key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
- <key>Persist</key>
<integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>-1</integer>
</map>
- <key>DebugStatModeSimSimPhysicsStepMsec</key>
+ <key>EnergyFromTop</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>20</integer>
</map>
- <key>DebugStatModeSimSimPhysicsShapeUpdateMsec</key>
+ <key>EnergyHeight</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>40</integer>
</map>
- <key>DebugStatModeSimSimPhysicsOtherMsec</key>
+ <key>EnergyWidth</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>175</integer>
</map>
- <key>DebugStatModeSimSleepMsec</key>
+ <key>EveryoneCopy</key>
+ <map>
+ <key>Comment</key>
+ <string>Everyone can copy the newly created objects</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>FPSLogFrequency</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Seconds between display of FPS in log (0 for never)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>-1</integer>
+ <real>60.0</real>
</map>
- <key>DebugStatModeSimPumpIOMsec</key>
+ <key>FPSLogFrequency</key>
+ <map>
+ <key>Comment</key>
+ <string>Seconds between display of FPS in log (0 for never)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>10.0</real>
+ </map>
+ <key>FilterItemsPerFrame</key>
<map>
<key>Comment</key>
- <string>Mode of stat in Statistics floater</string>
+ <string>Maximum number of inventory items to match against search filter every frame (lower to increase framerate while searching, higher to improve search speed)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>500</integer>
</map>
- <key>DebugViews</key>
+ <key>FindLandArea</key>
<map>
<key>Comment</key>
- <string>Display debugging info for views.</string>
+ <string>Enables filtering of land search results by area</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -2872,54 +2633,54 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>DebugWindowProc</key>
+ <key>FindLandPrice</key>
<map>
<key>Comment</key>
- <string>Log windows messages</string>
+ <string>Enables filtering of land search results by price</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>DefaultObjectTexture</key>
+ <key>FindLandType</key>
<map>
<key>Comment</key>
- <string>Texture used as 'Default' in texture picker. (UUID texture reference)</string>
+ <string>Controls which type of land you are searching for in Find Land interface ("All", "Auction", "For Sale")</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>89556747-24cb-43ed-920b-47caed15465f</string>
+ <string>All</string>
</map>
- <key>DisableCameraConstraints</key>
+ <key>FindPeopleOnline</key>
<map>
<key>Comment</key>
- <string>Disable the normal bounds put on the camera by avatar position</string>
+ <string>Limits people search to only users who are logged on</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>DisableRendering</key>
+ <key>FindPlacesPictures</key>
<map>
<key>Comment</key>
- <string>Disable GL rendering and GUI (load testing)</string>
+ <string>Display only results of find places that have pictures</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>DisableVerticalSync</key>
+ <key>FirstLoginThisInstall</key>
<map>
<key>Comment</key>
- <string>Update frames as fast as possible (FALSE = update frames between display scans)</string>
+ <string>Specifies that you have not successfully logged in since you installed the latest update</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -2927,43 +2688,43 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>DisplayAvatarAgentTarget</key>
+ <key>FirstName</key>
<map>
<key>Comment</key>
- <string>Show avatar positioning locators (animation debug)</string>
+ <string>Login first name</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>0</integer>
+ <string />
</map>
- <key>DisplayChat</key>
+ <key>FirstPersonAvatarVisible</key>
<map>
<key>Comment</key>
- <string>Display Latest Chat message on LCD</string>
+ <string>Display avatar and attachments below neck while in mouselook</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>DisplayDebug</key>
+ <key>FirstPersonBtnState</key>
<map>
<key>Comment</key>
- <string>Display Network Information on LCD</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>DisplayDebugConsole</key>
+ <key>FirstRunThisInstall</key>
<map>
<key>Comment</key>
- <string>Display Console Debug Information on LCD</string>
+ <string>Specifies that you have not run the viewer since you installed the latest update</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -2971,21 +2732,21 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>DisplayIM</key>
+ <key>FixedWeather</key>
<map>
<key>Comment</key>
- <string>Display Latest IM message on LCD</string>
+ <string>Weather effects do not change over time</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>DisplayLinden</key>
+ <key>FloaterActiveSpeakersSortAscending</key>
<map>
<key>Comment</key>
- <string>Display Account Information on LCD</string>
+ <string>Whether to sort up or down</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -2993,142 +2754,148 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>DisplayRegion</key>
+ <key>FloaterActiveSpeakersSortColumn</key>
<map>
<key>Comment</key>
- <string>Display Location information on LCD</string>
+ <string>Column name to sort on</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>speaking_status</string>
</map>
- <key>DisplayTimecode</key>
+ <key>FloaterMapNorth</key>
<map>
<key>Comment</key>
- <string>Display timecode on screen</string>
+ <string>Floater Map North Label</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>0</integer>
+ <string>N</string>
</map>
- <key>Disregard128DefaultDrawDistance</key>
+ <key>FloaterMapNorthEast</key>
<map>
<key>Comment</key>
- <string>Whether to use the auto default to 128 draw distance</string>
+ <string>Floater Map North-East Label</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>NE</string>
</map>
- <key>Disregard96DefaultDrawDistance</key>
+ <key>FloaterMapNorthWest</key>
<map>
<key>Comment</key>
- <string>Whether to use the auto default to 96 draw distance</string>
+ <string>Floater Map North-West Label</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>NW</string>
</map>
- <key>DoubleClickAutoPilot</key>
+ <key>FloaterMapEast</key>
<map>
<key>Comment</key>
- <string>Enable double-click auto pilot</string>
+ <string>Floater Map East Label</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>0</integer>
+ <string>E</string>
</map>
- <key>DragAndDropToolTipDelay</key>
+ <key>FloaterMapWest</key>
<map>
<key>Comment</key>
- <string>Seconds before displaying tooltip when performing drag and drop operation</string>
+ <string>Floater Map West Label</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>String</string>
<key>Value</key>
- <real>0.10000000149</real>
+ <string>W</string>
</map>
- <key>DropShadowButton</key>
+ <key>FloaterMapSouth</key>
<map>
<key>Comment</key>
- <string>Drop shadow width for buttons (pixels)</string>
+ <string>Floater Map South Label</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>String</string>
<key>Value</key>
- <integer>2</integer>
+ <string>S</string>
</map>
- <key>DropShadowFloater</key>
+ <key>FloaterMapSouthEast</key>
<map>
<key>Comment</key>
- <string>Drop shadow width for floaters (pixels)</string>
+ <string>Floater Map South-East Label</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>String</string>
<key>Value</key>
- <integer>5</integer>
+ <string>SE</string>
</map>
- <key>DropShadowSlider</key>
+ <key>FloaterMapSouthWest</key>
<map>
<key>Comment</key>
- <string>Drop shadow width for sliders (pixels)</string>
+ <string>Floater Map South-West Label</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>String</string>
<key>Value</key>
- <integer>3</integer>
+ <string>SW</string>
</map>
- <key>DropShadowTooltip</key>
+
+ <key>FloaterStatisticsRect</key>
<map>
<key>Comment</key>
- <string>Drop shadow width for tooltips (pixels)</string>
+ <string>Rectangle for chat history</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Rect</string>
<key>Value</key>
- <integer>4</integer>
+ <array>
+ <integer>0</integer>
+ <integer>400</integer>
+ <integer>250</integer>
+ <integer>0</integer>
+ </array>
</map>
- <key>DynamicCameraStrength</key>
+ <key>FloaterViewBottom</key>
<map>
<key>Comment</key>
- <string>Amount camera lags behind avatar motion (0 = none, 30 = avatar velocity)</string>
+ <string>[DO NOT MODIFY] Controls layout of floating windows within SL window</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>2.0</real>
+ <integer>-1</integer>
</map>
- <key>EditCameraMovement</key>
+ <key>FlyBtnEnabled</key>
<map>
<key>Comment</key>
- <string>When entering build mode, camera moves up above avatar</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>EditLinkedParts</key>
+ <key>FlyBtnState</key>
<map>
<key>Comment</key>
- <string>Select individual parts of linked objects</string>
+ <string />
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
@@ -3136,966 +2903,711 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>EffectColor</key>
+ <key>FlycamAbsolute</key>
<map>
<key>Comment</key>
- <string>Particle effects color</string>
+ <string>Treat Flycam values as absolute positions (not deltas).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>EnableRippleWater</key>
+ <key>FlycamAxisDeadZone0</key>
<map>
<key>Comment</key>
- <string>Whether to use ripple water shader or not</string>
+ <string>Flycam axis 0 dead zone.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>0.1</real>
</map>
- <key>EnableVoiceChat</key>
+ <key>FlycamAxisDeadZone1</key>
<map>
<key>Comment</key>
- <string>Enable talking to other residents with a microphone</string>
+ <string>Flycam axis 1 dead zone.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>0.1</real>
</map>
- <key>EnergyFromTop</key>
+ <key>FlycamAxisDeadZone2</key>
<map>
<key>Comment</key>
- <string />
+ <string>Flycam axis 2 dead zone.</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>20</integer>
+ <real>0.1</real>
</map>
- <key>EnergyHeight</key>
+ <key>FlycamAxisDeadZone3</key>
<map>
<key>Comment</key>
- <string />
+ <string>Flycam axis 3 dead zone.</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>40</integer>
+ <real>0.1</real>
</map>
- <key>EnergyWidth</key>
+ <key>FlycamAxisDeadZone4</key>
<map>
<key>Comment</key>
- <string />
+ <string>Flycam axis 4 dead zone.</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>175</integer>
- </map>
- <key>EveryoneCopy</key>
- <map>
- <key>Comment</key>
- <string>Everyone can copy the newly created objects</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
+ <real>0.1</real>
</map>
- <key>FPSLogFrequency</key>
+ <key>FlycamAxisDeadZone5</key>
<map>
<key>Comment</key>
- <string>Seconds between display of FPS in log (0 for never)</string>
+ <string>Flycam axis 5 dead zone.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>60.0</real>
+ <real>0.1</real>
</map>
- <key>FPSLogFrequency</key>
- <map>
- <key>Comment</key>
- <string>Seconds between display of FPS in log (0 for never)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>10.0</real>
- </map>
- <key>FilterItemsPerFrame</key>
+ <key>FlycamAxisDeadZone6</key>
<map>
<key>Comment</key>
- <string>Maximum number of inventory items to match against search filter every frame (lower to increase framerate while searching, higher to improve search speed)</string>
+ <string>Flycam axis 6 dead zone.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>500</integer>
+ <real>0.1</real>
</map>
- <key>FindLandArea</key>
+ <key>FlycamAxisScale0</key>
<map>
<key>Comment</key>
- <string>Enables filtering of land search results by area</string>
+ <string>Flycam axis 0 scaler.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>1.0</real>
</map>
- <key>FindLandPrice</key>
+ <key>FlycamAxisScale1</key>
<map>
<key>Comment</key>
- <string>Enables filtering of land search results by price</string>
+ <string>Flycam axis 1 scaler.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>1.0</real>
</map>
- <key>FindLandType</key>
+ <key>FlycamAxisScale2</key>
<map>
<key>Comment</key>
- <string>Controls which type of land you are searching for in Find Land interface ("All", "Auction", "For Sale")</string>
+ <string>Flycam axis 2 scaler.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>All</string>
+ <real>1.0</real>
</map>
- <key>FindPeopleOnline</key>
+ <key>FlycamAxisScale3</key>
<map>
<key>Comment</key>
- <string>Limits people search to only users who are logged on</string>
+ <string>Flycam axis 3 scaler.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>1.0</real>
</map>
- <key>FindPlacesPictures</key>
+ <key>FlycamAxisScale4</key>
<map>
<key>Comment</key>
- <string>Display only results of find places that have pictures</string>
+ <string>Flycam axis 4 scaler.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>1.0</real>
</map>
- <key>FirstLoginThisInstall</key>
+ <key>FlycamAxisScale5</key>
<map>
<key>Comment</key>
- <string>Specifies that you have not successfully logged in since you installed the latest update</string>
+ <string>Flycam axis 5 scaler.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>1.0</real>
</map>
- <key>FirstName</key>
+ <key>FlycamAxisScale6</key>
<map>
<key>Comment</key>
- <string>Login first name</string>
+ <string>Flycam axis 6 scaler.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string />
+ <real>1.0</real>
</map>
- <key>FirstPersonAvatarVisible</key>
+ <key>FlycamFeathering</key>
<map>
<key>Comment</key>
- <string>Display avatar and attachments below neck while in mouselook</string>
+ <string>Flycam feathering (less is softer)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>16.0</real>
</map>
- <key>FirstPersonBtnState</key>
+ <key>FlycamZoomDirect</key>
<map>
<key>Comment</key>
- <string />
+ <string>Map flycam zoom axis directly to camera zoom.</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>FirstRunThisInstall</key>
+ <key>FlyingAtExit</key>
<map>
<key>Comment</key>
- <string>Specifies that you have not run the viewer since you installed the latest update</string>
+ <string>Was flying when last logged out, so fly when logging in</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>FixedWeather</key>
+ <key>FocusOffsetDefault</key>
<map>
<key>Comment</key>
- <string>Weather effects do not change over time</string>
+ <string>Default focus point offset relative to avatar (x-axis is forward)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>Vector3</string>
<key>Value</key>
- <integer>0</integer>
+ <array>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
</map>
- <key>FloaterAboutRect</key>
+ <key>FocusPosOnLogout</key>
<map>
<key>Comment</key>
- <string>Rectangle for About window</string>
+ <string>Camera focus point when last logged out (global coordinates)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Vector3D</string>
<key>Value</key>
<array>
- <integer>0</integer>
- <integer>440</integer>
- <integer>470</integer>
- <integer>0</integer>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>0.0</real>
</array>
</map>
- <key>FloaterActiveSpeakersRect</key>
+ <key>FolderAutoOpenDelay</key>
<map>
<key>Comment</key>
- <string>Rectangle for active speakers window</string>
+ <string>Seconds before automatically expanding the folder under the mouse when performing inventory drag and drop</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>300</integer>
- <integer>250</integer>
- <integer>0</integer>
- </array>
+ <real>0.75</real>
</map>
- <key>FloaterActiveSpeakersSortAscending</key>
+ <key>FolderLoadingMessageWaitTime</key>
<map>
<key>Comment</key>
- <string>Whether to sort up or down</string>
+ <string>Seconds to wait before showing the LOADING... text in folder views</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>0.5</real>
</map>
- <key>FloaterActiveSpeakersSortColumn</key>
+ <key>FontMonospace</key>
<map>
<key>Comment</key>
- <string>Column name to sort on</string>
+ <string>Name of monospace font that definitely exists (Truetype file name)</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>speaking_status</string>
+ <string>DejaVuSansMono.ttf</string>
</map>
- <key>FloaterAdvancedSkyRect</key>
+ <key>FontSansSerif</key>
<map>
<key>Comment</key>
- <string>Rectangle for Advanced Sky Editor</string>
+ <string>Name of primary sans-serif font that definitely exists (Truetype file name)</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>String</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>220</integer>
- <integer>700</integer>
- <integer>0</integer>
- </array>
+ <string>MtBkLfRg.ttf</string>
</map>
- <key>FloaterAdvancedWaterRect</key>
+ <key>FontSansSerifBundledFallback</key>
<map>
<key>Comment</key>
- <string>Rectangle for Advanced Water Editor</string>
+ <string>Name of secondary sans-serif font that definitely exists (Truetype file name)</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>String</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>240</integer>
- <integer>700</integer>
- <integer>0</integer>
- </array>
+ <string>DejaVuSansCondensed.ttf</string>
</map>
- <key>FloaterAudioVolumeRect</key>
+ <key>FontSansSerifBold</key>
<map>
<key>Comment</key>
- <string>Rectangle for Audio Volume window</string>
+ <string>Name of bold font (Truetype file name)</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>String</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>440</integer>
- <integer>470</integer>
- <integer>0</integer>
- </array>
+ <string>MtBdLfRg.ttf</string>
</map>
- <key>FloaterBeaconsRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for beacon and highlight controls</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>200</integer>
- <integer>250</integer>
- <integer>250</integer>
- <integer>200</integer>
- </array>
- </map>
- <key>FloaterBuildOptionsRect</key>
+ <key>FontSansSerifFallback</key>
<map>
<key>Comment</key>
- <string>Rectangle for build options window.</string>
+ <string>Name of sans-serif font (Truetype file name)</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>String</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>0</integer>
- <integer>0</integer>
- <integer>0</integer>
- </array>
+ <string />
</map>
- <key>FloaterBumpRect</key>
+ <key>FontSansSerifFallbackScale</key>
<map>
<key>Comment</key>
- <string>Rectangle for Bumps/Hits window</string>
+ <string>Scale of fallback font relative to huge font (fraction of huge font size)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>180</integer>
- <integer>400</integer>
- <integer>0</integer>
- </array>
+ <real>1.0</real>
</map>
- <key>FloaterBuyContentsRect</key>
+ <key>FontScreenDPI</key>
<map>
<key>Comment</key>
- <string>Rectangle for Buy Contents window</string>
+ <string>Font resolution, higher is bigger (pixels per inch)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>250</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
+ <real>96.0</real>
</map>
- <key>FloaterBuyRect</key>
+ <key>FontSizeHuge</key>
<map>
<key>Comment</key>
- <string>Rectangle for buy window</string>
+ <string>Size of huge font (points, or 1/72 of an inch)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>250</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
+ <real>16.0</real>
</map>
- <key>FloaterCameraRect3</key>
+ <key>FontSizeLarge</key>
<map>
<key>Comment</key>
- <string>Rectangle for camera control window</string>
+ <string>Size of large font (points, or 1/72 of an inch)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>64</integer>
- <integer>176</integer>
- <integer>0</integer>
- </array>
+ <real>12.0</real>
</map>
- <key>FloaterChatRect</key>
+ <key>FontSizeMedium</key>
<map>
<key>Comment</key>
- <string>Rectangle for chat history</string>
+ <string>Size of medium font (points, or 1/72 of an inch)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>172</integer>
- <integer>500</integer>
- <integer>0</integer>
- </array>
+ <real>10.0</real>
</map>
- <key>FloaterClothingRect</key>
+ <key>FontSizeMonospace</key>
<map>
<key>Comment</key>
- <string>Rectangle for clothing window</string>
+ <string>Size of monospaced font (points, or 1/72 of an inch)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>480</integer>
- <integer>320</integer>
- <integer>0</integer>
- </array>
+ <real>8.1</real>
</map>
- <key>FloaterContactsRect</key>
+ <key>FontSizeSmall</key>
<map>
<key>Comment</key>
- <string>Rectangle for chat history</string>
+ <string>Size of small font (points, or 1/72 of an inch)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>390</integer>
- <integer>395</integer>
- <integer>0</integer>
- </array>
+ <real>9.0</real>
</map>
- <key>FloaterCustomizeAppearanceRect</key>
+ <key>ForceShowGrid</key>
<map>
<key>Comment</key>
- <string>Rectangle for avatar customization window</string>
+ <string>Always show grid dropdown on login screen</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>540</integer>
- <integer>494</integer>
- <integer>0</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>FloaterDayCycleRect</key>
+ <key>ForceMandatoryUpdate</key>
<map>
<key>Comment</key>
- <string>Rectangle for Day Cycle Editor</string>
+ <string>For QA: On next startup, forces the auto-updater to run</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>646</integer>
- <integer>275</integer>
- <integer>0</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>FloaterEnvRect</key>
+ <key>FreezeTime</key>
<map>
<key>Comment</key>
- <string>Rectangle for Environment Editor</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>150</integer>
- <integer>600</integer>
- <integer>0</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>FloaterFindRect2</key>
+ <key>FullScreen</key>
<map>
<key>Comment</key>
- <string>Rectangle for Find window</string>
+ <string>Run SL in fullscreen mode</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>570</integer>
- <integer>780</integer>
- <integer>0</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>FloaterFriendsRect</key>
+ <key>FullScreenAspectRatio</key>
<map>
<key>Comment</key>
- <string>Rectangle for friends window</string>
+ <string>Aspect ratio of fullscreen display (width / height)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>400</integer>
- <integer>250</integer>
- <integer>0</integer>
- </array>
+ <real>1.33329999447</real>
</map>
- <key>FloaterGestureRect2</key>
+ <key>FullScreenAutoDetectAspectRatio</key>
<map>
<key>Comment</key>
- <string>Rectangle for gestures window</string>
+ <string>Automatically detect proper aspect ratio for fullscreen display</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>465</integer>
- <integer>350</integer>
- <integer>0</integer>
- </array>
+ <integer>1</integer>
</map>
- <key>FloaterHUDRect2</key>
+ <key>FullScreenHeight</key>
<map>
<key>Comment</key>
- <string>Rectangle for HUD Floater window</string>
+ <string>Fullscreen resolution in height</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>S32</string>
<key>Value</key>
-<!-- NOTE: Height and width must match values in settings.xml for
- FloaterHUDRect because this floater is resized to those values
- in LLViewerWindow initialization. JC -->
- <array>
- <integer>0</integer>
- <integer>292</integer>
- <integer>362</integer>
- <integer>0</integer>
- </array>
+ <integer>768</integer>
</map>
- <key>FloaterHtmlRect</key>
+ <key>FullScreenWidth</key>
<map>
<key>Comment</key>
- <string>Rectangle for HTML window</string>
+ <string>Fullscreen resolution in width</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <integer>100</integer>
- <integer>460</integer>
- <integer>370</integer>
- <integer>100</integer>
- </array>
+ <integer>1024</integer>
</map>
- <key>FloaterIMRect</key>
+ <key>GridCrossSections</key>
<map>
<key>Comment</key>
- <string>Rectangle for IM window</string>
+ <string>Highlight cross sections of prims with grid manipulation plane.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>160</integer>
- <integer>500</integer>
- <integer>0</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>FloaterInspectRect</key>
+ <key>GridDrawSize</key>
<map>
<key>Comment</key>
- <string>Rectangle for Object Inspect window</string>
+ <string>Visible extent of 2D snap grid (meters)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>400</integer>
- <integer>400</integer>
- <integer>0</integer>
- </array>
+ <real>12.0</real>
</map>
- <key>FloaterInventoryRect</key>
+ <key>GridMode</key>
<map>
<key>Comment</key>
- <string>Rectangle for inventory window</string>
+ <string>Snap grid reference frame (0 = world, 1 = local, 2 = reference object)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>400</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>FloaterJoystickRect</key>
+ <key>GridOpacity</key>
<map>
<key>Comment</key>
- <string>Rectangle for joystick controls window.</string>
+ <string>Grid line opacity (0.0 = completely transparent, 1.0 = completely opaque)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>0</integer>
- <integer>0</integer>
- <integer>0</integer>
- </array>
+ <real>0.699999988079</real>
</map>
- <key>FloaterLagMeter</key>
+ <key>GridResolution</key>
<map>
<key>Comment</key>
- <string>Rectangle for lag meter</string>
+ <string>Size of single grid step (meters)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>142</integer>
- <integer>350</integer>
- <integer>0</integer>
- </array>
+ <real>0.5</real>
</map>
- <key>FloaterLandRect5</key>
+ <key>GridSubUnit</key>
<map>
<key>Comment</key>
- <string>Rectangle for About Land window</string>
+ <string>Display fractional grid steps, relative to grid size</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>370</integer>
- <integer>460</integer>
- <integer>0</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>FloaterLandmarkRect</key>
+ <key>GridSubdivision</key>
<map>
<key>Comment</key>
- <string>Rectangle for landmark picker</string>
+ <string>Maximum number of times to divide single snap grid unit when GridSubUnit is true</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>290</integer>
- <integer>310</integer>
- <integer>0</integer>
- </array>
+ <integer>32</integer>
</map>
- <key>FloaterMediaRect</key>
+ <key>GroupNotifyBoxHeight</key>
<map>
<key>Comment</key>
- <string>Rectangle for media browser window</string>
+ <string>Height of group notice messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <integer>16</integer>
- <integer>650</integer>
- <integer>600</integer>
- <integer>128</integer>
- </array>
+ <integer>260</integer>
</map>
- <key>FloaterMiniMapRect</key>
+ <key>GroupNotifyBoxWidth</key>
<map>
<key>Comment</key>
- <string>Rectangle for world map</string>
+ <string>Width of group notice messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>S32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>225</integer>
- <integer>200</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>FloaterMoveRect2</key>
+ <integer>400</integer>
+ </map>
+ <key>HelpHomeURL</key>
<map>
<key>Comment</key>
- <string>Rectangle for avatar control window</string>
+ <string>URL of initial help page</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>String</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>58</integer>
- <integer>135</integer>
- <integer>0</integer>
- </array>
+ <string>help/index.html</string>
</map>
- <key>FloaterMuteRect3</key>
+ <key>HelpLastVisitedURL</key>
<map>
<key>Comment</key>
- <string>Rectangle for mute window</string>
+ <string>URL of last help page, will be shown next time help is accessed</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>String</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>300</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
+ <string>help/index.html</string>
</map>
-
- <key>FloaterObjectIMInfo</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for floater object im info windows</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>300</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>FloaterOpenObjectRect</key>
+ <key>HighResSnapshot</key>
<map>
<key>Comment</key>
- <string>Rectangle for Open Object window</string>
+ <string>Double resolution of snapshot from current window resolution</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>350</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>FloaterPayRectB</key>
+ <key>HtmlHelpLastPage</key>
<map>
<key>Comment</key>
- <string>Rectangle for pay window</string>
+ <string>Last URL visited via help system</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>String</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>150</integer>
- <integer>400</integer>
- <integer>0</integer>
- </array>
+ <string />
</map>
- <key>FloaterPermPrefsRect</key>
+ <key>IMInChatHistory</key>
<map>
<key>Comment</key>
- <string>Rectangle for initial permissions preferences</string>
+ <string>Copy IM into chat history</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>200</integer>
- <integer>250</integer>
- <integer>250</integer>
- <integer>200</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>FloaterRegionInfo</key>
+ <key>IMShowTimestamps</key>
<map>
<key>Comment</key>
- <string>Rectangle for region info window</string>
+ <string>Show timestamps in IM</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>512</integer>
- <integer>480</integer>
- <integer>0</integer>
- </array>
+ <integer>1</integer>
</map>
- <key>FloaterScriptDebugRect</key>
+ <key>IgnorePixelDepth</key>
<map>
<key>Comment</key>
- <string>Rectangle for Script Error/Debug window</string>
+ <string>Ignore pixel depth settings.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>130</integer>
- <integer>450</integer>
- <integer>0</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>FloaterSnapshotRect</key>
+ <key>ImagePipelineUseHTTP</key>
<map>
<key>Comment</key>
- <string>Rectangle for snapshot window</string>
+ <string>If TRUE use HTTP GET to fetch textures from the server</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>200</integer>
- <integer>200</integer>
- <integer>400</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>FloaterStatisticsRect</key>
+ <key>InBandwidth</key>
<map>
<key>Comment</key>
- <string>Rectangle for chat history</string>
+ <string>Incoming bandwidth throttle (bps)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>400</integer>
- <integer>250</integer>
- <integer>0</integer>
- </array>
+ <real>0.0</real>
</map>
- <key>FloaterViewBottom</key>
+ <key>InstallLanguage</key>
<map>
<key>Comment</key>
- <string>[DO NOT MODIFY] Controls layout of floating windows within SL window</string>
+ <string>Language passed from installer (for UI)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>String</string>
<key>Value</key>
- <integer>-1</integer>
+ <string>default</string>
</map>
- <key>FloaterWorldMapRect2</key>
+ <key>InventoryAutoOpenDelay</key>
<map>
<key>Comment</key>
- <string>Rectangle for world map window</string>
+ <string>Seconds before automatically opening inventory when mouse is over inventory button when performing inventory drag and drop</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>0</integer>
- <integer>0</integer>
- <integer>0</integer>
- </array>
+ <real>1.0</real>
</map>
- <key>FlyBtnState</key>
+ <key>InventorySortOrder</key>
<map>
<key>Comment</key>
- <string />
+ <string>Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>U32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>7</integer>
</map>
- <key>FlycamAbsolute</key>
+ <key>InvertMouse</key>
<map>
<key>Comment</key>
- <string>Treat Flycam values as absolute positions (not deltas).</string>
+ <string>When in mouselook, moving mouse up looks down and vice verse (FALSE = moving up looks up)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -4103,485 +3615,484 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>FlycamAxisDeadZone0</key>
+ <key>JoystickAvatarEnabled</key>
<map>
<key>Comment</key>
- <string>Flycam axis 0 dead zone.</string>
+ <string>Enables the Joystick to control Avatar movement.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>0.1</real>
+ <integer>1</integer>
</map>
- <key>FlycamAxisDeadZone1</key>
+ <key>JoystickAxis0</key>
<map>
<key>Comment</key>
- <string>Flycam axis 1 dead zone.</string>
+ <string>Flycam hardware axis mapping for internal axis 0 ([0, 5]).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>0.1</real>
+ <integer>1</integer>
</map>
- <key>FlycamAxisDeadZone2</key>
+ <key>JoystickAxis1</key>
<map>
<key>Comment</key>
- <string>Flycam axis 2 dead zone.</string>
+ <string>Flycam hardware axis mapping for internal axis 1 ([0, 5]).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>0.1</real>
+ <integer>0</integer>
</map>
- <key>FlycamAxisDeadZone3</key>
+ <key>JoystickAxis2</key>
<map>
<key>Comment</key>
- <string>Flycam axis 3 dead zone.</string>
+ <string>Flycam hardware axis mapping for internal axis 2 ([0, 5]).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>0.1</real>
+ <integer>2</integer>
</map>
- <key>FlycamAxisDeadZone4</key>
+ <key>JoystickAxis3</key>
<map>
<key>Comment</key>
- <string>Flycam axis 4 dead zone.</string>
+ <string>Flycam hardware axis mapping for internal axis 3 ([0, 5]).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>0.1</real>
+ <integer>4</integer>
</map>
- <key>FlycamAxisDeadZone5</key>
+ <key>JoystickAxis4</key>
<map>
<key>Comment</key>
- <string>Flycam axis 5 dead zone.</string>
+ <string>Flycam hardware axis mapping for internal axis 4 ([0, 5]).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>0.1</real>
+ <integer>3</integer>
</map>
- <key>FlycamAxisDeadZone6</key>
+ <key>JoystickAxis5</key>
<map>
<key>Comment</key>
- <string>Flycam axis 6 dead zone.</string>
+ <string>Flycam hardware axis mapping for internal axis 5 ([0, 5]).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>0.1</real>
+ <integer>5</integer>
</map>
- <key>FlycamAxisScale0</key>
+ <key>JoystickAxis6</key>
<map>
<key>Comment</key>
- <string>Flycam axis 0 scaler.</string>
+ <string>Flycam hardware axis mapping for internal axis 6 ([0, 5]).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>1.0</real>
+ <integer>-1</integer>
</map>
- <key>FlycamAxisScale1</key>
+ <key>JoystickBuildEnabled</key>
<map>
<key>Comment</key>
- <string>Flycam axis 1 scaler.</string>
+ <string>Enables the Joystick to move edited objects.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>1.0</real>
+ <integer>0</integer>
</map>
- <key>FlycamAxisScale2</key>
+ <key>JoystickEnabled</key>
<map>
<key>Comment</key>
- <string>Flycam axis 2 scaler.</string>
+ <string>Enables Joystick Input.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>1.0</real>
+ <integer>0</integer>
</map>
- <key>FlycamAxisScale3</key>
+ <key>JoystickFlycamEnabled</key>
<map>
<key>Comment</key>
- <string>Flycam axis 3 scaler.</string>
+ <string>Enables the Joystick to control the flycam.</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>1.0</real>
+ <integer>1</integer>
</map>
- <key>FlycamAxisScale4</key>
+ <key>JoystickInitialized</key>
<map>
<key>Comment</key>
- <string>Flycam axis 4 scaler.</string>
+ <string>Whether or not a joystick has been detected and initiailized.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>String</string>
<key>Value</key>
- <real>1.0</real>
+ <string />
</map>
- <key>FlycamAxisScale5</key>
+ <key>JoystickRunThreshold</key>
<map>
<key>Comment</key>
- <string>Flycam axis 5 scaler.</string>
+ <string>Input threshold to initiate running</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>F32</string>
<key>Value</key>
- <real>1.0</real>
- </map>
- <key>FlycamAxisScale6</key>
+ <real>0.25</real>
+ </map>
+ <key>KeepAspectForSnapshot</key>
<map>
<key>Comment</key>
- <string>Flycam axis 6 scaler.</string>
+ <string>Use full window when taking snapshot, regardless of requested image size</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>1.0</real>
+ <integer>1</integer>
</map>
- <key>FlycamFeathering</key>
+ <key>LandBrushSize</key>
<map>
<key>Comment</key>
- <string>Flycam feathering (less is softer)</string>
+ <string>Size of affected region when using teraform tool</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>F32</string>
<key>Value</key>
- <real>16.0</real>
+ <real>2.0</real>
</map>
- <key>FlycamZoomDirect</key>
+ <key>LCDDestination</key>
<map>
<key>Comment</key>
- <string>Map flycam zoom axis directly to camera zoom.</string>
+ <string>Which LCD to use</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>FlyingAtExit</key>
+ <key>LSLFindCaseInsensitivity</key>
+ <map>
+ <key>Comment</key>
+ <string>Use case insensitivity when searching in LSL editor</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>LSLHelpURL</key>
<map>
<key>Comment</key>
- <string>Was flying when last logged out, so fly when logging in</string>
+ <string>URL that points to LSL help files, with [LSL_STRING] corresponding to the referenced LSL function or keyword</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>0</integer>
+ <string>http://wiki.secondlife.com/wiki/[LSL_STRING]</string>
</map>
- <key>FocusOffsetDefault</key>
+ <key>LagMeterShrunk</key>
<map>
<key>Comment</key>
- <string>Default focus point offset relative to avatar (x-axis is forward)</string>
+ <string>Last large/small state for lag meter</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Vector3</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>FocusPosOnLogout</key>
+ <key>Language</key>
<map>
<key>Comment</key>
- <string>Camera focus point when last logged out (global coordinates)</string>
+ <string>Language specifier (for UI)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Vector3D</string>
+ <string>String</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>0.0</real>
- <real>0.0</real>
- </array>
+ <string>default</string>
</map>
- <key>FolderAutoOpenDelay</key>
+ <key>LanguageIsPublic</key>
+ <map>
+ <key>Comment</key>
+ <string>Let other residents see our language information</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>LastFeatureVersion</key>
<map>
<key>Comment</key>
- <string>Seconds before automatically expanding the folder under the mouse when performing inventory drag and drop</string>
+ <string>[DO NOT MODIFY] Version number for tracking hardware changes</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>0.75</real>
+ <integer>0</integer>
</map>
- <key>FolderLoadingMessageWaitTime</key>
+ <key>LastFindPanel</key>
<map>
<key>Comment</key>
- <string>Seconds to wait before showing the LOADING... text in folder views</string>
+ <string>Controls which find operation appears by default when clicking "Find" button </string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>String</string>
<key>Value</key>
- <real>0.5</real>
+ <string>find_all_panel</string>
</map>
- <key>FontMonospace</key>
+ <key>LastName</key>
<map>
<key>Comment</key>
- <string>Name of monospace font that definitely exists (Truetype file name)</string>
+ <string>Login last name</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>DejaVuSansMono.ttf</string>
+ <string />
</map>
- <key>FontSansSerif</key>
+ <key>LastPrefTab</key>
<map>
<key>Comment</key>
- <string>Name of primary sans-serif font that definitely exists (Truetype file name)</string>
+ <string>Last selected tab in preferences window</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>MtBkLfRg.ttf</string>
+ <integer>0</integer>
</map>
- <key>FontSansSerifBundledFallback</key>
+ <key>LastRunVersion</key>
<map>
<key>Comment</key>
- <string>Name of secondary sans-serif font that definitely exists (Truetype file name)</string>
+ <string>Version number of last instance of the viewer that you ran</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>DejaVuSansCondensed.ttf</string>
+ <string>0.0.0</string>
</map>
- <key>FontSansSerifBold</key>
+
+ <key>LastSnapshotToEmailHeight</key>
<map>
<key>Comment</key>
- <string>Name of bold font (Truetype file name)</string>
+ <string>The height of the last email snapshot, in px</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>MtBdLfRg.ttf</string>
+ <integer>768</integer>
</map>
- <key>FontSansSerifFallback</key>
+ <key>LastSnapshotToEmailWidth</key>
<map>
<key>Comment</key>
- <string>Name of sans-serif font (Truetype file name)</string>
+ <string>The width of the last email snapshot, in px</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string />
+ <integer>1024</integer>
</map>
- <key>FontSansSerifFallbackScale</key>
+ <key>LastSnapshotToDiskHeight</key>
<map>
<key>Comment</key>
- <string>Scale of fallback font relative to huge font (fraction of huge font size)</string>
+ <string>The height of the last disk snapshot, in px</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>1.0</real>
+ <integer>768</integer>
</map>
- <key>FontScreenDPI</key>
+ <key>LastSnapshotToDiskWidth</key>
<map>
<key>Comment</key>
- <string>Font resolution, higher is bigger (pixels per inch)</string>
+ <string>The width of the last disk snapshot, in px</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>96.0</real>
+ <integer>1024</integer>
</map>
- <key>FontSizeHuge</key>
+ <key>LastSnapshotToInventoryHeight</key>
<map>
<key>Comment</key>
- <string>Size of huge font (points, or 1/72 of an inch)</string>
+ <string>The height of the last texture snapshot, in px</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>16.0</real>
+ <integer>512</integer>
</map>
- <key>FontSizeLarge</key>
+ <key>LastSnapshotToInventoryWidth</key>
<map>
<key>Comment</key>
- <string>Size of large font (points, or 1/72 of an inch)</string>
+ <string>The width of the last texture snapshot, in px</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>12.0</real>
+ <integer>512</integer>
</map>
- <key>FontSizeMedium</key>
+ <key>LastSnapshotType</key>
<map>
<key>Comment</key>
- <string>Size of medium font (points, or 1/72 of an inch)</string>
+ <string>Select this as next type of snapshot to take (0 = postcard, 1 = texture, 2 = local image)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>10.0</real>
+ <integer>0</integer>
</map>
- <key>FontSizeMonospace</key>
+ <key>LeftClickShowMenu</key>
<map>
<key>Comment</key>
- <string>Size of monospaced font (points, or 1/72 of an inch)</string>
+ <string>Left click opens pie menu (FALSE = left click touches or grabs object)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>8.1</real>
+ <integer>0</integer>
</map>
- <key>FontSizeSmall</key>
+ <key>LimitDragDistance</key>
<map>
<key>Comment</key>
- <string>Size of small font (points, or 1/72 of an inch)</string>
+ <string>Limit translation of object via translate tool</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>9.0</real>
+ <integer>1</integer>
</map>
- <key>ForceShowGrid</key>
+ <key>LimitSelectDistance</key>
<map>
<key>Comment</key>
- <string>Always show grid dropdown on login screen</string>
+ <string>Disallow selection of objects beyond max select distance</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>ForceMandatoryUpdate</key>
+ <key>LipSyncAah</key>
<map>
<key>Comment</key>
- <string>For QA: On next startup, forces the auto-updater to run</string>
+ <string>Aah (jaw opening) babble loop</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>0</integer>
+ <string>257998776531013446642343</string>
</map>
- <key>ForwardBtnRect</key>
+ <key>LipSyncAahPowerTransfer</key>
<map>
<key>Comment</key>
- <string />
+ <string>Transfer curve for Voice Interface power to aah lip sync amplitude</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>String</string>
<key>Value</key>
- <array>
- <integer>45</integer>
- <integer>54</integer>
- <integer>66</integer>
- <integer>29</integer>
- </array>
+ <string>0000123456789</string>
</map>
- <key>FreezeTime</key>
+ <key>LipSyncEnabled</key>
<map>
<key>Comment</key>
- <string />
+ <string>0 disable lip-sync, 1 enable babble loop</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>FullScreen</key>
+ <key>LipSyncOoh</key>
<map>
<key>Comment</key>
- <string>Run SL in fullscreen mode</string>
+ <string>Ooh (mouth width) babble loop</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>0</integer>
+ <string>1247898743223344444443200000</string>
</map>
- <key>FullScreenAspectRatio</key>
+ <key>LipSyncOohAahRate</key>
<map>
<key>Comment</key>
- <string>Aspect ratio of fullscreen display (width / height)</string>
+ <string>Rate to babble Ooh and Aah (/sec)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>1.33329999447</real>
+ <real>24.0</real>
</map>
- <key>FullScreenAutoDetectAspectRatio</key>
+ <key>LipSyncOohPowerTransfer</key>
<map>
<key>Comment</key>
- <string>Automatically detect proper aspect ratio for fullscreen display</string>
+ <string>Transfer curve for Voice Interface power to ooh lip sync amplitude</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>0012345566778899</string>
</map>
- <key>FullScreenHeight</key>
- <map>
- <key>Comment</key>
- <string>Fullscreen resolution in height</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>768</integer>
- </map>
- <key>FullScreenWidth</key>
+ <key>LocalCacheVersion</key>
<map>
<key>Comment</key>
- <string>Fullscreen resolution in width</string>
+ <string>Version number of cache</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>1024</integer>
+ <integer>0</integer>
</map>
- <key>GridCrossSections</key>
+ <key>LogMessages</key>
<map>
<key>Comment</key>
- <string>Highlight cross sections of prims with grid manipulation plane.</string>
+ <string>Log network traffic</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -4589,54 +4100,43 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>GridDrawSize</key>
- <map>
- <key>Comment</key>
- <string>Visible extent of 2D snap grid (meters)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>12.0</real>
- </map>
- <key>GridMode</key>
+ <key>LoginAsGod</key>
<map>
<key>Comment</key>
- <string>Snap grid reference frame (0 = world, 1 = local, 2 = reference object)</string>
+ <string>Attempt to login with god powers (Linden accounts only)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>GridOpacity</key>
+ <key>LoginLocation</key>
<map>
<key>Comment</key>
- <string>Grid line opacity (0.0 = completely transparent, 1.0 = completely opaque)</string>
+ <string>Login at same location you last logged out</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>String</string>
<key>Value</key>
- <real>0.699999988079</real>
+ <string>last</string>
</map>
- <key>GridResolution</key>
+ <key>LoginPage</key>
<map>
<key>Comment</key>
- <string>Size of single grid step (meters)</string>
+ <string>Login authentication page.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>String</string>
<key>Value</key>
- <real>0.5</real>
+ <string />
</map>
- <key>GridSubUnit</key>
+ <key>LosslessJ2CUpload</key>
<map>
<key>Comment</key>
- <string>Display fractional grid steps, relative to grid size</string>
+ <string>Use lossless compression for small image uploads</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -4644,108 +4144,98 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>GridSubdivision</key>
+ <key>MainloopTimeoutDefault</key>
<map>
<key>Comment</key>
- <string>Maximum number of times to divide single snap grid unit when GridSubUnit is true</string>
+ <string>Timeout duration for mainloop lock detection, in seconds.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>32</integer>
+ <real>20.0</real>
</map>
- <key>GroupNotifyBoxHeight</key>
+ <key>MapOverlayIndex</key>
<map>
<key>Comment</key>
- <string>Height of group notice messages</string>
+ <string>Currently selected world map type</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>260</integer>
+ <integer>0</integer>
</map>
- <key>GroupNotifyBoxWidth</key>
+ <key>MapScale</key>
<map>
<key>Comment</key>
- <string>Width of group notice messages</string>
+ <string>World map zoom level (pixels per region)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>400</integer>
+ <real>128.0</real>
</map>
- <key>HTMLLinkColor</key>
+ <key>MapShowEvents</key>
<map>
<key>Comment</key>
- <string>Color of hyperlinks</string>
+ <string>Show events on world map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.600000023842</real>
- <real>0.600000023842</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>1</integer>
</map>
- <key>HelpHomeURL</key>
+ <key>MapShowInfohubs</key>
<map>
<key>Comment</key>
- <string>URL of initial help page</string>
+ <string>Show infohubs on the world map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>help/index.html</string>
+ <integer>1</integer>
</map>
- <key>HelpLastVisitedURL</key>
+ <key>MapShowLandForSale</key>
<map>
<key>Comment</key>
- <string>URL of last help page, will be shown next time help is accessed</string>
+ <string>Show land for sale on world map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>help/index.html</string>
+ <integer>0</integer>
</map>
- <key>HighResSnapshot</key>
+ <key>MapShowPeople</key>
<map>
<key>Comment</key>
- <string>Double resolution of snapshot from current window resolution</string>
+ <string>Show other users on world map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>HtmlFindRect</key>
+ <key>MapShowTelehubs</key>
<map>
<key>Comment</key>
- <string>Rectangle for HTML find window</string>
+ <string>Show telehubs on world map</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>16</integer>
- <integer>650</integer>
- <integer>600</integer>
- <integer>128</integer>
- </array>
+ <integer>1</integer>
</map>
- <key>HtmlHelpLastPage</key>
+ <key>Marker</key>
<map>
<key>Comment</key>
- <string>Last URL visited via help system</string>
+ <string>[NOT USED]</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -4753,58 +4243,43 @@
<key>Value</key>
<string />
</map>
- <key>HtmlHelpRect</key>
+ <key>MaxDragDistance</key>
<map>
<key>Comment</key>
- <string>Rectangle for HTML help window</string>
+ <string>Maximum allowed translation distance in a single operation of translate tool (meters from start point)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>16</integer>
- <integer>650</integer>
- <integer>600</integer>
- <integer>128</integer>
- </array>
+ <real>48.0</real>
</map>
- <key>HtmlReleaseMessage</key>
+ <key>MaxSelectDistance</key>
<map>
<key>Comment</key>
- <string>Rectangle for HTML Release Message Floater window</string>
+ <string>Maximum allowed selection distance (meters from avatar)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <integer>46</integer>
- <integer>520</integer>
- <integer>400</integer>
- <integer>128</integer>
- </array>
+ <real>64.0</real>
</map>
- <key>IMChatColor</key>
+ <key>MeanCollisionBump</key>
<map>
<key>Comment</key>
- <string>Color of instant messages from other residents</string>
+ <string>You have experienced an abuse of being bumped by an object or avatar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>IMInChatHistory</key>
+ <key>MeanCollisionPhysical</key>
<map>
<key>Comment</key>
- <string>Copy IM into chat history</string>
+ <string>You have experienced an abuse from a physical object</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -4812,21 +4287,21 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>IMShowTimestamps</key>
+ <key>MeanCollisionPushObject</key>
<map>
<key>Comment</key>
- <string>Show timestamps in IM</string>
+ <string>You have experienced an abuse of being pushed by a scripted object</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>IgnorePixelDepth</key>
+ <key>MeanCollisionScripted</key>
<map>
<key>Comment</key>
- <string>Ignore pixel depth settings.</string>
+ <string>You have experienced an abuse from a scripted object</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -4834,10 +4309,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ImagePipelineUseHTTP</key>
+ <key>MeanCollisionSelected</key>
<map>
<key>Comment</key>
- <string>If TRUE use HTTP GET to fetch textures from the server</string>
+ <string>You have experienced an abuse of being pushed via a selected object</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -4845,153 +4320,164 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>InBandwidth</key>
+ <key>MemoryLogFrequency</key>
+ <map>
+ <key>Comment</key>
+ <string>Seconds between display of Memory in log (0 for never)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>600.0</real>
+ </map>
+ <key>MenuAccessKeyTime</key>
<map>
<key>Comment</key>
- <string>Incoming bandwidth throttle (bps)</string>
+ <string>Time (seconds) in which the menu key must be tapped to move focus to the menu bar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.0</real>
+ <real>0.25</real>
</map>
- <key>InstallLanguage</key>
+ <key>MenuBarHeight</key>
<map>
<key>Comment</key>
- <string>Language passed from installer (for UI)</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>default</string>
+ <integer>18</integer>
</map>
- <key>InventoryAutoOpenDelay</key>
+ <key>MenuBarWidth</key>
<map>
<key>Comment</key>
- <string>Seconds before automatically opening inventory when mouse is over inventory button when performing inventory drag and drop</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>1.0</real>
+ <integer>410</integer>
</map>
- <key>InventorySortOrder</key>
+ <key>MigrateCacheDirectory</key>
<map>
<key>Comment</key>
- <string>Specifies sort key for inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
+ <string>Check for old version of disk cache to migrate to current location</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>U32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>7</integer>
+ <integer>1</integer>
</map>
- <key>InvertMouse</key>
+ <key>MiniMapRotate</key>
<map>
<key>Comment</key>
- <string>When in mouselook, moving mouse up looks down and vice verse (FALSE = moving up looks up)</string>
+ <string>Rotate miniature world map to avatar direction</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>JoystickAvatarEnabled</key>
+ <key>MiniMapScale</key>
<map>
<key>Comment</key>
- <string>Enables the Joystick to control Avatar movement.</string>
+ <string>Miniature world map zoom levle (pixels per region)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>128.0</real>
</map>
- <key>JoystickAxis0</key>
+ <key>MouseSensitivity</key>
<map>
<key>Comment</key>
- <string>Flycam hardware axis mapping for internal axis 0 ([0, 5]).</string>
+ <string>Controls responsiveness of mouse when in mouselook mode (fraction or multiple of default mouse sensitivity)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>3.0</real>
</map>
- <key>JoystickAxis1</key>
+ <key>MouseSmooth</key>
<map>
<key>Comment</key>
- <string>Flycam hardware axis mapping for internal axis 1 ([0, 5]).</string>
+ <string>Smooths out motion of mouse when in mouselook mode.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>JoystickAxis2</key>
+ <key>MouseSun</key>
<map>
<key>Comment</key>
- <string>Flycam hardware axis mapping for internal axis 2 ([0, 5]).</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>2</integer>
+ <integer>0</integer>
</map>
- <key>JoystickAxis3</key>
+ <key>MouselookBtnState</key>
<map>
<key>Comment</key>
- <string>Flycam hardware axis mapping for internal axis 3 ([0, 5]).</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>4</integer>
+ <integer>0</integer>
</map>
- <key>JoystickAxis4</key>
+ <key>MuteAmbient</key>
<map>
<key>Comment</key>
- <string>Flycam hardware axis mapping for internal axis 4 ([0, 5]).</string>
+ <string>Ambient sound effects, such as wind noise, play at 0 volume</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>3</integer>
+ <integer>0</integer>
</map>
- <key>JoystickAxis5</key>
+ <key>MuteAudio</key>
<map>
<key>Comment</key>
- <string>Flycam hardware axis mapping for internal axis 5 ([0, 5]).</string>
+ <string>All audio plays at 0 volume (streaming audio still takes up bandwidth, for example)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>5</integer>
+ <integer>0</integer>
</map>
- <key>JoystickAxis6</key>
+ <key>MuteMedia</key>
<map>
<key>Comment</key>
- <string>Flycam hardware axis mapping for internal axis 6 ([0, 5]).</string>
+ <string>Media plays at 0 volume (streaming audio still takes up bandwidth)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>0</integer>
</map>
- <key>JoystickBuildEnabled</key>
+ <key>MuteMusic</key>
<map>
<key>Comment</key>
- <string>Enables the Joystick to move edited objects.</string>
+ <string>Music plays at 0 volume (streaming audio still takes up bandwidth)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -4999,10 +4485,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>JoystickEnabled</key>
+ <key>MuteSounds</key>
<map>
<key>Comment</key>
- <string>Enables Joystick Input.</string>
+ <string>Sound effects play at 0 volume</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5010,43 +4496,32 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>JoystickFlycamEnabled</key>
+ <key>MuteUI</key>
<map>
<key>Comment</key>
- <string>Enables the Joystick to control the flycam.</string>
+ <string>UI sound effects play at 0 volume</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>JoystickInitialized</key>
+ <key>MuteVoice</key>
<map>
<key>Comment</key>
- <string>Whether or not a joystick has been detected and initiailized.</string>
+ <string>Voice plays at 0 volume (streaming audio still takes up bandwidth)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string />
+ <integer>0</integer>
</map>
- <key>JoystickRunThreshold</key>
- <map>
- <key>Comment</key>
- <string>Input threshold to initiate running</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.25</real>
- </map>
- <key>KeepAspectForSnapshot</key>
+ <key>MuteWhenMinimized</key>
<map>
<key>Comment</key>
- <string>Use full window when taking snapshot, regardless of requested image size</string>
+ <string>Mute audio when SL window is minimized</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5054,247 +4529,219 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>LandBrushSize</key>
+ <key>NearMeRange</key>
<map>
<key>Comment</key>
- <string>Size of affected region when using teraform tool</string>
+ <string>Search radius for nearby avatars</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>F32</string>
<key>Value</key>
- <real>2.0</real>
+ <integer>20</integer>
</map>
- <key>LCDDestination</key>
+ <key>NextOwnerCopy</key>
<map>
<key>Comment</key>
- <string>Which LCD to use</string>
+ <string>Newly created objects can be copied by next owner</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>LSLFindCaseInsensitivity</key>
- <map>
- <key>Comment</key>
- <string>Use case insensitivity when searching in LSL editor</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>LSLHelpRect</key>
+ <key>NextOwnerModify</key>
<map>
<key>Comment</key>
- <string>Rectangle for LSL help window</string>
+ <string>Newly created objects can be modified by next owner</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>400</integer>
- <integer>400</integer>
- <integer>0</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>LSLHelpURL</key>
+ <key>NextOwnerTransfer</key>
<map>
<key>Comment</key>
- <string>URL that points to LSL help files, with [LSL_STRING] corresponding to the referenced LSL function or keyword</string>
+ <string>Newly created objects can be resold or given away by next owner</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>http://wiki.secondlife.com/wiki/[LSL_STRING]</string>
+ <integer>1</integer>
</map>
- <key>LagMeterShrunk</key>
+ <key>NewCacheLocation</key>
<map>
<key>Comment</key>
- <string>Last large/small state for lag meter</string>
+ <string>Change the location of the local disk cache to this</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>0</integer>
+ <string />
</map>
- <key>Language</key>
+ <key>NextLoginLocation</key>
<map>
<key>Comment</key>
- <string>Language specifier (for UI)</string>
+ <string>Location to log into by default.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>default</string>
+ <string />
</map>
- <key>LanguageIsPublic</key>
- <map>
- <key>Comment</key>
- <string>Let other residents see our language information</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>LastFeatureVersion</key>
+ <key>NoAudio</key>
<map>
<key>Comment</key>
- <string>[DO NOT MODIFY] Version number for tracking hardware changes</string>
+ <string>Disable audio playback.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>LastFindPanel</key>
+ <key>NoHardwareProbe</key>
<map>
<key>Comment</key>
- <string>Controls which find operation appears by default when clicking "Find" button </string>
+ <string>Disable hardware probe.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>find_all_panel</string>
+ <integer>0</integer>
</map>
- <key>LastName</key>
+ <key>NoInventoryLibrary</key>
<map>
<key>Comment</key>
- <string>Login last name</string>
+ <string>Do not request inventory library.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string />
+ <integer>0</integer>
</map>
- <key>LastPrefTab</key>
+ <key>NoPreload</key>
<map>
<key>Comment</key>
- <string>Last selected tab in preferences window</string>
+ <string>Disable sound and image preload.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>LastRunVersion</key>
+ <key>NoVerifySSLCert</key>
<map>
<key>Comment</key>
- <string>Version number of last instance of the viewer that you ran</string>
+ <string>Do not verify SSL peers.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>0.0.0</string>
+ <integer>0</integer>
</map>
-
- <key>LastSnapshotToEmailHeight</key>
+ <key>NotifyBoxHeight</key>
<map>
<key>Comment</key>
- <string>The height of the last email snapshot, in px</string>
+ <string>Height of notification messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>768</integer>
+ <integer>200</integer>
</map>
- <key>LastSnapshotToEmailWidth</key>
+ <key>NotifyBoxWidth</key>
<map>
<key>Comment</key>
- <string>The width of the last email snapshot, in px</string>
+ <string>Width of notification messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>1024</integer>
+ <integer>350</integer>
</map>
- <key>LastSnapshotToDiskHeight</key>
+ <key>NotifyMoneyChange</key>
<map>
<key>Comment</key>
- <string>The height of the last disk snapshot, in px</string>
+ <string>Pop up notifications for all L$ transactions</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>768</integer>
+ <integer>1</integer>
</map>
- <key>LastSnapshotToDiskWidth</key>
+ <key>NotifyTipDuration</key>
<map>
<key>Comment</key>
- <string>The width of the last disk snapshot, in px</string>
+ <string>Length of time that notification tips stay on screen (seconds)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1024</integer>
+ <real>4.0</real>
</map>
- <key>LastSnapshotToInventoryHeight</key>
+ <key>NumSessions</key>
<map>
<key>Comment</key>
- <string>The height of the last texture snapshot, in px</string>
+ <string>Number of successful logins to Second Life</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>512</integer>
+ <integer>0</integer>
</map>
- <key>LastSnapshotToInventoryWidth</key>
+ <key>NumpadControl</key>
<map>
<key>Comment</key>
- <string>The width of the last texture snapshot, in px</string>
+ <string>How numpad keys control your avatar. 0 = Like the normal arrow keys, 1 = Numpad moves avatar when numlock is off, 2 = Numpad moves avatar regardless of numlock (use this if you have no numlock)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>512</integer>
+ <integer>0</integer>
</map>
- <key>LastSnapshotType</key>
+ <key>OpenDebugStatAdvanced</key>
<map>
<key>Comment</key>
- <string>Select this as next type of snapshot to take (0 = postcard, 1 = texture, 2 = local image)</string>
+ <string>Expand advanced performance stats display</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>LeftClickShowMenu</key>
+ <key>OpenDebugStatBasic</key>
<map>
<key>Comment</key>
- <string>Left click opens pie menu (FALSE = left click touches or grabs object)</string>
+ <string>Expand basic performance stats display</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>LimitDragDistance</key>
+ <key>OpenDebugStatNet</key>
<map>
<key>Comment</key>
- <string>Limit translation of object via translate tool</string>
+ <string>Expand network stats display</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5302,10 +4749,10 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>LimitSelectDistance</key>
+ <key>OpenDebugStatRender</key>
<map>
<key>Comment</key>
- <string>Disallow selection of objects beyond max select distance</string>
+ <string>Expand render stats display</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5313,32 +4760,32 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>LipSyncAah</key>
+ <key>OpenDebugStatSim</key>
<map>
<key>Comment</key>
- <string>Aah (jaw opening) babble loop</string>
+ <string>Expand simulator performance stats display</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>257998776531013446642343</string>
+ <integer>1</integer>
</map>
- <key>LipSyncAahPowerTransfer</key>
+ <key>OpenDebugStatTexture</key>
<map>
<key>Comment</key>
- <string>Transfer curve for Voice Interface power to aah lip sync amplitude</string>
+ <string>Expand Texture performance stats display</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>0000123456789</string>
+ <integer>0</integer>
</map>
- <key>LipSyncEnabled</key>
+ <key>OpenDebugStatPhysicsDetails</key>
<map>
<key>Comment</key>
- <string>0 disable lip-sync, 1 enable babble loop</string>
+ <string>Expand Physics Details performance stats display</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5346,164 +4793,175 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>LipSyncOoh</key>
+ <key>OpenDebugStatSimTime</key>
<map>
<key>Comment</key>
- <string>Ooh (mouth width) babble loop</string>
+ <string>Expand Simulator Time performance stats display</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>1247898743223344444443200000</string>
+ <integer>0</integer>
</map>
- <key>LipSyncOohAahRate</key>
+ <key>OpenDebugStatSimTimeDetails</key>
<map>
<key>Comment</key>
- <string>Rate to babble Ooh and Aah (/sec)</string>
+ <string>Expand Simulator Time Details performance stats display</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>24.0</real>
+ <integer>0</integer>
</map>
- <key>LipSyncOohPowerTransfer</key>
+ <key>OutBandwidth</key>
<map>
<key>Comment</key>
- <string>Transfer curve for Voice Interface power to ooh lip sync amplitude</string>
+ <string>Expand render stats display</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>0012345566778899</string>
+ <integer>1</integer>
</map>
- <key>LocalCacheVersion</key>
+ <key>OutBandwidth</key>
<map>
<key>Comment</key>
- <string>Version number of cache</string>
+ <string>Outgoing bandwidth throttle (bps)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>0.0</real>
</map>
- <key>LogMessages</key>
+ <key>OverlayTitle</key>
<map>
<key>Comment</key>
- <string>Log network traffic</string>
+ <string>Controls watermark text message displayed on screen when "ShowOverlayTitle" is enabled (one word, underscores become spaces)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
+ <string>Set_via_OverlayTitle_in_settings.xml</string>
+ </map>
+ <key>PTTCurrentlyEnabled</key>
+ <map>
+ <key>Comment</key>
+ <string>Use Push to Talk mode</string>
+ <key>Persist</key>
<integer>0</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
</map>
- <key>LoginAsGod</key>
+ <key>PacketDropPercentage</key>
<map>
<key>Comment</key>
- <string>Attempt to login with god powers (Linden accounts only)</string>
+ <string>Percentage of packets dropped by the client.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>0.0</real>
</map>
- <key>LoginLastLocation</key>
+ <key>ParcelMediaAutoPlayEnable</key>
<map>
<key>Comment</key>
- <string>Login at same location you last logged out</string>
+ <string>Auto play parcel media when available</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>LoginPage</key>
+ <key>PerAccountSettingsFile</key>
<map>
<key>Comment</key>
- <string>Login authentication page.</string>
+ <string>Persisted client settings file name (per user).</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string />
</map>
- <key>LosslessJ2CUpload</key>
+ <key>PermissionsCautionEnabled</key>
<map>
<key>Comment</key>
- <string>Use lossless compression for small image uploads</string>
+ <string>When enabled, changes the handling of script permission requests to help avoid accidental granting of certain permissions, such as the debit permission</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>MainloopTimeoutDefault</key>
+ <key>PermissionsCautionNotifyBoxHeight</key>
<map>
<key>Comment</key>
- <string>Timeout duration for mainloop lock detection, in seconds.</string>
+ <string>Height of caution-style notification messages</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>20.0</real>
+ <integer>344</integer>
</map>
- <key>MapOverlayIndex</key>
+ <key>PickerContextOpacity</key>
<map>
<key>Comment</key>
- <string>Currently selected world map type</string>
+ <string>Controls overall opacity of context frustrum connecting color and texture pickers with their swatches</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>0.34999999404</real>
</map>
- <key>MapScale</key>
+ <key>PicksPerSecondMouseMoving</key>
<map>
<key>Comment</key>
- <string>World map zoom level (pixels per region)</string>
+ <string>How often to perform hover picks while the mouse is moving (picks per second)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>128.0</real>
+ <real>5.0</real>
</map>
- <key>MapShowEvents</key>
+ <key>PicksPerSecondMouseStationary</key>
<map>
<key>Comment</key>
- <string>Show events on world map</string>
+ <string>How often to perform hover picks while the mouse is stationary (picks per second)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>0.0</real>
</map>
- <key>MapShowInfohubs</key>
+ <key>PieMenuLineWidth</key>
<map>
<key>Comment</key>
- <string>Show infohubs on the world map</string>
+ <string>Width of lines in pie menu display (pixels)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>2.5</real>
</map>
- <key>MapShowLandForSale</key>
+ <key>PingInterpolate</key>
<map>
<key>Comment</key>
- <string>Show land for sale on world map</string>
+ <string>Extrapolate object position along velocity vector based on ping delay</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5511,21 +4969,21 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>MapShowPeople</key>
+ <key>PitchFromMousePosition</key>
<map>
<key>Comment</key>
- <string>Show other users on world map</string>
+ <string>Vertical range over which avatar head tracks mouse position (degrees of head rotation from top of window to bottom)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>90.0</real>
</map>
- <key>MapShowTelehubs</key>
+ <key>PlayTypingAnim</key>
<map>
<key>Comment</key>
- <string>Show telehubs on world map</string>
+ <string>Your avatar plays the typing animation whenever you type in the chat bar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5533,43 +4991,43 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>Marker</key>
+ <key>PrecachingDelay</key>
<map>
<key>Comment</key>
- <string>[NOT USED]</string>
+ <string>Delay when logging in to load world before showing it (seconds)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string />
+ <real>6.0</real>
</map>
- <key>MaxDragDistance</key>
+ <key>PreferredMaturity</key>
<map>
<key>Comment</key>
- <string>Maximum allowed translation distance in a single operation of translate tool (meters from start point)</string>
+ <string>Setting for the user's preferred maturity level.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>U32</string>
<key>Value</key>
- <real>48.0</real>
+ <integer>13</integer>
</map>
- <key>MaxSelectDistance</key>
+ <key>ProbeHardwareOnStartup</key>
<map>
<key>Comment</key>
- <string>Maximum allowed selection distance (meters from avatar)</string>
+ <string>Query current hardware configuration on application startup</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>64.0</real>
+ <integer>1</integer>
</map>
- <key>MeanCollisionBump</key>
+ <key>PurgeCacheOnNextStartup</key>
<map>
<key>Comment</key>
- <string>You have experienced an abuse of being bumped by an object or avatar</string>
+ <string>Clear local file cache next time viewer is run</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5577,10 +5035,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>MeanCollisionPhysical</key>
+ <key>PurgeCacheOnStartup</key>
<map>
<key>Comment</key>
- <string>You have experienced an abuse from a physical object</string>
+ <string>Clear local file cache every time viewer is run</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5588,10 +5046,21 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>MeanCollisionPushObject</key>
+ <key>PushToTalkButton</key>
<map>
<key>Comment</key>
- <string>You have experienced an abuse of being pushed by a scripted object</string>
+ <string>Which button or keyboard key is used for push-to-talk</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>MiddleMouse</string>
+ </map>
+ <key>PushToTalkToggle</key>
+ <map>
+ <key>Comment</key>
+ <string>Should the push-to-talk button behave as a toggle</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5599,10 +5068,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>MeanCollisionScripted</key>
+ <key>QAMode</key>
<map>
<key>Comment</key>
- <string>You have experienced an abuse from a scripted object</string>
+ <string>Enable Testing Features.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5610,10 +5079,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>MeanCollisionSelected</key>
+ <key>QuietSnapshotsToDisk</key>
<map>
<key>Comment</key>
- <string>You have experienced an abuse of being pushed via a selected object</string>
+ <string>Take snapshots to disk without playing animation or sound</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5621,65 +5090,65 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>MemoryLogFrequency</key>
- <map>
- <key>Comment</key>
- <string>Seconds between display of Memory in log (0 for never)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>600.0</real>
- </map>
- <key>MenuAccessKeyTime</key>
+ <key>QuitAfterSeconds</key>
<map>
<key>Comment</key>
- <string>Time (seconds) in which the menu key must be tapped to move focus to the menu bar</string>
+ <string>The duration allowed before quitting.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.25</real>
+ <real>0.0</real>
</map>
- <key>MenuBarHeight</key>
+ <key>RadioLandBrushAction</key>
<map>
<key>Comment</key>
- <string />
+ <string>Last selected land modification operation (0 = flatten, 1 = raise, 2 = lower, 3 = smooth, 4 = roughen, 5 = revert)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>18</integer>
+ <integer>0</integer>
</map>
- <key>MenuBarWidth</key>
+ <key>RadioLandBrushSize</key>
<map>
<key>Comment</key>
- <string />
+ <string>Size of land modification brush (0 = small, 1 = medium, 2 = large)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>410</integer>
+ <integer>0</integer>
</map>
- <key>MigrateCacheDirectory</key>
+ <key>LandBrushForce</key>
+ <map>
+ <key>Comment</key>
+ <string>Multiplier for land modification brush force.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>1.0</real>
+ </map>
+ <key>RecentItemsSortOrder</key>
<map>
<key>Comment</key>
- <string>Check for old version of disk cache to migrate to current location</string>
+ <string>Specifies sort key for recent inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>U32</string>
<key>Value</key>
<integer>1</integer>
</map>
- <key>MiniMapRotate</key>
+ <key>RectangleSelectInclusive</key>
<map>
<key>Comment</key>
- <string>Rotate miniature world map to avatar direction</string>
+ <string>Select objects that have at least one vertex inside selection rectangle</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5687,32 +5156,32 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>MiniMapScale</key>
+ <key>RegionTextureSize</key>
<map>
<key>Comment</key>
- <string>Miniature world map zoom levle (pixels per region)</string>
+ <string>Terrain texture dimensions (power of 2)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>U32</string>
<key>Value</key>
- <real>128.0</real>
+ <integer>256</integer>
</map>
- <key>MouseSensitivity</key>
+ <key>RememberPassword</key>
<map>
<key>Comment</key>
- <string>Controls responsiveness of mouse when in mouselook mode (fraction or multiple of default mouse sensitivity)</string>
+ <string>Keep password (in encrypted form) for next login</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>3.0</real>
+ <integer>1</integer>
</map>
- <key>MouseSmooth</key>
+ <key>RenderAnisotropic</key>
<map>
<key>Comment</key>
- <string>Smooths out motion of mouse when in mouselook mode.</string>
+ <string>Render textures using anisotropic filtering</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5720,141 +5189,98 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>MouseSun</key>
+ <key>RenderAppleUseMultGL</key>
<map>
<key>Comment</key>
- <string />
+ <string>Whether we want to use multi-threaded OpenGL on Apple hardware (requires restart of SL).</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>MouselookBtnState</key>
+ <key>RenderAttachedLights</key>
+ <map>
+ <key>Comment</key>
+ <string>Render lighted prims that are attached to avatars</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>RenderAttachedParticles</key>
+ <map>
+ <key>Comment</key>
+ <string>Render particle systems that are attached to avatars</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>RenderAvatar</key>
<map>
<key>Comment</key>
- <string />
+ <string>Render Avatars</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
- </map>
- <key>MoveDownBtnRect</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>91</integer>
- <integer>29</integer>
- <integer>116</integer>
- <integer>4</integer>
- </array>
- </map>
- <key>MoveUpBtnRect</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>91</integer>
- <integer>54</integer>
- <integer>116</integer>
- <integer>29</integer>
- </array>
- </map>
- <key>MuteAmbient</key>
- <map>
- <key>Comment</key>
- <string>Ambient sound effects, such as wind noise, play at 0 volume</string>
- <key>Persist</key>
<integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
</map>
- <key>MuteAudio</key>
+ <key>RenderAvatarCloth</key>
<map>
<key>Comment</key>
- <string>All audio plays at 0 volume (streaming audio still takes up bandwidth, for example)</string>
+ <string>Controls if avatars use wavy cloth</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
- </map>
- <key>MuteMedia</key>
- <map>
- <key>Comment</key>
- <string>Media plays at 0 volume (streaming audio still takes up bandwidth)</string>
- <key>Persist</key>
<integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
</map>
- <key>MuteMusic</key>
+ <key>RenderAvatarLODFactor</key>
<map>
<key>Comment</key>
- <string>Music plays at 0 volume (streaming audio still takes up bandwidth)</string>
+ <string>Controls level of detail of avatars (multiplier for current screen area when calculated level of detail)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>0.5</real>
</map>
- <key>MuteSounds</key>
+ <key>RenderAvatarMaxVisible</key>
<map>
<key>Comment</key>
- <string>Sound effects play at 0 volume</string>
+ <string>Maximum number of avatars to display at any one time</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>35</integer>
</map>
- <key>MuteUI</key>
+ <key>RenderAvatarInvisible</key>
<map>
<key>Comment</key>
- <string>UI sound effects play at 0 volume</string>
+ <string>Set your avatar as Invisible</string>
<key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
<integer>0</integer>
- </map>
- <key>MuteVoice</key>
- <map>
- <key>Comment</key>
- <string>Voice plays at 0 volume (streaming audio still takes up bandwidth)</string>
- <key>Persist</key>
- <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>MuteWhenMinimized</key>
+ <key>RenderAvatarVP</key>
<map>
<key>Comment</key>
- <string>Mute audio when SL window is minimized</string>
+ <string>Use vertex programs to perform hardware skinning of avatar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5862,32 +5288,138 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>NearMeRange</key>
+
+ <key>RenderShadowGaussian</key>
+ <map>
+ <key>Comment</key>
+ <string>Gaussian coefficients for the two shadow/SSAO blurring passes (z component unused).</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Vector3</string>
+ <key>Value</key>
+ <array>
+ <real>2.0</real>
+ <real>2.0</real>
+ <real>0.0</real>
+ </array>
+ </map>
+
+ <key>RenderShadowNearDist</key>
+ <map>
+ <key>Comment</key>
+ <string>Near clip plane of shadow camera (affects precision of depth shadows).</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Vector3</string>
+ <key>Value</key>
+ <array>
+ <real>256</real>
+ <real>256</real>
+ <real>256</real>
+ </array>
+ </map>
+ <key>RenderShadowClipPlanes</key>
+ <map>
+ <key>Comment</key>
+ <string>Near clip plane split distances for shadow map frusta.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Vector3</string>
+ <key>Value</key>
+ <array>
+ <real>4.0</real>
+ <real>8.0</real>
+ <real>24.0</real>
+ </array>
+ </map>
+ <key>RenderSSAOScale</key>
+ <map>
+ <key>Comment</key>
+ <string>Scaling factor for the area to sample for occluders (pixels at 1 meter away, inversely varying with distance)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>500.0</real>
+ </map>
+ <key>RenderSSAOMaxScale</key>
+ <map>
+ <key>Comment</key>
+ <string>Maximum screen radius for sampling (pixels)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <integer>60</integer>
+ </map>
+ <key>RenderSSAOFactor</key>
+ <map>
+ <key>Comment</key>
+ <string>Occlusion sensitivity factor for ambient occlusion (larger is more)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>0.30</real>
+ </map>
+ <key>RenderSSAOEffect</key>
+ <map>
+ <key>Comment</key>
+ <string>Multiplier for (1) value and (2) saturation (HSV definition), for areas which are totally occluded. Blends with original color for partly-occluded areas. (Third component is unused.)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Vector3</string>
+ <key>Value</key>
+ <array>
+ <real>0.40</real>
+ <real>1.00</real>
+ <real>0.00</real>
+ </array>
+ </map>
+ <key>RenderBumpmapMinDistanceSquared</key>
<map>
<key>Comment</key>
- <string>Search radius for nearby avatars</string>
+ <string>Maximum distance at which to render bumpmapped primitives (distance in meters, squared)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <integer>20</integer>
+ <real>100.0</real>
</map>
- <key>NextOwnerCopy</key>
+ <key>RenderNormalMapScale</key>
+ <map>
+ <key>Comment</key>
+ <string>Scaler applied to height map when generating normal maps</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>128</real>
+ </map>
+ <key>RenderCubeMap</key>
<map>
<key>Comment</key>
- <string>Newly created objects can be copied by next owner</string>
+ <string>Whether we can render the cube map or not</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>NextOwnerModify</key>
+ <key>RenderCustomSettings</key>
<map>
<key>Comment</key>
- <string>Newly created objects can be modified by next owner</string>
+ <string>Do you want to set the graphics settings yourself</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -5895,1905 +5427,165 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>NextOwnerTransfer</key>
+ <key>RenderDebugGL</key>
<map>
<key>Comment</key>
- <string>Newly created objects can be resold or given away by next owner</string>
+ <string>Enable strict GL debugging.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>NewCacheLocation</key>
+ <key>RenderDebugPipeline</key>
<map>
<key>Comment</key>
- <string>Change the location of the local disk cache to this</string>
+ <string>Enable strict pipeline debugging.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string />
+ <integer>0</integer>
</map>
- <key>NextLoginLocation</key>
+ <key>RenderDebugTextureBind</key>
<map>
<key>Comment</key>
- <string>Location to log into by default.</string>
+ <string>Enable texture bind performance test.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string />
+ <integer>0</integer>
</map>
- <key>NoAudio</key>
- <map>
- <key>Comment</key>
- <string>Disable audio playback.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>NoHardwareProbe</key>
- <map>
- <key>Comment</key>
- <string>Disable hardware probe.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>NoInventoryLibrary</key>
- <map>
- <key>Comment</key>
- <string>Do not request inventory library.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>NoPreload</key>
- <map>
- <key>Comment</key>
- <string>Disable sound and image preload.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>NoVerifySSLCert</key>
- <map>
- <key>Comment</key>
- <string>Do not verify SSL peers.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>NotecardEditorRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for notecard editor</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>400</integer>
- <integer>400</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>NotifyBoxHeight</key>
- <map>
- <key>Comment</key>
- <string>Height of notification messages</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>200</integer>
- </map>
- <key>NotifyBoxWidth</key>
- <map>
- <key>Comment</key>
- <string>Width of notification messages</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>350</integer>
- </map>
- <key>NotifyMoneyChange</key>
- <map>
- <key>Comment</key>
- <string>Pop up notifications for all L$ transactions</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>NotifyTipDuration</key>
- <map>
- <key>Comment</key>
- <string>Length of time that notification tips stay on screen (seconds)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>4.0</real>
- </map>
- <key>NumSessions</key>
- <map>
- <key>Comment</key>
- <string>Number of successful logins to Second Life</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>NumpadControl</key>
- <map>
- <key>Comment</key>
- <string>How numpad keys control your avatar. 0 = Like the normal arrow keys, 1 = Numpad moves avatar when numlock is off, 2 = Numpad moves avatar regardless of numlock (use this if you have no numlock)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>ObjectChatColor</key>
- <map>
- <key>Comment</key>
- <string>Color of chat messages from objects</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Color4</string>
- <key>Value</key>
- <array>
- <real>0.699999988079</real>
- <real>0.899999976158</real>
- <real>0.699999988079</real>
- <real>1</real>
- </array>
- </map>
- <key>OpenDebugStatAdvanced</key>
- <map>
- <key>Comment</key>
- <string>Expand advanced performance stats display</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>OpenDebugStatBasic</key>
- <map>
- <key>Comment</key>
- <string>Expand basic performance stats display</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>OpenDebugStatNet</key>
- <map>
- <key>Comment</key>
- <string>Expand network stats display</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>OpenDebugStatRender</key>
- <map>
- <key>Comment</key>
- <string>Expand render stats display</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>OpenDebugStatSim</key>
- <map>
- <key>Comment</key>
- <string>Expand simulator performance stats display</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>OpenDebugStatTexture</key>
- <map>
- <key>Comment</key>
- <string>Expand Texture performance stats display</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>OpenDebugStatPhysicsDetails</key>
- <map>
- <key>Comment</key>
- <string>Expand Physics Details performance stats display</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>OpenDebugStatSimTime</key>
- <map>
- <key>Comment</key>
- <string>Expand Simulator Time performance stats display</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>OpenDebugStatSimTimeDetails</key>
- <map>
- <key>Comment</key>
- <string>Expand Simulator Time Details performance stats display</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>OutBandwidth</key>
- <map>
- <key>Comment</key>
- <string>Outgoing bandwidth throttle (bps)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.0</real>
- </map>
- <key>OverdrivenColor</key>
- <map>
- <key>Comment</key>
- <string>Color of various indicators when resident is speaking too loud.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Color4</string>
- <key>Value</key>
- <array>
- <real>1.0</real>
- <real>0.0</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
- </map>
- <key>OverlayTitle</key>
- <map>
- <key>Comment</key>
- <string>Controls watermark text message displayed on screen when "ShowOverlayTitle" is enabled (one word, underscores become spaces)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
- <string>Set_via_OverlayTitle_in_settings.xml</string>
- </map>
- <key>PTTCurrentlyEnabled</key>
- <map>
- <key>Comment</key>
- <string>Use Push to Talk mode</string>
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>PacketDropPercentage</key>
- <map>
- <key>Comment</key>
- <string>Percentage of packets dropped by the client.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.0</real>
- </map>
- <key>ParcelMediaAutoPlayEnable</key>
- <map>
- <key>Comment</key>
- <string>Auto play parcel media when available</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>PerAccountSettingsFile</key>
- <map>
- <key>Comment</key>
- <string>Persisted client settings file name (per user).</string>
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
- <string />
- </map>
- <key>PermissionsCautionEnabled</key>
- <map>
- <key>Comment</key>
- <string>When enabled, changes the handling of script permission requests to help avoid accidental granting of certain permissions, such as the debit permission</string>
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>PermissionsCautionNotifyBoxHeight</key>
- <map>
- <key>Comment</key>
- <string>Height of caution-style notification messages</string>
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>344</integer>
- </map>
- <key>PermissionsManagerRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for permissions manager window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>85</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>PickerContextOpacity</key>
- <map>
- <key>Comment</key>
- <string>Controls overall opacity of context frustrum connecting color and texture pickers with their swatches</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.34999999404</real>
- </map>
- <key>PicksPerSecondMouseMoving</key>
- <map>
- <key>Comment</key>
- <string>How often to perform hover picks while the mouse is moving (picks per second)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>5.0</real>
- </map>
- <key>PicksPerSecondMouseStationary</key>
- <map>
- <key>Comment</key>
- <string>How often to perform hover picks while the mouse is stationary (picks per second)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.0</real>
- </map>
- <key>PieMenuLineWidth</key>
- <map>
- <key>Comment</key>
- <string>Width of lines in pie menu display (pixels)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>2.5</real>
- </map>
- <key>PinTalkViewOpen</key>
- <map>
- <key>Comment</key>
- <string>Stay in IM after hitting return</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>PingInterpolate</key>
- <map>
- <key>Comment</key>
- <string>Extrapolate object position along velocity vector based on ping delay</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>PitchFromMousePosition</key>
- <map>
- <key>Comment</key>
- <string>Vertical range over which avatar head tracks mouse position (degrees of head rotation from top of window to bottom)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>90.0</real>
- </map>
- <key>PlayTypingAnim</key>
- <map>
- <key>Comment</key>
- <string>Your avatar plays the typing animation whenever you type in the chat bar</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>PrecachingDelay</key>
- <map>
- <key>Comment</key>
- <string>Delay when logging in to load world before showing it (seconds)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>6.0</real>
- </map>
- <key>PreferredMaturity</key>
- <map>
- <key>Comment</key>
- <string>Setting for the user's preferred maturity level.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>13</integer>
- </map>
- <key>PreviewAnimRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for animation preview window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>85</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>PreviewClassifiedRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for URL preview window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>530</integer>
- <integer>420</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>PreviewEventRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for Event preview window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>530</integer>
- <integer>420</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>PreviewLandmarkRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for landmark preview window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>90</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>PreviewObjectRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for object preview window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>85</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>PreviewScriptRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for script preview window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>550</integer>
- <integer>500</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>PreviewSoundRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for sound preview window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>85</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>PreviewTextureRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for texture preview window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>400</integer>
- <integer>400</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>PreviewURLRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for URL preview window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>90</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>PreviewWearableRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for wearable preview window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>85</integer>
- <integer>300</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>ProbeHardwareOnStartup</key>
- <map>
- <key>Comment</key>
- <string>Query current hardware configuration on application startup</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>PropertiesRect</key>
- <map>
- <key>Comment</key>
- <string>Rectangle for inventory item properties window</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Rect</string>
- <key>Value</key>
- <array>
- <integer>0</integer>
- <integer>320</integer>
- <integer>350</integer>
- <integer>0</integer>
- </array>
- </map>
- <key>PurgeCacheOnNextStartup</key>
- <map>
- <key>Comment</key>
- <string>Clear local file cache next time viewer is run</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>PurgeCacheOnStartup</key>
- <map>
- <key>Comment</key>
- <string>Clear local file cache every time viewer is run</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>PushToTalkButton</key>
- <map>
- <key>Comment</key>
- <string>Which button or keyboard key is used for push-to-talk</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
- <string>MiddleMouse</string>
- </map>
- <key>PushToTalkToggle</key>
- <map>
- <key>Comment</key>
- <string>Should the push-to-talk button behave as a toggle</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>QAMode</key>
- <map>
- <key>Comment</key>
- <string>Enable Testing Features.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>QuietSnapshotsToDisk</key>
- <map>
- <key>Comment</key>
- <string>Take snapshots to disk without playing animation or sound</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>QuitAfterSeconds</key>
- <map>
- <key>Comment</key>
- <string>The duration allowed before quitting.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.0</real>
- </map>
- <key>RadioLandBrushAction</key>
- <map>
- <key>Comment</key>
- <string>Last selected land modification operation (0 = flatten, 1 = raise, 2 = lower, 3 = smooth, 4 = roughen, 5 = revert)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RadioLandBrushSize</key>
- <map>
- <key>Comment</key>
- <string>Size of land modification brush (0 = small, 1 = medium, 2 = large)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>LandBrushForce</key>
- <map>
- <key>Comment</key>
- <string>Multiplier for land modification brush force.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>1.0</real>
- </map>
- <key>RecentItemsSortOrder</key>
- <map>
- <key>Comment</key>
- <string>Specifies sort key for recent inventory items (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RectangleSelectInclusive</key>
- <map>
- <key>Comment</key>
- <string>Select objects that have at least one vertex inside selection rectangle</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RegionTextureSize</key>
- <map>
- <key>Comment</key>
- <string>Terrain texture dimensions (power of 2)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>256</integer>
- </map>
- <key>RememberPassword</key>
- <map>
- <key>Comment</key>
- <string>Keep password (in encrypted form) for next login</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderAnisotropic</key>
- <map>
- <key>Comment</key>
- <string>Render textures using anisotropic filtering</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderAppleUseMultGL</key>
- <map>
- <key>Comment</key>
- <string>Whether we want to use multi-threaded OpenGL on Apple hardware (requires restart of SL).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderAttachedLights</key>
- <map>
- <key>Comment</key>
- <string>Render lighted prims that are attached to avatars</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderAttachedParticles</key>
- <map>
- <key>Comment</key>
- <string>Render particle systems that are attached to avatars</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderAvatarCloth</key>
- <map>
- <key>Comment</key>
- <string>Controls if avatars use wavy cloth</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderAvatarLODFactor</key>
- <map>
- <key>Comment</key>
- <string>Controls level of detail of avatars (multiplier for current screen area when calculated level of detail)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.5</real>
- </map>
- <key>RenderAvatarMaxVisible</key>
- <map>
- <key>Comment</key>
- <string>Maximum number of avatars to display at any one time</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>35</integer>
- </map>
- <key>RenderAvatarInvisible</key>
- <map>
- <key>Comment</key>
- <string>Set your avatar as Invisible</string>
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderAvatarVP</key>
- <map>
- <key>Comment</key>
- <string>Use vertex programs to perform hardware skinning of avatar</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
-
- <key>RenderShadowGaussian</key>
- <map>
- <key>Comment</key>
- <string>Gaussian coefficients for the two shadow/SSAO blurring passes (z component unused).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Vector3</string>
- <key>Value</key>
- <array>
- <real>2.0</real>
- <real>2.0</real>
- <real>0.0</real>
- </array>
- </map>
-
- <key>RenderShadowNearDist</key>
- <map>
- <key>Comment</key>
- <string>Near clip plane of shadow camera (affects precision of depth shadows).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Vector3</string>
- <key>Value</key>
- <array>
- <real>256</real>
- <real>256</real>
- <real>256</real>
- </array>
- </map>
- <key>RenderShadowClipPlanes</key>
- <map>
- <key>Comment</key>
- <string>Near clip plane split distances for shadow map frusta.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Vector3</string>
- <key>Value</key>
- <array>
- <real>4.0</real>
- <real>8.0</real>
- <real>24.0</real>
- </array>
- </map>
- <key>RenderSSAOScale</key>
- <map>
- <key>Comment</key>
- <string>Scaling factor for the area to sample for occluders (pixels at 1 meter away, inversely varying with distance)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>500.0</real>
- </map>
- <key>RenderSSAOMaxScale</key>
- <map>
- <key>Comment</key>
- <string>Maximum screen radius for sampling (pixels)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>60</integer>
- </map>
- <key>RenderSSAOFactor</key>
- <map>
- <key>Comment</key>
- <string>Occlusion sensitivity factor for ambient occlusion (larger is more)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.30</real>
- </map>
- <key>RenderSSAOEffect</key>
- <map>
- <key>Comment</key>
- <string>Multiplier for (1) value and (2) saturation (HSV definition), for areas which are totally occluded. Blends with original color for partly-occluded areas. (Third component is unused.)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Vector3</string>
- <key>Value</key>
- <array>
- <real>0.40</real>
- <real>1.00</real>
- <real>0.00</real>
- </array>
- </map>
- <key>RenderBumpmapMinDistanceSquared</key>
- <map>
- <key>Comment</key>
- <string>Maximum distance at which to render bumpmapped primitives (distance in meters, squared)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>100.0</real>
- </map>
- <key>RenderNormalMapScale</key>
- <map>
- <key>Comment</key>
- <string>Scaler applied to height map when generating normal maps</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>128</real>
- </map>
- <key>RenderCubeMap</key>
- <map>
- <key>Comment</key>
- <string>Whether we can render the cube map or not</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderCustomSettings</key>
- <map>
- <key>Comment</key>
- <string>Do you want to set the graphics settings yourself</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderDebugGL</key>
- <map>
- <key>Comment</key>
- <string>Enable strict GL debugging.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderDebugPipeline</key>
- <map>
- <key>Comment</key>
- <string>Enable strict pipeline debugging.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderDebugTextureBind</key>
- <map>
- <key>Comment</key>
- <string>Enable texture bind performance test.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderDelayCreation</key>
- <map>
- <key>Comment</key>
- <string>Throttle creation of drawables.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderAnimateRes</key>
- <map>
- <key>Comment</key>
- <string>Animate rezing prims.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
-
- <key>RenderAnimateTrees</key>
- <map>
- <key>Comment</key>
- <string>Use GL matrix ops to animate tree branches.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderDeferredAlphaSoften</key>
- <map>
- <key>Comment</key>
- <string>Scalar for softening alpha surfaces (for soft particles).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.75</real>
- </map>
- <key>RenderDeferredNoise</key>
- <map>
- <key>Comment</key>
- <string>Noise scalar to hide banding in deferred render.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>4</real>
- </map>
- <key>RenderDeferred</key>
- <map>
- <key>Comment</key>
- <string>Use deferred rendering pipeline.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderDeferredSunShadow</key>
- <map>
- <key>Comment</key>
- <string>Generate shadows from the sun.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderDeferredSunWash</key>
- <map>
- <key>Comment</key>
- <string>Amount local lights are washed out by sun.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.5</real>
- </map>
- <key>RenderShadowNoise</key>
- <map>
- <key>Comment</key>
- <string>Magnitude of noise on shadow samples.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>-0.0001</real>
- </map>
- <key>RenderShadowBlurSize</key>
- <map>
- <key>Comment</key>
- <string>Scale of shadow softening kernel.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.7</real>
- </map>
- <key>RenderShadowBlurSamples</key>
- <map>
- <key>Comment</key>
- <string>Number of samples to take for each pass of shadow blur (value range 1-16). Actual number of samples is value * 2 - 1.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <real>5</real>
- </map>
- <key>RenderDynamicLOD</key>
- <map>
- <key>Comment</key>
- <string>Dynamically adjust level of detail.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderFSAASamples</key>
- <map>
- <key>Comment</key>
- <string>Number of samples to use for FSAA (0 = no AA).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderFarClip</key>
- <map>
- <key>Comment</key>
- <string>Distance of far clip plane from camera (meters)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>256.0</real>
- </map>
- <key>RenderFastAlpha</key>
- <map>
- <key>Comment</key>
- <string>Use lossy alpha rendering optimization (opaque/nonexistent small alpha faces).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderFastUI</key>
- <map>
- <key>Comment</key>
- <string>[NOT USED]</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderFlexTimeFactor</key>
- <map>
- <key>Comment</key>
- <string>Controls level of detail of flexible objects (multiplier for amount of time spent processing flex objects)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>1.0</real>
- </map>
- <key>RenderFogRatio</key>
- <map>
- <key>Comment</key>
- <string>Distance from camera where fog reaches maximum density (fraction or multiple of far clip distance)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>4.0</real>
- </map>
- <key>RenderGamma</key>
- <map>
- <key>Comment</key>
- <string>Sets gamma exponent for renderer</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.0</real>
- </map>
- <key>RenderGammaFull</key>
- <map>
- <key>Comment</key>
- <string>Use fully controllable gamma correction, instead of faster, hard-coded gamma correction of 2.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <real>1.0</real>
- </map>
- <key>RenderGlow</key>
- <map>
- <key>Comment</key>
- <string>Render bloom post effect.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderGlowIterations</key>
- <map>
- <key>Comment</key>
- <string>Number of times to iterate the glow (higher = wider and smoother but slower)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>2</integer>
- </map>
- <key>RenderGlowLumWeights</key>
- <map>
- <key>Comment</key>
- <string>Weights for each color channel to be used in calculating luminance (should add up to 1.0)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Vector3</string>
- <key>Value</key>
- <array>
- <real>0.299</real>
- <real>0.587</real>
- <real>0.114</real>
- </array>
- </map>
- <key>RenderGlowMaxExtractAlpha</key>
- <map>
- <key>Comment</key>
- <string>Max glow alpha value for brightness extraction to auto-glow.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.065</real>
- </map>
- <key>RenderGlowMinLuminance</key>
- <map>
- <key>Comment</key>
- <string>Min luminance intensity necessary to consider an object bright enough to automatically glow.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>2.5</real>
- </map>
- <key>RenderGlowResolutionPow</key>
- <map>
- <key>Comment</key>
- <string>Glow map resolution power of two.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>9</integer>
- </map>
- <key>RenderGlowStrength</key>
- <map>
- <key>Comment</key>
- <string>Additive strength of glow.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.35</real>
- </map>
- <key>RenderGlowWarmthAmount</key>
- <map>
- <key>Comment</key>
- <string>Amount of warmth extraction to use (versus luminance extraction). 0 = lum, 1.0 = warmth</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.0</real>
- </map>
- <key>RenderGlowWarmthWeights</key>
- <map>
- <key>Comment</key>
- <string>Weight of each color channel used before finding the max warmth</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Vector3</string>
- <key>Value</key>
- <array>
- <real>1.0</real>
- <real>0.5</real>
- <real>0.7</real>
- </array>
- </map>
- <key>RenderGlowWidth</key>
- <map>
- <key>Comment</key>
- <string>Glow sample size (higher = wider and softer but eventually more pixelated)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>1.3</real>
- </map>
- <key>RenderGround</key>
- <map>
- <key>Comment</key>
- <string>Determines whether we can render the ground pool or not</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderHUDInSnapshot</key>
- <map>
- <key>Comment</key>
- <string>Display HUD attachments in snapshot</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderHiddenSelections</key>
- <map>
- <key>Comment</key>
- <string>Show selection lines on objects that are behind other objects</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderHideGroupTitle</key>
- <map>
- <key>Comment</key>
- <string>Don't show my group title in my name label</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderHideGroupTitleAll</key>
- <map>
- <key>Comment</key>
- <string>Show group titles in name labels</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderInitError</key>
- <map>
- <key>Comment</key>
- <string>Error occured while initializing GL</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderLightRadius</key>
- <map>
- <key>Comment</key>
- <string>Render the radius of selected lights</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderLightingDetail</key>
- <map>
- <key>Comment</key>
- <string>Amount of detail for lighting objects/avatars/terrain (0=sun/moon only, 1=enable local lights)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderMaxPartCount</key>
- <map>
- <key>Comment</key>
- <string>Maximum number of particles to display on screen</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>4096</integer>
- </map>
- <key>RenderMaxNodeSize</key>
- <map>
- <key>Comment</key>
- <string>Maximum size of a single node's vertex data (in KB).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>4096</integer>
- </map>
- <key>RenderMaxVBOSize</key>
- <map>
- <key>Comment</key>
- <string>Maximum size of a vertex buffer (in KB).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>512</integer>
- </map>
- <key>RenderName</key>
- <map>
- <key>Comment</key>
- <string>Controls display of names above avatars (0 = never, 1 = fade, 2 = always)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>2</integer>
- </map>
- <key>RenderNameFadeDuration</key>
- <map>
- <key>Comment</key>
- <string>Time interval over which to fade avatar names (seconds)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>1.0</real>
- </map>
- <key>RenderNameHideSelf</key>
- <map>
- <key>Comment</key>
- <string>Don't display own name above avatar</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderNameShowTime</key>
- <map>
- <key>Comment</key>
- <string>Fade avatar names after specified time (seconds)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>10.0</real>
- </map>
- <key>RenderObjectBump</key>
- <map>
- <key>Comment</key>
- <string>Show bumpmapping on primitives</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderQualityPerformance</key>
- <map>
- <key>Comment</key>
- <string>Which graphics settings you've chosen</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderReflectionDetail</key>
- <map>
- <key>Comment</key>
- <string>Detail of reflection render pass.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>2</integer>
- </map>
- <key>RenderReflectionRes</key>
- <map>
- <key>Comment</key>
- <string>Reflection map resolution.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>64</integer>
- </map>
- <key>RenderResolutionDivisor</key>
- <map>
- <key>Comment</key>
- <string>Divisor for rendering 3D scene at reduced resolution.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>U32</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderShaderLightingMaxLevel</key>
- <map>
- <key>Comment</key>
- <string>Max lighting level to use in the shader (class 3 is default, 2 is less lights, 1 is sun/moon only. Works around shader compiler bugs on certain platforms.)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>3</integer>
- </map>
- <key>RenderShaderLODThreshold</key>
- <map>
- <key>Comment</key>
- <string>Fraction of draw distance defining the switch to a different shader LOD</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>1.0</real>
- </map>
- <key>RenderShaderParticleThreshold</key>
- <map>
- <key>Comment</key>
- <string>Fraction of draw distance to not use shader on particles</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.25</real>
- </map>
- <key>RenderSunDynamicRange</key>
- <map>
- <key>Comment</key>
- <string>Defines what percent brighter the sun is than local point lights (1.0 = 100% brighter. Value should not be less than 0. ).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>1.0</real>
- </map>
- <key>RenderTerrainDetail</key>
- <map>
- <key>Comment</key>
- <string>Detail applied to terrain texturing (0 = none, 1 or 2 = full)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>2</integer>
- </map>
- <key>RenderTerrainLODFactor</key>
- <map>
- <key>Comment</key>
- <string>Controls level of detail of terrain (multiplier for current screen area when calculated level of detail)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>1.0</real>
- </map>
- <key>RenderTerrainScale</key>
- <map>
- <key>Comment</key>
- <string>Terrain detail texture scale</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>12.0</real>
- </map>
- <key>RenderTextureMemoryMultiple</key>
- <map>
- <key>Comment</key>
- <string>Multiple of texture memory value to use (should fit: 0 < value <= 1.0)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>1.0</real>
- </map>
- <key>RenderTreeLODFactor</key>
- <map>
- <key>Comment</key>
- <string>Controls level of detail of vegetation (multiplier for current screen area when calculated level of detail)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.5</real>
- </map>
- <key>RenderUIInSnapshot</key>
- <map>
- <key>Comment</key>
- <string>Display user interface in snapshot</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderUnloadedAvatar</key>
- <map>
- <key>Comment</key>
- <string>Show avatars which haven't finished loading</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderUseFBO</key>
- <map>
- <key>Comment</key>
- <string>Whether we want to use GL_EXT_framebuffer_objects.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderUseFarClip</key>
- <map>
- <key>Comment</key>
- <string>If false, frustum culling will ignore far clip plane.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderUseImpostors</key>
- <map>
- <key>Comment</key>
- <string>Whether we want to use impostors for far away avatars.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderUseShaderLOD</key>
- <map>
- <key>Comment</key>
- <string>Whether we want to have different shaders for LOD</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderUseShaderNearParticles</key>
- <map>
- <key>Comment</key>
- <string>Whether we want to use shaders on near particles</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RenderVBOEnable</key>
- <map>
- <key>Comment</key>
- <string>Use GL Vertex Buffer Objects</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderVolumeLODFactor</key>
- <map>
- <key>Comment</key>
- <string>Controls level of detail of primitives (multiplier for current screen area when calculated level of detail)</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>1.0</real>
- </map>
- <key>RenderWater</key>
- <map>
- <key>Comment</key>
- <string>Display water</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>RenderWaterMipNormal</key>
+ <key>RenderDelayCreation</key>
+ <map>
+ <key>Comment</key>
+ <string>Throttle creation of drawables.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>RenderAnimateRes</key>
+ <map>
+ <key>Comment</key>
+ <string>Animate rezing prims.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+
+ <key>RenderAnimateTrees</key>
+ <map>
+ <key>Comment</key>
+ <string>Use GL matrix ops to animate tree branches.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>RenderDeferredAlphaSoften</key>
+ <map>
+ <key>Comment</key>
+ <string>Scalar for softening alpha surfaces (for soft particles).</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>0.75</real>
+ </map>
+ <key>RenderDeferredNoise</key>
+ <map>
+ <key>Comment</key>
+ <string>Noise scalar to hide banding in deferred render.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>4</real>
+ </map>
+ <key>RenderDeferred</key>
+ <map>
+ <key>Comment</key>
+ <string>Use deferred rendering pipeline.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>RenderDeferredSunShadow</key>
+ <map>
+ <key>Comment</key>
+ <string>Generate shadows from the sun.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>RenderDeferredSunWash</key>
+ <map>
+ <key>Comment</key>
+ <string>Amount local lights are washed out by sun.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>0.5</real>
+ </map>
+ <key>RenderShadowNoise</key>
+ <map>
+ <key>Comment</key>
+ <string>Magnitude of noise on shadow samples.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>-0.0001</real>
+ </map>
+ <key>RenderShadowBlurSize</key>
+ <map>
+ <key>Comment</key>
+ <string>Scale of shadow softening kernel.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>0.7</real>
+ </map>
+ <key>RenderShadowBlurSamples</key>
+ <map>
+ <key>Comment</key>
+ <string>Number of samples to take for each pass of shadow blur (value range 1-16). Actual number of samples is value * 2 - 1.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>U32</string>
+ <key>Value</key>
+ <real>5</real>
+ </map>
+ <key>RenderDynamicLOD</key>
<map>
<key>Comment</key>
- <string>Use mip maps for water normal map.</string>
+ <string>Dynamically adjust level of detail.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -7801,147 +5593,32 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>RenderWaterRefResolution</key>
- <map>
- <key>Comment</key>
- <string>Water planar reflection resolution.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>512</integer>
- </map>
- <key>RenderWaterReflections</key>
- <map>
- <key>Comment</key>
- <string>Reflect the environment in the water.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RotateRight</key>
+ <key>RenderFSAASamples</key>
<map>
<key>Comment</key>
- <string>Make the agent rotate to its right.</string>
+ <string>Number of samples to use for FSAA (0 = no AA).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>U32</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>RotationStep</key>
+ <key>RenderFarClip</key>
<map>
<key>Comment</key>
- <string>All rotations via rotation tool are constrained to multiples of this unit (degrees)</string>
+ <string>Distance of far clip plane from camera (meters)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>1.0</real>
- </map>
- <key>RunBtnState</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>RunMultipleThreads</key>
- <map>
- <key>Comment</key>
- <string>If TRUE keep background threads active during render</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>SafeMode</key>
- <map>
- <key>Comment</key>
- <string>Reset preferences, run in safe mode.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>SaveMinidump</key>
- <map>
- <key>Comment</key>
- <string>Save minidump for developer debugging on crash</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>ScaleShowAxes</key>
- <map>
- <key>Comment</key>
- <string>Show indicator of selected scale axis when scaling</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>ScaleStretchTextures</key>
- <map>
- <key>Comment</key>
- <string>Stretch textures along with object when scaling</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>ScaleUniform</key>
- <map>
- <key>Comment</key>
- <string>Scale selected objects evenly about center of selection</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>ScriptErrorColor</key>
- <map>
- <key>Comment</key>
- <string>Color of script error messages</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Color4</string>
- <key>Value</key>
- <array>
- <real>0.8235294117</real>
- <real>0.2745098039</real>
- <real>0.2745098039</real>
- <real>1.0</real>
- </array>
+ <real>256.0</real>
</map>
- <key>ScriptErrorsAsChat</key>
+ <key>RenderFastAlpha</key>
<map>
<key>Comment</key>
- <string>Display script errors and warning in chat history</string>
+ <string>Use lossy alpha rendering optimization (opaque/nonexistent small alpha faces).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -7949,10 +5626,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ScriptHelpFollowsCursor</key>
+ <key>RenderFastUI</key>
<map>
<key>Comment</key>
- <string>Scripting help window updates contents based on script editor contents under text cursor</string>
+ <string>[NOT USED]</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -7960,159 +5637,153 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>SearchURLDefault</key>
+ <key>RenderFlexTimeFactor</key>
<map>
<key>Comment</key>
- <string>URL to load for empty searches</string>
+ <string>Controls level of detail of flexible objects (multiplier for amount of time spent processing flex objects)</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>http://search.secondlife.com/client_search.php?</string>
+ <real>1.0</real>
</map>
- <key>SearchURLQuery</key>
+ <key>RenderFogRatio</key>
<map>
<key>Comment</key>
- <string>URL to use for searches</string>
+ <string>Distance from camera where fog reaches maximum density (fraction or multiple of far clip distance)</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>http://search.secondlife.com/client_search.php?q=[QUERY]&s=[COLLECTION]&</string>
+ <real>4.0</real>
</map>
- <key>SearchURLSuffix2</key>
+ <key>RenderGamma</key>
<map>
<key>Comment</key>
- <string>Parameters added to end of search queries</string>
+ <string>Sets gamma exponent for renderer</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>lang=[LANG]&mat=[MATURITY]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]</string>
+ <real>0.0</real>
</map>
- <key>SelectMovableOnly</key>
+ <key>RenderGammaFull</key>
<map>
<key>Comment</key>
- <string>Select only objects you can move</string>
+ <string>Use fully controllable gamma correction, instead of faster, hard-coded gamma correction of 2.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <real>1.0</real>
</map>
- <key>SelectOwnedOnly</key>
+ <key>RenderGlow</key>
<map>
<key>Comment</key>
- <string>Select only objects you own</string>
+ <string>Render bloom post effect.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>SelectionHighlightAlpha</key>
+ <key>RenderGlowIterations</key>
<map>
<key>Comment</key>
- <string>Opacity of selection highlight (0.0 = completely transparent, 1.0 = completely opaque)</string>
+ <string>Number of times to iterate the glow (higher = wider and smoother but slower)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>0.40000000596</real>
+ <integer>2</integer>
</map>
- <key>SelectionHighlightAlphaTest</key>
+ <key>RenderGlowMaxExtractAlpha</key>
<map>
<key>Comment</key>
- <string>Alpha value below which pixels are displayed on selection highlight line (0.0 = show all pixels, 1.0 = show now pixels)</string>
+ <string>Max glow alpha value for brightness extraction to auto-glow.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.1</real>
+ <real>0.065</real>
</map>
- <key>SelectionHighlightThickness</key>
+ <key>RenderGlowMinLuminance</key>
<map>
<key>Comment</key>
- <string>Thickness of selection highlight line (fraction of view distance)</string>
+ <string>Min luminance intensity necessary to consider an object bright enough to automatically glow.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.00999999977648</real>
+ <real>2.5</real>
</map>
- <key>SelectionHighlightUAnim</key>
+ <key>RenderGlowResolutionPow</key>
<map>
<key>Comment</key>
- <string>Rate at which texture animates along U direction in selection highlight line (fraction of texture per second)</string>
+ <string>Glow map resolution power of two.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>0.0</real>
+ <integer>9</integer>
</map>
- <key>SelectionHighlightUScale</key>
+ <key>RenderGlowStrength</key>
<map>
<key>Comment</key>
- <string>Scale of texture display on selection highlight line (fraction of texture size)</string>
+ <string>Additive strength of glow.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.1</real>
+ <real>0.35</real>
</map>
- <key>SelectionHighlightVAnim</key>
+ <key>RenderGlowWarmthAmount</key>
<map>
<key>Comment</key>
- <string>Rate at which texture animates along V direction in selection highlight line (fraction of texture per second)</string>
+ <string>Amount of warmth extraction to use (versus luminance extraction). 0 = lum, 1.0 = warmth</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.5</real>
+ <real>0.0</real>
</map>
- <key>SelectionHighlightVScale</key>
+ <key>RenderGlowWidth</key>
<map>
<key>Comment</key>
- <string>Scale of texture display on selection highlight line (fraction of texture size)</string>
+ <string>Glow sample size (higher = wider and softer but eventually more pixelated)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>1.0</real>
+ <real>1.3</real>
</map>
- <key>ServerChoice</key>
+ <key>RenderGround</key>
<map>
<key>Comment</key>
- <string>[DO NOT MODIFY] Controls which grid you connect to</string>
+ <string>Determines whether we can render the ground pool or not</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>ShareWithGroup</key>
+ <key>RenderHUDInSnapshot</key>
<map>
<key>Comment</key>
- <string>Newly created objects are shared with the currently active group</string>
+ <string>Display HUD attachments in snapshot</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8120,21 +5791,21 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowActiveSpeakers</key>
+ <key>RenderHiddenSelections</key>
<map>
<key>Comment</key>
- <string>Display active speakers list on login</string>
+ <string>Show selection lines on objects that are behind other objects</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>ShowAllObjectHoverTip</key>
+ <key>RenderHideGroupTitle</key>
<map>
<key>Comment</key>
- <string>Show descriptive tooltip when mouse hovers over non-interactive and interactive objects.</string>
+ <string>Don't show my group title in my name label</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8142,10 +5813,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowAxes</key>
+ <key>RenderHideGroupTitleAll</key>
<map>
<key>Comment</key>
- <string>Render coordinate frame at your position</string>
+ <string>Show group titles in name labels</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8153,87 +5824,98 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowBanLines</key>
+ <key>RenderInitError</key>
<map>
<key>Comment</key>
- <string>Show in-world ban/access borders</string>
+ <string>Error occured while initializing GL</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>ShowCameraControls</key>
+ <key>RenderLightRadius</key>
<map>
<key>Comment</key>
- <string>Display camera controls on login</string>
+ <string>Render the radius of selected lights</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>ShowChatHistory</key>
+ <key>RenderLightingDetail</key>
<map>
<key>Comment</key>
- <string />
+ <string>Amount of detail for lighting objects/avatars/terrain (0=sun/moon only, 1=enable local lights)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>ShowCommunicate</key>
+ <key>RenderMaxPartCount</key>
<map>
<key>Comment</key>
- <string />
+ <string>Maximum number of particles to display on screen</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>4096</integer>
</map>
- <key>ShowConsoleWindow</key>
+ <key>RenderMaxNodeSize</key>
+ <map>
+ <key>Comment</key>
+ <string>Maximum size of a single node's vertex data (in KB).</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
+ <key>Value</key>
+ <integer>4096</integer>
+ </map>
+ <key>RenderMaxVBOSize</key>
<map>
<key>Comment</key>
- <string>Show log in separate OS window</string>
+ <string>Maximum size of a vertex buffer (in KB).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>512</integer>
</map>
- <key>ShowCrosshairs</key>
+ <key>RenderName</key>
<map>
<key>Comment</key>
- <string>Display crosshairs when in mouselook mode</string>
+ <string>Controls display of names above avatars (0 = never, 1 = fade, 2 = always)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>2</integer>
</map>
- <key>ShowDebugConsole</key>
+ <key>RenderNameFadeDuration</key>
<map>
<key>Comment</key>
- <string>Show log in SL window</string>
+ <string>Time interval over which to fade avatar names (seconds)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>1.0</real>
</map>
- <key>ShowDebugStats</key>
+ <key>RenderNameHideSelf</key>
<map>
<key>Comment</key>
- <string>Show performance stats display</string>
+ <string>Don't display own name above avatar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8241,321 +5923,285 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowDirectory</key>
+ <key>RenderNameShowTime</key>
<map>
<key>Comment</key>
- <string />
+ <string>Fade avatar names after specified time (seconds)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>10.0</real>
</map>
- <key>ShowEmptyFoldersWhenSearching</key>
+ <key>RenderObjectBump</key>
<map>
<key>Comment</key>
- <string>Shows folders that do not have any visible contents when applying a filter to inventory</string>
+ <string>Show bumpmapping on primitives</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>ShowHoverTips</key>
+ <key>RenderQualityPerformance</key>
<map>
<key>Comment</key>
- <string>Show descriptive tooltip when mouse hovers over items in world</string>
+ <string>Which graphics settings you've chosen</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>U32</string>
<key>Value</key>
<integer>1</integer>
</map>
- <key>ShowInventory</key>
+ <key>RenderReflectionDetail</key>
<map>
<key>Comment</key>
- <string>Open inventory window on login</string>
+ <string>Detail of reflection render pass.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>2</integer>
</map>
- <key>ShowLandHoverTip</key>
+ <key>RenderReflectionRes</key>
<map>
<key>Comment</key>
- <string>Show descriptive tooltip when mouse hovers over land</string>
+ <string>Reflection map resolution.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>64</integer>
</map>
- <key>ShowLeaders</key>
+ <key>RenderResolutionDivisor</key>
<map>
<key>Comment</key>
- <string />
+ <string>Divisor for rendering 3D scene at reduced resolution.</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>U32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>ShowPGSearchAll</key>
+ <key>RenderShaderLightingMaxLevel</key>
<map>
<key>Comment</key>
- <string>Display results of search All that are flagged as PG</string>
+ <string>Max lighting level to use in the shader (class 3 is default, 2 is less lights, 1 is sun/moon only. Works around shader compiler bugs on certain platforms.)</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>3</integer>
</map>
- <key>ShowMatureSearchAll</key>
+ <key>RenderShaderLODThreshold</key>
<map>
<key>Comment</key>
- <string>Display results of search All that are flagged as mature</string>
+ <string>Fraction of draw distance defining the switch to a different shader LOD</string>
<key>Persist</key>
- <integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>1.0</real>
</map>
- <key>ShowAdultSearchAll</key>
+ <key>RenderShaderParticleThreshold</key>
<map>
<key>Comment</key>
- <string>Display results of search All that are flagged as adult</string>
+ <string>Fraction of draw distance to not use shader on particles</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>0.25</real>
</map>
- <key>ShowPGGroups</key>
+ <key>RenderSunDynamicRange</key>
<map>
<key>Comment</key>
- <string>Display results of find groups that are flagged as PG</string>
+ <string>Defines what percent brighter the sun is than local point lights (1.0 = 100% brighter. Value should not be less than 0. ).</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>1.0</real>
</map>
- <key>ShowMatureGroups</key>
+ <key>RenderTerrainDetail</key>
<map>
<key>Comment</key>
- <string>Display results of find groups that are flagged as mature</string>
+ <string>Detail applied to terrain texturing (0 = none, 1 or 2 = full)</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>2</integer>
</map>
- <key>ShowAdultGroups</key>
+ <key>RenderTerrainLODFactor</key>
<map>
<key>Comment</key>
- <string>Display results of find groups that are flagged as adult</string>
+ <string>Controls level of detail of terrain (multiplier for current screen area when calculated level of detail)</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>1.0</real>
</map>
- <key>ShowPGClassifieds</key>
+ <key>RenderTerrainScale</key>
<map>
<key>Comment</key>
- <string>Display results of find classifieds that are flagged as PG</string>
+ <string>Terrain detail texture scale</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>1</integer>
+ <real>12.0</real>
</map>
- <key>ShowMatureClassifieds</key>
+ <key>RenderTextureMemoryMultiple</key>
<map>
<key>Comment</key>
- <string>Display results of find classifieds that are flagged as mature</string>
+ <string>Multiple of texture memory value to use (should fit: 0 < value <= 1.0)</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>1.0</real>
</map>
- <key>ShowAdultClassifieds</key>
+ <key>RenderTreeLODFactor</key>
<map>
<key>Comment</key>
- <string>Display results of find classifieds that are flagged as adult</string>
+ <string>Controls level of detail of vegetation (multiplier for current screen area when calculated level of detail)</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>0.5</real>
</map>
- <key>ShowPGEvents</key>
+ <key>RenderUIInSnapshot</key>
<map>
<key>Comment</key>
- <string>Display results of find events that are flagged as PG</string>
+ <string>Display user interface in snapshot</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>ShowMatureEvents</key>
+ <key>RenderUnloadedAvatar</key>
<map>
<key>Comment</key>
- <string>Display results of find events that are flagged as mature</string>
+ <string>Show avatars which haven't finished loading</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowAdultEvents</key>
+ <key>RenderUseFBO</key>
<map>
<key>Comment</key>
- <string>Display results of find events that are flagged as adult</string>
+ <string>Whether we want to use GL_EXT_framebuffer_objects.</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowPGLand</key>
+ <key>RenderUseFarClip</key>
<map>
<key>Comment</key>
- <string>Display results of find land sales that are flagged as PG</string>
+ <string>If false, frustum culling will ignore far clip plane.</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
- <key>ShowMatureLand</key>
+ <key>RenderUseImpostors</key>
<map>
<key>Comment</key>
- <string>Display results of find land sales that are flagged as mature</string>
+ <string>Whether we want to use impostors for far away avatars.</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>ShowAdultLand</key>
+ <key>RenderUseShaderLOD</key>
<map>
<key>Comment</key>
- <string>Display results of find land sales that are flagged as adult</string>
+ <string>Whether we want to have different shaders for LOD</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>ShowPGSims</key>
+ <key>RenderUseShaderNearParticles</key>
<map>
<key>Comment</key>
- <string>Display results of find places or find popular that are in PG sims</string>
+ <string>Whether we want to use shaders on near particles</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>ShowMatureSims</key>
+ <key>RenderVBOEnable</key>
<map>
<key>Comment</key>
- <string>Display results of find places or find popular that are in mature sims</string>
+ <string>Use GL Vertex Buffer Objects</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>ShowAdultSims</key>
+ <key>RenderVolumeLODFactor</key>
<map>
<key>Comment</key>
- <string>Display results of find places or find popular that are in adult sims</string>
+ <string>Controls level of detail of primitives (multiplier for current screen area when calculated level of detail)</string>
<key>Persist</key>
<integer>1</integer>
- <key>HideFromEditor</key>
- <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>1.0</real>
</map>
- <key>ShowMiniMap</key>
+ <key>RenderWater</key>
<map>
<key>Comment</key>
- <string>Display mini map on login</string>
+ <string>Display water</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>ShowMovementControls</key>
+ <key>RenderWaterMipNormal</key>
<map>
<key>Comment</key>
- <string>Display movement controls on login</string>
+ <string>Use mip maps for water normal map.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8563,62 +6209,51 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>ShowNearClip</key>
+ <key>RenderWaterRefResolution</key>
<map>
<key>Comment</key>
- <string />
+ <string>Water planar reflection resolution.</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>512</integer>
</map>
- <key>ShowNewInventory</key>
+ <key>RenderWaterReflections</key>
<map>
<key>Comment</key>
- <string>Automatically views new notecards/textures/landmarks</string>
+ <string>Reflect the environment in the water.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>ShowInInventory</key>
- <map>
- <key>Comment</key>
- <string>Automatically opens inventory to show accepted objects</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>ShowObjectUpdates</key>
+ <key>RotateRight</key>
<map>
<key>Comment</key>
- <string>Show when update messages are received for individual objects</string>
+ <string>Make the agent rotate to its right.</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowOverlayTitle</key>
+ <key>RotationStep</key>
<map>
<key>Comment</key>
- <string>Prints watermark text message on screen</string>
+ <string>All rotations via rotation tool are constrained to multiples of this unit (degrees)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>1.0</real>
</map>
- <key>ShowParcelOwners</key>
+ <key>RunBtnState</key>
<map>
<key>Comment</key>
<string />
@@ -8629,21 +6264,21 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowPermissions</key>
+ <key>RunMultipleThreads</key>
<map>
<key>Comment</key>
- <string />
+ <string>If TRUE keep background threads active during render</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowPropertyLines</key>
+ <key>SafeMode</key>
<map>
<key>Comment</key>
- <string>Show line overlay demarking property boundaries</string>
+ <string>Reset preferences, run in safe mode.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8651,10 +6286,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowSearchBar</key>
+ <key>SaveMinidump</key>
<map>
<key>Comment</key>
- <string>Show the Search Bar in the Status Overlay</string>
+ <string>Save minidump for developer debugging on crash</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8662,32 +6297,32 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>ShowSelectionBeam</key>
+ <key>ScaleShowAxes</key>
<map>
<key>Comment</key>
- <string>Show selection particle beam when selecting or interacting with objects.</string>
+ <string>Show indicator of selected scale axis when scaling</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>ShowStartLocation</key>
+ <key>ScaleStretchTextures</key>
<map>
<key>Comment</key>
- <string>Display starting location menu on login screen</string>
+ <string>Stretch textures along with object when scaling</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>ShowTangentBasis</key>
+ <key>ScaleUniform</key>
<map>
<key>Comment</key>
- <string>Render normal and binormal (debugging bump mapping)</string>
+ <string>Scale selected objects evenly about center of selection</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8695,65 +6330,71 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowToolBar</key>
+ <key>ScriptErrorsAsChat</key>
<map>
<key>Comment</key>
- <string>Show toolbar at bottom of screen</string>
+ <string>Display script errors and warning in chat history</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>ShowTools</key>
+ <key>ScriptHelpFollowsCursor</key>
<map>
<key>Comment</key>
- <string />
+ <string>Scripting help window updates contents based on script editor contents under text cursor</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowTutorial</key>
- <map>
- <key>Comment</key>
- <string>Show tutorial window on login</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>ShowVoiceChannelPopup</key>
+ <key>SearchURLDefault</key>
+ <map>
+ <key>Comment</key>
+ <string>URL to load for empty searches</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>String</string>
+ <key>Value</key>
+ <string>http://search.secondlife.com/client_search.php?</string>
+ </map>
+ <key>SearchURLQuery</key>
<map>
<key>Comment</key>
- <string>Controls visibility of the current voice channel popup above the voice tab</string>
+ <string>URL to use for searches</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>0</integer>
+ <string>http://search.secondlife.com/client_search.php?q=[QUERY]&s=[COLLECTION]&</string>
</map>
- <key>ShowVolumeSettingsPopup</key>
+ <key>SearchURLSuffix2</key>
<map>
<key>Comment</key>
- <string>Show individual volume slider for voice, sound effects, etc</string>
+ <string>Parameters added to end of search queries</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>0</integer>
+ <string>lang=[LANG]&mat=[MATURITY]&t=[TEEN]&region=[REGION]&x=[X]&y=[Y]&z=[Z]&session=[SESSION]</string>
</map>
- <key>ShowWorldMap</key>
+ <key>SelectMovableOnly</key>
<map>
<key>Comment</key>
- <string>Display world map on login</string>
+ <string>Select only objects you can move</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8761,10 +6402,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>ShowXUINames</key>
+ <key>SelectOwnedOnly</key>
<map>
<key>Comment</key>
- <string>Display XUI Names as Tooltips</string>
+ <string>Select only objects you own</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8772,253 +6413,230 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>SitBtnState</key>
+ <key>SelectionHighlightAlpha</key>
<map>
<key>Comment</key>
- <string />
+ <string>Opacity of selection highlight (0.0 = completely transparent, 1.0 = completely opaque)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>0.40000000596</real>
</map>
- <key>SkinCurrent</key>
+ <key>SelectionHighlightAlphaTest</key>
<map>
<key>Comment</key>
- <string>The currently selected skin.</string>
+ <string>Alpha value below which pixels are displayed on selection highlight line (0.0 = show all pixels, 1.0 = show now pixels)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>default</string>
+ <real>0.1</real>
</map>
- <key>SkyAmbientScale</key>
+ <key>SelectionHighlightThickness</key>
<map>
<key>Comment</key>
- <string>Controls strength of ambient, or non-directional light from the sun and moon (fraction or multiple of default ambient level)</string>
+ <string>Thickness of selection highlight line (fraction of view distance)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
- <real>0.300000011921</real>
+ <real>0.00999999977648</real>
</map>
- <key>SkyEditPresets</key>
+ <key>SelectionHighlightUAnim</key>
<map>
<key>Comment</key>
- <string>Whether to be able to edit the sky defaults or not</string>
+ <string>Rate at which texture animates along U direction in selection highlight line (fraction of texture per second)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>0.0</real>
</map>
- <key>SkyNightColorShift</key>
+ <key>SelectionHighlightUScale</key>
<map>
<key>Comment</key>
- <string>Controls moonlight color (base color applied to moon as light source)</string>
+ <string>Scale of texture display on selection highlight line (fraction of texture size)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color3</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <real>0.699999988079</real>
- <real>0.699999988079</real>
- <real>1.0</real>
- </array>
+ <real>0.1</real>
</map>
- <key>SkyOverrideSimSunPosition</key>
+ <key>SelectionHighlightVAnim</key>
<map>
<key>Comment</key>
- <string />
+ <string>Rate at which texture animates along V direction in selection highlight line (fraction of texture per second)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>F32</string>
<key>Value</key>
- <integer>0</integer>
+ <real>0.5</real>
</map>
- <key>SkySunDefaultPosition</key>
+ <key>SelectionHighlightVScale</key>
<map>
<key>Comment</key>
- <string>Default position of sun in sky (direction in world coordinates)</string>
+ <string>Scale of texture display on selection highlight line (fraction of texture size)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Vector3</string>
+ <string>F32</string>
<key>Value</key>
- <array>
- <real>1.0</real>
- <real>0.0</real>
- <real>0.1</real>
- </array>
+ <real>1.0</real>
</map>
- <key>SkyUseClassicClouds</key>
+ <key>ServerChoice</key>
<map>
<key>Comment</key>
- <string>Whether to use the old Second Life particle clouds or not</string>
+ <string>[DO NOT MODIFY] Controls which grid you connect to</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>SlideLeftBtnRect</key>
+ <key>ShareWithGroup</key>
<map>
<key>Comment</key>
- <string />
+ <string>Newly created objects are shared with the currently active group</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>20</integer>
- <integer>54</integer>
- <integer>45</integer>
- <integer>29</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>SlideRightBtnRect</key>
+ <key>ShowActiveSpeakers</key>
<map>
<key>Comment</key>
- <string />
+ <string>Display active speakers list on login</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>66</integer>
- <integer>54</integer>
- <integer>91</integer>
- <integer>29</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>SmallAvatarNames</key>
+ <key>ShowAllObjectHoverTip</key>
<map>
<key>Comment</key>
- <string>Display avatar name text in smaller font</string>
+ <string>Show descriptive tooltip when mouse hovers over non-interactive and interactive objects.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>SnapEnabled</key>
+ <key>ShowAxes</key>
<map>
<key>Comment</key>
- <string>Enable snapping to grid</string>
+ <string>Render coordinate frame at your position</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>SnapMargin</key>
+ <key>ShowBanLines</key>
<map>
<key>Comment</key>
- <string>Controls maximum distance between windows before they auto-snap together (pixels)</string>
+ <string>Show in-world ban/access borders</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>10</integer>
+ <integer>1</integer>
</map>
- <key>SnapToMouseCursor</key>
+ <key>ShowCameraControls</key>
<map>
<key>Comment</key>
- <string>When snapping to grid, center object on nearest grid point to mouse cursor</string>
+ <string>Display camera controls on login</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>SnapshotFormat</key>
+ <key>ShowConsoleWindow</key>
<map>
<key>Comment</key>
- <string>Save snapshots in this format (0 = PNG, 1 = JPEG, 2 = BMP)</string>
+ <string>Show log in separate OS window</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
<integer>0</integer>
- </map>
- <key>SnapshotLocalLastResolution</key>
+ </map>
+ <key>ShowCrosshairs</key>
<map>
<key>Comment</key>
- <string>Take next local snapshot at this resolution</string>
+ <string>Display crosshairs when in mouselook mode</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>SnapshotPostcardLastResolution</key>
+ <key>ShowDebugConsole</key>
<map>
<key>Comment</key>
- <string>Take next postcard snapshot at this resolution</string>
+ <string>Show log in SL window</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>SnapshotQuality</key>
+ <key>ShowDirectory</key>
<map>
<key>Comment</key>
- <string>Quality setting of postcard JPEGs (0 = worst, 100 = best)</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>75</integer>
+ <integer>0</integer>
</map>
- <key>SnapshotTextureLastResolution</key>
+ <key>ShowEmptyFoldersWhenSearching</key>
<map>
<key>Comment</key>
- <string>Take next texture snapshot at this resolution</string>
+ <string>Shows folders that do not have any visible contents when applying a filter to inventory</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>SpeakingColor</key>
+ <key>ShowHoverTips</key>
<map>
<key>Comment</key>
- <string>Color of various indicators when resident is speaking on a voice channel.</string>
+ <string>Show descriptive tooltip when mouse hovers over items in world</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.0</real>
- <real>1.0</real>
- <real>0.0</real>
- <real>1.0</real>
- </array>
+ <integer>1</integer>
</map>
- <key>SpeedTest</key>
+ <key>ShowLandHoverTip</key>
<map>
<key>Comment</key>
- <string>Performance testing mode, no network</string>
+ <string>Show descriptive tooltip when mouse hovers over land</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -9026,370 +6644,387 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>StatsAutoRun</key>
+ <key>ShowLeaders</key>
<map>
<key>Comment</key>
- <string>Play back autopilot</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>StatsFile</key>
+ <key>ShowPGSearchAll</key>
<map>
<key>Comment</key>
- <string>Filename for stats logging output</string>
+ <string>Display results of search All that are flagged as PG</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>fs.txt</string>
+ <integer>1</integer>
</map>
- <key>StatsNumRuns</key>
+ <key>ShowMatureSearchAll</key>
<map>
<key>Comment</key>
- <string>Loop autopilot playback this number of times</string>
+ <string>Display results of search All that are flagged as mature</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>-1</integer>
+ <integer>0</integer>
</map>
- <key>StatsPilotFile</key>
+ <key>ShowAdultSearchAll</key>
<map>
<key>Comment</key>
- <string>Filename for stats logging autopilot path</string>
+ <string>Display results of search All that are flagged as adult</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>pilot.txt</string>
+ <integer>0</integer>
</map>
- <key>StatsQuitAfterRuns</key>
+ <key>ShowPGGroups</key>
<map>
<key>Comment</key>
- <string>Quit application after this number of autopilot playback runs</string>
+ <string>Display results of find groups that are flagged as PG</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
- <key>StatsSessionTrackFrameStats</key>
+ <key>ShowMatureGroups</key>
<map>
<key>Comment</key>
- <string>Track rendering and network statistics</string>
+ <string>Display results of find groups that are flagged as mature</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>StatsSummaryFile</key>
+ <key>ShowAdultGroups</key>
<map>
<key>Comment</key>
- <string>Filename for stats logging summary</string>
+ <string>Display results of find groups that are flagged as adult</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>fss.txt</string>
+ <integer>0</integer>
</map>
- <key>StatusBarHeight</key>
+ <key>ShowPGClassifieds</key>
<map>
<key>Comment</key>
- <string>Height of menu/status bar at top of screen (pixels)</string>
+ <string>Display results of find classifieds that are flagged as PG</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>26</integer>
+ <integer>1</integer>
</map>
- <key>StatusBarPad</key>
+ <key>ShowMatureClassifieds</key>
<map>
<key>Comment</key>
- <string>Spacing between popup buttons at bottom of screen (Stand up, Release Controls)</string>
+ <string>Display results of find classifieds that are flagged as mature</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>10</integer>
+ <integer>0</integer>
</map>
- <key>SystemChatColor</key>
+ <key>ShowAdultClassifieds</key>
<map>
<key>Comment</key>
- <string>Color of chat messages from SL System</string>
+ <string>Display results of find classifieds that are flagged as adult</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>Color4</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <real>0.800000011921</real>
- <real>1.0</real>
- <real>1.0</real>
- <real>1.0</real>
- </array>
+ <integer>0</integer>
</map>
- <key>SystemLanguage</key>
+ <key>ShowPGEvents</key>
<map>
<key>Comment</key>
- <string>Language indicated by system settings (for UI)</string>
+ <string>Display results of find events that are flagged as PG</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>en-us</string>
+ <integer>1</integer>
</map>
- <key>TabToTextFieldsOnly</key>
+ <key>ShowMatureEvents</key>
<map>
<key>Comment</key>
- <string>TAB key takes you to next text entry field, instead of next widget</string>
+ <string>Display results of find events that are flagged as mature</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>TerrainColorHeightRange</key>
+ <key>ShowAdultEvents</key>
<map>
<key>Comment</key>
- <string>Altitude range over which a given terrain texture has effect (meters)</string>
+ <string>Display results of find events that are flagged as adult</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>60.0</real>
+ <integer>0</integer>
</map>
- <key>TerrainColorStartHeight</key>
+ <key>ShowPGLand</key>
<map>
<key>Comment</key>
- <string>Starting altitude for terrain texturing (meters)</string>
+ <string>Display results of find land sales that are flagged as PG</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>20.0</real>
+ <integer>1</integer>
</map>
- <key>TextureMemory</key>
+ <key>ShowMatureLand</key>
<map>
<key>Comment</key>
- <string>Amount of memory to use for textures in MB (0 = autodetect)</string>
+ <string>Display results of find land sales that are flagged as mature</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>S32</string>
+ <string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>TexturePickerRect</key>
+ <key>ShowAdultLand</key>
<map>
<key>Comment</key>
- <string>Rectangle for texture picker</string>
+ <string>Display results of find land sales that are flagged as adult</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>290</integer>
- <integer>350</integer>
- <integer>0</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>TexturePickerShowFolders</key>
+ <key>ShowPGSims</key>
<map>
<key>Comment</key>
- <string>Show folders with no texures in texture picker</string>
+ <string>Display results of find places or find popular that are in PG sims</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
- <key>TexturePickerSortOrder</key>
+ <key>ShowMatureSims</key>
<map>
<key>Comment</key>
- <string>Specifies sort key for textures in texture picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
+ <string>Display results of find places or find popular that are in mature sims</string>
<key>Persist</key>
<integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
- <string>U32</string>
+ <string>Boolean</string>
<key>Value</key>
- <integer>2</integer>
+ <integer>0</integer>
</map>
- <key>ThirdPersonBtnState</key>
+ <key>ShowAdultSims</key>
<map>
<key>Comment</key>
- <string />
+ <string>Display results of find places or find popular that are in adult sims</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
+ <key>HideFromEditor</key>
+ <integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>ThrottleBandwidthKBPS</key>
+ <key>ShowMovementControls</key>
<map>
<key>Comment</key>
- <string>Maximum allowable downstream bandwidth (kilo bits per second)</string>
+ <string>Display movement controls on login</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>500.0</real>
+ <integer>1</integer>
</map>
- <key>ToolHelpRect</key>
+ <key>ShowNearClip</key>
<map>
<key>Comment</key>
<string />
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>8</integer>
- <integer>178</integer>
- <integer>75</integer>
- <integer>162</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>ToolTipDelay</key>
+ <key>ShowNewInventory</key>
<map>
<key>Comment</key>
- <string>Seconds before displaying tooltip when mouse stops over UI element</string>
+ <string>Automatically views new notecards/textures/landmarks</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>0.699999988079</real>
+ <integer>1</integer>
</map>
- <key>ToolboxAutoMove</key>
+ <key>ShowInInventory</key>
+ <map>
+ <key>Comment</key>
+ <string>Automatically opens inventory to show accepted objects</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>1</integer>
+ </map>
+ <key>ShowObjectUpdates</key>
<map>
<key>Comment</key>
- <string>[NOT USED]</string>
+ <string>Show when update messages are received for individual objects</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>ToolboxRect</key>
+ <key>ShowOverlayTitle</key>
<map>
<key>Comment</key>
- <string>Rectangle for tools window</string>
+ <string>Prints watermark text message on screen</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>0</integer>
- <integer>100</integer>
- <integer>100</integer>
- <integer>100</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>TrackFocusObject</key>
+ <key>ShowParcelOwners</key>
<map>
<key>Comment</key>
- <string>Camera tracks last object zoomed on</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>TurnLeftBtnRect</key>
+ <key>ShowPermissions</key>
<map>
<key>Comment</key>
<string />
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>20</integer>
- <integer>29</integer>
- <integer>45</integer>
- <integer>4</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>TurnRightBtnRect</key>
+ <key>ShowPropertyLines</key>
<map>
<key>Comment</key>
- <string />
+ <string>Show line overlay demarking property boundaries</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>Rect</string>
+ <string>Boolean</string>
<key>Value</key>
- <array>
- <integer>66</integer>
- <integer>29</integer>
- <integer>91</integer>
- <integer>4</integer>
- </array>
+ <integer>0</integer>
</map>
- <key>TutorialURL</key>
+ <key>ShowSearchBar</key>
<map>
<key>Comment</key>
- <string>URL for tutorial menu item, set automatically during login</string>
+ <string>Show the Search Bar in the Status Overlay</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string />
+ <integer>1</integer>
</map>
- <key>TypeAheadTimeout</key>
+ <key>ShowSelectionBeam</key>
<map>
<key>Comment</key>
- <string>Time delay before clearing type-ahead buffer in lists (seconds)</string>
+ <string>Show selection particle beam when selecting or interacting with objects.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>Boolean</string>
<key>Value</key>
- <real>1.5</real>
+ <integer>1</integer>
</map>
- <key>UIAutoScale</key>
+ <key>ShowStartLocation</key>
<map>
<key>Comment</key>
- <string>Keep UI scale consistent across different resolutions</string>
+ <string>Display starting location menu on login screen</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>UIFloaterTestBool</key>
+ <key>ShowTangentBasis</key>
<map>
<key>Comment</key>
- <string>Example saved setting for the test floater</string>
+ <string>Render normal and binormal (debugging bump mapping)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -9397,720 +7032,735 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>UIImgBtnCloseActiveUUID</key>
+ <key>ShowToolBar</key>
<map>
<key>Comment</key>
- <string />
+ <string>Show toolbar at bottom of screen</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>47a8c844-cd2a-4b1a-be01-df8b1612fe5d</string>
+ <integer>1</integer>
</map>
- <key>UIImgBtnCloseInactiveUUID</key>
+ <key>ShowTools</key>
<map>
<key>Comment</key>
<string />
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>779e4fa3-9b13-f74a-fba9-3886fe9c86ba</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnClosePressedUUID</key>
+ <key>ShowTutorial</key>
+ <map>
+ <key>Comment</key>
+ <string>Show tutorial window on login</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Boolean</string>
+ <key>Value</key>
+ <integer>0</integer>
+ </map>
+ <key>ShowVoiceChannelPopup</key>
<map>
<key>Comment</key>
- <string />
+ <string>Controls visibility of the current voice channel popup above the voice tab</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>e5821134-23c0-4bd0-af06-7fa95b9fb01a</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnForwardInUUID</key>
+ <key>ShowVolumeSettingsPopup</key>
<map>
<key>Comment</key>
- <string />
+ <string>Show individual volume slider for voice, sound effects, etc</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>54197a61-f5d1-4c29-95d2-c071d08849cb</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnForwardOutUUID</key>
+ <key>ShowXUINames</key>
<map>
<key>Comment</key>
- <string />
+ <string>Display XUI Names as Tooltips</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>a0eb4021-1b20-4a53-892d-8faa9265a6f5</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnJumpLeftInUUID</key>
+ <key>SitBtnState</key>
<map>
<key>Comment</key>
<string />
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnJumpLeftOutUUID</key>
+ <key>SkinCurrent</key>
<map>
<key>Comment</key>
- <string />
+ <string>The currently selected skin.</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>3c18c87e-5f50-14e2-e744-f44734aa365f</string>
+ <string>default</string>
</map>
- <key>UIImgBtnJumpRightInUUID</key>
+ <key>SkinningSettingsFile</key>
<map>
<key>Comment</key>
- <string />
+ <string>Client skin color setting file name (per install).</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>7dabc040-ec13-2309-ddf7-4f161f6de2f4</string>
+ <string />
</map>
- <key>UIImgBtnJumpRightOutUUID</key>
+ <key>SkyAmbientScale</key>
<map>
<key>Comment</key>
- <string />
+ <string>Controls strength of ambient, or non-directional light from the sun and moon (fraction or multiple of default ambient level)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>ff9a71eb-7414-4cf8-866e-a701deb7c3cf</string>
+ <real>0.300000011921</real>
</map>
- <key>UIImgBtnLeftInUUID</key>
+ <key>SkyEditPresets</key>
<map>
<key>Comment</key>
- <string />
+ <string>Whether to be able to edit the sky defaults or not</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>95463c78-aaa6-464d-892d-3a805b6bb7bf</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnLeftOutUUID</key>
+ <key>SkyOverrideSimSunPosition</key>
<map>
<key>Comment</key>
<string />
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>13a93910-6b44-45eb-ad3a-4d1324c59bac</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnMinimizeActiveUUID</key>
+ <key>SkySunDefaultPosition</key>
<map>
<key>Comment</key>
- <string />
+ <string>Default position of sun in sky (direction in world coordinates)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Vector3</string>
<key>Value</key>
- <string>34c9398d-bb78-4643-9633-46a2fa3e9637</string>
+ <array>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>0.1</real>
+ </array>
</map>
- <key>UIImgBtnMinimizeInactiveUUID</key>
+ <key>SkyUseClassicClouds</key>
<map>
<key>Comment</key>
- <string />
+ <string>Whether to use the old Second Life particle clouds or not</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>6e72abba-1378-437f-bf7a-f0c15f3e99a3</string>
+ <integer>1</integer>
</map>
- <key>UIImgBtnMinimizePressedUUID</key>
+ <key>SmallAvatarNames</key>
<map>
<key>Comment</key>
- <string />
+ <string>Display avatar name text in smaller font</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>39801651-26cb-4926-af57-7af9352c273c</string>
+ <integer>1</integer>
</map>
- <key>UIImgBtnMoveDownInUUID</key>
+ <key>SnapEnabled</key>
<map>
<key>Comment</key>
- <string />
+ <string>Enable snapping to grid</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>b92a70b9-c841-4c94-b4b3-cee9eb460d48</string>
+ <integer>1</integer>
</map>
- <key>UIImgBtnMoveDownOutUUID</key>
+ <key>SnapMargin</key>
<map>
<key>Comment</key>
- <string />
+ <string>Controls maximum distance between windows before they auto-snap together (pixels)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>b5abc9fa-9e62-4e03-bc33-82c4c1b6b689</string>
+ <integer>10</integer>
</map>
- <key>UIImgBtnMoveUpInUUID</key>
+ <key>SnapToMouseCursor</key>
<map>
<key>Comment</key>
- <string />
+ <string>When snapping to grid, center object on nearest grid point to mouse cursor</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>49b4b357-e430-4b56-b9e0-05b8759c3c82</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnMoveUpOutUUID</key>
+ <key>SnapshotFormat</key>
<map>
<key>Comment</key>
- <string />
+ <string>Save snapshots in this format (0 = PNG, 1 = JPEG, 2 = BMP)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>f887146d-829f-4e39-9211-cf872b78f97c</string>
- </map>
- <key>UIImgBtnPanDownInUUID</key>
+ <integer>0</integer>
+ </map>
+ <key>SnapshotLocalLastResolution</key>
<map>
<key>Comment</key>
- <string />
+ <string>Take next local snapshot at this resolution</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>e5821134-23c0-4bd0-af06-7fa95b9fb01a</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnPanDownOutUUID</key>
+ <key>SnapshotPostcardLastResolution</key>
<map>
<key>Comment</key>
- <string />
+ <string>Take next postcard snapshot at this resolution</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>47a8c844-cd2a-4b1a-be01-df8b1612fe5d</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnPanLeftInUUID</key>
+ <key>SnapshotQuality</key>
<map>
<key>Comment</key>
- <string />
+ <string>Quality setting of postcard JPEGs (0 = worst, 100 = best)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>e5821134-23c0-4bd0-af06-7fa95b9fb01a</string>
+ <integer>75</integer>
</map>
- <key>UIImgBtnPanLeftOutUUID</key>
+ <key>SnapshotTextureLastResolution</key>
<map>
<key>Comment</key>
- <string />
+ <string>Take next texture snapshot at this resolution</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>47a8c844-cd2a-4b1a-be01-df8b1612fe5d</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnPanRightInUUID</key>
+ <key>SpeedTest</key>
<map>
<key>Comment</key>
- <string />
+ <string>Performance testing mode, no network</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>e5821134-23c0-4bd0-af06-7fa95b9fb01a</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnPanRightOutUUID</key>
+ <key>StatsAutoRun</key>
<map>
<key>Comment</key>
- <string />
+ <string>Play back autopilot</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>47a8c844-cd2a-4b1a-be01-df8b1612fe5d</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnPanUpInUUID</key>
+ <key>StatsFile</key>
<map>
<key>Comment</key>
- <string />
+ <string>Filename for stats logging output</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>e5821134-23c0-4bd0-af06-7fa95b9fb01a</string>
+ <string>fs.txt</string>
</map>
- <key>UIImgBtnPanUpOutUUID</key>
+ <key>StatsNumRuns</key>
<map>
<key>Comment</key>
- <string />
+ <string>Loop autopilot playback this number of times</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>47a8c844-cd2a-4b1a-be01-df8b1612fe5d</string>
+ <integer>-1</integer>
</map>
- <key>UIImgBtnRestoreActiveUUID</key>
+ <key>StatsPilotFile</key>
<map>
<key>Comment</key>
- <string />
+ <string>Filename for stats logging autopilot path</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>111b39de-8928-4690-b7b2-e17d5c960277</string>
+ <string>pilot.txt</string>
</map>
- <key>UIImgBtnRestoreInactiveUUID</key>
+ <key>StatsQuitAfterRuns</key>
<map>
<key>Comment</key>
- <string />
+ <string>Quit application after this number of autopilot playback runs</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>0eafa471-70af-4882-b8c1-40a310929744</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnRestorePressedUUID</key>
+ <key>StatsSessionTrackFrameStats</key>
<map>
<key>Comment</key>
- <string />
+ <string>Track rendering and network statistics</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>90a0ed5c-2e7b-4845-9958-a64a1b30f312</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnRightInUUID</key>
+ <key>StatsSummaryFile</key>
<map>
<key>Comment</key>
- <string />
+ <string>Filename for stats logging summary</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>5e616d0d-4335-476f-9977-560bccd009da</string>
+ <string>fss.txt</string>
</map>
- <key>UIImgBtnRightOutUUID</key>
+ <key>StatusBarHeight</key>
<map>
<key>Comment</key>
- <string />
+ <string>Height of menu/status bar at top of screen (pixels)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>5a44fd04-f52b-4c30-8b00-4a31e27614bd</string>
+ <integer>26</integer>
</map>
- <key>UIImgBtnScrollDownInUUID</key>
+ <key>StatusBarPad</key>
<map>
<key>Comment</key>
- <string />
+ <string>Spacing between popup buttons at bottom of screen (Stand up, Release Controls)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>d2421bab-2eaf-4863-b8f6-5e4c52519247</string>
+ <integer>10</integer>
</map>
- <key>UIImgBtnScrollDownOutUUID</key>
+ <key>SystemLanguage</key>
<map>
<key>Comment</key>
- <string />
+ <string>Language indicated by system settings (for UI)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>b4ecdecf-5c8d-44e7-b882-17a77e88ed55</string>
+ <string>en-us</string>
</map>
- <key>UIImgBtnScrollLeftInUUID</key>
+ <key>TabToTextFieldsOnly</key>
<map>
<key>Comment</key>
- <string />
+ <string>TAB key takes you to next text entry field, instead of next widget</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>ea137a32-6718-4d05-9c22-7d570d27b2cd</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnScrollLeftOutUUID</key>
+ <key>TerrainColorHeightRange</key>
<map>
<key>Comment</key>
- <string />
+ <string>Altitude range over which a given terrain texture has effect (meters)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>43773e8d-49aa-48e0-80f3-a04715f4677a</string>
+ <real>60.0</real>
</map>
- <key>UIImgBtnScrollRightInUUID</key>
+ <key>TerrainColorStartHeight</key>
<map>
<key>Comment</key>
- <string />
+ <string>Starting altitude for terrain texturing (meters)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>b749de64-e903-4c3c-ac0b-25fb6fa39cb5</string>
+ <real>20.0</real>
</map>
- <key>UIImgBtnScrollRightOutUUID</key>
+ <key>TextureMemory</key>
<map>
<key>Comment</key>
- <string />
+ <string>Amount of memory to use for textures in MB (0 = autodetect)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>3d700d19-e708-465d-87f2-46c8c0ee7938</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnScrollUpInUUID</key>
+ <key>TexturePickerShowFolders</key>
<map>
<key>Comment</key>
- <string />
+ <string>Show folders with no texures in texture picker</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>a93abdf3-27b5-4e22-a8fa-c48216cd2e3a</string>
+ <integer>1</integer>
</map>
- <key>UIImgBtnScrollUpOutUUID</key>
+ <key>TexturePickerSortOrder</key>
<map>
<key>Comment</key>
- <string />
+ <string>Specifies sort key for textures in texture picker (+0 = name, +1 = date, +2 = folders always by name, +4 = system folders to top)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>U32</string>
<key>Value</key>
- <string>dad084d7-9a46-452a-b0ff-4b9f1cefdde9</string>
+ <integer>2</integer>
</map>
- <key>UIImgBtnSlideLeftInUUID</key>
+ <key>ThirdPersonBtnState</key>
<map>
<key>Comment</key>
<string />
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>724996f5-b956-46f6-9844-4fcfce1d5e83</string>
+ <integer>1</integer>
</map>
- <key>UIImgBtnSlideLeftOutUUID</key>
+ <key>ThrottleBandwidthKBPS</key>
<map>
<key>Comment</key>
- <string />
+ <string>Maximum allowable downstream bandwidth (kilo bits per second)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>82476321-0374-4c26-9567-521535ab4cd7</string>
+ <real>500.0</real>
</map>
- <key>UIImgBtnSlideRightInUUID</key>
+ <key>ToolTipDelay</key>
<map>
<key>Comment</key>
- <string />
+ <string>Seconds before displaying tooltip when mouse stops over UI element</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>7eeb57d2-3f37-454d-a729-8b217b8be443</string>
+ <real>0.699999988079</real>
</map>
- <key>UIImgBtnSlideRightOutUUID</key>
+ <key>ToolboxAutoMove</key>
<map>
<key>Comment</key>
- <string />
+ <string>[NOT USED]</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>1fbe4e60-0607-44d1-a50a-032eff56ae75</string>
+ <integer>0</integer>
</map>
- <key>UIImgBtnSpinDownInUUID</key>
+ <key>TrackFocusObject</key>
<map>
<key>Comment</key>
- <string />
+ <string>Camera tracks last object zoomed on</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>a985ac71-052f-48e6-9c33-d931c813ac92</string>
+ <integer>1</integer>
</map>
- <key>UIImgBtnSpinDownOutUUID</key>
+ <key>TutorialURL</key>
<map>
<key>Comment</key>
- <string />
+ <string>URL for tutorial menu item, set automatically during login</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>b6d240dd-5602-426f-b606-bbb49a30726d</string>
+ <string />
</map>
- <key>UIImgBtnSpinUpInUUID</key>
+ <key>TypeAheadTimeout</key>
<map>
<key>Comment</key>
- <string />
+ <string>Time delay before clearing type-ahead buffer in lists (seconds)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>c8450082-96a0-4319-8090-d3ff900b4954</string>
+ <real>1.5</real>
</map>
- <key>UIImgBtnSpinUpOutUUID</key>
+ <key>UIAutoScale</key>
<map>
<key>Comment</key>
- <string />
+ <string>Keep UI scale consistent across different resolutions</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>56576e6e-6710-4e66-89f9-471b59122794</string>
+ <integer>1</integer>
</map>
- <key>UIImgBtnTabBottomInUUID</key>
+ <key>UIAvatariconctrlSymbolHPad</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Avatar Icon Control Symbol Horizontal Pad</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>c001d8fd-a869-4b6f-86a1-fdcb106df9c7</string>
- </map>
- <key>UIImgBtnTabBottomOutUUID</key>
+ <real>2</real>
+ </map>
+ <key>UIAvatariconctrlSymbolVPad</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Avatar Icon Control Symbol Vertical Pad</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>bf0a8779-689b-48c3-bb9a-6af546366ef4</string>
- </map>
- <key>UIImgBtnTabBottomPartialInUUID</key>
+ <real>2</real>
+ </map>
+ <key>UIAvatariconctrlSymbolSize</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Avatar Icon Control Symbol Size</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>eb0b0904-8c91-4f24-b500-1180b91140de</string>
- </map>
- <key>UIImgBtnTabBottomPartialOutUUID</key>
+ <real>5</real>
+ </map>
+ <key>UIAvatariconctrlSymbolPosition</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Avatar Icon Control Symbol Position (TopLeft|TopRight|BottomLeft|BottomRight)</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>8dca716c-b29c-403a-9886-91c028357d6e</string>
+ <string>BottomRight</string>
</map>
- <key>UIImgBtnTabTopInUUID</key>
+ <key>UIButtonOrigHPad</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Button Original Horizontal Pad</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>16d032e8-817b-4368-8a4e-b7b947ae3889</string>
+ <real>6</real>
</map>
- <key>UIImgBtnTabTopOutUUID</key>
+ <key>UICheckboxctrlBtnSize</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Checkbox Control Button Size</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>1ed83f57-41cf-4052-a3b4-2e8bb78d8191</string>
+ <real>13</real>
</map>
- <key>UIImgBtnTabTopPartialInUUID</key>
+ <key>UICheckboxctrlHeight</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Checkbox Control Height</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>7c6c6c26-0e25-4438-89bd-30d8b8e9d704</string>
+ <real>16</real>
</map>
- <key>UIImgBtnTabTopPartialOutUUID</key>
+ <key>UICheckboxctrlHPad</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Checkbox Control Horizontal Pad</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>932ad585-0e45-4a57-aa23-4cf81beeb7b0</string>
+ <real>2</real>
</map>
- <key>UIImgBtnTearOffActiveUUID</key>
+ <key>UICheckboxctrlSpacing</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Checkbox Control Spacing</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>74e1a96f-4833-a24d-a1bb-1bce1468b0e7</string>
+ <real>5</real>
</map>
- <key>UIImgBtnTearOffInactiveUUID</key>
+ <key>UICheckboxctrlVPad</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Checkbox Control Vertical Pad</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>74e1a96f-4833-a24d-a1bb-1bce1468b0e7</string>
+ <real>2</real>
</map>
- <key>UIImgBtnTearOffPressedUUID</key>
+ <key>UICloseBoxFromTop</key>
<map>
<key>Comment</key>
- <string />
+ <string>Size of UI floater close box from top</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>d2524c13-4ba6-af7c-e305-8ac6cc18d86a</string>
+ <real>1</real>
</map>
- <key>UIImgCheckboxActiveSelectedUUID</key>
+ <key>UIExtraTriangleHeight</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI extra triangle height</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>cf4a2ed7-1533-4686-9dde-df9a37ddca55</string>
+ <real>-2</real>
</map>
- <key>UIImgCheckboxActiveUUID</key>
+ <key>UIExtraTriangleWidth</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI extra triangle width</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>05bb64ee-96fd-4243-b74e-f40a41bc53ba</string>
+ <real>2</real>
</map>
- <key>UIImgCheckboxInactiveSelectedUUID</key>
+ <key>UIFloaterCloseBoxSize</key>
<map>
<key>Comment</key>
- <string />
+ <string>Size of UI floater close box size</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>c817c642-9abd-4236-9287-ae0513fe7d2b</string>
+ <real>16</real>
</map>
- <key>UIImgCheckboxInactiveUUID</key>
+ <key>UIFloaterHeaderSize</key>
<map>
<key>Comment</key>
- <string />
+ <string>Size of UI floater header size</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>7d94cb59-32a2-49bf-a516-9e5a2045f9d9</string>
+ <real>18</real>
</map>
- <key>UIImgCreateSelectedUUID</key>
+ <key>UIFloaterHPad</key>
<map>
<key>Comment</key>
- <string />
+ <string>Size of UI floater horizontal pad</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>0098b015-3daf-4cfe-a72f-915369ea97c2</string>
+ <real>6</real>
</map>
- <key>UIImgCreateUUID</key>
+ <key>UIFloaterTestBool</key>
<map>
<key>Comment</key>
- <string />
+ <string>Example saved setting for the test floater</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b</string>
+ <integer>0</integer>
</map>
- <key>UIImgCrosshairsUUID</key>
+ <key>UIFloaterVPad</key>
<map>
<key>Comment</key>
- <string>Image to use for crosshair display (UUID texture reference)</string>
+ <string>Size of UI floater vertical pad</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>6e1a3980-bf2d-4274-8970-91e60d85fb52</string>
+ <real>6</real>
</map>
<key>UIImgDefaultEyesUUID</key>
<map>
@@ -10222,7 +7872,7 @@
<key>Value</key>
<string>5748decc-f629-461c-9a36-a35a221fe21f</string>
</map>
- <key>UIImgDirectionArrowUUID</key>
+ <key>UIImgWhiteUUID</key>
<map>
<key>Comment</key>
<string />
@@ -10231,216 +7881,238 @@
<key>Type</key>
<string>String</string>
<key>Value</key>
- <string>586383e8-4d9b-4fba-9196-2b5938e79c2c</string>
+ <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
</map>
- <key>UIImgFaceSelectedUUID</key>
+ <key>UILineEditorCursorThickness</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Line Editor Cursor Thickness</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>b4870163-6208-42a9-9801-93133bf9a6cd</string>
+ <integer>2</integer>
</map>
- <key>UIImgFaceUUID</key>
+ <key>UILineEditorHPad</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Line Editor Horizontal Pad</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>ce15fd63-b0b6-463c-a37d-ea6393208b3e</string>
+ <integer>2</integer>
</map>
- <key>UIImgFocusSelectedUUID</key>
+ <key>UILineEditorVPad</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Line Editor Vertical Pad</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>ab6a730e-ddfd-4982-9a32-c6de3de6d31d</string>
+ <integer>1</integer>
</map>
- <key>UIImgFocusUUID</key>
+ <key>UIMaxComboWidth</key>
<map>
<key>Comment</key>
- <string />
+ <string>Maximum width of combo box</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>57bc39d1-288c-4519-aea6-6d1786a5c274</string>
+ <real>500</real>
</map>
- <key>UIImgGrabSelectedUUID</key>
+ <key>UIMinimizedWidth</key>
<map>
<key>Comment</key>
- <string />
+ <string>Size of UI floater minimized width</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>c1e21504-f136-451d-b8e9-929037812f1d</string>
+ <real>160</real>
</map>
- <key>UIImgGrabUUID</key>
+ <key>UIMultiSliderctrlSpacing</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI multi slider ctrl spacing</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>c63f124c-6340-4fbf-b59e-0869a44adb64</string>
+ <real>4</real>
</map>
- <key>UIImgMoveSelectedUUID</key>
+ <key>UIMultiTrackHeight</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI multi track height</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>46f17c7b-8381-48c3-b628-6a406e060dd6</string>
+ <real>6</real>
</map>
- <key>UIImgMoveUUID</key>
+ <key>UIPreeditMarkerBrightness</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Preedit Marker Brightness</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>2fa5dc06-bcdd-4e09-a426-f9f262d4fa65</string>
+ <real>0.4</real>
</map>
- <key>UIImgRadioActiveSelectedUUID</key>
+ <key>UIPreeditMarkerGap</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Preedit Marker Gap</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>52f09e07-5816-4052-953c-94c6c10479b7</string>
+ <real>1</real>
</map>
- <key>UIImgRadioActiveUUID</key>
+ <key>UIPreeditMarkerPosition</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Preedit Marker Position</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>7a1ba9b8-1047-4d1e-9cfc-bc478c80b63f</string>
+ <real>1</real>
</map>
- <key>UIImgRadioInactiveSelectedUUID</key>
+ <key>UIPreeditMarkerThickness</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Preedit Marker Thickness</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>1975db39-aa29-4251-aea0-409ac09d414d</string>
+ <real>1</real>
</map>
- <key>UIImgRadioInactiveUUID</key>
+ <key>UIPreeditStandoutBrightness</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Preedit Standout Brightness</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>F32</string>
<key>Value</key>
- <string>90688481-67ff-4af0-be69-4aa084bcad1e</string>
+ <real>0.6</real>
</map>
- <key>UIImgResizeBottomRightUUID</key>
+ <key>UIPreeditStandoutGap</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Preedit Standout Gap</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>e3690e25-9690-4f6c-a745-e7dcd885285a</string>
+ <real>1</real>
</map>
- <key>UIImgRotateSelectedUUID</key>
+ <key>UIPreeditStandoutPosition</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Preedit Standout Position</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>cdfb7fde-0d13-418a-9d89-2bd91019fc95</string>
+ <real>2</real>
</map>
- <key>UIImgRotateUUID</key>
+ <key>UIPreeditStandoutThickness</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI Preedit Standout Thickness</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>c34b1eaa-aae3-4351-b082-e26c0b636779</string>
+ <real>2</real>
</map>
- <key>UIImgScaleSelectedUUID</key>
+ <key>UIResizeBarHeight</key>
<map>
<key>Comment</key>
- <string />
+ <string>Size of UI resize bar height</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>55aa57ef-508a-47f7-8867-85d21c5a810d</string>
+ <real>3</real>
</map>
- <key>UIImgScaleUUID</key>
+ <key>UIResizeBarOverlap</key>
<map>
<key>Comment</key>
- <string />
+ <string>Size of UI resize bar overlap</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
+ <key>Value</key>
+ <real>1</real>
+ </map>
+ <key>UIScaleFactor</key>
+ <map>
+ <key>Comment</key>
+ <string>Size of UI relative to default layout on 1024x768 screen</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>F32</string>
+ <key>Value</key>
+ <real>1.0</real>
+ </map>
+ <key>UIScrollbarSize</key>
+ <map>
+ <key>Comment</key>
+ <string>UI scrollbar size</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>S32</string>
<key>Value</key>
- <string>88a90fef-b448-4883-9344-ecf378a60433</string>
+ <real>16</real>
</map>
- <key>UIImgWhiteUUID</key>
+ <key>UISliderctrlHeight</key>
<map>
<key>Comment</key>
- <string />
+ <string>UI slider ctrl height</string>
<key>Persist</key>
- <integer>0</integer>
+ <integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>5748decc-f629-461c-9a36-a35a221fe21f</string>
+ <real>16</real>
</map>
- <key>UIScaleFactor</key>
+ <key>UISliderctrlSpacing</key>
<map>
<key>Comment</key>
- <string>Size of UI relative to default layout on 1024x768 screen</string>
+ <string>UI slider ctrl spacing</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>F32</string>
+ <string>S32</string>
<key>Value</key>
- <real>1.0</real>
+ <real>4</real>
</map>
<key>UISndAlert</key>
<map>
@@ -10805,286 +8477,197 @@
<key>Value</key>
<string>c80260ba-41fd-8a46-768a-6bf236360e3a</string>
</map>
- <key>UploadBakedTexOld</key>
- <map>
- <key>Comment</key>
- <string>Forces the baked texture pipeline to upload using the old method.</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>UseAltKeyForMenus</key>
- <map>
- <key>Comment</key>
- <string>Access menus via keyboard by tapping Alt</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>UseChatBubbles</key>
- <map>
- <key>Comment</key>
- <string>Show chat above avatars head in chat bubbles</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>UseDebugLogin</key>
- <map>
- <key>Comment</key>
- <string>Provides extra control over which grid to connect to</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>UseDebugMenus</key>
- <map>
- <key>Comment</key>
- <string>Turns on "Debug" menu</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>UseDefaultColorPicker</key>
+ <key>UISpinctrlBtnHeight</key>
<map>
<key>Comment</key>
- <string>Use color picker supplied by operating system</string>
+ <string>UI spin control button height</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>UseEnergy</key>
- <map>
- <key>Comment</key>
- <string />
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>8</integer>
</map>
- <key>UseExternalBrowser</key>
+ <key>UISpinctrlBtnWidth</key>
<map>
<key>Comment</key>
- <string>Use default browser when opening web pages instead of in-world browser.</string>
+ <string>UI spin control button width</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>16</integer>
</map>
- <key>UseFreezeFrame</key>
+ <key>UISpinctrlDefaultLabelWidth</key>
<map>
<key>Comment</key>
- <string>Freeze time when taking snapshots.</string>
+ <string>UI spin control default label width</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>10</integer>
</map>
- <key>UseOcclusion</key>
+ <key>UISpinctrlSpacing</key>
<map>
<key>Comment</key>
- <string>Enable object culling based on occlusion (coverage) by other objects</string>
+ <string>UI spin control spacing</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>2</integer>
</map>
- <key>RenderDelayVBUpdate</key>
+ <key>UITabCntrArrowBtnSize</key>
<map>
<key>Comment</key>
- <string>Delay vertex buffer updates until just before rendering</string>
+ <string>UI Tab Container Arrow Button Size</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>16</integer>
</map>
- <key>UseStartScreen</key>
+ <key>UITabCntrvArrowBtnSize</key>
<map>
<key>Comment</key>
- <string>Whether to load a start screen image or not.</string>
+ <string>UI Tab Container V Arrow Button Size</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>16</integer>
</map>
- <key>UseWebPagesOnPrims</key>
+ <key>UITabCntrvPad</key>
<map>
<key>Comment</key>
- <string>[NOT USED]</string>
+ <string>UI Tab Container V Pad</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
<integer>0</integer>
</map>
- <key>UserConnectionPort</key>
+ <key>UITabCntrButtonPanelOverlap</key>
<map>
<key>Comment</key>
- <string>Port that this client transmits on.</string>
+ <string>UI Tab Container Button Panel Overlap</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>U32</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
- </map>
- <key>UserLogFile</key>
- <map>
- <key>Comment</key>
- <string>User specified log file name.</string>
- <key>Persist</key>
<integer>1</integer>
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
- <string />
</map>
- <key>UserLoginInfo</key>
+ <key>UITabCntrCloseBtnSize</key>
<map>
<key>Comment</key>
- <string>Users loging data.</string>
+ <string>UI Tab Container Close Button Size</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>LLSD</string>
+ <string>S32</string>
<key>Value</key>
- <map>
- </map>
+ <integer>16</integer>
</map>
- <key>VFSOldSize</key>
+ <key>UITabCntrTabHeight</key>
<map>
<key>Comment</key>
- <string>[DO NOT MODIFY] Controls resizing of local file cache</string>
+ <string>UI Tab Container Tab Height</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>U32</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>16</integer>
</map>
- <key>VFSSalt</key>
+ <key>UITabCntrTabHPad</key>
<map>
<key>Comment</key>
- <string>[DO NOT MODIFY] Controls local file caching behavior</string>
+ <string>UI Tab Container Tab Horizontal Pad</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>U32</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>4</integer>
</map>
- <key>VectorizeEnable</key>
+ <key>UITabCntrTabPartialWidth</key>
<map>
<key>Comment</key>
- <string>Enable general vector operations and data alignment.</string>
+ <string>UI Tab Container Tab Partial Width</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>12</integer>
</map>
- <key>VectorizePerfTest</key>
+ <key>UITabCntrVertTabMinWidth</key>
<map>
<key>Comment</key>
- <string>Test SSE/vectorization performance and choose fastest version.</string>
+ <string>UI Tab Container Vertical Tab Minimum Width</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
- <key>VectorizeProcessor</key>
- <map>
- <key>Comment</key>
- <string>0=Compiler Default, 1=SSE, 2=SSE2, autodetected</string>
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>U32</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>100</integer>
</map>
- <key>VectorizeSkin</key>
+ <key>UITabPadding</key>
<map>
<key>Comment</key>
- <string>Enable vector operations for avatar skinning.</string>
+ <string>UI Tab Padding</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>15</integer>
</map>
- <key>VelocityInterpolate</key>
+ <key>UITextEditorBorder</key>
<map>
<key>Comment</key>
- <string>Extrapolate object motion from last packet based on received velocity</string>
+ <string>UI Text Editor Border</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
<integer>1</integer>
</map>
- <key>VerboseLogs</key>
+ <key>UITextEditorHPad</key>
<map>
<key>Comment</key>
- <string>Display source file and line number for each log item for debugging purposes</string>
+ <string>UI Text Horizontal Pad</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>4</integer>
</map>
- <key>VersionChannelName</key>
+ <key>UITextEditorVPadTop</key>
<map>
<key>Comment</key>
- <string>Versioning Channel Name.</string>
+ <string>UI Text Vertical Pad Top</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>S32</string>
<key>Value</key>
- <string>Second Life Release</string>
+ <integer>4</integer>
</map>
- <key>VertexShaderEnable</key>
+ <key>UploadBakedTexOld</key>
<map>
<key>Comment</key>
- <string>Enable/disable all GLSL shaders (debug)</string>
+ <string>Forces the baked texture pipeline to upload using the old method.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -11092,10 +8675,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>VivoxAutoPostCrashDumps</key>
+ <key>UseAltKeyForMenus</key>
<map>
<key>Comment</key>
- <string>If true, SLVoice will automatically send crash dumps directly to Vivox.</string>
+ <string>Access menus via keyboard by tapping Alt</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -11103,43 +8686,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>VivoxDebugLevel</key>
- <map>
- <key>Comment</key>
- <string>Logging level to use when launching the vivox daemon</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
- <string>-1</string>
- </map>
- <key>VivoxDebugSIPURIHostName</key>
- <map>
- <key>Comment</key>
- <string>Hostname portion of vivox SIP URIs (empty string for the default).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
- <string></string>
- </map>
- <key>VivoxDebugVoiceAccountServerURI</key>
- <map>
- <key>Comment</key>
- <string>URI to the vivox account management server (empty string for the default).</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>String</string>
- <key>Value</key>
- <string></string>
- </map>
- <key>VoiceCallsFriendsOnly</key>
+ <key>UseChatBubbles</key>
<map>
<key>Comment</key>
- <string>Only accept voice calls from residents on your friends list</string>
+ <string>Show chat above avatars head in chat bubbles</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -11147,197 +8697,187 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>AutoDisengageMic</key>
+ <key>UseDebugLogin</key>
<map>
<key>Comment</key>
- <string>Automatically turn off the microphone when ending IM calls.</string>
+ <string>Provides extra control over which grid to connect to</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
- </map>
- <key>VoiceEarLocation</key>
- <map>
- <key>Comment</key>
- <string>Location of the virtual ear for voice</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
<integer>0</integer>
</map>
- <key>VoiceHost</key>
+ <key>UseDebugMenus</key>
<map>
<key>Comment</key>
- <string>Client SLVoice host to connect to</string>
+ <string>Turns on "Debug" menu</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>127.0.0.1</string>
+ <integer>0</integer>
</map>
- <key>VoiceImageLevel0</key>
+ <key>UseDefaultColorPicker</key>
<map>
<key>Comment</key>
- <string>Texture UUID for voice image level 0</string>
+ <string>Use color picker supplied by operating system</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>041ee5a0-cb6a-9ac5-6e49-41e9320507d5</string>
+ <integer>0</integer>
</map>
- <key>VoiceImageLevel1</key>
+ <key>UseEnergy</key>
<map>
<key>Comment</key>
- <string>Texture UUID for voice image level 1</string>
+ <string />
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+ <integer>1</integer>
</map>
- <key>VoiceImageLevel2</key>
+ <key>UseExternalBrowser</key>
<map>
<key>Comment</key>
- <string>Texture UUID for voice image level 2</string>
+ <string>Use default browser when opening web pages instead of in-world browser.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+ <integer>0</integer>
</map>
- <key>VoiceImageLevel3</key>
+ <key>UseFreezeFrame</key>
<map>
<key>Comment</key>
- <string>Texture UUID for voice image level 3</string>
+ <string>Freeze time when taking snapshots.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+ <integer>0</integer>
</map>
- <key>VoiceImageLevel4</key>
+ <key>UseOcclusion</key>
<map>
<key>Comment</key>
- <string>Texture UUID for voice image level 4</string>
+ <string>Enable object culling based on occlusion (coverage) by other objects</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+ <integer>1</integer>
</map>
- <key>VoiceImageLevel5</key>
+ <key>RenderDelayVBUpdate</key>
<map>
<key>Comment</key>
- <string>Texture UUID for voice image level 5</string>
+ <string>Delay vertex buffer updates until just before rendering</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+ <integer>1</integer>
</map>
- <key>VoiceImageLevel6</key>
+ <key>UseStartScreen</key>
<map>
<key>Comment</key>
- <string>Texture UUID for voice image level 6</string>
+ <string>Whether to load a start screen image or not.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
+ <integer>1</integer>
</map>
- <key>VoiceInputAudioDevice</key>
+ <key>UseWebPagesOnPrims</key>
<map>
<key>Comment</key>
- <string>Audio input device to use for voice</string>
+ <string>[NOT USED]</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>Boolean</string>
<key>Value</key>
- <string>Default</string>
+ <integer>0</integer>
</map>
- <key>VoiceOutputAudioDevice</key>
+ <key>UserConnectionPort</key>
<map>
<key>Comment</key>
- <string>Audio output device to use for voice</string>
+ <string>Port that this client transmits on.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>String</string>
+ <string>U32</string>
<key>Value</key>
- <string>Default</string>
+ <integer>0</integer>
</map>
- <key>VoicePort</key>
+ <key>UserLogFile</key>
<map>
<key>Comment</key>
- <string>Client SLVoice port to connect to</string>
+ <string>User specified log file name.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>U32</string>
+ <string>String</string>
<key>Value</key>
- <integer>44125</integer>
+ <string />
</map>
- <key>WLSkyDetail</key>
+ <key>UserLoginInfo</key>
<map>
<key>Comment</key>
- <string>Controls vertex detail on the WindLight sky. Lower numbers will give better performance and uglier skies.</string>
+ <string>Users loging data.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>U32</string>
+ <string>LLSD</string>
<key>Value</key>
- <integer>64</integer>
+ <map>
+ </map>
</map>
- <key>WarnAboutBadPCI</key>
+ <key>VFSOldSize</key>
<map>
<key>Comment</key>
- <string>Enables AboutBadPCI warning dialog</string>
+ <string>[DO NOT MODIFY] Controls resizing of local file cache</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>U32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>WarnAboutDirectX9</key>
+ <key>VFSSalt</key>
<map>
<key>Comment</key>
- <string>Enables AboutDirectX9 warning dialog</string>
+ <string>[DO NOT MODIFY] Controls local file caching behavior</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>U32</string>
<key>Value</key>
<integer>1</integer>
</map>
- <key>WarnAboutOldGraphicsDriver</key>
+ <key>VectorizeEnable</key>
<map>
<key>Comment</key>
- <string>Enables AboutOldGraphicsDriver warning dialog</string>
+ <string>Enable general vector operations and data alignment.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>WarnAboutPCIGraphics</key>
+ <key>VectorizePerfTest</key>
<map>
<key>Comment</key>
- <string>Enables AboutPCIGraphics warning dialog</string>
+ <string>Test SSE/vectorization performance and choose fastest version.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -11345,21 +8885,21 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>WarnBrowserLaunch</key>
+ <key>VectorizeProcessor</key>
<map>
<key>Comment</key>
- <string>Enables BrowserLaunch warning dialog</string>
+ <string>0=Compiler Default, 1=SSE, 2=SSE2, autodetected</string>
<key>Persist</key>
- <integer>1</integer>
+ <integer>0</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>U32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>WarnDeedObject</key>
+ <key>VectorizeSkin</key>
<map>
<key>Comment</key>
- <string>Enables DeedObject warning dialog</string>
+ <string>Enable vector operations for avatar skinning.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -11367,10 +8907,10 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>WarnFirstAppearance</key>
+ <key>VelocityInterpolate</key>
<map>
<key>Comment</key>
- <string>Enables FirstAppearance warning dialog</string>
+ <string>Extrapolate object motion from last packet based on received velocity</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -11378,98 +8918,98 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>WarnFirstAttach</key>
+ <key>VerboseLogs</key>
<map>
<key>Comment</key>
- <string>Enables FirstAttach warning dialog</string>
+ <string>Display source file and line number for each log item for debugging purposes</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>WarnFirstBalanceDecrease</key>
+ <key>VersionChannelName</key>
<map>
<key>Comment</key>
- <string>Enables FirstBalanceDecrease warning dialog</string>
+ <string>Versioning Channel Name.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>Second Life Release</string>
</map>
- <key>WarnFirstBalanceIncrease</key>
+ <key>VertexShaderEnable</key>
<map>
<key>Comment</key>
- <string>Enables FirstBalanceIncrease warning dialog</string>
+ <string>Enable/disable all GLSL shaders (debug)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>WarnFirstBuild</key>
+ <key>VivoxAutoPostCrashDumps</key>
<map>
<key>Comment</key>
- <string>Enables FirstBuild warning dialog</string>
+ <string>If true, SLVoice will automatically send crash dumps directly to Vivox.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>WarnFirstDebugMenus</key>
+ <key>VivoxDebugLevel</key>
<map>
<key>Comment</key>
- <string>Enables FirstDebugMenus warning dialog</string>
+ <string>Logging level to use when launching the vivox daemon</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>-1</string>
</map>
- <key>WarnFirstFlexible</key>
+ <key>VivoxDebugSIPURIHostName</key>
<map>
<key>Comment</key>
- <string>Enables FirstFlexible warning dialog</string>
+ <string>Hostname portion of vivox SIP URIs (empty string for the default).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string></string>
</map>
- <key>WarnFirstGoTo</key>
+ <key>VivoxDebugVoiceAccountServerURI</key>
<map>
<key>Comment</key>
- <string>Enables FirstGoTo warning dialog</string>
+ <string>URI to the vivox account management server (empty string for the default).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string></string>
</map>
- <key>WarnFirstInventory</key>
+ <key>VoiceCallsFriendsOnly</key>
<map>
<key>Comment</key>
- <string>Enables FirstInventory warning dialog</string>
+ <string>Only accept voice calls from residents on your friends list</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>WarnFirstLeftClickNoHit</key>
+ <key>AutoDisengageMic</key>
<map>
<key>Comment</key>
- <string>Enables FirstLeftClickNoHit warning dialog</string>
+ <string>Automatically turn off the microphone when ending IM calls.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -11477,148 +9017,148 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>WarnFirstMap</key>
+ <key>VoiceEarLocation</key>
<map>
<key>Comment</key>
- <string>Enables FirstMap warning dialog</string>
+ <string>Location of the virtual ear for voice</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>S32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>0</integer>
</map>
- <key>WarnFirstMedia</key>
+ <key>VoiceHost</key>
<map>
<key>Comment</key>
- <string>Enables FirstMedia warning dialog</string>
+ <string>Client SLVoice host to connect to</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>127.0.0.1</string>
</map>
- <key>WarnFirstOverrideKeys</key>
+ <key>VoiceImageLevel0</key>
<map>
<key>Comment</key>
- <string>Enables FirstOverrideKeys warning dialog</string>
+ <string>Texture UUID for voice image level 0</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>041ee5a0-cb6a-9ac5-6e49-41e9320507d5</string>
</map>
- <key>WarnFirstSandbox</key>
+ <key>VoiceImageLevel1</key>
<map>
<key>Comment</key>
- <string>Enables FirstSandbox warning dialog</string>
+ <string>Texture UUID for voice image level 1</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
</map>
- <key>WarnFirstSculptedPrim</key>
+ <key>VoiceImageLevel2</key>
<map>
<key>Comment</key>
- <string>Enables FirstSculptedPrim warning dialog</string>
+ <string>Texture UUID for voice image level 2</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
</map>
- <key>WarnFirstSit</key>
+ <key>VoiceImageLevel3</key>
<map>
<key>Comment</key>
- <string>Enables FirstSit warning dialog</string>
+ <string>Texture UUID for voice image level 3</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
</map>
- <key>WarnFirstStreamingMusic</key>
+ <key>VoiceImageLevel4</key>
<map>
<key>Comment</key>
- <string>Enables FirstStreamingMusic warning dialog</string>
+ <string>Texture UUID for voice image level 4</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
</map>
- <key>WarnFirstStreamingVideo</key>
+ <key>VoiceImageLevel5</key>
<map>
<key>Comment</key>
- <string>Enables FirstStreamingVideo warning dialog</string>
+ <string>Texture UUID for voice image level 5</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
</map>
- <key>WarnFirstTeleport</key>
+ <key>VoiceImageLevel6</key>
<map>
<key>Comment</key>
- <string>Enables FirstTeleport warning dialog</string>
+ <string>Texture UUID for voice image level 6</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>29de489d-0491-fb00-7dab-f9e686d31e83</string>
</map>
- <key>WarnFirstVoice</key>
+ <key>VoiceInputAudioDevice</key>
<map>
<key>Comment</key>
- <string>Enables FirstVoice warning dialog</string>
+ <string>Audio input device to use for voice</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>Default</string>
</map>
- <key>WarnNewClassified</key>
+ <key>VoiceOutputAudioDevice</key>
<map>
<key>Comment</key>
- <string>Enables NewClassified warning dialog</string>
+ <string>Audio output device to use for voice</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>String</string>
<key>Value</key>
- <integer>1</integer>
+ <string>Default</string>
</map>
- <key>WarnQuickTimeInstalled</key>
+ <key>VoicePort</key>
<map>
<key>Comment</key>
- <string>Enables QuickTimeInstalled warning dialog</string>
+ <string>Client SLVoice port to connect to</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>U32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>44125</integer>
</map>
- <key>WarnReturnToOwner</key>
+ <key>WLSkyDetail</key>
<map>
<key>Comment</key>
- <string>Enables ReturnToOwner warning dialog</string>
+ <string>Controls vertex detail on the WindLight sky. Lower numbers will give better performance and uglier skies.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
- <string>Boolean</string>
+ <string>U32</string>
<key>Value</key>
- <integer>1</integer>
+ <integer>64</integer>
</map>
<key>WatchdogEnabled</key>
<map>
@@ -11796,22 +9336,6 @@
<key>Value</key>
<real>0.40000000596</real>
</map>
- <key>llOwnerSayChatColor</key>
- <map>
- <key>Comment</key>
- <string>Color of chat messages from objects only visible to the owner</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Color4</string>
- <key>Value</key>
- <array>
- <real>0.990000009537</real>
- <real>0.990000009537</real>
- <real>0.689999997616</real>
- <real>1.0</real>
- </array>
- </map>
<key>particlesbeacon</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/app_settings/settings_files.xml b/indra/newview/app_settings/settings_files.xml
index ec55745358..aa5b301959 100644
--- a/indra/newview/app_settings/settings_files.xml
+++ b/indra/newview/app_settings/settings_files.xml
@@ -4,10 +4,10 @@
<map>
<!--
The Locations LLSD block specifies the usage pattern of
- the settings file types listed above.
+ the settings file types
Each location is represented by a LLSD containing the following values:
PathIndex = hard coded path indicies.
- Files = map of files to load, from above 'Files' section.
+ Files = map of files to load
Each file can have:
Requirement = level of necessity for loading.
0 ( or Req. no key) = do not load
@@ -50,6 +50,13 @@
<key>Requirement</key>
<integer>1</integer>
</map>
+ <key>Warnings</key>
+ <map>
+ <key>Name</key>
+ <string>ignorable_dialogs.xml</string>
+ <key>Requirement</key>
+ <integer>1</integer>
+ </map>
</map>
</map>
<key>User</key>
@@ -70,6 +77,13 @@
<key>Name</key>
<string>settings_crash_behavior.xml</string>
</map>
+ <key>Warnings</key>
+ <map>
+ <key>Name</key>
+ <string>ignorable_dialogs.xml</string>
+ <key>NameFromSetting</key>
+ <string>WarningSettingsFile</string>
+ </map>
</map>
</map>
<key>Account</key>
@@ -82,6 +96,49 @@
<map>
<key>Name</key>
<string>settings_per_account.xml</string>
+ <key>NameFromSetting</key>
+ <string>PerAccountSettingsFile</string>
+ </map>
+ </map>
+ </map>
+ <key>DefaultSkin</key>
+ <map>
+ <key>PathIndex</key>
+ <integer>17</integer>
+ <key>Files</key>
+ <map>
+ <key>Skinning</key>
+ <map>
+ <key>Name</key>
+ <string>colors.xml</string>
+ </map>
+ </map>
+ </map>
+ <key>CurrentSkin</key>
+ <map>
+ <key>PathIndex</key>
+ <integer>10</integer>
+ <key>Files</key>
+ <map>
+ <key>Skinning</key>
+ <map>
+ <key>Name</key>
+ <string>colors.xml</string>
+ </map>
+ </map>
+ </map>
+ <key>UserSkin</key>
+ <map>
+ <key>PathIndex</key>
+ <integer>14</integer>
+ <key>Files</key>
+ <map>
+ <key>Skinning</key>
+ <map>
+ <key>Name</key>
+ <string>colors.xml</string>
+ <key>NameFromSetting</key>
+ <string>SkinningSettingsFile</string>
</map>
</map>
</map>
diff --git a/indra/newview/app_settings/std_bump.ini b/indra/newview/app_settings/std_bump.ini
index f34e21ce32..561e04c33c 100644
--- a/indra/newview/app_settings/std_bump.ini
+++ b/indra/newview/app_settings/std_bump.ini
@@ -1,18 +1,18 @@
LLStandardBumpmap version 1
-woodgrain 058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c
-bark 6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c
-bricks b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c
-checker 9deab416-9c63-78d6-d558-9a156f12044c.j2c
-concrete db9d39ec-a896-c287-1ced-64566217021e.j2c
-crustytile f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c
-cutstone d9258671-868f-7511-c321-7baef9e948a4.j2c
-discs d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c
-gravel 4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c
-petridish e569711a-27c2-aad4-9246-0c910239a179.j2c
-siding 073c9723-540c-5449-cdd4-0e87fdc159e3.j2c
-stonetile ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c
-stucco 92e66e00-f56f-598a-7997-048aa64cde18.j2c
-suction 83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c
-weave 735198cf-6ea0-2550-e222-21d3c6a341ae.j2c
+woodgrain 058c75c0-a0d5-f2f8-43f3-e9699a89c2fc
+bark 6c9fa78a-1c69-2168-325b-3e03ffa348ce
+bricks b8eed5f0-64b7-6e12-b67f-43fa8e773440
+checker 9deab416-9c63-78d6-d558-9a156f12044c
+concrete db9d39ec-a896-c287-1ced-64566217021e
+crustytile f2d7b6f6-4200-1e9a-fd5b-96459e950f94
+cutstone d9258671-868f-7511-c321-7baef9e948a4
+discs d21e44ca-ff1c-a96e-b2ef-c0753426b7d9
+gravel 4726f13e-bd07-f2fb-feb0-bfa2ac58ab61
+petridish e569711a-27c2-aad4-9246-0c910239a179
+siding 073c9723-540c-5449-cdd4-0e87fdc159e3
+stonetile ae874d1a-93ef-54fb-5fd3-eb0cb156afc0
+stucco 92e66e00-f56f-598a-7997-048aa64cde18
+suction 83b77fc6-10b4-63ec-4de7-f40629f238c5
+weave 735198cf-6ea0-2550-e222-21d3c6a341ae
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 9785940ff6..263c2b52bf 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -44,6 +44,7 @@
#include "llcriticaldamp.h"
#include "llfocusmgr.h"
#include "llglheaders.h"
+#include "llmenugl.h"
#include "llparcel.h"
#include "llpermissions.h"
#include "llregionhandle.h"
@@ -67,6 +68,7 @@
#include "llface.h"
#include "llfirstuse.h"
#include "llfloater.h"
+#include "llfloaterreg.h"
#include "llfloateractivespeakers.h"
#include "llfloateravatarinfo.h"
#include "llfloaterbuildoptions.h"
@@ -77,7 +79,6 @@
#include "llfloatergroupinfo.h"
#include "llfloatergroups.h"
#include "llfloaterland.h"
-#include "llfloatermap.h"
#include "llfloatermute.h"
#include "llfloatersnapshot.h"
#include "llfloatertools.h"
@@ -92,11 +93,13 @@
#include "llmenugl.h"
#include "llmorphview.h"
#include "llmoveview.h"
+#include "llteleporthistory.h"
#include "llnotify.h"
#include "llquantize.h"
#include "llsdutil.h"
#include "llselectmgr.h"
#include "llsky.h"
+#include "llslurl.h"
#include "llrendersphere.h"
#include "llstatusbar.h"
#include "llstartup.h"
@@ -107,9 +110,7 @@
#include "lltoolgrab.h"
#include "lltoolmgr.h"
#include "lltoolpie.h"
-#include "lltoolview.h"
#include "llui.h" // for make_ui_sound
-#include "llurldispatcher.h"
#include "llviewercamera.h"
#include "llviewerinventory.h"
#include "llviewermenu.h"
@@ -134,6 +135,9 @@
#include "llappviewer.h"
#include "llviewerjoystick.h"
#include "llfollowcam.h"
+#include "lltrans.h"
+
+#include "llnavigationbar.h" //to show/hide navigation bar when changing mouse look state
using namespace LLVOAvatarDefines;
@@ -240,6 +244,20 @@ void LLAgentFriendObserver::changed(U32 mask)
}
}
+bool handleSlowMotionAnimation(const LLSD& newvalue)
+{
+ if (newvalue.asBoolean())
+ {
+ gAgent.getAvatarObject()->setAnimTimeFactor(0.2f);
+ }
+ else
+ {
+ gAgent.getAvatarObject()->setAnimTimeFactor(1.0f);
+ }
+ return true;
+}
+
+
// ************************************************************
// Enabled this definition to compile a 'hacked' viewer that
// locally believes the end user has godlike powers.
@@ -398,15 +416,14 @@ LLAgent::LLAgent() :
mTextureCacheQueryID(0),
mAppearanceSerialNum(0)
{
- U32 i;
- for (i = 0; i < TOTAL_CONTROLS; i++)
+ for (U32 i = 0; i < TOTAL_CONTROLS; i++)
{
mControlsTakenCount[i] = 0;
mControlsTakenPassedOnCount[i] = 0;
}
mActiveCacheQueries = new S32[BAKED_NUM_INDICES];
- for (i = 0; i < (U32)BAKED_NUM_INDICES; i++)
+ for (U32 i = 0; i < (U32)BAKED_NUM_INDICES; i++)
{
mActiveCacheQueries[i] = 0;
}
@@ -420,6 +437,9 @@ LLAgent::LLAgent() :
//-----------------------------------------------------------------------------
void LLAgent::init()
{
+ gSavedSettings.declareBOOL("SlowMotionAnimation", FALSE, "Declared in code", FALSE);
+ gSavedSettings.getControl("SlowMotionAnimation")->getSignal()->connect(boost::bind(&handleSlowMotionAnimation, _2));
+
mDrawDistance = gSavedSettings.getF32("RenderFarClip");
// *Note: this is where LLViewerCamera::getInstance() used to be constructed.
@@ -441,9 +461,10 @@ void LLAgent::init()
mCameraZoomFraction = 1.f;
mTrackFocusObject = gSavedSettings.getBOOL("TrackFocusObject");
-// LLDebugVarMessageBox::show("Camera Lag", &CAMERA_FOCUS_HALF_LIFE, 0.5f, 0.01f);
-
- mEffectColor = gSavedSettings.getColor4("EffectColor");
+ mEffectColor = gSavedSkinSettings.getColor4("EffectColor");
+
+ gSavedSettings.getControl("PreferredMaturity")->getValidateSignal()->connect(boost::bind(&LLAgent::validateMaturity, this, _2));
+ gSavedSettings.getControl("PreferredMaturity")->getSignal()->connect(boost::bind(&LLAgent::handleMaturity, this, _2));
mInitialized = TRUE;
}
@@ -526,8 +547,8 @@ void LLAgent::resetView(BOOL reset_camera, BOOL change_camera)
{
LLViewerJoystick::getInstance()->moveAvatar(true);
}
-
- gFloaterTools->close();
+
+ LLFloaterReg::hideInstance("build");
gViewerWindow->showCursor();
@@ -820,12 +841,24 @@ void LLAgent::setFlying(BOOL fly)
//-----------------------------------------------------------------------------
// toggleFlying()
//-----------------------------------------------------------------------------
+// static
void LLAgent::toggleFlying()
{
- BOOL fly = !(mControlFlags & AGENT_CONTROL_FLY);
+ BOOL fly = !(gAgent.mControlFlags & AGENT_CONTROL_FLY);
- setFlying( fly );
- resetView();
+ gAgent.setFlying( fly );
+ gAgent.resetView();
+}
+
+// static
+bool LLAgent::enableFlying()
+{
+ BOOL sitting = FALSE;
+ if (gAgent.getAvatarObject())
+ {
+ sitting = gAgent.getAvatarObject()->mIsSitting;
+ }
+ return !sitting;
}
@@ -940,7 +973,7 @@ std::string LLAgent::getSLURL() const
S32 x = llround( (F32)fmod( agentPos.mdV[VX], (F64)REGION_WIDTH_METERS ) );
S32 y = llround( (F32)fmod( agentPos.mdV[VY], (F64)REGION_WIDTH_METERS ) );
S32 z = llround( (F32)agentPos.mdV[VZ] );
- slurl = LLURLDispatcher::buildSLURL(regionp->getName(), x, y, z);
+ slurl = LLSLURL::buildSLURL(regionp->getName(), x, y, z);
}
return slurl;
}
@@ -2118,8 +2151,7 @@ void LLAgent::setAFK()
gAwayTimer.start();
if (gAFKMenu)
{
- //*TODO:Translate
- gAFKMenu->setLabel(std::string("Set Not Away"));
+ gAFKMenu->setLabel(LLTrans::getString("AvatarSetNotAway"));
}
}
}
@@ -2142,8 +2174,7 @@ void LLAgent::clearAFK()
clearControlFlags(AGENT_CONTROL_AWAY);
if (gAFKMenu)
{
- //*TODO:Translate
- gAFKMenu->setLabel(std::string("Set Away"));
+ gAFKMenu->setLabel(LLTrans::getString("AvatarSetAway"));
}
}
}
@@ -2165,8 +2196,7 @@ void LLAgent::setBusy()
mIsBusy = TRUE;
if (gBusyMenu)
{
- //*TODO:Translate
- gBusyMenu->setLabel(std::string("Set Not Busy"));
+ gBusyMenu->setLabel(LLTrans::getString("AvatarSetNotBusy"));
}
LLFloaterMute::getInstance()->updateButtons();
}
@@ -2180,8 +2210,7 @@ void LLAgent::clearBusy()
sendAnimationRequest(ANIM_AGENT_BUSY, ANIM_REQUEST_STOP);
if (gBusyMenu)
{
- //*TODO:Translate
- gBusyMenu->setLabel(std::string("Set Busy"));
+ gBusyMenu->setLabel(LLTrans::getString("AvatarSetBusy"));
}
LLFloaterMute::getInstance()->updateButtons();
}
@@ -2808,13 +2837,6 @@ U8 LLAgent::getRenderState()
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-static const LLFloaterView::skip_list_t& get_skip_list()
-{
- static LLFloaterView::skip_list_t skip_list;
- skip_list.insert(LLFloaterMap::getInstance());
- return skip_list;
-}
-
//-----------------------------------------------------------------------------
// endAnimationUpdateUI()
//-----------------------------------------------------------------------------
@@ -2833,6 +2855,7 @@ void LLAgent::endAnimationUpdateUI()
gViewerWindow->showCursor();
// show menus
gMenuBarView->setVisible(TRUE);
+ LLNavigationBar::getInstance()->setVisible(TRUE);
gStatusBar->setVisibleForMouselook(true);
LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
@@ -2840,10 +2863,17 @@ void LLAgent::endAnimationUpdateUI()
// Only pop if we have pushed...
if (TRUE == mViewsPushed)
{
+#if 0 // Use this once all floaters are registered
+ LLFloaterReg::restoreVisibleInstances();
+#else // Use this for now
+ LLFloaterView::skip_list_t skip_list;
+ skip_list.insert(LLFloaterReg::findInstance("mini_map"));
+ gFloaterView->popVisibleAll(skip_list);
+#endif
mViewsPushed = FALSE;
- gFloaterView->popVisibleAll(get_skip_list());
}
-
+
+
gAgent.setLookAt(LOOKAT_TARGET_CLEAR);
if( gMorphView )
{
@@ -2885,13 +2915,6 @@ void LLAgent::endAnimationUpdateUI()
LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
- // HACK: If we're quitting, and we were in customize avatar, don't
- // let the mini-map go visible again. JC
- if (!LLAppViewer::instance()->quitRequested())
- {
- LLFloaterMap::getInstance()->popVisible();
- }
-
if( gMorphView )
{
gMorphView->setVisible( FALSE );
@@ -2918,6 +2941,7 @@ void LLAgent::endAnimationUpdateUI()
{
// hide menus
gMenuBarView->setVisible(FALSE);
+ LLNavigationBar::getInstance()->setVisible(FALSE);
gStatusBar->setVisibleForMouselook(false);
// clear out camera lag effect
@@ -2929,15 +2953,24 @@ void LLAgent::endAnimationUpdateUI()
LLToolMgr::getInstance()->setCurrentToolset(gMouselookToolset);
mViewsPushed = TRUE;
-
- gFloaterView->pushVisibleAll(FALSE, get_skip_list());
+
+ // hide all floaters except the mini map
+
+#if 0 // Use this once all floaters are registered
+ std::set<std::string> exceptions;
+ exceptions.insert("mini_map");
+ LLFloaterReg::hideVisibleInstances(exceptions);
+#else // Use this for now
+ LLFloaterView::skip_list_t skip_list;
+ skip_list.insert(LLFloaterReg::findInstance("mini_map"));
+ gFloaterView->pushVisibleAll(FALSE, skip_list);
+#endif
if( gMorphView )
{
gMorphView->setVisible(FALSE);
}
- gIMMgr->setFloaterOpen( FALSE );
gConsole->setVisible( TRUE );
if (mAvatarObject.notNull())
@@ -2986,15 +3019,6 @@ void LLAgent::endAnimationUpdateUI()
{
LLToolMgr::getInstance()->setCurrentToolset(gFaceEditToolset);
- LLFloaterMap::getInstance()->pushVisible(FALSE);
- /*
- LLView *view;
- for (view = gFloaterView->getFirstChild(); view; view = gFloaterView->getNextChild())
- {
- view->pushVisible(FALSE);
- }
- */
-
if( gMorphView )
{
gMorphView->setVisible( TRUE );
@@ -4915,6 +4939,9 @@ int LLAgent::convertTextToMaturity(char text)
bool LLAgent::sendMaturityPreferenceToServer(int preferredMaturity)
{
+ if (!getRegion())
+ return false;
+
// Update agent access preference on the server
std::string url = getRegion()->getCapability("UpdateAgentInformation");
if (!url.empty())
@@ -4974,6 +5001,17 @@ const LLAgentAccess& LLAgent::getAgentAccess()
return mAgentAccess;
}
+bool LLAgent::validateMaturity(const LLSD& newvalue)
+{
+ return mAgentAccess.canSetMaturity(newvalue.asInteger());
+}
+
+void LLAgent::handleMaturity(const LLSD& newvalue)
+{
+ sendMaturityPreferenceToServer(newvalue.asInteger());
+}
+
+//----------------------------------------------------------------------------
void LLAgent::buildFullname(std::string& name) const
{
@@ -5137,8 +5175,14 @@ BOOL LLAgent::setUserGroupFlags(const LLUUID& group_id, BOOL accept_notices, BOO
}
// utility to build a location string
-void LLAgent::buildLocationString(std::string& str)
+BOOL LLAgent::buildLocationString(std::string& str, ELocationFormat fmt)
{
+ LLViewerRegion* region = getRegion();
+ LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+
+ if (!region || !parcel)
+ return FALSE;
+
const LLVector3& agent_pos_region = getPositionAgent();
S32 pos_x = S32(agent_pos_region.mV[VX]);
S32 pos_y = S32(agent_pos_region.mV[VY]);
@@ -5165,23 +5209,57 @@ void LLAgent::buildLocationString(std::string& str)
}
// create a defult name and description for the landmark
+ std::string parcel_name = LLViewerParcelMgr::getInstance()->getAgentParcelName();
+ std::string region_name = region->getName();
std::string buffer;
if( LLViewerParcelMgr::getInstance()->getAgentParcelName().empty() )
{
// the parcel doesn't have a name
- buffer = llformat("%.32s (%d, %d, %d)",
- getRegion()->getName().c_str(),
- pos_x, pos_y, pos_z);
+ switch (fmt)
+ {
+ case LOCATION_FORMAT_LANDMARK:
+ buffer = llformat("%.32s (%d, %d, %d)",
+ region_name.c_str(),
+ pos_x, pos_y, pos_z);
+ break;
+ case LOCATION_FORMAT_NORMAL:
+ case LOCATION_FORMAT_FULL:
+ buffer = llformat("%s (%d, %d, %d)",
+ region_name.c_str(),
+ pos_x, pos_y, pos_z);
+ break;
+ }
}
else
{
// the parcel has a name, so include it in the landmark name
- buffer = llformat("%.32s, %.32s (%d, %d, %d)",
- LLViewerParcelMgr::getInstance()->getAgentParcelName().c_str(),
- getRegion()->getName().c_str(),
- pos_x, pos_y, pos_z);
+ switch (fmt)
+ {
+ case LOCATION_FORMAT_LANDMARK:
+ buffer = llformat("%.32s, %.32s (%d, %d, %d)",
+ parcel_name.c_str(),
+ region_name.c_str(),
+ pos_x, pos_y, pos_z);
+ break;
+ case LOCATION_FORMAT_NORMAL:
+ buffer = llformat("%s/%s (%d, %d, %d)",
+ region_name.c_str(),
+ parcel_name.c_str(),
+ pos_x, pos_y, pos_z);
+ break;
+ case LOCATION_FORMAT_FULL:
+ std::string sim_access_string = region->getSimAccessString();
+ buffer = llformat("%s/%s (%d, %d, %d)%s%s",
+ region_name.c_str(),
+ parcel_name.c_str(),
+ pos_x, pos_y, pos_z,
+ sim_access_string.empty() ? "" : " - ",
+ sim_access_string.c_str());
+ break;
+ }
}
str = buffer;
+ return TRUE;
}
LLQuaternion LLAgent::getHeadRotation()
@@ -5389,7 +5467,7 @@ void update_group_floaters(const LLUUID& group_id)
LLFloaterGroupInfo::refreshGroup(group_id);
// update avatar info
- LLFloaterAvatarInfo* fa = LLFloaterAvatarInfo::getInstance(gAgent.getID());
+ LLFloaterAvatarInfo* fa = LLFloaterReg::findTypedInstance<LLFloaterAvatarInfo>("preview_avatar", LLSD(gAgent.getID()));
if(fa)
{
fa->resetGroupList();
@@ -5978,8 +6056,8 @@ bool LLAgent::teleportCore(bool is_local)
// process_teleport_location_reply
// close the map and find panels so we can see our destination
- LLFloaterWorldMap::hide(NULL);
- LLFloaterDirectory::hide(NULL);
+ LLFloaterReg::hideInstance("world_map");
+ LLFloaterReg::hideInstance("search");
// hide land floater too - it'll be out of date
LLFloaterLand::hideInstance();
@@ -6144,13 +6222,18 @@ void LLAgent::setTeleportState(ETeleportState state)
mTeleportState = state;
if (mTeleportState > TELEPORT_NONE && gSavedSettings.getBOOL("FreezeTime"))
{
- LLFloaterSnapshot::hide(0);
+ LLFloaterReg::hideInstance("snapshot");
}
if (mTeleportState == TELEPORT_MOVING)
{
// We're outa here. Save "back" slurl.
mTeleportSourceSLURL = getSLURL();
}
+ else if(mTeleportState == TELEPORT_ARRIVING)
+ {
+ // Let the interested parties know we've teleported.
+ LLViewerParcelMgr::getInstance()->onTeleportFinished();
+ }
}
void LLAgent::stopCurrentAnimations()
@@ -7272,10 +7355,23 @@ void LLAgent::sendAgentSetAppearance()
void LLAgent::sendAgentDataUpdateRequest()
{
+ if(getID().isNull())
+ return; // not logged in
gMessageSystem->newMessageFast(_PREHASH_AgentDataUpdateRequest);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
- gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
- gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ gMessageSystem->addUUIDFast(_PREHASH_AgentID, getID());
+ gMessageSystem->addUUIDFast(_PREHASH_SessionID, getSessionID());
+ sendReliableMessage();
+}
+
+void LLAgent::sendAgentUserInfoRequest()
+{
+ if(getID().isNull())
+ return; // not logged in
+ gMessageSystem->newMessageFast(_PREHASH_UserInfoRequest);
+ gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+ gMessageSystem->addUUIDFast(_PREHASH_AgentID, getID());
+ gMessageSystem->addUUIDFast(_PREHASH_SessionID, getSessionID());
sendReliableMessage();
}
@@ -7673,15 +7769,15 @@ void LLAgent::userRemoveAllClothes( void* userdata )
// We have to do this up front to avoid having to deal with the case of multiple wearables being dirty.
if( gFloaterCustomize )
{
- gFloaterCustomize->askToSaveIfDirty( LLAgent::userRemoveAllClothesStep2, NULL );
+ gFloaterCustomize->askToSaveIfDirty( LLAgent::userRemoveAllClothesStep2 );
}
else
{
- LLAgent::userRemoveAllClothesStep2( TRUE, NULL );
+ LLAgent::userRemoveAllClothesStep2( TRUE );
}
}
-void LLAgent::userRemoveAllClothesStep2( BOOL proceed, void* userdata )
+void LLAgent::userRemoveAllClothesStep2( BOOL proceed )
{
if( proceed )
{
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 226c78e631..3174357a1a 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -46,7 +46,7 @@
#include "lldbstrings.h"
#include "llhudeffectlookat.h"
#include "llhudeffectpointat.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llstring.h"
#include "lluuid.h"
#include "m3math.h"
@@ -271,6 +271,10 @@ public:
static int convertTextToMaturity(char text);
bool sendMaturityPreferenceToServer(int preferredMaturity);
+ // maturity callbacks for PreferredMaturity control variable
+ void handleMaturity(const LLSD& newvalue);
+ bool validateMaturity(const LLSD& newvalue);
+
const LLAgentAccess& getAgentAccess();
// This function can go away after the AO transition (see llstartup.cpp)
@@ -318,8 +322,15 @@ public:
// in a dialog. We don't render the avatar until they choose.
BOOL isGenderChosen() const { return mGenderChosen; }
+ typedef enum e_location_format
+ {
+ LOCATION_FORMAT_NORMAL,
+ LOCATION_FORMAT_LANDMARK,
+ LOCATION_FORMAT_FULL,
+ } ELocationFormat;
+
// utility to build a location string
- void buildLocationString(std::string& str);
+ BOOL buildLocationString(std::string& str, ELocationFormat fmt = LOCATION_FORMAT_LANDMARK);
LLQuaternion getHeadRotation();
LLVOAvatar *getAvatarObject() const { return mAvatarObject; }
@@ -391,7 +402,8 @@ public:
// Flight management
BOOL getFlying() const { return mControlFlags & AGENT_CONTROL_FLY; }
void setFlying(BOOL fly);
- void toggleFlying();
+ static void toggleFlying();
+ static bool enableFlying();
// Does this parcel allow you to fly?
BOOL canFly();
@@ -607,9 +619,10 @@ public:
void requestLeaveGodMode();
void sendAgentSetAppearance();
-
void sendAgentDataUpdateRequest();
-
+ void sendAgentUserInfoRequest();
+
+
// Ventrella
LLFollowCam mFollowCam;
// end Ventrella
@@ -692,7 +705,7 @@ public:
static void processAgentInitialWearablesUpdate(LLMessageSystem* mesgsys, void** user_data);
static void userRemoveWearable( void* userdata ); // userdata is EWearableType
static void userRemoveAllClothes( void* userdata ); // userdata is NULL
- static void userRemoveAllClothesStep2(BOOL proceed, void* userdata ); // userdata is NULL
+ static void userRemoveAllClothesStep2(BOOL proceed );
static void userRemoveAllAttachments( void* userdata); // userdata is NULL
static BOOL selfHasWearable( void* userdata ); // userdata is EWearableType
diff --git a/indra/newview/llagentaccess.cpp b/indra/newview/llagentaccess.cpp
index a4fbc04855..eb978eb6c1 100644
--- a/indra/newview/llagentaccess.cpp
+++ b/indra/newview/llagentaccess.cpp
@@ -3,16 +3,39 @@
* @brief LLAgentAccess class implementation - manages maturity and godmode info
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
* Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "llagentaccess.h"
#include "indra_constants.h"
-#include "llcontrolgroupreader.h"
+#include "llcontrol.h"
-LLAgentAccess::LLAgentAccess(LLControlGroupReader& savedSettings) :
+LLAgentAccess::LLAgentAccess(LLControlGroup& savedSettings) :
mSavedSettings(savedSettings),
mAccess(SIM_ACCESS_PG),
mAdminOverride(false),
@@ -140,6 +163,20 @@ int LLAgentAccess::convertTextToMaturity(char text)
void LLAgentAccess::setMaturity(char text)
{
mAccess = LLAgentAccess::convertTextToMaturity(text);
+ U32 preferred_access = mSavedSettings.getU32("PreferredMaturity");
+ while (!canSetMaturity(preferred_access))
+ {
+ if (preferred_access == SIM_ACCESS_ADULT)
+ {
+ preferred_access = SIM_ACCESS_MATURE;
+ }
+ else
+ {
+ // Mature or invalid access gets set to PG
+ preferred_access = SIM_ACCESS_PG;
+ }
+ }
+ mSavedSettings.setU32("PreferredMaturity", preferred_access);
}
void LLAgentAccess::setTransition()
@@ -152,3 +189,14 @@ bool LLAgentAccess::isInTransition() const
return mAOTransition;
}
+bool LLAgentAccess::canSetMaturity(S32 maturity)
+{
+ if (isGodlike()) // Gods can always set their Maturity level
+ return true;
+ if (isAdult()) // Adults can always set their Maturity level
+ return true;
+ if (maturity == SIM_ACCESS_PG || (maturity == SIM_ACCESS_MATURE && isMature()))
+ return true;
+ else
+ return false;
+}
diff --git a/indra/newview/llagentaccess.h b/indra/newview/llagentaccess.h
index dec0d76cc9..93d2f0a371 100644
--- a/indra/newview/llagentaccess.h
+++ b/indra/newview/llagentaccess.h
@@ -3,7 +3,30 @@
* @brief LLAgentAccess class implementation - manages maturity and godmode info
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
* Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
@@ -13,12 +36,12 @@
#include "stdtypes.h"
// forward declaration so that we don't have to include the whole class
-class LLControlGroupReader;
+class LLControlGroup;
class LLAgentAccess
{
public:
- LLAgentAccess(LLControlGroupReader& savedSettings);
+ LLAgentAccess(LLControlGroup& savedSettings);
bool getAdminOverride() const;
void setAdminOverride(bool b);
@@ -48,6 +71,7 @@ public:
void setTransition(); // sets the transition bit, which defaults to false
bool isInTransition() const;
+ bool canSetMaturity(S32 maturity);
private:
U8 mAccess; // SIM_ACCESS_MATURE etc
@@ -61,9 +85,7 @@ private:
// all of the code that depends on it.
bool mAOTransition;
- // we want this to be const but the getters for it aren't, so we're
- // overriding it for now
- /* const */ LLControlGroupReader& mSavedSettings;
+ LLControlGroup& mSavedSettings;
};
#endif // LL_LLAGENTACCESS_H
diff --git a/indra/newview/llagentlanguage.h b/indra/newview/llagentlanguage.h
index 6bc7250c6e..e313837883 100644
--- a/indra/newview/llagentlanguage.h
+++ b/indra/newview/llagentlanguage.h
@@ -33,7 +33,7 @@
#ifndef LL_LLAGENTLANGUAGE_H
#define LL_LLAGENTLANGUAGE_H
-#include "llmemory.h" // LLSingleton<>
+#include "llsingleton.h" // LLSingleton<>
#include "llevent.h"
class LLAgentLanguage: public LLSingleton<LLAgentLanguage>, public LLSimpleListener
diff --git a/indra/newview/llagentpilot.cpp b/indra/newview/llagentpilot.cpp
index 035c9426a1..95595c87ab 100644
--- a/indra/newview/llagentpilot.cpp
+++ b/indra/newview/llagentpilot.cpp
@@ -38,7 +38,6 @@
#include "llagentpilot.h"
#include "llagent.h"
-#include "llframestats.h"
#include "llappviewer.h"
#include "llviewercontrol.h"
@@ -198,7 +197,6 @@ void LLAgentPilot::updateTarget()
{
llinfos << "At start, beginning playback" << llendl;
mTimer.reset();
- LLFrameStats::startLogging(NULL);
mStarted = TRUE;
}
}
@@ -215,7 +213,6 @@ void LLAgentPilot::updateTarget()
else
{
stopPlayback();
- LLFrameStats::stopLogging(NULL);
mNumRuns--;
if (sLoop)
{
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index f2154a05dc..a613e6a14b 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -30,9 +30,10 @@
* $/LicenseInfo$
*/
-
#include "llviewerprecompiledheaders.h"
+
#include "llappviewer.h"
+
#include "llprimitive.h"
#include "llversionviewer.h"
@@ -50,13 +51,12 @@
#include "llpumpio.h"
#include "llimpanel.h"
#include "llmimetypes.h"
+#include "llslurl.h"
#include "llstartup.h"
#include "llfocusmgr.h"
#include "llviewerjoystick.h"
-#include "llfloaterjoystick.h"
#include "llares.h"
#include "llcurl.h"
-#include "llfloatersnapshot.h"
#include "llviewerwindow.h"
#include "llviewerdisplay.h"
#include "llviewermedia.h"
@@ -68,10 +68,15 @@
#include "llurlhistory.h"
#include "llfirstuse.h"
#include "llrender.h"
-
+#include "llteleporthistory.h"
+#include "lllocationhistory.h"
#include "llweb.h"
#include "llsecondlifeurls.h"
+// Linden library includes
+#include "llmemory.h"
+
+// Third party library includes
#include <boost/bind.hpp>
#if LL_WINDOWS
@@ -104,7 +109,6 @@
#include "llviewermenu.h"
#include "llselectmgr.h"
#include "lltrans.h"
-#include "lluitrans.h"
#include "lltracker.h"
#include "llviewerparcelmgr.h"
#include "llworldmapview.h"
@@ -115,9 +119,7 @@
#include "lldebugview.h"
#include "llconsole.h"
#include "llcontainerview.h"
-#include "llfloaterstats.h"
#include "llhoverview.h"
-#include "llfloatermemleak.h"
#include "llsdserialize.h"
@@ -138,12 +140,16 @@
#include "llvoavatar.h"
#include "llfolderview.h"
#include "lltoolbar.h"
-#include "llframestats.h"
#include "llagentpilot.h"
#include "llsrv.h"
#include "llvovolume.h"
#include "llflexibleobject.h"
#include "llvosurfacepatch.h"
+#include "llviewerfloaterreg.h"
+#include "llcommandlineparser.h"
+#include "llfloatermemleak.h"
+#include "llfloatersnapshot.h"
+#include "llinventoryview.h"
// includes for idle() idleShutdown()
#include "llviewercontrol.h"
@@ -160,11 +166,6 @@
#include "llviewerthrottle.h"
#include "llparcel.h"
-
-#include "llinventoryview.h"
-
-#include "llcommandlineparser.h"
-
// *FIX: These extern globals should be cleaned up.
// The globals either represent state/config/resource-storage of either
// this app, or another 'component' of the viewer. App globals should be
@@ -180,10 +181,6 @@
////// Windows-specific includes to the bottom - nasty defines in these pollute the preprocessor
//
-#if LL_WINDOWS && LL_LCD_COMPILE
- #include "lllcd.h"
-#endif
-
//----------------------------------------------------------------------------
// viewer.cpp - these are only used in viewer, should be easily moved.
@@ -283,12 +280,23 @@ static std::string gLaunchFileOnQuit;
// Used on Win32 for other apps to identify our window (eg, win_setup)
const char* const VIEWER_WINDOW_CLASSNAME = "Second Life";
+//----------------------------------------------------------------------------
+
+// List of entries from strings.xml to always replace
+static std::set<std::string> default_trans_args;
+void init_default_trans_args()
+{
+ default_trans_args.insert("SECOND_LIFE"); // World
+ default_trans_args.insert("SECOND_LIFE_VIEWER");
+ default_trans_args.insert("SECOND_LIFE_GRID");
+ default_trans_args.insert("SECOND_LIFE_SUPPORT");
+}
+
//----------------------------------------------------------------------------
// File scope definitons
const char *VFS_DATA_FILE_BASE = "data.db2.x.";
const char *VFS_INDEX_FILE_BASE = "index.db2.x.";
-static std::string gSecondLife;
static std::string gWindowTitle;
std::string gLoginPage;
@@ -387,7 +395,6 @@ static void settings_to_globals()
LLSelectMgr::sRenderHiddenSelections = gSavedSettings.getBOOL("RenderHiddenSelections");
LLSelectMgr::sRenderLightRadius = gSavedSettings.getBOOL("RenderLightRadius");
- gFrameStats.setTrackStats(gSavedSettings.getBOOL("StatsSessionTrackFrameStats"));
gAgentPilot.mNumRuns = gSavedSettings.getS32("StatsNumRuns");
gAgentPilot.mQuitAfterRuns = gSavedSettings.getBOOL("StatsQuitAfterRuns");
gAgent.mHideGroupTitle = gSavedSettings.getBOOL("RenderHideGroupTitle");
@@ -496,8 +503,6 @@ bool LLAppViewer::sendURLToOtherInstance(const std::string& url)
LLAppViewer* LLAppViewer::sInstance = NULL;
const std::string LLAppViewer::sGlobalSettingsName = "Global";
-const std::string LLAppViewer::sPerAccountSettingsName = "PerAccount";
-const std::string LLAppViewer::sCrashSettingsName = "CrashSettings";
LLTextureCache* LLAppViewer::sTextureCache = NULL;
LLWorkerThread* LLAppViewer::sImageDecodeThread = NULL;
@@ -516,7 +521,9 @@ LLAppViewer::LLAppViewer() :
mLogoutRequestSent(false),
mYieldTime(-1),
mMainloopTimeout(NULL),
- mAgentRegionLastAlive(false)
+ mAgentRegionLastAlive(false),
+ mRandomizeFramerate(LLCachedControl<bool>(gSavedSettings,"Randomize Framerate", FALSE)),
+ mPeriodicSlowFrame(LLCachedControl<bool>(gSavedSettings,"Periodic Slow Frame", FALSE))
{
if(NULL != sInstance)
{
@@ -556,9 +563,12 @@ bool LLAppViewer::init()
//
// OK to write stuff to logs now, we've now crash reported if necessary
//
- if (!initConfiguration())
+
+ init_default_trans_args();
+
+ if (!initConfiguration())
return false;
-
+
// *NOTE:Mani - LLCurl::initClass is not thread safe.
// Called before threads are created.
LLCurl::initClass();
@@ -610,34 +620,35 @@ bool LLAppViewer::init()
LLError::setPrintLocation(true);
}
- // Load art UUID information, don't require these strings to be declared in code.
- std::string colors_base_filename = gDirUtilp->findSkinnedFilename("colors_base.xml");
- LL_DEBUGS("InitInfo") << "Loading base colors from " << colors_base_filename << LL_ENDL;
- gColors.loadFromFileLegacy(colors_base_filename, FALSE, TYPE_COL4U);
-
- // Load overrides from user colors file
- std::string user_colors_filename = gDirUtilp->findSkinnedFilename("colors.xml");
- LL_DEBUGS("InitInfo") << "Loading user colors from " << user_colors_filename << LL_ENDL;
- if (gColors.loadFromFileLegacy(user_colors_filename, FALSE, TYPE_COL4U) == 0)
- {
- LL_DEBUGS("InitInfo") << "Cannot load user colors from " << user_colors_filename << LL_ENDL;
- }
-
// Widget construction depends on LLUI being initialized
- LLUI::initClass(&gSavedSettings,
- &gSavedSettings,
- &gColors,
+ LLUI::settings_map_t settings_map;
+ settings_map["config"] = &gSavedSettings;
+ settings_map["color"] = &gSavedSkinSettings;
+ settings_map["ignores"] = &gWarningSettings;
+ settings_map["floater"] = &gSavedSettings; // *TODO: New settings file
+
+ LLUI::initClass(settings_map,
LLUIImageList::getInstance(),
ui_audio_callback,
&LLUI::sGLScaleFactor);
+
+ // Setup paths and LLTrans after LLUI::initClass has been called
+ LLUI::setupPaths();
+ LLTrans::parseStrings("strings.xml", default_trans_args);
+
LLWeb::initClass(); // do this after LLUI
LLTextEditor::setURLCallbacks(&LLWeb::loadURL,
&LLURLDispatcher::dispatchFromTextEditor,
&LLURLDispatcher::dispatchFromTextEditor);
- LLUICtrlFactory::getInstance()->setupPaths(); // update paths with correct language set
+ /////////////////////////////////////////////////
+
+ LLToolMgr::getInstance(); // Initialize tool manager if not already instantiated
+
+ LLViewerFloaterReg::registerFloaters();
+
/////////////////////////////////////////////////
//
// Load settings files
@@ -690,18 +701,8 @@ bool LLAppViewer::init()
if (!initCache())
{
std::ostringstream msg;
- msg <<
- gSecondLife << " is unable to access a file that it needs.\n"
- "\n"
- "This can be because you somehow have multiple copies running, "
- "or your system incorrectly thinks a file is open. "
- "If this message persists, restart your computer and try again. "
- "If it continues to persist, you may need to completely uninstall " <<
- gSecondLife << " and reinstall it.";
- OSMessageBox(
- msg.str(),
- LLStringUtil::null,
- OSMB_OK);
+ msg << LLTrans::getString("MBUnableToAccessFile");
+ OSMessageBox(msg.str(),LLStringUtil::null,OSMB_OK);
return 1;
}
@@ -849,7 +850,8 @@ bool LLAppViewer::mainLoop()
{
LLFastTimer t(LLFastTimer::FTM_FRAME);
pingMainloopTimeout("Main:MiscNativeWindowEvents");
-
+
+ if (gViewerWindow)
{
LLFastTimer t2(LLFastTimer::FTM_MESSAGES);
gViewerWindow->mWindow->processMiscNativeEvents();
@@ -857,6 +859,7 @@ bool LLAppViewer::mainLoop()
pingMainloopTimeout("Main:GatherInput");
+ if (gViewerWindow)
{
LLFastTimer t2(LLFastTimer::FTM_MESSAGES);
if (!restoreErrorTrap())
@@ -935,12 +938,6 @@ bool LLAppViewer::mainLoop()
pingMainloopTimeout("Main:Snapshot");
LLFloaterSnapshot::update(); // take snapshots
-
-#if LL_LCD_COMPILE
- // update LCD Screen
- pingMainloopTimeout("Main:LCD");
- gLcdScreen->UpdateDisplay();
-#endif
}
}
@@ -962,7 +959,7 @@ bool LLAppViewer::mainLoop()
// yield cooperatively when not running as foreground window
if ( gNoRender
- || !gViewerWindow->mWindow->getVisible()
+ || (gViewerWindow && !gViewerWindow->mWindow->getVisible())
|| !gFocusMgr.getAppHasFocus())
{
// Sleep if we're not rendering, or the window is minimized.
@@ -978,12 +975,12 @@ bool LLAppViewer::mainLoop()
}
}
- if (gRandomizeFramerate)
+ if (mRandomizeFramerate)
{
ms_sleep(rand() % 200);
}
- if (gPeriodicSlowFrame
+ if (mPeriodicSlowFrame
&& (gFrameCount % 10 == 0))
{
llinfos << "Periodic slow frame - sleeping 500 ms" << llendl;
@@ -1209,22 +1206,26 @@ bool LLAppViewer::cleanup()
llinfos << "Shutting down." << llendflush;
// Destroy the UI
- gViewerWindow->shutdownViews();
+ if( gViewerWindow)
+ gViewerWindow->shutdownViews();
// Clean up selection managers after UI is destroyed, as UI may be observing them.
// Clean up before GL is shut down because we might be holding on to objects with texture references
LLSelectMgr::cleanupGlobals();
// Shut down OpenGL
- gViewerWindow->shutdownGL();
+ if( gViewerWindow)
+ {
+ gViewerWindow->shutdownGL();
+
+ // Destroy window, and make sure we're not fullscreen
+ // This may generate window reshape and activation events.
+ // Therefore must do this before destroying the message system.
+ delete gViewerWindow;
+ gViewerWindow = NULL;
+ llinfos << "ViewerWindow deleted" << llendflush;
+ }
- // Destroy window, and make sure we're not fullscreen
- // This may generate window reshape and activation events.
- // Therefore must do this before destroying the message system.
- delete gViewerWindow;
- gViewerWindow = NULL;
- llinfos << "ViewerWindow deleted" << llendflush;
-
// viewer UI relies on keyboard so keep it aound until viewer UI isa gone
delete gKeyboard;
gKeyboard = NULL;
@@ -1244,12 +1245,6 @@ bool LLAppViewer::cleanup()
// gDXHardware.cleanup();
//#endif // LL_WINDOWS
-#if LL_LCD_COMPILE
- // shut down the LCD window on a logitech keyboard, if there is one
- delete gLcdScreen;
- gLcdScreen = NULL;
-#endif
-
LLVolumeMgr* volume_manager = LLPrimitive::getVolumeManager();
if (!volume_manager->cleanup())
{
@@ -1291,8 +1286,10 @@ bool LLAppViewer::cleanup()
// Must do this after all panels have been deleted because panels that have persistent rects
// save their rects on delete.
- gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
-
+ gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
+
+ //*FIX: don't overwrite user color tweaks with *all* colors
+ gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile"), TRUE);
// PerAccountSettingsFile should be empty if no use has been logged on.
// *FIX:Mani This should get really saved in a "logoff" mode.
gSavedPerAccountSettings.saveToFile(gSavedSettings.getString("PerAccountSettingsFile"), TRUE);
@@ -1302,8 +1299,11 @@ bool LLAppViewer::cleanup()
// save all settings, even if equals defaults
gCrashSettings.saveToFile(crash_settings_filename, FALSE);
+ std::string warnings_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Warnings"));
+ gWarningSettings.saveToFile(warnings_settings_filename, TRUE);
+
gSavedSettings.cleanup();
- gColors.cleanup();
+ gSavedSkinSettings.cleanup();
gCrashSettings.cleanup();
// Save URL history file
@@ -1464,7 +1464,7 @@ bool LLAppViewer::initThreads()
void errorCallback(const std::string &error_string)
{
#ifndef LL_RELEASE_FOR_DOWNLOAD
- OSMessageBox(error_string, "Fatal Error", OSMB_OK);
+ OSMessageBox(error_string, LLTrans::getString("MBFatalError"), OSMB_OK);
#endif
//Set the ErrorActivated global so we know to create a marker file
@@ -1532,7 +1532,7 @@ bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key,
llinfos << "Attempting to load settings for the group " << settings_group
<< " - from location " << location_key << llendl;
- if(gSettings.find(settings_group) == gSettings.end())
+ if(!LLControlGroup::getInstance(settings_group))
{
llwarns << "No matching settings group for name " << settings_group << llendl;
continue;
@@ -1546,10 +1546,10 @@ bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key,
std::string custom_name_setting = file.get("NameFromSetting");
// *NOTE: Regardless of the group currently being lodaed,
// this setting is always read from the Global settings.
- if(gSettings[sGlobalSettingsName]->controlExists(custom_name_setting))
+ if(LLControlGroup::getInstance(sGlobalSettingsName)->controlExists(custom_name_setting))
{
std::string file_name =
- gSettings[sGlobalSettingsName]->getString(custom_name_setting);
+ LLControlGroup::getInstance(sGlobalSettingsName)->getString(custom_name_setting);
full_settings_path = file_name;
}
}
@@ -1566,7 +1566,7 @@ bool LLAppViewer::loadSettingsFromDirectory(const std::string& location_key,
requirement = file.get("Requirement").asInteger();
}
- if(!gSettings[settings_group]->loadFromFile(full_settings_path, set_defaults))
+ if(!LLControlGroup::getInstance(settings_group)->loadFromFile(full_settings_path, set_defaults))
{
if(requirement == 1)
{
@@ -1606,17 +1606,22 @@ std::string LLAppViewer::getSettingsFilename(const std::string& location_key,
return std::string();
}
+void LLAppViewer::loadColorSettings()
+{
+ gSavedSkinSettings.cleanup();
+
+ loadSettingsFromDirectory("DefaultSkin");
+ loadSettingsFromDirectory("CurrentSkin", true);
+ loadSettingsFromDirectory("UserSkin");
+
+}
+
bool LLAppViewer::initConfiguration()
{
- //Set up internal pointers
- gSettings[sGlobalSettingsName] = &gSavedSettings;
- gSettings[sPerAccountSettingsName] = &gSavedPerAccountSettings;
- gSettings[sCrashSettingsName] = &gCrashSettings;
-
//Load settings files list
std::string settings_file_list = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "settings_files.xml");
- LLControlGroup settings_control;
- llinfos << "Loading settings file list" << settings_file_list << llendl;
+ LLControlGroup settings_control("SettingsFiles");
+ llinfos << "Loading settings file list " << settings_file_list << llendl;
if (0 == settings_control.loadFromFile(settings_file_list))
{
llerrs << "Cannot load default configuration file " << settings_file_list << llendl;
@@ -1639,21 +1644,22 @@ bool LLAppViewer::initConfiguration()
if(!loadSettingsFromDirectory("Default", set_defaults))
{
std::ostringstream msg;
- msg << "Second Life could not load its default settings file. \n"
- << "The installation may be corrupted. \n";
-
- OSMessageBox(
- msg.str(),
- LLStringUtil::null,
- OSMB_OK);
-
+ msg << "Unable to load default settings file. The installation may be corrupted.";
+ OSMessageBox(msg.str(),LLStringUtil::null,OSMB_OK);
return false;
}
-
- // - set procedural settings
+
+ LLUI::setupPaths(); // setup paths for LLTrans based on settings files only
+ LLTrans::parseStrings("strings.xml", default_trans_args);
+
+ // - set procedural settings
+ // Note: can't use LL_PATH_PER_SL_ACCOUNT for any of these since we haven't logged in yet
gSavedSettings.setString("ClientSettingsFile",
gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));
+ gSavedSettings.setString("SkinningSettingsFile",
+ gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("UserSkin", "Skinning")));
+
gSavedSettings.setString("VersionChannelName", LL_CHANNEL);
#ifndef LL_RELEASE_FOR_DOWNLOAD
@@ -1673,7 +1679,7 @@ bool LLAppViewer::initConfiguration()
gSavedSettings.setBOOL("WatchdogEnabled", FALSE);
#endif
- gCrashSettings.getControl(CRASH_BEHAVIOR_SETTING)->getSignal()->connect(boost::bind(&handleCrashSubmitBehaviorChanged, _1));
+ gCrashSettings.getControl(CRASH_BEHAVIOR_SETTING)->getSignal()->connect(boost::bind(&handleCrashSubmitBehaviorChanged, _2));
// These are warnings that appear on the first experience of that condition.
// They are already set in the settings_default.xml file, but still need to be added to LLFirstUse
@@ -1707,22 +1713,13 @@ bool LLAppViewer::initConfiguration()
if(!initParseCommandLine(clp))
{
- llwarns
- << "Error parsing command line options. Command Line options ignored."
- << llendl;
-
+ llwarns << "Error parsing command line options. Command Line options ignored." << llendl;
+
llinfos << "Command line usage:\n" << clp << llendl;
std::ostringstream msg;
- msg << "Second Life found an error parsing the command line. \n"
- << "Please see: http://wiki.secondlife.com/wiki/Client_parameters \n"
- << "Error: " << clp.getErrorMessage();
-
- OSMessageBox(
- msg.str(),
- LLStringUtil::null,
- OSMB_OK);
-
+ msg << LLTrans::getString("MBCmdLineError") << clp.getErrorMessage();
+ OSMessageBox(msg.str(),LLStringUtil::null,OSMB_OK);
return false;
}
@@ -1742,7 +1739,6 @@ bool LLAppViewer::initConfiguration()
// - load overrides from user_settings
loadSettingsFromDirectory("User");
-
// - apply command line settings
clp.notify();
@@ -1756,7 +1752,7 @@ bool LLAppViewer::initConfiguration()
if(clp.hasOption("help"))
{
std::ostringstream msg;
- msg << "Command line usage:\n" << clp;
+ msg << LLTrans::getString("MBCmdLineUsg") << "\n" << clp;
llinfos << msg.str() << llendl;
OSMessageBox(
@@ -1767,36 +1763,6 @@ bool LLAppViewer::initConfiguration()
return false;
}
- //////////////////////////
- // Apply settings...
- if(clp.hasOption("setdefault"))
- {
- //const LLCommandLineParser::token_vector_t& setdefault = clp.getOption("setdefault");
- //if(0x1 & setdefault.size())
- //{
- // llwarns << "Invalid '--setdefault' parameter count." << llendl;
- //}
- //else
- //{
- // LLCommandLineParser::token_vector_t::const_iterator itr = setdefault.begin();
- // for(; itr != setdefault.end(); ++itr)
- // {
- // const std::string& name = *itr;
- // const std::string& value = *(++itr);
- // LLControlVariable* c = gSettings[sGlobalSettingsName]->getControl(name);
- // if(c)
- // {
- // c->setDefault(value);
- // }
- // else
- // {
- // llwarns << "'--setdefault' specified with unknown setting: '"
- // << name << "'." << llendl;
- // }
- // }
- //}
- }
-
if(clp.hasOption("set"))
{
const LLCommandLineParser::token_vector_t& set_values = clp.getOption("set");
@@ -1811,7 +1777,7 @@ bool LLAppViewer::initConfiguration()
{
const std::string& name = *itr;
const std::string& value = *(++itr);
- LLControlVariable* c = gSettings[sGlobalSettingsName]->getControl(name);
+ LLControlVariable* c = LLControlGroup::getInstance(sGlobalSettingsName)->getControl(name);
if(c)
{
c->setValue(value, false);
@@ -1853,7 +1819,7 @@ bool LLAppViewer::initConfiguration()
if(clp.hasOption("url"))
{
std::string slurl = clp.getOption("url")[0];
- if (LLURLDispatcher::isSLURLCommand(slurl))
+ if (LLSLURL::isSLURLCommand(slurl))
{
LLStartUp::sSLURLCommand = slurl;
}
@@ -1865,9 +1831,9 @@ bool LLAppViewer::initConfiguration()
else if(clp.hasOption("slurl"))
{
std::string slurl = clp.getOption("slurl")[0];
- if(LLURLDispatcher::isSLURL(slurl))
+ if(LLSLURL::isSLURL(slurl))
{
- if (LLURLDispatcher::isSLURLCommand(slurl))
+ if (LLSLURL::isSLURLCommand(slurl))
{
LLStartUp::sSLURLCommand = slurl;
}
@@ -1882,12 +1848,12 @@ bool LLAppViewer::initConfiguration()
if(skinfolder && LLStringUtil::null != skinfolder->getValue().asString())
{
gDirUtilp->setSkinFolder(skinfolder->getValue().asString());
+
+ gSavedSettings.setString("SkinningSettingsFile",
+ gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("UserSkin", "Skinning")));
}
mYieldTime = gSavedSettings.getS32("YieldTime");
-
- // XUI:translate
- gSecondLife = "Second Life";
// Read skin/branding settings if specified.
//if (! gDirUtilp->getSkinDir().empty() )
@@ -1904,7 +1870,7 @@ bool LLAppViewer::initConfiguration()
#if LL_DARWIN
// Initialize apple menubar and various callbacks
- init_apple_menu(gSecondLife.c_str());
+ init_apple_menu(LLTrans::getString("SECOND_LIFE_VIEWER").c_str());
#if __ppc__
// If the CPU doesn't have Altivec (i.e. it's not at least a G4), don't go any further.
@@ -1912,7 +1878,7 @@ bool LLAppViewer::initConfiguration()
if(!gSysCPU.hasAltivec())
{
std::ostringstream msg;
- msg << gSecondLife << " requires a processor with AltiVec (G4 or later).";
+ msg << LLTrans::getString("MBRequiresAltiVec");
OSMessageBox(
msg.str(),
LLStringUtil::null,
@@ -1927,7 +1893,7 @@ bool LLAppViewer::initConfiguration()
// Display splash screen. Must be after above check for previous
// crash as this dialog is always frontmost.
std::ostringstream splash_msg;
- splash_msg << "Loading " << gSecondLife << "...";
+ splash_msg << "Loading " << LLTrans::getString("SECOND_LIFE") << "...";
LLSplashScreen::show();
LLSplashScreen::update(splash_msg.str());
@@ -1943,12 +1909,11 @@ bool LLAppViewer::initConfiguration()
//
// Set the name of the window
//
-#if LL_RELEASE_FOR_DOWNLOAD
- gWindowTitle = gSecondLife;
-#elif LL_DEBUG
- gWindowTitle = gSecondLife + std::string(" [DEBUG] ") + gArgs;
+ gWindowTitle = LLTrans::getString("SECOND_LIFE_VIEWER");
+#if LL_DEBUG
+ gWindowTitle += std::string(" [DEBUG] ") + gArgs;
#else
- gWindowTitle = gSecondLife + std::string(" ") + gArgs;
+ gWindowTitle += std::string(" ") + gArgs;
#endif
LLStringUtil::truncate(gWindowTitle, 255);
@@ -1985,11 +1950,7 @@ bool LLAppViewer::initConfiguration()
if (mSecondInstance)
{
std::ostringstream msg;
- msg <<
- gSecondLife << " is already running.\n"
- "\n"
- "Check your task bar for a minimized copy of the program.\n"
- "If this message persists, restart your computer.",
+ msg << LLTrans::getString("MBAlreadyRunning");
OSMessageBox(
msg.str(),
LLStringUtil::null,
@@ -2034,6 +1995,8 @@ bool LLAppViewer::initConfiguration()
gLastRunVersion = gSavedSettings.getString("LastRunVersion");
+ loadColorSettings();
+
return true; // Config was successful.
}
@@ -2048,13 +2011,9 @@ void LLAppViewer::checkForCrash(void)
//
// Pop up a freeze or crash warning dialog
//
- std::ostringstream msg;
- msg << gSecondLife
- << " appears to have frozen or crashed on the previous run.\n"
- << "Would you like to send a crash report?";
- std::string alert;
- alert = gSecondLife;
- alert += " Alert";
+ std::ostringstream msg;
+ msg << LLTrans::getString("MBFrozenCrashed");
+ std::string alert = LLTrans::getString("SECOND_LIFE_VIEWER") + " " + LLTrans::getString("MBAlert");
S32 choice = OSMessageBox(msg.str(),
alert,
OSMB_YESNO);
@@ -2130,9 +2089,6 @@ bool LLAppViewer::initWindow()
LLUI::sWindow = gViewerWindow->getWindow();
- LLTrans::parseStrings("strings.xml");
- LLUITrans::parseStrings("ui_strings.xml");
-
// Show watch cursor
gViewerWindow->setCursor(UI_CURSOR_WAIT);
@@ -2252,7 +2208,7 @@ void LLAppViewer::writeSystemInfo()
gDebugInfo["CrashNotHandled"] = (LLSD::Boolean)true;
// Dump some debugging info
- LL_INFOS("SystemInfo") << gSecondLife
+ LL_INFOS("SystemInfo") << LLTrans::getString("SECOND_LIFE_VIEWER")
<< " version " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH
<< LL_ENDL;
@@ -2330,7 +2286,7 @@ void LLAppViewer::handleViewerCrash()
gDebugInfo["CurrentPath"] = gDirUtilp->getCurPath();
gDebugInfo["SessionLength"] = F32(LLFrameTimer::getElapsedSeconds());
gDebugInfo["StartupState"] = LLStartUp::getStartupStateString();
- gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer) getCurrentRSS() >> 10;
+ gDebugInfo["RAMInfo"]["Allocated"] = (LLSD::Integer) LLMemory::getCurrentRSS() >> 10;
if(gLogoutInProgress)
{
@@ -2924,12 +2880,12 @@ void LLAppViewer::purgeCache()
gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,""),mask);
}
-const std::string& LLAppViewer::getSecondLifeTitle() const
+std::string LLAppViewer::getSecondLifeTitle() const
{
- return gSecondLife;
+ return LLTrans::getString("SECOND_LIFE_VIEWER");
}
-const std::string& LLAppViewer::getWindowTitle() const
+std::string LLAppViewer::getWindowTitle() const
{
return gWindowTitle;
}
@@ -2963,7 +2919,7 @@ void LLAppViewer::forceDisconnect(const std::string& mesg)
return;
}
- // Translate the message if possible
+ // *TODO: Translate the message if possible
std::string big_reason = LLAgent::sTeleportErrorMessages[mesg];
if ( big_reason.size() == 0 )
{
@@ -3235,7 +3191,6 @@ void LLAppViewer::idle()
gObjectList.mNumUnknownUpdates = 0;
}
}
- gFrameStats.addFrameData();
}
if (!gDisconnected)
@@ -3250,12 +3205,10 @@ void LLAppViewer::idle()
// floating throughout the various object lists.
//
- gFrameStats.start(LLFrameStats::IDLE_NETWORK);
stop_glerror();
idleNetwork();
stop_glerror();
- gFrameStats.start(LLFrameStats::AGENT_MISC);
// Check for away from keyboard, kick idle agents.
idle_afk_check();
@@ -3284,7 +3237,7 @@ void LLAppViewer::idle()
return;
}
- gViewerWindow->handlePerFrameHover();
+ gViewerWindow->updateUI();
///////////////////////////////////////
// Agent and camera movement
@@ -3307,7 +3260,6 @@ void LLAppViewer::idle()
{
LLFastTimer t(LLFastTimer::FTM_OBJECTLIST_UPDATE); // Actually "object update"
- gFrameStats.start(LLFrameStats::OBJECT_UPDATE);
if (!(logoutRequestSent() && hasSavedFinalSnapshot()))
{
@@ -3323,7 +3275,6 @@ void LLAppViewer::idle()
{
LLFastTimer t(LLFastTimer::FTM_CLEANUP);
- gFrameStats.start(LLFrameStats::CLEAN_DEAD);
gObjectList.cleanDeadObjects();
LLDrawable::cleanupDeadDrawables();
}
@@ -3342,7 +3293,6 @@ void LLAppViewer::idle()
//
{
- gFrameStats.start(LLFrameStats::UPDATE_EFFECTS);
LLSelectMgr::getInstance()->updateEffects();
LLHUDManager::getInstance()->cleanupEffects();
LLHUDManager::getInstance()->sendEffects();
@@ -3416,10 +3366,8 @@ void LLAppViewer::idle()
if (!gNoRender)
{
LLFastTimer t(LLFastTimer::FTM_WORLD_UPDATE);
- gFrameStats.start(LLFrameStats::UPDATE_MOVE);
gPipeline.updateMove();
- gFrameStats.start(LLFrameStats::UPDATE_PARTICLES);
LLWorld::getInstance()->updateParticles();
}
stop_glerror();
@@ -3445,7 +3393,6 @@ void LLAppViewer::idle()
}
{
- gFrameStats.start(LLFrameStats::AUDIO);
LLFastTimer t(LLFastTimer::FTM_AUDIO_UPDATE);
if (gAudiop)
@@ -3491,6 +3438,17 @@ void LLAppViewer::idleShutdown()
{
return;
}
+
+ // ProductEngine: Try moving this code to where we shut down sTextureCache in cleanup()
+ // *TODO: ugly
+ static bool saved_teleport_history = false;
+ if (!saved_teleport_history)
+ {
+ saved_teleport_history = true;
+ LLTeleportHistory::getInstance()->save();
+ LLLocationHistory::getInstance()->save(); // *TODO: find a better place for doing this
+ return;
+ }
static bool saved_snapshot = false;
if (!saved_snapshot)
@@ -3674,7 +3632,7 @@ void LLAppViewer::idleNetwork()
}
}
llpushcallstacks ;
- gObjectList.mNumNewObjectsStat.addValue(gObjectList.mNumNewObjects);
+ LLViewerStats::getInstance()->mNumNewObjectsStat.addValue(gObjectList.mNumNewObjects);
// Retransmit unacknowledged packets.
gXferManager->retransmitUnackedPackets();
@@ -3715,7 +3673,6 @@ void LLAppViewer::disconnectViewer()
llinfos << "Disconnecting viewer!" << llendl;
// Dump our frame statistics
- gFrameStats.dump();
// Remember if we were flying
gSavedSettings.setBOOL("FlyingAtExit", gAgent.getFlying() );
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index a3b84759f5..536abfae58 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -33,12 +33,15 @@
#ifndef LL_LLAPPVIEWER_H
#define LL_LLAPPVIEWER_H
+#include "llcontrol.h"
+
class LLTextureCache;
class LLWorkerThread;
class LLTextureFetch;
class LLWatchdogTimeout;
class LLCommandLineParser;
+
class LLAppViewer : public LLApp
{
public:
@@ -96,8 +99,8 @@ public:
bool getPurgeCache() const { return mPurgeCache; }
- const std::string& getSecondLifeTitle() const; // The Second Life title.
- const std::string& getWindowTitle() const; // The window display name.
+ std::string getSecondLifeTitle() const; // The Second Life title.
+ std::string getWindowTitle() const; // The window display name.
void forceDisconnect(const std::string& msg); // Force disconnection, with a message to the user.
void badNetworkHandler(); // Cause a crash state due to bad network packet.
@@ -119,14 +122,13 @@ public:
virtual void forceErrorSoftwareException();
virtual void forceErrorDriverCrash();
- // *NOTE: There are currently 3 settings files:
- // "Global", "PerAccount" and "CrashSettings"
// The list is found in app_settings/settings_files.xml
// but since they are used explicitly in code,
// the follow consts should also do the trick.
static const std::string sGlobalSettingsName;
- static const std::string sPerAccountSettingsName;
- static const std::string sCrashSettingsName;
+
+ LLCachedControl<bool> mRandomizeFramerate;
+ LLCachedControl<bool> mPeriodicSlowFrame;
// Load settings from the location specified by loction_key.
// Key availale and rules for loading, are specified in
@@ -136,6 +138,7 @@ public:
std::string getSettingsFilename(const std::string& location_key,
const std::string& file);
+ void loadColorSettings();
// For thread debugging.
// llstartup needs to control init.
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 16928923bf..be5403e39a 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -64,6 +64,7 @@
#include "llfindlocale.h"
#include "llcommandlineparser.h"
+#include "lltrans.h"
// *FIX:Mani - This hack is to fix a linker issue with libndofdev.lib
// The lib was compiled under VS2005 - in VS2003 we need to remap assert
@@ -84,7 +85,7 @@ LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *excepti
{
// *NOTE:Mani - this code is stolen from LLApp, where its never actually used.
//OSMessageBox("Attach Debugger Now", "Error", OSMB_OK);
- // Translate the signals/exceptions into cross-platform stuff
+ // *TODO: Translate the signals/exceptions into cross-platform stuff
// Windows implementation
_tprintf( _T("Entering Windows Exception Handler...\n") );
llinfos << "Entering Windows Exception Handler..." << llendl;
@@ -409,33 +410,24 @@ bool LLAppViewerWin32::initHardwareTest()
// but vram.
vram_only = TRUE;
- LLSplashScreen::update("Detecting hardware...");
+ LLSplashScreen::update(LLTrans::getString("StartupDetectingHardware"));
LL_DEBUGS("AppInit") << "Attempting to poll DirectX for hardware info" << LL_ENDL;
gDXHardware.setWriteDebugFunc(write_debug_dx);
BOOL probe_ok = gDXHardware.getInfo(vram_only);
if (!probe_ok
- && gSavedSettings.getWarning("AboutDirectX9"))
+ && gWarningSettings.getBOOL("AboutDirectX9"))
{
LL_WARNS("AppInit") << "DirectX probe failed, alerting user." << LL_ENDL;
// Warn them that runnin without DirectX 9 will
// not allow us to tell them about driver issues
std::ostringstream msg;
- msg <<
- LLAppViewer::instance()->getSecondLifeTitle() << " is unable to detect DirectX 9.0b or greater.\n"
- "\n" <<
- LLAppViewer::instance()->getSecondLifeTitle() << " uses DirectX to detect hardware and/or\n"
- "outdated drivers that can cause stability problems,\n"
- "poor performance and crashes. While you can run\n" <<
- LLAppViewer::instance()->getSecondLifeTitle() << " without it, we highly recommend running\n"
- "with DirectX 9.0b\n"
- "\n"
- "Do you wish to continue?\n";
+ msg << LLTrans::getString ("MBNoDirectX");
S32 button = OSMessageBox(
msg.str(),
- "Warning",
+ LLTrans::getString("MBWarning"),
OSMB_YESNO);
if (OSBTN_NO== button)
{
@@ -443,7 +435,7 @@ bool LLAppViewerWin32::initHardwareTest()
LLWeb::loadURLExternal(DIRECTX_9_URL);
return false;
}
- gSavedSettings.setWarning("AboutDirectX9", FALSE);
+ gWarningSettings.setBOOL("AboutDirectX9", FALSE);
}
LL_DEBUGS("AppInit") << "Done polling DirectX for hardware info" << LL_ENDL;
@@ -452,7 +444,7 @@ bool LLAppViewerWin32::initHardwareTest()
// Disable so debugger can work
std::ostringstream splash_msg;
- splash_msg << "Loading " << LLAppViewer::instance()->getSecondLifeTitle() << "...";
+ splash_msg << LLTrans::getString("StartupLoading") << " " << LLAppViewer::instance()->getSecondLifeTitle() << "...";
LLSplashScreen::update(splash_msg.str());
}
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index 5b04e241a1..63d0518cfe 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -59,6 +59,7 @@
// library includes
#include "lleconomy.h"
+#include "llfloaterreg.h"
#include "llfocusmgr.h"
#include "llscrolllistctrl.h"
#include "llsdserialize.h"
@@ -416,72 +417,68 @@ void LLUpdateAgentInventoryResponder::uploadComplete(const LLSD& content)
LLInventoryType::EType inventory_type = new_item->getInventoryType();
switch(inventory_type)
{
- case LLInventoryType::IT_NOTECARD:
- {
-
- // Update the UI with the new asset.
- LLPreviewNotecard* nc;
- nc = (LLPreviewNotecard*)LLPreview::find(new_item->getUUID());
- if(nc)
- {
- // *HACK: we have to delete the asset in the VFS so
- // that the viewer will redownload it. This is only
- // really necessary if the asset had to be modified by
- // the uploader, so this can be optimized away in some
- // cases. A better design is to have a new uuid if the
- // script actually changed the asset.
- if(nc->hasEmbeddedInventory())
- {
- gVFS->removeFile(
- content["new_asset"].asUUID(),
- LLAssetType::AT_NOTECARD);
- }
- nc->refreshFromInventory();
- }
- }
- break;
- case LLInventoryType::IT_LSL:
- {
- // Find our window and close it if requested.
- LLPreviewLSL* preview = (LLPreviewLSL*)LLPreview::find(item_id);
- if (preview)
- {
- // Bytecode save completed
- if (content["compiled"])
- {
- preview->callbackLSLCompileSucceeded();
- }
- else
- {
- preview->callbackLSLCompileFailed(content["errors"]);
- }
- }
- }
- break;
-
- case LLInventoryType::IT_GESTURE:
- {
- // If this gesture is active, then we need to update the in-memory
- // active map with the new pointer.
- if (gGestureManager.isGestureActive(item_id))
- {
- LLUUID asset_id = new_item->getAssetUUID();
- gGestureManager.replaceGesture(item_id, asset_id);
- gInventory.notifyObservers();
- }
-
- //gesture will have a new asset_id
- LLPreviewGesture* previewp = (LLPreviewGesture*)LLPreview::find(item_id);
- if(previewp)
- {
- previewp->onUpdateSucceeded();
- }
+ case LLInventoryType::IT_NOTECARD:
+ {
+ // Update the UI with the new asset.
+ LLPreviewNotecard* nc = LLFloaterReg::findTypedInstance<LLPreviewNotecard>("preview_notecard", LLSD(item_id));
+ if(nc)
+ {
+ // *HACK: we have to delete the asset in the VFS so
+ // that the viewer will redownload it. This is only
+ // really necessary if the asset had to be modified by
+ // the uploader, so this can be optimized away in some
+ // cases. A better design is to have a new uuid if the
+ // script actually changed the asset.
+ if(nc->hasEmbeddedInventory())
+ {
+ gVFS->removeFile(content["new_asset"].asUUID(), LLAssetType::AT_NOTECARD);
+ }
+ nc->refreshFromInventory(new_item->getUUID());
+ }
+ break;
+ }
+ case LLInventoryType::IT_LSL:
+ {
+ // Find our window and close it if requested.
+ LLPreviewLSL* preview = LLFloaterReg::findTypedInstance<LLPreviewLSL>("preview_script", LLSD(item_id));
+ if (preview)
+ {
+ // Bytecode save completed
+ if (content["compiled"])
+ {
+ preview->callbackLSLCompileSucceeded();
+ }
+ else
+ {
+ preview->callbackLSLCompileFailed(content["errors"]);
+ }
+ }
+ break;
+ }
+
+ case LLInventoryType::IT_GESTURE:
+ {
+ // If this gesture is active, then we need to update the in-memory
+ // active map with the new pointer.
+ if (gGestureManager.isGestureActive(item_id))
+ {
+ LLUUID asset_id = new_item->getAssetUUID();
+ gGestureManager.replaceGesture(item_id, asset_id);
+ gInventory.notifyObservers();
+ }
+
+ //gesture will have a new asset_id
+ LLPreviewGesture* previewp = LLFloaterReg::findTypedInstance<LLPreviewGesture>("preview_gesture", LLSD(item_id));
+ if(previewp)
+ {
+ previewp->onUpdateSucceeded();
+ }
- }
- break;
- case LLInventoryType::IT_WEARABLE:
- default:
- break;
+ break;
+ }
+ case LLInventoryType::IT_WEARABLE:
+ default:
+ break;
}
}
@@ -519,64 +516,57 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
switch(mAssetType)
{
- case LLAssetType::AT_NOTECARD:
- {
-
- // Update the UI with the new asset.
- LLPreviewNotecard* nc;
- nc = (LLPreviewNotecard*)LLPreview::find(item_id);
- if(nc)
- {
- // *HACK: we have to delete the asset in the VFS so
- // that the viewer will redownload it. This is only
- // really necessary if the asset had to be modified by
- // the uploader, so this can be optimized away in some
- // cases. A better design is to have a new uuid if the
- // script actually changed the asset.
- if(nc->hasEmbeddedInventory())
- {
- gVFS->removeFile(
- content["new_asset"].asUUID(),
- LLAssetType::AT_NOTECARD);
- }
-
- nc->refreshFromInventory();
- }
- }
- break;
- case LLAssetType::AT_LSL_TEXT:
- {
- if(mQueueId.notNull())
- {
- LLFloaterCompileQueue* queue =
- (LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
- if(NULL != queue)
- {
- queue->removeItemByItemID(item_id);
- }
- }
- else
- {
- LLLiveLSLEditor* preview = LLLiveLSLEditor::find(item_id, task_id);
- if (preview)
- {
- // Bytecode save completed
- if (content["compiled"])
- {
- preview->callbackLSLCompileSucceeded(
- task_id,
- item_id,
- mPostData["is_script_running"]);
- }
- else
- {
- preview->callbackLSLCompileFailed(content["errors"]);
- }
- }
- }
- }
- break;
- default:
+ case LLAssetType::AT_NOTECARD:
+ {
+ // Update the UI with the new asset.
+ LLPreviewNotecard* nc = LLFloaterReg::findTypedInstance<LLPreviewNotecard>("preview_notecard", LLSD(item_id));
+ if(nc)
+ {
+ // *HACK: we have to delete the asset in the VFS so
+ // that the viewer will redownload it. This is only
+ // really necessary if the asset had to be modified by
+ // the uploader, so this can be optimized away in some
+ // cases. A better design is to have a new uuid if the
+ // script actually changed the asset.
+ if(nc->hasEmbeddedInventory())
+ {
+ gVFS->removeFile(content["new_asset"].asUUID(),
+ LLAssetType::AT_NOTECARD);
+ }
+
+ nc->refreshFromInventory();
+ }
+ break;
+ }
+ case LLAssetType::AT_LSL_TEXT:
+ {
+ if(mQueueId.notNull())
+ {
+ LLFloaterCompileQueue* queue = LLFloaterReg::findTypedInstance<LLFloaterCompileQueue>("compile_queue", mQueueId);
+ if(NULL != queue)
+ {
+ queue->removeItemByItemID(item_id);
+ }
+ }
+ else
+ {
+ LLLiveLSLEditor* preview = LLFloaterReg::findTypedInstance<LLLiveLSLEditor>("preview_scriptedit", LLSD(item_id));
+ if (preview)
+ {
+ // Bytecode save completed
+ if (content["compiled"])
+ {
+ preview->callbackLSLCompileSucceeded(task_id, item_id, mPostData["is_script_running"]);
+ }
+ else
+ {
+ preview->callbackLSLCompileFailed(content["errors"]);
+ }
+ }
+ }
+ break;
+ }
+ default:
break;
}
}
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp
new file mode 100644
index 0000000000..09aecd193f
--- /dev/null
+++ b/indra/newview/llavatariconctrl.cpp
@@ -0,0 +1,244 @@
+/**
+ * @file llavatariconctrl.cpp
+ * @brief LLAvatarIconCtrl class implementation
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llagent.h"
+#include "llavatarconstants.h"
+#include "llavatariconctrl.h"
+#include "llfloateravatarinfo.h"
+#include "llfloaterfriends.h"
+#include "llimview.h"
+#include "llmenugl.h"
+#include "lluictrlfactory.h"
+
+#define MENU_ITEM_VIEW_PROFILE 0
+#define MENU_ITEM_SEND_IM 1
+
+static LLRegisterWidget<LLAvatarIconCtrl> r("avatar_icon");
+
+LLAvatarIconCtrl::LLAvatarIconCtrl(const LLAvatarIconCtrl::Params& p)
+: LLIconCtrl(p)
+{
+ LLRect rect = p.rect;
+
+ static LLUICachedControl<S32> llavatariconctrl_symbol_hpad("UIAvatariconctrlSymbolHPad", 2);
+ static LLUICachedControl<S32> llavatariconctrl_symbol_vpad("UIAvatariconctrlSymbolVPad", 2);
+ static LLUICachedControl<S32> llavatariconctrl_symbol_size("UIAvatariconctrlSymbolSize", 5);
+ static LLUICachedControl<std::string> llavatariconctrl_symbol_pos("UIAvatariconctrlSymbolPosition", "BottomRight");
+
+ // BottomRight is the default position
+ S32 left = rect.getWidth() - llavatariconctrl_symbol_size - llavatariconctrl_symbol_hpad;
+ S32 bottom = llavatariconctrl_symbol_vpad;
+
+ if ("BottomLeft" == (std::string)llavatariconctrl_symbol_pos)
+ {
+ left = llavatariconctrl_symbol_hpad;
+ bottom = llavatariconctrl_symbol_vpad;
+ }
+ else if ("TopLeft" == (std::string)llavatariconctrl_symbol_pos)
+ {
+ left = llavatariconctrl_symbol_hpad;
+ bottom = rect.getHeight() - llavatariconctrl_symbol_size - llavatariconctrl_symbol_vpad;
+ }
+ else if ("TopRight" == (std::string)llavatariconctrl_symbol_pos)
+ {
+ left = rect.getWidth() - llavatariconctrl_symbol_size - llavatariconctrl_symbol_hpad;
+ bottom = rect.getHeight() - llavatariconctrl_symbol_size - llavatariconctrl_symbol_vpad;
+ }
+
+ rect.setOriginAndSize(left, bottom, llavatariconctrl_symbol_size, llavatariconctrl_symbol_size);
+
+ LLIconCtrl::Params icparams;
+ icparams.name ("Status Symbol");
+ icparams.follows.flags (FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
+ icparams.rect (rect);
+ mStatusSymbol = LLUICtrlFactory::create<LLIconCtrl> (icparams);
+ mStatusSymbol->setValue("circle.tga");
+ mStatusSymbol->setColor(LLColor4::grey);
+
+ addChild(mStatusSymbol);
+
+ if (p.avatar_id.isProvided())
+ {
+ LLSD value(p.avatar_id);
+ setValue(value);
+ }
+
+ LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
+
+ registrar.add("AvatarIcon.Action", boost::bind(&LLAvatarIconCtrl::onAvatarIconContextMenuItemClicked, this, _2));
+
+ LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_avatar_icon.xml", this);
+
+ mPopupMenuHandle = menu->getHandle();
+}
+
+LLAvatarIconCtrl::~LLAvatarIconCtrl()
+{
+ if (mAvatarId.notNull())
+ {
+ LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarId, this);
+ // Name callbacks will be automatically disconnected since LLUICtrl is trackable
+ }
+
+ LLView::deleteViewByHandle(mPopupMenuHandle);
+}
+
+//virtual
+void LLAvatarIconCtrl::setValue(const LLSD& value)
+{
+ if (value.isUUID())
+ {
+ if (mAvatarId.notNull())
+ {
+ LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarId, this);
+ }
+
+ if (mAvatarId != value.asUUID())
+ {
+ LLAvatarPropertiesProcessor::getInstance()->addObserver(value.asUUID(), this);
+ LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(value.asUUID());
+ mAvatarId = value.asUUID();
+ }
+ }
+ else
+ {
+ LLIconCtrl::setValue(value);
+ }
+
+ gCacheName->get(mAvatarId, FALSE, boost::bind(&LLAvatarIconCtrl::nameUpdatedCallback, this, _1, _2, _3, _4));
+}
+
+//virtual
+void LLAvatarIconCtrl::processAvatarProperties(const LLAvatarData& avatar_data)
+{
+ if (avatar_data.avatar_id != mAvatarId)
+ {
+ return;
+ }
+
+ // Update the avatar
+ LLIconCtrl::setValue(avatar_data.image_id);
+
+ // Update color of status symbol and tool tip
+ if (avatar_data.flags & AVATAR_ONLINE)
+ {
+ mStatusSymbol->setColor(LLColor4::green);
+ setToolTip((LLStringExplicit)"Online");
+ }
+ else
+ {
+ mStatusSymbol->setColor(LLColor4::grey);
+ setToolTip((LLStringExplicit)"Offline");
+ }
+
+}
+
+BOOL LLAvatarIconCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+ LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
+
+ if(menu)
+ {
+ bool is_friend = LLAvatarTracker::instance().getBuddyInfo(mAvatarId) != NULL;
+
+ menu->setItemEnabled("Add Friend", !is_friend);
+ menu->setItemEnabled("Remove Friend", is_friend);
+
+ menu->buildDrawLabels();
+ menu->updateParent(LLMenuGL::sMenuContainer);
+ LLMenuGL::showPopup(this, menu, x, y);
+ }
+
+ return TRUE;
+}
+
+void LLAvatarIconCtrl::nameUpdatedCallback(
+ const LLUUID& id,
+ const std::string& first,
+ const std::string& last,
+ BOOL is_group)
+{
+ if (id == mAvatarId)
+ {
+ mFirstName = first;
+ mLastName = last;
+ }
+}
+
+void LLAvatarIconCtrl::onAvatarIconContextMenuItemClicked(const LLSD& userdata)
+{
+ std::string level = userdata.asString();
+ LLUUID id = getAvatarId();
+
+ if (level == "profile")
+ {
+ LLFloaterAvatarInfo::show(id);
+ }
+ else if (level == "im")
+ {
+ std::string name;
+ name.assign(getFirstName());
+ name.append(" ");
+ name.append(getLastName());
+
+ gIMMgr->addSession(name, IM_NOTHING_SPECIAL, id);
+ }
+ else if (level == "add")
+ {
+ std::string name;
+ name.assign(getFirstName());
+ name.append(" ");
+ name.append(getLastName());
+
+ LLPanelFriends::requestFriendshipDialog(id, name);
+ }
+ else if (level == "remove")
+ {
+ LLSD args;
+
+ std::string msgType = "RemoveFromFriends";
+
+ args["FIRST_NAME"] = getFirstName();
+ args["LAST_NAME"] = getLastName();
+
+ LLSD payload;
+
+ payload["ids"].append(id);
+
+ LLNotifications::instance().add(msgType,
+ args,
+ payload,
+ &LLPanelFriends::handleRemove);
+ }
+}
diff --git a/indra/newview/llavatariconctrl.h b/indra/newview/llavatariconctrl.h
new file mode 100644
index 0000000000..4cec1d2d75
--- /dev/null
+++ b/indra/newview/llavatariconctrl.h
@@ -0,0 +1,86 @@
+/**
+ * @file llavatariconctrl.h
+ * @brief LLAvatarIconCtrl base class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLAVATARICONCTRL_H
+#define LL_LLAVATARICONCTRL_H
+
+#include "lliconctrl.h"
+#include "llavatarpropertiesprocessor.h"
+#include "llviewermenu.h"
+
+class LLAvatarIconCtrl
+: public LLIconCtrl, public LLAvatarPropertiesObserver
+{
+public:
+ struct Params : public LLInitParam::Block<Params, LLIconCtrl::Params>
+ {
+ Optional <LLUUID> avatar_id;
+ Params()
+ {
+ name = "avatar_icon";
+ }
+ };
+protected:
+ LLAvatarIconCtrl(const Params&);
+ friend class LLUICtrlFactory;
+
+ void onAvatarIconContextMenuItemClicked(const LLSD& userdata);
+
+public:
+ virtual ~LLAvatarIconCtrl();
+
+ virtual void setValue(const LLSD& value);
+
+ // LLAvatarPropertiesProcessor observer trigger
+ virtual void processAvatarProperties(const LLAvatarData& avatar_data);
+
+ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+
+ void nameUpdatedCallback(
+ const LLUUID& id,
+ const std::string& first,
+ const std::string& last,
+ BOOL is_group);
+
+ const LLUUID& getAvatarId() const { return mAvatarId; }
+ const std::string& getFirstName() const { return mFirstName; }
+ const std::string& getLastName() const { return mLastName; }
+
+protected:
+ LLIconCtrl* mStatusSymbol;
+ LLUUID mAvatarId;
+ std::string mFirstName;
+ std::string mLastName;
+ LLHandle<LLView> mPopupMenuHandle;
+};
+
+#endif // LL_LLAVATARICONCTRL_H
diff --git a/indra/newview/llavatarpropertiesprocessor.cpp b/indra/newview/llavatarpropertiesprocessor.cpp
new file mode 100644
index 0000000000..6ff5c8f625
--- /dev/null
+++ b/indra/newview/llavatarpropertiesprocessor.cpp
@@ -0,0 +1,138 @@
+/**
+ * @file llavatarpropertiesprocessor.cpp
+ * @brief LLAvatarPropertiesProcessor class implementation
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llavatarpropertiesprocessor.h"
+#include "message.h"
+#include "llagent.h"
+
+void LLAvatarPropertiesProcessor::addObserver(const LLUUID& avatar_id, LLAvatarPropertiesObserver* observer)
+{
+ // Check if that observer is alredy in mObservers for that avatar_id
+ observer_multimap_t::iterator it;
+
+ // IAN BUG this should update the observer's UUID if this is a dupe - sent to PE
+ it = mObservers.find(avatar_id);
+ while (it != mObservers.end())
+ {
+ if (it->second == observer)
+ {
+ return;
+ }
+ else
+ {
+ ++it;
+ }
+ }
+
+ mObservers.insert(std::pair<LLUUID, LLAvatarPropertiesObserver*>(avatar_id, observer));
+}
+
+void LLAvatarPropertiesProcessor::removeObserver(const LLUUID& avatar_id, LLAvatarPropertiesObserver* observer)
+{
+ if (!observer)
+ {
+ return;
+ }
+
+ observer_multimap_t::iterator it;
+ it = mObservers.find(avatar_id);
+ while (it != mObservers.end())
+ {
+ if (it->second == observer)
+ {
+ mObservers.erase(it);
+ break;
+ }
+ else
+ {
+ ++it;
+ }
+ }
+}
+
+
+// IAN BUG - this is in no way linked to observers... problem?
+void LLAvatarPropertiesProcessor::sendAvatarPropertiesRequest(const LLUUID& avatar_id)
+{
+ lldebugs << "LLAvatarPropertiesProcessor::sendAvatarPropertiesRequest()" << llendl;
+ LLMessageSystem *msg = gMessageSystem;
+
+ msg->newMessageFast(_PREHASH_AvatarPropertiesRequest);
+ msg->nextBlockFast( _PREHASH_AgentData);
+ msg->addUUIDFast( _PREHASH_AgentID, gAgent.getID() );
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->addUUIDFast( _PREHASH_AvatarID, avatar_id);
+ gAgent.sendReliableMessage();
+
+}
+
+// static
+void LLAvatarPropertiesProcessor::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
+{
+ LLAvatarData avatar_data;
+
+ msg->getUUIDFast( _PREHASH_AgentData, _PREHASH_AgentID, avatar_data.agent_id);
+ msg->getUUIDFast( _PREHASH_AgentData, _PREHASH_AvatarID, avatar_data.avatar_id);
+ msg->getUUIDFast( _PREHASH_PropertiesData, _PREHASH_ImageID, avatar_data.image_id);
+ msg->getUUIDFast( _PREHASH_PropertiesData, _PREHASH_FLImageID, avatar_data.fl_image_id);
+ msg->getUUIDFast( _PREHASH_PropertiesData, _PREHASH_PartnerID, avatar_data.partner_id);
+ msg->getStringFast( _PREHASH_PropertiesData, _PREHASH_AboutText, avatar_data.about_text);
+ msg->getStringFast( _PREHASH_PropertiesData, _PREHASH_FLAboutText, avatar_data.fl_about_text);
+ msg->getStringFast( _PREHASH_PropertiesData, _PREHASH_BornOn, avatar_data.born_on);
+ msg->getString( "PropertiesData", "ProfileURL", avatar_data.profile_url);
+ msg->getU32Fast( _PREHASH_PropertiesData, _PREHASH_Flags, avatar_data.flags);
+
+ avatar_data.caption_index = 0;
+
+ S32 charter_member_size = 0;
+ charter_member_size = msg->getSize("PropertiesData", "CharterMember");
+ if(1 == charter_member_size)
+ {
+ msg->getBinaryData("PropertiesData", "CharterMember", &avatar_data.caption_index, 1);
+ }
+ else if(1 < charter_member_size)
+ {
+ msg->getString("PropertiesData", "CharterMember", avatar_data.caption_text);
+ }
+
+ LLAvatarPropertiesProcessor::observer_multimap_t observers = LLAvatarPropertiesProcessor::getInstance()->mObservers;
+
+ observer_multimap_t::iterator oi = observers.find(avatar_data.avatar_id);
+ observer_multimap_t::iterator end = observers.upper_bound(avatar_data.avatar_id);
+ for (; oi != end; ++oi)
+ {
+ oi->second->processAvatarProperties(avatar_data);
+ }
+}
+
diff --git a/indra/newview/llavatarpropertiesprocessor.h b/indra/newview/llavatarpropertiesprocessor.h
new file mode 100644
index 0000000000..e8c0e253d7
--- /dev/null
+++ b/indra/newview/llavatarpropertiesprocessor.h
@@ -0,0 +1,80 @@
+/**
+ * @file llavatarpropertiesprocessor.h
+ * @brief LLAvatatIconCtrl base class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLAVATARPROPERTIESPROCESSOR_H
+#define LL_LLAVATARPROPERTIESPROCESSOR_H
+
+#include "lluuid.h"
+#include <map>
+
+class LLMessageSystem;
+
+struct LLAvatarData
+{
+ LLUUID agent_id;
+ LLUUID avatar_id;
+ LLUUID image_id;
+ LLUUID fl_image_id;
+ LLUUID partner_id;
+ std::string about_text;
+ std::string fl_about_text;
+ std::string born_on;
+ std::string profile_url;
+ U8 caption_index;
+ std::string caption_text;
+ U32 flags;
+};
+
+class LLAvatarPropertiesObserver
+{
+public:
+ virtual ~LLAvatarPropertiesObserver() {}
+ virtual void processAvatarProperties(const LLAvatarData& avatar_data) = 0;
+};
+
+class LLAvatarPropertiesProcessor : public LLSingleton<LLAvatarPropertiesProcessor>
+{
+
+public:
+ virtual ~LLAvatarPropertiesProcessor() {}
+ void addObserver(const LLUUID& avatar_id, LLAvatarPropertiesObserver* observer);
+ void removeObserver(const LLUUID& avatar_id, LLAvatarPropertiesObserver* observer);
+
+ void sendAvatarPropertiesRequest(const LLUUID& avatar_id);
+ static void processAvatarPropertiesReply(LLMessageSystem *msg, void **);
+
+private:
+ typedef std::multimap<LLUUID, LLAvatarPropertiesObserver*> observer_multimap_t;
+ observer_multimap_t mObservers;
+};
+
+#endif // LL_LLAVATARPROPERTIESPROCESSOR_H
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index db28c7ad38..1844934e6a 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -684,7 +684,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
{
std::string notifyMsg = notification->getMessage();
if (!notifyMsg.empty())
- floater->addHistoryLine(notifyMsg,gSavedSettings.getColor4("SystemChatColor"));
+ floater->addHistoryLine(notifyMsg,gSavedSkinSettings.getColor4("SystemChatColor"));
}
}
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 2395f3c5ae..4e2eebbab1 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -77,7 +77,6 @@ const F32 AGENT_TYPING_TIMEOUT = 5.f; // seconds
LLChatBar *gChatBar = NULL;
// legacy calllback glue
-void toggleChatHistory(void* user_data);
void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel);
@@ -97,7 +96,7 @@ private:
//
LLChatBar::LLChatBar()
-: LLPanel(LLStringUtil::null, LLRect(), BORDER_NO),
+: LLPanel(),
mInputEditor(NULL),
mGestureLabelTimer(),
mLastSpecialChatChannel(0),
@@ -107,7 +106,7 @@ LLChatBar::LLChatBar()
{
setIsChrome(TRUE);
- #if !LL_RELEASE_FOR_DOWNLOAD
+#if !LL_RELEASE_FOR_DOWNLOAD
childDisplayNotFound();
#endif
}
@@ -123,34 +122,23 @@ LLChatBar::~LLChatBar()
BOOL LLChatBar::postBuild()
{
- childSetAction("History", toggleChatHistory, this);
- childSetCommitCallback("Say", onClickSay, this);
+ getChild<LLUICtrl>("Say")->setCommitCallback(boost::bind(&LLChatBar::onClickSay, this, _1));
// attempt to bind to an existing combo box named gesture
- setGestureCombo(getChild<LLComboBox>( "Gesture"));
-
- LLButton * sayp = getChild<LLButton>("Say");
- if(sayp)
- {
- setDefaultBtn(sayp);
- }
+ setGestureCombo(getChild<LLComboBox>( "Gesture", TRUE, FALSE));
mInputEditor = getChild<LLLineEditor>("Chat Editor");
- if (mInputEditor)
- {
- mInputEditor->setCallbackUserData(this);
- mInputEditor->setKeystrokeCallback(&onInputEditorKeystroke);
- mInputEditor->setFocusLostCallback(&onInputEditorFocusLost, this);
- mInputEditor->setFocusReceivedCallback( &onInputEditorGainFocus, this );
- mInputEditor->setCommitOnFocusLost( FALSE );
- mInputEditor->setRevertOnEsc( FALSE );
- mInputEditor->setIgnoreTab(TRUE);
- mInputEditor->setPassDelete(TRUE);
- mInputEditor->setReplaceNewlinesWithSpaces(FALSE);
-
- mInputEditor->setMaxTextLength(1023);
- mInputEditor->setEnableLineHistory(TRUE);
- }
+ mInputEditor->setKeystrokeCallback(&onInputEditorKeystroke, this);
+ mInputEditor->setFocusLostCallback(&onInputEditorFocusLost, this);
+ mInputEditor->setFocusReceivedCallback( &onInputEditorGainFocus, this );
+ mInputEditor->setCommitOnFocusLost( FALSE );
+ mInputEditor->setRevertOnEsc( FALSE );
+ mInputEditor->setIgnoreTab(TRUE);
+ mInputEditor->setPassDelete(TRUE);
+ mInputEditor->setReplaceNewlinesWithSpaces(FALSE);
+
+ mInputEditor->setMaxTextLength(1023);
+ mInputEditor->setEnableLineHistory(TRUE);
mIsBuilt = TRUE;
@@ -209,10 +197,7 @@ void LLChatBar::refresh()
gAgent.stopTyping();
}
- childSetValue("History", LLFloaterChat::instanceVisible(LLSD()));
-
childSetEnabled("Say", mInputEditor->getText().size() > 0);
- childSetEnabled("Shout", mInputEditor->getText().size() > 0);
}
@@ -311,8 +296,7 @@ void LLChatBar::setGestureCombo(LLComboBox* combo)
mGestureCombo = combo;
if (mGestureCombo)
{
- mGestureCombo->setCommitCallback(onCommitGesture);
- mGestureCombo->setCallbackUserData(this);
+ mGestureCombo->setCommitCallback(boost::bind(&LLChatBar::onCommitGesture, this, _1));
// now register observer since we have a place to put the results
mObserver = new LLChatBarGestureObserver(this);
@@ -553,20 +537,19 @@ void LLChatBar::onInputEditorGainFocus( LLFocusableElement* caller, void* userda
LLFloaterChat::setHistoryCursorAndScrollToEnd();
}
-// static
-void LLChatBar::onClickSay( LLUICtrl* ctrl, void* userdata )
+void LLChatBar::onClickSay( LLUICtrl* ctrl )
{
+ std::string cmd = ctrl->getValue().asString();
e_chat_type chat_type = CHAT_TYPE_NORMAL;
- if (ctrl->getValue().asString() == "shout")
+ if (cmd == "shout")
{
chat_type = CHAT_TYPE_SHOUT;
}
- else if (ctrl->getValue().asString() == "whisper")
+ else if (cmd == "whisper")
{
chat_type = CHAT_TYPE_WHISPER;
}
- LLChatBar* self = (LLChatBar*) userdata;
- self->sendChat(chat_type);
+ sendChat(chat_type);
}
void LLChatBar::sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate)
@@ -641,11 +624,9 @@ void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32
}
-// static
-void LLChatBar::onCommitGesture(LLUICtrl* ctrl, void* data)
+void LLChatBar::onCommitGesture(LLUICtrl* ctrl)
{
- LLChatBar* self = (LLChatBar*)data;
- LLCtrlListInterface* gestures = self->mGestureCombo ? self->mGestureCombo->getListInterface() : NULL;
+ LLCtrlListInterface* gestures = mGestureCombo ? mGestureCombo->getListInterface() : NULL;
if (gestures)
{
S32 index = gestures->getFirstSelectedIndex();
@@ -665,23 +646,17 @@ void LLChatBar::onCommitGesture(LLUICtrl* ctrl, void* data)
if (!revised_text.empty())
{
// Don't play nodding animation
- self->sendChatFromViewer(revised_text, CHAT_TYPE_NORMAL, FALSE);
+ sendChatFromViewer(revised_text, CHAT_TYPE_NORMAL, FALSE);
}
}
- self->mGestureLabelTimer.start();
- if (self->mGestureCombo != NULL)
+ mGestureLabelTimer.start();
+ if (mGestureCombo != NULL)
{
// free focus back to chat bar
- self->mGestureCombo->setFocus(FALSE);
+ mGestureCombo->setFocus(FALSE);
}
}
-void toggleChatHistory(void* user_data)
-{
- LLFloaterChat::toggleInstance(LLSD());
-}
-
-
class LLChatHandler : public LLCommandHandler
{
public:
diff --git a/indra/newview/llchatbar.h b/indra/newview/llchatbar.h
index 56a98a78f9..93421da34f 100644
--- a/indra/newview/llchatbar.h
+++ b/indra/newview/llchatbar.h
@@ -82,14 +82,14 @@ public:
LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
// callbacks
- static void onClickSay( LLUICtrl*, void* userdata );
+ void onClickSay(LLUICtrl* ctrl);
static void onTabClick( void* userdata );
static void onInputEditorKeystroke(LLLineEditor* caller, void* userdata);
static void onInputEditorFocusLost(LLFocusableElement* caller,void* userdata);
static void onInputEditorGainFocus(LLFocusableElement* caller,void* userdata);
- static void onCommitGesture(LLUICtrl* ctrl, void* data);
+ void onCommitGesture(LLUICtrl* ctrl);
static void startChat(const char* line);
static void stopChat();
diff --git a/indra/newview/llcloud.h b/indra/newview/llcloud.h
index f4ae03b689..155bf4eae9 100644
--- a/indra/newview/llcloud.h
+++ b/indra/newview/llcloud.h
@@ -72,7 +72,7 @@
#include "v3dmath.h"
#include "v4math.h"
#include "v4color.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "lldarray.h"
#include "llframetimer.h"
diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp
index 5f8d9ed27b..096d4fb8ed 100644
--- a/indra/newview/llcolorswatch.cpp
+++ b/indra/newview/llcolorswatch.cpp
@@ -37,12 +37,12 @@
// Linden library includes
#include "v4color.h"
+#include "llwindow.h" // setCursor()
// Project includes
#include "llui.h"
#include "llrender.h"
#include "lluiconstants.h"
-#include "llviewerwindow.h"
#include "llviewercontrol.h"
#include "llbutton.h"
#include "lltextbox.h"
@@ -53,58 +53,53 @@
static LLRegisterWidget<LLColorSwatchCtrl> r("color_swatch");
-LLColorSwatchCtrl::LLColorSwatchCtrl(const std::string& name, const LLRect& rect, const LLColor4& color,
- void (*commit_callback)(LLUICtrl* ctrl, void* userdata),
- void* userdata )
-: LLUICtrl(name, rect, TRUE, commit_callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP),
- mValid( TRUE ),
- mColor( color ),
- mBorderColor( gColors.getColor("DefaultHighlightLight") ),
- mCanApplyImmediately(FALSE),
- mOnCancelCallback(NULL),
- mOnSelectCallback(NULL)
+LLColorSwatchCtrl::Params::Params()
+: color("color", LLColor4::white),
+ can_apply_immediately("can_apply_immediately", false),
+ alpha_background_image("alpha_background_image"),
+ border_color("border_color"),
+ label_width("label_width", -1),
+ caption_text("caption_text"),
+ border("border")
{
- mCaption = new LLTextBox( name,
- LLRect( 0, BTN_HEIGHT_SMALL, getRect().getWidth(), 0 ),
- name,
- LLFontGL::getFontSansSerifSmall() );
- mCaption->setFollows( FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM );
- addChild( mCaption );
-
- // Scalable UI made this off-by-one, I don't know why. JC
- LLRect border_rect(0, getRect().getHeight()-1, getRect().getWidth()-1, 0);
- border_rect.mBottom += BTN_HEIGHT_SMALL;
- mBorder = new LLViewBorder(std::string("border"), border_rect, LLViewBorder::BEVEL_IN);
- addChild(mBorder);
-
- mAlphaGradientImage = LLUI::getUIImage("color_swatch_alpha.tga");
+ name = "colorswatch";
}
-LLColorSwatchCtrl::LLColorSwatchCtrl(const std::string& name, const LLRect& rect, const std::string& label, const LLColor4& color,
- void (*commit_callback)(LLUICtrl* ctrl, void* userdata),
- void* userdata )
-: LLUICtrl(name, rect, TRUE, commit_callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP),
+LLColorSwatchCtrl::LLColorSwatchCtrl(const Params& p)
+: LLUICtrl(p),
mValid( TRUE ),
- mColor( color ),
- mBorderColor( gColors.getColor("DefaultHighlightLight") ),
- mCanApplyImmediately(FALSE),
- mOnCancelCallback(NULL),
- mOnSelectCallback(NULL)
-{
- mCaption = new LLTextBox( label,
- LLRect( 0, BTN_HEIGHT_SMALL, getRect().getWidth(), 0 ),
- label,
- LLFontGL::getFontSansSerifSmall() );
- mCaption->setFollows( FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM );
+ mColor(p.color),
+ mCanApplyImmediately(p.can_apply_immediately),
+ mAlphaGradientImage(p.alpha_background_image),
+ mOnCancelCallback(p.cancel_callback()),
+ mOnSelectCallback(p.select_callback()),
+ mBorderColor(p.border_color()),
+ mLabelWidth(p.label_width)
+{
+ LLTextBox::Params tp = p.caption_text;
+ // label_width is specified, not -1
+ if(mLabelWidth!= -1)
+ {
+ tp.rect(LLRect( 0, BTN_HEIGHT_SMALL, mLabelWidth, 0 ));
+ }
+ else
+ {
+ tp.rect(LLRect( 0, BTN_HEIGHT_SMALL, getRect().getWidth(), 0 ));
+ }
+
+ tp.text(p.label);
+ mCaption = LLUICtrlFactory::create<LLTextBox>(tp);
addChild( mCaption );
- // Scalable UI made this off-by-one, I don't know why. JC
- LLRect border_rect(0, getRect().getHeight()-1, getRect().getWidth()-1, 0);
+ LLRect border_rect = getLocalRect();
+ border_rect.mTop -= 1;
+ border_rect.mRight -=1;
border_rect.mBottom += BTN_HEIGHT_SMALL;
- mBorder = new LLViewBorder(std::string("border"), border_rect, LLViewBorder::BEVEL_IN);
- addChild(mBorder);
- mAlphaGradientImage = LLUI::getUIImage("color_swatch_alpha.tga");
+ LLViewBorder::Params params = p.border;
+ params.rect(border_rect);
+ mBorder = LLUICtrlFactory::create<LLViewBorder> (params);
+ addChild(mBorder);
}
LLColorSwatchCtrl::~LLColorSwatchCtrl ()
@@ -114,9 +109,8 @@ LLColorSwatchCtrl::~LLColorSwatchCtrl ()
if (pickerp)
{
pickerp->cancelSelection();
- pickerp->close();
+ pickerp->closeFloater();
}
- mAlphaGradientImage = NULL;
}
BOOL LLColorSwatchCtrl::handleDoubleClick(S32 x, S32 y, MASK mask)
@@ -206,7 +200,7 @@ void LLColorSwatchCtrl::draw()
mBorder->setKeyboardFocusHighlight(hasFocus());
// Draw border
LLRect border( 0, getRect().getHeight(), getRect().getWidth(), BTN_HEIGHT_SMALL );
- gl_rect_2d( border, mBorderColor, FALSE );
+ gl_rect_2d( border, mBorderColor.get(), FALSE );
LLRect interior = border;
interior.stretch( -1 );
@@ -264,7 +258,7 @@ void LLColorSwatchCtrl::setEnabled( BOOL enabled )
if (pickerp)
{
pickerp->cancelSelection();
- pickerp->close();
+ pickerp->closeFloater();
}
}
}
@@ -295,11 +289,11 @@ void LLColorSwatchCtrl::onColorChanged ( void* data, EColorPickOp pick_op )
if (pick_op == COLOR_CANCEL && subject->mOnCancelCallback)
{
- subject->mOnCancelCallback(subject, subject->mCallbackUserData);
+ subject->mOnCancelCallback( subject, LLSD());
}
else if (pick_op == COLOR_SELECT && subject->mOnSelectCallback)
{
- subject->mOnSelectCallback(subject, subject->mCallbackUserData);
+ subject->mOnSelectCallback( subject, LLSD() );
}
else
{
@@ -343,59 +337,3 @@ void LLColorSwatchCtrl::showPicker(BOOL take_focus)
}
}
-// virtual
-LLXMLNodePtr LLColorSwatchCtrl::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- node->createChild("color", TRUE)->setFloatValue(4, mColor.mV);
-
- node->createChild("border_color", TRUE)->setFloatValue(4, mBorderColor.mV);
-
- if (mCaption)
- {
- node->createChild("label", TRUE)->setStringValue(mCaption->getText());
- }
-
- node->createChild("can_apply_immediately", TRUE)->setBoolValue(mCanApplyImmediately);
-
- return node;
-}
-
-LLView* LLColorSwatchCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("colorswatch");
- node->getAttributeString("name", name);
-
- std::string label;
- node->getAttributeString("label", label);
-
- LLColor4 color(1.f, 1.f, 1.f, 1.f);
- node->getAttributeColor("initial_color", color);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- BOOL can_apply_immediately = FALSE;
- node->getAttributeBOOL("can_apply_immediately", can_apply_immediately);
-
- LLUICtrlCallback callback = NULL;
-
- if (label.empty())
- {
- label.assign(node->getValue());
- }
-
- LLColorSwatchCtrl* color_swatch = new LLColorSwatchCtrl(
- name,
- rect,
- label,
- color,
- callback,
- NULL );
-
- color_swatch->setCanApplyImmediately(can_apply_immediately);
- color_swatch->initFromXML(node, parent);
-
- return color_swatch;
-}
diff --git a/indra/newview/llcolorswatch.h b/indra/newview/llcolorswatch.h
index 0dd021f51f..a05926c2f5 100644
--- a/indra/newview/llcolorswatch.h
+++ b/indra/newview/llcolorswatch.h
@@ -37,6 +37,7 @@
#include "v4color.h"
#include "llfloater.h"
#include "llviewerimage.h"
+#include "lltextbox.h"
//
// Classes
@@ -57,53 +58,65 @@ public:
COLOR_CANCEL
} EColorPickOp;
- LLColorSwatchCtrl(const std::string& name, const LLRect& rect, const LLColor4& color,
- void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata),
- void* callback_userdata);
- LLColorSwatchCtrl(const std::string& name, const LLRect& rect, const std::string& label, const LLColor4& color,
- void (*on_commit_callback)(LLUICtrl* ctrl, void* userdata),
- void* callback_userdata);
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<LLColor4> color;
+ Optional<bool> can_apply_immediately;
+ Optional<LLUIImage*> alpha_background_image;
+ Optional<commit_callback_t> cancel_callback;
+ Optional<commit_callback_t> select_callback;
+ Optional<LLUIColor> border_color;
+ Optional<S32> label_width;
+
+ Optional<LLTextBox::Params> caption_text;
+ Optional<LLViewBorder::Params> border;
+ Params();
+ };
+protected:
+ LLColorSwatchCtrl(const Params& p);
+ friend class LLUICtrlFactory;
+public:
~LLColorSwatchCtrl ();
- virtual void setValue(const LLSD& value);
+ /*virtual*/ void setValue(const LLSD& value);
- virtual LLSD getValue() const { return mColor.getValue(); }
+ /*virtual*/ LLSD getValue() const { return mColor.getValue(); }
const LLColor4& get() { return mColor; }
void set(const LLColor4& color, BOOL update_picker = FALSE, BOOL from_event = FALSE);
void setOriginal(const LLColor4& color);
void setValid(BOOL valid);
void setLabel(const std::string& label);
+ void setLabelWidth(S32 label_width) {mLabelWidth =label_width;}
void setCanApplyImmediately(BOOL apply) { mCanApplyImmediately = apply; }
- void setOnCancelCallback(LLUICtrlCallback cb) { mOnCancelCallback = cb; }
- void setOnSelectCallback(LLUICtrlCallback cb) { mOnSelectCallback = cb; }
+ void setOnCancelCallback(commit_callback_t cb) { mOnCancelCallback = cb; }
+ void setOnSelectCallback(commit_callback_t cb) { mOnSelectCallback = cb; }
void setFallbackImageName(const std::string& name) { mFallbackImageName = name; }
void showPicker(BOOL take_focus);
- virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
- virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
- virtual BOOL handleDoubleClick(S32 x,S32 y,MASK mask);
- virtual BOOL handleHover(S32 x, S32 y, MASK mask);
- virtual BOOL handleUnicodeCharHere(llwchar uni_char);
- virtual void draw();
- virtual void setEnabled( BOOL enabled );
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+ /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleDoubleClick(S32 x,S32 y,MASK mask);
+ /*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
+ /*virtual*/ BOOL handleUnicodeCharHere(llwchar uni_char);
+ /*virtual*/ void draw();
+ /*virtual*/ void setEnabled( BOOL enabled );
static void onColorChanged ( void* data, EColorPickOp pick_op = COLOR_CHANGE );
protected:
BOOL mValid;
LLColor4 mColor;
- LLColor4 mBorderColor;
+ LLUIColor mBorderColor;
LLTextBox* mCaption;
LLHandle<LLFloater> mPickerHandle;
LLViewBorder* mBorder;
BOOL mCanApplyImmediately;
- LLUICtrlCallback mOnCancelCallback;
- LLUICtrlCallback mOnSelectCallback;
+ commit_callback_t mOnCancelCallback;
+ commit_callback_t mOnSelectCallback;
+ S32 mLabelWidth;
LLPointer<LLUIImage> mAlphaGradientImage;
std::string mFallbackImageName;
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
index 689033a07b..096777ddd4 100644
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -46,6 +46,7 @@
#include "llassetuploadqueue.h"
#include "llassetuploadresponders.h"
#include "llchat.h"
+#include "llfloaterreg.h"
#include "llviewerwindow.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
@@ -60,23 +61,17 @@
#include "llfloaterchat.h"
#include "llviewerstats.h"
#include "lluictrlfactory.h"
+#include "lltrans.h"
#include "llselectmgr.h"
+// *TODO: This should be separated into the script queue, and the floater views of that queue.
+// There should only be one floater class that can view any queue type
+
///----------------------------------------------------------------------------
/// Local function declarations, constants, enums, and typedefs
///----------------------------------------------------------------------------
-// *TODO:Translate
-const std::string COMPILE_QUEUE_TITLE("Recompilation Progress");
-const std::string COMPILE_START_STRING("recompile");
-const std::string RESET_QUEUE_TITLE("Reset Progress");
-const std::string RESET_START_STRING("reset");
-const std::string RUN_QUEUE_TITLE("Set Running Progress");
-const std::string RUN_START_STRING("set running");
-const std::string NOT_RUN_QUEUE_TITLE("Set Not Running Progress");
-const std::string NOT_RUN_START_STRING("set not running");
-
struct LLScriptQueueData
{
LLUUID mQueueID;
@@ -92,54 +87,26 @@ struct LLScriptQueueData
/// Class LLFloaterScriptQueue
///----------------------------------------------------------------------------
-// static
-LLMap<LLUUID, LLFloaterScriptQueue*> LLFloaterScriptQueue::sInstances;
-
-
// Default constructor
-LLFloaterScriptQueue::LLFloaterScriptQueue(const std::string& name,
- const LLRect& rect,
- const std::string& title,
- const std::string& start_string) :
- LLFloater(name, rect, title,
- RESIZE_YES, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT,
- DRAG_ON_TOP, MINIMIZE_YES, CLOSE_YES)
+LLFloaterScriptQueue::LLFloaterScriptQueue(const LLSD& key) :
+ LLFloater(key),
+ mDone(FALSE)
{
- mID.generate();
-
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_queue.xml");
-
- childSetAction("close",onCloseBtn,this);
- childSetEnabled("close",FALSE);
-
- setTitle(title);
-
- LLRect curRect = getRect();
- translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
-
- mStartString = start_string;
- mDone = FALSE;
- sInstances.addData(mID, this);
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_queue.xml", FALSE);
}
// Destroys the object
LLFloaterScriptQueue::~LLFloaterScriptQueue()
{
- sInstances.removeData(mID);
}
-// find an instance by ID. Return NULL if it does not exist.
-// static
-LLFloaterScriptQueue* LLFloaterScriptQueue::findInstance(const LLUUID& id)
+BOOL LLFloaterScriptQueue::postBuild()
{
- if(sInstances.checkData(id))
- {
- return sInstances.getData(id);
- }
- return NULL;
+ childSetAction("close",onCloseBtn,this);
+ childSetEnabled("close",FALSE);
+ return TRUE;
}
-
// This is the callback method for the viewer object currently being
// worked on.
// NOT static, virtual!
@@ -185,7 +152,7 @@ void LLFloaterScriptQueue::inventoryChanged(LLViewerObject* viewer_object,
void LLFloaterScriptQueue::onCloseBtn(void* user_data)
{
LLFloaterScriptQueue* self = (LLFloaterScriptQueue*)user_data;
- self->close();
+ self->closeFloater();
}
void LLFloaterScriptQueue::addObject(const LLUUID& id)
@@ -210,10 +177,12 @@ BOOL LLFloaterScriptQueue::start()
n_objects = selectHandle->getRootObjectCount();
}
- buffer = llformat("Starting %s of %d items.", mStartString.c_str(), n_objects); // *TODO: Translate
+ LLStringUtil::format_map_t args;
+ args["[START]"] = mStartString;
+ args["[COUNT]"] = llformat ("%d", mObjectIDs.count());
+ buffer = getString ("Starting", args);
- LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
- list->addCommentText(buffer);
+ getChild<LLScrollListCtrl>("queue output")->setCommentText(buffer);
return nextObject();
}
@@ -245,12 +214,8 @@ BOOL LLFloaterScriptQueue::nextObject()
} while((mObjectIDs.count() > 0) && !successful_start);
if(isDone() && !mDone)
{
-
- LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
-
mDone = TRUE;
- std::string buffer = "Done."; // *TODO: Translate
- list->addCommentText(buffer);
+ getChild<LLScrollListCtrl>("queue output")->setCommentText(getString("Done"));
childSetEnabled("close",TRUE);
}
return successful_start;
@@ -275,7 +240,7 @@ BOOL LLFloaterScriptQueue::popNext()
{
llinfos << "LLFloaterScriptQueue::popNext() requesting inv for "
<< mCurrentObjectID << llendl;
- LLUUID* id = new LLUUID(mID);
+ LLUUID* id = new LLUUID(getKey().asUUID());
registerVOInventoryListener(obj,id);
requestVOInventory();
rv = TRUE;
@@ -289,64 +254,48 @@ BOOL LLFloaterScriptQueue::popNext()
/// Class LLFloaterCompileQueue
///----------------------------------------------------------------------------
-// static
-LLFloaterCompileQueue* LLFloaterCompileQueue::create(BOOL mono)
+class LLCompileFloaterUploadQueueSupplier : public LLAssetUploadQueueSupplier
{
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("CompileOutputRect");
- rect.translate(left - rect.mLeft, top - rect.mTop);
- LLFloaterCompileQueue* new_queue = new LLFloaterCompileQueue("queue", rect);
+public:
- class LLCompileFloaterUploadQueueSupplier : public LLAssetUploadQueueSupplier
+ LLCompileFloaterUploadQueueSupplier(const LLUUID& queue_id) :
+ mQueueId(queue_id)
{
- public:
-
- LLCompileFloaterUploadQueueSupplier(const LLUUID& queue_id) :
- mQueueId(queue_id)
- {
- }
+ }
- virtual LLAssetUploadQueue* get() const
+ virtual LLAssetUploadQueue* get() const
+ {
+ LLFloaterCompileQueue* queue = LLFloaterReg::findTypedInstance<LLFloaterCompileQueue>("compile_queue", LLSD(mQueueId));
+ if(NULL == queue)
{
- LLFloaterCompileQueue* queue =
- (LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
-
- if(NULL == queue)
- {
- return NULL;
- }
-
- return queue->mUploadQueue;
+ return NULL;
}
+ return queue->getUploadQueue();
+ }
- virtual void log(std::string message) const
+ virtual void log(std::string message) const
+ {
+ LLFloaterCompileQueue* queue = LLFloaterReg::findTypedInstance<LLFloaterCompileQueue>("compile_queue", LLSD(mQueueId));
+ if(NULL == queue)
{
- LLFloaterCompileQueue* queue =
- (LLFloaterCompileQueue*) LLFloaterScriptQueue::findInstance(mQueueId);
-
- if(NULL == queue)
- {
- return;
- }
-
- LLScrollListCtrl* list = queue->getChild<LLScrollListCtrl>("queue output");
- list->addCommentText(message.c_str());
+ return;
}
+
+ queue->getChild<LLScrollListCtrl>("queue output")->setCommentText(message);
+ }
- private:
- LLUUID mQueueId;
- };
-
- new_queue->mUploadQueue = new LLAssetUploadQueue(new LLCompileFloaterUploadQueueSupplier(new_queue->getID()));
- new_queue->mMono = mono;
- new_queue->open();
- return new_queue;
-}
+private:
+ LLUUID mQueueId;
+};
-LLFloaterCompileQueue::LLFloaterCompileQueue(const std::string& name, const LLRect& rect)
-: LLFloaterScriptQueue(name, rect, COMPILE_QUEUE_TITLE, COMPILE_START_STRING)
-{ }
+LLFloaterCompileQueue::LLFloaterCompileQueue(const LLSD& key)
+ : LLFloaterScriptQueue(key)
+{
+ setTitle(LLTrans::getString("CompileQueueTitle"));
+ setStartString(LLTrans::getString("CompileQueueStart"));
+
+ mUploadQueue = new LLAssetUploadQueue(new LLCompileFloaterUploadQueueSupplier(key.asUUID()));
+}
LLFloaterCompileQueue::~LLFloaterCompileQueue()
{
@@ -391,7 +340,7 @@ void LLFloaterCompileQueue::handleInventory(LLViewerObject *viewer_object,
for(iter = asset_item_map.begin(); iter != asset_item_map.end(); iter++)
{
LLInventoryItem *itemp = iter->second;
- LLScriptQueueData* datap = new LLScriptQueueData(getID(),
+ LLScriptQueueData* datap = new LLScriptQueueData(getKey().asUUID(),
itemp->getName(),
viewer_object->getID(),
itemp->getUUID());
@@ -419,9 +368,12 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
{
llinfos << "LLFloaterCompileQueue::scriptArrived()" << llendl;
LLScriptQueueData* data = (LLScriptQueueData*)user_data;
- if(!data) return;
- LLFloaterCompileQueue* queue = static_cast<LLFloaterCompileQueue*>
- (LLFloaterScriptQueue::findInstance(data->mQueueID));
+ if(!data)
+ {
+ return;
+ }
+ LLFloaterCompileQueue* queue = LLFloaterReg::findTypedInstance<LLFloaterCompileQueue>("compile_queue", data->mQueueID);
+
std::string buffer;
if(queue && (0 == status))
{
@@ -447,13 +399,13 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
file.read(script_data, script_size);
queue->mUploadQueue->queue(filename, data->mTaskId,
- data->mItemId, is_running, queue->mMono, queue->getID(),
- script_data, script_size, data->mScriptName);
+ data->mItemId, is_running, queue->mMono, queue->getKey().asUUID(),
+ script_data, script_size, data->mScriptName);
}
else
{
// It's now in the file, now compile it.
- buffer = std::string("Downloaded, now compiling: ") + data->mScriptName; // *TODO: Translate
+ buffer = LLTrans::getString("CompileQueueDownloadedCompiling") + (": ") + data->mScriptName;
// Write script to local file for compilation.
LLFILE *fp = LLFile::fopen(filename, "wb"); /*Flawfinder: ignore*/
@@ -492,19 +444,19 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status )
{
- LLChat chat(std::string("Script not found on server.")); // *TODO: Translate
+ LLChat chat(LLTrans::getString("CompileQueueScriptNotFound"));
LLFloaterChat::addChat(chat);
- buffer = std::string("Problem downloading: ") + data->mScriptName; // *TODO: Translate
+ buffer = LLTrans::getString("CompileQueueProblemDownloading") + (": ") + data->mScriptName;
}
else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)
{
- LLChat chat(std::string("Insufficient permissions to download a script.")); // *TODO: Translate
+ LLChat chat(LLTrans::getString("CompileQueueInsufficientPermDownload"));
LLFloaterChat::addChat(chat);
- buffer = std::string("Insufficient permissions for: ") + data->mScriptName; // *TODO: Translate
+ buffer = LLTrans::getString("CompileQueueInsufficientPermFor") + (": ") + data->mScriptName;
}
else
{
- buffer = std::string("Unknown failure to download ") + data->mScriptName; // *TODO: Translate
+ buffer = LLTrans::getString("CompileQueueUnknownFailure") + (" ") + data->mScriptName;
}
llwarns << "Problem downloading script asset." << llendl;
@@ -512,8 +464,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
}
if(queue && (buffer.size() > 0))
{
- LLScrollListCtrl* list = queue->getChild<LLScrollListCtrl>("queue output");
- list->addCommentText(buffer);
+ queue->getChild<LLScrollListCtrl>("queue output")->setCommentText(buffer);
}
delete data;
}
@@ -536,8 +487,7 @@ void LLFloaterCompileQueue::onSaveBytecodeComplete(const LLUUID& asset_id, void*
{
llinfos << "LLFloaterCompileQueue::onSaveBytecodeComplete()" << llendl;
LLCompileQueueData* data = (LLCompileQueueData*)user_data;
- LLFloaterCompileQueue* queue = static_cast<LLFloaterCompileQueue*>
- (LLFloaterScriptQueue::findInstance(data->mQueueID));
+ LLFloaterCompileQueue* queue = LLFloaterReg::findTypedInstance<LLFloaterCompileQueue>("compile_queue", data->mQueueID);
if(queue && (0 == status) && data)
{
queue->saveItemByItemID(data->mItemId);
@@ -587,7 +537,7 @@ void LLFloaterCompileQueue::compile(const std::string& filename,
llinfos << "compile successful." << llendl;
// Save LSL bytecode
- LLCompileQueueData* data = new LLCompileQueueData(mID, item_id);
+ LLCompileQueueData* data = new LLCompileQueueData(getKey().asUUID(), item_id);
gAssetStorage->storeAssetData(dst_filename, new_asset_id,
LLAssetType::AT_LSL_BYTECODE,
&LLFloaterCompileQueue::onSaveBytecodeComplete,
@@ -656,23 +606,13 @@ void LLFloaterCompileQueue::saveItemByItemID(const LLUUID& asset_id)
/// Class LLFloaterResetQueue
///----------------------------------------------------------------------------
-// static
-LLFloaterResetQueue* LLFloaterResetQueue::create()
+LLFloaterResetQueue::LLFloaterResetQueue(const LLSD& key)
+ : LLFloaterScriptQueue(key)
{
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("CompileOutputRect");
- rect.translate(left - rect.mLeft, top - rect.mTop);
- LLFloaterResetQueue* new_queue = new LLFloaterResetQueue("queue", rect);
- gFloaterView->addChild(new_queue);
- new_queue->open();
- return new_queue;
+ setTitle(LLTrans::getString("ResetQueueTitle"));
+ setStartString(LLTrans::getString("ResetQueueStart"));
}
-LLFloaterResetQueue::LLFloaterResetQueue(const std::string& name, const LLRect& rect)
-: LLFloaterScriptQueue(name, rect, RESET_QUEUE_TITLE, RESET_START_STRING)
-{ }
-
LLFloaterResetQueue::~LLFloaterResetQueue()
{
}
@@ -695,10 +635,9 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
if (object)
{
LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
- LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
std::string buffer;
- buffer = std::string("Resetting: ") + item->getName(); // *TODO: Translate
- list->addCommentText(buffer);
+ buffer = getString("Resetting") + (": ") + item->getName();
+ getChild<LLScrollListCtrl>("queue output")->setCommentText(buffer);
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_ScriptReset);
msg->nextBlockFast(_PREHASH_AgentData);
@@ -719,22 +658,13 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
/// Class LLFloaterRunQueue
///----------------------------------------------------------------------------
-// static
-LLFloaterRunQueue* LLFloaterRunQueue::create()
+LLFloaterRunQueue::LLFloaterRunQueue(const LLSD& key)
+ : LLFloaterScriptQueue(key)
{
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("CompileOutputRect");
- rect.translate(left - rect.mLeft, top - rect.mTop);
- LLFloaterRunQueue* new_queue = new LLFloaterRunQueue("queue", rect);
- new_queue->open(); /*Flawfinder: ignore*/
- return new_queue;
+ setTitle(LLTrans::getString("RunQueueTitle"));
+ setStartString(LLTrans::getString("RunQueueStart"));
}
-LLFloaterRunQueue::LLFloaterRunQueue(const std::string& name, const LLRect& rect)
-: LLFloaterScriptQueue(name, rect, RUN_QUEUE_TITLE, RUN_START_STRING)
-{ }
-
LLFloaterRunQueue::~LLFloaterRunQueue()
{
}
@@ -759,8 +689,8 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
std::string buffer;
- buffer = std::string("Running: ") + item->getName(); // *TODO: Translate
- list->addCommentText(buffer);
+ buffer = getString("Running") + (": ") + item->getName();
+ list->setCommentText(buffer);
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_SetScriptRunning);
@@ -783,22 +713,13 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
/// Class LLFloaterNotRunQueue
///----------------------------------------------------------------------------
-// static
-LLFloaterNotRunQueue* LLFloaterNotRunQueue::create()
+LLFloaterNotRunQueue::LLFloaterNotRunQueue(const LLSD& key)
+ : LLFloaterScriptQueue(key)
{
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("CompileOutputRect");
- rect.translate(left - rect.mLeft, top - rect.mTop);
- LLFloaterNotRunQueue* new_queue = new LLFloaterNotRunQueue("queue", rect);
- new_queue->open(); /*Flawfinder: ignore*/
- return new_queue;
+ setTitle(LLTrans::getString("NotRunQueueTitle"));
+ setStartString(LLTrans::getString("NotRunQueueStart"));
}
-LLFloaterNotRunQueue::LLFloaterNotRunQueue(const std::string& name, const LLRect& rect)
-: LLFloaterScriptQueue(name, rect, NOT_RUN_QUEUE_TITLE, NOT_RUN_START_STRING)
-{ }
-
LLFloaterNotRunQueue::~LLFloaterNotRunQueue()
{
}
@@ -823,8 +744,8 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj,
LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
std::string buffer;
- buffer = std::string("Not running: ") +item->getName(); // *TODO: Translate
- list->addCommentText(buffer);
+ buffer = getString("NotRunning") + (": ") +item->getName();
+ list->setCommentText(buffer);
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_SetScriptRunning);
diff --git a/indra/newview/llcompilequeue.h b/indra/newview/llcompilequeue.h
index 51240423ba..063d573239 100644
--- a/indra/newview/llcompilequeue.h
+++ b/indra/newview/llcompilequeue.h
@@ -59,20 +59,20 @@
class LLFloaterScriptQueue : public LLFloater, public LLVOInventoryListener
{
public:
+ LLFloaterScriptQueue(const LLSD& key);
+ virtual ~LLFloaterScriptQueue();
+
+ /*virtual*/ BOOL postBuild();
+
+ void setMono(bool mono) { mMono = mono; }
+
// addObject() accepts an object id.
void addObject(const LLUUID& id);
// start() returns TRUE if the queue has started, otherwise FALSE.
BOOL start();
-
- // find an instance by ID. Return NULL if it does not exist.
- static LLFloaterScriptQueue* findInstance(const LLUUID& id);
-
+
protected:
- LLFloaterScriptQueue(const std::string& name, const LLRect& rect,
- const std::string& title, const std::string& start_string);
- virtual ~LLFloaterScriptQueue();
-
// This is the callback method for the viewer object currently
// being worked on.
/*virtual*/ void inventoryChanged(LLViewerObject* obj,
@@ -94,8 +94,7 @@ protected:
BOOL nextObject();
BOOL popNext();
- // Get this instances ID.
- const LLUUID& getID() const { return mID; }
+ void setStartString(const std::string& s) { mStartString = s; }
protected:
// UI
@@ -107,10 +106,8 @@ protected:
LLUUID mCurrentObjectID;
BOOL mDone;
- LLUUID mID;
- static LLMap<LLUUID, LLFloaterScriptQueue*> sInstances;
-
std::string mStartString;
+ BOOL mMono;
};
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -131,20 +128,19 @@ class LLAssetUploadQueue;
class LLFloaterCompileQueue : public LLFloaterScriptQueue
{
+ friend class LLFloaterReg;
public:
- // Use this method to create a compile queue. Once created, it
- // will be responsible for it's own destruction.
- static LLFloaterCompileQueue* create(BOOL mono);
-
static void onSaveBytecodeComplete(const LLUUID& asset_id,
void* user_data,
S32 status);
// remove any object in mScriptScripts with the matching uuid.
void removeItemByItemID(const LLUUID& item_id);
+
+ LLAssetUploadQueue* getUploadQueue() { return mUploadQueue; }
protected:
- LLFloaterCompileQueue(const std::string& name, const LLRect& rect);
+ LLFloaterCompileQueue(const LLSD& key);
virtual ~LLFloaterCompileQueue();
// This is called by inventoryChanged
@@ -173,12 +169,11 @@ protected:
// find InventoryItem given item id.
const LLInventoryItem* findItemByItemID(const LLUUID& item_id) const;
-
+
protected:
LLViewerInventoryItem::item_array_t mCurrentScripts;
private:
- BOOL mMono; // Compile to mono.
LLAssetUploadQueue* mUploadQueue;
};
@@ -190,20 +185,14 @@ private:
class LLFloaterResetQueue : public LLFloaterScriptQueue
{
-public:
- // Use this method to create a reset queue. Once created, it
- // will be responsible for it's own destruction.
- static LLFloaterResetQueue* create();
-
+ friend class LLFloaterReg;
protected:
- LLFloaterResetQueue(const std::string& name, const LLRect& rect);
+ LLFloaterResetQueue(const LLSD& key);
virtual ~LLFloaterResetQueue();
// This is called by inventoryChanged
virtual void handleInventory(LLViewerObject* viewer_obj,
InventoryObjectList* inv);
-
-protected:
};
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -214,20 +203,14 @@ protected:
class LLFloaterRunQueue : public LLFloaterScriptQueue
{
-public:
- // Use this method to create a run queue. Once created, it
- // will be responsible for it's own destruction.
- static LLFloaterRunQueue* create();
-
+ friend class LLFloaterReg;
protected:
- LLFloaterRunQueue(const std::string& name, const LLRect& rect);
+ LLFloaterRunQueue(const LLSD& key);
virtual ~LLFloaterRunQueue();
// This is called by inventoryChanged
virtual void handleInventory(LLViewerObject* viewer_obj,
InventoryObjectList* inv);
-
-protected:
};
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -238,20 +221,14 @@ protected:
class LLFloaterNotRunQueue : public LLFloaterScriptQueue
{
-public:
- // Use this method to create a not run queue. Once created, it
- // will be responsible for it's own destruction.
- static LLFloaterNotRunQueue* create();
-
+ friend class LLFloaterReg;
protected:
- LLFloaterNotRunQueue(const std::string& name, const LLRect& rect);
+ LLFloaterNotRunQueue(const LLSD& key);
virtual ~LLFloaterNotRunQueue();
// This is called by inventoryChanged
virtual void handleInventory(LLViewerObject* viewer_obj,
InventoryObjectList* inv);
-
-protected:
};
#endif // LL_LLCOMPILEQUEUE_H
diff --git a/indra/newview/llcurrencyuimanager.cpp b/indra/newview/llcurrencyuimanager.cpp
index 71ecca5d41..19a560abf2 100644
--- a/indra/newview/llcurrencyuimanager.cpp
+++ b/indra/newview/llcurrencyuimanager.cpp
@@ -46,6 +46,7 @@
#include "llviewchildren.h"
#include "llxmlrpctransaction.h"
#include "llviewernetwork.h"
+#include "llpanel.h"
const F64 CURRENCY_ESTIMATE_FREQUENCY = 2.0;
@@ -355,8 +356,7 @@ void LLCurrencyUIManager::Impl::prepare()
if (lindenAmount)
{
lindenAmount->setPrevalidate(LLLineEditor::prevalidateNonNegativeS32);
- lindenAmount->setKeystrokeCallback(onCurrencyKey);
- lindenAmount->setCallbackUserData(this);
+ lindenAmount->setKeystrokeCallback(onCurrencyKey, this);
}
}
diff --git a/indra/newview/lldebugmessagebox.cpp b/indra/newview/lldebugmessagebox.cpp
index 4188ecc0e2..9eee3b239c 100644
--- a/indra/newview/lldebugmessagebox.cpp
+++ b/indra/newview/lldebugmessagebox.cpp
@@ -50,32 +50,69 @@
std::map<std::string, LLDebugVarMessageBox*> LLDebugVarMessageBox::sInstances;
LLDebugVarMessageBox::LLDebugVarMessageBox(const std::string& title, EDebugVarType var_type, void *var) :
- LLFloater(std::string("msg box"), LLRect(10,160,400,10), title),
+ LLFloater(),
mVarType(var_type), mVarData(var), mAnimate(FALSE)
{
+ setRect(LLRect(10,160,400,10));
+
+ LLSliderCtrl::Params slider_p;
+ slider_p.label(title);
+ slider_p.label_width(70);
+ slider_p.text_width(40);
+ slider_p.can_edit_text(true);
+ slider_p.show_text(true);
+
+ mSlider1 = NULL;
+ mSlider2 = NULL;
+ mSlider3 = NULL;
+
switch(var_type)
{
case VAR_TYPE_F32:
- mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), title, NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, *((F32*)var), -100.f, 100.f, 0.1f, LLStringUtil::null);
- mSlider1->setPrecision(3);
+ slider_p.name("slider 1");
+ slider_p.rect(LLRect(20,130,190,110));
+ slider_p.initial_value(*((F32*)var));
+ slider_p.min_value(-100.f);
+ slider_p.max_value(100.f);
+ slider_p.increment(0.1f);
+ slider_p.decimal_digits(3);
+ mSlider1 = LLUICtrlFactory::create<LLSliderCtrl>(slider_p);
addChild(mSlider1);
- mSlider2 = NULL;
- mSlider3 = NULL;
break;
case VAR_TYPE_S32:
- mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,100,190,80), title, NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, (F32)*((S32*)var), -255.f, 255.f, 1.f, LLStringUtil::null);
- mSlider1->setPrecision(0);
+ slider_p.name("slider 1");
+ slider_p.rect(LLRect(20,100,190,80));
+ slider_p.initial_value((F32)*((S32*)var));
+ slider_p.min_value(-255.f);
+ slider_p.max_value(255.f);
+ slider_p.increment(1.f);
+ slider_p.decimal_digits(0);
+ mSlider1 = LLUICtrlFactory::create<LLSliderCtrl>(slider_p);
addChild(mSlider1);
- mSlider2 = NULL;
- mSlider3 = NULL;
break;
case VAR_TYPE_VEC3:
- mSlider1 = new LLSliderCtrl(std::string("slider 1"), LLRect(20,130,190,110), std::string("x: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, ((LLVector3*)var)->mV[VX], -100.f, 100.f, 0.1f, LLStringUtil::null);
- mSlider1->setPrecision(3);
- mSlider2 = new LLSliderCtrl(std::string("slider 2"), LLRect(20,100,190,80), std::string("y: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, ((LLVector3*)var)->mV[VY], -100.f, 100.f, 0.1f, LLStringUtil::null);
- mSlider2->setPrecision(3);
- mSlider3 = new LLSliderCtrl(std::string("slider 3"), LLRect(20,70,190,50), std::string("z: "), NULL, 70, 130, TRUE, TRUE, FALSE, NULL, NULL, ((LLVector3*)var)->mV[VZ], -100.f, 100.f, 0.1f, LLStringUtil::null);
- mSlider3->setPrecision(3);
+ slider_p.name("slider 1");
+ slider_p.label("x: ");
+ slider_p.rect(LLRect(20,130,190,110));
+ slider_p.initial_value(((LLVector3*)var)->mV[VX]);
+ slider_p.min_value(-100.f);
+ slider_p.max_value(100.f);
+ slider_p.increment(0.1f);
+ slider_p.decimal_digits(3);
+ mSlider1 = LLUICtrlFactory::create<LLSliderCtrl>(slider_p);
+
+ slider_p.name("slider 2");
+ slider_p.label("y: ");
+ slider_p.rect(LLRect(20,100,190,80));
+ slider_p.initial_value(((LLVector3*)var)->mV[VY]);
+ mSlider2 = LLUICtrlFactory::create<LLSliderCtrl>(slider_p);
+
+ slider_p.name("slider 3");
+ slider_p.label("z: ");
+ slider_p.rect(LLRect(20,70,190,50));
+ slider_p.initial_value(((LLVector3*)var)->mV[VZ]);
+ mSlider2 = LLUICtrlFactory::create<LLSliderCtrl>(slider_p);
+
addChild(mSlider1);
addChild(mSlider2);
addChild(mSlider3);
@@ -85,10 +122,18 @@ LLDebugVarMessageBox::LLDebugVarMessageBox(const std::string& title, EDebugVarTy
break;
}
- mAnimateButton = new LLButton(std::string("Animate"), LLRect(20, 45, 180, 25), LLStringUtil::null, onAnimateClicked, this);
+ LLButton::Params p;
+ p.name(std::string("Animate"));
+ p.rect(LLRect(20, 45, 180, 25));
+ p.click_callback.function(boost::bind(&LLDebugVarMessageBox::onAnimateClicked, this, _2));
+ mAnimateButton = LLUICtrlFactory::create<LLButton>(p);
addChild(mAnimateButton);
- mText = new LLTextBox(std::string("value"), LLRect(20,20,190,0));
+ LLTextBox::Params params;
+ params.name("value");
+ params.text(params.name);
+ params.rect(LLRect(20,20,190,0));
+ mText = LLUICtrlFactory::create<LLTextBox> (params);
addChild(mText);
//disable hitting enter closes dialog
@@ -112,8 +157,7 @@ void LLDebugVarMessageBox::show(const std::string& title, F32 *var, F32 max_valu
{
box->mSlider1->setValue(*var);
}
- box->mSlider1->setCommitCallback(slider_changed);
- box->mSlider1->setCallbackUserData(box);
+ box->mSlider1->setCommitCallback(boost::bind(&LLDebugVarMessageBox::sliderChanged, box, _2));
#endif
}
@@ -129,8 +173,7 @@ void LLDebugVarMessageBox::show(const std::string& title, S32 *var, S32 max_valu
{
box->mSlider1->setValue((F32)*var);
}
- box->mSlider1->setCommitCallback(slider_changed);
- box->mSlider1->setCallbackUserData(box);
+ box->mSlider1->setCommitCallback(boost::bind(&LLDebugVarMessageBox::sliderChanged, box, _2));
#endif
}
@@ -142,20 +185,17 @@ void LLDebugVarMessageBox::show(const std::string& title, LLVector3 *var, LLVect
box->mSlider1->setMaxValue(max_value.mV[VX]);
box->mSlider1->setMinValue(-max_value.mV[VX]);
box->mSlider1->setIncrement(increment.mV[VX]);
- box->mSlider1->setCommitCallback(slider_changed);
- box->mSlider1->setCallbackUserData(box);
+ box->mSlider1->setCommitCallback(boost::bind(&LLDebugVarMessageBox::sliderChanged, box, _2));
box->mSlider2->setMaxValue(max_value.mV[VX]);
box->mSlider2->setMinValue(-max_value.mV[VX]);
box->mSlider2->setIncrement(increment.mV[VX]);
- box->mSlider2->setCommitCallback(slider_changed);
- box->mSlider2->setCallbackUserData(box);
+ box->mSlider2->setCommitCallback(boost::bind(&LLDebugVarMessageBox::sliderChanged, box, _2));
box->mSlider3->setMaxValue(max_value.mV[VX]);
box->mSlider3->setMinValue(-max_value.mV[VX]);
box->mSlider3->setIncrement(increment.mV[VX]);
- box->mSlider3->setCommitCallback(slider_changed);
- box->mSlider3->setCallbackUserData(box);
+ box->mSlider3->setCommitCallback(boost::bind(&LLDebugVarMessageBox::sliderChanged, box, _2));
#endif
}
@@ -170,45 +210,44 @@ LLDebugVarMessageBox* LLDebugVarMessageBox::show(const std::string& title, EDebu
sInstances[title_string] = box;
gFloaterView->addChild(box);
box->reshape(200,150);
- box->open(); /*Flawfinder: ignore*/
+ box->openFloater();
box->mTitle = title_string;
}
return box;
}
-void LLDebugVarMessageBox::slider_changed(LLUICtrl* ctrl, void* user_data)
+void LLDebugVarMessageBox::sliderChanged(const LLSD& data)
{
- LLDebugVarMessageBox *msg_box = (LLDebugVarMessageBox*)user_data;
- if (!msg_box || !msg_box->mVarData) return;
+ if (!mVarData)
+ return;
- switch(msg_box->mVarType)
+ switch(mVarType)
{
case VAR_TYPE_F32:
- *((F32*)msg_box->mVarData) = (F32)msg_box->mSlider1->getValue().asReal();
+ *((F32*)mVarData) = (F32)mSlider1->getValue().asReal();
break;
case VAR_TYPE_S32:
- *((S32*)msg_box->mVarData) = (S32)msg_box->mSlider1->getValue().asInteger();
+ *((S32*)mVarData) = (S32)mSlider1->getValue().asInteger();
break;
case VAR_TYPE_VEC3:
{
- LLVector3* vec_p = (LLVector3*)msg_box->mVarData;
- vec_p->setVec((F32)msg_box->mSlider1->getValue().asReal(),
- (F32)msg_box->mSlider2->getValue().asReal(),
- (F32)msg_box->mSlider3->getValue().asReal());
+ LLVector3* vec_p = (LLVector3*)mVarData;
+ vec_p->setVec((F32)mSlider1->getValue().asReal(),
+ (F32)mSlider2->getValue().asReal(),
+ (F32)mSlider3->getValue().asReal());
break;
}
default:
- llwarns << "Unhandled var type " << msg_box->mVarType << llendl;
+ llwarns << "Unhandled var type " << mVarType << llendl;
break;
}
}
-void LLDebugVarMessageBox::onAnimateClicked(void* user_data)
+void LLDebugVarMessageBox::onAnimateClicked(const LLSD& data)
{
- LLDebugVarMessageBox* msg_boxp = (LLDebugVarMessageBox*)user_data;
- msg_boxp->mAnimate = !msg_boxp->mAnimate;
- msg_boxp->mAnimateButton->setToggleState(msg_boxp->mAnimate);
+ mAnimate = !mAnimate;
+ mAnimateButton->setToggleState(mAnimate);
}
void LLDebugVarMessageBox::onClose(bool app_quitting)
@@ -245,16 +284,16 @@ void LLDebugVarMessageBox::draw()
{
F32 animated_val = clamp_rescale(fmodf((F32)LLFrameTimer::getElapsedSeconds() / 5.f, 1.f), 0.f, 1.f, 0.f, mSlider1->getMaxValue());
mSlider1->setValue(animated_val);
- slider_changed(mSlider1, this);
+ sliderChanged(LLSD());
if (mSlider2)
{
mSlider2->setValue(animated_val);
- slider_changed(mSlider2, this);
+ sliderChanged(LLSD());
}
if (mSlider3)
{
mSlider3->setValue(animated_val);
- slider_changed(mSlider3, this);
+ sliderChanged(LLSD());
}
}
}
diff --git a/indra/newview/lldebugmessagebox.h b/indra/newview/lldebugmessagebox.h
index 07062218ac..76e128cfc1 100644
--- a/indra/newview/lldebugmessagebox.h
+++ b/indra/newview/lldebugmessagebox.h
@@ -66,8 +66,8 @@ protected:
~LLDebugVarMessageBox();
static LLDebugVarMessageBox* show(const std::string& title, EDebugVarType var_type, void *var);
- static void slider_changed(LLUICtrl* ctrl, void* user_data);
- static void onAnimateClicked(void* user_data);
+ void sliderChanged(const LLSD& data);
+ void onAnimateClicked(const LLSD& data);
public:
static void show(const std::string& title, F32 *var, F32 max_value = 100.f, F32 increment = 0.1f);
diff --git a/indra/newview/lldebugview.cpp b/indra/newview/lldebugview.cpp
index 40f5202067..2af29260f4 100644
--- a/indra/newview/lldebugview.cpp
+++ b/indra/newview/lldebugview.cpp
@@ -35,16 +35,14 @@
#include "lldebugview.h"
// library includes
-#include "llframestatview.h"
#include "llfasttimerview.h"
#include "llmemoryview.h"
#include "llconsole.h"
#include "lltextureview.h"
#include "llresmgr.h"
#include "imageids.h"
-#include "llvelocitybar.h"
+#include "llviewercontrol.h"
#include "llviewerwindow.h"
-#include "llfloaterstats.h"
//
// Globals
@@ -56,57 +54,51 @@ LLDebugView* gDebugView = NULL;
// Methods
//
-LLDebugView::LLDebugView(const std::string& name, const LLRect &rect)
-: LLView(name, rect, FALSE)
+LLDebugView::LLDebugView(const LLDebugView::Params& p)
+: LLView(p)
{
LLRect r;
+ LLRect rect(p.rect);
r.set(10, rect.getHeight() - 100, rect.getWidth()/2, 100);
- mDebugConsolep = new LLConsole("debug console", 20, r, -1, 0.f );
- mDebugConsolep->setFollowsBottom();
- mDebugConsolep->setFollowsLeft();
- mDebugConsolep->setVisible( FALSE );
+ LLConsole::Params cp;
+ cp.name("debug console");
+ cp.max_lines(20);
+ cp.rect(r);
+ cp.font(LLFontGL::getFontMonospace());
+ cp.follows.flags(FOLLOWS_BOTTOM | FOLLOWS_LEFT);
+ cp.visible(false);
+ mDebugConsolep = LLUICtrlFactory::create<LLConsole>(cp);
addChild(mDebugConsolep);
r.set(150 - 25, rect.getHeight() - 50, rect.getWidth()/2 - 25, rect.getHeight() - 450);
- mFrameStatView = new LLFrameStatView("frame stat", r);
- mFrameStatView->setFollowsTop();
- mFrameStatView->setFollowsLeft();
- mFrameStatView->setVisible(FALSE); // start invisible
- addChild(mFrameStatView);
r.set(25, rect.getHeight() - 50, (S32) (gViewerWindow->getVirtualWindowRect().getWidth() * 0.75f),
(S32) (gViewerWindow->getVirtualWindowRect().getHeight() * 0.75f));
- mFastTimerView = new LLFastTimerView("fast timers", r);
+ mFastTimerView = new LLFastTimerView(r);
mFastTimerView->setFollowsTop();
mFastTimerView->setFollowsLeft();
mFastTimerView->setVisible(FALSE); // start invisible
addChild(mFastTimerView);
r.set(25, rect.getHeight() - 50, rect.getWidth()/2, rect.getHeight() - 450);
- mMemoryView = new LLMemoryView("memory", r);
- mMemoryView->setFollowsTop();
- mMemoryView->setFollowsLeft();
- mMemoryView->setVisible(FALSE); // start invisible
+ LLMemoryView::Params mp;
+ mp.name("memory");
+ mp.rect(r);
+ mp.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT);
+ mp.visible(false);
+ mMemoryView = LLUICtrlFactory::create<LLMemoryView>(mp);
addChild(mMemoryView);
r.set(150, rect.getHeight() - 50, 820, 100);
- gTextureView = new LLTextureView("gTextureView", r);
- gTextureView->setRect(r);
- gTextureView->setFollowsBottom();
- gTextureView->setFollowsLeft();
+ LLTextureView::Params tvp;
+ tvp.name("gTextureView");
+ tvp.rect(r);
+ tvp.follows.flags(FOLLOWS_BOTTOM|FOLLOWS_LEFT);
+ tvp.visible(false);
+ gTextureView = LLUICtrlFactory::create<LLTextureView>(tvp);
addChild(gTextureView);
//gTextureView->reshape(r.getWidth(), r.getHeight(), TRUE);
-
- const S32 VELOCITY_LEFT = 10; // 370;
- const S32 VELOCITY_WIDTH = 500;
- const S32 VELOCITY_TOP = 140;
- const S32 VELOCITY_HEIGHT = 45;
- r.setLeftTopAndSize( VELOCITY_LEFT, VELOCITY_TOP, VELOCITY_WIDTH, VELOCITY_HEIGHT );
- gVelocityBar = new LLVelocityBar("Velocity Bar", r);
- gVelocityBar->setFollowsBottom();
- gVelocityBar->setFollowsLeft();
- addChild(gVelocityBar);
}
diff --git a/indra/newview/lldebugview.h b/indra/newview/lldebugview.h
index 189efd3a3f..9cf2a59a0a 100644
--- a/indra/newview/lldebugview.h
+++ b/indra/newview/lldebugview.h
@@ -40,9 +40,7 @@
// declarations
class LLButton;
-class LLToolView;
class LLStatusPanel;
-class LLFrameStatView;
class LLFastTimerView;
class LLMemoryView;
class LLConsole;
@@ -52,10 +50,18 @@ class LLFloaterStats;
class LLDebugView : public LLView
{
public:
- LLDebugView(const std::string& name, const LLRect &rect);
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Params()
+ {
+ mouse_opaque = false;
+ }
+ };
+ LLDebugView(const Params&);
~LLDebugView();
- LLFrameStatView* mFrameStatView;
+ void setStatsVisible(BOOL visible);
+
LLFastTimerView* mFastTimerView;
LLMemoryView* mMemoryView;
LLConsole* mDebugConsolep;
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index 8b0ed39eb0..a720dc46b5 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -40,6 +40,7 @@
#include "lldir.h"
#include "llframetimer.h"
#include "lltrans.h"
+#include "llwindow.h" // beforeDialog()
#if LL_LINUX || LL_SOLARIS
# include "llfilepicker.h"
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h
index f5a66a3a78..ba37694356 100644
--- a/indra/newview/lldrawable.h
+++ b/indra/newview/lldrawable.h
@@ -46,7 +46,6 @@
#include "llmemtype.h"
#include "llprimitive.h"
#include "lldarray.h"
-#include "llstat.h"
#include "llviewerobject.h"
#include "llrect.h"
#include "llappviewer.h" // for gFrameTimeSeconds
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 80c7d73e6a..51f4bbac5c 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -95,11 +95,9 @@ static BOOL sRenderingSkinned = FALSE;
S32 normal_channel = -1;
S32 specular_channel = -1;
-LLDrawPoolAvatar::LLDrawPoolAvatar() :
-LLFacePool(POOL_AVATAR)
+LLDrawPoolAvatar::LLDrawPoolAvatar() :
+ LLFacePool(POOL_AVATAR)
{
- //LLDebugVarMessageBox::show("acceleration", &CLOTHING_ACCEL_FORCE_FACTOR, 10.f, 0.1f);
- //LLDebugVarMessageBox::show("gravity", &CLOTHING_GRAVITY_EFFECT, 10.f, 0.1f);
}
//-----------------------------------------------------------------------------
@@ -110,7 +108,6 @@ LLDrawPool *LLDrawPoolAvatar::instancePool()
return new LLDrawPoolAvatar();
}
-BOOL gRenderAvatar = TRUE;
S32 LLDrawPoolAvatar::getVertexShaderLevel() const
{
@@ -288,10 +285,6 @@ void LLDrawPoolAvatar::endShadowPass(S32 pass)
void LLDrawPoolAvatar::renderShadow(S32 pass)
{
LLFastTimer t(LLFastTimer::FTM_SHADOW_AVATAR);
- if (!gRenderAvatar)
- {
- return;
- }
if (mDrawFace.empty())
{
@@ -609,13 +602,6 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
return;
}
-
-
- if (!gRenderAvatar)
- {
- return;
- }
-
if (mDrawFace.empty() && !single_avatar)
{
return;
@@ -761,10 +747,7 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
//-----------------------------------------------------------------------------
void LLDrawPoolAvatar::renderForSelect()
{
- if (!gRenderAvatar)
- {
- return;
- }
+
if (mDrawFace.empty())
{
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index b11dcc1608..ed6e55b7bc 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -127,9 +127,9 @@ void LLStandardBumpmap::restoreGL()
{
// *NOTE: This buffer size is hard coded into scanf() below.
char label[2048] = ""; /* Flawfinder: ignore */
- char bump_file[2048] = ""; /* Flawfinder: ignore */
+ char bump_image_id[2048] = ""; /* Flawfinder: ignore */
fields_read = fscanf( /* Flawfinder: ignore */
- file, "\n%2047s %2047s", label, bump_file);
+ file, "\n%2047s %2047s", label, bump_image_id);
if( EOF == fields_read )
{
break;
@@ -140,10 +140,10 @@ void LLStandardBumpmap::restoreGL()
return;
}
-// llinfos << "Loading bumpmap: " << bump_file << " from viewerart" << llendl;
+// llinfos << "Loading bumpmap: " << bump_image_id << " from viewerart" << llendl;
gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mLabel = label;
gStandardBumpmapList[LLStandardBumpmap::sStandardBumpmapCount].mImage =
- gImageList.getImageFromFile(bump_file,
+ gImageList.getImage(LLUUID(bump_image_id),
TRUE,
FALSE,
0,
diff --git a/indra/newview/lldrawpoolsky.cpp b/indra/newview/lldrawpoolsky.cpp
index 7f21adcc94..060af75736 100644
--- a/indra/newview/lldrawpoolsky.cpp
+++ b/indra/newview/lldrawpoolsky.cpp
@@ -43,7 +43,6 @@
#include "llviewercamera.h"
#include "llviewerimagelist.h"
#include "llviewerregion.h"
-#include "llviewerwindow.h"
#include "llvosky.h"
#include "llworld.h" // To get water height
#include "pipeline.h"
diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp
index 2f2b07232a..22634d96b0 100644
--- a/indra/newview/lldrawpooltree.cpp
+++ b/indra/newview/lldrawpooltree.cpp
@@ -37,7 +37,6 @@
#include "lldrawable.h"
#include "llface.h"
#include "llsky.h"
-#include "llviewerwindow.h"
#include "llvotree.h"
#include "pipeline.h"
#include "llviewercamera.h"
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index ce3425dd9e..4a593ac4f8 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -45,7 +45,6 @@
#include "lldrawable.h"
#include "llface.h"
#include "llsky.h"
-#include "llviewercamera.h" // to get OGL_TO_CFR_ROTATION
#include "llviewerimagelist.h"
#include "llviewerregion.h"
#include "llvosky.h"
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index 62fcf60e7f..203c086c56 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -33,7 +33,12 @@
#include "llviewerprecompiledheaders.h"
#include "lldynamictexture.h"
+
+// Linden library includes
#include "llglheaders.h"
+#include "llwindow.h" // getPosition()
+
+// Viewer includes
#include "llviewerwindow.h"
#include "llviewercamera.h"
#include "llviewercontrol.h"
diff --git a/indra/newview/lleventnotifier.cpp b/indra/newview/lleventnotifier.cpp
index e7403c2903..c0fe327815 100644
--- a/indra/newview/lleventnotifier.cpp
+++ b/indra/newview/lleventnotifier.cpp
@@ -38,6 +38,7 @@
#include "llnotify.h"
#include "lleventinfo.h"
+#include "llfloaterreg.h"
#include "llfloaterdirectory.h"
#include "llfloaterworldmap.h"
#include "llagent.h"
@@ -192,11 +193,11 @@ bool LLEventNotification::handleResponse(const LLSD& notification, const LLSD& r
{
case 0:
gAgent.teleportViaLocation(getEventPosGlobal());
- gFloaterWorldMap->trackLocation(getEventPosGlobal());
+ LLFloaterWorldMap::getInstance()->trackLocation(getEventPosGlobal());
break;
case 1:
gDisplayEventHack = TRUE;
- LLFloaterDirectory::showEvents(getEventID());
+ LLFloaterReg::showInstance("search", LLSD().insert("panel", "event").insert("id", S32(getEventID())));
break;
case 2:
break;
diff --git a/indra/newview/llface.h b/indra/newview/llface.h
index 4a551ff261..8332eec19c 100644
--- a/indra/newview/llface.h
+++ b/indra/newview/llface.h
@@ -46,7 +46,6 @@
#include "lldarrayptr.h"
#include "llvertexbuffer.h"
#include "llviewerimage.h"
-#include "llstat.h"
#include "lldrawable.h"
class LLFacePool;
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index c9037d0fbb..7a79b7ef3e 100644
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -196,16 +196,18 @@ static struct ft_display_info ft_display_table[] =
{ LLFastTimer::FTM_RENDER_FONTS, " Fonts", &LLColor4::pink1, 0 },
{ LLFastTimer::FTM_SWAP, " Swap", &LLColor4::pink2, 0 },
{ LLFastTimer::FTM_CLIENT_COPY, " Client Copy", &LLColor4::red1, 1},
+ { LLFastTimer::FTM_SWAP, " Swap", &LLColor4::pink2, 0 },
+ { LLFastTimer::FTM_CLIENT_COPY, " Client Copy", &LLColor4::red1, 1},
#if 0 || !LL_RELEASE_FOR_DOWNLOAD
- { LLFastTimer::FTM_TEMP1, " Temp1", &LLColor4::red1, 0 },
- { LLFastTimer::FTM_TEMP2, " Temp2", &LLColor4::magenta1, 0 },
- { LLFastTimer::FTM_TEMP3, " Temp3", &LLColor4::red2, 0 },
- { LLFastTimer::FTM_TEMP4, " Temp4", &LLColor4::magenta2, 0 },
- { LLFastTimer::FTM_TEMP5, " Temp5", &LLColor4::red3, 0 },
- { LLFastTimer::FTM_TEMP6, " Temp6", &LLColor4::magenta3, 0 },
- { LLFastTimer::FTM_TEMP7, " Temp7", &LLColor4::red4, 0 },
- { LLFastTimer::FTM_TEMP8, " Temp8", &LLColor4::magenta4, 0 },
+ { LLFastTimer::FTM_TEMP1, " Temp1", &LLColor4::red1, 0 },
+ { LLFastTimer::FTM_TEMP2, " Temp2", &LLColor4::magenta1, 0 },
+ { LLFastTimer::FTM_TEMP3, " Temp3", &LLColor4::red2, 0 },
+ { LLFastTimer::FTM_TEMP4, " Temp4", &LLColor4::magenta2, 0 },
+ { LLFastTimer::FTM_TEMP5, " Temp5", &LLColor4::red3, 0 },
+ { LLFastTimer::FTM_TEMP6, " Temp6", &LLColor4::magenta3, 0 },
+ { LLFastTimer::FTM_TEMP7, " Temp7", &LLColor4::red4, 0 },
+ { LLFastTimer::FTM_TEMP8, " Temp8", &LLColor4::magenta4, 0 },
#endif
{ LLFastTimer::FTM_OTHER, " Other", &red0 }
@@ -215,9 +217,10 @@ static const int FTV_DISPLAY_NUM = LL_ARRAY_SIZE(ft_display_table);
S32 ft_display_idx[FTV_DISPLAY_NUM]; // line of table entry for display purposes (for collapse)
-LLFastTimerView::LLFastTimerView(const std::string& name, const LLRect& rect)
- : LLFloater(name, rect, std::string("Fast Timers"))
+LLFastTimerView::LLFastTimerView(const LLRect& rect)
+: LLFloater()
{
+ setRect(rect);
setVisible(FALSE);
mDisplayMode = 0;
mAvgCountTotal = 0;
diff --git a/indra/newview/llfasttimerview.h b/indra/newview/llfasttimerview.h
index 86fc194610..611bca6494 100644
--- a/indra/newview/llfasttimerview.h
+++ b/indra/newview/llfasttimerview.h
@@ -39,7 +39,7 @@
class LLFastTimerView : public LLFloater
{
public:
- LLFastTimerView(const std::string& name, const LLRect& rect);
+ LLFastTimerView(const LLRect& rect);
virtual ~LLFastTimerView();
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
new file mode 100644
index 0000000000..45bbea7e2a
--- /dev/null
+++ b/indra/newview/llfavoritesbar.cpp
@@ -0,0 +1,328 @@
+/**
+ * @file llfavoritesbar.cpp
+ * @brief LLFavoritesBarCtrl class implementation
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfavoritesbar.h"
+#include "lluictrlfactory.h"
+
+#include "llagent.h"
+#include "llviewerinventory.h"
+#include "llinventory.h"
+#include "llinventorymodel.h"
+#include "llbutton.h"
+#include "llinventorybridge.h"
+
+static LLRegisterWidget<LLFavoritesBarCtrl> r("favorites_bar");
+
+// updateButtons's helper
+struct LLFavoritesSort
+{
+ // Sorting by creation date and name
+ // TODO - made it customizible using gSavedSettings
+ bool operator()(const LLViewerInventoryItem* const& a, const LLViewerInventoryItem* const& b)
+ {
+ time_t first_create = a->getCreationDate();
+ time_t second_create = b->getCreationDate();
+ if (first_create == second_create)
+ {
+ return (LLStringUtil::compareDict(a->getName(), b->getName()) < 0);
+ }
+ else
+ {
+ return (first_create > second_create);
+ }
+ }
+};
+
+LLFavoritesBarCtrl::LLFavoritesBarCtrl(const LLFavoritesBarCtrl::Params& p)
+: LLUICtrl(p),
+ mFont(p.font.isProvided() ? p.font() : LLFontGL::getFontSansSerifSmall())
+{
+ gInventory.addObserver(this);
+}
+
+LLFavoritesBarCtrl::~LLFavoritesBarCtrl()
+{
+ gInventory.removeObserver(this);
+}
+
+BOOL LLFavoritesBarCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg)
+{
+ *accept = ACCEPT_NO;
+
+ switch (cargo_type)
+ {
+
+ // IAN BUG: did the spec ask for calling cards here?
+ case DAD_LANDMARK:
+ case DAD_CALLINGCARD:
+ {
+ // Copy the item into the favorites folder (if it's not already there).
+ LLInventoryItem *item = (LLInventoryItem *)cargo_data;
+ LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_FAVORITE);
+ if (item->getParentUUID() == favorites_id)
+ {
+ llwarns << "Attemt to copy a favorite item into the same folder." << llendl;
+ break;
+ }
+
+ *accept = ACCEPT_YES_COPY_SINGLE;
+
+ if (drop)
+ {
+ copy_inventory_item(
+ gAgent.getID(),
+ item->getPermissions().getOwner(),
+ item->getUUID(),
+ favorites_id,
+ std::string(),
+ LLPointer<LLInventoryCallback>(NULL));
+
+ llinfos << "Copied inventory item #" << item->getUUID() << " to favorites." << llendl;
+ }
+
+ }
+ break;
+ default:
+ break;
+ }
+
+ return TRUE;
+}
+
+//virtual
+void LLFavoritesBarCtrl::changed(U32 mask)
+{
+ LLInventoryModel::item_array_t items;
+
+ if (!collectFavoriteItems(items))
+ {
+ return;
+ }
+
+ S32 count = items.count();
+ if (getChildCount() == count)
+ {
+ // Check whether buttons are reflecting state of favorite inventory folder
+ const LLView::child_list_t *buttons_list = getChildList();
+ S32 i = 0;
+ for(LLView::child_list_const_iter_t iter = buttons_list->begin(); iter != buttons_list->end(); iter++)
+ {
+ LLButton *button = (LLButton *)*iter;
+ LLInventoryItem* item = items.get(i);
+ // tooltip contains full name of item, label can be cutted
+ if (button->getToolTip() != item->getName())
+ {
+ break;
+ }
+
+
+ i++;
+ }
+
+ // Check passed, nothing is changed
+ if (i < items.count())
+ {
+ return;
+ }
+ }
+
+ //FIXME: optimize this
+ deleteAllChildren();
+
+ LLButton::Params bparams;
+
+ const S32 buttonWidth = LLUI::sSettingGroups["config"]->getS32("ButtonHPad") * 2;
+ LLRect rect;
+
+ for(S32 i = 0; i < count; ++i)
+ {
+ rect.setOriginAndSize(0, 0, buttonWidth, llround(mFont->getLineHeight()));
+
+ bparams.follows.flags (FOLLOWS_LEFT | FOLLOWS_BOTTOM);
+ bparams.rect (rect);
+ bparams.tab_stop(false);
+ bparams.font(mFont);
+ bparams.click_callback.function(boost::bind(&LLFavoritesBarCtrl::onButtonClick, this, 0));
+
+ LLButton *button = LLUICtrlFactory::create<LLButton> (bparams);
+
+ addChildInBack(button);
+ }
+
+ updateButtons(getRect().getWidth(), items);
+}
+
+//virtual
+void LLFavoritesBarCtrl::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+ LLInventoryModel::item_array_t items;
+ if (collectFavoriteItems(items))
+ {
+ updateButtons(width, items);
+ }
+
+ LLUICtrl::reshape(width, height, called_from_parent);
+}
+
+void LLFavoritesBarCtrl::updateButtons(U32 barWidth, LLInventoryModel::item_array_t items)
+{
+ std::sort(items.begin(), items.end(), LLFavoritesSort());
+
+ const S32 buttonHPad = LLUI::sSettingGroups["config"]->getS32("ButtonHPad");
+ const S32 buttonHGap = 2;
+
+ S32 curr_x = buttonHGap;
+
+ S32 count = items.count();
+ S32 labelsWidth = 0;
+
+ for (S32 i = 0; i < count; ++i)
+ {
+ labelsWidth += mFont->getWidth(items.get(i)->getName());
+ }
+
+ const S32 ellipsisWIdth = mFont->getWidth("...");
+
+ F32 shrinkFactor = 1.0f;
+
+ S32 labelsSpace = barWidth - buttonHGap * (count + 1) - buttonHPad * 2 * count; // There is leading buttonHGap in front of first button,
+ // one buttonHGap at the end of each button and 2 buttonHPad's
+ if (labelsWidth >= labelsSpace)
+ {
+ shrinkFactor = (float)labelsSpace / labelsWidth;
+ }
+
+ const LLView::child_list_t *buttons_list = getChildList();
+
+ S32 i = 0;
+ for(LLView::child_list_const_iter_t iter = buttons_list->begin(); iter != buttons_list->end(); iter++)
+ {
+ LLButton *button = (LLButton *)*iter;
+
+ LLInventoryItem* item = items.get(i);
+
+ LLRect rect;
+
+ S32 labelWidth = mFont->getWidth(item->getName());
+
+ if (shrinkFactor < 1.0f)
+ {
+ labelWidth = (S32) ((float)labelWidth * shrinkFactor);
+
+ if (labelWidth > ellipsisWIdth)
+ {
+ labelWidth -= ellipsisWIdth;
+
+ S32 charsTotal = item->getName().length();
+ S32 charsFitted = 1;
+ while (charsFitted < charsTotal && mFont->getWidth(item->getName(), 0, charsFitted) < labelWidth)
+ {
+ charsFitted++;
+ }
+
+ charsFitted--;
+ labelWidth += ellipsisWIdth;
+
+ button->setLabel(item->getName().substr(0, charsFitted) + "...");
+ }
+ else
+ {
+ button->setLabel((LLStringExplicit)"");
+ labelWidth = 0;
+ }
+ }
+ else
+ {
+ button->setLabel(item->getName());
+ }
+
+ S32 buttonWidth = labelWidth + buttonHPad * 2;
+ rect.setOriginAndSize(curr_x, 2, buttonWidth, llround(mFont->getLineHeight()));
+ button->setRect(rect);
+
+ button->setToolTip(item->getName());
+
+ curr_x += buttonWidth + buttonHGap;
+
+ i++;
+ }
+}
+
+BOOL LLFavoritesBarCtrl::collectFavoriteItems(LLInventoryModel::item_array_t &items)
+{
+ LLUUID favorite_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_FAVORITE);
+
+ if (!favorite_folder_id.notNull())
+ return FALSE;
+
+ LLInventoryModel::cat_array_t cats;
+
+ gInventory.collectDescendents(favorite_folder_id, cats, items, LLInventoryModel::EXCLUDE_TRASH);
+
+ return TRUE;
+}
+
+void LLFavoritesBarCtrl::onButtonClick(int idx)
+{
+ LLInventoryModel::item_array_t items;
+
+ if (!collectFavoriteItems(items))
+ {
+ return;
+ }
+
+ S32 count = items.count();
+
+ if (idx < 0 || idx >= count)
+ {
+ llwarns << "Invalid favorites bar index" << llendl;
+ return;
+ }
+
+ LLInventoryItem* item = items.get(idx);
+ if(item)
+ {
+ LLUUID item_id = item->getUUID();
+ LLAssetType::EType item_type = item->getType();
+
+ //TODO - donno but may be we must use InventoryModel from InventoryView
+ //think for now there is only one model...but still
+ LLInvFVBridgeAction::doAction(item_type,item_id,&gInventory);
+ }
+}
+
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h
new file mode 100644
index 0000000000..c92f1d5caf
--- /dev/null
+++ b/indra/newview/llfavoritesbar.h
@@ -0,0 +1,70 @@
+/**
+ * @file llfavoritesbar.h
+ * @brief LLFavoritesBarCtrl base class
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFAVORITESBARCTRL_H
+#define LL_LLFAVORITESBARCTRL_H
+
+#include "lluictrl.h"
+#include "lliconctrl.h"
+#include "llinventorymodel.h"
+
+class LLFavoritesBarCtrl : public LLUICtrl, public LLInventoryObserver
+{
+public:
+ struct Params : public LLUICtrl::Params{};
+protected:
+ LLFavoritesBarCtrl(const Params&);
+ friend class LLUICtrlFactory;
+public:
+ virtual ~LLFavoritesBarCtrl();
+
+ /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ EDragAndDropType cargo_type,
+ void* cargo_data,
+ EAcceptance* accept,
+ std::string& tooltip_msg);
+
+ virtual void changed(U32 mask);
+
+ virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+protected:
+ void updateButtons(U32 barWidth, LLInventoryModel::item_array_t items);
+ BOOL collectFavoriteItems(LLInventoryModel::item_array_t &items);
+
+ void onButtonClick(int idx);
+
+ const LLFontGL *mFont;
+};
+
+
+#endif // LL_LLFAVORITESBARCTRL_H
+
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 8f5882615f..028e1cc098 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -39,6 +39,7 @@
#include "lldir.h"
#include "llframetimer.h"
#include "lltrans.h"
+#include "llwindow.h" // beforeDialog()
#if LL_SDL
#include "llwindowsdl.h" // for some X/GTK utils to help with filepickers
@@ -818,6 +819,13 @@ BOOL LLFilePicker::getOpenFile(ELoadFilter filter)
reset();
mNavOptions.optionFlags &= ~kNavAllowMultipleFiles;
+
+ if(filter == FFLOAD_ALL) // allow application bundles etc. to be traversed; important for DEV-16869, but generally useful
+ {
+ // mNavOptions.optionFlags |= kNavAllowOpenPackages;
+ mNavOptions.optionFlags |= kNavSupportPackages;
+ }
+
// Modal, so pause agent
send_agent_pause();
{
diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp
index 9ee24d6d83..352ca3c863 100644
--- a/indra/newview/llfirstuse.cpp
+++ b/indra/newview/llfirstuse.cpp
@@ -51,8 +51,6 @@ std::set<std::string> LLFirstUse::sConfigVariables;
// static
void LLFirstUse::addConfigVariable(const std::string& var)
{
- //Don't add the warning, now that we're storing the default in the settings_default.xml file
- //gSavedSettings.addWarning(var);
sConfigVariables.insert(var);
}
@@ -63,7 +61,7 @@ void LLFirstUse::disableFirstUse()
for (std::set<std::string>::iterator iter = sConfigVariables.begin();
iter != sConfigVariables.end(); ++iter)
{
- gSavedSettings.setWarning(*iter, FALSE);
+ gWarningSettings.setBOOL(*iter, FALSE);
}
}
@@ -74,7 +72,7 @@ void LLFirstUse::resetFirstUse()
for (std::set<std::string>::iterator iter = sConfigVariables.begin();
iter != sConfigVariables.end(); ++iter)
{
- gSavedSettings.setWarning(*iter, TRUE);
+ gWarningSettings.setBOOL(*iter, TRUE);
}
}
@@ -82,9 +80,9 @@ void LLFirstUse::resetFirstUse()
// Called whenever the viewer detects that your balance went up
void LLFirstUse::useBalanceIncrease(S32 delta)
{
- if (gSavedSettings.getWarning("FirstBalanceIncrease"))
+ if (gWarningSettings.getBOOL("FirstBalanceIncrease"))
{
- gSavedSettings.setWarning("FirstBalanceIncrease", FALSE);
+ gWarningSettings.setBOOL("FirstBalanceIncrease", FALSE);
LLSD args;
args["AMOUNT"] = llformat("%d",delta);
@@ -96,9 +94,9 @@ void LLFirstUse::useBalanceIncrease(S32 delta)
// Called whenever the viewer detects your balance went down
void LLFirstUse::useBalanceDecrease(S32 delta)
{
- if (gSavedSettings.getWarning("FirstBalanceDecrease"))
+ if (gWarningSettings.getBOOL("FirstBalanceDecrease"))
{
- gSavedSettings.setWarning("FirstBalanceDecrease", FALSE);
+ gWarningSettings.setBOOL("FirstBalanceDecrease", FALSE);
LLSD args;
args["AMOUNT"] = llformat("%d",-delta);
@@ -112,9 +110,9 @@ void LLFirstUse::useSit()
{
// Our orientation island uses sitting to teach vehicle driving
// so just never show this message. JC
- //if (gSavedSettings.getWarning("FirstSit"))
+ //if (gWarningSettings.getBOOL("FirstSit"))
//{
- // gSavedSettings.setWarning("FirstSit", FALSE);
+ // gWarningSettings.setBOOL("FirstSit", FALSE);
//
// LLNotifications::instance().add("FirstSit");
//}
@@ -123,9 +121,9 @@ void LLFirstUse::useSit()
// static
void LLFirstUse::useMap()
{
- if (gSavedSettings.getWarning("FirstMap"))
+ if (gWarningSettings.getBOOL("FirstMap"))
{
- gSavedSettings.setWarning("FirstMap", FALSE);
+ gWarningSettings.setBOOL("FirstMap", FALSE);
LLNotifications::instance().add("FirstMap");
}
@@ -140,9 +138,9 @@ void LLFirstUse::useGoTo()
// static
void LLFirstUse::useBuild()
{
- if (gSavedSettings.getWarning("FirstBuild"))
+ if (gWarningSettings.getBOOL("FirstBuild"))
{
- gSavedSettings.setWarning("FirstBuild", FALSE);
+ gWarningSettings.setBOOL("FirstBuild", FALSE);
LLNotifications::instance().add("FirstBuild");
}
@@ -151,9 +149,9 @@ void LLFirstUse::useBuild()
// static
void LLFirstUse::useLeftClickNoHit()
{
- if (gSavedSettings.getWarning("FirstLeftClickNoHit"))
+ if (gWarningSettings.getBOOL("FirstLeftClickNoHit"))
{
- gSavedSettings.setWarning("FirstLeftClickNoHit", FALSE);
+ gWarningSettings.setBOOL("FirstLeftClickNoHit", FALSE);
LLNotifications::instance().add("FirstLeftClickNoHit");
}
@@ -162,12 +160,12 @@ void LLFirstUse::useLeftClickNoHit()
// static
void LLFirstUse::useTeleport()
{
- if (gSavedSettings.getWarning("FirstTeleport"))
+ if (gWarningSettings.getBOOL("FirstTeleport"))
{
LLVector3d teleportDestination = LLTracker::getTrackedPositionGlobal();
if(teleportDestination != LLVector3d::zero)
{
- gSavedSettings.setWarning("FirstTeleport", FALSE);
+ gWarningSettings.setBOOL("FirstTeleport", FALSE);
LLNotifications::instance().add("FirstTeleport");
}
@@ -181,9 +179,9 @@ void LLFirstUse::useOverrideKeys()
// so don't show this message until you get off OI. JC
if (!gAgent.inPrelude())
{
- if (gSavedSettings.getWarning("FirstOverrideKeys"))
+ if (gWarningSettings.getBOOL("FirstOverrideKeys"))
{
- gSavedSettings.setWarning("FirstOverrideKeys", FALSE);
+ gWarningSettings.setBOOL("FirstOverrideKeys", FALSE);
LLNotifications::instance().add("FirstOverrideKeys");
}
@@ -199,9 +197,9 @@ void LLFirstUse::useAttach()
// static
void LLFirstUse::useAppearance()
{
- if (gSavedSettings.getWarning("FirstAppearance"))
+ if (gWarningSettings.getBOOL("FirstAppearance"))
{
- gSavedSettings.setWarning("FirstAppearance", FALSE);
+ gWarningSettings.setBOOL("FirstAppearance", FALSE);
LLNotifications::instance().add("FirstAppearance");
}
@@ -210,9 +208,9 @@ void LLFirstUse::useAppearance()
// static
void LLFirstUse::useInventory()
{
- if (gSavedSettings.getWarning("FirstInventory"))
+ if (gWarningSettings.getBOOL("FirstInventory"))
{
- gSavedSettings.setWarning("FirstInventory", FALSE);
+ gWarningSettings.setBOOL("FirstInventory", FALSE);
LLNotifications::instance().add("FirstInventory");
}
@@ -222,9 +220,9 @@ void LLFirstUse::useInventory()
// static
void LLFirstUse::useSandbox()
{
- if (gSavedSettings.getWarning("FirstSandbox"))
+ if (gWarningSettings.getBOOL("FirstSandbox"))
{
- gSavedSettings.setWarning("FirstSandbox", FALSE);
+ gWarningSettings.setBOOL("FirstSandbox", FALSE);
LLSD args;
args["HOURS"] = llformat("%d",SANDBOX_CLEAN_FREQ);
@@ -236,9 +234,9 @@ void LLFirstUse::useSandbox()
// static
void LLFirstUse::useFlexible()
{
- if (gSavedSettings.getWarning("FirstFlexible"))
+ if (gWarningSettings.getBOOL("FirstFlexible"))
{
- gSavedSettings.setWarning("FirstFlexible", FALSE);
+ gWarningSettings.setBOOL("FirstFlexible", FALSE);
LLNotifications::instance().add("FirstFlexible");
}
@@ -247,9 +245,9 @@ void LLFirstUse::useFlexible()
// static
void LLFirstUse::useDebugMenus()
{
- if (gSavedSettings.getWarning("FirstDebugMenus"))
+ if (gWarningSettings.getBOOL("FirstDebugMenus"))
{
- gSavedSettings.setWarning("FirstDebugMenus", FALSE);
+ gWarningSettings.setBOOL("FirstDebugMenus", FALSE);
LLNotifications::instance().add("FirstDebugMenus");
}
@@ -258,9 +256,9 @@ void LLFirstUse::useDebugMenus()
// static
void LLFirstUse::useSculptedPrim()
{
- if (gSavedSettings.getWarning("FirstSculptedPrim"))
+ if (gWarningSettings.getBOOL("FirstSculptedPrim"))
{
- gSavedSettings.setWarning("FirstSculptedPrim", FALSE);
+ gWarningSettings.setBOOL("FirstSculptedPrim", FALSE);
LLNotifications::instance().add("FirstSculptedPrim");
@@ -270,9 +268,9 @@ void LLFirstUse::useSculptedPrim()
// static
void LLFirstUse::useMedia()
{
- if (gSavedSettings.getWarning("FirstMedia"))
+ if (gWarningSettings.getBOOL("FirstMedia"))
{
- gSavedSettings.setWarning("FirstMedia", FALSE);
+ gWarningSettings.setBOOL("FirstMedia", FALSE);
LLNotifications::instance().add("FirstMedia");
}
diff --git a/indra/newview/llflexibleobject.h b/indra/newview/llflexibleobject.h
index 895701da3a..811ae24df2 100644
--- a/indra/newview/llflexibleobject.h
+++ b/indra/newview/llflexibleobject.h
@@ -43,7 +43,6 @@
#ifndef LL_LLFLEXIBLEOBJECT_H
#define LL_LLFLEXIBLEOBJECT_H
-#include "llmemory.h"
#include "llprimitive.h"
#include "llvovolume.h"
#include "llwind.h"
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index 2652387bfe..9b5d322ba6 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -65,41 +65,34 @@ extern LLCPUInfo gSysCPU;
extern LLMemoryInfo gSysMemory;
extern U32 gPacketsIn;
-///----------------------------------------------------------------------------
-/// Local function declarations, constants, enums, and typedefs
-///----------------------------------------------------------------------------
-
-LLFloaterAbout* LLFloaterAbout::sInstance = NULL;
-
static std::string get_viewer_release_notes_url();
+
///----------------------------------------------------------------------------
/// Class LLFloaterAbout
///----------------------------------------------------------------------------
// Default constructor
-LLFloaterAbout::LLFloaterAbout()
-: LLFloater(std::string("floater_about"), std::string("FloaterAboutRect"), LLStringUtil::null)
+LLFloaterAbout::LLFloaterAbout(const LLSD& key)
+: LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_about.xml");
+ center();
+}
- // Support for changing product name.
- std::string title("About ");
- title += LLAppViewer::instance()->getSecondLifeTitle();
- setTitle(title);
+// Destroys the object
+LLFloaterAbout::~LLFloaterAbout()
+{
+}
+BOOL LLFloaterAbout::postBuild()
+{
LLViewerTextEditor *support_widget =
getChild<LLViewerTextEditor>("support_editor", true);
LLViewerTextEditor *credits_widget =
getChild<LLViewerTextEditor>("credits_editor", true);
-
- if (!support_widget || !credits_widget)
- {
- return;
- }
-
// For some reason, adding style doesn't work unless this is true.
support_widget->setParseHTML(TRUE);
@@ -108,15 +101,15 @@ LLFloaterAbout::LLFloaterAbout()
viewer_link_style->setVisible(true);
viewer_link_style->setFontName(LLStringUtil::null);
viewer_link_style->setLinkHREF(get_viewer_release_notes_url());
- viewer_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
+ viewer_link_style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
// Version string
- std::string version = LLAppViewer::instance()->getSecondLifeTitle()
+ std::string version = LLTrans::getString("SECOND_LIFE_VIEWER")
+ llformat(" %d.%d.%d (%d) %s %s (%s)\n",
LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
__DATE__, __TIME__,
gSavedSettings.getString("VersionChannelName").c_str());
- support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
+ support_widget->appendColoredText(version, FALSE, FALSE, LLUI::sSettingGroups["color"]->getColor("TextFgReadOnlyColor"));
support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
std::string support;
@@ -138,7 +131,7 @@ LLFloaterAbout::LLFloaterAbout()
server_link_style->setVisible(true);
server_link_style->setFontName(LLStringUtil::null);
server_link_style->setLinkHREF(region->getCapability("ServerReleaseNotes"));
- server_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
+ server_link_style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
const LLVector3d &pos = gAgent.getPositionGlobal();
LLUIString pos_text = getString("you_are_at");
@@ -146,8 +139,8 @@ LLFloaterAbout::LLFloaterAbout()
llformat("%.1f, %.1f, %.1f ", pos.mdV[VX], pos.mdV[VY], pos.mdV[VZ]));
support.append(pos_text);
- std::string region_text = llformat("in %s located at ",
- gAgent.getRegion()->getName().c_str());
+ LLUIString region_text = getString ("in_region") + " ";
+ region_text.setArg("[REGION]", llformat ("%s", gAgent.getRegion()->getName().c_str()));
support.append(region_text);
std::string buffer;
@@ -160,7 +153,7 @@ LLFloaterAbout::LLFloaterAbout()
support.append(gLastVersionChannel);
support.append("\n");
- support_widget->appendColoredText(support, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
+ support_widget->appendColoredText(support, FALSE, FALSE, LLUI::sSettingGroups["color"]->getColor("TextFgReadOnlyColor"));
support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, server_link_style);
support = "\n\n";
@@ -171,45 +164,46 @@ LLFloaterAbout::LLFloaterAbout()
// and this info sometimes gets sent to support
// CPU
- support.append("CPU: ");
+ support.append(getString("CPU") + " ");
support.append( gSysCPU.getCPUString() );
support.append("\n");
U32 memory = gSysMemory.getPhysicalMemoryKB() / 1024;
// Moved hack adjustment to Windows memory size into llsys.cpp
- std::string mem_text = llformat("Memory: %u MB\n", memory );
- support.append(mem_text);
+ LLStringUtil::format_map_t args;
+ args["[MEM]"] = llformat ("%u", memory);
+ support.append(getString("Memory", args) + "\n");
- support.append("OS Version: ");
+ support.append(getString("OSVersion") + " ");
support.append( LLAppViewer::instance()->getOSInfo().getOSString() );
support.append("\n");
- support.append("Graphics Card Vendor: ");
+ support.append(getString("GraphicsCardVendor") + " ");
support.append( (const char*) glGetString(GL_VENDOR) );
support.append("\n");
- support.append("Graphics Card: ");
+ support.append(getString("GraphicsCard") + " ");
support.append( (const char*) glGetString(GL_RENDERER) );
support.append("\n");
- support.append("OpenGL Version: ");
+ support.append(getString("OpenGLVersion") + " ");
support.append( (const char*) glGetString(GL_VERSION) );
support.append("\n");
support.append("\n");
- support.append("libcurl Version: ");
+ support.append(getString("LibCurlVersion") + " ");
support.append( LLCurl::getVersionString() );
support.append("\n");
- support.append("J2C Decoder Version: ");
+ support.append(getString("J2CDecoderVersion") + " ");
support.append( LLImageJ2C::getEngineInfo() );
support.append("\n");
- support.append("Audio Driver Version: ");
+ support.append(getString("AudioDriverVersion") + " ");
bool want_fullname = true;
- support.append( gAudiop ? gAudiop->getDriverName(want_fullname) : "(none)" );
+ support.append( gAudiop ? gAudiop->getDriverName(want_fullname) : getString("none") );
support.append("\n");
LLMediaManager *mgr = LLMediaManager::getInstance();
@@ -218,7 +212,7 @@ LLFloaterAbout::LLFloaterAbout()
LLMediaBase *media_source = mgr->createSourceFromMimeType("http", "text/html");
if (media_source)
{
- support.append("LLMozLib Version: ");
+ support.append(getString("LLMozLibVersion") + " ");
support.append(media_source->getVersion());
support.append("\n");
mgr->destroySource(media_source);
@@ -227,15 +221,13 @@ LLFloaterAbout::LLFloaterAbout()
if (gPacketsIn > 0)
{
- std::string packet_loss = llformat("Packets Lost: %.0f/%.0f (%.1f%%)",
- LLViewerStats::getInstance()->mPacketsLostStat.getCurrent(),
- F32(gPacketsIn),
- 100.f*LLViewerStats::getInstance()->mPacketsLostStat.getCurrent() / F32(gPacketsIn) );
- support.append(packet_loss);
- support.append("\n");
+ args["[LOST]"] = llformat ("%.0f", LLViewerStats::getInstance()->mPacketsLostStat.getCurrent());
+ args["[IN]"] = llformat ("%.0f", F32(gPacketsIn));
+ args["[PCT]"] = llformat ("%.1f", 100.f*LLViewerStats::getInstance()->mPacketsLostStat.getCurrent() / F32(gPacketsIn) );
+ support.append(getString ("PacketsLost", args) + "\n");
}
- support_widget->appendColoredText(support, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
+ support_widget->appendColoredText(support, FALSE, FALSE, LLUI::sSettingGroups["color"]->getColor("TextFgReadOnlyColor"));
// Fix views
support_widget->setCursorPos(0);
@@ -248,43 +240,24 @@ LLFloaterAbout::LLFloaterAbout()
credits_widget->setTakesFocus(TRUE);
credits_widget->setHandleEditKeysDirectly(TRUE);
- center();
-
- sInstance = this;
-}
-
-// Destroys the object
-LLFloaterAbout::~LLFloaterAbout()
-{
- sInstance = NULL;
-}
-
-// static
-void LLFloaterAbout::show(void*)
-{
- if (!sInstance)
- {
- sInstance = new LLFloaterAbout();
- }
-
- sInstance->open(); /*Flawfinder: ignore*/
+ return TRUE;
}
-static std::string get_viewer_release_notes_url()
-{
- std::ostringstream version;
- version << LL_VERSION_MAJOR << "."
- << LL_VERSION_MINOR << "."
- << LL_VERSION_PATCH << "."
- << LL_VERSION_BUILD;
+ static std::string get_viewer_release_notes_url()
+ {
+ std::ostringstream version;
+ version << LL_VERSION_MAJOR << "."
+ << LL_VERSION_MINOR << "."
+ << LL_VERSION_PATCH << "."
+ << LL_VERSION_BUILD;
- LLSD query;
- query["channel"] = gSavedSettings.getString("VersionChannelName");
- query["version"] = version.str();
+ LLSD query;
+ query["channel"] = gSavedSettings.getString("VersionChannelName");
+ query["version"] = version.str();
- std::ostringstream url;
- url << RELEASE_NOTES_BASE_URL << LLURI::mapToQueryString(query);
+ std::ostringstream url;
+ url << LLFloaterAbout::getInstance()->getString("RELEASE_NOTES_BASE_URL") << LLURI::mapToQueryString(query);
- return url.str();
-}
+ return url.str();
+ }
diff --git a/indra/newview/llfloaterabout.h b/indra/newview/llfloaterabout.h
index 7564b8e41c..537c8f29c0 100644
--- a/indra/newview/llfloaterabout.h
+++ b/indra/newview/llfloaterabout.h
@@ -36,16 +36,15 @@
#include "llfloater.h"
class LLFloaterAbout
-: public LLFloater
+ : public LLFloater, public LLFloaterSingleton<LLFloaterAbout>
{
-public:
- LLFloaterAbout();
+ friend class LLUISingleton<LLFloaterAbout, VisibilityPolicy<LLFloater> >;
+protected:
+ LLFloaterAbout(const LLSD& key);
virtual ~LLFloaterAbout();
- static void show(void*);
-
-private:
- static LLFloaterAbout* sInstance;
+public:
+ /*virtual*/ BOOL postBuild();
};
diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp
index 162456b8ce..34bd5211f2 100644
--- a/indra/newview/llfloateranimpreview.cpp
+++ b/indra/newview/llfloateranimpreview.cpp
@@ -66,6 +66,7 @@
#include "llvoavatar.h"
#include "pipeline.h"
#include "lluictrlfactory.h"
+#include "lltrans.h"
S32 LLFloaterAnimPreview::sUploadAmount = 10;
@@ -82,6 +83,40 @@ const F32 MAX_CAMERA_ZOOM = 10.f;
const F32 BASE_ANIM_TIME_OFFSET = 5.f;
+std::string STATUS[] =
+{
+ "E_ST_OK",
+ "E_ST_EOF",
+ "E_ST_NO_CONSTRAINT",
+ "E_ST_NO_FILE",
+"E_ST_NO_HIER",
+"E_ST_NO_JOINT",
+"E_ST_NO_NAME",
+"E_ST_NO_OFFSET",
+"E_ST_NO_CHANNELS",
+"E_ST_NO_ROTATION",
+"E_ST_NO_AXIS",
+"E_ST_NO_MOTION",
+"E_ST_NO_FRAMES",
+"E_ST_NO_FRAME_TIME",
+"E_ST_NO_POS",
+"E_ST_NO_ROT",
+"E_ST_NO_XLT_FILE",
+"E_ST_NO_XLT_HEADER",
+"E_ST_NO_XLT_NAME",
+"E_ST_NO_XLT_IGNORE",
+"E_ST_NO_XLT_RELATIVE",
+"E_ST_NO_XLT_OUTNAME",
+"E_ST_NO_XLT_MATRIX",
+"E_ST_NO_XLT_MERGECHILD",
+"E_ST_NO_XLT_MERGEPARENT",
+"E_ST_NO_XLT_PRIORITY",
+"E_ST_NO_XLT_LOOP",
+"E_ST_NO_XLT_EASEIN",
+"E_ST_NO_XLT_EASEOUT",
+"E_ST_NO_XLT_HAND",
+"E_ST_NO_XLT_EMOTE",
+};
//-----------------------------------------------------------------------------
// LLFloaterAnimPreview()
//-----------------------------------------------------------------------------
@@ -131,9 +166,9 @@ void LLFloaterAnimPreview::setAnimCallbacks()
childSetCommitCallback("priority", onCommitPriority, this);
childSetCommitCallback("loop_check", onCommitLoop, this);
childSetCommitCallback("loop_in_point", onCommitLoopIn, this);
- childSetValidate("loop_in_point", validateLoopIn);
+ childSetValidate("loop_in_point", boost::bind(&LLFloaterAnimPreview::validateLoopIn, this, _1));
childSetCommitCallback("loop_out_point", onCommitLoopOut, this);
- childSetValidate("loop_out_point", validateLoopOut);
+ childSetValidate("loop_out_point", boost::bind(&LLFloaterAnimPreview::validateLoopOut, this, _1));
childSetCommitCallback("hand_pose_combo", onCommitHandPose, this);
@@ -141,9 +176,9 @@ void LLFloaterAnimPreview::setAnimCallbacks()
childSetValue("emote_combo", "[None]");
childSetCommitCallback("ease_in_time", onCommitEaseIn, this);
- childSetValidate("ease_in_time", validateEaseIn);
+ childSetValidate("ease_in_time", boost::bind(&LLFloaterAnimPreview::validateEaseIn, this, _1));
childSetCommitCallback("ease_out_time", onCommitEaseOut, this);
- childSetValidate("ease_out_time", validateEaseOut);
+ childSetValidate("ease_out_time", boost::bind(&LLFloaterAnimPreview::validateEaseOut, this, _1));
}
//-----------------------------------------------------------------------------
@@ -151,7 +186,6 @@ void LLFloaterAnimPreview::setAnimCallbacks()
//-----------------------------------------------------------------------------
BOOL LLFloaterAnimPreview::postBuild()
{
- LLRect r;
LLKeyframeMotion* motionp = NULL;
LLBVHLoader* loaderp = NULL;
@@ -172,63 +206,14 @@ BOOL LLFloaterAnimPreview::postBuild()
PREVIEW_HPAD + PREF_BUTTON_HEIGHT + PREVIEW_HPAD);
mPreviewImageRect.set(0.f, 1.f, 1.f, 0.f);
- S32 y = mPreviewRect.mTop + BTN_HEIGHT;
- S32 btn_left = PREVIEW_HPAD;
-
- r.set( btn_left, y, btn_left + 32, y - BTN_HEIGHT );
mPlayButton = getChild<LLButton>( "play_btn");
- if (!mPlayButton)
- {
- mPlayButton = new LLButton(std::string("play_btn"), LLRect(0,0,0,0));
- }
- mPlayButton->setClickedCallback(onBtnPlay);
- mPlayButton->setCallbackUserData(this);
-
- mPlayButton->setImages(std::string("button_anim_play.tga"),
- std::string("button_anim_play_selected.tga"));
- mPlayButton->setDisabledImages(LLStringUtil::null,LLStringUtil::null);
-
- mPlayButton->setScaleImage(TRUE);
+ mPlayButton->setClickedCallback(onBtnPlay, this);
mStopButton = getChild<LLButton>( "stop_btn");
- if (!mStopButton)
- {
- mStopButton = new LLButton(std::string("stop_btn"), LLRect(0,0,0,0));
- }
- mStopButton->setClickedCallback(onBtnStop);
- mStopButton->setCallbackUserData(this);
-
- mStopButton->setImages(std::string("button_anim_stop.tga"),
- std::string("button_anim_stop_selected.tga"));
- mStopButton->setDisabledImages(LLStringUtil::null,LLStringUtil::null);
-
- mStopButton->setScaleImage(TRUE);
-
- r.set(r.mRight + PREVIEW_HPAD, y, getRect().getWidth() - PREVIEW_HPAD, y - BTN_HEIGHT);
- //childSetCommitCallback("playback_slider", onSliderMove, this);
+ mStopButton->setClickedCallback(onBtnStop, this);
childHide("bad_animation_text");
- //childSetCommitCallback("preview_base_anim", onCommitBaseAnim, this);
- //childSetValue("preview_base_anim", "Standing");
-
- //childSetCommitCallback("priority", onCommitPriority, this);
- //childSetCommitCallback("loop_check", onCommitLoop, this);
- //childSetCommitCallback("loop_in_point", onCommitLoopIn, this);
- //childSetValidate("loop_in_point", validateLoopIn);
- //childSetCommitCallback("loop_out_point", onCommitLoopOut, this);
- //childSetValidate("loop_out_point", validateLoopOut);
-
- //childSetCommitCallback("hand_pose_combo", onCommitHandPose, this);
-
- //childSetCommitCallback("emote_combo", onCommitEmote, this);
- //childSetValue("emote_combo", "[None]");
-
- //childSetCommitCallback("ease_in_time", onCommitEaseIn, this);
- //childSetValidate("ease_in_time", validateEaseIn);
- //childSetCommitCallback("ease_out_time", onCommitEaseOut, this);
- //childSetValidate("ease_out_time", validateEaseOut);
-
std::string exten = gDirUtilp->getExtension(mFilename);
if (exten == "bvh")
{
@@ -254,7 +239,19 @@ BOOL LLFloaterAnimPreview::postBuild()
{
file_buffer[file_size] = '\0';
llinfos << "Loading BVH file " << mFilename << llendl;
- loaderp = new LLBVHLoader(file_buffer);
+ ELoadStatus load_status = E_ST_OK;
+ S32 line_number = 0;
+ loaderp = new LLBVHLoader(file_buffer, load_status, line_number);
+ std::string status = getString(STATUS[load_status]);
+
+ if(load_status == E_ST_NO_XLT_FILE)
+ {
+ llwarns << "NOTE: No translation table found." << llendl;
+ }
+ else
+ {
+ llwarns << "ERROR: [line: " << line_number << "] " << status << llendl;
+ }
}
infile.close() ;
@@ -347,7 +344,7 @@ BOOL LLFloaterAnimPreview::postBuild()
else
{
LLUIString out_str = getString("failed_file_read");
- out_str.setArg("[STATUS]", loaderp->getStatus()); // *TODO:Translate
+ out_str.setArg("[STATUS]", getString(STATUS[loaderp->getStatus()]));
childSetValue("bad_animation_text", out_str.getString());
}
}
@@ -813,57 +810,53 @@ void LLFloaterAnimPreview::onCommitEaseOut(LLUICtrl* ctrl, void* data)
//-----------------------------------------------------------------------------
// validateEaseIn()
//-----------------------------------------------------------------------------
-BOOL LLFloaterAnimPreview::validateEaseIn(LLUICtrl* spin, void* data)
+bool LLFloaterAnimPreview::validateEaseIn(const LLSD& data)
{
- LLFloaterAnimPreview* previewp = (LLFloaterAnimPreview*)data;
- if (!previewp->getEnabled())
- return FALSE;
+ if (!getEnabled())
+ return false;
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
- LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(previewp->mMotionID);
+ LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+ LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
if (!motionp->getLoop())
{
- F32 new_ease_in = llclamp((F32)previewp->childGetValue("ease_in_time").asReal(), 0.f, motionp->getDuration() - motionp->getEaseOutDuration());
- previewp->childSetValue("ease_in_time", LLSD(new_ease_in));
+ F32 new_ease_in = llclamp((F32)childGetValue("ease_in_time").asReal(), 0.f, motionp->getDuration() - motionp->getEaseOutDuration());
+ childSetValue("ease_in_time", LLSD(new_ease_in));
}
- return TRUE;
+ return true;
}
//-----------------------------------------------------------------------------
// validateEaseOut()
//-----------------------------------------------------------------------------
-BOOL LLFloaterAnimPreview::validateEaseOut(LLUICtrl* spin, void* data)
+bool LLFloaterAnimPreview::validateEaseOut(const LLSD& data)
{
- LLFloaterAnimPreview* previewp = (LLFloaterAnimPreview*)data;
+ if (!getEnabled())
+ return false;
- if (!previewp->getEnabled())
- return FALSE;
-
- LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar();
- LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(previewp->mMotionID);
+ LLVOAvatar* avatarp = mAnimPreview->getDummyAvatar();
+ LLKeyframeMotion* motionp = (LLKeyframeMotion*)avatarp->findMotion(mMotionID);
if (!motionp->getLoop())
{
- F32 new_ease_out = llclamp((F32)previewp->childGetValue("ease_out_time").asReal(), 0.f, motionp->getDuration() - motionp->getEaseInDuration());
- previewp->childSetValue("ease_out_time", LLSD(new_ease_out));
+ F32 new_ease_out = llclamp((F32)childGetValue("ease_out_time").asReal(), 0.f, motionp->getDuration() - motionp->getEaseInDuration());
+ childSetValue("ease_out_time", LLSD(new_ease_out));
}
- return TRUE;
+ return true;
}
//-----------------------------------------------------------------------------
// validateLoopIn()
//-----------------------------------------------------------------------------
-BOOL LLFloaterAnimPreview::validateLoopIn(LLUICtrl* ctrl, void* data)
+bool LLFloaterAnimPreview::validateLoopIn(const LLSD& data)
{
- LLFloaterAnimPreview* previewp = (LLFloaterAnimPreview*)data;
- if (!previewp->getEnabled())
- return FALSE;
+ if (!getEnabled())
+ return false;
- F32 loop_in_value = (F32)previewp->childGetValue("loop_in_point").asReal();
- F32 loop_out_value = (F32)previewp->childGetValue("loop_out_point").asReal();
+ F32 loop_in_value = (F32)childGetValue("loop_in_point").asReal();
+ F32 loop_out_value = (F32)childGetValue("loop_out_point").asReal();
if (loop_in_value < 0.f)
{
@@ -878,21 +871,20 @@ BOOL LLFloaterAnimPreview::validateLoopIn(LLUICtrl* ctrl, void* data)
loop_in_value = loop_out_value;
}
- previewp->childSetValue("loop_in_point", LLSD(loop_in_value));
- return TRUE;
+ childSetValue("loop_in_point", LLSD(loop_in_value));
+ return true;
}
//-----------------------------------------------------------------------------
// validateLoopOut()
//-----------------------------------------------------------------------------
-BOOL LLFloaterAnimPreview::validateLoopOut(LLUICtrl* spin, void* data)
+bool LLFloaterAnimPreview::validateLoopOut(const LLSD& data)
{
- LLFloaterAnimPreview* previewp = (LLFloaterAnimPreview*)data;
- if (!previewp->getEnabled())
- return FALSE;
+ if (!getEnabled())
+ return false;
- F32 loop_out_value = (F32)previewp->childGetValue("loop_out_point").asReal();
- F32 loop_in_value = (F32)previewp->childGetValue("loop_in_point").asReal();
+ F32 loop_out_value = (F32)childGetValue("loop_out_point").asReal();
+ F32 loop_in_value = (F32)childGetValue("loop_in_point").asReal();
if (loop_out_value < 0.f)
{
@@ -907,8 +899,8 @@ BOOL LLFloaterAnimPreview::validateLoopOut(LLUICtrl* spin, void* data)
loop_out_value = loop_in_value;
}
- previewp->childSetValue("loop_out_point", LLSD(loop_out_value));
- return TRUE;
+ childSetValue("loop_out_point", LLSD(loop_out_value));
+ return true;
}
@@ -1018,7 +1010,7 @@ void LLFloaterAnimPreview::onBtnOK(void* userdata)
LLKeyframeDataCache::removeKeyframeData(floaterp->mMotionID);
}
- floaterp->close(false);
+ floaterp->closeFloater(false);
}
//-----------------------------------------------------------------------------
diff --git a/indra/newview/llfloateranimpreview.h b/indra/newview/llfloateranimpreview.h
index 639c9277cd..2f228c3ecd 100644
--- a/indra/newview/llfloateranimpreview.h
+++ b/indra/newview/llfloateranimpreview.h
@@ -92,16 +92,16 @@ public:
static void onCommitLoop(LLUICtrl*, void*);
static void onCommitLoopIn(LLUICtrl*, void*);
static void onCommitLoopOut(LLUICtrl*, void*);
- static BOOL validateLoopIn(LLUICtrl*, void*);
- static BOOL validateLoopOut(LLUICtrl*, void*);
+ bool validateLoopIn(const LLSD& data);
+ bool validateLoopOut(const LLSD& data);
static void onCommitName(LLUICtrl*, void*);
static void onCommitHandPose(LLUICtrl*, void*);
static void onCommitEmote(LLUICtrl*, void*);
static void onCommitPriority(LLUICtrl*, void*);
static void onCommitEaseIn(LLUICtrl*, void*);
static void onCommitEaseOut(LLUICtrl*, void*);
- static BOOL validateEaseIn(LLUICtrl*, void*);
- static BOOL validateEaseOut(LLUICtrl*, void*);
+ bool validateEaseIn(const LLSD& data);
+ bool validateEaseOut(const LLSD& data);
static void onBtnOK(void*);
static void onSaveComplete(const LLUUID& asset_uuid,
LLAssetType::EType type,
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp
index 747431fb19..e1974bba84 100644
--- a/indra/newview/llfloaterauction.cpp
+++ b/indra/newview/llfloaterauction.cpp
@@ -41,6 +41,7 @@
#include "llparcel.h"
#include "llvfile.h"
#include "llvfs.h"
+#include "llwindow.h"
#include "llagent.h"
#include "llcombobox.h"
@@ -69,41 +70,32 @@ void auction_tga_upload_done(const LLUUID& asset_id,
/// Class llfloaterauction
///----------------------------------------------------------------------------
-LLFloaterAuction* LLFloaterAuction::sInstance = NULL;
-
// Default constructor
-LLFloaterAuction::LLFloaterAuction() :
- LLFloater(std::string("floater_auction")),
+LLFloaterAuction::LLFloaterAuction(const LLSD& key)
+ : LLFloater(),
mParcelID(-1)
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_auction.xml");
-
- childSetValue("fence_check",
- LLSD( gSavedSettings.getBOOL("AuctionShowFence") ) );
- childSetCommitCallback("fence_check",
- LLSavedSettingsGlue::setBOOL, (void*)"AuctionShowFence");
-
- childSetAction("snapshot_btn", onClickSnapshot, this);
- childSetAction("ok_btn", onClickOK, this);
}
// Destroys the object
LLFloaterAuction::~LLFloaterAuction()
{
- sInstance = NULL;
}
-// static
-void LLFloaterAuction::show()
+BOOL LLFloaterAuction::postBuild()
{
- if(!sInstance)
- {
- sInstance = new LLFloaterAuction();
- sInstance->center();
- sInstance->setFocus(TRUE);
- }
- sInstance->initialize();
- sInstance->open(); /*Flawfinder: ignore*/
+ childSetValue("fence_check", LLSD( gSavedSettings.getBOOL("AuctionShowFence") ) );
+ getChild<LLUICtrl>("fence_check")->setCommitCallback(boost::bind(LLSavedSettingsGlue::setBOOL, _1, "AuctionShowFence"));
+
+ childSetAction("snapshot_btn", onClickSnapshot, this);
+ childSetAction("ok_btn", onClickOK, this);
+ return TRUE;
+}
+
+void LLFloaterAuction::onOpen(const LLSD& key)
+{
+ initialize();
}
void LLFloaterAuction::initialize()
@@ -259,7 +251,7 @@ void LLFloaterAuction::onClickOK(void* data)
self->mImage = NULL;
self->mParcelID = -1;
self->mParcelHost.invalidate();
- self->close();
+ self->closeFloater();
}
diff --git a/indra/newview/llfloaterauction.h b/indra/newview/llfloaterauction.h
index e13bce01e1..d71fd3c653 100644
--- a/indra/newview/llfloaterauction.h
+++ b/indra/newview/llfloaterauction.h
@@ -36,7 +36,7 @@
#include "llfloater.h"
#include "lluuid.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llviewerimage.h"
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -46,26 +46,24 @@
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
class LLParcelSelection;
-class LLFloaterAuction : public LLFloater
+class LLFloaterAuction : public LLFloater, public LLFloaterSingleton<LLFloaterAuction>
{
+ friend class LLUISingleton<LLFloaterAuction, VisibilityPolicy<LLFloater> >;
public:
// LLFloater interface
/*virtual*/ void onClose(bool app_quitting) { setVisible(FALSE); }
+ /*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void draw();
-
- // LLFloaterAuction interface
- static void show();
private:
- LLFloaterAuction();
+ LLFloaterAuction(const LLSD& key);
~LLFloaterAuction();
void initialize();
static void onClickSnapshot(void* data);
static void onClickOK(void* data);
- static LLFloaterAuction* sInstance;
-
+ /*virtual*/ BOOL postBuild();
private:
LLTransactionID mTransactionID;
LLAssetID mImageID;
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index e382fefece..2c2dcda633 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -42,15 +42,13 @@
#include "llinventorymodel.h"
#include "lllineeditor.h"
#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
#include "lltextbox.h"
#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "llworld.h"
-
-const S32 MIN_WIDTH = 200;
-const S32 MIN_HEIGHT = 340;
-const LLRect FLOATER_RECT(0, 380, 240, 0);
-const std::string FLOATER_TITLE = "Choose Resident";
+#include "lltabcontainer.h"
// static
LLFloaterAvatarPicker* LLFloaterAvatarPicker::sInstance = NULL;
@@ -70,13 +68,13 @@ LLFloaterAvatarPicker* LLFloaterAvatarPicker::show(callback_t callback,
sInstance->mCallbackUserdata = userdata;
sInstance->mCloseOnSelect = FALSE;
- sInstance->open(); /* Flawfinder: ignore */
+ sInstance->openFloater();
sInstance->center();
sInstance->setAllowMultiple(allow_multiple);
}
else
{
- sInstance->open(); /*Flawfinder: ignore*/
+ sInstance->openFloater();
sInstance->mCallback = callback;
sInstance->mCallbackUserdata = userdata;
sInstance->setAllowMultiple(allow_multiple);
@@ -88,30 +86,33 @@ LLFloaterAvatarPicker* LLFloaterAvatarPicker::show(callback_t callback,
}
// Default constructor
-LLFloaterAvatarPicker::LLFloaterAvatarPicker() :
- LLFloater(std::string("avatarpicker"), FLOATER_RECT, FLOATER_TITLE, TRUE, MIN_WIDTH, MIN_HEIGHT),
+LLFloaterAvatarPicker::LLFloaterAvatarPicker()
+ : LLFloater(),
mResultsReturned(FALSE),
mCallback(NULL),
mCallbackUserdata(NULL)
{
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_avatar_picker.xml", NULL);
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_avatar_picker.xml");
}
BOOL LLFloaterAvatarPicker::postBuild()
{
- childSetKeystrokeCallback("Edit", editKeystroke, this);
+ getChild<LLLineEditor>("Edit")->setKeystrokeCallback(editKeystroke, this);
childSetAction("Find", onBtnFind, this);
childDisable("Find");
childSetAction("Refresh", onBtnRefresh, this);
childSetCommitCallback("near_me_range", onRangeAdjust, this);
-
- childSetDoubleClickCallback("SearchResults", onBtnSelect);
- childSetDoubleClickCallback("NearMe", onBtnSelect);
+
+ LLScrollListCtrl* searchresults = getChild<LLScrollListCtrl>("SearchResults");
+ searchresults->setDoubleClickCallback(onBtnSelect, this);
childSetCommitCallback("SearchResults", onList, this);
- childSetCommitCallback("NearMe", onList, this);
childDisable("SearchResults");
-
+
+ LLScrollListCtrl* nearme = getChild<LLScrollListCtrl>("NearMe");
+ nearme->setDoubleClickCallback(onBtnSelect, this);
+ childSetCommitCallback("NearMe", onList, this);
+
childSetAction("Select", onBtnSelect, this);
childDisable("Select");
@@ -126,33 +127,26 @@ BOOL LLFloaterAvatarPicker::postBuild()
search_panel->setDefaultBtn("Find");
}
- getChild<LLScrollListCtrl>("SearchResults")->addCommentText(getString("no_results"));
+ getChild<LLScrollListCtrl>("SearchResults")->setCommentText(getString("no_results"));
LLInventoryPanel* inventory_panel = getChild<LLInventoryPanel>("InventoryPanel");
inventory_panel->setFilterTypes(0x1 << LLInventoryType::IT_CALLINGCARD);
inventory_panel->setFollowsAll();
inventory_panel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
inventory_panel->openDefaultFolderForType(LLAssetType::AT_CALLINGCARD);
- inventory_panel->setSelectCallback(LLFloaterAvatarPicker::onCallingCardSelectionChange, this);
-
- childSetTabChangeCallback("ResidentChooserTabs", "SearchPanel", onTabChanged, this);
- childSetTabChangeCallback("ResidentChooserTabs", "CallingCardsPanel", onTabChanged, this);
- childSetTabChangeCallback("ResidentChooserTabs", "NearMePanel", onTabChanged, this);
+ inventory_panel->setSelectCallback(boost::bind(&LLFloaterAvatarPicker::doCallingCardSelectionChange, this, _1, _2));
+
+ getChild<LLTabContainer>("ResidentChooserTabs")->setCommitCallback(
+ boost::bind(&LLFloaterAvatarPicker::onTabChanged, this));
setAllowMultiple(FALSE);
return TRUE;
}
-void LLFloaterAvatarPicker::onTabChanged(void* userdata, bool from_click)
+void LLFloaterAvatarPicker::onTabChanged()
{
- LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)userdata;
- if (!self)
- {
- return;
- }
-
- self->childSetEnabled("Select", self->visibleItemsSelected());
+ childSetEnabled("Select", visibleItemsSelected());
}
// Destroys the object
@@ -216,7 +210,7 @@ void LLFloaterAvatarPicker::onBtnSelect(void* userdata)
if(self->mCloseOnSelect)
{
self->mCloseOnSelect = FALSE;
- self->close();
+ self->closeFloater();
}
}
@@ -229,14 +223,14 @@ void LLFloaterAvatarPicker::onBtnRefresh(void* userdata)
}
self->getChild<LLScrollListCtrl>("NearMe")->deleteAllItems();
- self->getChild<LLScrollListCtrl>("NearMe")->addCommentText(self->getString("searching"));
+ self->getChild<LLScrollListCtrl>("NearMe")->setCommentText(self->getString("searching"));
self->mNearMeListComplete = FALSE;
}
void LLFloaterAvatarPicker::onBtnClose(void* userdata)
{
LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)userdata;
- if(self) self->close();
+ if(self) self->closeFloater();
}
void LLFloaterAvatarPicker::onRangeAdjust(LLUICtrl* source, void* data)
@@ -253,18 +247,8 @@ void LLFloaterAvatarPicker::onList(LLUICtrl* ctrl, void* userdata)
}
}
-// static callback for inventory picker (select from calling cards)
-void LLFloaterAvatarPicker::onCallingCardSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data)
-{
- LLFloaterAvatarPicker* self = (LLFloaterAvatarPicker*)data;
- if (self)
- {
- self->doCallingCardSelectionChange( items, user_action, data );
- }
-}
-
// Callback for inventory picker (select from calling cards)
-void LLFloaterAvatarPicker::doCallingCardSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data)
+void LLFloaterAvatarPicker::doCallingCardSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action)
{
bool panel_active = (childGetVisibleTab("ResidentChooserTabs") == getChild<LLPanel>("CallingCardsPanel"));
@@ -330,7 +314,7 @@ void LLFloaterAvatarPicker::populateNearMe()
{
childDisable("NearMe");
childDisable("Select");
- near_me_scroller->addCommentText(getString("no_one_near"));
+ near_me_scroller->setCommentText(getString("no_one_near"));
}
else
{
@@ -394,7 +378,7 @@ void LLFloaterAvatarPicker::find()
gAgent.sendReliableMessage();
getChild<LLScrollListCtrl>("SearchResults")->deleteAllItems();
- getChild<LLScrollListCtrl>("SearchResults")->addCommentText(getString("searching"));
+ getChild<LLScrollListCtrl>("SearchResults")->setCommentText(getString("searching"));
childSetEnabled("Select", FALSE);
mResultsReturned = FALSE;
@@ -501,7 +485,7 @@ BOOL LLFloaterAvatarPicker::handleKeyHere(KEY key, MASK mask)
}
else if (key == KEY_ESCAPE && mask == MASK_NONE)
{
- close();
+ closeFloater();
return TRUE;
}
diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h
index 56bc387bce..0f47401f23 100644
--- a/indra/newview/llfloateravatarpicker.h
+++ b/indra/newview/llfloateravatarpicker.h
@@ -62,10 +62,9 @@ private:
static void onRangeAdjust(LLUICtrl* source, void* data);
static void onBtnClose(void* userdata);
static void onList(class LLUICtrl* ctrl, void* userdata);
- static void onTabChanged(void* userdata, bool from_click);
+ void onTabChanged();
- void doCallingCardSelectionChange(const std::deque<class LLFolderViewItem*> &items, BOOL user_action, void* data);
- static void onCallingCardSelectionChange(const std::deque<class LLFolderViewItem*> &items, BOOL user_action, void* data);
+ void doCallingCardSelectionChange(const std::deque<class LLFolderViewItem*> &items, BOOL user_action);
void populateNearMe();
BOOL visibleItemsSelected() const; // Returns true if any items in the current tab are selected.
diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp
index e81b5d7fce..e2f13088eb 100644
--- a/indra/newview/llfloateravatartextures.cpp
+++ b/indra/newview/llfloateravatartextures.cpp
@@ -42,30 +42,29 @@
using namespace LLVOAvatarDefines;
-LLFloaterAvatarTextures::LLFloaterAvatarTextures(const LLUUID& id) :
- LLFloater(std::string("avatar_texture_debug")),
+LLFloaterAvatarTextures* LLFloaterAvatarTextures::sInstance = NULL;
+LLFloaterAvatarTextures::LLFloaterAvatarTextures(const LLUUID& id)
+ : LLFloater(),
mID(id)
{
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_avatar_textures.xml");
}
LLFloaterAvatarTextures::~LLFloaterAvatarTextures()
{
+ sInstance = NULL;
}
LLFloaterAvatarTextures* LLFloaterAvatarTextures::show(const LLUUID &id)
{
-
- LLFloaterAvatarTextures* floaterp = new LLFloaterAvatarTextures(id);
-
- // Builds and adds to gFloaterView
- LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_avatar_textures.xml");
-
- gFloaterView->addChild(floaterp);
- floaterp->open(); /*Flawfinder: ignore*/
-
- gFloaterView->adjustToFitScreen(floaterp, FALSE);
-
- return floaterp;
+ if (!sInstance)
+ {
+ sInstance = new LLFloaterAvatarTextures(id);
+ gFloaterView->addChild(sInstance);
+ gFloaterView->adjustToFitScreen(sInstance, FALSE);
+ }
+ sInstance->openFloater();
+ return sInstance;
}
BOOL LLFloaterAvatarTextures::postBuild()
@@ -142,7 +141,7 @@ void LLFloaterAvatarTextures::refresh()
}
else
{
- setTitle(mTitle + ": INVALID AVATAR (" + mID.asString() + ")");
+ setTitle(mTitle + ": " + getString("InvalidAvatar") + " (" + mID.asString() + ")");
}
}
diff --git a/indra/newview/llfloateravatartextures.h b/indra/newview/llfloateravatartextures.h
index 4138edeb4d..3ec0e7cb03 100644
--- a/indra/newview/llfloateravatartextures.h
+++ b/indra/newview/llfloateravatartextures.h
@@ -60,6 +60,7 @@ private:
LLUUID mID;
std::string mTitle;
LLTextureCtrl* mTextures[LLVOAvatarDefines::TEX_NUM_INDICES];
+ static LLFloaterAvatarTextures* sInstance;
};
#endif
diff --git a/indra/newview/llfloaterbeacons.cpp b/indra/newview/llfloaterbeacons.cpp
index 5476b35dc8..052f334285 100644
--- a/indra/newview/llfloaterbeacons.cpp
+++ b/indra/newview/llfloaterbeacons.cpp
@@ -40,6 +40,7 @@
LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
+: LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_beacons.xml");
@@ -71,14 +72,13 @@ BOOL LLFloaterBeacons::postBuild()
// Needed to make the floater visibility toggle the beacons.
// Too bad we can't just add control_name="BeaconAlwaysOn" to the XML.
-void LLFloaterBeacons::open()
+void LLFloaterBeacons::onOpen(const LLSD& key)
{
- LLFloater::open();
gSavedSettings.setBOOL( "BeaconAlwaysOn", TRUE);
}
-void LLFloaterBeacons::close(bool app_quitting)
+void LLFloaterBeacons::onClose(bool app_quitting)
{
- LLFloater::close(app_quitting);
+ destroy();
if(!app_quitting)
{
gSavedSettings.setBOOL( "BeaconAlwaysOn", FALSE);
diff --git a/indra/newview/llfloaterbeacons.h b/indra/newview/llfloaterbeacons.h
index c12bdd7261..8156e82ac3 100644
--- a/indra/newview/llfloaterbeacons.h
+++ b/indra/newview/llfloaterbeacons.h
@@ -45,8 +45,8 @@ public:
// Needed to make the floater visibility toggle the beacons.
// Too bad we can't just add control_name="BeaconAlwaysOn" to the XML.
- /*virtual*/ void open();
- /*virtual*/ void close(bool app_quitting);
+ /*virtual*/ void onOpen(const LLSD& key);
+ /*virtual*/ void onClose(bool app_quitting);
private:
LLFloaterBeacons(const LLSD& seed);
diff --git a/indra/newview/llfloaterbuildoptions.cpp b/indra/newview/llfloaterbuildoptions.cpp
index 3cd35db19c..2507a72caa 100644
--- a/indra/newview/llfloaterbuildoptions.cpp
+++ b/indra/newview/llfloaterbuildoptions.cpp
@@ -40,58 +40,16 @@
#include "llfloaterbuildoptions.h"
#include "lluictrlfactory.h"
-// library includes
-#include "llfontgl.h"
-#include "llcheckboxctrl.h"
-#include "llspinctrl.h"
-#include "llsliderctrl.h"
-
-// newview includes
-#include "llresmgr.h"
-#include "llviewercontrol.h"
-
-//
-// Globals
-//
-LLFloaterBuildOptions *LLFloaterBuildOptions::sInstance = NULL;
-
//
// Methods
//
-LLFloaterBuildOptions::LLFloaterBuildOptions( )
-: LLFloater(std::string("build options floater"))
+LLFloaterBuildOptions::LLFloaterBuildOptions(const LLSD& key)
+ : LLFloater()
{
- sInstance = this;
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_build_options.xml");
}
LLFloaterBuildOptions::~LLFloaterBuildOptions()
{
- sInstance = NULL;
-}
-
-// static
-void LLFloaterBuildOptions::show(void*)
-{
- if (sInstance)
- {
- sInstance->open(); /*Flawfinder: ignore*/
- }
- else
- {
- LLFloaterBuildOptions* floater = new LLFloaterBuildOptions();
-
- LLUICtrlFactory::getInstance()->buildFloater(floater, "floater_build_options.xml");
- floater->open(); /*Flawfinder: ignore*/
- }
}
-LLFloaterBuildOptions* LLFloaterBuildOptions::getInstance()
-{
- return sInstance;
-}
-
-// static
-BOOL LLFloaterBuildOptions::visible(void*)
-{
- return (sInstance != NULL);
-}
diff --git a/indra/newview/llfloaterbuildoptions.h b/indra/newview/llfloaterbuildoptions.h
index e030b063d9..da72520486 100644
--- a/indra/newview/llfloaterbuildoptions.h
+++ b/indra/newview/llfloaterbuildoptions.h
@@ -42,19 +42,12 @@
class LLFloaterBuildOptions
-: public LLFloater
+ : public LLFloater, public LLFloaterSingleton<LLFloaterBuildOptions>
{
+ friend class LLUISingleton<LLFloaterBuildOptions, VisibilityPolicy<LLFloater> >;
protected:
- LLFloaterBuildOptions();
+ LLFloaterBuildOptions(const LLSD& key);
~LLFloaterBuildOptions();
-
-public:
- static void show(void*);
- static LLFloaterBuildOptions* getInstance();
- static BOOL visible(void*);
-
-protected:
- static LLFloaterBuildOptions* sInstance;
};
#endif
diff --git a/indra/newview/llfloaterbulkpermission.cpp b/indra/newview/llfloaterbulkpermission.cpp
index 4697296e16..6157d19541 100644
--- a/indra/newview/llfloaterbulkpermission.cpp
+++ b/indra/newview/llfloaterbulkpermission.cpp
@@ -52,20 +52,28 @@
#include "llviewerstats.h"
#include "lluictrlfactory.h"
#include "llselectmgr.h"
+#include "llcheckboxctrl.h"
#include "roles_constants.h" // for GP_OBJECT_MANIPULATE
-LLFloaterBulkPermission::LLFloaterBulkPermission(const LLSD& seed) : mDone(FALSE)
+LLFloaterBulkPermission::LLFloaterBulkPermission(const LLSD& seed)
+: LLFloater(),
+ mDone(FALSE)
{
mID.generate();
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_bulk_perms.xml");
+}
+
+BOOL LLFloaterBulkPermission::postBuild()
+{
childSetEnabled("next_owner_transfer", gSavedSettings.getBOOL("BulkChangeNextOwnerCopy"));
childSetAction("apply", onApplyBtn, this);
childSetAction("close", onCloseBtn, this);
childSetAction("check_all", onCheckAll, this);
childSetAction("check_none", onUncheckAll, this);
childSetCommitCallback("next_owner_copy", &onCommitCopy, this);
+ return TRUE;
}
void LLFloaterBulkPermission::doApply()
@@ -92,7 +100,7 @@ void LLFloaterBulkPermission::doApply()
LLSelectMgr::getInstance()->getSelection()->applyToNodes(&gatherer);
if(mObjectIDs.empty())
{
- list->addCommentText(getString("nothing_to_modify_text"));
+ list->setCommentText(getString("nothing_to_modify_text"));
}
else
{
@@ -172,7 +180,7 @@ void LLFloaterBulkPermission::onCommitCopy(LLUICtrl* ctrl, void* data)
BOOL LLFloaterBulkPermission::start()
{
// note: number of top-level objects to modify is mObjectIDs.count().
- getChild<LLScrollListCtrl>("queue output")->addCommentText(getString("start_text"));
+ getChild<LLScrollListCtrl>("queue output")->setCommentText(getString("start_text"));
return nextObject();
}
@@ -195,7 +203,7 @@ BOOL LLFloaterBulkPermission::nextObject()
if(isDone() && !mDone)
{
- getChild<LLScrollListCtrl>("queue output")->addCommentText(getString("done_text"));
+ getChild<LLScrollListCtrl>("queue output")->setCommentText(getString("done_text"));
mDone = TRUE;
}
return successful_start;
@@ -262,6 +270,7 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, Invent
( asstype == LLAssetType::AT_CLOTHING && gSavedSettings.getBOOL("BulkChangeIncludeClothing" )) ||
( asstype == LLAssetType::AT_GESTURE && gSavedSettings.getBOOL("BulkChangeIncludeGestures" )) ||
( asstype == LLAssetType::AT_LANDMARK && gSavedSettings.getBOOL("BulkChangeIncludeLandmarks" )) ||
+ ( asstype == LLAssetType::AT_FAVORITE && gSavedSettings.getBOOL("BulkChangeIncludeFavourite" )) ||
( asstype == LLAssetType::AT_NOTECARD && gSavedSettings.getBOOL("BulkChangeIncludeNotecards" )) ||
( asstype == LLAssetType::AT_OBJECT && gSavedSettings.getBOOL("BulkChangeIncludeObjects" )) ||
( asstype == LLAssetType::AT_LSL_TEXT && gSavedSettings.getBOOL("BulkChangeIncludeScripts" )) ||
@@ -311,7 +320,7 @@ void LLFloaterBulkPermission::handleInventory(LLViewerObject* viewer_obj, Invent
status_text.setArg("[STATUS]", "");
}
- list->addCommentText(status_text.getString());
+ list->setCommentText(status_text.getString());
//TODO if we are an object inside an object we should check a recuse flag and if set
//open the inventory of the object and recurse - Michelle2 Zenovka
diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h
index 09af27045a..d4578f9f30 100644
--- a/indra/newview/llfloaterbulkpermission.h
+++ b/indra/newview/llfloaterbulkpermission.h
@@ -51,6 +51,7 @@ class LLFloaterBulkPermission : public LLFloater, public LLVOInventoryListener,
public:
LLFloaterBulkPermission(const LLSD& seed);
+ BOOL postBuild();
private:
virtual ~LLFloaterBulkPermission() {}
diff --git a/indra/newview/llfloaterbump.cpp b/indra/newview/llfloaterbump.cpp
index 96e51c2fa2..5cf4d90ece 100644
--- a/indra/newview/llfloaterbump.cpp
+++ b/indra/newview/llfloaterbump.cpp
@@ -37,25 +37,19 @@
#include "llscrolllistctrl.h"
+#include "llsd.h"
#include "lluictrlfactory.h"
#include "llviewermessage.h"
#include "llappviewer.h" // gPacificDaylightTime
-///----------------------------------------------------------------------------
-/// Local function declarations, constants, enums, and typedefs
-///----------------------------------------------------------------------------
-LLFloaterBump* LLFloaterBump::sInstance = NULL;
-
///----------------------------------------------------------------------------
/// Class LLFloaterBump
///----------------------------------------------------------------------------
// Default constructor
-LLFloaterBump::LLFloaterBump()
+LLFloaterBump::LLFloaterBump(const LLSD& key)
: LLFloater()
{
- sInstance = this;
-
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_bumps.xml");
}
@@ -63,29 +57,19 @@ LLFloaterBump::LLFloaterBump()
// Destroys the object
LLFloaterBump::~LLFloaterBump()
{
- sInstance = NULL;
}
-// static
-void LLFloaterBump::show(void *contents)
+// virtual
+void LLFloaterBump::onOpen(const LLSD& key)
{
- if (gNoRender)
- {
+ LLScrollListCtrl* list = getChild<LLScrollListCtrl>("bump_list");
+ if (!list)
return;
- }
-
- if (!sInstance)
- {
- sInstance = new LLFloaterBump();
- }
-
- LLScrollListCtrl* list = sInstance->getChild<LLScrollListCtrl>("bump_list");
- if (!list) return;
list->deleteAllItems();
if (gMeanCollisionList.empty())
{
- std::string none_detected = sInstance->getString("none_detected");
+ std::string none_detected = getString("none_detected");
LLSD row;
row["columns"][0]["value"] = none_detected;
row["columns"][0]["font"] = "SansSerifBold";
@@ -97,33 +81,23 @@ void LLFloaterBump::show(void *contents)
iter != gMeanCollisionList.end(); ++iter)
{
LLMeanCollisionData *mcd = *iter;
- LLFloaterBump::add(list, mcd);
+ add(list, mcd);
}
}
-
- sInstance->open(); /*Flawfinder: ignore*/
}
void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd)
{
- if (!sInstance)
- {
- new LLFloaterBump();
- }
-
if (mcd->mFirstName.empty() || list->getItemCount() >= 20)
{
return;
}
- // There's only one internal tm buffer.
- struct tm* timep;
-
- // Convert to Pacific, based on server's opinion of whether
- // it's daylight savings time there.
- timep = utc_to_pacific_time(mcd->mTime, gPacificDaylightTime);
-
- std::string time = llformat("[%d:%02d]", timep->tm_hour, timep->tm_min);
+ std::string timeStr = getString ("timeStr");
+ LLSD substitution;
+
+ substitution["datetime"] = (S32) mcd->mTime;
+ LLStringUtil::format (timeStr, substitution);
std::string action;
switch(mcd->mType)
@@ -150,8 +124,8 @@ void LLFloaterBump::add(LLScrollListCtrl* list, LLMeanCollisionData* mcd)
}
// All above action strings are in XML file
- LLUIString text = sInstance->getString(action);
- text.setArg("[TIME]", time);
+ LLUIString text = getString(action);
+ text.setArg("[TIME]", timeStr);
text.setArg("[FIRST]", mcd->mFirstName);
text.setArg("[LAST]", mcd->mLastName);
diff --git a/indra/newview/llfloaterbump.h b/indra/newview/llfloaterbump.h
index eb15671d41..f55a9e6bc5 100644
--- a/indra/newview/llfloaterbump.h
+++ b/indra/newview/llfloaterbump.h
@@ -40,18 +40,17 @@ class LLMeanCollisionData;
class LLScrollListCtrl;
class LLFloaterBump
-: public LLFloater
+: public LLFloater, public LLFloaterSingleton<LLFloaterBump>
{
-public:
- static void show(void *);
-
-private:
- LLFloaterBump();
+ friend class LLUISingleton<LLFloaterBump, VisibilityPolicy<LLFloater> >;
+protected:
+ LLFloaterBump(const LLSD& key);
virtual ~LLFloaterBump();
- static void add(LLScrollListCtrl* list, LLMeanCollisionData *mcd);
-private:
- static LLFloaterBump* sInstance;
+ void add(LLScrollListCtrl* list, LLMeanCollisionData *mcd);
+
+public:
+ /*virtual*/ void onOpen(const LLSD& key);
};
#endif
diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp
index a33cabc749..9c523522fd 100644
--- a/indra/newview/llfloaterbuy.cpp
+++ b/indra/newview/llfloaterbuy.cpp
@@ -49,14 +49,19 @@
#include "llviewerobject.h"
#include "lluictrlfactory.h"
#include "llviewerwindow.h"
+#include "lltrans.h"
LLFloaterBuy* LLFloaterBuy::sInstance = NULL;
LLFloaterBuy::LLFloaterBuy()
-: LLFloater(std::string("floater_buy_object"), std::string("FloaterBuyRect"), LLStringUtil::null)
+: LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_buy_object.xml");
+}
+
+BOOL LLFloaterBuy::postBuild()
+{
childDisable("object_list");
childDisable("item_list");
@@ -64,6 +69,7 @@ LLFloaterBuy::LLFloaterBuy()
childSetAction("buy_btn", onClickBuy, this);
setDefaultBtn("cancel_btn"); // to avoid accidental buy (SL-43130)
+ return TRUE;
}
LLFloaterBuy::~LLFloaterBuy()
@@ -102,7 +108,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
sInstance = new LLFloaterBuy();
}
- sInstance->open(); /*Flawfinder: ignore*/
+ sInstance->openFloater();
sInstance->setFocus(TRUE);
sInstance->mSaleInfo = sale_info;
sInstance->mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
@@ -270,15 +276,15 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
std::string text = obj->getName();
if (!(next_owner_mask & PERM_COPY))
{
- text.append(" (no copy)");
+ text.append(getString("no_copy"));
}
if (!(next_owner_mask & PERM_MODIFY))
{
- text.append(" (no modify)");
+ text.append(LLTrans::getString("no_modify"));
}
if (!(next_owner_mask & PERM_TRANSFER))
{
- text.append(" (no transfer)");
+ text.append(LLTrans::getString("no_transfer"));
}
row["columns"][1]["column"] = "text";
@@ -290,7 +296,6 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
removeVOInventoryListener();
}
-
// static
void LLFloaterBuy::onClickBuy(void*)
{
@@ -309,7 +314,7 @@ void LLFloaterBuy::onClickBuy(void*)
// it doesn't match region info then sale is canceled.
LLSelectMgr::getInstance()->sendBuy(gAgent.getID(), category_id, sInstance->mSaleInfo );
- sInstance->close();
+ sInstance->closeFloater();
}
@@ -318,7 +323,7 @@ void LLFloaterBuy::onClickCancel(void*)
{
if (sInstance)
{
- sInstance->close();
+ sInstance->closeFloater();
}
}
@@ -326,5 +331,5 @@ void LLFloaterBuy::onClose(bool app_quitting)
{
// drop reference to current selection so selection goes away
mObjectSelection = NULL;
- LLFloater::onClose(app_quitting);
+ destroy();
}
diff --git a/indra/newview/llfloaterbuy.h b/indra/newview/llfloaterbuy.h
index 7473e6c855..ffd3fa30c8 100644
--- a/indra/newview/llfloaterbuy.h
+++ b/indra/newview/llfloaterbuy.h
@@ -57,7 +57,7 @@ public:
protected:
LLFloaterBuy();
~LLFloaterBuy();
-
+ /*virtual*/ BOOL postBuild();
/*virtual*/ void onClose(bool app_quitting);
void reset();
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
index 95a8caac53..7a90275201 100644
--- a/indra/newview/llfloaterbuycontents.cpp
+++ b/indra/newview/llfloaterbuycontents.cpp
@@ -57,10 +57,14 @@
LLFloaterBuyContents* LLFloaterBuyContents::sInstance = NULL;
LLFloaterBuyContents::LLFloaterBuyContents()
-: LLFloater(std::string("floater_buy_contents"), std::string("FloaterBuyContentsRect"), LLStringUtil::null)
+: LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_buy_contents.xml");
+}
+BOOL LLFloaterBuyContents::postBuild()
+{
+
childSetAction("cancel_btn", onClickCancel, this);
childSetAction("buy_btn", onClickBuy, this);
@@ -69,6 +73,7 @@ LLFloaterBuyContents::LLFloaterBuyContents()
childDisable("wear_check");
setDefaultBtn("cancel_btn"); // to avoid accidental buy (SL-43130)
+ return TRUE;
}
LLFloaterBuyContents::~LLFloaterBuyContents()
@@ -99,7 +104,7 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
sInstance = new LLFloaterBuyContents();
}
- sInstance->open(); /*Flawfinder: ignore*/
+ sInstance->openFloater();
sInstance->setFocus(TRUE);
sInstance->mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
@@ -275,7 +280,7 @@ void LLFloaterBuyContents::onClickBuy(void*)
if(!sInstance->childIsEnabled("buy_btn"))
{
// We shouldn't be enabled. Just close.
- sInstance->close();
+ sInstance->closeFloater();
return;
}
@@ -294,12 +299,12 @@ void LLFloaterBuyContents::onClickBuy(void*)
// it doesn't match region info then sale is canceled.
LLSelectMgr::getInstance()->sendBuy(gAgent.getID(), category_id, sInstance->mSaleInfo);
- sInstance->close();
+ sInstance->closeFloater();
}
// static
void LLFloaterBuyContents::onClickCancel(void*)
{
- sInstance->close();
+ sInstance->closeFloater();
}
diff --git a/indra/newview/llfloaterbuycontents.h b/indra/newview/llfloaterbuycontents.h
index 908ff134e6..52114811bf 100644
--- a/indra/newview/llfloaterbuycontents.h
+++ b/indra/newview/llfloaterbuycontents.h
@@ -55,7 +55,7 @@ public:
protected:
LLFloaterBuyContents();
~LLFloaterBuyContents();
-
+ /*virtual*/ BOOL postBuild();
void requestObjectInventories();
/*virtual*/ void inventoryChanged(LLViewerObject* obj,
InventoryObjectList* inv,
diff --git a/indra/newview/llfloaterbuycurrency.cpp b/indra/newview/llfloaterbuycurrency.cpp
index 37cac9e271..c943eaeacf 100644
--- a/indra/newview/llfloaterbuycurrency.cpp
+++ b/indra/newview/llfloaterbuycurrency.cpp
@@ -80,7 +80,6 @@ public:
virtual void draw();
virtual BOOL canClose();
- virtual void onClose(bool app_quitting);
static void onClickBuy(void* data);
static void onClickCancel(void* data);
@@ -114,7 +113,7 @@ LLFloaterBuyCurrencyUI* LLFloaterBuyCurrencyUI::soleInstance(bool createIfNeeded
#pragma warning(disable : 4355)
#endif
LLFloaterBuyCurrencyUI::LLFloaterBuyCurrencyUI()
-: LLFloater(std::string("Buy Currency")),
+: LLFloater(),
mChildren(*this),
mManager(*this)
{
@@ -162,7 +161,6 @@ BOOL LLFloaterBuyCurrencyUI::postBuild()
childSetAction("error_web", onClickErrorWeb, this);
updateUI();
-
return TRUE;
}
@@ -172,7 +170,7 @@ void LLFloaterBuyCurrencyUI::draw()
{
if (mManager.bought())
{
- close();
+ closeFloater();
return;
}
@@ -187,12 +185,6 @@ BOOL LLFloaterBuyCurrencyUI::canClose()
return mManager.canCancel();
}
-void LLFloaterBuyCurrencyUI::onClose(bool app_quitting)
-{
- LLFloater::onClose(app_quitting);
- destroy();
-}
-
void LLFloaterBuyCurrencyUI::updateUI()
{
bool hasError = mManager.hasError();
@@ -341,7 +333,7 @@ void LLFloaterBuyCurrencyUI::onClickCancel(void* data)
LLFloaterBuyCurrencyUI* self = LLFloaterBuyCurrencyUI::soleInstance(false);
if (self)
{
- self->close();
+ self->closeFloater();
}
}
@@ -352,7 +344,7 @@ void LLFloaterBuyCurrencyUI::onClickErrorWeb(void* data)
if (self)
{
LLWeb::loadURLExternal(self->mManager.errorURI());
- self->close();
+ self->closeFloater();
}
}
@@ -362,7 +354,7 @@ void LLFloaterBuyCurrency::buyCurrency()
LLFloaterBuyCurrencyUI* ui = LLFloaterBuyCurrencyUI::soleInstance(true);
ui->noTarget();
ui->updateUI();
- ui->open();
+ ui->openFloater();
}
void LLFloaterBuyCurrency::buyCurrency(const std::string& name, S32 price)
@@ -370,7 +362,7 @@ void LLFloaterBuyCurrency::buyCurrency(const std::string& name, S32 price)
LLFloaterBuyCurrencyUI* ui = LLFloaterBuyCurrencyUI::soleInstance(true);
ui->target(name, price);
ui->updateUI();
- ui->open();
+ ui->openFloater();
}
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
index 29506e21d5..e981b07a82 100644
--- a/indra/newview/llfloaterbuyland.cpp
+++ b/indra/newview/llfloaterbuyland.cpp
@@ -187,7 +187,6 @@ public:
virtual void draw();
virtual BOOL canClose();
- virtual void onClose(bool app_quitting);
/*virtual*/ void setMinimized(BOOL b);
private:
@@ -199,7 +198,7 @@ private:
};
static void cacheNameUpdateRefreshesBuyLand(const LLUUID&,
- const std::string&, const std::string&, BOOL, void* data)
+ const std::string&, const std::string&, BOOL)
{
LLFloaterBuyLandUI* ui = LLFloaterBuyLandUI::soleInstance(false);
if (ui)
@@ -221,7 +220,7 @@ void LLFloaterBuyLand::buyLand(
LLFloaterBuyLandUI* ui = LLFloaterBuyLandUI::soleInstance(true);
ui->setForGroup(is_for_group);
ui->setParcel(region, parcel);
- ui->open(); /*Flawfinder: ignore*/
+ ui->openFloater();
}
// static
@@ -298,7 +297,7 @@ LLFloaterBuyLandUI* LLFloaterBuyLandUI::soleInstance(bool createIfNeeded)
static bool observingCacheName = false;
if (!observingCacheName)
{
- gCacheName->addObserver(cacheNameUpdateRefreshesBuyLand);
+ gCacheName->addObserver(&cacheNameUpdateRefreshesBuyLand);
observingCacheName = true;
}
@@ -322,7 +321,7 @@ LLFloaterBuyLandUI* LLFloaterBuyLandUI::soleInstance(bool createIfNeeded)
#pragma warning(disable : 4355)
#endif
LLFloaterBuyLandUI::LLFloaterBuyLandUI()
-: LLFloater(std::string("Buy Land")),
+: LLFloater(),
mParcel(0),
mBought(false),
mParcelValid(false), mSiteValid(false),
@@ -350,7 +349,7 @@ void LLFloaterBuyLandUI::SelectionObserver::changed()
{
if (LLViewerParcelMgr::getInstance()->selectionEmpty())
{
- ui->close();
+ ui->closeFloater();
}
else {
ui->setParcel(
@@ -566,8 +565,7 @@ void LLFloaterBuyLandUI::updateCovenantInfo()
{
check->set(false);
check->setEnabled(true);
- check->setCallbackUserData(this);
- check->setCommitCallback(onChangeAgreeCovenant);
+ check->setCommitCallback(onChangeAgreeCovenant, this);
}
LLTextBox* box = getChild<LLTextBox>("covenant_text");
@@ -963,7 +961,7 @@ void LLFloaterBuyLandUI::draw()
if (mBought)
{
- close();
+ closeFloater();
}
else if (needsUpdate)
{
@@ -999,13 +997,6 @@ void LLFloaterBuyLandUI::setMinimized(BOOL minimize)
}
}
-void LLFloaterBuyLandUI::onClose(bool app_quitting)
-{
- LLFloater::onClose(app_quitting);
- destroy();
-}
-
-
void LLFloaterBuyLandUI::refreshUI()
{
// section zero: title area
@@ -1169,7 +1160,7 @@ void LLFloaterBuyLandUI::refreshUI()
if (!mParcelValid)
{
- message += "(no parcel selected)";
+ message += getString("no_parcel_selected");
}
else if (mParcelBillableArea == mParcelActualArea)
{
@@ -1225,12 +1216,10 @@ void LLFloaterBuyLandUI::refreshUI()
? LLViewChildren::BADGE_NOTE
: LLViewChildren::BADGE_OK);
- childSetText("purchase_action",
- llformat(
- "Pay L$ %d to %s for this land",
- mParcelPrice,
- mParcelSellerName.c_str()
- ));
+ LLStringUtil::format_map_t string_args;
+ string_args["[AMOUNT]"] = llformat("%d", mParcelPrice);
+ string_args["[SELLER]"] = mParcelSellerName;
+ childSetText("purchase_action", getString("pay_to_for_land", string_args));
childSetVisible("purchase_action", mParcelValid);
std::string reasonString;
@@ -1368,7 +1357,7 @@ void LLFloaterBuyLandUI::onClickBuy(void* data)
void LLFloaterBuyLandUI::onClickCancel(void* data)
{
LLFloaterBuyLandUI* self = (LLFloaterBuyLandUI*)data;
- self->close();
+ self->closeFloater();
}
// static
@@ -1376,7 +1365,7 @@ void LLFloaterBuyLandUI::onClickErrorWeb(void* data)
{
LLFloaterBuyLandUI* self = (LLFloaterBuyLandUI*)data;
LLWeb::loadURLExternal(self->mCannotBuyURI);
- self->close();
+ self->closeFloater();
}
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 7a4e5147fe..6ca8944a19 100644
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -48,71 +48,31 @@ const F32 CAMERA_BUTTON_DELAY = 0.0f;
// Member functions
//
+
LLFloaterCamera::LLFloaterCamera(const LLSD& val)
-: LLFloater("camera floater") // uses "FloaterCameraRect3"
+: LLFloater()
{
setIsChrome(TRUE);
// For now, only used for size and tooltip strings
const BOOL DONT_OPEN = FALSE;
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_camera.xml", NULL, DONT_OPEN);
-
- S32 top = getRect().getHeight();
- S32 bottom = 0;
- S32 left = 16;
-
- const S32 ROTATE_WIDTH = 64;
- mRotate = new LLJoystickCameraRotate(std::string("cam rotate stick"),
- LLRect( left, top, left + ROTATE_WIDTH, bottom ),
- std::string("cam_rotate_out.tga"),
- std::string("cam_rotate_in.tga") );
- mRotate->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
- mRotate->setHeldDownDelay(CAMERA_BUTTON_DELAY);
- mRotate->setToolTip( getString("rotate_tooltip") );
- mRotate->setSoundFlags(MOUSE_DOWN | MOUSE_UP);
- addChild(mRotate);
-
- left += ROTATE_WIDTH;
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_camera.xml", DONT_OPEN);
- const S32 ZOOM_WIDTH = 16;
- mZoom = new LLJoystickCameraZoom(
- std::string("zoom"),
- LLRect( left, top, left + ZOOM_WIDTH, bottom ),
- std::string("cam_zoom_out.tga"),
- std::string("cam_zoom_plus_in.tga"),
- std::string("cam_zoom_minus_in.tga"));
- mZoom->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
- mZoom->setHeldDownDelay(CAMERA_BUTTON_DELAY);
- mZoom->setToolTip( getString("zoom_tooltip") );
- mZoom->setSoundFlags(MOUSE_DOWN | MOUSE_UP);
- addChild(mZoom);
-
- left += ZOOM_WIDTH;
-
- const S32 TRACK_WIDTH = 64;
- mTrack = new LLJoystickCameraTrack(std::string("cam track stick"),
- LLRect( left, top, left + TRACK_WIDTH, bottom ),
- std::string("cam_tracking_out.tga"),
- std::string("cam_tracking_in.tga"));
- mTrack->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
- mTrack->setHeldDownDelay(CAMERA_BUTTON_DELAY);
- mTrack->setToolTip( getString("move_tooltip") );
- mTrack->setSoundFlags(MOUSE_DOWN | MOUSE_UP);
- addChild(mTrack);
+ mRotate = getChild<LLJoystickCameraRotate>("cam_rotate_stick");
+ mZoom = getChild<LLJoystickCameraZoom>("zoom");
+ mTrack = getChild<LLJoystickCameraTrack>("cam_track_stick");
}
// virtual
-void LLFloaterCamera::onOpen()
+void LLFloaterCamera::onOpen(const LLSD& key)
{
- LLFloater::onOpen();
-
gSavedSettings.setBOOL("ShowCameraControls", TRUE);
}
// virtual
void LLFloaterCamera::onClose(bool app_quitting)
{
- LLFloater::onClose(app_quitting);
+ destroy();
if (!app_quitting)
{
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h
index 6862db7068..871e5c8ed1 100644
--- a/indra/newview/llfloatercamera.h
+++ b/indra/newview/llfloatercamera.h
@@ -49,7 +49,7 @@ private:
LLFloaterCamera(const LLSD& val);
~LLFloaterCamera() {};
- /*virtual*/ void onOpen();
+ /*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void onClose(bool app_quitting);
public:
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 682ed8e26b..4e2d952488 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -38,15 +38,6 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaterchat.h"
-#include "llfloateractivespeakers.h"
-#include "llfloaterscriptdebug.h"
-
-#include "llchat.h"
-#include "llfontgl.h"
-#include "llrect.h"
-#include "llerror.h"
-#include "llstring.h"
-#include "message.h"
// project include
#include "llagent.h"
@@ -54,8 +45,11 @@
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "llconsole.h"
+#include "llfloateractivespeakers.h"
#include "llfloaterchatterbox.h"
#include "llfloatermute.h"
+#include "llfloaterreg.h"
+#include "llfloaterscriptdebug.h"
#include "llkeyboard.h"
//#include "lllineeditor.h"
#include "llmutelist.h"
@@ -76,16 +70,21 @@
#include "llweb.h"
#include "llstylemap.h"
-// Used for LCD display
-extern void AddNewIMToLCD(const std::string &newLine);
-extern void AddNewChatToLCD(const std::string &newLine);
+// linden library includes
+#include "audioengine.h"
+#include "llchat.h"
+#include "llfontgl.h"
+#include "llrect.h"
+#include "llerror.h"
+#include "llstring.h"
+#include "llwindow.h"
+#include "message.h"
+
//
// Constants
//
const F32 INSTANT_MSG_SIZE = 8.0f;
const F32 CHAT_MSG_SIZE = 8.0f;
-const LLColor4 MUTED_MSG_COLOR(0.5f, 0.5f, 0.5f, 1.f);
-const S32 MAX_CHATTER_COUNT = 16;
//
// Global statics
@@ -96,20 +95,13 @@ LLColor4 get_text_color(const LLChat& chat);
// Member Functions
//
LLFloaterChat::LLFloaterChat(const LLSD& seed)
-: LLFloater(std::string("chat floater"), std::string("FloaterChatRect"), LLStringUtil::null,
- RESIZE_YES, 440, 100, DRAG_ON_TOP, MINIMIZE_NO, CLOSE_YES),
- mPanel(NULL)
+ : LLFloater(),
+ mPanel(NULL)
{
mFactoryMap["chat_panel"] = LLCallbackMap(createChatPanel, NULL);
mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, NULL);
- // do not automatically open singleton floaters (as result of getInstance())
- BOOL no_open = FALSE;
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_chat_history.xml",&getFactoryMap(),no_open);
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this,"floater_chat_history.xml");
- childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
- childSetVisible("Chat History Editor with mute",FALSE);
- childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
- setDefaultBtn("Chat");
}
LLFloaterChat::~LLFloaterChat()
@@ -120,8 +112,6 @@ LLFloaterChat::~LLFloaterChat()
void LLFloaterChat::setVisible(BOOL visible)
{
LLFloater::setVisible( visible );
-
- gSavedSettings.setBOOL("ShowChatHistory", visible);
}
void LLFloaterChat::draw()
@@ -130,7 +120,7 @@ void LLFloaterChat::draw()
childSetValue("toggle_active_speakers_btn", childIsVisible("active_speakers_panel"));
- LLChatBar* chat_barp = getChild<LLChatBar>("chat_panel", TRUE);
+ LLChatBar* chat_barp = findChild<LLChatBar>("chat_panel", TRUE);
if (chat_barp)
{
chat_barp->refresh();
@@ -144,22 +134,30 @@ BOOL LLFloaterChat::postBuild()
{
mPanel = (LLPanelActiveSpeakers*)getChild<LLPanel>("active_speakers_panel");
- LLChatBar* chat_barp = getChild<LLChatBar>("chat_panel", TRUE);
+ LLChatBar* chat_barp = findChild<LLChatBar>("chat_panel", TRUE);
if (chat_barp)
{
chat_barp->setGestureCombo(getChild<LLComboBox>( "Gesture"));
}
+
+ childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
+ childSetVisible("Chat History Editor with mute",FALSE);
+ childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
+
return TRUE;
}
// public virtual
void LLFloaterChat::onClose(bool app_quitting)
{
- if (!app_quitting)
+ if (getHost())
{
- gSavedSettings.setBOOL("ShowChatHistory", FALSE);
+ getHost()->setVisible(FALSE);
+ }
+ else
+ {
+ setVisible(FALSE);
}
- setVisible(FALSE);
}
void LLFloaterChat::onVisibilityChange(BOOL new_visibility)
@@ -167,12 +165,6 @@ void LLFloaterChat::onVisibilityChange(BOOL new_visibility)
// Hide the chat overlay when our history is visible.
updateConsoleVisibility();
- // stop chat history tab from flashing when it appears
- if (new_visibility)
- {
- LLFloaterChatterBox::getInstance()->setFloaterFlashing(this, FALSE);
- }
-
LLFloater::onVisibilityChange(new_visibility);
}
@@ -257,7 +249,7 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
}
// could flash the chat button in the status bar here. JC
- LLFloaterChat* chat_floater = LLFloaterChat::getInstance(LLSD());
+ LLFloaterChat* chat_floater = LLFloaterChat::getInstance();
LLViewerTextEditor* history_editor = chat_floater->getChild<LLViewerTextEditor>("Chat History Editor");
LLViewerTextEditor* history_editor_with_mute = chat_floater->getChild<LLViewerTextEditor>("Chat History Editor with mute");
@@ -295,8 +287,8 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
// static
void LLFloaterChat::setHistoryCursorAndScrollToEnd()
{
- LLViewerTextEditor* history_editor = LLFloaterChat::getInstance(LLSD())->getChild<LLViewerTextEditor>("Chat History Editor");
- LLViewerTextEditor* history_editor_with_mute = LLFloaterChat::getInstance(LLSD())->getChild<LLViewerTextEditor>("Chat History Editor with mute");
+ LLViewerTextEditor* history_editor = LLFloaterChat::getInstance()->getChild<LLViewerTextEditor>("Chat History Editor");
+ LLViewerTextEditor* history_editor_with_mute = LLFloaterChat::getInstance()->getChild<LLViewerTextEditor>("Chat History Editor with mute");
if (history_editor)
{
@@ -368,20 +360,6 @@ void LLFloaterChat::addChat(const LLChat& chat,
chat.mChatType == CHAT_TYPE_DEBUG_MSG
&& !gSavedSettings.getBOOL("ScriptErrorsAsChat");
-#if LL_LCD_COMPILE
- // add into LCD displays
- if (!invisible_script_debug_chat)
- {
- if (!from_instant_message)
- {
- AddNewChatToLCD(chat.mText);
- }
- else
- {
- AddNewIMToLCD(chat.mText);
- }
- }
-#endif
if (!invisible_script_debug_chat
&& !chat.mMuted
&& gConsole
@@ -390,11 +368,11 @@ void LLFloaterChat::addChat(const LLChat& chat,
F32 size = CHAT_MSG_SIZE;
if (chat.mSourceType == CHAT_SOURCE_SYSTEM)
{
- text_color = gSavedSettings.getColor("SystemChatColor");
+ text_color = gSavedSkinSettings.getColor("SystemChatColor");
}
else if(from_instant_message)
{
- text_color = gSavedSettings.getColor("IMChatColor");
+ text_color = gSavedSkinSettings.getColor("IMChatColor");
size = INSTANT_MSG_SIZE;
}
// We display anything if it's not an IM. If it's an IM, check pref...
@@ -410,13 +388,54 @@ void LLFloaterChat::addChat(const LLChat& chat,
if(from_instant_message && gSavedSettings.getBOOL("IMInChatHistory"))
addChatHistory(chat,false);
- LLTextParser* highlight = LLTextParser::getInstance();
- highlight->triggerAlerts(gAgent.getID(), gAgent.getPositionGlobal(), chat.mText, gViewerWindow->getWindow());
+ triggerAlerts(chat.mText);
if(!from_instant_message)
addChatHistory(chat);
}
+// Moved from lltextparser.cpp to break llui/llaudio library dependency.
+//static
+void LLFloaterChat::triggerAlerts(const std::string& text)
+{
+ LLTextParser* parser = LLTextParser::getInstance();
+// bool spoken=FALSE;
+ for (S32 i=0;i<parser->mHighlights.size();i++)
+ {
+ LLSD& highlight = parser->mHighlights[i];
+ if (parser->findPattern(text,highlight) >= 0 )
+ {
+ if(gAudiop)
+ {
+ if ((std::string)highlight["sound_lluuid"] != LLUUID::null.asString())
+ {
+ gAudiop->triggerSound(highlight["sound_lluuid"].asUUID(),
+ gAgent.getID(),
+ 1.f,
+ LLAudioEngine::AUDIO_TYPE_UI,
+ gAgent.getPositionGlobal() );
+ }
+/*
+ if (!spoken)
+ {
+ LLTextToSpeech* text_to_speech = NULL;
+ text_to_speech = LLTextToSpeech::getInstance();
+ spoken = text_to_speech->speak((LLString)highlight["voice"],text);
+ }
+ */
+ }
+ if (highlight["flash"])
+ {
+ LLWindow* viewer_window = gViewerWindow->getWindow();
+ if (viewer_window && viewer_window->getMinimized())
+ {
+ viewer_window->flashIcon(5.f);
+ }
+ }
+ }
+ }
+}
+
LLColor4 get_text_color(const LLChat& chat)
{
LLColor4 text_color;
@@ -430,37 +449,37 @@ LLColor4 get_text_color(const LLChat& chat)
switch(chat.mSourceType)
{
case CHAT_SOURCE_SYSTEM:
- text_color = gSavedSettings.getColor4("SystemChatColor");
+ text_color = gSavedSkinSettings.getColor4("SystemChatColor");
break;
case CHAT_SOURCE_AGENT:
if (chat.mFromID.isNull())
{
- text_color = gSavedSettings.getColor4("SystemChatColor");
+ text_color = gSavedSkinSettings.getColor4("SystemChatColor");
}
else
{
if(gAgent.getID() == chat.mFromID)
{
- text_color = gSavedSettings.getColor4("UserChatColor");
+ text_color = gSavedSkinSettings.getColor4("UserChatColor");
}
else
{
- text_color = gSavedSettings.getColor4("AgentChatColor");
+ text_color = gSavedSkinSettings.getColor4("AgentChatColor");
}
}
break;
case CHAT_SOURCE_OBJECT:
if (chat.mChatType == CHAT_TYPE_DEBUG_MSG)
{
- text_color = gSavedSettings.getColor4("ScriptErrorColor");
+ text_color = gSavedSkinSettings.getColor4("ScriptErrorColor");
}
else if ( chat.mChatType == CHAT_TYPE_OWNER )
{
- text_color = gSavedSettings.getColor4("llOwnerSayChatColor");
+ text_color = gSavedSkinSettings.getColor4("llOwnerSayChatColor");
}
else
{
- text_color = gSavedSettings.getColor4("ObjectChatColor");
+ text_color = gSavedSkinSettings.getColor4("ObjectChatColor");
}
break;
default:
@@ -485,7 +504,7 @@ LLColor4 get_text_color(const LLChat& chat)
//static
void LLFloaterChat::loadHistory()
{
- LLLogChat::loadHistory(std::string("chat"), &chatFromLogFile, (void *)LLFloaterChat::getInstance(LLSD()));
+ LLLogChat::loadHistory(std::string("chat"), &chatFromLogFile, (void *)LLFloaterChat::getInstance());
}
//static
@@ -501,6 +520,7 @@ void LLFloaterChat::chatFromLogFile(LLLogChat::ELogLineType type , std::string l
{
LLChat chat;
chat.mText = line;
+ get_text_color(chat);
addChatHistory(chat, FALSE);
}
break;
@@ -531,27 +551,9 @@ void LLFloaterChat::onClickToggleActiveSpeakers(void* userdata)
self->childSetVisible("active_speakers_panel", !self->childIsVisible("active_speakers_panel"));
}
-//static
-bool LLFloaterChat::visible(LLFloater* instance, const LLSD& key)
-{
- return VisibilityPolicy<LLFloater>::visible(instance, key);
-}
-
-//static
-void LLFloaterChat::show(LLFloater* instance, const LLSD& key)
-{
- VisibilityPolicy<LLFloater>::show(instance, key);
-}
-
-//static
-void LLFloaterChat::hide(LLFloater* instance, const LLSD& key)
-{
- if(instance->getHost())
- {
- LLFloaterChatterBox::hideInstance();
- }
- else
- {
- VisibilityPolicy<LLFloater>::hide(instance, key);
- }
-}
+//static
+ LLFloaterChat* LLFloaterChat::getInstance()
+ {
+ LLFloater* inst = LLFloaterReg::getInstance("chat", LLSD()) ;
+ return dynamic_cast<LLFloaterChat*>(inst);
+ }
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h
index b5393866b8..2bae4ea0c2 100644
--- a/indra/newview/llfloaterchat.h
+++ b/indra/newview/llfloaterchat.h
@@ -40,19 +40,18 @@
#include "llfloater.h"
#include "lllogchat.h"
-class LLButton;
+
class LLChat;
-class LLComboBox;
-class LLLineEditor;
class LLViewerTextEditor;
class LLMessageSystem;
class LLUUID;
class LLCheckBoxCtrl;
class LLPanelActiveSpeakers;
class LLLogChat;
+class LLVector3d;
+class LLWindow;
-class LLFloaterChat
- : public LLFloater, public LLUISingleton<LLFloaterChat, LLFloaterChat>
+class LLFloaterChat : public LLFloater
{
public:
LLFloaterChat(const LLSD& seed);
@@ -67,14 +66,16 @@ public:
void updateConsoleVisibility();
static void setHistoryCursorAndScrollToEnd();
-
+
+ // *TODO:Skinning - move these to LLChat (or LLViewerChat?)
// Add chat to console and history list.
// Color based on source, type, distance.
static void addChat(const LLChat& chat, BOOL from_im = FALSE, BOOL local_agent = FALSE);
-
// Add chat to history alone.
static void addChatHistory(const LLChat& chat, bool log_to_file = true);
+ static void triggerAlerts(const std::string& text);
+
static void onClickMute(void *data);
static void onClickToggleShowMute(LLUICtrl* caller, void *data);
static void onClickToggleActiveSpeakers(void* userdata);
@@ -82,12 +83,9 @@ public:
static void loadHistory();
static void* createSpeakersPanel(void* data);
static void* createChatPanel(void* data);
-
- // visibility policy for LLUISingleton
- static bool visible(LLFloater* instance, const LLSD& key);
- static void show(LLFloater* instance, const LLSD& key);
- static void hide(LLFloater* instance, const LLSD& key);
-
+
+ static LLFloaterChat* getInstance(); // *TODO:Skinning Deprecate
+
LLPanelActiveSpeakers* mPanel;
BOOL mScrolledToEnd;
};
diff --git a/indra/newview/llfloaterchatterbox.cpp b/indra/newview/llfloaterchatterbox.cpp
index 0fa1aa15e6..a283b445f5 100644
--- a/indra/newview/llfloaterchatterbox.cpp
+++ b/indra/newview/llfloaterchatterbox.cpp
@@ -35,6 +35,7 @@
#include "llviewerprecompiledheaders.h"
+#include "llfloaterreg.h"
#include "llfloaterchatterbox.h"
#include "lluictrlfactory.h"
#include "llfloaterchat.h"
@@ -49,12 +50,11 @@
//
LLFloaterMyFriends::LLFloaterMyFriends(const LLSD& seed)
+ : LLFloater()
{
mFactoryMap["friends_panel"] = LLCallbackMap(LLFloaterMyFriends::createFriendsPanel, NULL);
mFactoryMap["groups_panel"] = LLCallbackMap(LLFloaterMyFriends::createGroupsPanel, NULL);
- // do not automatically open singleton floaters (as result of getInstance())
- BOOL no_open = FALSE;
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_my_friends.xml", &getFactoryMap(), no_open);
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_my_friends.xml");
}
LLFloaterMyFriends::~LLFloaterMyFriends()
@@ -63,11 +63,20 @@ LLFloaterMyFriends::~LLFloaterMyFriends()
BOOL LLFloaterMyFriends::postBuild()
{
- mTabs = getChild<LLTabContainer>("friends_and_groups");
-
return TRUE;
}
+void LLFloaterMyFriends::onOpen(const LLSD& key)
+{
+ if (key.asString() == "friends")
+ {
+ childShowTab("friends_and_groups", "friends_panel");
+ }
+ else if (key.asString() == "groups")
+ {
+ childShowTab("friends_and_groups", "groups_panel");
+ }
+}
void LLFloaterMyFriends::onClose(bool app_quitting)
{
@@ -86,18 +95,34 @@ void* LLFloaterMyFriends::createGroupsPanel(void* data)
return new LLPanelGroups();
}
+//static
+LLFloaterMyFriends* LLFloaterMyFriends::getInstance()
+{
+ LLFloater* inst = LLFloaterReg::getInstance("contacts", "friends") ;
+ return dynamic_cast<LLFloaterMyFriends*>(inst);
+}
+
//
// LLFloaterChatterBox
//
-LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) :
- mActiveVoiceFloater(NULL)
+LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed)
+ : LLMultiFloater(),
+ mActiveVoiceFloater(NULL)
{
mAutoResize = FALSE;
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox.xml", NULL, FALSE);
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox.xml", FALSE);
+}
+
+LLFloaterChatterBox::~LLFloaterChatterBox()
+{
+}
+
+BOOL LLFloaterChatterBox::postBuild()
+{
if (gSavedSettings.getBOOL("ContactsTornOff"))
{
- LLFloaterMyFriends* floater_contacts = LLFloaterMyFriends::getInstance(0);
+ LLFloaterMyFriends* floater_contacts = LLFloaterMyFriends::getInstance();
// add then remove to set up relationship for re-attach
addFloater(floater_contacts, FALSE);
removeFloater(floater_contacts);
@@ -106,7 +131,7 @@ LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) :
}
else
{
- addFloater(LLFloaterMyFriends::getInstance(0), TRUE);
+ addFloater(LLFloaterMyFriends::getInstance(), TRUE);
}
if (gSavedSettings.getBOOL("ChatHistoryTornOff"))
@@ -120,13 +145,10 @@ LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) :
}
else
{
- addFloater(LLFloaterChat::getInstance(LLSD()), FALSE);
+ addFloater(LLFloaterChat::getInstance(), FALSE);
}
mTabContainer->lockTabs();
-}
-
-LLFloaterChatterBox::~LLFloaterChatterBox()
-{
+ return TRUE;
}
BOOL LLFloaterChatterBox::handleKeyHere(KEY key, MASK mask)
@@ -139,13 +161,13 @@ BOOL LLFloaterChatterBox::handleKeyHere(KEY key, MASK mask)
{
if (floater->isCloseable())
{
- floater->close();
+ floater->closeFloater();
}
else
{
// close chatterbox window if frontmost tab is reserved, non-closeable tab
// such as contacts or near me
- close();
+ closeFloater();
}
}
return TRUE;
@@ -200,15 +222,27 @@ void LLFloaterChatterBox::draw()
LLMultiFloater::draw();
}
-void LLFloaterChatterBox::onOpen()
+void LLFloaterChatterBox::onOpen(const LLSD& key)
{
- gSavedSettings.setBOOL("ShowCommunicate", TRUE);
+ //*TODO:Skinning show the session id associated with key
+ if (key.asString() == "local")
+ {
+ LLFloaterChat* chat = LLFloaterReg::findTypedInstance<LLFloaterChat>("chat");
+ chat->openFloater();
+ }
+ else if (key.isDefined())
+ {
+ LLFloaterIMPanel* impanel = gIMMgr->findFloaterBySession(key.asUUID());
+ if (impanel)
+ {
+ impanel->openFloater();
+ }
+ }
}
void LLFloaterChatterBox::onClose(bool app_quitting)
{
setVisible(FALSE);
- gSavedSettings.setBOOL("ShowCommunicate", FALSE);
}
void LLFloaterChatterBox::setMinimized(BOOL minimized)
@@ -244,7 +278,11 @@ void LLFloaterChatterBox::addFloater(LLFloater* floaterp,
S32 num_locked_tabs = mTabContainer->getNumLockedTabs();
// already here
- if (floaterp->getHost() == this) return;
+ if (floaterp->getHost() == this)
+ {
+ openFloater(floaterp->getKey());
+ return;
+ }
// make sure my friends and chat history both locked when re-attaching chat history
if (floaterp->getName() == "chat floater")
@@ -281,6 +319,7 @@ void LLFloaterChatterBox::addFloater(LLFloater* floaterp,
else
{
LLMultiFloater::addFloater(floaterp, select_added_floater, insertion_point);
+ openFloater(floaterp->getKey());
}
// make sure active voice icon shows up for new tab
@@ -290,6 +329,13 @@ void LLFloaterChatterBox::addFloater(LLFloater* floaterp,
}
}
+//static
+LLFloaterChatterBox* LLFloaterChatterBox::getInstance()
+{
+ LLFloater* inst = LLFloaterReg::getInstance("communicate", LLSD()) ;
+ return dynamic_cast<LLFloaterChatterBox*>(inst);
+}
+
//static
LLFloater* LLFloaterChatterBox::getCurrentVoiceFloater()
{
@@ -300,11 +346,11 @@ LLFloater* LLFloaterChatterBox::getCurrentVoiceFloater()
if (LLVoiceChannelProximal::getInstance() == LLVoiceChannel::getCurrentVoiceChannel())
{
// show near me tab if in proximal channel
- return LLFloaterChat::getInstance(LLSD());
+ return LLFloaterChat::getInstance();
}
else
{
- LLFloaterChatterBox* floater = LLFloaterChatterBox::getInstance(LLSD());
+ LLFloaterChatterBox* floater = LLFloaterChatterBox::getInstance();
// iterator over all IM tabs (skip friends and near me)
for (S32 i = 0; i < floater->getFloaterCount(); i++)
{
diff --git a/indra/newview/llfloaterchatterbox.h b/indra/newview/llfloaterchatterbox.h
index 3adbd14370..e6a2e30ba6 100644
--- a/indra/newview/llfloaterchatterbox.h
+++ b/indra/newview/llfloaterchatterbox.h
@@ -42,15 +42,16 @@
class LLTabContainer;
-class LLFloaterChatterBox : public LLMultiFloater, public LLUISingleton<LLFloaterChatterBox, LLFloaterChatterBox>
+class LLFloaterChatterBox : public LLMultiFloater
{
public:
LLFloaterChatterBox(const LLSD& seed);
virtual ~LLFloaterChatterBox();
-
+
+ /*virtual*/ BOOL postBuild();
/*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
/*virtual*/ void draw();
- /*virtual*/ void onOpen();
+ /*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void onClose(bool app_quitting);
/*virtual*/ void setMinimized(BOOL minimized);
@@ -59,108 +60,28 @@ public:
BOOL select_added_floater,
LLTabContainer::eInsertionPoint insertion_point = LLTabContainer::END);
+ static LLFloaterChatterBox* getInstance(); // *TODO:Skinning Deprecate
static LLFloater* getCurrentVoiceFloater();
- // visibility policy for LLUISingleton
- static bool visible(LLFloater* instance, const LLSD& key)
- {
- LLFloater* floater_to_check = ((LLFloaterChatterBox*)instance)->getFloater(key);
-
- if (floater_to_check)
- {
- return floater_to_check->isInVisibleChain();
- }
-
- // otherwise use default visibility rule for chatterbox
- return VisibilityPolicy<LLFloater>::visible(instance, key);
- }
-
- static void show(LLFloater* instance, const LLSD& key)
- {
- LLFloater* floater_to_show = ((LLFloaterChatterBox*)instance)->getFloater(key);
- VisibilityPolicy<LLFloater>::show(instance, key);
-
- if (floater_to_show)
- {
- floater_to_show->open();
- }
- }
-
- static void hide(LLFloater* instance, const LLSD& key)
- {
- VisibilityPolicy<LLFloater>::hide(instance, key);
- }
-
-private:
- LLFloater* getFloater(const LLSD& key)
- {
- LLFloater* floater = NULL;
-
- //try to show requested session
- LLUUID session_id = key.asUUID();
- if (session_id.notNull())
- {
- floater = LLIMMgr::getInstance()->findFloaterBySession(session_id);
- }
-
- // if TRUE, show tab for active voice channel, otherwise, just show last tab
- if (key.asBoolean())
- {
- floater = getCurrentVoiceFloater();
- }
-
- return floater;
- }
-
protected:
LLFloater* mActiveVoiceFloater;
};
-class LLFloaterMyFriends : public LLFloater, public LLUISingleton<LLFloaterMyFriends, LLFloaterMyFriends>
+class LLFloaterMyFriends : public LLFloater
{
public:
LLFloaterMyFriends(const LLSD& seed);
virtual ~LLFloaterMyFriends();
- virtual BOOL postBuild();
-
- void onClose(bool app_quitting);
+ /*virtual*/ BOOL postBuild();
+ /*virtual*/ void onOpen(const LLSD& key);
+ /*virtual*/ void onClose(bool app_quitting);
+ static LLFloaterMyFriends* getInstance(); // *TODO:Skinning Deprecate
+
static void* createFriendsPanel(void* data);
static void* createGroupsPanel(void* data);
-
- // visibility policy for LLUISingleton
- static bool visible(LLFloater* instance, const LLSD& key)
- {
- LLFloaterMyFriends* floaterp = (LLFloaterMyFriends*)instance;
- return floaterp->isInVisibleChain() && floaterp->mTabs->getCurrentPanelIndex() == key.asInteger();
- }
-
- static void show(LLFloater* instance, const LLSD& key)
- {
- VisibilityPolicy<LLFloater>::show(instance, key);
- // garbage values in id will be interpreted as 0, or the friends tab
- ((LLFloaterMyFriends*)instance)->mTabs->selectTab(key);
- }
-
- static void hide(LLFloater* instance, const LLSD& key)
- {
- if (visible(instance, key))
- {
- if(instance->getHost())
- {
- LLFloaterChatterBox::hideInstance();
- }
- else
- {
- VisibilityPolicy<LLFloater>::hide(instance, key);
- }
- }
- }
-
-protected:
- LLTabContainer* mTabs;
};
#endif // LL_LLFLOATERCHATTERBOX_H
diff --git a/indra/newview/llfloatercolorpicker.cpp b/indra/newview/llfloatercolorpicker.cpp
index f82d692dd3..4964f04556 100644
--- a/indra/newview/llfloatercolorpicker.cpp
+++ b/indra/newview/llfloatercolorpicker.cpp
@@ -32,11 +32,15 @@
#include "llviewerprecompiledheaders.h"
-#include <sstream>
-#include <iomanip>
-
#include "llfloatercolorpicker.h"
+// Viewer project includes
+#include "lltoolmgr.h"
+#include "lltoolpipette.h"
+#include "llviewercontrol.h"
+#include "llworld.h"
+
+// Linden library includes
#include "llfontgl.h"
#include "llsys.h"
#include "llgl.h"
@@ -47,23 +51,23 @@
#include "lllineeditor.h"
#include "v4coloru.h"
#include "llbutton.h"
-#include "llviewercontrol.h"
#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
#include "llgl.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llimage.h"
#include "llmousehandler.h"
#include "llimagegl.h"
#include "llglheaders.h"
#include "llcheckboxctrl.h"
-#include "llworld.h"
#include "lltextbox.h"
#include "lluiconstants.h"
#include "llfocusmgr.h"
-#include "lltoolmgr.h"
-#include "lltoolpipette.h"
#include "lldraghandle.h"
+#include "llwindow.h"
+
+// System includes
+#include <sstream>
+#include <iomanip>
const F32 CONTEXT_CONE_IN_ALPHA = 0.0f;
const F32 CONTEXT_CONE_OUT_ALPHA = 1.f;
@@ -75,11 +79,8 @@ const F32 CONTEXT_FADE_TIME = 0.08f;
//
//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-// default ctor
-LLFloaterColorPicker::
-LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show_apply_immediate )
- : LLFloater (std::string("Color Picker Floater")),
+LLFloaterColorPicker::LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show_apply_immediate )
+ : LLFloater(),
mComponents ( 3 ),
mMouseDownInLumRegion ( FALSE ),
mMouseDownInHueRegion ( FALSE ),
@@ -123,10 +124,7 @@ LLFloaterColorPicker (LLColorSwatchCtrl* swatch, BOOL show_apply_immediate )
}
}
-//////////////////////////////////////////////////////////////////////////////
-// dtor
-LLFloaterColorPicker::
-~LLFloaterColorPicker()
+LLFloaterColorPicker::~LLFloaterColorPicker()
{
// destroy the UI we created
destroyUI ();
@@ -134,9 +132,7 @@ LLFloaterColorPicker::
//////////////////////////////////////////////////////////////////////////////
//
-void
-LLFloaterColorPicker::
-createUI ()
+void LLFloaterColorPicker::createUI ()
{
// build the majority of the gui using the factory builder
LLUICtrlFactory::getInstance()->buildFloater ( this, "floater_color_picker.xml" );
@@ -177,19 +173,17 @@ createUI ()
// argh!
const std::string s ( codec.str () );
- mPalette.push_back ( new LLColor4 ( gSavedSettings.getColor4 ( s ) ) );
+ mPalette.push_back ( new LLColor4 ( gSavedSkinSettings.getColor4 ( s ) ) );
}
}
//////////////////////////////////////////////////////////////////////////////
//
-void
-LLFloaterColorPicker::
-showUI ()
+void LLFloaterColorPicker::showUI ()
{
setVisible ( TRUE );
setFocus ( TRUE );
- open(); /*Flawfinder: ignore*/
+ openFloater(getKey());
// HACK: if system color picker is required - close the SL one we made and use default system dialog
if ( gSavedSettings.getBOOL ( "UseDefaultColorPicker" ) )
@@ -203,7 +197,7 @@ showUI ()
{
LLColor4 curCol = swatch->get ();
send_agent_pause();
- gViewerWindow->getWindow ()->dialog_color_picker ( &curCol [ 0 ], &curCol [ 1 ], &curCol [ 2 ] );
+ getWindow()->dialogColorPicker( &curCol [ 0 ], &curCol [ 1 ], &curCol [ 2 ] );
send_agent_resume();
setOrigRgb ( curCol [ 0 ], curCol [ 1 ], curCol [ 2 ] );
@@ -212,36 +206,30 @@ showUI ()
LLColorSwatchCtrl::onColorChanged ( swatch, LLColorSwatchCtrl::COLOR_CHANGE );
}
- close();
+ closeFloater();
}
}
//////////////////////////////////////////////////////////////////////////////
// called after the dialog is rendered
-BOOL
-LLFloaterColorPicker::
-postBuild()
+BOOL LLFloaterColorPicker::postBuild()
{
mCancelBtn = getChild<LLButton>( "cancel_btn" );
- mCancelBtn->setClickedCallback ( onClickCancel );
- mCancelBtn->setCallbackUserData ( this );
+ mCancelBtn->setClickedCallback ( onClickCancel, this );
mSelectBtn = getChild<LLButton>( "select_btn");
- mSelectBtn->setClickedCallback ( onClickSelect );
- mSelectBtn->setCallbackUserData ( this );
+ mSelectBtn->setClickedCallback ( onClickSelect, this );
mSelectBtn->setFocus ( TRUE );
mPipetteBtn = getChild<LLButton>("color_pipette" );
mPipetteBtn->setImages(std::string("eye_button_inactive.tga"), std::string("eye_button_active.tga"));
- mPipetteBtn->setClickedCallback( onClickPipette );
- mPipetteBtn->setCallbackUserData ( this );
+ mPipetteBtn->setCommitCallback( boost::bind(&LLFloaterColorPicker::onClickPipette, this ));
mApplyImmediateCheck = getChild<LLCheckBoxCtrl>("apply_immediate");
mApplyImmediateCheck->set(gSavedSettings.getBOOL("ApplyColorImmediately"));
- mApplyImmediateCheck->setCommitCallback(onImmediateCheck);
- mApplyImmediateCheck->setCallbackUserData(this);
+ mApplyImmediateCheck->setCommitCallback(onImmediateCheck, this);
childSetCommitCallback("rspin", onTextCommit, (void*)this );
childSetCommitCallback("gspin", onTextCommit, (void*)this );
@@ -250,18 +238,15 @@ postBuild()
childSetCommitCallback("sspin", onTextCommit, (void*)this );
childSetCommitCallback("lspin", onTextCommit, (void*)this );
+ LLToolPipette::getInstance()->setToolSelectCallback(boost::bind(&LLFloaterColorPicker::onColorSelect, this, _1));
+
return TRUE;
}
//////////////////////////////////////////////////////////////////////////////
//
-void
-LLFloaterColorPicker::
-initUI ( F32 rValIn, F32 gValIn, F32 bValIn )
+void LLFloaterColorPicker::initUI ( F32 rValIn, F32 gValIn, F32 bValIn )
{
- // start catching lose-focus events from entry widgets
- enableTextCallbacks ( TRUE );
-
// under some circumstances, we get rogue values that can be calmed by clamping...
rValIn = llclamp ( rValIn, 0.0f, 1.0f );
gValIn = llclamp ( gValIn, 0.0f, 1.0f );
@@ -279,9 +264,7 @@ initUI ( F32 rValIn, F32 gValIn, F32 bValIn )
//////////////////////////////////////////////////////////////////////////////
//
-void
-LLFloaterColorPicker::
-destroyUI ()
+void LLFloaterColorPicker::destroyUI ()
{
// shut down pipette tool if active
stopUsingPipette();
@@ -305,9 +288,7 @@ destroyUI ()
//////////////////////////////////////////////////////////////////////////////
//
-F32
-LLFloaterColorPicker::
-hueToRgb ( F32 val1In, F32 val2In, F32 valHUeIn )
+F32 LLFloaterColorPicker::hueToRgb ( F32 val1In, F32 val2In, F32 valHUeIn )
{
if ( valHUeIn < 0.0f ) valHUeIn += 1.0f;
if ( valHUeIn > 1.0f ) valHUeIn -= 1.0f;
@@ -319,9 +300,7 @@ hueToRgb ( F32 val1In, F32 val2In, F32 valHUeIn )
//////////////////////////////////////////////////////////////////////////////
//
-void
-LLFloaterColorPicker::
-hslToRgb ( F32 hValIn, F32 sValIn, F32 lValIn, F32& rValOut, F32& gValOut, F32& bValOut )
+void LLFloaterColorPicker::hslToRgb ( F32 hValIn, F32 sValIn, F32 lValIn, F32& rValOut, F32& gValOut, F32& bValOut )
{
if ( sValIn < 0.00001f )
{
@@ -349,9 +328,7 @@ hslToRgb ( F32 hValIn, F32 sValIn, F32 lValIn, F32& rValOut, F32& gValOut, F32&
//////////////////////////////////////////////////////////////////////////////
// mutator for original RGB value
-void
-LLFloaterColorPicker::
-setOrigRgb ( F32 origRIn, F32 origGIn, F32 origBIn )
+void LLFloaterColorPicker::setOrigRgb ( F32 origRIn, F32 origGIn, F32 origBIn )
{
origR = origRIn;
origG = origGIn;
@@ -360,9 +337,7 @@ setOrigRgb ( F32 origRIn, F32 origGIn, F32 origBIn )
//////////////////////////////////////////////////////////////////////////////
// accessor for original RGB value
-void
-LLFloaterColorPicker::
-getOrigRgb ( F32& origROut, F32& origGOut, F32& origBOut )
+void LLFloaterColorPicker::getOrigRgb ( F32& origROut, F32& origGOut, F32& origBOut )
{
origROut = origR;
origGOut = origG;
@@ -371,9 +346,7 @@ getOrigRgb ( F32& origROut, F32& origGOut, F32& origBOut )
//////////////////////////////////////////////////////////////////////////////
// mutator for current RGB value
-void
-LLFloaterColorPicker::
-setCurRgb ( F32 curRIn, F32 curGIn, F32 curBIn )
+void LLFloaterColorPicker::setCurRgb ( F32 curRIn, F32 curGIn, F32 curBIn )
{
// save current RGB
curR = curRIn;
@@ -383,19 +356,13 @@ setCurRgb ( F32 curRIn, F32 curGIn, F32 curBIn )
// update corresponding HSL values and
LLColor3(curRIn, curGIn, curBIn).calcHSL(&curH, &curS, &curL);
- // color changed so update text fields (fixes SL-16968)
- // HACK: turn off the call back wilst we update the text or we recurse ourselves into oblivion
- // CP: this was required when I first wrote the code but this may not be necessary anymore - leaving it there just in case
- enableTextCallbacks( FALSE );
+ // color changed so update text fields
updateTextEntry();
- enableTextCallbacks( TRUE );
}
//////////////////////////////////////////////////////////////////////////////
// accessor for current RGB value
-void
-LLFloaterColorPicker::
-getCurRgb ( F32& curROut, F32& curGOut, F32& curBOut )
+void LLFloaterColorPicker::getCurRgb ( F32& curROut, F32& curGOut, F32& curBOut )
{
curROut = curR;
curGOut = curG;
@@ -404,9 +371,7 @@ getCurRgb ( F32& curROut, F32& curGOut, F32& curBOut )
//////////////////////////////////////////////////////////////////////////////
// mutator for current HSL value
-void
-LLFloaterColorPicker::
-setCurHsl ( F32 curHIn, F32 curSIn, F32 curLIn )
+void LLFloaterColorPicker::setCurHsl ( F32 curHIn, F32 curSIn, F32 curLIn )
{
// save current HSL
curH = curHIn;
@@ -419,9 +384,7 @@ setCurHsl ( F32 curHIn, F32 curSIn, F32 curLIn )
//////////////////////////////////////////////////////////////////////////////
// accessor for current HSL value
-void
-LLFloaterColorPicker::
-getCurHsl ( F32& curHOut, F32& curSOut, F32& curLOut )
+void LLFloaterColorPicker::getCurHsl ( F32& curHOut, F32& curSOut, F32& curLOut )
{
curHOut = curH;
curSOut = curS;
@@ -430,9 +393,7 @@ getCurHsl ( F32& curHOut, F32& curSOut, F32& curLOut )
//////////////////////////////////////////////////////////////////////////////
// called when 'cancel' clicked
-void
-LLFloaterColorPicker::
-onClickCancel ( void* data )
+void LLFloaterColorPicker::onClickCancel ( void* data )
{
if (data)
{
@@ -441,16 +402,14 @@ onClickCancel ( void* data )
if ( self )
{
self->cancelSelection ();
- self->close();
+ self->closeFloater();
}
}
}
//////////////////////////////////////////////////////////////////////////////
// called when 'select' clicked
-void
-LLFloaterColorPicker::
-onClickSelect ( void* data )
+void LLFloaterColorPicker::onClickSelect ( void* data )
{
if (data)
{
@@ -460,36 +419,28 @@ onClickSelect ( void* data )
{
// apply to selection
LLColorSwatchCtrl::onColorChanged ( self->getSwatch (), LLColorSwatchCtrl::COLOR_SELECT );
- self->close();
+ self->closeFloater();
}
}
}
-void LLFloaterColorPicker::onClickPipette( void* data )
+void LLFloaterColorPicker::onClickPipette( )
{
- LLFloaterColorPicker* self = ( LLFloaterColorPicker* )data;
-
- if ( self)
+ BOOL pipette_active = mPipetteBtn->getToggleState();
+ pipette_active = !pipette_active;
+ if (pipette_active)
{
- BOOL pipette_active = self->mPipetteBtn->getToggleState();
- pipette_active = !pipette_active;
- if (pipette_active)
- {
- LLToolPipette::getInstance()->setSelectCallback(onColorSelect, self);
- LLToolMgr::getInstance()->setTransientTool(LLToolPipette::getInstance());
- }
- else
- {
- LLToolMgr::getInstance()->clearTransientTool();
- }
+ LLToolMgr::getInstance()->setTransientTool(LLToolPipette::getInstance());
+ }
+ else
+ {
+ LLToolMgr::getInstance()->clearTransientTool();
}
}
//////////////////////////////////////////////////////////////////////////////
// called when 'text is committed' - i,e. focus moves from a text field
-void
-LLFloaterColorPicker::
-onTextCommit ( LLUICtrl* ctrl, void* data )
+void LLFloaterColorPicker::onTextCommit ( LLUICtrl* ctrl, void* data )
{
if ( data )
{
@@ -515,16 +466,12 @@ void LLFloaterColorPicker::onImmediateCheck( LLUICtrl* ctrl, void* data)
}
}
-void LLFloaterColorPicker::onColorSelect( const LLTextureEntry& te, void *data )
+void LLFloaterColorPicker::onColorSelect( const LLTextureEntry& te )
{
- LLFloaterColorPicker* self = (LLFloaterColorPicker*)data;
- if (self)
+ setCurRgb(te.getColor().mV[VRED], te.getColor().mV[VGREEN], te.getColor().mV[VBLUE]);
+ if (mApplyImmediateCheck->get())
{
- self->setCurRgb(te.getColor().mV[VRED], te.getColor().mV[VGREEN], te.getColor().mV[VBLUE]);
- if (self->mApplyImmediateCheck->get())
- {
- LLColorSwatchCtrl::onColorChanged ( self->getSwatch (), LLColorSwatchCtrl::COLOR_CHANGE );
- }
+ LLColorSwatchCtrl::onColorChanged ( getSwatch (), LLColorSwatchCtrl::COLOR_CHANGE );
}
}
@@ -673,9 +620,7 @@ void LLFloaterColorPicker::draw()
//////////////////////////////////////////////////////////////////////////////
// find a complimentary color to the one passed in that can be used to highlight
-const LLColor4&
-LLFloaterColorPicker::
-getComplimentaryColor ( const LLColor4& backgroundColor )
+const LLColor4& LLFloaterColorPicker::getComplimentaryColor ( const LLColor4& backgroundColor )
{
// going to base calculation on luminance
F32 hVal, sVal, lVal;
@@ -695,9 +640,7 @@ getComplimentaryColor ( const LLColor4& backgroundColor )
//////////////////////////////////////////////////////////////////////////////
// draw color palette
-void
-LLFloaterColorPicker::
-drawPalette ()
+void LLFloaterColorPicker::drawPalette ()
{
S32 curEntry = 0;
@@ -748,9 +691,7 @@ drawPalette ()
//////////////////////////////////////////////////////////////////////////////
// update text entry values for RGB/HSL (can't be done in ::draw () since this overwrites input
-void
-LLFloaterColorPicker::
-updateTextEntry ()
+void LLFloaterColorPicker::updateTextEntry ()
{
// set values in spinners
childSetValue("rspin", ( getCurR () * 255.0f ) );
@@ -761,38 +702,9 @@ updateTextEntry ()
childSetValue("lspin", ( getCurL () * 100.0f ) );
}
-//////////////////////////////////////////////////////////////////////////////
-// turns on or off text entry commit call backs
-void
-LLFloaterColorPicker::
-enableTextCallbacks ( BOOL stateIn )
-{
- if ( stateIn )
- {
- childSetCommitCallback("rspin", onTextCommit, (void*)this );
- childSetCommitCallback("gspin", onTextCommit, (void*)this );
- childSetCommitCallback("bspin", onTextCommit, (void*)this );
- childSetCommitCallback("hspin", onTextCommit, (void*)this );
- childSetCommitCallback("sspin", onTextCommit, (void*)this );
- childSetCommitCallback("lspin", onTextCommit, (void*)this );
- }
- else
- {
- childSetCommitCallback("rspin", 0, (void*)this );
- childSetCommitCallback("gspin", 0, (void*)this );
- childSetCommitCallback("bspin", 0, (void*)this );
- childSetCommitCallback("hspin", 0, (void*)this );
- childSetCommitCallback("sspin", 0, (void*)this );
- childSetCommitCallback("lspin", 0, (void*)this );
- }
-}
-
-
//////////////////////////////////////////////////////////////////////////////
//
-void
-LLFloaterColorPicker::
-onTextEntryChanged ( LLUICtrl* ctrl )
+void LLFloaterColorPicker::onTextEntryChanged ( LLUICtrl* ctrl )
{
// value in RGB boxes changed
std::string name = ctrl->getName();
@@ -821,10 +733,7 @@ onTextEntryChanged ( LLUICtrl* ctrl )
// update current RGB (and implicitly HSL)
setCurRgb ( rVal, gVal, bVal );
- // HACK: turn off the call back wilst we update the text or we recurse ourselves into oblivion
- enableTextCallbacks ( FALSE );
updateTextEntry ();
- enableTextCallbacks ( TRUE );
}
else
// value in HSL boxes changed
@@ -847,10 +756,7 @@ onTextEntryChanged ( LLUICtrl* ctrl )
// update current HSL (and implicitly RGB)
setCurHsl ( hVal, sVal, lVal );
- // HACK: turn off the call back wilst we update the text or we recurse ourselves into oblivion
- enableTextCallbacks ( FALSE );
updateTextEntry ();
- enableTextCallbacks ( TRUE );
}
if (mApplyImmediateCheck->get())
@@ -861,9 +767,7 @@ onTextEntryChanged ( LLUICtrl* ctrl )
//////////////////////////////////////////////////////////////////////////////
//
-BOOL
-LLFloaterColorPicker::
-updateRgbHslFromPoint ( S32 xPosIn, S32 yPosIn )
+BOOL LLFloaterColorPicker::updateRgbHslFromPoint ( S32 xPosIn, S32 yPosIn )
{
if ( xPosIn >= mRGBViewerImageLeft &&
xPosIn <= mRGBViewerImageLeft + mRGBViewerImageWidth &&
@@ -899,9 +803,7 @@ updateRgbHslFromPoint ( S32 xPosIn, S32 yPosIn )
//////////////////////////////////////////////////////////////////////////////
//
-BOOL
-LLFloaterColorPicker::
-handleMouseDown ( S32 x, S32 y, MASK mask )
+BOOL LLFloaterColorPicker::handleMouseDown ( S32 x, S32 y, MASK mask )
{
// make it the frontmost
gFloaterView->bringToFront(this);
@@ -987,10 +889,7 @@ handleMouseDown ( S32 x, S32 y, MASK mask )
LLColorSwatchCtrl::onColorChanged ( getSwatch (), LLColorSwatchCtrl::COLOR_CHANGE );
}
- // HACK: turn off the call back wilst we update the text or we recurse ourselves into oblivion
- enableTextCallbacks ( FALSE );
updateTextEntry ();
- enableTextCallbacks ( TRUE );
}
return TRUE;
@@ -1003,9 +902,7 @@ handleMouseDown ( S32 x, S32 y, MASK mask )
//////////////////////////////////////////////////////////////////////////////
//
-BOOL
-LLFloaterColorPicker::
-handleHover ( S32 x, S32 y, MASK mask )
+BOOL LLFloaterColorPicker::handleHover ( S32 x, S32 y, MASK mask )
{
// if we're the front most window
if ( isFrontmost () )
@@ -1071,19 +968,9 @@ handleHover ( S32 x, S32 y, MASK mask )
return LLFloater::handleHover ( x, y, mask );
}
-void LLFloaterColorPicker::onClose(bool app_quitting)
-{
- //RN: this is consistent with texture picker in that closing the window leaves the current selection
- // to change this to "close to cancel", uncomment the following line
- //cancelSelection();
- LLFloater::onClose(app_quitting);
-}
-
//////////////////////////////////////////////////////////////////////////////
// reverts state once mouse button is released
-BOOL
-LLFloaterColorPicker::
-handleMouseUp ( S32 x, S32 y, MASK mask )
+BOOL LLFloaterColorPicker::handleMouseUp ( S32 x, S32 y, MASK mask )
{
getWindow()->setCursor ( UI_CURSOR_ARROW );
@@ -1130,7 +1017,7 @@ handleMouseUp ( S32 x, S32 y, MASK mask )
std::ostringstream codec;
codec << "ColorPaletteEntry" << std::setfill ( '0' ) << std::setw ( 2 ) << curEntry + 1;
const std::string s ( codec.str () );
- gSavedSettings.setColor4( s, *mPalette [ curEntry ] );
+ gSavedSkinSettings.setColor4( s, *mPalette [ curEntry ] );
}
}
@@ -1158,16 +1045,11 @@ handleMouseUp ( S32 x, S32 y, MASK mask )
//////////////////////////////////////////////////////////////////////////////
// cancel current color selection, revert to original and close picker
-void
-LLFloaterColorPicker::
-cancelSelection ()
+void LLFloaterColorPicker::cancelSelection ()
{
// restore the previous color selection
setCurRgb ( getOrigR (), getOrigG (), getOrigB () );
- // we're going away and when we do and the entry widgets lose focus, they do bad things so turn them off
- enableTextCallbacks ( FALSE );
-
// update in world item with original color via current swatch
LLColorSwatchCtrl::onColorChanged( getSwatch(), LLColorSwatchCtrl::COLOR_CANCEL );
diff --git a/indra/newview/llfloatercolorpicker.h b/indra/newview/llfloatercolorpicker.h
index 7c8d36a7c7..16f456b5bf 100644
--- a/indra/newview/llfloatercolorpicker.h
+++ b/indra/newview/llfloatercolorpicker.h
@@ -36,7 +36,7 @@
#include <vector>
#include "llfloater.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llcolorswatch.h"
#include "llspinctrl.h"
#include "lltextureentry.h"
@@ -61,7 +61,6 @@ class LLFloaterColorPicker
virtual BOOL handleMouseUp ( S32 x, S32 y, MASK mask );
virtual BOOL handleHover ( S32 x, S32 y, MASK mask );
virtual void onMouseCaptureLost();
- virtual void onClose(bool app_quitting);
// implicit methods
void createUI ();
@@ -123,14 +122,11 @@ class LLFloaterColorPicker
// callbacks
static void onClickCancel ( void* data );
static void onClickSelect ( void* data );
- static void onClickPipette ( void* data );
+ void onClickPipette ( );
static void onTextCommit ( LLUICtrl* ctrl, void* data );
static void onImmediateCheck ( LLUICtrl* ctrl, void* data );
- static void onColorSelect( const LLTextureEntry& te, void *data );
+ void onColorSelect( const LLTextureEntry& te );
private:
- // turns on or off text entry commit call backs
- void enableTextCallbacks ( BOOL stateIn );
-
// draws color selection palette
void drawPalette ();
diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp
index 58876a8dec..a448df792e 100644
--- a/indra/newview/llfloaterdaycycle.cpp
+++ b/indra/newview/llfloaterdaycycle.cpp
@@ -63,15 +63,20 @@ LLFloaterDayCycle* LLFloaterDayCycle::sDayCycle = NULL;
std::map<std::string, LLWLSkyKey> LLFloaterDayCycle::sSliderToKey;
const F32 LLFloaterDayCycle::sHoursPerDay = 24.0f;
-LLFloaterDayCycle::LLFloaterDayCycle() : LLFloater(std::string("Day Cycle Floater"))
+LLFloaterDayCycle::LLFloaterDayCycle()
+ : LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_day_cycle_options.xml");
-
+}
+
+BOOL LLFloaterDayCycle::postBuild()
+{
// add the combo boxes
LLComboBox* keyCombo = getChild<LLComboBox>("WLKeyPresets");
if(keyCombo != NULL)
{
+ keyCombo->removeall();
std::map<std::string, LLWLParamSet>::iterator mIt =
LLWLParamManager::instance()->mParamList.begin();
for(; mIt != LLWLParamManager::instance()->mParamList.end(); mIt++)
@@ -90,6 +95,7 @@ LLFloaterDayCycle::LLFloaterDayCycle() : LLFloater(std::string("Day Cycle Floate
// load it up
initCallbacks();
+ return TRUE;
}
LLFloaterDayCycle::~LLFloaterDayCycle()
@@ -231,7 +237,7 @@ LLFloaterDayCycle* LLFloaterDayCycle::instance()
if (!sDayCycle)
{
sDayCycle = new LLFloaterDayCycle();
- sDayCycle->open();
+ sDayCycle->openFloater();
sDayCycle->setFocus(TRUE);
}
return sDayCycle;
@@ -256,7 +262,7 @@ void LLFloaterDayCycle::show()
//LLUICtrlFactory::getInstance()->buildFloater(dayCycle, "floater_day_cycle_options.xml");
//dayCycle->initCallbacks();
- dayCycle->open();
+ dayCycle->openFloater();
}
// virtual
diff --git a/indra/newview/llfloaterdaycycle.h b/indra/newview/llfloaterdaycycle.h
index d230035545..a03a7f749a 100644
--- a/indra/newview/llfloaterdaycycle.h
+++ b/indra/newview/llfloaterdaycycle.h
@@ -58,7 +58,7 @@ public:
LLFloaterDayCycle();
virtual ~LLFloaterDayCycle();
-
+ /*virtual*/ BOOL postBuild();
/// help button stuff
static void onClickHelp(void* data);
void initHelpBtn(const std::string& name, const std::string& xml_alert);
diff --git a/indra/newview/llfloaterenvsettings.cpp b/indra/newview/llfloaterenvsettings.cpp
index 661c3988c0..cfdf49373e 100644
--- a/indra/newview/llfloaterenvsettings.cpp
+++ b/indra/newview/llfloaterenvsettings.cpp
@@ -54,18 +54,22 @@
LLFloaterEnvSettings* LLFloaterEnvSettings::sEnvSettings = NULL;
-LLFloaterEnvSettings::LLFloaterEnvSettings() : LLFloater(std::string("Environment Settings Floater"))
+LLFloaterEnvSettings::LLFloaterEnvSettings()
+ : LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_env_settings.xml");
-
- // load it up
- initCallbacks();
}
-
+// virtual
LLFloaterEnvSettings::~LLFloaterEnvSettings()
{
}
-
+// virtual
+BOOL LLFloaterEnvSettings::postBuild()
+{
+ // load it up
+ initCallbacks();
+ return TRUE;
+}
void LLFloaterEnvSettings::onClickHelp(void* data)
{
LLFloaterEnvSettings* self = (LLFloaterEnvSettings*)data;
@@ -174,7 +178,7 @@ LLFloaterEnvSettings* LLFloaterEnvSettings::instance()
if (!sEnvSettings)
{
sEnvSettings = new LLFloaterEnvSettings();
- sEnvSettings->open();
+ sEnvSettings->openFloater();
sEnvSettings->setFocus(TRUE);
}
return sEnvSettings;
@@ -188,7 +192,7 @@ void LLFloaterEnvSettings::show()
//LLUICtrlFactory::getInstance()->buildFloater(envSettings, "floater_env_settings.xml");
//envSettings->initCallbacks();
- envSettings->open();
+ envSettings->openFloater();
}
bool LLFloaterEnvSettings::isOpen()
@@ -303,7 +307,6 @@ std::string LLFloaterEnvSettings::timeToString(F32 curTime)
{
S32 hours;
S32 min;
- bool isPM = false;
// get hours and minutes
hours = (S32) (24.0 * curTime);
@@ -317,46 +320,19 @@ std::string LLFloaterEnvSettings::timeToString(F32 curTime)
min = 0;
}
- // set for PM
- if(hours >= 12 && hours < 24)
- {
- isPM = true;
- }
+ std::string newTime = getString("timeStr");
+ struct tm * timeT;
+ time_t secT = time(0);
+ timeT = gmtime (&secT);
- // convert to non-military notation
- if(hours >= 24)
- {
- hours = 12;
- }
- else if(hours > 12)
- {
- hours -= 12;
- }
- else if(hours == 0)
- {
- hours = 12;
- }
+ timeT->tm_hour = hours;
+ timeT->tm_min = min;
+ secT = mktime (timeT);
+ secT -= LLStringOps::getLocalTimeOffset ();
- // make the string
- std::stringstream newTime;
- newTime << hours << ":";
-
- // double 0
- if(min < 10)
- {
- newTime << 0;
- }
-
- // finish it
- newTime << min << " ";
- if(isPM)
- {
- newTime << "PM";
- }
- else
- {
- newTime << "AM";
- }
+ LLSD substitution;
+ substitution["datetime"] = (S32) secT;
- return newTime.str();
+ LLStringUtil::format (newTime, substitution);
+ return newTime;
}
diff --git a/indra/newview/llfloaterenvsettings.h b/indra/newview/llfloaterenvsettings.h
index 4cdf6036c6..725fb9ed45 100644
--- a/indra/newview/llfloaterenvsettings.h
+++ b/indra/newview/llfloaterenvsettings.h
@@ -46,8 +46,8 @@ class LLFloaterEnvSettings : public LLFloater
public:
LLFloaterEnvSettings();
- virtual ~LLFloaterEnvSettings();
-
+ /*virtual*/ ~LLFloaterEnvSettings();
+ /*virtual*/ BOOL postBuild();
/// initialize all the callbacks for the menu
void initCallbacks(void);
diff --git a/indra/newview/llfloaterevent.cpp b/indra/newview/llfloaterevent.cpp
index 485c13c7b6..6f84807564 100644
--- a/indra/newview/llfloaterevent.cpp
+++ b/indra/newview/llfloaterevent.cpp
@@ -75,13 +75,13 @@ public:
};
LLEventHandler gEventHandler;
-LLFloaterEventInfo::LLFloaterEventInfo(const std::string& name, const U32 event_id)
-: LLFloater(name),
+LLFloaterEventInfo::LLFloaterEventInfo(const U32 event_id)
+: LLFloater(),
mEventID( event_id )
{
mFactoryMap["event_details_panel"] = LLCallbackMap(LLFloaterEventInfo::createEventDetail, this);
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_event.xml", &getFactoryMap());
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_event.xml");
gEventInfoInstances.addData(event_id, this);
}
@@ -115,14 +115,14 @@ LLFloaterEventInfo* LLFloaterEventInfo::show(const U32 event_id)
{
// ...bring that window to front
floater = gEventInfoInstances.getData(event_id);
- floater->open(); /*Flawfinder: ignore*/
+ floater->openFloater();
floater->setFrontmost(true);
}
else
{
- floater = new LLFloaterEventInfo("eventinfo", event_id );
+ floater = new LLFloaterEventInfo( event_id );
floater->center();
- floater->open(); /*Flawfinder: ignore*/
+ floater->openFloater();
floater->displayEventInfo(event_id);
floater->setFrontmost(true);
}
diff --git a/indra/newview/llfloaterevent.h b/indra/newview/llfloaterevent.h
index 8f448b5fa2..563ecc49da 100644
--- a/indra/newview/llfloaterevent.h
+++ b/indra/newview/llfloaterevent.h
@@ -42,7 +42,7 @@ class LLPanelEvent;
class LLFloaterEventInfo : public LLFloater
{
public:
- LLFloaterEventInfo(const std::string& name, const U32 event_id );
+ LLFloaterEventInfo( const U32 event_id );
/*virtual*/ ~LLFloaterEventInfo();
void displayEventInfo(const U32 event_id);
diff --git a/indra/newview/llfloaterfonttest.cpp b/indra/newview/llfloaterfonttest.cpp
index 4bb1d9605d..02791b711e 100644
--- a/indra/newview/llfloaterfonttest.cpp
+++ b/indra/newview/llfloaterfonttest.cpp
@@ -5,7 +5,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008 Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -13,12 +13,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
@@ -44,7 +45,7 @@
LLFloaterFontTest* LLFloaterFontTest::sInstance = NULL;
LLFloaterFontTest::LLFloaterFontTest()
- : LLFloater(std::string("floater_font_test"), LLRect(0,500,700,0), std::string("Font Test"))
+ : LLFloater("floater_font_test")
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_font_test.xml");
}
@@ -60,6 +61,6 @@ void LLFloaterFontTest::show(void *unused)
if (!sInstance)
sInstance = new LLFloaterFontTest();
- sInstance->open(); /*Flawfinder: ignore*/
+ sInstance->openFloater();
sInstance->setFocus(TRUE);
}
diff --git a/indra/newview/llfloaterfonttest.h b/indra/newview/llfloaterfonttest.h
index 45ff890423..eb2d410387 100644
--- a/indra/newview/llfloaterfonttest.h
+++ b/indra/newview/llfloaterfonttest.h
@@ -5,7 +5,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -13,12 +13,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp
index 014a631a53..7fa9d07d0a 100644
--- a/indra/newview/llfloaterfriends.cpp
+++ b/indra/newview/llfloaterfriends.cpp
@@ -52,6 +52,9 @@
#include "llnotify.h"
#include "llresmgr.h"
#include "llimview.h"
+#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
#include "lluictrlfactory.h"
#include "llmenucommands.h"
#include "llviewercontrol.h"
@@ -148,7 +151,7 @@ void LLPanelFriends::updateFriends(U32 changed_mask)
// if the maximum amount of friends are selected
mShowMaxSelectWarning = false;
- LLDynamicArray<LLUUID> selected_friends = getSelectedIDs();
+ std::vector<LLUUID> selected_friends = getSelectedIDs();
if(changed_mask & (LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE))
{
refreshNames(changed_mask);
@@ -173,7 +176,7 @@ void LLPanelFriends::updateFriends(U32 changed_mask)
// but we don't really care here, because refreshUI() will
// clean up the interface.
friends_list->setCurrentByID(selected_id);
- for(LLDynamicArray<LLUUID>::iterator itr = selected_friends.begin(); itr != selected_friends.end(); ++itr)
+ for(std::vector<LLUUID>::iterator itr = selected_friends.begin(); itr != selected_friends.end(); ++itr)
{
friends_list->setSelectedByValue(*itr, true);
}
@@ -188,10 +191,10 @@ BOOL LLPanelFriends::postBuild()
{
mFriendsList = getChild<LLScrollListCtrl>("friend_list");
mFriendsList->setMaxSelectable(MAX_FRIEND_SELECT);
- mFriendsList->setMaximumSelectCallback(onMaximumSelect);
+ mFriendsList->setMaximumSelectCallback(boost::bind(&LLPanelFriends::onMaximumSelect));
mFriendsList->setCommitOnSelectionChange(TRUE);
childSetCommitCallback("friend_list", onSelectName, this);
- childSetDoubleClickCallback("friend_list", onClickIM);
+ getChild<LLScrollListCtrl>("friend_list")->setDoubleClickCallback(onClickIM, this);
U32 changed_mask = LLFriendObserver::ADD | LLFriendObserver::REMOVE | LLFriendObserver::ONLINE;
refreshNames(changed_mask);
@@ -233,7 +236,7 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
friend_column["column"] = "friend_name";
friend_column["value"] = fullname;
friend_column["font"] = "SANSSERIF";
- friend_column["font-style"] = "NORMAL";
+ friend_column["font"]["style"] = "NORMAL";
LLSD& online_status_column = element["columns"][LIST_ONLINE_STATUS];
online_status_column["column"] = "icon_online_status";
@@ -241,12 +244,12 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
if (isOnline)
{
- friend_column["font-style"] = "BOLD";
+ friend_column["font"]["style"] = "BOLD";
online_status_column["value"] = "icon_avatar_online.tga";
}
else if(isOnlineSIP)
{
- friend_column["font-style"] = "BOLD";
+ friend_column["font"]["style"] = "BOLD";
online_status_column["value"] = ONLINE_SIP_ICON_NAME;
}
@@ -325,31 +328,14 @@ BOOL LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationsh
void LLPanelFriends::refreshRightsChangeList()
{
- LLDynamicArray<LLUUID> friends = getSelectedIDs();
+ std::vector<LLUUID> friends = getSelectedIDs();
S32 num_selected = friends.size();
bool can_offer_teleport = num_selected >= 1;
bool selected_friends_online = true;
- LLTextBox* processing_label = getChild<LLTextBox>("process_rights_label");
-
- if(!mAllowRightsChange)
- {
- if(processing_label)
- {
- processing_label->setVisible(true);
- // ignore selection for now
- friends.clear();
- num_selected = 0;
- }
- }
- else if(processing_label)
- {
- processing_label->setVisible(false);
- }
-
const LLRelationship* friend_status = NULL;
- for(LLDynamicArray<LLUUID>::iterator itr = friends.begin(); itr != friends.end(); ++itr)
+ for(std::vector<LLUUID>::iterator itr = friends.begin(); itr != friends.end(); ++itr)
{
friend_status = LLAvatarTracker::instance().getBuddyInfo(*itr);
if (friend_status)
@@ -391,7 +377,7 @@ struct SortFriendsByID
void LLPanelFriends::refreshNames(U32 changed_mask)
{
- LLDynamicArray<LLUUID> selected_ids = getSelectedIDs();
+ std::vector<LLUUID> selected_ids = getSelectedIDs();
S32 pos = mFriendsList->getScrollPos();
// get all buddies we know about
@@ -499,17 +485,8 @@ void LLPanelFriends::refreshUI()
single_selected = TRUE;
if(num_selected > 1)
{
- childSetText("friend_name_label", getString("Multiple"));
multiple_selected = TRUE;
}
- else
- {
- childSetText("friend_name_label", mFriendsList->getFirstSelected()->getColumn(LIST_FRIEND_NAME)->getValue().asString() + "...");
- }
- }
- else
- {
- childSetText("friend_name_label", LLStringUtil::null);
}
@@ -521,15 +498,15 @@ void LLPanelFriends::refreshUI()
//(single_selected will always be true in this situations)
childSetEnabled("remove_btn", single_selected);
childSetEnabled("im_btn", single_selected);
- childSetEnabled("friend_rights", single_selected);
+// childSetEnabled("friend_rights", single_selected);
refreshRightsChangeList();
}
-LLDynamicArray<LLUUID> LLPanelFriends::getSelectedIDs()
+std::vector<LLUUID> LLPanelFriends::getSelectedIDs()
{
LLUUID selected_id;
- LLDynamicArray<LLUUID> friend_ids;
+ std::vector<LLUUID> friend_ids;
std::vector<LLScrollListItem*> selected = mFriendsList->getAllSelected();
for(std::vector<LLScrollListItem*>::iterator itr = selected.begin(); itr != selected.end(); ++itr)
{
@@ -552,7 +529,7 @@ void LLPanelFriends::onSelectName(LLUICtrl* ctrl, void* user_data)
}
//static
-void LLPanelFriends::onMaximumSelect(void* user_data)
+void LLPanelFriends::onMaximumSelect()
{
LLSD args;
args["MAX_SELECT"] = llformat("%d", MAX_FRIEND_SELECT);
@@ -565,7 +542,7 @@ void LLPanelFriends::onClickProfile(void* user_data)
LLPanelFriends* panelp = (LLPanelFriends*)user_data;
//llinfos << "LLPanelFriends::onClickProfile()" << llendl;
- LLDynamicArray<LLUUID> ids = panelp->getSelectedIDs();
+ std::vector<LLUUID> ids = panelp->getSelectedIDs();
if(ids.size() > 0)
{
LLUUID agent_id = ids[0];
@@ -581,7 +558,7 @@ void LLPanelFriends::onClickIM(void* user_data)
LLPanelFriends* panelp = (LLPanelFriends*)user_data;
//llinfos << "LLPanelFriends::onClickIM()" << llendl;
- LLDynamicArray<LLUUID> ids = panelp->getSelectedIDs();
+ std::vector<LLUUID> ids = panelp->getSelectedIDs();
if(ids.size() > 0)
{
if(ids.size() == 1)
@@ -591,14 +568,18 @@ void LLPanelFriends::onClickIM(void* user_data)
std::string fullname;
if(info && gCacheName->getFullName(agent_id, fullname))
{
- gIMMgr->setFloaterOpen(TRUE);
gIMMgr->addSession(fullname, IM_NOTHING_SPECIAL, agent_id);
}
}
else
{
- gIMMgr->setFloaterOpen(TRUE);
- gIMMgr->addSession("Friends Conference", IM_SESSION_CONFERENCE_START, ids[0], ids);
+ // *HACK: Copy into dynamic array
+ LLDynamicArray<LLUUID> id_array;
+ for (std::vector<LLUUID>::iterator it = ids.begin(); it != ids.end(); ++it)
+ {
+ id_array.push_back(*it);
+ }
+ gIMMgr->addSession("Friends Conference", IM_SESSION_CONFERENCE_START, ids[0], id_array);
}
make_ui_sound("UISndStartIM");
}
@@ -702,7 +683,7 @@ void LLPanelFriends::onClickRemove(void* user_data)
LLPanelFriends* panelp = (LLPanelFriends*)user_data;
//llinfos << "LLPanelFriends::onClickRemove()" << llendl;
- LLDynamicArray<LLUUID> ids = panelp->getSelectedIDs();
+ std::vector<LLUUID> ids = panelp->getSelectedIDs();
LLSD args;
if(ids.size() > 0)
{
@@ -742,7 +723,7 @@ void LLPanelFriends::onClickOfferTeleport(void* user_data)
{
LLPanelFriends* panelp = (LLPanelFriends*)user_data;
- LLDynamicArray<LLUUID> ids = panelp->getSelectedIDs();
+ std::vector<LLUUID> ids = panelp->getSelectedIDs();
if(ids.size() > 0)
{
handle_lure(ids);
@@ -754,7 +735,7 @@ void LLPanelFriends::onClickPay(void* user_data)
{
LLPanelFriends* panelp = (LLPanelFriends*)user_data;
- LLDynamicArray<LLUUID> ids = panelp->getSelectedIDs();
+ std::vector<LLUUID> ids = panelp->getSelectedIDs();
if(ids.size() == 1)
{
handle_pay_by_id(ids[0]);
diff --git a/indra/newview/llfloaterfriends.h b/indra/newview/llfloaterfriends.h
index a5c94ee485..51fe5f6d89 100644
--- a/indra/newview/llfloaterfriends.h
+++ b/indra/newview/llfloaterfriends.h
@@ -83,6 +83,9 @@ public:
static void requestFriendship(const LLUUID& target_id,
const std::string& target_name, const std::string& message);
+ // *HACK Made public to remove friends from LLAvatarIconCtrl context menu
+ static bool handleRemove(const LLSD& notification, const LLSD& response);
+
private:
enum FRIENDS_COLUMN_ORDER
@@ -115,15 +118,15 @@ private:
void confirmModifyRights(rights_map_t& ids, EGrantRevoke command);
void sendRightsGrant(rights_map_t& ids);
- // return LLUUID::null if nothing is selected
- LLDynamicArray<LLUUID> getSelectedIDs();
+ // return empty vector if nothing is selected
+ std::vector<LLUUID> getSelectedIDs();
// callback methods
static void onSelectName(LLUICtrl* ctrl, void* user_data);
static bool callbackAddFriend(const LLSD& notification, const LLSD& response);
static bool callbackAddFriendWithMessage(const LLSD& notification, const LLSD& response);
static void onPickAvatar(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data);
- static void onMaximumSelect(void* user_data);
+ static void onMaximumSelect();
static void onClickIM(void* user_data);
static void onClickProfile(void* user_data);
@@ -135,7 +138,6 @@ private:
static void onClickModifyStatus(LLUICtrl* ctrl, void* user_data);
- static bool handleRemove(const LLSD& notification, const LLSD& response);
bool modifyRightsConfirmation(const LLSD& notification, const LLSD& response, rights_map_t* rights);
private:
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
index 6d39d75663..c3448d52c9 100644
--- a/indra/newview/llfloatergesture.cpp
+++ b/indra/newview/llfloatergesture.cpp
@@ -53,6 +53,7 @@
#include "llscrollcontainer.h"
#include "llscrolllistctrl.h"
#include "lltextbox.h"
+#include "lltrans.h"
#include "lluictrlfactory.h"
#include "llviewergesture.h"
#include "llviewerimagelist.h"
@@ -81,10 +82,8 @@ public:
// LLFloaterGesture
//---------------------------------------------------------------------------
LLFloaterGesture::LLFloaterGesture()
-: LLFloater(std::string("Gesture Floater"))
+: LLFloater()
{
- sInstance = this;
-
sObserver = new LLFloaterGestureObserver;
gGestureManager.addObserver(sObserver);
}
@@ -97,10 +96,6 @@ LLFloaterGesture::~LLFloaterGesture()
sObserver = NULL;
sInstance = NULL;
-
- // Custom saving rectangle, since load must be done
- // after postBuild.
- gSavedSettings.setRect("FloaterGestureRect2", getRect());
}
// virtual
@@ -108,13 +103,12 @@ BOOL LLFloaterGesture::postBuild()
{
std::string label;
- // Translate title
label = getTitle();
setTitle(label);
childSetCommitCallback("gesture_list", onCommitList, this);
- childSetDoubleClickCallback("gesture_list", onClickPlay);
+ getChild<LLScrollListCtrl>("gesture_list")->setDoubleClickCallback(onClickPlay, this);
childSetAction("inventory_btn", onClickInventory, this);
@@ -138,25 +132,20 @@ void LLFloaterGesture::show()
{
if (sInstance)
{
- sInstance->open(); /*Flawfinder: ignore*/
+ sInstance->openFloater();
return;
}
- LLFloaterGesture *self = new LLFloaterGesture();
+ sInstance = new LLFloaterGesture();
// Builds and adds to gFloaterView
- LLUICtrlFactory::getInstance()->buildFloater(self, "floater_gesture.xml");
+ LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_gesture.xml");
- // Fix up rectangle
- LLRect rect = gSavedSettings.getRect("FloaterGestureRect2");
- self->reshape(rect.getWidth(), rect.getHeight());
- self->setRect(rect);
+ sInstance->buildGestureList();
- self->buildGestureList();
+ sInstance->childSetFocus("gesture_list");
- self->childSetFocus("gesture_list");
-
- LLCtrlListInterface *list = self->childGetListInterface("gesture_list");
+ LLCtrlListInterface *list = sInstance->childGetListInterface("gesture_list");
if (list)
{
const BOOL ascending = TRUE;
@@ -164,11 +153,11 @@ void LLFloaterGesture::show()
list->selectFirstItem();
}
- self->mSelectedID = LLUUID::null;
+ sInstance->mSelectedID = LLUUID::null;
// Update button labels
- onCommitList(NULL, self);
- self->open(); /*Flawfinder: ignore*/
+ onCommitList(NULL, sInstance);
+ sInstance->openFloater();
}
// static
@@ -176,7 +165,7 @@ void LLFloaterGesture::toggleVisibility()
{
if(sInstance && sInstance->getVisible())
{
- sInstance->close();
+ sInstance->closeFloater();
}
else
{
@@ -231,7 +220,7 @@ void LLFloaterGesture::buildGestureList()
LLMultiGesture* gesture = (*it).second;
// Note: Can have NULL item if inventory hasn't arrived yet.
- std::string item_name = "Loading...";
+ std::string item_name = getString("loading");
LLInventoryItem* item = gInventory.getItem(item_id);
if (item)
{
@@ -254,7 +243,7 @@ void LLFloaterGesture::buildGestureList()
element["columns"][0]["column"] = "trigger";
element["columns"][0]["value"] = gesture->mTrigger;
element["columns"][0]["font"] = "SANSSERIF";
- element["columns"][0]["font-style"] = font_style;
+ element["columns"][0]["font"]["style"] = font_style;
std::string key_string = LLKeyboard::stringFromKey(gesture->mKey);
std::string buffer;
@@ -281,42 +270,42 @@ void LLFloaterGesture::buildGestureList()
element["columns"][1]["column"] = "shortcut";
element["columns"][1]["value"] = buffer;
element["columns"][1]["font"] = "SANSSERIF";
- element["columns"][1]["font-style"] = font_style;
+ element["columns"][1]["font"]["style"] = font_style;
// hidden column for sorting
element["columns"][2]["column"] = "key";
element["columns"][2]["value"] = key_string;
element["columns"][2]["font"] = "SANSSERIF";
- element["columns"][2]["font-style"] = font_style;
+ element["columns"][2]["font"]["style"] = font_style;
// Only add "playing" if we've got the name, less confusing. JC
if (item && gesture->mPlaying)
{
- item_name += " (Playing)";
+ item_name += " " + getString("playing");
}
element["columns"][3]["column"] = "name";
element["columns"][3]["value"] = item_name;
element["columns"][3]["font"] = "SANSSERIF";
- element["columns"][3]["font-style"] = font_style;
+ element["columns"][3]["font"]["style"] = font_style;
}
else
{
element["columns"][0]["column"] = "trigger";
element["columns"][0]["value"] = "";
element["columns"][0]["font"] = "SANSSERIF";
- element["columns"][0]["font-style"] = font_style;
+ element["columns"][0]["font"]["style"] = font_style;
element["columns"][0]["column"] = "trigger";
element["columns"][0]["value"] = "---";
element["columns"][0]["font"] = "SANSSERIF";
- element["columns"][0]["font-style"] = font_style;
+ element["columns"][0]["font"]["style"] = font_style;
element["columns"][2]["column"] = "key";
element["columns"][2]["value"] = "~~~";
element["columns"][2]["font"] = "SANSSERIF";
- element["columns"][2]["font-style"] = font_style;
+ element["columns"][2]["font"]["style"] = font_style;
element["columns"][3]["column"] = "name";
element["columns"][3]["value"] = item_name;
element["columns"][3]["font"] = "SANSSERIF";
- element["columns"][3]["font-style"] = font_style;
+ element["columns"][3]["font"]["style"] = font_style;
}
list->addElement(element, ADD_BOTTOM);
}
@@ -360,24 +349,16 @@ void LLFloaterGesture::onClickPlay(void* data)
class GestureShowCallback : public LLInventoryCallback
{
public:
- GestureShowCallback(std::string &title)
- {
- mTitle = title;
- }
void fire(const LLUUID &inv_item)
{
- LLPreviewGesture::show(mTitle, inv_item, LLUUID::null);
+ LLPreviewGesture::show(inv_item, LLUUID::null);
}
-private:
- std::string mTitle;
};
// static
void LLFloaterGesture::onClickNew(void* data)
{
- std::string title("Gesture: ");
- title.append("New Gesture");
- LLPointer<LLInventoryCallback> cb = new GestureShowCallback(title);
+ LLPointer<LLInventoryCallback> cb = new GestureShowCallback();
create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
LLUUID::null, LLTransactionID::tnull, "New Gesture", "", LLAssetType::AT_GESTURE,
LLInventoryType::IT_GESTURE, NOT_WEARABLE, PERM_MOVE | PERM_TRANSFER, cb);
@@ -396,10 +377,7 @@ void LLFloaterGesture::onClickEdit(void* data)
LLInventoryItem* item = gInventory.getItem(item_id);
if (!item) return;
- std::string title("Gesture: ");
- title.append(item->getName());
-
- LLPreviewGesture* previewp = LLPreviewGesture::show(title, item_id, LLUUID::null);
+ LLPreviewGesture* previewp = LLPreviewGesture::show(item_id, LLUUID::null);
if (!previewp->getHost())
{
previewp->setRect(gFloaterView->findNeighboringPosition(self, previewp));
diff --git a/indra/newview/llfloatergesture.h b/indra/newview/llfloatergesture.h
index 4e11a10e61..f7c4e558ac 100644
--- a/indra/newview/llfloatergesture.h
+++ b/indra/newview/llfloatergesture.h
@@ -41,7 +41,7 @@
#include "lldarray.h"
-class LLScrollableContainerView;
+class LLScrollContainer;
class LLView;
class LLButton;
class LLLineEditor;
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index 4959a2913e..58cbe02d6d 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -73,36 +73,39 @@
#include "llsurface.h"
#include "llviewercontrol.h"
#include "lluictrlfactory.h"
+#include "lltrans.h"
#include "lltransfertargetfile.h"
#include "lltransfersourcefile.h"
const F32 SECONDS_BETWEEN_UPDATE_REQUESTS = 5.0f;
-static LLFloaterGodTools* sGodTools = NULL;
-
//*****************************************************************************
// LLFloaterGodTools
//*****************************************************************************
-// static
-LLFloaterGodTools* LLFloaterGodTools::instance()
+void LLFloaterGodTools::onOpen(const LLSD& key)
{
- if (!sGodTools)
+ center();
+ setFocus(TRUE);
+// LLPanel *panel = childGetVisibleTab("GodTools Tabs");
+// if (panel)
+// panel->setFocus(TRUE);
+ if (mPanelObjectTools)
+ mPanelObjectTools->setTargetAvatar(LLUUID::null);
+
+ if (gAgent.getRegionHost() != mCurrentHost)
{
- sGodTools = new LLFloaterGodTools();
- sGodTools->open(); /*Flawfinder: ignore*/
- sGodTools->center();
- sGodTools->setFocus(TRUE);
+ // we're in a new region
+ sendRegionInfoRequest();
}
- return sGodTools;
}
// static
void LLFloaterGodTools::refreshAll()
{
- LLFloaterGodTools* god_tools = instance();
+ LLFloaterGodTools* god_tools = getInstance();
if (god_tools)
{
if (gAgent.getRegionHost() != god_tools->mCurrentHost)
@@ -115,22 +118,16 @@ void LLFloaterGodTools::refreshAll()
-LLFloaterGodTools::LLFloaterGodTools()
-: LLFloater(std::string("godtools floater")),
+LLFloaterGodTools::LLFloaterGodTools(const LLSD& key)
+: LLFloater(),
mCurrentHost(LLHost::invalid),
mUpdateTimer()
{
- LLCallbackMap::map_t factory_map;
- factory_map["grid"] = LLCallbackMap(createPanelGrid, this);
- factory_map["region"] = LLCallbackMap(createPanelRegion, this);
- factory_map["objects"] = LLCallbackMap(createPanelObjects, this);
- factory_map["request"] = LLCallbackMap(createPanelRequest, this);
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_god_tools.xml", &factory_map);
-
- childSetTabChangeCallback("GodTools Tabs", "grid", onTabChanged, this);
- childSetTabChangeCallback("GodTools Tabs", "region", onTabChanged, this);
- childSetTabChangeCallback("GodTools Tabs", "objects", onTabChanged, this);
- childSetTabChangeCallback("GodTools Tabs", "request", onTabChanged, this);
+ mFactoryMap["grid"] = LLCallbackMap(createPanelGrid, this);
+ mFactoryMap["region"] = LLCallbackMap(createPanelRegion, this);
+ mFactoryMap["objects"] = LLCallbackMap(createPanelObjects, this);
+ mFactoryMap["request"] = LLCallbackMap(createPanelRequest, this);
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_god_tools.xml");
sendRegionInfoRequest();
@@ -140,14 +137,14 @@ LLFloaterGodTools::LLFloaterGodTools()
// static
void* LLFloaterGodTools::createPanelGrid(void *userdata)
{
- return new LLPanelGridTools("grid");
+ return new LLPanelGridTools();
}
// static
void* LLFloaterGodTools::createPanelRegion(void *userdata)
{
LLFloaterGodTools* self = (LLFloaterGodTools*)userdata;
- self->mPanelRegionTools = new LLPanelRegionTools("region");
+ self->mPanelRegionTools = new LLPanelRegionTools();
return self->mPanelRegionTools;
}
@@ -155,20 +152,24 @@ void* LLFloaterGodTools::createPanelRegion(void *userdata)
void* LLFloaterGodTools::createPanelObjects(void *userdata)
{
LLFloaterGodTools* self = (LLFloaterGodTools*)userdata;
- self->mPanelObjectTools = new LLPanelObjectTools("objects");
+ self->mPanelObjectTools = new LLPanelObjectTools();
return self->mPanelObjectTools;
}
// static
void* LLFloaterGodTools::createPanelRequest(void *userdata)
{
- return new LLPanelRequestTools("region");
+ return new LLPanelRequestTools();
}
LLFloaterGodTools::~LLFloaterGodTools()
{
// children automatically deleted
}
+BOOL LLFloaterGodTools::postBuild()
+{
+ return TRUE;
+}
U32 LLFloaterGodTools::computeRegionFlags() const
{
@@ -186,9 +187,9 @@ void LLFloaterGodTools::updatePopup(LLCoordGL center, MASK mask)
// virtual
void LLFloaterGodTools::onClose(bool app_quitting)
{
- if (sGodTools)
+ if (getInstance())
{
- sGodTools->setVisible(FALSE);
+ getInstance()->setVisible(FALSE);
}
}
@@ -209,42 +210,15 @@ void LLFloaterGodTools::draw()
LLFloater::draw();
}
-// static
-void LLFloaterGodTools::show(void *)
-{
- LLFloaterGodTools* god_tools = instance();
- god_tools->open();
- LLPanel *panel = god_tools->childGetVisibleTab("GodTools Tabs");
- if (panel) panel->setFocus(TRUE);
- if (god_tools->mPanelObjectTools) god_tools->mPanelObjectTools->setTargetAvatar(LLUUID::null);
-
- if (gAgent.getRegionHost() != god_tools->mCurrentHost)
- {
- // we're in a new region
- god_tools->sendRegionInfoRequest();
- }
-}
-
void LLFloaterGodTools::showPanel(const std::string& panel_name)
{
childShowTab("GodTools Tabs", panel_name);
- open(); /*Flawfinder: ignore*/
+ openFloater();
LLPanel *panel = childGetVisibleTab("GodTools Tabs");
- if (panel) panel->setFocus(TRUE);
-}
-
-
-// static
-void LLFloaterGodTools::onTabChanged(void* data, bool from_click)
-{
- LLPanel* panel = (LLPanel*)data;
if (panel)
- {
panel->setFocus(TRUE);
- }
}
-
// static
void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
{
@@ -299,14 +273,14 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
}
// push values to god tools, if available
- if (sGodTools
- && sGodTools->mPanelRegionTools
- && sGodTools->mPanelObjectTools
- && msg
- && gAgent.isGodlike())
+ if ( gAgent.isGodlike()
+ && instanceVisible()
+ && getInstance()->mPanelRegionTools
+ && getInstance()->mPanelObjectTools
+ && msg )
{
- LLPanelRegionTools* rtool = sGodTools->mPanelRegionTools;
- sGodTools->mCurrentHost = host;
+ LLPanelRegionTools* rtool = getInstance()->mPanelRegionTools;
+ getInstance()->mCurrentHost = host;
// store locally
rtool->setSimName(sim_name);
@@ -319,7 +293,7 @@ void LLFloaterGodTools::processRegionInfo(LLMessageSystem* msg)
rtool->setRedirectGridY(redirect_grid_y);
rtool->enableAllWidgets();
- LLPanelObjectTools *otool = sGodTools->mPanelObjectTools;
+ LLPanelObjectTools *otool = getInstance()->mPanelObjectTools;
otool->setCheckFlags(region_flags);
otool->enableAllWidgets();
@@ -364,12 +338,12 @@ void LLFloaterGodTools::sendGodUpdateRegionInfo()
{
LLViewerRegion *regionp = gAgent.getRegion();
if (gAgent.isGodlike()
- && sGodTools->mPanelRegionTools
+ && getInstance()->mPanelRegionTools
&& regionp
&& gAgent.getRegionHost() == mCurrentHost)
{
LLMessageSystem *msg = gMessageSystem;
- LLPanelRegionTools *rtool = sGodTools->mPanelRegionTools;
+ LLPanelRegionTools *rtool = getInstance()->mPanelRegionTools;
msg->newMessage("GodUpdateRegionInfo");
msg->nextBlockFast(_PREHASH_AgentData);
@@ -426,15 +400,15 @@ const F32 PRICE_PER_METER_MIN = 0.f;
const F32 PRICE_PER_METER_MAX = 100.f;
-LLPanelRegionTools::LLPanelRegionTools(const std::string& title)
-: LLPanel(title)
+LLPanelRegionTools::LLPanelRegionTools()
+: LLPanel()
{
}
BOOL LLPanelRegionTools::postBuild()
{
childSetCommitCallback("region name", onChangeAnything, this);
- childSetKeystrokeCallback("region name", onChangeSimName, this);
+ getChild<LLLineEditor>("region name")->setKeystrokeCallback(onChangeSimName, this);
childSetPrevalidate("region name", &LLLineEditor::prevalidatePrintableNotPipe);
childSetCommitCallback("check prelude", onChangePrelude, this);
@@ -768,9 +742,7 @@ void LLPanelRegionTools::setPricePerMeter(S32 price)
// static
void LLPanelRegionTools::onChangeAnything(LLUICtrl* ctrl, void* userdata)
{
- if (sGodTools
- && userdata
- && gAgent.isGodlike())
+ if (userdata && gAgent.isGodlike())
{
LLPanelRegionTools* region_tools = (LLPanelRegionTools*) userdata;
region_tools->childEnable("Apply");
@@ -794,9 +766,7 @@ void LLPanelRegionTools::onChangePrelude(LLUICtrl* ctrl, void* data)
// static
void LLPanelRegionTools::onChangeSimName(LLLineEditor* caller, void* userdata )
{
- if (sGodTools
- && userdata
- && gAgent.isGodlike())
+ if (userdata && gAgent.isGodlike())
{
LLPanelRegionTools* region_tools = (LLPanelRegionTools*) userdata;
region_tools->childEnable("Apply");
@@ -807,11 +777,9 @@ void LLPanelRegionTools::onChangeSimName(LLLineEditor* caller, void* userdata )
void LLPanelRegionTools::onRefresh(void* userdata)
{
LLViewerRegion *region = gAgent.getRegion();
- if (region
- && sGodTools
- && gAgent.isGodlike())
+ if (region && gAgent.isGodlike())
{
- sGodTools->sendRegionInfoRequest();
+ LLFloaterGodTools::getInstance()->sendRegionInfoRequest();
}
}
@@ -819,15 +787,12 @@ void LLPanelRegionTools::onRefresh(void* userdata)
void LLPanelRegionTools::onApplyChanges(void* userdata)
{
LLViewerRegion *region = gAgent.getRegion();
- if (region
- && sGodTools
- && userdata
- && gAgent.isGodlike())
+ if (region && userdata && gAgent.isGodlike())
{
LLPanelRegionTools* region_tools = (LLPanelRegionTools*) userdata;
region_tools->childDisable("Apply");
- sGodTools->sendGodUpdateRegionInfo();
+ LLFloaterGodTools::getInstance()->sendGodUpdateRegionInfo();
}
}
@@ -890,11 +855,10 @@ void LLPanelRegionTools::onSelectRegion(void* userdata)
// LEFT R2 RIGHT
const F32 HOURS_TO_RADIANS = (2.f*F_PI)/24.f;
-const char FLOATER_GRID_ADMIN_TITLE[] = "Grid Administration";
-LLPanelGridTools::LLPanelGridTools(const std::string& name) :
- LLPanel(name)
+LLPanelGridTools::LLPanelGridTools() :
+ LLPanel()
{
}
@@ -919,10 +883,6 @@ void LLPanelGridTools::refresh()
// static
void LLPanelGridTools::onClickKickAll(void* userdata)
{
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect(left, top, left+400, top-300);
-
LLNotifications::instance().add("KickAllUsers", LLSD(), LLSD(), LLPanelGridTools::confirmKick);
}
@@ -1017,8 +977,9 @@ bool LLPanelGridTools::flushMapVisibilityCachesConfirm(const LLSD& notification,
// LEFT RIGHT
// Default constructor
-LLPanelObjectTools::LLPanelObjectTools(const std::string& title)
-: LLPanel(title), mTargetAvatar()
+LLPanelObjectTools::LLPanelObjectTools()
+ : LLPanel(),
+ mTargetAvatar()
{
}
@@ -1054,7 +1015,7 @@ void LLPanelObjectTools::setTargetAvatar(const LLUUID &target_id)
mTargetAvatar = target_id;
if (target_id.isNull())
{
- childSetValue("target_avatar_name", "(no target)");
+ childSetValue("target_avatar_name", getString("no_target"));
}
}
@@ -1137,8 +1098,7 @@ void LLPanelObjectTools::enableAllWidgets()
// static
void LLPanelObjectTools::onGetTopColliders(void* userdata)
{
- if (sGodTools
- && gAgent.isGodlike())
+ if (gAgent.isGodlike())
{
LLFloaterTopObjects::show();
LLFloaterTopObjects::setMode(STAT_REPORT_TOP_COLLIDERS);
@@ -1149,8 +1109,7 @@ void LLPanelObjectTools::onGetTopColliders(void* userdata)
// static
void LLPanelObjectTools::onGetTopScripts(void* userdata)
{
- if (sGodTools
- && gAgent.isGodlike())
+ if (gAgent.isGodlike())
{
LLFloaterTopObjects::show();
LLFloaterTopObjects::setMode(STAT_REPORT_TOP_SCRIPTS);
@@ -1161,8 +1120,7 @@ void LLPanelObjectTools::onGetTopScripts(void* userdata)
// static
void LLPanelObjectTools::onGetScriptDigest(void* userdata)
{
- if (sGodTools
- && gAgent.isGodlike())
+ if (gAgent.isGodlike())
{
// get the list of scripts and number of occurences of each
// (useful for finding self-replicating objects)
@@ -1272,7 +1230,10 @@ void LLPanelObjectTools::onClickSetBySelection(void* data)
LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
panelp->mTargetAvatar = owner_id;
- std::string name = "Object " + node->mName + " owned by " + owner_name;
+ LLStringUtil::format_map_t args;
+ args["[OBJECT]"] = node->mName;
+ args["[OWNER]"] = owner_name;
+ std::string name = LLTrans::getString("GodToolsObjectOwnedBy", args);
panelp->childSetValue("target_avatar_name", name);
}
@@ -1290,9 +1251,7 @@ void LLPanelObjectTools::callbackAvatarID(const std::vector<std::string>& names,
// static
void LLPanelObjectTools::onChangeAnything(LLUICtrl* ctrl, void* userdata)
{
- if (sGodTools
- && userdata
- && gAgent.isGodlike())
+ if (userdata && gAgent.isGodlike())
{
LLPanelObjectTools* object_tools = (LLPanelObjectTools*) userdata;
object_tools->childEnable("Apply");
@@ -1303,16 +1262,13 @@ void LLPanelObjectTools::onChangeAnything(LLUICtrl* ctrl, void* userdata)
void LLPanelObjectTools::onApplyChanges(void* userdata)
{
LLViewerRegion *region = gAgent.getRegion();
- if (region
- && sGodTools
- && userdata
- && gAgent.isGodlike())
+ if (region && gAgent.isGodlike())
{
LLPanelObjectTools* object_tools = (LLPanelObjectTools*) userdata;
// TODO -- implement this
object_tools->childDisable("Apply");
- sGodTools->sendGodUpdateRegionInfo();
+ LLFloaterGodTools::getInstance()->sendGodUpdateRegionInfo();
}
}
@@ -1324,8 +1280,8 @@ void LLPanelObjectTools::onApplyChanges(void* userdata)
const std::string SELECTION = "Selection";
const std::string AGENT_REGION = "Agent Region";
-LLPanelRequestTools::LLPanelRequestTools(const std::string& name):
- LLPanel(name)
+LLPanelRequestTools::LLPanelRequestTools():
+ LLPanel()
{
}
@@ -1348,9 +1304,13 @@ void LLPanelRequestTools::refresh()
LLCtrlListInterface *list = childGetListInterface("destination");
if (!list) return;
- list->operateOnAll(LLCtrlListInterface::OP_DELETE);
- list->addSimpleElement(SELECTION);
- list->addSimpleElement(AGENT_REGION);
+ S32 last_item = list->getItemCount();
+
+ if (last_item >=3)
+ {
+ list->selectItemRange(2,last_item);
+ list->operateOnSelection(LLCtrlListInterface::OP_DELETE);
+ }
for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
{
@@ -1367,7 +1327,7 @@ void LLPanelRequestTools::refresh()
}
else
{
- list->selectByValue(SELECTION);
+ list->operateOnSelection(LLCtrlListInterface::OP_DESELECT);
}
}
diff --git a/indra/newview/llfloatergodtools.h b/indra/newview/llfloatergodtools.h
index 75813ca886..6c4b438808 100644
--- a/indra/newview/llfloatergodtools.h
+++ b/indra/newview/llfloatergodtools.h
@@ -57,12 +57,11 @@ class LLTextBox;
class LLMessageSystem;
class LLFloaterGodTools
-: public LLFloater
+ : public LLFloater, public LLFloaterSingleton<LLFloaterGodTools>
{
+ friend class LLUISingleton<LLFloaterGodTools, VisibilityPolicy<LLFloater> >;
public:
- static LLFloaterGodTools* instance();
-
enum EGodPanel
{
PANEL_GRID,
@@ -72,9 +71,6 @@ public:
PANEL_COUNT
};
- static void show(void *);
- static void hide(void *);
-
static void* createPanelGrid(void *userdata);
static void* createPanelRegion(void *userdata);
static void* createPanelObjects(void *userdata);
@@ -84,6 +80,7 @@ public:
void showPanel(const std::string& panel_name);
+ virtual void onOpen(const LLSD& key);
virtual void onClose(bool app_quitting);
virtual void draw();
@@ -101,21 +98,17 @@ public:
// Send possibly changed values to simulator.
void sendGodUpdateRegionInfo();
- static void onTabChanged(void *data, bool from_click);
-
protected:
U32 computeRegionFlags() const;
protected:
- LLFloaterGodTools();
+ LLFloaterGodTools(const LLSD& key);
~LLFloaterGodTools();
-
+ /*virtual*/ BOOL postBuild();
// When the floater is going away, reset any options that need to be
// cleared.
void resetToolState();
- static LLFloaterGodTools* sInstance;
-
public:
LLPanelRegionTools *mPanelRegionTools;
LLPanelObjectTools *mPanelObjectTools;
@@ -133,7 +126,7 @@ class LLPanelRegionTools
: public LLPanel
{
public:
- LLPanelRegionTools(const std::string& name);
+ LLPanelRegionTools();
/*virtual*/ ~LLPanelRegionTools();
BOOL postBuild();
@@ -194,7 +187,7 @@ class LLPanelGridTools
: public LLPanel
{
public:
- LLPanelGridTools(const std::string& name);
+ LLPanelGridTools();
virtual ~LLPanelGridTools();
BOOL postBuild();
@@ -221,7 +214,7 @@ class LLPanelObjectTools
: public LLPanel
{
public:
- LLPanelObjectTools(const std::string& name);
+ LLPanelObjectTools();
/*virtual*/ ~LLPanelObjectTools();
BOOL postBuild();
@@ -262,7 +255,7 @@ protected:
class LLPanelRequestTools : public LLPanel
{
public:
- LLPanelRequestTools(const std::string& name);
+ LLPanelRequestTools();
/*virtual*/ ~LLPanelRequestTools();
BOOL postBuild();
diff --git a/indra/newview/llfloatergroupinvite.cpp b/indra/newview/llfloatergroupinvite.cpp
index 08a6269a04..e8a0973ced 100644
--- a/indra/newview/llfloatergroupinvite.cpp
+++ b/indra/newview/llfloatergroupinvite.cpp
@@ -34,9 +34,8 @@
#include "llfloatergroupinvite.h"
#include "llpanelgroupinvite.h"
-
-const char FLOATER_TITLE[] = "Group Invitation";
-const LLRect FGI_RECT(0, 380, 210, 0);
+#include "lltrans.h"
+#include "lldraghandle.h"
class LLFloaterGroupInvite::impl
{
@@ -73,25 +72,26 @@ void LLFloaterGroupInvite::impl::closeFloater(void* data)
{
LLFloaterGroupInvite* floaterp = (LLFloaterGroupInvite*) data;
- if ( floaterp ) floaterp->close();
+ if ( floaterp ) floaterp->closeFloater();
}
//-----------------------------------------------------------------------------
// Implementation
//-----------------------------------------------------------------------------
-LLFloaterGroupInvite::LLFloaterGroupInvite(const std::string& name,
- const LLRect &rect,
- const std::string& title,
- const LLUUID& group_id)
-: LLFloater(name, rect, title)
+LLFloaterGroupInvite::LLFloaterGroupInvite(const LLUUID& group_id)
+: LLFloater()
{
- LLRect contents(getRect());
- contents.mTop -= LLFLOATER_HEADER_SIZE;
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+ LLRect contents;
mImpl = new impl(group_id);
- mImpl->mInvitePanelp = new LLPanelGroupInvite("Group Invite Panel",
- group_id);
+ mImpl->mInvitePanelp = new LLPanelGroupInvite(group_id);
+
+ contents = mImpl->mInvitePanelp->getRect();
+ contents.mTop -= floater_header_size;
+
+ setTitle (LLTrans::getString("GroupInvitation"));
mImpl->mInvitePanelp->setCloseCallback(impl::closeFloater, this);
@@ -114,6 +114,9 @@ LLFloaterGroupInvite::~LLFloaterGroupInvite()
// static
void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUUID> *agent_ids)
{
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+ LLRect contents;
+
// Make sure group_id isn't null
if (group_id.isNull())
{
@@ -127,10 +130,12 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
(LLFloaterGroupInvite*)NULL);
if (!fgi)
{
- fgi = new LLFloaterGroupInvite("groupinfo",
- FGI_RECT,
- FLOATER_TITLE,
- group_id);
+ fgi = new LLFloaterGroupInvite(group_id);
+ contents = fgi->mImpl->mInvitePanelp->getRect();
+ contents.mTop += floater_header_size;
+ fgi->setRect(contents);
+ fgi->getDragHandle()->setRect(contents);
+ fgi->getDragHandle()->setTitle(LLTrans::getString("GroupInvitation"));
impl::sInstances[group_id] = fgi;
@@ -143,6 +148,6 @@ void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUU
}
fgi->center();
- fgi->open(); /*Flawfinder: ignore*/
+ fgi->openFloater();
fgi->mImpl->mInvitePanelp->update();
}
diff --git a/indra/newview/llfloatergroupinvite.h b/indra/newview/llfloatergroupinvite.h
index d1485ead91..b3f5d75ac1 100644
--- a/indra/newview/llfloatergroupinvite.h
+++ b/indra/newview/llfloatergroupinvite.h
@@ -46,10 +46,7 @@ public:
static void showForGroup(const LLUUID &group_id, std::vector<LLUUID> *agent_ids = NULL);
protected:
- LLFloaterGroupInvite(const std::string& name,
- const LLRect &rect,
- const std::string& title,
- const LLUUID& group_id = LLUUID::null);
+ LLFloaterGroupInvite(const LLUUID& group_id = LLUUID::null);
class impl;
impl* mImpl;
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp
index 8cd7297447..011774fa5e 100644
--- a/indra/newview/llfloatergroups.cpp
+++ b/indra/newview/llfloatergroups.cpp
@@ -46,6 +46,7 @@
#include "llagent.h"
#include "llbutton.h"
+#include "llfloaterreg.h"
#include "llfloatergroupinfo.h"
#include "llfloaterdirectory.h"
#include "llfocusmgr.h"
@@ -56,6 +57,7 @@
#include "lluictrlfactory.h"
#include "llviewerwindow.h"
#include "llimview.h"
+#include "lltrans.h"
// static
std::map<const LLUUID, LLFloaterGroupPicker*> LLFloaterGroupPicker::sInstances;
@@ -82,17 +84,16 @@ LLFloaterGroupPicker* LLFloaterGroupPicker::findInstance(const LLSD& seed)
LLFloaterGroupPicker* LLFloaterGroupPicker::createInstance(const LLSD &seed)
{
LLFloaterGroupPicker* pickerp = new LLFloaterGroupPicker(seed);
- LLUICtrlFactory::getInstance()->buildFloater(pickerp, "floater_choose_group.xml");
return pickerp;
}
-LLFloaterGroupPicker::LLFloaterGroupPicker(const LLSD& seed) :
- mSelectCallback(NULL),
- mCallbackUserdata(NULL),
+LLFloaterGroupPicker::LLFloaterGroupPicker(const LLSD& seed)
+: LLFloater(),
mPowersMask(GP_ALL_POWERS)
{
mID = seed.asUUID();
sInstances.insert(std::make_pair(mID, this));
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_choose_group.xml");
}
LLFloaterGroupPicker::~LLFloaterGroupPicker()
@@ -100,13 +101,6 @@ LLFloaterGroupPicker::~LLFloaterGroupPicker()
sInstances.erase(mID);
}
-void LLFloaterGroupPicker::setSelectCallback(void (*callback)(LLUUID, void*),
- void* userdata)
-{
- mSelectCallback = callback;
- mCallbackUserdata = userdata;
-}
-
void LLFloaterGroupPicker::setPowersMask(U64 powers_mask)
{
mPowersMask = powers_mask;
@@ -124,8 +118,7 @@ BOOL LLFloaterGroupPicker::postBuild()
setDefaultBtn("OK");
- childSetDoubleClickCallback("group list", onBtnOK);
- childSetUserData("group list", this);
+ getChild<LLScrollListCtrl>("group list")->setDoubleClickCallback(onBtnOK, this);
childEnable("OK");
@@ -141,7 +134,7 @@ void LLFloaterGroupPicker::onBtnOK(void* userdata)
void LLFloaterGroupPicker::onBtnCancel(void* userdata)
{
LLFloaterGroupPicker* self = (LLFloaterGroupPicker*)userdata;
- if(self) self->close();
+ if(self) self->closeFloater();
}
@@ -153,12 +146,9 @@ void LLFloaterGroupPicker::ok()
{
group_id = group_list->getCurrentID();
}
- if(mSelectCallback)
- {
- mSelectCallback(group_id, mCallbackUserdata);
- }
+ mGroupSelectSignal(group_id);
- close();
+ closeFloater();
}
///----------------------------------------------------------------------------
@@ -227,8 +217,7 @@ BOOL LLPanelGroups::postBuild()
setDefaultBtn("IM");
- childSetDoubleClickCallback("group list", onBtnIM);
- childSetUserData("group list", this);
+ getChild<LLScrollListCtrl>("group list")->setDoubleClickCallback(onBtnIM, this);
reset();
@@ -357,7 +346,6 @@ void LLPanelGroups::startIM()
LLGroupData group_data;
if (gAgent.getGroupData(group_id, group_data))
{
- gIMMgr->setFloaterOpen(TRUE);
gIMMgr->addSession(
group_data.mName,
IM_SESSION_GROUP_START,
@@ -400,7 +388,7 @@ void LLPanelGroups::leave()
void LLPanelGroups::search()
{
- LLFloaterDirectory::showGroups();
+ LLFloaterReg::showInstance("search", LLSD().insert("panel", "group"));
}
// static
@@ -454,7 +442,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
element["columns"][0]["column"] = "name";
element["columns"][0]["value"] = group_datap->mName;
element["columns"][0]["font"] = "SANSSERIF";
- element["columns"][0]["font-style"] = style;
+ element["columns"][0]["font"]["style"] = style;
group_list->addElement(element, ADD_SORTED);
}
@@ -470,9 +458,9 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
LLSD element;
element["id"] = LLUUID::null;
element["columns"][0]["column"] = "name";
- element["columns"][0]["value"] = "none"; // *TODO: Translate
+ element["columns"][0]["value"] = LLTrans::getString("GroupsNone");
element["columns"][0]["font"] = "SANSSERIF";
- element["columns"][0]["font-style"] = style;
+ element["columns"][0]["font"]["style"] = style;
group_list->addElement(element, ADD_TOP);
}
diff --git a/indra/newview/llfloatergroups.h b/indra/newview/llfloatergroups.h
index da1c4e23dd..b30d40581f 100644
--- a/indra/newview/llfloatergroups.h
+++ b/indra/newview/llfloatergroups.h
@@ -47,6 +47,8 @@
#include "lluuid.h"
#include "llfloater.h"
#include <map>
+#include <boost/function.hpp>
+#include <boost/signal.hpp>
class LLUICtrl;
class LLTextBox;
@@ -59,8 +61,10 @@ class LLFloaterGroupPicker : public LLFloater, public LLUIFactory<LLFloaterGroup
friend class LLUIFactory<LLFloaterGroupPicker>;
public:
~LLFloaterGroupPicker();
- void setSelectCallback( void (*callback)(LLUUID, void*),
- void* userdata);
+
+ // Note: Don't return connection; use boost::bind + boost::signal::trackable to disconnect slots
+ typedef boost::signal<void (LLUUID id)> signal_t;
+ void setSelectGroupCallback(const signal_t::slot_type& cb) { mGroupSelectSignal.connect(cb); }
void setPowersMask(U64 powers_mask);
BOOL postBuild();
@@ -77,8 +81,7 @@ protected:
protected:
LLUUID mID;
U64 mPowersMask;
- void (*mSelectCallback)(LLUUID id, void* userdata);
- void* mCallbackUserdata;
+ signal_t mGroupSelectSignal;
typedef std::map<const LLUUID, LLFloaterGroupPicker*> instance_map_t;
static instance_map_t sInstances;
diff --git a/indra/newview/llfloaterhandler.cpp b/indra/newview/llfloaterhandler.cpp
index f4c7e43a7d..f229d30488 100644
--- a/indra/newview/llfloaterhandler.cpp
+++ b/indra/newview/llfloaterhandler.cpp
@@ -70,7 +70,7 @@ bool LLFloaterHandler::handle(const LLSD ¶ms, const LLSD &query_map, LLWebBr
{
if (floater)
{
- floater->close();
+ floater->closeFloater();
return true;
}
}
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
index 7886e394a3..38915ebff9 100644
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ b/indra/newview/llfloaterhardwaresettings.cpp
@@ -33,27 +33,28 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaterhardwaresettings.h"
+
+// Viewer includes
#include "llfloaterpreference.h"
#include "llviewerwindow.h"
#include "llviewercontrol.h"
#include "llviewerimagelist.h"
#include "llfeaturemanager.h"
#include "llstartup.h"
+#include "pipeline.h"
+// Linden library includes
#include "llradiogroup.h"
#include "lluictrlfactory.h"
-
+#include "llwindow.h"
#include "llimagegl.h"
-#include "pipeline.h"
LLFloaterHardwareSettings* LLFloaterHardwareSettings::sHardwareSettings = NULL;
-LLFloaterHardwareSettings::LLFloaterHardwareSettings() : LLFloater(std::string("Hardware Settings Floater"))
+LLFloaterHardwareSettings::LLFloaterHardwareSettings()
+ : LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hardware_settings.xml");
-
- // load it up
- initCallbacks();
}
LLFloaterHardwareSettings::~LLFloaterHardwareSettings()
@@ -114,7 +115,7 @@ LLFloaterHardwareSettings* LLFloaterHardwareSettings::instance()
if (!sHardwareSettings)
{
sHardwareSettings = new LLFloaterHardwareSettings();
- sHardwareSettings->close();
+ sHardwareSettings->closeFloater();
}
return sHardwareSettings;
}
@@ -128,7 +129,7 @@ void LLFloaterHardwareSettings::show()
//LLUICtrlFactory::getInstance()->buildFloater(hardSettings, "floater_hardware_settings.xml");
//hardSettings->initCallbacks();
- hardSettings->open();
+ hardSettings->openFloater();
}
bool LLFloaterHardwareSettings::isOpen()
@@ -158,6 +159,8 @@ BOOL LLFloaterHardwareSettings::postBuild()
refresh();
+ // load it up
+ initCallbacks();
return TRUE;
}
@@ -203,7 +206,7 @@ void LLFloaterHardwareSettings::cancel()
gSavedSettings.setF32("RenderFogRatio", mFogRatio);
gSavedSettings.setBOOL("ProbeHardwareOnStartup", mProbeHardwareOnStartup );
- close();
+ closeFloater();
}
// static
@@ -211,6 +214,6 @@ void LLFloaterHardwareSettings::onBtnOK( void* userdata )
{
LLFloaterHardwareSettings *fp =(LLFloaterHardwareSettings *)userdata;
fp->apply();
- fp->close(false);
+ fp->closeFloater(false);
}
diff --git a/indra/newview/llfloaterhardwaresettings.h b/indra/newview/llfloaterhardwaresettings.h
index 04a33f69dc..70344c11d1 100644
--- a/indra/newview/llfloaterhardwaresettings.h
+++ b/indra/newview/llfloaterhardwaresettings.h
@@ -40,14 +40,14 @@ class LLSliderCtrl;
/// Menuing system for all of windlight's functionality
class LLFloaterHardwareSettings : public LLFloater
{
- friend class LLPreferenceCore;
+ friend class LLFloaterPreference;
public:
LLFloaterHardwareSettings();
- virtual ~LLFloaterHardwareSettings();
+ /*virtual*/ ~LLFloaterHardwareSettings();
- virtual BOOL postBuild();
+ /*virtual*/ BOOL postBuild();
/// initialize all the callbacks for the menu
void initCallbacks(void);
diff --git a/indra/newview/llfloaterhud.cpp b/indra/newview/llfloaterhud.cpp
index 9810bf1009..4379d25a66 100644
--- a/indra/newview/llfloaterhud.cpp
+++ b/indra/newview/llfloaterhud.cpp
@@ -52,7 +52,7 @@ LLFloaterHUD* LLFloaterHUD::sInstance = 0;
// Default constructor
LLFloaterHUD::LLFloaterHUD()
-: LLFloater(std::string("floater_hud")),
+: LLFloater(),
mWebBrowser(0)
{
// Create floater from its XML definition
@@ -69,11 +69,6 @@ LLFloaterHUD::LLFloaterHUD()
// Opaque background since we never get the focus
setBackgroundOpaque(TRUE);
- // Position floater based on saved location
- LLRect saved_position_rect = gSavedSettings.getRect("FloaterHUDRect2");
- reshape(saved_position_rect.getWidth(), saved_position_rect.getHeight(), FALSE);
- setRect(saved_position_rect);
-
mWebBrowser = getChild<LLWebBrowserCtrl>("floater_hud_browser" );
if (mWebBrowser)
{
@@ -91,9 +86,6 @@ LLFloaterHUD::LLFloaterHUD()
std::string url = base_url + language + "/";
mWebBrowser->navigateTo(url);
}
-
- // Remember the one instance
- sInstance = this;
}
// Get the instance
@@ -101,7 +93,7 @@ LLFloaterHUD* LLFloaterHUD::getInstance()
{
if (!sInstance)
{
- new LLFloaterHUD();
+ sInstance = new LLFloaterHUD();
}
return sInstance;
}
@@ -109,9 +101,6 @@ LLFloaterHUD* LLFloaterHUD::getInstance()
// Destructor
LLFloaterHUD::~LLFloaterHUD()
{
- // Save floater position
- gSavedSettings.setRect("FloaterHUDRect2", getRect() );
-
// Clear out the one instance if it's ours
if (sInstance == this)
{
@@ -131,7 +120,7 @@ void LLFloaterHUD::showHUD()
// Create the instance if necessary
LLFloaterHUD* hud = getInstance();
- hud->open();
+ hud->openFloater();
hud->setFrontmost(FALSE);
}
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
index de8a094fa9..14d664ff9d 100644
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@@ -31,11 +31,15 @@
*/
#include "llviewerprecompiledheaders.h"
-#include "llfloateravatarinfo.h"
+
#include "llfloaterinspect.h"
+
+#include "llfloaterreg.h"
+#include "llfloateravatarinfo.h"
#include "llfloatertools.h"
#include "llcachename.h"
#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
#include "llselectmgr.h"
#include "lltoolcomp.h"
#include "lltoolmgr.h"
@@ -45,17 +49,16 @@
LLFloaterInspect* LLFloaterInspect::sInstance = NULL;
-LLFloaterInspect::LLFloaterInspect(void) :
- LLFloater(std::string("Inspect Object")),
+LLFloaterInspect::LLFloaterInspect(void)
+ : LLFloater(),
mDirty(FALSE)
{
- sInstance = this;
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_inspect.xml");
}
LLFloaterInspect::~LLFloaterInspect(void)
{
- if(!gFloaterTools->getVisible())
+ if(!LLFloaterReg::instanceVisible("build"))
{
if(LLToolMgr::getInstance()->getBaseTool() == LLToolCompInspect::getInstance())
{
@@ -66,7 +69,7 @@ LLFloaterInspect::~LLFloaterInspect(void)
}
else
{
- gFloaterTools->setFocus(TRUE);
+ LLFloaterReg::showInstance("build", LLSD(), TRUE);
}
sInstance = NULL;
}
@@ -88,7 +91,7 @@ void LLFloaterInspect::show(void* ignored)
sInstance = new LLFloaterInspect;
}
- sInstance->open();
+ sInstance->openFloater();
LLToolMgr::getInstance()->setTransientTool(LLToolCompInspect::getInstance());
LLSelectMgr::getInstance()->setForceSelection(forcesel); // restore previouis value
@@ -156,7 +159,7 @@ BOOL LLFloaterInspect::postBuild()
mObjectList = getChild<LLScrollListCtrl>("object_list");
childSetAction("button owner",onClickOwnerProfile, this);
childSetAction("button creator",onClickCreatorProfile, this);
- childSetCommitCallback("object_list", onSelectObject);
+ childSetCommitCallback("object_list", onSelectObject, NULL);
return TRUE;
}
@@ -212,7 +215,6 @@ void LLFloaterInspect::refresh()
{
LLSelectNode* obj = *iter;
LLSD row;
- char time[MAX_STRING];
std::string owner_name, creator_name;
if (obj->mCreationDate == 0)
@@ -221,8 +223,11 @@ void LLFloaterInspect::refresh()
}
time_t timestamp = (time_t) (obj->mCreationDate/1000000);
- LLStringUtil::copy(time, ctime(×tamp), MAX_STRING);
- time[24] = '\0';
+ std::string timeStr = getString("timeStamp");
+ LLSD substitution;
+ substitution["datetime"] = (S32) timestamp;
+ LLStringUtil::format (timeStr, substitution);
+
gCacheName->getFullName(obj->mPermissions->getOwner(), owner_name);
gCacheName->getFullName(obj->mPermissions->getCreator(), creator_name);
row["id"] = obj->getObject()->getID();
@@ -246,7 +251,7 @@ void LLFloaterInspect::refresh()
row["columns"][2]["value"] = creator_name;
row["columns"][3]["column"] = "creation_date";
row["columns"][3]["type"] = "text";
- row["columns"][3]["value"] = time;
+ row["columns"][3]["value"] = timeStr;
mObjectList->addElement(row, ADD_TOP);
}
if(selected_index > -1 && mObjectList->getItemIndex(selected_uuid) == selected_index)
diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp
index e5811671ed..c73218cd0f 100644
--- a/indra/newview/llfloaterjoystick.cpp
+++ b/indra/newview/llfloaterjoystick.cpp
@@ -48,10 +48,10 @@
#include "llcheckboxctrl.h"
LLFloaterJoystick::LLFloaterJoystick(const LLSD& data)
- : LLFloater("floater_joystick")
+ : LLFloater()
{
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_joystick.xml");
- center();
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_joystick.xml");
+
}
void LLFloaterJoystick::draw()
@@ -68,14 +68,15 @@ void LLFloaterJoystick::draw()
{
F32 value = joystick->getJoystickAxis(i);
mAxisStats[i]->addValue(value * gFrameIntervalSeconds);
-
- if (mAxisStatsBar[i]->mMinBar > value)
- {
- mAxisStatsBar[i]->mMinBar = value;
- }
- if (mAxisStatsBar[i]->mMaxBar < value)
+ if (mAxisStatsBar[i])
{
- mAxisStatsBar[i]->mMaxBar = value;
+ F32 minbar, maxbar;
+ mAxisStatsBar[i]->getRange(minbar, maxbar);
+ if (llabs(value) > maxbar)
+ {
+ F32 range = llabs(value);
+ mAxisStatsBar[i]->setRange(-range, range, range * 0.25f, range * 0.5f);
+ }
}
}
@@ -84,37 +85,20 @@ void LLFloaterJoystick::draw()
BOOL LLFloaterJoystick::postBuild()
{
- F32 range = gSavedSettings.getBOOL("Cursor3D") ? 1024.f : 2.f;
- LLUIString axis = getString("Axis");
- LLUIString joystick = getString("JoystickMonitor");
-
- // use this child to get relative positioning info; we'll place the
- // joystick monitor on its right, vertically aligned to it.
- LLView* child = getChild<LLView>("FlycamAxisScale1");
- LLRect rect;
-
- if (child)
- {
- LLRect r = child->getRect();
- LLRect f = getRect();
- rect = LLRect(350, r.mTop, r.mRight + 200, 0);
- }
-
- mAxisStatsView = new LLStatView("axis values", joystick, "", rect);
- mAxisStatsView->setDisplayChildren(TRUE);
+ center();
+ F32 range = gSavedSettings.getBOOL("Cursor3D") ? 128.f : 2.f;
for (U32 i = 0; i < 6; i++)
{
- axis.setArg("[NUM]", llformat("%d", i));
mAxisStats[i] = new LLStat(4);
- mAxisStatsBar[i] = mAxisStatsView->addStat(axis, mAxisStats[i]);
- mAxisStatsBar[i]->mMinBar = -range;
- mAxisStatsBar[i]->mMaxBar = range;
- mAxisStatsBar[i]->mLabelSpacing = range * 0.5f;
- mAxisStatsBar[i]->mTickSpacing = range * 0.25f;
+ std::string axisname = llformat("axis%d", i);
+ mAxisStatsBar[i] = getChild<LLStatBar>(axisname);
+ if (mAxisStatsBar[i])
+ {
+ mAxisStatsBar[i]->setStat(mAxisStats[i]);
+ mAxisStatsBar[i]->setRange(-range, range, range * 0.25f, range * 0.5f);
+ }
}
-
- addChild(mAxisStatsView);
mCheckJoystickEnabled = getChild<LLCheckBoxCtrl>("enable_joystick");
childSetCommitCallback("enable_joystick",onCommitJoystickEnabled,this);
@@ -310,7 +294,7 @@ void LLFloaterJoystick::onClickCancel(void *joy_panel)
if (self)
{
self->cancel();
- self->close();
+ self->closeFloater();
}
}
}
@@ -323,7 +307,7 @@ void LLFloaterJoystick::onClickOK(void *joy_panel)
if (self)
{
- self->close();
+ self->closeFloater();
}
}
}
diff --git a/indra/newview/llfloaterjoystick.h b/indra/newview/llfloaterjoystick.h
index 3ce647e5bb..9c66b3a895 100644
--- a/indra/newview/llfloaterjoystick.h
+++ b/indra/newview/llfloaterjoystick.h
@@ -84,9 +84,8 @@ private:
LLCheckBoxCtrl *mCheckFlycamEnabled;
// stats view
- LLStatView* mAxisStatsView;
- LLStat* mAxisStats[6];
- LLStatBar* mAxisStatsBar[6];
+ LLStat* mAxisStats[6];
+ LLStatBar* mAxisStatsBar[6];
};
#endif
diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp
index 91471ca2d0..5d6c06f1a6 100644
--- a/indra/newview/llfloaterlagmeter.cpp
+++ b/indra/newview/llfloaterlagmeter.cpp
@@ -51,7 +51,7 @@ const std::string LAG_WARNING_IMAGE_NAME = "lag_status_warning.tga";
const std::string LAG_GOOD_IMAGE_NAME = "lag_status_good.tga";
LLFloaterLagMeter::LLFloaterLagMeter(const LLSD& key)
- : LLFloater(std::string("floater_lagmeter"))
+ : LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_lagmeter.xml");
@@ -59,6 +59,15 @@ LLFloaterLagMeter::LLFloaterLagMeter(const LLSD& key)
// lose arrow-key driving when testing lag.
setIsChrome(TRUE);
+ // were we shrunk last time?
+ if (gSavedSettings.getBOOL("LagMeterShrunk"))
+ {
+ onClickShrink(this);
+ }
+}
+
+BOOL LLFloaterLagMeter::postBuild()
+{
mClientButton = getChild<LLButton>("client_lagmeter");
mClientText = getChild<LLTextBox>("client_text");
mClientCause = getChild<LLTextBox>("client_lag_cause");
@@ -113,13 +122,8 @@ LLFloaterLagMeter::LLFloaterLagMeter(const LLSD& key)
childSetAction("minimize", onClickShrink, this);
- // were we shrunk last time?
- if (gSavedSettings.getBOOL("LagMeterShrunk"))
- {
- onClickShrink(this);
- }
+ return TRUE;
}
-
LLFloaterLagMeter::~LLFloaterLagMeter()
{
// save shrunk status for next time
diff --git a/indra/newview/llfloaterlagmeter.h b/indra/newview/llfloaterlagmeter.h
index d9cea18305..e8af68ac7a 100644
--- a/indra/newview/llfloaterlagmeter.h
+++ b/indra/newview/llfloaterlagmeter.h
@@ -35,13 +35,15 @@
#include "llfloater.h"
+class LLTextBox;
+
class LLFloaterLagMeter : public LLFloater, public LLFloaterSingleton<LLFloaterLagMeter>
{
friend class LLUISingleton<LLFloaterLagMeter, VisibilityPolicy<LLFloater> >;
public:
/*virtual*/ void draw();
-
+ /*virtual*/ BOOL postBuild();
private:
LLFloaterLagMeter(const LLSD& key);
/*virtual*/ ~LLFloaterLagMeter();
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 94a834502f..1de656144f 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -59,6 +59,8 @@
#include "llpanellandmedia.h"
#include "llradiogroup.h"
#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
#include "llselectmgr.h"
#include "llspinctrl.h"
#include "lltabcontainer.h"
@@ -75,6 +77,7 @@
#include "llviewerwindow.h"
#include "llviewercontrol.h"
#include "roles_constants.h"
+#include "lltrans.h"
static std::string OWNER_ONLINE = "0";
static std::string OWNER_OFFLINE = "1";
@@ -161,7 +164,7 @@ void LLFloaterLand::refreshAll()
LLFloaterLand::getInstance()->refresh();
}
-void LLFloaterLand::onOpen()
+void LLFloaterLand::onOpen(const LLSD& key)
{
// Done automatically when the selected parcel's properties arrive
// (and hence we have the local id).
@@ -193,19 +196,16 @@ void LLFloaterLand::onClose(bool app_quitting)
LLFloaterLand::LLFloaterLand(const LLSD& seed)
-: LLFloater(std::string("floaterland"), std::string("FloaterLandRect5"), std::string("About Land"))
+: LLFloater()
{
- LLCallbackMap::map_t factory_map;
- factory_map["land_general_panel"] = LLCallbackMap(createPanelLandGeneral, this);
+ mFactoryMap["land_general_panel"] = LLCallbackMap(createPanelLandGeneral, this);
+ mFactoryMap["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this);
+ mFactoryMap["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this);
+ mFactoryMap["land_options_panel"] = LLCallbackMap(createPanelLandOptions, this);
+ mFactoryMap["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this);
+ mFactoryMap["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this);
-
- factory_map["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this);
- factory_map["land_objects_panel"] = LLCallbackMap(createPanelLandObjects, this);
- factory_map["land_options_panel"] = LLCallbackMap(createPanelLandOptions, this);
- factory_map["land_media_panel"] = LLCallbackMap(createPanelLandMedia, this);
- factory_map["land_access_panel"] = LLCallbackMap(createPanelLandAccess, this);
-
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_about_land.xml", &factory_map, false);
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_about_land.xml", false);
sObserver = new LLParcelSelectionObserver();
LLViewerParcelMgr::getInstance()->addObserver( sObserver );
@@ -297,7 +297,7 @@ void* LLFloaterLand::createPanelLandAccess(void* data)
LLPanelLandGeneral::LLPanelLandGeneral(LLParcelSelectionHandle& parcel)
-: LLPanel(std::string("land_general_panel")),
+: LLPanel(),
mUncheckedSell(FALSE),
mParcel(parcel)
{
@@ -306,15 +306,13 @@ LLPanelLandGeneral::LLPanelLandGeneral(LLParcelSelectionHandle& parcel)
BOOL LLPanelLandGeneral::postBuild()
{
mEditName = getChild<LLLineEditor>("Name");
- mEditName->setCommitCallback(onCommitAny);
+ mEditName->setCommitCallback(onCommitAny, this);
childSetPrevalidate("Name", LLLineEditor::prevalidatePrintableNotPipe);
- childSetUserData("Name", this);
mEditDesc = getChild<LLTextEditor>("Description");
mEditDesc->setCommitOnFocusLost(TRUE);
- mEditDesc->setCommitCallback(onCommitAny);
+ mEditDesc->setCommitCallback(onCommitAny, this);
childSetPrevalidate("Description", LLLineEditor::prevalidatePrintableNotPipe);
- childSetUserData("Description", this);
mTextSalePending = getChild<LLTextBox>("SalePending");
@@ -333,7 +331,7 @@ BOOL LLPanelLandGeneral::postBuild()
mBtnSetGroup = getChild<LLButton>("Set...");
- mBtnSetGroup->setClickedCallback(onClickSetGroup, this);
+ mBtnSetGroup->setCommitCallback(boost::bind(&LLPanelLandGeneral::onClickSetGroup, this));
mCheckDeedToGroup = getChild<LLCheckBoxCtrl>( "check deed");
@@ -396,7 +394,7 @@ BOOL LLPanelLandGeneral::postBuild()
mBtnReclaimLand->setClickedCallback(onClickReclaim, NULL);
mBtnStartAuction = getChild<LLButton>("Linden Sale...");
- mBtnStartAuction->setClickedCallback(onClickStartAuction, NULL);
+ mBtnStartAuction->setClickedCallback(onClickStartAuction, this);
return TRUE;
}
@@ -754,16 +752,14 @@ void LLPanelLandGeneral::draw()
LLPanel::draw();
}
-// static
-void LLPanelLandGeneral::onClickSetGroup(void* userdata)
+void LLPanelLandGeneral::onClickSetGroup()
{
- LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)userdata;
LLFloaterGroupPicker* fg;
- LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
+ LLFloater* parent_floater = gFloaterView->getParentFloater(this);
fg = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
- fg->setSelectCallback( cbGroupID, userdata );
+ fg->setSelectGroupCallback( boost::bind(&LLPanelLandGeneral::setGroup, this, _1 ));
if (parent_floater)
{
@@ -792,13 +788,6 @@ void LLPanelLandGeneral::onClickProfile(void* data)
}
}
-// static
-void LLPanelLandGeneral::cbGroupID(LLUUID group_id, void* userdata)
-{
- LLPanelLandGeneral* self = (LLPanelLandGeneral*)userdata;
- self->setGroup(group_id);
-}
-
// public
void LLPanelLandGeneral::setGroup(const LLUUID& group_id)
{
@@ -900,7 +889,7 @@ void LLPanelLandGeneral::onClickStartAuction(void* data)
}
else
{
- LLFloaterAuction::show();
+ LLFloaterAuction::showInstance();
}
}
}
@@ -974,7 +963,8 @@ void LLPanelLandGeneral::onClickStopSellLand(void* data)
// LLPanelLandObjects
//---------------------------------------------------------------------------
LLPanelLandObjects::LLPanelLandObjects(LLParcelSelectionHandle& parcel)
-: LLPanel(std::string("land_objects_panel")), mParcel(parcel)
+ : LLPanel(),
+ mParcel(parcel)
{
}
@@ -1014,10 +1004,8 @@ BOOL LLPanelLandObjects::postBuild()
mCleanOtherObjectsTime = getChild<LLLineEditor>("clean other time");
mCleanOtherObjectsTime->setFocusLostCallback(onLostFocus, this);
- mCleanOtherObjectsTime->setCommitCallback(onCommitClean);
-
+ mCleanOtherObjectsTime->setCommitCallback(onCommitClean, this);
childSetPrevalidate("clean other time", LLLineEditor::prevalidateNonNegativeS32);
- childSetUserData("clean other time", this);
mBtnRefresh = getChild<LLButton>("Refresh List");
mBtnRefresh->setClickedCallback(onClickRefresh, this);
@@ -1032,7 +1020,7 @@ BOOL LLPanelLandObjects::postBuild()
mOwnerList = getChild<LLNameListCtrl>("owner list");
mOwnerList->sortByColumnIndex(3, FALSE);
childSetCommitCallback("owner list", onCommitList, this);
- mOwnerList->setDoubleClickCallback(onDoubleClickOwner);
+ mOwnerList->setDoubleClickCallback(onDoubleClickOwner, this);
return TRUE;
}
@@ -1406,7 +1394,7 @@ void LLPanelLandObjects::onClickRefresh(void* userdata)
// ready the list for results
self->mOwnerList->deleteAllItems();
- self->mOwnerList->addCommentText(std::string("Searching...")); // *TODO: Translate
+ self->mOwnerList->setCommentText(LLTrans::getString("Searching"));
self->mOwnerList->setEnabled(FALSE);
self->mFirstReply = TRUE;
@@ -1468,39 +1456,34 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
continue;
}
- LLScrollListItem *row = new LLScrollListItem( TRUE, NULL, owner_id);
+ LLNameListCtrl::NameItem item_params;
+ item_params.value = owner_id;
+ item_params.target = is_group_owned ? LLNameListCtrl::GROUP : LLNameListCtrl::INDIVIDUAL;
+
if (is_group_owned)
{
- row->addColumn(self->mIconGroup);
- row->addColumn(OWNER_GROUP, FONT);
+ item_params.cells.add().type("icon").value(self->mIconGroup->getName());
+ item_params.cells.add().value(OWNER_GROUP).font(FONT);
}
else if (is_online)
{
- row->addColumn(self->mIconAvatarOnline);
- row->addColumn(OWNER_ONLINE, FONT);
+ item_params.cells.add().type("icon").value(self->mIconAvatarOnline->getName());
+ item_params.cells.add().value(OWNER_ONLINE).font(FONT);
}
else // offline
{
- row->addColumn(self->mIconAvatarOffline);
- row->addColumn(OWNER_OFFLINE, FONT);
+ item_params.cells.add().type("icon").value(self->mIconAvatarOffline->getName());
+ item_params.cells.add().value(OWNER_OFFLINE).font(FONT);
}
+
// Placeholder for name.
- row->addColumn(LLStringUtil::null, FONT);
+ item_params.cells.add().font(FONT);
object_count_str = llformat("%d", object_count);
- row->addColumn(object_count_str, FONT);
-
- row->addColumn(formatted_time((time_t)most_recent_time), FONT);
-
+ item_params.cells.add().value(object_count_str).font(FONT);
+ item_params.cells.add().value(formatted_time((time_t)most_recent_time)).font(FONT);
- if (is_group_owned)
- {
- self->mOwnerList->addGroupNameItem(row, ADD_BOTTOM);
- }
- else
- {
- self->mOwnerList->addNameItem(row, ADD_BOTTOM);
- }
+ self->mOwnerList->addRow(item_params);
lldebugs << "object owner " << owner_id << " (" << (is_group_owned ? "group" : "agent")
<< ") owns " << object_count << " objects." << llendl;
@@ -1508,7 +1491,7 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
// check for no results
if (0 == self->mOwnerList->getItemCount())
{
- self->mOwnerList->addCommentText(std::string("None found.")); // *TODO: Translate
+ self->mOwnerList->setCommentText(LLTrans::getString("NoneFound"));
}
else
{
@@ -1699,7 +1682,7 @@ void LLPanelLandObjects::onCommitClean(LLUICtrl *caller, void* user_data)
//---------------------------------------------------------------------------
LLPanelLandOptions::LLPanelLandOptions(LLParcelSelectionHandle& parcel)
-: LLPanel(std::string("land_options_panel")),
+: LLPanel(),
mCheckEditObjects(NULL),
mCheckEditGroupObjects(NULL),
mCheckAllObjectEntry(NULL),
@@ -1808,8 +1791,7 @@ BOOL LLPanelLandOptions::postBuild()
mSnapshotCtrl = getChild<LLTextureCtrl>("snapshot_ctrl");
if (mSnapshotCtrl)
{
- mSnapshotCtrl->setCommitCallback( onCommitAny );
- mSnapshotCtrl->setCallbackUserData( this );
+ mSnapshotCtrl->setCommitCallback( onCommitAny, this );
mSnapshotCtrl->setAllowNoTexture ( TRUE );
mSnapshotCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
mSnapshotCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
@@ -2262,7 +2244,8 @@ void LLPanelLandOptions::onClickPublishHelp(void*)
//---------------------------------------------------------------------------
LLPanelLandAccess::LLPanelLandAccess(LLParcelSelectionHandle& parcel)
-: LLPanel(std::string("land_access_panel")), mParcel(parcel)
+ : LLPanel(),
+ mParcel(parcel)
{
}
@@ -2328,7 +2311,6 @@ void LLPanelLandAccess::refresh()
childSetToolTipArg("AccessList", "[LISTED]", llformat("%d",count));
childSetToolTipArg("AccessList", "[MAX]", llformat("%d",PARCEL_MAX_ACCESS_LIST));
- // *TODO: Translate
for (access_map_const_iterator cit = parcel->mAccessList.begin();
cit != parcel->mAccessList.end(); ++cit)
{
@@ -2336,25 +2318,28 @@ void LLPanelLandAccess::refresh()
std::string suffix;
if (entry.mTime != 0)
{
+ LLStringUtil::format_map_t args;
S32 now = time(NULL);
S32 seconds = entry.mTime - now;
if (seconds < 0) seconds = 0;
suffix.assign(" (");
if (seconds >= 120)
{
- std::string buf = llformat("%d minutes", (seconds/60));
+ args["[MINUTES]"] = llformat("%d", (seconds/60));
+ std::string buf = getString ("Minutes", args);
suffix.append(buf);
}
else if (seconds >= 60)
{
- suffix.append("1 minute");
+ suffix.append("1 " + getString("Minute"));
}
else
{
- std::string buf = llformat("%d seconds", seconds);
+ args["[SECONDS]"] = llformat("%d", seconds);
+ std::string buf = getString ("Seconds", args);
suffix.append(buf);
}
- suffix.append(" remaining)");
+ suffix.append(" " + getString("Remaining") + ")");
}
if (mListAccess)
mListAccess->addNameItem(entry.mID, ADD_SORTED, TRUE, suffix);
@@ -2375,25 +2360,28 @@ void LLPanelLandAccess::refresh()
std::string suffix;
if (entry.mTime != 0)
{
+ LLStringUtil::format_map_t args;
S32 now = time(NULL);
S32 seconds = entry.mTime - now;
if (seconds < 0) seconds = 0;
suffix.assign(" (");
if (seconds >= 120)
{
- std::string buf = llformat("%d minutes", (seconds/60));
+ args["[MINUTES]"] = llformat("%d", (seconds/60));
+ std::string buf = getString ("Minutes", args);
suffix.append(buf);
}
else if (seconds >= 60)
{
- suffix.append("1 minute");
+ suffix.append("1 " + getString("Minute"));
}
else
{
- std::string buf = llformat("%d seconds", seconds);
+ args["[SECONDS]"] = llformat("%d", seconds);
+ std::string buf = getString ("Seconds", args);
suffix.append(buf);
}
- suffix.append(" remaining)");
+ suffix.append(" " + getString("Remaining") + ")");
}
mListBanned->addNameItem(entry.mID, ADD_SORTED, TRUE, suffix);
}
@@ -2758,7 +2746,8 @@ void LLPanelLandAccess::onClickRemoveBanned(void* data)
// LLPanelLandCovenant
//---------------------------------------------------------------------------
LLPanelLandCovenant::LLPanelLandCovenant(LLParcelSelectionHandle& parcel)
-: LLPanel(std::string("land_covenant_panel")), mParcel(parcel)
+ : LLPanel(),
+ mParcel(parcel)
{
}
diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h
index 4c3de65d71..74c1205e1f 100644
--- a/indra/newview/llfloaterland.h
+++ b/indra/newview/llfloaterland.h
@@ -38,8 +38,8 @@
#include <vector>
#include "llfloater.h"
-//#include "llviewerimagelist.h"
-#include "llmemory.h" // LLPointer<>
+#include "llpointer.h" // LLPointer<>
+#include "llsafehandle.h"
typedef std::set<LLUUID, lluuid_less> uuid_list_t;
const F32 CACHE_REFRESH_TIME = 2.5f;
@@ -82,7 +82,7 @@ public:
// Destroys itself on close.
virtual void onClose(bool app_quitting);
- virtual void onOpen();
+ virtual void onOpen(const LLSD& key);
virtual BOOL postBuild();
protected:
@@ -138,8 +138,7 @@ public:
void setGroup(const LLUUID& group_id);
static void onClickProfile(void*);
- static void onClickSetGroup(void*);
- static void cbGroupID(LLUUID group_id, void* userdata);
+ void onClickSetGroup();
static BOOL enableDeedToGroup(void*);
static void onClickDeed(void*);
static void onClickBuyLand(void* data);
diff --git a/indra/newview/llfloaterlandholdings.cpp b/indra/newview/llfloaterlandholdings.cpp
index bd1186b151..223cca50b2 100644
--- a/indra/newview/llfloaterlandholdings.cpp
+++ b/indra/newview/llfloaterlandholdings.cpp
@@ -41,13 +41,16 @@
#include "message.h"
#include "llagent.h"
-#include "llbutton.h"
+#include "llfloaterreg.h"
#include "llfloatergroupinfo.h"
#include "llfloaterworldmap.h"
#include "llproductinforequest.h"
#include "llscrolllistctrl.h"
#include "llstatusbar.h"
#include "lltextbox.h"
+#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
#include "lltrans.h"
#include "lluiconstants.h"
#include "llviewermessage.h"
@@ -78,13 +81,13 @@ void LLFloaterLandHoldings::show(void*)
"");
// TODO: request updated L$ balance?
- floater->open(); /* Flawfinder: ignore */
+ floater->openFloater();
}
// protected
LLFloaterLandHoldings::LLFloaterLandHoldings()
-: LLFloater(std::string("land holdings floater")),
+: LLFloater(),
mActualArea(0),
mBillableArea(0),
mFirstPacketReceived(FALSE),
@@ -101,8 +104,7 @@ BOOL LLFloaterLandHoldings::postBuild()
childSetAction("Show on Map", onClickMap, this);
// Grant list
- childSetDoubleClickCallback("grant list", onGrantList);
- childSetUserData("grant list", this);
+ getChild<LLScrollListCtrl>("grant list")->setDoubleClickCallback(onGrantList, this);
LLCtrlListInterface *list = childGetListInterface("grant list");
if (!list) return TRUE;
@@ -295,11 +297,11 @@ void LLFloaterLandHoldings::buttonCore(S32 which)
{
case 0:
gAgent.teleportViaLocation(pos_global);
- gFloaterWorldMap->trackLocation(pos_global);
+ LLFloaterWorldMap::getInstance()->trackLocation(pos_global);
break;
case 1:
- gFloaterWorldMap->trackLocation(pos_global);
- LLFloaterWorldMap::show(NULL, TRUE);
+ LLFloaterWorldMap::getInstance()->trackLocation(pos_global);
+ LLFloaterReg::showInstance("world_map", "center");
break;
default:
break;
@@ -311,7 +313,7 @@ void LLFloaterLandHoldings::onClickTeleport(void* data)
{
LLFloaterLandHoldings* self = (LLFloaterLandHoldings*)data;
self->buttonCore(0);
- self->close();
+ self->closeFloater();
}
diff --git a/indra/newview/llfloatermap.cpp b/indra/newview/llfloatermap.cpp
index 3b1e4c7ac7..6920d45381 100644
--- a/indra/newview/llfloatermap.cpp
+++ b/indra/newview/llfloatermap.cpp
@@ -30,96 +30,188 @@
* $/LicenseInfo$
*/
+#include <string>
#include "llviewerprecompiledheaders.h"
+// self include
#include "llfloatermap.h"
+// Library includes
+#include "llfloaterreg.h"
+#include "llfontgl.h"
+#include "llglheaders.h"
+#include "llmenugl.h"
+
+// Viewer includes
#include "llagent.h"
-#include "llcolorscheme.h"
#include "llviewercontrol.h"
-#include "lldraghandle.h"
#include "llnetmap.h"
-#include "llregionhandle.h"
-#include "llresizebar.h"
-#include "lluictrlfactory.h"
-
-LLFloaterMap::LLFloaterMap(const LLSD& key)
- :
- LLFloater(std::string("minimap")),
- mPanelMap(NULL)
+#include "lltracker.h"
+#include "llviewercamera.h"
+#include "lldraghandle.h"
+#include "lltextbox.h"
+
+//
+// Constants
+//
+const F32 MAP_SCALE_MIN = 64;
+const F32 MAP_SCALE_MID = 172;
+const F32 MAP_SCALE_MAX = 512;
+
+//
+// Member functions
+//
+
+LLFloaterMap::LLFloaterMap(const LLSD& key)
+ : LLFloater(key)
{
- LLCallbackMap::map_t factory_map;
- factory_map["mini_mapview"] = LLCallbackMap(createPanelMiniMap, this);
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_mini_map.xml", &factory_map, FALSE);
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_map.xml", FALSE);
}
-
-// static
-void* LLFloaterMap::createPanelMiniMap(void* data)
+LLFloaterMap::~LLFloaterMap()
{
- LLFloaterMap* self = (LLFloaterMap*)data;
- self->mPanelMap = new LLNetMap("Mapview");
- return self->mPanelMap;
}
BOOL LLFloaterMap::postBuild()
{
- // Send the drag handle to the back, but make sure close stays on top
+ mMap = getChild<LLNetMap>("Net Map");
+ mMap->setScale(gSavedSettings.getF32("MiniMapScale"));
+ mMap->setRotateMap(gSavedSettings.getBOOL( "MiniMapRotate" ));
+ mMap->setToolTipMsg(getString("ToolTipMsg"));
+ sendChildToBack(mMap);
+
+ mTextBoxNorth = getChild<LLTextBox> ("floater_map_north");
+ mTextBoxEast = getChild<LLTextBox> ("floater_map_east");
+ mTextBoxWest = getChild<LLTextBox> ("floater_map_west");
+ mTextBoxSouth = getChild<LLTextBox> ("floater_map_south");
+ mTextBoxSouthEast = getChild<LLTextBox> ("floater_map_southeast");
+ mTextBoxNorthEast = getChild<LLTextBox> ("floater_map_northeast");
+ mTextBoxSouthWest = getChild<LLTextBox> ("floater_map_southwest");
+ mTextBoxNorthWest = getChild<LLTextBox> ("floater_map_northwest");
+
+ LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registrar;
+
+ registrar.add("Minimap.Zoom", boost::bind(&LLFloaterMap::handleZoom, this, _2));
+ registrar.add("Minimap.Tracker", boost::bind(&LLFloaterMap::handleStopTracking, this, _2));
+
+ mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_minimap.xml", this);
+ if (mPopupMenu && !LLTracker::isTracking(0))
+ {
+ mPopupMenu->setItemEnabled ("Stop Tracking", false);
+ }
+
+ // Get the drag handle all the way in back
sendChildToBack(getDragHandle());
- sendChildToFront(getChild<LLButton>("llfloater_close_btn"));
+
setIsChrome(TRUE);
+
+ // keep onscreen
+ gFloaterView->adjustToFitScreen(this, FALSE);
+
return TRUE;
}
-
-LLFloaterMap::~LLFloaterMap()
+BOOL LLFloaterMap::handleDoubleClick( S32 x, S32 y, MASK mask )
{
+ LLFloaterReg::showInstance("world_map");
+ return TRUE;
}
+BOOL LLFloaterMap::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+ if (mPopupMenu)
+ {
+ mPopupMenu->buildDrawLabels();
+ mPopupMenu->updateParent(LLMenuGL::sMenuContainer);
+ LLMenuGL::showPopup(this, mPopupMenu, x, y);
+ }
+ return TRUE;
+}
-// virtual
-void LLFloaterMap::onOpen()
+void LLFloaterMap::setDirectionPos( LLTextBox* text_box, F32 rotation )
{
- gFloaterView->adjustToFitScreen(this, FALSE);
+ // Rotation is in radians.
+ // Rotation of 0 means x = 1, y = 0 on the unit circle.
- gSavedSettings.setBOOL("ShowMiniMap", TRUE);
-}
+ F32 map_half_height = (F32)(getRect().getHeight() / 2);
+ F32 map_half_width = (F32)(getRect().getWidth() / 2);
+ F32 text_half_height = (F32)(text_box->getRect().getHeight() / 2);
+ F32 text_half_width = (F32)(text_box->getRect().getWidth() / 2);
+ F32 radius = llmin( map_half_height - text_half_height, map_half_width - text_half_width );
+
+ // Inset by a little to account for position display.
+ radius -= 8.f;
+ text_box->setOrigin(
+ llround(map_half_width - text_half_width + radius * cos( rotation )),
+ llround(map_half_height - text_half_height + radius * sin( rotation )) );
+}
// virtual
-void LLFloaterMap::onClose(bool app_quitting)
+void LLFloaterMap::draw()
{
- LLFloater::setVisible(FALSE);
+ F32 rotation = 0;
- if (!app_quitting)
+ if( mMap->getRotateMap() )
{
- gSavedSettings.setBOOL("ShowMiniMap", FALSE);
+ // rotate subsequent draws to agent rotation
+ rotation = atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] );
}
-}
-BOOL LLFloaterMap::canClose()
-{
- return !LLApp::isExiting();
-}
+ setDirectionPos( mTextBoxEast, rotation );
+ setDirectionPos( mTextBoxNorth, rotation + F_PI_BY_TWO );
+ setDirectionPos( mTextBoxWest, rotation + F_PI );
+ setDirectionPos( mTextBoxSouth, rotation + F_PI + F_PI_BY_TWO );
+ setDirectionPos( mTextBoxNorthEast, rotation + F_PI_BY_TWO / 2);
+ setDirectionPos( mTextBoxNorthWest, rotation + F_PI_BY_TWO + F_PI_BY_TWO / 2);
+ setDirectionPos( mTextBoxSouthWest, rotation + F_PI + F_PI_BY_TWO / 2);
+ setDirectionPos( mTextBoxSouthEast, rotation + F_PI + F_PI_BY_TWO + F_PI_BY_TWO / 2);
-// virtual
-void LLFloaterMap::draw()
-{
// Note: we can't just gAgent.check cameraMouselook() because the transition states are wrong.
if( gAgent.cameraMouselook())
{
setMouseOpaque(FALSE);
getDragHandle()->setMouseOpaque(FALSE);
-
- drawChild(mPanelMap);
}
else
{
setMouseOpaque(TRUE);
getDragHandle()->setMouseOpaque(TRUE);
+ }
+
+ if (LLTracker::isTracking(0))
+ {
+ mPopupMenu->setItemEnabled ("Stop Tracking", true);
+ }
+
+ LLFloater::draw();
+}
- LLFloater::draw();
+void LLFloaterMap::handleZoom(const LLSD& userdata)
+{
+ std::string level = userdata.asString();
+
+ F32 scale = 0.0f;
+ if (level == std::string("close"))
+ scale = MAP_SCALE_MAX;
+ else if (level == std::string("medium"))
+ scale = MAP_SCALE_MID;
+ else if (level == std::string("far"))
+ scale = MAP_SCALE_MIN;
+ if (scale != 0.0f)
+ {
+ gSavedSettings.setF32("MiniMapScale", scale );
+ mMap->setScale(scale);
+ }
+}
+
+void LLFloaterMap::handleStopTracking (const LLSD& userdata)
+{
+ if (mPopupMenu)
+ {
+ mPopupMenu->setItemEnabled ("Stop Tracking", false);
+ LLTracker::stopTracking ((void*)LLTracker::isTracking(NULL));
}
}
diff --git a/indra/newview/llfloatermap.h b/indra/newview/llfloatermap.h
index ec2db27f7a..501777ed07 100644
--- a/indra/newview/llfloatermap.h
+++ b/indra/newview/llfloatermap.h
@@ -35,28 +35,42 @@
#include "llfloater.h"
+class LLMenuGL;
class LLNetMap;
+class LLTextBox;
-class LLFloaterMap :
- public LLFloater,
- public LLFloaterSingleton<LLFloaterMap>
+//
+// Classes
+//
+class LLFloaterMap : public LLFloater
{
- friend class LLUISingleton<LLFloaterMap, VisibilityPolicy<LLFloater> >;
public:
+ LLFloaterMap(const LLSD& key);
virtual ~LLFloaterMap();
-
- static void* createPanelMiniMap(void* data);
-
- BOOL postBuild();
-
+
+ /*virtual*/ BOOL postBuild();
+ /*virtual*/ BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
+ /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
/*virtual*/ void draw();
- /*virtual*/ void onOpen();
- /*virtual*/ void onClose(bool app_quitting);
- /*virtual*/ BOOL canClose();
-
+
private:
- LLFloaterMap(const LLSD& key = LLSD());
- LLNetMap* mPanelMap;
+ void handleZoom(const LLSD& userdata);
+ void handleStopTracking (const LLSD& userdata);
+ void setDirectionPos( LLTextBox* text_box, F32 rotation );
+
+ LLMenuGL* mPopupMenu;
+
+ LLTextBox* mTextBoxEast;
+ LLTextBox* mTextBoxNorth;
+ LLTextBox* mTextBoxWest;
+ LLTextBox* mTextBoxSouth;
+
+ LLTextBox* mTextBoxSouthEast;
+ LLTextBox* mTextBoxNorthEast;
+ LLTextBox* mTextBoxNorthWest;
+ LLTextBox* mTextBoxSouthWest;
+
+ LLNetMap* mMap;
};
#endif // LL_LLFLOATERMAP_H
diff --git a/indra/newview/llfloatermemleak.cpp b/indra/newview/llfloatermemleak.cpp
index df51918e35..3f2fcc26db 100644
--- a/indra/newview/llfloatermemleak.cpp
+++ b/indra/newview/llfloatermemleak.cpp
@@ -49,8 +49,10 @@ U32 LLFloaterMemLeak::sTotalLeaked = 0 ;
S32 LLFloaterMemLeak::sStatus = LLFloaterMemLeak::STOP ;
BOOL LLFloaterMemLeak::sbAllocationFailed = FALSE ;
-LLFloaterMemLeak::LLFloaterMemLeak() : LLFloater("Memory Leaking Simulation Floater")
+LLFloaterMemLeak::LLFloaterMemLeak()
+ : LLFloater()
{
+ setTitle("Memory Leaking Simulation Floater");
}
LLFloaterMemLeak::~LLFloaterMemLeak()
@@ -224,7 +226,7 @@ LLFloaterMemLeak* LLFloaterMemLeak::instance()
if (!sInstance)
{
sInstance = new LLFloaterMemLeak();
- LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_mem_leaking.xml", NULL, FALSE);
+ LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_mem_leaking.xml", FALSE);
if(sInstance)
{
@@ -256,7 +258,7 @@ LLFloaterMemLeak* LLFloaterMemLeak::instance()
void LLFloaterMemLeak::show(void*)
{
- instance()->open();
+ instance()->openFloater();
}
LLFloaterMemLeak* LLFloaterMemLeak::getInstance()
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp
index acfcfab445..ad0f9aacb1 100644
--- a/indra/newview/llfloaternamedesc.cpp
+++ b/indra/newview/llfloaternamedesc.cpp
@@ -69,8 +69,9 @@ const S32 PREF_BUTTON_HEIGHT = 16;
// LLFloaterNameDesc()
//-----------------------------------------------------------------------------
LLFloaterNameDesc::LLFloaterNameDesc(const std::string& filename )
- : LLFloater(std::string("Name/Description Floater"))
+ : LLFloater()
{
+ setTitle("Name/Description Floater");
mFilenameAndPath = filename;
mFilename = gDirUtilp->getBaseFileName(filename, false);
// SL-5521 Maintain capitalization of filename when making the inventory item. JC
@@ -190,7 +191,7 @@ void LLFloaterNameDesc::onBtnOK( void* userdata )
0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE,
LLFloaterPerms::getNextOwnerPerms(), LLFloaterPerms::getGroupPerms(), LLFloaterPerms::getEveryonePerms(),
display_name, callback, expected_upload_cost, nruserdata);
- fp->close(false);
+ fp->closeFloater(false);
}
// static
@@ -200,5 +201,5 @@ void LLFloaterNameDesc::onBtnOK( void* userdata )
void LLFloaterNameDesc::onBtnCancel( void* userdata )
{
LLFloaterNameDesc *fp =(LLFloaterNameDesc *)userdata;
- fp->close(false);
+ fp->closeFloater(false);
}
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index e6250063f7..11842b8b0e 100644
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -36,6 +36,7 @@
#include "lluictrlfactory.h"
#include "llbutton.h"
#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
#include "llpanel.h"
#include "llcombobox.h"
#include "llviewertexteditor.h"
@@ -59,11 +60,12 @@ private:
};
LLNotificationChannelPanel::LLNotificationChannelPanel(const std::string& channel_name)
- : LLPanel(channel_name)
+ : LLPanel()
{
mChannelPtr = LLNotifications::instance().getChannel(channel_name);
mChannelRejectsPtr = LLNotificationChannelPtr(
- LLNotificationChannel::buildChannel(channel_name + "rejects", mChannelPtr->getParentChannelName(), !boost::bind(mChannelPtr->getFilter(), _1)));
+ LLNotificationChannel::buildChannel(channel_name + "rejects", mChannelPtr->getParentChannelName(),
+ !boost::bind(mChannelPtr->getFilter(), _1)));
LLUICtrlFactory::instance().buildPanel(this, "panel_notifications_channel.xml");
}
@@ -77,13 +79,11 @@ BOOL LLNotificationChannelPanel::postBuild()
mChannelRejectsPtr->connectChanged(boost::bind(&LLNotificationChannelPanel::update, this, _1, false));
LLScrollListCtrl* scroll = getChild<LLScrollListCtrl>("notifications_list");
- scroll->setDoubleClickCallback(onClickNotification);
- scroll->setCallbackUserData(this);
-
+ scroll->setDoubleClickCallback(onClickNotification, this);
+ scroll->setRect(LLRect( getRect().mLeft, getRect().mTop, getRect().mRight, 0));
scroll = getChild<LLScrollListCtrl>("notification_rejects_list");
- scroll->setDoubleClickCallback(onClickNotificationReject);
- scroll->setCallbackUserData(this);
-
+ scroll->setDoubleClickCallback(onClickNotificationReject, this);
+ scroll->setRect(LLRect( getRect().mLeft, getRect().mTop, getRect().mRight, 0));
return TRUE;
}
@@ -161,6 +161,7 @@ bool LLNotificationChannelPanel::update(const LLSD& payload, bool passed_filter)
// LLFloaterNotificationConsole
//
LLFloaterNotificationConsole::LLFloaterNotificationConsole(const LLSD& key)
+: LLFloater()
{
LLUICtrlFactory::instance().buildFloater(this, "floater_notifications_console.xml");
}
@@ -229,8 +230,10 @@ void LLFloaterNotificationConsole::removeChannel(const std::string& name)
//static
void LLFloaterNotificationConsole::updateResizeLimits()
{
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+
LLLayoutStack& stack = getChildRef<LLLayoutStack>("notification_channels");
- setResizeLimits(getMinWidth(), LLFLOATER_HEADER_SIZE + HEADER_PADDING + ((NOTIFICATION_PANEL_HEADER_HEIGHT + 3) * stack.getNumPanels()));
+ setResizeLimits(getMinWidth(), floater_header_size + HEADER_PADDING + ((NOTIFICATION_PANEL_HEADER_HEIGHT + 3) * stack.getNumPanels()));
}
void LLFloaterNotificationConsole::onClickAdd(void* user_data)
@@ -247,7 +250,9 @@ void LLFloaterNotificationConsole::onClickAdd(void* user_data)
//=============== LLFloaterNotification ================
-LLFloaterNotification::LLFloaterNotification(LLNotification* note) : mNote(note)
+LLFloaterNotification::LLFloaterNotification(LLNotification* note)
+: LLFloater(),
+ mNote(note)
{
LLUICtrlFactory::instance().buildFloater(this, "floater_notification.xml");
}
@@ -265,8 +270,7 @@ BOOL LLFloaterNotification::postBuild()
return TRUE;
}
- responses_combo->setCommitCallback(onCommitResponse);
- responses_combo->setCallbackUserData(this);
+ responses_combo->setCommitCallback(onCommitResponse, this);
LLSD form_sd = form->asLLSD();
diff --git a/indra/newview/llfloaternotificationsconsole.h b/indra/newview/llfloaternotificationsconsole.h
index 1a436b8bfe..0372553182 100644
--- a/indra/newview/llfloaternotificationsconsole.h
+++ b/indra/newview/llfloaternotificationsconsole.h
@@ -34,6 +34,7 @@
#define LL_LLFLOATER_NOTIFICATIONS_CONSOLE_H
#include "llfloater.h"
+#include "lllayoutstack.h"
#include "llnotifications.h"
class LLFloaterNotificationConsole :
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index f4984df6d9..de6b8ad814 100644
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -58,24 +58,26 @@
LLFloaterOpenObject* LLFloaterOpenObject::sInstance = NULL;
LLFloaterOpenObject::LLFloaterOpenObject()
-: LLFloater(std::string("object_contents")),
+: LLFloater(),
mPanelInventory(NULL),
mDirty(TRUE)
{
- LLCallbackMap::map_t factory_map;
- factory_map["object_contents"] = LLCallbackMap(createPanelInventory, this);
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_openobject.xml",&factory_map);
-
- childSetAction("copy_to_inventory_button", onClickMoveToInventory, this);
- childSetAction("copy_and_wear_button", onClickMoveAndWear, this);
- childSetTextArg("object_name", "[DESC]", std::string("Object") ); // *Note: probably do not want to translate this
+ LLUICtrlFactory::getInstance()->buildFloater(this,"floater_openobject.xml");
}
LLFloaterOpenObject::~LLFloaterOpenObject()
{
sInstance = NULL;
}
-
+// virtual
+BOOL LLFloaterOpenObject::postBuild()
+{
+ childSetAction("copy_to_inventory_button", onClickMoveToInventory, this);
+ childSetAction("copy_and_wear_button", onClickMoveAndWear, this);
+ childSetTextArg("object_name", "[DESC]", std::string("Object") ); // *Note: probably do not want to translate this
+ mPanelInventory = getChild<LLPanelInventory>("object_contents");
+ return TRUE;
+}
void LLFloaterOpenObject::refresh()
{
mPanelInventory->refresh();
@@ -135,7 +137,7 @@ void LLFloaterOpenObject::show()
sInstance->center();
}
- sInstance->open(); /* Flawfinder: ignore */
+ sInstance->openFloater();
sInstance->setFocus(TRUE);
sInstance->mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
@@ -215,7 +217,7 @@ void LLFloaterOpenObject::onClickMoveToInventory(void* data)
{
LLFloaterOpenObject* self = (LLFloaterOpenObject*)data;
self->moveToInventory(false);
- self->close();
+ self->closeFloater();
}
// static
@@ -223,13 +225,6 @@ void LLFloaterOpenObject::onClickMoveAndWear(void* data)
{
LLFloaterOpenObject* self = (LLFloaterOpenObject*)data;
self->moveToInventory(true);
- self->close();
+ self->closeFloater();
}
-//static
-void* LLFloaterOpenObject::createPanelInventory(void* data)
-{
- LLFloaterOpenObject* floater = (LLFloaterOpenObject*)data;
- floater->mPanelInventory = new LLPanelInventory(std::string("Object Contents"), LLRect());
- return floater->mPanelInventory;
-}
diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h
index 27653a5c99..0097a85690 100644
--- a/indra/newview/llfloateropenobject.h
+++ b/indra/newview/llfloateropenobject.h
@@ -59,7 +59,7 @@ public:
protected:
LLFloaterOpenObject();
~LLFloaterOpenObject();
-
+ /*virtual*/ BOOL postBuild();
void refresh();
void draw();
@@ -68,7 +68,6 @@ protected:
static void onClickMoveToInventory(void* data);
static void onClickMoveAndWear(void* data);
static void callbackMoveInventory(S32 result, void* data);
- static void* createPanelInventory(void* data);
protected:
static LLFloaterOpenObject* sInstance;
diff --git a/indra/newview/llfloaterparcel.cpp b/indra/newview/llfloaterparcel.cpp
index 4213150553..fa7403874e 100644
--- a/indra/newview/llfloaterparcel.cpp
+++ b/indra/newview/llfloaterparcel.cpp
@@ -93,12 +93,12 @@ void* LLFloaterParcelInfo::createPanelPlace(void* data)
//----------------------------------------------------------------------------
-LLFloaterParcelInfo::LLFloaterParcelInfo(const std::string& name, const LLUUID &parcel_id)
-: LLFloater(name),
+LLFloaterParcelInfo::LLFloaterParcelInfo(const LLUUID &parcel_id)
+: LLFloater(),
mParcelID( parcel_id )
{
mFactoryMap["place_details_panel"] = LLCallbackMap(LLFloaterParcelInfo::createPanelPlace, this);
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml", &getFactoryMap());
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml");
gPlaceInfoInstances.addData(parcel_id, this);
}
@@ -128,14 +128,14 @@ LLFloaterParcelInfo* LLFloaterParcelInfo::show(const LLUUID &parcel_id)
{
// ...bring that window to front
floater = gPlaceInfoInstances.getData(parcel_id);
- floater->open(); /*Flawfinder: ignore*/
+ floater->openFloater();
floater->setFrontmost(true);
}
else
{
- floater = new LLFloaterParcelInfo("parcelinfo", parcel_id );
+ floater = new LLFloaterParcelInfo( parcel_id );
floater->center();
- floater->open(); /*Flawfinder: ignore*/
+ floater->openFloater();
floater->displayParcelInfo(parcel_id);
floater->setFrontmost(true);
}
diff --git a/indra/newview/llfloaterparcel.h b/indra/newview/llfloaterparcel.h
index 4d698d64ae..c2d5987d8e 100644
--- a/indra/newview/llfloaterparcel.h
+++ b/indra/newview/llfloaterparcel.h
@@ -43,7 +43,7 @@ class LLFloaterParcelInfo
public:
static void* createPanelPlace(void* data);
- LLFloaterParcelInfo(const std::string& name, const LLUUID &parcel_id );
+ LLFloaterParcelInfo( const LLUUID &parcel_id );
/*virtual*/ ~LLFloaterParcelInfo();
void displayParcelInfo(const LLUUID& parcel_id);
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index 52fba0aa20..1ef71a9d53 100644
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -42,6 +42,7 @@
LLFloaterPerms::LLFloaterPerms(const LLSD& seed)
+: LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_perm_prefs.xml");
}
@@ -64,7 +65,7 @@ void LLFloaterPerms::onClickOK(void* data)
{
LLFloaterPerms* self = static_cast<LLFloaterPerms*>(data);
self->ok();
- self->close();
+ self->closeFloater();
}
//static
@@ -72,7 +73,7 @@ void LLFloaterPerms::onClickCancel(void* data)
{
LLFloaterPerms* self = static_cast<LLFloaterPerms*>(data);
self->cancel();
- self->close();
+ self->closeFloater();
}
//static
@@ -117,7 +118,7 @@ void LLFloaterPerms::onClose(bool app_quitting)
// Cancel any unsaved changes before closing.
// Note: when closed due to the OK button this amounts to a no-op.
cancel();
- LLFloater::onClose(app_quitting);
+ destroy();
}
//static
diff --git a/indra/newview/llfloaterpostcard.cpp b/indra/newview/llfloaterpostcard.cpp
index b0ab0f9625..4a68e3092e 100644
--- a/indra/newview/llfloaterpostcard.cpp
+++ b/indra/newview/llfloaterpostcard.cpp
@@ -78,30 +78,21 @@ LLFloaterPostcard::instance_list_t LLFloaterPostcard::sInstances;
///----------------------------------------------------------------------------
LLFloaterPostcard::LLFloaterPostcard(LLImageJPEG* jpeg, LLImageGL *img, const LLVector2& img_scale, const LLVector3d& pos_taken_global)
-: LLFloater(std::string("Postcard Floater")),
+: LLFloater(),
mJPEGImage(jpeg),
mViewerImage(img),
mImageScale(img_scale),
mPosTakenGlobal(pos_taken_global),
mHasFirstMsgFocus(false)
{
- init();
-}
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_postcard.xml");
-void LLFloaterPostcard::init()
-{
+ sInstances.insert(this);
+
// pick up the user's up-to-date email address
- if(!gAgent.getID().isNull())
- {
- // we're logged in, so we can get this info.
- gMessageSystem->newMessageFast(_PREHASH_UserInfoRequest);
- gMessageSystem->nextBlockFast(_PREHASH_AgentData);
- gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
- gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
- gAgent.sendReliableMessage();
- }
+ gAgent.sendAgentUserInfoRequest();
- sInstances.insert(this);
+ openFloater();
}
// Destroys the object
@@ -145,14 +136,6 @@ LLFloaterPostcard* LLFloaterPostcard::showFromSnapshot(LLImageJPEG *jpeg, LLImag
// It's now our job to clean them up
LLFloaterPostcard *instance = new LLFloaterPostcard(jpeg, img, image_scale, pos_taken_global);
- LLUICtrlFactory::getInstance()->buildFloater(instance, "floater_postcard.xml");
-
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- instance->setOrigin(left, top - instance->getRect().getHeight());
-
- instance->open(); /*Flawfinder: ignore*/
-
return instance;
}
@@ -215,7 +198,7 @@ void LLFloaterPostcard::onClickCancel(void* data)
{
LLFloaterPostcard *self = (LLFloaterPostcard *)data;
- self->close(false);
+ self->closeFloater(false);
}
}
@@ -313,7 +296,7 @@ void LLFloaterPostcard::uploadCallback(const LLUUID& asset_id, void *user_data,
gAgent.sendReliableMessage();
}
- self->close();
+ self->closeFloater();
}
// static
diff --git a/indra/newview/llfloaterpostcard.h b/indra/newview/llfloaterpostcard.h
index 087649f159..5abb97e15f 100644
--- a/indra/newview/llfloaterpostcard.h
+++ b/indra/newview/llfloaterpostcard.h
@@ -36,12 +36,13 @@
#include "llfloater.h"
#include "llcheckboxctrl.h"
-#include "llmemory.h"
-#include "llimagegl.h"
+#include "llpointer.h"
class LLTextEditor;
class LLLineEditor;
class LLButton;
+class LLImageGL;
+class LLImageJPEG;
class LLFloaterPostcard
: public LLFloater
@@ -50,7 +51,6 @@ public:
LLFloaterPostcard(LLImageJPEG* jpeg, LLImageGL *img, const LLVector2& img_scale, const LLVector3d& pos_taken_global);
virtual ~LLFloaterPostcard();
- virtual void init();
virtual BOOL postBuild();
virtual void draw();
diff --git a/indra/newview/llfloaterpostprocess.cpp b/indra/newview/llfloaterpostprocess.cpp
index de9b598b1e..a1015918d4 100644
--- a/indra/newview/llfloaterpostprocess.cpp
+++ b/indra/newview/llfloaterpostprocess.cpp
@@ -47,10 +47,20 @@
LLFloaterPostProcess* LLFloaterPostProcess::sPostProcess = NULL;
-LLFloaterPostProcess::LLFloaterPostProcess() : LLFloater(std::string("Post-Process Floater"))
+LLFloaterPostProcess::LLFloaterPostProcess()
+ : LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_post_process.xml");
+}
+
+LLFloaterPostProcess::~LLFloaterPostProcess()
+{
+
+
+}
+BOOL LLFloaterPostProcess::postBuild()
+{
/// Color Filter Callbacks
childSetCommitCallback("ColorFilterToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_color_filter");
//childSetCommitCallback("ColorFilterGamma", &LLFloaterPostProcess::onFloatControlMoved, &(gPostProcess->tweaks.gamma()));
@@ -78,19 +88,13 @@ LLFloaterPostProcess::LLFloaterPostProcess() : LLFloater(std::string("Post-Proce
// Effect loading and saving.
LLComboBox* comboBox = getChild<LLComboBox>("PPEffectsCombo");
childSetAction("PPLoadEffect", &LLFloaterPostProcess::onLoadEffect, comboBox);
- comboBox->setCommitCallback(onChangeEffectName);
+ comboBox->setCommitCallback(boost::bind(&LLFloaterPostProcess::onChangeEffectName, this, _1));
LLLineEditor* editBox = getChild<LLLineEditor>("PPEffectNameEditor");
childSetAction("PPSaveEffect", &LLFloaterPostProcess::onSaveEffect, editBox);
syncMenu();
-
-}
-
-LLFloaterPostProcess::~LLFloaterPostProcess()
-{
-
-
+ return TRUE;
}
LLFloaterPostProcess* LLFloaterPostProcess::instance()
@@ -99,7 +103,7 @@ LLFloaterPostProcess* LLFloaterPostProcess::instance()
if (!sPostProcess)
{
sPostProcess = new LLFloaterPostProcess();
- sPostProcess->open();
+ sPostProcess->openFloater();
sPostProcess->setFocus(TRUE);
}
return sPostProcess;
@@ -185,14 +189,13 @@ void LLFloaterPostProcess::onSaveEffect(void* userData)
}
}
-void LLFloaterPostProcess::onChangeEffectName(LLUICtrl* ctrl, void * userData)
+void LLFloaterPostProcess::onChangeEffectName(LLUICtrl* ctrl)
{
// get the combo box and name
- LLComboBox * comboBox = static_cast<LLComboBox*>(ctrl);
- LLLineEditor* editBox = sPostProcess->getChild<LLLineEditor>("PPEffectNameEditor");
+ LLLineEditor* editBox = getChild<LLLineEditor>("PPEffectNameEditor");
// set the parameter's new name
- editBox->setValue(comboBox->getSelectedValue());
+ editBox->setValue(ctrl->getValue());
}
bool LLFloaterPostProcess::saveAlertCallback(const LLSD& notification, const LLSD& response)
@@ -215,7 +218,7 @@ void LLFloaterPostProcess::show()
// and open the menu
LLFloaterPostProcess* postProcess = instance();
postProcess->syncMenu();
- postProcess->open();
+ postProcess->openFloater();
}
// virtual
diff --git a/indra/newview/llfloaterpostprocess.h b/indra/newview/llfloaterpostprocess.h
index 08a3618c2b..68e6d1e244 100644
--- a/indra/newview/llfloaterpostprocess.h
+++ b/indra/newview/llfloaterpostprocess.h
@@ -53,7 +53,7 @@ public:
LLFloaterPostProcess();
virtual ~LLFloaterPostProcess();
-
+ /*virtual*/ BOOL postBuild();
/// one and one instance only
static LLFloaterPostProcess* instance();
@@ -66,7 +66,7 @@ public:
static void onColorControlIMoved(LLUICtrl* ctrl, void* userData);
static void onLoadEffect(void* userData);
static void onSaveEffect(void* userData);
- static void onChangeEffectName(LLUICtrl* ctrl, void * userData);
+ void onChangeEffectName(LLUICtrl* ctrl);
/// prompts a user when overwriting an effect
static bool saveAlertCallback(const LLSD& notification, const LLSD& response);
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 17a59ccb77..1dcf4a51d2 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -40,390 +40,163 @@
#include "llfloaterpreference.h"
-#include "llbutton.h"
-#include "llcheckboxctrl.h"
-#include "lldir.h"
-#include "llfocusmgr.h"
-#include "llscrollbar.h"
-#include "llspinctrl.h"
#include "message.h"
+#include "llfocusmgr.h"
+#include "lltabcontainer.h"
+#include "llfloaterreg.h"
+
+#include "llagent.h"
#include "llcommandhandler.h"
#include "llfloaterabout.h"
-#include "llfloaterpreference.h"
+#include "llfloaterhardwaresettings.h"
#include "llpanelnetwork.h"
#include "llpanelaudioprefs.h"
#include "llpaneldisplay.h"
-#include "llpaneldebug.h"
#include "llpanelgeneral.h"
#include "llpanelinput.h"
#include "llpanellogin.h"
-#include "llpanelLCD.h"
#include "llpanelmsgs.h"
#include "llpanelweb.h"
#include "llpanelskins.h"
#include "llprefschat.h"
#include "llprefsvoice.h"
#include "llprefsim.h"
-#include "llresizehandle.h"
-#include "llresmgr.h"
-#include "llassetstorage.h"
-#include "llagent.h"
#include "llviewercontrol.h"
-#include "llviewernetwork.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
-#include "llkeyboard.h"
-#include "llscrollcontainer.h"
-#include "llfloaterhardwaresettings.h"
-
-const S32 PREF_BORDER = 4;
-const S32 PREF_PAD = 5;
-const S32 PREF_BUTTON_WIDTH = 70;
-const S32 PREF_CATEGORY_WIDTH = 150;
-
-const S32 PREF_FLOATER_MIN_HEIGHT = 2 * SCROLLBAR_SIZE + 2 * LLPANEL_BORDER_WIDTH + 96;
-
-LLFloaterPreference* LLFloaterPreference::sInstance = NULL;
-
-
-class LLPreferencesHandler : public LLCommandHandler
-{
-public:
- // requires trusted browser
- LLPreferencesHandler() : LLCommandHandler("preferences", true) { }
- bool handle(const LLSD& tokens, const LLSD& query_map,
- LLWebBrowserCtrl* web)
- {
- LLFloaterPreference::show(NULL);
- return true;
- }
-};
-
-LLPreferencesHandler gPreferencesHandler;
-
-
-// Must be done at run time, not compile time. JC
-S32 pref_min_width()
-{
- return
- 2 * PREF_BORDER +
- 2 * PREF_BUTTON_WIDTH +
- PREF_PAD + RESIZE_HANDLE_WIDTH +
- PREF_CATEGORY_WIDTH +
- PREF_PAD;
-}
-
-S32 pref_min_height()
-{
- return
- 2 * PREF_BORDER +
- 3*(BTN_HEIGHT + PREF_PAD) +
- PREF_FLOATER_MIN_HEIGHT;
-}
-
-
-LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * default_btn) :
- mTabContainer(tab_container),
- mGeneralPanel(NULL),
- mInputPanel(NULL),
- mNetworkPanel(NULL),
- mDisplayPanel(NULL),
- mAudioPanel(NULL),
- mMsgPanel(NULL),
- mSkinsPanel(NULL),
- mLCDPanel(NULL)
-{
- mGeneralPanel = new LLPanelGeneral();
- mTabContainer->addTabPanel(mGeneralPanel, mGeneralPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
- mGeneralPanel->setDefaultBtn(default_btn);
-
- mInputPanel = new LLPanelInput();
- mTabContainer->addTabPanel(mInputPanel, mInputPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
- mInputPanel->setDefaultBtn(default_btn);
-
- mNetworkPanel = new LLPanelNetwork();
- mTabContainer->addTabPanel(mNetworkPanel, mNetworkPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
- mNetworkPanel->setDefaultBtn(default_btn);
-
- mWebPanel = new LLPanelWeb();
- mTabContainer->addTabPanel(mWebPanel, mWebPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
- mWebPanel->setDefaultBtn(default_btn);
-
- mDisplayPanel = new LLPanelDisplay();
- mTabContainer->addTabPanel(mDisplayPanel, mDisplayPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
- mDisplayPanel->setDefaultBtn(default_btn);
-
- mAudioPanel = new LLPanelAudioPrefs();
- mTabContainer->addTabPanel(mAudioPanel, mAudioPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
- mAudioPanel->setDefaultBtn(default_btn);
-
- mPrefsChat = new LLPrefsChat();
- mTabContainer->addTabPanel(mPrefsChat->getPanel(), mPrefsChat->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
- mPrefsChat->getPanel()->setDefaultBtn(default_btn);
-
- mPrefsVoice = new LLPrefsVoice();
- mTabContainer->addTabPanel(mPrefsVoice, mPrefsVoice->getLabel(), FALSE, onTabChanged, mTabContainer);
- mPrefsVoice->setDefaultBtn(default_btn);
-
- mPrefsIM = new LLPrefsIM();
- mTabContainer->addTabPanel(mPrefsIM->getPanel(), mPrefsIM->getPanel()->getLabel(), FALSE, onTabChanged, mTabContainer);
- mPrefsIM->getPanel()->setDefaultBtn(default_btn);
-
-#if LL_LCD_COMPILE
-
- // only add this option if we actually have a logitech keyboard / speaker set
- if (gLcdScreen->Enabled())
- {
- mLCDPanel = new LLPanelLCD();
- mTabContainer->addTabPanel(mLCDPanel, mLCDPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
- mLCDPanel->setDefaultBtn(default_btn);
- }
-
-#else
- mLCDPanel = NULL;
-#endif
-
- mMsgPanel = new LLPanelMsgs();
- mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
- mMsgPanel->setDefaultBtn(default_btn);
-
- mSkinsPanel = new LLPanelSkins();
- mTabContainer->addTabPanel(mSkinsPanel, mSkinsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
- mSkinsPanel->setDefaultBtn(default_btn);
-
- if (!mTabContainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
- {
- mTabContainer->selectFirstTab();
- }
-}
-
-LLPreferenceCore::~LLPreferenceCore()
-{
- if (mGeneralPanel)
- {
- delete mGeneralPanel;
- mGeneralPanel = NULL;
- }
- if (mInputPanel)
- {
- delete mInputPanel;
- mInputPanel = NULL;
- }
- if (mNetworkPanel)
- {
- delete mNetworkPanel;
- mNetworkPanel = NULL;
- }
- if (mDisplayPanel)
- {
- delete mDisplayPanel;
- mDisplayPanel = NULL;
- }
-
- if (mAudioPanel)
- {
- delete mAudioPanel;
- mAudioPanel = NULL;
- }
- if (mPrefsChat)
- {
- delete mPrefsChat;
- mPrefsChat = NULL;
- }
- if (mPrefsIM)
- {
- delete mPrefsIM;
- mPrefsIM = NULL;
- }
- if (mMsgPanel)
- {
- delete mMsgPanel;
- mMsgPanel = NULL;
- }
- if (mWebPanel)
- {
- delete mWebPanel;
- mWebPanel = NULL;
- }
- if (mSkinsPanel)
- {
- delete mSkinsPanel;
- mSkinsPanel = NULL;
- }
-
-}
-
-
-void LLPreferenceCore::apply()
-{
- mGeneralPanel->apply();
- mInputPanel->apply();
- mNetworkPanel->apply();
- mDisplayPanel->apply();
- mAudioPanel->apply();
- mPrefsChat->apply();
- mPrefsVoice->apply();
- mPrefsIM->apply();
- mMsgPanel->apply();
- mSkinsPanel->apply();
-
- // hardware menu apply
- LLFloaterHardwareSettings::instance()->apply();
-
- mWebPanel->apply();
-#if LL_LCD_COMPILE
- // only add this option if we actually have a logitech keyboard / speaker set
- if (gLcdScreen->Enabled())
- {
- mLCDPanel->apply();
- }
-#endif
-// mWebPanel->apply();
-}
-
-
-void LLPreferenceCore::cancel()
-{
- mGeneralPanel->cancel();
- mInputPanel->cancel();
- mNetworkPanel->cancel();
- mDisplayPanel->cancel();
- mAudioPanel->cancel();
- mPrefsChat->cancel();
- mPrefsVoice->cancel();
- mPrefsIM->cancel();
- mMsgPanel->cancel();
- mSkinsPanel->cancel();
-
- // cancel hardware menu
- LLFloaterHardwareSettings::instance()->cancel();
-
- mWebPanel->cancel();
-#if LL_LCD_COMPILE
- // only add this option if we actually have a logitech keyboard / speaker set
- if (gLcdScreen->Enabled())
- {
- mLCDPanel->cancel();
- }
-#endif
-// mWebPanel->cancel();
-}
-
-// static
-void LLPreferenceCore::onTabChanged(void* user_data, bool from_click)
-{
- LLTabContainer* self = (LLTabContainer*)user_data;
-
- gSavedSettings.setS32("LastPrefTab", self->getCurrentPanelIndex());
-}
-
-
-void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
-{
- mPrefsIM->setPersonalInfo(visibility, im_via_email, email);
-}
-
-void LLPreferenceCore::refreshEnabledGraphics()
-{
- LLFloaterHardwareSettings::instance()->refreshEnabledState();
- mDisplayPanel->refreshEnabledState();
-}
//////////////////////////////////////////////
// LLFloaterPreference
-LLFloaterPreference::LLFloaterPreference()
+LLFloaterPreference::LLFloaterPreference(const LLSD& key)
+ : LLFloater(key),
+ mInputPanel(NULL),
+ mNetworkPanel(NULL),
+ mWebPanel(NULL),
+ mDisplayPanel(NULL),
+ mAudioPanel(NULL),
+ mPrefsChat(NULL),
+ mPrefsVoice(NULL),
+ mPrefsIM(NULL),
+ mMsgPanel(NULL),
+ mSkinsPanel(NULL)
{
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preferences.xml");
+ mFactoryMap["general"] = LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPanelGeneral>);
+ mFactoryMap["input"] = LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPanelInput>);
+ mFactoryMap["network"] = LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPanelNetwork>);
+ mFactoryMap["web"] = LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPanelWeb>);
+ mFactoryMap["display"] = LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPanelDisplay>);
+ mFactoryMap["audio"] = LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPanelAudioPrefs>);
+ mFactoryMap["chat"] = LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPrefsChat>);
+ mFactoryMap["voice"] = LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPrefsVoice>);
+ mFactoryMap["im"] = LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPrefsIM>);
+ mFactoryMap["msgs"] = LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPanelMsgs>);
+ mFactoryMap["skins"] = LLCallbackMap((LLCallbackMap::callback_t)LLCallbackMap::buildPanel<LLPanelSkins>);
+
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preferences.xml", FALSE);
}
BOOL LLFloaterPreference::postBuild()
{
- requires<LLButton>("About...");
- requires<LLButton>("OK");
- requires<LLButton>("Cancel");
- requires<LLButton>("Apply");
- requires<LLTabContainer>("pref core");
-
- if (!checkRequirements())
- {
- return FALSE;
- }
-
- mAboutBtn = getChild<LLButton>("About...");
- mAboutBtn->setClickedCallback(onClickAbout, this);
+ getChild<LLButton>("About...")->setClickedCallback(onClickAbout, this);
+ getChild<LLButton>("Apply")->setClickedCallback(onBtnApply, this);
+ getChild<LLButton>("Cancel")->setClickedCallback(onBtnCancel, this);
+ getChild<LLButton>("OK")->setClickedCallback(onBtnOK, this);
- mApplyBtn = getChild<LLButton>("Apply");
- mApplyBtn->setClickedCallback(onBtnApply, this);
-
- mCancelBtn = getChild<LLButton>("Cancel");
- mCancelBtn->setClickedCallback(onBtnCancel, this);
-
- mOKBtn = getChild<LLButton>("OK");
- mOKBtn->setClickedCallback(onBtnOK, this);
-
- mPreferenceCore = new LLPreferenceCore(
- getChild<LLTabContainer>("pref core"),
- getChild<LLButton>("OK")
- );
+ LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");
+ if (!tabcontainer->selectTab(gSavedSettings.getS32("LastPrefTab")))
+ tabcontainer->selectFirstTab();
+
+ // Panels that don't yet derive from LLPanelPreferenc
+ // *TODO: Skinning - conver these to derive from LLPanelPreference
+ mWebPanel = dynamic_cast<LLPanelWeb*>(getChild<LLPanel>("web"));
+ mDisplayPanel = dynamic_cast<LLPanelDisplay*>(getChild<LLPanel>("display"));
+ mAudioPanel = dynamic_cast<LLPanelAudioPrefs*>(getChild<LLPanel>("audio"));
+ mPrefsChat = dynamic_cast<LLPrefsChat*>(getChild<LLPanel>("chat"));
+ mPrefsVoice = dynamic_cast<LLPrefsVoice*>(getChild<LLPanel>("voice"));
+ mPrefsIM = dynamic_cast<LLPrefsIM*>(getChild<LLPanel>("im"));
+ mMsgPanel = dynamic_cast<LLPanelMsgs*>(getChild<LLPanel>("msgs"));
+ mSkinsPanel = dynamic_cast<LLPanelSkins*>(getChild<LLPanel>("skins"));
- sInstance = this;
-
return TRUE;
}
LLFloaterPreference::~LLFloaterPreference()
{
- sInstance = NULL;
- delete mPreferenceCore;
}
void LLFloaterPreference::apply()
{
- this->mPreferenceCore->apply();
-}
+ LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");
+ // Call apply() on all panels that derive from LLPanelPreference
+ for (child_list_t::const_iterator iter = tabcontainer->getChildList()->begin();
+ iter != tabcontainer->getChildList()->end(); ++iter)
+ {
+ LLView* view = *iter;
+ LLPanelPreference* panel = dynamic_cast<LLPanelPreference*>(view);
+ if (panel)
+ panel->apply();
+ }
+ if (mWebPanel) mWebPanel->apply();
+ if (mDisplayPanel) mDisplayPanel->apply();
+ if (mAudioPanel) mAudioPanel->apply();
+ if (mPrefsChat) mPrefsChat->apply();
+ if (mPrefsVoice) mPrefsVoice->apply();
+ if (mPrefsIM) mPrefsIM->apply();
+ if (mMsgPanel) mMsgPanel->apply();
+ if (mSkinsPanel) mSkinsPanel->apply();
-void LLFloaterPreference::cancel()
-{
- this->mPreferenceCore->cancel();
+ // hardware menu apply
+ LLFloaterHardwareSettings::instance()->apply();
}
-
-// static
-void LLFloaterPreference::show(void*)
+void LLFloaterPreference::cancel()
{
- if (!sInstance)
+ LLTabContainer* tabcontainer = getChild<LLTabContainer>("pref core");
+ // Call cancel() on all panels that derive from LLPanelPreference
+ for (child_list_t::const_iterator iter = tabcontainer->getChildList()->begin();
+ iter != tabcontainer->getChildList()->end(); ++iter)
{
- new LLFloaterPreference();
- sInstance->center();
+ LLView* view = *iter;
+ LLPanelPreference* panel = dynamic_cast<LLPanelPreference*>(view);
+ if (panel)
+ panel->cancel();
}
- sInstance->open(); /* Flawfinder: ignore */
+ if (mWebPanel) mWebPanel->apply();
+ if (mDisplayPanel) mDisplayPanel->cancel();
+ if (mAudioPanel) mAudioPanel->cancel();
+ if (mPrefsChat) mPrefsChat->cancel();
+ if (mPrefsVoice) mPrefsVoice->cancel();
+ if (mPrefsIM) mPrefsIM->cancel();
+ if (mMsgPanel) mMsgPanel->cancel();
+ if (mSkinsPanel) mSkinsPanel->cancel();
- if(!gAgent.getID().isNull())
- {
- // we're logged in, so we can get this info.
- gMessageSystem->newMessageFast(_PREHASH_UserInfoRequest);
- gMessageSystem->nextBlockFast(_PREHASH_AgentData);
- gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
- gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
- gAgent.sendReliableMessage();
- }
+ // cancel hardware menu
+ LLFloaterHardwareSettings::instance()->cancel();
+}
+void LLFloaterPreference::onOpen(const LLSD& key)
+{
+ gAgent.sendAgentUserInfoRequest();
LLPanelLogin::setAlwaysRefresh(true);
}
+void LLFloaterPreference::onClose(bool app_quitting)
+{
+ gSavedSettings.setS32("LastPrefTab", getChild<LLTabContainer>("pref core")->getCurrentPanelIndex());
+ LLPanelLogin::setAlwaysRefresh(false);
+ cancel(); // will be a no-op if OK or apply was performed just prior.
+ destroy();
+}
// static
void LLFloaterPreference::onClickAbout(void*)
{
- LLFloaterAbout::show(NULL);
+ LLFloaterAbout::showInstance();
}
-
// static
void LLFloaterPreference::onBtnOK( void* userdata )
{
@@ -441,10 +214,10 @@ void LLFloaterPreference::onBtnOK( void* userdata )
if (fp->canClose())
{
fp->apply();
- fp->close(false);
+ fp->closeFloater(false);
gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile"), TRUE );
-
+ gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile") , TRUE );
std::string crash_settings_filename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, CRASH_SETTINGS_FILE);
// save all settings, even if equals defaults
gCrashSettings.saveToFile(crash_settings_filename, FALSE);
@@ -477,14 +250,6 @@ void LLFloaterPreference::onBtnApply( void* userdata )
}
-void LLFloaterPreference::onClose(bool app_quitting)
-{
- LLPanelLogin::setAlwaysRefresh(false);
- cancel(); // will be a no-op if OK or apply was performed just prior.
- LLFloater::onClose(app_quitting);
-}
-
-
// static
void LLFloaterPreference::onBtnCancel( void* userdata )
{
@@ -497,20 +262,80 @@ void LLFloaterPreference::onBtnCancel( void* userdata )
cur_focus->onCommit();
}
}
- fp->close(); // side effect will also cancel any unsaved changes.
+
+ fp->closeFloater(); // side effect will also cancel any unsaved changes.
}
// static
void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email)
{
- if(sInstance && sInstance->mPreferenceCore)
+ LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+ if(instance && instance->mPrefsIM)
{
- sInstance->mPreferenceCore->setPersonalInfo(visibility, im_via_email, email);
+ instance->mPrefsIM->setPersonalInfo(visibility, im_via_email, email);
}
}
+// static
void LLFloaterPreference::refreshEnabledGraphics()
{
- sInstance->mPreferenceCore->refreshEnabledGraphics();
+ LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
+ if(instance)
+ {
+ LLFloaterHardwareSettings::instance()->refreshEnabledState();
+ if (instance->mDisplayPanel)
+ instance->mDisplayPanel->refreshEnabledState();
+ }
+}
+
+//----------------------------------------------------------------------------
+
+//virtual
+BOOL LLPanelPreference::postBuild()
+{
+ apply();
+ return true;
+}
+
+void LLPanelPreference::apply()
+{
+ // Save the value of all controls in the hierarchy
+ mSavedValues.clear();
+ std::list<LLView*> view_stack;
+ view_stack.push_back(this);
+ while(!view_stack.empty())
+ {
+ // Process view on top of the stack
+ LLView* curview = view_stack.front();
+ view_stack.pop_front();
+ LLUICtrl* ctrl = dynamic_cast<LLUICtrl*>(curview);
+ if (ctrl)
+ {
+ LLControlVariable* control = ctrl->getControlVariable();
+ if (control)
+ {
+ mSavedValues[control] = control->getValue();
+ }
+ }
+
+ // Push children onto the end of the work stack
+ for (child_list_t::const_iterator iter = curview->getChildList()->begin();
+ iter != curview->getChildList()->end(); ++iter)
+ {
+ view_stack.push_back(*iter);
+ }
+ }
+
+}
+
+void LLPanelPreference::cancel()
+{
+ for (control_values_map_t::iterator iter = mSavedValues.begin();
+ iter != mSavedValues.end(); ++iter)
+ {
+ LLControlVariable* control = iter->first;
+ LLSD ctrl_value = iter->second;
+ control->set(ctrl_value);
+ }
}
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index f48696ffdb..8144b9b8f1 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -40,7 +40,6 @@
#define LL_LLFLOATERPREFERENCE_H
#include "llfloater.h"
-#include "lltabcontainervertical.h"
class LLPanelGeneral;
class LLPanelInput;
@@ -58,76 +57,57 @@ class LLPanelMsgs;
class LLPanelSkins;
class LLScrollListCtrl;
-class LLPreferenceCore
-{
-
-public:
- LLPreferenceCore(LLTabContainer* tab_container, LLButton * default_btn);
- ~LLPreferenceCore();
-
- void apply();
- void cancel();
-
- LLTabContainer* getTabContainer() { return mTabContainer; }
-
- void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email);
-
- static void onTabChanged(void* user_data, bool from_click);
-
- // refresh all the graphics preferences menus
- void refreshEnabledGraphics();
-
-private:
- LLTabContainer *mTabContainer;
- LLPanelGeneral *mGeneralPanel;
- LLPanelSkins *mSkinsPanel;
- LLPanelInput *mInputPanel;
- LLPanelNetwork *mNetworkPanel;
- LLPanelDisplay *mDisplayPanel;
- LLPanelAudioPrefs *mAudioPanel;
-// LLPanelDebug *mDebugPanel;
- LLPrefsChat *mPrefsChat;
- LLPrefsVoice *mPrefsVoice;
- LLPrefsIM *mPrefsIM;
- LLPanelWeb *mWebPanel;
- LLPanelMsgs *mMsgPanel;
- LLPanelLCD *mLCDPanel;
-};
+class LLSD;
// Floater to control preferences (display, audio, bandwidth, general.
class LLFloaterPreference : public LLFloater
{
public:
- LLFloaterPreference();
+ LLFloaterPreference(const LLSD& key);
~LLFloaterPreference();
void apply();
void cancel();
virtual BOOL postBuild();
- static void show(void*);
+ virtual void onOpen(const LLSD& key);
+ virtual void onClose(bool app_quitting);
// static data update, called from message handler
static void updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email);
// refresh all the graphics preferences menus
static void refreshEnabledGraphics();
-
+
protected:
- LLPreferenceCore *mPreferenceCore;
-
- /*virtual*/ void onClose(bool app_quitting);
-
- LLButton* mAboutBtn;
- LLButton *mOKBtn;
- LLButton *mCancelBtn;
- LLButton *mApplyBtn;
-
static void onClickAbout(void*);
static void onBtnOK(void*);
static void onBtnCancel(void*);
static void onBtnApply(void*);
+
+private:
+ LLPanelSkins *mSkinsPanel;
+ LLPanelInput *mInputPanel;
+ LLPanelNetwork *mNetworkPanel;
+ LLPanelDisplay *mDisplayPanel;
+ LLPanelAudioPrefs *mAudioPanel;
+ LLPrefsChat *mPrefsChat;
+ LLPrefsVoice *mPrefsVoice;
+ LLPrefsIM *mPrefsIM;
+ LLPanelWeb *mWebPanel;
+ LLPanelMsgs *mMsgPanel;
+};
- static LLFloaterPreference* sInstance;
+class LLPanelPreference : public LLPanel
+{
+public:
+ /*virtual*/ BOOL postBuild();
+
+ virtual void apply();
+ virtual void cancel();
+
+private:
+ typedef std::map<LLControlVariable*, LLSD> control_values_map_t;
+ control_values_map_t mSavedValues;
};
#endif // LL_LLPREFERENCEFLOATER_H
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index 406d940cf0..e94967eba8 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -37,6 +37,7 @@
#include <functional>
#include "llcachename.h"
#include "lldbstrings.h"
+#include "llfloaterreg.h"
#include "llinventory.h"
#include "llagent.h"
@@ -51,11 +52,13 @@
#include "roles_constants.h"
#include "llselectmgr.h"
#include "lltextbox.h"
+#include "lltrans.h"
#include "lluiconstants.h"
#include "llviewerinventory.h"
#include "llviewerobjectlist.h"
#include "llviewerregion.h"
#include "llviewercontrol.h"
+#include "llviewerwindow.h"
#include "lluictrlfactory.h"
@@ -135,7 +138,13 @@ LLFloaterProperties* LLFloaterProperties::show(const LLUUID& item_id,
}
instance->refresh();
- instance->open(); /* Flawfinder: ignore */
+ instance->openFloater();
+ }
+ else
+ {
+ LLFloaterProperties* floater = new LLFloaterProperties(item_id, object_id);
+ // keep onscreen
+ gFloaterView->adjustToFitScreen(floater, FALSE);
}
return instance;
}
@@ -151,14 +160,14 @@ void LLFloaterProperties::dirtyAll()
}
// Default constructor
-LLFloaterProperties::LLFloaterProperties(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_id, const LLUUID& object_id) :
- LLFloater(name, rect, title),
+LLFloaterProperties::LLFloaterProperties(const LLUUID& item_id, const LLUUID& object_id)
+ : LLFloater(),
mItemID(item_id),
mObjectID(object_id),
mDirty(TRUE)
{
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_inventory_item_properties.xml");
-
+
if (!sPropertiesObserver)
{
sPropertiesObserver = new LLPropertiesObserver;
@@ -168,6 +177,28 @@ LLFloaterProperties::LLFloaterProperties(const std::string& name, const LLRect&
// add the object to the static structure
LLUUID key = mItemID ^ mObjectID;
sInstances.insert(instance_map::value_type(key, this));
+
+}
+
+// Destroys the object
+LLFloaterProperties::~LLFloaterProperties()
+{
+ // clean up the static data.
+ instance_map::iterator it = sInstances.find(mItemID ^ mObjectID);
+ if(it != sInstances.end())
+ {
+ sInstances.erase(it);
+ }
+ sPropertiesObserverCount--;
+ if (!sPropertiesObserverCount)
+ {
+ delete sPropertiesObserver;
+ sPropertiesObserver = NULL;
+ }
+}
+// virtual
+BOOL LLFloaterProperties::postBuild()
+{
// build the UI
// item name & description
childSetPrevalidate("LabelItemName",&LLLineEditor::prevalidatePrintableNotPipe);
@@ -196,23 +227,8 @@ LLFloaterProperties::LLFloaterProperties(const std::string& name, const LLRect&
childSetCommitCallback("EditPrice",&onCommitSaleInfo, this);
// The UI has been built, now fill in all the values
refresh();
-}
-// Destroys the object
-LLFloaterProperties::~LLFloaterProperties()
-{
- // clean up the static data.
- instance_map::iterator it = sInstances.find(mItemID ^ mObjectID);
- if(it != sInstances.end())
- {
- sInstances.erase(it);
- }
- sPropertiesObserverCount--;
- if (!sPropertiesObserverCount)
- {
- delete sPropertiesObserver;
- sPropertiesObserver = NULL;
- }
+ return TRUE;
}
void LLFloaterProperties::refresh()
@@ -372,8 +388,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
//////////////////
// ACQUIRE DATE //
//////////////////
-
- // *TODO: Localize / translate this
+
time_t time_utc = item->getCreationDate();
if (0 == time_utc)
{
@@ -381,7 +396,11 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
}
else
{
- childSetText("LabelAcquiredDate", std::string(ctime(&time_utc)) );
+ std::string timeStr = getString("acquiredDate");
+ LLSD substitution;
+ substitution["datetime"] = (S32) time_utc;
+ LLStringUtil::format (timeStr, substitution);
+ childSetText ("LabelAcquiredDate", timeStr);
}
///////////////////////
@@ -938,7 +957,7 @@ void LLFloaterProperties::closeByID(const LLUUID& item_id, const LLUUID &object_
if (floaterp)
{
- floaterp->close();
+ floaterp->closeFloater();
}
}
@@ -946,8 +965,24 @@ void LLFloaterProperties::closeByID(const LLUUID& item_id, const LLUUID &object_
/// LLMultiProperties
///----------------------------------------------------------------------------
-LLMultiProperties::LLMultiProperties(const LLRect &rect) : LLMultiFloater(std::string("Properties"), rect)
+LLMultiProperties::LLMultiProperties()
+ : LLMultiFloater()
{
+ // *TODO: There should be a .xml file for this
+ const LLRect& nextrect = LLFloaterReg::getFloaterRect("properties"); // place where the next properties should show up
+ if (nextrect.getWidth() > 0)
+ {
+ setRect(nextrect);
+ }
+ else
+ {
+ // start with a small rect in the top-left corner ; will get resized
+ LLRect rect;
+ rect.setLeftTopAndSize(0, gViewerWindow->getWindowHeight(), 20, 20);
+ setRect(rect);
+ }
+ setTitle(LLTrans::getString("MultiPropertiesTitle"));
+ buildTabContainer();
}
///----------------------------------------------------------------------------
diff --git a/indra/newview/llfloaterproperties.h b/indra/newview/llfloaterproperties.h
index 2f5d97d384..d0e5abefb8 100644
--- a/indra/newview/llfloaterproperties.h
+++ b/indra/newview/llfloaterproperties.h
@@ -34,7 +34,7 @@
#define LL_LLFLOATERPROPERTIES_H
#include <map>
-#include "llfloater.h"
+#include "llmultifloater.h"
#include "lliconctrl.h"
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -54,16 +54,16 @@ class LLFloaterProperties : public LLFloater
{
public:
static LLFloaterProperties* find(const LLUUID& item_id,
- const LLUUID& object_id);
+ const LLUUID& object_id = LLUUID::null);
static LLFloaterProperties* show(const LLUUID& item_id,
- const LLUUID& object_id);
+ const LLUUID& object_id = LLUUID::null);
static void dirtyAll();
static void closeByID(const LLUUID& item_id, const LLUUID& object_id);
- LLFloaterProperties(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_id, const LLUUID& object_id);
+ LLFloaterProperties(const LLUUID& item_id, const LLUUID& object_id);
virtual ~LLFloaterProperties();
-
+ /*virtual*/ BOOL postBuild();
// do everything necessary
void dirty() { mDirty = TRUE; }
void refresh();
@@ -104,7 +104,7 @@ protected:
class LLMultiProperties : public LLMultiFloater
{
public:
- LLMultiProperties(const LLRect& rect);
+ LLMultiProperties();
};
#endif // LL_LLFLOATERPROPERTIES_H
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 06c1b2c12b..504760175b 100644
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -64,6 +64,7 @@
#include "lllineeditor.h"
#include "llalertdialog.h"
#include "llnamelistctrl.h"
+#include "llscrolllistitem.h"
#include "llsliderctrl.h"
#include "llspinctrl.h"
#include "lltabcontainer.h"
@@ -80,6 +81,7 @@
#include "llviewertexteditor.h"
#include "llviewerwindow.h"
#include "llvlcomposition.h"
+#include "lltrans.h"
#define ELAR_ENABLED 0 // Enable when server support is implemented
@@ -161,8 +163,9 @@ bool estate_dispatch_initialized = false;
LLUUID LLFloaterRegionInfo::sRequestInvoice;
LLFloaterRegionInfo::LLFloaterRegionInfo(const LLSD& seed)
+ : LLFloater()
{
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_info.xml", NULL, FALSE);
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_info.xml", FALSE);
}
BOOL LLFloaterRegionInfo::postBuild()
@@ -174,32 +177,32 @@ BOOL LLFloaterRegionInfo::postBuild()
panel = new LLPanelRegionGeneralInfo;
mInfoPanels.push_back(panel);
LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_general.xml");
- mTab->addTabPanel(panel, panel->getLabel(), TRUE);
+ mTab->addTabPanel(LLTabContainer::TabPanelParams().panel(panel).select_tab(true));
panel = new LLPanelRegionDebugInfo;
mInfoPanels.push_back(panel);
LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_debug.xml");
- mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+ mTab->addTabPanel(panel);
panel = new LLPanelRegionTextureInfo;
mInfoPanels.push_back(panel);
LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_texture.xml");
- mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+ mTab->addTabPanel(panel);
panel = new LLPanelRegionTerrainInfo;
mInfoPanels.push_back(panel);
LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_terrain.xml");
- mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+ mTab->addTabPanel(panel);
panel = new LLPanelEstateInfo;
mInfoPanels.push_back(panel);
LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_estate.xml");
- mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+ mTab->addTabPanel(panel);
panel = new LLPanelEstateCovenant;
mInfoPanels.push_back(panel);
LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_covenant.xml");
- mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+ mTab->addTabPanel(panel);
gMessageSystem->setHandlerFunc(
"EstateOwnerMessage",
@@ -212,22 +215,16 @@ LLFloaterRegionInfo::~LLFloaterRegionInfo()
{
}
-void LLFloaterRegionInfo::onOpen()
+void LLFloaterRegionInfo::onOpen(const LLSD& key)
{
- LLRect rect = gSavedSettings.getRect("FloaterRegionInfo");
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- rect.translate(left,top);
-
refreshFromRegion(gAgent.getRegion());
requestRegionInfo();
- LLFloater::onOpen();
}
// static
void LLFloaterRegionInfo::requestRegionInfo()
{
- LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
+ LLTabContainer* tab = getChild<LLTabContainer>("region_panels");
tab->getChild<LLPanel>("General")->setCtrlsEnabled(FALSE);
tab->getChild<LLPanel>("Debug")->setCtrlsEnabled(FALSE);
@@ -436,6 +433,11 @@ void LLFloaterRegionInfo::refresh()
// LLPanelRegionInfo
//
+LLPanelRegionInfo::LLPanelRegionInfo()
+ : LLPanel()
+{
+}
+
// static
void LLPanelRegionInfo::onBtnSet(void* user_data)
{
@@ -719,7 +721,7 @@ bool LLPanelRegionGeneralInfo::onMessageCommit(const LLSD& notification, const L
// static
void LLPanelRegionGeneralInfo::onClickManageTelehub(void* data)
{
- LLFloaterRegionInfo::getInstance()->close();
+ LLFloaterRegionInfo::getInstance()->closeFloater();
LLFloaterTelehub::show();
}
@@ -1074,7 +1076,7 @@ BOOL LLPanelRegionTextureInfo::postBuild()
initCtrl(buffer);
}
-// LLButton* btn = new LLButton("dump", LLRect(0, 20, 100, 0), "", onClickDump, this);
+// LLButton* btn = ("dump", LLRect(0, 20, 100, 0), "", onClickDump, this);
// btn->setFollows(FOLLOWS_TOP|FOLLOWS_LEFT);
// addChild(btn);
@@ -1363,9 +1365,10 @@ void LLPanelRegionTerrainInfo::onClickUploadRaw(void* data)
// static
void LLPanelRegionTerrainInfo::onClickBakeTerrain(void* data)
{
- LLNotifications::instance().add(
- LLNotification::Params("ConfirmBakeTerrain")
- .functor(boost::bind(&LLPanelRegionTerrainInfo::callbackBakeTerrain, (LLPanelRegionTerrainInfo*)data, _1, _2)));
+ LLNotification::Params::Functor functor_params;
+ functor_params.function(boost::bind(&LLPanelRegionTerrainInfo::callbackBakeTerrain, (LLPanelRegionTerrainInfo*)data, _1, _2));
+
+ LLNotifications::instance().add(LLNotification::Params("ConfirmBakeTerrain").functor(functor_params));
}
bool LLPanelRegionTerrainInfo::callbackBakeTerrain(const LLSD& notification, const LLSD& response)
@@ -1478,11 +1481,9 @@ void LLPanelEstateInfo::onClickRemoveAllowedAgent(void* user_data)
accessRemoveCore(ESTATE_ACCESS_ALLOWED_AGENT_REMOVE, "EstateAllowedAgentRemove", "allowed_avatar_name_list");
}
-// static
-void LLPanelEstateInfo::onClickAddAllowedGroup(void* user_data)
+void LLPanelEstateInfo::onClickAddAllowedGroup()
{
- LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
- LLCtrlListInterface *list = self->childGetListInterface("allowed_group_name_list");
+ LLCtrlListInterface *list = childGetListInterface("allowed_group_name_list");
if (!list) return;
if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
{
@@ -1493,7 +1494,7 @@ void LLPanelEstateInfo::onClickAddAllowedGroup(void* user_data)
}
LLNotification::Params params("ChangeLindenAccess");
- params.functor(boost::bind(&LLPanelEstateInfo::addAllowedGroup, self, _1, _2));
+ params.functor.function(boost::bind(&LLPanelEstateInfo::addAllowedGroup, this, _1, _2));
if (isLindenEstate())
{
LLNotifications::instance().add(params);
@@ -1515,7 +1516,7 @@ bool LLPanelEstateInfo::addAllowedGroup(const LLSD& notification, const LLSD& re
widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
if (widget)
{
- widget->setSelectCallback(addAllowedGroup2, NULL);
+ widget->setSelectGroupCallback(boost::bind(&LLPanelEstateInfo::addAllowedGroup2, this, _1));
if (parent_floater)
{
LLRect new_rect = gFloaterView->findNeighboringPosition(parent_floater, widget);
@@ -1656,26 +1657,29 @@ bool LLPanelEstateInfo::kickUserConfirm(const LLSD& notification, const LLSD& re
std::string all_estates_text()
{
LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
- if (!panel) return "(error)";
+ if (!panel) return "(" + LLTrans::getString("RegionInfoError") + ")";
+ LLStringUtil::format_map_t args;
std::string owner = panel->getOwnerName();
LLViewerRegion* region = gAgent.getRegion();
if (gAgent.isGodlike())
{
- return llformat("all estates\nowned by %s", owner.c_str());
+ args["[OWNER]"] = owner.c_str();
+ return LLTrans::getString("RegionInfoAllEstatesOwnedBy", args);
}
else if (region && region->getOwner() == gAgent.getID())
{
- return "all estates you own";
+ return LLTrans::getString("AllEstatesYouOwn");
}
else if (region && region->isEstateManager())
{
- return llformat("all estates that\nyou manage for %s", owner.c_str());
+ args["[OWNER]"] = owner.c_str();
+ return LLTrans::getString("RegionInfoAllEstatesYouManage", args);
}
else
{
- return "(error)";
+ return "(" + LLTrans::getString("RegionInfoError") + ")";
}
}
@@ -1725,8 +1729,7 @@ struct LLEstateAccessChangeInfo
};
// Special case callback for groups, since it has different callback format than names
-// static
-void LLPanelEstateInfo::addAllowedGroup2(LLUUID id, void* user_data)
+void LLPanelEstateInfo::addAllowedGroup2(LLUUID id)
{
LLSD payload;
payload["operation"] = (S32)ESTATE_ACCESS_ALLOWED_GROUP_ADD;
@@ -1739,7 +1742,7 @@ void LLPanelEstateInfo::addAllowedGroup2(LLUUID id, void* user_data)
LLNotification::Params params("EstateAllowedGroupAdd");
params.payload(payload)
.substitutions(args)
- .functor(accessCoreConfirm);
+ .functor.function(accessCoreConfirm);
if (isLindenEstate())
{
LLNotifications::instance().forceResponse(params, 0);
@@ -1760,7 +1763,7 @@ void LLPanelEstateInfo::accessAddCore(U32 operation_flag, const std::string& dia
LLNotification::Params params("ChangeLindenAccess");
params.payload(payload)
- .functor(accessAddCore2);
+ .functor.function(accessAddCore2);
if (isLindenEstate())
{
@@ -1848,7 +1851,7 @@ void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, co
LLNotification::Params params(change_info->mDialogName);
params.substitutions(args)
.payload(change_info->asLLSD())
- .functor(accessCoreConfirm);
+ .functor.function(accessCoreConfirm);
if (isLindenEstate())
{
@@ -1888,7 +1891,7 @@ void LLPanelEstateInfo::accessRemoveCore(U32 operation_flag, const std::string&
LLNotification::Params params("ChangeLindenAccess");
params.payload(payload)
- .functor(accessRemoveCore2);
+ .functor.function(accessRemoveCore2);
if (isLindenEstate())
{
@@ -2121,7 +2124,7 @@ BOOL LLPanelEstateInfo::postBuild()
initCtrl("limit_age_verified");
initCtrl("voice_chat_check");
childSetCommitCallback("abuse_email_address", onChangeAnything, this);
- childSetKeystrokeCallback("abuse_email_address", onChangeText, this);
+ getChild<LLLineEditor>("abuse_email_address")->setKeystrokeCallback(onChangeText, this);
initHelpBtn("estate_manager_help", "HelpEstateEstateManager");
initHelpBtn("use_global_time_help", "HelpEstateUseGlobalTime");
@@ -2161,7 +2164,7 @@ BOOL LLPanelEstateInfo::postBuild()
group_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
}
- childSetAction("add_allowed_group_btn", onClickAddAllowedGroup, this);
+ getChild<LLUICtrl>("add_allowed_group_btn")->setCommitCallback(boost::bind(&LLPanelEstateInfo::onClickAddAllowedGroup, this));
childSetAction("remove_allowed_group_btn", onClickRemoveAllowedGroup, this);
childSetCommitCallback("banned_avatar_name_list", onChangeChildCtrl, this);
@@ -2213,7 +2216,7 @@ BOOL LLPanelEstateInfo::sendUpdate()
llinfos << "LLPanelEsateInfo::sendUpdate()" << llendl;
LLNotification::Params params("ChangeLindenEstate");
- params.functor(boost::bind(&LLPanelEstateInfo::callbackChangeLindenEstate, this, _1, _2));
+ params.functor.function(boost::bind(&LLPanelEstateInfo::callbackChangeLindenEstate, this, _1, _2));
if (getEstateID() <= ESTATE_LAST_LINDEN)
{
@@ -2556,8 +2559,7 @@ void LLPanelEstateInfo::callbackCacheName(
const LLUUID& id,
const std::string& first,
const std::string& last,
- BOOL is_group,
- void*)
+ BOOL is_group)
{
LLPanelEstateInfo* self = LLFloaterRegionInfo::getPanelEstate();
if (!self) return;
@@ -2852,7 +2854,7 @@ void LLPanelEstateCovenant::loadInvItem(LLInventoryItem *itemp)
else
{
mAssetStatus = ASSET_LOADED;
- setCovenantTextEditor("There is no Covenant provided for this Estate.");
+ setCovenantTextEditor(LLTrans::getString("RegionNoCovenant"));
sendChangeCovenantID(LLUUID::null);
}
}
@@ -3063,7 +3065,7 @@ bool LLDispatchEstateUpdateInfo::operator()(
regionp->setOwner(owner_id);
// Update estate owner name in UI
const BOOL is_group = FALSE;
- gCacheName->get(owner_id, is_group, LLPanelEstateInfo::callbackCacheName);
+ gCacheName->get(owner_id, is_group, &LLPanelEstateInfo::callbackCacheName);
U32 estate_id = strtoul(strings[2].c_str(), NULL, 10);
panel->setEstateID(estate_id);
@@ -3162,9 +3164,10 @@ bool LLDispatchSetEstateAccess::operator()(
totalAllowedAgents += allowed_agent_name_list->getItemCount();
}
- std::string msg = llformat("Allowed residents: (%d, max %d)",
- totalAllowedAgents,
- ESTATE_MAX_ACCESS_IDS);
+ LLStringUtil::format_map_t args;
+ args["[ALLOWEDAGENTS]"] = llformat ("%d", totalAllowedAgents);
+ args["[MAXACCESS]"] = llformat ("%d", ESTATE_MAX_ACCESS_IDS);
+ std::string msg = LLTrans::getString("RegionInfoAllowedResidents", args);
panel->childSetValue("allow_resident_label", LLSD(msg));
if (allowed_agent_name_list)
@@ -3186,9 +3189,10 @@ bool LLDispatchSetEstateAccess::operator()(
LLNameListCtrl* allowed_group_name_list;
allowed_group_name_list = panel->getChild<LLNameListCtrl>("allowed_group_name_list");
- std::string msg = llformat("Allowed groups: (%d, max %d)",
- num_allowed_groups,
- (S32) ESTATE_MAX_GROUP_IDS);
+ LLStringUtil::format_map_t args;
+ args["[ALLOWEDGROUPS]"] = llformat ("%d", num_allowed_groups);
+ args["[MAXACCESS]"] = llformat ("%d", ESTATE_MAX_GROUP_IDS);
+ std::string msg = LLTrans::getString("RegionInfoAllowedGroups", args);
panel->childSetValue("allow_group_label", LLSD(msg));
if (allowed_group_name_list)
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index 806d1f57d6..b3a1fcb7ca 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -65,7 +65,7 @@ class LLFloaterRegionInfo : public LLFloater, public LLFloaterSingleton<LLFloate
public:
~LLFloaterRegionInfo();
- /*virtual*/ void onOpen();
+ /*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ BOOL postBuild();
static void processEstateOwnerRequest(LLMessageSystem* msg, void**);
@@ -84,7 +84,7 @@ public:
// from LLPanel
virtual void refresh();
- static void requestRegionInfo();
+ void requestRegionInfo();
protected:
LLFloaterRegionInfo(const LLSD& seed);
@@ -103,7 +103,8 @@ protected:
class LLPanelRegionInfo : public LLPanel
{
public:
- LLPanelRegionInfo() : LLPanel(std::string("Region Info Panel")) {}
+ LLPanelRegionInfo();
+
static void onBtnSet(void* user_data);
static void onChangeChildCtrl(LLUICtrl* ctrl, void* user_data);
static void onChangeAnything(LLUICtrl* ctrl, void* user_data);
@@ -261,7 +262,7 @@ public:
static void onClickAddAllowedAgent(void* user_data);
static void onClickRemoveAllowedAgent(void* user_data);
- static void onClickAddAllowedGroup(void* user_data);
+ void onClickAddAllowedGroup();
static void onClickRemoveAllowedGroup(void* user_data);
static void onClickAddBannedAgent(void* user_data);
static void onClickRemoveBannedAgent(void* user_data);
@@ -271,7 +272,7 @@ public:
// Group picker callback is different, can't use core methods below
bool addAllowedGroup(const LLSD& notification, const LLSD& response);
- static void addAllowedGroup2(LLUUID id, void* data);
+ void addAllowedGroup2(LLUUID id);
// Core methods for all above add/remove button clicks
static void accessAddCore(U32 operation_flag, const std::string& dialog_name);
@@ -339,8 +340,7 @@ public:
const LLUUID& id,
const std::string& first,
const std::string& last,
- BOOL is_group,
- void*);
+ BOOL is_group);
protected:
virtual BOOL sendUpdate();
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 412494eeb3..8ddc929019 100644
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -105,13 +105,9 @@ namespace {
//-----------------------------------------------------------------------------
// Member functions
//-----------------------------------------------------------------------------
-LLFloaterReporter::LLFloaterReporter(
- const std::string& name,
- const LLRect& rect,
- const std::string& title,
- EReportType report_type)
- :
- LLFloater(name, rect, title),
+
+LLFloaterReporter::LLFloaterReporter(EReportType report_type)
+: LLFloater(),
mReportType(report_type),
mObjectID(),
mScreenID(),
@@ -122,37 +118,11 @@ LLFloaterReporter::LLFloaterReporter(
mCopyrightWarningSeen( FALSE ),
mResourceDatap(new LLResourceData())
{
- if (report_type == BUG_REPORT)
- {
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_report_bug.xml");
- }
- else
- {
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_report_abuse.xml");
- }
-
- childSetText("abuse_location_edit", gAgent.getSLURL() );
-
- LLButton* pick_btn = getChild<LLButton>("pick_btn");
- if (pick_btn)
- {
- // XUI: Why aren't these in viewerart.ini?
- pick_btn->setImages( std::string("UIImgFaceUUID"),
- std::string("UIImgFaceSelectedUUID") );
- childSetAction("pick_btn", onClickObjPicker, this);
- }
- if (report_type != BUG_REPORT)
- {
- // abuser name is selected from a list
- LLLineEditor* le = getChild<LLLineEditor>("abuser_name_edit");
- le->setEnabled( FALSE );
- }
-
- childSetAction("select_abuser", onClickSelectAbuser, this);
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_report_abuse.xml");
+
- childSetAction("send_btn", onClickSend, this);
- childSetAction("cancel_btn", onClickCancel, this);
+ childSetText("abuse_location_edit", gAgent.getSLURL() );
enableControls(TRUE);
@@ -182,18 +152,16 @@ LLFloaterReporter::LLFloaterReporter(
gDialogVisible = TRUE;
- // only request details for abuse reports (not BUG reports)
- if (report_type != BUG_REPORT)
- {
- // send a message and ask for information about this region -
- // result comes back in processRegionInfo(..)
- LLMessageSystem* msg = gMessageSystem;
- msg->newMessage("RequestRegionInfo");
- msg->nextBlock("AgentData");
- msg->addUUID("AgentID", gAgent.getID());
- msg->addUUID("SessionID", gAgent.getSessionID());
- gAgent.sendReliableMessage();
- };
+
+ // send a message and ask for information about this region -
+ // result comes back in processRegionInfo(..)
+ LLMessageSystem* msg = gMessageSystem;
+ msg->newMessage("RequestRegionInfo");
+ msg->nextBlock("AgentData");
+ msg->addUUID("AgentID", gAgent.getID());
+ msg->addUUID("SessionID", gAgent.getSessionID());
+ gAgent.sendReliableMessage();
+
}
// static
@@ -213,7 +181,25 @@ void LLFloaterReporter::processRegionInfo(LLMessageSystem* msg)
LLNotifications::instance().add("HelpReportAbuseEmailLL");
};
}
+// virtual
+BOOL LLFloaterReporter::postBuild()
+{
+ // abuser name is selected from a list
+ LLLineEditor* le = getChild<LLLineEditor>("abuser_name_edit");
+ le->setEnabled( FALSE );
+ setPosBox(mPosition.getValue());
+ LLButton* pick_btn = getChild<LLButton>("pick_btn");
+ pick_btn->setImages(std::string("tool_face.tga"),
+ std::string("tool_face_active.tga") );
+ childSetAction("pick_btn", onClickObjPicker, this);
+
+ childSetAction("select_abuser", onClickSelectAbuser, this);
+
+ childSetAction("send_btn", onClickSend, this);
+ childSetAction("cancel_btn", onClickCancel, this);
+ return TRUE;
+}
// virtual
LLFloaterReporter::~LLFloaterReporter()
{
@@ -241,7 +227,7 @@ void LLFloaterReporter::draw()
// this is set by a static callback sometime after the dialog is created.
// Only disable screenshot for abuse reports to estate owners - bug reports always
// allow screenshots to be taken.
- if ( gEmailToEstateOwner && ( mReportType != BUG_REPORT ) )
+ if ( gEmailToEstateOwner )
{
childSetValue("screen_check", FALSE );
childSetEnabled("screen_check", FALSE );
@@ -257,11 +243,7 @@ void LLFloaterReporter::draw()
void LLFloaterReporter::enableControls(BOOL enable)
{
childSetEnabled("category_combo", enable);
- // bug reports never include the chat history
- if (mReportType != BUG_REPORT)
- {
- childSetEnabled("chat_check", enable);
- }
+ childSetEnabled("chat_check", enable);
childSetEnabled("screen_check", enable);
childDisable("screenshot");
childSetEnabled("pick_btn", enable);
@@ -332,7 +314,7 @@ void LLFloaterReporter::getObjectInfo(const LLUUID& object_id)
// we have to query the simulator for information
// about this object
LLMessageSystem* msg = gMessageSystem;
- U32 request_flags = (mReportType == BUG_REPORT) ? BUG_REPORT_REQUEST : COMPLAINT_REPORT_REQUEST;
+ U32 request_flags = COMPLAINT_REPORT_REQUEST;
msg->newMessageFast(_PREHASH_RequestObjectPropertiesFamily);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@@ -363,15 +345,12 @@ void LLFloaterReporter::callbackAvatarID(const std::vector<std::string>& names,
if (ids.empty() || names.empty()) return;
- // this should never be called in a bug report but here for safety.
- if ( self->mReportType != BUG_REPORT )
- {
- self->childSetText("abuser_name_edit", names[0] );
-
- self->mAbuserID = ids[0];
+ self->childSetText("abuser_name_edit", names[0] );
+
+ self->mAbuserID = ids[0];
+
+ self->refresh();
- self->refresh();
- };
}
// static
@@ -386,9 +365,7 @@ void LLFloaterReporter::onClickSend(void *userdata)
if(self->validateReport())
{
- // only show copyright alert for abuse reports
- if ( self->mReportType != BUG_REPORT )
- {
+
const int IP_CONTENT_REMOVAL = 66;
const int IP_PERMISSONS_EXPLOIT = 37;
LLComboBox* combo = self->getChild<LLComboBox>( "category_combo");
@@ -418,7 +395,7 @@ void LLFloaterReporter::onClickSend(void *userdata)
LLNotifications::instance().add("HelpReportAbuseContainsCopyright");
return;
}
- }
+
LLUploadDialog::modalUploadDialog("Uploading...\n\nReport");
// *TODO don't upload image if checkbox isn't checked
@@ -427,7 +404,7 @@ void LLFloaterReporter::onClickSend(void *userdata)
if(!url.empty() || !sshot_url.empty())
{
self->sendReportViaCaps(url, sshot_url, self->gatherReport());
- self->close();
+ self->closeFloater();
}
else
{
@@ -442,7 +419,7 @@ void LLFloaterReporter::onClickSend(void *userdata)
{
self->sendReportViaLegacy(self->gatherReport());
LLUploadDialog::modalUploadFinished();
- self->close();
+ self->closeFloater();
}
}
}
@@ -461,7 +438,7 @@ void LLFloaterReporter::onClickCancel(void *userdata)
{
closePickTool(self);
}
- self->close();
+ self->closeFloater();
}
@@ -501,16 +478,13 @@ void LLFloaterReporter::showFromMenu(EReportType report_type)
{
// ...bring that window to front
LLFloaterReporter *f = gReporterInstances.getData(report_type);
- f->open(); /* Flawfinder: ignore */
+ f->openFloater();
}
else
{
LLFloaterReporter *f;
- if (BUG_REPORT == report_type)
- {
- f = LLFloaterReporter::createNewBugReporter();
- }
- else if (COMPLAINT_REPORT == report_type)
+
+ if (COMPLAINT_REPORT == report_type)
{
f = LLFloaterReporter::createNewAbuseReporter();
}
@@ -557,7 +531,7 @@ void LLFloaterReporter::showFromObject(const LLUUID& object_id)
// Need to deselect on close
f->mDeselectOnClose = TRUE;
- f->open(); /* Flawfinder: ignore */
+ f->openFloater();
}
@@ -575,21 +549,8 @@ LLFloaterReporter* LLFloaterReporter::getReporter(EReportType report_type)
LLFloaterReporter* LLFloaterReporter::createNewAbuseReporter()
{
- return new LLFloaterReporter("complaint_reporter",
- LLRect(),
- "Report Abuse",
- COMPLAINT_REPORT);
-}
-
-//static
-LLFloaterReporter* LLFloaterReporter::createNewBugReporter()
-{
- return new LLFloaterReporter("bug_reporter",
- LLRect(),
- "Report Bug",
- BUG_REPORT);
+ return new LLFloaterReporter(COMPLAINT_REPORT);
}
-
void LLFloaterReporter::setPickedObjectProperties(const std::string& object_name, const std::string& owner_name, const LLUUID owner_id)
@@ -619,21 +580,26 @@ bool LLFloaterReporter::validateReport()
return false;
}
- if ( mReportType != BUG_REPORT )
+
+ if ( childGetText("abuser_name_edit").empty() )
+ {
+ LLNotifications::instance().add("HelpReportAbuseAbuserNameEmpty");
+ return false;
+ };
+
+ if ( childGetText("abuse_location_edit").empty() )
+ {
+ LLNotifications::instance().add("HelpReportAbuseAbuserLocationEmpty");
+ return false;
+ };
+
+ if ( childGetText("abuse_location_edit").empty() )
{
- if ( childGetText("abuser_name_edit").empty() )
- {
- LLNotifications::instance().add("HelpReportAbuseAbuserNameEmpty");
- return false;
- };
-
- if ( childGetText("abuse_location_edit").empty() )
- {
- LLNotifications::instance().add("HelpReportAbuseAbuserLocationEmpty");
- return false;
- };
+ LLNotifications::instance().add("HelpReportAbuseAbuserLocationEmpty");
+ return false;
};
+
if ( childGetText("summary_edit").empty() )
{
if ( mReportType != BUG_REPORT )
@@ -685,50 +651,34 @@ LLSD LLFloaterReporter::gatherReport()
#if LL_WINDOWS
const char* platform = "Win";
- const char* short_platform = "O:W";
#elif LL_DARWIN
const char* platform = "Mac";
- const char* short_platform = "O:M";
#elif LL_LINUX
const char* platform = "Lnx";
- const char* short_platform = "O:L";
#elif LL_SOLARIS
const char* platform = "Sol";
const char* short_platform = "O:S";
#else
const char* platform = "???";
- const char* short_platform = "O:?";
#endif
- if ( mReportType == BUG_REPORT)
- {
- summary << short_platform << " V" << LL_VERSION_MAJOR << "."
- << LL_VERSION_MINOR << "."
- << LL_VERSION_PATCH << "."
- << LL_VIEWER_BUILD
- << " (" << regionp->getName() << ")"
- << "[" << category_name << "] "
- << "\"" << childGetValue("summary_edit").asString() << "\"";
- }
- else
- {
- summary << ""
- << " |" << regionp->getName() << "|" // region reporter is currently in.
- << " (" << childGetText("abuse_location_edit") << ")" // region abuse occured in (freeform text - no LLRegionPicker tool)
- << " [" << category_name << "] " // updated category
- << " {" << childGetText("abuser_name_edit") << "} " // name of abuse entered in report (chosen using LLAvatarPicker)
- << " \"" << childGetValue("summary_edit").asString() << "\""; // summary as entered
- };
+
+ summary << ""
+ << " |" << regionp->getName() << "|" // region reporter is currently in.
+ << " (" << childGetText("abuse_location_edit") << ")" // region abuse occured in (freeform text - no LLRegionPicker tool)
+ << " [" << category_name << "] " // updated category
+ << " {" << childGetText("abuser_name_edit") << "} " // name of abuse entered in report (chosen using LLAvatarPicker)
+ << " \"" << childGetValue("summary_edit").asString() << "\""; // summary as entered
+
std::ostringstream details;
- if (mReportType != BUG_REPORT)
- {
- details << "V" << LL_VERSION_MAJOR << "." // client version moved to body of email for abuse reports
- << LL_VERSION_MINOR << "."
- << LL_VERSION_PATCH << "."
- << LL_VIEWER_BUILD << std::endl << std::endl;
- }
+
+ details << "V" << LL_VERSION_MAJOR << "." // client version moved to body of email for abuse reports
+ << LL_VERSION_MINOR << "."
+ << LL_VERSION_PATCH << "."
+ << LL_VIEWER_BUILD << std::endl << std::endl;
+
std::string object_name = childGetText("object_name");
std::string owner_name = childGetText("owner_name");
if (!object_name.empty() && !owner_name.empty())
@@ -737,11 +687,9 @@ LLSD LLFloaterReporter::gatherReport()
details << "Owner: " << owner_name << "\n";
}
- if ( mReportType != BUG_REPORT )
- {
- details << "Abuser name: " << childGetText("abuser_name_edit") << " \n";
- details << "Abuser location: " << childGetText("abuse_location_edit") << " \n";
- };
+
+ details << "Abuser name: " << childGetText("abuser_name_edit") << " \n";
+ details << "Abuser location: " << childGetText("abuse_location_edit") << " \n";
details << childGetValue("details_edit").asString();
@@ -761,17 +709,11 @@ LLSD LLFloaterReporter::gatherReport()
LLUUID screenshot_id = LLUUID::null;
if (childGetValue("screen_check"))
{
- if ( mReportType != BUG_REPORT )
- {
- if ( gEmailToEstateOwner == FALSE )
- {
- screenshot_id = childGetValue("screenshot");
- }
- }
- else
+
+ if ( gEmailToEstateOwner == FALSE )
{
screenshot_id = childGetValue("screenshot");
- };
+ }
};
LLSD report = LLSD::emptyMap();
@@ -891,12 +833,8 @@ void LLFloaterReporter::takeScreenshot()
mResourceDatap->mExpectedUploadCost = 0; // we expect that abuse screenshots are free
mResourceDatap->mAssetInfo.mTransactionID.generate();
mResourceDatap->mAssetInfo.mUuid = mResourceDatap->mAssetInfo.mTransactionID.makeAssetID(gAgent.getSecureSessionID());
- if (BUG_REPORT == mReportType)
- {
- mResourceDatap->mAssetInfo.mType = LLAssetType::AT_TEXTURE;
- mResourceDatap->mPreferredLocation = LLAssetType::EType(-1);
- }
- else if (COMPLAINT_REPORT == mReportType)
+
+ if (COMPLAINT_REPORT == mReportType)
{
mResourceDatap->mAssetInfo.mType = LLAssetType::AT_TEXTURE;
mResourceDatap->mPreferredLocation = LLAssetType::EType(-2);
@@ -927,7 +865,7 @@ void LLFloaterReporter::takeScreenshot()
{
texture->setImageAssetID(mResourceDatap->mAssetInfo.mUuid);
texture->setDefaultImageAssetID(mResourceDatap->mAssetInfo.mUuid);
- texture->setCaption(std::string("Screenshot"));
+ texture->setCaption(getString("Screenshot"));
}
}
@@ -967,11 +905,7 @@ void LLFloaterReporter::uploadDoneCallback(const LLUUID &uuid, void *user_data,
}
EReportType report_type = UNKNOWN_REPORT;
- if (data->mPreferredLocation == -1)
- {
- report_type = BUG_REPORT;
- }
- else if (data->mPreferredLocation == -2)
+ if (data->mPreferredLocation == -2)
{
report_type = COMPLAINT_REPORT;
}
@@ -986,7 +920,7 @@ void LLFloaterReporter::uploadDoneCallback(const LLUUID &uuid, void *user_data,
self->mScreenID = uuid;
llinfos << "Got screen shot " << uuid << llendl;
self->sendReportViaLegacy(self->gatherReport());
- self->close();
+ self->closeFloater();
}
}
diff --git a/indra/newview/llfloaterreporter.h b/indra/newview/llfloaterreporter.h
index 86bc60559e..da1dda9c78 100644
--- a/indra/newview/llfloaterreporter.h
+++ b/indra/newview/llfloaterreporter.h
@@ -82,12 +82,9 @@ class LLFloaterReporter
: public LLFloater
{
public:
- LLFloaterReporter(const std::string& name,
- const LLRect &rect,
- const std::string& title,
- EReportType = UNKNOWN_REPORT);
+ LLFloaterReporter(EReportType = UNKNOWN_REPORT);
/*virtual*/ ~LLFloaterReporter();
-
+ /*virtual*/ BOOL postBuild();
virtual void draw();
// Enables all buttons
@@ -107,7 +104,6 @@ public:
// returns a pointer to reporter of report_type
static LLFloaterReporter* getReporter(EReportType report_type);
static LLFloaterReporter* createNewAbuseReporter();
- static LLFloaterReporter* createNewBugReporter();
// static
static void processRegionInfo(LLMessageSystem* msg);
diff --git a/indra/newview/llfloaterscriptdebug.cpp b/indra/newview/llfloaterscriptdebug.cpp
index bc774e77ac..b2bb343681 100644
--- a/indra/newview/llfloaterscriptdebug.cpp
+++ b/indra/newview/llfloaterscriptdebug.cpp
@@ -52,12 +52,17 @@
//
LLFloaterScriptDebug* LLFloaterScriptDebug::sInstance = NULL;
+void* getOutputWindow(void* data);
+
//
// Member Functions
//
-LLFloaterScriptDebug::LLFloaterScriptDebug() :
- LLMultiFloater()
+LLFloaterScriptDebug::LLFloaterScriptDebug(const std::string& filename)
+ : LLMultiFloater()
{
+ mFactoryMap["all_scripts"] = LLCallbackMap(getOutputWindow, NULL);
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_script_debug.xml");
+
// avoid resizing of the window to match
// the initial size of the tabbed-childs, whenever a tab is opened or closed
mAutoResize = FALSE;
@@ -73,8 +78,11 @@ void LLFloaterScriptDebug::show(const LLUUID& object_id)
LLFloater* floaterp = addOutputWindow(object_id);
if (sInstance)
{
- sInstance->open(); /* Flawfinder: ignore */
- sInstance->showFloater(floaterp);
+ sInstance->openFloater(object_id);
+ if (object_id.notNull())
+ sInstance->showFloater(floaterp, LLTabContainer::END);
+// else // Jump to [All scripts], but keep it on the left
+// sInstance->showFloater(floaterp, LLTabContainer::START);
}
}
@@ -95,25 +103,19 @@ BOOL LLFloaterScriptDebug::postBuild()
void* getOutputWindow(void* data)
{
- return new LLFloaterScriptDebugOutput();
+ return new LLFloaterScriptDebugOutput(LLUUID::null);
}
LLFloater* LLFloaterScriptDebug::addOutputWindow(const LLUUID &object_id)
{
if (!sInstance)
{
- sInstance = new LLFloaterScriptDebug();
- LLCallbackMap::map_t factory_map;
- factory_map["all_scripts"] = LLCallbackMap(getOutputWindow, NULL);
- LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_script_debug.xml", &factory_map);
+ sInstance = new LLFloaterScriptDebug("floater_script_debug.xml");
sInstance->setVisible(FALSE);
}
- LLFloater* floaterp = NULL;
LLFloater::setFloaterHost(sInstance);
- {
- floaterp = LLFloaterScriptDebugOutput::show(object_id);
- }
+ LLFloater* floaterp = LLFloaterScriptDebugOutput::show(object_id);
LLFloater::setFloaterHost(NULL);
// Tabs sometimes overlap resize handle
@@ -155,54 +157,19 @@ void LLFloaterScriptDebug::addScriptLine(const std::string &utf8mesg, const std:
std::map<LLUUID, LLFloaterScriptDebugOutput*> LLFloaterScriptDebugOutput::sInstanceMap;
-LLFloaterScriptDebugOutput::LLFloaterScriptDebugOutput()
-: mObjectID(LLUUID::null)
-{
- sInstanceMap[mObjectID] = this;
-}
-
LLFloaterScriptDebugOutput::LLFloaterScriptDebugOutput(const LLUUID& object_id)
-: LLFloater(std::string("script instance floater"), LLRect(0, 200, 200, 0), std::string("Script"), TRUE), mObjectID(object_id)
+ : LLFloater(),
+ mObjectID(object_id)
{
- S32 y = getRect().getHeight() - LLFLOATER_HEADER_SIZE - LLFLOATER_VPAD;
- S32 x = LLFLOATER_HPAD;
- // History editor
- // Give it a border on the top
- LLRect history_editor_rect(
- x,
- y,
- getRect().getWidth() - LLFLOATER_HPAD,
- LLFLOATER_VPAD );
- mHistoryEditor = new LLViewerTextEditor( std::string("Chat History Editor"),
- history_editor_rect, S32_MAX, LLStringUtil::null, LLFontGL::getFontSansSerif());
- mHistoryEditor->setWordWrap( TRUE );
- mHistoryEditor->setFollowsAll();
- mHistoryEditor->setEnabled( FALSE );
- mHistoryEditor->setTabStop( TRUE ); // We want to be able to cut or copy from the history.
- addChild(mHistoryEditor);
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_script_debug_panel.xml");
+ sInstanceMap[object_id] = this;
}
-void LLFloaterScriptDebugOutput::initFloater(const std::string& title, BOOL resizable,
- S32 min_width, S32 min_height, BOOL drag_on_left,
- BOOL minimizable, BOOL close_btn)
+BOOL LLFloaterScriptDebugOutput::postBuild()
{
- LLFloater::initFloater(title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
- S32 y = getRect().getHeight() - LLFLOATER_HEADER_SIZE - LLFLOATER_VPAD;
- S32 x = LLFLOATER_HPAD;
- // History editor
- // Give it a border on the top
- LLRect history_editor_rect(
- x,
- y,
- getRect().getWidth() - LLFLOATER_HPAD,
- LLFLOATER_VPAD );
- mHistoryEditor = new LLViewerTextEditor( std::string("Chat History Editor"),
- history_editor_rect, S32_MAX, LLStringUtil::null, LLFontGL::getFontSansSerif());
- mHistoryEditor->setWordWrap( TRUE );
- mHistoryEditor->setFollowsAll();
- mHistoryEditor->setEnabled( FALSE );
- mHistoryEditor->setTabStop( TRUE ); // We want to be able to cut or copy from the history.
- addChild(mHistoryEditor);
+ LLFloater::postBuild();
+ mHistoryEditor = getChild<LLViewerTextEditor>("Chat History Editor");
+ return TRUE;
}
LLFloaterScriptDebugOutput::~LLFloaterScriptDebugOutput()
@@ -214,13 +181,13 @@ void LLFloaterScriptDebugOutput::addLine(const std::string &utf8mesg, const std:
{
if (mObjectID.isNull())
{
- //setTitle("[All scripts]");
setCanTearOff(FALSE);
setCanClose(FALSE);
}
else
{
setTitle(user_name);
+ setShortTitle(user_name);
}
mHistoryEditor->appendColoredText(utf8mesg, false, true, color);
@@ -234,8 +201,7 @@ LLFloaterScriptDebugOutput* LLFloaterScriptDebugOutput::show(const LLUUID& objec
if (found_it == sInstanceMap.end())
{
floaterp = new LLFloaterScriptDebugOutput(object_id);
- sInstanceMap[object_id] = floaterp;
- floaterp->open(); /* Flawfinder: ignore*/
+ floaterp->openFloater();
}
else
{
diff --git a/indra/newview/llfloaterscriptdebug.h b/indra/newview/llfloaterscriptdebug.h
index 59c0ba1c8b..5f2cf48125 100644
--- a/indra/newview/llfloaterscriptdebug.h
+++ b/indra/newview/llfloaterscriptdebug.h
@@ -33,7 +33,7 @@
#ifndef LL_LLFLOATERSCRIPTDEBUG_H
#define LL_LLFLOATERSCRIPTDEBUG_H
-#include "llfloater.h"
+#include "llmultifloater.h"
class LLTextEditor;
class LLUUID;
@@ -48,7 +48,7 @@ public:
static void addScriptLine(const std::string &utf8mesg, const std::string &user_name, const LLColor4& color, const LLUUID& source_id);
protected:
- LLFloaterScriptDebug();
+ LLFloaterScriptDebug(const std::string& filename);
static LLFloater* addOutputWindow(const LLUUID& object_id);
@@ -63,12 +63,10 @@ public:
LLFloaterScriptDebugOutput(const LLUUID& object_id);
~LLFloaterScriptDebugOutput();
- virtual void initFloater(const std::string& title, BOOL resizable,
- S32 min_width, S32 min_height, BOOL drag_on_left,
- BOOL minimizable, BOOL close_btn);
-
void addLine(const std::string &utf8mesg, const std::string &user_name, const LLColor4& color);
+ virtual BOOL postBuild();
+
static LLFloaterScriptDebugOutput* show(const LLUUID& object_id);
static LLFloaterScriptDebugOutput* getFloaterByID(const LLUUID& id);
diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp
index 92e070f766..6775e218cb 100644
--- a/indra/newview/llfloatersellland.cpp
+++ b/indra/newview/llfloatersellland.cpp
@@ -88,7 +88,6 @@ private:
public:
virtual BOOL postBuild();
- virtual void onClose(bool app_quitting);
static LLFloaterSellLandUI* soleInstance(bool createIfNeeded);
@@ -109,7 +108,7 @@ void LLFloaterSellLand::sellLand(
LLFloaterSellLandUI* ui = LLFloaterSellLandUI::soleInstance(true);
if (ui->setParcel(region, parcel))
{
- ui->open(); /* Flawfinder: ignore */
+ ui->openFloater();
}
}
@@ -139,7 +138,7 @@ LLFloaterSellLandUI* LLFloaterSellLandUI::soleInstance(bool createIfNeeded)
}
LLFloaterSellLandUI::LLFloaterSellLandUI()
-: LLFloater(std::string("Sell Land")),
+: LLFloater(),
mRegion(0)
{
}
@@ -159,7 +158,7 @@ void LLFloaterSellLandUI::SelectionObserver::changed()
{
if (LLViewerParcelMgr::getInstance()->selectionEmpty())
{
- ui->close();
+ ui->closeFloater();
}
else {
ui->setParcel(
@@ -169,12 +168,6 @@ void LLFloaterSellLandUI::SelectionObserver::changed()
}
}
-void LLFloaterSellLandUI::onClose(bool app_quitting)
-{
- LLFloater::onClose(app_quitting);
- destroy();
-}
-
BOOL LLFloaterSellLandUI::postBuild()
{
childSetCommitCallback("sell_to", onChangeValue, this);
@@ -432,7 +425,7 @@ void LLFloaterSellLandUI::callbackAvatarPick(const std::vector<std::string>& nam
void LLFloaterSellLandUI::doCancel(void *userdata)
{
LLFloaterSellLandUI* self = (LLFloaterSellLandUI*)userdata;
- self->close();
+ self->closeFloater();
}
// static
@@ -490,7 +483,7 @@ void LLFloaterSellLandUI::doSellLand(void *userdata)
LLNotification::Params params("ConfirmLandSaleChange");
params.substitutions(args)
- .functor(boost::bind(&LLFloaterSellLandUI::onConfirmSale, self, _1, _2));
+ .functor.function(boost::bind(&LLFloaterSellLandUI::onConfirmSale, self, _1, _2));
if (sell_to_anyone)
{
@@ -556,6 +549,6 @@ bool LLFloaterSellLandUI::onConfirmSale(const LLSD& notification, const LLSD& re
// Send update to server
LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate( parcel );
- close();
+ closeFloater();
return false;
}
diff --git a/indra/newview/llfloatersellland.h b/indra/newview/llfloatersellland.h
index 1b3a33ebb8..12b0ecbcef 100644
--- a/indra/newview/llfloatersellland.h
+++ b/indra/newview/llfloatersellland.h
@@ -31,7 +31,8 @@
#ifndef LL_LLFLOATERSELLLAND_H
#define LL_LLFLOATERSELLLAND_H
-#include "llmemory.h"
+
+#include "llsafehandle.h"
class LLParcel;
class LLViewerRegion;
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 2677467611..9b591496f7 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -40,16 +40,15 @@
#include "llcolorswatch.h"
#include "llviewercontrol.h"
-LLFloaterSettingsDebug* LLFloaterSettingsDebug::sInstance = NULL;
-LLFloaterSettingsDebug::LLFloaterSettingsDebug() : LLFloater(std::string("Configuration Editor"))
+LLFloaterSettingsDebug::LLFloaterSettingsDebug(const LLSD& key)
+: LLFloater()
{
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_settings_debug.xml");
}
LLFloaterSettingsDebug::~LLFloaterSettingsDebug()
-{
- sInstance = NULL;
-}
+{}
BOOL LLFloaterSettingsDebug::postBuild()
{
@@ -70,27 +69,19 @@ BOOL LLFloaterSettingsDebug::postBuild()
gSavedSettings.applyToAll(&func);
gSavedPerAccountSettings.applyToAll(&func);
- gColors.applyToAll(&func);
+ gSavedSkinSettings.applyToAll(&func);
settings_combo->sortByName();
- settings_combo->setCommitCallback(onSettingSelect);
- settings_combo->setCallbackUserData(this);
+ settings_combo->setCommitCallback(onSettingSelect, this);
settings_combo->updateSelection();
- childSetCommitCallback("val_spinner_1", onCommitSettings);
- childSetUserData("val_spinner_1", this);
- childSetCommitCallback("val_spinner_2", onCommitSettings);
- childSetUserData("val_spinner_2", this);
- childSetCommitCallback("val_spinner_3", onCommitSettings);
- childSetUserData("val_spinner_3", this);
- childSetCommitCallback("val_spinner_4", onCommitSettings);
- childSetUserData("val_spinner_4", this);
- childSetCommitCallback("val_text", onCommitSettings);
- childSetUserData("val_text", this);
- childSetCommitCallback("boolean_combo", onCommitSettings);
- childSetUserData("boolean_combo", this);
- childSetCommitCallback("color_swatch", onCommitSettings);
- childSetUserData("color_swatch", this);
+ childSetCommitCallback("val_spinner_1", onCommitSettings, this);
+ childSetCommitCallback("val_spinner_2", onCommitSettings, this);
+ childSetCommitCallback("val_spinner_3", onCommitSettings, this);
+ childSetCommitCallback("val_spinner_4", onCommitSettings, this);
+ childSetCommitCallback("val_text", onCommitSettings, this);
+ childSetCommitCallback("boolean_combo", onCommitSettings, this);
+ childSetCommitCallback("color_swatch", onCommitSettings, this);
childSetAction("default_btn", onClickDefault, this);
mComment = getChild<LLTextEditor>("comment_text");
return TRUE;
@@ -105,19 +96,6 @@ void LLFloaterSettingsDebug::draw()
LLFloater::draw();
}
-//static
-void LLFloaterSettingsDebug::show(void*)
-{
- if (sInstance == NULL)
- {
- sInstance = new LLFloaterSettingsDebug();
-
- LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_settings_debug.xml");
- }
-
- sInstance->open(); /* Flawfinder: ignore */
-}
-
//static
void LLFloaterSettingsDebug::onSettingSelect(LLUICtrl* ctrl, void* user_data)
{
@@ -192,12 +170,6 @@ void LLFloaterSettingsDebug::onCommitSettings(LLUICtrl* ctrl, void* user_data)
//col3.mV[VBLUE] = (F32)floaterp->childGetValue("val_spinner_3").asReal();
//controlp->set(col3.getValue());
break;
- case TYPE_COL4U:
- col3.setValue(floaterp->childGetValue("color_swatch"));
- col4U.setVecScaleClamp(col3);
- col4U.mV[VALPHA] = floaterp->childGetValue("val_spinner_4").asInteger();
- controlp->set(col4U.getValue());
- break;
default:
break;
}
@@ -464,29 +436,6 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
color_swatch->setValue(sd);
break;
}
- case TYPE_COL4U:
- {
- LLColor4U clr;
- clr.setValue(sd);
- color_swatch->setVisible(TRUE);
- if(LLColor4(clr) != LLColor4(color_swatch->getValue()))
- {
- color_swatch->set(LLColor4(clr), TRUE, FALSE);
- }
- spinner4->setVisible(TRUE);
- spinner4->setLabel(std::string("Alpha"));
- if(!spinner4->hasFocus())
- {
- spinner4->setPrecision(0);
- spinner4->setValue(clr.mV[VALPHA]);
- }
-
- spinner4->setMinValue(0);
- spinner4->setMaxValue(255);
- spinner4->setIncrement(1.f);
-
- break;
- }
default:
mComment->setText(std::string("unknown"));
break;
diff --git a/indra/newview/llfloatersettingsdebug.h b/indra/newview/llfloatersettingsdebug.h
index e08e6b5d74..1190e8038f 100644
--- a/indra/newview/llfloatersettingsdebug.h
+++ b/indra/newview/llfloatersettingsdebug.h
@@ -37,10 +37,12 @@
#include "llfloater.h"
#include "lltexteditor.h"
-class LLFloaterSettingsDebug : public LLFloater
+class LLFloaterSettingsDebug
+: public LLFloater,
+ public LLFloaterSingleton<LLFloaterSettingsDebug>
{
public:
- LLFloaterSettingsDebug();
+ LLFloaterSettingsDebug(const LLSD& key);
virtual ~LLFloaterSettingsDebug();
virtual BOOL postBuild();
@@ -48,13 +50,11 @@ public:
void updateControl(LLControlVariable* control);
- static void show(void*);
static void onSettingSelect(LLUICtrl* ctrl, void* user_data);
static void onCommitSettings(LLUICtrl* ctrl, void* user_data);
static void onClickDefault(void* user_data);
protected:
- static LLFloaterSettingsDebug* sInstance;
LLTextEditor* mComment;
};
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 34dbce67c2..74b7ee1106 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -34,15 +34,9 @@
#include "llfloatersnapshot.h"
-#include "llfontgl.h"
-#include "llsys.h"
-#include "llgl.h"
-#include "llrender.h"
-#include "v3dmath.h"
-#include "llmath.h"
-#include "lldir.h"
-#include "llsdserialize.h"
+#include "llfloaterreg.h"
+// Viewer includes
#include "llagent.h"
#include "llcallbacklist.h"
#include "llcriticaldamp.h"
@@ -67,14 +61,24 @@
#include "lltoolmgr.h"
#include "llworld.h"
+// Linden library includes
+#include "llfontgl.h"
+#include "llsys.h"
+#include "llrender.h"
+#include "v3dmath.h"
+#include "llmath.h"
+#include "lldir.h"
+#include "llsdserialize.h"
#include "llgl.h"
#include "llglheaders.h"
#include "llimagejpeg.h"
#include "llimagepng.h"
#include "llimagebmp.h"
#include "llimagej2c.h"
+#include "llresmgr.h" // LLLocale
#include "llvfile.h"
#include "llvfs.h"
+#include "llwindow.h"
///----------------------------------------------------------------------------
/// Local function declarations, constants, enums, and typedefs
@@ -85,8 +89,6 @@ S32 LLFloaterSnapshot::sUIWinWidth = 215 ;
LLSnapshotFloaterView* gSnapshotFloaterView = NULL;
-LLFloaterSnapshot* LLFloaterSnapshot::sInstance = NULL;
-
const F32 AUTO_SNAPSHOT_TIME_DELAY = 1.f;
F32 SHINE_TIME = 0.5f;
@@ -112,7 +114,17 @@ public:
};
- LLSnapshotLivePreview(const LLRect& rect);
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Params()
+ {
+ name = "snapshot_live_preview";
+ mouse_opaque = false;
+ }
+ };
+
+
+ LLSnapshotLivePreview(const LLSnapshotLivePreview::Params& p);
~LLSnapshotLivePreview();
/*virtual*/ void draw();
@@ -200,8 +212,9 @@ public:
};
std::set<LLSnapshotLivePreview*> LLSnapshotLivePreview::sList;
-LLSnapshotLivePreview::LLSnapshotLivePreview (const LLRect& rect) :
- LLView(std::string("snapshot_live_preview"), rect, FALSE),
+
+LLSnapshotLivePreview::LLSnapshotLivePreview (const LLSnapshotLivePreview::Params& p)
+: LLView(p),
mColor(1.f, 0.f, 0.f, 0.5f),
mCurImageIndex(0),
mPreviewImage(NULL),
@@ -472,10 +485,6 @@ void LLSnapshotLivePreview::draw()
}
else if (mShineAnimTimer.getStarted())
{
- //LLDebugVarMessageBox::show("Shine time", &SHINE_TIME, 10.f, 0.1f);
- //LLDebugVarMessageBox::show("Shine width", &SHINE_WIDTH, 2.f, 0.05f);
- //LLDebugVarMessageBox::show("Shine opacity", &SHINE_OPACITY, 1.f, 0.05f);
-
F32 shine_interp = llmin(1.f, mShineAnimTimer.getElapsedTimeF32() / SHINE_TIME);
// draw "shine" effect
@@ -1053,9 +1062,6 @@ public:
static void updateLayout(LLFloaterSnapshot* floater);
static void updateResolutionTextEntry(LLFloaterSnapshot* floater);
- static LLHandle<LLView> sPreviewHandle;
- static BOOL sAspectRatioCheckOff ;
-
private:
static LLSnapshotLivePreview::ESnapshotType getTypeIndex(LLFloaterSnapshot* floater);
static ESnapshotFormat getFormatIndex(LLFloaterSnapshot* floater);
@@ -1068,18 +1074,14 @@ public:
std::vector<LLAnimPauseRequest> mAvatarPauseHandles;
LLToolset* mLastToolset;
+ LLHandle<LLView> mPreviewHandle;
+ BOOL mAspectRatioCheckOff ;
};
-// static
-LLHandle<LLView> LLFloaterSnapshot::Impl::sPreviewHandle;
-
-//static
-BOOL LLFloaterSnapshot::Impl::sAspectRatioCheckOff = FALSE ;
-
// static
LLSnapshotLivePreview* LLFloaterSnapshot::Impl::getPreviewView(LLFloaterSnapshot *floater)
{
- LLSnapshotLivePreview* previewp = (LLSnapshotLivePreview*)sPreviewHandle.get();
+ LLSnapshotLivePreview* previewp = (LLSnapshotLivePreview*)floater->impl.mPreviewHandle.get();
return previewp;
}
@@ -1186,7 +1188,7 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
iter != LLCharacter::sInstances.end(); ++iter)
{
avatarp = *iter;
- sInstance->impl.mAvatarPauseHandles.push_back(avatarp->requestPause());
+ floaterp->impl.mAvatarPauseHandles.push_back(avatarp->requestPause());
}
// freeze everything else
@@ -1194,7 +1196,7 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
if (LLToolMgr::getInstance()->getCurrentToolset() != gCameraToolset)
{
- sInstance->impl.mLastToolset = LLToolMgr::getInstance()->getCurrentToolset();
+ floaterp->impl.mLastToolset = LLToolMgr::getInstance()->getCurrentToolset();
LLToolMgr::getInstance()->setCurrentToolset(gCameraToolset);
}
}
@@ -1209,15 +1211,15 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp)
}
//RN: thaw all avatars
- sInstance->impl.mAvatarPauseHandles.clear();
+ floaterp->impl.mAvatarPauseHandles.clear();
// thaw everything else
gSavedSettings.setBOOL("FreezeTime", FALSE);
// restore last tool (e.g. pie menu, etc)
- if (sInstance->impl.mLastToolset)
+ if (floaterp->impl.mLastToolset)
{
- LLToolMgr::getInstance()->setCurrentToolset(sInstance->impl.mLastToolset);
+ LLToolMgr::getInstance()->setCurrentToolset(floaterp->impl.mLastToolset);
}
}
}
@@ -1248,7 +1250,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
floater->childSetVisible("upload_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE);
floater->childSetVisible("send_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD);
floater->childSetVisible("save_btn", shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL);
- floater->childSetEnabled("keep_aspect_check", shot_type != LLSnapshotLivePreview::SNAPSHOT_TEXTURE && !sAspectRatioCheckOff);
+ floater->childSetEnabled("keep_aspect_check", shot_type != LLSnapshotLivePreview::SNAPSHOT_TEXTURE && !floater->impl.mAspectRatioCheckOff);
floater->childSetEnabled("layer_types", shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL);
BOOL is_advance = gSavedSettings.getBOOL("AdvanceSnapshot");
@@ -1295,7 +1297,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
floater->childSetColor("file_size_label",
shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD
&& got_bytes
- && previewp->getDataSize() > MAX_POSTCARD_DATASIZE ? LLColor4::red : gColors.getColor( "LabelTextColor" ));
+ && previewp->getDataSize() > MAX_POSTCARD_DATASIZE ? LLColor4::red : LLUI::sSettingGroups["color"]->getColor( "LabelTextColor" ));
switch(shot_type)
{
@@ -1369,7 +1371,7 @@ void LLFloaterSnapshot::Impl::onClickDiscard(void* data)
LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
if (view)
{
- view->close();
+ view->closeFloater();
}
}
@@ -1415,7 +1417,7 @@ void LLFloaterSnapshot::Impl::onClickKeep(void* data)
if (gSavedSettings.getBOOL("CloseSnapshotOnKeep"))
{
- view->close();
+ view->closeFloater();
}
else
{
@@ -1596,7 +1598,7 @@ void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 inde
if(0 == index) //current window size
{
- sAspectRatioCheckOff = TRUE ;
+ view->impl.mAspectRatioCheckOff = TRUE ;
view->childSetEnabled("keep_aspect_check", FALSE) ;
if(previewp)
@@ -1606,7 +1608,7 @@ void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 inde
}
else if(-1 == index) //custom
{
- sAspectRatioCheckOff = FALSE ;
+ view->impl.mAspectRatioCheckOff = FALSE ;
//if(LLSnapshotLivePreview::SNAPSHOT_TEXTURE != gSavedSettings.getS32("LastSnapshotType"))
{
view->childSetEnabled("keep_aspect_check", TRUE) ;
@@ -1619,7 +1621,7 @@ void LLFloaterSnapshot::Impl::checkAspectRatio(LLFloaterSnapshot *view, S32 inde
}
else
{
- sAspectRatioCheckOff = TRUE ;
+ view->impl.mAspectRatioCheckOff = TRUE ;
view->childSetEnabled("keep_aspect_check", FALSE) ;
if(previewp)
@@ -1955,21 +1957,17 @@ void LLFloaterSnapshot::Impl::onCommitCustomResolution(LLUICtrl *ctrl, void* dat
///----------------------------------------------------------------------------
// Default constructor
-LLFloaterSnapshot::LLFloaterSnapshot()
- : LLFloater(std::string("Snapshot Floater")),
+LLFloaterSnapshot::LLFloaterSnapshot(const LLSD& key)
+ : LLFloater(key),
impl (*(new Impl))
{
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_snapshot.xml", FALSE);
}
// Destroys the object
LLFloaterSnapshot::~LLFloaterSnapshot()
{
- if (sInstance == this)
- {
- LLView::deleteViewByHandle(Impl::sPreviewHandle);
- Impl::sPreviewHandle = LLHandle<LLView>();
- sInstance = NULL;
- }
+ LLView::deleteViewByHandle(impl.mPreviewHandle);
//unfreeze everything else
gSavedSettings.setBOOL("FreezeTime", FALSE);
@@ -2034,16 +2032,22 @@ BOOL LLFloaterSnapshot::postBuild()
childSetCommitCallback("local_size_combo", Impl::onCommitResolution, this);
// create preview window
- LLRect full_screen_rect = sInstance->getRootView()->getRect();
- LLSnapshotLivePreview* previewp = new LLSnapshotLivePreview(full_screen_rect);
- sInstance->getRootView()->removeChild(gSnapshotFloaterView);
+ LLRect full_screen_rect = getRootView()->getRect();
+ LLSnapshotLivePreview::Params p;
+ p.rect(full_screen_rect);
+ LLSnapshotLivePreview* previewp = new LLSnapshotLivePreview(p);
+ getRootView()->removeChild(gSnapshotFloaterView);
// make sure preview is below snapshot floater
- sInstance->getRootView()->addChild(previewp);
- sInstance->getRootView()->addChild(gSnapshotFloaterView);
-
- Impl::sPreviewHandle = previewp->getHandle();
+ getRootView()->addChild(previewp);
+ getRootView()->addChild(gSnapshotFloaterView);
+
+ //move snapshot floater to special purpose snapshotfloaterview
+ gFloaterView->removeChild(this);
+ gSnapshotFloaterView->addChild(this);
+ impl.mPreviewHandle = previewp->getHandle();
impl.updateControls(this);
+ impl.updateLayout(this);
return TRUE;
}
@@ -2077,54 +2081,34 @@ void LLFloaterSnapshot::draw()
}
}
-void LLFloaterSnapshot::onClose(bool app_quitting)
-{
- gSnapshotFloaterView->setEnabled(FALSE);
- // Set invisible so it doesn't eat tooltips. JC
- gSnapshotFloaterView->setVisible(FALSE);
- destroy();
-}
-
-// static
-void LLFloaterSnapshot::show(void*)
+void LLFloaterSnapshot::onOpen(const LLSD& key)
{
- if (!sInstance)
- {
- sInstance = new LLFloaterSnapshot();
- LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_snapshot.xml", NULL, FALSE);
- //move snapshot floater to special purpose snapshotfloaterview
- gFloaterView->removeChild(sInstance);
- gSnapshotFloaterView->addChild(sInstance);
-
- sInstance->impl.updateLayout(sInstance);
- }
- else // just refresh the snapshot in the existing floater instance (DEV-12255)
+ LLSnapshotLivePreview* preview = LLFloaterSnapshot::Impl::getPreviewView(this);
+ if(preview)
{
- LLSnapshotLivePreview* preview = LLFloaterSnapshot::Impl::getPreviewView(sInstance);
- if(preview)
- {
- preview->updateSnapshot(TRUE);
- }
+ preview->updateSnapshot(TRUE);
}
-
- sInstance->open(); /* Flawfinder: ignore */
- sInstance->focusFirstItem(FALSE);
+ focusFirstItem(FALSE);
gSnapshotFloaterView->setEnabled(TRUE);
gSnapshotFloaterView->setVisible(TRUE);
- gSnapshotFloaterView->adjustToFitScreen(sInstance, FALSE);
+ gSnapshotFloaterView->adjustToFitScreen(this, FALSE);
}
-void LLFloaterSnapshot::hide(void*)
+void LLFloaterSnapshot::onClose(bool app_quitting)
{
- if (sInstance && !sInstance->isDead())
- {
- sInstance->close();
- }
+ gSnapshotFloaterView->setEnabled(FALSE);
+ // Set invisible so it doesn't eat tooltips. JC
+ gSnapshotFloaterView->setVisible(FALSE);
+ destroy();
}
//static
void LLFloaterSnapshot::update()
{
+ LLFloaterSnapshot* inst = LLFloaterReg::findTypedInstance<LLFloaterSnapshot>("snapshot");
+ if (!inst)
+ return;
+
BOOL changed = FALSE;
for (std::set<LLSnapshotLivePreview*>::iterator iter = LLSnapshotLivePreview::sList.begin();
iter != LLSnapshotLivePreview::sList.end(); ++iter)
@@ -2133,7 +2117,7 @@ void LLFloaterSnapshot::update()
}
if(changed)
{
- sInstance->impl.updateControls(sInstance);
+ inst->impl.updateControls(inst);
}
}
@@ -2142,10 +2126,8 @@ void LLFloaterSnapshot::update()
/// Class LLSnapshotFloaterView
///----------------------------------------------------------------------------
-LLSnapshotFloaterView::LLSnapshotFloaterView( const std::string& name, const LLRect& rect ) : LLFloaterView(name, rect)
+LLSnapshotFloaterView::LLSnapshotFloaterView (const Params& p) : LLFloaterView (p)
{
- setMouseOpaque(TRUE);
- setEnabled(FALSE);
}
LLSnapshotFloaterView::~LLSnapshotFloaterView()
diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h
index 14f1872cd1..1333497bd2 100644
--- a/indra/newview/llfloatersnapshot.h
+++ b/indra/newview/llfloatersnapshot.h
@@ -35,10 +35,6 @@
#include "llfloater.h"
-#include "llmemory.h"
-#include "llimagegl.h"
-#include "llcharacter.h"
-
class LLFloaterSnapshot : public LLFloater
{
@@ -50,17 +46,16 @@ public:
SNAPSHOT_FORMAT_BMP
} ESnapshotFormat;
- LLFloaterSnapshot();
+ LLFloaterSnapshot(const LLSD& key);
virtual ~LLFloaterSnapshot();
-
+
/*virtual*/ BOOL postBuild();
/*virtual*/ void draw();
+ /*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void onClose(bool app_quitting);
-
- static void show(void*);
- static void hide(void*);
+
static void update();
-
+
static S32 getUIWinHeightLong() {return sUIWinHeightLong ;}
static S32 getUIWinHeightShort() {return sUIWinHeightShort ;}
static S32 getUIWinWidth() {return sUIWinWidth ;}
@@ -69,7 +64,6 @@ private:
class Impl;
Impl& impl;
- static LLFloaterSnapshot* sInstance;
static S32 sUIWinHeightLong ;
static S32 sUIWinHeightShort ;
static S32 sUIWinWidth ;
@@ -78,7 +72,16 @@ private:
class LLSnapshotFloaterView : public LLFloaterView
{
public:
- LLSnapshotFloaterView( const std::string& name, const LLRect& rect );
+ struct Params
+ : public LLInitParam::Block<Params, LLFloaterView::Params>
+ {
+ };
+
+protected:
+ LLSnapshotFloaterView (const Params& p);
+ friend class LLUICtrlFactory;
+
+public:
virtual ~LLSnapshotFloaterView();
/*virtual*/ BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
diff --git a/indra/newview/llfloatertelehub.cpp b/indra/newview/llfloatertelehub.cpp
index 530bb87983..1d2d3b98f2 100644
--- a/indra/newview/llfloatertelehub.cpp
+++ b/indra/newview/llfloatertelehub.cpp
@@ -81,7 +81,7 @@ void LLFloaterTelehub::show()
}
LLFloaterTelehub::LLFloaterTelehub()
-: LLFloater(std::string("telehub")),
+: LLFloater(),
mTelehubObjectID(),
mTelehubObjectName(),
mTelehubPos(),
@@ -94,6 +94,11 @@ LLFloaterTelehub::LLFloaterTelehub()
LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_telehub.xml");
+ mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
+}
+BOOL LLFloaterTelehub::postBuild()
+{
+
childSetAction("connect_btn", onClickConnect, this);
childSetAction("disconnect_btn", onClickDisconnect, this);
childSetAction("add_spawn_point_btn", onClickAddSpawnPoint, this);
@@ -106,9 +111,8 @@ LLFloaterTelehub::LLFloaterTelehub()
list->setAllowKeyboardMovement(FALSE);
}
- mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
+ return TRUE;
}
-
LLFloaterTelehub::~LLFloaterTelehub()
{
sInstance = NULL;
diff --git a/indra/newview/llfloatertelehub.h b/indra/newview/llfloatertelehub.h
index 28c9d16573..b639338dfc 100644
--- a/indra/newview/llfloatertelehub.h
+++ b/indra/newview/llfloatertelehub.h
@@ -48,7 +48,7 @@ public:
static void show();
virtual void draw();
-
+ /*virtual*/ BOOL postBuild();
static BOOL renderBeacons();
static void addBeacons();
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index a33b49563c..62a8c0d27e 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -54,6 +54,7 @@
#include "llpanelobject.h"
#include "llpanelvolume.h"
#include "llpanelpermissions.h"
+#include "llradiogroup.h"
#include "llresmgr.h"
#include "llselectmgr.h"
#include "llslider.h"
@@ -95,25 +96,21 @@ const std::string PANEL_NAMES[LLFloaterTools::PANEL_COUNT] =
};
// Local prototypes
-void commit_select_tool(LLUICtrl *ctrl, void *data);
void commit_select_component(LLUICtrl *ctrl, void *data);
void click_show_more(void*);
void click_popup_info(void*);
void click_popup_done(void*);
void click_popup_minimize(void*);
-void click_popup_grab_drag(LLUICtrl *, void*);
-void click_popup_grab_lift(LLUICtrl *, void*);
-void click_popup_grab_spin(LLUICtrl *, void*);
void click_popup_rotate_left(void*);
void click_popup_rotate_reset(void*);
void click_popup_rotate_right(void*);
-void click_popup_dozer_mode(LLUICtrl *, void *user);
void commit_slider_dozer_size(LLUICtrl *, void*);
void commit_slider_dozer_force(LLUICtrl *, void*);
void click_apply_to_selection(void*);
-void commit_radio_zoom(LLUICtrl *, void*);
-void commit_radio_orbit(LLUICtrl *, void*);
-void commit_radio_pan(LLUICtrl *, void*);
+void commit_radio_group_focus(LLUICtrl* ctrl, void* data);
+void commit_radio_group_move(LLUICtrl* ctrl, void* data);
+void commit_radio_group_edit(LLUICtrl* ctrl, void* data);
+void commit_radio_group_land(LLUICtrl* ctrl, void* data);
void commit_grid_mode(LLUICtrl *, void*);
void commit_slider_zoom(LLUICtrl *, void*);
@@ -122,14 +119,14 @@ void commit_slider_zoom(LLUICtrl *, void*);
void* LLFloaterTools::createPanelPermissions(void* data)
{
LLFloaterTools* floater = (LLFloaterTools*)data;
- floater->mPanelPermissions = new LLPanelPermissions("General");
+ floater->mPanelPermissions = new LLPanelPermissions();
return floater->mPanelPermissions;
}
//static
void* LLFloaterTools::createPanelObject(void* data)
{
LLFloaterTools* floater = (LLFloaterTools*)data;
- floater->mPanelObject = new LLPanelObject("Object");
+ floater->mPanelObject = new LLPanelObject();
return floater->mPanelObject;
}
@@ -137,7 +134,7 @@ void* LLFloaterTools::createPanelObject(void* data)
void* LLFloaterTools::createPanelVolume(void* data)
{
LLFloaterTools* floater = (LLFloaterTools*)data;
- floater->mPanelVolume = new LLPanelVolume("Features");
+ floater->mPanelVolume = new LLPanelVolume();
return floater->mPanelVolume;
}
@@ -145,7 +142,7 @@ void* LLFloaterTools::createPanelVolume(void* data)
void* LLFloaterTools::createPanelFace(void* data)
{
LLFloaterTools* floater = (LLFloaterTools*)data;
- floater->mPanelFace = new LLPanelFace("Texture");
+ floater->mPanelFace = new LLPanelFace();
return floater->mPanelFace;
}
@@ -153,26 +150,51 @@ void* LLFloaterTools::createPanelFace(void* data)
void* LLFloaterTools::createPanelContents(void* data)
{
LLFloaterTools* floater = (LLFloaterTools*)data;
- floater->mPanelContents = new LLPanelContents("Contents");
+ floater->mPanelContents = new LLPanelContents();
return floater->mPanelContents;
}
-//static
-void* LLFloaterTools::createPanelContentsInventory(void* data)
-{
- LLFloaterTools* floater = (LLFloaterTools*)data;
- floater->mPanelContents->mPanelInventory = new LLPanelInventory(std::string("ContentsInventory"), LLRect());
- return floater->mPanelContents->mPanelInventory;
-}
-
//static
void* LLFloaterTools::createPanelLandInfo(void* data)
{
LLFloaterTools* floater = (LLFloaterTools*)data;
- floater->mPanelLandInfo = new LLPanelLandInfo(std::string("land info panel"));
+ floater->mPanelLandInfo = new LLPanelLandInfo();
return floater->mPanelLandInfo;
}
+static const std::string toolNames[]={
+ "ToolCube",
+ "ToolPrism",
+ "ToolPyramid",
+ "ToolTetrahedron",
+ "ToolCylinder",
+ "ToolHemiCylinder",
+ "ToolCone",
+ "ToolHemiCone",
+ "ToolSphere",
+ "ToolHemiSphere",
+ "ToolTorus",
+ "ToolTube",
+ "ToolRing",
+ "ToolTree",
+ "ToolGrass"};
+LLPCode toolData[]={
+ LL_PCODE_CUBE,
+ LL_PCODE_PRISM,
+ LL_PCODE_PYRAMID,
+ LL_PCODE_TETRAHEDRON,
+ LL_PCODE_CYLINDER,
+ LL_PCODE_CYLINDER_HEMI,
+ LL_PCODE_CONE,
+ LL_PCODE_CONE_HEMI,
+ LL_PCODE_SPHERE,
+ LL_PCODE_SPHERE_HEMI,
+ LL_PCODE_TORUS,
+ LLViewerObject::LL_VO_SQUARE_TORUS,
+ LLViewerObject::LL_VO_TRIANGLE_TORUS,
+ LL_PCODE_LEGACY_TREE,
+ LL_PCODE_LEGACY_GRASS};
+
BOOL LLFloaterTools::postBuild()
{
@@ -200,27 +222,15 @@ BOOL LLFloaterTools::postBuild()
childSetCommitCallback("slider zoom",commit_slider_zoom,this);
- mRadioZoom = getChild<LLCheckBoxCtrl>("radio zoom");
- childSetCommitCallback("radio zoom",commit_radio_zoom,this);
- mRadioOrbit = getChild<LLCheckBoxCtrl>("radio orbit");
- childSetCommitCallback("radio orbit",commit_radio_orbit,this);
- mRadioPan = getChild<LLCheckBoxCtrl>("radio pan");
- childSetCommitCallback("radio pan",commit_radio_pan,this);
-
- mRadioMove = getChild<LLCheckBoxCtrl>("radio move");
- childSetCommitCallback("radio move",click_popup_grab_drag,this);
- mRadioLift = getChild<LLCheckBoxCtrl>("radio lift");
- childSetCommitCallback("radio lift",click_popup_grab_lift,this);
- mRadioSpin = getChild<LLCheckBoxCtrl>("radio spin");
- childSetCommitCallback("radio spin",click_popup_grab_spin,NULL);
- mRadioPosition = getChild<LLCheckBoxCtrl>("radio position");
- childSetCommitCallback("radio position",commit_select_tool,LLToolCompTranslate::getInstance());
- mRadioRotate = getChild<LLCheckBoxCtrl>("radio rotate");
- childSetCommitCallback("radio rotate",commit_select_tool,LLToolCompRotate::getInstance());
- mRadioStretch = getChild<LLCheckBoxCtrl>("radio stretch");
- childSetCommitCallback("radio stretch",commit_select_tool,LLToolCompScale::getInstance());
- mRadioSelectFace = getChild<LLCheckBoxCtrl>("radio select face");
- childSetCommitCallback("radio select face",commit_select_tool,LLToolFace::getInstance());
+ mRadioGroupFocus = getChild<LLRadioGroup>("focus_radio_group");
+ childSetCommitCallback("focus_radio_group", commit_radio_group_focus, this);
+
+ mRadioGroupMove = getChild<LLRadioGroup>("move_radio_group");
+ childSetCommitCallback("move_radio_group", commit_radio_group_move, this);
+
+ mRadioGroupEdit = getChild<LLRadioGroup>("edit_radio_group");
+ childSetCommitCallback("edit_radio_group", commit_radio_group_edit, this);
+
mCheckSelectIndividual = getChild<LLCheckBoxCtrl>("checkbox edit linked parts");
childSetValue("checkbox edit linked parts",(BOOL)gSavedSettings.getBOOL("EditLinkedParts"));
childSetCommitCallback("checkbox edit linked parts",commit_select_component,this);
@@ -239,44 +249,12 @@ BOOL LLFloaterTools::postBuild()
// Create Buttons
//
- static const std::string toolNames[]={
- "ToolCube",
- "ToolPrism",
- "ToolPyramid",
- "ToolTetrahedron",
- "ToolCylinder",
- "ToolHemiCylinder",
- "ToolCone",
- "ToolHemiCone",
- "ToolSphere",
- "ToolHemiSphere",
- "ToolTorus",
- "ToolTube",
- "ToolRing",
- "ToolTree",
- "ToolGrass"};
- void* toolData[]={
- &LLToolPlacerPanel::sCube,
- &LLToolPlacerPanel::sPrism,
- &LLToolPlacerPanel::sPyramid,
- &LLToolPlacerPanel::sTetrahedron,
- &LLToolPlacerPanel::sCylinder,
- &LLToolPlacerPanel::sCylinderHemi,
- &LLToolPlacerPanel::sCone,
- &LLToolPlacerPanel::sConeHemi,
- &LLToolPlacerPanel::sSphere,
- &LLToolPlacerPanel::sSphereHemi,
- &LLToolPlacerPanel::sTorus,
- &LLToolPlacerPanel::sSquareTorus,
- &LLToolPlacerPanel::sTriangleTorus,
- &LLToolPlacerPanel::sTree,
- &LLToolPlacerPanel::sGrass};
for(size_t t=0; t<LL_ARRAY_SIZE(toolNames); ++t)
{
LLButton *found = getChild<LLButton>(toolNames[t]);
if(found)
{
- found->setClickedCallback(setObjectType,toolData[t]);
+ found->setClickedCallback(boost::bind(&LLFloaterTools::setObjectType, toolData[t]));
mButtons.push_back( found );
}else{
llwarns << "Tool button not found! DOA Pending." << llendl;
@@ -290,20 +268,10 @@ BOOL LLFloaterTools::postBuild()
childSetValue("checkbox copy centers",(BOOL)gSavedSettings.getBOOL("CreateToolCopyCenters"));
mCheckCopyRotates = getChild<LLCheckBoxCtrl>("checkbox copy rotates");
childSetValue("checkbox copy rotates",(BOOL)gSavedSettings.getBOOL("CreateToolCopyRotates"));
- mRadioSelectLand = getChild<LLCheckBoxCtrl>("radio select land");
- childSetCommitCallback("radio select land",commit_select_tool, LLToolSelectLand::getInstance());
- mRadioDozerFlatten = getChild<LLCheckBoxCtrl>("radio flatten");
- childSetCommitCallback("radio flatten",click_popup_dozer_mode, (void*)0);
- mRadioDozerRaise = getChild<LLCheckBoxCtrl>("radio raise");
- childSetCommitCallback("radio raise",click_popup_dozer_mode, (void*)1);
- mRadioDozerLower = getChild<LLCheckBoxCtrl>("radio lower");
- childSetCommitCallback("radio lower",click_popup_dozer_mode, (void*)2);
- mRadioDozerSmooth = getChild<LLCheckBoxCtrl>("radio smooth");
- childSetCommitCallback("radio smooth",click_popup_dozer_mode, (void*)3);
- mRadioDozerNoise = getChild<LLCheckBoxCtrl>("radio noise");
- childSetCommitCallback("radio noise",click_popup_dozer_mode, (void*)4);
- mRadioDozerRevert = getChild<LLCheckBoxCtrl>("radio revert");
- childSetCommitCallback("radio revert",click_popup_dozer_mode, (void*)5);
+
+ mRadioGroupLand = getChild<LLRadioGroup>("land_radio_group");
+ childSetCommitCallback("land_radio_group", commit_radio_group_land, this);
+
mBtnApplyToSelection = getChild<LLButton>("button apply to selection");
childSetAction("button apply to selection",click_apply_to_selection, (void*)0);
@@ -338,8 +306,8 @@ BOOL LLFloaterTools::postBuild()
// Create the popupview with a dummy center. It will be moved into place
// during LLViewerWindow's per-frame hover processing.
-LLFloaterTools::LLFloaterTools()
-: LLFloater(std::string("toolbox floater")),
+LLFloaterTools::LLFloaterTools(const LLSD& key)
+: LLFloater(key),
mBtnFocus(NULL),
mBtnMove(NULL),
mBtnEdit(NULL),
@@ -347,18 +315,10 @@ LLFloaterTools::LLFloaterTools()
mBtnLand(NULL),
mTextStatus(NULL),
- mRadioOrbit(NULL),
- mRadioZoom(NULL),
- mRadioPan(NULL),
-
- mRadioMove(NULL),
- mRadioLift(NULL),
- mRadioSpin(NULL),
+ mRadioGroupFocus(NULL),
+ mRadioGroupMove(NULL),
+ mRadioGroupEdit(NULL),
- mRadioPosition(NULL),
- mRadioRotate(NULL),
- mRadioStretch(NULL),
- mRadioSelectFace(NULL),
mCheckSelectIndividual(NULL),
mCheckSnapToGrid(NULL),
@@ -380,13 +340,7 @@ LLFloaterTools::LLFloaterTools()
mCheckCopySelection(NULL),
mCheckCopyCenters(NULL),
mCheckCopyRotates(NULL),
- mRadioSelectLand(NULL),
- mRadioDozerFlatten(NULL),
- mRadioDozerRaise(NULL),
- mRadioDozerLower(NULL),
- mRadioDozerSmooth(NULL),
- mRadioDozerNoise(NULL),
- mRadioDozerRevert(NULL),
+ mRadioGroupLand(NULL),
mSliderDozerSize(NULL),
mSliderDozerForce(NULL),
mBtnApplyToSelection(NULL),
@@ -402,22 +356,23 @@ LLFloaterTools::LLFloaterTools()
mTabLand(NULL),
mDirty(TRUE)
{
+ gFloaterTools = this;
+
setAutoFocus(FALSE);
- LLCallbackMap::map_t factory_map;
- factory_map["General"] = LLCallbackMap(createPanelPermissions, this);//LLPanelPermissions
- factory_map["Object"] = LLCallbackMap(createPanelObject, this);//LLPanelObject
- factory_map["Features"] = LLCallbackMap(createPanelVolume, this);//LLPanelVolume
- factory_map["Texture"] = LLCallbackMap(createPanelFace, this);//LLPanelFace
- factory_map["Contents"] = LLCallbackMap(createPanelContents, this);//LLPanelContents
- factory_map["ContentsInventory"] = LLCallbackMap(createPanelContentsInventory, this);//LLPanelContents
- factory_map["land info panel"] = LLCallbackMap(createPanelLandInfo, this);//LLPanelLandInfo
-
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_tools.xml",&factory_map,FALSE);
+ mFactoryMap["General"] = LLCallbackMap(createPanelPermissions, this);//LLPanelPermissions
+ mFactoryMap["Object"] = LLCallbackMap(createPanelObject, this);//LLPanelObject
+ mFactoryMap["Features"] = LLCallbackMap(createPanelVolume, this);//LLPanelVolume
+ mFactoryMap["Texture"] = LLCallbackMap(createPanelFace, this);//LLPanelFace
+ mFactoryMap["Contents"] = LLCallbackMap(createPanelContents, this);//LLPanelContents
+ mFactoryMap["land info panel"] = LLCallbackMap(createPanelLandInfo, this);//LLPanelLandInfo
+
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this,"floater_tools.xml",FALSE);
}
LLFloaterTools::~LLFloaterTools()
{
// children automatically deleted
+ gFloaterTools = NULL;
}
void LLFloaterTools::setStatusText(const std::string& text)
@@ -525,26 +480,31 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
mBtnFocus ->setToggleState( focus_visible );
- mRadioZoom ->setVisible( focus_visible );
- mRadioOrbit ->setVisible( focus_visible );
- mRadioPan ->setVisible( focus_visible );
+ mRadioGroupFocus->setVisible( focus_visible );
childSetVisible("slider zoom", focus_visible);
childSetEnabled("slider zoom", gCameraBtnZoom);
- mRadioZoom ->set( !gCameraBtnOrbit &&
- !gCameraBtnPan &&
- !(mask == MASK_ORBIT) &&
- !(mask == (MASK_ORBIT | MASK_ALT)) &&
- !(mask == MASK_PAN) &&
- !(mask == (MASK_PAN | MASK_ALT)) );
-
- mRadioOrbit ->set( gCameraBtnOrbit ||
- (mask == MASK_ORBIT) ||
- (mask == (MASK_ORBIT | MASK_ALT)) );
-
- mRadioPan ->set( gCameraBtnPan ||
- (mask == MASK_PAN) ||
- (mask == (MASK_PAN | MASK_ALT)) );
+ if (!gCameraBtnOrbit &&
+ !gCameraBtnPan &&
+ !(mask == MASK_ORBIT) &&
+ !(mask == (MASK_ORBIT | MASK_ALT)) &&
+ !(mask == MASK_PAN) &&
+ !(mask == (MASK_PAN | MASK_ALT)) )
+ {
+ mRadioGroupFocus->setValue("radio zoom");
+ }
+ else if ( gCameraBtnOrbit ||
+ (mask == MASK_ORBIT) ||
+ (mask == (MASK_ORBIT | MASK_ALT)) )
+ {
+ mRadioGroupFocus->setValue("radio orbit");
+ }
+ else if ( gCameraBtnPan ||
+ (mask == MASK_PAN) ||
+ (mask == (MASK_PAN | MASK_ALT)) )
+ {
+ mRadioGroupFocus->setValue("radio pan");
+ }
// multiply by correction factor because volume sliders go [0, 0.5]
childSetValue( "slider zoom", gAgent.getCameraZoomFraction() * 0.5f);
@@ -555,27 +515,23 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
if (mBtnMove) mBtnMove ->setToggleState( move_visible );
// HACK - highlight buttons for next click
- if (mRadioMove)
+ mRadioGroupMove->setVisible(move_visible);
+ if (!gGrabBtnSpin &&
+ !gGrabBtnVertical &&
+ !(mask == MASK_VERTICAL) &&
+ !(mask == MASK_SPIN) )
{
- mRadioMove ->setVisible( move_visible );
- mRadioMove ->set( !gGrabBtnSpin &&
- !gGrabBtnVertical &&
- !(mask == MASK_VERTICAL) &&
- !(mask == MASK_SPIN) );
+ mRadioGroupMove->setValue("radio move");
}
-
- if (mRadioLift)
+ else if (gGrabBtnVertical ||
+ (mask == MASK_VERTICAL) )
{
- mRadioLift ->setVisible( move_visible );
- mRadioLift ->set( gGrabBtnVertical ||
- (mask == MASK_VERTICAL) );
+ mRadioGroupMove->setValue("radio lift");
}
-
- if (mRadioSpin)
+ else if (gGrabBtnSpin ||
+ (mask == MASK_SPIN) )
{
- mRadioSpin ->setVisible( move_visible );
- mRadioSpin ->set( gGrabBtnSpin ||
- (mask == MASK_SPIN) );
+ mRadioGroupMove->setValue("radio spin");
}
// Edit buttons
@@ -587,15 +543,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
tool == LLToolPipette::getInstance();
mBtnEdit ->setToggleState( edit_visible );
-
- mRadioPosition ->setVisible( edit_visible );
- mRadioRotate ->setVisible( edit_visible );
- mRadioStretch ->setVisible( edit_visible );
- if (mRadioSelectFace)
- {
- mRadioSelectFace->setVisible( edit_visible );
- mRadioSelectFace->set( tool == LLToolFace::getInstance() );
- }
+ mRadioGroupEdit->setVisible( edit_visible );
if (mCheckSelectIndividual)
{
@@ -603,9 +551,22 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
//mCheckSelectIndividual->set(gSavedSettings.getBOOL("EditLinkedParts"));
}
- mRadioPosition ->set( tool == LLToolCompTranslate::getInstance() );
- mRadioRotate ->set( tool == LLToolCompRotate::getInstance() );
- mRadioStretch ->set( tool == LLToolCompScale::getInstance() );
+ if ( tool == LLToolCompTranslate::getInstance() )
+ {
+ mRadioGroupEdit->setValue("radio position");
+ }
+ else if ( tool == LLToolCompRotate::getInstance() )
+ {
+ mRadioGroupEdit->setValue("radio rotate");
+ }
+ else if ( tool == LLToolCompScale::getInstance() )
+ {
+ mRadioGroupEdit->setValue("radio stretch");
+ }
+ else if ( tool == LLToolFace::getInstance() )
+ {
+ mRadioGroupEdit->setValue("radio select face");
+ }
if (mComboGridMode)
{
@@ -662,15 +623,13 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
else
{
// Highlight the correct placer button
- for( std::vector<LLButton*>::size_type i = 0; i < mButtons.size(); i++ )
+ for( S32 t = 0; t < (S32)mButtons.size(); t++ )
{
LLPCode pcode = LLToolPlacer::getObjectType();
- void *userdata = mButtons[i]->getCallbackUserData();
- LLPCode *cur = (LLPCode*) userdata;
-
- BOOL state = (pcode == *cur);
- mButtons[i]->setToggleState( state );
- mButtons[i]->setVisible( create_visible );
+ LLPCode button_pcode = toolData[t];
+ BOOL state = (pcode == button_pcode);
+ mButtons[t]->setToggleState( state );
+ mButtons[t]->setVisible( create_visible );
}
}
@@ -687,44 +646,39 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
if (mBtnLand) mBtnLand ->setToggleState( land_visible );
- // mRadioEditLand ->set( tool == LLToolBrushLand::getInstance() );
- if (mRadioSelectLand) mRadioSelectLand->set( tool == LLToolSelectLand::getInstance() );
-
- // mRadioEditLand ->setVisible( land_visible );
- if (mRadioSelectLand) mRadioSelectLand->setVisible( land_visible );
-
- S32 dozer_mode = gSavedSettings.getS32("RadioLandBrushAction");
-
- if (mRadioDozerFlatten)
+ mRadioGroupLand->setVisible( land_visible );
+ if ( tool == LLToolSelectLand::getInstance() )
{
- mRadioDozerFlatten ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 0);
- mRadioDozerFlatten ->setVisible( land_visible );
+ mRadioGroupLand->setValue("radio select land");
}
- if (mRadioDozerRaise)
+ else if ( tool == LLToolBrushLand::getInstance() )
{
- mRadioDozerRaise ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 1);
- mRadioDozerRaise ->setVisible( land_visible );
- }
- if (mRadioDozerLower)
- {
- mRadioDozerLower ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 2);
- mRadioDozerLower ->setVisible( land_visible );
- }
- if (mRadioDozerSmooth)
- {
- mRadioDozerSmooth ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 3);
- mRadioDozerSmooth ->setVisible( land_visible );
- }
- if (mRadioDozerNoise)
- {
- mRadioDozerNoise ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 4);
- mRadioDozerNoise ->setVisible( land_visible );
- }
- if (mRadioDozerRevert)
- {
- mRadioDozerRevert ->set( tool == LLToolBrushLand::getInstance() && dozer_mode == 5);
- mRadioDozerRevert ->setVisible( land_visible );
+ S32 dozer_mode = gSavedSettings.getS32("RadioLandBrushAction");
+ switch(dozer_mode)
+ {
+ case 0:
+ mRadioGroupLand->setValue("radio flatten");
+ break;
+ case 1:
+ mRadioGroupLand->setValue("radio raise");
+ break;
+ case 2:
+ mRadioGroupLand->setValue("radio lower");
+ break;
+ case 3:
+ mRadioGroupLand->setValue("radio smooth");
+ break;
+ case 4:
+ mRadioGroupLand->setValue("radio noise");
+ break;
+ case 5:
+ mRadioGroupLand->setValue("radio revert");
+ break;
+ default:
+ break;
+ }
}
+
if (mBtnApplyToSelection)
{
mBtnApplyToSelection->setVisible( land_visible );
@@ -757,13 +711,18 @@ BOOL LLFloaterTools::canClose()
}
// virtual
-void LLFloaterTools::onOpen()
+void LLFloaterTools::onOpen(const LLSD& key)
{
mParcelSelection = LLViewerParcelMgr::getInstance()->getFloatingParcelSelection();
mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
- // gMenuBarView->setItemVisible(std::string("Tools"), TRUE);
- // gMenuBarView->arrange();
+ std::string panel = key.asString();
+ if (!panel.empty())
+ {
+ mTab->selectTabByName(panel);
+ }
+
+ gMenuBarView->setItemVisible("BuildTools", TRUE);
}
// virtual
@@ -796,19 +755,11 @@ void LLFloaterTools::onClose(bool app_quitting)
// so manually reset tool to default (pie menu tool)
LLToolMgr::getInstance()->getCurrentToolset()->selectFirstTool();
- // gMenuBarView->setItemVisible(std::string("Tools"), FALSE);
- // gMenuBarView->arrange();
-}
-
-void LLFloaterTools::showPanel(EInfoPanel panel)
-{
- llassert(panel >= 0 && panel < PANEL_COUNT);
- mTab->selectTabByName(PANEL_NAMES[panel]);
+ gMenuBarView->setItemVisible("BuildTools", FALSE);
}
void click_popup_info(void*)
{
-// gBuildView->setPropertiesPanelOpen(TRUE);
}
void click_popup_done(void*)
@@ -816,43 +767,49 @@ void click_popup_done(void*)
handle_reset_view();
}
-void click_popup_grab_drag(LLUICtrl*, void*)
+void commit_radio_group_move(LLUICtrl* ctrl, void* data)
{
- gGrabBtnVertical = FALSE;
- gGrabBtnSpin = FALSE;
-}
-
-void click_popup_grab_lift(LLUICtrl*, void*)
-{
- gGrabBtnVertical = TRUE;
- gGrabBtnSpin = FALSE;
-}
-
-void click_popup_grab_spin(LLUICtrl*, void*)
-{
- gGrabBtnVertical = FALSE;
- gGrabBtnSpin = TRUE;
-}
-
-void commit_radio_zoom(LLUICtrl *, void*)
-{
- gCameraBtnZoom = TRUE;
- gCameraBtnOrbit = FALSE;
- gCameraBtnPan = FALSE;
-}
-
-void commit_radio_orbit(LLUICtrl *, void*)
-{
- gCameraBtnZoom = FALSE;
- gCameraBtnOrbit = TRUE;
- gCameraBtnPan = FALSE;
+ LLRadioGroup* group = (LLRadioGroup*)ctrl;
+ std::string selected = group->getValue().asString();
+ if (selected == "radio move")
+ {
+ gGrabBtnVertical = FALSE;
+ gGrabBtnSpin = FALSE;
+ }
+ else if (selected == "radio lift")
+ {
+ gGrabBtnVertical = TRUE;
+ gGrabBtnSpin = FALSE;
+ }
+ else if (selected == "radio spin")
+ {
+ gGrabBtnVertical = FALSE;
+ gGrabBtnSpin = TRUE;
+ }
}
-void commit_radio_pan(LLUICtrl *, void*)
+void commit_radio_group_focus(LLUICtrl* ctrl, void* data)
{
- gCameraBtnZoom = FALSE;
- gCameraBtnOrbit = FALSE;
- gCameraBtnPan = TRUE;
+ LLRadioGroup* group = (LLRadioGroup*)ctrl;
+ std::string selected = group->getValue().asString();
+ if (selected == "radio zoom")
+ {
+ gCameraBtnZoom = TRUE;
+ gCameraBtnOrbit = FALSE;
+ gCameraBtnPan = FALSE;
+ }
+ else if (selected == "radio orbit")
+ {
+ gCameraBtnZoom = FALSE;
+ gCameraBtnOrbit = TRUE;
+ gCameraBtnPan = FALSE;
+ }
+ else if (selected == "radio pan")
+ {
+ gCameraBtnZoom = FALSE;
+ gCameraBtnOrbit = FALSE;
+ gCameraBtnPan = TRUE;
+ }
}
void commit_slider_zoom(LLUICtrl *ctrl, void*)
@@ -881,13 +838,6 @@ void click_popup_rotate_right(void*)
}
-void click_popup_dozer_mode(LLUICtrl *, void *user)
-{
- S32 mode = (S32)(intptr_t) user;
- gFloaterTools->setEditTool( LLToolBrushLand::getInstance() );
- gSavedSettings.setS32("RadioLandBrushAction", mode);
-}
-
void commit_slider_dozer_size(LLUICtrl *ctrl, void*)
{
F32 size = (F32)ctrl->getValue().asReal();
@@ -901,21 +851,64 @@ void commit_slider_dozer_force(LLUICtrl *ctrl, void*)
gSavedSettings.setF32("LandBrushForce", dozer_force);
}
-
-
-
void click_apply_to_selection(void* user)
{
LLToolBrushLand::getInstance()->modifyLandInSelectionGlobal();
}
-void commit_select_tool(LLUICtrl *ctrl, void *data)
+void commit_radio_group_edit(LLUICtrl *ctrl, void *data)
{
S32 show_owners = gSavedSettings.getBOOL("ShowParcelOwners");
- gFloaterTools->setEditTool(data);
+
+ LLRadioGroup* group = (LLRadioGroup*)ctrl;
+ std::string selected = group->getValue().asString();
+ if (selected == "radio position")
+ {
+ LLFloaterTools::setEditTool( LLToolCompTranslate::getInstance() );
+ }
+ else if (selected == "radio rotate")
+ {
+ LLFloaterTools::setEditTool( LLToolCompRotate::getInstance() );
+ }
+ else if (selected == "radio stretch")
+ {
+ LLFloaterTools::setEditTool( LLToolCompScale::getInstance() );
+ }
+ else if (selected == "radio select face")
+ {
+ LLFloaterTools::setEditTool( LLToolFace::getInstance() );
+ }
gSavedSettings.setBOOL("ShowParcelOwners", show_owners);
}
+void commit_radio_group_land(LLUICtrl* ctrl, void* data)
+{
+ LLRadioGroup* group = (LLRadioGroup*)ctrl;
+ std::string selected = group->getValue().asString();
+ if (selected == "radio select land")
+ {
+ LLFloaterTools::setEditTool( LLToolSelectLand::getInstance() );
+ }
+ else
+ {
+ LLFloaterTools::setEditTool( LLToolBrushLand::getInstance() );
+ S32 dozer_mode = gSavedSettings.getS32("RadioLandBrushAction");
+ if (selected == "radio flatten")
+ dozer_mode = 0;
+ else if (selected == "radio raise")
+ dozer_mode = 1;
+ else if (selected == "radio lower")
+ dozer_mode = 2;
+ else if (selected == "radio smooth")
+ dozer_mode = 3;
+ else if (selected == "radio noise")
+ dozer_mode = 4;
+ else if (selected == "radio revert")
+ dozer_mode = 5;
+ gSavedSettings.setS32("RadioLandBrushAction", dozer_mode);
+ }
+}
+
void commit_select_component(LLUICtrl *ctrl, void *data)
{
LLFloaterTools* floaterp = (LLFloaterTools*)data;
@@ -948,9 +941,8 @@ void commit_grid_mode(LLUICtrl *ctrl, void *data)
}
// static
-void LLFloaterTools::setObjectType( void* data )
+void LLFloaterTools::setObjectType( LLPCode pcode )
{
- LLPCode pcode = *(LLPCode*) data;
LLToolPlacer::setObjectType( pcode );
gSavedSettings.setBOOL("CreateToolCopySelection", FALSE);
gFocusMgr.setMouseCapture(NULL);
@@ -960,14 +952,16 @@ void LLFloaterTools::setObjectType( void* data )
void LLFloaterTools::onClickGridOptions(void* data)
{
//LLFloaterTools* floaterp = (LLFloaterTools*)data;
- LLFloaterBuildOptions::show(NULL);
+ LLFloaterBuildOptions::showInstance();
// RN: this makes grid options dependent on build tools window
//floaterp->addDependentFloater(LLFloaterBuildOptions::getInstance(), FALSE);
}
+// static
void LLFloaterTools::setEditTool(void* tool_pointer)
{
- select_tool(tool_pointer);
+ LLTool *tool = (LLTool *)tool_pointer;
+ LLToolMgr::getInstance()->getCurrentToolset()->selectTool( tool );
}
void LLFloaterTools::onFocusReceived()
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index 833a8a7b73..7bb072232a 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -38,18 +38,20 @@
#include "llparcelselection.h"
class LLButton;
-class LLTextBox;
-class LLTool;
+class LLComboBox;
class LLCheckBoxCtrl;
-class LLTabContainer;
class LLPanelPermissions;
class LLPanelObject;
class LLPanelVolume;
class LLPanelContents;
class LLPanelFace;
class LLPanelLandInfo;
-class LLComboBox;
+class LLRadioCtrl;
+class LLRadioGroup;
class LLSlider;
+class LLTabContainer;
+class LLTextBox;
+class LLTool;
class LLParcelSelection;
class LLObjectSelection;
@@ -65,15 +67,16 @@ public:
static void* createPanelVolume(void* vdata);
static void* createPanelFace(void* vdata);
static void* createPanelContents(void* vdata);
- static void* createPanelContentsInventory(void* vdata);
static void* createPanelLandInfo(void* vdata);
- LLFloaterTools();
+ LLFloaterTools(const LLSD& key);
virtual ~LLFloaterTools();
- virtual void onOpen();
- virtual void onClose(bool app_quitting);
- virtual BOOL canClose();
+ /*virtual*/ void onOpen(const LLSD& key);
+ /*virtual*/ void onClose(bool app_quitting);
+ /*virtual*/ BOOL canClose();
+ /*virtual*/ void draw();
+ /*virtual*/ void onFocusReceived();
// call this once per frame to handle visibility, rect location,
// button highlights, etc.
@@ -93,24 +96,20 @@ public:
PANEL_COUNT
};
- /*virtual*/ void draw();
-
void dirty();
void showPanel(EInfoPanel panel);
void setStatusText(const std::string& text);
- virtual void onFocusReceived();
static void setEditTool(void* data);
void saveLastTool();
private:
- static void setObjectType( void* data );
+ static void setObjectType( LLPCode pcode );
void refresh();
static void onClickGridOptions(void* data);
public:
-
LLButton *mBtnFocus;
LLButton *mBtnMove;
LLButton *mBtnEdit;
@@ -120,20 +119,13 @@ public:
LLTextBox *mTextStatus;
// Focus buttons
- LLCheckBoxCtrl *mRadioOrbit;
- LLCheckBoxCtrl *mRadioZoom;
- LLCheckBoxCtrl *mRadioPan;
+ LLRadioGroup* mRadioGroupFocus;
// Move buttons
- LLCheckBoxCtrl *mRadioMove;
- LLCheckBoxCtrl *mRadioLift;
- LLCheckBoxCtrl *mRadioSpin;
+ LLRadioGroup* mRadioGroupMove;
// Edit buttons
- LLCheckBoxCtrl *mRadioPosition;
- LLCheckBoxCtrl *mRadioRotate;
- LLCheckBoxCtrl *mRadioStretch;
- LLCheckBoxCtrl *mRadioSelectFace;
+ LLRadioGroup* mRadioGroupEdit;
LLCheckBoxCtrl *mCheckSelectIndividual;
@@ -159,15 +151,7 @@ public:
LLCheckBoxCtrl *mCheckCopyRotates;
// Land buttons
-// LLCheckBoxCtrl *mRadioEditLand;
- LLCheckBoxCtrl *mRadioSelectLand;
-
- LLCheckBoxCtrl *mRadioDozerFlatten;
- LLCheckBoxCtrl *mRadioDozerRaise;
- LLCheckBoxCtrl *mRadioDozerLower;
- LLCheckBoxCtrl *mRadioDozerSmooth;
- LLCheckBoxCtrl *mRadioDozerNoise;
- LLCheckBoxCtrl *mRadioDozerRevert;
+ LLRadioGroup* mRadioGroupLand;
LLSlider *mSliderDozerSize;
LLSlider *mSliderDozerForce;
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index fa6ba162ec..29ac0c66f8 100644
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -42,6 +42,8 @@
#include "llfloatergodtools.h"
#include "llparcel.h"
#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
#include "lllineeditor.h"
#include "lltextbox.h"
#include "lltracker.h"
@@ -71,7 +73,7 @@ void LLFloaterTopObjects::show()
}
LLFloaterTopObjects::LLFloaterTopObjects()
-: LLFloater(std::string("top_objects")),
+: LLFloater(),
mInitialized(FALSE),
mtotalScore(0.f)
{
@@ -86,14 +88,11 @@ LLFloaterTopObjects::~LLFloaterTopObjects()
// virtual
BOOL LLFloaterTopObjects::postBuild()
{
- childSetCommitCallback("objects_list", onCommitObjectsList, this);
- childSetDoubleClickCallback("objects_list", onDoubleClickObjectsList);
- childSetFocus("objects_list");
LLScrollListCtrl *objects_list = getChild<LLScrollListCtrl>("objects_list");
- if (objects_list)
- {
- objects_list->setCommitOnSelectionChange(TRUE);
- }
+ childSetFocus("objects_list");
+ childSetCommitCallback("objects_list", onCommitObjectsList, this);
+ objects_list->setDoubleClickCallback(onDoubleClickObjectsList, this);
+ objects_list->setCommitOnSelectionChange(TRUE);
childSetAction("show_beacon_btn", onClickShowBeacon, this);
setDefaultBtn("show_beacon_btn");
@@ -114,16 +113,14 @@ BOOL LLFloaterTopObjects::postBuild()
if (line_editor)
{
line_editor->setCommitOnFocusLost(FALSE);
- line_editor->setCommitCallback(onGetByOwnerName);
- line_editor->setCallbackUserData(this);
+ line_editor->setCommitCallback(onGetByOwnerName, this);
}
line_editor = getChild<LLLineEditor>("object_name_editor");
if (line_editor)
{
line_editor->setCommitOnFocusLost(FALSE);
- line_editor->setCommitCallback(onGetByObjectName);
- line_editor->setCallbackUserData(this);
+ line_editor->setCommitCallback(onGetByObjectName, this);
}*/
mCurrentMode = STAT_REPORT_TOP_SCRIPTS;
@@ -234,7 +231,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
if (total_count == 0 && list->getItemCount() == 0)
{
- list->addCommentText(getString("none_descriptor"));
+ list->setCommentText(getString("none_descriptor"));
}
else
{
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp
index 6a392e03fb..764a6a3498 100644
--- a/indra/newview/llfloatertos.cpp
+++ b/indra/newview/llfloatertos.cpp
@@ -254,7 +254,7 @@ void LLFloaterTOS::onContinue( void* userdata )
#endif
LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT ); // Go back and finish authentication
- self->close(); // destroys this object
+ self->closeFloater(); // destroys this object
}
// static
@@ -265,7 +265,7 @@ void LLFloaterTOS::onCancel( void* userdata )
LLNotifications::instance().add("MustAgreeToLogIn", LLSD(), LLSD(), login_alert_done);
LLStartUp::setStartupState( STATE_LOGIN_SHOW );
self->mLoadCompleteCount = 0; // reset counter for next time we come to TOS
- self->close(); // destroys this object
+ self->closeFloater(); // destroys this object
}
//virtual
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp
new file mode 100644
index 0000000000..ec8eb2e2cf
--- /dev/null
+++ b/indra/newview/llfloateruipreview.cpp
@@ -0,0 +1,1507 @@
+/**
+ * @file llfloateruipreview.cpp
+ * @brief Tool for previewing and editing floaters, plus localization tool integration
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// Tool for previewing floaters and panels for localization and UI design purposes.
+// See: https://wiki.lindenlab.com/wiki/GUI_Preview_And_Localization_Tools
+// See: https://jira.lindenlab.com/browse/DEV-16869
+
+// *TODO: Translate error messgaes using notifications/alerts.xml
+
+#include "llviewerprecompiledheaders.h" // Precompiled headers
+
+#include "llfloateruipreview.h" // Own header
+
+// Internal utility
+#include "llrender.h"
+#include "llsdutil.h"
+#include "llxmltree.h"
+#include "llviewerwindow.h"
+#include "lllivefile.h"
+
+// XUI
+#include "lluictrlfactory.h"
+#include "llcombobox.h"
+#include "llresizebar.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistctrl.h"
+#include "llfilepicker.h"
+#include "lldraghandle.h"
+#include "lllayoutstack.h"
+
+// Boost (for linux/unix command-line execv)
+#include <boost/tokenizer.hpp>
+#include <boost/shared_ptr.hpp>
+
+// External utility
+#include <string>
+
+#if LL_DARWIN
+#include <CoreFoundation/CFURL.h>
+#endif
+
+// Static initialization
+LLFloaterUIPreview* LLFloaterUIPreview::sInstance = NULL; // initialization of static instance pointer to NULL
+std::string LLFloaterUIPreview::mSavedEditorPath = std::string("");
+std::string LLFloaterUIPreview::mSavedEditorArgs = std::string("");
+std::string LLFloaterUIPreview::mSavedDiffPath = std::string("");
+static const S32 PRIMARY_FLOATER = 1;
+static const S32 SECONDARY_FLOATER = 2;
+
+static std::string get_xui_dir()
+{
+ std::string delim = gDirUtilp->getDirDelimiter();
+ return gDirUtilp->getAppRODataDir() + delim + std::string("skins") + delim + "default" + delim + "xui" + delim;
+}
+
+// Localization reset forcer -- ensures that when localization is temporarily changed for previewed floater, it is reset
+// Changes are made here
+LLLocalizationResetForcer::LLLocalizationResetForcer(S32 ID)
+{
+ mSavedLocalization = LLUI::sSettingGroups["config"]->getString("Language"); // save current localization setting
+ LLUI::sSettingGroups["config"]->setString("Language", LLFloaterUIPreview::getLocStr(ID));// hack language to be the one we want to preview floaters in
+ LLUI::setupPaths(); // forcibly reset XUI paths with this new language
+}
+
+// Actually reset in destructor
+// Changes are reversed here
+LLLocalizationResetForcer::~LLLocalizationResetForcer()
+{
+ LLUI::sSettingGroups["config"]->setString("Language", mSavedLocalization); // reset language to what it was before we changed it
+ LLUI::setupPaths(); // forcibly reset XUI paths with this new language
+}
+
+// Live file constructor
+// Needs full path for LLLiveFile but needs just file name for this code, hence the reduntant arguments; easier than separating later
+LLGUIPreviewLiveFile::LLGUIPreviewLiveFile(std::string path, std::string name, LLFloaterUIPreview* parent)
+ : mFileName(name),
+ mParent(parent),
+ mFirstFade(TRUE),
+ mFadeTimer(NULL),
+ LLLiveFile(path, 1.0)
+{}
+
+LLGUIPreviewLiveFile::~LLGUIPreviewLiveFile()
+{
+ mParent->mLiveFile = NULL;
+ if(mFadeTimer)
+ {
+ mFadeTimer->mParent = NULL;
+ // deletes itself; see lltimer.cpp
+ }
+}
+
+// Live file load
+void LLGUIPreviewLiveFile::loadFile()
+{
+ mParent->displayFloater(FALSE,1); // redisplay the floater
+ if(mFirstFade) // only fade if it wasn't just clicked on; can't use "clicked" BOOL below because of an oddity with setting LLLiveFile initial state
+ {
+ mFirstFade = FALSE;
+ }
+ else
+ {
+ if(mFadeTimer)
+ {
+ mFadeTimer->mParent = NULL;
+ }
+ mFadeTimer = new LLFadeEventTimer(0.05f,this);
+ }
+}
+
+// Initialize fade event timer
+LLFadeEventTimer::LLFadeEventTimer(F32 refresh, LLGUIPreviewLiveFile* parent)
+ : mParent(parent),
+ mFadingOut(TRUE),
+ LLEventTimer(refresh)
+{
+ mOriginalColor = mParent->mParent->mDisplayedFloater->getBackgroundColor();
+}
+
+// Single tick of fade event timer: increment the color
+BOOL LLFadeEventTimer::tick()
+{
+ float diff = 0.04f;
+ if(TRUE == mFadingOut) // set fade for in/out color direction
+ {
+ diff = -diff;
+ }
+
+ if(NULL == mParent) // no more need to tick, so suicide
+ {
+ delete this;
+ return FALSE;
+ }
+
+ // Set up colors
+ LLColor4 bg_color = mParent->mParent->mDisplayedFloater->getBackgroundColor();
+ LLSD colors = bg_color.getValue();
+ LLSD colors_old = colors;
+
+ // Tick colors
+ colors[0] = colors[0].asReal() - diff; if(colors[0].asReal() < mOriginalColor.getValue()[0].asReal()) { colors[0] = colors_old[0]; }
+ colors[1] = colors[1].asReal() - diff; if(colors[1].asReal() < mOriginalColor.getValue()[1].asReal()) { colors[1] = colors_old[1]; }
+ colors[2] = colors[2].asReal() + diff; if(colors[2].asReal() > mOriginalColor.getValue()[2].asReal()) { colors[2] = colors_old[2]; }
+
+ // Clamp and set colors
+ bg_color.setValue(colors);
+ bg_color.clamp(); // make sure we didn't exceed [0,1]
+ mParent->mParent->mDisplayedFloater->setBackgroundColor(bg_color);
+
+ if(bg_color[2] <= 0.0f) // end of fade out, start fading in
+ {
+ mFadingOut = FALSE;
+ }
+
+ return FALSE;
+}
+
+void* create_overlap_panel(void* data)
+{
+ return new LLOverlapPanel();
+}
+
+// Constructor
+LLFloaterUIPreview::LLFloaterUIPreview(const LLSD& key)
+ : LLFloater(),
+ mDisplayedFloater(NULL),
+ mDisplayedFloater_2(NULL),
+ mLiveFile(NULL),
+ // sHighlightingDiffs(FALSE),
+ mHighlightingOverlaps(FALSE),
+ mLastDisplayedX(0),
+ mLastDisplayedY(0)
+
+{
+ sInstance = this;
+ mFactoryMap["overlap_panel"] = LLCallbackMap(create_overlap_panel, NULL);
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_ui_preview.xml");
+}
+
+// Destructor
+LLFloaterUIPreview::~LLFloaterUIPreview()
+{
+ // spawned floaters are deleted automatically, so we don't need to delete them here
+
+ // save contents of textfields so it can be restored later if the floater is created again this session
+ LLFloaterUIPreview::mSavedEditorPath = mEditorPathTextBox->getText();
+ LLFloaterUIPreview::mSavedEditorArgs = mEditorArgsTextBox->getText();
+ LLFloaterUIPreview::mSavedDiffPath = mDiffPathTextBox->getText();
+
+ // delete live file if it exists
+ if(sInstance->mLiveFile)
+ {
+ delete sInstance->mLiveFile;
+ sInstance->mLiveFile = NULL;
+ }
+
+ sInstance = NULL; // clear static pointer
+}
+
+// Perform post-build setup (defined in superclass)
+BOOL LLFloaterUIPreview::postBuild()
+{
+ LLPanel* main_panel_tmp = getChild<LLPanel>("main_panel"); // get a pointer to the main panel in order to...
+ mFileList = main_panel_tmp->getChild<LLScrollListCtrl>("name_list"); // save pointer to file list
+ // Double-click opens the floater, for convenience
+ mFileList->setDoubleClickCallback(onClickDisplayFloater, (void*)&PRIMARY_FLOATER);
+
+ // get pointers to buttons and link to callbacks
+ mLanguageSelection = main_panel_tmp->getChild<LLComboBox>("language_select_combo");
+ mLanguageSelection->setSelectionCallback(boost::bind(&LLFloaterUIPreview::onLanguageComboSelect, this, mLanguageSelection));
+ mLanguageSelection_2 = main_panel_tmp->getChild<LLComboBox>("language_select_combo_2");
+ mLanguageSelection_2->setSelectionCallback(boost::bind(&LLFloaterUIPreview::onLanguageComboSelect, this, mLanguageSelection));
+ LLPanel* editor_panel_tmp = main_panel_tmp->getChild<LLPanel>("editor_panel");
+ mDisplayFloaterBtn = main_panel_tmp->getChild<LLButton>("display_floater");
+ mDisplayFloaterBtn->setClickedCallback(onClickDisplayFloater, (void*)&PRIMARY_FLOATER);
+ mDisplayFloaterBtn_2 = main_panel_tmp->getChild<LLButton>("display_floater_2");
+ mDisplayFloaterBtn_2->setClickedCallback(onClickDisplayFloater, (void*)&SECONDARY_FLOATER);
+ mToggleOverlapButton = main_panel_tmp->getChild<LLButton>("toggle_overlap_panel");
+ mToggleOverlapButton->setClickedCallback(onClickToggleOverlapping, this);
+ mCloseOtherButton = main_panel_tmp->getChild<LLButton>("close_displayed_floater");
+ mCloseOtherButton->setClickedCallback(onClickCloseDisplayedFloater, (void*)&PRIMARY_FLOATER);
+ mCloseOtherButton_2 = main_panel_tmp->getChild<LLButton>("close_displayed_floater_2");
+ mCloseOtherButton_2->setClickedCallback(onClickCloseDisplayedFloater, (void*)&SECONDARY_FLOATER);
+ mEditFloaterBtn = main_panel_tmp->getChild<LLButton>("edit_floater");
+ mEditFloaterBtn->setClickedCallback(onClickEditFloater, this);
+ mExecutableBrowseButton = editor_panel_tmp->getChild<LLButton>("browse_for_executable");
+ LLPanel* vlt_panel_tmp = main_panel_tmp->getChild<LLPanel>("vlt_panel");
+ mExecutableBrowseButton->setClickedCallback(onClickBrowseForEditor, this);
+ mDiffBrowseButton = vlt_panel_tmp->getChild<LLButton>("browse_for_vlt_diffs");
+ mDiffBrowseButton->setClickedCallback(onClickBrowseForDiffs, NULL);
+ mToggleHighlightButton = vlt_panel_tmp->getChild<LLButton>("toggle_vlt_diff_highlight");
+ mToggleHighlightButton->setClickedCallback(onClickToggleDiffHighlighting, NULL);
+ main_panel_tmp->getChild<LLButton>("save_floater")->setClickedCallback(onClickSaveFloater, (void*)&PRIMARY_FLOATER);
+
+ // get pointers to text fields
+ mEditorPathTextBox = editor_panel_tmp->getChild<LLLineEditor>("executable_path_field");
+ mEditorArgsTextBox = editor_panel_tmp->getChild<LLLineEditor>("executable_args_field");
+ mDiffPathTextBox = vlt_panel_tmp->getChild<LLLineEditor>("vlt_diff_path_field");
+
+ // *HACK: restored saved editor path and args to textfields
+ mEditorPathTextBox->setText(LLFloaterUIPreview::mSavedEditorPath);
+ mEditorArgsTextBox->setText(LLFloaterUIPreview::mSavedEditorArgs);
+ mDiffPathTextBox->setText(LLFloaterUIPreview::mSavedDiffPath);
+
+ // Set up overlap panel
+ mOverlapPanel = getChild<LLOverlapPanel>("overlap_panel");
+
+ sInstance->childSetVisible("overlap_scroll", mHighlightingOverlaps);
+
+ mDelim = gDirUtilp->getDirDelimiter(); // initialize delimiter to dir sep slash
+
+ // refresh list of available languages (EN-US will still be default)
+ BOOL found = TRUE;
+ BOOL found_en_us = FALSE;
+ std::string language_directory;
+ std::string xui_dir = get_xui_dir(); // directory containing localizations -- don't forget trailing delim
+ mLanguageSelection->removeall(); // clear out anything temporarily in list from XML
+ while(found) // for every directory
+ {
+ if((found = gDirUtilp->getNextFileInDir(xui_dir, "*", language_directory, FALSE))) // get next directory
+ {
+ std::string full_path = xui_dir + language_directory;
+ if(LLFile::isfile(full_path.c_str())) // if it's not a directory, skip it
+ {
+ continue;
+ }
+
+ if(strncmp("template",language_directory.c_str(),8) && -1 == language_directory.find(".")) // if it's not the template directory or a hidden directory
+ {
+ if(!strncmp("en-us",language_directory.c_str(),5)) // remember if we've seen en-us, so we can make it default
+ {
+ found_en_us = TRUE;
+ }
+ else
+ {
+ mLanguageSelection->add(std::string(language_directory)); // add it to the language selection dropdown menu
+ mLanguageSelection_2->add(std::string(language_directory));
+ }
+ }
+ }
+ }
+ if(found_en_us)
+ {
+ mLanguageSelection->add(std::string("en-us"),ADD_TOP); // make en-us first item if we found it
+ mLanguageSelection_2->add(std::string("en-us"),ADD_TOP);
+ }
+ else
+ {
+ std::string warning = std::string("No EN-US localization found; check your XUI directories!");
+ popupAndPrintWarning(warning);
+ }
+ mLanguageSelection->selectFirstItem(); // select the first item
+ mLanguageSelection_2->selectFirstItem();
+
+ refreshList(); // refresh the list of available floaters
+
+ return TRUE;
+}
+
+// Callback for language combo box selection: refresh current floater when you change languages
+void LLFloaterUIPreview::onLanguageComboSelect(LLUICtrl* ctrl)
+{
+ LLComboBox* caller = dynamic_cast<LLComboBox*>(ctrl);
+ if (!caller)
+ return;
+ if(caller->getName() == std::string("language_select_combo"))
+ {
+ if(mDisplayedFloater)
+ {
+ onClickCloseDisplayedFloater((void*)&PRIMARY_FLOATER);
+ displayFloater(TRUE,1);
+ }
+ }
+ else
+ {
+ if(mDisplayedFloater_2)
+ {
+ onClickCloseDisplayedFloater((void*)&PRIMARY_FLOATER);
+ displayFloater(TRUE,2); // *TODO: make take an arg
+ }
+ }
+
+}
+
+// Close click handler -- delete my displayed floater if it exists
+void LLFloaterUIPreview::onClose(bool app_quitting)
+{
+ if(!app_quitting && sInstance && sInstance->mDisplayedFloater)
+ {
+ onClickCloseDisplayedFloater((void*)&PRIMARY_FLOATER);
+ onClickCloseDisplayedFloater((void*)&SECONDARY_FLOATER);
+ delete sInstance->mDisplayedFloater;
+ sInstance->mDisplayedFloater = NULL;
+ }
+ destroy();
+}
+
+// Error handling (to avoid code repetition)
+// *TODO: this is currently unlocalized. Add to alerts/notifications.xml, someday, maybe.
+void LLFloaterUIPreview::popupAndPrintWarning(std::string& warning)
+{
+ llwarns << warning << llendl;
+ LLSD args;
+ args["MESSAGE"] = warning;
+ LLNotifications::instance().add("GenericAlert", args);
+}
+
+// Get localization string from drop-down menu
+std::string LLFloaterUIPreview::getLocStr(S32 ID)
+{
+ if(ID == 1)
+ {
+ return sInstance->mLanguageSelection->getSelectedItemLabel(0);
+ }
+ else
+ {
+ return sInstance->mLanguageSelection_2->getSelectedItemLabel(0);
+ }
+}
+
+// Get localized directory (build path from data directory to XUI files, substituting localization string in for language)
+std::string LLFloaterUIPreview::getLocalizedDirectory()
+{
+ return get_xui_dir() + (sInstance ? getLocStr(1) : "en-us") + mDelim; // e.g. "C:/Code/guipreview/indra/newview/skins/xui/en-us/";
+}
+
+// Refresh the list of floaters by doing a directory traverse for XML XUI floater files
+// Could be used to grab any specific language's list of compatible floaters, but currently it's just used to get all of them
+void LLFloaterUIPreview::refreshList()
+{
+ // Note: the mask doesn't seem to accept regular expressions, so there need to be two directory searches here
+ mFileList->clearRows(); // empty list
+ std::string name;
+ BOOL found = TRUE;
+ while(found) // for every floater file that matches the pattern
+ {
+ if((found = gDirUtilp->getNextFileInDir(getLocalizedDirectory(), "floater_*.xml", name, FALSE))) // get next file matching pattern
+ {
+ addFloaterEntry(name.c_str()); // and add it to the list (file name only; localization code takes care of rest of path)
+ }
+ }
+ found = TRUE;
+ while(found) // for every panel file that matches the pattern
+ {
+ if((found = gDirUtilp->getNextFileInDir(getLocalizedDirectory(), "panel_*.xml", name, FALSE))) // get next file matching pattern
+ {
+ addFloaterEntry(name.c_str()); // and add it to the list (file name only; localization code takes care of rest of path)
+ }
+ }
+
+ if(!mFileList->isEmpty()) // if there were any matching files, just select the first one (so we don't have to worry about disabling buttons when no entry is selected)
+ {
+ mFileList->selectFirstItem();
+ }
+}
+
+// Add a single entry to the list of available floaters
+// Note: no deduplification (shouldn't be necessary)
+void LLFloaterUIPreview::addFloaterEntry(const std::string& path)
+{
+ LLUUID* entry_id = new LLUUID(); // create a new UUID
+ entry_id->generate(path);
+ const LLUUID& entry_id_ref = *entry_id; // get a reference to the UUID for the LLSD block
+
+ // fill LLSD column entry: initialize row/col structure
+ LLSD row;
+ row["id"] = entry_id_ref;
+ LLSD& columns = row["columns"];
+
+ // Get name of floater:
+ LLXmlTree xml_tree;
+ std::string full_path = getLocalizedDirectory() + path; // get full path
+ BOOL success = xml_tree.parseFile(full_path.c_str(), TRUE); // parse xml
+ std::string entry_name;
+ std::string entry_title;
+ if(success)
+ {
+ // get root (or error handle)
+ LLXmlTreeNode* root_floater = xml_tree.getRoot();
+ if (!root_floater)
+ {
+ std::string warning = std::string("No root node found in XUI file: ") + path;
+ popupAndPrintWarning(warning);
+ return;
+ }
+
+ // get name
+ root_floater->getAttributeString("name",entry_name);
+ if(std::string("") == entry_name)
+ {
+ entry_name = "Error: unable to load " + std::string(path); // set to error state if load fails
+ }
+
+ // get title
+ root_floater->getAttributeString("title",entry_title); // some don't have a title, and some have title = "(unknown)", so just leave it blank if it fails
+ }
+ else
+ {
+ std::string warning = std::string("Unable to parse XUI file: ") + path; // error handling
+ popupAndPrintWarning(warning);
+ if(mLiveFile)
+ {
+ delete mLiveFile;
+ mLiveFile = NULL;
+ }
+ return;
+ }
+
+ // Fill floater title column
+ columns[0]["column"] = "title_column";
+ columns[0]["type"] = "text";
+ columns[0]["value"] = entry_title;
+
+ // Fill floater path column
+ columns[1]["column"] = "file_column";
+ columns[1]["type"] = "text";
+ columns[1]["value"] = std::string(path);
+
+ // Fill floater name column
+ columns[2]["column"] = "top_level_node_column";
+ columns[2]["type"] = "text";
+ columns[2]["value"] = entry_name;
+
+ mFileList->addElement(row); // actually add to list
+}
+
+// Respond to button click to display/refresh currently-selected floater
+void LLFloaterUIPreview::onClickDisplayFloater(void* data)
+{
+ S32 caller_id = *((S32*)data);
+ displayFloater(TRUE, caller_id);
+ if(caller_id == 1)
+ {
+ sInstance->mDisplayedFloater->center(); // move displayed floater to the center of the screen
+ }
+}
+
+// Respond to button click to display/refresh currently-selected floater
+void LLFloaterUIPreview::onClickSaveFloater(void* data)
+{
+ S32 caller_id = *((S32*)data);
+ displayFloater(TRUE, caller_id, true);
+ if(caller_id == 1)
+ {
+ sInstance->mDisplayedFloater->center(); // move displayed floater to the center of the screen
+ }
+}
+
+
+// Given path to floater or panel XML file "filename.xml",
+// returns "filename_new.xml"
+static std::string append_new_to_xml_filename(const std::string& path)
+{
+ std::string full_filename = gDirUtilp->findSkinnedFilename(LLUI::getSkinPath(), path);
+ std::string::size_type extension_pos = full_filename.rfind(".xml");
+ full_filename.resize(extension_pos);
+ full_filename += "_new.xml";
+ return full_filename;
+}
+
+// Actually display the floater
+// Only set up a new live file if this came from a click (at which point there should be no existing live file), rather than from the live file's update itself;
+// otherwise, we get an infinite loop as the live file keeps recreating itself. That means this function is generally called twice.
+void LLFloaterUIPreview::displayFloater(BOOL click, S32 ID, bool save)
+{
+ // Convince UI that we're in a different language (the one selected on the drop-down menu)
+ LLLocalizationResetForcer reset_forcer(ID); // save old language in reset forcer object (to be reset upon destruction when it falls out of scope)
+
+ LLPreviewedFloater** floaterp = (ID == 1 ? &(sInstance->mDisplayedFloater) : &(sInstance->mDisplayedFloater_2));
+ if(ID == 1)
+ {
+ BOOL floater_already_open = sInstance->mDisplayedFloater != NULL;
+ if(floater_already_open) // if we are already displaying a floater
+ {
+ sInstance->mLastDisplayedX = sInstance->mDisplayedFloater->calcScreenRect().mLeft; // save floater's last known position to put the new one there
+ sInstance->mLastDisplayedY = sInstance->mDisplayedFloater->calcScreenRect().mBottom;
+ delete sInstance->mDisplayedFloater; // delete it (this closes it too)
+ sInstance->mDisplayedFloater = NULL; // and reset the pointer
+ }
+ }
+ else
+ {
+ if(sInstance->mDisplayedFloater_2 != NULL)
+ {
+ delete sInstance->mDisplayedFloater_2;
+ sInstance->mDisplayedFloater_2 = NULL;
+ }
+ }
+
+ std::string path = sInstance->mFileList->getSelectedItemLabel(1); // get the path of the currently-selected floater
+ if(std::string("") == path) // if no item is selected
+ {
+ return; // ignore click (this can only happen with empty list; otherwise an item is always selected)
+ }
+
+ *floaterp = new LLPreviewedFloater();
+
+ if(strncmp(path.c_str(),"panel_",6)) // if it's not a panel
+ {
+ if (save)
+ {
+ LLXMLNodePtr floater_write = new LLXMLNode();
+ LLUICtrlFactory::getInstance()->buildFloater(*floaterp, path, FALSE, floater_write); // just build it
+
+ std::string full_filename = append_new_to_xml_filename(path);
+ LLFILE* floater_temp = LLFile::fopen(full_filename.c_str(), "w");
+ LLXMLNode::writeHeaderToFile(floater_temp);
+ floater_write->writeToFile(floater_temp, " ");
+ fclose(floater_temp);
+ }
+ else
+ {
+ LLUICtrlFactory::getInstance()->buildFloater(*floaterp, path, TRUE); // just build it
+ }
+
+ }
+ else // if it is a panel...
+ {
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
+
+ LLPanel::Params panel_params;
+ LLPanel* panel = LLUICtrlFactory::create<LLPanel>(panel_params); // create a new panel
+
+ if (save)
+ {
+ LLXMLNodePtr panel_write = new LLXMLNode();
+ LLUICtrlFactory::getInstance()->buildPanel(panel, path, panel_write); // build it
+
+ std::string full_filename = append_new_to_xml_filename(path);
+ LLFILE* panel_temp = LLFile::fopen(full_filename.c_str(), "w");
+ LLXMLNode::writeHeaderToFile(panel_temp);
+ panel_write->writeToFile(panel_temp, " ");
+ fclose(panel_temp);
+ }
+ else
+ {
+ LLUICtrlFactory::getInstance()->buildPanel(panel, path); // build it
+
+ }
+
+ if (!save)
+ {
+ LLRect new_size = panel->getRect(); // get its rectangle
+ panel->setOrigin(0,0); // reset its origin point so it's not offset by -left or other XUI attributes
+ (*floaterp)->setTitle(path); // use the file name as its title, since panels have no guaranteed meaningful name attribute
+ panel->setUseBoundingRect(TRUE); // enable the use of its outer bounding rect (normally disabled because it's O(n) on the number of sub-elements)
+ panel->updateBoundingRect(); // update bounding rect
+ LLRect bounding_rect = panel->getBoundingRect(); // get the bounding rect
+ LLRect panel_rect = panel->getRect(); // get the panel's rect
+ LLRect new_rect = panel_rect.unionWith(bounding_rect); // union them to make sure we get the biggest one possible
+ (*floaterp)->reshape(new_rect.getWidth(), new_rect.getHeight() + floater_header_size); // reshape floater to match the union rect's dimensions
+ panel->reshape(new_rect.getWidth(), new_rect.getHeight()); // reshape panel to match the union rect's dimensions as well (both are needed)
+ (*floaterp)->addChild(panel); // add panel as child
+ (*floaterp)->openFloater(); // open floater (needed?)
+ }
+ }
+
+ if(ID == 1)
+ {
+ (*floaterp)->setOrigin(sInstance->mLastDisplayedX, sInstance->mLastDisplayedY);
+ }
+
+ // *HACK: Remove ability to close it; if you close it, its destructor gets called, but we don't know it's null and try to delete it again,
+ // resulting in a double free
+ (*floaterp)->setCanClose(FALSE);
+
+ if(ID == 1)
+ {
+ sInstance->mCloseOtherButton->setEnabled(TRUE); // enable my floater's close button
+ }
+ else
+ {
+ sInstance->mCloseOtherButton_2->setEnabled(TRUE);
+ }
+
+ // *TODO: Make the secondary floater pop up next to the primary one. Doesn't seem to always work if secondary was up first...
+ if((sInstance->mDisplayedFloater && ID == 2) || (sInstance->mDisplayedFloater_2 && ID == 1))
+ {
+ sInstance->mDisplayedFloater_2->setSnapTarget(sInstance->mDisplayedFloater->getHandle());
+ sInstance->mDisplayedFloater->addDependentFloater(sInstance->mDisplayedFloater_2);
+ }
+
+ // Add localization to title so user knows whether it's localized or defaulted to en-us
+ std::string full_path = sInstance->getLocalizedDirectory() + path;
+ std::string floater_lang = "EN-US";
+ llstat dummy;
+ if(!LLFile::stat(full_path.c_str(), &dummy)) // if the file does not exist
+ {
+ floater_lang = getLocStr(ID);
+ }
+ std::string new_title = (*floaterp)->getTitle() + std::string(" [") + floater_lang +
+ (ID == 1 ? " - Primary" : " - Secondary") + std::string("]");
+ (*floaterp)->setTitle(new_title);
+
+ if(click && ID == 1 && !save)
+ {
+ // set up live file to track it
+ if(sInstance->mLiveFile)
+ {
+ delete sInstance->mLiveFile;
+ sInstance->mLiveFile = NULL;
+ }
+ sInstance->mLiveFile = new LLGUIPreviewLiveFile(std::string(full_path.c_str()),std::string(path.c_str()),sInstance);
+ sInstance->mLiveFile->checkAndReload();
+ sInstance->mLiveFile->addToEventTimer();
+ }
+
+ if(ID == 1)
+ {
+ sInstance->mToggleOverlapButton->setEnabled(TRUE);
+ }
+
+ if(LLView::sHighlightingDiffs && click && ID == 1)
+ {
+ sInstance->highlightChangedElements();
+ }
+
+ if(ID == 1)
+ {
+ sInstance->mOverlapMap.clear();
+ LLView::sPreviewClickedElement = NULL; // stop overlapping elements from drawing
+ sInstance->mOverlapPanel->mLastClickedElement = NULL;
+ sInstance->findOverlapsInChildren((LLView*)sInstance->mDisplayedFloater);
+
+ // highlight and enable them
+ if(sInstance->mHighlightingOverlaps)
+ {
+ for(OverlapMap::iterator iter = sInstance->mOverlapMap.begin(); iter != sInstance->mOverlapMap.end(); ++iter)
+ {
+ LLView* viewp = iter->first;
+ LLView::sPreviewHighlightedElements.insert(viewp);
+ }
+ }
+ else if(LLView::sHighlightingDiffs)
+ {
+ sInstance->highlightChangedElements();
+ }
+ }
+
+ // NOTE: language is reset here automatically when the reset forcer object falls out of scope (see header for details)
+}
+
+// Respond to button click to edit currently-selected floater
+void LLFloaterUIPreview::onClickEditFloater(void*)
+{
+ std::string file_name = sInstance->mFileList->getSelectedItemLabel(1); // get the file name of the currently-selected floater
+ if(std::string("") == file_name) // if no item is selected
+ {
+ return; // ignore click
+ }
+ std::string path = sInstance->getLocalizedDirectory() + file_name;
+
+ // stat file to see if it exists (some localized versions may not have it there are no diffs, and then we try to open an nonexistent file)
+ llstat dummy;
+ if(LLFile::stat(path.c_str(), &dummy)) // if the file does not exist
+ {
+ std::string warning = "No file for this floater exists in the selected localization. Opening the EN-US version instead.";
+ popupAndPrintWarning(warning);
+
+ path = get_xui_dir() + sInstance->mDelim + "en-us" + sInstance->mDelim + file_name; // open the en-us version instead, by default
+ }
+
+ // get executable path
+ const char* exe_path_char;
+ std::string path_in_textfield = sInstance->mEditorPathTextBox->getText();
+ if(std::string("") != path_in_textfield) // if the text field is not emtpy, use its path
+ {
+ exe_path_char = path_in_textfield.c_str();
+ }
+ else // otherwise use the path specified by the environment variable
+ {
+ exe_path_char = getenv("LL_XUI_EDITOR");
+ }
+
+ // error check executable path
+ if(NULL == exe_path_char)
+ {
+ std::string warning = "Select an editor by setting the environment variable LL_XUI_EDITOR or specifying its path in the \"Editor Path\" field.";
+ popupAndPrintWarning(warning);
+ return;
+ }
+ std::string exe_path = exe_path_char; // do this after error check, otherwise internal strlen call fails on bad char*
+
+ // remove any quotes; they're added back in later where necessary
+ int found_at;
+ while((found_at = exe_path.find("\"")) != -1 || (found_at = exe_path.find("'")) != -1)
+ {
+ exe_path.erase(found_at,1);
+ }
+
+ llstat s;
+ if(!LLFile::stat(exe_path.c_str(), &s)) // If the executable exists
+ {
+ // build paths and arguments
+ std::string args;
+ std::string custom_args = sInstance->mEditorArgsTextBox->getText();
+ int position_of_file = custom_args.find(std::string("%FILE%"), 0); // prepare to replace %FILE% with actual file path
+ std::string first_part_of_args = "";
+ std::string second_part_of_args = "";
+ if(-1 == position_of_file) // default: Executable.exe File.xml
+ {
+ args = std::string("\"") + path + std::string("\""); // execute the command Program.exe "File.xml"
+ }
+ else // use advanced command-line arguments, e.g. "Program.exe -safe File.xml" -windowed for "-safe %FILE% -windowed"
+ {
+ first_part_of_args = custom_args.substr(0,position_of_file); // get part of args before file name
+ second_part_of_args = custom_args.substr(position_of_file+6,custom_args.length()); // get part of args after file name
+ custom_args = first_part_of_args + std::string("\"") + path + std::string("\"") + second_part_of_args; // replace %FILE% with "<file path>" and put back together
+ args = custom_args; // and save in the variable that is actually used
+ }
+
+ // find directory in which executable resides by taking everything after last slash
+ int last_slash_position = exe_path.find_last_of(sInstance->mDelim);
+ if(-1 == last_slash_position)
+ {
+ std::string warning = std::string("Unable to find a valid path to the specified executable for XUI XML editing: ") + exe_path;
+ popupAndPrintWarning(warning);
+ return;
+ }
+ std::string exe_dir = exe_path.substr(0,last_slash_position); // strip executable off, e.g. get "C:\Program Files\TextPad 5" (with or without trailing slash)
+
+#if LL_WINDOWS
+ PROCESS_INFORMATION pinfo;
+ STARTUPINFOA sinfo;
+ memset(&sinfo, 0, sizeof(sinfo));
+ memset(&pinfo, 0, sizeof(pinfo));
+
+ std::string exe_name = exe_path.substr(last_slash_position+1);
+ args = exe_name + std::string(" ") + args; // and prepend the executable name, so we get 'Program.exe "Arg1"'
+
+ char *args2 = new char[args.size() + 1]; // Windows requires that the second parameter to CreateProcessA be a writable (non-const) string...
+ strcpy(args2, args.c_str());
+
+ if(!CreateProcessA(exe_path.c_str(), args2, NULL, NULL, FALSE, 0, NULL, exe_dir.c_str(), &sinfo, &pinfo))
+ {
+ // DWORD dwErr = GetLastError();
+ std::string warning = "Creating editor process failed!";
+ popupAndPrintWarning(warning);
+ }
+ else
+ {
+ // foo = pinfo.dwProcessId; // get your pid here if you want to use it later on
+ // sGatewayHandle = pinfo.hProcess;
+ CloseHandle(pinfo.hThread); // stops leaks - nothing else
+ }
+
+ delete[] args2;
+#else // if !LL_WINDOWS
+ // This code was copied from the code to run SLVoice, with some modification; should work in UNIX (Mac/Darwin or Linux)
+ {
+ std::vector<std::string> arglist;
+ arglist.push_back(exe_path.c_str());
+
+ // Split the argument string into separate strings for each argument
+ typedef boost::tokenizer< boost::char_separator<char> > tokenizer;
+ boost::char_separator<char> sep("","\" ", boost::drop_empty_tokens);
+
+ tokenizer tokens(args, sep);
+ tokenizer::iterator token_iter;
+ BOOL inside_quotes = FALSE;
+ BOOL last_was_space = FALSE;
+ for(token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
+ {
+ if(!strncmp("\"",(*token_iter).c_str(),2))
+ {
+ inside_quotes = !inside_quotes;
+ }
+ else if(!strncmp(" ",(*token_iter).c_str(),2))
+ {
+ if(inside_quotes)
+ {
+ arglist.back().append(std::string(" "));
+ last_was_space = TRUE;
+ }
+ }
+ else
+ {
+ std::string to_push = *token_iter;
+ if(last_was_space)
+ {
+ arglist.back().append(to_push);
+ last_was_space = FALSE;
+ }
+ else
+ {
+ arglist.push_back(to_push);
+ }
+ }
+ }
+
+ // create an argv vector for the child process
+ char **fakeargv = new char*[arglist.size() + 1];
+ int i;
+ for(i=0; i < arglist.size(); i++)
+ fakeargv[i] = const_cast<char*>(arglist[i].c_str());
+
+ fakeargv[i] = NULL;
+
+ fflush(NULL); // flush all buffers before the child inherits them
+ pid_t id = vfork();
+ if(id == 0)
+ {
+ // child
+ execv(exe_path.c_str(), fakeargv);
+
+ // If we reach this point, the exec failed.
+ // Use _exit() instead of exit() per the vfork man page.
+ std::string warning = "Creating editor process failed (vfork/execv)!";
+ popupAndPrintWarning(warning);
+ _exit(0);
+ }
+
+ // parent
+ delete[] fakeargv;
+ // sGatewayPID = id;
+ }
+#endif // LL_WINDOWS
+ }
+ else
+ {
+ std::string warning = "Unable to find path to external XML editor for XUI preview tool";
+ popupAndPrintWarning(warning);
+ }
+}
+
+// Respond to button click to browse for an executable with which to edit XML files
+void LLFloaterUIPreview::onClickBrowseForEditor(void*)
+{
+ // create load dialog box
+ LLFilePicker::ELoadFilter type = (LLFilePicker::ELoadFilter)((intptr_t)((void*)LLFilePicker::FFLOAD_ALL)); // nothing for *.exe so just use all
+ LLFilePicker& picker = LLFilePicker::instance();
+ if (!picker.getOpenFile(type)) // user cancelled -- do nothing
+ {
+ return;
+ }
+
+ // put the selected path into text field
+ const std::string chosen_path = picker.getFirstFile();
+ std::string executable_path = chosen_path;
+#if LL_DARWIN
+ // on Mac, if it's an application bundle, figure out the actual path from the Info.plist file
+ CFStringRef path_cfstr = CFStringCreateWithCString(kCFAllocatorDefault, chosen_path.c_str(), kCFStringEncodingMacRoman); // get path as a CFStringRef
+ CFURLRef path_url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, path_cfstr, kCFURLPOSIXPathStyle, TRUE); // turn it into a CFURLRef
+ CFBundleRef chosen_bundle = CFBundleCreate(kCFAllocatorDefault, path_url); // get a handle for the bundle
+ if(NULL != chosen_bundle)
+ {
+ CFDictionaryRef bundleInfoDict = CFBundleGetInfoDictionary(chosen_bundle); // get the bundle's dictionary
+ if(NULL != bundleInfoDict)
+ {
+ CFStringRef executable_cfstr = (CFStringRef)CFDictionaryGetValue(bundleInfoDict, CFSTR("CFBundleExecutable")); // get the name of the actual executable (e.g. TextEdit or firefox-bin)
+ int max_file_length = 256; // (max file name length is 255 in OSX)
+ char executable_buf[max_file_length];
+ if(CFStringGetCString(executable_cfstr, executable_buf, max_file_length, kCFStringEncodingMacRoman)) // convert CFStringRef to char*
+ {
+ executable_path += std::string("/Contents/MacOS/") + std::string(executable_buf); // append path to executable directory and then executable name to exec path
+ }
+ else
+ {
+ std::string warning = "Unable to get CString from CFString for executable path";
+ popupAndPrintWarning(warning);
+ }
+ }
+ else
+ {
+ std::string warning = "Unable to get bundle info dictionary from application bundle";
+ popupAndPrintWarning(warning);
+ }
+ }
+ else
+ {
+ if(-1 != executable_path.find(".app")) // only warn if this path actually had ".app" in it, i.e. it probably just wasn'nt an app bundle and that's okay
+ {
+ std::string warning = std::string("Unable to get bundle from path \"") + chosen_path + std::string("\"");
+ popupAndPrintWarning(warning);
+ }
+ }
+
+#endif
+ sInstance->mEditorPathTextBox->setText(std::string(executable_path)); // copy the path to the executable to the textfield for display and later fetching
+}
+
+// Respond to button click to browse for a VLT-generated diffs file
+void LLFloaterUIPreview::onClickBrowseForDiffs(void*)
+{
+ // create load dialog box
+ LLFilePicker::ELoadFilter type = (LLFilePicker::ELoadFilter)((intptr_t)((void*)LLFilePicker::FFLOAD_XML)); // nothing for *.exe so just use all
+ LLFilePicker& picker = LLFilePicker::instance();
+ if (!picker.getOpenFile(type)) // user cancelled -- do nothing
+ {
+ return;
+ }
+
+ // put the selected path into text field
+ const std::string chosen_path = picker.getFirstFile();
+ sInstance->mDiffPathTextBox->setText(std::string(chosen_path)); // copy the path to the executable to the textfield for display and later fetching
+ if(LLView::sHighlightingDiffs) // if we're already highlighting, toggle off and then on so we get the data from the new file
+ {
+ onClickToggleDiffHighlighting(NULL);
+ onClickToggleDiffHighlighting(NULL);
+ }
+}
+
+void LLFloaterUIPreview::onClickToggleDiffHighlighting(void*)
+{
+ if(sInstance->mHighlightingOverlaps)
+ {
+ onClickToggleOverlapping(NULL);
+ sInstance->mToggleOverlapButton->toggleState();
+ }
+
+ LLView::sPreviewHighlightedElements.clear(); // clear lists first
+ sInstance->mDiffsMap.clear();
+ sInstance->mFileList->clearHighlightedItems();
+
+ if(LLView::sHighlightingDiffs) // Turning highlighting off
+ {
+ LLView::sHighlightingDiffs = !sInstance->sHighlightingDiffs;
+ return;
+ }
+ else // Turning highlighting on
+ {
+ // Get the file and make sure it exists
+ std::string path_in_textfield = sInstance->mDiffPathTextBox->getText(); // get file path
+ BOOL error = FALSE;
+
+ if(std::string("") == path_in_textfield) // check for blank file
+ {
+ std::string warning = "Unable to highlight differences because no file was provided; fill in the relevant text field";
+ popupAndPrintWarning(warning);
+ error = TRUE;
+ }
+
+ llstat dummy;
+ if(LLFile::stat(path_in_textfield.c_str(), &dummy) && !error) // check if the file exists (empty check is reduntant but useful for the informative error message)
+ {
+ std::string warning = std::string("Unable to highlight differences because an invalid path to a difference file was provided:\"") + path_in_textfield + "\"";
+ popupAndPrintWarning(warning);
+ error = TRUE;
+ }
+
+ // Build a list of changed elements as given by the XML
+ std::list<std::string> changed_element_names;
+ LLXmlTree xml_tree;
+ BOOL success = xml_tree.parseFile(path_in_textfield.c_str(), TRUE);
+
+ if(success && !error)
+ {
+ LLXmlTreeNode* root_floater = xml_tree.getRoot();
+ if(!strncmp("XuiDelta",root_floater->getName().c_str(),9))
+ {
+ for (LLXmlTreeNode* child = root_floater->getFirstChild(); // get the first child first, then below get the next one; otherwise the iterator is invalid (bug or feature in XML code?)
+ child != NULL;
+ child = root_floater->getNextChild()) // get child for next iteration
+ {
+ if(!strncmp("file",child->getName().c_str(),5))
+ {
+ sInstance->scanDiffFile(child);
+ }
+ else if(!strncmp("error",child->getName().c_str(),6))
+ {
+ std::string error_file, error_message;
+ child->getAttributeString("filename",error_file);
+ child->getAttributeString("message",error_message);
+ if(sInstance->mDiffsMap.find(error_file) != sInstance->mDiffsMap.end())
+ {
+ sInstance->mDiffsMap.insert(std::make_pair(error_file,std::make_pair(StringListPtr(new StringList), StringListPtr(new StringList))));
+ }
+ sInstance->mDiffsMap[error_file].second->push_back(error_message);
+ }
+ else
+ {
+ std::string warning = std::string("Child was neither a file or an error, but rather the following:\"") + std::string(child->getName()) + "\"";
+ popupAndPrintWarning(warning);
+ error = TRUE;
+ break;
+ }
+ }
+ }
+ else
+ {
+ std::string warning = std::string("Root node not named XuiDelta:\"") + path_in_textfield + "\"";
+ popupAndPrintWarning(warning);
+ error = TRUE;
+ }
+ }
+ else if(!error)
+ {
+ std::string warning = std::string("Unable to create tree from XML:\"") + path_in_textfield + "\"";
+ popupAndPrintWarning(warning);
+ error = TRUE;
+ }
+
+ if(error) // if we encountered an error, reset the button to off
+ {
+ sInstance->mToggleHighlightButton->setToggleState(FALSE);
+ }
+ else // only toggle if we didn't encounter an error
+ {
+ LLView::sHighlightingDiffs = !sInstance->sHighlightingDiffs;
+ sInstance->highlightChangedElements(); // *TODO: this is extraneous, right?
+ sInstance->highlightChangedFiles(); // *TODO: this is extraneous, right?
+ }
+ }
+}
+
+void LLFloaterUIPreview::scanDiffFile(LLXmlTreeNode* file_node)
+{
+ // Get file name
+ std::string file_name;
+ file_node->getAttributeString("name",file_name);
+ if(std::string("") == file_name)
+ {
+ std::string warning = std::string("Empty file name encountered in differences:\"") + file_name + "\"";
+ popupAndPrintWarning(warning);
+ return;
+ }
+
+ // Get a list of changed elements
+ // Get the first child first, then below get the next one; otherwise the iterator is invalid (bug or feature in XML code?)
+ for (LLXmlTreeNode* child = file_node->getFirstChild(); child != NULL; child = file_node->getNextChild())
+ {
+ if(!strncmp("delta",child->getName().c_str(),6))
+ {
+ std::string id;
+ child->getAttributeString("id",id);
+ if(mDiffsMap.find(file_name) == mDiffsMap.end())
+ {
+ mDiffsMap.insert(std::make_pair(file_name,std::make_pair(StringListPtr(new StringList), StringListPtr(new StringList))));
+ }
+ mDiffsMap[file_name].first->push_back(std::string(id.c_str()));
+ }
+ else
+ {
+ std::string warning = std::string("Child of file was not a delta, but rather the following:\"") + std::string(child->getName()) + "\"";
+ popupAndPrintWarning(warning);
+ return;
+ }
+ }
+}
+
+void LLFloaterUIPreview::highlightChangedElements()
+{
+ if(NULL == mLiveFile)
+ {
+ return;
+ }
+
+ // Process differences first (we want their warnings to be shown underneath other warnings)
+ StringListPtr changed_element_paths;
+ DiffMap::iterator iterExists = mDiffsMap.find(mLiveFile->mFileName);
+ if(iterExists != mDiffsMap.end())
+ {
+ changed_element_paths = mDiffsMap[mLiveFile->mFileName].first; // retrieve list of changed element paths from map
+ }
+
+ for(std::list<std::string>::iterator iter = changed_element_paths->begin(); iter != changed_element_paths->end(); ++iter) // for every changed element path
+ {
+ LLView* element = sInstance->mDisplayedFloater;
+ if(!strncmp(iter->c_str(),".",1)) // if it's the root floater itself
+ {
+ continue;
+ }
+
+ // Split element hierarchy path on period (*HACK: it's possible that the element name will have a period in it, in which case this won't work. See https://wiki.lindenlab.com/wiki/Viewer_Localization_Tool_Documentation.)
+ typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+ boost::char_separator<char> sep(".");
+ tokenizer tokens(*iter, sep);
+ tokenizer::iterator token_iter;
+ BOOL failed = FALSE;
+ for(token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
+ {
+ element = element->getChild<LLView>(*token_iter,FALSE,FALSE); // try to find element: don't recur, and don't create if missing
+
+ // if we still didn't find it...
+ if(NULL == element)
+ {
+ llinfos << "Unable to find element in XuiDelta file named \"" << *iter << "\" in file \"" << mLiveFile->mFileName <<
+ "\". The element may no longer exist, the path may be incorrect, or it may not be a non-displayable element (not an LLView) such as a \"string\" type." << llendl;
+ failed = TRUE;
+ break;
+ }
+ }
+
+ if(!failed)
+ {
+ // Now that we have a pointer to the actual element, add it to the list of elements to be highlighted
+ std::set<LLView*>::iterator iter2 = std::find(LLView::sPreviewHighlightedElements.begin(), LLView::sPreviewHighlightedElements.end(), element);
+ if(iter2 == LLView::sPreviewHighlightedElements.end())
+ {
+ LLView::sPreviewHighlightedElements.insert(element);
+ }
+ }
+ }
+
+ // Process errors second, so their warnings show up on top of other warnings
+ StringListPtr error_list;
+ if(iterExists != mDiffsMap.end())
+ {
+ error_list = mDiffsMap[mLiveFile->mFileName].second;
+ }
+ for(std::list<std::string>::iterator iter = error_list->begin(); iter != error_list->end(); ++iter) // for every changed element path
+ {
+ std::string warning = std::string("Error listed among differences. Filename: \"") + mLiveFile->mFileName + "\". Message: \"" + *iter + "\"";
+ popupAndPrintWarning(warning);
+ }
+}
+
+void LLFloaterUIPreview::highlightChangedFiles()
+{
+ for(DiffMap::iterator iter = mDiffsMap.begin(); iter != mDiffsMap.end(); ++iter) // for every file listed in diffs
+ {
+ LLScrollListItem* item = mFileList->getItemByLabel(std::string(iter->first), FALSE, 1);
+ if(item)
+ {
+ item->setHighlighted(TRUE);
+ }
+ }
+}
+
+// Respond to button click to browse for an executable with which to edit XML files
+void LLFloaterUIPreview::onClickCloseDisplayedFloater(void* data)
+{
+ S32 caller_id = *((S32*)data);
+ if(caller_id == 1)
+ {
+ sInstance->mCloseOtherButton->setEnabled(FALSE);
+ sInstance->mToggleOverlapButton->setEnabled(FALSE);
+
+ if(sInstance->mDisplayedFloater)
+ {
+ sInstance->mLastDisplayedX = sInstance->mDisplayedFloater->calcScreenRect().mLeft;
+ sInstance->mLastDisplayedY = sInstance->mDisplayedFloater->calcScreenRect().mBottom;
+ delete sInstance->mDisplayedFloater;
+ sInstance->mDisplayedFloater = NULL;
+ }
+
+ if(sInstance->mLiveFile)
+ {
+ delete sInstance->mLiveFile;
+ sInstance->mLiveFile = NULL;
+ }
+
+ if(sInstance->mToggleOverlapButton->getToggleState())
+ {
+ sInstance->mToggleOverlapButton->toggleState();
+ onClickToggleOverlapping(NULL);
+ }
+
+ LLView::sPreviewClickedElement = NULL; // stop overlapping elements panel from drawing
+ sInstance->mOverlapPanel->mLastClickedElement = NULL;
+ }
+ else
+ {
+ sInstance->mCloseOtherButton_2->setEnabled(FALSE);
+ delete sInstance->mDisplayedFloater_2;
+ sInstance->mDisplayedFloater_2 = NULL;
+ }
+
+}
+
+BOOL LLPreviewedFloater::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+ selectElement(this,x,y,0);
+ return TRUE;
+}
+
+// *NOTE: In order to hide all of the overlapping elements of the selected element so as to see it in context, here is what you would need to do:
+// -This selectElement call fills the overlap panel as normal. The element which is "selected" here is actually just an intermediate selection step;
+// what you've really selected is a list of elements: the one you clicked on and everything that overlaps it.
+// -The user then selects one of the elements from this list the overlap panel (click handling to the overlap panel would have to be added).
+// This becomes the final selection (as opposed to the intermediate selection that was just made).
+// -Everything else that is currently displayed on the overlap panel should be hidden from view in the previewed floater itself (setVisible(FALSE)).
+// -Subsequent clicks on other elements in the overlap panel (they should still be there) should make other elements the final selection.
+// -On close or on the click of a new button, everything should be shown again and all selection state should be cleared.
+// ~Jacob, 8/08
+BOOL LLPreviewedFloater::selectElement(LLView* parent, int x, int y, int depth)
+{
+ if(getVisible())
+ {
+ BOOL handled = FALSE;
+ if(LLFloaterUIPreview::containerType(parent))
+ {
+ for(child_list_const_iter_t child_it = parent->getChildList()->begin(); child_it != parent->getChildList()->end(); ++child_it)
+ {
+ LLView* child = *child_it;
+ S32 local_x = x - child->getRect().mLeft;
+ S32 local_y = y - child->getRect().mBottom;
+ if (child->pointInView(local_x, local_y) &&
+ child->getVisible() &&
+ selectElement(child, x, y, ++depth))
+ {
+ handled = TRUE;
+ break;
+ }
+ }
+ }
+
+ if(!handled)
+ {
+ LLView::sPreviewClickedElement = parent;
+ }
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
+}
+
+void LLPreviewedFloater::draw()
+{
+ if(NULL != LLFloaterUIPreview::sInstance)
+ {
+ // Set and unset sDrawPreviewHighlights flag so as to avoid using two flags
+ if(LLFloaterUIPreview::sInstance->mHighlightingOverlaps)
+ {
+ LLView::sDrawPreviewHighlights = TRUE;
+ }
+ LLFloater::draw();
+ if(LLFloaterUIPreview::sInstance->mHighlightingOverlaps)
+ {
+ LLView::sDrawPreviewHighlights = FALSE;
+ }
+ }
+}
+
+void LLFloaterUIPreview::onClickToggleOverlapping(void*)
+{
+ if(LLView::sHighlightingDiffs)
+ {
+ onClickToggleDiffHighlighting(NULL);
+ sInstance->mToggleHighlightButton->toggleState();
+ }
+ LLView::sPreviewHighlightedElements.clear(); // clear lists first
+
+ S32 width, height;
+ sInstance->getResizeLimits(&width, &height); // illegal call of non-static member function
+ if(sInstance->mHighlightingOverlaps)
+ {
+ sInstance->mHighlightingOverlaps = !sInstance->mHighlightingOverlaps;
+ // reset list of preview highlighted elements
+ sInstance->setRect(LLRect(sInstance->getRect().mLeft,sInstance->getRect().mTop,sInstance->getRect().mRight - sInstance->mOverlapPanel->getRect().getWidth(),sInstance->getRect().mBottom));
+ sInstance->setResizeLimits(width - sInstance->mOverlapPanel->getRect().getWidth(), height);
+ }
+ else
+ {
+ sInstance->mHighlightingOverlaps = !sInstance->mHighlightingOverlaps;
+ displayFloater(FALSE,1);
+ sInstance->setRect(LLRect(sInstance->getRect().mLeft,sInstance->getRect().mTop,sInstance->getRect().mRight + sInstance->mOverlapPanel->getRect().getWidth(),sInstance->getRect().mBottom));
+ sInstance->setResizeLimits(width + sInstance->mOverlapPanel->getRect().getWidth(), height);
+ }
+ sInstance->childSetVisible("overlap_scroll", sInstance->mHighlightingOverlaps);
+}
+
+void LLFloaterUIPreview::findOverlapsInChildren(LLView* parent)
+{
+ if(parent->getChildCount() == 0 || !containerType(parent)) // if it has no children or isn't a container type, skip it
+ {
+ return;
+ }
+
+ // for every child of the parent
+ for(child_list_const_iter_t child_it = parent->getChildList()->begin(); child_it != parent->getChildList()->end(); ++child_it)
+ {
+ LLView* child = *child_it;
+ if(overlapIgnorable(child))
+ {
+ continue;
+ }
+
+ // for every sibling
+ for(child_list_const_iter_t sibling_it = parent->getChildList()->begin(); sibling_it != parent->getChildList()->end(); ++sibling_it) // for each sibling
+ {
+ LLView* sibling = *sibling_it;
+ if(overlapIgnorable(sibling))
+ {
+ continue;
+ }
+
+ // if they overlap... (we don't care if they're visible or enabled -- we want to check those anyway, i.e. hidden tabs that can be later shown)
+ if(sibling != child && elementOverlap(child, sibling))
+ {
+ mOverlapMap[child].push_back(sibling); // add to the map
+ }
+ }
+ findOverlapsInChildren(child); // recur
+ }
+}
+
+// *HACK: don't overlap with the drag handle and various other elements
+// This is using dynamic casts because there is no object-oriented way to tell which elements contain localizable text. These are a few that are ignorable.
+// *NOTE: If a list of elements which have localizable content were created, this function should return false if viewp's class is in that list.
+BOOL LLFloaterUIPreview::overlapIgnorable(LLView* viewp)
+{
+ return NULL != dynamic_cast<LLDragHandle*>(viewp) ||
+ NULL != dynamic_cast<LLViewBorder*>(viewp) ||
+ NULL != dynamic_cast<LLResizeBar*>(viewp);
+}
+
+// *HACK: these are the only two container types as of 8/08, per Richard
+// This is using dynamic casts because there is no object-oriented way to tell which elements are containers.
+BOOL LLFloaterUIPreview::containerType(LLView* viewp)
+{
+ return NULL != dynamic_cast<LLPanel*>(viewp) || NULL != dynamic_cast<LLLayoutStack*>(viewp);
+}
+
+// Check if two llview's rectangles overlap, with some tolerance
+BOOL LLFloaterUIPreview::elementOverlap(LLView* view1, LLView* view2)
+{
+ LLSD rec1 = view1->getRect().getValue();
+ LLSD rec2 = view2->getRect().getValue();
+ int tolerance = 2;
+ return (int)rec1[0] <= (int)rec2[2] - tolerance &&
+ (int)rec2[0] <= (int)rec1[2] - tolerance &&
+ (int)rec1[3] <= (int)rec2[1] - tolerance &&
+ (int)rec2[3] <= (int)rec1[1] - tolerance;
+}
+
+void LLOverlapPanel::draw()
+{
+ static const std::string current_selection_text("Current selection: ");
+ static const std::string overlapper_text("Overlapper: ");
+ LLColor4 text_color = LLColor4::grey;
+ gGL.color4fv(text_color.mV);
+
+ if(!LLView::sPreviewClickedElement)
+ {
+ LLUI::translate(5,getRect().getHeight()-20); // translate to top-5,left-5
+ LLView::sDrawPreviewHighlights = FALSE;
+ LLFontGL::getFontSansSerifSmall()->renderUTF8(current_selection_text, 0, 0, 0, text_color,
+ LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
+ }
+ else
+ {
+ LLFloaterUIPreview::OverlapMap::iterator iterExists = LLFloaterUIPreview::sInstance->mOverlapMap.find(LLView::sPreviewClickedElement);
+ if(iterExists == LLFloaterUIPreview::sInstance->mOverlapMap.end())
+ {
+ return;
+ }
+
+ std::list<LLView*> overlappers = LLFloaterUIPreview::sInstance->mOverlapMap[LLView::sPreviewClickedElement];
+ if(overlappers.size() == 0)
+ {
+ LLUI::translate(5,getRect().getHeight()-20); // translate to top-5,left-5
+ LLView::sDrawPreviewHighlights = FALSE;
+ std::string current_selection = std::string(current_selection_text + LLView::sPreviewClickedElement->getName() + " (no elements overlap)");
+ S32 text_width = LLFontGL::getFontSansSerifSmall()->getWidth(current_selection) + 10;
+ LLFontGL::getFontSansSerifSmall()->renderUTF8(current_selection, 0, 0, 0, text_color,
+ LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
+ // widen panel enough to fit this text
+ LLRect rect = getRect();
+ setRect(LLRect(rect.mLeft,rect.mTop,rect.getWidth() < text_width ? rect.mLeft + text_width : rect.mRight,rect.mTop));
+ return;
+ }
+
+ // recalculate required with and height; otherwise use cached
+ BOOL need_to_recalculate_bounds = FALSE;
+ if(mLastClickedElement == NULL)
+ {
+ need_to_recalculate_bounds = TRUE;
+ }
+
+ if(NULL == mLastClickedElement)
+ {
+ mLastClickedElement = LLView::sPreviewClickedElement;
+ }
+
+ // recalculate bounds for scroll panel
+ if(need_to_recalculate_bounds || LLView::sPreviewClickedElement->getName() != mLastClickedElement->getName())
+ {
+ // reset panel's rectangle to its default width and height (300x600)
+ LLRect panel_rect = LLFloaterUIPreview::sInstance->mOverlapPanel->getRect();
+ LLFloaterUIPreview::sInstance->mOverlapPanel->setRect(LLRect(panel_rect.mLeft,panel_rect.mTop,panel_rect.mLeft+LLFloaterUIPreview::sInstance->mOverlapPanel->getRect().getWidth(),panel_rect.mTop-LLFloaterUIPreview::sInstance->mOverlapPanel->getRect().getHeight()));
+
+ LLRect rect;
+
+ // change bounds for selected element
+ int height_sum = mLastClickedElement->getRect().getHeight() + mSpacing + 80;
+ rect = LLFloaterUIPreview::sInstance->mOverlapPanel->getRect();
+ LLFloaterUIPreview::sInstance->mOverlapPanel->setRect(LLRect(rect.mLeft,rect.mTop,rect.getWidth() > mLastClickedElement->getRect().getWidth() + 5 ? rect.mRight : rect.mLeft + mLastClickedElement->getRect().getWidth() + 5, rect.mBottom));
+
+ // and widen to accomodate text if that's wider
+ std::string display_text = current_selection_text + LLView::sPreviewClickedElement->getName();
+ S32 text_width = LLFontGL::getFontSansSerifSmall()->getWidth(display_text) + 10;
+ rect = getRect();
+ setRect(LLRect(rect.mLeft,rect.mTop,rect.getWidth() < text_width ? rect.mLeft + text_width : rect.mRight,rect.mTop));
+
+ std::list<LLView*> overlappers = LLFloaterUIPreview::sInstance->mOverlapMap[LLView::sPreviewClickedElement];
+ for(std::list<LLView*>::iterator overlap_it = overlappers.begin(); overlap_it != overlappers.end(); ++overlap_it)
+ {
+ LLView* viewp = *overlap_it;
+ height_sum += viewp->getRect().getHeight() + mSpacing*3;
+
+ // widen panel's rectangle to accommodate widest overlapping element of this floater
+ rect = LLFloaterUIPreview::sInstance->mOverlapPanel->getRect();
+ LLFloaterUIPreview::sInstance->mOverlapPanel->setRect(LLRect(rect.mLeft,rect.mTop,rect.getWidth() > viewp->getRect().getWidth() + 5 ? rect.mRight : rect.mLeft + viewp->getRect().getWidth() + 5, rect.mBottom));
+
+ // and widen to accomodate text if that's wider
+ std::string display_text = overlapper_text + viewp->getName();
+ S32 text_width = LLFontGL::getFontSansSerifSmall()->getWidth(display_text) + 10;
+ rect = getRect();
+ setRect(LLRect(rect.mLeft,rect.mTop,rect.getWidth() < text_width ? rect.mLeft + text_width : rect.mRight,rect.mTop));
+ }
+ // change panel's height to accommodate all element heights plus spacing between them
+ rect = LLFloaterUIPreview::sInstance->mOverlapPanel->getRect();
+ LLFloaterUIPreview::sInstance->mOverlapPanel->setRect(LLRect(rect.mLeft,rect.mTop,rect.mRight,rect.mTop-height_sum));
+ }
+
+ LLUI::translate(5,getRect().getHeight()-10); // translate to top left
+ LLView::sDrawPreviewHighlights = FALSE;
+
+ // draw currently-selected element at top of overlappers
+ LLUI::translate(0,-mSpacing);
+ LLFontGL::getFontSansSerifSmall()->renderUTF8(current_selection_text + LLView::sPreviewClickedElement->getName(), 0, 0, 0, text_color,
+ LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
+ LLUI::translate(0,-mSpacing-LLView::sPreviewClickedElement->getRect().getHeight()); // skip spacing distance + height
+ LLView::sPreviewClickedElement->draw();
+
+ for(std::list<LLView*>::iterator overlap_it = overlappers.begin(); overlap_it != overlappers.end(); ++overlap_it)
+ {
+ LLView* viewp = *overlap_it;
+
+ // draw separating line
+ LLUI::translate(0,-mSpacing);
+ gl_line_2d(0,0,getRect().getWidth()-10,0,LLColor4(192.0f/255.0f,192.0f/255.0f,192.0f/255.0f));
+
+ // draw name
+ LLUI::translate(0,-mSpacing);
+ LLFontGL::getFontSansSerifSmall()->renderUTF8(overlapper_text + viewp->getName(), 0, 0, 0, text_color,
+ LLFontGL::LEFT, LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
+
+ // draw element
+ LLUI::translate(0,-mSpacing-viewp->getRect().getHeight()); // skip spacing distance + height
+ viewp->draw();
+ }
+ mLastClickedElement = LLView::sPreviewClickedElement;
+ }
+}
diff --git a/indra/newview/llfloateruipreview.h b/indra/newview/llfloateruipreview.h
new file mode 100644
index 0000000000..28fbb52013
--- /dev/null
+++ b/indra/newview/llfloateruipreview.h
@@ -0,0 +1,215 @@
+/**
+ * @file llfloateruipreview.h
+ * @brief Tool for previewing and editing floaters
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// Tool for previewing floaters and panels for localization and UI design purposes.
+// See: https://wiki.lindenlab.com/wiki/GUI_Preview_And_Localization_Tools
+// See: https://jira.lindenlab.com/browse/DEV-16869
+
+#ifndef LL_LLUIPREVIEW_H
+#define LL_LLUIPREVIEW_H
+
+#include "llfloater.h" // superclass
+#include "llscrollcontainer.h" // scroll container for overlapping elements
+#include "lllivefile.h" // live file poll/stat/reload
+#include <list>
+#include <map>
+
+// Forward declarations to avoid header dependencies
+class LLEventTimer;
+class LLColor;
+class LLScrollListCtrl;
+class LLComboBox;
+class LLButton;
+class LLXmlTreeNode;
+class LLFloaterUIPreview;
+class LLFadeEventTimer;
+
+// Reset object to ensure that when we change the current language setting for preview purposes,
+// it automatically is reset. Constructed on the stack at the start of the method; the reset
+// occurs as it falls out of scope at the end of the method. See llfloateruipreview.cpp for usage.
+class LLLocalizationResetForcer
+{
+public:
+ LLLocalizationResetForcer(S32 ID);
+ virtual ~LLLocalizationResetForcer();
+
+private:
+ std::string mSavedLocalization; // the localization before we change it
+};
+
+// Implementation of live file
+// When a floater is being previewed, any saved changes to its corresponding
+// file cause the previewed floater to be reloaded
+class LLGUIPreviewLiveFile : public LLLiveFile
+{
+public:
+ LLGUIPreviewLiveFile(std::string path, std::string name, LLFloaterUIPreview* parent);
+ virtual ~LLGUIPreviewLiveFile();
+ LLFloaterUIPreview* mParent;
+ LLFadeEventTimer* mFadeTimer; // timer for fade-to-yellow-and-back effect to warn that file has been reloaded
+ BOOL mFirstFade; // setting this avoids showing the fade reload warning on first load
+ std::string mFileName;
+protected:
+ void loadFile();
+};
+
+// Implementation of graphical fade in/out (on timer) for when XUI files are updated
+class LLFadeEventTimer : public LLEventTimer
+{
+public:
+ LLFadeEventTimer(F32 refresh, LLGUIPreviewLiveFile* parent);
+ BOOL tick();
+ LLGUIPreviewLiveFile* mParent;
+private:
+ BOOL mFadingOut; // fades in then out; this is toggled in between
+ LLColor4 mOriginalColor; // original color; color is reset to this after fade is coimplete
+};
+
+// Implementation of previewed floater
+// Used to override draw and mouse handler
+class LLPreviewedFloater : public LLFloater
+{
+public:
+ LLPreviewedFloater() : LLFloater() {}
+ virtual void draw();
+ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+ BOOL selectElement(LLView* parent, int x, int y, int depth); // select element to display its overlappers
+};
+
+// Implementation of custom overlapping element display panel
+class LLOverlapPanel : public LLPanel
+{
+public:
+ struct Params : public LLInitParam::Block<Params, LLPanel::Params>
+ {
+ Params() {}
+ };
+ LLOverlapPanel(Params p = Params()) : LLPanel(p),
+ mSpacing(10),
+ // mClickedElement(NULL),
+ mLastClickedElement(NULL)
+ {
+ mOriginalWidth = getRect().getWidth();
+ mOriginalHeight = getRect().getHeight();
+ }
+ virtual void draw();
+ // LLView *mClickedElement;
+ LLView *mLastClickedElement;
+ int mOriginalWidth, mOriginalHeight, mSpacing;
+};
+
+class LLFloaterUIPreview : public LLFloater, public LLFloaterSingleton<LLFloaterUIPreview>
+{
+public:
+ // Setup
+ LLFloaterUIPreview(const LLSD& key);
+ virtual ~LLFloaterUIPreview();
+
+ static std::string getLocStr(S32 ID); // fetches the localization string based on what is selected in the drop-down menu
+ static void displayFloater(BOOL click, S32 ID, bool save = false); // needs to be public so live file can call it when it finds an update
+ static BOOL containerType(LLView* viewp); // check if the element is a container type and tree traverses need to look at its children
+ static LLFloaterUIPreview* sInstance; // static instance of this (for references in handlers)
+
+ BOOL postBuild(); // post-build setup (called by superclass' constructor)
+ void refreshList(); // refresh list (empty it out and fill it up from scratch)
+ void addFloaterEntry(const std::string& path); // add a single file's entry to the list of floaters
+
+ LLPreviewedFloater* mDisplayedFloater; // the floater which is currently being displayed
+ LLPreviewedFloater* mDisplayedFloater_2; // the floater which is currently being displayed
+ LLGUIPreviewLiveFile* mLiveFile; // live file for checking for updates to the currently-displayed XML file
+ LLOverlapPanel* mOverlapPanel; // custom overlapping elements panel
+ // BOOL mHighlightingDiffs; // bool for whether localization diffs are being highlighted or not
+ BOOL mHighlightingOverlaps; // bool for whether overlapping elements are being highlighted
+
+ typedef std::map<LLView*, std::list<LLView*> > OverlapMap;
+ OverlapMap mOverlapMap; // map, of XUI element to a list of XUI elements it overlaps
+
+ // typedef std::map<std::string,std::pair<std::list<std::string>,std::list<std::string> > > DiffMap; // this version copies the lists etc., and thus is bad memory-wise
+ typedef std::list<std::string> StringList;
+ typedef boost::shared_ptr<StringList> StringListPtr;
+ typedef std::map<std::string, std::pair<StringListPtr,StringListPtr> > DiffMap;
+ DiffMap mDiffsMap; // map, of filename to pair of list of changed element paths and list of errors
+
+protected:
+ virtual void onClose(bool app_quitting);
+
+private:
+ // XUI elements for this floater
+ LLScrollListCtrl* mFileList; // scroll list control for file list
+ LLLineEditor* mEditorPathTextBox; // text field for path to editor executable
+ LLLineEditor* mEditorArgsTextBox; // text field for arguments to editor executable
+ LLLineEditor* mDiffPathTextBox; // text field for path to diff file
+ LLButton* mDisplayFloaterBtn; // button to display primary floater
+ LLButton* mDisplayFloaterBtn_2; // button to display secondary floater
+ LLButton* mEditFloaterBtn; // button to edit floater
+ LLButton* mExecutableBrowseButton; // button to browse for executable
+ LLButton* mCloseOtherButton; // button to close primary displayed floater
+ LLButton* mCloseOtherButton_2; // button to close secondary displayed floater
+ LLButton* mDiffBrowseButton; // button to browse for diff file
+ LLButton* mToggleHighlightButton; // button to toggle highlight of files/elements with diffs
+ LLButton* mToggleOverlapButton; // button to togle overlap panel/highlighting
+ LLComboBox* mLanguageSelection; // combo box for primary language selection
+ LLComboBox* mLanguageSelection_2; // combo box for secondary language selection
+ LLScrollContainer* mOverlapScrollView; // overlapping elements scroll container
+ S32 mLastDisplayedX, mLastDisplayedY; // stored position of last floater so the new one opens up in the same place
+ std::string mDelim; // the OS-specific delimiter character (/ or \) (*TODO: this shouldn't be needed, right?)
+
+ static std::string mSavedEditorPath; // stored editor path so closing this floater doesn't reset it
+ static std::string mSavedEditorArgs; // stored editor args so closing this floater doesn't reset it
+ static std::string mSavedDiffPath; // stored diff file path so closing this floater doesn't reset it
+
+ // Internal functionality
+ static void popupAndPrintWarning(std::string& warning); // pop up a warning
+ std::string getLocalizedDirectory(); // build and return the path to the XUI directory for the currently-selected localization
+ void scanDiffFile(LLXmlTreeNode* file_node); // scan a given XML node for diff entries and highlight them in its associated file
+ void highlightChangedElements(); // look up the list of elements to highlight and highlight them in the current floater
+ void highlightChangedFiles(); // look up the list of changed files to highlight and highlight them in the scroll list
+ void findOverlapsInChildren(LLView* parent); // fill the map below with element overlap information
+ static BOOL overlapIgnorable(LLView* viewp); // check it the element can be ignored for overlap/localization purposes
+
+ // check if two elements overlap using their rectangles
+ // used instead of llrect functions because by adding a few pixels of leeway I can cut down drastically on the number of overlaps
+ BOOL elementOverlap(LLView* view1, LLView* view2);
+
+ // Button/drop-down action listeners (self explanatory)
+ static void onClickDisplayFloater(void*);
+ static void onClickSaveFloater(void*);
+ static void onClickEditFloater(void*);
+ static void onClickBrowseForEditor(void*);
+ static void onClickBrowseForDiffs(void*);
+ static void onClickToggleDiffHighlighting(void*);
+ static void onClickToggleOverlapping(void*);
+ static void onClickCloseDisplayedFloater(void*);
+ void onLanguageComboSelect(LLUICtrl* ctrl);
+};
+#endif // LL_LLUIPREVIEW_H
+
diff --git a/indra/newview/llfloaterurldisplay.cpp b/indra/newview/llfloaterurldisplay.cpp
index c265c6169a..7f7d05e1d2 100644
--- a/indra/newview/llfloaterurldisplay.cpp
+++ b/indra/newview/llfloaterurldisplay.cpp
@@ -45,9 +45,10 @@
LLFloaterURLDisplay::LLFloaterURLDisplay(const LLSD& sd)
+ : LLFloater()
{
mFactoryMap["place_details_panel"] = LLCallbackMap(LLFloaterURLDisplay::createPlaceDetail, this);
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml", &getFactoryMap());
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_url.xml");
this->setVisible(false);
// If positioned at 0,0 the teleport button is behind the toolbar.
diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp
index 9d91aa9868..1f59812029 100644
--- a/indra/newview/llfloaterurlentry.cpp
+++ b/indra/newview/llfloaterurlentry.cpp
@@ -86,12 +86,22 @@ public:
// LLFloaterURLEntry()
//-----------------------------------------------------------------------------
LLFloaterURLEntry::LLFloaterURLEntry(LLHandle<LLPanel> parent)
- :
- LLFloater(),
- mPanelLandMediaHandle(parent)
+ : LLFloater(),
+ mPanelLandMediaHandle(parent)
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_url_entry.xml");
+}
+
+//-----------------------------------------------------------------------------
+// ~LLFloaterURLEntry()
+//-----------------------------------------------------------------------------
+LLFloaterURLEntry::~LLFloaterURLEntry()
+{
+ sInstance = NULL;
+}
+BOOL LLFloaterURLEntry::postBuild()
+{
mMediaURLEdit = getChild<LLComboBox>("media_entry");
// Cancel button
@@ -99,7 +109,6 @@ LLFloaterURLEntry::LLFloaterURLEntry(LLHandle<LLPanel> parent)
// Cancel button
childSetAction("clear_btn", onBtnClear, this);
-
// clear media list button
LLSD parcel_history = LLURLHistory::getURLHistory("parcel");
bool enable_clear_button = parcel_history.size() > 0 ? true : false;
@@ -111,17 +120,8 @@ LLFloaterURLEntry::LLFloaterURLEntry(LLHandle<LLPanel> parent)
setDefaultBtn("ok_btn");
buildURLHistory();
- sInstance = this;
-}
-
-//-----------------------------------------------------------------------------
-// ~LLFloaterURLEntry()
-//-----------------------------------------------------------------------------
-LLFloaterURLEntry::~LLFloaterURLEntry()
-{
- sInstance = NULL;
+ return TRUE;
}
-
void LLFloaterURLEntry::buildURLHistory()
{
LLCtrlListInterface* url_list = childGetListInterface("media_entry");
@@ -155,7 +155,7 @@ void LLFloaterURLEntry::headerFetchComplete(U32 status, const std::string& mime_
// Decrement the cursor
getWindow()->decBusyCount();
childSetVisible("loading_label", false);
- close();
+ closeFloater();
}
// static
@@ -163,7 +163,7 @@ LLHandle<LLFloater> LLFloaterURLEntry::show(LLHandle<LLPanel> parent)
{
if (sInstance)
{
- sInstance->open();
+ sInstance->openFloater();
}
else
{
@@ -254,7 +254,7 @@ void LLFloaterURLEntry::onBtnOK( void* userdata )
void LLFloaterURLEntry::onBtnCancel( void* userdata )
{
LLFloaterURLEntry *self =(LLFloaterURLEntry *)userdata;
- self->close();
+ self->closeFloater();
}
// static
diff --git a/indra/newview/llfloaterurlentry.h b/indra/newview/llfloaterurlentry.h
index 6d04326cf8..6f83c18d07 100644
--- a/indra/newview/llfloaterurlentry.h
+++ b/indra/newview/llfloaterurlentry.h
@@ -45,7 +45,7 @@ public:
// Can only be shown by LLPanelLandMedia, and pushes data back into
// that panel via the handle.
static LLHandle<LLFloater> show(LLHandle<LLPanel> panel_land_media_handle);
-
+ /*virtual*/ BOOL postBuild();
void updateFromLandMediaPanel();
void headerFetchComplete(U32 status, const std::string& mime_type);
diff --git a/indra/newview/llfloatervoicedevicesettings.cpp b/indra/newview/llfloatervoicedevicesettings.cpp
index 2922628786..5e5ea2e2f1 100644
--- a/indra/newview/llfloatervoicedevicesettings.cpp
+++ b/indra/newview/llfloatervoicedevicesettings.cpp
@@ -52,6 +52,7 @@
LLPanelVoiceDeviceSettings::LLPanelVoiceDeviceSettings()
+ : LLPanel()
{
mCtrlInputDevices = NULL;
mCtrlOutputDevices = NULL;
@@ -113,7 +114,7 @@ void LLPanelVoiceDeviceSettings::draw()
{
if (power_bar_idx < discrete_power)
{
- LLColor4 color = (power_bar_idx >= 3) ? gSavedSettings.getColor4("OverdrivenColor") : gSavedSettings.getColor4("SpeakingColor");
+ LLColor4 color = (power_bar_idx >= 3) ? gSavedSkinSettings.getColor4("OverdrivenColor") : gSavedSkinSettings.getColor4("SpeakingColor");
gl_rect_2d(bar_view->getRect(), color, TRUE);
}
gl_rect_2d(bar_view->getRect(), LLColor4::grey, FALSE);
@@ -240,7 +241,7 @@ void LLPanelVoiceDeviceSettings::refresh()
}
}
-void LLPanelVoiceDeviceSettings::onOpen()
+void LLPanelVoiceDeviceSettings::initialize()
{
mInputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
mOutputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
@@ -255,7 +256,7 @@ void LLPanelVoiceDeviceSettings::onOpen()
LLVoiceChannel::suspend();
}
-void LLPanelVoiceDeviceSettings::onClose(bool app_quitting)
+void LLPanelVoiceDeviceSettings::cleanup()
{
gVoiceClient->tuningStop();
LLVoiceChannel::resume();
@@ -284,31 +285,29 @@ void LLPanelVoiceDeviceSettings::onCommitOutputDevice(LLUICtrl* ctrl, void* user
//
LLFloaterVoiceDeviceSettings::LLFloaterVoiceDeviceSettings(const LLSD& seed)
- : LLFloater(std::string("floater_device_settings")),
+ : LLFloater(),
mDevicePanel(NULL)
{
mFactoryMap["device_settings"] = LLCallbackMap(createPanelVoiceDeviceSettings, this);
// do not automatically open singleton floaters (as result of getInstance())
BOOL no_open = FALSE;
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_device_settings.xml", &mFactoryMap, no_open);
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_device_settings.xml", no_open);
center();
}
-void LLFloaterVoiceDeviceSettings::onOpen()
+void LLFloaterVoiceDeviceSettings::onOpen(const LLSD& key)
{
if(mDevicePanel)
{
- mDevicePanel->onOpen();
+ mDevicePanel->initialize();
}
-
- LLFloater::onOpen();
}
void LLFloaterVoiceDeviceSettings::onClose(bool app_quitting)
{
if(mDevicePanel)
{
- mDevicePanel->onClose(app_quitting);
+ mDevicePanel->cleanup();
}
setVisible(FALSE);
diff --git a/indra/newview/llfloatervoicedevicesettings.h b/indra/newview/llfloatervoicedevicesettings.h
index d30a57f161..addc674ae3 100644
--- a/indra/newview/llfloatervoicedevicesettings.h
+++ b/indra/newview/llfloatervoicedevicesettings.h
@@ -49,8 +49,8 @@ public:
void apply();
void cancel();
void refresh();
- void onOpen();
- void onClose(bool app_quitting);
+ void initialize();
+ void cleanup();
protected:
static void onCommitInputDevice(LLUICtrl* ctrl, void* user_data);
@@ -68,7 +68,7 @@ class LLFloaterVoiceDeviceSettings : public LLFloater, public LLFloaterSingleton
{
public:
LLFloaterVoiceDeviceSettings(const LLSD& seed);
- /*virtual*/ void onOpen();
+ /*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void onClose(bool app_quitting);
/*virtual*/ void draw();
void apply();
diff --git a/indra/newview/llfloaterwater.cpp b/indra/newview/llfloaterwater.cpp
index 730c1393ca..5b551af836 100644
--- a/indra/newview/llfloaterwater.cpp
+++ b/indra/newview/llfloaterwater.cpp
@@ -66,25 +66,11 @@ LLFloaterWater* LLFloaterWater::sWaterMenu = NULL;
std::set<std::string> LLFloaterWater::sDefaultPresets;
-LLFloaterWater::LLFloaterWater() : LLFloater(std::string("water floater"))
+LLFloaterWater::LLFloaterWater()
+ : LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_water.xml");
- // add the combo boxes
- LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo");
-
- if(comboBox != NULL) {
-
- std::map<std::string, LLWaterParamSet>::iterator mIt =
- LLWaterParamManager::instance()->mParamList.begin();
- for(; mIt != LLWaterParamManager::instance()->mParamList.end(); mIt++)
- {
- comboBox->add(mIt->first);
- }
-
- // set defaults on combo boxes
- comboBox->selectByValue(LLSD("Default"));
- }
std::string def_water = getString("WLDefaultWaterNames");
@@ -97,14 +83,33 @@ LLFloaterWater::LLFloaterWater() : LLFloater(std::string("water floater"))
sDefaultPresets.insert(tok);
}
- // load it up
- initCallbacks();
+
}
LLFloaterWater::~LLFloaterWater()
{
}
+BOOL LLFloaterWater::postBuild()
+{
+ // add the combo boxes
+ LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo");
+
+ if(comboBox != NULL) {
+
+ std::map<std::string, LLWaterParamSet>::iterator mIt =
+ LLWaterParamManager::instance()->mParamList.begin();
+ for(; mIt != LLWaterParamManager::instance()->mParamList.end(); mIt++)
+ {
+ comboBox->add(mIt->first);
+ }
+ // set defaults on combo boxes
+ comboBox->selectByValue(LLSD("Default"));
+ }
+ // load it up
+ initCallbacks();
+ return TRUE;
+}
void LLFloaterWater::initCallbacks(void) {
// help buttons
@@ -165,7 +170,7 @@ void LLFloaterWater::initCallbacks(void) {
childSetCommitCallback("WaterWave2DirX", onVector2ControlXMoved, ¶m_mgr->mWave2Dir);
childSetCommitCallback("WaterWave2DirY", onVector2ControlYMoved, ¶m_mgr->mWave2Dir);
- comboBox->setCommitCallback(onChangePresetName);
+ comboBox->setCommitCallback(boost::bind(&LLFloaterWater::onChangePresetName, this, _1));
LLTextureCtrl* textCtrl = getChild<LLTextureCtrl>("WaterNormalMap");
textCtrl->setDefaultImageAssetID(DEFAULT_WATER_NORMAL);
@@ -296,7 +301,7 @@ LLFloaterWater* LLFloaterWater::instance()
if (!sWaterMenu)
{
sWaterMenu = new LLFloaterWater();
- sWaterMenu->open();
+ sWaterMenu->openFloater();
sWaterMenu->setFocus(TRUE);
}
return sWaterMenu;
@@ -310,7 +315,7 @@ void LLFloaterWater::show()
//LLUICtrlFactory::getInstance()->buildFloater(water, "floater_water.xml");
//water->initCallbacks();
- water->open();
+ water->openFloater();
}
bool LLFloaterWater::isOpen()
@@ -712,17 +717,13 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
}
-void LLFloaterWater::onChangePresetName(LLUICtrl* ctrl, void * userData)
+void LLFloaterWater::onChangePresetName(LLUICtrl* ctrl)
{
- LLComboBox * combo_box = static_cast<LLComboBox*>(ctrl);
-
- if(combo_box->getSimple() == "")
+ std::string data = ctrl->getValue().asString();
+ if(!data.empty())
{
- return;
+ LLWaterParamManager::instance()->loadPreset(data);
+ sWaterMenu->syncMenu();
}
-
- LLWaterParamManager::instance()->loadPreset(
- combo_box->getSelectedValue().asString());
- sWaterMenu->syncMenu();
}
diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h
index 774d5c5a75..50fd7dd450 100644
--- a/indra/newview/llfloaterwater.h
+++ b/indra/newview/llfloaterwater.h
@@ -53,7 +53,7 @@ public:
LLFloaterWater();
virtual ~LLFloaterWater();
-
+ /*virtual*/ BOOL postBuild();
/// initialize all
void initCallbacks(void);
@@ -107,7 +107,7 @@ public:
static bool deleteAlertCallback(const LLSD& notification, const LLSD& response);
/// what to do when you change the preset name
- static void onChangePresetName(LLUICtrl* ctrl, void* userData);
+ void onChangePresetName(LLUICtrl* ctrl);
//// menu management
diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp
index 98b315795a..2ba4002d94 100644
--- a/indra/newview/llfloaterwindlight.cpp
+++ b/indra/newview/llfloaterwindlight.cpp
@@ -67,15 +67,36 @@ std::set<std::string> LLFloaterWindLight::sDefaultPresets;
static const F32 WL_SUN_AMBIENT_SLIDER_SCALE = 3.0f;
-LLFloaterWindLight::LLFloaterWindLight() : LLFloater(std::string("windlight floater"))
+LLFloaterWindLight::LLFloaterWindLight()
+ : LLFloater()
{
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_windlight_options.xml");
+
+
+ // add the list of presets
+ std::string def_days = getString("WLDefaultSkyNames");
+
+ // no editing or deleting of the blank string
+ sDefaultPresets.insert("");
+ boost_tokenizer tokens(def_days, boost::char_separator<char>(":"));
+ for (boost_tokenizer::iterator token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
+ {
+ std::string tok(*token_iter);
+ sDefaultPresets.insert(tok);
+ }
+}
+
+LLFloaterWindLight::~LLFloaterWindLight()
+{
+}
+BOOL LLFloaterWindLight::postBuild()
+{
// add the combo boxes
LLComboBox* comboBox = getChild<LLComboBox>("WLPresetsCombo");
if(comboBox != NULL) {
-
+
std::map<std::string, LLWLParamSet>::iterator mIt =
LLWLParamManager::instance()->mParamList.begin();
for(; mIt != LLWLParamManager::instance()->mParamList.end(); mIt++)
@@ -89,27 +110,10 @@ LLFloaterWindLight::LLFloaterWindLight() : LLFloater(std::string("windlight floa
// set defaults on combo boxes
comboBox->selectByValue(LLSD("Default"));
}
-
- // add the list of presets
- std::string def_days = getString("WLDefaultSkyNames");
-
- // no editing or deleting of the blank string
- sDefaultPresets.insert("");
- boost_tokenizer tokens(def_days, boost::char_separator<char>(":"));
- for (boost_tokenizer::iterator token_iter = tokens.begin(); token_iter != tokens.end(); ++token_iter)
- {
- std::string tok(*token_iter);
- sDefaultPresets.insert(tok);
- }
-
// load it up
initCallbacks();
+ return TRUE;
}
-
-LLFloaterWindLight::~LLFloaterWindLight()
-{
-}
-
void LLFloaterWindLight::initCallbacks(void) {
// help buttons
@@ -210,7 +214,7 @@ void LLFloaterWindLight::initCallbacks(void) {
childSetCommitCallback("WLCloudScrollX", onCloudScrollXMoved, NULL);
childSetCommitCallback("WLCloudScrollY", onCloudScrollYMoved, NULL);
childSetCommitCallback("WLDistanceMult", onFloatControlMoved, ¶m_mgr->mDistanceMult);
- childSetCommitCallback("DrawClassicClouds", LLSavedSettingsGlue::setBOOL, (void*)"SkyUseClassicClouds");
+ getChild<LLUICtrl>("DrawClassicClouds")->setCommitCallback(boost::bind(LLSavedSettingsGlue::setBOOL, _1, "SkyUseClassicClouds"));
// WL Top
childSetAction("WLDayCycleMenuButton", onOpenDayCycle, NULL);
@@ -222,7 +226,7 @@ void LLFloaterWindLight::initCallbacks(void) {
childSetAction("WLSavePreset", onSavePreset, comboBox);
childSetAction("WLDeletePreset", onDeletePreset, comboBox);
- comboBox->setCommitCallback(onChangePresetName);
+ comboBox->setCommitCallback(boost::bind(&LLFloaterWindLight::onChangePresetName, this, _1));
// Dome
@@ -444,7 +448,7 @@ LLFloaterWindLight* LLFloaterWindLight::instance()
if (!sWindLight)
{
sWindLight = new LLFloaterWindLight();
- sWindLight->open();
+ sWindLight->openFloater();
sWindLight->setFocus(TRUE);
}
return sWindLight;
@@ -458,7 +462,7 @@ void LLFloaterWindLight::show()
//LLUICtrlFactory::getInstance()->buildFloater(windLight, "floater_windlight_options.xml");
//windLight->initCallbacks();
- windLight->open();
+ windLight->openFloater();
}
bool LLFloaterWindLight::isOpen()
@@ -903,20 +907,16 @@ bool LLFloaterWindLight::deleteAlertCallback(const LLSD& notification, const LLS
}
-void LLFloaterWindLight::onChangePresetName(LLUICtrl* ctrl, void * userData)
+void LLFloaterWindLight::onChangePresetName(LLUICtrl* ctrl)
{
deactivateAnimator();
- LLComboBox * combo_box = static_cast<LLComboBox*>(ctrl);
-
- if(combo_box->getSimple() == "")
+ std::string data = ctrl->getValue().asString();
+ if(!data.empty())
{
- return;
+ LLWLParamManager::instance()->loadPreset( data);
+ sWindLight->syncMenu();
}
-
- LLWLParamManager::instance()->loadPreset(
- combo_box->getSelectedValue().asString());
- sWindLight->syncMenu();
}
void LLFloaterWindLight::onOpenDayCycle(void* userData)
diff --git a/indra/newview/llfloaterwindlight.h b/indra/newview/llfloaterwindlight.h
index 3447caa923..e527a5637c 100644
--- a/indra/newview/llfloaterwindlight.h
+++ b/indra/newview/llfloaterwindlight.h
@@ -53,7 +53,7 @@ public:
LLFloaterWindLight();
virtual ~LLFloaterWindLight();
-
+ /*virtual*/ BOOL postBuild();
/// initialize all
void initCallbacks(void);
@@ -104,7 +104,7 @@ public:
bool deleteAlertCallback(const LLSD& notification, const LLSD& response);
/// what to do when you change the preset name
- static void onChangePresetName(LLUICtrl* ctrl, void* userData);
+ void onChangePresetName(LLUICtrl* ctrl);
/// when user hits the save preset button
static void onOpenDayCycle(void* userData);
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 8326557cf8..251539088b 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -41,23 +41,22 @@
#include "llfloaterworldmap.h"
#include "llagent.h"
-#include "llviewerwindow.h"
#include "llbutton.h"
#include "llcallingcard.h"
-#include "llcolorscheme.h"
#include "llcombobox.h"
#include "llviewercontrol.h"
#include "lldraghandle.h"
#include "llfirstuse.h"
+#include "llfloaterreg.h" // getTypedInstance()
#include "llfocusmgr.h"
#include "lllandmarklist.h"
#include "lllineeditor.h"
#include "llpreviewlandmark.h"
#include "llregionhandle.h"
#include "llscrolllistctrl.h"
+#include "llslurl.h"
#include "lltextbox.h"
#include "lltracker.h"
-#include "llurldispatcher.h"
#include "llviewermenu.h"
#include "llviewerregion.h"
#include "llviewerstats.h"
@@ -69,6 +68,7 @@
#include "llweb.h"
#include "llglheaders.h"
+#include "llwindow.h" // copyTextToClipboard()
//---------------------------------------------------------------------------
// Constants
@@ -84,17 +84,10 @@ enum EPanDirection
};
// Values in pixels per region
-static const F32 ZOOM_MIN = -8.f; // initial value, updated by adjustZoomSlider
-static const F32 ZOOM_MAX = 0.f;
-static const F32 ZOOM_INC = 0.2f;
+static const F32 ZOOM_MAX = 128.f;
-static const F32 SIM_COORD_MIN = 0.f;
-static const F32 SIM_COORD_MAX = 255.f;
static const F32 SIM_COORD_DEFAULT = 128.f;
-static const F64 MAX_FLY_DISTANCE = 363.f; // Diagonal size of one sim.
-static const F64 MAX_FLY_DISTANCE_SQUARED = MAX_FLY_DISTANCE * MAX_FLY_DISTANCE;
-
//---------------------------------------------------------------------------
// Globals
//---------------------------------------------------------------------------
@@ -148,8 +141,8 @@ const LLUUID LLFloaterWorldMap::sHomeID( "10000000-0000-0000-0000-000000000001"
//---------------------------------------------------------------------------
-LLFloaterWorldMap::LLFloaterWorldMap()
-: LLFloater(std::string("worldmap")),
+LLFloaterWorldMap::LLFloaterWorldMap(const LLSD& key)
+: LLFloater(key),
mInventory(NULL),
mInventoryObserver(NULL),
mFriendObserver(NULL),
@@ -161,16 +154,18 @@ LLFloaterWorldMap::LLFloaterWorldMap()
mTrackedLocation(0,0,0),
mTrackedStatus(LLTracker::TRACKING_NOTHING)
{
- LLCallbackMap::map_t factory_map;
- factory_map["objects_mapview"] = LLCallbackMap(createWorldMapView, NULL);
- factory_map["terrain_mapview"] = LLCallbackMap(createWorldMapView, NULL);
- LLUICtrlFactory::getInstance()->buildFloater(this, "floater_world_map.xml", &factory_map);
+ gFloaterWorldMap = this;
+
+ mFactoryMap["objects_mapview"] = LLCallbackMap(createWorldMapView, NULL);
+ mFactoryMap["terrain_mapview"] = LLCallbackMap(createWorldMapView, NULL);
+
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_world_map.xml", FALSE);
}
// static
void* LLFloaterWorldMap::createWorldMapView(void* data)
{
- return new LLWorldMapView(std::string("mapview"), LLRect(0,300,400,0));
+ return new LLWorldMapView();
}
BOOL LLFloaterWorldMap::postBuild()
@@ -178,27 +173,14 @@ BOOL LLFloaterWorldMap::postBuild()
mTabs = getChild<LLTabContainer>("maptab");
if (!mTabs) return FALSE;
- LLPanel *panel;
-
- panel = mTabs->getChild<LLPanel>("objects_mapview");
- if (panel)
- {
- mTabs->setTabChangeCallback(panel, onCommitBackground);
- mTabs->setTabUserData(panel, this);
- }
- panel = mTabs->getChild<LLPanel>("terrain_mapview");
- if (panel)
- {
- mTabs->setTabChangeCallback(panel, onCommitBackground);
- mTabs->setTabUserData(panel, this);
- }
+ mTabs->setCommitCallback(boost::bind(&LLFloaterWorldMap::onCommitBackground, this));
// The following callback syncs the worlmap tabs with the images.
// Commented out since it was crashing when LLWorldMap became a singleton.
// We should be fine without it but override the onOpen method and put it
// there if it turns out to be needed. -MG
//
- //onCommitBackground((void*)this, false);
+ //onCommitBackground();
childSetCommitCallback("friend combo", onAvatarComboCommit, this);
@@ -206,22 +188,22 @@ BOOL LLFloaterWorldMap::postBuild()
if (avatar_combo)
{
avatar_combo->selectFirstItem();
- avatar_combo->setPrearrangeCallback( onAvatarComboPrearrange );
- avatar_combo->setTextEntryCallback( onComboTextEntry );
+ avatar_combo->setPrearrangeCallback( boost::bind(&LLFloaterWorldMap::onAvatarComboPrearrange, this) );
+ avatar_combo->setTextEntryCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) );
}
childSetAction("DoSearch", onLocationCommit, this);
- childSetFocusChangedCallback("location", onLocationFocusChanged, this);
+ getChild<LLScrollListCtrl>("location")->setFocusChangedCallback(boost::bind(&LLFloaterWorldMap::onLocationFocusChanged, this, _1));
LLLineEditor *location_editor = getChild<LLLineEditor>("location");
if (location_editor)
{
- location_editor->setKeystrokeCallback( onSearchTextEntry );
+ location_editor->setKeystrokeCallback( boost::bind(&LLFloaterWorldMap::onSearchTextEntry, this, _1), NULL );
}
childSetCommitCallback("search_results", onCommitSearchResult, this);
- childSetDoubleClickCallback("search_results", onClickTeleportBtn);
+ getChild<LLScrollListCtrl>("search_results")->setDoubleClickCallback(onClickTeleportBtn, this);
childSetCommitCallback("spin x", onCommitLocation, this);
childSetCommitCallback("spin y", onCommitLocation, this);
childSetCommitCallback("spin z", onCommitLocation, this);
@@ -232,8 +214,8 @@ BOOL LLFloaterWorldMap::postBuild()
if (landmark_combo)
{
landmark_combo->selectFirstItem();
- landmark_combo->setPrearrangeCallback( onLandmarkComboPrearrange );
- landmark_combo->setTextEntryCallback( onComboTextEntry );
+ landmark_combo->setPrearrangeCallback( boost::bind(&LLFloaterWorldMap::onLandmarkComboPrearrange, this) );
+ landmark_combo->setTextEntryCallback( boost::bind(&LLFloaterWorldMap::onComboTextEntry, this) );
}
childSetAction("Go Home", onGoHome, this);
@@ -267,28 +249,44 @@ LLFloaterWorldMap::~LLFloaterWorldMap()
// avatar tracker will delete this for us.
mFriendObserver = NULL;
+
+ gFloaterWorldMap = NULL;
}
+//static
+LLFloaterWorldMap* LLFloaterWorldMap::getInstance()
+{
+ return LLFloaterReg::getTypedInstance<LLFloaterWorldMap>("world_map");
+}
// virtual
void LLFloaterWorldMap::onClose(bool app_quitting)
{
+ // While we're not visible, discard the overlay images we're using
+ LLWorldMap::getInstance()->clearImageRefs();
+
+#if RELEASE_FOR_DOWNLOAD
setVisible(FALSE);
+#else
+ // Don't call destroy(), we need to delete this immediately
+ delete this; // sets gFloaterWorldMap = NULL;
+ // need to reconstruct gFloaterWorldMap so that code that assumes it exists doesn't crash
+ LLFloaterReg::getInstance("world_map"); // constructs a LLFloaterWorldMap and sets gFloaterWorldMap
+ gFloaterWorldMap->setVisible(FALSE); // hide it
+#endif
}
-// static
-void LLFloaterWorldMap::show(void*, BOOL center_on_target)
+// virtual
+void LLFloaterWorldMap::onOpen(const LLSD& key)
{
- BOOL was_visible = gFloaterWorldMap->getVisible();
+ bool center_on_target = (key.asString() == "center");
- gFloaterWorldMap->mIsClosing = FALSE;
- gFloaterWorldMap->open(); /* Flawfinder: ignore */
+ mIsClosing = FALSE;
LLWorldMapView* map_panel;
- map_panel = (LLWorldMapView*)gFloaterWorldMap->mTabs->getCurrentPanel();
+ map_panel = (LLWorldMapView*)mTabs->getCurrentPanel();
map_panel->clearLastClick();
- if (!was_visible)
{
// reset pan on show, so it centers on you again
if (!center_on_target)
@@ -303,13 +301,13 @@ void LLFloaterWorldMap::show(void*, BOOL center_on_target)
// Reload any maps that may have changed
LLWorldMap::getInstance()->clearSimFlags();
- const S32 panel_num = gFloaterWorldMap->mTabs->getCurrentPanelIndex();
+ const S32 panel_num = mTabs->getCurrentPanelIndex();
const bool request_from_sim = true;
LLWorldMap::getInstance()->setCurrentLayer(panel_num, request_from_sim);
// We may already have a bounding box for the regions of the world,
// so use that to adjust the view.
- gFloaterWorldMap->adjustZoomSliderBounds();
+ adjustZoomSliderBounds();
// Could be first show
LLFirstUse::useMap();
@@ -318,19 +316,19 @@ void LLFloaterWorldMap::show(void*, BOOL center_on_target)
LLUUID landmark_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
gInventory.startBackgroundFetch(landmark_folder_id);
- gFloaterWorldMap->childSetFocus("location", TRUE);
+ childSetFocus("location", TRUE);
gFocusMgr.triggerFocusFlash();
- gFloaterWorldMap->buildAvatarIDList();
- gFloaterWorldMap->buildLandmarkIDLists();
+ buildAvatarIDList();
+ buildLandmarkIDLists();
// If nothing is being tracked, set flag so the user position will be found
- gFloaterWorldMap->mSetToUserPosition = ( LLTracker::getTrackingStatus() == LLTracker::TRACKING_NOTHING );
+ mSetToUserPosition = ( LLTracker::getTrackingStatus() == LLTracker::TRACKING_NOTHING );
}
if (center_on_target)
{
- gFloaterWorldMap->centerOnTarget(FALSE);
+ centerOnTarget(FALSE);
}
}
@@ -345,46 +343,6 @@ void LLFloaterWorldMap::reloadIcons(void*)
}
-// static
-void LLFloaterWorldMap::toggle(void*)
-{
- BOOL visible = gFloaterWorldMap->getVisible();
-
- if (!visible)
- {
- show(NULL, FALSE);
- }
- else
- {
- gFloaterWorldMap->mIsClosing = TRUE;
- gFloaterWorldMap->close();
- }
-}
-
-
-// static
-void LLFloaterWorldMap::hide(void*)
-{
- gFloaterWorldMap->mIsClosing = TRUE;
- gFloaterWorldMap->close();
-}
-
-
-// virtual
-void LLFloaterWorldMap::setVisible( BOOL visible )
-{
- LLFloater::setVisible( visible );
-
- gSavedSettings.setBOOL( "ShowWorldMap", visible );
-
- if( !visible )
- {
- // While we're not visible, discard the overlay images we're using
- LLWorldMap::getInstance()->clearImageRefs();
- }
-}
-
-
// virtual
BOOL LLFloaterWorldMap::handleHover(S32 x, S32 y, MASK mask)
{
@@ -428,6 +386,9 @@ void LLFloaterWorldMap::reshape( S32 width, S32 height, BOOL called_from_parent
// virtual
void LLFloaterWorldMap::draw()
{
+ static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
+ static LLCachedControl<LLColor4> map_track_disabled_color(gSavedSkinSettings, "MapTrackDisabledColor", LLColor4::white);
+
// Hide/Show Mature Events controls
childSetVisible("events_mature_icon", gAgent.canAccessMature());
childSetVisible("events_mature_label", gAgent.canAccessMature());
@@ -456,25 +417,25 @@ void LLFloaterWorldMap::draw()
LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus();
if (LLTracker::TRACKING_AVATAR == tracking_status)
{
- childSetColor("avatar_icon", gTrackColor);
+ childSetColor("avatar_icon", map_track_color);
}
else
{
- childSetColor("avatar_icon", gDisabledTrackColor);
+ childSetColor("avatar_icon", map_track_disabled_color);
}
if (LLTracker::TRACKING_LANDMARK == tracking_status)
{
- childSetColor("landmark_icon", gTrackColor);
+ childSetColor("landmark_icon", map_track_color);
}
else
{
- childSetColor("landmark_icon", gDisabledTrackColor);
+ childSetColor("landmark_icon", map_track_disabled_color);
}
if (LLTracker::TRACKING_LOCATION == tracking_status)
{
- childSetColor("location_icon", gTrackColor);
+ childSetColor("location_icon", map_track_color);
}
else
{
@@ -488,7 +449,7 @@ void LLFloaterWorldMap::draw()
}
else
{
- childSetColor("location_icon", gDisabledTrackColor);
+ childSetColor("location_icon", map_track_disabled_color);
}
}
@@ -703,7 +664,7 @@ void LLFloaterWorldMap::updateLocation()
childSetValue("spin z", LLSD(agent_z) );
// Set the current SLURL
- mSLURL = LLURLDispatcher::buildSLURL(agent_sim_name, agent_x, agent_y, agent_z);
+ mSLURL = LLSLURL::buildSLURL(agent_sim_name, agent_x, agent_y, agent_z);
}
}
@@ -740,7 +701,7 @@ void LLFloaterWorldMap::updateLocation()
// simNameFromPosGlobal can fail, so don't give the user an invalid SLURL
if ( gotSimName )
{
- mSLURL = LLURLDispatcher::buildSLURL(sim_name, llround(region_x), llround(region_y), llround((F32)pos_global.mdV[VZ]));
+ mSLURL = LLSLURL::buildSLURL(sim_name, llround(region_x), llround(region_y), llround((F32)pos_global.mdV[VZ]));
}
else
{ // Empty SLURL will disable the "Copy SLURL to clipboard" button
@@ -1024,7 +985,7 @@ void LLFloaterWorldMap::adjustZoomSliderBounds()
// Make sure the zoom slider can be moved at least a little bit.
// Likewise, less than the increment pixels per region is just silly.
- pixels_per_region = llclamp(pixels_per_region, 1.f, (F32)(pow(2.f, ZOOM_MAX) * 128.f));
+ pixels_per_region = llclamp(pixels_per_region, 1.f, ZOOM_MAX);
F32 min_power = log(pixels_per_region/256.f)/log(2.f);
childSetMinValue("zoom slider", min_power);
@@ -1062,20 +1023,18 @@ void LLFloaterWorldMap::onPanBtn( void* userdata )
void LLFloaterWorldMap::onGoHome(void*)
{
gAgent.teleportHome();
- gFloaterWorldMap->close();
+ gFloaterWorldMap->closeFloater();
}
-// static
-void LLFloaterWorldMap::onLandmarkComboPrearrange( LLUICtrl* ctrl, void* userdata )
+void LLFloaterWorldMap::onLandmarkComboPrearrange( )
{
- LLFloaterWorldMap* self = gFloaterWorldMap;
- if( !self || self->mIsClosing )
+ if( mIsClosing )
{
return;
}
- LLCtrlListInterface *list = self->childGetListInterface("landmark combo");
+ LLCtrlListInterface *list = childGetListInterface("landmark combo");
if (!list) return;
LLUUID current_choice = list->getCurrentID();
@@ -1089,7 +1048,7 @@ void LLFloaterWorldMap::onLandmarkComboPrearrange( LLUICtrl* ctrl, void* userdat
}
-void LLFloaterWorldMap::onComboTextEntry( LLLineEditor* ctrl, void* userdata )
+void LLFloaterWorldMap::onComboTextEntry()
{
// Reset the tracking whenever we start typing into any of the search fields,
// so that hitting <enter> does an auto-complete versus teleporting us to the
@@ -1097,11 +1056,10 @@ void LLFloaterWorldMap::onComboTextEntry( LLLineEditor* ctrl, void* userdata )
LLTracker::clearFocus();
}
-// static
-void LLFloaterWorldMap::onSearchTextEntry( LLLineEditor* ctrl, void* userdata )
+void LLFloaterWorldMap::onSearchTextEntry( LLLineEditor* ctrl )
{
- onComboTextEntry(ctrl, userdata);
- updateSearchEnabled(ctrl, userdata);
+ onComboTextEntry();
+ updateSearchEnabled();
}
// static
@@ -1154,15 +1112,14 @@ void LLFloaterWorldMap::onLandmarkComboCommit( LLUICtrl* ctrl, void* userdata )
}
// static
-void LLFloaterWorldMap::onAvatarComboPrearrange( LLUICtrl* ctrl, void* userdata )
+void LLFloaterWorldMap::onAvatarComboPrearrange( )
{
- LLFloaterWorldMap* self = gFloaterWorldMap;
- if( !self || self->mIsClosing )
+ if( mIsClosing )
{
return;
}
- LLCtrlListInterface *list = self->childGetListInterface("friend combo");
+ LLCtrlListInterface *list = childGetListInterface("friend combo");
if (!list) return;
LLUUID current_choice;
@@ -1172,7 +1129,7 @@ void LLFloaterWorldMap::onAvatarComboPrearrange( LLUICtrl* ctrl, void* userdata
current_choice = LLAvatarTracker::instance().getAvatarID();
}
- self->buildAvatarIDList();
+ buildAvatarIDList();
if( !list->setCurrentByID( current_choice ) || current_choice.isNull() )
{
@@ -1208,24 +1165,21 @@ void LLFloaterWorldMap::onAvatarComboCommit( LLUICtrl* ctrl, void* userdata )
}
}
-//static
-void LLFloaterWorldMap::onLocationFocusChanged( LLFocusableElement* focus, void* userdata )
+void LLFloaterWorldMap::onLocationFocusChanged( LLFocusableElement* focus )
{
- updateSearchEnabled((LLUICtrl*)focus, userdata);
+ updateSearchEnabled();
}
-// static
-void LLFloaterWorldMap::updateSearchEnabled( LLUICtrl* ctrl, void* userdata )
+void LLFloaterWorldMap::updateSearchEnabled()
{
- LLFloaterWorldMap *self = gFloaterWorldMap;
- if (self->childHasKeyboardFocus("location") &&
- self->childGetValue("location").asString().length() > 0)
+ if (childHasKeyboardFocus("location") &&
+ childGetValue("location").asString().length() > 0)
{
- self->setDefaultBtn("DoSearch");
+ setDefaultBtn("DoSearch");
}
else
{
- self->setDefaultBtn(NULL);
+ setDefaultBtn(NULL);
}
}
@@ -1312,7 +1266,7 @@ void LLFloaterWorldMap::onClickTeleportBtn(void* data)
void LLFloaterWorldMap::onCopySLURL(void* data)
{
LLFloaterWorldMap* self = (LLFloaterWorldMap*)data;
- gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(self->mSLURL));
+ self->getWindow()->copyTextToClipboard(utf8str_to_wstring(self->mSLURL));
LLSD args;
args["SLURL"] = self->mSLURL;
@@ -1375,7 +1329,7 @@ void LLFloaterWorldMap::fly()
if (!pos_global.isExactlyZero())
{
gAgent.startAutoPilotGlobal( pos_global );
- close();
+ closeFloater();
}
else
{
@@ -1536,14 +1490,10 @@ void LLFloaterWorldMap::flyToAvatar()
}
}
-// static
-void LLFloaterWorldMap::onCommitBackground(void* userdata, bool from_click)
+void LLFloaterWorldMap::onCommitBackground()
{
- LLFloaterWorldMap* self = (LLFloaterWorldMap*) userdata;
-
// Find my index
- S32 index = self->mTabs->getCurrentPanelIndex();
-
+ S32 index = mTabs->getCurrentPanelIndex();
LLWorldMap::getInstance()->setCurrentLayer(index);
}
@@ -1612,7 +1562,7 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
}
else if (num_results == 0)
{
- list->addCommentText(std::string("None found."));
+ list->setCommentText(std::string("None found."));
list->operateOnAll(LLCtrlListInterface::OP_DESELECT);
}
}
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h
index b0e72f298a..a7d7051b40 100644
--- a/indra/newview/llfloaterworldmap.h
+++ b/indra/newview/llfloaterworldmap.h
@@ -50,28 +50,27 @@ class LLInventoryModel;
class LLInventoryObserver;
class LLItemInfo;
class LLTabContainer;
-class LLWorldMapView;
class LLFloaterWorldMap : public LLFloater
{
public:
- LLFloaterWorldMap();
+ LLFloaterWorldMap(const LLSD& key);
virtual ~LLFloaterWorldMap();
+ // Prefer this to gFloaterWorldMap
+ static LLFloaterWorldMap* getInstance();
+
static void *createWorldMapView(void* data);
BOOL postBuild();
+ /*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void onClose(bool app_quitting);
- static void show(void*, BOOL center_on_target );
static void reloadIcons(void*);
- static void toggle(void*);
- static void hide(void*);
/*virtual*/ void reshape( S32 width, S32 height, BOOL called_from_parent = TRUE );
/*virtual*/ BOOL handleHover(S32 x, S32 y, MASK mask);
/*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
- /*virtual*/ void setVisible(BOOL visible);
/*virtual*/ void draw();
// methods for dealing with inventory. The observe() method is
@@ -117,16 +116,16 @@ protected:
static void onGoHome(void* data);
- static void onLandmarkComboPrearrange( LLUICtrl* ctrl, void* data );
+ void onLandmarkComboPrearrange( );
static void onLandmarkComboCommit( LLUICtrl* ctrl, void* data );
- static void onAvatarComboPrearrange( LLUICtrl* ctrl, void* data );
+ void onAvatarComboPrearrange( );
static void onAvatarComboCommit( LLUICtrl* ctrl, void* data );
- static void onCommitBackground(void* data, bool from_click);
+ void onCommitBackground();
- static void onComboTextEntry( LLLineEditor* ctrl, void* data );
- static void onSearchTextEntry( LLLineEditor* ctrl, void* data );
+ void onComboTextEntry( );
+ void onSearchTextEntry( LLLineEditor* ctrl );
static void onClearBtn(void*);
static void onFlyBtn(void*);
@@ -153,8 +152,8 @@ protected:
void flyToAvatar();
void teleportToAvatar();
- static void updateSearchEnabled( LLUICtrl* ctrl, void* userdata );
- static void onLocationFocusChanged( LLFocusableElement* ctrl, void* userdata );
+ void updateSearchEnabled( );
+ void onLocationFocusChanged( LLFocusableElement* ctrl );
static void onLocationCommit( void* userdata );
static void onCommitLocation( LLUICtrl* ctrl, void* userdata );
static void onCommitSearchResult( LLUICtrl* ctrl, void* userdata );
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 97a3bd7c50..75c7467442 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -50,10 +50,10 @@
#include "llkeyboard.h"
#include "lllineeditor.h"
#include "llmenugl.h"
-#include "llresmgr.h"
#include "llpreview.h"
#include "llscrollcontainer.h" // hack to allow scrolling
#include "lltooldraganddrop.h"
+#include "lltrans.h"
#include "llui.h"
#include "llviewerimage.h"
#include "llviewerimagelist.h"
@@ -110,28 +110,16 @@ void renamer_focus_lost( LLFocusableElement* handler, void* user_data );
// statics
const LLFontGL* LLFolderViewItem::sFont = NULL;
const LLFontGL* LLFolderViewItem::sSmallFont = NULL;
-LLColor4 LLFolderViewItem::sFgColor;
-LLColor4 LLFolderViewItem::sHighlightBgColor;
-LLColor4 LLFolderViewItem::sHighlightFgColor;
-LLColor4 LLFolderViewItem::sFilterBGColor;
-LLColor4 LLFolderViewItem::sFilterTextColor;
-LLColor4 LLFolderViewItem::sSuffixColor;
-LLColor4 LLFolderViewItem::sSearchStatusColor;
LLUIImagePtr LLFolderViewItem::sArrowImage;
LLUIImagePtr LLFolderViewItem::sBoxImage;
+const LLColor4U DEFAULT_WHITE(255, 255, 255);
+
//static
void LLFolderViewItem::initClass()
{
- sFont = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
- sSmallFont = LLResMgr::getInstance()->getRes( LLFONT_SMALL );
- sFgColor = gColors.getColor( "MenuItemEnabledColor" );
- sHighlightBgColor = gColors.getColor( "MenuItemHighlightBgColor" );
- sHighlightFgColor = gColors.getColor( "MenuItemHighlightFgColor" );
- sFilterBGColor = gColors.getColor( "FilterBackgroundColor" );
- sFilterTextColor = gColors.getColor( "FilterTextColor" );
- sSuffixColor = gColors.getColor( "InventoryItemSuffixColor" );
- sSearchStatusColor = gColors.getColor( "InventorySearchStatusColor" );
+ sFont = LLFontGL::getFontSansSerifSmall();
+ sSmallFont = LLFontGL::getFontMonospace();
sArrowImage = LLUI::getUIImage("folder_arrow.tga");
sBoxImage = LLUI::getUIImage("rounded_square.tga");
}
@@ -143,23 +131,17 @@ void LLFolderViewItem::cleanupClass()
sBoxImage = NULL;
}
-// Default constructor
// NOTE: Optimize this, we call it a *lot* when opening a large inventory
-LLFolderViewItem::LLFolderViewItem( const std::string& name, LLUIImagePtr icon,
- time_t creation_date,
- LLFolderView* root,
- LLFolderViewEventListener* listener ) :
- LLUICtrl( name, LLRect(0, 0, 0, 0), TRUE, NULL, NULL, FOLLOWS_LEFT|FOLLOWS_TOP|FOLLOWS_RIGHT),
- mLabel( name ),
+
+// Default constructor
+LLFolderViewItem::LLFolderViewItem(LLFolderViewItem::Params p)
+: LLUICtrl(p),
mLabelWidth(0),
- mCreationDate(creation_date),
mParentFolder( NULL ),
- mListener( listener ),
mIsSelected( FALSE ),
mIsCurSelection( FALSE ),
mSelectPending(FALSE),
mLabelStyle( LLFontGL::NORMAL ),
- mIcon(icon),
mHasVisibleChildren(FALSE),
mIndentation(0),
mNumDescendantsSelected(0),
@@ -167,12 +149,16 @@ LLFolderViewItem::LLFolderViewItem( const std::string& name, LLUIImagePtr icon,
mLastFilterGeneration(-1),
mStringMatchOffset(std::string::npos),
mControlLabelRotation(0.f),
- mRoot( root ),
mDragAndDropTarget(FALSE),
- mIsLoading(FALSE)
+ mIsLoading(FALSE),
+ mLabel(p.name),
+ mRoot(p.root),
+ mCreationDate(p.creation_date),
+ mListener(p.listener),
+ mArrowImage(p.folder_arrow_image),
+ mBoxImage(p.selection_image)
{
- refresh(); // possible opt: only call refreshFromListener()
- setTabStop(FALSE);
+ refresh();
}
// Destroys the object
@@ -258,7 +244,7 @@ BOOL LLFolderViewItem::potentiallyVisible()
BOOL LLFolderViewItem::getFiltered()
{
- return mFiltered && mLastFilterGeneration >= mRoot->getFilter()->getMinRequiredGeneration();
+ return mFiltered && mLastFilterGeneration >= getRoot()->getFilter()->getMinRequiredGeneration();
}
BOOL LLFolderViewItem::getFiltered(S32 filter_generation)
@@ -283,6 +269,15 @@ void LLFolderViewItem::refreshFromListener()
if(mListener)
{
mLabel = mListener->getDisplayName();
+ LLAssetType::EType preferred_type = mListener->getPreferredType();
+
+ // *TODO: to be removed when database supports multi language. This is a
+ // temporary attempt to display the inventory folder in the user locale.
+ if (preferred_type != LLAssetType::AT_NONE)
+ {
+ mLabel = LLTrans::getString("InvFolder " + mLabel);
+ };
+
setIcon(mListener->getIcon());
time_t creation_date = mListener->getCreationDate();
if (mCreationDate != creation_date)
@@ -796,6 +791,14 @@ BOOL LLFolderViewItem::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
void LLFolderViewItem::draw()
{
+ static LLCachedControl<LLColor4> sFgColor(gSavedSkinSettings, "MenuItemEnabledColor", DEFAULT_WHITE);
+ static LLCachedControl<LLColor4> sHighlightBgColor(gSavedSkinSettings, "MenuItemHighlightBgColor", DEFAULT_WHITE);
+ static LLCachedControl<LLColor4> sHighlightFgColor(gSavedSkinSettings, "MenuItemHighlightFgColor", DEFAULT_WHITE);
+ static LLCachedControl<LLColor4> sFilterBGColor(gSavedSkinSettings, "FilterBackgroundColor", DEFAULT_WHITE);
+ static LLCachedControl<LLColor4> sFilterTextColor(gSavedSkinSettings, "FilterTextColor", DEFAULT_WHITE);
+ static LLCachedControl<LLColor4> sSuffixColor(gSavedSkinSettings, "InventoryItemSuffixColor", DEFAULT_WHITE);
+ static LLCachedControl<LLColor4> sSearchStatusColor(gSavedSkinSettings, "InventorySearchStatusColor", DEFAULT_WHITE);
+
bool possibly_has_children = false;
bool up_to_date = mListener && mListener->isUpToDate();
if((up_to_date && hasVisibleChildren() ) || // we fetched our children and some of them have passed the filter...
@@ -920,7 +923,7 @@ void LLFolderViewItem::draw()
LLColor4 filter_color = mLastFilterGeneration >= getRoot()->getFilter()->getCurrentGeneration() ? LLColor4(0.5f, 0.8f, 0.5f, 1.f) : LLColor4(0.8f, 0.5f, 0.5f, 1.f);
sSmallFont->renderUTF8(mStatusText, 0, text_left, y, filter_color,
- LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL,
+ LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW,
S32_MAX, S32_MAX, &right_x, FALSE );
text_left = right_x;
}
@@ -928,26 +931,25 @@ void LLFolderViewItem::draw()
if ( mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime") )
{
- // *TODO: Translate
- sFont->renderUTF8( std::string("Loading... "), 0, text_left, y, sSearchStatusColor,
- LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, S32_MAX, S32_MAX, &right_x, FALSE);
+ sFont->renderUTF8(LLTrans::getString("LoadingData"), 0, text_left, y, sSearchStatusColor,
+ LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, &right_x, FALSE);
text_left = right_x;
}
sFont->renderUTF8( mLabel, 0, text_left, y, color,
- LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
+ LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW,
S32_MAX, S32_MAX, &right_x, FALSE );
if (!mLabelSuffix.empty())
{
sFont->renderUTF8( mLabelSuffix, 0, right_x, y, sSuffixColor,
- LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
+ LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW,
S32_MAX, S32_MAX, &right_x, FALSE );
}
if (sBoxImage.notNull() && mStringMatchOffset != std::string::npos)
{
// don't draw backgrounds for zero-length strings
- S32 filter_string_length = mRoot->getFilterSubString().size();
+ S32 filter_string_length = getRoot()->getFilterSubString().size();
if (filter_string_length > 0)
{
std::string combined_string = mLabel + mLabelSuffix;
@@ -961,7 +963,7 @@ void LLFolderViewItem::draw()
F32 match_string_left = text_left + sFont->getWidthF32(combined_string, 0, mStringMatchOffset);
F32 y = (F32)getRect().getHeight() - sFont->getLineHeight() - (F32)TEXT_PAD;
sFont->renderUTF8( combined_string, mStringMatchOffset, match_string_left, y,
- sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle,
+ sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, mLabelStyle, LLFontGL::NO_SHADOW,
filter_string_length, S32_MAX, &right_x, FALSE );
}
}
@@ -971,6 +973,13 @@ void LLFolderViewItem::draw()
{
drawDebugRect();
}
+
+ //// *HACK: also draw debug rectangles around currently-being-edited LLView, and any elements that are being highlighted by GUI preview code (see LLFloaterUIPreview)
+ //std::set<LLView*>::iterator iter = std::find(sPreviewHighlightedElements.begin(), sPreviewHighlightedElements.end(), this);
+ //if ((sEditingUI && this == sEditingUIView) || (iter != sPreviewHighlightedElements.end() && sDrawPreviewHighlights))
+ //{
+ // drawDebugRect();
+ //}
}
@@ -978,11 +987,8 @@ void LLFolderViewItem::draw()
/// Class LLFolderViewFolder
///----------------------------------------------------------------------------
-// Default constructor
-LLFolderViewFolder::LLFolderViewFolder( const std::string& name, LLUIImagePtr icon,
- LLFolderView* root,
- LLFolderViewEventListener* listener ):
- LLFolderViewItem( name, icon, 0, root, listener ), // 0 = no create time
+LLFolderViewFolder::LLFolderViewFolder( const LLFolderViewItem::Params& p ):
+ LLFolderViewItem( p ), // 0 = no create time
mIsOpen(FALSE),
mExpanderHighlighted(FALSE),
mCurHeight(0.f),
@@ -1042,7 +1048,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
{
// set last arrange generation first, in case children are animating
// and need to be arranged again
- mLastArrangeGeneration = mRoot->getArrangeGeneration();
+ mLastArrangeGeneration = getRoot()->getArrangeGeneration();
if (mIsOpen)
{
// Add sizes of children
@@ -1163,7 +1169,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
BOOL LLFolderViewFolder::needsArrange()
{
- return mLastArrangeGeneration < mRoot->getArrangeGeneration();
+ return mLastArrangeGeneration < getRoot()->getArrangeGeneration();
}
void LLFolderViewFolder::setCompletedFilterGeneration(S32 generation, BOOL recurse_up)
@@ -1256,7 +1262,7 @@ void LLFolderViewFolder::filter( LLInventoryFilter& filter)
if ((*fit)->getFiltered() || (*fit)->hasFilteredDescendants(filter.getMinRequiredGeneration()))
{
mMostFilteredDescendantGeneration = filter_generation;
- if (mRoot->needsAutoSelect())
+ if (getRoot()->needsAutoSelect())
{
(*fit)->setOpenArrangeRecursively(TRUE);
}
@@ -1272,7 +1278,7 @@ void LLFolderViewFolder::filter( LLInventoryFilter& filter)
if ((*fit)->getFiltered() || (*fit)->hasFilteredDescendants(filter_generation))
{
mMostFilteredDescendantGeneration = filter_generation;
- if (mRoot->needsAutoSelect())
+ if (getRoot()->needsAutoSelect())
{
(*fit)->setOpenArrangeRecursively(TRUE);
}
@@ -1346,7 +1352,7 @@ void LLFolderViewFolder::dirtyFilter()
BOOL LLFolderViewFolder::hasFilteredDescendants()
{
- return mMostFilteredDescendantGeneration >= mRoot->getFilter()->getCurrentGeneration();
+ return mMostFilteredDescendantGeneration >= getRoot()->getFilter()->getCurrentGeneration();
}
// Passes selection information on to children and record selection
@@ -2209,7 +2215,7 @@ BOOL LLFolderViewFolder::potentiallyVisible()
// folder should be visible by it's own filter status
return LLFolderViewItem::potentiallyVisible()
// or one or more of its descendants have passed the minimum filter requirement
- || hasFilteredDescendants(mRoot->getFilter()->getMinRequiredGeneration())
+ || hasFilteredDescendants(getRoot()->getFilter()->getMinRequiredGeneration())
// or not all of its descendants have been checked against minimum filter requirement
|| getCompletedFilterGeneration() < getRoot()->getFilter()->getMinRequiredGeneration();
}
@@ -2494,21 +2500,13 @@ void LLCloseAllFoldersFunctor::doItem(LLFolderViewItem* item)
///----------------------------------------------------------------------------
// Default constructor
-LLFolderView::LLFolderView( const std::string& name, LLUIImagePtr root_folder_icon,
- const LLRect& rect, const LLUUID& source_id, LLView *parent_view ) :
-#if LL_WINDOWS
-#pragma warning( push )
-#pragma warning( disable : 4355 ) // warning C4355: 'this' : used in base member initializer list
-#endif
- LLFolderViewFolder( name, root_folder_icon, this, NULL ),
-#if LL_WINDOWS
-#pragma warning( pop )
-#endif
+LLFolderView::LLFolderView(const Params& p)
+: LLFolderViewFolder(p),
mScrollContainer( NULL ),
mPopupMenuHandle(),
mAllowMultiSelect(TRUE),
mShowFolderHierarchy(FALSE),
- mSourceID(source_id),
+ mSourceID(p.task_id),
mRenameItem( NULL ),
mNeedsScroll( FALSE ),
mLastScrollItem( NULL ),
@@ -2517,16 +2515,16 @@ LLFolderView::LLFolderView( const std::string& name, LLUIImagePtr root_folder_ic
mNeedsAutoRename(FALSE),
mDebugFilters(FALSE),
mSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME), // This gets overridden by a pref immediately
- mFilter(name),
+ mFilter(p.name),
mShowSelectionContext(FALSE),
mShowSingleSelection(FALSE),
mArrangeGeneration(0),
- mUserData(NULL),
- mSelectCallback(NULL),
mSignalSelectCallback(0),
mMinWidth(0),
- mDragAndDropThisFrame(FALSE)
+ mDragAndDropThisFrame(FALSE),
+ mCallbackRegistrar(NULL)
{
+ LLRect rect = p.rect;
LLRect new_rect(rect.mLeft, rect.mBottom + getRect().getHeight(), rect.mLeft + getRect().getWidth(), rect.mBottom);
setRect( rect );
reshape(rect.getWidth(), rect.getHeight());
@@ -2543,27 +2541,27 @@ LLFolderView::LLFolderView( const std::string& name, LLUIImagePtr root_folder_ic
// just make sure the label ("Inventory Folder") never shows up
mLabel = LLStringUtil::null;
- mRenamer = new LLLineEditor(std::string("ren"), getRect(), LLStringUtil::null, sFont,
- DB_INV_ITEM_NAME_STR_LEN,
- &LLFolderView::commitRename,
- NULL,
- NULL,
- this,
- &LLLineEditor::prevalidatePrintableNotPipe);
//mRenamer->setWriteableBgColor(LLColor4::white);
// Escape is handled by reverting the rename, not commiting it (default behavior)
- mRenamer->setCommitOnFocusLost(TRUE);
- mRenamer->setVisible(FALSE);
+ LLLineEditor::Params params;
+ params.name("ren");
+ params.rect(getRect());
+ params.font(sFont);
+ params.max_length_bytes(DB_INV_ITEM_NAME_STR_LEN);
+ params.commit_callback.function(boost::bind(&LLFolderView::commitRename, this, _2));
+ params.prevalidate_callback(&LLLineEditor::prevalidatePrintableNotPipe);
+ params.commit_on_focus_lost(true);
+ params.visible(false);
+ mRenamer = LLUICtrlFactory::create<LLLineEditor> (params);
addChild(mRenamer);
// make the popup menu available
- LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_inventory.xml", parent_view);
+ LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_inventory.xml", p.parent_panel);
if (!menu)
{
- menu = new LLMenuGL(LLStringUtil::null);
+ menu = LLUICtrlFactory::createDummyWidget<LLMenuGL>("inventory_menu");
}
- menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
- menu->setVisible(FALSE);
+ menu->setBackgroundColor(gSavedSkinSettings.getColor("MenuPopupBgColor"));
mPopupMenuHandle = menu->getHandle();
setTabStop(TRUE);
@@ -2674,7 +2672,7 @@ void LLFolderView::closeAllFolders()
void LLFolderView::openFolder(const std::string& foldername)
{
- LLFolderViewFolder* inv = getChild<LLFolderViewFolder>(foldername);
+ LLFolderViewFolder* inv = findChild<LLFolderViewFolder>(foldername);
if (inv)
{
setSelection(inv, FALSE, FALSE);
@@ -2700,7 +2698,7 @@ S32 LLFolderView::arrange( S32* unused_width, S32* unused_height, S32 filter_gen
mHasVisibleChildren = hasFilteredDescendants(filter_generation);
// arrange always finishes, so optimistically set the arrange generation to the most current
- mLastArrangeGeneration = mRoot->getArrangeGeneration();
+ mLastArrangeGeneration = getRoot()->getArrangeGeneration();
LLInventoryFilter::EFolderShow show_folder_state = getRoot()->getShowFolderState();
@@ -3113,24 +3111,21 @@ BOOL LLFolderView::startDrag(LLToolDragAndDrop::ESource source)
return can_drag;
}
-void LLFolderView::commitRename( LLUICtrl* renamer, void* user_data )
+void LLFolderView::commitRename( const LLSD& data )
{
- LLFolderView* root = reinterpret_cast<LLFolderView*>(user_data);
- if( root )
- {
- root->finishRenamingItem();
- }
+ finishRenamingItem();
}
void LLFolderView::draw()
{
+ static LLCachedControl<LLColor4> sSearchStatusColor(gSavedSkinSettings, "InventorySearchStatusColor", DEFAULT_WHITE);
if (mDebugFilters)
{
std::string current_filter_string = llformat("Current Filter: %d, Least Filter: %d, Auto-accept Filter: %d",
mFilter.getCurrentGeneration(), mFilter.getMinRequiredGeneration(), mFilter.getMustPassGeneration());
sSmallFont->renderUTF8(current_filter_string, 0, 2,
getRect().getHeight() - sSmallFont->getLineHeight(), LLColor4(0.5f, 0.5f, 0.8f, 1.f),
- LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, S32_MAX, S32_MAX, NULL, FALSE );
+ LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE );
}
// if cursor has moved off of me during drag and drop
@@ -3176,13 +3171,13 @@ void LLFolderView::draw()
{
if (gInventory.backgroundFetchActive() || mCompletedFilterGeneration < mFilter.getMinRequiredGeneration())
{
- mStatusText = std::string("Searching..."); // *TODO:translate
- sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, S32_MAX, S32_MAX, NULL, FALSE );
+ mStatusText = LLTrans::getString("Searching");
+ sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE );
}
else
{
- mStatusText = std::string("No matching items found in inventory."); // *TODO:translate
- sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, S32_MAX, S32_MAX, NULL, FALSE );
+ mStatusText = LLTrans::getString("InventoryNoMatchingItems");
+ sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE );
}
}
@@ -3347,11 +3342,8 @@ void LLFolderView::openSelectedItems( void )
}
else
{
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLMultiPreview* multi_previewp = new LLMultiPreview(LLRect(left, top, left + 300, top - 100));
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLMultiProperties* multi_propertiesp = new LLMultiProperties(LLRect(left, top, left + 300, top - 100));
+ LLMultiPreview* multi_previewp = new LLMultiPreview();
+ LLMultiProperties* multi_propertiesp = new LLMultiProperties();
selected_items_t::iterator item_it;
for (item_it = mSelectedItems.begin(); item_it != mSelectedItems.end(); ++item_it)
@@ -3371,8 +3363,8 @@ void LLFolderView::openSelectedItems( void )
LLFloater::setFloaterHost(NULL);
// *NOTE: LLMulti* will safely auto-delete when open'd
// without any children.
- multi_previewp->open();
- multi_propertiesp->open();
+ multi_previewp->openFloater(LLSD());
+ multi_propertiesp->openFloater(LLSD());
}
}
}
@@ -3389,10 +3381,7 @@ void LLFolderView::propertiesSelectedItems( void )
}
else
{
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
-
- LLMultiProperties* multi_propertiesp = new LLMultiProperties(LLRect(left, top, left + 100, top - 100));
+ LLMultiProperties* multi_propertiesp = new LLMultiProperties();
LLFloater::setFloaterHost(multi_propertiesp);
@@ -3403,7 +3392,7 @@ void LLFolderView::propertiesSelectedItems( void )
}
LLFloater::setFloaterHost(NULL);
- multi_propertiesp->open(); /* Flawfinder: ignore */
+ multi_propertiesp->openFloater(LLSD());
}
}
}
@@ -3631,7 +3620,7 @@ void LLFolderView::startRenamingSelectedItem( void )
mRenamer->setVisible( TRUE );
// set focus will fail unless item is visible
mRenamer->setFocus( TRUE );
- mRenamer->setLostTopCallback(onRenamerLost);
+ mRenamer->setTopLostCallback(onRenamerLost);
gFocusMgr.setTopCtrl( mRenamer );
}
}
@@ -4037,6 +4026,8 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
if(handled && (count > 0) && menu)
{
+ if (mCallbackRegistrar)
+ mCallbackRegistrar->pushScope();
//menu->empty();
const LLView::child_list_t *list = menu->getChildList();
@@ -4056,9 +4047,10 @@ BOOL LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
flags = 0x0;
}
- menu->arrange();
menu->updateParent(LLMenuGL::sMenuContainer);
LLMenuGL::showPopup(this, menu, x, y);
+ if (mCallbackRegistrar)
+ mCallbackRegistrar->popScope();
}
else
{
@@ -4295,11 +4287,11 @@ void LLFolderView::doIdle()
}
}
- if (mSignalSelectCallback && mSelectCallback)
+ if (mSignalSelectCallback)
{
//RN: we use keyboard focus as a proxy for user-explicit actions
BOOL take_keyboard_focus = (mSignalSelectCallback == SIGNAL_KEYBOARD_FOCUS);
- mSelectCallback(mSelectedItems, take_keyboard_focus, mUserData);
+ mSelectSignal(mSelectedItems, take_keyboard_focus);
}
mSignalSelectCallback = FALSE;
}
@@ -4400,9 +4392,13 @@ bool LLInventorySort::operator()(const LLFolderViewItem* const& a, const LLFolde
}
//static
-void LLFolderView::onRenamerLost( LLUICtrl* renamer, void* user_data)
+void LLFolderView::onRenamerLost( LLFocusableElement* renamer, void* user_data)
{
- renamer->setVisible(FALSE);
+ LLUICtrl* uictrl = dynamic_cast<LLUICtrl*>(renamer);
+ if (uictrl)
+ {
+ uictrl->setVisible(FALSE);
+ }
}
void delete_selected_item(void* user_data)
@@ -4823,133 +4819,156 @@ std::string LLInventoryFilter::getFilterText()
if (isFilterWith(LLInventoryType::IT_ANIMATION))
{
- filtered_types += " Animations,";
+ //filtered_types += " Animations,";
+ filtered_types += LLTrans::getString("Animations");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
- not_filtered_types += " Animations,";
+ //not_filtered_types += " Animations,";
+ not_filtered_types += LLTrans::getString("Animations");
+
filtered_by_all_types = FALSE;
}
if (isFilterWith(LLInventoryType::IT_CALLINGCARD))
{
- filtered_types += " Calling Cards,";
+ //filtered_types += " Calling Cards,";
+ filtered_types += LLTrans::getString("Calling Cards");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
- not_filtered_types += " Calling Cards,";
+ //not_filtered_types += " Calling Cards,";
+ not_filtered_types += LLTrans::getString("Calling Cards");
filtered_by_all_types = FALSE;
}
if (isFilterWith(LLInventoryType::IT_WEARABLE))
{
- filtered_types += " Clothing,";
+ //filtered_types += " Clothing,";
+ filtered_types += LLTrans::getString("Clothing");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
- not_filtered_types += " Clothing,";
+ //not_filtered_types += " Clothing,";
+ not_filtered_types += LLTrans::getString("Clothing");
filtered_by_all_types = FALSE;
}
if (isFilterWith(LLInventoryType::IT_GESTURE))
{
- filtered_types += " Gestures,";
+ //filtered_types += " Gestures,";
+ filtered_types += LLTrans::getString("Gestures");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
- not_filtered_types += " Gestures,";
+ //not_filtered_types += " Gestures,";
+ not_filtered_types += LLTrans::getString("Gestures");
filtered_by_all_types = FALSE;
}
if (isFilterWith(LLInventoryType::IT_LANDMARK))
{
- filtered_types += " Landmarks,";
+ //filtered_types += " Landmarks,";
+ filtered_types += LLTrans::getString("Landmarks");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
- not_filtered_types += " Landmarks,";
+ //not_filtered_types += " Landmarks,";
+ not_filtered_types += LLTrans::getString("Landmarks");
filtered_by_all_types = FALSE;
}
if (isFilterWith(LLInventoryType::IT_NOTECARD))
{
- filtered_types += " Notecards,";
+ //filtered_types += " Notecards,";
+ filtered_types += LLTrans::getString("Notecards");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
- not_filtered_types += " Notecards,";
+ //not_filtered_types += " Notecards,";
+ not_filtered_types += LLTrans::getString("Notecards");
filtered_by_all_types = FALSE;
}
if (isFilterWith(LLInventoryType::IT_OBJECT) && isFilterWith(LLInventoryType::IT_ATTACHMENT))
{
- filtered_types += " Objects,";
+ //filtered_types += " Objects,";
+ filtered_types += LLTrans::getString("Objects");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
- not_filtered_types += " Objects,";
+ //not_filtered_types += " Objects,";
+ not_filtered_types += LLTrans::getString("Objects");
filtered_by_all_types = FALSE;
}
if (isFilterWith(LLInventoryType::IT_LSL))
{
- filtered_types += " Scripts,";
+ //filtered_types += " Scripts,";
+ filtered_types += LLTrans::getString("Scripts");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
- not_filtered_types += " Scripts,";
+ //not_filtered_types += " Scripts,";
+ not_filtered_types += LLTrans::getString("Scripts");
filtered_by_all_types = FALSE;
}
if (isFilterWith(LLInventoryType::IT_SOUND))
{
- filtered_types += " Sounds,";
+ //filtered_types += " Sounds,";
+ filtered_types += LLTrans::getString("Sounds");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
- not_filtered_types += " Sounds,";
+ //not_filtered_types += " Sounds,";
+ not_filtered_types += LLTrans::getString("Sounds");
filtered_by_all_types = FALSE;
}
if (isFilterWith(LLInventoryType::IT_TEXTURE))
{
- filtered_types += " Textures,";
+ //filtered_types += " Textures,";
+ filtered_types += LLTrans::getString("Textures");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
- not_filtered_types += " Textures,";
+ //not_filtered_types += " Textures,";
+ not_filtered_types += LLTrans::getString("Textures");
filtered_by_all_types = FALSE;
}
if (isFilterWith(LLInventoryType::IT_SNAPSHOT))
{
- filtered_types += " Snapshots,";
+ //filtered_types += " Snapshots,";
+ filtered_types += LLTrans::getString("Snapshots");
filtered_by_type = TRUE;
num_filter_types++;
}
else
{
- not_filtered_types += " Snapshots,";
+ //not_filtered_types += " Snapshots,";
+ not_filtered_types += LLTrans::getString("Snapshots");
filtered_by_all_types = FALSE;
}
@@ -4962,7 +4981,8 @@ std::string LLInventoryFilter::getFilterText()
}
else
{
- mFilterText += "No ";
+ //mFilterText += "No ";
+ mFilterText += LLTrans::getString("No Filters");
mFilterText += not_filtered_types;
}
// remove the ',' at the end
@@ -4971,7 +4991,8 @@ std::string LLInventoryFilter::getFilterText()
if (isSinceLogoff())
{
- mFilterText += " - Since Logoff";
+ //mFilterText += " - Since Logoff";
+ mFilterText += LLTrans::getString("Since Logoff");
}
return mFilterText;
}
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index 3fe3095c58..1b128d84ee 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -70,7 +70,7 @@ class LLMenuGL;
class LLFolderViewItem;
class LLFolderView;
class LLInventoryModel;
-class LLScrollableContainerView;
+class LLScrollContainer;
class LLFolderViewEventListener
{
@@ -81,6 +81,7 @@ public:
virtual const LLUUID& getUUID() const = 0;
virtual time_t getCreationDate() const = 0; // UTC seconds
virtual PermissionMask getPermissionMask() const = 0;
+ virtual LLAssetType::EType getPreferredType() const {return LLAssetType::AT_NONE;};
virtual LLUIImagePtr getIcon() const = 0;
virtual LLFontGL::StyleFlags getLabelStyle() const = 0;
virtual std::string getLabelSuffix() const = 0;
@@ -316,21 +317,39 @@ class LLFolderView;
class LLFolderViewItem : public LLUICtrl
{
+public:
+ static void initClass();
+ static void cleanupClass();
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<LLUIImage*> icon;
+ Optional<LLFolderView*> root;
+ Optional<LLFolderViewEventListener*> listener;
+
+ Optional<LLUIImage*> folder_arrow_image;
+ Optional<LLUIImage*> selection_image;
+
+ Optional<S32> creation_date; //UTC seconds
+ Params()
+ : folder_arrow_image("", LLUI::getUIImage("folder_arrow.tga")),
+ selection_image("", LLUI::getUIImage("rounded_square.tga"))
+ {
+ mouse_opaque(true);
+ follows.flags(FOLLOWS_LEFT|FOLLOWS_TOP|FOLLOWS_RIGHT);
+ tab_stop(false);
+ }
+ };
+
protected:
+ friend class LLUICtrlFactory;
friend class LLFolderViewEventListener;
+ LLFolderViewItem(Params = LLFolderViewItem::Params());
+
static const LLFontGL* sFont;
static const LLFontGL* sSmallFont;
- static LLColor4 sFgColor;
- static LLColor4 sHighlightBgColor;
- static LLColor4 sHighlightFgColor;
- static LLColor4 sFilterBGColor;
- static LLColor4 sFilterTextColor;
- static LLColor4 sSuffixColor;
- static LLColor4 sSearchStatusColor;
static LLUIImagePtr sArrowImage;
static LLUIImagePtr sBoxImage;
-
std::string mLabel;
std::string mSearchableLabel;
std::string mType;
@@ -354,6 +373,8 @@ protected:
F32 mControlLabelRotation;
LLFolderView* mRoot;
BOOL mDragAndDropTarget;
+ LLUIImagePtr mArrowImage;
+ LLUIImagePtr mBoxImage;
BOOL mIsLoading;
LLTimer mTimeSinceRequestStart;
@@ -376,17 +397,12 @@ protected:
virtual BOOL addFolder(LLFolderViewFolder*) { return FALSE; }
public:
- static void initClass();
- static void cleanupClass();
-
// This function is called when the folder view is dirty. It's
// implemented here but called by derived classes when folding the
// views.
void arrangeFromRoot();
void filterFromRoot( void );
- // creation_date is in UTC seconds
- LLFolderViewItem( const std::string& name, LLUIImagePtr icon, time_t creation_date, LLFolderView* root, LLFolderViewEventListener* listener );
virtual ~LLFolderViewItem( void );
// addToFolder() returns TRUE if it succeeds. FALSE otherwise
@@ -490,7 +506,7 @@ public:
virtual BOOL isOpen() { return FALSE; }
- LLFolderView* getRoot();
+ virtual LLFolderView* getRoot();
BOOL isDescendantOf( const LLFolderViewFolder* potential_ancestor );
S32 getIndentation() { return mIndentation; }
@@ -541,12 +557,16 @@ typedef bool (*sort_order_f)(LLFolderViewItem* a, LLFolderViewItem* b);
class LLFolderViewFolder : public LLFolderViewItem
{
+protected:
+ LLFolderViewFolder( const LLFolderViewItem::Params& );
+ friend class LLUICtrlFactory;
+
public:
typedef enum e_trash
{
UNKNOWN, TRASH, NOT_TRASH
} ETrash;
-
+
protected:
typedef std::list<LLFolderViewItem*> items_t;
typedef std::list<LLFolderViewFolder*> folders_t;
@@ -574,9 +594,7 @@ public:
RECURSE_UP_DOWN
} ERecurseType;
- LLFolderViewFolder( const std::string& name, LLUIImagePtr icon,
- LLFolderView* root,
- LLFolderViewEventListener* listener );
+
virtual ~LLFolderViewFolder( void );
virtual BOOL potentiallyVisible();
@@ -724,24 +742,30 @@ class LLLineEditor;
class LLFolderView : public LLFolderViewFolder, LLEditMenuHandler
{
public:
- typedef void (*SelectCallback)(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
-
- static F32 sAutoOpenTime;
-
+ struct Params : public LLInitParam::Block<Params, LLFolderViewFolder::Params>
+ {
+ Mandatory<LLPanel*> parent_panel;
+ Optional<LLUUID> task_id;
+ };
LLFolderView( const std::string& name, LLUIImagePtr root_folder_icon, const LLRect& rect,
- const LLUUID& source_id, LLView *parent_view );
+ const LLUUID& source_id, LLPanel *parent_view );
+ LLFolderView(const Params&);
virtual ~LLFolderView( void );
virtual BOOL canFocusChildren() const;
+ virtual LLFolderView* getRoot() { return this; }
+
// FolderViews default to sort by name. This will change that,
// and resort the items if necessary.
void setSortOrder(U32 order);
void checkTreeResortForModelChanged();
void setFilterPermMask(PermissionMask filter_perm_mask) { mFilter.setFilterPermissions(filter_perm_mask); }
- void setSelectCallback(SelectCallback callback, void* user_data) { mSelectCallback = callback, mUserData = user_data; }
void setAllowMultiSelect(BOOL allow) { mAllowMultiSelect = allow; }
-
+
+ typedef boost::signal<void (const std::deque<LLFolderViewItem*>& items, BOOL user_action)> signal_t;
+ void setSelectCallback(const signal_t::slot_type& cb) { mSelectSignal.connect(cb); }
+
LLInventoryFilter* getFilter() { return &mFilter; }
const std::string getFilterSubString(BOOL trim = FALSE);
U32 getFilterTypes() const { return mFilter.getFilterTypes(); }
@@ -852,7 +876,7 @@ public:
void scrollToShowSelection();
void scrollToShowItem(LLFolderViewItem* item);
- void setScrollContainer( LLScrollableContainerView* parent ) { mScrollContainer = parent; }
+ void setScrollContainer( LLScrollContainer* parent ) { mScrollContainer = parent; }
LLRect getVisibleRect();
BOOL search(LLFolderViewItem* first_item, const std::string &search_string, BOOL backward);
@@ -873,20 +897,22 @@ public:
BOOL needsAutoRename() { return mNeedsAutoRename; }
void setNeedsAutoRename(BOOL val) { mNeedsAutoRename = val; }
+ void setCallbackRegistrar(LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* registrar) { mCallbackRegistrar = registrar; }
+
BOOL getDebugFilters() { return mDebugFilters; }
// DEBUG only
void dumpSelectionInformation();
protected:
- LLScrollableContainerView* mScrollContainer; // NULL if this is not a child of a scroll container.
+ LLScrollContainer* mScrollContainer; // NULL if this is not a child of a scroll container.
- static void commitRename( LLUICtrl* renamer, void* user_data );
- static void onRenamerLost( LLUICtrl* renamer, void* user_data);
+ void commitRename( const LLSD& data );
+ static void onRenamerLost( LLFocusableElement* renamer, void* user_data);
void finishRenamingItem( void );
void closeRenamer( void );
-
+
protected:
LLHandle<LLView> mPopupMenuHandle;
@@ -921,13 +947,16 @@ protected:
LLFrameTimer mMultiSelectionFadeTimer;
S32 mArrangeGeneration;
- void* mUserData;
- SelectCallback mSelectCallback;
+ signal_t mSelectSignal;
S32 mSignalSelectCallback;
S32 mMinWidth;
std::map<LLUUID, LLFolderViewItem*> mItemMap;
BOOL mDragAndDropThisFrame;
+ LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* mCallbackRegistrar;
+
+public:
+ static F32 sAutoOpenTime;
};
bool sort_item_name(LLFolderViewItem* a, LLFolderViewItem* b);
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 91beb801ad..b0ccc0f141 100644
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -58,7 +58,6 @@
#include "llviewerobjectlist.h"
#include "lltoolselectrect.h"
#include "llviewerwindow.h"
-#include "llcompass.h"
#include "llsurface.h"
#include "llwind.h"
#include "llworld.h"
@@ -338,127 +337,8 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
gViewerWindow->setup3DRender();
}
-
-const F32 COMPASS_SIZE = 64;
-static const F32 COMPASS_RANGE = 0.33f;
-
-void LLCompass::draw()
-{
- glMatrixMode(GL_MODELVIEW);
- gGL.pushMatrix();
-
- S32 width = 32;
- S32 height = 32;
-
- LLGLSUIDefault gls_ui;
-
- gGL.translatef( COMPASS_SIZE/2.f, COMPASS_SIZE/2.f, 0.f);
-
- if (mBkgndTexture)
- {
- gGL.getTexUnit(0)->bind(mBkgndTexture.get());
-
- gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-
- gGL.begin(LLRender::QUADS);
-
- gGL.texCoord2f(1.f, 1.f);
- gGL.vertex2i(width, height);
-
- gGL.texCoord2f(0.f, 1.f);
- gGL.vertex2i(-width, height);
-
- gGL.texCoord2f(0.f, 0.f);
- gGL.vertex2i(-width, -height);
-
- gGL.texCoord2f(1.f, 0.f);
- gGL.vertex2i(width, -height);
-
- gGL.end();
- }
-
- // rotate subsequent draws to agent rotation
- F32 rotation = atan2( gAgent.getFrameAgent().getAtAxis().mV[VX], gAgent.getFrameAgent().getAtAxis().mV[VY] );
- glRotatef( - rotation * RAD_TO_DEG, 0.f, 0.f, -1.f);
-
- if (mTexture)
- {
- gGL.getTexUnit(0)->bind(mTexture.get());
- gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f);
-
- gGL.begin(LLRender::QUADS);
-
- gGL.texCoord2f(1.f, 1.f);
- gGL.vertex2i(width, height);
-
- gGL.texCoord2f(0.f, 1.f);
- gGL.vertex2i(-width, height);
-
- gGL.texCoord2f(0.f, 0.f);
- gGL.vertex2i(-width, -height);
-
- gGL.texCoord2f(1.f, 0.f);
- gGL.vertex2i(width, -height);
-
- gGL.end();
- }
-
- gGL.popMatrix();
-
-}
-
-
-
-void LLHorizontalCompass::draw()
-{
- LLGLSUIDefault gls_ui;
-
- S32 width = getRect().getWidth();
- S32 height = getRect().getHeight();
- S32 half_width = width / 2;
-
- if( mTexture )
- {
- const LLVector3& at_axis = LLViewerCamera::getInstance()->getAtAxis();
- F32 center = atan2( at_axis.mV[VX], at_axis.mV[VY] );
-
- center += F_PI;
- center = llclamp( center, 0.0f, F_TWO_PI ); // probably not necessary...
- center /= F_TWO_PI;
- F32 left = center - COMPASS_RANGE;
- F32 right = center + COMPASS_RANGE;
-
- gGL.getTexUnit(0)->bind(mTexture.get());
- gGL.color4f(1.0f, 1.0f, 1.0f, 1.0f );
- gGL.begin( LLRender::QUADS );
-
- gGL.texCoord2f(right, 1.f);
- gGL.vertex2i(width, height);
-
- gGL.texCoord2f(left, 1.f);
- gGL.vertex2i(0, height);
-
- gGL.texCoord2f(left, 0.f);
- gGL.vertex2i(0, 0);
-
- gGL.texCoord2f(right, 0.f);
- gGL.vertex2i(width, 0);
-
- gGL.end();
- }
-
- // Draw the focus line
- {
- gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
- gGL.color4fv( mFocusColor.mV );
- gl_line_2d( half_width, 0, half_width, height );
- }
-}
-
-
const F32 WIND_ALTITUDE = 180.f;
-
void LLWind::renderVectors()
{
// Renders the wind as vectors (used for debug)
@@ -1008,8 +888,6 @@ void LLViewerObjectList::renderObjectBeacons()
return;
}
- //const LLFontGL *font = LLResMgr::getInstance()->getRes(LLFONT_SANSSERIF);
-
LLGLSUIDefault gls_ui;
{
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 003a02c3cd..a8d97c6afb 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -1293,7 +1293,7 @@ void LLGroupMgr::processCreateGroupReply(LLMessageSystem* msg, void ** data)
}
else
{
- // *TODO:translate
+ // *TODO: Translate
LLSD args;
args["MESSAGE"] = message;
LLNotifications::instance().add("UnableToCreateGroup", args);
diff --git a/indra/newview/llhudeffect.h b/indra/newview/llhudeffect.h
index 954cda7c8d..781e57fa6a 100644
--- a/indra/newview/llhudeffect.h
+++ b/indra/newview/llhudeffect.h
@@ -37,9 +37,6 @@
#include "lluuid.h"
#include "v4coloru.h"
-#include "llinterp.h"
-#include "llframetimer.h"
-#include "llmemory.h"
const F32 LL_HUD_DUR_SHORT = 1.f;
diff --git a/indra/newview/llhudicon.h b/indra/newview/llhudicon.h
index 154e6df518..2c1c549521 100644
--- a/indra/newview/llhudicon.h
+++ b/indra/newview/llhudicon.h
@@ -33,7 +33,7 @@
#ifndef LL_LLHUDICON_H
#define LL_LLHUDICON_H
-#include "llmemory.h"
+#include "llpointer.h"
#include "lldarrayptr.h"
#include "llhudobject.h"
diff --git a/indra/newview/llhudmanager.cpp b/indra/newview/llhudmanager.cpp
index 955d786187..e1e9d9c51e 100644
--- a/indra/newview/llhudmanager.cpp
+++ b/indra/newview/llhudmanager.cpp
@@ -52,9 +52,9 @@ LLColor4 LLHUDManager::sChildColor;
LLHUDManager::LLHUDManager()
{
- LLHUDManager::sParentColor = gColors.getColor("FocusColor");
+ LLHUDManager::sParentColor = gSavedSkinSettings.getColor("FocusColor");
// rdw commented out since it's not used. Also removed from colors_base.xml
- //LLHUDManager::sChildColor = gColors.getColor("FocusSecondaryColor");
+ //LLHUDManager::sChildColor =gSavedSkinSettings.getColor("FocusSecondaryColor");
}
LLHUDManager::~LLHUDManager()
diff --git a/indra/newview/llhudmanager.h b/indra/newview/llhudmanager.h
index 615eb93a27..b2b4ffb559 100644
--- a/indra/newview/llhudmanager.h
+++ b/indra/newview/llhudmanager.h
@@ -36,7 +36,7 @@
// Responsible for managing all HUD elements.
#include "llhudobject.h"
-#include "lldarray.h"
+#include "lldarrayptr.h"
class LLViewerObject;
class LLHUDEffect;
diff --git a/indra/newview/llhudobject.h b/indra/newview/llhudobject.h
index 2cd8abf886..d304ac41af 100644
--- a/indra/newview/llhudobject.h
+++ b/indra/newview/llhudobject.h
@@ -37,7 +37,7 @@
* Base class and manager for in-world 2.5D non-interactive objects
*/
-#include "llmemory.h"
+#include "llpointer.h"
#include "v4color.h"
#include "v3math.h"
diff --git a/indra/newview/llhudrender.cpp b/indra/newview/llhudrender.cpp
index 95b8442ec7..c00edfaa5c 100644
--- a/indra/newview/llhudrender.cpp
+++ b/indra/newview/llhudrender.cpp
@@ -47,17 +47,19 @@
void hud_render_utf8text(const std::string &str, const LLVector3 &pos_agent,
const LLFontGL &font,
const U8 style,
+ const LLFontGL::ShadowType shadow,
const F32 x_offset, const F32 y_offset,
const LLColor4& color,
const BOOL orthographic)
{
LLWString wstr(utf8str_to_wstring(str));
- hud_render_text(wstr, pos_agent, font, style, x_offset, y_offset, color, orthographic);
+ hud_render_text(wstr, pos_agent, font, style, shadow, x_offset, y_offset, color, orthographic);
}
void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
const LLFontGL &font,
const U8 style,
+ const LLFontGL::ShadowType shadow,
const F32 x_offset, const F32 y_offset,
const LLColor4& color,
const BOOL orthographic)
@@ -123,7 +125,7 @@ void hud_render_text(const LLWString &wstr, const LLVector3 &pos_agent,
//glScalef(right_scale, up_scale, 1.f);
F32 right_x;
- font.render(wstr, 0, 0, 0, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, wstr.length(), 1000, &right_x);
+ font.render(wstr, 0, 0, 0, color, LLFontGL::LEFT, LLFontGL::BASELINE, style, shadow, wstr.length(), 1000, &right_x);
LLUI::popMatrix();
glMatrixMode(GL_PROJECTION);
diff --git a/indra/newview/llhudrender.h b/indra/newview/llhudrender.h
index 5ca865737f..93de89f7b0 100644
--- a/indra/newview/llhudrender.h
+++ b/indra/newview/llhudrender.h
@@ -43,6 +43,7 @@ void hud_render_text(const LLWString &wstr,
const LLVector3 &pos_agent,
const LLFontGL &font,
const U8 style,
+ const LLFontGL::ShadowType,
const F32 x_offset,
const F32 y_offset,
const LLColor4& color,
@@ -53,6 +54,7 @@ void hud_render_utf8text(const std::string &str,
const LLVector3 &pos_agent,
const LLFontGL &font,
const U8 style,
+ const LLFontGL::ShadowType,
const F32 x_offset,
const F32 y_offset,
const LLColor4& color,
diff --git a/indra/newview/llhudtext.cpp b/indra/newview/llhudtext.cpp
index 20140073f4..25f513e5c1 100644
--- a/indra/newview/llhudtext.cpp
+++ b/indra/newview/llhudtext.cpp
@@ -113,7 +113,6 @@ LLHUDText::LLHUDText(const U8 type) :
mRadius = 0.1f;
LLPointer<LLHUDText> ptr(this);
sTextObjects.insert(ptr);
- //LLDebugVarMessageBox::show("max width", &HUD_TEXT_MAX_WIDTH, 500.f, 1.f);
}
LLHUDText::~LLHUDText()
@@ -293,7 +292,7 @@ void LLHUDText::renderText(BOOL for_select)
LLUIImagePtr imagep = LLUI::getUIImage("rounded_square.tga");
// *TODO: make this a per-text setting
- LLColor4 bg_color = gSavedSettings.getColor4("BackgroundChatColor");
+ LLColor4 bg_color = gSavedSkinSettings.getColor4("BackgroundChatColor");
bg_color.setAlpha(gSavedSettings.getF32("ChatBubbleOpacity") * alpha_factor);
const S32 border_height = 16;
@@ -509,7 +508,7 @@ void LLHUDText::renderText(BOOL for_select)
LLColor4 label_color(0.f, 0.f, 0.f, 1.f);
label_color.mV[VALPHA] = alpha_factor;
- hud_render_text(segment_iter->getText(), render_position, *fontp, segment_iter->mStyle, x_offset, y_offset, label_color, mOnHUDAttachment);
+ hud_render_text(segment_iter->getText(), render_position, *fontp, segment_iter->mStyle, LLFontGL::NO_SHADOW, x_offset, y_offset, label_color, mOnHUDAttachment);
}
}
@@ -535,9 +534,10 @@ void LLHUDText::renderText(BOOL for_select)
y_offset -= fontp->getLineHeight();
U8 style = segment_iter->mStyle;
+ LLFontGL::ShadowType shadow = LLFontGL::NO_SHADOW;
if (mDropShadow)
{
- style |= LLFontGL::DROP_SHADOW;
+ shadow = LLFontGL::DROP_SHADOW;
}
F32 x_offset;
@@ -553,7 +553,7 @@ void LLHUDText::renderText(BOOL for_select)
text_color = segment_iter->mColor;
text_color.mV[VALPHA] *= alpha_factor;
- hud_render_text(segment_iter->getText(), render_position, *fontp, style, x_offset, y_offset, text_color, mOnHUDAttachment);
+ hud_render_text(segment_iter->getText(), render_position, *fontp, style, shadow, x_offset, y_offset, text_color, mOnHUDAttachment);
}
}
/// Reset the default color to white. The renderer expects this to be the default.
diff --git a/indra/newview/llhudtext.h b/indra/newview/llhudtext.h
index 645cbc2698..dc14a8c764 100644
--- a/indra/newview/llhudtext.h
+++ b/indra/newview/llhudtext.h
@@ -33,7 +33,7 @@
#ifndef LL_LLHUDTEXT_H
#define LL_LLHUDTEXT_H
-#include "llmemory.h"
+#include "llpointer.h"
#include "lldarrayptr.h"
#include "llhudobject.h"
diff --git a/indra/newview/llhudview.cpp b/indra/newview/llhudview.cpp
index 198514ce0c..6f22a68327 100644
--- a/indra/newview/llhudview.cpp
+++ b/indra/newview/llhudview.cpp
@@ -41,7 +41,6 @@
// viewer includes
#include "llagent.h"
#include "llcallingcard.h"
-#include "llcolorscheme.h"
#include "llviewercontrol.h"
#include "llfloaterworldmap.h"
#include "llworldmapview.h"
@@ -55,10 +54,12 @@ const S32 HUD_ARROW_SIZE = 32;
LLHUDView::LLHUDView()
: LLPanel()
-{ }
+{
+}
LLHUDView::~LLHUDView()
-{ }
+{
+}
// virtual
void LLHUDView::draw()
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index 0586409283..15475be951 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -49,6 +49,7 @@
#include "llchat.h"
#include "llconsole.h"
#include "llfloater.h"
+#include "llfloatercall.h"
#include "llfloatergroupinfo.h"
#include "llimview.h"
#include "llinventory.h"
@@ -61,6 +62,7 @@
#include "lllineeditor.h"
#include "llnotify.h"
#include "llresmgr.h"
+#include "lltrans.h"
#include "lltabcontainer.h"
#include "llviewertexteditor.h"
#include "llviewermessage.h"
@@ -216,7 +218,7 @@ private:
bool send_start_session_messages(
const LLUUID& temp_session_id,
const LLUUID& other_participant_id,
- const LLDynamicArray<LLUUID>& ids,
+ const std::vector<LLUUID>& ids,
EInstantMessage dialog)
{
if ( dialog == IM_SESSION_GROUP_START )
@@ -246,7 +248,7 @@ bool send_start_session_messages(
LLSD agents;
for (int i = 0; i < (S32) ids.size(); i++)
{
- agents.append(ids.get(i));
+ agents.append(ids[i]);
}
//we have a new way of starting conference calls now
@@ -587,7 +589,6 @@ LLVoiceChannel* LLVoiceChannel::getChannelByURI(std::string uri)
}
}
-
void LLVoiceChannel::updateSessionID(const LLUUID& new_session_id)
{
sVoiceChannelMap.erase(sVoiceChannelMap.find(mSessionID));
@@ -622,6 +623,17 @@ void LLVoiceChannel::setState(EState state)
mState = state;
}
+void LLVoiceChannel::toggleCallWindowIfNeeded(EState state)
+{
+ if (state == STATE_CONNECTED)
+ LLFloaterCall::openInstance(mSessionID);
+ // By checking that current state is CONNECTED we make sure that the call window
+ // has been shown, hence there's something to hide. This helps when user presses
+ // the "End call" button right after initiating the call.
+ // *TODO: move this check to LLFloaterCall?
+ else if (state == STATE_HUNG_UP && mState == STATE_CONNECTED)
+ LLFloaterCall::closeInstance(mSessionID);
+}
//static
void LLVoiceChannel::initClass()
@@ -814,6 +826,9 @@ void LLVoiceChannelGroup::handleError(EStatusType status)
void LLVoiceChannelGroup::setState(EState state)
{
+ // HACK: Open/close the call window if needed.
+ toggleCallWindowIfNeeded(state);
+
switch(state)
{
case STATE_RINGING:
@@ -1056,6 +1071,9 @@ void LLVoiceChannelP2P::setSessionHandle(const std::string& handle, const std::s
void LLVoiceChannelP2P::setState(EState state)
{
+ // HACK: Open/close the call window if needed.
+ toggleCallWindowIfNeeded(state);
+
// you only "answer" voice invites in p2p mode
// so provide a special purpose message here
if (mReceivedCall && state == STATE_RINGING)
@@ -1071,57 +1089,28 @@ void LLVoiceChannelP2P::setState(EState state)
//
// LLFloaterIMPanel
//
-LLFloaterIMPanel::LLFloaterIMPanel(
- const std::string& session_label,
- const LLUUID& session_id,
- const LLUUID& other_participant_id,
- EInstantMessage dialog) :
- LLFloater(session_label, LLRect(), session_label),
- mInputEditor(NULL),
- mHistoryEditor(NULL),
- mSessionUUID(session_id),
- mVoiceChannel(NULL),
- mSessionInitialized(FALSE),
- mSessionStartMsgPos(0),
- mOtherParticipantUUID(other_participant_id),
- mDialog(dialog),
- mTyping(FALSE),
- mOtherTyping(FALSE),
- mTypingLineStartIndex(0),
- mSentTypingState(TRUE),
- mNumUnreadMessages(0),
- mShowSpeakersOnConnect(TRUE),
- mAutoConnect(FALSE),
- mTextIMPossible(TRUE),
- mProfileButtonEnabled(TRUE),
- mCallBackEnabled(TRUE),
- mSpeakers(NULL),
- mSpeakerPanel(NULL),
- mFirstKeystrokeTimer(),
- mLastKeystrokeTimer()
-{
- init(session_label);
-}
-LLFloaterIMPanel::LLFloaterIMPanel(
- const std::string& session_label,
- const LLUUID& session_id,
- const LLUUID& other_participant_id,
- const LLDynamicArray<LLUUID>& ids,
- EInstantMessage dialog) :
- LLFloater(session_label, LLRect(), session_label),
+LLFloaterIMPanel::LLFloaterIMPanel(const std::string& session_label,
+ const LLUUID& session_id,
+ const LLUUID& other_participant_id,
+ const std::vector<LLUUID>& ids,
+ EInstantMessage dialog)
+: LLFloater(session_id),
mInputEditor(NULL),
mHistoryEditor(NULL),
mSessionUUID(session_id),
+ mSessionLabel(session_label),
mVoiceChannel(NULL),
mSessionInitialized(FALSE),
mSessionStartMsgPos(0),
mOtherParticipantUUID(other_participant_id),
mDialog(dialog),
+ mSessionInitialTargetIDs(ids),
mTyping(FALSE),
mOtherTyping(FALSE),
mTypingLineStartIndex(0),
mSentTypingState(TRUE),
+ mNumUnreadMessages(0),
mShowSpeakersOnConnect(TRUE),
mAutoConnect(FALSE),
mTextIMPossible(TRUE),
@@ -1132,15 +1121,6 @@ LLFloaterIMPanel::LLFloaterIMPanel(
mFirstKeystrokeTimer(),
mLastKeystrokeTimer()
{
- mSessionInitialTargetIDs = ids;
- init(session_label);
-}
-
-
-void LLFloaterIMPanel::init(const std::string& session_label)
-{
- mSessionLabel = session_label;
-
std::string xml_filename;
switch(mDialog)
{
@@ -1189,10 +1169,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
mSpeakers = new LLIMSpeakerMgr(mVoiceChannel);
- LLUICtrlFactory::getInstance()->buildFloater(this,
- xml_filename,
- &getFactoryMap(),
- FALSE);
+ LLUICtrlFactory::getInstance()->buildFloater(this, xml_filename, FALSE);
setTitle(mSessionLabel);
mInputEditor->setMaxTextLength(1023);
@@ -1230,7 +1207,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
addHistoryLine(
session_start,
- gSavedSettings.getColor4("SystemChatColor"),
+ gSavedSkinSettings.getColor4("SystemChatColor"),
false);
}
}
@@ -1283,9 +1260,8 @@ BOOL LLFloaterIMPanel::postBuild()
mInputEditor = getChild<LLLineEditor>("chat_editor");
mInputEditor->setFocusReceivedCallback( onInputEditorFocusReceived, this );
mInputEditor->setFocusLostCallback( onInputEditorFocusLost, this );
- mInputEditor->setKeystrokeCallback( onInputEditorKeystroke );
- mInputEditor->setCommitCallback( onCommitChat );
- mInputEditor->setCallbackUserData(this);
+ mInputEditor->setKeystrokeCallback( onInputEditorKeystroke, this );
+ mInputEditor->setCommitCallback( onCommitChat, this );
mInputEditor->setCommitOnFocusLost( FALSE );
mInputEditor->setRevertOnEsc( FALSE );
mInputEditor->setReplaceNewlinesWithSpaces( FALSE );
@@ -1479,7 +1455,7 @@ private:
LLUUID mSessionID;
};
-BOOL LLFloaterIMPanel::inviteToSession(const LLDynamicArray<LLUUID>& ids)
+BOOL LLFloaterIMPanel::inviteToSession(const std::vector<LLUUID>& ids)
{
LLViewerRegion* region = gAgent.getRegion();
if (!region)
@@ -1487,7 +1463,7 @@ BOOL LLFloaterIMPanel::inviteToSession(const LLDynamicArray<LLUUID>& ids)
return FALSE;
}
- S32 count = ids.count();
+ S32 count = ids.size();
if( isInviteAllowed() && (count > 0) )
{
@@ -1500,7 +1476,7 @@ BOOL LLFloaterIMPanel::inviteToSession(const LLDynamicArray<LLUUID>& ids)
data["params"] = LLSD::emptyArray();
for (int i = 0; i < count; i++)
{
- data["params"].append(ids.get(i));
+ data["params"].append(ids[i]);
}
data["method"] = "invite";
@@ -1637,24 +1613,11 @@ BOOL LLFloaterIMPanel::handleKeyHere( KEY key, MASK mask )
{
sendMsg();
handled = TRUE;
-
- // Close talk panels on hitting return
- // but not shift-return or control-return
- if ( !gSavedSettings.getBOOL("PinTalkViewOpen") && !(mask & MASK_CONTROL) && !(mask & MASK_SHIFT) )
- {
- gIMMgr->toggle(NULL);
- }
}
else if ( KEY_ESCAPE == key )
{
handled = TRUE;
gFocusMgr.setKeyboardFocus(NULL);
-
- // Close talk panel with escape
- if( !gSavedSettings.getBOOL("PinTalkViewOpen") )
- {
- gIMMgr->toggle(NULL);
- }
}
// May need to call base class LLPanel::handleKeyHere if not handled
@@ -1705,8 +1668,8 @@ BOOL LLFloaterIMPanel::dropCallingCard(LLInventoryItem* item, BOOL drop)
{
if(drop)
{
- LLDynamicArray<LLUUID> ids;
- ids.put(item->getCreatorUUID());
+ std::vector<LLUUID> ids;
+ ids.push_back(item->getCreatorUUID());
inviteToSession(ids);
}
}
@@ -1738,10 +1701,11 @@ BOOL LLFloaterIMPanel::dropCategory(LLInventoryCategory* category, BOOL drop)
}
else if(drop)
{
- LLDynamicArray<LLUUID> ids;
+ std::vector<LLUUID> ids;
+ ids.reserve(count);
for(S32 i = 0; i < count; ++i)
{
- ids.put(items.get(i)->getCreatorUUID());
+ ids.push_back(items.get(i)->getCreatorUUID());
}
inviteToSession(ids);
}
@@ -1792,7 +1756,7 @@ void LLFloaterIMPanel::onClickClose( void* userdata )
LLFloaterIMPanel* self = (LLFloaterIMPanel*) userdata;
if(self)
{
- self->close();
+ self->closeFloater();
}
}
@@ -1887,6 +1851,9 @@ void LLFloaterIMPanel::onClose(bool app_quitting)
}
gIMMgr->removeSession(mSessionUUID);
+ // *HACK hide the voice floater
+ LLFloaterCall::toggleInstanceVisibility(FALSE, mSessionUUID);
+
destroy();
}
@@ -1896,6 +1863,10 @@ void LLFloaterIMPanel::onVisibilityChange(BOOL new_visibility)
{
mNumUnreadMessages = 0;
}
+
+ LLFloaterCall::toggleInstanceVisibility(
+ new_visibility && mVoiceChannel->getState() == LLVoiceChannel::STATE_CONNECTED,
+ mSessionUUID);
}
void deliver_message(const std::string& utf8_text,
@@ -2015,7 +1986,7 @@ void LLFloaterIMPanel::sendMsg()
BOOL other_was_typing = mOtherTyping;
- addHistoryLine(history_echo, gSavedSettings.getColor("IMChatColor"), true, gAgent.getID());
+ addHistoryLine(history_echo, gSavedSkinSettings.getColor("IMChatColor"), true, gAgent.getID());
if (other_was_typing)
{
@@ -2186,7 +2157,7 @@ void LLFloaterIMPanel::addTypingIndicator(const std::string &name)
mTypingLineStartIndex = mHistoryEditor->getWText().length();
LLUIString typing_start = sTypingStartString;
typing_start.setArg("[NAME]", name);
- addHistoryLine(typing_start, gSavedSettings.getColor4("SystemChatColor"), false);
+ addHistoryLine(typing_start, gSavedSkinSettings.getColor4("SystemChatColor"), false);
mOtherTypingName = name;
mOtherTyping = TRUE;
}
@@ -2224,14 +2195,14 @@ void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, std::string
// add warning log enabled message
if (gSavedPerAccountSettings.getBOOL("LogInstantMessages"))
{
- message = LLFloaterChat::getInstance()->getString("IM_logging_string");
+ message = LLTrans::getString("IM_logging_string");
}
break;
case LLLogChat::LOG_END:
// add log end message
if (gSavedPerAccountSettings.getBOOL("LogInstantMessages"))
{
- message = LLFloaterChat::getInstance()->getString("IM_logging_string");
+ message = LLTrans::getString("IM_logging_string");
}
break;
case LLLogChat::LOG_LINE:
@@ -2243,7 +2214,7 @@ void LLFloaterIMPanel::chatFromLogFile(LLLogChat::ELogLineType type, std::string
}
//self->addHistoryLine(line, LLColor4::grey, FALSE);
- self->mHistoryEditor->appendColoredText(message, false, true, LLColor4::grey);
+ self->mHistoryEditor->appendColoredText(message, false, true, gSavedSkinSettings.getColor4("ChatHistoryTextColor"));
}
void LLFloaterIMPanel::showSessionStartError(
@@ -2325,7 +2296,7 @@ bool LLFloaterIMPanel::onConfirmForceCloseError(const LLSD& notification, const
LLFloaterIMPanel* floaterp = gIMMgr->findFloaterBySession(
session_id);
- if ( floaterp ) floaterp->close(FALSE);
+ if ( floaterp ) floaterp->closeFloater(FALSE);
}
return false;
}
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
index 8b3ca202c7..7cd19d4872 100644
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -77,6 +77,7 @@ public:
virtual void getChannelInfo();
virtual BOOL isActive();
virtual BOOL callStarted();
+ const std::string& getSessionName() const { return mSessionName; }
const LLUUID getSessionID() { return mSessionID; }
EState getState() { return mState; }
@@ -94,6 +95,7 @@ public:
protected:
virtual void setState(EState state);
+ void toggleCallWindowIfNeeded(EState state);
void setURI(std::string uri);
std::string mURI;
@@ -185,11 +187,7 @@ public:
LLFloaterIMPanel(const std::string& session_label,
const LLUUID& session_id,
const LLUUID& target_id,
- EInstantMessage dialog);
- LLFloaterIMPanel(const std::string& session_label,
- const LLUUID& session_id,
- const LLUUID& target_id,
- const LLDynamicArray<LLUUID>& ids,
+ const std::vector<LLUUID>& ids,
EInstantMessage dialog);
virtual ~LLFloaterIMPanel();
@@ -202,7 +200,7 @@ public:
// add target ids to the session.
// Return TRUE if successful, otherwise FALSE.
- BOOL inviteToSession(const LLDynamicArray<LLUUID>& agent_ids);
+ BOOL inviteToSession(const std::vector<LLUUID>& agent_ids);
void addHistoryLine(const std::string &utf8msg,
const LLColor4& color = LLColor4::white,
@@ -246,6 +244,7 @@ public:
const LLUUID& getSessionID() const { return mSessionUUID; }
const LLUUID& getOtherParticipantID() const { return mOtherParticipantUUID; }
+ LLIMSpeakerMgr* getSpeakerManager() const { return mSpeakers; }
void updateSpeakersList(const LLSD& speaker_updates);
void processSessionUpdate(const LLSD& update);
void setSpeakers(const LLSD& speaker_list);
@@ -270,9 +269,6 @@ public:
static bool onConfirmForceCloseError(const LLSD& notification, const LLSD& response);
private:
- // called by constructors
- void init(const std::string& session_label);
-
// Called by UI methods.
void sendMsg();
@@ -318,7 +314,7 @@ private:
// inventory folder ==> first target id in list
// 911 ==> sender
LLUUID mOtherParticipantUUID;
- LLDynamicArray<LLUUID> mSessionInitialTargetIDs;
+ std::vector<LLUUID> mSessionInitialTargetIDs;
EInstantMessage mDialog;
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index a90ea39265..26ce5c5ac4 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -34,6 +34,7 @@
#include "llimview.h"
+#include "llfloaterreg.h"
#include "llfontgl.h"
#include "llrect.h"
#include "llerror.h"
@@ -44,12 +45,12 @@
#include "lluictrlfactory.h"
#include "llagent.h"
+#include "llavatariconctrl.h"
#include "llcallingcard.h"
#include "llchat.h"
#include "llresmgr.h"
#include "llfloaterchat.h"
#include "llfloaterchatterbox.h"
-#include "llfloaternewim.h"
#include "llhttpnode.h"
#include "llimpanel.h"
#include "llresizebar.h"
@@ -67,6 +68,8 @@
#include "llviewerwindow.h"
#include "llnotify.h"
#include "llviewerregion.h"
+#include "llviewertexteditor.h"
+#include "lltrans.h"
#include "llfirstuse.h"
@@ -145,11 +148,11 @@ public:
floaterp->requestAutoConnect();
LLFloaterIMPanel::onClickStartCall(floaterp);
// always open IM window when connecting to voice
- LLFloaterChatterBox::showInstance(TRUE);
+ LLFloaterReg::showInstance("communicate", LLSD(), TRUE);
}
else if ( mInvitiationType == LLIMMgr::INVITATION_TYPE_IMMEDIATE )
{
- LLFloaterChatterBox::showInstance(TRUE);
+ LLFloaterReg::showInstance("communicate", LLSD(), TRUE);
}
}
@@ -234,7 +237,8 @@ LLUUID LLIMMgr::computeSessionID(
// LLFloaterIM
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-LLFloaterIM::LLFloaterIM()
+LLFloaterIM::LLFloaterIM()
+ : LLMultiFloater()
{
// autoresize=false is necessary to avoid resizing of the IM window whenever
// a session is opened or closed (it would otherwise resize the window to match
@@ -324,6 +328,168 @@ BOOL LLFloaterIM::postBuild()
return TRUE;
}
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLIncomingCallDialog
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+LLIncomingCallDialog::LLIncomingCallDialog(const LLSD& payload) :
+ LLModalDialog(LLStringUtil::null, 240, 200),
+ mPayload(payload)
+{
+ LLUICtrlFactory::getInstance()->buildFloater(this, "floater_incoming_call.xml");
+}
+
+BOOL LLIncomingCallDialog::postBuild()
+{
+ LLSD caller_id = mPayload["caller_id"];
+ EInstantMessage type = (EInstantMessage)mPayload["type"].asInteger();
+
+ std::string call_type = getString("VoiceInviteP2P");
+ std::string caller_name = mPayload["caller_name"].asString() + " ";
+ setTitle(caller_name + call_type);
+
+ // If it is not a P2P invite, then it's an AdHoc invite
+ if ( type != IM_SESSION_P2P_INVITE )
+ {
+ call_type = getString("VoiceInviteAdHoc");
+ }
+
+ LLViewerTextEditor* text = getChild<LLViewerTextEditor>("caller name");
+ text->setEmbeddedText(caller_name + call_type);
+ LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon");
+ icon->setValue(caller_id);
+
+ childSetAction("Accept", onAccept, this);
+ childSetAction("Reject", onReject, this);
+ childSetAction("Start IM", onStartIM, this);
+ childSetFocus("Accept");
+
+ return TRUE;
+}
+
+//static
+void LLIncomingCallDialog::onAccept(void* user_data)
+{
+ LLIncomingCallDialog* self = (LLIncomingCallDialog*)user_data;
+ self->processCallResponse(0);
+ self->closeFloater();
+}
+
+//static
+void LLIncomingCallDialog::onReject(void* user_data)
+{
+ LLIncomingCallDialog* self = (LLIncomingCallDialog*)user_data;
+ self->processCallResponse(1);
+ self->closeFloater();
+}
+
+//static
+void LLIncomingCallDialog::onStartIM(void* user_data)
+{
+ LLIncomingCallDialog* self = (LLIncomingCallDialog*)user_data;
+ self->processCallResponse(2);
+ self->closeFloater();
+}
+
+void LLIncomingCallDialog::processCallResponse(S32 response)
+{
+ LLUUID session_id = mPayload["session_id"].asUUID();
+ EInstantMessage type = (EInstantMessage)mPayload["type"].asInteger();
+ LLIMMgr::EInvitationType inv_type = (LLIMMgr::EInvitationType)mPayload["inv_type"].asInteger();
+ bool voice = true;
+ switch(response)
+ {
+ case 2: // start IM: just don't start the voice chat
+ {
+ voice = false;
+ /* FALLTHROUGH */
+ }
+ case 0: // accept
+ {
+ if (type == IM_SESSION_P2P_INVITE)
+ {
+ // create a normal IM session
+ session_id = gIMMgr->addP2PSession(
+ mPayload["session_name"].asString(),
+ mPayload["caller_id"].asUUID(),
+ mPayload["session_handle"].asString());
+
+ if (voice)
+ {
+ LLFloaterIMPanel* im_floater =
+ gIMMgr->findFloaterBySession(
+ session_id);
+
+ if (im_floater)
+ {
+ im_floater->requestAutoConnect();
+ LLFloaterIMPanel::onClickStartCall(im_floater);
+ }
+ }
+
+ // always open IM window when connecting to voice
+ LLFloaterReg::showInstance("communicate", session_id);
+
+ gIMMgr->clearPendingAgentListUpdates(session_id);
+ gIMMgr->clearPendingInvitation(session_id);
+ }
+ else
+ {
+ gIMMgr->addSession(
+ mPayload["session_name"].asString(),
+ type,
+ session_id);
+
+ std::string url = gAgent.getRegion()->getCapability(
+ "ChatSessionRequest");
+
+ if (voice)
+ {
+ LLSD data;
+ data["method"] = "accept invitation";
+ data["session-id"] = session_id;
+ LLHTTPClient::post(
+ url,
+ data,
+ new LLViewerChatterBoxInvitationAcceptResponder(
+ session_id,
+ inv_type));
+ }
+ }
+ if (voice)
+ {
+ break;
+ }
+ }
+ case 1: // decline
+ {
+ if (type == IM_SESSION_P2P_INVITE)
+ {
+ if(gVoiceClient)
+ {
+ std::string s = mPayload["session_handle"].asString();
+ gVoiceClient->declineInvite(s);
+ }
+ }
+ else
+ {
+ std::string url = gAgent.getRegion()->getCapability(
+ "ChatSessionRequest");
+
+ LLSD data;
+ data["method"] = "decline invitation";
+ data["session-id"] = session_id;
+ LLHTTPClient::post(
+ url,
+ data,
+ NULL);
+ }
+ }
+
+ gIMMgr->clearPendingAgentListUpdates(session_id);
+ gIMMgr->clearPendingInvitation(session_id);
+ }
+}
+
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLIMViewFriendObserver
//
@@ -375,7 +541,7 @@ bool inviteUserResponse(const LLSD& notification, const LLSD& response)
im_floater->requestAutoConnect();
LLFloaterIMPanel::onClickStartCall(im_floater);
// always open IM window when connecting to voice
- LLFloaterChatterBox::showInstance(session_id);
+ LLFloaterReg::showInstance("communicate", session_id, TRUE);
}
gIMMgr->clearPendingAgentListUpdates(session_id);
@@ -467,54 +633,6 @@ EInstantMessage LLIMMgr::defaultIMTypeForAgent(const LLUUID& agent_id)
return type;
}
-// static
-//void LLIMMgr::onPinButton(void*)
-//{
-// BOOL state = gSavedSettings.getBOOL( "PinTalkViewOpen" );
-// gSavedSettings.setBOOL( "PinTalkViewOpen", !state );
-//}
-
-// static
-void LLIMMgr::toggle(void*)
-{
- static BOOL return_to_mouselook = FALSE;
-
- // Hide the button and show the floater or vice versa.
- llassert( gIMMgr );
- BOOL old_state = gIMMgr->getFloaterOpen();
-
- // If we're in mouselook and we triggered the Talk View, we want to talk.
- if( gAgent.cameraMouselook() && old_state )
- {
- return_to_mouselook = TRUE;
- gAgent.changeCameraToDefault();
- return;
- }
-
- BOOL new_state = !old_state;
-
- if (new_state)
- {
- // ...making visible
- if ( gAgent.cameraMouselook() )
- {
- return_to_mouselook = TRUE;
- gAgent.changeCameraToDefault();
- }
- }
- else
- {
- // ...hiding
- if ( gAgent.cameraThirdPerson() && return_to_mouselook )
- {
- gAgent.changeCameraToMouselook();
- }
- return_to_mouselook = FALSE;
- }
-
- gIMMgr->setFloaterOpen( new_state );
-}
-
//
// Member Functions
//
@@ -614,10 +732,10 @@ void LLIMMgr::addMessage(
{
// *TODO:translate (low priority, god ability)
std::ostringstream bonus_info;
- bonus_info << "*** parent estate: "
+ bonus_info << LLTrans::getString("***")+ " "+ LLTrans::getString("IMParentEstate") + ":" + " "
<< parent_estate_id
- << ((parent_estate_id == 1) ? ", mainland" : "")
- << ((parent_estate_id == 5) ? ", teen" : "");
+ << ((parent_estate_id == 1) ? "," + LLTrans::getString("IMMainland") : "")
+ << ((parent_estate_id == 5) ? "," + LLTrans::getString ("IMTeen") : "");
// once we have web-services (or something) which returns
// information about a region id, we can print this out
@@ -625,7 +743,7 @@ void LLIMMgr::addMessage(
//<< "*** region_id: " << region_id << std::endl
//<< "*** position: " << position << std::endl;
- floater->addHistoryLine(bonus_info.str(), gSavedSettings.getColor4("SystemChatColor"));
+ floater->addHistoryLine(bonus_info.str(), gSavedSkinSettings.getColor4("SystemChatColor"));
}
make_ui_sound("UISndNewIncomingIMSession");
@@ -634,8 +752,8 @@ void LLIMMgr::addMessage(
// now add message to floater
bool is_from_system = target_id.isNull() || (from == SYSTEM_FROM);
const LLColor4& color = ( is_from_system ?
- gSavedSettings.getColor4("SystemChatColor") :
- gSavedSettings.getColor("IMChatColor"));
+ gSavedSkinSettings.getColor4("SystemChatColor") :
+ gSavedSkinSettings.getColor("IMChatColor"));
if ( !link_name )
{
floater->addHistoryLine(msg,color); // No name to prepend, so just add the message normally
@@ -645,10 +763,10 @@ void LLIMMgr::addMessage(
floater->addHistoryLine(msg, color, true, other_participant_id, from); // Insert linked name to front of message
}
- LLFloaterChatterBox* chat_floater = LLFloaterChatterBox::getInstance(LLSD());
-
- if( !chat_floater->getVisible() && !floater->getVisible())
+ if( !LLFloaterReg::instanceVisible("communicate") && !floater->getVisible())
{
+ LLFloaterChatterBox* chat_floater = LLFloaterChatterBox::getInstance();
+
//if the IM window is not open and the floater is not visible (i.e. not torn off)
LLFloater* previouslyActiveFloater = chat_floater->getActiveFloater();
@@ -675,14 +793,12 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess
// null session id means near me (chat history)
if (session_id.isNull())
{
- LLFloaterChat* floaterp = LLFloaterChat::getInstance();
-
- message = floaterp->getString(message_name);
+ message = LLTrans::getString(message_name);
message.setArgs(args);
LLChat chat(message);
chat.mSourceType = CHAT_SOURCE_SYSTEM;
- LLFloaterChat::getInstance()->addChatHistory(chat);
+ LLFloaterChat::addChatHistory(chat);
}
else // going to IM session
{
@@ -699,7 +815,7 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess
void LLIMMgr::notifyNewIM()
{
- if(!gIMMgr->getFloaterOpen())
+ if(!LLFloaterReg::instanceVisible("communicate"))
{
mIMReceived = TRUE;
}
@@ -767,18 +883,17 @@ LLUUID LLIMMgr::addSession(
TRUE);
noteOfflineUsers(floater, ids);
- LLFloaterChatterBox::showInstance(session_id);
+ LLFloaterReg::showInstance("communicate", session_id);
// Only warn for regular IMs - not group IMs
if( dialog == IM_NOTHING_SPECIAL )
{
noteMutedUsers(floater, ids);
}
- LLFloaterChatterBox::getInstance(LLSD())->showFloater(floater);
}
else
{
- floater->open();
+ floater->openFloater();
}
//mTabContainer->selectTabPanel(panel);
floater->setInputFocus(TRUE);
@@ -818,7 +933,7 @@ LLUUID LLIMMgr::addSession(
if ( !floater ) return LLUUID::null;
noteOfflineUsers(floater, ids);
- LLFloaterChatterBox::showInstance(session_id);
+ LLFloaterReg::showInstance("communicate", session_id);
// Only warn for regular IMs - not group IMs
if( dialog == IM_NOTHING_SPECIAL )
@@ -828,7 +943,7 @@ LLUUID LLIMMgr::addSession(
}
else
{
- floater->open();
+ floater->openFloater();
}
//mTabContainer->selectTabPanel(panel);
floater->setInputFocus(TRUE);
@@ -843,7 +958,7 @@ void LLIMMgr::removeSession(const LLUUID& session_id)
if(floater)
{
mFloaters.erase(floater->getHandle());
- LLFloaterChatterBox::getInstance(LLSD())->removeFloater(floater);
+ LLFloaterChatterBox::getInstance()->removeFloater(floater);
//mTabContainer->removeTabPanel(floater);
clearPendingInvitation(session_id);
@@ -932,65 +1047,60 @@ void LLIMMgr::inviteToSession(
{
if (caller_name.empty())
{
- gCacheName->getName(caller_id, onInviteNameLookup, new LLSD(payload));
+ gCacheName->get(caller_id, FALSE, boost::bind(&LLIMMgr::onInviteNameLookup, payload, _1, _2, _3, _4));
}
else
{
- LLSD args;
- args["NAME"] = caller_name;
- args["GROUP"] = session_name;
-
- LLNotifications::instance().add(notify_box_type,
- args,
- payload,
- &inviteUserResponse);
-
+ if (notify_box_type == "VoiceInviteP2P" || notify_box_type == "VoiceInviteAdHoc")
+ {
+ LLIncomingCallDialog *dialog = new LLIncomingCallDialog(payload);
+ dialog->startModal();
+ }
+ else
+ {
+ LLSD args;
+ args["NAME"] = caller_name;
+ args["GROUP"] = session_name;
+
+ LLNotifications::instance().add(notify_box_type,
+ args,
+ payload,
+ &inviteUserResponse);
+ }
}
mPendingInvitations[session_id.asString()] = LLSD();
}
}
-//static
-void LLIMMgr::onInviteNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* userdata)
+void LLIMMgr::onInviteNameLookup(LLSD payload, const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group)
{
- LLSD payload = *(LLSD*)userdata;
- delete (LLSD*)userdata;
-
payload["caller_name"] = first + " " + last;
payload["session_name"] = payload["caller_name"].asString();
- LLSD args;
- args["NAME"] = payload["caller_name"].asString();
-
- LLNotifications::instance().add(
- payload["notify_box_type"].asString(),
- args,
- payload,
- &inviteUserResponse);
-}
-
-void LLIMMgr::refresh()
-{
-}
+ std::string notify_box_type = payload["notify_box_type"].asString();
-void LLIMMgr::setFloaterOpen(BOOL set_open)
-{
- if (set_open)
+ if (notify_box_type == "VoiceInviteP2P" || notify_box_type == "VoiceInviteAdHoc")
{
- LLFloaterChatterBox::showInstance();
+ LLIncomingCallDialog *dialog = new LLIncomingCallDialog(payload);
+ dialog->startModal();
}
else
{
- LLFloaterChatterBox::hideInstance();
+ LLSD args;
+ args["NAME"] = payload["caller_name"].asString();
+
+ LLNotifications::instance().add(
+ payload["notify_box_type"].asString(),
+ args,
+ payload,
+ &inviteUserResponse);
}
}
-
-BOOL LLIMMgr::getFloaterOpen()
+void LLIMMgr::refresh()
{
- return LLFloaterChatterBox::instanceVisible(LLSD());
}
-
+
void LLIMMgr::disconnectAllSessions()
{
LLFloaterIMPanel* floater = NULL;
@@ -1007,7 +1117,7 @@ void LLIMMgr::disconnectAllSessions()
if (floater)
{
floater->setEnabled(FALSE);
- floater->close(TRUE);
+ floater->closeFloater(TRUE);
}
}
}
@@ -1146,12 +1256,14 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
llinfos << "LLIMMgr::createFloater: from " << other_participant_id
<< " in session " << session_id << llendl;
+ std::vector<LLUUID> ids;
LLFloaterIMPanel* floater = new LLFloaterIMPanel(session_label,
session_id,
other_participant_id,
+ ids,
dialog);
LLTabContainer::eInsertionPoint i_pt = user_initiated ? LLTabContainer::RIGHT_OF_CURRENT : LLTabContainer::END;
- LLFloaterChatterBox::getInstance(LLSD())->addFloater(floater, FALSE, i_pt);
+ LLFloaterChatterBox::getInstance()->addFloater(floater, FALSE, i_pt);
mFloaters.insert(floater->getHandle());
return floater;
}
@@ -1177,7 +1289,7 @@ LLFloaterIMPanel* LLIMMgr::createFloater(
ids,
dialog);
LLTabContainer::eInsertionPoint i_pt = user_initiated ? LLTabContainer::RIGHT_OF_CURRENT : LLTabContainer::END;
- LLFloaterChatterBox::getInstance(LLSD())->addFloater(floater, FALSE, i_pt);
+ LLFloaterChatterBox::getInstance()->addFloater(floater, FALSE, i_pt);
mFloaters.insert(floater->getHandle());
return floater;
}
@@ -1189,7 +1301,7 @@ void LLIMMgr::noteOfflineUsers(
S32 count = ids.count();
if(count == 0)
{
- floater->addHistoryLine(sOnlyUserMessage, gSavedSettings.getColor4("SystemChatColor"));
+ floater->addHistoryLine(sOnlyUserMessage, gSavedSkinSettings.getColor4("SystemChatColor"));
}
else
{
@@ -1205,7 +1317,7 @@ void LLIMMgr::noteOfflineUsers(
LLUIString offline = sOfflineMessage;
offline.setArg("[FIRST]", first);
offline.setArg("[LAST]", last);
- floater->addHistoryLine(offline, gSavedSettings.getColor4("SystemChatColor"));
+ floater->addHistoryLine(offline, gSavedSkinSettings.getColor4("SystemChatColor"));
}
}
}
@@ -1267,11 +1379,6 @@ void LLIMMgr::updateFloaterSessionID(
}
}
-LLFloaterChatterBox* LLIMMgr::getFloater()
-{
- return LLFloaterChatterBox::getInstance(LLSD());
-}
-
class LLViewerChatterBoxSessionStartReply : public LLHTTPNode
{
public:
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h
index a4e419694d..38a57a4025 100644
--- a/indra/newview/llimview.h
+++ b/indra/newview/llimview.h
@@ -33,9 +33,10 @@
#ifndef LL_LLIMVIEW_H
#define LL_LLIMVIEW_H
-#include "llfloater.h"
+#include "llmodaldialog.h"
#include "llinstantmessage.h"
#include "lluuid.h"
+#include "llmultifloater.h"
class LLFloaterChatterBox;
class LLUUID;
@@ -134,19 +135,12 @@ public:
// IM received that you haven't seen yet
BOOL getIMReceived() const;
- void setFloaterOpen(BOOL open); /*Flawfinder: ignore*/
- BOOL getFloaterOpen();
-
- LLFloaterChatterBox* getFloater();
-
// This method is used to go through all active sessions and
// disable all of them. This method is usally called when you are
// forced to log out or similar situations where you do not have a
// good connection.
void disconnectAllSessions();
- static void toggle(void*);
-
// This is a helper function to determine what kind of im session
// should be used for the given agent.
static EInstantMessage defaultIMTypeForAgent(const LLUUID& agent_id);
@@ -198,7 +192,7 @@ private:
void processIMTypingCore(const LLIMInfo* im_info, BOOL typing);
- static void onInviteNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* userdata);
+ static void onInviteNameLookup(LLSD payload, const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
private:
std::set<LLHandle<LLFloater> > mFloaters;
@@ -223,6 +217,23 @@ public:
static std::map<std::string,std::string> sForceCloseSessionMap;
};
+class LLIncomingCallDialog : public LLModalDialog
+{
+public:
+ LLIncomingCallDialog(const LLSD& payload);
+
+ /*virtual*/ BOOL postBuild();
+
+ static void onAccept(void* user_data);
+ static void onReject(void* user_data);
+ static void onStartIM(void* user_data);
+
+private:
+ void processCallResponse(S32 response);
+
+ LLSD mPayload;
+};
+
// Globals
extern LLIMMgr *gIMMgr;
diff --git a/indra/newview/llinventoryactions.h b/indra/newview/llinventoryactions.h
new file mode 100644
index 0000000000..79247e3abb
--- /dev/null
+++ b/indra/newview/llinventoryactions.h
@@ -0,0 +1,47 @@
+/**
+ * @file llinventoryactions.h
+ * @brief inventory callback functions
+ * class definition
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLINVENTORYACTIONS_H
+#define LL_LLINVENTORYACTIONS_H
+
+#include "lluictrl.h"
+
+class LLPanelInventory;
+class LLInventoryView;
+class LLInventoryPanel;
+
+void init_object_inventory_panel_actions(LLPanelInventory *panel, LLUICtrl::CommitCallbackRegistry::Registrar& registrar);
+void init_inventory_actions(LLInventoryView *floater, LLUICtrl::CommitCallbackRegistry::Registrar& registrar);
+void init_inventory_panel_actions(LLInventoryPanel *panel, LLUICtrl::CommitCallbackRegistry::Registrar& registrar);
+
+#endif // LL_LLINVENTORYACTIONS_H
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 2697ef25f9..fe8d1c4844 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -42,6 +42,7 @@
#include "llagent.h"
#include "llcallingcard.h"
#include "llcheckboxctrl.h" // for radio buttons
+#include "llfloaterreg.h"
#include "llradiogroup.h"
#include "llspinctrl.h"
#include "lltextbox.h"
@@ -86,6 +87,7 @@
#include "lluictrlfactory.h"
#include "llselectmgr.h"
#include "llfloateropenobject.h"
+#include "lltrans.h"
// Helpers
// bug in busy count inc/dec right now, logic is complex... do we really need it?
@@ -105,11 +107,11 @@ void dec_busy_count()
// Function declarations
struct LLWearableHoldingPattern;
void wear_inventory_category_on_avatar(LLInventoryCategory* category, BOOL append);
-void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata);
+void wear_inventory_category_on_avatar_step2( BOOL proceed, LLUUID category, BOOL append);
void wear_inventory_category_on_avatar_loop(LLWearable* wearable, void*);
void wear_inventory_category_on_avatar_step3(LLWearableHoldingPattern* holder, BOOL append);
void remove_inventory_category_from_avatar(LLInventoryCategory* category);
-void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata);
+void remove_inventory_category_from_avatar_step2( BOOL proceed, LLUUID category_id);
bool move_task_inventory_callback(const LLSD& notification, const LLSD& response, LLMoveInv*);
bool confirm_replace_attachment_rez(const LLSD& notification, const LLSD& response);
@@ -147,12 +149,6 @@ std::string ICON_NAME[ICON_NAME_COUNT] =
"inv_item_gesture.tga",
};
-struct LLWearInfo
-{
- LLUUID mCategoryID;
- BOOL mAppend;
-};
-
BOOL gAddToOutfit = FALSE;
// +=================================================+
@@ -190,7 +186,7 @@ time_t LLInvFVBridge::getCreationDate() const
// Can be destoryed (or moved to trash)
BOOL LLInvFVBridge::isItemRemovable()
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return FALSE;
if(model->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID()))
{
@@ -208,14 +204,14 @@ BOOL LLInvFVBridge::isItemMovable()
// *TODO: make sure this does the right thing
void LLInvFVBridge::showProperties()
{
- LLShowProps::showProperties(mUUID);
+ LLFloaterProperties::show(mUUID);
}
void LLInvFVBridge::removeBatch(LLDynamicArray<LLFolderViewEventListener*>& batch)
{
// Deactivate gestures when moving them into Trash
LLInvFVBridge* bridge;
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
LLViewerInventoryItem* item = NULL;
LLViewerInventoryCategory* cat = NULL;
LLInventoryModel::cat_array_t descendent_categories;
@@ -263,7 +259,7 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
// we call LLInventoryModel::moveObject() to move everything
// around.
LLInvFVBridge* bridge;
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return;
LLMessageSystem* msg = gMessageSystem;
LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
@@ -367,7 +363,7 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*
BOOL LLInvFVBridge::isClipboardPasteable() const
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return FALSE;
BOOL is_agent_inventory = model->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID());
@@ -427,7 +423,6 @@ void hideContextEntries(LLMenuGL& menu,
void LLInvFVBridge::getClipboardEntries(bool show_asset_id, std::vector<std::string> &items,
std::vector<std::string> &disabled_items, U32 flags)
{
- // *TODO: Translate
items.push_back(std::string("Rename"));
if (!isItemRenameable() || (flags & FIRST_SELECTED_ITEM) == 0)
{
@@ -469,18 +464,17 @@ void LLInvFVBridge::getClipboardEntries(bool show_asset_id, std::vector<std::str
void LLInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
- // *TODO: Translate
lldebugs << "LLInvFVBridge::buildContextMenu()" << llendl;
std::vector<std::string> items;
std::vector<std::string> disabled_items;
if(isInTrash())
{
- items.push_back(std::string("Purge Item"));
+ items.push_back(std::string("PurgeItem"));
if (!isItemRemovable())
{
- disabled_items.push_back(std::string("Purge Item"));
+ disabled_items.push_back(std::string("PurgeItem"));
}
- items.push_back(std::string("Restore Item"));
+ items.push_back(std::string("RestoreItem"));
}
else
{
@@ -524,7 +518,7 @@ BOOL LLInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
LLInventoryObject* LLInvFVBridge::getInventoryObject() const
{
LLInventoryObject* obj = NULL;
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(model)
{
obj = (LLInventoryObject*)model->getObject(mUUID);
@@ -532,9 +526,15 @@ LLInventoryObject* LLInvFVBridge::getInventoryObject() const
return obj;
}
+LLInventoryModel* LLInvFVBridge::getInventoryModel() const
+{
+ LLInventoryPanel* panel = dynamic_cast<LLInventoryPanel*>(mInventoryPanel.get());
+ return panel ? panel->getModel() : NULL;
+}
+
BOOL LLInvFVBridge::isInTrash() const
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return FALSE;
LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
return model->isObjectDescendentOf(mUUID, trash_id);
@@ -542,7 +542,7 @@ BOOL LLInvFVBridge::isInTrash() const
BOOL LLInvFVBridge::isAgentInventory() const
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return FALSE;
if(gAgent.getInventoryRootID() == mUUID) return TRUE;
return model->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID());
@@ -713,6 +713,10 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type,
case LLAssetType::AT_ROOT_CATEGORY:
new_listener = new LLFolderBridge(inventory, uuid);
break;
+
+ case LLAssetType::AT_FAVORITE:
+ new_listener = new LLFolderBridge(inventory, uuid);
+ break;
default:
llinfos << "Unhandled asset type (llassetstorage.h): "
@@ -809,7 +813,7 @@ void LLItemBridge::restoreItem()
LLViewerInventoryItem* item = (LLViewerInventoryItem*)getItem();
if(item)
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
LLUUID new_parent = model->findCategoryUUIDForType(item->getType());
// do not restamp on restore.
LLInvFVBridge::changeItemParent(model, item, new_parent, FALSE);
@@ -916,11 +920,11 @@ std::string LLItemBridge::getLabelSuffix() const
BOOL mod = item->getPermissions().allowModifyBy(gAgent.getID());
BOOL xfer = item->getPermissions().allowOperationBy(PERM_TRANSFER,
gAgent.getID());
- // *TODO: Translate
+
const char* EMPTY = "";
- const char* NO_COPY = " (no copy)";
- const char* NO_MOD = " (no modify)";
- const char* NO_XFER = " (no transfer)";
+ const char* NO_COPY =LLTrans::getString("NO_COPY").c_str();
+ const char* NO_MOD = LLTrans::getString("NO_MOD").c_str();
+ const char* NO_XFER = LLTrans::getString("NO_XFER").c_str();
const char* scopy;
if(copy) scopy = EMPTY;
else scopy = NO_COPY;
@@ -959,10 +963,12 @@ BOOL LLItemBridge::isItemRenameable() const
BOOL LLItemBridge::renameItem(const std::string& new_name)
{
- if(!isItemRenameable()) return FALSE;
- LLPreview::rename(mUUID, getPrefix() + new_name);
- LLInventoryModel* model = mInventoryPanel->getModel();
- if(!model) return FALSE;
+ if(!isItemRenameable())
+ return FALSE;
+ LLPreview::dirty(mUUID);
+ LLInventoryModel* model = getInventoryModel();
+ if(!model)
+ return FALSE;
LLViewerInventoryItem* item = getItem();
if(item && (item->getName() != new_name))
{
@@ -987,7 +993,7 @@ BOOL LLItemBridge::removeItem()
}
// move it to the trash
LLPreview::hide(mUUID, TRUE);
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return FALSE;
LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
LLViewerInventoryItem* item = getItem();
@@ -1042,7 +1048,7 @@ BOOL LLItemBridge::copyToClipboard() const
LLViewerInventoryItem* LLItemBridge::getItem() const
{
LLViewerInventoryItem* item = NULL;
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(model)
{
item = (LLViewerInventoryItem*)model->getItem(mUUID);
@@ -1089,7 +1095,7 @@ void LLFolderBridge::selectItem()
// Can be destroyed (or moved to trash)
BOOL LLFolderBridge::isItemRemovable()
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model)
{
return FALSE;
@@ -1157,7 +1163,7 @@ BOOL LLFolderBridge::isItemRemovable()
BOOL LLFolderBridge::isUpToDate() const
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return FALSE;
LLViewerInventoryCategory* category = (LLViewerInventoryCategory*)model->getCategory(mUUID);
if( !category )
@@ -1175,7 +1181,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
// the UI will get confused and pass in a NULL.
if(!inv_cat) return FALSE;
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return FALSE;
LLVOAvatar* avatar = gAgent.getAvatarObject();
@@ -1392,7 +1398,7 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id,
else
{
LLNotification::Params params("MoveInventoryFromObject");
- params.functor(boost::bind(move_task_inventory_callback, _1, _2, move_inv));
+ params.functor.function(boost::bind(move_task_inventory_callback, _1, _2, move_inv));
LLNotifications::instance().forceResponse(params, 0);
}
}
@@ -1624,7 +1630,7 @@ void LLFolderBridge::performAction(LLFolderView* folder, LLInventoryModel* model
}
else if ("removefromoutfit" == action)
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return;
LLViewerInventoryCategory* cat = getCategory();
if(!cat) return;
@@ -1655,7 +1661,7 @@ void LLFolderBridge::performAction(LLFolderView* folder, LLInventoryModel* model
void LLFolderBridge::openItem()
{
lldebugs << "LLFolderBridge::openItem()" << llendl;
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return;
model->fetchDescendentsOf(mUUID);
}
@@ -1677,13 +1683,25 @@ void LLFolderBridge::restoreItem()
cat = (LLViewerInventoryCategory*)getCategory();
if(cat)
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
LLUUID new_parent = model->findCategoryUUIDForType(cat->getType());
// do not restamp children on restore
LLInvFVBridge::changeCategoryParent(model, cat, new_parent, FALSE);
}
}
+LLAssetType::EType LLFolderBridge::getPreferredType() const
+{
+ LLAssetType::EType preferred_type = LLAssetType::AT_NONE;
+ LLViewerInventoryCategory* cat = getCategory();
+ if(cat)
+ {
+ preferred_type = cat->getPreferredType();
+ }
+
+ return preferred_type;
+}
+
// Icons for folders are based on the preferred type
LLUIImagePtr LLFolderBridge::getIcon() const
{
@@ -1742,6 +1760,10 @@ LLUIImagePtr LLFolderBridge::getIcon() const
case LLAssetType::AT_GESTURE:
control = "inv_folder_gesture.tga";
break;
+ case LLAssetType::AT_FAVORITE:
+ //TODO - need icon
+ control = "inv_folder_plain_closed.tga";
+ break;
default:
control = "inv_folder_plain_closed.tga";
break;
@@ -1751,9 +1773,11 @@ LLUIImagePtr LLFolderBridge::getIcon() const
BOOL LLFolderBridge::renameItem(const std::string& new_name)
{
- if(!isItemRenameable()) return FALSE;
- LLInventoryModel* model = mInventoryPanel->getModel();
- if(!model) return FALSE;
+ if(!isItemRenameable())
+ return FALSE;
+ LLInventoryModel* model = getInventoryModel();
+ if(!model)
+ return FALSE;
LLViewerInventoryCategory* cat = getCategory();
if(cat && (cat->getName() != new_name))
{
@@ -1776,7 +1800,7 @@ BOOL LLFolderBridge::removeItem()
}
// move it to the trash
LLPreview::hide(mUUID);
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return FALSE;
LLUUID trash_id;
@@ -1820,7 +1844,7 @@ BOOL LLFolderBridge::isClipboardPasteable() const
void LLFolderBridge::pasteFromClipboard()
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(model && isClipboardPasteable())
{
LLInventoryItem* item = NULL;
@@ -1855,9 +1879,7 @@ void LLFolderBridge::folderOptionsMenu()
{
std::vector<std::string> disabled_items;
- // *TODO: Translate
-
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return;
const LLInventoryCategory* category = model->getCategory(mUUID);
@@ -1917,10 +1939,9 @@ BOOL LLFolderBridge::checkFolderForContentsOfType(LLInventoryModel* model, LLInv
// Flags unused
void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
- // *TODO: Translate
lldebugs << "LLFolderBridge::buildContextMenu()" << llendl;
// std::vector<std::string> disabled_items;
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return;
LLUUID trash_id = model->findCategoryUUIDForType(LLAssetType::AT_TRASH);
LLUUID lost_and_found_id = model->findCategoryUUIDForType(LLAssetType::AT_LOST_AND_FOUND);
@@ -1950,31 +1971,6 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
}
else if(isAgentInventory()) // do not allow creating in library
{
- // only mature accounts can create undershirts/underwear
- /*if (!gAgent.isTeen())
- {
- sub_menu->append(new LLMenuItemCallGL("New Undershirt",
- &createNewUndershirt,
- NULL,
- (void*)this));
- sub_menu->append(new LLMenuItemCallGL("New Underpants",
- &createNewUnderpants,
- NULL,
- (void*)this));
- }*/
-
-/* BOOL contains_calling_cards = FALSE;
- LLInventoryModel::cat_array_t cat_array;
- LLInventoryModel::item_array_t item_array;
-
- LLIsType is_callingcard(LLAssetType::AT_CALLINGCARD);
- model->collectDescendentsIf(mUUID,
- cat_array,
- item_array,
- LLInventoryModel::EXCLUDE_TRASH,
- is_callingcard);
- if(item_array.count() > 0) contains_calling_cards = TRUE;
-*/
mItems.push_back(std::string("New Folder"));
mItems.push_back(std::string("New Script"));
mItems.push_back(std::string("New Note"));
@@ -2035,7 +2031,7 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
BOOL LLFolderBridge::hasChildren() const
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return FALSE;
LLInventoryModel::EHasChildren has_children;
has_children = gInventory.categoryHasChildren(mUUID);
@@ -2077,7 +2073,7 @@ BOOL LLFolderBridge::dragOrDrop(MASK mask, BOOL drop,
LLViewerInventoryCategory* LLFolderBridge::getCategory() const
{
LLViewerInventoryCategory* cat = NULL;
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(model)
{
cat = (LLViewerInventoryCategory*)model->getCategory(mUUID);
@@ -2097,7 +2093,8 @@ void LLFolderBridge::createNewCategory(void* user_data)
{
LLFolderBridge* bridge = (LLFolderBridge*)user_data;
if(!bridge) return;
- LLInventoryPanel* panel = bridge->mInventoryPanel;
+ LLInventoryPanel* panel = dynamic_cast<LLInventoryPanel*>(bridge->mInventoryPanel.get());
+ if (!panel) return;
LLInventoryModel* model = panel->getModel();
if(!model) return;
LLUUID id;
@@ -2201,7 +2198,7 @@ void LLFolderBridge::createWearable(LLUUID parent_id, EWearableType type)
void LLFolderBridge::modifyOutfit(BOOL append)
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return;
LLViewerInventoryCategory* cat = getCategory();
if(!cat) return;
@@ -2252,7 +2249,7 @@ bool move_task_inventory_callback(const LLSD& notification, const LLSD& response
BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
BOOL drop)
{
- LLInventoryModel* model = mInventoryPanel->getModel();
+ LLInventoryModel* model = getInventoryModel();
if(!model) return FALSE;
// cannot drag into library
@@ -2318,18 +2315,33 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
if (LLInventoryView::getActiveInventory())
{
LLInventoryPanel* active_panel = LLInventoryView::getActiveInventory()->getPanel();
- if (active_panel && (mInventoryPanel != active_panel))
+ LLInventoryPanel* panel = dynamic_cast<LLInventoryPanel*>(mInventoryPanel.get());
+ if (active_panel && (panel != active_panel))
{
active_panel->unSelectAll();
}
}
- // restamp if the move is into the trash.
- LLInvFVBridge::changeItemParent(
- model,
- (LLViewerInventoryItem*)inv_item,
- mUUID,
- move_is_into_trash);
+ LLUUID favorites_id = model->findCategoryUUIDForType(LLAssetType::AT_FAVORITE);
+ if (favorites_id == mUUID) // if target is the favorites folder we use copy
+ {
+ copy_inventory_item(
+ gAgent.getID(),
+ inv_item->getPermissions().getOwner(),
+ inv_item->getUUID(),
+ mUUID,
+ std::string(),
+ LLPointer<LLInventoryCallback>(NULL));
+ }
+ else
+ {
+ // restamp if the move is into the trash.
+ LLInvFVBridge::changeItemParent(
+ model,
+ (LLViewerInventoryItem*)inv_item,
+ mUUID,
+ move_is_into_trash);
+ }
}
}
else if(LLToolDragAndDrop::SOURCE_WORLD == source)
@@ -2378,7 +2390,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
else
{
LLNotification::Params params("MoveInventoryFromObject");
- params.functor(boost::bind(move_task_inventory_callback, _1, _2, move_inv));
+ params.functor.function(boost::bind(move_task_inventory_callback, _1, _2, move_inv));
LLNotifications::instance().forceResponse(params, 0);
}
}
@@ -2431,49 +2443,18 @@ LLUIImagePtr LLScriptBridge::getIcon() const
// | LLTextureBridge |
// +=================================================+
-std::string LLTextureBridge::sPrefix("Texture: ");
-
-
LLUIImagePtr LLTextureBridge::getIcon() const
{
return get_item_icon(LLAssetType::AT_TEXTURE, mInvType, 0, FALSE);
}
-void open_texture(const LLUUID& item_id,
- const std::string& title,
- BOOL show_keep_discard,
- const LLUUID& source_id,
- BOOL take_focus)
-{
- // See if we can bring an exiting preview to the front
- if( !LLPreview::show( item_id, take_focus ) )
- {
- // There isn't one, so make a new preview
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
- rect.translate( left - rect.mLeft, top - rect.mTop );
-
- LLPreviewTexture* preview;
- preview = new LLPreviewTexture("preview texture",
- rect,
- title,
- item_id,
- LLUUID::null,
- show_keep_discard);
- preview->setSourceID(source_id);
- if(take_focus) preview->setFocus(TRUE);
-
- gFloaterView->adjustToFitScreen(preview, FALSE);
- }
-}
-
void LLTextureBridge::openItem()
{
LLViewerInventoryItem* item = getItem();
- if(item)
+
+ if (item)
{
- open_texture(mUUID, getPrefix() + item->getName(), FALSE);
+ LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
}
}
@@ -2481,9 +2462,6 @@ void LLTextureBridge::openItem()
// | LLSoundBridge |
// +=================================================+
-std::string LLSoundBridge::sPrefix("Sound: ");
-
-
LLUIImagePtr LLSoundBridge::getIcon() const
{
return get_item_icon(LLAssetType::AT_SOUND, LLInventoryType::IT_SOUND, 0, FALSE);
@@ -2491,6 +2469,13 @@ LLUIImagePtr LLSoundBridge::getIcon() const
void LLSoundBridge::openItem()
{
+ LLViewerInventoryItem* item = getItem();
+
+ if (item)
+ {
+ LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
+ }
+/*
// Changed this back to the way it USED to work:
// only open the preview dialog through the contextual right-click menu
// double-click just plays the sound
@@ -2501,18 +2486,7 @@ void LLSoundBridge::openItem()
openSoundPreview((void*)this);
//send_uuid_sound_trigger(item->getAssetUUID(), 1.0);
}
-
-// if(!LLPreview::show(mUUID))
-// {
-// S32 left, top;
-// gFloaterView->getNewFloaterPosition(&left, &top);
-// LLRect rect = gSavedSettings.getRect("PreviewSoundRect");
-// rect.translate(left - rect.mLeft, top - rect.mTop);
-// new LLPreviewSound("preview sound",
-// rect,
-// getPrefix() + getName(),
-// mUUID));
-// }
+*/
}
void LLSoundBridge::previewItem()
@@ -2527,20 +2501,7 @@ void LLSoundBridge::previewItem()
void LLSoundBridge::openSoundPreview(void* which)
{
LLSoundBridge *me = (LLSoundBridge *)which;
- if(!LLPreview::show(me->mUUID))
- {
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("PreviewSoundRect");
- rect.translate(left - rect.mLeft, top - rect.mTop);
- LLPreviewSound* preview = new LLPreviewSound("preview sound",
- rect,
- me->getPrefix() + me->getName(),
- me->mUUID);
- preview->setFocus(TRUE);
- // Keep entirely onscreen.
- gFloaterView->adjustToFitScreen(preview, FALSE);
- }
+ LLFloaterReg::showInstance("preview_sound", LLSD(me->mUUID), TAKE_FOCUS_YES);
}
void LLSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
@@ -2549,7 +2510,6 @@ void LLSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
std::vector<std::string> items;
std::vector<std::string> disabled_items;
- // *TODO: Translate
if(isInTrash())
{
items.push_back(std::string("Purge Item"));
@@ -2578,8 +2538,6 @@ void LLSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
// | LLLandmarkBridge |
// +=================================================+
-std::string LLLandmarkBridge::sPrefix("Landmark: ");
-
LLUIImagePtr LLLandmarkBridge::getIcon() const
{
return get_item_icon(LLAssetType::AT_LANDMARK, LLInventoryType::IT_LANDMARK, mVisited, FALSE);
@@ -2590,7 +2548,6 @@ void LLLandmarkBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
std::vector<std::string> items;
std::vector<std::string> disabled_items;
- // *TODO: Translate
lldebugs << "LLLandmarkBridge::buildContextMenu()" << llendl;
if(isInTrash())
{
@@ -2617,6 +2574,20 @@ void LLLandmarkBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
}
+// Convenience function for the two functions below.
+static void teleport_via_landmark(const LLUUID& asset_id)
+{
+ gAgent.teleportViaLandmark( asset_id );
+
+ // we now automatically track the landmark you're teleporting to
+ // because you'll probably arrive at a telehub instead
+ LLFloaterWorldMap* floater_world_map = LLFloaterWorldMap::getInstance();
+ if( floater_world_map )
+ {
+ floater_world_map->trackLandmark( asset_id );
+ }
+}
+
// virtual
void LLLandmarkBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
{
@@ -2625,52 +2596,20 @@ void LLLandmarkBridge::performAction(LLFolderView* folder, LLInventoryModel* mod
LLViewerInventoryItem* item = getItem();
if(item)
{
- gAgent.teleportViaLandmark(item->getAssetUUID());
-
- // we now automatically track the landmark you're teleporting to
- // because you'll probably arrive at a telehub instead
- if( gFloaterWorldMap )
- {
- gFloaterWorldMap->trackLandmark( item->getAssetUUID() );
- }
+ teleport_via_landmark(item->getAssetUUID());
}
}
- if ("about" == action)
+ else if ("about" == action)
{
LLViewerInventoryItem* item = getItem();
if(item)
{
- open_landmark(item, std::string(" ") + getPrefix() + item->getName(), FALSE);
+ LLFloaterReg::showInstance("preview_landmark", LLSD(item->getUUID()), TAKE_FOCUS_YES);
}
}
- else LLItemBridge::performAction(folder, model, action);
-}
-
-void open_landmark(LLViewerInventoryItem* inv_item,
- const std::string& title,
- BOOL show_keep_discard,
- const LLUUID& source_id,
- BOOL take_focus)
-{
- // See if we can bring an exiting preview to the front
- if( !LLPreview::show( inv_item->getUUID(), take_focus ) )
+ else
{
- // There isn't one, so make a new preview
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("PreviewLandmarkRect");
- rect.translate( left - rect.mLeft, top - rect.mTop );
-
- LLPreviewLandmark* preview = new LLPreviewLandmark(title,
- rect,
- title,
- inv_item->getUUID(),
- show_keep_discard,
- inv_item);
- preview->setSourceID(source_id);
- if(take_focus) preview->setFocus(TRUE);
- // keep onscreen
- gFloaterView->adjustToFitScreen(preview, FALSE);
+ LLItemBridge::performAction(folder, model, action);
}
}
@@ -2681,15 +2620,7 @@ static bool open_landmark_callback(const LLSD& notification, const LLSD& respons
LLUUID asset_id = notification["payload"]["asset_id"].asUUID();
if (option == 0)
{
- // HACK: This is to demonstrate teleport on double click for landmarks
- gAgent.teleportViaLandmark( asset_id );
-
- // we now automatically track the landmark you're teleporting to
- // because you'll probably arrive at a telehub instead
- if( gFloaterWorldMap )
- {
- gFloaterWorldMap->trackLandmark( asset_id );
- }
+ teleport_via_landmark(asset_id);
}
return false;
@@ -2700,15 +2631,23 @@ static LLNotificationFunctorRegistration open_landmark_callback_reg("TeleportFro
void LLLandmarkBridge::openItem()
{
LLViewerInventoryItem* item = getItem();
+
+ if (item)
+ {
+ LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
+ }
+/*
+ LLViewerInventoryItem* item = getItem();
if( item )
{
// Opening (double-clicking) a landmark immediately teleports,
// but warns you the first time.
- // open_landmark(item, std::string(" ") + getPrefix() + item->getName(), FALSE);
+ // open_landmark(item);
LLSD payload;
payload["asset_id"] = item->getAssetUUID();
LLNotifications::instance().add("TeleportFromLandmark", LLSD(), payload);
}
+*/
}
@@ -2724,8 +2663,6 @@ void LLCallingCardObserver::changed(U32 mask)
// | LLCallingCardBridge |
// +=================================================+
-std::string LLCallingCardBridge::sPrefix("Calling Card: ");
-
LLCallingCardBridge::LLCallingCardBridge( LLInventoryPanel* inventory, const LLUUID& uuid ) :
LLItemBridge(inventory, uuid)
{
@@ -2741,7 +2678,8 @@ LLCallingCardBridge::~LLCallingCardBridge()
void LLCallingCardBridge::refreshFolderViewItem()
{
- LLFolderViewItem* itemp = mInventoryPanel->getRootFolder()->getItemByID(mUUID);
+ LLInventoryPanel* panel = dynamic_cast<LLInventoryPanel*>(mInventoryPanel.get());
+ LLFolderViewItem* itemp = panel ? panel->getRootFolder()->getItemByID(mUUID) : NULL;
if (itemp)
{
itemp->refresh();
@@ -2757,7 +2695,6 @@ void LLCallingCardBridge::performAction(LLFolderView* folder, LLInventoryModel*
if (item && (item->getCreatorUUID() != gAgent.getID()) &&
(!item->getCreatorUUID().isNull()))
{
- gIMMgr->setFloaterOpen(TRUE);
gIMMgr->addSession(item->getName(), IM_NOTHING_SPECIAL, item->getCreatorUUID());
}
}
@@ -2800,17 +2737,24 @@ std::string LLCallingCardBridge::getLabelSuffix() const
void LLCallingCardBridge::openItem()
{
LLViewerInventoryItem* item = getItem();
+
+ if (item)
+ {
+ LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
+ }
+/*
+ LLViewerInventoryItem* item = getItem();
if(item && !item->getCreatorUUID().isNull())
{
BOOL online;
online = LLAvatarTracker::instance().isBuddyOnline(item->getCreatorUUID());
LLFloaterAvatarInfo::showFromFriend(item->getCreatorUUID(), online);
}
+*/
}
void LLCallingCardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
- // *TODO: Translate
lldebugs << "LLCallingCardBridge::buildContextMenu()" << llendl;
std::vector<std::string> items;
std::vector<std::string> disabled_items;
@@ -2931,68 +2875,27 @@ BOOL LLCallingCardBridge::dragOrDrop(MASK mask, BOOL drop,
// | LLNotecardBridge |
// +=================================================+
-std::string LLNotecardBridge::sPrefix("Note: ");
-
-
LLUIImagePtr LLNotecardBridge::getIcon() const
{
return get_item_icon(LLAssetType::AT_NOTECARD, LLInventoryType::IT_NOTECARD, 0, FALSE);
}
-void open_notecard(LLViewerInventoryItem* inv_item,
- const std::string& title,
- const LLUUID& object_id,
- BOOL show_keep_discard,
- const LLUUID& source_id,
- BOOL take_focus)
-{
- // See if we can bring an existing preview to the front
- if(!LLPreview::show(inv_item->getUUID(), take_focus))
- {
- // There isn't one, so make a new preview
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("NotecardEditorRect");
- rect.translate(left - rect.mLeft, top - rect.mTop);
- LLPreviewNotecard* preview;
- preview = new LLPreviewNotecard("preview notecard", rect, title,
- inv_item->getUUID(), object_id, inv_item->getAssetUUID(),
- show_keep_discard, inv_item);
- preview->setSourceID(source_id);
- if(take_focus) preview->setFocus(TRUE);
- // Force to be entirely onscreen.
- gFloaterView->adjustToFitScreen(preview, FALSE);
-
- //if (source_id.notNull())
- //{
- // // look for existing tabbed view for content from same source
- // LLPreview* existing_preview = LLPreview::getPreviewForSource(source_id);
- // if (existing_preview)
- // {
- // // found existing preview from this source
- // // is it already hosted in a multi-preview window?
- // LLMultiPreview* preview_hostp = (LLMultiPreview*)existing_preview->getHost();
- // if (!preview_hostp)
- // {
- // // create new multipreview if it doesn't exist
- // LLMultiPreview* preview_hostp = new LLMultiPreview(existing_preview->getRect());
- // preview_hostp->addFloater(existing_preview);
- // }
- // // add this preview to existing host
- // preview_hostp->addFloater(preview);
- // }
- //}
- }
-}
-
-
void LLNotecardBridge::openItem()
{
LLViewerInventoryItem* item = getItem();
+
+ if (item)
+ {
+ LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
+ }
+
+/*
+ LLViewerInventoryItem* item = getItem();
if (item)
{
- open_notecard(item, getPrefix() + item->getName(), LLUUID::null, FALSE);
+ LLFloaterReg::showInstance("preview_notecard", LLSD(item->getUUID()), TAKE_FOCUS_YES);
}
+*/
}
@@ -3000,8 +2903,6 @@ void LLNotecardBridge::openItem()
// | LLGestureBridge |
// +=================================================+
-std::string LLGestureBridge::sPrefix("Gesture: ");
-
LLUIImagePtr LLGestureBridge::getIcon() const
{
return get_item_icon(LLAssetType::AT_GESTURE, LLInventoryType::IT_GESTURE, 0, FALSE);
@@ -3064,22 +2965,19 @@ void LLGestureBridge::performAction(LLFolderView* folder, LLInventoryModel* mode
void LLGestureBridge::openItem()
{
LLViewerInventoryItem* item = getItem();
- if (!item) return;
-
- // See if we can bring an existing preview to the front
- if(!LLPreview::show(mUUID))
+
+ if (item)
{
- LLUUID item_id = mUUID;
- std::string title = getPrefix() + item->getName();
- LLUUID object_id = LLUUID::null;
-
- // TODO: save the rectangle
- LLPreviewGesture* preview = LLPreviewGesture::show(title, item_id, object_id);
+ LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
+ }
+/*
+ LLViewerInventoryItem* item = getItem();
+ if (item)
+ {
+ LLPreviewGesture* preview = LLPreviewGesture::show(mUUID, LLUUID::null);
preview->setFocus(TRUE);
-
- // Force to be entirely onscreen.
- gFloaterView->adjustToFitScreen(preview, FALSE);
}
+*/
}
BOOL LLGestureBridge::removeItem()
@@ -3091,7 +2989,6 @@ BOOL LLGestureBridge::removeItem()
void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
- // *TODO: Translate
lldebugs << "LLGestureBridge::buildContextMenu()" << llendl;
std::vector<std::string> items;
std::vector<std::string> disabled_items;
@@ -3115,15 +3012,6 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
items.push_back(std::string("Gesture Separator"));
items.push_back(std::string("Activate"));
items.push_back(std::string("Deactivate"));
-
- /*menu.append(new LLMenuItemCallGL("Activate",
- handleActivateGesture,
- enableActivateGesture,
- (void*)this));
- menu.append(new LLMenuItemCallGL("Deactivate",
- handleDeactivateGesture,
- enableDeactivateGesture,
- (void*)this));*/
}
hideContextEntries(menu, items, disabled_items);
}
@@ -3132,9 +3020,6 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
// | LLAnimationBridge |
// +=================================================+
-std::string LLAnimationBridge::sPrefix("Animation: ");
-
-
LLUIImagePtr LLAnimationBridge::getIcon() const
{
return get_item_icon(LLAssetType::AT_ANIMATION, LLInventoryType::IT_ANIMATION, 0, FALSE);
@@ -3142,7 +3027,6 @@ LLUIImagePtr LLAnimationBridge::getIcon() const
void LLAnimationBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
- // *TODO: Translate
std::vector<std::string> items;
std::vector<std::string> disabled_items;
@@ -3176,32 +3060,18 @@ void LLAnimationBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
// virtual
void LLAnimationBridge::performAction(LLFolderView* folder, LLInventoryModel* model, std::string action)
{
- S32 activate = 0;
-
if ((action == "playworld") || (action == "playlocal"))
{
-
- if ("playworld" == action) activate = 1;
- if ("playlocal" == action) activate = 2;
-
- // See if we can bring an existing preview to the front
- if( !LLPreview::show( mUUID ) )
+ if (getItem())
{
- // There isn't one, so make a new preview
- LLViewerInventoryItem* item = getItem();
- if( item )
+ LLPreviewAnim::e_activation_type activate = LLPreviewAnim::NONE;
+ if ("playworld" == action) activate = LLPreviewAnim::PLAY;
+ if ("playlocal" == action) activate = LLPreviewAnim::AUDITION;
+
+ LLPreviewAnim* preview = LLFloaterReg::showTypedInstance<LLPreviewAnim>("preview_anim", LLSD(mUUID));
+ if (preview)
{
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("PreviewAnimRect");
- rect.translate( left - rect.mLeft, top - rect.mTop );
- LLPreviewAnim* preview = new LLPreviewAnim("preview anim",
- rect,
- getPrefix() + item->getName(),
- mUUID,
- activate);
- // Force to be entirely onscreen.
- gFloaterView->adjustToFitScreen(preview, FALSE);
+ preview->activate(activate);
}
}
}
@@ -3213,36 +3083,25 @@ void LLAnimationBridge::performAction(LLFolderView* folder, LLInventoryModel* mo
void LLAnimationBridge::openItem()
{
- // See if we can bring an existing preview to the front
- if( !LLPreview::show( mUUID ) )
+ LLViewerInventoryItem* item = getItem();
+
+ if (item)
{
- // There isn't one, so make a new preview
- LLViewerInventoryItem* item = getItem();
- if( item )
- {
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("PreviewAnimRect");
- rect.translate( left - rect.mLeft, top - rect.mTop );
- LLPreviewAnim* preview = new LLPreviewAnim("preview anim",
- rect,
- getPrefix() + item->getName(),
- mUUID,
- 0);
- preview->setFocus(TRUE);
- // Force to be entirely onscreen.
- gFloaterView->adjustToFitScreen(preview, FALSE);
- }
+ LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
}
+/*
+ LLViewerInventoryItem* item = getItem();
+ if (item)
+ {
+ LLFloaterReg::showInstance("preview_anim", LLSD(mUUID), TAKE_FOCUS_YES);
+ }
+*/
}
// +=================================================+
// | LLObjectBridge |
// +=================================================+
-// static
-std::string LLObjectBridge::sPrefix("Object: ");
-
// static
LLUUID LLObjectBridge::sContextMenuItemID;
@@ -3316,10 +3175,16 @@ void LLObjectBridge::performAction(LLFolderView* folder, LLInventoryModel* model
void LLObjectBridge::openItem()
{
- /* Disabled -- this preview isn't useful. JC */
- // CP: actually, this code is required - made changes to match LLAnimationBridge::openItem() idiom
- // The properties preview is useful, converting to show object properties. - DaveP
- LLShowProps::showProperties(mUUID);
+ LLViewerInventoryItem* item = getItem();
+
+ if (item)
+ {
+ LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
+ }
+
+ /*
+ LLFloaterProperties::show(mUUID);
+ */
}
LLFontGL::StyleFlags LLObjectBridge::getLabelStyle() const
@@ -3411,7 +3276,6 @@ static LLNotificationFunctorRegistration confirm_replace_attachment_rez_reg("Rep
void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
- // *TODO: Translate
std::vector<std::string> items;
std::vector<std::string> disabled_items;
if(isInTrash())
@@ -3457,35 +3321,36 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
LLMenuGL* attach_menu = menu.getChildMenuByName("Attach To", TRUE);
LLMenuGL* attach_hud_menu = menu.getChildMenuByName("Attach To HUD", TRUE);
LLVOAvatar *avatarp = gAgent.getAvatarObject();
- if (attach_menu && (attach_menu->getChildCount() == 0) &&
- attach_hud_menu && (attach_hud_menu->getChildCount() == 0) &&
- avatarp)
+ if (attach_menu
+ && (attach_menu->getChildCount() == 0)
+ && attach_hud_menu
+ && (attach_hud_menu->getChildCount() == 0)
+ && avatarp)
{
for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin();
iter != avatarp->mAttachmentPoints.end(); )
{
LLVOAvatar::attachment_map_t::iterator curiter = iter++;
LLViewerJointAttachment* attachment = curiter->second;
- LLMenuItemCallGL *new_item;
- if (attachment->getIsHUDAttachment())
+ LLMenuItemCallGL::Params p;
+ std::string submenu_name = attachment->getName();
+ if (LLTrans::getString(submenu_name) != "")
{
- attach_hud_menu->append(new_item = new LLMenuItemCallGL(attachment->getName(),
- NULL, //&LLObjectBridge::attachToAvatar,
- NULL, &attach_label, (void*)attachment));
+ p.name = (" ")+LLTrans::getString(submenu_name)+" ";
}
else
{
- attach_menu->append(new_item = new LLMenuItemCallGL(attachment->getName(),
- NULL, //&LLObjectBridge::attachToAvatar,
- NULL, &attach_label, (void*)attachment));
- }
-
- LLSimpleListener* callback = mInventoryPanel->getListenerByName("Inventory.AttachObject");
-
- if (callback)
- {
- new_item->addListener(callback, "on_click", LLSD(attachment->getName()));
+ p.name = submenu_name;
}
+ LLSD cbparams;
+ cbparams["index"] = curiter->first;
+ cbparams["label"] = attachment->getName();
+ p.on_click.function_name = "Inventory.AttachObject";
+ p.on_click.parameter = LLSD(attachment->getName());
+ p.on_enable.function_name = "Attachment.Label";
+ p.on_enable.parameter = cbparams;
+ LLView* parent = attachment->getIsHUDAttachment() ? attach_hud_menu : attach_menu;
+ LLUICtrlFactory::create<LLMenuItemCallGL>(p, parent);
}
}
}
@@ -3496,10 +3361,12 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
BOOL LLObjectBridge::renameItem(const std::string& new_name)
{
- if(!isItemRenameable()) return FALSE;
- LLPreview::rename(mUUID, getPrefix() + new_name);
- LLInventoryModel* model = mInventoryPanel->getModel();
- if(!model) return FALSE;
+ if(!isItemRenameable())
+ return FALSE;
+ LLPreview::dirty(mUUID);
+ LLInventoryModel* model = getInventoryModel();
+ if(!model)
+ return FALSE;
LLViewerInventoryItem* item = getItem();
if(item && (item->getName() != new_name))
{
@@ -3532,8 +3399,6 @@ BOOL LLObjectBridge::renameItem(const std::string& new_name)
// | LLLSLTextBridge |
// +=================================================+
-std::string LLLSLTextBridge::sPrefix("Script: ");
-
LLUIImagePtr LLLSLTextBridge::getIcon() const
{
return get_item_icon(LLAssetType::AT_SCRIPT, LLInventoryType::IT_LSL, 0, FALSE);
@@ -3541,27 +3406,19 @@ LLUIImagePtr LLLSLTextBridge::getIcon() const
void LLLSLTextBridge::openItem()
{
- // See if we can bring an exiting preview to the front
- if(!LLPreview::show(mUUID))
+ LLViewerInventoryItem* item = getItem();
+
+ if (item)
{
- LLViewerInventoryItem* item = getItem();
- if (item)
- {
- // There isn't one, so make a new preview
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("PreviewScriptRect");
- rect.translate(left - rect.mLeft, top - rect.mTop);
-
- LLPreviewLSL* preview = new LLPreviewLSL("preview lsl text",
- rect,
- getPrefix() + item->getName(),
- mUUID);
- preview->setFocus(TRUE);
- // keep onscreen
- gFloaterView->adjustToFitScreen(preview, FALSE);
- }
+ LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
}
+ /*
+ LLViewerInventoryItem* item = getItem();
+ if (item)
+ {
+ LLFloaterReg::showInstance("preview_script", LLSD(mUUID), TAKE_FOCUS_YES);
+ }
+ */
}
// +=================================================+
@@ -3897,30 +3754,18 @@ void wear_inventory_category_on_avatar( LLInventoryCategory* category, BOOL appe
lldebugs << "wear_inventory_category_on_avatar( " << category->getName()
<< " )" << llendl;
- LLWearInfo* userdata = new LLWearInfo;
- userdata->mAppend = append;
- userdata->mCategoryID = category->getUUID();
-
if( gFloaterCustomize )
{
- gFloaterCustomize->askToSaveIfDirty(
- wear_inventory_category_on_avatar_step2,
- userdata);
+ gFloaterCustomize->askToSaveIfDirty(boost::bind(wear_inventory_category_on_avatar_step2, _1, category->getUUID(), append));
}
else
{
- wear_inventory_category_on_avatar_step2(
- TRUE,
- userdata );
+ wear_inventory_category_on_avatar_step2(TRUE, category->getUUID(), append );
}
}
-
-void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
+void wear_inventory_category_on_avatar_step2( BOOL proceed, LLUUID category, BOOL append )
{
- LLWearInfo* wear_info = (LLWearInfo*)userdata;
- if (!wear_info) return;
-
// Find all the wearables that are in the category's subtree.
lldebugs << "wear_inventory_category_on_avatar_step2()" << llendl;
if(proceed)
@@ -3928,7 +3773,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
LLInventoryModel::cat_array_t cat_array;
LLInventoryModel::item_array_t item_array;
LLFindWearables is_wearable;
- gInventory.collectDescendentsIf(wear_info->mCategoryID,
+ gInventory.collectDescendentsIf(category,
cat_array,
item_array,
LLInventoryModel::EXCLUDE_TRASH,
@@ -3939,7 +3784,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
LLInventoryModel::cat_array_t obj_cat_array;
LLInventoryModel::item_array_t obj_item_array;
LLIsType is_object( LLAssetType::AT_OBJECT );
- gInventory.collectDescendentsIf(wear_info->mCategoryID,
+ gInventory.collectDescendentsIf(category,
obj_cat_array,
obj_item_array,
LLInventoryModel::EXCLUDE_TRASH,
@@ -3950,7 +3795,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
LLInventoryModel::cat_array_t gest_cat_array;
LLInventoryModel::item_array_t gest_item_array;
LLIsType is_gesture( LLAssetType::AT_GESTURE );
- gInventory.collectDescendentsIf(wear_info->mCategoryID,
+ gInventory.collectDescendentsIf(category,
gest_cat_array,
gest_item_array,
LLInventoryModel::EXCLUDE_TRASH,
@@ -3960,7 +3805,6 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
if( !wearable_count && !obj_count && !gest_count)
{
LLNotifications::instance().add("CouldNotPutOnOutfit");
- delete wear_info;
return;
}
@@ -3979,7 +3823,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
// Update the inventory item labels to reflect the fact
// they are active.
- LLViewerInventoryCategory* catp = gInventory.getCategory(wear_info->mCategoryID);
+ LLViewerInventoryCategory* catp = gInventory.getCategory(category);
if (catp)
{
gInventory.updateCategory(catp);
@@ -4007,7 +3851,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
}
for(i = 0; i < wearable_count; ++i)
{
- gAddToOutfit = wear_info->mAppend;
+ gAddToOutfit = append;
found = found_container.get(i);
gWearableList.getAsset(found->mAssetID,
@@ -4020,7 +3864,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
//If not appending and the folder doesn't contain only gestures, take off all attachments.
- if (!wear_info->mAppend
+ if (!append
&& !(wearable_count == 0 && obj_count == 0 && gest_count > 0) )
{
LLAgent::userRemoveAllAttachments(NULL);
@@ -4061,7 +3905,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
msg->nextBlockFast(_PREHASH_HeaderData);
msg->addUUIDFast(_PREHASH_CompoundMsgID, compound_msg_id );
msg->addU8Fast(_PREHASH_TotalObjects, obj_count );
- msg->addBOOLFast(_PREHASH_FirstDetachAll, !wear_info->mAppend );
+ msg->addBOOLFast(_PREHASH_FirstDetachAll, !append );
}
LLInventoryItem* item = obj_item_array.get(i);
@@ -4082,8 +3926,6 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
}
}
}
- delete wear_info;
- wear_info = NULL;
}
void wear_inventory_category_on_avatar_loop(LLWearable* wearable, void* data)
@@ -4170,36 +4012,29 @@ void remove_inventory_category_from_avatar( LLInventoryCategory* category )
<< " )" << llendl;
- LLUUID* uuid = new LLUUID(category->getUUID());
-
if( gFloaterCustomize )
{
gFloaterCustomize->askToSaveIfDirty(
- remove_inventory_category_from_avatar_step2,
- uuid);
+ boost::bind(remove_inventory_category_from_avatar_step2, _1, category->getUUID()));
}
else
{
- remove_inventory_category_from_avatar_step2(
- TRUE,
- uuid );
+ remove_inventory_category_from_avatar_step2(TRUE, category->getUUID() );
}
}
-void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata)
+void remove_inventory_category_from_avatar_step2( BOOL proceed, LLUUID category_id)
{
// Find all the wearables that are in the category's subtree.
- LLUUID* category_id = (LLUUID *)userdata;
-
lldebugs << "remove_inventory_category_from_avatar_step2()" << llendl;
if(proceed)
{
LLInventoryModel::cat_array_t cat_array;
LLInventoryModel::item_array_t item_array;
LLFindWearables is_wearable;
- gInventory.collectDescendentsIf(*category_id,
+ gInventory.collectDescendentsIf(category_id,
cat_array,
item_array,
LLInventoryModel::EXCLUDE_TRASH,
@@ -4210,7 +4045,7 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata)
LLInventoryModel::cat_array_t obj_cat_array;
LLInventoryModel::item_array_t obj_item_array;
LLIsType is_object( LLAssetType::AT_OBJECT );
- gInventory.collectDescendentsIf(*category_id,
+ gInventory.collectDescendentsIf(category_id,
obj_cat_array,
obj_item_array,
LLInventoryModel::EXCLUDE_TRASH,
@@ -4221,7 +4056,7 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata)
LLInventoryModel::cat_array_t gest_cat_array;
LLInventoryModel::item_array_t gest_item_array;
LLIsType is_gesture( LLAssetType::AT_GESTURE );
- gInventory.collectDescendentsIf(*category_id,
+ gInventory.collectDescendentsIf(category_id,
gest_cat_array,
gest_item_array,
LLInventoryModel::EXCLUDE_TRASH,
@@ -4283,8 +4118,6 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, void* userdata)
}
}
}
- delete category_id;
- category_id = NULL;
}
BOOL LLWearableBridge::renameItem(const std::string& new_name)
@@ -4364,6 +4197,13 @@ void LLWearableBridge::performAction(LLFolderView* folder, LLInventoryModel* mod
void LLWearableBridge::openItem()
{
+ LLViewerInventoryItem* item = getItem();
+
+ if (item)
+ {
+ LLInvFVBridgeAction::doAction(item->getType(),mUUID,getInventoryModel());
+ }
+ /*
if( isInTrash() )
{
LLNotifications::instance().add("CannotWearTrash");
@@ -4398,11 +4238,11 @@ void LLWearableBridge::openItem()
LLNotifications::instance().add("CannotWearInfoNotComplete");
}
}
+ */
}
void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
- // *TODO: Translate
lldebugs << "LLWearableBridge::buildContextMenu()" << llendl;
std::vector<std::string> items;
std::vector<std::string> disabled_items;
@@ -4445,23 +4285,10 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
disabled_items.push_back(std::string("Wearable Edit"));
}
- //menu.appendSeparator();
- //menu.append(new LLMenuItemCallGL("Wear",
- // LLWearableBridge::onWearOnAvatar,
- // LLWearableBridge::canWearOnAvatar,
- // (void*)this));
- //menu.append(new LLMenuItemCallGL("Edit",
- // LLWearableBridge::onEditOnAvatar,
- // LLWearableBridge::canEditOnAvatar,
- // (void*)this));
if( item && (item->getType() == LLAssetType::AT_CLOTHING) )
{
items.push_back(std::string("Take Off"));
- /*menu.append(new LLMenuItemCallGL("Take Off",
- LLWearableBridge::onRemoveFromAvatar,
- LLWearableBridge::canRemoveFromAvatar,
- (void*)this));*/
}
}
hideContextEntries(menu, items, disabled_items);
@@ -4586,7 +4413,8 @@ void LLWearableBridge::editOnAvatar()
if( wearable )
{
// Set the tab to the right wearable.
- LLFloaterCustomize::setCurrentWearableType( wearable->getType() );
+ if (gFloaterCustomize)
+ gFloaterCustomize->setCurrentWearableType( wearable->getType() );
if( CAMERA_MODE_CUSTOMIZE_AVATAR != gAgent.getCameraMode() )
{
@@ -4646,3 +4474,279 @@ void LLWearableBridge::onRemoveFromAvatarArrived(LLWearable* wearable,
}
delete item_id;
}
+
+
+LLInvFVBridgeAction* LLInvFVBridgeAction::createAction(LLAssetType::EType asset_type,
+ const LLUUID& uuid,LLInventoryModel* model)
+{
+ LLInvFVBridgeAction* action = NULL;
+ switch(asset_type)
+ {
+ case LLAssetType::AT_TEXTURE:
+ action = new LLTextureBridgeAction(uuid,model);
+ break;
+
+ case LLAssetType::AT_SOUND:
+ action = new LLSoundBridgeAction(uuid,model);
+ break;
+
+ case LLAssetType::AT_LANDMARK:
+ action = new LLLandmarkBridgeAction(uuid,model);
+ break;
+
+ case LLAssetType::AT_CALLINGCARD:
+ action = new LLCallingCardBridgeAction(uuid,model);
+ break;
+
+ case LLAssetType::AT_OBJECT:
+ action = new LLObjectBridgeAction(uuid,model);
+ break;
+
+ case LLAssetType::AT_NOTECARD:
+ action = new LLNotecardBridgeAction(uuid,model);
+ break;
+
+ case LLAssetType::AT_ANIMATION:
+ action = new LLAnimationBridgeAction(uuid,model);
+ break;
+
+ case LLAssetType::AT_GESTURE:
+ action = new LLGestureBridgeAction(uuid,model);
+ break;
+
+ case LLAssetType::AT_LSL_TEXT:
+ action = new LLLSLTextBridgeAction(uuid,model);
+ break;
+
+ case LLAssetType::AT_CLOTHING:
+ case LLAssetType::AT_BODYPART:
+ action = new LLWearableBridgeAction(uuid,model);
+
+ break;
+
+ default:
+ break;
+ }
+ return action;
+}
+
+//static
+void LLInvFVBridgeAction::doAction(LLAssetType::EType asset_type,
+ const LLUUID& uuid,LLInventoryModel* model)
+{
+ LLInvFVBridgeAction* action = createAction(asset_type,uuid,model);
+ if(action)
+ {
+ action->doIt();
+ delete action;
+ }
+}
+
+LLViewerInventoryItem* LLInvFVBridgeAction::getItem() const
+{
+ if(mModel)
+ return (LLViewerInventoryItem*)mModel->getItem(mUUID);
+ return NULL;
+}
+
+//virtual
+void LLTextureBridgeAction::doIt()
+{
+ if (getItem())
+ {
+ LLFloaterReg::showInstance("preview_texture", LLSD(mUUID), TAKE_FOCUS_YES);
+ }
+
+ LLInvFVBridgeAction::doIt();
+}
+
+//virtual
+void LLSoundBridgeAction::doIt()
+{
+ LLViewerInventoryItem* item = getItem();
+ if(item)
+ {
+ LLFloaterReg::showInstance("preview_sound", LLSD(mUUID), TAKE_FOCUS_YES);
+ }
+
+ LLInvFVBridgeAction::doIt();
+}
+
+
+//virtual
+void LLLandmarkBridgeAction::doIt()
+{
+ LLViewerInventoryItem* item = getItem();
+ if( item )
+ {
+ // Opening (double-clicking) a landmark immediately teleports,
+ // but warns you the first time.
+ LLSD payload;
+ payload["asset_id"] = item->getAssetUUID();
+ LLNotifications::instance().add("TeleportFromLandmark", LLSD(), payload);
+ }
+
+ LLInvFVBridgeAction::doIt();
+}
+
+
+//virtual
+void LLCallingCardBridgeAction::doIt()
+{
+ LLViewerInventoryItem* item = getItem();
+ if(item && !item->getCreatorUUID().isNull())
+ {
+ BOOL online;
+ online = LLAvatarTracker::instance().isBuddyOnline(item->getCreatorUUID());
+ LLFloaterAvatarInfo::showFromFriend(item->getCreatorUUID(), online);
+ }
+
+ LLInvFVBridgeAction::doIt();
+}
+
+//virtual
+void
+LLNotecardBridgeAction::doIt()
+{
+ LLViewerInventoryItem* item = getItem();
+ if (item)
+ {
+ LLFloaterReg::showInstance("preview_notecard", LLSD(item->getUUID()), TAKE_FOCUS_YES);
+ }
+
+ LLInvFVBridgeAction::doIt();
+}
+
+//virtual
+void LLGestureBridgeAction::doIt()
+{
+ LLViewerInventoryItem* item = getItem();
+ if (item)
+ {
+ LLPreviewGesture* preview = LLPreviewGesture::show(mUUID, LLUUID::null);
+ preview->setFocus(TRUE);
+ }
+
+ LLInvFVBridgeAction::doIt();
+}
+
+//virtual
+void LLAnimationBridgeAction::doIt()
+{
+ LLViewerInventoryItem* item = getItem();
+ if (item)
+ {
+ LLFloaterReg::showInstance("preview_anim", LLSD(mUUID), TAKE_FOCUS_YES);
+ }
+
+ LLInvFVBridgeAction::doIt();
+}
+
+
+//virtual
+void LLObjectBridgeAction::doIt()
+{
+ LLFloaterProperties::show(mUUID);
+
+ LLInvFVBridgeAction::doIt();
+}
+
+
+//virtual
+void LLLSLTextBridgeAction::doIt()
+{
+ LLViewerInventoryItem* item = getItem();
+ if (item)
+ {
+ LLFloaterReg::showInstance("preview_script", LLSD(mUUID), TAKE_FOCUS_YES);
+ }
+
+ LLInvFVBridgeAction::doIt();
+}
+
+
+BOOL LLWearableBridgeAction::isInTrash() const
+{
+ if(!mModel) return FALSE;
+ LLUUID trash_id = mModel->findCategoryUUIDForType(LLAssetType::AT_TRASH);
+ return mModel->isObjectDescendentOf(mUUID, trash_id);
+}
+
+BOOL LLWearableBridgeAction::isAgentInventory() const
+{
+ if(!mModel) return FALSE;
+ if(gAgent.getInventoryRootID() == mUUID) return TRUE;
+ return mModel->isObjectDescendentOf(mUUID, gAgent.getInventoryRootID());
+}
+
+void LLWearableBridgeAction::wearOnAvatar()
+{
+ // Don't wear anything until initial wearables are loaded, can
+ // destroy clothing items.
+ if (!gAgent.areWearablesLoaded())
+ {
+ LLNotifications::instance().add("CanNotChangeAppearanceUntilLoaded");
+ return;
+ }
+
+ LLViewerInventoryItem* item = getItem();
+ if(item)
+ {
+ if(!isAgentInventory())
+ {
+ LLPointer<LLInventoryCallback> cb = new WearOnAvatarCallback();
+ copy_inventory_item(
+ gAgent.getID(),
+ item->getPermissions().getOwner(),
+ item->getUUID(),
+ LLUUID::null,
+ std::string(),
+ cb);
+ }
+ else
+ {
+ wear_inventory_item_on_avatar(item);
+ }
+ }
+}
+
+//virtual
+void LLWearableBridgeAction::doIt()
+{
+ if( isInTrash() )
+ {
+ LLNotifications::instance().add("CannotWearTrash");
+ }
+ else if(isAgentInventory())
+ {
+ if( !gAgent.isWearingItem( mUUID ) )
+ {
+ wearOnAvatar();
+ }
+ }
+ else
+ {
+ // must be in the inventory library. copy it to our inventory
+ // and put it on right away.
+ LLViewerInventoryItem* item = getItem();
+ if(item && item->isComplete())
+ {
+ LLPointer<LLInventoryCallback> cb = new WearOnAvatarCallback();
+ copy_inventory_item(
+ gAgent.getID(),
+ item->getPermissions().getOwner(),
+ item->getUUID(),
+ LLUUID::null,
+ std::string(),
+ cb);
+ }
+ else if(item)
+ {
+ // *TODO: We should fetch the item details, and then do
+ // the operation above.
+ LLNotifications::instance().add("CannotWearInfoNotComplete");
+ }
+ }
+
+ LLInvFVBridgeAction::doIt();
+}
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 526b30f214..b66228c75a 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -34,6 +34,8 @@
#include "llwearable.h"
#include "llviewercontrol.h"
#include "llcallingcard.h"
+#include "llinventorymodel.h"
+#include "llinventoryview.h"
enum EInventoryIcon
{
@@ -93,31 +95,6 @@ struct LLAttachmentRezAction
};
-//helper functions
-class LLShowProps
-{
-public:
-
- static void showProperties(const LLUUID& uuid)
- {
- if(!LLFloaterProperties::show(uuid, LLUUID::null))
- {
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("PropertiesRect");
- rect.translate( left - rect.mLeft, top - rect.mTop );
- LLFloaterProperties* floater;
- floater = new LLFloaterProperties("item properties",
- rect,
- "Inventory Item Properties",
- uuid,
- LLUUID::null);
- // keep onscreen
- gFloaterView->adjustToFitScreen(floater, FALSE);
- }
- }
-};
-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLInventoryPanelObserver
//
@@ -158,7 +135,6 @@ public:
virtual const LLUUID& getUUID() const { return mUUID; }
- virtual const std::string& getPrefix() { return LLStringUtil::null; }
virtual void restoreItem() {}
virtual void restoreToWorld() {}
@@ -201,9 +177,14 @@ public:
protected:
LLInvFVBridge(LLInventoryPanel* inventory, const LLUUID& uuid) :
- mInventoryPanel(inventory), mUUID(uuid), mInvType(LLInventoryType::IT_NONE) {}
+ mUUID(uuid), mInvType(LLInventoryType::IT_NONE)
+ {
+ mInventoryPanel = inventory->getHandle();
+ }
LLInventoryObject* getInventoryObject() const;
+ LLInventoryModel* getInventoryModel() const;
+
BOOL isInTrash() const;
// return true if the item is in agent inventory. if false, it
// must be lost or in the inventory library.
@@ -218,9 +199,9 @@ protected:
const LLUUID& new_parent,
BOOL restamp);
void removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*>& batch);
-
+
protected:
- LLInventoryPanel* mInventoryPanel;
+ LLHandle<LLPanel> mInventoryPanel;
LLUUID mUUID; // item id
LLInventoryType::EType mInvType;
};
@@ -277,6 +258,7 @@ public:
virtual void selectItem();
virtual void restoreItem();
+ virtual LLAssetType::EType getPreferredType() const;
virtual LLUIImagePtr getIcon() const;
virtual BOOL renameItem(const std::string& new_name);
virtual BOOL removeItem();
@@ -351,15 +333,12 @@ class LLTextureBridge : public LLItemBridge
{
friend class LLInvFVBridge;
public:
- virtual const std::string& getPrefix() { return sPrefix; }
-
virtual LLUIImagePtr getIcon() const;
virtual void openItem();
protected:
LLTextureBridge(LLInventoryPanel* inventory, const LLUUID& uuid, LLInventoryType::EType type) :
LLItemBridge(inventory, uuid), mInvType(type) {}
- static std::string sPrefix;
LLInventoryType::EType mInvType;
};
@@ -367,8 +346,6 @@ class LLSoundBridge : public LLItemBridge
{
friend class LLInvFVBridge;
public:
- virtual const std::string& getPrefix() { return sPrefix; }
-
virtual LLUIImagePtr getIcon() const;
virtual void openItem();
virtual void previewItem();
@@ -378,15 +355,12 @@ public:
protected:
LLSoundBridge(LLInventoryPanel* inventory, const LLUUID& uuid) :
LLItemBridge(inventory, uuid) {}
- static std::string sPrefix;
};
class LLLandmarkBridge : public LLItemBridge
{
friend class LLInvFVBridge;
public:
- static const std::string& prefix() { return sPrefix; }
- virtual const std::string& getPrefix() { return sPrefix; }
virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
virtual LLUIImagePtr getIcon() const;
@@ -404,7 +378,6 @@ protected:
}
protected:
- static std::string sPrefix;
BOOL mVisited;
};
@@ -425,8 +398,6 @@ class LLCallingCardBridge : public LLItemBridge
{
friend class LLInvFVBridge;
public:
- virtual const std::string& getPrefix() { return sPrefix; }
-
virtual std::string getLabelSuffix() const;
//virtual const std::string& getDisplayName() const;
virtual LLUIImagePtr getIcon() const;
@@ -445,7 +416,6 @@ protected:
~LLCallingCardBridge();
protected:
- static std::string sPrefix;
LLCallingCardObserver* mObserver;
};
@@ -454,25 +424,18 @@ class LLNotecardBridge : public LLItemBridge
{
friend class LLInvFVBridge;
public:
- virtual const std::string& getPrefix() { return sPrefix; }
-
virtual LLUIImagePtr getIcon() const;
virtual void openItem();
protected:
LLNotecardBridge(LLInventoryPanel* inventory, const LLUUID& uuid) :
LLItemBridge(inventory, uuid) {}
-
-protected:
- static std::string sPrefix;
};
class LLGestureBridge : public LLItemBridge
{
friend class LLInvFVBridge;
public:
- virtual const std::string& getPrefix() { return sPrefix; }
-
virtual LLUIImagePtr getIcon() const;
// Only suffix for gesture items, not task items, because only
@@ -489,9 +452,6 @@ public:
protected:
LLGestureBridge(LLInventoryPanel* inventory, const LLUUID& uuid)
: LLItemBridge(inventory, uuid) {}
-
-protected:
- static std::string sPrefix;
};
@@ -499,7 +459,6 @@ class LLAnimationBridge : public LLItemBridge
{
friend class LLInvFVBridge;
public:
- virtual const std::string& getPrefix() { return sPrefix; }
virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
@@ -509,9 +468,6 @@ public:
protected:
LLAnimationBridge(LLInventoryPanel* inventory, const LLUUID& uuid) :
LLItemBridge(inventory, uuid) {}
-
-protected:
- static std::string sPrefix;
};
@@ -519,8 +475,6 @@ class LLObjectBridge : public LLItemBridge
{
friend class LLInvFVBridge;
public:
- virtual const std::string& getPrefix() { return sPrefix; }
-
virtual LLUIImagePtr getIcon() const;
virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
virtual void openItem();
@@ -540,7 +494,6 @@ protected:
}
protected:
- static std::string sPrefix;
static LLUUID sContextMenuItemID; // Only valid while the context menu is open.
LLInventoryType::EType mInvType;
U32 mAttachPt;
@@ -552,17 +505,12 @@ class LLLSLTextBridge : public LLItemBridge
{
friend class LLInvFVBridge;
public:
- virtual const std::string& getPrefix() { return sPrefix; }
-
virtual LLUIImagePtr getIcon() const;
virtual void openItem();
protected:
LLLSLTextBridge( LLInventoryPanel* inventory, const LLUUID& uuid ) :
LLItemBridge(inventory, uuid) {}
-
-protected:
- static std::string sPrefix;
};
@@ -605,3 +553,162 @@ protected:
LLInventoryType::EType mInvType;
EWearableType mWearableType;
};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLInvFVBridgeAction (& it's derived classes)
+//
+// This is an implementation class to be able to
+// perform action to view inventory items.
+//
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+class LLInvFVBridgeAction
+{
+public:
+ // This method is a convenience function which creates the correct
+ // type of bridge action based on some basic information
+ static LLInvFVBridgeAction* createAction(LLAssetType::EType asset_type,
+ const LLUUID& uuid,LLInventoryModel* model);
+
+ static void doAction(LLAssetType::EType asset_type,
+ const LLUUID& uuid,LLInventoryModel* model);
+
+ virtual void doIt() { };
+ virtual ~LLInvFVBridgeAction(){}//need this because of warning on OSX
+protected:
+ LLInvFVBridgeAction(const LLUUID& id,LLInventoryModel* model):mUUID(id),mModel(model){}
+
+ LLViewerInventoryItem* getItem() const;
+protected:
+ const LLUUID& mUUID; // item id
+ LLInventoryModel* mModel;
+
+};
+
+
+
+class LLTextureBridgeAction: public LLInvFVBridgeAction
+{
+ friend class LLInvFVBridgeAction;
+public:
+ virtual void doIt() ;
+ virtual ~LLTextureBridgeAction(){}
+protected:
+ LLTextureBridgeAction(const LLUUID& id,LLInventoryModel* model):LLInvFVBridgeAction(id,model){}
+
+};
+
+
+class LLSoundBridgeAction: public LLInvFVBridgeAction
+{
+ friend class LLInvFVBridgeAction;
+public:
+ virtual void doIt() ;
+ virtual ~LLSoundBridgeAction(){}
+protected:
+ LLSoundBridgeAction(const LLUUID& id,LLInventoryModel* model):LLInvFVBridgeAction(id,model){}
+
+};
+
+
+class LLLandmarkBridgeAction: public LLInvFVBridgeAction
+{
+ friend class LLInvFVBridgeAction;
+public:
+ virtual void doIt() ;
+ virtual ~LLLandmarkBridgeAction(){}
+protected:
+ LLLandmarkBridgeAction(const LLUUID& id,LLInventoryModel* model):LLInvFVBridgeAction(id,model){}
+
+};
+
+
+class LLCallingCardBridgeAction: public LLInvFVBridgeAction
+{
+ friend class LLInvFVBridgeAction;
+public:
+ virtual void doIt() ;
+ virtual ~LLCallingCardBridgeAction(){}
+protected:
+ LLCallingCardBridgeAction(const LLUUID& id,LLInventoryModel* model):LLInvFVBridgeAction(id,model){}
+
+};
+
+
+class LLNotecardBridgeAction: public LLInvFVBridgeAction
+{
+ friend class LLInvFVBridgeAction;
+public:
+ virtual void doIt() ;
+ virtual ~LLNotecardBridgeAction(){}
+protected:
+ LLNotecardBridgeAction(const LLUUID& id,LLInventoryModel* model):LLInvFVBridgeAction(id,model){}
+
+};
+
+
+class LLGestureBridgeAction: public LLInvFVBridgeAction
+{
+ friend class LLInvFVBridgeAction;
+public:
+ virtual void doIt() ;
+ virtual ~LLGestureBridgeAction(){}
+protected:
+ LLGestureBridgeAction(const LLUUID& id,LLInventoryModel* model):LLInvFVBridgeAction(id,model){}
+
+};
+
+
+class LLAnimationBridgeAction: public LLInvFVBridgeAction
+{
+ friend class LLInvFVBridgeAction;
+public:
+ virtual void doIt() ;
+ virtual ~LLAnimationBridgeAction(){}
+protected:
+ LLAnimationBridgeAction(const LLUUID& id,LLInventoryModel* model):LLInvFVBridgeAction(id,model){}
+
+};
+
+
+class LLObjectBridgeAction: public LLInvFVBridgeAction
+{
+ friend class LLInvFVBridgeAction;
+public:
+ virtual void doIt() ;
+ virtual ~LLObjectBridgeAction(){}
+protected:
+ LLObjectBridgeAction(const LLUUID& id,LLInventoryModel* model):LLInvFVBridgeAction(id,model){}
+
+};
+
+
+class LLLSLTextBridgeAction: public LLInvFVBridgeAction
+{
+ friend class LLInvFVBridgeAction;
+public:
+ virtual void doIt() ;
+ virtual ~LLLSLTextBridgeAction(){}
+protected:
+ LLLSLTextBridgeAction(const LLUUID& id,LLInventoryModel* model):LLInvFVBridgeAction(id,model){}
+
+};
+
+
+class LLWearableBridgeAction: public LLInvFVBridgeAction
+{
+ friend class LLInvFVBridgeAction;
+public:
+ virtual void doIt();
+ virtual ~LLWearableBridgeAction(){}
+protected:
+ LLWearableBridgeAction(const LLUUID& id,LLInventoryModel* model):LLInvFVBridgeAction(id,model){}
+
+
+ BOOL isInTrash() const;
+ // return true if the item is in agent inventory. if false, it
+ // must be lost or in the inventory library.
+ BOOL isAgentInventory() const;
+
+ void wearOnAvatar();
+
+};
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index f98a3f9ee5..1176bf8735 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -112,7 +112,8 @@ const char* NEW_CATEGORY_NAMES[LLAssetType::AT_COUNT] =
"Uncompressed Images", // AT_IMAGE_JPEG
"Animations", // AT_ANIMATION
"Gestures", // AT_GESTURE
- "New Folder" // AT_SIMSTATE
+ "New Folder", // AT_SIMSTATE
+ "My Favorites" //AT_FAVORITE
};
struct InventoryIDPtrLess
@@ -389,7 +390,8 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
name.assign(pname);
}
else if((preferred_type >= LLAssetType::AT_TEXTURE) &&
- (preferred_type < LLAssetType::AT_SIMSTATE))
+ //why < LLAssetType::AT_SIMSTATE??? if preferred_type == LLAssetType::AT_SIMSTATE that will be handled above
+ (preferred_type < LLAssetType::AT_COUNT))
{
name.assign(NEW_CATEGORY_NAMES[preferred_type]);
}
diff --git a/indra/newview/lljoystickbutton.cpp b/indra/newview/lljoystickbutton.cpp
index 326c511fcf..539d889c51 100644
--- a/indra/newview/lljoystickbutton.cpp
+++ b/indra/newview/lljoystickbutton.cpp
@@ -51,6 +51,10 @@
static LLRegisterWidget<LLJoystickAgentSlide> r1("joystick_slide");
static LLRegisterWidget<LLJoystickAgentTurn> r2("joystick_turn");
+static LLRegisterWidget<LLJoystickCameraRotate> r3("joystick_rotate");
+static LLRegisterWidget<LLJoystickCameraZoom> r4("joystick_zoom");
+static LLRegisterWidget<LLJoystickCameraTrack> r5("joystick_track");
+
const F32 NUDGE_TIME = 0.25f; // in seconds
@@ -59,15 +63,18 @@ const F32 ORBIT_NUDGE_RATE = 0.05f; // fraction of normal speed
//
// Public Methods
//
-LLJoystick::LLJoystick(
- const std::string& name,
- LLRect rect,
- const std::string &default_image,
- const std::string &selected_image,
- EJoystickQuadrant initial_quadrant )
- :
- LLButton(name, rect, default_image, selected_image, LLStringUtil::null, NULL, NULL),
- mInitialQuadrant(initial_quadrant),
+void QuadrantNames::declareValues()
+{
+ declare("origin", JQ_ORIGIN);
+ declare("up", JQ_UP);
+ declare("down", JQ_DOWN);
+ declare("left", JQ_LEFT);
+ declare("right", JQ_RIGHT);
+}
+
+
+LLJoystick::LLJoystick(const LLJoystick::Params& p)
+: LLButton(p),
mInitialOffset(0, 0),
mLastMouse(0, 0),
mFirstMouse(0, 0),
@@ -76,10 +83,10 @@ LLJoystick::LLJoystick(
mHorizSlopNear(0),
mHorizSlopFar(0),
mHeldDown(FALSE),
- mHeldDownTimer()
+ mHeldDownTimer(),
+ mInitialQuadrant(p.quadrant)
{
- setHeldDownCallback(&LLJoystick::onHeldDown);
- setCallbackUserData(this);
+ setHeldDownCallback(&LLJoystick::onBtnHeldDown, this);
}
@@ -178,16 +185,14 @@ F32 LLJoystick::getElapsedHeldDownTime()
}
// static
-void LLJoystick::onHeldDown(void *userdata)
+void LLJoystick::onBtnHeldDown(void *userdata)
{
LLJoystick *self = (LLJoystick *)userdata;
-
- // somebody removed this function without checking the
- // build. Removed 2007-03-26.
- //llassert( gViewerWindow->hasMouseCapture( self ) );
-
- self->mHeldDown = TRUE;
- self->onHeldDown();
+ if (self)
+ {
+ self->mHeldDown = TRUE;
+ self->onHeldDown();
+ }
}
EJoystickQuadrant LLJoystick::selectQuadrant(LLXMLNodePtr node)
@@ -246,23 +251,6 @@ EJoystickQuadrant LLJoystick::quadrantFromName(const std::string& sQuadrant)
}
-LLXMLNodePtr LLJoystick::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- node->createChild("halign", TRUE)->setStringValue(LLFontGL::nameFromHAlign(getHAlign()));
- node->createChild("quadrant", TRUE)->setStringValue(nameFromQuadrant(mInitialQuadrant));
-
- addImageAttributeToXML(node,getImageUnselectedName(),getImageUnselectedID(),std::string("image_unselected"));
- addImageAttributeToXML(node,getImageSelectedName(),getImageSelectedID(),std::string("image_selected"));
-
- node->createChild("scale_image", TRUE)->setBoolValue(getScaleImage());
-
- return node;
-}
-
-
-
//-------------------------------------------------------------------------------
// LLJoystickAgentTurn
//-------------------------------------------------------------------------------
@@ -327,46 +315,6 @@ void LLJoystickAgentTurn::onHeldDown()
}
}
-LLView* LLJoystickAgentTurn::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("button");
- node->getAttributeString("name", name);
-
- std::string image_unselected;
- if (node->hasAttribute("image_unselected")) node->getAttributeString("image_unselected",image_unselected);
-
- std::string image_selected;
- if (node->hasAttribute("image_selected")) node->getAttributeString("image_selected",image_selected);
-
- EJoystickQuadrant quad = JQ_ORIGIN;
- if (node->hasAttribute("quadrant")) quad = selectQuadrant(node);
-
- LLJoystickAgentTurn *button = new LLJoystickAgentTurn(name,
- LLRect(),
- image_unselected,
- image_selected,
- quad);
-
- if (node->hasAttribute("halign"))
- {
- LLFontGL::HAlign halign = selectFontHAlign(node);
- button->setHAlign(halign);
- }
-
- if (node->hasAttribute("scale_image"))
- {
- BOOL needsScale = FALSE;
- node->getAttributeBOOL("scale_image",needsScale);
- button->setScaleImage( needsScale );
- }
-
- button->initFromXML(node, parent);
-
- return button;
-}
-
-
-
//-------------------------------------------------------------------------------
// LLJoystickAgentSlide
//-------------------------------------------------------------------------------
@@ -435,54 +383,12 @@ void LLJoystickAgentSlide::onHeldDown()
}
-// static
-LLView* LLJoystickAgentSlide::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("button");
- node->getAttributeString("name", name);
-
- std::string image_unselected;
- if (node->hasAttribute("image_unselected")) node->getAttributeString("image_unselected",image_unselected);
-
- std::string image_selected;
- if (node->hasAttribute("image_selected")) node->getAttributeString("image_selected",image_selected);
-
-
- EJoystickQuadrant quad = JQ_ORIGIN;
- if (node->hasAttribute("quadrant")) quad = selectQuadrant(node);
-
- LLJoystickAgentSlide *button = new LLJoystickAgentSlide(name,
- LLRect(),
- image_unselected,
- image_selected,
- quad);
-
- if (node->hasAttribute("halign"))
- {
- LLFontGL::HAlign halign = selectFontHAlign(node);
- button->setHAlign(halign);
- }
-
- if (node->hasAttribute("scale_image"))
- {
- BOOL needsScale = FALSE;
- node->getAttributeBOOL("scale_image",needsScale);
- button->setScaleImage( needsScale );
- }
-
- button->initFromXML(node, parent);
-
- return button;
-}
-
-
//-------------------------------------------------------------------------------
// LLJoystickCameraRotate
//-------------------------------------------------------------------------------
-LLJoystickCameraRotate::LLJoystickCameraRotate(const std::string& name, LLRect rect, const std::string &out_img, const std::string &in_img)
- :
- LLJoystick(name, rect, out_img, in_img, JQ_ORIGIN),
+LLJoystickCameraRotate::LLJoystickCameraRotate(const LLJoystickCameraRotate::Params& p)
+: LLJoystick(p),
mInLeft( FALSE ),
mInTop( FALSE ),
mInRight( FALSE ),
@@ -636,6 +542,13 @@ void LLJoystickCameraRotate::draw()
{
drawDebugRect();
}
+
+ //// *HACK: also draw debug rectangles around currently-being-edited LLView, and any elements that are being highlighted by GUI preview code (see LLFloaterUIPreview)
+ //std::set<LLView*>::iterator iter = std::find(sPreviewHighlightedElements.begin(), sPreviewHighlightedElements.end(), this);
+ //if ((sEditingUI && this == sEditingUIView) || (iter != sPreviewHighlightedElements.end() && sDrawPreviewHighlights))
+ //{
+ // drawDebugRect();
+ //}
}
// Draws image rotated by multiples of 90 degrees
@@ -679,6 +592,15 @@ void LLJoystickCameraRotate::drawRotatedImage( LLImageGL* image, S32 rotations )
// LLJoystickCameraTrack
//-------------------------------------------------------------------------------
+LLJoystickCameraTrack::Params::Params()
+{
+ held_down_delay.seconds(0.0);
+}
+
+LLJoystickCameraTrack::LLJoystickCameraTrack(const LLJoystickCameraTrack::Params& p)
+: LLJoystickCameraRotate(p)
+{}
+
void LLJoystickCameraTrack::onHeldDown()
{
@@ -717,17 +639,15 @@ void LLJoystickCameraTrack::onHeldDown()
// LLJoystickCameraZoom
//-------------------------------------------------------------------------------
-LLJoystickCameraZoom::LLJoystickCameraZoom(const std::string& name, LLRect rect, const std::string &out_img, const std::string &plus_in_img, const std::string &minus_in_img)
- :
- LLJoystick(name, rect, out_img, LLStringUtil::null, JQ_ORIGIN),
+LLJoystickCameraZoom::LLJoystickCameraZoom(const LLJoystickCameraZoom::Params& p)
+: LLJoystick(p),
mInTop( FALSE ),
- mInBottom( FALSE )
+ mInBottom( FALSE ),
+ mPlusInImage(p.plus_image),
+ mMinusInImage(p.minus_image)
{
- mPlusInImage = LLUIImageList::getInstance()->getUIImage(plus_in_img);
- mMinusInImage = LLUIImageList::getInstance()->getUIImage(minus_in_img);
}
-
BOOL LLJoystickCameraZoom::handleMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = LLJoystick::handleMouseDown(x, y, mask);
@@ -808,6 +728,13 @@ void LLJoystickCameraZoom::draw()
{
drawDebugRect();
}
+
+ //// *HACK: also draw debug rectangles around currently-being-edited LLView, and any elements that are being highlighted by GUI preview code (see LLFloaterUIPreview)
+ //std::set<LLView*>::iterator iter = std::find(sPreviewHighlightedElements.begin(), sPreviewHighlightedElements.end(), this);
+ //if ((sEditingUI && this == sEditingUIView) || (iter != sPreviewHighlightedElements.end() && sDrawPreviewHighlights))
+ //{
+ // drawDebugRect();
+ //}
}
void LLJoystickCameraZoom::updateSlop()
diff --git a/indra/newview/lljoystickbutton.h b/indra/newview/lljoystickbutton.h
index 076a506f14..954a8c481d 100644
--- a/indra/newview/lljoystickbutton.h
+++ b/indra/newview/lljoystickbutton.h
@@ -46,11 +46,27 @@ typedef enum e_joystick_quadrant
JQ_RIGHT
} EJoystickQuadrant;
+struct QuadrantNames : public LLInitParam::TypeValuesHelper<EJoystickQuadrant, QuadrantNames>
+{
+ static void declareValues();
+};
+
class LLJoystick
: public LLButton
{
public:
- LLJoystick(const std::string& name, LLRect rect, const std::string &default_image, const std::string &selected_image, EJoystickQuadrant initial);
+ struct Params
+ : public LLInitParam::Block<Params, LLButton::Params>
+ {
+ Optional<EJoystickQuadrant, QuadrantNames> quadrant;
+
+ Params()
+ : quadrant("quadrant", JQ_ORIGIN)
+ {
+ label("");
+ }
+ };
+ LLJoystick(const Params&);
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
@@ -60,10 +76,9 @@ public:
virtual void onHeldDown() = 0;
F32 getElapsedHeldDownTime();
- static void onHeldDown(void *userdata); // called by llbutton callback handler
+ static void onBtnHeldDown(void *userdata); // called by llbutton callback handler
void setInitialQuadrant(EJoystickQuadrant initial) { mInitialQuadrant = initial; };
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
static std::string nameFromQuadrant(const EJoystickQuadrant quadrant);
static EJoystickQuadrant quadrantFromName(const std::string& name);
static EJoystickQuadrant selectQuadrant(LLXMLNodePtr node);
@@ -91,14 +106,9 @@ class LLJoystickAgentTurn
: public LLJoystick
{
public:
- LLJoystickAgentTurn(const std::string& name, LLRect rect, const std::string &default_image, const std::string &selected_image, EJoystickQuadrant initial)
- : LLJoystick(name, rect, default_image, selected_image, initial)
- { }
-
+ struct Params : public LLJoystick::Params {};
+ LLJoystickAgentTurn(const Params& p) : LLJoystick(p) {}
virtual void onHeldDown();
-
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-
};
@@ -107,14 +117,11 @@ class LLJoystickAgentSlide
: public LLJoystick
{
public:
- LLJoystickAgentSlide(const std::string& name, LLRect rect, const std::string &default_image, const std::string &selected_image, EJoystickQuadrant initial)
- : LLJoystick(name, rect, default_image, selected_image, initial)
- { }
-
+ struct Params : public LLJoystick::Params {};
+ LLJoystickAgentSlide(const Params& p) : LLJoystick(p) {}
+
virtual void onHeldDown();
virtual void onMouseUp();
-
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
};
@@ -123,7 +130,16 @@ class LLJoystickCameraRotate
: public LLJoystick
{
public:
- LLJoystickCameraRotate(const std::string& name, LLRect rect, const std::string &out_img, const std::string &in_img);
+ struct Params
+ : public LLInitParam::Block<Params, LLJoystick::Params>
+ {
+ Params()
+ {
+ held_down_delay.seconds(0.0);
+ }
+ };
+
+ LLJoystickCameraRotate(const LLJoystickCameraRotate::Params&);
virtual void setToggleState( BOOL left, BOOL top, BOOL right, BOOL bottom );
@@ -149,10 +165,13 @@ class LLJoystickCameraTrack
: public LLJoystickCameraRotate
{
public:
- LLJoystickCameraTrack(const std::string& name, LLRect rect, const std::string &out_img, const std::string &in_img)
- : LLJoystickCameraRotate(name, rect, out_img, in_img)
- { }
+ struct Params
+ : public LLInitParam::Block<Params, LLJoystickCameraRotate::Params>
+ {
+ Params();
+ };
+ LLJoystickCameraTrack(const LLJoystickCameraTrack::Params&);
virtual void onHeldDown();
};
@@ -162,7 +181,20 @@ class LLJoystickCameraZoom
: public LLJoystick
{
public:
- LLJoystickCameraZoom(const std::string& name, LLRect rect, const std::string &out_img, const std::string &plus_in_img, const std::string &minus_in_img);
+ struct Params
+ : public LLInitParam::Block<Params, LLJoystick::Params>
+ {
+ Optional<LLUIImage*> plus_image;
+ Optional<LLUIImage*> minus_image;
+
+ Params()
+ : plus_image ("plus_image", NULL),
+ minus_image ("minus_image", NULL)
+ {
+ held_down_delay.seconds(0.0);
+ }
+ };
+ LLJoystickCameraZoom(const Params&);
virtual void setToggleState( BOOL top, BOOL bottom );
diff --git a/indra/newview/lllocationhistory.cpp b/indra/newview/lllocationhistory.cpp
new file mode 100644
index 0000000000..ab3256a186
--- /dev/null
+++ b/indra/newview/lllocationhistory.cpp
@@ -0,0 +1,130 @@
+/**
+ * @file lllocationhistory.cpp
+ * @brief Typed locations history
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "lllocationhistory.h"
+
+#include <iomanip> // for std::setw()
+
+LLLocationHistory::LLLocationHistory() :
+ mFilename("typed_locations.txt"),
+ mLoadedCallback(NULL)
+{
+}
+
+void LLLocationHistory::addItem(std::string item)
+{
+ mItems.push_back(item);
+
+ // If the vector size exceeds the maximum, purge the oldest items.
+ if (mItems.size() > MAX_ITEMS)
+ mItems.erase(mItems.begin(), mItems.end()-MAX_ITEMS);
+}
+
+
+bool LLLocationHistory::getMatchingItems(std::string substring, location_list_t& result) const
+{
+ // *TODO: an STL algorithm would look nicer
+ result.clear();
+
+ std::string needle = substring;
+ LLStringUtil::toLower(needle);
+
+ for (location_list_t::const_iterator it = mItems.begin(); it != mItems.end(); ++it)
+ {
+ std::string haystack = *it;
+ LLStringUtil::toLower(haystack);
+
+ if (haystack.find(needle) != std::string::npos)
+ result.push_back(*it);
+ }
+
+ return result.size();
+}
+
+void LLLocationHistory::dump() const
+{
+ llinfos << "Location history dump:" << llendl;
+ int i = 0;
+ for (location_list_t::const_iterator it = mItems.begin(); it != mItems.end(); ++it, ++i)
+ {
+ llinfos << "#" << std::setw(2) << std::setfill('0') << i << ": " << *it << llendl;
+ }
+}
+
+void LLLocationHistory::save() const
+{
+ // build filename for each user
+ std::string resolved_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, mFilename);
+
+ // open a file for writing
+ llofstream file (resolved_filename);
+ if (!file.is_open())
+ {
+ llwarns << "can't open location history file \"" << mFilename << "\" for writing" << llendl;
+ return;
+ }
+
+ for (location_list_t::const_iterator it = mItems.begin(); it != mItems.end(); ++it)
+ file << (*it) << std::endl;
+
+ file.close();
+}
+
+void LLLocationHistory::load()
+{
+ llinfos << "Loading location history." << llendl;
+
+ // build filename for each user
+ std::string resolved_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, mFilename);
+ llifstream file(resolved_filename);
+
+ if (!file.is_open())
+ {
+ llwarns << "can't load location history from file \"" << mFilename << "\"" << llendl;
+ return;
+ }
+
+ // remove current entries before we load over them
+ mItems.clear();
+
+ // add each line in the file to the list
+ std::string line;
+ while (std::getline(file, line))
+ addItem(line);
+
+ file.close();
+
+ if (mLoadedCallback)
+ mLoadedCallback();
+}
diff --git a/indra/newview/lllocationhistory.h b/indra/newview/lllocationhistory.h
new file mode 100644
index 0000000000..ea27d755fa
--- /dev/null
+++ b/indra/newview/lllocationhistory.h
@@ -0,0 +1,69 @@
+/**
+ * @file llocationhistory.h
+ * @brief Typed locations history
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLLOCATIONHISTORY_H
+#define LL_LLLOCATIONHISTORY_H
+
+#include "llsingleton.h" // for LLSingleton
+
+#include <vector>
+#include <string>
+#include <boost/function.hpp>
+
+class LLLocationHistory: public LLSingleton<LLLocationHistory>
+{
+ LOG_CLASS(LLLocationHistory);
+
+public:
+ typedef std::vector<std::string> location_list_t;
+ typedef boost::function<void()> loaded_callback_t;
+
+ LLLocationHistory();
+
+ void addItem(std::string item);
+ size_t getItemCount() const { return mItems.size(); }
+ const location_list_t& getItems() const { return mItems; }
+ bool getMatchingItems(std::string substring, location_list_t& result) const;
+ void setLoadedCallback(loaded_callback_t cb) { mLoadedCallback = cb; }
+
+ void save() const;
+ void load();
+ void dump() const;
+
+private:
+ static const size_t MAX_ITEMS = 10;
+ std::vector<std::string> mItems;
+ std::string mFilename; /// File to store the history to.
+ loaded_callback_t mLoadedCallback;
+};
+
+#endif
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
new file mode 100644
index 0000000000..67bf2d7265
--- /dev/null
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -0,0 +1,1126 @@
+/**
+ * @file lllocationinputmonitorctrl.cpp
+ * @brief Combobox-like location input control
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+// file includes
+#include "lllocationinputctrl.h"
+
+// common includes
+#include <llstring.h>
+#include <llcombobox.h>
+
+// newview includes
+#include "llbutton.h"
+#include "llkeyboard.h"
+#include "llscrolllistctrl.h"
+#include "llwindow.h"
+#include "llfloater.h"
+#include "llscrollbar.h"
+#include "llscrolllistcell.h"
+#include "llscrolllistitem.h"
+#include "llcontrol.h"
+#include "llfocusmgr.h"
+#include "lllineeditor.h"
+#include "v2math.h"
+#include "lluictrlfactory.h"
+
+// Globals
+static S32 MAX_COMBO_WIDTH = 500;
+
+static LLRegisterWidget<LLLocationInputCtrl> r("location_input");
+
+LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p)
+: LLUICtrl(p),
+ mTextEntry(NULL),
+ mTextEntryTentative(TRUE),
+ mListPosition(BELOW),
+ mAllowTextEntry(p.allow_text_entry),
+ mSelectOnFocus(p.select_on_focus),
+ mHasAutocompletedText(false),
+ mMaxChars(p.max_chars),
+ mPrearrangeCallback(p.prearrange_callback()),
+ mTextEntryCallback(p.text_entry_callback()),
+ mSelectionCallback(p.selection_callback()),
+ mArrowImage(p.arrow_image)
+{
+ // Text label button
+
+ LLButton::Params button_params;
+ button_params.name(p.label);
+ button_params.image_unselected.name("square_btn_32x128.tga");
+ button_params.image_selected.name("square_btn_selected_32x128.tga");
+ button_params.image_disabled.name("square_btn_32x128.tga");
+ button_params.image_disabled_selected.name("square_btn_selected_32x128.tga");
+ button_params.image_overlay.name("combobox_arrow.tga");
+ button_params.image_overlay_alignment("right");
+ button_params.scale_image(true);
+ button_params.mouse_down_callback.function(boost::bind(&LLLocationInputCtrl::onButtonDown, this));
+ button_params.font(LLFontGL::getFontSansSerifSmall());
+ button_params.follows.flags(FOLLOWS_LEFT|FOLLOWS_BOTTOM|FOLLOWS_RIGHT);
+ button_params.font_halign(LLFontGL::LEFT);
+ button_params.rect(p.rect);
+ button_params.pad_right(2);
+
+ mButton = LLUICtrlFactory::create<LLButton>(button_params);
+ mButton->setRightHPad(2); //redo to compensate for button hack that leaves space for a character
+ addChild(mButton);
+
+ LLScrollListCtrl::Params params;
+ params.name ("LocationInput");
+ params.commit_callback.function(boost::bind(&LLLocationInputCtrl::onItemSelected, this, _2));
+ params.visible(false);
+ params.bg_writeable_color(LLColor4::white);
+ params.commit_on_keyboard_movement(false);
+
+ mList = LLUICtrlFactory::create<LLScrollListCtrl>(params);
+ addChild(mList);
+
+ for (LLInitParam::ParamIterator<LLScrollListItem::Params>::const_iterator it = p.items().begin();
+ it != p.items().end();
+ ++it)
+ {
+ mList->addRow(*it);
+ }
+
+ setTopLostCallback(boost::bind(&LLLocationInputCtrl::hideList, this));
+}
+
+LLLocationInputCtrl::~LLLocationInputCtrl()
+{
+ // children automatically deleted, including mMenu, mButton
+}
+
+void LLLocationInputCtrl::setEnabled(BOOL enabled)
+{
+ LLView::setEnabled(enabled);
+ mButton->setEnabled(enabled);
+}
+
+void LLLocationInputCtrl::clear()
+{
+ if (mTextEntry)
+ {
+ mTextEntry->setText(LLStringUtil::null);
+ }
+ mButton->setLabelSelected(LLStringUtil::null);
+ mButton->setLabelUnselected(LLStringUtil::null);
+ mButton->setDisabledLabel(LLStringUtil::null);
+ mButton->setDisabledSelectedLabel(LLStringUtil::null);
+ mList->deselectAllItems();
+}
+
+void LLLocationInputCtrl::onCommit()
+{
+ if (mAllowTextEntry && getCurrentIndex() != -1)
+ {
+ // we have selected an existing item, blitz the manual text entry with
+ // the properly capitalized item
+ mTextEntry->setValue(getSimple());
+ mTextEntry->setTentative(FALSE);
+ }
+ LLUICtrl::onCommit();
+}
+
+// virtual
+BOOL LLLocationInputCtrl::isDirty() const
+{
+ BOOL grubby = FALSE;
+ if ( mList )
+ {
+ grubby = mList->isDirty();
+ }
+ return grubby;
+}
+
+// virtual Clear dirty state
+void LLLocationInputCtrl::resetDirty()
+{
+ if ( mList )
+ {
+ mList->resetDirty();
+ }
+}
+
+
+// add item "name" to menu
+LLScrollListItem* LLLocationInputCtrl::add(const std::string& name, EAddPosition pos, BOOL enabled)
+{
+ LLScrollListItem* item = mList->addSimpleElement(name, pos);
+ item->setEnabled(enabled);
+ if (!mAllowTextEntry && mLabel.empty())
+ {
+ selectFirstItem();
+ }
+ return item;
+}
+
+// add item "name" with a unique id to menu
+LLScrollListItem* LLLocationInputCtrl::add(const std::string& name, const LLUUID& id, EAddPosition pos, BOOL enabled )
+{
+ LLScrollListItem* item = mList->addSimpleElement(name, pos, id);
+ item->setEnabled(enabled);
+ if (!mAllowTextEntry && mLabel.empty())
+ {
+ selectFirstItem();
+ }
+ return item;
+}
+
+// add item "name" with attached userdata
+LLScrollListItem* LLLocationInputCtrl::add(const std::string& name, void* userdata, EAddPosition pos, BOOL enabled )
+{
+ LLScrollListItem* item = mList->addSimpleElement(name, pos);
+ item->setEnabled(enabled);
+ item->setUserdata( userdata );
+ if (!mAllowTextEntry && mLabel.empty())
+ {
+ selectFirstItem();
+ }
+ return item;
+}
+
+// add item "name" with attached generic data
+LLScrollListItem* LLLocationInputCtrl::add(const std::string& name, LLSD value, EAddPosition pos, BOOL enabled )
+{
+ LLScrollListItem* item = mList->addSimpleElement(name, pos, value);
+ item->setEnabled(enabled);
+ if (!mAllowTextEntry && mLabel.empty())
+ {
+ selectFirstItem();
+ }
+ return item;
+}
+
+LLScrollListItem* LLLocationInputCtrl::addSeparator(EAddPosition pos)
+{
+ return mList->addSeparator(pos);
+}
+
+void LLLocationInputCtrl::sortByName(BOOL ascending)
+{
+ mList->sortOnce(0, ascending);
+}
+
+
+// Choose an item with a given name in the menu.
+// Returns TRUE if the item was found.
+BOOL LLLocationInputCtrl::setSimple(const LLStringExplicit& name)
+{
+ BOOL found = mList->selectItemByLabel(name, FALSE);
+
+ if (found)
+ {
+ setLabel(name);
+ }
+
+ return found;
+}
+
+// virtual
+void LLLocationInputCtrl::setValue(const LLSD& value)
+{
+ BOOL found = mList->selectByValue(value);
+ if (found)
+ {
+ LLScrollListItem* item = mList->getFirstSelected();
+ if (item)
+ {
+ setLabel( mList->getSelectedItemLabel() );
+ }
+ }
+}
+
+const std::string LLLocationInputCtrl::getSimple() const
+{
+ const std::string res = mList->getSelectedItemLabel();
+ if (res.empty() && mAllowTextEntry)
+ {
+ return mTextEntry->getText();
+ }
+ else
+ {
+ return res;
+ }
+}
+
+const std::string LLLocationInputCtrl::getSelectedItemLabel(S32 column) const
+{
+ return mList->getSelectedItemLabel(column);
+}
+
+// virtual
+LLSD LLLocationInputCtrl::getValue() const
+{
+ LLScrollListItem* item = mList->getFirstSelected();
+ if( item )
+ {
+ return item->getValue();
+ }
+ else if (mAllowTextEntry)
+ {
+ return mTextEntry->getValue();
+ }
+ else
+ {
+ return LLSD();
+ }
+}
+
+void LLLocationInputCtrl::setLabel(const LLStringExplicit& name)
+{
+ if ( mTextEntry )
+ {
+ mTextEntry->setText(name);
+ if (mList->selectItemByLabel(name, FALSE))
+ {
+ mTextEntry->setTentative(FALSE);
+ }
+ else
+ {
+ mTextEntry->setTentative(mTextEntryTentative);
+ }
+ }
+
+ if (!mAllowTextEntry)
+ {
+ mButton->setLabelUnselected(name);
+ mButton->setLabelSelected(name);
+ mButton->setDisabledLabel(name);
+ mButton->setDisabledSelectedLabel(name);
+ }
+}
+
+
+BOOL LLLocationInputCtrl::remove(const std::string& name)
+{
+ BOOL found = mList->selectItemByLabel(name);
+
+ if (found)
+ {
+ LLScrollListItem* item = mList->getFirstSelected();
+ if (item)
+ {
+ mList->deleteSingleItem(mList->getItemIndex(item));
+ }
+ }
+
+ return found;
+}
+
+BOOL LLLocationInputCtrl::remove(S32 index)
+{
+ if (index < mList->getItemCount())
+ {
+ mList->deleteSingleItem(index);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+// Keyboard focus lost.
+void LLLocationInputCtrl::onFocusLost()
+{
+ hideList();
+ // if valid selection
+ if (mAllowTextEntry && getCurrentIndex() != -1)
+ {
+ mTextEntry->selectAll();
+ }
+ LLUICtrl::onFocusLost();
+}
+
+void LLLocationInputCtrl::setButtonVisible(BOOL visible)
+{
+ static LLUICachedControl<S32> drop_shadow_button ("DropShadowButton", 0);
+
+ mButton->setVisible(visible);
+ if (mTextEntry)
+ {
+ LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
+ if (visible)
+ {
+ text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth()) + 2 * drop_shadow_button;
+ }
+ //mTextEntry->setRect(text_entry_rect);
+ mTextEntry->reshape(text_entry_rect.getWidth(), text_entry_rect.getHeight(), TRUE);
+ }
+}
+
+/*virtual*/
+BOOL LLLocationInputCtrl::postBuild()
+{
+ // If providing user text entry or descriptive label don't select an item under the hood
+ if (!acceptsTextInput() && mLabel.empty())
+ {
+ selectFirstItem();
+ }
+ updateLayout();
+ return TRUE;
+}
+
+void LLLocationInputCtrl::draw()
+{
+ mButton->setEnabled(getEnabled() /*&& !mList->isEmpty()*/);
+
+ // Draw children normally
+ LLUICtrl::draw();
+}
+
+BOOL LLLocationInputCtrl::setCurrentByIndex( S32 index )
+{
+ BOOL found = mList->selectNthItem( index );
+ if (found)
+ {
+ setLabel(mList->getSelectedItemLabel());
+ }
+ return found;
+}
+
+S32 LLLocationInputCtrl::getCurrentIndex() const
+{
+ LLScrollListItem* item = mList->getFirstSelected();
+ if( item )
+ {
+ return mList->getItemIndex( item );
+ }
+ return -1;
+}
+
+
+void LLLocationInputCtrl::updateLayout()
+{
+ static LLUICachedControl<S32> drop_shadow_button ("DropShadowButton", 0);
+ LLRect rect = getLocalRect();
+ if (mAllowTextEntry)
+ {
+ S32 shadow_size = drop_shadow_button;
+ mButton->setRect(LLRect( getRect().getWidth() - llmax(8,mArrowImage->getWidth()) - 2 * shadow_size,
+ rect.mTop, rect.mRight, rect.mBottom));
+ mButton->setTabStop(FALSE);
+ mButton->setHAlign(LLFontGL::HCENTER);
+
+ if (!mTextEntry)
+ {
+ LLRect text_entry_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
+ text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth()) + 2 * drop_shadow_button;
+ // clear label on button
+ std::string cur_label = mButton->getLabelSelected();
+ LLLineEditor::Params params;
+ params.name ("combo_text_entry");
+ params.rect (text_entry_rect);
+ params.default_text (LLStringUtil::null);
+ params.font (LLFontGL::getFontSansSerifSmall());
+ params.max_length_bytes (mMaxChars);
+ params.commit_callback.function(boost::bind(&LLLocationInputCtrl::onTextCommit, this, _2));
+ params.keystroke_callback (boost::bind(&LLLocationInputCtrl::onTextEntry, this, _1));
+ params.focus_lost_callback (NULL);
+ params.select_on_focus (mSelectOnFocus);
+ params.handle_edit_keys_directly (true);
+ params.commit_on_focus_lost (false);
+ params.follows.flags (FOLLOWS_ALL);
+ mTextEntry = LLUICtrlFactory::create<LLLineEditor> (params);
+ mTextEntry->setText(cur_label);
+ mTextEntry->setIgnoreTab(TRUE);
+ mTextEntry->setRevertOnEsc(FALSE);
+ //mTextEntry->setFocusReceivedCallback(boost::bind(&LLLocationInputCtrl::hideList, this));
+ addChild(mTextEntry);
+ }
+ else
+ {
+ mTextEntry->setVisible(TRUE);
+ mTextEntry->setMaxTextLength(mMaxChars);
+ }
+
+ // clear label on button
+ setLabel(LLStringUtil::null);
+
+ mButton->setFollows(FOLLOWS_BOTTOM | FOLLOWS_TOP | FOLLOWS_RIGHT);
+ }
+ else if (!mAllowTextEntry)
+ {
+ mButton->setRect(rect);
+ mButton->setTabStop(TRUE);
+ mButton->setHAlign(LLFontGL::LEFT);
+
+ if (mTextEntry)
+ {
+ mTextEntry->setVisible(FALSE);
+ }
+ mButton->setFollowsAll();
+ }
+}
+
+void* LLLocationInputCtrl::getCurrentUserdata()
+{
+ LLScrollListItem* item = mList->getFirstSelected();
+ if( item )
+ {
+ return item->getUserdata();
+ }
+ return NULL;
+}
+
+
+void LLLocationInputCtrl::showList()
+{
+ // Make sure we don't go off top of screen.
+ LLCoordWindow window_size;
+ getWindow()->getSize(&window_size);
+ //HACK: shouldn't have to know about scale here
+ mList->fitContents( 192, llfloor((F32)window_size.mY / LLUI::sGLScaleFactor.mV[VY]) - 50 );
+
+ // Make sure that we can see the whole list
+ LLRect root_view_local;
+ LLView* root_view = getRootView();
+ root_view->localRectToOtherView(root_view->getLocalRect(), &root_view_local, this);
+
+ LLRect rect = mList->getRect();
+
+ S32 min_width = getRect().getWidth();
+ S32 max_width = llmax(min_width, MAX_COMBO_WIDTH);
+ // make sure we have up to date content width metrics
+ mList->calcColumnWidths();
+ S32 list_width = llclamp(mList->getMaxContentWidth(), min_width, max_width);
+
+ if (mListPosition == BELOW)
+ {
+ if (rect.getHeight() <= -root_view_local.mBottom)
+ {
+ // Move rect so it hangs off the bottom of this view
+ rect.setLeftTopAndSize(0, 0, list_width, rect.getHeight() );
+ }
+ else
+ {
+ // stack on top or bottom, depending on which has more room
+ if (-root_view_local.mBottom > root_view_local.mTop - getRect().getHeight())
+ {
+ // Move rect so it hangs off the bottom of this view
+ rect.setLeftTopAndSize(0, 0, list_width, llmin(-root_view_local.mBottom, rect.getHeight()));
+ }
+ else
+ {
+ // move rect so it stacks on top of this view (clipped to size of screen)
+ rect.setOriginAndSize(0, getRect().getHeight(), list_width, llmin(root_view_local.mTop - getRect().getHeight(), rect.getHeight()));
+ }
+ }
+ }
+ else // ABOVE
+ {
+ if (rect.getHeight() <= root_view_local.mTop - getRect().getHeight())
+ {
+ // move rect so it stacks on top of this view (clipped to size of screen)
+ rect.setOriginAndSize(0, getRect().getHeight(), list_width, llmin(root_view_local.mTop - getRect().getHeight(), rect.getHeight()));
+ }
+ else
+ {
+ // stack on top or bottom, depending on which has more room
+ if (-root_view_local.mBottom > root_view_local.mTop - getRect().getHeight())
+ {
+ // Move rect so it hangs off the bottom of this view
+ rect.setLeftTopAndSize(0, 0, list_width, llmin(-root_view_local.mBottom, rect.getHeight()));
+ }
+ else
+ {
+ // move rect so it stacks on top of this view (clipped to size of screen)
+ rect.setOriginAndSize(0, getRect().getHeight(), list_width, llmin(root_view_local.mTop - getRect().getHeight(), rect.getHeight()));
+ }
+ }
+
+ }
+ mList->setOrigin(rect.mLeft, rect.mBottom);
+ mList->reshape(rect.getWidth(), rect.getHeight());
+ mList->translateIntoRect(root_view_local, FALSE);
+
+ // Make sure we didn't go off bottom of screen
+ S32 x, y;
+ mList->localPointToScreen(0, 0, &x, &y);
+
+ if (y < 0)
+ {
+ mList->translate(0, -y);
+ }
+
+ // NB: this call will trigger the focuslost callback which will hide the list, so do it first
+ // before finally showing the list
+
+ mList->setFocus(TRUE);
+
+ // register ourselves as a "top" control
+ // effectively putting us into a special draw layer
+ // and not affecting the bounding rectangle calculation
+ gFocusMgr.setTopCtrl(this);
+
+ // Show the list and push the button down
+ mButton->setToggleState(TRUE);
+ mList->setVisible(TRUE);
+
+ setUseBoundingRect(TRUE);
+}
+
+void LLLocationInputCtrl::hideList()
+{
+ //*HACK: store the original value explicitly somewhere, not just in label
+ std::string orig_selection = mAllowTextEntry ? mTextEntry->getText() : mButton->getLabelSelected();
+
+ // assert selection in list
+ mList->selectItemByLabel(orig_selection, FALSE);
+
+ mButton->setToggleState(FALSE);
+ mList->setVisible(FALSE);
+ mList->mouseOverHighlightNthItem(-1);
+
+ setUseBoundingRect(FALSE);
+
+ if( gFocusMgr.getTopCtrl() == this )
+ {
+ gFocusMgr.setTopCtrl(NULL);
+ }
+}
+
+void LLLocationInputCtrl::onButtonDown()
+{
+ if (!mList->getVisible())
+ {
+#if 0 // XXX VS
+ LLScrollListItem* last_selected_item = mList->getLastSelectedItem();
+ if (last_selected_item)
+ {
+ // highlight the original selection before potentially selecting a new item
+ mList->mouseOverHighlightNthItem(mList->getItemIndex(last_selected_item));
+ }
+#endif
+
+ prearrangeList();
+
+ if (mList->getItemCount() != 0)
+ {
+ showList();
+ }
+
+ setFocus( TRUE );
+
+ // pass mouse capture on to list if button is depressed
+ if (mButton->hasMouseCapture())
+ {
+ gFocusMgr.setMouseCapture(mList);
+ }
+ }
+ else
+ {
+ hideList();
+ // XXX VS
+ mTextEntry->setFocus(TRUE);
+ }
+
+}
+
+
+//------------------------------------------------------------------
+// static functions
+//------------------------------------------------------------------
+
+void LLLocationInputCtrl::onItemSelected(const LLSD& data)
+{
+ const std::string name = mList->getSelectedItemLabel();
+
+ S32 cur_id = getCurrentIndex();
+ if (cur_id != -1)
+ {
+ setLabel(name);
+
+ if (mAllowTextEntry)
+ {
+ gFocusMgr.setKeyboardFocus(mTextEntry);
+ mTextEntry->selectAll();
+ }
+ }
+
+ // hiding the list reasserts the old value stored in the text editor/dropdown button
+ hideList();
+
+ // commit does the reverse, asserting the value in the list
+ onCommit();
+
+ // call the callback if it exists
+ if(mSelectionCallback)
+ {
+ mSelectionCallback(this, data);
+ }
+}
+
+BOOL LLLocationInputCtrl::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
+{
+ std::string tool_tip;
+
+ if(LLUICtrl::handleToolTip(x, y, msg, sticky_rect_screen))
+ {
+ return TRUE;
+ }
+
+ if (LLUI::sShowXUINames)
+ {
+ tool_tip = getShowNamesToolTip();
+ }
+ else
+ {
+ tool_tip = getToolTip();
+ if (tool_tip.empty())
+ {
+ tool_tip = getSelectedItemLabel();
+ }
+ }
+
+ if( !tool_tip.empty() )
+ {
+ msg = tool_tip;
+
+ // Convert rect local to screen coordinates
+ localPointToScreen(
+ 0, 0,
+ &(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
+ localPointToScreen(
+ getRect().getWidth(), getRect().getHeight(),
+ &(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) );
+ }
+ return TRUE;
+}
+
+BOOL LLLocationInputCtrl::handleKeyHere(KEY key, MASK mask)
+{
+ BOOL result = FALSE;
+ if (hasFocus())
+ {
+ if (mList->getVisible()
+ && key == KEY_ESCAPE && mask == MASK_NONE)
+ {
+ hideList();
+ // XXX VS
+ mTextEntry->setFocus(TRUE);
+ return TRUE;
+ }
+ //give list a chance to pop up and handle key
+ LLScrollListItem* last_selected_item = mList->getLastSelectedItem();
+ if (last_selected_item)
+ {
+ // highlight the original selection before potentially selecting a new item
+ mList->mouseOverHighlightNthItem(mList->getItemIndex(last_selected_item));
+ }
+ result = mList->handleKeyHere(key, mask);
+
+ // will only see return key if it is originating from line editor
+ // since the dropdown button eats the key
+ if (key == KEY_RETURN)
+ {
+ // don't show list and don't eat key input when committing
+ // free-form text entry with RETURN since user already knows
+ // what they are trying to select
+ return FALSE;
+ }
+ // if selection has changed, pop open list
+ // XXX VS
+#if 1
+ else if(key == KEY_DOWN && mList->getItemCount() != 0)
+#else
+ else if (mList->getLastSelectedItem() != last_selected_item)
+#endif
+ {
+ showList();
+ }
+
+ }
+ return result;
+}
+
+BOOL LLLocationInputCtrl::handleUnicodeCharHere(llwchar uni_char)
+{
+ BOOL result = FALSE;
+ if (gFocusMgr.childHasKeyboardFocus(this))
+ {
+ // space bar just shows the list
+ if (' ' != uni_char )
+ {
+ LLScrollListItem* last_selected_item = mList->getLastSelectedItem();
+ if (last_selected_item)
+ {
+ // highlight the original selection before potentially selecting a new item
+ mList->mouseOverHighlightNthItem(mList->getItemIndex(last_selected_item));
+ }
+ result = mList->handleUnicodeCharHere(uni_char);
+ if (mList->getLastSelectedItem() != last_selected_item)
+ {
+ showList();
+ }
+ }
+ }
+ return result;
+}
+
+void LLLocationInputCtrl::setTextEntry(const LLStringExplicit& text)
+{
+ if (mTextEntry)
+ {
+ setText(text);
+ updateSelection();
+ }
+}
+
+/**
+ * Useful if we want to just set the text entry value, no matter what the list contains.
+ *
+ * This is faster than setTextEntry().
+ */
+void LLLocationInputCtrl::setText(const LLStringExplicit& text)
+{
+ if (mTextEntry)
+ mTextEntry->setText(text);
+}
+
+void LLLocationInputCtrl::onTextEntry(LLLineEditor* line_editor)
+{
+ if (mTextEntryCallback != NULL)
+ {
+ (mTextEntryCallback)(line_editor, LLSD());
+ }
+
+ KEY key = gKeyboard->currentKey();
+
+ // XXX VS
+ {
+ if (line_editor->getText().empty())
+ {
+ prearrangeList(); // resets filter
+ hideList();
+ }
+ // Moving cursor should not affect showing the list.
+ else if (key != KEY_LEFT && key != KEY_RIGHT && key != KEY_HOME && key != KEY_END)
+ {
+ prearrangeList(line_editor->getText());
+ if (mList->getItemCount() != 0)
+ {
+ showList();
+ }
+ else
+ {
+ // Hide the list if it's empty.
+ hideList();
+ }
+
+ mTextEntry->setFocus(TRUE);
+ }
+ }
+
+ if (key == KEY_BACKSPACE ||
+ key == KEY_DELETE)
+ {
+ if (mList->selectItemByLabel(line_editor->getText(), FALSE))
+ {
+ line_editor->setTentative(FALSE);
+ }
+ else
+ {
+ line_editor->setTentative(mTextEntryTentative);
+ mList->deselectAllItems();
+ }
+ return;
+ }
+
+ if (key == KEY_LEFT ||
+ key == KEY_RIGHT)
+ {
+ return;
+ }
+
+ if (key == KEY_DOWN)
+ {
+ setCurrentByIndex(llmin(getItemCount() - 1, getCurrentIndex() + 1));
+ if (!mList->getVisible())
+ {
+ prearrangeList();
+
+ if (mList->getItemCount() != 0)
+ {
+ showList();
+ }
+ }
+ line_editor->selectAll();
+ line_editor->setTentative(FALSE);
+ }
+ else
+ {
+ // RN: presumably text entry
+ updateSelection();
+ }
+}
+
+void LLLocationInputCtrl::updateSelection()
+{
+ LLWString left_wstring = mTextEntry->getWText().substr(0, mTextEntry->getCursor());
+ // user-entered portion of string, based on assumption that any selected
+ // text was a result of auto-completion
+ LLWString user_wstring = mHasAutocompletedText ? left_wstring : mTextEntry->getWText();
+ std::string full_string = mTextEntry->getText();
+
+ // go ahead and arrange drop down list on first typed character, even
+ // though we aren't showing it... some code relies on prearrange
+ // callback to populate content
+ if( mTextEntry->getWText().size() == 1 )
+ {
+ prearrangeList(mTextEntry->getText());
+ }
+
+ if (mList->selectItemByLabel(full_string, FALSE))
+ {
+ mTextEntry->setTentative(FALSE);
+ }
+ else if (mList->selectItemByPrefix(left_wstring, FALSE))
+ {
+ LLWString selected_item = utf8str_to_wstring(mList->getSelectedItemLabel());
+ LLWString wtext = left_wstring + selected_item.substr(left_wstring.size(), selected_item.size());
+ mTextEntry->setText(wstring_to_utf8str(wtext));
+ mTextEntry->setSelection(left_wstring.size(), mTextEntry->getWText().size());
+ mTextEntry->endSelection();
+ mTextEntry->setTentative(FALSE);
+ mHasAutocompletedText = TRUE;
+ }
+ else // no matching items found
+ {
+ mList->deselectAllItems();
+ mTextEntry->setText(wstring_to_utf8str(user_wstring)); // removes text added by autocompletion
+ mTextEntry->setTentative(mTextEntryTentative);
+ mHasAutocompletedText = FALSE;
+ }
+}
+
+void LLLocationInputCtrl::onTextCommit(const LLSD& data)
+{
+ std::string text = mTextEntry->getText();
+ setSimple(text);
+ onCommit();
+ mTextEntry->selectAll();
+}
+
+void LLLocationInputCtrl::setFocus(BOOL b)
+{
+ LLUICtrl::setFocus(b);
+
+ if (b)
+ {
+ mList->clearSearchString();
+ if (mList->getVisible())
+ {
+ mList->setFocus(TRUE);
+ }
+ else
+ {
+ mTextEntry->setFocus(TRUE);
+ }
+ }
+}
+
+//============================================================================
+// LLCtrlListInterface functions
+
+S32 LLLocationInputCtrl::getItemCount() const
+{
+ return mList->getItemCount();
+}
+
+void LLLocationInputCtrl::addColumn(const LLSD& column, EAddPosition pos)
+{
+ mList->clearColumns();
+ mList->addColumn(column, pos);
+}
+
+void LLLocationInputCtrl::clearColumns()
+{
+ mList->clearColumns();
+}
+
+void LLLocationInputCtrl::setColumnLabel(const std::string& column, const std::string& label)
+{
+ mList->setColumnLabel(column, label);
+}
+
+LLScrollListItem* LLLocationInputCtrl::addElement(const LLSD& value, EAddPosition pos, void* userdata)
+{
+ return mList->addElement(value, pos, userdata);
+}
+
+LLScrollListItem* LLLocationInputCtrl::addSimpleElement(const std::string& value, EAddPosition pos, const LLSD& id)
+{
+ return mList->addSimpleElement(value, pos, id);
+}
+
+void LLLocationInputCtrl::clearRows()
+{
+ mList->clearRows();
+}
+
+void LLLocationInputCtrl::sortByColumn(const std::string& name, BOOL ascending)
+{
+ mList->sortByColumn(name, ascending);
+}
+
+//============================================================================
+//LLCtrlSelectionInterface functions
+
+BOOL LLLocationInputCtrl::setCurrentByID(const LLUUID& id)
+{
+ BOOL found = mList->selectByID( id );
+
+ if (found)
+ {
+ setLabel(mList->getSelectedItemLabel());
+ }
+
+ return found;
+}
+
+LLUUID LLLocationInputCtrl::getCurrentID() const
+{
+ return mList->getStringUUIDSelectedItem();
+}
+BOOL LLLocationInputCtrl::setSelectedByValue(const LLSD& value, BOOL selected)
+{
+ BOOL found = mList->setSelectedByValue(value, selected);
+ if (found)
+ {
+ setLabel(mList->getSelectedItemLabel());
+ }
+ return found;
+}
+
+LLSD LLLocationInputCtrl::getSelectedValue()
+{
+ return mList->getSelectedValue();
+}
+
+BOOL LLLocationInputCtrl::isSelected(const LLSD& value) const
+{
+ return mList->isSelected(value);
+}
+
+BOOL LLLocationInputCtrl::operateOnSelection(EOperation op)
+{
+ if (op == OP_DELETE)
+ {
+ mList->deleteSelectedItems();
+ return TRUE;
+ }
+ return FALSE;
+}
+
+BOOL LLLocationInputCtrl::operateOnAll(EOperation op)
+{
+ if (op == OP_DELETE)
+ {
+ clearRows();
+ return TRUE;
+ }
+ return FALSE;
+}
+
+BOOL LLLocationInputCtrl::selectItemRange( S32 first, S32 last )
+{
+ return mList->selectItemRange(first, last);
+}
+
+void LLLocationInputCtrl::prearrangeList(std::string filter)
+{
+ if (mPrearrangeCallback)
+ {
+ mPrearrangeCallback(this, LLSD(filter));
+ }
+}
+
+//===========================================================================
+
+BOOL LLLocationInputCtrl::childHasFocus() const
+{
+ return LLUICtrl::hasFocus() || mButton->hasFocus() || mList->hasFocus() || mTextEntry->hasFocus();
+}
+
+BOOL LLLocationInputCtrl::canCut() const
+{
+ return mTextEntry ? mTextEntry->canCut() : false;
+}
+
+BOOL LLLocationInputCtrl::canCopy() const
+{
+ return mTextEntry ? mTextEntry->canCopy() : false;
+}
+
+BOOL LLLocationInputCtrl::canPaste() const
+{
+ return mTextEntry ? mTextEntry->canPaste() : false;
+}
+
+BOOL LLLocationInputCtrl::canDeselect() const
+{
+ return mTextEntry ? mTextEntry->canDeselect() : false;
+}
+
+BOOL LLLocationInputCtrl::canSelectAll() const
+{
+ return mTextEntry ? mTextEntry->canSelectAll() : false;
+}
+
+void LLLocationInputCtrl::cut()
+{
+ if (mTextEntry)
+ mTextEntry->cut();
+}
+
+void LLLocationInputCtrl::copy()
+{
+ if (mTextEntry)
+ mTextEntry->copy();
+}
+
+void LLLocationInputCtrl::paste()
+{
+ if (mTextEntry)
+ mTextEntry->paste();
+}
+
+void LLLocationInputCtrl::deleteSelection()
+{
+ if (mTextEntry)
+ mTextEntry->deleteSelection();
+}
+
+void LLLocationInputCtrl::selectAll()
+{
+ if (mTextEntry)
+ mTextEntry->selectAll();
+}
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h
new file mode 100644
index 0000000000..07aa30295c
--- /dev/null
+++ b/indra/newview/lllocationinputctrl.h
@@ -0,0 +1,248 @@
+/**
+ * @file lllocationinputmonitorctrl.h
+ * @brief Combobox-like location input control
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLLOCATIONINPUTCTRL_H
+#define LL_LLLOCATIONINPUTCTRL_H
+
+#include "llbutton.h"
+#include "lluictrl.h"
+#include "llctrlselectioninterface.h"
+#include "llimagegl.h"
+#include "llrect.h"
+#include "llscrolllistitem.h"
+#include <boost/function.hpp>
+
+// Classes
+class LLButton;
+class LLFontGL;
+class LLLineEditor;
+class LLScrollListCtrl;
+class LLSquareButton;
+class LLUICtrlFactory;
+class LLViewBorder;
+
+/**
+ * Location input control.
+ *
+ * This is currently just a copy of LLComboBox (which is not exactly what the nav bar needs).
+ * The only major difference so far is the way auto-completion works.
+ *
+ * @see LLNavigationBar
+ */
+class LLLocationInputCtrl
+: public LLUICtrl, public LLCtrlListInterface
+{
+ LOG_CLASS(LLLocationInputCtrl);
+
+public:
+ struct Params
+ : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<bool> allow_text_entry, select_on_focus;
+ Optional<S32> max_chars;
+ Optional<commit_callback_t> prearrange_callback;
+ Optional<commit_callback_t> text_entry_callback;
+ Optional<commit_callback_t > selection_callback;
+ Optional<LLUIImage*> arrow_image;
+Multiple<LLScrollListItem::Params> items;
+
+ Params()
+ : allow_text_entry("allow_text_entry", false),
+ select_on_focus("select_on_focus", true),
+ max_chars("max_chars", 20),
+ arrow_image("arrow_image", LLUI::getUIImage("combobox_arrow.tga")),
+ items("item")
+ {
+ addSynonym(items, "combo_item");
+ }
+ };
+
+ typedef enum e_preferred_position
+ {
+ ABOVE,
+ BELOW
+ } EPreferredPosition;
+
+ virtual ~LLLocationInputCtrl();
+protected:
+ friend class LLUICtrlFactory;
+ LLLocationInputCtrl(const Params&);
+public:
+ // LLView interface
+
+ virtual BOOL postBuild();
+ virtual void draw();
+ virtual void onFocusLost();
+
+ virtual void setEnabled(BOOL enabled);
+
+ virtual BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
+ virtual BOOL handleKeyHere(KEY key, MASK mask);
+ virtual BOOL handleUnicodeCharHere(llwchar uni_char);
+
+ // LLUICtrl interface
+ virtual void clear(); // select nothing
+ virtual void onCommit();
+ virtual BOOL acceptsTextInput() const { return mAllowTextEntry; }
+ virtual BOOL isDirty() const; // Returns TRUE if the user has modified this control.
+ virtual void resetDirty(); // Clear dirty state
+
+ virtual void setFocus(BOOL b);
+
+ // Selects item by underlying LLSD value, using LLSD::asString() matching.
+ // For simple items, this is just the name of the label.
+ virtual void setValue(const LLSD& value );
+
+ // Gets underlying LLSD value for currently selected items. For simple
+ // items, this is just the label.
+ virtual LLSD getValue() const;
+
+ void setTextEntry(const LLStringExplicit& text);
+ void setText(const LLStringExplicit& text);
+
+ LLScrollListItem* add(const std::string& name, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE); // add item "name" to menu
+ LLScrollListItem* add(const std::string& name, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+ LLScrollListItem* add(const std::string& name, void* userdata, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+ LLScrollListItem* add(const std::string& name, LLSD value, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+ LLScrollListItem* addSeparator(EAddPosition pos = ADD_BOTTOM);
+ BOOL remove( S32 index ); // remove item by index, return TRUE if found and removed
+ void removeall() { clearRows(); }
+
+ void sortByName(BOOL ascending = TRUE); // Sort the entries in the combobox by name
+
+ // Select current item by name using selectItemByLabel. Returns FALSE if not found.
+ BOOL setSimple(const LLStringExplicit& name);
+ // Get name of current item. Returns an empty string if not found.
+ const std::string getSimple() const;
+ // Get contents of column x of selected row
+ const std::string getSelectedItemLabel(S32 column = 0) const;
+
+ // Sets the label, which doesn't have to exist in the label.
+ // This is probably a UI abuse.
+ void setLabel(const LLStringExplicit& name);
+
+ BOOL remove(const std::string& name); // remove item "name", return TRUE if found and removed
+
+ BOOL setCurrentByIndex( S32 index );
+ S32 getCurrentIndex() const;
+
+ virtual void updateLayout();
+
+ //========================================================================
+ LLCtrlSelectionInterface* getSelectionInterface() { return (LLCtrlSelectionInterface*)this; };
+ LLCtrlListInterface* getListInterface() { return (LLCtrlListInterface*)this; };
+
+ // LLCtrlListInterface functions
+ // See llscrolllistctrl.h
+ virtual S32 getItemCount() const;
+ // Overwrites the default column (See LLScrollListCtrl for format)
+ virtual void addColumn(const LLSD& column, EAddPosition pos = ADD_BOTTOM);
+ virtual void clearColumns();
+ virtual void setColumnLabel(const std::string& column, const std::string& label);
+ virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
+ virtual LLScrollListItem* addSimpleElement(const std::string& value, EAddPosition pos = ADD_BOTTOM, const LLSD& id = LLSD());
+ virtual void clearRows();
+ virtual void sortByColumn(const std::string& name, BOOL ascending);
+
+ // LLCtrlSelectionInterface functions
+ virtual BOOL getCanSelect() const { return TRUE; }
+ virtual BOOL selectFirstItem() { return setCurrentByIndex(0); }
+ virtual BOOL selectNthItem( S32 index ) { return setCurrentByIndex(index); }
+ virtual BOOL selectItemRange( S32 first, S32 last );
+ virtual S32 getFirstSelectedIndex() const { return getCurrentIndex(); }
+ virtual BOOL setCurrentByID( const LLUUID& id );
+ virtual LLUUID getCurrentID() const; // LLUUID::null if no items in menu
+ virtual BOOL setSelectedByValue(const LLSD& value, BOOL selected);
+ virtual LLSD getSelectedValue();
+ virtual BOOL isSelected(const LLSD& value) const;
+ virtual BOOL operateOnSelection(EOperation op);
+ virtual BOOL operateOnAll(EOperation op);
+
+ //========================================================================
+
+ void* getCurrentUserdata();
+
+ void setPrearrangeCallback( commit_callback_t cb ) { mPrearrangeCallback = cb; }
+ void setTextEntryCallback( commit_callback_t cb ) { mTextEntryCallback = cb; }
+ void setSelectionCallback( commit_callback_t cb ) { mSelectionCallback = cb; }
+
+ void setButtonVisible(BOOL visible);
+
+ void onButtonDown();
+ void onItemSelected(const LLSD& data);
+ void onTextCommit(const LLSD& data);
+
+ virtual void updateSelection();
+ virtual void showList();
+ virtual void hideList();
+
+ //========================================================================
+ BOOL childHasFocus() const; /// Is one of our children focused?
+
+ BOOL canCut() const;
+ BOOL canCopy() const;
+ BOOL canPaste() const;
+ BOOL canDeselect() const;
+ BOOL canSelectAll() const;
+
+ void cut();
+ void copy();
+ void paste();
+ void deleteSelection();
+ void selectAll();
+ //========================================================================
+
+ void onTextEntry(LLLineEditor* line_editor);
+
+protected:
+
+ void prearrangeList(std::string filter = "");
+
+
+ LLButton* mButton;
+ LLScrollListCtrl* mList;
+ EPreferredPosition mListPosition;
+ LLPointer<LLUIImage> mArrowImage;
+ std::string mLabel;
+ S32 mButtonPadding;
+ LLLineEditor* mTextEntry;
+ BOOL mAllowTextEntry;
+ BOOL mSelectOnFocus;
+ BOOL mHasAutocompletedText;
+ S32 mMaxChars;
+ BOOL mTextEntryTentative;
+ commit_callback_t mPrearrangeCallback;
+ commit_callback_t mTextEntryCallback;
+ commit_callback_t mSelectionCallback;
+};
+
+#endif
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 1709d6465d..29cf996f7c 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -35,6 +35,7 @@
#include "lllogchat.h"
#include "llappviewer.h"
#include "llfloaterchat.h"
+#include "lltrans.h"
const S32 LOG_RECALL_SIZE = 2048;
@@ -64,20 +65,21 @@ std::string LLLogChat::timestamp(bool withdate)
time_t utc_time;
utc_time = time_corrected();
- // There's only one internal tm buffer.
- struct tm* timep;
+ std::string timeStr;
+ LLSD substitution;
+ substitution["datetime"] = (S32) utc_time;
- // Convert to Pacific, based on server's opinion of whether
- // it's daylight savings time there.
- timep = utc_to_pacific_time(utc_time, gPacificDaylightTime);
-
- std::string text;
if (withdate)
- text = llformat("[%d/%02d/%02d %d:%02d] ", (timep->tm_year-100)+2000, timep->tm_mon+1, timep->tm_mday, timep->tm_hour, timep->tm_min);
+ {
+ timeStr = LLTrans::getString ("LogChatDateTime");
+ }
else
- text = llformat("[%d:%02d] ", timep->tm_hour, timep->tm_min);
+ {
+ timeStr = LLTrans::getString ("LogChatTime");
+ }
- return text;
+ LLStringUtil::format (timeStr, substitution);
+ return timeStr;
}
@@ -114,7 +116,7 @@ void LLLogChat::loadHistory(std::string filename , void (*callback)(ELogLineType
LLFILE* fptr = LLFile::fopen(makeLogFileName(filename), "r"); /*Flawfinder: ignore*/
if (!fptr)
{
- //LLUIString message = LLFloaterChat::getInstance()->getString("IM_logging_string");
+ //LLUIString message = LLTrans::getString("IM_logging_string");
//callback(LOG_EMPTY,"IM_logging_string",userdata);
callback(LOG_EMPTY,LLStringUtil::null,userdata);
return; //No previous conversation with this name.
diff --git a/indra/newview/llloginhandler.cpp b/indra/newview/llloginhandler.cpp
index 053f798882..554163c8e1 100644
--- a/indra/newview/llloginhandler.cpp
+++ b/indra/newview/llloginhandler.cpp
@@ -156,15 +156,9 @@ void LLLoginHandler::parse(const LLSD& queryMap)
{
LLURLSimString::setString(queryMap["region"].asString());
}
- else if (startLocation == "home")
+ else if (!startLocation.empty()) // "last" or "home" or ??? (let LLURLSimString figure it out)
{
- gSavedSettings.setBOOL("LoginLastLocation", FALSE);
- LLURLSimString::setString(LLStringUtil::null);
- }
- else if (startLocation == "last")
- {
- gSavedSettings.setBOOL("LoginLastLocation", TRUE);
- LLURLSimString::setString(LLStringUtil::null);
+ LLURLSimString::setString(startLocation);
}
}
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp
index 53c74aaec1..2d852dea40 100644
--- a/indra/newview/llmanip.cpp
+++ b/indra/newview/llmanip.cpp
@@ -452,35 +452,36 @@ void LLManip::renderXYZ(const LLVector3 &vec)
gViewerWindow->setup3DRender();
{
+ LLFontGL* font = LLFontGL::getFontSansSerif();
LLLocale locale(LLLocale::USER_LOCALE);
LLGLDepthTest gls_depth(GL_FALSE);
// render drop shadowed text
feedback_string = llformat("X: %.3f", vec.mV[VX]);
- hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -102.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
+ hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *font, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -102.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
feedback_string = llformat("Y: %.3f", vec.mV[VY]);
- hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -27.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
+ hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *font, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -27.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
feedback_string = llformat("Z: %.3f", vec.mV[VZ]);
- hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, 48.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
+ hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *font, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, 48.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
// render text on top
feedback_string = llformat("X: %.3f", vec.mV[VX]);
- hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -102.f, (F32)vertical_offset, LLColor4(1.f, 0.5f, 0.5f, 1.f), FALSE);
+ hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *font, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -102.f, (F32)vertical_offset, LLColor4(1.f, 0.5f, 0.5f, 1.f), FALSE);
glColor3f(0.5f, 1.f, 0.5f);
feedback_string = llformat("Y: %.3f", vec.mV[VY]);
- hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -27.f, (F32)vertical_offset, LLColor4(0.5f, 1.f, 0.5f, 1.f), FALSE);
+ hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *font, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -27.f, (F32)vertical_offset, LLColor4(0.5f, 1.f, 0.5f, 1.f), FALSE);
glColor3f(0.5f, 0.5f, 1.f);
feedback_string = llformat("Z: %.3f", vec.mV[VZ]);
- hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, 48.f, (F32)vertical_offset, LLColor4(0.5f, 0.5f, 1.f, 1.f), FALSE);
+ hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *font, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, 48.f, (F32)vertical_offset, LLColor4(0.5f, 0.5f, 1.f, 1.f), FALSE);
}
}
void LLManip::renderTickText(const LLVector3& pos, const std::string& text, const LLColor4 &color)
{
- const LLFontGL* big_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
+ const LLFontGL* big_fontp = LLFontGL::getFontSansSerif();
BOOL hud_selection = mObjectSelection->getSelectType() == SELECT_TYPE_HUD;
glMatrixMode(GL_MODELVIEW);
@@ -499,9 +500,9 @@ void LLManip::renderTickText(const LLVector3& pos, const std::string& text, cons
LLColor4 shadow_color = LLColor4::black;
shadow_color.mV[VALPHA] = color.mV[VALPHA] * 0.5f;
gViewerWindow->setupViewport(1, -1);
- hud_render_utf8text(text, render_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(text), 3.f, shadow_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
+ hud_render_utf8text(text, render_pos, *big_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -0.5f * big_fontp->getWidthF32(text), 3.f, shadow_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
gViewerWindow->setupViewport();
- hud_render_utf8text(text, render_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(text), 3.f, color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
+ hud_render_utf8text(text, render_pos, *big_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -0.5f * big_fontp->getWidthF32(text), 3.f, color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
glPopMatrix();
}
@@ -510,8 +511,8 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const std::string
{
LLLocale locale(LLLocale::USER_LOCALE);
- const LLFontGL* big_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
- const LLFontGL* small_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
+ const LLFontGL* big_fontp = LLFontGL::getFontSansSerif();
+ const LLFontGL* small_fontp = LLFontGL::getFontSansSerifSmall();
std::string val_string;
std::string fraction_string;
@@ -561,28 +562,28 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const std::string
fraction_string = llformat("%c%02d%s", LLResMgr::getInstance()->getDecimalPoint(), fractional_portion, suffix.c_str());
gViewerWindow->setupViewport(1, -1);
- hud_render_utf8text(val_string, render_pos, *big_fontp, LLFontGL::NORMAL, -1.f * big_fontp->getWidthF32(val_string), 3.f, shadow_color, hud_selection);
- hud_render_utf8text(fraction_string, render_pos, *small_fontp, LLFontGL::NORMAL, 1.f, 3.f, shadow_color, hud_selection);
+ hud_render_utf8text(val_string, render_pos, *big_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -1.f * big_fontp->getWidthF32(val_string), 3.f, shadow_color, hud_selection);
+ hud_render_utf8text(fraction_string, render_pos, *small_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, 1.f, 3.f, shadow_color, hud_selection);
gViewerWindow->setupViewport();
- hud_render_utf8text(val_string, render_pos, *big_fontp, LLFontGL::NORMAL, -1.f * big_fontp->getWidthF32(val_string), 3.f, color, hud_selection);
- hud_render_utf8text(fraction_string, render_pos, *small_fontp, LLFontGL::NORMAL, 1.f, 3.f, color, hud_selection);
+ hud_render_utf8text(val_string, render_pos, *big_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -1.f * big_fontp->getWidthF32(val_string), 3.f, color, hud_selection);
+ hud_render_utf8text(fraction_string, render_pos, *small_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, 1.f, 3.f, color, hud_selection);
}
else
{
gViewerWindow->setupViewport(1, -1);
- hud_render_utf8text(val_string, render_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(val_string), 3.f, shadow_color, hud_selection);
+ hud_render_utf8text(val_string, render_pos, *big_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -0.5f * big_fontp->getWidthF32(val_string), 3.f, shadow_color, hud_selection);
gViewerWindow->setupViewport();
- hud_render_utf8text(val_string, render_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(val_string), 3.f, color, hud_selection);
+ hud_render_utf8text(val_string, render_pos, *big_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -0.5f * big_fontp->getWidthF32(val_string), 3.f, color, hud_selection);
}
glPopMatrix();
}
LLColor4 LLManip::setupSnapGuideRenderPass(S32 pass)
{
- static LLColor4 grid_color_fg = gColors.getColor("GridlineColor");
- static LLColor4 grid_color_bg = gColors.getColor("GridlineBGColor");
- static LLColor4 grid_color_shadow = gColors.getColor("GridlineShadowColor");
+ static LLColor4 grid_color_fg = gSavedSkinSettings.getColor("GridlineColor");
+ static LLColor4 grid_color_bg = gSavedSkinSettings.getColor("GridlineBGColor");
+ static LLColor4 grid_color_shadow = gSavedSkinSettings.getColor("GridlineShadowColor");
LLColor4 line_color;
F32 line_alpha = gSavedSettings.getF32("GridOpacity");
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index 8b0484bba6..f228ea624b 100644
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -63,6 +63,7 @@
#include "pipeline.h"
#include "lldrawable.h"
#include "llglheaders.h"
+#include "lltrans.h"
const F32 RADIUS_PIXELS = 100.f; // size in screen space
const F32 SQ_RADIUS = RADIUS_PIXELS * RADIUS_PIXELS;
@@ -897,7 +898,6 @@ void LLManipRotate::renderSnapGuides()
}
gGL.end();
- // *TODO: Translate
//RN: text rendering does own shadow pass, so only render once
if (pass == 1 && render_text && i % 16 == 0)
{
@@ -905,32 +905,32 @@ void LLManipRotate::renderSnapGuides()
{
if (i == 0)
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Forward") : LLTrans::getString("East"), LLColor4::white);
}
else if (i == 16)
{
if (constraint_axis.mV[VZ] > 0.f)
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Left") : LLTrans::getString("North"), LLColor4::white);
}
else
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Right") : LLTrans::getString("South"), LLColor4::white);
}
}
else if (i == 32)
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Back") : LLTrans::getString("West"), LLColor4::white);
}
else
{
if (constraint_axis.mV[VZ] > 0.f)
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Right") : LLTrans::getString("South"), LLColor4::white);
}
else
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Left") : LLTrans::getString("North"), LLColor4::white);
}
}
}
@@ -938,32 +938,32 @@ void LLManipRotate::renderSnapGuides()
{
if (i == 0)
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Left") : LLTrans::getString("North"), LLColor4::white);
}
else if (i == 16)
{
if (constraint_axis.mV[VX] > 0.f)
{
- renderTickText(text_point, std::string("Up"), LLColor4::white);
+ renderTickText(text_point, LLTrans::getString("Up"), LLColor4::white);
}
else
{
- renderTickText(text_point, std::string("Down"), LLColor4::white);
+ renderTickText(text_point, LLTrans::getString("Down"), LLColor4::white);
}
}
else if (i == 32)
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Right") : LLTrans::getString("South"), LLColor4::white);
}
else
{
if (constraint_axis.mV[VX] > 0.f)
{
- renderTickText(text_point, std::string("Down"), LLColor4::white);
+ renderTickText(text_point, LLTrans::getString("Down"), LLColor4::white);
}
else
{
- renderTickText(text_point, std::string("Up"), LLColor4::white);
+ renderTickText(text_point, LLTrans::getString("Up"), LLColor4::white);
}
}
}
@@ -971,32 +971,32 @@ void LLManipRotate::renderSnapGuides()
{
if (i == 0)
{
- renderTickText(text_point, std::string("Up"), LLColor4::white);
+ renderTickText(text_point, LLTrans::getString("Up"), LLColor4::white);
}
else if (i == 16)
{
if (constraint_axis.mV[VY] > 0.f)
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Forward") : LLTrans::getString("East"), LLColor4::white);
}
else
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Back") : LLTrans::getString("West"), LLColor4::white);
}
}
else if (i == 32)
{
- renderTickText(text_point, std::string("Down"), LLColor4::white);
+ renderTickText(text_point, LLTrans::getString("Down"), LLColor4::white);
}
else
{
if (constraint_axis.mV[VY] > 0.f)
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Back") : LLTrans::getString("West"), LLColor4::white);
}
else
{
- renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
+ renderTickText(text_point, mObjectSelection->isAttachment() ? LLTrans::getString("Forward") : LLTrans::getString("East"), LLColor4::white);
}
}
}
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index b1cdfe3886..5261c130ea 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -415,7 +415,7 @@ BOOL LLManipScale::handleHover(S32 x, S32 y, MASK mask)
// Patch up textures, if possible.
LLSelectMgr::getInstance()->adjustTexturesByScale(FALSE, getStretchTextures());
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLSCALE);
+ gViewerWindow->setCursor(UI_CURSOR_TOOLSCALE);
return TRUE;
}
@@ -1827,10 +1827,10 @@ void LLManipScale::renderSnapGuides(const LLBBox& bbox)
std::string help_text = "Move mouse cursor over ruler";
LLColor4 help_text_color = LLColor4::white;
help_text_color.mV[VALPHA] = clamp_rescale(mHelpTextTimer.getElapsedTimeF32(), sHelpTextVisibleTime, sHelpTextVisibleTime + sHelpTextFadeTime, grid_alpha, 0.f);
- hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
+ hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
help_text = "to snap to grid";
help_text_pos -= LLViewerCamera::getInstance()->getUpAxis() * mSnapRegimeOffset * 0.4f;
- hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
+ hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
}
}
}
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index f2585c8543..8a12f75536 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -1441,10 +1441,10 @@ void LLManipTranslate::renderSnapGuides()
std::string help_text = "Move mouse cursor over ruler to snap";
LLColor4 help_text_color = LLColor4::white;
help_text_color.mV[VALPHA] = clamp_rescale(mHelpTextTimer.getElapsedTimeF32(), sHelpTextVisibleTime, sHelpTextVisibleTime + sHelpTextFadeTime, line_alpha, 0.f);
- hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
+ hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
help_text = "to snap to grid";
help_text_pos -= LLViewerCamera::getInstance()->getUpAxis() * mSnapOffsetMeters * 0.2f;
- hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
+ hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD);
}
}
}
@@ -1522,7 +1522,7 @@ void LLManipTranslate::renderSnapGuides()
float a = line_alpha;
- LLColor4 col = gColors.getColor("SilhouetteChildColor");
+ LLColor4 col = gSavedSkinSettings.getColor("SilhouetteChildColor");
{
//draw grid behind objects
LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
diff --git a/indra/newview/llmemoryview.cpp b/indra/newview/llmemoryview.cpp
index 215cc6940b..c763da34d5 100644
--- a/indra/newview/llmemoryview.cpp
+++ b/indra/newview/llmemoryview.cpp
@@ -51,11 +51,10 @@
-LLMemoryView::LLMemoryView(const std::string& name, const LLRect& rect)
-: LLView(name, rect, TRUE),
-mDelay(120)
+LLMemoryView::LLMemoryView(const LLMemoryView::Params& p)
+: LLView(p),
+ mDelay(120)
{
- setVisible(FALSE);
mDumpTimer.reset();
#ifdef MEM_DUMP_DATA
diff --git a/indra/newview/llmemoryview.h b/indra/newview/llmemoryview.h
index 81466bd6b0..e5b019bb47 100644
--- a/indra/newview/llmemoryview.h
+++ b/indra/newview/llmemoryview.h
@@ -38,7 +38,15 @@
class LLMemoryView : public LLView
{
public:
- LLMemoryView(const std::string& name, const LLRect& rect);
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Params()
+ {
+ mouse_opaque = true;
+ visible = false;
+ }
+ };
+ LLMemoryView(const LLMemoryView::Params&);
virtual ~LLMemoryView();
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
diff --git a/indra/newview/llmenucommands.cpp b/indra/newview/llmenucommands.cpp
index ac77a920a5..502302868e 100644
--- a/indra/newview/llmenucommands.cpp
+++ b/indra/newview/llmenucommands.cpp
@@ -35,6 +35,7 @@
#include "llmenucommands.h"
#include "imageids.h"
+#include "llfloaterreg.h"
#include "llfontgl.h"
#include "llrect.h"
#include "llerror.h"
@@ -48,7 +49,6 @@
#include "llfirstuse.h"
#include "llfloaterchat.h"
#include "llfloaterdirectory.h"
-#include "llfloatermap.h"
#include "llfloaterworldmap.h"
#include "llgivemoney.h"
#include "llinventoryview.h"
@@ -68,14 +68,6 @@
#include "llworldmap.h"
#include "llfocusmgr.h"
-void handle_track_avatar(const LLUUID& agent_id, const std::string& name)
-{
- LLAvatarTracker::instance().track(agent_id, name);
-
- LLFloaterDirectory::hide(NULL);
- LLFloaterWorldMap::show(NULL, TRUE);
-}
-
void handle_pay_by_id(const LLUUID& agent_id)
{
const BOOL is_group = FALSE;
@@ -88,39 +80,6 @@ void handle_mouselook(void*)
}
-void handle_map(void*)
-{
- LLFloaterWorldMap::toggle(NULL);
-}
-
-void handle_mini_map(void*)
-{
- LLFloaterMap::toggleInstance();
-}
-
-
-void handle_find(void*)
-{
- LLFloaterDirectory::toggleFind(NULL);
-}
-
-
-void handle_events(void*)
-{
- LLFloaterDirectory::toggleEvents(NULL);
-}
-
-
-void handle_inventory(void*)
-{
- // We're using the inventory, possibly for the
- // first time.
- LLFirstUse::useInventory();
-
- LLInventoryView::toggleVisibility(NULL);
-}
-
-
void handle_chat(void*)
{
// give focus to chatbar if it's open but not focused
diff --git a/indra/newview/llmenucommands.h b/indra/newview/llmenucommands.h
index 03f7a2571c..368c6fe752 100644
--- a/indra/newview/llmenucommands.h
+++ b/indra/newview/llmenucommands.h
@@ -35,14 +35,8 @@
class LLUUID;
-void handle_track_avatar(const LLUUID& agent_id, const std::string& name);
void handle_pay_by_id(const LLUUID& agent_id);
void handle_mouselook(void*);
-void handle_map(void*);
-void handle_mini_map(void*);
-void handle_find(void*);
-void handle_events(void*);
-void handle_inventory(void*);
void handle_chat(void*);
void handle_return_key(void*);
void handle_slash_key(void*);
diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp
index 18fd20d12a..0e49ecd9b5 100644
--- a/indra/newview/llmorphview.cpp
+++ b/indra/newview/llmorphview.cpp
@@ -67,9 +67,8 @@ const F32 CAMERA_DIST_STEP = 1.5f;
//-----------------------------------------------------------------------------
// LLMorphView()
//-----------------------------------------------------------------------------
-LLMorphView::LLMorphView(const std::string& name, const LLRect& rect)
- :
- LLView(name, rect, FALSE, FOLLOWS_ALL),
+LLMorphView::LLMorphView(const LLMorphView::Params& p)
+: LLView(p),
mCameraTargetJoint( NULL ),
mCameraOffset(-0.5f, 0.05f, 0.07f ),
mCameraTargetOffset(0.f, 0.f, 0.05f ),
@@ -78,8 +77,7 @@ LLMorphView::LLMorphView(const std::string& name, const LLRect& rect)
mCameraYaw( 0.f ),
mCameraDist( -1.f ),
mCameraDrivenByKeys( FALSE )
-{
-}
+{}
//-----------------------------------------------------------------------------
// initialize()
@@ -137,7 +135,7 @@ void LLMorphView::setVisible(BOOL visible)
llassert( !gFloaterCustomize );
gFloaterCustomize = new LLFloaterCustomize();
gFloaterCustomize->fetchInventory();
- gFloaterCustomize->open(); /*Flawfinder: ignore*/
+ gFloaterCustomize->openFloater();
// Must do this _after_ gFloaterView is initialized.
gFloaterCustomize->switchToDefaultSubpart();
diff --git a/indra/newview/llmorphview.h b/indra/newview/llmorphview.h
index 1dd8ef7a5f..493f906c6b 100644
--- a/indra/newview/llmorphview.h
+++ b/indra/newview/llmorphview.h
@@ -43,7 +43,15 @@ class LLFloaterCustomize;
class LLMorphView : public LLView
{
public:
- LLMorphView(const std::string& name, const LLRect& rect);
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Params()
+ {
+ mouse_opaque(false);
+ follows.flags(FOLLOWS_ALL);
+ }
+ };
+ LLMorphView(const LLMorphView::Params&);
void initialize();
void shutdown();
diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp
index a180047875..36ec2c779a 100644
--- a/indra/newview/llmoveview.cpp
+++ b/indra/newview/llmoveview.cpp
@@ -59,13 +59,28 @@ const F32 NUDGE_TIME = 0.25f; // in seconds
// protected
LLFloaterMove::LLFloaterMove(const LLSD& key)
-: LLFloater(std::string("move floater"))
+: LLFloater()
{
setIsChrome(TRUE);
const BOOL DONT_OPEN = FALSE;
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_moveview.xml", NULL, DONT_OPEN);
+ LLUICtrlFactory::getInstance()->buildFloater(this,"floater_moveview.xml", DONT_OPEN);
+}
+
+// virtual
+void LLFloaterMove::onClose(bool app_quitting)
+{
+ destroy();
+
+ if (!app_quitting)
+ {
+ gSavedSettings.setBOOL("ShowMovementControls", FALSE);
+ }
+}
+// virtual
+BOOL LLFloaterMove::postBuild()
+{
mForwardButton = getChild<LLJoystickAgentTurn>("forward btn");
mForwardButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
@@ -80,41 +95,29 @@ LLFloaterMove::LLFloaterMove(const LLSD& key)
mTurnLeftButton = getChild<LLButton>("turn left btn");
mTurnLeftButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
- mTurnLeftButton->setHeldDownCallback( turnLeft );
+ mTurnLeftButton->setHeldDownCallback( turnLeft, NULL );
mTurnRightButton = getChild<LLButton>("turn right btn");
mTurnRightButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
- mTurnRightButton->setHeldDownCallback( turnRight );
+ mTurnRightButton->setHeldDownCallback( turnRight, NULL );
mMoveUpButton = getChild<LLButton>("move up btn");
childSetAction("move up btn",moveUp,NULL);
mMoveUpButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
- mMoveUpButton->setHeldDownCallback( moveUp );
+ mMoveUpButton->setHeldDownCallback( moveUp, NULL );
mMoveDownButton = getChild<LLButton>("move down btn");
childSetAction("move down btn",moveDown,NULL);
mMoveDownButton->setHeldDownDelay(MOVE_BUTTON_DELAY);
- mMoveDownButton->setHeldDownCallback( moveDown );
-}
-
-// virtual
-void LLFloaterMove::onClose(bool app_quitting)
-{
- LLFloater::onClose(app_quitting);
-
- if (!app_quitting)
- {
- gSavedSettings.setBOOL("ShowMovementControls", FALSE);
- }
+ mMoveDownButton->setHeldDownCallback( moveDown, NULL );
+ return TRUE;
}
-
//
// Static member functions
//
-void LLFloaterMove::onOpen()
+void LLFloaterMove::onOpen(const LLSD& key)
{
- LLFloater::onOpen();
gSavedSettings.setBOOL("ShowMovementControls", TRUE);
}
diff --git a/indra/newview/llmoveview.h b/indra/newview/llmoveview.h
index e772551efe..8d7cdc881d 100644
--- a/indra/newview/llmoveview.h
+++ b/indra/newview/llmoveview.h
@@ -54,9 +54,9 @@ protected:
~LLFloaterMove() {}
public:
- /*virtual*/ void onOpen();
+ /*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ void onClose(bool app_quitting);
-
+ /*virtual*/ BOOL postBuild();
static F32 getYawRate(F32 time);
protected:
diff --git a/indra/newview/llmutelist.cpp b/indra/newview/llmutelist.cpp
index 841330483c..4ec2faf957 100644
--- a/indra/newview/llmutelist.cpp
+++ b/indra/newview/llmutelist.cpp
@@ -72,6 +72,7 @@
#include "lluistring.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
+#include "lltrans.h"
namespace
{
@@ -112,11 +113,6 @@ static LLDispatchEmptyMuteList sDispatchEmptyMuteList;
//-----------------------------------------------------------------------------
// LLMute()
//-----------------------------------------------------------------------------
-const char BY_NAME_SUFFIX[] = " (by name)";
-const char AGENT_SUFFIX[] = " (resident)";
-const char OBJECT_SUFFIX[] = " (object)";
-const char GROUP_SUFFIX[] = " (group)";
-
LLMute::LLMute(const LLUUID& id, const std::string& name, EType type, U32 flags)
: mID(id),
@@ -150,16 +146,16 @@ std::string LLMute::getDisplayName() const
{
case BY_NAME:
default:
- name_with_suffix += BY_NAME_SUFFIX;
+ name_with_suffix += " " + LLTrans::getString("MuteByName");
break;
case AGENT:
- name_with_suffix += AGENT_SUFFIX;
+ name_with_suffix += " " + LLTrans::getString("MuteAgent");
break;
case OBJECT:
- name_with_suffix += OBJECT_SUFFIX;
+ name_with_suffix += " " + LLTrans::getString("MuteObject");
break;
case GROUP:
- name_with_suffix += GROUP_SUFFIX;
+ name_with_suffix += " " + LLTrans::getString("MuteGroup");
break;
}
return name_with_suffix;
@@ -170,7 +166,7 @@ void LLMute::setFromDisplayName(const std::string& display_name)
size_t pos = 0;
mName = display_name;
- pos = mName.rfind(GROUP_SUFFIX);
+ pos = mName.rfind(" " + LLTrans::getString("MuteGroup"));
if (pos != std::string::npos)
{
mName.erase(pos);
@@ -178,7 +174,7 @@ void LLMute::setFromDisplayName(const std::string& display_name)
return;
}
- pos = mName.rfind(OBJECT_SUFFIX);
+ pos = mName.rfind(" " + LLTrans::getString("MuteObject"));
if (pos != std::string::npos)
{
mName.erase(pos);
@@ -186,7 +182,7 @@ void LLMute::setFromDisplayName(const std::string& display_name)
return;
}
- pos = mName.rfind(AGENT_SUFFIX);
+ pos = mName.rfind(" " + LLTrans::getString("MuteAgent"));
if (pos != std::string::npos)
{
mName.erase(pos);
@@ -194,7 +190,7 @@ void LLMute::setFromDisplayName(const std::string& display_name)
return;
}
- pos = mName.rfind(BY_NAME_SUFFIX);
+ pos = mName.rfind(" " + LLTrans::getString("MuteByName"));
if (pos != std::string::npos)
{
mName.erase(pos);
@@ -502,11 +498,8 @@ void LLMuteList::updateRemove(const LLMute& mute)
gAgent.sendReliableMessage();
}
-void notify_automute_callback(const LLUUID& agent_id, const std::string& first_name, const std::string& last_name, BOOL is_group, void* user_data)
+void notify_automute_callback(const LLUUID& agent_id, const std::string& first_name, const std::string& last_name, BOOL is_group, LLMuteList::EAutoReason reason)
{
- U32 temp_data = (U32) (uintptr_t) user_data;
- LLMuteList::EAutoReason reason = (LLMuteList::EAutoReason)temp_data;
-
std::string auto_message;
switch (reason)
{
@@ -522,8 +515,8 @@ void notify_automute_callback(const LLUUID& agent_id, const std::string& first_n
break;
}
- std::string message = LLNotification::format(auto_message,
- LLSD().insert("FIRST", first_name).insert("LAST", last_name));
+ std::string message = auto_message;
+ LLStringUtil::format(message, LLSD().insert("FIRST", first_name).insert("LAST", last_name));
if (reason == LLMuteList::AR_IM)
{
@@ -555,18 +548,18 @@ BOOL LLMuteList::autoRemove(const LLUUID& agent_id, const EAutoReason reason, co
if (gCacheName->getName(agent_id, cache_first, cache_last))
{
// name in cache, call callback directly
- notify_automute_callback(agent_id, cache_first, cache_last, FALSE, (void *)reason);
+ notify_automute_callback(agent_id, cache_first, cache_last, FALSE, reason);
}
else
{
// not in cache, lookup name from cache
- gCacheName->get(agent_id, FALSE, notify_automute_callback, (void *)reason);
+ gCacheName->get(agent_id, FALSE, boost::bind(¬ify_automute_callback, _1, _2, _3, _4, reason));
}
}
else
{
// call callback directly
- notify_automute_callback(agent_id, first_name, last_name, FALSE, (void *)reason);
+ notify_automute_callback(agent_id, first_name, last_name, FALSE, reason);
}
}
diff --git a/indra/newview/llnamebox.cpp b/indra/newview/llnamebox.cpp
index 98c7a4b631..883ddc7b53 100644
--- a/indra/newview/llnamebox.cpp
+++ b/indra/newview/llnamebox.cpp
@@ -46,20 +46,15 @@
// statics
std::set<LLNameBox*> LLNameBox::sInstances;
+static LLRegisterWidget<LLNameBox> r("name_box");
-LLNameBox::LLNameBox(const std::string& name, const LLRect& rect, const LLUUID& name_id, BOOL is_group, const LLFontGL* font, BOOL mouse_opaque)
-: LLTextBox(name, rect, std::string("(retrieving)"), font, mouse_opaque),
- mNameID(name_id)
+
+LLNameBox::LLNameBox(const Params& p)
+: LLTextBox(p)
{
+ mNameID = LLUUID::null;
LLNameBox::sInstances.insert(this);
- if(!name_id.isNull())
- {
- setNameID(name_id, is_group);
- }
- else
- {
- setText(LLStringUtil::null);
- }
+ setText(LLStringUtil::null);
}
LLNameBox::~LLNameBox()
diff --git a/indra/newview/llnamebox.h b/indra/newview/llnamebox.h
index f76850bd3c..3edb36883f 100644
--- a/indra/newview/llnamebox.h
+++ b/indra/newview/llnamebox.h
@@ -44,10 +44,15 @@ class LLNameBox
: public LLTextBox
{
public:
- LLNameBox(const std::string& name, const LLRect& rect, const LLUUID& name_id = LLUUID::null, BOOL is_group = FALSE, const LLFontGL* font = NULL, BOOL mouse_opaque = TRUE );
- // By default, follows top and left and is mouse-opaque.
- // If no text, text = name.
- // If no font, uses default system font.
+ struct Params : public LLInitParam::Block<Params, LLTextBox::Params>
+ {
+ Optional<bool> is_group;
+
+ Params()
+ : is_group("is_group", false)
+ {}
+ };
+
virtual ~LLNameBox();
void setNameID(const LLUUID& name_id, BOOL is_group);
@@ -57,6 +62,10 @@ public:
static void refreshAll(const LLUUID& id, const std::string& firstname,
const std::string& lastname, BOOL is_group);
+protected:
+ LLNameBox (const Params&);
+
+ friend class LLUICtrlFactory;
private:
static std::set<LLNameBox*> sInstances;
diff --git a/indra/newview/llnameeditor.cpp b/indra/newview/llnameeditor.cpp
index e4a65734d8..d706daf044 100644
--- a/indra/newview/llnameeditor.cpp
+++ b/indra/newview/llnameeditor.cpp
@@ -48,35 +48,17 @@ static LLRegisterWidget<LLNameEditor> r("name_editor");
// statics
std::set<LLNameEditor*> LLNameEditor::sInstances;
-LLNameEditor::LLNameEditor(const std::string& name, const LLRect& rect,
- const LLUUID& name_id,
- BOOL is_group,
- const LLFontGL* glfont,
- S32 max_text_length,
- void (*commit_callback)(LLUICtrl* caller, void* user_data),
- void (*keystroke_callback)(LLLineEditor* caller, void* user_data),
- void (*focus_lost_callback)(LLFocusableElement* caller, void* user_data),
- void* userdata,
- LLLinePrevalidateFunc prevalidate_func)
-: LLLineEditor(name, rect,
- std::string("(retrieving)"),
- glfont,
- max_text_length,
- commit_callback,
- keystroke_callback,
- focus_lost_callback,
- userdata,
- prevalidate_func),
- mNameID(name_id)
+LLNameEditor::LLNameEditor(const LLNameEditor::Params& p)
+: LLLineEditor(p)
{
LLNameEditor::sInstances.insert(this);
- if(!name_id.isNull())
+
+ if(!p.name_id().isNull())
{
- setNameID(name_id, is_group);
+ setNameID(p.name_id, p.is_group);
}
}
-
LLNameEditor::~LLNameEditor()
{
LLNameEditor::sInstances.erase(this);
@@ -141,35 +123,3 @@ LLSD LLNameEditor::getValue() const
return LLSD(mNameID);
}
-LLView* LLNameEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("name_editor");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- S32 max_text_length = 128;
- node->getAttributeS32("max_length", max_text_length);
-
- LLFontGL* font = LLView::selectFont(node);
-
- LLUICtrlCallback commit_callback = NULL;
-
- LLNameEditor* line_editor = new LLNameEditor(name,
- rect,
- LLUUID::null, FALSE,
- font,
- max_text_length,
- commit_callback);
-
- std::string label;
- if(node->getAttributeString("label", label))
- {
- line_editor->setLabel(label);
- }
- line_editor->setColorParameters(node);
- line_editor->initFromXML(node, parent);
-
- return line_editor;
-}
diff --git a/indra/newview/llnameeditor.h b/indra/newview/llnameeditor.h
index bc5a67866c..f9cabb5831 100644
--- a/indra/newview/llnameeditor.h
+++ b/indra/newview/llnameeditor.h
@@ -46,24 +46,18 @@ class LLNameEditor
: public LLLineEditor
{
public:
- LLNameEditor(const std::string& name, const LLRect& rect,
- const LLUUID& name_id = LLUUID::null,
- BOOL is_group = FALSE,
- const LLFontGL* glfont = NULL,
- S32 max_text_length = 254,
- void (*commit_callback)(LLUICtrl* caller, void* user_data) = NULL,
- void (*keystroke_callback)(LLLineEditor* caller, void* user_data) = NULL,
- void (*focus_lost_callback)(LLFocusableElement* caller, void* user_data) = NULL,
- void* userdata = NULL,
- LLLinePrevalidateFunc prevalidate_func = NULL);
- // By default, follows top and left and is mouse-opaque.
- // If no text, text = name.
- // If no font, uses default system font.
-
+ struct Params : public LLInitParam::Block<Params, LLLineEditor::Params>
+ {
+ Optional<bool> is_group;
+ Optional<LLUUID> name_id;
+ };
+
+protected:
+ LLNameEditor(const Params&);
+ friend class LLUICtrlFactory;
+public:
virtual ~LLNameEditor();
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-
void setNameID(const LLUUID& name_id, BOOL is_group);
void refresh(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index baf06567c1..eee64b5651 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -39,51 +39,46 @@
#include "llcachename.h"
#include "llagent.h"
#include "llinventory.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
+#include "llscrolllistcolumn.h"
+#include "llsdparam.h"
static LLRegisterWidget<LLNameListCtrl> r("name_list");
-// statics
-std::set<LLNameListCtrl*> LLNameListCtrl::sInstances;
-
-LLNameListCtrl::LLNameListCtrl(const std::string& name,
- const LLRect& rect,
- LLUICtrlCallback cb,
- void* userdata,
- BOOL allow_multiple_selection,
- BOOL draw_border,
- S32 name_column_index,
- const std::string& tooltip)
-: LLScrollListCtrl(name, rect, cb, userdata, allow_multiple_selection,
- draw_border),
- mNameColumnIndex(name_column_index),
- mAllowCallingCardDrop(FALSE)
+void LLNameListCtrl::NameTypeNames::declareValues()
{
- setToolTip(tooltip);
- LLNameListCtrl::sInstances.insert(this);
+ declare("INDIVIDUAL", LLNameListCtrl::INDIVIDUAL);
+ declare("GROUP", LLNameListCtrl::GROUP);
+ declare("SPECIAL", LLNameListCtrl::SPECIAL);
}
-
-// virtual
-LLNameListCtrl::~LLNameListCtrl()
+LLNameListCtrl::Params::Params()
+: name_column("name_column"),
+ allow_calling_card_drop("allow_calling_card_drop", false)
{
- LLNameListCtrl::sInstances.erase(this);
+ name = "name_list";
}
+LLNameListCtrl::LLNameListCtrl(const LLNameListCtrl::Params& p)
+: LLScrollListCtrl(p),
+ mAllowCallingCardDrop(p.allow_calling_card_drop),
+ mNameColumn(p.name_column),
+ mNameColumnIndex(0)
+{}
// public
-BOOL LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos,
+void LLNameListCtrl::addNameItem(const LLUUID& agent_id, EAddPosition pos,
BOOL enabled, std::string& suffix)
{
//llinfos << "LLNameListCtrl::addNameItem " << agent_id << llendl;
std::string fullname;
- BOOL result = gCacheName->getFullName(agent_id, fullname);
+ gCacheName->getFullName(agent_id, fullname);
fullname.append(suffix);
addStringUUIDItem(fullname, agent_id, pos, enabled);
-
- return result;
}
// virtual, public
@@ -138,75 +133,70 @@ BOOL LLNameListCtrl::handleDragAndDrop(
void LLNameListCtrl::addGroupNameItem(const LLUUID& group_id, EAddPosition pos,
BOOL enabled)
{
- //llinfos << "LLNameListCtrl::addGroupNameItem " << group_id << llendl;
- std::string group_name;
- gCacheName->getGroupName(group_id, group_name);
- addStringUUIDItem(group_name, group_id, pos, enabled);
+ NameItem item;
+ item.value = group_id;
+ item.enabled = enabled;
+ item.target = GROUP;
+
+ addRow(item, pos);
}
// public
-void LLNameListCtrl::addGroupNameItem(LLScrollListItem* item, EAddPosition pos)
-
+void LLNameListCtrl::addGroupNameItem(LLNameListCtrl::NameItem& item, EAddPosition pos)
{
- //llinfos << "LLNameListCtrl::addGroupNameItem " << item->getUUID() << llendl;
-
- std::string group_name;
- gCacheName->getGroupName(item->getUUID(), group_name);
-
- LLScrollListCell* cell = (LLScrollListCell*)item->getColumn(mNameColumnIndex);
- ((LLScrollListText*)cell)->setText( std::string(group_name) );
-
- addItem(item, pos);
+ item.target = GROUP;
+ addRow(item, pos);
}
-BOOL LLNameListCtrl::addNameItem(LLScrollListItem* item, EAddPosition pos)
+void LLNameListCtrl::addNameItem(LLNameListCtrl::NameItem& item, EAddPosition pos)
{
- //llinfos << "LLNameListCtrl::addNameItem " << item->getUUID() << llendl;
-
- std::string fullname;
- BOOL result = gCacheName->getFullName(item->getUUID(), fullname);
-
- LLScrollListCell* cell = (LLScrollListCell*)item->getColumn(mNameColumnIndex);
- ((LLScrollListText*)cell)->setText( fullname );
-
- addItem(item, pos);
-
- // this column is resizable
- LLScrollListColumn* columnp = getColumn(mNameColumnIndex);
- if (columnp && columnp->mHeader)
- {
- columnp->mHeader->setHasResizableElement(TRUE);
- }
+ item.target = INDIVIDUAL;
+ addRow(item, pos);
+}
- return result;
+LLScrollListItem* LLNameListCtrl::addElement(const LLSD& element, EAddPosition pos, void* userdata)
+{
+ LLNameListCtrl::NameItem item_params;
+ LLParamSDParser::instance().readSD(element, item_params);
+ item_params.userdata = userdata;
+ return addRow(item_params, pos);
}
-LLScrollListItem* LLNameListCtrl::addElement(const LLSD& value, EAddPosition pos, void* userdata)
+
+LLScrollListItem* LLNameListCtrl::addRow(const LLNameListCtrl::NameItem& name_item, EAddPosition pos)
{
- LLScrollListItem* item = LLScrollListCtrl::addElement(value, pos, userdata);
+ LLScrollListItem* item = LLScrollListCtrl::addRow(name_item, pos);
+ if (!item) return NULL;
// use supplied name by default
- std::string fullname = value["name"].asString();
- if (value["target"].asString() == "GROUP")
+ std::string fullname = name_item.display_name;
+ switch(name_item.target)
{
- gCacheName->getGroupName(item->getUUID(), fullname);
+ case GROUP:
+ gCacheName->getGroupName(name_item.value().asUUID(), fullname);
// fullname will be "nobody" if group not found
- }
- else if (value["target"].asString() == "SPECIAL")
- {
+ break;
+ case SPECIAL:
// just use supplied name
- }
- else // normal resident
- {
- std::string name;
- if (gCacheName->getFullName(item->getUUID(), name))
+ break;
+ case INDIVIDUAL:
{
- fullname = name;
+ std::string name;
+ if (gCacheName->getFullName(name_item.value().asUUID(), name))
+ {
+ fullname = name;
+ }
+ break;
}
+ default:
+ break;
}
- LLScrollListCell* cell = (LLScrollListCell*)item->getColumn(mNameColumnIndex);
- ((LLScrollListText*)cell)->setText( fullname );
+ LLScrollListCell* cell = item->getColumn(mNameColumnIndex);
+ if (cell)
+ {
+ cell->setValue(fullname);
+ }
dirtyColumns();
@@ -259,9 +249,11 @@ void LLNameListCtrl::refresh(const LLUUID& id, const std::string& first,
if (item->getUUID() == id)
{
LLScrollListCell* cell = (LLScrollListCell*)item->getColumn(0);
- cell = (LLScrollListCell*)item->getColumn(mNameColumnIndex);
-
- ((LLScrollListText*)cell)->setText( fullname );
+ cell = item->getColumn(mNameColumnIndex);
+ if (cell)
+ {
+ cell->setValue(fullname);
+ }
}
}
@@ -273,186 +265,24 @@ void LLNameListCtrl::refresh(const LLUUID& id, const std::string& first,
void LLNameListCtrl::refreshAll(const LLUUID& id, const std::string& first,
const std::string& last, BOOL is_group)
{
- std::set<LLNameListCtrl*>::iterator it;
- for (it = LLNameListCtrl::sInstances.begin();
- it != LLNameListCtrl::sInstances.end();
- ++it)
+ LLInstanceTracker<LLNameListCtrl>::instance_iter it;
+ for (it = instancesBegin(); it != instancesEnd(); ++it)
{
LLNameListCtrl* ctrl = *it;
ctrl->refresh(id, first, last, is_group);
}
}
-// virtual
-LLXMLNodePtr LLNameListCtrl::getXML(bool save_children) const
+void LLNameListCtrl::updateColumns()
{
- LLXMLNodePtr node = LLScrollListCtrl::getXML();
-
- node->createChild("allow_calling_card_drop", TRUE)->setBoolValue(mAllowCallingCardDrop);
+ LLScrollListCtrl::updateColumns();
- if (mNameColumnIndex != 0)
+ if (!mNameColumn.empty())
{
- node->createChild("name_column_index", TRUE)->setIntValue(mNameColumnIndex);
- }
-
- // Don't save contents, probably filled by code
-
- return node;
-}
-
-LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("name_list");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- BOOL multi_select = FALSE;
- node->getAttributeBOOL("multi_select", multi_select);
-
- BOOL draw_border = TRUE;
- node->getAttributeBOOL("draw_border", draw_border);
-
- BOOL draw_heading = FALSE;
- node->getAttributeBOOL("draw_heading", draw_heading);
-
- S32 name_column_index = 0;
- node->getAttributeS32("name_column_index", name_column_index);
-
- LLUICtrlCallback callback = NULL;
-
- LLNameListCtrl* name_list = new LLNameListCtrl(name,
- rect,
- callback,
- NULL,
- multi_select,
- draw_border,
- name_column_index);
-
- name_list->setDisplayHeading(draw_heading);
- if (node->hasAttribute("heading_height"))
- {
- S32 heading_height;
- node->getAttributeS32("heading_height", heading_height);
- name_list->setHeadingHeight(heading_height);
- }
-
- BOOL allow_calling_card_drop = FALSE;
- if (node->getAttributeBOOL("allow_calling_card_drop", allow_calling_card_drop))
- {
- name_list->setAllowCallingCardDrop(allow_calling_card_drop);
- }
-
- name_list->setScrollListParameters(node);
-
- name_list->initFromXML(node, parent);
-
- LLSD columns;
- S32 index = 0;
- //S32 total_static = 0;
- LLXMLNodePtr child;
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
- {
- if (child->hasName("column"))
+ LLScrollListColumn* name_column = getColumn(mNameColumn);
+ if (name_column)
{
- std::string labelname("");
- child->getAttributeString("label", labelname);
-
- std::string columnname(labelname);
- child->getAttributeString("name", columnname);
-
- BOOL columndynamicwidth = FALSE;
- child->getAttributeBOOL("dynamicwidth", columndynamicwidth);
-
- std::string sortname(columnname);
- child->getAttributeString("sort", sortname);
-
- S32 columnwidth = -1;
- if (child->hasAttribute("relwidth"))
- {
- F32 columnrelwidth = 0.f;
- child->getAttributeF32("relwidth", columnrelwidth);
- columns[index]["relwidth"] = columnrelwidth;
- }
- else
- {
- child->getAttributeS32("width", columnwidth);
- columns[index]["width"] = columnwidth;
- }
-
- LLFontGL::HAlign h_align = LLFontGL::LEFT;
- h_align = LLView::selectFontHAlign(child);
-
- //if(!columndynamicwidth) total_static += llmax(0, columnwidth);
-
- columns[index]["name"] = columnname;
- columns[index]["label"] = labelname;
- columns[index]["halign"] = (S32)h_align;
- columns[index]["dynamicwidth"] = columndynamicwidth;
- columns[index]["sort"] = sortname;
-
- index++;
+ mNameColumnIndex = name_column->mIndex;
}
}
- name_list->setColumnHeadings(columns);
-
-
- for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
- {
- if (child->hasName("row"))
- {
- LLUUID id;
- child->getAttributeUUID("id", id);
-
- LLSD row;
-
- row["id"] = id;
-
- S32 column_idx = 0;
- LLXMLNodePtr row_child;
- for (row_child = node->getFirstChild(); row_child.notNull(); row_child = row_child->getNextSibling())
- {
- if (row_child->hasName("column"))
- {
- std::string value = row_child->getTextContents();
-
- std::string columnname("");
- row_child->getAttributeString("name", columnname);
-
- std::string font("");
- row_child->getAttributeString("font", font);
-
- std::string font_style("");
- row_child->getAttributeString("font-style", font_style);
-
- row["columns"][column_idx]["column"] = columnname;
- row["columns"][column_idx]["value"] = value;
- row["columns"][column_idx]["font"] = font;
- row["columns"][column_idx]["font-style"] = font_style;
- column_idx++;
- }
- }
- name_list->addElement(row);
- }
- }
-
- std::string contents = node->getTextContents();
-
- typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
- boost::char_separator<char> sep("\t\n");
- tokenizer tokens(contents, sep);
- tokenizer::iterator token_iter = tokens.begin();
-
- while(token_iter != tokens.end())
- {
- const std::string& line = *token_iter;
- name_list->addCommentText(line);
- ++token_iter;
- }
-
- return name_list;
}
-
-
-
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 1b7795ddff..759ea938f9 100644
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -39,35 +39,58 @@
class LLNameListCtrl
-: public LLScrollListCtrl
+: public LLScrollListCtrl, protected LLInstanceTracker<LLNameListCtrl>
{
public:
- LLNameListCtrl(const std::string& name,
- const LLRect& rect,
- LLUICtrlCallback callback,
- void* userdata,
- BOOL allow_multiple_selection,
- BOOL draw_border = TRUE,
- S32 name_column_index = 0,
- const std::string& tooltip = LLStringUtil::null);
- virtual ~LLNameListCtrl();
-
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-
+ typedef enum e_name_type
+ {
+ INDIVIDUAL,
+ GROUP,
+ SPECIAL
+ } ENameType;
+
+ // provide names for enums
+ struct NameTypeNames : public LLInitParam::TypeValuesHelper<LLNameListCtrl::ENameType, NameTypeNames>
+ {
+ static void declareValues();
+ };
+
+ struct NameItem : public LLInitParam::Block<NameItem, LLScrollListItem::Params>
+ {
+ Optional<std::string> display_name;
+ Optional<ENameType, NameTypeNames> target;
+
+ NameItem()
+ : display_name("name"),
+ target("target", INDIVIDUAL)
+ {}
+ };
+
+ struct Params : public LLInitParam::Block<Params, LLScrollListCtrl::Params>
+ {
+ Optional<std::string> name_column;
+ Optional<bool> allow_calling_card_drop;
+ Params();
+ };
+
+protected:
+ LLNameListCtrl(const Params&);
+ friend class LLUICtrlFactory;
+public:
// Add a user to the list by name. It will be added, the name
// requested from the cache, and updated as necessary.
- BOOL addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM,
+ void addNameItem(const LLUUID& agent_id, EAddPosition pos = ADD_BOTTOM,
BOOL enabled = TRUE, std::string& suffix = LLStringUtil::null);
- BOOL addNameItem(LLScrollListItem* item, EAddPosition pos = ADD_BOTTOM);
+ void addNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM);
- virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
+ /*virtual*/ LLScrollListItem* addElement(const LLSD& element, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
+ LLScrollListItem* addRow(const NameItem& value, EAddPosition pos = ADD_BOTTOM);
// Add a user to the list by name. It will be added, the name
// requested from the cache, and updated as necessary.
void addGroupNameItem(const LLUUID& group_id, EAddPosition pos = ADD_BOTTOM,
BOOL enabled = TRUE);
- void addGroupNameItem(LLScrollListItem* item, EAddPosition pos = ADD_BOTTOM);
+ void addGroupNameItem(NameItem& item, EAddPosition pos = ADD_BOTTOM);
void removeNameItem(const LLUUID& agent_id);
@@ -84,10 +107,11 @@ public:
void setAllowCallingCardDrop(BOOL b) { mAllowCallingCardDrop = b; }
+ /*virtual*/ void updateColumns();
private:
- static std::set<LLNameListCtrl*> sInstances;
- S32 mNameColumnIndex;
- BOOL mAllowCallingCardDrop;
+ S32 mNameColumnIndex;
+ std::string mNameColumn;
+ BOOL mAllowCallingCardDrop;
};
#endif
diff --git a/indra/newview/llnavigationbar.cpp b/indra/newview/llnavigationbar.cpp
new file mode 100644
index 0000000000..4a9dadfc7a
--- /dev/null
+++ b/indra/newview/llnavigationbar.cpp
@@ -0,0 +1,523 @@
+/**
+ * @file llnavigationbar.cpp
+ * @brief Navigation bar implementation
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llnavigationbar.h"
+
+#include "llfocusmgr.h"
+#include "llmenugl.h"
+#include "llparcel.h"
+#include "llregistry.h"
+#include "llwindow.h"
+
+#include "llagent.h"
+#include "llfloaterhtmlhelp.h"
+#include "llfloaterreg.h"
+#include "lllocationhistory.h"
+#include "lllocationinputctrl.h"
+#include "llteleporthistory.h"
+#include "llslurl.h"
+#include "llurlsimstring.h"
+#include "llviewerparcelmgr.h"
+#include "llviewerregion.h"
+#include "llworldmap.h"
+
+
+/*
+TODO:
+- Load navbar height from saved settings (as it's done for status bar) or think of a better way.
+- Share location info formatting code with LLStatusBar.
+- Fix notifications appearing below navbar.
+- Navbar should not be visible in mouselook mode.
+*/
+
+S32 NAVIGATION_BAR_HEIGHT = 60; // *HACK
+LLNavigationBar* LLNavigationBar::sInstance = 0;
+
+LLNavigationBar* LLNavigationBar::getInstance()
+{
+ if (!sInstance)
+ sInstance = new LLNavigationBar();
+
+ return sInstance;
+}
+
+LLNavigationBar::LLNavigationBar()
+: mTeleportHistoryMenu(NULL),
+ mLocationContextMenu(NULL),
+ mBtnBack(NULL),
+ mBtnForward(NULL),
+ mBtnHome(NULL),
+ mBtnInfo(NULL),
+ mBtnHelp(NULL),
+ mCmbLocation(NULL),
+ mLeSearch(NULL)
+{
+ setIsChrome(TRUE);
+
+ LLUICtrlFactory::getInstance()->buildPanel(this, "panel_navigation_bar.xml");
+
+ // navigation bar can never get a tab
+ setFocusRoot(FALSE);
+
+}
+
+LLNavigationBar::~LLNavigationBar()
+{
+ sInstance = 0;
+}
+
+BOOL LLNavigationBar::postBuild()
+{
+ mBtnBack = getChild<LLButton>("back_btn");
+ mBtnForward = getChild<LLButton>("forward_btn");
+ mBtnHome = getChild<LLButton>("home_btn");
+ mBtnInfo = getChild<LLButton>("info_btn");
+ mBtnHelp = getChild<LLButton>("help_btn");
+
+ mCmbLocation= getChild<LLLocationInputCtrl>("location_combo");
+ mLeSearch = getChild<LLLineEditor>("search_input");
+
+ if (!mBtnBack || !mBtnForward || !mBtnHome || !mBtnInfo || !mBtnHelp ||
+ !mCmbLocation || !mLeSearch)
+ {
+ llwarns << "Malformed navigation bar" << llendl;
+ return FALSE;
+ }
+
+ mBtnBack->setEnabled(FALSE);
+ mBtnBack->setClickedCallback(boost::bind(&LLNavigationBar::onBackButtonClicked, this));
+ mBtnBack->setHeldDownCallback(boost::bind(&LLNavigationBar::onBackOrForwardButtonHeldDown, this, _2));
+
+ mBtnForward->setEnabled(FALSE);
+ mBtnForward->setClickedCallback(boost::bind(&LLNavigationBar::onForwardButtonClicked, this));
+ mBtnForward->setHeldDownCallback(boost::bind(&LLNavigationBar::onBackOrForwardButtonHeldDown, this, _2));
+
+ mBtnHome->setClickedCallback(boost::bind(&LLNavigationBar::onHomeButtonClicked, this));
+ mBtnInfo->setClickedCallback(boost::bind(&LLNavigationBar::onInfoButtonClicked, this));
+ mBtnHelp->setClickedCallback(boost::bind(&LLNavigationBar::onHelpButtonClicked, this));
+
+ mCmbLocation->setFocusReceivedCallback(boost::bind(&LLNavigationBar::onLocationFocusReceived, this));
+ mCmbLocation->setFocusLostCallback(boost::bind(&LLNavigationBar::onLocationFocusLost, this));
+ mCmbLocation->setTextEntryCallback(boost::bind(&LLNavigationBar::onLocationTextEntry, this, _1));
+ mCmbLocation->setPrearrangeCallback(boost::bind(&LLNavigationBar::onLocationPrearrange, this, _2));
+ mCmbLocation->setSelectionCallback(boost::bind(&LLNavigationBar::onLocationSelection, this));
+
+ mLeSearch->setCommitCallback(boost::bind(&LLNavigationBar::onSearchCommit, this));
+
+ // Register callbacks and load the location field context menu (NB: the order matters).
+ LLUICtrl::CommitCallbackRegistry::ScopedRegistrar commit_registrar;
+ LLMenuItemGL::EnableCallbackRegistry::ScopedRegistrar enable_registrar;
+ commit_registrar.add("Navbar.Action", boost::bind(&LLNavigationBar::onLocationContextMenuItemClicked, this, _2));
+ enable_registrar.add("Navbar.EnableMenuItem", boost::bind(&LLNavigationBar::onLocationContextMenuItemEnabled, this, _2));
+ mLocationContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_navbar.xml", this);
+ if (!mLocationContextMenu)
+ {
+ llwarns << "Error loading navigation bar context menu" << llendl;
+ return FALSE;
+ }
+
+ // we'll be notified on teleport history changes
+ LLTeleportHistory::getInstance()->setHistoryChangedCallback(
+ boost::bind(&LLNavigationBar::onTeleportHistoryChanged, this));
+
+ LLLocationHistory::getInstance()->setLoadedCallback(
+ boost::bind(&LLNavigationBar::onLocationHistoryLoaded, this));
+
+ LLLocationHistory::getInstance()->load(); // *TODO: temporary, remove this after debugging
+ LLTeleportHistory::getInstance()->load(); // *TODO: temporary, remove this after debugging
+
+ return TRUE;
+}
+
+void LLNavigationBar::draw()
+{
+ // *TODO: It doesn't look very optimal to refresh location every frame.
+ refreshLocation();
+ LLPanel::draw();
+}
+
+BOOL LLNavigationBar::handleRightMouseDown(S32 x, S32 y, MASK mask)
+{
+ // If the location field is clicked then show its context menu.
+ if (mCmbLocation->getRect().pointInRect(x, y))
+ {
+
+ // Pass the focus to the line editor when it is righ-clicked
+ mCmbLocation->setFocus(TRUE);
+
+ // IAN BUG why do the individual items need to be enabled individually here?
+ // where are they disabled?
+
+ if (mLocationContextMenu)
+ {
+ mLocationContextMenu->setItemEnabled("Cut", mCmbLocation->canCut());
+ mLocationContextMenu->setItemEnabled("Copy", mCmbLocation->canCopy());
+ mLocationContextMenu->setItemEnabled("Paste", mCmbLocation->canPaste());
+ mLocationContextMenu->setItemEnabled("Delete", mCmbLocation->canDeselect());
+ mLocationContextMenu->setItemEnabled("Select All", mCmbLocation->canSelectAll());
+
+ mLocationContextMenu->buildDrawLabels();
+ mLocationContextMenu->updateParent(LLMenuGL::sMenuContainer);
+ LLMenuGL::showPopup(this, mLocationContextMenu, x, y);
+ }
+ }
+ return TRUE;
+}
+
+void LLNavigationBar::onBackButtonClicked()
+{
+ LLTeleportHistory::getInstance()->goBack();
+}
+
+void LLNavigationBar::onBackOrForwardButtonHeldDown(const LLSD& param)
+{
+ if (param["count"].asInteger() == 0)
+ showTeleportHistoryMenu();
+}
+
+void LLNavigationBar::onForwardButtonClicked()
+{
+ LLTeleportHistory::getInstance()->goForward();
+}
+
+void LLNavigationBar::onHomeButtonClicked()
+{
+ gAgent.teleportHome();
+}
+
+void LLNavigationBar::onInfoButtonClicked()
+{
+ // XXX temporary
+ LLTeleportHistory::getInstance()->dump();
+ LLLocationHistory::getInstance()->dump();
+}
+
+void LLNavigationBar::onHelpButtonClicked()
+{
+ gViewerHtmlHelp.show();
+}
+
+void LLNavigationBar::onSearchCommit()
+{
+ std::string search_text = mLeSearch->getText();
+ LLFloaterReg::showInstance("search", LLSD().insert("panel", "all").insert("id", LLSD(search_text)));
+}
+
+void LLNavigationBar::onLocationFocusReceived()
+{
+ mCmbLocation->setTextEntry(gAgent.getSLURL());
+}
+
+void LLNavigationBar::onLocationFocusLost()
+{
+}
+
+void LLNavigationBar::onTeleportHistoryMenuItemClicked(const LLSD& userdata)
+{
+ int idx = userdata.asInteger();
+ LLTeleportHistory::getInstance()->goToItem(idx);
+}
+
+// This is called when user presses enter in the location input
+// or selects a location from the typed locations dropdown.
+void LLNavigationBar::onLocationSelection()
+{
+ std::string loc_str = mCmbLocation->getSimple();
+
+ // Will not teleport to empty location.
+ if (loc_str.empty())
+ return;
+
+ // *TODO: validate location before adding it to the history.
+ S32 selected_item = mCmbLocation->getCurrentIndex();
+ if (selected_item == -1) // user has typed text
+ {
+ LLLocationHistory* lh = LLLocationHistory::getInstance();
+ mCmbLocation->add(loc_str);
+ lh->addItem(loc_str);
+ lh->save();
+ }
+
+ // If the input is not a SLURL treat it as a region name.
+ if (!LLSLURL::isSLURL(loc_str))
+ {
+ loc_str = LLSLURL::buildSLURL(loc_str, 128, 128, 0);
+ }
+
+ teleport(loc_str);
+}
+
+void LLNavigationBar::onLocationTextEntry(LLUICtrl* ctrl)
+{
+ LLLineEditor* editor = dynamic_cast<LLLineEditor*>(ctrl);
+ if (!editor)
+ return;
+
+ // *TODO: decide whether to populate the list here on in LLLocationInputCtrl.
+ std::string text = editor->getText();
+ //rebuildLocationHistory(text);
+}
+
+void LLNavigationBar::onLocationPrearrange(const LLSD& data)
+{
+ std::string filter = data.asString();
+ rebuildLocationHistory(filter);
+}
+
+void LLNavigationBar::onLocationHistoryLoaded()
+{
+ rebuildLocationHistory();
+}
+
+void LLNavigationBar::onTeleportHistoryChanged()
+{
+ // Update navigation controls.
+ LLTeleportHistory* h = LLTeleportHistory::getInstance();
+ int cur_item = h->getCurrentItemIndex();
+ mBtnBack->setEnabled(cur_item > 0);
+ mBtnForward->setEnabled(cur_item < ((int)h->getItems().size() - 1));
+}
+
+void LLNavigationBar::refreshLocation()
+{
+ // Update location field.
+ if (mCmbLocation && !mCmbLocation->childHasFocus())
+ {
+ std::string location_name;
+
+ if (!gAgent.buildLocationString(location_name, LLAgent::LOCATION_FORMAT_FULL))
+ location_name = "Unknown";
+
+ mCmbLocation->setText(location_name);
+ }
+}
+
+void LLNavigationBar::rebuildLocationHistory(std::string filter)
+{
+ if (!mCmbLocation)
+ {
+ llwarns << "Cannot find location history control" << llendl;
+ return;
+ }
+
+ LLLocationHistory::location_list_t filtered_items;
+ const LLLocationHistory::location_list_t* itemsp = NULL;
+ LLLocationHistory* lh = LLLocationHistory::getInstance();
+
+ if (filter.empty())
+ itemsp = &lh->getItems();
+ else
+ {
+ lh->getMatchingItems(filter, filtered_items);
+ itemsp = &filtered_items;
+ }
+
+ mCmbLocation->removeall();
+ for (LLLocationHistory::location_list_t::const_reverse_iterator it = itemsp->rbegin(); it != itemsp->rend(); it++)
+ mCmbLocation->add(*it);
+}
+
+void LLNavigationBar::rebuildTeleportHistoryMenu()
+{
+ // Has the pop-up menu been built?
+ if (mTeleportHistoryMenu)
+ {
+ // Clear it.
+ // *TODO: LLMenuGL should have a method for removing all items.
+ while (mTeleportHistoryMenu->getItemCount())
+ {
+ LLMenuItemGL* itemp = mTeleportHistoryMenu->getItem(0);
+ mTeleportHistoryMenu->removeChild(itemp);
+ }
+ }
+ else
+ {
+ // Create it.
+ LLMenuGL::Params menu_p;
+ menu_p.name("popup");
+ menu_p.can_tear_off(false);
+ menu_p.visible(false);
+ menu_p.bg_visible(true);
+ mTeleportHistoryMenu = LLUICtrlFactory::create<LLMenuGL>(menu_p);
+
+ addChild(mTeleportHistoryMenu);
+ }
+
+ // Populate the menu with teleport history items.
+ LLTeleportHistory* hist = LLTeleportHistory::getInstance();
+ const LLTeleportHistory::slurl_list_t& hist_items = hist->getItems();
+ int cur_item = hist->getCurrentItemIndex();
+
+ // Items will be shown in the reverse order, just like in Firefox.
+ for (int i = (int)hist_items.size()-1; i >= 0; i--)
+ {
+ LLMenuItemCallGL::Params item_params;
+ std::string title = hist_items[i].mTitle;
+
+ if (i == cur_item)
+ item_params.font.style("BOLD");
+ else
+ title = " " + title;
+
+ item_params.name(title);
+ item_params.label(title);
+ item_params.on_click.function(boost::bind(&LLNavigationBar::onTeleportHistoryMenuItemClicked, this, i));
+ mTeleportHistoryMenu->addChild(LLUICtrlFactory::create<LLMenuItemCallGL>(item_params));
+ }
+}
+
+// static
+void LLNavigationBar::onRegionNameResponse(
+ LLVector3 local_coords,
+ U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)
+{
+ LLVector3d region_pos = from_region_handle(region_handle);
+ LLVector3d global_pos = region_pos + (LLVector3d) local_coords;
+
+ llinfos << "Teleporting to: " << global_pos << llendl;
+ gAgent.teleportViaLocation(global_pos);
+}
+
+// static
+void LLNavigationBar::teleport(std::string slurl)
+{
+ std::string sim_string = LLSLURL::stripProtocol(slurl);
+ std::string region_name;
+ S32 x = 128;
+ S32 y = 128;
+ S32 z = 0;
+
+ LLURLSimString::parse(sim_string, ®ion_name, &x, &y, &z);
+
+ // Resolve region name to global coords.
+ LLVector3 local_coords(x, y, z);
+ LLWorldMap::getInstance()->sendNamedRegionRequest(region_name,
+ boost::bind(&LLNavigationBar::onRegionNameResponse, local_coords, _1, _2, _3, _4),
+ slurl,
+ false); // don't teleport
+}
+
+void LLNavigationBar::showTeleportHistoryMenu()
+{
+ // Don't show the popup if teleport history is empty.
+ if (LLTeleportHistory::getInstance()->isEmpty())
+ {
+ lldebugs << "Teleport history is empty, will not show the menu." << llendl;
+ return;
+ }
+
+ rebuildTeleportHistoryMenu();
+
+ if (mTeleportHistoryMenu == NULL)
+ return;
+
+ // *TODO: why to draw/update anything before showing the menu?
+ mTeleportHistoryMenu->buildDrawLabels();
+ mTeleportHistoryMenu->updateParent(LLMenuGL::sMenuContainer);
+ LLRect btnBackRect = mBtnBack->getRect();
+ LLMenuGL::showPopup(this, mTeleportHistoryMenu, btnBackRect.mLeft, btnBackRect.mBottom);
+
+ // *HACK pass the mouse capturing to the drop-down menu
+ gFocusMgr.setMouseCapture( mTeleportHistoryMenu );
+}
+
+void LLNavigationBar::onLocationContextMenuItemClicked(const LLSD& userdata)
+{
+ std::string level = userdata.asString();
+
+ if (level == std::string("copy_url"))
+ {
+ LLUIString url(gAgent.getSLURL());
+ LLView::getWindow()->copyTextToClipboard(url.getWString());
+ lldebugs << "Copy SLURL" << llendl;
+ }
+ else if (level == std::string("landmark"))
+ {
+ // *TODO To be implemented
+ lldebugs << "Add Landmark" << llendl;
+ }
+ else if (level == std::string("cut"))
+ {
+ mCmbLocation->cut();
+ lldebugs << "Cut" << llendl;
+ }
+ else if (level == std::string("copy"))
+ {
+ mCmbLocation->copy();
+ lldebugs << "Copy" << llendl;
+ }
+ else if (level == std::string("paste"))
+ {
+ mCmbLocation->paste();
+ lldebugs << "Paste" << llendl;
+ }
+ else if (level == std::string("delete"))
+ {
+ mCmbLocation->deleteSelection();
+ lldebugs << "Delete" << llendl;
+ }
+ else if (level == std::string("select_all"))
+ {
+ mCmbLocation->selectAll();
+ lldebugs << "Select All" << llendl;
+ }
+}
+
+bool LLNavigationBar::onLocationContextMenuItemEnabled(const LLSD& userdata)
+{
+ std::string level = userdata.asString();
+
+ if (level == std::string("can_cut"))
+ {
+ return mCmbLocation->canCut();
+ }
+ else if (level == std::string("can_copy"))
+ {
+ return mCmbLocation->canCopy();
+ }
+ else if (level == std::string("can_paste"))
+ {
+ return mCmbLocation->canPaste();
+ }
+ else if (level == std::string("can_delete"))
+ {
+ return mCmbLocation->canDeselect();
+ }
+ else if (level == std::string("can_select_all"))
+ {
+ return mCmbLocation->canSelectAll();
+ }
+
+ return false;
+}
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h
new file mode 100644
index 0000000000..4ef3039eb7
--- /dev/null
+++ b/indra/newview/llnavigationbar.h
@@ -0,0 +1,106 @@
+/**
+ * @file llnavigationbar.h
+ * @brief Navigation bar definition
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLNAVIGATIONBAR_H
+#define LL_LLNAVIGATIONBAR_H
+
+#include "llpanel.h"
+
+extern S32 NAVIGATION_BAR_HEIGHT;
+
+class LLButton;
+class LLLocationInputCtrl;
+class LLMenuGL;
+class LLLineEditor;
+
+/**
+ * Web browser-like navigation bar.
+ */
+class LLNavigationBar
+: public LLPanel
+{
+ LOG_CLASS(LLNavigationBar);
+
+public:
+ static LLNavigationBar* getInstance();
+ virtual ~LLNavigationBar();
+
+ /*virtual*/ void draw();
+ /*virtual*/ BOOL postBuild();
+ /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
+
+private:
+ LLNavigationBar();
+
+ void refreshLocation();
+ void rebuildLocationHistory(std::string filter = "");
+ void rebuildTeleportHistoryMenu();
+ void showTeleportHistoryMenu();
+
+ // callbacks
+ bool onLocationContextMenuItemEnabled(const LLSD& userdata);
+ void onLocationContextMenuItemClicked(const LLSD& userdata);
+ void onTeleportHistoryMenuItemClicked(const LLSD& userdata);
+ void onTeleportHistoryChanged();
+ void onBackButtonClicked();
+ void onBackOrForwardButtonHeldDown(const LLSD& param);
+ void onForwardButtonClicked();
+ void onHomeButtonClicked();
+ void onInfoButtonClicked();
+ void onHelpButtonClicked();
+ void onLocationFocusReceived();
+ void onLocationFocusLost();
+ void onLocationSelection();
+ void onLocationTextEntry(LLUICtrl* ctrl);
+ void onLocationPrearrange(const LLSD& data);
+ void onLocationHistoryLoaded();
+ void onSearchCommit();
+ static void onRegionNameResponse(
+ LLVector3 local_coords, U64 region_handle, const std::string& url,
+ const LLUUID& snapshot_id, bool teleport);
+
+ static void teleport(std::string slurl);
+
+ static LLNavigationBar *sInstance;
+
+ LLMenuGL* mLocationContextMenu;
+ LLMenuGL* mTeleportHistoryMenu;
+ LLButton* mBtnBack;
+ LLButton* mBtnForward;
+ LLButton* mBtnHome;
+ LLButton* mBtnInfo;
+ LLButton* mBtnHelp;
+ LLLineEditor* mLeSearch;
+ LLLocationInputCtrl* mCmbLocation;
+};
+
+#endif
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 2eee54df40..7d18616a13 100644
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -1,7 +1,7 @@
/**
* @file llnetmap.cpp
* @author James Cook
- * @brief Display of surrounding regions, objects, and agents. View contained by LLFloaterMap.
+ * @brief Display of surrounding regions, objects, and agents.
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
@@ -36,81 +36,43 @@
#include "llnetmap.h"
#include "indra_constants.h"
-#include "llui.h"
-#include "llmath.h" // clampf()
+#include "llmath.h"
+#include "llfloaterreg.h"
#include "llfocusmgr.h"
#include "llrender.h"
+#include "llui.h"
+
+#include "llglheaders.h"
#include "llagent.h"
-#include "llcallingcard.h"
-#include "llcolorscheme.h"
-#include "llviewercontrol.h"
-#include "llfloateravatarinfo.h"
-#include "llfloaterworldmap.h"
-#include "llframetimer.h"
+#include "llappviewer.h" // for gDisconnected
+#include "llcallingcard.h" // LLAvatarTracker
#include "lltracker.h"
-#include "llmenugl.h"
#include "llsurface.h"
-#include "lltextbox.h"
-#include "lluictrlfactory.h"
-#include "lluuid.h"
#include "llviewercamera.h"
-#include "llviewerimage.h"
-#include "llviewerimagelist.h"
-#include "llviewermenu.h"
+#include "llviewercontrol.h"
#include "llviewerobjectlist.h"
#include "llviewerregion.h"
-#include "llviewerwindow.h"
-#include "llvoavatar.h"
#include "llworld.h"
#include "llworldmapview.h" // shared draw code
-#include "llappviewer.h" // Only for constants!
-#include "llglheaders.h"
+static LLRegisterWidget<LLNetMap> r1("net_map");
const F32 MAP_SCALE_MIN = 64;
const F32 MAP_SCALE_MID = 172;
const F32 MAP_SCALE_MAX = 512;
const F32 MAP_SCALE_INCREMENT = 16;
const F32 MAP_MIN_PICK_DIST = 4;
-const F32 MAP_MINOR_DIR_THRESHOLD = 0.08f;
-
-const S32 TRACKING_RADIUS = 3;
-
-LLNetMap::LLNetMap(const std::string& name) :
- LLPanel(name),
- mScale(128.f),
- mObjectMapTPM(1.f),
- mObjectMapPixels(255.f),
- mTargetPanX( 0.f ),
- mTargetPanY( 0.f ),
- mCurPanX( 0.f ),
- mCurPanY( 0.f ),
- mUpdateNow( FALSE )
-{
- mScale = gSavedSettings.getF32("MiniMapScale");
- mPixelsPerMeter = mScale / LLWorld::getInstance()->getRegionWidthInMeters();
+const F32 MAX_PRIM_RADIUS = 256.0f; // Don't try to draw giant mega-prims on the mini map
+LLNetMap::LLNetMap (const Params & p) :
+ LLUICtrl (p),
+ mScale(128.0f),
+ mBackgroundColor (p.bg_color()),
+ mRotateMap(FALSE)
+{
mObjectImageCenterGlobal = gAgent.getCameraPositionGlobal();
-
- // Register event listeners for popup menu
- (new LLScaleMap())->registerListener(this, "MiniMap.ZoomLevel");
- (new LLStopTracking())->registerListener(this, "MiniMap.StopTracking");
- (new LLEnableTracking())->registerListener(this, "MiniMap.EnableTracking");
- (new LLShowAgentProfile())->registerListener(this, "MiniMap.ShowProfile");
- (new LLEnableProfile())->registerListener(this, "MiniMap.EnableProfile");
-
- LLUICtrlFactory::getInstance()->buildPanel(this, "panel_mini_map.xml");
-
- updateMinorDirections();
-
- LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_mini_map.xml", this);
- if (!menu)
- {
- menu = new LLMenuGL(LLStringUtil::null);
- }
- menu->setVisible(FALSE);
- mPopupMenuHandle = menu->getHandle();
+ mPixelsPerMeter = mScale / REGION_WIDTH_METERS;
}
LLNetMap::~LLNetMap()
@@ -119,26 +81,21 @@ LLNetMap::~LLNetMap()
void LLNetMap::setScale( F32 scale )
{
- mScale = scale;
- if (mScale == 0.f)
- {
- mScale = 0.1f;
- }
- gSavedSettings.setF32("MiniMapScale", mScale);
-
+ mScale = llclamp(scale, 0.1f, 16.f*1024.f); // [reasonably small , unreasonably large]
+
if (mObjectImagep.notNull())
{
- F32 width = (F32)(getRect().getWidth());
- F32 height = (F32)(getRect().getHeight());
- F32 diameter = sqrt(width * width + height * height);
- F32 region_widths = diameter / mScale;
+ F32 half_width = (F32)(getRect().getWidth() / 2);
+ F32 half_height = (F32)(getRect().getHeight() / 2);
+ F32 radius = sqrt( half_width * half_width + half_height * half_height );
+ F32 region_widths = (2.f*radius)/mScale;
F32 meters = region_widths * LLWorld::getInstance()->getRegionWidthInMeters();
F32 num_pixels = (F32)mObjectImagep->getWidth();
- mObjectMapTPM = num_pixels / meters;
- mObjectMapPixels = diameter;
+ mObjectMapTPM = num_pixels/meters;
+ mObjectMapPixels = 2.f*radius;
}
- mPixelsPerMeter = mScale / LLWorld::getInstance()->getRegionWidthInMeters();
+ mPixelsPerMeter = mScale / REGION_WIDTH_METERS;
mUpdateNow = TRUE;
}
@@ -155,21 +112,27 @@ void LLNetMap::translatePan( F32 delta_x, F32 delta_y )
void LLNetMap::draw()
{
static LLFrameTimer map_timer;
-
+ static LLCachedControl<LLColor4> map_avatar_color(gSavedSkinSettings, "MapAvatarColor", LLColor4::white);
+ static LLCachedControl<LLColor4> map_avatar_friend_color(gSavedSkinSettings, "MapAvatarFriendColor", LLColor4::white);
+ static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
+ static LLCachedControl<LLColor4> map_track_disabled_color(gSavedSkinSettings, "MapTrackDisabledColor", LLColor4::white);
+ static LLCachedControl<LLColor4> map_frustum_color(gSavedSkinSettings, "MapFrustumColor", LLColor4::white);
+ static LLCachedControl<LLColor4> map_frustum_rotating_color(gSavedSkinSettings, "MapFrustumRotatingColor", LLColor4::white);
+
if (mObjectImagep.isNull())
{
createObjectImage();
}
-
+
mCurPanX = lerp(mCurPanX, mTargetPanX, LLCriticalDamp::getInterpolant(0.1f));
mCurPanY = lerp(mCurPanY, mTargetPanY, LLCriticalDamp::getInterpolant(0.1f));
+ // Prepare a scissor region
F32 rotation = 0;
- // Prepare a scissor region
{
LLGLEnable scissor(GL_SCISSOR_TEST);
-
+
{
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
LLLocalClipRect clip(getLocalRect());
@@ -177,11 +140,9 @@ void LLNetMap::draw()
glMatrixMode(GL_MODELVIEW);
// Draw background rectangle
- if(isBackgroundVisible())
- {
- gGL.color4fv(isBackgroundOpaque() ? getBackgroundColor().mV : getTransparentColor().mV);
- gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0);
- }
+ LLColor4 background_color = mBackgroundColor.get();
+ gGL.color4fv( background_color.mV );
+ gl_rect_2d(0, getRect().getHeight(), getRect().getWidth(), 0);
}
// region 0,0 is in the middle
@@ -192,8 +153,7 @@ void LLNetMap::draw()
gGL.translatef( (F32) center_sw_left, (F32) center_sw_bottom, 0.f);
- BOOL rotate_map = gSavedSettings.getBOOL( "MiniMapRotate" );
- if( rotate_map )
+ if( mRotateMap )
{
// rotate subsequent draws to agent rotation
rotation = atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] );
@@ -202,9 +162,6 @@ void LLNetMap::draw()
// figure out where agent is
S32 region_width = llround(LLWorld::getInstance()->getRegionWidthInMeters());
- LLColor4 this_region_color = gColors.getColor( "NetMapThisRegion" );
- LLColor4 live_region_color = gColors.getColor( "NetMapLiveRegion" );
- LLColor4 dead_region_color = gColors.getColor( "NetMapDeadRegion" );
for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
@@ -222,10 +179,18 @@ void LLNetMap::draw()
F32 top = bottom + mScale ;
F32 right = left + mScale ;
- gGL.color4fv(regionp == gAgent.getRegion() ? this_region_color.mV : live_region_color.mV);
+ if (regionp == gAgent.getRegion())
+ {
+ gGL.color4f(1.f, 1.f, 1.f, 1.f);
+ }
+ else
+ {
+ gGL.color4f(0.8f, 0.8f, 0.8f, 1.f);
+ }
+
if (!regionp->isAlive())
{
- gGL.color4fv(dead_region_color.mV);
+ gGL.color4f(1.f, 0.5f, 0.5f, 1.f);
}
@@ -317,57 +282,86 @@ void LLNetMap::draw()
// Mouse pointer in local coordinates
S32 local_mouse_x;
S32 local_mouse_y;
+ //localMouse(&local_mouse_x, &local_mouse_y);
LLUI::getCursorPositionLocal(this, &local_mouse_x, &local_mouse_y);
mClosestAgentToCursor.setNull();
F32 closest_dist = F32_MAX;
// Draw avatars
- LLColor4 avatar_color = gColors.getColor( "MapAvatar" );
- LLColor4 friend_color = gColors.getColor( "MapFriend" );
- std::vector<LLUUID> avatar_ids;
- std::vector<LLVector3d> positions;
- LLWorld::getInstance()->getAvatars(&avatar_ids, &positions);
- for(U32 i=0; i<avatar_ids.size(); i++)
+ for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
+ iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
{
+ LLViewerRegion* regionp = *iter;
+ const LLVector3d& origin_global = regionp->getOriginGlobal();
+
+ S32 count = regionp->mMapAvatars.count();
+ S32 i;
+ LLVector3 pos_local;
+ U32 compact_local;
+ U8 bits;
// TODO: it'd be very cool to draw these in sorted order from lowest Z to highest.
// just be careful to sort the avatar IDs along with the positions. -MG
- pos_map = globalPosToView(positions[i], rotate_map);
+ for (i = 0; i < count; i++)
+ {
+ compact_local = regionp->mMapAvatars.get(i);
- LLWorldMapView::drawAvatar(
- pos_map.mV[VX], pos_map.mV[VY],
- is_agent_friend(avatar_ids[i]) ? friend_color : avatar_color,
- pos_map.mV[VZ]);
+ bits = compact_local & 0xFF;
+ pos_local.mV[VZ] = F32(bits) * 4.f;
+ compact_local >>= 8;
- F32 dist_to_cursor = dist_vec(LLVector2(pos_map.mV[VX], pos_map.mV[VY]), LLVector2(local_mouse_x,local_mouse_y));
- if(dist_to_cursor < MAP_MIN_PICK_DIST && dist_to_cursor < closest_dist)
- {
- closest_dist = dist_to_cursor;
- mClosestAgentToCursor = avatar_ids[i];
+ bits = compact_local & 0xFF;
+ pos_local.mV[VY] = (F32)bits;
+ compact_local >>= 8;
+
+ bits = compact_local & 0xFF;
+ pos_local.mV[VX] = (F32)bits;
+
+ pos_global.setVec( pos_local );
+ pos_global += origin_global;
+
+ pos_map = globalPosToView(pos_global);
+
+ BOOL show_as_friend = FALSE;
+ if( i < regionp->mMapAvatarIDs.count())
+ {
+ show_as_friend = (LLAvatarTracker::instance().getBuddyInfo(regionp->mMapAvatarIDs.get(i)) != NULL);
+ }
+ LLWorldMapView::drawAvatar(
+ pos_map.mV[VX], pos_map.mV[VY],
+ show_as_friend ? map_avatar_friend_color : map_avatar_color,
+ pos_map.mV[VZ]);
+
+ F32 dist_to_cursor = dist_vec(LLVector2(pos_map.mV[VX], pos_map.mV[VY]), LLVector2(local_mouse_x,local_mouse_y));
+ if(dist_to_cursor < MAP_MIN_PICK_DIST && dist_to_cursor < closest_dist)
+ {
+ closest_dist = dist_to_cursor;
+ mClosestAgentToCursor = regionp->mMapAvatarIDs.get(i);
+ }
}
}
// Draw dot for autopilot target
if (gAgent.getAutoPilot())
{
- drawTracking( gAgent.getAutoPilotTargetGlobal(), rotate_map, gTrackColor );
+ drawTracking( gAgent.getAutoPilotTargetGlobal(), map_track_color );
}
else
{
LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus();
if ( LLTracker::TRACKING_AVATAR == tracking_status )
{
- drawTracking( LLAvatarTracker::instance().getGlobalPos(), rotate_map, gTrackColor );
+ drawTracking( LLAvatarTracker::instance().getGlobalPos(), map_track_color );
}
else if ( LLTracker::TRACKING_LANDMARK == tracking_status
|| LLTracker::TRACKING_LOCATION == tracking_status )
{
- drawTracking( LLTracker::getTrackedPositionGlobal(), rotate_map, gTrackColor );
+ drawTracking( LLTracker::getTrackedPositionGlobal(), map_track_color );
}
}
// Draw dot for self avatar position
pos_global = gAgent.getPositionGlobal();
- pos_map = globalPosToView(pos_global, rotate_map);
+ pos_map = globalPosToView(pos_global);
LLUIImagePtr you = LLWorldMapView::sAvatarYouSmallImage;
you->draw(
llround(pos_map.mV[VX]) - you->getWidth()/2,
@@ -389,9 +383,9 @@ void LLNetMap::draw()
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
- if( rotate_map )
+ if( mRotateMap )
{
- gGL.color4fv(gColors.getColor("NetMapFrustum").mV);
+ gGL.color4fv((map_frustum_color()).mV);
gGL.begin( LLRender::TRIANGLES );
gGL.vertex2f( ctr_x, ctr_y );
@@ -401,7 +395,7 @@ void LLNetMap::draw()
}
else
{
- gGL.color4fv(gColors.getColor("NetMapFrustumRotating").mV);
+ gGL.color4fv((map_frustum_rotating_color()).mV);
// If we don't rotate the map, we have to rotate the frustum.
gGL.pushMatrix();
@@ -416,27 +410,11 @@ void LLNetMap::draw()
}
}
- // Rotation of 0 means that North is up
- setDirectionPos( getChild<LLTextBox>("e_label"), rotation);
- setDirectionPos( getChild<LLTextBox>("n_label"), rotation + F_PI_BY_TWO);
- setDirectionPos( getChild<LLTextBox>("w_label"), rotation + F_PI);
- setDirectionPos( getChild<LLTextBox>("s_label"), rotation + F_PI + F_PI_BY_TWO);
-
- setDirectionPos( getChild<LLTextBox>("ne_label"), rotation + F_PI_BY_TWO / 2);
- setDirectionPos( getChild<LLTextBox>("nw_label"), rotation + F_PI_BY_TWO + F_PI_BY_TWO / 2);
- setDirectionPos( getChild<LLTextBox>("sw_label"), rotation + F_PI + F_PI_BY_TWO / 2);
- setDirectionPos( getChild<LLTextBox>("se_label"), rotation + F_PI + F_PI_BY_TWO + F_PI_BY_TWO / 2);
-
- LLView::draw();
+ LLUICtrl::draw();
}
-void LLNetMap::reshape(S32 width, S32 height, BOOL called_from_parent)
+LLVector3 LLNetMap::globalPosToView( const LLVector3d& global_pos )
{
- LLPanel::reshape(width, height, called_from_parent);
- updateMinorDirections();
-}
-
-LLVector3 LLNetMap::globalPosToView( const LLVector3d& global_pos, BOOL rotated ){
LLVector3d relative_pos_global = global_pos - gAgent.getCameraPositionGlobal();
LLVector3 pos_local;
pos_local.setVec(relative_pos_global); // convert to floats from doubles
@@ -445,7 +423,7 @@ LLVector3 LLNetMap::globalPosToView( const LLVector3d& global_pos, BOOL rotated
pos_local.mV[VY] *= mPixelsPerMeter;
// leave Z component in meters
- if( rotated )
+ if( mRotateMap )
{
F32 radians = atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] );
LLQuaternion rot(radians, LLVector3(0.f, 0.f, 1.f));
@@ -458,10 +436,10 @@ LLVector3 LLNetMap::globalPosToView( const LLVector3d& global_pos, BOOL rotated
return pos_local;
}
-void LLNetMap::drawTracking(const LLVector3d& pos_global, BOOL rotated,
- const LLColor4& color, BOOL draw_arrow )
+void LLNetMap::drawTracking(const LLVector3d& pos_global, const LLColor4& color,
+ BOOL draw_arrow )
{
- LLVector3 pos_local = globalPosToView( pos_global, rotated );
+ LLVector3 pos_local = globalPosToView( pos_global );
if( (pos_local.mV[VX] < 0) ||
(pos_local.mV[VY] < 0) ||
(pos_local.mV[VX] >= getRect().getWidth()) ||
@@ -484,16 +462,16 @@ void LLNetMap::drawTracking(const LLVector3d& pos_global, BOOL rotated,
}
}
-LLVector3d LLNetMap::viewPosToGlobal( S32 x, S32 y, BOOL rotated )
+LLVector3d LLNetMap::viewPosToGlobal( S32 x, S32 y )
{
x -= llround(getRect().getWidth() / 2 + mCurPanX);
y -= llround(getRect().getHeight() / 2 + mCurPanY);
- LLVector3 pos_local( (F32)x, (F32)y, 0.f );
+ LLVector3 pos_local( (F32)x, (F32)y, 0 );
F32 radians = - atan2( LLViewerCamera::getInstance()->getAtAxis().mV[VX], LLViewerCamera::getInstance()->getAtAxis().mV[VY] );
- if( rotated )
+ if( mRotateMap )
{
LLQuaternion rot(radians, LLVector3(0.f, 0.f, 1.f));
pos_local.rotVec( rot );
@@ -522,87 +500,55 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
{
return FALSE;
}
- LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( viewPosToGlobal( x, y , gSavedSettings.getBOOL( "MiniMapRotate" )) );
+
+ // mToolTipMsg = "[AGENT][REGION](Double-click to open Map)"
+
+ LLStringUtil::format_map_t args;
+ std::string fullname;
+ if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname))
+ {
+ args["[AGENT]"] = fullname + "\n";
+ }
+ else
+ {
+ args["[AGENT]"] = "";
+ }
+
+ LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( viewPosToGlobal( x, y ) );
if( region )
{
- msg.assign("");
- std::string fullname;
- if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname))
- {
- msg.append(fullname);
- msg.append("\n");
- }
- msg.append( region->getName() );
-
-#ifndef LL_RELEASE_FOR_DOWNLOAD
- std::string buffer;
- msg.append("\n");
- buffer = region->getHost().getHostName();
- msg.append(buffer);
- msg.append("\n");
- buffer = region->getHost().getString();
- msg.append(buffer);
-#endif
- msg.append("\n");
- msg.append(getToolTip());
-
+ args["[REGION]"] = region->getName() + "\n";
+ }
+ else
+ {
+ args["[REGION]"] = "";
+ }
+
+ msg = mToolTipMsg;
+ LLStringUtil::format(msg, args);
+
+ // set sticky_rect
+ if (region)
+ {
S32 SLOP = 4;
localPointToScreen(
x - SLOP, y - SLOP,
&(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
sticky_rect_screen->mRight = sticky_rect_screen->mLeft + 2 * SLOP;
sticky_rect_screen->mTop = sticky_rect_screen->mBottom + 2 * SLOP;
- handled = TRUE;
- }
- if(!handled)
- {
- return LLPanel::handleToolTip(x, y, msg, sticky_rect_screen);
}
+
+ handled = TRUE;
return handled;
}
-void LLNetMap::setDirectionPos( LLTextBox* text_box, F32 rotation )
-{
- // Rotation is in radians.
- // Rotation of 0 means x = 1, y = 0 on the unit circle.
-
- F32 half_height = (F32)( (getRect().getHeight() - text_box->getRect().getHeight()) / 2);
- F32 half_width = (F32)( (getRect().getWidth() - text_box->getRect().getWidth()) / 2);
- F32 radius = llmin( half_height, half_width );
-
- // Inset by a little to account for position display.
- radius -= 8.f;
-
- text_box->setOrigin(llround(half_width + radius * cos( rotation )),
- llround(half_height + radius * sin( rotation )));
-}
-
-void LLNetMap::updateMinorDirections()
-{
- if (getChild<LLTextBox>("ne_label") == NULL)
- {
- return;
- }
-
- // Hide minor directions if they cover too much of the map
- bool show_minors = getChild<LLTextBox>("ne_label")->getRect().getHeight() < MAP_MINOR_DIR_THRESHOLD *
- llmin(getRect().getWidth(), getRect().getHeight());
-
- getChild<LLTextBox>("ne_label")->setVisible(show_minors);
- getChild<LLTextBox>("nw_label")->setVisible(show_minors);
- getChild<LLTextBox>("sw_label")->setVisible(show_minors);
- getChild<LLTextBox>("se_label")->setVisible(show_minors);
-}
-
void LLNetMap::renderScaledPointGlobal( const LLVector3d& pos, const LLColor4U &color, F32 radius_meters )
{
LLVector3 local_pos;
local_pos.setVec( pos - mObjectImageCenterGlobal );
- // DEV-17370 - megaprims of size > 4096 cause lag. (go figger.)
- const F32 MAX_RADIUS = 256.0f;
- F32 radius_clamped = llmin(radius_meters, MAX_RADIUS);
+ F32 radius_clamped = llmin(radius_meters, MAX_PRIM_RADIUS);
S32 diameter_pixels = llround(2 * radius_clamped * mObjectMapTPM);
renderPoint( local_pos, color, diameter_pixels );
@@ -697,10 +643,10 @@ void LLNetMap::renderPoint(const LLVector3 &pos_local, const LLColor4U &color,
void LLNetMap::createObjectImage()
{
// Find the size of the side of a square that surrounds the circle that surrounds getRect().
- // ... which is, the diagonal of the rect.
- F32 width = getRect().getWidth();
- F32 height = getRect().getHeight();
- S32 square_size = llround( sqrt(width*width + height*height) );
+ F32 half_width = (F32)(getRect().getWidth() / 2);
+ F32 half_height = (F32)(getRect().getHeight() / 2);
+ F32 radius = sqrt( half_width * half_width + half_height * half_height );
+ S32 square_size = S32( 2 * radius );
// Find the least power of two >= the minimum size.
const S32 MIN_SIZE = 32;
@@ -723,75 +669,3 @@ void LLNetMap::createObjectImage()
}
mUpdateNow = TRUE;
}
-
-BOOL LLNetMap::handleDoubleClick( S32 x, S32 y, MASK mask )
-{
- LLFloaterWorldMap::show(NULL, FALSE);
- return TRUE;
-}
-
-BOOL LLNetMap::handleRightMouseDown(S32 x, S32 y, MASK mask)
-{
- mClosestAgentAtLastRightClick = mClosestAgentToCursor;
- LLMenuGL* menu = (LLMenuGL*)mPopupMenuHandle.get();
- if (menu)
- {
- menu->buildDrawLabels();
- menu->updateParent(LLMenuGL::sMenuContainer);
- LLMenuGL::showPopup(this, menu, x, y);
- }
- return TRUE;
-}
-
-
-// static
-bool LLNetMap::LLScaleMap::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-{
- LLNetMap *self = mPtr;
-
- S32 level = userdata.asInteger();
-
- switch(level)
- {
- case 0:
- self->setScale(MAP_SCALE_MIN);
- break;
- case 1:
- self->setScale(MAP_SCALE_MID);
- break;
- case 2:
- self->setScale(MAP_SCALE_MAX);
- break;
- default:
- break;
- }
-
- return true;
-}
-
-bool LLNetMap::LLStopTracking::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-{
- LLTracker::stopTracking(NULL);
- return true;
-}
-
-bool LLNetMap::LLEnableTracking::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-{
- LLNetMap *self = mPtr;
- self->findControl(userdata["control"].asString())->setValue(LLTracker::isTracking(NULL));
- return true;
-}
-
-bool LLNetMap::LLShowAgentProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-{
- LLNetMap *self = mPtr;
- LLFloaterAvatarInfo::show(self->mClosestAgentAtLastRightClick);
- return true;
-}
-
-bool LLNetMap::LLEnableProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
-{
- LLNetMap *self = mPtr;
- self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor());
- return true;
-}
diff --git a/indra/newview/llnetmap.h b/indra/newview/llnetmap.h
index a5bf9f0fb5..cebc4af165 100644
--- a/indra/newview/llnetmap.h
+++ b/indra/newview/llnetmap.h
@@ -33,55 +33,67 @@
#ifndef LL_LLNETMAP_H
#define LL_LLNETMAP_H
-#include "llpanel.h"
-#include "llmemberlistener.h"
+#include "llmath.h"
+#include "lluictrl.h"
#include "v3math.h"
#include "v3dmath.h"
#include "v4color.h"
#include "llimage.h"
#include "llimagegl.h"
-
+class LLColor4U;
+class LLCoordGL;
class LLTextBox;
-class LLNetMap : public LLPanel
+class LLNetMap : public LLUICtrl
{
public:
- LLNetMap(const std::string& name);
- virtual ~LLNetMap();
+ struct Params
+ : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<LLUIColor> bg_color;
- virtual void draw();
- virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
- virtual BOOL handleDoubleClick( S32 x, S32 y, MASK mask );
- virtual BOOL handleRightMouseDown( S32 x, S32 y, MASK mask );
- virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
- virtual BOOL handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen );
+ Params()
+ : bg_color("bg_color")
+ {}
+ };
- void renderScaledPointGlobal( const LLVector3d& pos, const LLColor4U &color, F32 radius );
+protected:
+ LLNetMap (const Params & p);
+ friend class LLUICtrlFactory;
-private:
+public:
+ virtual ~LLNetMap();
+ /*virtual*/ void draw();
+ /*virtual*/ BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
+ /*virtual*/ BOOL handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen );
+
void setScale( F32 scale );
-
- // *TODO: Enable panning of the mini-map
+ void setRotateMap( BOOL b ) { mRotateMap = b; }
+ void setToolTipMsg(const std::string& msg) { mToolTipMsg = msg; }
+ BOOL getRotateMap( ) { return mRotateMap; }
+ void renderScaledPointGlobal( const LLVector3d& pos, const LLColor4U &color, F32 radius );
+
+private:
void translatePan( F32 delta_x, F32 delta_y );
void setPan( F32 x, F32 y ) { mTargetPanX = x; mTargetPanY = y; }
- void renderPoint(const LLVector3 &pos, const LLColor4U &color,
- S32 diameter, S32 relative_height = 0);
- LLVector3 globalPosToView(const LLVector3d& global_pos, BOOL rotated);
- LLVector3d viewPosToGlobal(S32 x,S32 y, BOOL rotated);
+ const LLVector3d& getObjectImageCenterGlobal() { return mObjectImageCenterGlobal; }
+ void renderPoint(const LLVector3 &pos, const LLColor4U &color,
+ S32 diameter, S32 relative_height = 0);
- void drawTracking( const LLVector3d& pos_global,
- BOOL rotated,
- const LLColor4& color,
- BOOL draw_arrow = TRUE);
+ LLVector3 globalPosToView(const LLVector3d& global_pos);
+ LLVector3d viewPosToGlobal(S32 x,S32 y);
- void setDirectionPos( LLTextBox* text_box, F32 rotation );
- void updateMinorDirections();
- void createObjectImage();
+ void drawTracking( const LLVector3d& pos_global,
+ const LLColor4& color,
+ BOOL draw_arrow = TRUE);
- LLHandle<LLView> mPopupMenuHandle;
+ void createObjectImage();
+
+private:
+ LLUIColor mBackgroundColor;
F32 mScale; // Size of a region in pixels
F32 mPixelsPerMeter; // world meters to map pixels
@@ -96,45 +108,11 @@ private:
LLPointer<LLImageRaw> mObjectRawImagep;
LLPointer<LLImageGL> mObjectImagep;
-private:
LLUUID mClosestAgentToCursor;
LLUUID mClosestAgentAtLastRightClick;
- static BOOL sRotateMap;
- static LLNetMap* sInstance;
- static BOOL isAgentUnderCursor(void*) { return sInstance && sInstance->mClosestAgentToCursor.notNull(); }
- static void showAgentProfile(void*);
- BOOL isAgentUnderCursor() { return mClosestAgentToCursor.notNull(); }
-
- class LLScaleMap : public LLMemberListener<LLNetMap>
- {
- public:
- /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
- };
-
- class LLStopTracking : public LLMemberListener<LLNetMap>
- {
- public:
- /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
- };
-
- class LLEnableTracking : public LLMemberListener<LLNetMap>
- {
- public:
- /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
- };
-
- class LLShowAgentProfile : public LLMemberListener<LLNetMap>
- {
- public:
- /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
- };
-
- class LLEnableProfile : public LLMemberListener<LLNetMap>
- {
- public:
- /*virtual*/ bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
- };
+ BOOL mRotateMap;
+ std::string mToolTipMsg;
};
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
new file mode 100644
index 0000000000..4ab4266221
--- /dev/null
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -0,0 +1,134 @@
+/**
+ * @file lloutputmonitorctrl.cpp
+ * @brief LLOutputMonitorCtrl base class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "lloutputmonitorctrl.h"
+
+// library includes
+#include "llui.h"
+
+// viewer includes
+#include "llvoiceclient.h"
+
+static LLRegisterWidget<LLOutputMonitorCtrl> r("output_monitor");
+
+// The defaults will be initialized in the constructor.
+LLColor4 LLOutputMonitorCtrl::sColorMuted;
+LLColor4 LLOutputMonitorCtrl::sColorOverdriven;
+LLColor4 LLOutputMonitorCtrl::sColorNormal;
+LLColor4 LLOutputMonitorCtrl::sColorBound;
+S32 LLOutputMonitorCtrl::sRectsNumber = 0;
+F32 LLOutputMonitorCtrl::sRectWidthRatio = 0.f;
+F32 LLOutputMonitorCtrl::sRectHeightRatio = 0.f;
+
+LLOutputMonitorCtrl::LLOutputMonitorCtrl(const LLOutputMonitorCtrl::Params& p)
+: LLView(p),
+ mPower(0),
+ mIsMuted(true)
+{
+ static LLUICachedControl<LLColor4> output_monitor_muted_color("OutputMonitorMutedColor", LLColor4::orange);
+ static LLUICachedControl<LLColor4> output_monitor_overdriven_color("OutputMonitorOverdrivenColor", LLColor4::red);
+ static LLUICachedControl<LLColor4> output_monitor_normal_color("OutputMonitorNotmalColor", LLColor4::green);
+ static LLUICachedControl<LLColor4> output_monitor_bound_color("OutputMonitorBoundColor", LLColor4::white);
+ static LLUICachedControl<S32> output_monitor_rects_number("OutputMonitorRectanglesNumber", 20);
+ static LLUICachedControl<F32> output_monitor_rect_width_ratio("OutputMonitorRectangleWidthRatio", 0.5f);
+ static LLUICachedControl<F32> output_monitor_rect_height_ratio("OutputMonitorRectangleHeightRatio", 0.8f);
+
+ // IAN BUG compare to existing pattern where these are members - some will change per-widget and need to be anyway
+ // sent feedback to PE
+
+ // *TODO: it looks suboptimal to load the defaults every time an output monitor is constructed.
+ sColorMuted = output_monitor_muted_color;
+ sColorOverdriven = output_monitor_overdriven_color;
+ sColorNormal = output_monitor_normal_color;
+ sColorBound = output_monitor_bound_color;
+ sRectsNumber = output_monitor_rects_number;
+ sRectWidthRatio = output_monitor_rect_width_ratio;
+ sRectHeightRatio = output_monitor_rect_height_ratio;
+}
+
+LLOutputMonitorCtrl::~LLOutputMonitorCtrl()
+{
+}
+
+void LLOutputMonitorCtrl::setPower(F32 val)
+{
+ mPower = llmax(0.f, llmin(1.f, val));
+}
+
+void LLOutputMonitorCtrl::draw()
+{
+ //
+ // Fill the monitor with a bunch of small rectangles.
+ // The rectangles will be filled with gradient color,
+ // beginning with sColorNormal and ending with sColorOverdriven.
+ //
+ // *TODO: would using a (partially drawn) pixmap instead be faster?
+ //
+ const int monh = getRect().getHeight();
+ const int monw = getRect().getWidth();
+ const int maxrects = sRectsNumber;
+ const int period = monw / maxrects;
+ const int rectw = llfloor(period * sRectWidthRatio);
+ const int recth = llfloor(monh * sRectHeightRatio);
+ const int nrects = mIsMuted ? maxrects : llfloor(mPower * maxrects); // how many rects to draw?
+ const int rectbtm = (monh - recth) / 2;
+ const int recttop = rectbtm + recth;
+
+ LLColor4 rect_color;
+
+ for (int i=1, xpos = 0; i <= nrects; i++)
+ {
+ // Calculate color to use for the current rectangle.
+ if (mIsMuted)
+ {
+ rect_color = sColorMuted;
+ }
+ else
+ {
+ F32 frac = (mPower * i/nrects) / LLVoiceClient::OVERDRIVEN_POWER_LEVEL;
+ // Use overdriven color if the power exceeds overdriven level.
+ if (frac > 1.0f)
+ frac = 1.0f;
+ rect_color = lerp(sColorNormal, sColorOverdriven, frac);
+ }
+
+ // Draw rectangle filled with the color.
+ gl_rect_2d(xpos, recttop, xpos+rectw, rectbtm, rect_color, TRUE);
+ xpos += period;
+ }
+
+ //
+ // Draw bounding box.
+ //
+ gl_rect_2d(0, monh, monw, 0, sColorBound, FALSE);
+}
diff --git a/indra/newview/lloutputmonitorctrl.h b/indra/newview/lloutputmonitorctrl.h
new file mode 100644
index 0000000000..d5ab8e75ce
--- /dev/null
+++ b/indra/newview/lloutputmonitorctrl.h
@@ -0,0 +1,88 @@
+/**
+ * @file lloutputmonitorctrl.h
+ * @brief LLOutputMonitorCtrl base class
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
+ * Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLOUTPUTMONITORCTRL_H
+#define LL_LLOUTPUTMONITORCTRL_H
+
+#include "v4color.h"
+#include "llview.h"
+
+class LLTextBox;
+class LLUICtrlFactory;
+
+//
+// Classes
+//
+
+class LLOutputMonitorCtrl
+: public LLView
+{
+public:
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Params()
+ {
+ name = "output_monitor";
+ follows.flags(FOLLOWS_LEFT|FOLLOWS_TOP);
+ mouse_opaque = false;
+ }
+ };
+protected:
+ LLOutputMonitorCtrl(const Params&);
+ friend class LLUICtrlFactory;
+
+public:
+ virtual ~LLOutputMonitorCtrl();
+
+ // llview overrides
+ virtual void draw();
+
+ void setPower(F32 val);
+ F32 getPower(F32 val) const { return mPower; }
+
+ bool getIsMuted() const { return mIsMuted; }
+ void setIsMuted(bool val) { mIsMuted = val; }
+
+private:
+ static LLColor4 sColorMuted;
+ static LLColor4 sColorNormal;
+ static LLColor4 sColorOverdriven;
+ static LLColor4 sColorBound;
+ static S32 sRectsNumber;
+ static F32 sRectWidthRatio;
+ static F32 sRectHeightRatio;
+
+ F32 mPower;
+ bool mIsMuted;
+};
+
+#endif
diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp
index b16f56d0d8..e6ee91cdd3 100644
--- a/indra/newview/lloverlaybar.cpp
+++ b/indra/newview/lloverlaybar.cpp
@@ -89,7 +89,7 @@ void* LLOverlayBar::createMediaRemote(void* userdata)
void* LLOverlayBar::createVoiceRemote(void* userdata)
{
LLOverlayBar *self = (LLOverlayBar*)userdata;
- self->mVoiceRemote = new LLVoiceRemoteCtrl(std::string("voice_remote"));
+ self->mVoiceRemote = new LLVoiceRemoteCtrl();
return self->mVoiceRemote;
}
@@ -110,23 +110,24 @@ LLOverlayBar::LLOverlayBar()
mBuilt = false;
- LLCallbackMap::map_t factory_map;
- factory_map["media_remote"] = LLCallbackMap(LLOverlayBar::createMediaRemote, this);
- factory_map["voice_remote"] = LLCallbackMap(LLOverlayBar::createVoiceRemote, this);
- factory_map["chat_bar"] = LLCallbackMap(LLOverlayBar::createChatBar, this);
+ mFactoryMap["media_remote"] = LLCallbackMap(LLOverlayBar::createMediaRemote, this);
+ mFactoryMap["voice_remote"] = LLCallbackMap(LLOverlayBar::createVoiceRemote, this);
+ mFactoryMap["chat_bar"] = LLCallbackMap(LLOverlayBar::createChatBar, this);
- LLUICtrlFactory::getInstance()->buildPanel(this, "panel_overlaybar.xml", &factory_map);
+ LLUICtrlFactory::getInstance()->buildPanel(this, "panel_overlaybar.xml");
}
BOOL LLOverlayBar::postBuild()
{
- childSetAction("IM Received",onClickIMReceived,this);
childSetAction("Set Not Busy",onClickSetNotBusy,this);
childSetAction("Mouselook",onClickMouselook,this);
childSetAction("Stand Up",onClickStandUp,this);
childSetAction("Flycam",onClickFlycam,this);
childSetVisible("chat_bar", gSavedSettings.getBOOL("ChatVisible"));
+ mVoiceRemote->expandOrCollapse();
+ mMediaRemote->expandOrCollapse();
+
setFocusRoot(TRUE);
mBuilt = true;
@@ -282,13 +283,6 @@ void LLOverlayBar::refresh()
// Static functions
//-----------------------------------------------------------------------
-// static
-void LLOverlayBar::onClickIMReceived(void*)
-{
- gIMMgr->setFloaterOpen(TRUE);
-}
-
-
// static
void LLOverlayBar::onClickSetNotBusy(void*)
{
diff --git a/indra/newview/lloverlaybar.h b/indra/newview/lloverlaybar.h
index 852d033a10..f0cf480458 100644
--- a/indra/newview/lloverlaybar.h
+++ b/indra/newview/lloverlaybar.h
@@ -67,7 +67,6 @@ public:
// helpers for returning desired state
BOOL musicPlaying() { return mMusicState == PLAYING; }
- static void onClickIMReceived(void* data);
static void onClickSetNotBusy(void* data);
static void onClickMouselook(void* data);
static void onClickStandUp(void* data);
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 9d5a4ad01c..d0816ad4d8 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -35,6 +35,7 @@
#include "llpanelavatar.h"
#include "llclassifiedflags.h"
+#include "llfloaterreg.h"
#include "llfontgl.h"
#include "llcachename.h"
@@ -63,9 +64,9 @@
#include "llpanelclassified.h"
#include "llpanelpick.h"
#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
#include "llstatusbar.h"
#include "lltabcontainer.h"
-#include "lltabcontainervertical.h"
#include "llimview.h"
#include "lltooldraganddrop.h"
#include "lluiconstants.h"
@@ -78,6 +79,7 @@
#include "llweb.h"
#include "llinventorymodel.h"
#include "roles_constants.h"
+#include "lltrans.h"
#include "lluictrlfactory.h"
// Statics
@@ -98,7 +100,17 @@ extern void handle_pay_by_id(const LLUUID& payee);
class LLDropTarget : public LLView
{
public:
- LLDropTarget(const std::string& name, const LLRect& rect, const LLUUID& agent_id);
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Optional<LLUUID> agent_id;
+ Params()
+ {
+ mouse_opaque(false);
+ follows.flags(FOLLOWS_ALL);
+ }
+ };
+
+ LLDropTarget(const Params&);
~LLDropTarget();
void doDrop(EDragAndDropType cargo_type, void* cargo_data);
@@ -115,17 +127,13 @@ protected:
LLUUID mAgentID;
};
-
-LLDropTarget::LLDropTarget(const std::string& name, const LLRect& rect,
- const LLUUID& agent_id) :
- LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL),
- mAgentID(agent_id)
-{
-}
+LLDropTarget::LLDropTarget(const LLDropTarget::Params& p)
+: LLView(p),
+ mAgentID(p.agent_id)
+{}
LLDropTarget::~LLDropTarget()
-{
-}
+{}
void LLDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
{
@@ -149,13 +157,14 @@ BOOL LLDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
return FALSE;
}
+static LLRegisterWidget<LLDropTarget> r("drop_target");
+
//-----------------------------------------------------------------------------
// LLPanelAvatarTab()
//-----------------------------------------------------------------------------
-LLPanelAvatarTab::LLPanelAvatarTab(const std::string& name, const LLRect &rect,
- LLPanelAvatar* panel_avatar)
-: LLPanel(name, rect),
+LLPanelAvatarTab::LLPanelAvatarTab(LLPanelAvatar* panel_avatar)
+: LLPanel(),
mPanelAvatar(panel_avatar),
mDataRequested(false)
{ }
@@ -182,10 +191,8 @@ void LLPanelAvatarTab::sendAvatarProfileRequestIfNeeded(const std::string& metho
//-----------------------------------------------------------------------------
// LLPanelAvatarSecondLife()
//-----------------------------------------------------------------------------
-LLPanelAvatarSecondLife::LLPanelAvatarSecondLife(const std::string& name,
- const LLRect &rect,
- LLPanelAvatar* panel_avatar )
-: LLPanelAvatarTab(name, rect, panel_avatar),
+LLPanelAvatarSecondLife::LLPanelAvatarSecondLife(LLPanelAvatar* panel_avatar )
+: LLPanelAvatarTab(panel_avatar),
mPartnerID()
{
}
@@ -313,17 +320,15 @@ void LLPanelAvatarSecondLife::onClickPartnerInfo(void *data)
if (self->mPartnerID.notNull())
{
LLFloaterAvatarInfo::showFromProfile(self->mPartnerID,
- self->getScreenRect());
+ self->calcScreenRect());
}
}
//-----------------------------------------------------------------------------
// LLPanelAvatarFirstLife()
//-----------------------------------------------------------------------------
-LLPanelAvatarFirstLife::LLPanelAvatarFirstLife(const std::string& name,
- const LLRect &rect,
- LLPanelAvatar* panel_avatar )
-: LLPanelAvatarTab(name, rect, panel_avatar)
+LLPanelAvatarFirstLife::LLPanelAvatarFirstLife(LLPanelAvatar* panel_avatar )
+: LLPanelAvatarTab(panel_avatar)
{
}
@@ -373,7 +378,7 @@ BOOL LLPanelAvatarSecondLife::postBuild(void)
childSetAction("Offer Teleport...", LLPanelAvatar::onClickOfferTeleport,
getPanelAvatar() );
- childSetDoubleClickCallback("groups", onDoubleClickGroup, this );
+ getChild<LLScrollListCtrl>("groups")->setDoubleClickCallback(onDoubleClickGroup, this );
getChild<LLTextureCtrl>("img")->setFallbackImageName("default_profile_picture.j2c");
@@ -401,7 +406,7 @@ BOOL LLPanelAvatarNotes::postBuild(void)
BOOL LLPanelAvatarWeb::postBuild(void)
{
- childSetKeystrokeCallback("url_edit", onURLKeystroke, this);
+ getChild<LLLineEditor>("url_edit")->setKeystrokeCallback(onURLKeystroke, this);
childSetCommitCallback("load", onCommitLoad, this);
childSetAction("web_profile_help",onClickWebProfileHelp,this);
@@ -423,15 +428,15 @@ BOOL LLPanelAvatarWeb::postBuild(void)
BOOL LLPanelAvatarClassified::postBuild(void)
{
- childSetAction("New...",onClickNew,NULL);
- childSetAction("Delete...",onClickDelete,NULL);
+ childSetAction("New...",onClickNew,this);
+ childSetAction("Delete...",onClickDelete,this);
return TRUE;
}
BOOL LLPanelAvatarPicks::postBuild(void)
{
- childSetAction("New...",onClickNew,NULL);
- childSetAction("Delete...",onClickDelete,NULL);
+ childSetAction("New...",onClickNew,this);
+ childSetAction("Delete...",onClickDelete,this);
return TRUE;
}
@@ -467,9 +472,8 @@ BOOL LLPanelAvatarAdvanced::postBuild()
//-----------------------------------------------------------------------------
// LLPanelAvatarWeb
//-----------------------------------------------------------------------------
-LLPanelAvatarWeb::LLPanelAvatarWeb(const std::string& name, const LLRect& rect,
- LLPanelAvatar* panel_avatar)
-: LLPanelAvatarTab(name, rect, panel_avatar),
+LLPanelAvatarWeb::LLPanelAvatarWeb(LLPanelAvatar* panel_avatar)
+: LLPanelAvatarTab(panel_avatar),
mWebBrowser(NULL)
{
}
@@ -608,10 +612,8 @@ void LLPanelAvatarWeb::onLocationChange( const EventType& eventIn )
//-----------------------------------------------------------------------------
// LLPanelAvatarAdvanced
//-----------------------------------------------------------------------------
-LLPanelAvatarAdvanced::LLPanelAvatarAdvanced(const std::string& name,
- const LLRect& rect,
- LLPanelAvatar* panel_avatar)
-: LLPanelAvatarTab(name, rect, panel_avatar),
+LLPanelAvatarAdvanced::LLPanelAvatarAdvanced(LLPanelAvatar* panel_avatar)
+: LLPanelAvatarTab(panel_avatar),
mWantToCount(0),
mSkillsCount(0),
mWantToEdit( NULL ),
@@ -695,8 +697,8 @@ void LLPanelAvatarAdvanced::getWantSkills(U32* want_to_mask, std::string& want_t
//-----------------------------------------------------------------------------
// LLPanelAvatarNotes()
//-----------------------------------------------------------------------------
-LLPanelAvatarNotes::LLPanelAvatarNotes(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar)
-: LLPanelAvatarTab(name, rect, panel_avatar)
+LLPanelAvatarNotes::LLPanelAvatarNotes(LLPanelAvatar* panel_avatar)
+: LLPanelAvatarTab(panel_avatar)
{
}
@@ -723,9 +725,8 @@ void LLPanelAvatarNotes::onCommitNotes(LLUICtrl*, void* userdata)
//-----------------------------------------------------------------------------
// LLPanelAvatarClassified()
//-----------------------------------------------------------------------------
-LLPanelAvatarClassified::LLPanelAvatarClassified(const std::string& name, const LLRect& rect,
- LLPanelAvatar* panel_avatar)
-: LLPanelAvatarTab(name, rect, panel_avatar)
+LLPanelAvatarClassified::LLPanelAvatarClassified(LLPanelAvatar* panel_avatar)
+: LLPanelAvatarTab(panel_avatar)
{
}
@@ -850,18 +851,12 @@ void LLPanelAvatarClassified::processAvatarClassifiedReply(LLMessageSystem* msg,
panel_classified->markForServerRequest();
// The button should automatically truncate long names for us
- if(tabs)
- {
- tabs->addTabPanel(panel_classified, classified_name);
- }
+ tabs->addTabPanel(LLTabContainer::TabPanelParams().panel(panel_classified).label(classified_name));
}
// Make sure somebody is highlighted. This works even if there
// are no tabs in the container.
- if(tabs)
- {
- tabs->selectFirstTab();
- }
+ tabs->selectFirstTab();
childSetVisible("New...", true);
childSetVisible("Delete...", true);
@@ -888,11 +883,8 @@ bool LLPanelAvatarClassified::callbackNew(const LLSD& notification, const LLSD&
LLPanelClassified* panel_classified = new LLPanelClassified(false, false);
panel_classified->initNewClassified();
LLTabContainer* tabs = getChild<LLTabContainer>("classified tab");
- if(tabs)
- {
- tabs->addTabPanel(panel_classified, panel_classified->getClassifiedName());
- tabs->selectLastTab();
- }
+ tabs->addTabPanel(LLTabContainer::TabPanelParams().panel(panel_classified).label(panel_classified->getClassifiedName()));
+ tabs->selectLastTab();
}
return false;
}
@@ -956,10 +948,8 @@ bool LLPanelAvatarClassified::callbackDelete(const LLSD& notification, const LL
//-----------------------------------------------------------------------------
// LLPanelAvatarPicks()
//-----------------------------------------------------------------------------
-LLPanelAvatarPicks::LLPanelAvatarPicks(const std::string& name,
- const LLRect& rect,
- LLPanelAvatar* panel_avatar)
-: LLPanelAvatarTab(name, rect, panel_avatar)
+LLPanelAvatarPicks::LLPanelAvatarPicks(LLPanelAvatar* panel_avatar)
+: LLPanelAvatarTab(panel_avatar)
{
}
@@ -1014,7 +1004,7 @@ void LLPanelAvatarPicks::processAvatarPicksReply(LLMessageSystem* msg, void**)
msg->getUUID("Data", "PickID", pick_id, block);
msg->getString("Data", "PickName", pick_name, block);
- panel_pick = new LLPanelPick(FALSE);
+ panel_pick = new LLPanelPick();
panel_pick->setPickID(pick_id, avatar_id);
@@ -1023,18 +1013,12 @@ void LLPanelAvatarPicks::processAvatarPicksReply(LLMessageSystem* msg, void**)
panel_pick->markForServerRequest();
// The button should automatically truncate long names for us
- if(tabs)
- {
- tabs->addTabPanel(panel_pick, pick_name);
- }
+ tabs->addTabPanel(LLTabContainer::TabPanelParams().panel(panel_pick).label(pick_name));
}
// Make sure somebody is highlighted. This works even if there
// are no tabs in the container.
- if(tabs)
- {
- tabs->selectFirstTab();
- }
+ tabs->selectFirstTab();
childSetVisible("New...", true);
childSetVisible("Delete...", true);
@@ -1048,15 +1032,12 @@ void LLPanelAvatarPicks::processAvatarPicksReply(LLMessageSystem* msg, void**)
void LLPanelAvatarPicks::onClickNew(void* data)
{
LLPanelAvatarPicks* self = (LLPanelAvatarPicks*)data;
- LLPanelPick* panel_pick = new LLPanelPick(FALSE);
+ LLPanelPick* panel_pick = new LLPanelPick();
LLTabContainer* tabs = self->getChild<LLTabContainer>("picks tab");
panel_pick->initNewPick();
- if(tabs)
- {
- tabs->addTabPanel(panel_pick, panel_pick->getPickName());
- tabs->selectLastTab();
- }
+ tabs->addTabPanel(LLTabContainer::TabPanelParams().panel(panel_pick).label(panel_pick->getPickName()));
+ tabs->selectLastTab();
}
@@ -1128,12 +1109,8 @@ bool LLPanelAvatarPicks::callbackDelete(const LLSD& notification, const LLSD& re
//-----------------------------------------------------------------------------
// LLPanelAvatar
//-----------------------------------------------------------------------------
-LLPanelAvatar::LLPanelAvatar(
- const std::string& name,
- const LLRect &rect,
- BOOL allow_edit)
- :
- LLPanel(name, rect, FALSE),
+LLPanelAvatar::LLPanelAvatar(BOOL allow_edit)
+: LLPanel(),
mPanelSecondLife(NULL),
mPanelAdvanced(NULL),
mPanelClassified(NULL),
@@ -1152,21 +1129,17 @@ LLPanelAvatar::LLPanelAvatar(
sAllPanels.push_back(this);
- LLCallbackMap::map_t factory_map;
-
- factory_map["2nd Life"] = LLCallbackMap(createPanelAvatarSecondLife, this);
- factory_map["WebProfile"] = LLCallbackMap(createPanelAvatarWeb, this);
- factory_map["Interests"] = LLCallbackMap(createPanelAvatarInterests, this);
- factory_map["Picks"] = LLCallbackMap(createPanelAvatarPicks, this);
- factory_map["Classified"] = LLCallbackMap(createPanelAvatarClassified, this);
- factory_map["1st Life"] = LLCallbackMap(createPanelAvatarFirstLife, this);
- factory_map["My Notes"] = LLCallbackMap(createPanelAvatarNotes, this);
+ mFactoryMap["2nd Life"] = LLCallbackMap(createPanelAvatarSecondLife, this);
+ mFactoryMap["WebProfile"] = LLCallbackMap(createPanelAvatarWeb, this);
+ mFactoryMap["Interests"] = LLCallbackMap(createPanelAvatarInterests, this);
+ mFactoryMap["Picks"] = LLCallbackMap(createPanelAvatarPicks, this);
+ mFactoryMap["Classified"] = LLCallbackMap(createPanelAvatarClassified, this);
+ mFactoryMap["1st Life"] = LLCallbackMap(createPanelAvatarFirstLife, this);
+ mFactoryMap["My Notes"] = LLCallbackMap(createPanelAvatarNotes, this);
- LLUICtrlFactory::getInstance()->buildPanel(this, "panel_avatar.xml", &factory_map);
+ LLUICtrlFactory::getInstance()->buildPanel(this, "panel_avatar.xml");
selectTab(0);
-
-
}
BOOL LLPanelAvatar::postBuild(void)
@@ -1203,6 +1176,10 @@ BOOL LLPanelAvatar::postBuild(void)
LLPanelAvatar::~LLPanelAvatar()
{
sAllPanels.remove(this);
+ if (mAvatarID.notNull())
+ {
+ LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarID, this);
+ }
}
@@ -1281,6 +1258,13 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
if (avatar_id != mAvatarID)
{
avatar_changed = TRUE;
+
+ if (mAvatarID.notNull())
+ {
+ LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarID, this);
+ }
+
+ LLAvatarPropertiesProcessor::getInstance()->addObserver(avatar_id, this);
}
mAvatarID = avatar_id;
@@ -1299,17 +1283,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
// Teens don't have this.
if (mPanelFirstLife) mPanelFirstLife->enableControls(own_avatar && mAllowEdit);
- LLView *target_view = getChild<LLView>("drop_target_rect");
- if(target_view)
- {
- if (mDropTarget)
- {
- delete mDropTarget;
- }
- mDropTarget = new LLDropTarget("drop target", target_view->getRect(), mAvatarID);
- addChild(mDropTarget);
- mDropTarget->setAgentID(mAvatarID);
- }
+ mDropTarget = getChild<LLDropTarget> ("Drop Target");
+ mDropTarget->setAgentID(mAvatarID);
LLNameEditor* name_edit = getChild<LLNameEditor>("name");
if(name_edit)
@@ -1343,7 +1318,7 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
// Request just the first two pages of data. The picks,
// classifieds, and notes will be requested when that panel
// is made visible. JC
- sendAvatarPropertiesRequest();
+ LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(mAvatarID);
if (own_avatar)
{
@@ -1486,7 +1461,6 @@ void LLPanelAvatar::resetGroupList()
void LLPanelAvatar::onClickIM(void* userdata)
{
LLPanelAvatar* self = (LLPanelAvatar*) userdata;
- gIMMgr->setFloaterOpen(TRUE);
std::string name;
LLNameEditor* nameedit = self->mPanelSecondLife->getChild<LLNameEditor>("name");
@@ -1503,14 +1477,11 @@ void LLPanelAvatar::onClickTrack(void* userdata)
{
LLPanelAvatar* self = (LLPanelAvatar*) userdata;
- if( gFloaterWorldMap )
- {
- std::string name;
- LLNameEditor* nameedit = self->mPanelSecondLife->getChild<LLNameEditor>("name");
- if (nameedit) name = nameedit->getText();
- gFloaterWorldMap->trackAvatar(self->mAvatarID, name);
- LLFloaterWorldMap::show(NULL, TRUE);
- }
+ std::string name;
+ LLNameEditor* nameedit = self->mPanelSecondLife->getChild<LLNameEditor>("name");
+ if (nameedit) name = nameedit->getText();
+ LLFloaterWorldMap::getInstance()->trackAvatar(self->mAvatarID, name);
+ LLFloaterReg::showInstance("world_map", "center");
}
@@ -1588,24 +1559,15 @@ void LLPanelAvatar::onClickOK(void *userdata)
if ( tabs->getCurrentPanel() != self->mPanelClassified )
{
self->mPanelClassified->apply();
-
- LLFloaterAvatarInfo *infop = LLFloaterAvatarInfo::getInstance(self->mAvatarID);
- if (infop)
- {
- infop->close();
- }
+
+ LLFloaterReg::hideInstance("preview_avatar", self->mAvatarID);
}
else
{
if ( self->mPanelClassified->titleIsValid() )
{
self->mPanelClassified->apply();
-
- LLFloaterAvatarInfo *infop = LLFloaterAvatarInfo::getInstance(self->mAvatarID);
- if (infop)
- {
- infop->close();
- }
+ LLFloaterReg::hideInstance("preview_avatar", self->mAvatarID);
}
}
}
@@ -1618,12 +1580,7 @@ void LLPanelAvatar::onClickCancel(void *userdata)
if (self)
{
- LLFloaterAvatarInfo *infop;
- if ((infop = LLFloaterAvatarInfo::getInstance(self->mAvatarID)))
- {
- infop->close();
- }
- else
+ if (!LLFloaterReg::hideInstance("preview_avatar", self->mAvatarID))
{
// We're in the Search directory and are cancelling an edit
// to our own profile, so reset.
@@ -1635,15 +1592,7 @@ void LLPanelAvatar::onClickCancel(void *userdata)
void LLPanelAvatar::sendAvatarPropertiesRequest()
{
- lldebugs << "LLPanelAvatar::sendAvatarPropertiesRequest()" << llendl;
- LLMessageSystem *msg = gMessageSystem;
-
- msg->newMessageFast(_PREHASH_AvatarPropertiesRequest);
- msg->nextBlockFast( _PREHASH_AgentData);
- msg->addUUIDFast( _PREHASH_AgentID, gAgent.getID() );
- msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
- msg->addUUIDFast( _PREHASH_AvatarID, mAvatarID);
- gAgent.sendReliableMessage();
+ LLAvatarPropertiesProcessor::getInstance()->sendAvatarPropertiesRequest(mAvatarID);
}
void LLPanelAvatar::sendAvatarNotesUpdate()
@@ -1675,154 +1624,110 @@ void LLPanelAvatar::sendAvatarNotesUpdate()
gAgent.sendReliableMessage();
}
-
-// static
-void LLPanelAvatar::processAvatarPropertiesReply(LLMessageSystem *msg, void**)
+void LLPanelAvatar::processAvatarProperties(const LLAvatarData& avatar_data)
{
- LLUUID agent_id; // your id
- LLUUID avatar_id; // target of this panel
- LLUUID image_id;
- LLUUID fl_image_id;
- LLUUID partner_id;
- std::string about_text;
- std::string fl_about_text;
- std::string born_on;
- S32 charter_member_size = 0;
BOOL allow_publish = FALSE;
- //BOOL mature = FALSE;
BOOL identified = FALSE;
BOOL transacted = FALSE;
BOOL age_verified = FALSE;
BOOL online = FALSE;
std::string profile_url;
-
- U32 flags = 0x0;
+ std::string caption_text;
//llinfos << "properties packet size " << msg->getReceiveSize() << llendl;
- msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
- msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AvatarID, avatar_id );
+ childSetEnabled("Instant Message...",TRUE);
+ childSetEnabled("Pay...",TRUE);
+ childSetEnabled("Mute",TRUE);
- for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter)
+ childSetEnabled("drop target",TRUE);
+
+ mHaveProperties = TRUE;
+ enableOKIfReady();
+
+ identified = (avatar_data.flags & AVATAR_IDENTIFIED);
+ transacted = (avatar_data.flags & AVATAR_TRANSACTED);
+ age_verified = (avatar_data.flags & AVATAR_AGEVERIFIED); // Not currently getting set in dataserver/lldataavatar.cpp for privacy considerations
+ allow_publish = (avatar_data.flags & AVATAR_ALLOW_PUBLISH);
+ online = (avatar_data.flags & AVATAR_ONLINE);
+
+ caption_text = avatar_data.caption_text;
+
+ if(caption_text.empty())
{
- LLPanelAvatar* self = *iter;
- if (self->mAvatarID != avatar_id)
- {
- continue;
- }
- self->childSetEnabled("Instant Message...",TRUE);
- self->childSetEnabled("Pay...",TRUE);
- self->childSetEnabled("Mute",TRUE);
-
- self->childSetEnabled("drop target",TRUE);
-
- self->mHaveProperties = TRUE;
- self->enableOKIfReady();
-
- msg->getUUIDFast( _PREHASH_PropertiesData, _PREHASH_ImageID, image_id );
- msg->getUUIDFast( _PREHASH_PropertiesData, _PREHASH_FLImageID, fl_image_id );
- msg->getUUIDFast(_PREHASH_PropertiesData, _PREHASH_PartnerID, partner_id);
- msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_AboutText, about_text );
- msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_FLAboutText, fl_about_text );
- msg->getStringFast(_PREHASH_PropertiesData, _PREHASH_BornOn, born_on);
- msg->getString("PropertiesData","ProfileURL", profile_url);
- msg->getU32Fast(_PREHASH_PropertiesData, _PREHASH_Flags, flags);
-
- identified = (flags & AVATAR_IDENTIFIED);
- transacted = (flags & AVATAR_TRANSACTED);
- age_verified = (flags & AVATAR_AGEVERIFIED); // Not currently getting set in dataserver/lldataavatar.cpp for privacy considerations
- allow_publish = (flags & AVATAR_ALLOW_PUBLISH);
- online = (flags & AVATAR_ONLINE);
-
- U8 caption_index = 0;
- std::string caption_text;
- charter_member_size = msg->getSize("PropertiesData", "CharterMember");
- if(1 == charter_member_size)
- {
- msg->getBinaryData("PropertiesData", "CharterMember", &caption_index, 1);
- }
- else if(1 < charter_member_size)
- {
- msg->getString("PropertiesData", "CharterMember", caption_text);
- }
-
+ LLStringUtil::format_map_t args;
+ caption_text = mPanelSecondLife->getString("CaptionTextAcctInfo");
- if(caption_text.empty())
- {
- LLStringUtil::format_map_t args;
- caption_text = self->mPanelSecondLife->getString("CaptionTextAcctInfo");
-
- const char* ACCT_TYPE[] = {
- "AcctTypeResident",
- "AcctTypeTrial",
- "AcctTypeCharterMember",
- "AcctTypeEmployee"
- };
- caption_index = llclamp(caption_index, (U8)0, (U8)(LL_ARRAY_SIZE(ACCT_TYPE)-1));
- args["[ACCTTYPE]"] = self->mPanelSecondLife->getString(ACCT_TYPE[caption_index]);
-
- std::string payment_text = " ";
- const S32 DEFAULT_CAPTION_LINDEN_INDEX = 3;
- if(caption_index != DEFAULT_CAPTION_LINDEN_INDEX)
- {
- if(transacted)
- {
- payment_text = "PaymentInfoUsed";
- }
- else if (identified)
- {
- payment_text = "PaymentInfoOnFile";
- }
- else
- {
- payment_text = "NoPaymentInfoOnFile";
- }
- args["[PAYMENTINFO]"] = self->mPanelSecondLife->getString(payment_text);
- std::string age_text = age_verified ? "AgeVerified" : "NotAgeVerified";
- // Do not display age verification status at this time
- //args["[[AGEVERIFICATION]]"] = self->mPanelSecondLife->getString(age_text);
- args["[AGEVERIFICATION]"] = " ";
+ const char* ACCT_TYPE[] = {
+ "AcctTypeResident",
+ "AcctTypeTrial",
+ "AcctTypeCharterMember",
+ "AcctTypeEmployee"
+ };
+ U8 caption_index = llclamp(avatar_data.caption_index, (U8)0, (U8)(LL_ARRAY_SIZE(ACCT_TYPE)-1));
+ args["[ACCTTYPE]"] = mPanelSecondLife->getString(ACCT_TYPE[caption_index]);
+
+ std::string payment_text = " ";
+ const S32 DEFAULT_CAPTION_LINDEN_INDEX = 3;
+ if(caption_index != DEFAULT_CAPTION_LINDEN_INDEX)
+ {
+ if(transacted)
+ {
+ payment_text = "PaymentInfoUsed";
+ }
+ else if (identified)
+ {
+ payment_text = "PaymentInfoOnFile";
}
else
{
- args["[PAYMENTINFO]"] = " ";
- args["[AGEVERIFICATION]"] = " ";
+ payment_text = "NoPaymentInfoOnFile";
}
- LLStringUtil::format(caption_text, args);
+ args["[PAYMENTINFO]"] = mPanelSecondLife->getString(payment_text);
+ std::string age_text = age_verified ? "AgeVerified" : "NotAgeVerified";
+ // Do not display age verification status at this time
+ //args["[[AGEVERIFICATION]]"] = mPanelSecondLife->getString(age_text);
+ args["[AGEVERIFICATION]"] = " ";
}
-
- self->mPanelSecondLife->childSetValue("acct", caption_text);
- self->mPanelSecondLife->childSetValue("born", born_on);
+ else
+ {
+ args["[PAYMENTINFO]"] = " ";
+ args["[AGEVERIFICATION]"] = " ";
+ }
+ LLStringUtil::format(caption_text, args);
+ }
+
+ mPanelSecondLife->childSetValue("acct", caption_text);
+ mPanelSecondLife->childSetValue("born", avatar_data.born_on);
- EOnlineStatus online_status = (online) ? ONLINE_STATUS_YES : ONLINE_STATUS_NO;
+ EOnlineStatus online_status = (online) ? ONLINE_STATUS_YES : ONLINE_STATUS_NO;
- self->setOnlineStatus(online_status);
+ setOnlineStatus(online_status);
- self->mPanelWeb->setWebURL(profile_url);
+ mPanelWeb->setWebURL(profile_url);
- LLTextureCtrl* image_ctrl = self->mPanelSecondLife->getChild<LLTextureCtrl>("img");
- if(image_ctrl)
- {
- image_ctrl->setImageAssetID(image_id);
- }
- self->childSetValue("about", about_text);
+ LLTextureCtrl* image_ctrl = mPanelSecondLife->getChild<LLTextureCtrl>("img");
+ if(image_ctrl)
+ {
+ image_ctrl->setImageAssetID(avatar_data.image_id);
+ }
+ childSetValue("about", avatar_data.about_text);
- self->mPanelSecondLife->setPartnerID(partner_id);
- self->mPanelSecondLife->updatePartnerName();
+ mPanelSecondLife->setPartnerID(avatar_data.partner_id);
+ mPanelSecondLife->updatePartnerName();
- if (self->mPanelFirstLife)
+ if (mPanelFirstLife)
+ {
+ // Teens don't get these
+ mPanelFirstLife->childSetValue("about", avatar_data.fl_about_text);
+ LLTextureCtrl* image_ctrl = mPanelFirstLife->getChild<LLTextureCtrl>("img");
+ if(image_ctrl)
{
- // Teens don't get these
- self->mPanelFirstLife->childSetValue("about", fl_about_text);
- LLTextureCtrl* image_ctrl = self->mPanelFirstLife->getChild<LLTextureCtrl>("img");
- if(image_ctrl)
- {
- image_ctrl->setImageAssetID(fl_image_id);
- }
+ image_ctrl->setImageAssetID(avatar_data.fl_image_id);
+ }
- self->mPanelSecondLife->childSetValue("allow_publish", allow_publish);
+ mPanelSecondLife->childSetValue("allow_publish", allow_publish);
- }
}
}
@@ -1896,7 +1801,7 @@ void LLPanelAvatar::processAvatarGroupsReply(LLMessageSystem *msg, void**)
S32 group_count = msg->getNumberOfBlocksFast(_PREHASH_GroupData);
if (0 == group_count)
{
- if(group_list) group_list->addCommentText(std::string("None")); // *TODO: Translate
+ if(group_list) group_list->setCommentText(LLTrans::getString("None"));
}
else
{
@@ -2128,10 +2033,6 @@ void LLPanelAvatar::onClickKick(void* userdata)
{
LLPanelAvatar* self = (LLPanelAvatar*) userdata;
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect(left, top, left+400, top-300);
-
LLSD payload;
payload["avatar_id"] = self->mAvatarID;
LLNotifications::instance().add("KickUser", LLSD(), payload, finishKick);
@@ -2256,21 +2157,21 @@ void LLPanelAvatar::onClickCSR(void* userdata)
void* LLPanelAvatar::createPanelAvatarSecondLife(void* data)
{
LLPanelAvatar* self = (LLPanelAvatar*)data;
- self->mPanelSecondLife = new LLPanelAvatarSecondLife(std::string("2nd Life"),LLRect(),self);
+ self->mPanelSecondLife = new LLPanelAvatarSecondLife(self);
return self->mPanelSecondLife;
}
void* LLPanelAvatar::createPanelAvatarWeb(void* data)
{
LLPanelAvatar* self = (LLPanelAvatar*)data;
- self->mPanelWeb = new LLPanelAvatarWeb(std::string("Web"),LLRect(),self);
+ self->mPanelWeb = new LLPanelAvatarWeb(self);
return self->mPanelWeb;
}
void* LLPanelAvatar::createPanelAvatarInterests(void* data)
{
LLPanelAvatar* self = (LLPanelAvatar*)data;
- self->mPanelAdvanced = new LLPanelAvatarAdvanced(std::string("Interests"),LLRect(),self);
+ self->mPanelAdvanced = new LLPanelAvatarAdvanced(self);
return self->mPanelAdvanced;
}
@@ -2278,27 +2179,27 @@ void* LLPanelAvatar::createPanelAvatarInterests(void* data)
void* LLPanelAvatar::createPanelAvatarPicks(void* data)
{
LLPanelAvatar* self = (LLPanelAvatar*)data;
- self->mPanelPicks = new LLPanelAvatarPicks(std::string("Picks"),LLRect(),self);
+ self->mPanelPicks = new LLPanelAvatarPicks(self);
return self->mPanelPicks;
}
void* LLPanelAvatar::createPanelAvatarClassified(void* data)
{
LLPanelAvatar* self = (LLPanelAvatar*)data;
- self->mPanelClassified = new LLPanelAvatarClassified(std::string("Classified"),LLRect(),self);
+ self->mPanelClassified = new LLPanelAvatarClassified(self);
return self->mPanelClassified;
}
void* LLPanelAvatar::createPanelAvatarFirstLife(void* data)
{
LLPanelAvatar* self = (LLPanelAvatar*)data;
- self->mPanelFirstLife = new LLPanelAvatarFirstLife(std::string("1st Life"), LLRect(), self);
+ self->mPanelFirstLife = new LLPanelAvatarFirstLife(self);
return self->mPanelFirstLife;
}
void* LLPanelAvatar::createPanelAvatarNotes(void* data)
{
LLPanelAvatar* self = (LLPanelAvatar*)data;
- self->mPanelNotes = new LLPanelAvatarNotes(std::string("My Notes"),LLRect(),self);
+ self->mPanelNotes = new LLPanelAvatarNotes(self);
return self->mPanelNotes;
}
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index 12e1b99360..8c7112197f 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -37,6 +37,7 @@
#include "v3dmath.h"
#include "lluuid.h"
#include "llwebbrowserctrl.h"
+#include "llavatarpropertiesprocessor.h"
class LLButton;
class LLCheckBoxCtrl;
@@ -69,8 +70,7 @@ enum EOnlineStatus
class LLPanelAvatarTab : public LLPanel
{
public:
- LLPanelAvatarTab(const std::string& name, const LLRect &rect,
- LLPanelAvatar* panel_avatar);
+ LLPanelAvatarTab(LLPanelAvatar* panel_avatar);
// Calls refresh() once per frame when panel is visible
/*virtual*/ void draw();
@@ -96,7 +96,7 @@ private:
class LLPanelAvatarFirstLife : public LLPanelAvatarTab
{
public:
- LLPanelAvatarFirstLife(const std::string& name, const LLRect &rect, LLPanelAvatar* panel_avatar);
+ LLPanelAvatarFirstLife(LLPanelAvatar* panel_avatar);
/*virtual*/ BOOL postBuild(void);
@@ -108,7 +108,7 @@ class LLPanelAvatarSecondLife
: public LLPanelAvatarTab
{
public:
- LLPanelAvatarSecondLife(const std::string& name, const LLRect &rect, LLPanelAvatar* panel_avatar );
+ LLPanelAvatarSecondLife(LLPanelAvatar* panel_avatar );
/*virtual*/ BOOL postBuild(void);
/*virtual*/ void refresh();
@@ -140,7 +140,7 @@ class LLPanelAvatarWeb :
, public LLWebBrowserCtrlObserver
{
public:
- LLPanelAvatarWeb(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
+ LLPanelAvatarWeb(LLPanelAvatar* panel_avatar);
/*virtual*/ ~LLPanelAvatarWeb();
/*virtual*/ BOOL postBuild(void);
@@ -170,7 +170,7 @@ private:
class LLPanelAvatarAdvanced : public LLPanelAvatarTab
{
public:
- LLPanelAvatarAdvanced(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
+ LLPanelAvatarAdvanced(LLPanelAvatar* panel_avatar);
/*virtual*/ BOOL postBuild(void);
@@ -195,7 +195,7 @@ private:
class LLPanelAvatarNotes : public LLPanelAvatarTab
{
public:
- LLPanelAvatarNotes(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
+ LLPanelAvatarNotes(LLPanelAvatar* panel_avatar);
/*virtual*/ BOOL postBuild(void);
@@ -210,7 +210,7 @@ public:
class LLPanelAvatarClassified : public LLPanelAvatarTab
{
public:
- LLPanelAvatarClassified(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
+ LLPanelAvatarClassified(LLPanelAvatar* panel_avatar);
/*virtual*/ BOOL postBuild(void);
@@ -243,7 +243,7 @@ private:
class LLPanelAvatarPicks : public LLPanelAvatarTab
{
public:
- LLPanelAvatarPicks(const std::string& name, const LLRect& rect, LLPanelAvatar* panel_avatar);
+ LLPanelAvatarPicks(LLPanelAvatar* panel_avatar);
/*virtual*/ BOOL postBuild(void);
@@ -265,10 +265,10 @@ private:
};
-class LLPanelAvatar : public LLPanel
+class LLPanelAvatar : public LLPanel, public LLAvatarPropertiesObserver
{
public:
- LLPanelAvatar(const std::string& name, const LLRect &rect, BOOL allow_edit);
+ LLPanelAvatar(BOOL allow_edit);
/*virtual*/ ~LLPanelAvatar();
/*virtual*/ BOOL postBuild(void);
@@ -306,7 +306,9 @@ public:
BOOL haveData() { return mHaveProperties && mHaveStatistics; }
BOOL isEditable() const { return mAllowEdit; }
- static void processAvatarPropertiesReply(LLMessageSystem *msg, void **);
+ // LLAvatarPropertiesProcessor observer trigger
+ virtual void processAvatarProperties(const LLAvatarData& avatar_data);
+
static void processAvatarInterestsReply(LLMessageSystem *msg, void **);
static void processAvatarGroupsReply(LLMessageSystem* msg, void**);
static void processAvatarNotesReply(LLMessageSystem *msg, void **);
diff --git a/indra/newview/llpanelclassified.cpp b/indra/newview/llpanelclassified.cpp
index afaaea28f0..b606aef06d 100644
--- a/indra/newview/llpanelclassified.cpp
+++ b/indra/newview/llpanelclassified.cpp
@@ -40,6 +40,7 @@
#include "lldir.h"
#include "lldispatcher.h"
+#include "llfloaterreg.h"
#include "llparcel.h"
#include "message.h"
@@ -54,7 +55,6 @@
#include "lllineeditor.h"
#include "llfloateravatarinfo.h"
#include "llfloaterclassified.h"
-#include "lltabcontainervertical.h"
#include "lltextbox.h"
#include "llcombobox.h"
#include "llviewertexteditor.h"
@@ -70,6 +70,7 @@
#include "llviewerregion.h"
#include "llviewerwindow.h" // for window width, height
#include "llappviewer.h" // abortQuit()
+#include "lltrans.h"
const S32 MINIMUM_PRICE_FOR_LISTING = 50; // L$
const S32 MATURE_UNDEFINED = -1;
@@ -151,7 +152,7 @@ LLClassifiedTeleportHandler gClassifiedTeleportHandler;
*/
LLPanelClassified::LLPanelClassified(bool in_finder, bool from_search)
-: LLPanel(std::string("Classified Panel")),
+: LLPanel(),
mInFinder(in_finder),
mFromSearch(from_search),
mDirty(false),
@@ -231,44 +232,37 @@ void LLPanelClassified::reset()
BOOL LLPanelClassified::postBuild()
{
mSnapshotCtrl = getChild<LLTextureCtrl>("snapshot_ctrl");
- mSnapshotCtrl->setCommitCallback(onCommitAny);
- mSnapshotCtrl->setCallbackUserData(this);
+ mSnapshotCtrl->setCommitCallback(onCommitAny, this);
mSnapshotSize = mSnapshotCtrl->getRect();
mNameEditor = getChild<LLLineEditor>("given_name_editor");
mNameEditor->setMaxTextLength(DB_PARCEL_NAME_LEN);
mNameEditor->setCommitOnFocusLost(TRUE);
mNameEditor->setFocusReceivedCallback(focusReceived, this);
- mNameEditor->setCommitCallback(onCommitAny);
- mNameEditor->setCallbackUserData(this);
+ mNameEditor->setCommitCallback(onCommitAny, this);
mNameEditor->setPrevalidate( LLLineEditor::prevalidateASCII );
mDescEditor = getChild<LLTextEditor>("desc_editor");
mDescEditor->setCommitOnFocusLost(TRUE);
mDescEditor->setFocusReceivedCallback(focusReceived, this);
- mDescEditor->setCommitCallback(onCommitAny);
- mDescEditor->setCallbackUserData(this);
+ mDescEditor->setCommitCallback(onCommitAny, this);
mDescEditor->setTabsToNextField(TRUE);
mLocationEditor = getChild<LLLineEditor>("location_editor");
mSetBtn = getChild<LLButton>( "set_location_btn");
- mSetBtn->setClickedCallback(onClickSet);
- mSetBtn->setCallbackUserData(this);
+ mSetBtn->setClickedCallback(onClickSet, this);
mTeleportBtn = getChild<LLButton>( "classified_teleport_btn");
- mTeleportBtn->setClickedCallback(onClickTeleport);
- mTeleportBtn->setCallbackUserData(this);
+ mTeleportBtn->setClickedCallback(onClickTeleport, this);
mMapBtn = getChild<LLButton>( "classified_map_btn");
- mMapBtn->setClickedCallback(onClickMap);
- mMapBtn->setCallbackUserData(this);
+ mMapBtn->setClickedCallback(onClickMap, this);
if(mInFinder)
{
mProfileBtn = getChild<LLButton>( "classified_profile_btn");
- mProfileBtn->setClickedCallback(onClickProfile);
- mProfileBtn->setCallbackUserData(this);
+ mProfileBtn->setClickedCallback(onClickProfile, this);
}
mCategoryCombo = getChild<LLComboBox>( "classified_category_combo");
@@ -277,16 +271,14 @@ BOOL LLPanelClassified::postBuild()
iter != LLClassifiedInfo::sCategories.end();
iter++)
{
- mCategoryCombo->add(iter->second, (void *)((intptr_t)iter->first), ADD_BOTTOM);
+ mCategoryCombo->add(LLTrans::getString(iter->second), (void *)((intptr_t)iter->first), ADD_BOTTOM);
}
mCategoryCombo->setCurrentByIndex(0);
- mCategoryCombo->setCommitCallback(onCommitAny);
- mCategoryCombo->setCallbackUserData(this);
+ mCategoryCombo->setCommitCallback(onCommitAny, this);
mMatureCombo = getChild<LLComboBox>( "classified_mature_check");
mMatureCombo->setCurrentByIndex(0);
- mMatureCombo->setCommitCallback(onCommitAny);
- mMatureCombo->setCallbackUserData(this);
+ mMatureCombo->setCommitCallback(onCommitAny, this);
if (gAgent.wantsPGOnly())
{
// Teens don't get to set mature flag. JC
@@ -297,13 +289,11 @@ BOOL LLPanelClassified::postBuild()
if (!mInFinder)
{
mAutoRenewCheck = getChild<LLCheckBoxCtrl>( "auto_renew_check");
- mAutoRenewCheck->setCommitCallback(onCommitAny);
- mAutoRenewCheck->setCallbackUserData(this);
+ mAutoRenewCheck->setCommitCallback(onCommitAny, this);
}
mUpdateBtn = getChild<LLButton>("classified_update_btn");
- mUpdateBtn->setClickedCallback(onClickUpdate);
- mUpdateBtn->setCallbackUserData(this);
+ mUpdateBtn->setClickedCallback(onClickUpdate, this);
if (!mInFinder)
{
@@ -360,7 +350,7 @@ bool LLPanelClassified::saveCallback(const LLSD& notification, const LLSD& respo
LLFloater* parent_floater = gFloaterView->getParentFloater(this);
if (parent_floater)
{
- parent_floater->close();
+ parent_floater->closeFloater();
}
}
break;
@@ -455,10 +445,11 @@ void LLPanelClassified::setClickThrough(const LLUUID& classified_id,
if (self->mClickThroughText)
{
- std::string msg = llformat("Clicks: %d teleport, %d map, %d profile",
- self->mTeleportClicksNew + self->mTeleportClicksOld,
- self->mMapClicksNew + self->mMapClicksOld,
- self->mProfileClicksNew + self->mProfileClicksOld);
+ LLStringUtil::format_map_t args;
+ args["[TELEPORT]"] = llformat ("%d", self->mTeleportClicksNew + self->mTeleportClicksOld);
+ args["[MAP]"] = llformat ("%d", self->mMapClicksNew + self->mMapClicksOld);
+ args["[PROFILE]"] = llformat ("%d", self->mProfileClicksNew + self->mProfileClicksOld);
+ std::string msg = LLTrans::getString ("ClassifiedClicksTxt", args);
self->mClickThroughText->setText(msg);
}
}
@@ -623,7 +614,6 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
U32 date = 0;
msg->getU32Fast(_PREHASH_Data, _PREHASH_CreationDate, date);
time_t tim = date;
- tm *now=localtime(&tim);
// future use
U32 expiration_date = 0;
@@ -674,9 +664,13 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
self->mAutoRenewCheck->set(auto_renew);
}
- std::string datestr = llformat("%02d/%02d/%d", now->tm_mon+1, now->tm_mday, now->tm_year+1900);
+ std::string dateStr = self->getString("dateStr");
+ LLSD substitution;
+ substitution["datetime"] = (S32) tim;
+ LLStringUtil::format (dateStr, substitution);
+
LLStringUtil::format_map_t string_args;
- string_args["[DATE]"] = datestr;
+ string_args["[DATE]"] = dateStr;
string_args["[AMT]"] = llformat("%d", price_for_listing);
self->childSetText("classified_info_text", self->getString("ad_placed_paid", string_args));
@@ -850,7 +844,7 @@ void LLPanelClassified::gotMature()
if (mPaidFor)
{
LLNotification::Params params("PublishClassified");
- params.functor(boost::bind(&LLPanelClassified::confirmPublish, this, _1, _2));
+ params.functor.function(boost::bind(&LLPanelClassified::confirmPublish, this, _1, _2));
LLNotifications::instance().forceResponse(params, 0);
}
else
@@ -945,7 +939,7 @@ void LLPanelClassified::onClickTeleport(void* data)
if (!self->mPosGlobal.isExactlyZero())
{
gAgent.teleportViaLocation(self->mPosGlobal);
- gFloaterWorldMap->trackLocation(self->mPosGlobal);
+ LLFloaterWorldMap::getInstance()->trackLocation(self->mPosGlobal);
self->sendClassifiedClickMessage("teleport");
}
@@ -956,8 +950,8 @@ void LLPanelClassified::onClickTeleport(void* data)
void LLPanelClassified::onClickMap(void* data)
{
LLPanelClassified* self = (LLPanelClassified*)data;
- gFloaterWorldMap->trackLocation(self->mPosGlobal);
- LLFloaterWorldMap::show(NULL, TRUE);
+ LLFloaterWorldMap::getInstance()->trackLocation(self->mPosGlobal);
+ LLFloaterReg::showInstance("world_map", "center");
self->sendClassifiedClickMessage("map");
}
@@ -988,7 +982,7 @@ void LLPanelClassified::onClickSet(void* data)
self->mPosGlobal = gAgent.getPositionGlobal();
std::string location_text;
- std::string regionName = "(will update after publish)";
+ std::string regionName = LLTrans::getString("ClassifiedUpdateAfterPublish");
LLViewerRegion* pRegion = gAgent.getRegion();
if (pRegion)
{
@@ -1069,7 +1063,7 @@ void LLPanelClassified::sendClassifiedClickMessage(const std::string& type)
////////////////////////////////////////////////////////////////////////////////////////////
LLFloaterPriceForListing::LLFloaterPriceForListing()
-: LLFloater(std::string("PriceForListing")),
+: LLFloater(),
mCallback(NULL),
mUserData(NULL)
{ }
@@ -1133,7 +1127,7 @@ void LLFloaterPriceForListing::buttonCore(S32 button, void* data)
{
std::string text = self->childGetText("price_edit");
self->mCallback(button, text, self->mUserData);
- self->close();
+ self->closeFloater();
}
}
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index a2f3d9e12c..b7ec485872 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -36,37 +36,33 @@
#include "llpanelcontents.h"
// linden library includes
+#include "lleconomy.h"
#include "llerror.h"
+#include "llfloaterreg.h"
+#include "llfontgl.h"
+#include "llmaterialtable.h"
+#include "llpermissionsflags.h"
#include "llrect.h"
#include "llstring.h"
-#include "llmaterialtable.h"
-#include "llfontgl.h"
+#include "llui.h"
#include "m3math.h"
-#include "llpermissionsflags.h"
-#include "lleconomy.h"
#include "material_codes.h"
// project includes
-#include "llui.h"
-#include "llspinctrl.h"
-#include "llcheckboxctrl.h"
-#include "lltextbox.h"
-#include "llbutton.h"
-#include "llcombobox.h"
-#include "llfloaterbulkpermission.h"
-
#include "llagent.h"
-#include "llviewerwindow.h"
-#include "llworld.h"
-#include "llviewerobject.h"
-#include "llviewerregion.h"
+#include "llfloaterbulkpermission.h"
+#include "llpanelinventory.h"
+#include "llpreviewscript.h"
#include "llresmgr.h"
#include "llselectmgr.h"
-#include "llpreviewscript.h"
#include "lltool.h"
-#include "lltoolmgr.h"
#include "lltoolcomp.h"
-#include "llpanelinventory.h"
+#include "lltoolmgr.h"
+#include "lltrans.h"
+#include "llviewerobject.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
+#include "llworld.h"
//
// Imported globals
@@ -86,11 +82,13 @@ BOOL LLPanelContents::postBuild()
childSetAction("button new script",&LLPanelContents::onClickNewScript, this);
childSetAction("button permissions",&LLPanelContents::onClickPermissions, this);
+ mPanelInventory = getChild<LLPanelInventory>("contents_inventory");
+
return TRUE;
}
-LLPanelContents::LLPanelContents(const std::string& name)
- : LLPanel(name),
+LLPanelContents::LLPanelContents()
+ : LLPanel(),
mPanelInventory(NULL)
{
}
@@ -171,7 +169,7 @@ void LLPanelContents::onClickNewScript(void *userdata)
LLUUID::null,
LLAssetType::AT_LSL_TEXT,
LLInventoryType::IT_LSL,
- std::string("New Script"),
+ LLTrans::getString("PanelContentsNewScript"),
desc,
LLSaleInfo::DEFAULT,
LLViewerInventoryItem::II_FLAGS_NONE,
@@ -185,21 +183,7 @@ void LLPanelContents::onClickNewScript(void *userdata)
// viewer so the viewer can auto-open the script and start
// editing ASAP.
#if 0
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("PreviewScriptRect");
- rect.translate( left - rect.mLeft, top - rect.mTop );
-
- LLLiveLSLEditor* editor;
- editor = new LLLiveLSLEditor("script ed",
- rect,
- "Script: New Script",
- object->mID,
- LLUUID::null);
- editor->open(); /*Flawfinder: ignore*/
-
- // keep onscreen
- gFloaterView->adjustToFitScreen(editor, FALSE);
+ LLFloaterReg::showInstance("preview_scriptedit", LLSD(inv_item->getUUID()), TAKE_FOCUS_YES);
#endif
}
}
diff --git a/indra/newview/llpanelcontents.h b/indra/newview/llpanelcontents.h
index ea06707494..de1914bff9 100644
--- a/indra/newview/llpanelcontents.h
+++ b/indra/newview/llpanelcontents.h
@@ -46,7 +46,7 @@ class LLPanelContents : public LLPanel
{
public:
virtual BOOL postBuild();
- LLPanelContents(const std::string& name);
+ LLPanelContents();
virtual ~LLPanelContents();
void refresh();
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index e93a5be8ed..2ff22416ec 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -87,11 +87,10 @@ BOOL LLPanelFace::postBuild()
if(mTextureCtrl)
{
mTextureCtrl->setDefaultImageAssetID(LLUUID( gSavedSettings.getString( "DefaultObjectTexture" )));
- mTextureCtrl->setCommitCallback( LLPanelFace::onCommitTexture );
- mTextureCtrl->setOnCancelCallback( LLPanelFace::onCancelTexture );
- mTextureCtrl->setOnSelectCallback( LLPanelFace::onSelectTexture );
- mTextureCtrl->setDragCallback(LLPanelFace::onDragTexture);
- mTextureCtrl->setCallbackUserData( this );
+ mTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitTexture, this, _2) );
+ mTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelTexture, this, _2) );
+ mTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectTexture, this, _2) );
+ mTextureCtrl->setDragCallback(boost::bind(&LLPanelFace::onDragTexture, _2));
mTextureCtrl->setFollowsTop();
mTextureCtrl->setFollowsLeft();
// Don't allow (no copy) or (no transfer) textures to be selected during immediate mode
@@ -118,10 +117,9 @@ BOOL LLPanelFace::postBuild()
mColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
if(mColorSwatch)
{
- mColorSwatch->setCommitCallback(LLPanelFace::onCommitColor);
- mColorSwatch->setOnCancelCallback(LLPanelFace::onCancelColor);
- mColorSwatch->setOnSelectCallback(LLPanelFace::onSelectColor);
- mColorSwatch->setCallbackUserData( this );
+ mColorSwatch->setCommitCallback(boost::bind(&LLPanelFace::onCommitColor, this, _2));
+ mColorSwatch->setOnCancelCallback(boost::bind(&LLPanelFace::onCancelColor, this, _2));
+ mColorSwatch->setOnSelectCallback(boost::bind(&LLPanelFace::onSelectColor, this, _2));
mColorSwatch->setFollowsTop();
mColorSwatch->setFollowsLeft();
mColorSwatch->setCanApplyImmediately(TRUE);
@@ -137,8 +135,7 @@ BOOL LLPanelFace::postBuild()
mCtrlColorTransp = getChild<LLSpinCtrl>("ColorTrans");
if(mCtrlColorTransp)
{
- mCtrlColorTransp->setCommitCallback(LLPanelFace::onCommitAlpha);
- mCtrlColorTransp->setCallbackUserData(this);
+ mCtrlColorTransp->setCommitCallback(boost::bind(&LLPanelFace::onCommitAlpha, this, _2));
mCtrlColorTransp->setPrecision(0);
mCtrlColorTransp->setFollowsTop();
mCtrlColorTransp->setFollowsLeft();
@@ -147,23 +144,20 @@ BOOL LLPanelFace::postBuild()
mCheckFullbright = getChild<LLCheckBoxCtrl>("checkbox fullbright");
if (mCheckFullbright)
{
- mCheckFullbright->setCommitCallback(LLPanelFace::onCommitFullbright);
- mCheckFullbright->setCallbackUserData( this );
+ mCheckFullbright->setCommitCallback(LLPanelFace::onCommitFullbright, this);
}
mComboTexGen = getChild<LLComboBox>("combobox texgen");
if(mComboTexGen)
{
- mComboTexGen->setCommitCallback(LLPanelFace::onCommitTexGen);
+ mComboTexGen->setCommitCallback(LLPanelFace::onCommitTexGen, this);
mComboTexGen->setFollows(FOLLOWS_LEFT | FOLLOWS_TOP);
- mComboTexGen->setCallbackUserData( this );
}
mCtrlGlow = getChild<LLSpinCtrl>("glow");
if(mCtrlGlow)
{
- mCtrlGlow->setCommitCallback(LLPanelFace::onCommitGlow);
- mCtrlGlow->setCallbackUserData(this);
+ mCtrlGlow->setCommitCallback(LLPanelFace::onCommitGlow, this);
}
childSetCommitCallback("combobox shininess",&LLPanelFace::onCommitShiny,this);
@@ -183,8 +177,8 @@ BOOL LLPanelFace::postBuild()
return TRUE;
}
-LLPanelFace::LLPanelFace(const std::string& name)
-: LLPanel(name)
+LLPanelFace::LLPanelFace()
+: LLPanel()
{
}
@@ -807,32 +801,25 @@ F32 LLPanelFace::valueGlow(LLViewerObject* object, S32 face)
}
-// static
-void LLPanelFace::onCommitColor(LLUICtrl* ctrl, void* userdata)
+void LLPanelFace::onCommitColor(const LLSD& data)
{
- LLPanelFace* self = (LLPanelFace*) userdata;
- self->sendColor();
+ sendColor();
}
-// static
-void LLPanelFace::onCommitAlpha(LLUICtrl* ctrl, void* userdata)
+void LLPanelFace::onCommitAlpha(const LLSD& data)
{
- LLPanelFace* self = (LLPanelFace*) userdata;
- self->sendAlpha();
+ sendAlpha();
}
-// static
-void LLPanelFace::onCancelColor(LLUICtrl* ctrl, void* userdata)
+void LLPanelFace::onCancelColor(const LLSD& data)
{
LLSelectMgr::getInstance()->selectionRevertColors();
}
-// static
-void LLPanelFace::onSelectColor(LLUICtrl* ctrl, void* userdata)
+void LLPanelFace::onSelectColor(const LLSD& data)
{
- LLPanelFace* self = (LLPanelFace*) userdata;
LLSelectMgr::getInstance()->saveSelectedObjectColors();
- self->sendColor();
+ sendColor();
}
// static
@@ -871,7 +858,7 @@ void LLPanelFace::onCommitGlow(LLUICtrl* ctrl, void* userdata)
}
// static
-BOOL LLPanelFace::onDragTexture(LLUICtrl*, LLInventoryItem* item, void*)
+BOOL LLPanelFace::onDragTexture(LLInventoryItem* item)
{
BOOL accept = TRUE;
for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
@@ -888,28 +875,21 @@ BOOL LLPanelFace::onDragTexture(LLUICtrl*, LLInventoryItem* item, void*)
return accept;
}
-// static
-void LLPanelFace::onCommitTexture( LLUICtrl* ctrl, void* userdata )
+void LLPanelFace::onCommitTexture( const LLSD& data )
{
- LLPanelFace* self = (LLPanelFace*) userdata;
-
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_EDIT_TEXTURE_COUNT );
-
- self->sendTexture();
+ sendTexture();
}
-// static
-void LLPanelFace::onCancelTexture(LLUICtrl* ctrl, void* userdata)
+void LLPanelFace::onCancelTexture(const LLSD& data)
{
LLSelectMgr::getInstance()->selectionRevertTextures();
}
-// static
-void LLPanelFace::onSelectTexture(LLUICtrl* ctrl, void* userdata)
+void LLPanelFace::onSelectTexture(const LLSD& data)
{
- LLPanelFace* self = (LLPanelFace*) userdata;
LLSelectMgr::getInstance()->saveSelectedObjectTextures();
- self->sendTexture();
+ sendTexture();
}
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index a2ead0c8a2..9600129696 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -52,7 +52,7 @@ class LLPanelFace : public LLPanel
{
public:
virtual BOOL postBuild();
- LLPanelFace(const std::string& name);
+ LLPanelFace();
virtual ~LLPanelFace();
void refresh();
@@ -70,17 +70,18 @@ protected:
void sendFullbright(); // applies and sends full bright
void sendGlow();
- // this function is to return TRUE if the dra should succeed.
- static BOOL onDragTexture(LLUICtrl* ctrl, LLInventoryItem* item, void* ud);
+ // this function is to return TRUE if the drag should succeed.
+ static BOOL onDragTexture(LLInventoryItem* item);
- static void onCommitTexture( LLUICtrl* ctrl, void* userdata);
- static void onCancelTexture( LLUICtrl* ctrl, void* userdata);
- static void onSelectTexture( LLUICtrl* ctrl, void* userdata);
- static void onCommitTextureInfo( LLUICtrl* ctrl, void* userdata);
- static void onCommitColor( LLUICtrl* ctrl, void* userdata);
- static void onCommitAlpha( LLUICtrl* ctrl, void* userdata);
- static void onCancelColor( LLUICtrl* ctrl, void* userdata);
- static void onSelectColor( LLUICtrl* ctrl, void* userdata);
+ void onCommitTexture(const LLSD& data);
+ void onCancelTexture(const LLSD& data);
+ void onSelectTexture(const LLSD& data);
+ void onCommitColor(const LLSD& data);
+ void onCommitAlpha(const LLSD& data);
+ void onCancelColor(const LLSD& data);
+ void onSelectColor(const LLSD& data);
+
+ static void onCommitTextureInfo( LLUICtrl* ctrl, void* userdata);
static void onCommitBump( LLUICtrl* ctrl, void* userdata);
static void onCommitTexGen( LLUICtrl* ctrl, void* userdata);
static void onCommitShiny( LLUICtrl* ctrl, void* userdata);
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index d9d796fd9e..3acaa6b68e 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -46,12 +46,21 @@
#include "llviewerwindow.h"
#include "llappviewer.h"
#include "llnotifications.h"
+#include "llfloater.h"
// static
void* LLPanelGroupTab::createTab(void* data)
{
LLUUID* group_id = static_cast<LLUUID*>(data);
- return new LLPanelGroupTab("panel group tab", *group_id);
+ return new LLPanelGroupTab(*group_id);
+}
+
+LLPanelGroupTab::LLPanelGroupTab(const LLUUID& group_id)
+ : LLPanel(),
+ mGroupID(group_id),
+ mAllowEdit(TRUE),
+ mHasModal(FALSE)
+{
}
LLPanelGroupTab::~LLPanelGroupTab()
@@ -68,13 +77,11 @@ BOOL LLPanelGroupTab::isVisibleByAgent(LLAgent* agentp)
BOOL LLPanelGroupTab::postBuild()
{
// Hook up the help button callback.
- LLButton* button = getChild<LLButton>("help_button");
+ LLButton* button = findChild<LLButton>("help_button");
if (button)
{
- button->setClickedCallback(onClickHelp);
- button->setCallbackUserData(this);
+ button->setCommitCallback(boost::bind(&LLPanelGroupTab::handleClickHelp, this));
}
-
mHelpText = getString("help_text");
return TRUE;
}
@@ -103,13 +110,6 @@ void LLPanelGroupTab::notifyObservers()
}
}
-// static
-void LLPanelGroupTab::onClickHelp(void* user_data)
-{
- LLPanelGroupTab* self = static_cast<LLPanelGroupTab*>(user_data);
- self->handleClickHelp();
-}
-
void LLPanelGroupTab::handleClickHelp()
{
// Display the help text.
@@ -125,67 +125,48 @@ void LLPanelGroupTab::handleClickHelp()
}
}
-LLPanelGroup::LLPanelGroup(const std::string& filename,
- const std::string& name,
- const LLUUID& group_id,
- const std::string& initial_tab_selected)
-: LLPanel(name, LLRect(), FALSE),
+LLPanelGroup::LLPanelGroup(const LLUUID& group_id)
+: LLPanel(),
LLGroupMgrObserver( group_id ),
mCurrentTab( NULL ),
mRequestedTab( NULL ),
mTabContainer( NULL ),
mIgnoreTransition( FALSE ),
+ mApplyBtn( NULL ),
mForceClose( FALSE ),
- mInitialTab(initial_tab_selected),
mAllowEdit( TRUE ),
mShowingNotifyDialog( FALSE )
{
// Set up the factory callbacks.
- mFactoryMap["general_tab"] = LLCallbackMap(LLPanelGroupGeneral::createTab,
- &mID);
- mFactoryMap["roles_tab"] = LLCallbackMap(LLPanelGroupRoles::createTab,
- &mID);
- mFactoryMap["notices_tab"] = LLCallbackMap(LLPanelGroupNotices::createTab,
- &mID);
- mFactoryMap["land_money_tab"]= LLCallbackMap(LLPanelGroupLandMoney::createTab,
- &mID);
+ mFactoryMap["general_tab"] = LLCallbackMap(LLPanelGroupGeneral::createTab, &mID);
+ mFactoryMap["roles_tab"] = LLCallbackMap(LLPanelGroupRoles::createTab, &mID);
+ mFactoryMap["notices_tab"] = LLCallbackMap(LLPanelGroupNotices::createTab, &mID);
+ mFactoryMap["land_money_tab"]= LLCallbackMap(LLPanelGroupLandMoney::createTab, &mID);
// Roles sub tabs
mFactoryMap["members_sub_tab"] = LLCallbackMap(LLPanelGroupMembersSubTab::createTab, &mID);
mFactoryMap["roles_sub_tab"] = LLCallbackMap(LLPanelGroupRolesSubTab::createTab, &mID);
mFactoryMap["actions_sub_tab"] = LLCallbackMap(LLPanelGroupActionsSubTab::createTab, &mID);
LLGroupMgr::getInstance()->addObserver(this);
-
- // Pass on construction of this panel to the control factory.
- LLUICtrlFactory::getInstance()->buildPanel(this, filename, &getFactoryMap());
- mFilename = filename;
}
LLPanelGroup::~LLPanelGroup()
{
LLGroupMgr::getInstance()->removeObserver(this);
- int i;
- int tab_count = mTabContainer->getTabCount();
-
- for (i = tab_count - 1; i >=0; --i)
+ for (S32 i=mTabContainer->getTabCount() - 1; i >=0; --i)
{
- LLPanelGroupTab* panelp =
- (LLPanelGroupTab*) mTabContainer->getPanelByIndex(i);
-
- if ( panelp ) panelp->removeObserver(this);
+ LLPanelGroupTab* panelp = (LLPanelGroupTab*) mTabContainer->getPanelByIndex(i);
+ if ( panelp )
+ panelp->removeObserver(this);
}
}
void LLPanelGroup::updateTabVisibility()
{
- S32 i;
- S32 tab_count = mTabContainer->getTabCount();
-
- for (i = tab_count - 1; i >=0; --i)
+ for (S32 i = mTabContainer->getTabCount() - 1; i >=0; --i)
{
- LLPanelGroupTab* panelp =
- (LLPanelGroupTab*) mTabContainer->getPanelByIndex(i);
+ LLPanelGroupTab* panelp = (LLPanelGroupTab*) mTabContainer->getPanelByIndex(i);
BOOL visible = panelp->isVisibleByAgent(&gAgent) || gAgent.isGodlike();
mTabContainer->enableTabButton(i, visible);
@@ -195,8 +176,7 @@ void LLPanelGroup::updateTabVisibility()
//we are disabling the currently selected tab
//select the previous one
mTabContainer->selectPrevTab();
- mCurrentTab =
- (LLPanelGroupTab*) mTabContainer->getCurrentPanel();
+ mCurrentTab = (LLPanelGroupTab*) mTabContainer->getCurrentPanel();
}
}
}
@@ -209,49 +189,24 @@ BOOL LLPanelGroup::postBuild()
if (mTabContainer)
{
- // Select the initial tab specified via constructor
- const BOOL recurse = TRUE;
- LLPanelGroupTab* tabp =
- getChild<LLPanelGroupTab>(mInitialTab, recurse);
-
- if (!tabp)
+ mCurrentTab = dynamic_cast<LLPanelGroupTab*>(mTabContainer->getCurrentPanel());
+ llassert_always(mCurrentTab);
+
+ // Add click callback.
+ mTabContainer->setCommitCallback(boost::bind(&LLPanelGroup::handleClickTab, this));
+
+ // Setup pabels
+ for (S32 i = mTabContainer->getTabCount() - 1; i >=0; --i)
{
- //our initial tab selection was invalid, just select the
- //first tab then or default to selecting the initial
- //selected tab specified in the layout file
- tabp = (LLPanelGroupTab*) mTabContainer->getCurrentPanel();
-
- //no tab was initially selected through constructor
- //or the XML, select the first tab
- if (!tabp)
+ LLPanel* tab_panel = mTabContainer->getPanelByIndex(i);
+ LLPanelGroupTab* panelp = dynamic_cast<LLPanelGroupTab*>(tab_panel);
+ if (panelp)
{
- mTabContainer->selectFirstTab();
- tabp = (LLPanelGroupTab*) mTabContainer->getCurrentPanel();
+ // Pass on whether or not to allow edit to tabs.
+ panelp->setAllowEdit(mAllowEdit);
+ panelp->addObserver(this);
}
}
- else
- {
- mTabContainer->selectTabPanel(tabp);
- }
-
- mCurrentTab = tabp;
-
- // Add click callbacks.
- S32 i;
- S32 tab_count = mTabContainer->getTabCount();
-
- for (i = tab_count - 1; i >=0; --i)
- {
- LLPanel* tab_panel = mTabContainer->getPanelByIndex(i);
- LLPanelGroupTab* panelp =(LLPanelGroupTab*)tab_panel; // bit of a hack
-
- // Pass on whether or not to allow edit to tabs.
- panelp->setAllowEdit(mAllowEdit);
- panelp->addObserver(this);
-
- mTabContainer->setTabChangeCallback(panelp, onClickTab);
- mTabContainer->setTabUserData(panelp, this);
- }
updateTabVisibility();
// Act as though this tab was just activated.
@@ -262,38 +217,22 @@ BOOL LLPanelGroup::postBuild()
mWantApplyMesg = getString("want_apply_text");
LLButton* button = getChild<LLButton>("btn_ok");
- if (button)
- {
- button->setClickedCallback(onBtnOK);
- button->setCallbackUserData(this);
- button->setVisible(mAllowEdit);
- }
+ button->setClickedCallback(onBtnOK, this);
+ button->setVisible(mAllowEdit);
button = getChild<LLButton>("btn_cancel");
- if (button)
- {
- button->setClickedCallback(onBtnCancel);
- button->setCallbackUserData(this);
- button->setVisible(mAllowEdit);
- }
+ button->setClickedCallback(onBtnCancel, this);
+ button->setVisible(mAllowEdit);
button = getChild<LLButton>("btn_apply");
- if (button)
- {
- button->setClickedCallback(onBtnApply);
- button->setVisible(mAllowEdit);
- button->setEnabled(FALSE);
-
- mApplyBtn = button;
- }
+ button->setClickedCallback(onBtnApply, this);
+ button->setVisible(mAllowEdit);
+ button->setEnabled(FALSE);
+ mApplyBtn = button;
button = getChild<LLButton>("btn_refresh");
- if (button)
- {
- button->setClickedCallback(onBtnRefresh);
- button->setCallbackUserData(this);
- button->setVisible(mAllowEdit);
- }
+ button->setClickedCallback(onBtnRefresh, this);
+ button->setVisible(mAllowEdit);
return TRUE;
}
@@ -322,13 +261,6 @@ void LLPanelGroup::tabChanged()
}
}
-// static
-void LLPanelGroup::onClickTab(void* user_data, bool from_click)
-{
- LLPanelGroup* self = static_cast<LLPanelGroup*>(user_data);
- self->handleClickTab();
-}
-
void LLPanelGroup::handleClickTab()
{
// If we are already handling a transition,
@@ -357,7 +289,8 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
LLGroupMgr::getInstance()->removeObserver(this);
mID = group_id;
LLGroupMgr::getInstance()->addObserver(this);
- //TODO: this is really bad, we should add a method
+
+ //*TODO: this is really bad, we should add a method
// where the panels can just update themselves
// on a group id change. Similar to update() but with a group
// id change.
@@ -365,20 +298,19 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
// For now, rebuild panel
//delete children and rebuild panel
deleteAllChildren();
- LLUICtrlFactory::getInstance()->buildPanel(this, mFilename, &getFactoryMap());
+ LLUICtrlFactory::getInstance()->buildPanel(this, "panel_group.xml");
}
void LLPanelGroup::selectTab(std::string tab_name)
{
const BOOL recurse = TRUE;
- LLPanelGroupTab* tabp =
- getChild<LLPanelGroupTab>(tab_name, recurse);
+ LLPanelGroupTab* tabp = findChild<LLPanelGroupTab>(tab_name, recurse);
if ( tabp && mTabContainer )
{
mTabContainer->selectTabPanel(tabp);
- onClickTab(this, false);
+ handleClickTab();
}
}
@@ -455,7 +387,7 @@ void LLPanelGroup::transitionToTab()
}
else // NULL requested indicates a close action.
{
- close();
+ closePanel();
}
}
@@ -507,7 +439,7 @@ void LLPanelGroup::onBtnOK(void* user_data)
// If we are able to apply changes, then close.
if(self->apply())
{
- self->close();
+ self->closePanel();
}
}
@@ -515,7 +447,7 @@ void LLPanelGroup::onBtnOK(void* user_data)
void LLPanelGroup::onBtnCancel(void* user_data)
{
LLPanelGroup* self = static_cast<LLPanelGroup*>(user_data);
- self->close();
+ self->closePanel();
}
// static
@@ -528,10 +460,12 @@ void LLPanelGroup::onBtnApply(void* user_data)
bool LLPanelGroup::apply()
{
// Pass this along to the currently visible tab.
- if (!mTabContainer) return false;
+ if (!mTabContainer)
+ return false;
- LLPanelGroupTab* panelp = (LLPanelGroupTab*) mTabContainer->getCurrentPanel();
- if (!panelp) return false;
+ LLPanelGroupTab* panelp = dynamic_cast<LLPanelGroupTab*>(mTabContainer->getCurrentPanel());
+ if (!panelp)
+ return false;
std::string mesg;
if ( !panelp->needsApply(mesg) )
@@ -598,7 +532,7 @@ void LLPanelGroup::refreshData()
mRefreshTimer.setTimerExpirySec(5);
}
-void LLPanelGroup::close()
+void LLPanelGroup::closePanel()
{
// Pass this to the parent, if it is a floater.
LLView* viewp = getParent();
@@ -609,7 +543,7 @@ void LLPanelGroup::close()
// will be asking us whether it can close.
mForceClose = TRUE;
// Tell the parent floater to close.
- floaterp->close();
+ floaterp->closeFloater();
}
}
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h
index 445fb28502..55c7494a44 100644
--- a/indra/newview/llpanelgroup.h
+++ b/indra/newview/llpanelgroup.h
@@ -58,10 +58,7 @@ class LLPanelGroup : public LLPanel,
public LLPanelGroupTabObserver
{
public:
- LLPanelGroup(const std::string& filename,
- const std::string& name,
- const LLUUID& group_id,
- const std::string& initial_tab_selected = std::string());
+ LLPanelGroup(const LLUUID& group_id);
virtual ~LLPanelGroup();
virtual BOOL postBuild();
@@ -70,7 +67,6 @@ public:
static void onBtnCancel(void*);
static void onBtnApply(void*);
static void onBtnRefresh(void*);
- static void onClickTab(void*,bool);
void handleClickTab();
void setGroupID(const LLUUID& group_id);
@@ -92,7 +88,7 @@ public:
bool apply();
void refreshData();
- void close();
+ void closePanel();
void draw();
// Group manager observer trigger.
@@ -120,9 +116,6 @@ protected:
BOOL mForceClose;
- std::string mInitialTab;
- std::string mFilename;
-
std::string mDefaultNeedsApplyMesg;
std::string mWantApplyMesg;
@@ -133,8 +126,7 @@ protected:
class LLPanelGroupTab : public LLPanel
{
public:
- LLPanelGroupTab(const std::string& name, const LLUUID& group_id)
- : LLPanel(name), mGroupID(group_id), mAllowEdit(TRUE), mHasModal(FALSE) { }
+ LLPanelGroupTab(const LLUUID& group_id);
virtual ~LLPanelGroupTab();
// Factory that returns a new LLPanelGroupFoo tab.
@@ -167,7 +159,6 @@ public:
virtual std::string getHelpText() const { return mHelpText; }
// Display anything returned by getHelpText
- static void onClickHelp(void* data);
void handleClickHelp();
// This just connects the help button callback.
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 3dc5e032c5..da87b4d1a0 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -48,11 +48,13 @@
#include "lllineeditor.h"
#include "llnamebox.h"
#include "llnamelistctrl.h"
+#include "llscrolllistitem.h"
#include "llspinctrl.h"
#include "llstatusbar.h" // can_afford_transaction()
#include "lltextbox.h"
#include "lltexteditor.h"
#include "lltexturectrl.h"
+#include "lltrans.h"
#include "llviewerwindow.h"
// consts
@@ -64,13 +66,12 @@ const S32 DECLINE_TO_STATE = 0;
void* LLPanelGroupGeneral::createTab(void* data)
{
LLUUID* group_id = static_cast<LLUUID*>(data);
- return new LLPanelGroupGeneral("panel group general", *group_id);
+ return new LLPanelGroupGeneral(*group_id);
}
-LLPanelGroupGeneral::LLPanelGroupGeneral(const std::string& name,
- const LLUUID& group_id)
-: LLPanelGroupTab(name, group_id),
+LLPanelGroupGeneral::LLPanelGroupGeneral(const LLUUID& group_id)
+: LLPanelGroupTab(group_id),
mPendingMemberUpdate(FALSE),
mChanged(FALSE),
mFirstUse(TRUE),
@@ -100,8 +101,6 @@ LLPanelGroupGeneral::~LLPanelGroupGeneral()
BOOL LLPanelGroupGeneral::postBuild()
{
- llinfos << "LLPanelGroupGeneral::postBuild()" << llendl;
-
bool recurse = true;
// General info
@@ -111,63 +110,50 @@ BOOL LLPanelGroupGeneral::postBuild()
mInsignia = getChild<LLTextureCtrl>("insignia", recurse);
if (mInsignia)
{
- mInsignia->setCommitCallback(onCommitAny);
- mInsignia->setCallbackUserData(this);
+ mInsignia->setCommitCallback(onCommitAny, this);
mDefaultIconID = mInsignia->getImageAssetID();
}
mEditCharter = getChild<LLTextEditor>("charter", recurse);
if(mEditCharter)
{
- mEditCharter->setCommitCallback(onCommitAny);
+ mEditCharter->setCommitCallback(onCommitAny, this);
mEditCharter->setFocusReceivedCallback(onFocusEdit, this);
mEditCharter->setFocusChangedCallback(onFocusEdit, this);
- mEditCharter->setCallbackUserData(this);
}
mBtnJoinGroup = getChild<LLButton>("join_button", recurse);
if ( mBtnJoinGroup )
{
- mBtnJoinGroup->setClickedCallback(onClickJoin);
- mBtnJoinGroup->setCallbackUserData(this);
+ mBtnJoinGroup->setClickedCallback(onClickJoin, this);
}
mBtnInfo = getChild<LLButton>("info_button", recurse);
if ( mBtnInfo )
{
- mBtnInfo->setClickedCallback(onClickInfo);
- mBtnInfo->setCallbackUserData(this);
+ mBtnInfo->setClickedCallback(onClickInfo, this);
}
- LLTextBox* founder = getChild<LLTextBox>("founder_name");
- if (founder)
- {
- mFounderName = new LLNameBox(founder->getName(),founder->getRect(),LLUUID::null,FALSE,founder->getFont(),founder->getMouseOpaque());
- removeChild(founder, TRUE);
- addChild(mFounderName);
- }
+ mFounderName = getChild<LLNameBox>("founder_name");
mListVisibleMembers = getChild<LLNameListCtrl>("visible_members", recurse);
if (mListVisibleMembers)
{
- mListVisibleMembers->setDoubleClickCallback(openProfile);
- mListVisibleMembers->setCallbackUserData(this);
+ mListVisibleMembers->setDoubleClickCallback(openProfile, this);
}
// Options
mCtrlShowInGroupList = getChild<LLCheckBoxCtrl>("show_in_group_list", recurse);
if (mCtrlShowInGroupList)
{
- mCtrlShowInGroupList->setCommitCallback(onCommitAny);
- mCtrlShowInGroupList->setCallbackUserData(this);
+ mCtrlShowInGroupList->setCommitCallback(onCommitAny, this);
}
mComboMature = getChild<LLComboBox>("group_mature_check", recurse);
if(mComboMature)
{
mComboMature->setCurrentByIndex(0);
- mComboMature->setCommitCallback(onCommitAny);
- mComboMature->setCallbackUserData(this);
+ mComboMature->setCommitCallback(onCommitAny, this);
if (gAgent.isTeen())
{
// Teens don't get to set mature flag. JC
@@ -178,22 +164,19 @@ BOOL LLPanelGroupGeneral::postBuild()
mCtrlOpenEnrollment = getChild<LLCheckBoxCtrl>("open_enrollement", recurse);
if (mCtrlOpenEnrollment)
{
- mCtrlOpenEnrollment->setCommitCallback(onCommitAny);
- mCtrlOpenEnrollment->setCallbackUserData(this);
+ mCtrlOpenEnrollment->setCommitCallback(onCommitAny, this);
}
mCtrlEnrollmentFee = getChild<LLCheckBoxCtrl>("check_enrollment_fee", recurse);
if (mCtrlEnrollmentFee)
{
- mCtrlEnrollmentFee->setCommitCallback(onCommitEnrollment);
- mCtrlEnrollmentFee->setCallbackUserData(this);
+ mCtrlEnrollmentFee->setCommitCallback(onCommitEnrollment, this);
}
mSpinEnrollmentFee = getChild<LLSpinCtrl>("spin_enrollment_fee", recurse);
if (mSpinEnrollmentFee)
{
- mSpinEnrollmentFee->setCommitCallback(onCommitAny);
- mSpinEnrollmentFee->setCallbackUserData(this);
+ mSpinEnrollmentFee->setCommitCallback(onCommitAny, this);
mSpinEnrollmentFee->setPrecision(0);
mSpinEnrollmentFee->resetDirty();
}
@@ -209,8 +192,7 @@ BOOL LLPanelGroupGeneral::postBuild()
mCtrlReceiveNotices = getChild<LLCheckBoxCtrl>("receive_notices", recurse);
if (mCtrlReceiveNotices)
{
- mCtrlReceiveNotices->setCommitCallback(onCommitUserOnly);
- mCtrlReceiveNotices->setCallbackUserData(this);
+ mCtrlReceiveNotices->setCommitCallback(onCommitUserOnly, this);
mCtrlReceiveNotices->set(accept_notices);
mCtrlReceiveNotices->setEnabled(data.mID.notNull());
}
@@ -218,8 +200,7 @@ BOOL LLPanelGroupGeneral::postBuild()
mCtrlListGroup = getChild<LLCheckBoxCtrl>("list_groups_in_profile", recurse);
if (mCtrlListGroup)
{
- mCtrlListGroup->setCommitCallback(onCommitUserOnly);
- mCtrlListGroup->setCallbackUserData(this);
+ mCtrlListGroup->setCommitCallback(onCommitUserOnly, this);
mCtrlListGroup->set(list_in_profile);
mCtrlListGroup->setEnabled(data.mID.notNull());
mCtrlListGroup->resetDirty();
@@ -230,8 +211,7 @@ BOOL LLPanelGroupGeneral::postBuild()
mComboActiveTitle = getChild<LLComboBox>("active_title", recurse);
if (mComboActiveTitle)
{
- mComboActiveTitle->setCommitCallback(onCommitTitle);
- mComboActiveTitle->setCallbackUserData(this);
+ mComboActiveTitle->setCommitCallback(onCommitTitle, this);
mComboActiveTitle->resetDirty();
}
@@ -480,8 +460,7 @@ bool LLPanelGroupGeneral::apply(std::string& mesg)
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
if (!gdatap)
{
- // *TODO: Translate
- mesg = std::string("No group data found for group ");
+ mesg = LLTrans::getString("NoGroupDataFound");
mesg.append(mGroupID.asString());
return false;
}
@@ -730,7 +709,9 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
if ( visible )
{
- fee_buff = llformat( "Join (L$%d)", gdatap->mMembershipFee);
+ LLStringUtil::format_map_t string_args;
+ string_args["[AMOUNT]"] = llformat("%d", gdatap->mMembershipFee);
+ fee_buff = getString("group_join_btn", string_args);
mBtnJoinGroup->setLabelSelected(fee_buff);
mBtnJoinGroup->setLabelUnselected(fee_buff);
}
@@ -842,16 +823,16 @@ void LLPanelGroupGeneral::updateMembers()
row["id"] = member->getID();
row["columns"][0]["column"] = "name";
- row["columns"][0]["font-style"] = style;
+ row["columns"][0]["font"]["style"] = style;
// value is filled in by name list control
row["columns"][1]["column"] = "title";
row["columns"][1]["value"] = member->getTitle();
- row["columns"][1]["font-style"] = style;
+ row["columns"][1]["font"]["style"] = style;
row["columns"][2]["column"] = "online";
row["columns"][2]["value"] = member->getOnlineStatus();
- row["columns"][2]["font-style"] = style;
+ row["columns"][2]["font"]["style"] = style;
sSDTime += sd_timer.getElapsedTimeF32();
diff --git a/indra/newview/llpanelgroupgeneral.h b/indra/newview/llpanelgroupgeneral.h
index 71356677fc..5d673d5219 100644
--- a/indra/newview/llpanelgroupgeneral.h
+++ b/indra/newview/llpanelgroupgeneral.h
@@ -49,7 +49,7 @@ class LLSpinCtrl;
class LLPanelGroupGeneral : public LLPanelGroupTab
{
public:
- LLPanelGroupGeneral(const std::string& name, const LLUUID& group_id);
+ LLPanelGroupGeneral(const LLUUID& group_id);
virtual ~LLPanelGroupGeneral();
// LLPanelGroupTab
diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp
index eedec9c8eb..1e6eb8ed44 100644
--- a/indra/newview/llpanelgroupinvite.cpp
+++ b/indra/newview/llpanelgroupinvite.cpp
@@ -39,6 +39,7 @@
#include "llcombobox.h"
#include "llgroupmgr.h"
#include "llnamelistctrl.h"
+#include "llscrolllistitem.h"
#include "llspinctrl.h"
#include "lltextbox.h"
#include "llviewerobject.h"
@@ -351,18 +352,13 @@ void LLPanelGroupInvite::impl::callbackAddUsers(const std::vector<std::string>&
if ( selfp) selfp->addUsers(names, ids);
}
-LLPanelGroupInvite::LLPanelGroupInvite(const std::string& name,
- const LLUUID& group_id)
- : LLPanel(name)
+LLPanelGroupInvite::LLPanelGroupInvite(const LLUUID& group_id)
+ : LLPanel(),
+ mImplementation(new impl(group_id)),
+ mPendingUpdate(FALSE)
{
- mImplementation = new impl(group_id);
- mPendingUpdate = FALSE;
- mStoreSelected = LLUUID::null;
-
- std::string panel_def_file;
-
// Pass on construction of this panel to the control factory.
- LLUICtrlFactory::getInstance()->buildPanel(this, "panel_group_invite.xml", &getFactoryMap());
+ LLUICtrlFactory::getInstance()->buildPanel(this, "panel_group_invite.xml");
}
LLPanelGroupInvite::~LLPanelGroupInvite()
@@ -519,9 +515,8 @@ BOOL LLPanelGroupInvite::postBuild()
getChild<LLNameListCtrl>("invitee_list", recurse);
if ( mImplementation->mInvitees )
{
- mImplementation->mInvitees->setCallbackUserData(mImplementation);
mImplementation->mInvitees->setCommitOnSelectionChange(TRUE);
- mImplementation->mInvitees->setCommitCallback(impl::callbackSelect);
+ mImplementation->mInvitees->setCommitCallback(impl::callbackSelect, mImplementation);
}
LLButton* button = getChild<LLButton>("add_button", recurse);
@@ -529,17 +524,14 @@ BOOL LLPanelGroupInvite::postBuild()
{
// default to opening avatarpicker automatically
// (*impl::callbackClickAdd)((void*)this);
- button->setClickedCallback(impl::callbackClickAdd);
- button->setCallbackUserData(this);
+ button->setClickedCallback(impl::callbackClickAdd, this);
}
mImplementation->mRemoveButton =
getChild<LLButton>("remove_button", recurse);
if ( mImplementation->mRemoveButton )
{
- mImplementation->mRemoveButton->
- setClickedCallback(impl::callbackClickRemove);
- mImplementation->mRemoveButton->setCallbackUserData(mImplementation);
+ mImplementation->mRemoveButton->setClickedCallback(impl::callbackClickRemove, mImplementation);
mImplementation->mRemoveButton->setEnabled(FALSE);
}
@@ -547,17 +539,14 @@ BOOL LLPanelGroupInvite::postBuild()
getChild<LLButton>("ok_button", recurse);
if ( mImplementation->mOKButton )
{
- mImplementation->mOKButton->
- setClickedCallback(impl::callbackClickOK);
- mImplementation->mOKButton->setCallbackUserData(mImplementation);
+ mImplementation->mOKButton->setClickedCallback(impl::callbackClickOK, mImplementation);
mImplementation->mOKButton->setEnabled(FALSE);
}
button = getChild<LLButton>("cancel_button", recurse);
if ( button )
{
- button->setClickedCallback(impl::callbackClickCancel);
- button->setCallbackUserData(mImplementation);
+ button->setClickedCallback(impl::callbackClickCancel, mImplementation);
}
mImplementation->mOwnerWarning = getString("confirm_invite_owner_str");
diff --git a/indra/newview/llpanelgroupinvite.h b/indra/newview/llpanelgroupinvite.h
index 9117b83e7d..37135b488a 100644
--- a/indra/newview/llpanelgroupinvite.h
+++ b/indra/newview/llpanelgroupinvite.h
@@ -39,7 +39,7 @@ class LLPanelGroupInvite
: public LLPanel
{
public:
- LLPanelGroupInvite(const std::string& name, const LLUUID& group_id);
+ LLPanelGroupInvite(const LLUUID& group_id);
~LLPanelGroupInvite();
void addUsers(std::vector<LLUUID>& agent_ids);
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index 73a9868962..afc5873415 100644
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -42,13 +42,17 @@
#include "llagent.h"
#include "lliconctrl.h"
+#include "llfloaterreg.h"
#include "lllineeditor.h"
#include "llproductinforequest.h"
#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
#include "lltextbox.h"
#include "lltabcontainer.h"
#include "lltrans.h"
#include "lltransactiontypes.h"
+#include "lltrans.h"
#include "lluictrlfactory.h"
#include "llstatusbar.h"
@@ -80,7 +84,6 @@ public:
static void clickEarlierCallback(void* data);
static void clickLaterCallback(void* data);
- static void clickTabCallback(void* user_data, bool from_click);
static LLMap<LLUUID, LLGroupMoneyTabEventHandler*> sInstanceIDs;
static std::map<LLPanel*, LLGroupMoneyTabEventHandler*> sTabsToHandlers;
@@ -244,9 +247,9 @@ void LLPanelGroupLandMoney::impl::onMapButton()
F64 global_z = gAgent.getPositionGlobal().mdV[VZ];
LLVector3d pos_global(global_x, global_y, global_z);
- gFloaterWorldMap->trackLocation(pos_global);
+ LLFloaterWorldMap::getInstance()->trackLocation(pos_global);
- LLFloaterWorldMap::show(NULL, TRUE);
+ LLFloaterReg::showInstance("world_map", "center");
}
bool LLPanelGroupLandMoney::impl::applyContribution()
@@ -460,15 +463,15 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
row["columns"][0]["column"] = "name";
row["columns"][0]["value"] = name;
- row["columns"][0]["font"] = "SANSSERIFSMALL";
+ row["columns"][0]["font"] = "SANSSERIF_SMALL";
row["columns"][1]["column"] = "location";
row["columns"][1]["value"] = location;
- row["columns"][1]["font"] = "SANSSERIFSMALL";
+ row["columns"][1]["font"] = "SANSSERIF_SMALL";
row["columns"][2]["column"] = "area";
row["columns"][2]["value"] = area;
- row["columns"][2]["font"] = "SANSSERIFSMALL";
+ row["columns"][2]["font"] = "SANSSERIF_SMALL";
row["columns"][3]["column"] = "type";
row["columns"][3]["value"] = land_type;
@@ -491,15 +494,14 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg)
void* LLPanelGroupLandMoney::createTab(void* data)
{
LLUUID* group_id = static_cast<LLUUID*>(data);
- return new LLPanelGroupLandMoney("panel group land money", *group_id);
+ return new LLPanelGroupLandMoney(*group_id);
}
//static
LLMap<LLUUID, LLPanelGroupLandMoney*> LLPanelGroupLandMoney::sGroupIDs;
-LLPanelGroupLandMoney::LLPanelGroupLandMoney(const std::string& name,
- const LLUUID& group_id) :
- LLPanelGroupTab(name, group_id)
+LLPanelGroupLandMoney::LLPanelGroupLandMoney(const LLUUID& group_id) :
+ LLPanelGroupTab(group_id)
{
mImplementationp = new impl(*this, group_id);
@@ -634,9 +636,8 @@ BOOL LLPanelGroupLandMoney::postBuild()
{
LLLineEditor* editor = mImplementationp->mYourContributionEditorp;
- editor->setCommitCallback(mImplementationp->contributionCommitCallback);
- editor->setKeystrokeCallback(mImplementationp->contributionKeystrokeCallback);
- editor->setCallbackUserData(this);
+ editor->setCommitCallback(mImplementationp->contributionCommitCallback, this);
+ editor->setKeystrokeCallback(mImplementationp->contributionKeystrokeCallback, this);
}
mImplementationp->mMapButtonp = getChild<LLButton>("map_button");
@@ -671,7 +672,7 @@ BOOL LLPanelGroupLandMoney::postBuild()
{
if ( mImplementationp->mGroupParcelsp )
{
- mImplementationp->mGroupParcelsp->addCommentText(
+ mImplementationp->mGroupParcelsp->setCommentText(
mImplementationp->mCantViewParcelsText);
mImplementationp->mGroupParcelsp->setEnabled(FALSE);
}
@@ -917,8 +918,7 @@ LLGroupMoneyTabEventHandler::LLGroupMoneyTabEventHandler(LLButton* earlier_butto
if ( tab_containerp && panelp )
{
- tab_containerp->setTabChangeCallback(panelp, clickTabCallback);
- tab_containerp->setTabUserData(panelp, this);
+ tab_containerp->setCommitCallback(boost::bind(&LLGroupMoneyTabEventHandler::onClickTab, this));
}
sInstanceIDs.addData(mImplementationp->mPanelID, this);
@@ -990,13 +990,6 @@ void LLGroupMoneyTabEventHandler::clickLaterCallback(void* data)
if ( selfp ) selfp->onClickLater();
}
-//static
-void LLGroupMoneyTabEventHandler::clickTabCallback(void* data, bool from_click)
-{
- LLGroupMoneyTabEventHandler* selfp = (LLGroupMoneyTabEventHandler*) data;
- if ( selfp && from_click ) selfp->onClickTab();
-}
-
//**************************************************
//** LLGroupMoneyDetailsTabEventHandler Functions **
//**************************************************
@@ -1100,7 +1093,7 @@ void LLGroupMoneyDetailsTabEventHandler::processReply(LLMessageSystem* msg,
text.append(1, '\n');
- text.append(llformat("%-24s %6d\n", "Total", total_amount));
+ text.append(llformat("%-24s %6d\n", LLTrans::getString("GroupMoneyTotal").c_str(), total_amount));
if ( mImplementationp->mTextEditorp )
{
@@ -1220,7 +1213,7 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
S32 transactions = msg->getNumberOfBlocksFast(_PREHASH_HistoryData);
if (transactions == 0)
{
- text.append("(none)");
+ text.append(LLTrans::getString("none_text"));
}
else
{
@@ -1245,22 +1238,22 @@ void LLGroupMoneySalesTabEventHandler::processReply(LLMessageSystem* msg,
switch(type)
{
case TRANS_OBJECT_SALE:
- verb = "bought";
+ verb = LLTrans::getString("GroupMoneyBought").c_str();
break;
case TRANS_GIFT:
- verb = "paid you";
+ verb = LLTrans::getString("GroupMoneyPaidYou").c_str();
break;
case TRANS_PAY_OBJECT:
- verb = "paid into";
+ verb = LLTrans::getString("GroupMoneyPaidInto").c_str();
break;
case TRANS_LAND_PASS_SALE:
- verb = "bought pass to";
+ verb = LLTrans::getString("GroupMoneyBoughtPassTo").c_str();
break;
case TRANS_EVENT_FEE:
- verb = "paid fee for event";
+ verb = LLTrans::getString("GroupMoneyPaidFeeForEvent").c_str();
break;
case TRANS_EVENT_PRIZE:
- verb = "paid prize for event";
+ verb = LLTrans::getString("GroupMoneyPaidPrizeForEvent").c_str();
break;
default:
verb = "";
@@ -1420,24 +1413,24 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
return;
}
- text.append("Summary for this week, beginning on ");
+ text.append(LLTrans::getString("SummaryForTheWeek"));
text.append(start_date);
if (current_interval == 0)
{
- text.append("The next stipend day is ");
+ text.append(LLTrans::getString("NextStipendDay"));
text.append(next_stipend_date);
text.append("\n\n");
- text.append(llformat("%-24sL$%6d\n", "Balance", balance ));
+ text.append(llformat("%-24sL$%6d\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance ));
text.append(1, '\n');
}
// [DEV-29503] Hide the individual info since
// non_exempt_member here is a wrong choice to calculate individual shares.
- // text.append( " Group Individual Share\n");
- // text.append(llformat( "%-24s %6d %6d \n", "Credits", total_credits, (S32)floor((F32)total_credits/(F32)non_exempt_members)));
- // text.append(llformat( "%-24s %6d %6d \n", "Debits", total_debits, (S32)floor((F32)total_debits/(F32)non_exempt_members)));
- // text.append(llformat( "%-24s %6d %6d \n", "Total", total_credits + total_debits, (S32)floor((F32)(total_credits + total_debits)/(F32)non_exempt_members)));
+// text.append( LLTrans::getString("GroupIndividualShare"));
+// text.append(llformat( "%-24s %6d %6d \n", LLTrans::getString("GroupMoneyCredits").c_str(), total_credits, (S32)floor((F32)total_credits/(F32)non_exempt_members)));
+// text.append(llformat( "%-24s %6d %6d \n", LLTrans::getString("GroupMoneyDebits").c_str(), total_debits, (S32)floor((F32)total_debits/(F32)non_exempt_members)));
+// text.append(llformat( "%-24s %6d %6d \n", LLTrans::getString("GroupMoneyTotal").c_str(), total_credits + total_debits, (S32)floor((F32)(total_credits + total_debits)/(F32)non_exempt_members)));
text.append( " Group\n");
text.append(llformat( "%-24s %6d\n", "Credits", total_credits));
diff --git a/indra/newview/llpanelgrouplandmoney.h b/indra/newview/llpanelgrouplandmoney.h
index 591511a5fb..748485745b 100644
--- a/indra/newview/llpanelgrouplandmoney.h
+++ b/indra/newview/llpanelgrouplandmoney.h
@@ -44,7 +44,7 @@
class LLPanelGroupLandMoney : public LLPanelGroupTab
{
public:
- LLPanelGroupLandMoney(const std::string& name, const LLUUID& group_id);
+ LLPanelGroupLandMoney(const LLUUID& group_id);
virtual ~LLPanelGroupLandMoney();
virtual BOOL postBuild();
virtual BOOL isVisibleByAgent(LLAgent* agentp);
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp
index 5824df46e2..acf6bc0dd0 100644
--- a/indra/newview/llpanelgroupnotices.cpp
+++ b/indra/newview/llpanelgroupnotices.cpp
@@ -49,7 +49,9 @@
#include "lliconctrl.h"
#include "llcheckboxctrl.h"
#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
#include "lltextbox.h"
+#include "lltrans.h"
#include "roles_constants.h"
#include "llviewerwindow.h"
@@ -69,7 +71,19 @@
class LLGroupDropTarget : public LLView
{
public:
- LLGroupDropTarget(const std::string& name, const LLRect& rect, LLPanelGroupNotices* panel, const LLUUID& group_id);
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
+ {
+ Mandatory<LLPanelGroupNotices*> panel;
+ Mandatory<LLUUID> group_id;
+ Params()
+ : panel("panel"),
+ group_id("group_id")
+ {
+ mouse_opaque(false);
+ follows.flags(FOLLOWS_ALL);
+ }
+ };
+ LLGroupDropTarget(const Params&);
~LLGroupDropTarget() {};
void doDrop(EDragAndDropType cargo_type, void* cargo_data);
@@ -81,18 +95,21 @@ public:
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg);
+ void setPanel (LLPanelGroupNotices* panel) {mGroupNoticesPanel = panel;};
+ void setGroup (LLUUID group) {mGroupID = group;};
+
protected:
LLPanelGroupNotices* mGroupNoticesPanel;
LLUUID mGroupID;
};
-LLGroupDropTarget::LLGroupDropTarget(const std::string& name, const LLRect& rect,
- LLPanelGroupNotices* panel, const LLUUID& group_id) :
- LLView(name, rect, NOT_MOUSE_OPAQUE, FOLLOWS_ALL),
- mGroupNoticesPanel(panel),
- mGroupID(group_id)
-{
-}
+static LLRegisterWidget<LLGroupDropTarget> r("group_drop_target");
+
+LLGroupDropTarget::LLGroupDropTarget(const LLGroupDropTarget::Params& p)
+: LLView(p),
+ mGroupNoticesPanel(p.panel),
+ mGroupID(p.group_id)
+{}
void LLGroupDropTarget::doDrop(EDragAndDropType cargo_type, void* cargo_data)
{
@@ -179,18 +196,16 @@ std::string build_notice_date(const U32& the_time)
time(&t);
}
- tm* lt = localtime(&t);
-
- //for some reason, the month is off by 1. See other uses of
- //"local" time in the code...
- std::string buffer = llformat("%04i-%02i-%02i", lt->tm_year + 1900, lt->tm_mon + 1, lt->tm_mday);
-
- return buffer;
+
+ std::string dateStr = LLTrans::getString("GroupNotifyDateStr");
+ LLSD substitution;
+ substitution["datetime"] = (S32) t;
+ LLStringUtil::format (dateStr, substitution);
+ return dateStr;
}
-LLPanelGroupNotices::LLPanelGroupNotices(const std::string& name,
- const LLUUID& group_id) :
- LLPanelGroupTab(name,group_id),
+LLPanelGroupNotices::LLPanelGroupNotices(const LLUUID& group_id) :
+ LLPanelGroupTab(group_id),
mInventoryItem(NULL),
mInventoryOffer(NULL)
{
@@ -214,7 +229,7 @@ LLPanelGroupNotices::~LLPanelGroupNotices()
void* LLPanelGroupNotices::createTab(void* data)
{
LLUUID* group_id = static_cast<LLUUID*>(data);
- return new LLPanelGroupNotices("panel group notices", *group_id);
+ return new LLPanelGroupNotices(*group_id);
}
BOOL LLPanelGroupNotices::isVisibleByAgent(LLAgent* agentp)
@@ -229,17 +244,14 @@ BOOL LLPanelGroupNotices::postBuild()
mNoticesList = getChild<LLScrollListCtrl>("notice_list",recurse);
mNoticesList->setCommitOnSelectionChange(TRUE);
- mNoticesList->setCommitCallback(onSelectNotice);
- mNoticesList->setCallbackUserData(this);
+ mNoticesList->setCommitCallback(onSelectNotice, this);
mBtnNewMessage = getChild<LLButton>("create_new_notice",recurse);
- mBtnNewMessage->setClickedCallback(onClickNewMessage);
- mBtnNewMessage->setCallbackUserData(this);
+ mBtnNewMessage->setClickedCallback(onClickNewMessage, this);
mBtnNewMessage->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_NOTICES_SEND));
mBtnGetPastNotices = getChild<LLButton>("refresh_notices",recurse);
- mBtnGetPastNotices->setClickedCallback(onClickRefreshNotices);
- mBtnGetPastNotices->setCallbackUserData(this);
+ mBtnGetPastNotices->setClickedCallback(onClickRefreshNotices, this);
// Create
mCreateSubject = getChild<LLLineEditor>("create_subject",recurse);
@@ -253,12 +265,10 @@ BOOL LLPanelGroupNotices::postBuild()
mCreateInventoryIcon->setVisible(FALSE);
mBtnSendMessage = getChild<LLButton>("send_notice",recurse);
- mBtnSendMessage->setClickedCallback(onClickSendMessage);
- mBtnSendMessage->setCallbackUserData(this);
+ mBtnSendMessage->setClickedCallback(onClickSendMessage, this);
mBtnRemoveAttachment = getChild<LLButton>("remove_attachment",recurse);
- mBtnRemoveAttachment->setClickedCallback(onClickRemoveAttachment);
- mBtnRemoveAttachment->setCallbackUserData(this);
+ mBtnRemoveAttachment->setClickedCallback(onClickRemoveAttachment, this);
mBtnRemoveAttachment->setEnabled(FALSE);
// View
@@ -273,24 +283,16 @@ BOOL LLPanelGroupNotices::postBuild()
mViewInventoryIcon->setVisible(FALSE);
mBtnOpenAttachment = getChild<LLButton>("open_attachment",recurse);
- mBtnOpenAttachment->setClickedCallback(onClickOpenAttachment);
- mBtnOpenAttachment->setCallbackUserData(this);
+ mBtnOpenAttachment->setClickedCallback(onClickOpenAttachment, this);
mNoNoticesStr = getString("no_notices_text");
mPanelCreateNotice = getChild<LLPanel>("panel_create_new_notice",recurse);
mPanelViewNotice = getChild<LLPanel>("panel_view_past_notice",recurse);
- // Must be in front of all other UI elements.
- LLPanel* dtv = getChild<LLPanel>("drop_target",recurse);
- LLGroupDropTarget* target = new LLGroupDropTarget("drop_target",
- dtv->getRect(),
- this, mGroupID);
- target->setEnabled(TRUE);
- target->setToolTip(dtv->getToolTip());
-
- mPanelCreateNotice->addChild(target);
- mPanelCreateNotice->removeChild(dtv, TRUE);
+ LLGroupDropTarget* target = getChild<LLGroupDropTarget> ("drop_target");
+ target->setPanel (this);
+ target->setGroup (mGroupID);
arrangeNoticeView(VIEW_PAST_NOTICE);
@@ -331,7 +333,7 @@ void LLPanelGroupNotices::setItem(LLPointer<LLInventoryItem> inv_item)
inv_item->getFlags(),
item_is_multi );
- mCreateInventoryIcon->setImage(icon_name);
+ mCreateInventoryIcon->setValue(icon_name);
mCreateInventoryIcon->setVisible(TRUE);
std::stringstream ss;
@@ -466,7 +468,7 @@ void LLPanelGroupNotices::processNotices(LLMessageSystem* msg)
if (1 == count && id.isNull())
{
// Only one entry, the dummy entry.
- mNoticesList->addCommentText(mNoNoticesStr);
+ mNoticesList->setCommentText(mNoNoticesStr);
mNoticesList->setEnabled(FALSE);
return;
}
@@ -554,7 +556,7 @@ void LLPanelGroupNotices::showNotice(const std::string& subject,
LLInventoryType::IT_TEXTURE,
0, FALSE);
- mViewInventoryIcon->setImage(icon_name);
+ mViewInventoryIcon->setValue(icon_name);
mViewInventoryIcon->setVisible(TRUE);
std::stringstream ss;
diff --git a/indra/newview/llpanelgroupnotices.h b/indra/newview/llpanelgroupnotices.h
index 916032c1b6..a0712f1770 100644
--- a/indra/newview/llpanelgroupnotices.h
+++ b/indra/newview/llpanelgroupnotices.h
@@ -34,7 +34,7 @@
#define LL_LLPANELGROUPNOTICES_H
#include "llpanelgroup.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llinventory.h"
class LLLineEditor;
@@ -47,7 +47,7 @@ class LLScrollListCtrl;
class LLPanelGroupNotices : public LLPanelGroupTab
{
public:
- LLPanelGroupNotices(const std::string& name, const LLUUID& group_id);
+ LLPanelGroupNotices(const LLUUID& group_id);
virtual ~LLPanelGroupNotices();
// LLPanelGroupTab
diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp
index 6e65181f99..1f50d2ef04 100644
--- a/indra/newview/llpanelgrouproles.cpp
+++ b/indra/newview/llpanelgrouproles.cpp
@@ -44,6 +44,8 @@
#include "llnotify.h"
#include "llpanelgrouproles.h"
#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
#include "lltabcontainer.h"
#include "lltextbox.h"
#include "lltexteditor.h"
@@ -109,11 +111,11 @@ bool agentCanAddToRole(const LLUUID& group_id,
void* LLPanelGroupRoles::createTab(void* data)
{
LLUUID* group_id = static_cast<LLUUID*>(data);
- return new LLPanelGroupRoles("panel group roles", *group_id);
+ return new LLPanelGroupRoles(*group_id);
}
-LLPanelGroupRoles::LLPanelGroupRoles(const std::string& name, const LLUUID& group_id)
-: LLPanelGroupTab(name, group_id),
+LLPanelGroupRoles::LLPanelGroupRoles(const LLUUID& group_id)
+: LLPanelGroupTab(group_id),
mCurrentTab(NULL),
mRequestedTab( NULL ),
mSubTabContainer( NULL ),
@@ -148,8 +150,7 @@ BOOL LLPanelGroupRoles::postBuild()
LLPanelGroupSubTab* subtabp = (LLPanelGroupSubTab*) mSubTabContainer->getPanelByIndex(i);
// Add click callbacks to all the tabs.
- mSubTabContainer->setTabChangeCallback(subtabp, onClickSubTab);
- mSubTabContainer->setTabUserData(subtabp, this);
+ mSubTabContainer->setCommitCallback(boost::bind(&LLPanelGroupRoles::handleClickSubTab, this));
// Hand the subtab a pointer to this LLPanelGroupRoles, so that it can
// look around for the widgets it is interested in.
@@ -198,13 +199,6 @@ BOOL LLPanelGroupRoles::isVisibleByAgent(LLAgent* agentp)
}
-// static
-void LLPanelGroupRoles::onClickSubTab(void* user_data, bool from_click)
-{
- LLPanelGroupRoles* self = static_cast<LLPanelGroupRoles*>(user_data);
- self->handleClickSubTab();
-}
-
void LLPanelGroupRoles::handleClickSubTab()
{
// If we are already handling a transition,
@@ -474,8 +468,8 @@ void LLPanelGroupRoles::tabChanged()
////////////////////////////
// LLPanelGroupSubTab
////////////////////////////
-LLPanelGroupSubTab::LLPanelGroupSubTab(const std::string& name, const LLUUID& group_id)
-: LLPanelGroupTab(name, group_id),
+LLPanelGroupSubTab::LLPanelGroupSubTab(const LLUUID& group_id)
+: LLPanelGroupTab(group_id),
mHeader(NULL),
mFooter(NULL),
mSearchLineEditor(NULL),
@@ -495,47 +489,36 @@ BOOL LLPanelGroupSubTab::postBuild()
mSearchLineEditor = getChild<LLLineEditor>("search_text", recurse);
if (!mSearchLineEditor) return FALSE;
- mSearchLineEditor->setKeystrokeCallback(onSearchKeystroke);
- mSearchLineEditor->setCallbackUserData(this);
+ mSearchLineEditor->setKeystrokeCallback(onSearchKeystroke, this);
mSearchButton = getChild<LLButton>("search_button", recurse);
if (!mSearchButton) return FALSE;
- mSearchButton->setClickedCallback(onClickSearch);
- mSearchButton->setCallbackUserData(this);
+ mSearchButton->setClickedCallback(onClickSearch, this);
mSearchButton->setEnabled(FALSE);
mShowAllButton = getChild<LLButton>("show_all_button", recurse);
if (!mShowAllButton) return FALSE;
- mShowAllButton->setClickedCallback(onClickShowAll);
- mShowAllButton->setCallbackUserData(this);
+ mShowAllButton->setClickedCallback(onClickShowAll, this);
mShowAllButton->setEnabled(FALSE);
// Get icons for later use.
mActionIcons.clear();
- bool no_recurse = false;
-
- LLIconCtrl* icon = getChild<LLIconCtrl>("power_folder_icon",no_recurse);
- if (icon && !icon->getImageName().empty())
+ if (hasString("power_folder_icon"))
{
- mActionIcons["folder"] = icon->getImageName();
- removeChild(icon, TRUE);
+ mActionIcons["folder"] = getString("power_folder_icon");
}
- icon = getChild<LLIconCtrl>("power_all_have_icon",no_recurse);
- if (icon && !icon->getImageName().empty())
+ if (hasString("power_all_have_icon"))
{
- mActionIcons["full"] = icon->getImageName();
- removeChild(icon, TRUE);
+ mActionIcons["full"] = getString("power_all_have_icon");
}
- icon = getChild<LLIconCtrl>("power_partial_icon",no_recurse);
- if (icon && !icon->getImageName().empty())
+ if (hasString("power_partial_icon"))
{
- mActionIcons["partial"] = icon->getImageName();
- removeChild(icon, TRUE);
+ mActionIcons["partial"] = getString("power_partial_icon");
}
return LLPanelGroupTab::postBuild();
@@ -663,7 +646,7 @@ void LLPanelGroupSubTab::buildActionsList(LLScrollListCtrl* ctrl,
U64 allowed_by_some,
U64 allowed_by_all,
icon_map_t& icons,
- void (*commit_callback)(LLUICtrl*,void*),
+ LLUICtrl::commit_callback_t commit_callback,
BOOL show_all,
BOOL filter,
BOOL is_owner_role)
@@ -696,7 +679,7 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl,
U64 allowed_by_all,
LLRoleActionSet* action_set,
icon_map_t& icons,
- void (*commit_callback)(LLUICtrl*,void*),
+ LLUICtrl::commit_callback_t commit_callback,
BOOL show_all,
BOOL filter,
BOOL is_owner_role)
@@ -718,7 +701,7 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl,
row["columns"][1]["column"] = "action";
row["columns"][1]["value"] = action_set->mActionSetData->mName;
- row["columns"][1]["font-style"] = "BOLD";
+ row["columns"][1]["font"]["style"] = "BOLD";
LLScrollListItem* title_row = ctrl->addElement(row, ADD_BOTTOM, action_set->mActionSetData);
@@ -799,7 +782,7 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl,
row["columns"][column_index]["column"] = "action";
row["columns"][column_index]["value"] = (*ra_it)->mDescription;
- row["columns"][column_index]["font"] = "SANSSERIFSMALL";
+ row["columns"][column_index]["font"] = "SANSSERIF_SMALL";
LLScrollListItem* item = ctrl->addElement(row, ADD_BOTTOM, (*ra_it));
@@ -810,7 +793,6 @@ void LLPanelGroupSubTab::buildActionCategory(LLScrollListCtrl* ctrl,
LLCheckBoxCtrl* check = check_cell->getCheckBox();
check->setEnabled(can_change_actions);
check->setCommitCallback(commit_callback);
- check->setCallbackUserData(ctrl->getCallbackUserData());
check->setToolTip( check->getLabel() );
if (show_all)
@@ -864,11 +846,11 @@ void LLPanelGroupSubTab::setFooterEnabled(BOOL enable)
void* LLPanelGroupMembersSubTab::createTab(void* data)
{
LLUUID* group_id = static_cast<LLUUID*>(data);
- return new LLPanelGroupMembersSubTab("panel group members sub tab", *group_id);
+ return new LLPanelGroupMembersSubTab(*group_id);
}
-LLPanelGroupMembersSubTab::LLPanelGroupMembersSubTab(const std::string& name, const LLUUID& group_id)
-: LLPanelGroupSubTab(name, group_id),
+LLPanelGroupMembersSubTab::LLPanelGroupMembersSubTab(const LLUUID& group_id)
+: LLPanelGroupSubTab(group_id),
mMembersList(NULL),
mAssignedRolesList(NULL),
mAllowedActionsList(NULL),
@@ -900,25 +882,22 @@ BOOL LLPanelGroupMembersSubTab::postBuildSubTab(LLView* root)
if (!mMembersList || !mAssignedRolesList || !mAllowedActionsList) return FALSE;
// We want to be notified whenever a member is selected.
- mMembersList->setCallbackUserData(this);
mMembersList->setCommitOnSelectionChange(TRUE);
- mMembersList->setCommitCallback(onMemberSelect);
+ mMembersList->setCommitCallback(onMemberSelect, this);
// Show the member's profile on double click.
- mMembersList->setDoubleClickCallback(onMemberDoubleClick);
+ mMembersList->setDoubleClickCallback(onMemberDoubleClick, this);
LLButton* button = parent->getChild<LLButton>("member_invite", recurse);
if ( button )
{
- button->setClickedCallback(onInviteMember);
- button->setCallbackUserData(this);
+ button->setClickedCallback(onInviteMember, this);
button->setEnabled(gAgent.hasPowerInGroup(mGroupID, GP_MEMBER_INVITE));
}
mEjectBtn = parent->getChild<LLButton>("member_eject", recurse);
if ( mEjectBtn )
{
- mEjectBtn->setClickedCallback(onEjectMembers);
- mEjectBtn->setCallbackUserData(this);
+ mEjectBtn->setClickedCallback(onEjectMembers, this);
mEjectBtn->setEnabled(FALSE);
}
@@ -1097,8 +1076,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect()
// Extract the checkbox that was created.
LLScrollListCheck* check_cell = (LLScrollListCheck*) item->getColumn(0);
LLCheckBoxCtrl* check = check_cell->getCheckBox();
- check->setCommitCallback(onRoleCheck);
- check->setCallbackUserData(this);
+ check->setCommitCallback(onRoleCheck, this);
check->set( count > 0 );
check->setTentative(
(0 != count)
@@ -1628,7 +1606,7 @@ void LLPanelGroupMembersSubTab::update(LLGroupChange gc)
retrieved << "Retrieving role member mappings...";
}
mMembersList->setEnabled(FALSE);
- mMembersList->addCommentText(retrieved.str());
+ mMembersList->setCommentText(retrieved.str());
}
}
@@ -1691,7 +1669,7 @@ void LLPanelGroupMembersSubTab::updateMembers()
row["columns"][2]["column"] = "online";
row["columns"][2]["value"] = mMemberProgress->second->getOnlineStatus();
- row["columns"][2]["font"] = "SANSSERIFSMALL";
+ row["columns"][2]["font"] = "SANSSERIF_SMALL";
mMembersList->addElement(row);//, ADD_SORTED);
mHasMatch = TRUE;
@@ -1707,7 +1685,7 @@ void LLPanelGroupMembersSubTab::updateMembers()
else
{
mMembersList->setEnabled(FALSE);
- mMembersList->addCommentText(std::string("No match."));
+ mMembersList->setCommentText(std::string("No match."));
}
}
else
@@ -1729,11 +1707,11 @@ void LLPanelGroupMembersSubTab::updateMembers()
void* LLPanelGroupRolesSubTab::createTab(void* data)
{
LLUUID* group_id = static_cast<LLUUID*>(data);
- return new LLPanelGroupRolesSubTab("panel group roles sub tab", *group_id);
+ return new LLPanelGroupRolesSubTab(*group_id);
}
-LLPanelGroupRolesSubTab::LLPanelGroupRolesSubTab(const std::string& name, const LLUUID& group_id)
-: LLPanelGroupSubTab(name, group_id), mHasRoleChange(FALSE)
+LLPanelGroupRolesSubTab::LLPanelGroupRolesSubTab(const LLUUID& group_id)
+: LLPanelGroupSubTab(group_id), mHasRoleChange(FALSE)
{
}
@@ -1775,8 +1753,7 @@ BOOL LLPanelGroupRolesSubTab::postBuildSubTab(LLView* root)
parent->getChild<LLButton>("role_create", recurse);
if ( mCreateRoleButton )
{
- mCreateRoleButton->setCallbackUserData(this);
- mCreateRoleButton->setClickedCallback(onCreateRole);
+ mCreateRoleButton->setClickedCallback(onCreateRole, this);
mCreateRoleButton->setEnabled(FALSE);
}
@@ -1784,32 +1761,25 @@ BOOL LLPanelGroupRolesSubTab::postBuildSubTab(LLView* root)
parent->getChild<LLButton>("role_delete", recurse);
if ( mDeleteRoleButton )
{
- mDeleteRoleButton->setCallbackUserData(this);
- mDeleteRoleButton->setClickedCallback(onDeleteRole);
+ mDeleteRoleButton->setClickedCallback(onDeleteRole, this);
mDeleteRoleButton->setEnabled(FALSE);
}
mRolesList->setCommitOnSelectionChange(TRUE);
- mRolesList->setCallbackUserData(this);
- mRolesList->setCommitCallback(onRoleSelect);
+ mRolesList->setCommitCallback(onRoleSelect, this);
- mMemberVisibleCheck->setCallbackUserData(this);
- mMemberVisibleCheck->setCommitCallback(onMemberVisibilityChange);
+ mMemberVisibleCheck->setCommitCallback(onMemberVisibilityChange, this);
mAllowedActionsList->setCommitOnSelectionChange(TRUE);
- mAllowedActionsList->setCallbackUserData(this);
mRoleName->setCommitOnFocusLost(TRUE);
- mRoleName->setCallbackUserData(this);
- mRoleName->setKeystrokeCallback(onPropertiesKey);
+ mRoleName->setKeystrokeCallback(onPropertiesKey, this);
mRoleTitle->setCommitOnFocusLost(TRUE);
- mRoleTitle->setCallbackUserData(this);
- mRoleTitle->setKeystrokeCallback(onPropertiesKey);
+ mRoleTitle->setKeystrokeCallback(onPropertiesKey, this);
mRoleDescription->setCommitOnFocusLost(TRUE);
- mRoleDescription->setCallbackUserData(this);
- mRoleDescription->setCommitCallback(onDescriptionCommit);
+ mRoleDescription->setCommitCallback(onDescriptionCommit, this);
mRoleDescription->setFocusReceivedCallback(onDescriptionFocus, this);
setFooterEnabled(FALSE);
@@ -2060,7 +2030,7 @@ void LLPanelGroupRolesSubTab::handleRoleSelect()
rd.mRolePowers,
0LL,
mActionIcons,
- onActionCheck,
+ boost::bind(&LLPanelGroupRolesSubTab::handleActionCheck, this, _1, false),
TRUE,
FALSE,
is_owner_role);
@@ -2157,24 +2127,18 @@ void LLPanelGroupRolesSubTab::buildMembersList()
}
}
-// static
-void LLPanelGroupRolesSubTab::onActionCheck(LLUICtrl* ctrl, void* user_data)
-{
- LLPanelGroupRolesSubTab* self = static_cast<LLPanelGroupRolesSubTab*>(user_data);
- LLCheckBoxCtrl* check = static_cast<LLCheckBoxCtrl*>(ctrl);
- if (!check || !self) return;
-
- self->handleActionCheck(check);
-}
-
struct ActionCBData
{
LLPanelGroupRolesSubTab* mSelf;
LLCheckBoxCtrl* mCheck;
};
-void LLPanelGroupRolesSubTab::handleActionCheck(LLCheckBoxCtrl* check, bool force)
+void LLPanelGroupRolesSubTab::handleActionCheck(LLUICtrl* ctrl, bool force)
{
+ LLCheckBoxCtrl* check = dynamic_cast<LLCheckBoxCtrl*>(ctrl);
+ if (!check)
+ return;
+
lldebugs << "LLPanelGroupRolesSubTab::handleActionSelect()" << llendl;
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupID);
@@ -2442,11 +2406,11 @@ void LLPanelGroupRolesSubTab::saveRoleChanges()
void* LLPanelGroupActionsSubTab::createTab(void* data)
{
LLUUID* group_id = static_cast<LLUUID*>(data);
- return new LLPanelGroupActionsSubTab("panel group actions sub tab", *group_id);
+ return new LLPanelGroupActionsSubTab(*group_id);
}
-LLPanelGroupActionsSubTab::LLPanelGroupActionsSubTab(const std::string& name, const LLUUID& group_id)
-: LLPanelGroupSubTab(name, group_id)
+LLPanelGroupActionsSubTab::LLPanelGroupActionsSubTab(const LLUUID& group_id)
+: LLPanelGroupSubTab(group_id)
{
}
@@ -2472,12 +2436,8 @@ BOOL LLPanelGroupActionsSubTab::postBuildSubTab(LLView* root)
if (!mActionList || !mActionDescription || !mActionRoles || !mActionMembers) return FALSE;
- mActionList->setCallbackUserData(this);
mActionList->setCommitOnSelectionChange(TRUE);
- mActionList->setCommitCallback(onActionSelect);
-
- mActionMembers->setCallbackUserData(this);
- mActionRoles->setCallbackUserData(this);
+ mActionList->setCommitCallback(boost::bind(&LLPanelGroupActionsSubTab::handleActionSelect, this));
update(GC_ALL);
@@ -2537,13 +2497,6 @@ void LLPanelGroupActionsSubTab::update(LLGroupChange gc)
FALSE);
}
-// static
-void LLPanelGroupActionsSubTab::onActionSelect(LLUICtrl* scroll, void* data)
-{
- LLPanelGroupActionsSubTab* self = static_cast<LLPanelGroupActionsSubTab*>(data);
- self->handleActionSelect();
-}
-
void LLPanelGroupActionsSubTab::handleActionSelect()
{
mActionMembers->deleteAllItems();
diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h
index 95057bbfaf..8290a81ff4 100644
--- a/indra/newview/llpanelgrouproles.h
+++ b/indra/newview/llpanelgrouproles.h
@@ -52,7 +52,7 @@ class LLPanelGroupRoles : public LLPanelGroupTab,
public LLPanelGroupTabObserver
{
public:
- LLPanelGroupRoles(const std::string& name, const LLUUID& group_id);
+ LLPanelGroupRoles(const LLUUID& group_id);
virtual ~LLPanelGroupRoles();
// Allow sub tabs to ask for sibling controls.
@@ -64,7 +64,6 @@ public:
virtual BOOL isVisibleByAgent(LLAgent* agentp);
static void* createTab(void* data);
- static void onClickSubTab(void*,bool);
void handleClickSubTab();
// Checks if the current tab needs to be applied, and tries to switch to the requested tab.
@@ -104,7 +103,7 @@ protected:
class LLPanelGroupSubTab : public LLPanelGroupTab
{
public:
- LLPanelGroupSubTab(const std::string& name, const LLUUID& group_id);
+ LLPanelGroupSubTab(const LLUUID& group_id);
virtual ~LLPanelGroupSubTab();
virtual BOOL postBuild();
@@ -131,7 +130,7 @@ public:
U64 allowed_by_some,
U64 allowed_by_all,
icon_map_t& icons,
- void (*commit_callback)(LLUICtrl*,void*),
+ LLUICtrl::commit_callback_t commit_callback,
BOOL show_all,
BOOL filter,
BOOL is_owner_role);
@@ -140,7 +139,7 @@ public:
U64 allowed_by_all,
LLRoleActionSet* action_set,
icon_map_t& icons,
- void (*commit_callback)(LLUICtrl*,void*),
+ LLUICtrl::commit_callback_t commit_callback,
BOOL show_all,
BOOL filter,
BOOL is_owner_role);
@@ -164,7 +163,7 @@ protected:
class LLPanelGroupMembersSubTab : public LLPanelGroupSubTab
{
public:
- LLPanelGroupMembersSubTab(const std::string& name, const LLUUID& group_id);
+ LLPanelGroupMembersSubTab(const LLUUID& group_id);
virtual ~LLPanelGroupMembersSubTab();
virtual BOOL postBuildSubTab(LLView* root);
@@ -229,7 +228,7 @@ protected:
class LLPanelGroupRolesSubTab : public LLPanelGroupSubTab
{
public:
- LLPanelGroupRolesSubTab(const std::string& name, const LLUUID& group_id);
+ LLPanelGroupRolesSubTab(const LLUUID& group_id);
virtual ~LLPanelGroupRolesSubTab();
virtual BOOL postBuildSubTab(LLView* root);
@@ -249,7 +248,6 @@ public:
void buildMembersList();
static void onActionCheck(LLUICtrl*, void*);
- void handleActionCheck(LLCheckBoxCtrl*, bool force=false);
bool addActionCB(const LLSD& notification, const LLSD& response, LLCheckBoxCtrl* check);
static void onPropertiesKey(LLLineEditor*, void*);
@@ -268,10 +266,8 @@ public:
void saveRoleChanges();
protected:
- LLSD createRoleItem(const LLUUID& role_id,
- std::string name,
- std::string title,
- S32 members);
+ void handleActionCheck(LLUICtrl* ctrl, bool force);
+ LLSD createRoleItem(const LLUUID& role_id, std::string name, std::string title, S32 members);
LLScrollListCtrl* mRolesList;
LLNameListCtrl* mAssignedMembersList;
@@ -293,7 +289,7 @@ protected:
class LLPanelGroupActionsSubTab : public LLPanelGroupSubTab
{
public:
- LLPanelGroupActionsSubTab(const std::string& name, const LLUUID& group_id);
+ LLPanelGroupActionsSubTab(const LLUUID& group_id);
virtual ~LLPanelGroupActionsSubTab();
virtual BOOL postBuildSubTab(LLView* root);
@@ -306,7 +302,6 @@ public:
virtual bool apply(std::string& mesg);
virtual void update(LLGroupChange gc);
- static void onActionSelect(LLUICtrl*, void*);
void handleActionSelect();
protected:
LLScrollListCtrl* mActionList;
diff --git a/indra/newview/llpanelland.cpp b/indra/newview/llpanelland.cpp
index 8bb100d335..92fe082ef2 100644
--- a/indra/newview/llpanelland.cpp
+++ b/indra/newview/llpanelland.cpp
@@ -79,8 +79,8 @@ BOOL LLPanelLandInfo::postBuild()
//
// Methods
//
-LLPanelLandInfo::LLPanelLandInfo(const std::string& name)
-: LLPanel(name),
+LLPanelLandInfo::LLPanelLandInfo()
+: LLPanel(),
mCheckShowOwners(NULL)
{
if (!sInstance)
diff --git a/indra/newview/llpanelland.h b/indra/newview/llpanelland.h
index 9a7e977711..92fe313405 100644
--- a/indra/newview/llpanelland.h
+++ b/indra/newview/llpanelland.h
@@ -46,7 +46,7 @@ class LLPanelLandInfo
: public LLPanel
{
public:
- LLPanelLandInfo(const std::string& name);
+ LLPanelLandInfo();
virtual ~LLPanelLandInfo();
void refresh();
diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp
index b8886c9493..d1ab3510cd 100644
--- a/indra/newview/llpanellandmedia.cpp
+++ b/indra/newview/llpanellandmedia.cpp
@@ -60,8 +60,7 @@
//---------------------------------------------------------------------------
LLPanelLandMedia::LLPanelLandMedia(LLParcelSelectionHandle& parcel)
-: LLPanel(std::string("land_media_panel")),
-
+: LLPanel(),
mParcel(parcel),
mCheckSoundLocal(NULL),
mSoundHelpButton(NULL),
@@ -118,8 +117,7 @@ BOOL LLPanelLandMedia::postBuild()
childSetCommitCallback("music_url", onCommitAny, this);
mMediaTextureCtrl = getChild<LLTextureCtrl>("media texture");
- mMediaTextureCtrl->setCommitCallback( onCommitAny );
- mMediaTextureCtrl->setCallbackUserData( this );
+ mMediaTextureCtrl->setCommitCallback( onCommitAny, this );
mMediaTextureCtrl->setAllowNoTexture ( TRUE );
mMediaTextureCtrl->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
mMediaTextureCtrl->setNonImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index bc5e8f2482..671d3264bb 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -50,7 +50,6 @@
#include "llcurl.h"
#include "llviewercontrol.h"
#include "llfloaterabout.h"
-#include "llfloatertest.h"
#include "llfloaterpreference.h"
#include "llfocusmgr.h"
#include "lllineeditor.h"
@@ -70,12 +69,12 @@
#include "llhttpclient.h"
#include "llweb.h"
#include "llwebbrowserctrl.h"
-
+#include "llfloateruipreview.h"
#include "llfloaterhtml.h"
#include "llfloaterhtmlhelp.h"
#include "llfloatertos.h"
-
+#include "lltrans.h"
#include "llglheaders.h"
#define USE_VIEWER_AUTH 0
@@ -166,7 +165,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
BOOL show_server,
void (*callback)(S32 option, void* user_data),
void *cb_data)
-: LLPanel(std::string("panel_login"), LLRect(0,600,800,0), FALSE), // not bordered
+: LLPanel(),
mLogoImage(),
mCallback(callback),
mCallbackData(cb_data),
@@ -190,7 +189,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
LLPanelLogin::sInstance = this;
// add to front so we are the bottom-most child
- gViewerWindow->getRootView()->addChildAtEnd(this);
+ gViewerWindow->getRootView()->addChildInBack(this);
// Logo
mLogoImage = LLUI::getUIImage("startup_logo.j2c");
@@ -207,9 +206,8 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
childSetPrevalidate("first_name_edit", LLLineEditor::prevalidatePrintableNoSpace);
childSetPrevalidate("last_name_edit", LLLineEditor::prevalidatePrintableNoSpace);
- childSetCommitCallback("password_edit", mungePassword);
- childSetKeystrokeCallback("password_edit", onPassKey, this);
- childSetUserData("password_edit", this);
+ childSetCommitCallback("password_edit", mungePassword, this);
+ getChild<LLLineEditor>("password_edit")->setKeystrokeCallback(onPassKey, this);
// change z sort of clickable text to be behind buttons
sendChildToBack(getChildView("channel_text"));
@@ -219,14 +217,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
if (edit) edit->setDrawAsterixes(TRUE);
LLComboBox* combo = getChild<LLComboBox>("start_location_combo");
- combo->setAllowTextEntry(TRUE, 128, FALSE);
-
- // The XML file loads the combo with the following labels:
- // 0 - "My Home"
- // 1 - "My Last Location"
- // 2 - "<Type region name>"
- BOOL login_last = gSavedSettings.getBOOL("LoginLastLocation");
std::string sim_string = LLURLSimString::sInstance.mSimString;
if (!sim_string.empty())
{
@@ -236,19 +227,11 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
combo->setTextEntry(sim_string);
combo->setCurrentByIndex( 2 );
}
- else if (login_last)
- {
- combo->setCurrentByIndex( 1 );
- }
- else
- {
- combo->setCurrentByIndex( 0 );
- }
- combo->setCommitCallback( &set_start_location );
+ combo->setCommitCallback( &set_start_location, NULL );
LLComboBox* server_choice_combo = sInstance->getChild<LLComboBox>("server_combo");
- server_choice_combo->setCommitCallback(onSelectServer);
+ server_choice_combo->setCommitCallback(onSelectServer, NULL);
server_choice_combo->setFocusLostCallback(onServerComboLostFocus);
childSetAction("connect_btn", onClickConnect, this);
@@ -266,14 +249,13 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
LLTextBox* channel_text = getChild<LLTextBox>("channel_text");
channel_text->setTextArg("[CHANNEL]", channel); // though not displayed
channel_text->setTextArg("[VERSION]", version);
- channel_text->setClickedCallback(onClickVersion);
- channel_text->setCallbackUserData(this);
+ channel_text->setClickedCallback(onClickVersion, this);
LLTextBox* forgot_password_text = getChild<LLTextBox>("forgot_password_text");
- forgot_password_text->setClickedCallback(onClickForgotPassword);
+ forgot_password_text->setClickedCallback(onClickForgotPassword, NULL);
LLTextBox* create_new_account_text = getChild<LLTextBox>("create_new_account_text");
- create_new_account_text->setClickedCallback(onClickNewAccount);
+ create_new_account_text->setClickedCallback(onClickNewAccount, NULL);
#endif
// get the web browser control
@@ -432,16 +414,13 @@ BOOL LLPanelLogin::handleKeyHere(KEY key, MASK mask)
return TRUE;
}
- if (('P' == key) && (MASK_CONTROL == mask))
- {
- LLFloaterPreference::show(NULL);
- return TRUE;
- }
-
if (('T' == key) && (MASK_CONTROL == mask))
- {
- new LLFloaterSimple("floater_test.xml");
- return TRUE;
+ { // previously was "Test Floater"
+ if(gSavedSettings.getBOOL("QAMode"))
+ {
+ LLFloaterUIPreview::showInstance();
+ return TRUE;
+ }
}
if ( KEY_F1 == key )
@@ -656,19 +635,6 @@ void LLPanelLogin::refreshLocation( bool force_visible )
#if USE_VIEWER_AUTH
loadLoginPage();
#else
- LLComboBox* combo = sInstance->getChild<LLComboBox>("start_location_combo");
-
- if (LLURLSimString::parse())
- {
- combo->setCurrentByIndex( 3 ); // BUG? Maybe 2?
- combo->setTextEntry(LLURLSimString::sInstance.mSimString);
- }
- else
- {
- BOOL login_last = gSavedSettings.getBOOL("LoginLastLocation");
- combo->setCurrentByIndex( login_last ? 1 : 0 );
- }
-
BOOL show_start = TRUE;
if ( ! force_visible )
@@ -688,7 +654,7 @@ void LLPanelLogin::refreshLocation( bool force_visible )
}
// static
-void LLPanelLogin::close()
+void LLPanelLogin::closePanel()
{
if (sInstance)
{
@@ -787,14 +753,7 @@ void LLPanelLogin::loadLoginPage()
}
else
{
- if (gSavedSettings.getBOOL("LoginLastLocation"))
- {
- location = "last";
- }
- else
- {
- location = "home";
- }
+ location = gSavedSettings.getString("LoginLocation");
}
std::string firstname, lastname;
@@ -899,13 +858,12 @@ void LLPanelLogin::onClickConnect(void *)
}
else
{
- LLNotifications::instance().add("MustHaveAccountToLogIn", LLSD(), LLSD(),
- LLPanelLogin::newAccountAlertCallback);
+ LLNotifications::instance().add("MustHaveAccountToLogIn");
}
}
}
-
+/*
// static
bool LLPanelLogin::newAccountAlertCallback(const LLSD& notification, const LLSD& response)
{
@@ -913,7 +871,7 @@ bool LLPanelLogin::newAccountAlertCallback(const LLSD& notification, const LLSD&
if (0 == option)
{
llinfos << "Going to account creation URL" << llendl;
- LLWeb::loadURLExternal( CREATE_ACCOUNT_URL );
+ LLWeb::loadURLExternal( LLNotifications::instance().getGlobalString("CREATE_ACCOUNT_URL"));
}
else
{
@@ -921,12 +879,12 @@ bool LLPanelLogin::newAccountAlertCallback(const LLSD& notification, const LLSD&
}
return false;
}
-
+*/
// static
void LLPanelLogin::onClickNewAccount(void*)
{
- LLWeb::loadURLExternal( CREATE_ACCOUNT_URL );
+ LLWeb::loadURLExternal(sInstance->getString("create_account_url"));
}
@@ -949,7 +907,7 @@ void LLPanelLogin::onClickQuit(void*)
// static
void LLPanelLogin::onClickVersion(void*)
{
- LLFloaterAbout::show(NULL);
+ LLFloaterAbout::showInstance();
}
//static
@@ -1023,6 +981,8 @@ void LLPanelLogin::onSelectServer(LLUICtrl*, void*)
void LLPanelLogin::onServerComboLostFocus(LLFocusableElement* fe, void*)
{
+ if (!sInstance) return;
+
LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
if(fe == combo)
{
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h
index 47d42da7f1..540f938053 100644
--- a/indra/newview/llpanellogin.h
+++ b/indra/newview/llpanellogin.h
@@ -34,7 +34,7 @@
#define LL_LLPANELLOGIN_H
#include "llpanel.h"
-#include "llmemory.h" // LLPointer<>
+#include "llpointer.h" // LLPointer<>
#include "llwebbrowserctrl.h" // LLWebBrowserCtrlObserver
class LLUIImage;
@@ -72,7 +72,7 @@ public:
static BOOL isGridComboDirty();
static void getLocation(std::string &location);
- static void close();
+ static void closePanel();
void setSiteIsAlive( bool alive );
@@ -84,7 +84,7 @@ public:
private:
static void onClickConnect(void*);
static void onClickNewAccount(void*);
- static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response);
+// static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response);
static void onClickQuit(void*);
static void onClickVersion(void*);
virtual void onNavigateComplete( const EventType& eventIn );
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 75f479c16f..9ec9874384 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -52,7 +52,6 @@
#include "llcombobox.h"
#include "llfocusmgr.h"
#include "llmanipscale.h"
-#include "llpanelinventory.h"
#include "llpreviewscript.h"
#include "llresmgr.h"
#include "llselectmgr.h"
@@ -62,6 +61,7 @@
#include "lltool.h"
#include "lltoolcomp.h"
#include "lltoolmgr.h"
+#include "lltrans.h"
#include "llui.h"
#include "llviewerobject.h"
#include "llviewerregion.h"
@@ -99,13 +99,23 @@ enum {
MI_HOLE_COUNT
};
-//*TODO:translate (depricated, so very low priority)
-static const std::string LEGACY_FULLBRIGHT_DESC("Fullbright (Legacy)");
+//static const std::string LEGACY_FULLBRIGHT_DESC =LLTrans::getString("Fullbright");
BOOL LLPanelObject::postBuild()
{
setMouseOpaque(FALSE);
-
+
+ std::map<std::string, std::string> material_name_map;
+ material_name_map["Stone"]= LLTrans::getString("Stone");
+ material_name_map["Metal"]= LLTrans::getString("Metal");
+ material_name_map["Glass"]= LLTrans::getString("Glass");
+ material_name_map["Wood"]= LLTrans::getString("Wood");
+ material_name_map["Flesh"]= LLTrans::getString("Flesh");
+ material_name_map["Plastic"]= LLTrans::getString("Plastic");
+ material_name_map["Rubber"]= LLTrans::getString("Rubber");
+ material_name_map["Light"]= LLTrans::getString("Light");
+
+ LLMaterialTable::basic.initTableTransNames(material_name_map);
//--------------------------------------------------------
// Top
//--------------------------------------------------------
@@ -164,14 +174,14 @@ BOOL LLPanelObject::postBuild()
mComboMaterial = getChild<LLComboBox>("material");
childSetCommitCallback("material",onCommitMaterial,this);
mComboMaterial->removeall();
- // *TODO:translate
+
for (LLMaterialTable::info_list_t::iterator iter = LLMaterialTable::basic.mMaterialInfoList.begin();
iter != LLMaterialTable::basic.mMaterialInfoList.end(); ++iter)
{
LLMaterialInfo* minfop = *iter;
if (minfop->mMCode != LL_MCODE_LIGHT)
{
- mComboMaterial->add(minfop->mName);
+ mComboMaterial->add(minfop->mName);
}
}
mComboMaterialItemCount = mComboMaterial->getItemCount();
@@ -263,11 +273,10 @@ BOOL LLPanelObject::postBuild()
if (mCtrlSculptTexture)
{
mCtrlSculptTexture->setDefaultImageAssetID(LLUUID(SCULPT_DEFAULT_TEXTURE));
- mCtrlSculptTexture->setCommitCallback( LLPanelObject::onCommitSculpt );
- mCtrlSculptTexture->setOnCancelCallback( LLPanelObject::onCancelSculpt );
- mCtrlSculptTexture->setOnSelectCallback( LLPanelObject::onSelectSculpt );
- mCtrlSculptTexture->setDropCallback(LLPanelObject::onDropSculpt);
- mCtrlSculptTexture->setCallbackUserData( this );
+ mCtrlSculptTexture->setCommitCallback( boost::bind(&LLPanelObject::onCommitSculpt, this, _2 ));
+ mCtrlSculptTexture->setOnCancelCallback( boost::bind(&LLPanelObject::onCancelSculpt, this, _2 ));
+ mCtrlSculptTexture->setOnSelectCallback( boost::bind(&LLPanelObject::onSelectSculpt, this, _2 ));
+ mCtrlSculptTexture->setDropCallback( boost::bind(&LLPanelObject::onDropSculpt, this, _2 ));
// Don't allow (no copy) or (no transfer) textures to be selected during immediate mode
mCtrlSculptTexture->setImmediateFilterPermMask(PERM_COPY | PERM_TRANSFER);
// Allow any texture to be used during non-immediate mode.
@@ -303,8 +312,8 @@ BOOL LLPanelObject::postBuild()
return TRUE;
}
-LLPanelObject::LLPanelObject(const std::string& name)
-: LLPanel(name),
+LLPanelObject::LLPanelObject()
+: LLPanel(),
mIsPhysical(FALSE),
mIsTemporary(FALSE),
mIsPhantom(FALSE),
@@ -530,7 +539,7 @@ void LLPanelObject::getState( )
}
} func;
bool material_same = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, material_code );
-
+ std::string LEGACY_FULLBRIGHT_DESC = LLTrans::getString("Fullbright");
if (editable && single_volume && material_same)
{
mComboMaterial->setEnabled( TRUE );
@@ -549,7 +558,7 @@ void LLPanelObject::getState( )
{
mComboMaterial->remove(LEGACY_FULLBRIGHT_DESC);
}
- // *TODO:Translate
+
mComboMaterial->setSimple(std::string(LLMaterialTable::basic.getName(material_code)));
}
}
@@ -1163,7 +1172,7 @@ void LLPanelObject::getState( )
}
// static
-BOOL LLPanelObject::precommitValidate( LLUICtrl* ctrl, void* userdata )
+bool LLPanelObject::precommitValidate( const LLSD& data )
{
// TODO: Richard will fill this in later.
return TRUE; // FALSE means that validation failed and new value should not be commited.
@@ -1244,6 +1253,7 @@ void LLPanelObject::onCommitMaterial( LLUICtrl* ctrl, void* userdata )
{
// apply the currently selected material to the object
const std::string& material_name = box->getSimple();
+ std::string LEGACY_FULLBRIGHT_DESC = LLTrans::getString("Fullbright");
if (material_name != LEGACY_FULLBRIGHT_DESC)
{
U8 material_code = LLMaterialTable::basic.getMCode(material_name);
@@ -1992,60 +2002,49 @@ void LLPanelObject::onCommitCastShadows( LLUICtrl* ctrl, void* userdata )
}
-// static
-void LLPanelObject::onSelectSculpt(LLUICtrl* ctrl, void* userdata)
+void LLPanelObject::onSelectSculpt(const LLSD& data)
{
- LLPanelObject* self = (LLPanelObject*) userdata;
-
- LLTextureCtrl* mTextureCtrl = self->getChild<LLTextureCtrl>("sculpt texture control");
+ LLTextureCtrl* mTextureCtrl = getChild<LLTextureCtrl>("sculpt texture control");
if (mTextureCtrl)
{
- self->mSculptTextureRevert = mTextureCtrl->getImageAssetID();
+ mSculptTextureRevert = mTextureCtrl->getImageAssetID();
}
- self->sendSculpt();
+ sendSculpt();
}
-void LLPanelObject::onCommitSculpt( LLUICtrl* ctrl, void* userdata )
+void LLPanelObject::onCommitSculpt( const LLSD& data )
{
- LLPanelObject* self = (LLPanelObject*) userdata;
-
- self->sendSculpt();
+ sendSculpt();
}
-// static
-BOOL LLPanelObject::onDropSculpt(LLUICtrl*, LLInventoryItem* item, void* userdata)
+BOOL LLPanelObject::onDropSculpt(LLInventoryItem* item)
{
- LLPanelObject* self = (LLPanelObject*) userdata;
-
- LLTextureCtrl* mTextureCtrl = self->getChild<LLTextureCtrl>("sculpt texture control");
+ LLTextureCtrl* mTextureCtrl = getChild<LLTextureCtrl>("sculpt texture control");
if (mTextureCtrl)
{
LLUUID asset = item->getAssetUUID();
mTextureCtrl->setImageAssetID(asset);
- self->mSculptTextureRevert = asset;
+ mSculptTextureRevert = asset;
}
return TRUE;
}
-// static
-void LLPanelObject::onCancelSculpt(LLUICtrl* ctrl, void* userdata)
+void LLPanelObject::onCancelSculpt(const LLSD& data)
{
- LLPanelObject* self = (LLPanelObject*) userdata;
-
- LLTextureCtrl* mTextureCtrl = self->getChild<LLTextureCtrl>("sculpt texture control");
+ LLTextureCtrl* mTextureCtrl = getChild<LLTextureCtrl>("sculpt texture control");
if(!mTextureCtrl)
return;
- mTextureCtrl->setImageAssetID(self->mSculptTextureRevert);
+ mTextureCtrl->setImageAssetID(mSculptTextureRevert);
- self->sendSculpt();
+ sendSculpt();
}
// static
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index 9ed091ed5f..1ab4ff581e 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -35,7 +35,7 @@
#include "v3math.h"
#include "llpanel.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llvolume.h"
class LLSpinCtrl;
@@ -54,7 +54,7 @@ class LLUUID;
class LLPanelObject : public LLPanel
{
public:
- LLPanelObject(const std::string& name);
+ LLPanelObject();
virtual ~LLPanelObject();
virtual BOOL postBuild();
@@ -63,7 +63,7 @@ public:
void refresh();
- static BOOL precommitValidate(LLUICtrl* ctrl,void* userdata);
+ static bool precommitValidate(const LLSD& data);
static void onCommitLock(LLUICtrl *ctrl, void *data);
static void onCommitPosition( LLUICtrl* ctrl, void* userdata);
@@ -78,10 +78,10 @@ public:
static void onCommitMaterial( LLUICtrl* ctrl, void* userdata);
- static void onCommitSculpt( LLUICtrl* ctrl, void* userdata);
- static void onCancelSculpt( LLUICtrl* ctrl, void* userdata);
- static void onSelectSculpt( LLUICtrl* ctrl, void* userdata);
- static BOOL onDropSculpt( LLUICtrl* ctrl, LLInventoryItem* item, void* ud);
+ void onCommitSculpt(const LLSD& data);
+ void onCancelSculpt(const LLSD& data);
+ void onSelectSculpt(const LLSD& data);
+ BOOL onDropSculpt(LLInventoryItem* item);
static void onCommitSculptType( LLUICtrl *ctrl, void* userdata);
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 389f06f355..b4e33fec76 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -70,56 +70,44 @@
///----------------------------------------------------------------------------
// Default constructor
-LLPanelPermissions::LLPanelPermissions(const std::string& title) :
- LLPanel(title)
+LLPanelPermissions::LLPanelPermissions() :
+ LLPanel()
{
setMouseOpaque(FALSE);
}
BOOL LLPanelPermissions::postBuild()
{
- this->childSetCommitCallback("Object Name",LLPanelPermissions::onCommitName,this);
- this->childSetPrevalidate("Object Name",LLLineEditor::prevalidatePrintableNotPipe);
- this->childSetCommitCallback("Object Description",LLPanelPermissions::onCommitDesc,this);
- this->childSetPrevalidate("Object Description",LLLineEditor::prevalidatePrintableNotPipe);
+ childSetCommitCallback("Object Name",LLPanelPermissions::onCommitName,this);
+ childSetPrevalidate("Object Name",LLLineEditor::prevalidatePrintableNotPipe);
+ childSetCommitCallback("Object Description",LLPanelPermissions::onCommitDesc,this);
+ childSetPrevalidate("Object Description",LLLineEditor::prevalidatePrintableNotPipe);
- this->childSetAction("button owner profile",LLPanelPermissions::onClickOwner,this);
- this->childSetAction("button creator profile",LLPanelPermissions::onClickCreator,this);
+ childSetAction("button owner profile",LLPanelPermissions::onClickOwner,this);
+ childSetAction("button creator profile",LLPanelPermissions::onClickCreator,this);
- this->childSetAction("button set group",LLPanelPermissions::onClickGroup,this);
+ getChild<LLUICtrl>("button set group")->setCommitCallback(boost::bind(&LLPanelPermissions::onClickGroup,this));
- this->childSetCommitCallback("checkbox share with group",LLPanelPermissions::onCommitGroupShare,this);
+ childSetCommitCallback("checkbox share with group",LLPanelPermissions::onCommitGroupShare,this);
- this->childSetAction("button deed",LLPanelPermissions::onClickDeedToGroup,this);
+ childSetAction("button deed",LLPanelPermissions::onClickDeedToGroup,this);
- this->childSetCommitCallback("checkbox allow everyone move",LLPanelPermissions::onCommitEveryoneMove,this);
+ childSetCommitCallback("checkbox allow everyone move",LLPanelPermissions::onCommitEveryoneMove,this);
- this->childSetCommitCallback("checkbox allow everyone copy",LLPanelPermissions::onCommitEveryoneCopy,this);
+ childSetCommitCallback("checkbox allow everyone copy",LLPanelPermissions::onCommitEveryoneCopy,this);
- this->childSetCommitCallback("checkbox for sale",LLPanelPermissions::onCommitSaleInfo,this);
+ childSetCommitCallback("checkbox for sale",LLPanelPermissions::onCommitSaleInfo,this);
- this->childSetCommitCallback("Edit Cost",LLPanelPermissions::onCommitSaleInfo,this);
- this->childSetPrevalidate("Edit Cost",LLLineEditor::prevalidateNonNegativeS32);
-
- this->childSetCommitCallback("sale type",LLPanelPermissions::onCommitSaleType,this);
+ childSetCommitCallback("sale type",LLPanelPermissions::onCommitSaleType,this);
- this->childSetCommitCallback("checkbox next owner can modify",LLPanelPermissions::onCommitNextOwnerModify,this);
- this->childSetCommitCallback("checkbox next owner can copy",LLPanelPermissions::onCommitNextOwnerCopy,this);
- this->childSetCommitCallback("checkbox next owner can transfer",LLPanelPermissions::onCommitNextOwnerTransfer,this);
- this->childSetCommitCallback("clickaction",LLPanelPermissions::onCommitClickAction,this);
- this->childSetCommitCallback("search_check",LLPanelPermissions::onCommitIncludeInSearch,this);
+ childSetCommitCallback("checkbox next owner can modify",LLPanelPermissions::onCommitNextOwnerModify,this);
+ childSetCommitCallback("checkbox next owner can copy",LLPanelPermissions::onCommitNextOwnerCopy,this);
+ childSetCommitCallback("checkbox next owner can transfer",LLPanelPermissions::onCommitNextOwnerTransfer,this);
+ childSetCommitCallback("clickaction",LLPanelPermissions::onCommitClickAction,this);
+ childSetCommitCallback("search_check",LLPanelPermissions::onCommitIncludeInSearch,this);
- LLTextBox* group_rect_proxy = getChild<LLTextBox>("Group Name Proxy");
- if(group_rect_proxy )
- {
- mLabelGroupName = new LLNameBox("Group Name", group_rect_proxy->getRect());
- addChild(mLabelGroupName);
- }
- else
- {
- mLabelGroupName = NULL;
- }
+ mLabelGroupName = getChild<LLNameBox>("Group Name Proxy");
return TRUE;
}
@@ -137,7 +125,7 @@ void LLPanelPermissions::refresh()
if(BtnDeedToGroup)
{
std::string deedText;
- if (gSavedSettings.getWarning("DeedObject"))
+ if (gWarningSettings.getBOOL("DeedObject"))
{
deedText = getString("text deed continued");
}
@@ -843,19 +831,18 @@ void LLPanelPermissions::onClickOwner(void *data)
}
}
-void LLPanelPermissions::onClickGroup(void* data)
+void LLPanelPermissions::onClickGroup()
{
- LLPanelPermissions* panelp = (LLPanelPermissions*)data;
LLUUID owner_id;
std::string name;
BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, name);
- LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
+ LLFloater* parent_floater = gFloaterView->getParentFloater(this);
if(owners_identical && (owner_id == gAgent.getID()))
{
LLFloaterGroupPicker* fg;
fg = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
- fg->setSelectCallback( cbGroupID, data );
+ fg->setSelectGroupCallback( boost::bind(&LLPanelPermissions::cbGroupID, this, _1) );
if (parent_floater)
{
@@ -866,13 +853,11 @@ void LLPanelPermissions::onClickGroup(void* data)
}
}
-// static
-void LLPanelPermissions::cbGroupID(LLUUID group_id, void* userdata)
+void LLPanelPermissions::cbGroupID(LLUUID group_id)
{
- LLPanelPermissions* self = (LLPanelPermissions*)userdata;
- if(self->mLabelGroupName)
+ if(mLabelGroupName)
{
- self->mLabelGroupName->setNameID(group_id, TRUE);
+ mLabelGroupName->setNameID(group_id, TRUE);
}
LLSelectMgr::getInstance()->sendGroup(group_id);
}
diff --git a/indra/newview/llpanelpermissions.h b/indra/newview/llpanelpermissions.h
index bb816acd07..481efe178e 100644
--- a/indra/newview/llpanelpermissions.h
+++ b/indra/newview/llpanelpermissions.h
@@ -53,24 +53,22 @@ class LLNameBox;
class LLPanelPermissions : public LLPanel
{
public:
- LLPanelPermissions(const std::string& title);
+ LLPanelPermissions();
virtual ~LLPanelPermissions();
virtual BOOL postBuild();
// MANIPULATORS
void refresh(); // refresh all labels as needed
-// void setPermCheckboxes(U32 mask_on, U32 mask_off,
-// LLCheckBoxCtrl* move, LLCheckboxCtrl* edit,
-// LLCheckBoxCtrl* copy);
+
protected:
// statics
static void onClickClaim(void*);
static void onClickRelease(void*);
static void onClickCreator(void*);
static void onClickOwner(void*);
- static void onClickGroup(void*);
- static void cbGroupID(LLUUID group_id, void* userdata);
+ void onClickGroup();
+ void cbGroupID(LLUUID group_id);
static void onClickDeedToGroup(void*);
static void onCommitPerm(LLUICtrl *ctrl, void *data, U8 field, U32 perm);
@@ -101,10 +99,6 @@ protected:
protected:
LLNameBox* mLabelGroupName; // group name
- //LLTextBox* mBuyerLabel;
- //LLCheckBoxCtrl* mCheckBuyerModify;
- //LLCheckBoxCtrl* mCheckBuyerCopy;
-
LLUUID mCreatorID;
LLUUID mOwnerID;
LLUUID mLastOwnerID;
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 43ecd273c2..905c42861a 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -39,6 +39,7 @@
#include "llpanelpick.h"
#include "lldir.h"
+#include "llfloaterreg.h"
#include "llparcel.h"
#include "message.h"
@@ -47,7 +48,7 @@
#include "llcheckboxctrl.h"
#include "llviewercontrol.h"
#include "lllineeditor.h"
-#include "lltabcontainervertical.h"
+#include "lltabcontainer.h"
#include "lltextbox.h"
#include "llviewertexteditor.h"
#include "lltexturectrl.h"
@@ -63,9 +64,8 @@
//static
std::list<LLPanelPick*> LLPanelPick::sAllPanels;
-LLPanelPick::LLPanelPick(BOOL top_pick)
-: LLPanel(std::string("Top Picks Panel")),
- mTopPick(top_pick),
+LLPanelPick::LLPanelPick()
+: LLPanel(),
mPickID(),
mCreatorID(),
mParcelID(),
@@ -87,14 +87,8 @@ LLPanelPick::LLPanelPick(BOOL top_pick)
sAllPanels.push_back(this);
std::string pick_def_file;
- if (top_pick)
- {
- LLUICtrlFactory::getInstance()->buildPanel(this, "panel_top_pick.xml");
- }
- else
- {
- LLUICtrlFactory::getInstance()->buildPanel(this, "panel_avatar_pick.xml");
- }
+ LLUICtrlFactory::getInstance()->buildPanel(this, "panel_avatar_pick.xml");
+
}
@@ -123,45 +117,37 @@ void LLPanelPick::reset()
BOOL LLPanelPick::postBuild()
{
mSnapshotCtrl = getChild<LLTextureCtrl>("snapshot_ctrl");
- mSnapshotCtrl->setCommitCallback(onCommitAny);
- mSnapshotCtrl->setCallbackUserData(this);
+ mSnapshotCtrl->setCommitCallback(onCommitAny, this);
mNameEditor = getChild<LLLineEditor>("given_name_editor");
mNameEditor->setCommitOnFocusLost(TRUE);
- mNameEditor->setCommitCallback(onCommitAny);
- mNameEditor->setCallbackUserData(this);
+ mNameEditor->setCommitCallback(onCommitAny, this);
mDescEditor = getChild<LLTextEditor>("desc_editor");
mDescEditor->setCommitOnFocusLost(TRUE);
- mDescEditor->setCommitCallback(onCommitAny);
- mDescEditor->setCallbackUserData(this);
+ mDescEditor->setCommitCallback(onCommitAny, this);
mDescEditor->setTabsToNextField(TRUE);
mLocationEditor = getChild<LLLineEditor>("location_editor");
mSetBtn = getChild<LLButton>( "set_location_btn");
- mSetBtn->setClickedCallback(onClickSet);
- mSetBtn->setCallbackUserData(this);
+ mSetBtn->setClickedCallback(onClickSet, this);
mTeleportBtn = getChild<LLButton>( "pick_teleport_btn");
- mTeleportBtn->setClickedCallback(onClickTeleport);
- mTeleportBtn->setCallbackUserData(this);
+ mTeleportBtn->setClickedCallback(onClickTeleport, this);
mMapBtn = getChild<LLButton>( "pick_map_btn");
- mMapBtn->setClickedCallback(onClickMap);
- mMapBtn->setCallbackUserData(this);
+ mMapBtn->setClickedCallback(onClickMap, this);
mSortOrderText = getChild<LLTextBox>("sort_order_text");
mSortOrderEditor = getChild<LLLineEditor>("sort_order_editor");
mSortOrderEditor->setPrevalidate(LLLineEditor::prevalidateInt);
mSortOrderEditor->setCommitOnFocusLost(TRUE);
- mSortOrderEditor->setCommitCallback(onCommitAny);
- mSortOrderEditor->setCallbackUserData(this);
+ mSortOrderEditor->setCommitCallback(onCommitAny, this);
mEnabledCheck = getChild<LLCheckBoxCtrl>( "enabled_check");
- mEnabledCheck->setCommitCallback(onCommitAny);
- mEnabledCheck->setCallbackUserData(this);
+ mEnabledCheck->setCommitCallback(onCommitAny, this);
return TRUE;
}
@@ -243,7 +229,7 @@ void LLPanelPick::sendPickInfoUpdate()
msg->nextBlock("Data");
msg->addUUID("PickID", mPickID);
msg->addUUID("CreatorID", mCreatorID);
- msg->addBOOL("TopPick", mTopPick);
+ msg->addBOOL("TopPick", FALSE); //legacy var need to be deleted -angela
// fills in on simulator if null
msg->addUUID("ParcelID", mParcelID);
msg->addString("Name", mNameEditor->getText());
@@ -253,14 +239,8 @@ void LLPanelPick::sendPickInfoUpdate()
// Only top picks have a sort order
S32 sort_order;
- if (mTopPick)
- {
- sort_order = atoi(mSortOrderEditor->getText().c_str());
- }
- else
- {
- sort_order = 0;
- }
+ sort_order = 0;
+
msg->addS32("SortOrder", sort_order);
msg->addBOOL("Enabled", mEnabledCheck->get());
gAgent.sendReliableMessage();
@@ -287,6 +267,7 @@ void LLPanelPick::processPickInfoReply(LLMessageSystem *msg, void **)
LLUUID creator_id;
msg->getUUID("Data", "CreatorID", creator_id);
+ // ** top_pick should be deleted, not being used anymore - angela
BOOL top_pick;
msg->getBOOL("Data", "TopPick", top_pick);
@@ -382,44 +363,26 @@ void LLPanelPick::refresh()
}
// Check for god mode
- BOOL godlike = gAgent.isGodlike();
+ //BOOL godlike = gAgent.isGodlike();
BOOL is_self = (gAgent.getID() == mCreatorID);
- // Set button visibility/enablement appropriately
- if (mTopPick)
- {
- mSnapshotCtrl->setEnabled(godlike);
- mNameEditor->setEnabled(godlike);
- mDescEditor->setEnabled(godlike);
+ // Set button visibility/enablement appropriately
- mSortOrderText->setVisible(godlike);
+ mSnapshotCtrl->setEnabled(is_self);
+ mNameEditor->setEnabled(is_self);
+ mDescEditor->setEnabled(is_self);
- mSortOrderEditor->setVisible(godlike);
- mSortOrderEditor->setEnabled(godlike);
+ mSortOrderText->setVisible(FALSE);
- mEnabledCheck->setVisible(godlike);
- mEnabledCheck->setEnabled(godlike);
+ mSortOrderEditor->setVisible(FALSE);
+ mSortOrderEditor->setEnabled(FALSE);
- mSetBtn->setVisible(godlike);
- mSetBtn->setEnabled(godlike);
- }
- else
- {
- mSnapshotCtrl->setEnabled(is_self);
- mNameEditor->setEnabled(is_self);
- mDescEditor->setEnabled(is_self);
+ mEnabledCheck->setVisible(FALSE);
+ mEnabledCheck->setEnabled(FALSE);
- mSortOrderText->setVisible(FALSE);
+ mSetBtn->setVisible(is_self);
+ mSetBtn->setEnabled(is_self);
- mSortOrderEditor->setVisible(FALSE);
- mSortOrderEditor->setEnabled(FALSE);
-
- mEnabledCheck->setVisible(FALSE);
- mEnabledCheck->setEnabled(FALSE);
-
- mSetBtn->setVisible(is_self);
- mSetBtn->setEnabled(is_self);
- }
}
@@ -431,7 +394,7 @@ void LLPanelPick::onClickTeleport(void* data)
if (!self->mPosGlobal.isExactlyZero())
{
gAgent.teleportViaLocation(self->mPosGlobal);
- gFloaterWorldMap->trackLocation(self->mPosGlobal);
+ LLFloaterWorldMap::getInstance()->trackLocation(self->mPosGlobal);
}
}
@@ -440,8 +403,8 @@ void LLPanelPick::onClickTeleport(void* data)
void LLPanelPick::onClickMap(void* data)
{
LLPanelPick* self = (LLPanelPick*)data;
- gFloaterWorldMap->trackLocation(self->mPosGlobal);
- LLFloaterWorldMap::show(NULL, TRUE);
+ LLFloaterWorldMap::getInstance()->trackLocation(self->mPosGlobal);
+ LLFloaterReg::showInstance("world_map", "center");
}
// static
diff --git a/indra/newview/llpanelpick.h b/indra/newview/llpanelpick.h
index 450fa78801..641e1bdf64 100644
--- a/indra/newview/llpanelpick.h
+++ b/indra/newview/llpanelpick.h
@@ -54,7 +54,7 @@ class LLMessageSystem;
class LLPanelPick : public LLPanel
{
public:
- LLPanelPick(BOOL top_pick);
+ LLPanelPick();
/*virtual*/ ~LLPanelPick();
void reset();
@@ -95,7 +95,6 @@ protected:
static void onCommitAny(LLUICtrl* ctrl, void* data);
protected:
- BOOL mTopPick;
LLUUID mPickID;
LLUUID mCreatorID;
LLUUID mParcelID;
diff --git a/indra/newview/llpanelplace.cpp b/indra/newview/llpanelplace.cpp
index 815152c69f..227faaa584 100644
--- a/indra/newview/llpanelplace.cpp
+++ b/indra/newview/llpanelplace.cpp
@@ -41,6 +41,7 @@
#include "llsecondlifeurls.h"
#include "llremoteparcelrequest.h"
#include "llfloater.h"
+#include "llfloaterreg.h"
#include "llagent.h"
#include "llviewerwindow.h"
@@ -51,6 +52,7 @@
#include "lltextbox.h"
#include "llviewertexteditor.h"
#include "lltexturectrl.h"
+#include "lltrans.h"
#include "llworldmap.h"
#include "llviewerregion.h"
#include "lluictrlfactory.h"
@@ -62,7 +64,7 @@
std::list<LLPanelPlace*> LLPanelPlace::sAllPanels;
LLPanelPlace::LLPanelPlace()
-: LLPanel(std::string("Places Panel")),
+: LLPanel(),
mParcelID(),
mRequestedID(),
mRegionID(),
@@ -102,20 +104,16 @@ BOOL LLPanelPlace::postBuild()
mLocationDisplay = getChild<LLTextBox>("location_editor");
mTeleportBtn = getChild<LLButton>( "teleport_btn");
- mTeleportBtn->setClickedCallback(onClickTeleport);
- mTeleportBtn->setCallbackUserData(this);
+ mTeleportBtn->setClickedCallback(onClickTeleport, this);
mMapBtn = getChild<LLButton>( "map_btn");
- mMapBtn->setClickedCallback(onClickMap);
- mMapBtn->setCallbackUserData(this);
+ mMapBtn->setClickedCallback(onClickMap, this);
//mLandmarkBtn = getChild<LLButton>( "landmark_btn");
- //mLandmarkBtn->setClickedCallback(onClickLandmark);
- //mLandmarkBtn->setCallbackUserData(this);
+ //mLandmarkBtn->setClickedCallback(onClickLandmark, this);
mAuctionBtn = getChild<LLButton>( "auction_btn");
- mAuctionBtn->setClickedCallback(onClickAuction);
- mAuctionBtn->setCallbackUserData(this);
+ mAuctionBtn->setClickedCallback(onClickAuction, this);
// Default to no auction button. We'll show it if we get an auction id
mAuctionBtn->setVisible(FALSE);
@@ -128,8 +126,11 @@ BOOL LLPanelPlace::postBuild()
void LLPanelPlace::displayItemInfo(const LLInventoryItem* pItem)
{
- mNameEditor->setText(pItem->getName());
- mDescEditor->setText(pItem->getDescription());
+ if (pItem)
+ {
+ mNameEditor->setText(pItem->getName());
+ mDescEditor->setText(pItem->getDescription());
+ }
}
// Use this for search directory clicks, because we are totally
@@ -410,20 +411,20 @@ void LLPanelPlace::onClickTeleport(void* data)
LLFloater* parent_floaterp = dynamic_cast<LLFloater*>(parent_viewp);
if (parent_floaterp)
{
- parent_floaterp->close();
+ parent_floaterp->closeFloater();
}
// LLFloater* parent_floaterp = (LLFloater*)self->getParent();
parent_viewp->setVisible(false);
if(self->mLandmarkAssetID.notNull())
{
gAgent.teleportViaLandmark(self->mLandmarkAssetID);
- gFloaterWorldMap->trackLandmark(self->mLandmarkAssetID);
+ LLFloaterWorldMap::getInstance()->trackLandmark(self->mLandmarkAssetID);
}
else if (!self->mPosGlobal.isExactlyZero())
{
gAgent.teleportViaLocation(self->mPosGlobal);
- gFloaterWorldMap->trackLocation(self->mPosGlobal);
+ LLFloaterWorldMap::getInstance()->trackLocation(self->mPosGlobal);
}
}
@@ -433,8 +434,8 @@ void LLPanelPlace::onClickMap(void* data)
LLPanelPlace* self = (LLPanelPlace*)data;
if (!self->mPosGlobal.isExactlyZero())
{
- gFloaterWorldMap->trackLocation(self->mPosGlobal);
- LLFloaterWorldMap::show(NULL, TRUE);
+ LLFloaterWorldMap::getInstance()->trackLocation(self->mPosGlobal);
+ LLFloaterReg::showInstance("world_map", "center");
}
}
@@ -453,12 +454,12 @@ void LLPanelPlace::onClickLandmark(void* data)
void LLPanelPlace::onClickAuction(void* data)
{
LLPanelPlace* self = (LLPanelPlace*)data;
- LLSD payload;
- payload["auction_id"] = self->mAuctionID;
+ LLSD args;
+ args["AUCTION_ID"] = self->mAuctionID;
- LLNotifications::instance().add("GoToAuctionPage", LLSD(), payload, callbackAuctionWebPage);
+ LLNotifications::instance().add("GoToAuctionPage", args);
}
-
+/*
// static
bool LLPanelPlace::callbackAuctionWebPage(const LLSD& notification, const LLSD& response)
{
@@ -466,7 +467,7 @@ bool LLPanelPlace::callbackAuctionWebPage(const LLSD& notification, const LLSD&
if (0 == option)
{
std::string url;
- url = AUCTION_URL + llformat("%010d", response["auction_id"].asInteger());
+ url = LLNotifications::instance().getGlobalString("AUCTION_URL") + llformat("%010d", response["auction_id"].asInteger());
llinfos << "Loading auction page " << url << llendl;
@@ -474,3 +475,5 @@ bool LLPanelPlace::callbackAuctionWebPage(const LLSD& notification, const LLSD&
}
return false;
}
+*/
+
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 6d014a23de..1e44a294b0 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -107,8 +107,8 @@ BOOL LLPanelVolume::postBuild()
childSetCommitCallback("Light Checkbox Ctrl",onCommitIsLight,this);
LLColorSwatchCtrl* LightColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
if(LightColorSwatch){
- LightColorSwatch->setOnCancelCallback(onLightCancelColor);
- LightColorSwatch->setOnSelectCallback(onLightSelectColor);
+ LightColorSwatch->setOnCancelCallback(boost::bind(&LLPanelVolume::onLightCancelColor, this, _2));
+ LightColorSwatch->setOnSelectCallback(boost::bind(&LLPanelVolume::onLightSelectColor, this, _2));
childSetCommitCallback("colorswatch",onCommitLight,this);
}
childSetCommitCallback("Light Intensity",onCommitLight,this);
@@ -125,8 +125,8 @@ BOOL LLPanelVolume::postBuild()
return TRUE;
}
-LLPanelVolume::LLPanelVolume(const std::string& name)
- : LLPanel(name)
+LLPanelVolume::LLPanelVolume()
+ : LLPanel()
{
setMouseOpaque(FALSE);
@@ -317,7 +317,7 @@ void LLPanelVolume::getState( )
}
// static
-BOOL LLPanelVolume::precommitValidate( LLUICtrl* ctrl, void* userdata )
+bool LLPanelVolume::precommitValidate( const LLSD& data )
{
// TODO: Richard will fill this in later.
return TRUE; // FALSE means that validation failed and new value should not be commited.
@@ -427,21 +427,19 @@ void LLPanelVolume::sendIsFlexible()
llinfos << "update flexible sent" << llendl;
}
-void LLPanelVolume::onLightCancelColor(LLUICtrl* ctrl, void* userdata)
+void LLPanelVolume::onLightCancelColor(const LLSD& data)
{
- LLPanelVolume* self = (LLPanelVolume*) userdata;
- LLColorSwatchCtrl* LightColorSwatch = self->getChild<LLColorSwatchCtrl>("colorswatch");
+ LLColorSwatchCtrl* LightColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
if(LightColorSwatch)
{
- LightColorSwatch->setColor(self->mLightSavedColor);
+ LightColorSwatch->setColor(mLightSavedColor);
}
- onLightSelectColor(NULL, userdata);
+ onLightSelectColor(data);
}
-void LLPanelVolume::onLightSelectColor(LLUICtrl* ctrl, void* userdata)
+void LLPanelVolume::onLightSelectColor(const LLSD& data)
{
- LLPanelVolume* self = (LLPanelVolume*) userdata;
- LLViewerObject* objectp = self->mObject;
+ LLViewerObject* objectp = mObject;
if (!objectp || (objectp->getPCode() != LL_PCODE_VOLUME))
{
return;
@@ -449,13 +447,13 @@ void LLPanelVolume::onLightSelectColor(LLUICtrl* ctrl, void* userdata)
LLVOVolume *volobjp = (LLVOVolume *)objectp;
- LLColorSwatchCtrl* LightColorSwatch = self->getChild<LLColorSwatchCtrl>("colorswatch");
+ LLColorSwatchCtrl* LightColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
if(LightColorSwatch)
{
LLColor4 clr = LightColorSwatch->get();
LLColor3 clr3( clr );
volobjp->setLightColor(clr3);
- self->mLightSavedColor = clr;
+ mLightSavedColor = clr;
}
}
diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h
index 841880b147..f285141bbe 100644
--- a/indra/newview/llpanelvolume.h
+++ b/indra/newview/llpanelvolume.h
@@ -35,7 +35,7 @@
#include "v3math.h"
#include "llpanel.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llvolume.h"
class LLSpinCtrl;
@@ -51,7 +51,7 @@ class LLColorSwatchCtrl;
class LLPanelVolume : public LLPanel
{
public:
- LLPanelVolume(const std::string& name);
+ LLPanelVolume();
virtual ~LLPanelVolume();
virtual void draw();
@@ -64,15 +64,15 @@ public:
void sendIsLight();
void sendIsFlexible();
- static BOOL precommitValidate(LLUICtrl* ctrl,void* userdata);
+ static bool precommitValidate(const LLSD& data);
static void onCommitIsLight( LLUICtrl* ctrl, void* userdata);
static void onCommitLight( LLUICtrl* ctrl, void* userdata);
static void onCommitIsFlexible( LLUICtrl* ctrl, void* userdata);
static void onCommitFlexible( LLUICtrl* ctrl, void* userdata);
- static void onLightCancelColor(LLUICtrl* ctrl, void* userdata);
- static void onLightSelectColor(LLUICtrl* ctrl, void* userdata);
+ void onLightCancelColor(const LLSD& data);
+ void onLightSelectColor(const LLSD& data);
protected:
void getState();
diff --git a/indra/newview/llparcelselection.h b/indra/newview/llparcelselection.h
index 5f26fafc33..0481bea6f7 100644
--- a/indra/newview/llparcelselection.h
+++ b/indra/newview/llparcelselection.h
@@ -33,7 +33,8 @@
#ifndef LLPARCELSELECTION_H
#define LLPARCELSELECTION_H
-#include "llmemory.h"
+#include "llrefcount.h"
+#include "llsafehandle.h"
class LLParcel;
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp
index 6d7082bf9a..dfc8b783d5 100644
--- a/indra/newview/llpreview.cpp
+++ b/indra/newview/llpreview.cpp
@@ -34,11 +34,13 @@
#include "stdenums.h"
#include "llpreview.h"
+
#include "lllineeditor.h"
#include "llinventory.h"
#include "llinventorymodel.h"
#include "llresmgr.h"
#include "lltextbox.h"
+#include "llfloaterreg.h"
#include "llfocusmgr.h"
#include "lltooldraganddrop.h"
#include "llradiogroup.h"
@@ -51,125 +53,68 @@
#include "llselectmgr.h"
#include "llinventoryview.h"
#include "llviewerinventory.h"
+#include "llviewerwindow.h"
+#include "lltrans.h"
// Constants
-// Globals and statics
-LLPreview::preview_multimap_t LLPreview::sPreviewsBySource;
-LLPreview::preview_map_t LLPreview::sInstances;
-std::map<LLUUID, LLHandle<LLFloater> > LLMultiPreview::sAutoOpenPreviewHandles;
-
-// Functions
-LLPreview::LLPreview(const std::string& name) :
- LLFloater(name),
- mCopyToInvBtn(NULL),
+LLPreview::LLPreview(const LLSD& key)
+: LLFloater(key),
+ mItemUUID(key.asUUID()),
+ mCopyToInvBtn( NULL ),
mForceClose(FALSE),
mUserResized(FALSE),
mCloseAfterSave(FALSE),
mAssetStatus(PREVIEW_ASSET_UNLOADED),
- mItem(NULL),
mDirty(TRUE)
{
- // don't add to instance list, since ItemID is null
- mAuxItem = new LLInventoryItem; // (LLPointer is auto-deleted)
+ mAuxItem = new LLInventoryItem;
// don't necessarily steal focus on creation -- sometimes these guys pop up without user action
setAutoFocus(FALSE);
+
gInventory.addObserver(this);
+
+ refreshFromItem();
}
-LLPreview::LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize, S32 min_width, S32 min_height, LLPointer<LLViewerInventoryItem> inv_item )
-: LLFloater(name, rect, title, allow_resize, min_width, min_height ),
- mItemUUID(item_uuid),
- mSourceID(LLUUID::null),
- mObjectUUID(object_uuid),
- mCopyToInvBtn( NULL ),
- mForceClose( FALSE ),
- mUserResized(FALSE),
- mCloseAfterSave(FALSE),
- mAssetStatus(PREVIEW_ASSET_UNLOADED),
- mItem(inv_item),
- mDirty(TRUE)
+BOOL LLPreview::postBuild()
{
- mAuxItem = new LLInventoryItem;
- // don't necessarily steal focus on creation -- sometimes these guys pop up without user action
- setAutoFocus(FALSE);
-
- if (mItemUUID.notNull())
- {
- sInstances[mItemUUID] = this;
- }
- gInventory.addObserver(this);
+ refreshFromItem();
+ return TRUE;
}
LLPreview::~LLPreview()
{
gFocusMgr.releaseFocusIfNeeded( this ); // calls onCommit()
-
- if (mItemUUID.notNull())
- {
- sInstances.erase( mItemUUID );
- }
-
- if (mSourceID.notNull())
- {
- preview_multimap_t::iterator found_it = sPreviewsBySource.find(mSourceID);
- for (; found_it != sPreviewsBySource.end(); ++found_it)
- {
- if (found_it->second == getHandle())
- {
- sPreviewsBySource.erase(found_it);
- break;
- }
- }
- }
gInventory.removeObserver(this);
}
-void LLPreview::setItemID(const LLUUID& item_id)
-{
- if (mItemUUID.notNull())
- {
- sInstances.erase(mItemUUID);
- }
-
- mItemUUID = item_id;
-
- if (mItemUUID.notNull())
- {
- sInstances[mItemUUID] = this;
- }
-}
-
void LLPreview::setObjectID(const LLUUID& object_id)
{
mObjectUUID = object_id;
+ if (getAssetStatus() == PREVIEW_ASSET_UNLOADED)
+ {
+ loadAsset();
+ }
}
-void LLPreview::setSourceID(const LLUUID& source_id)
+void LLPreview::setItem( LLInventoryItem* item )
{
- if (mSourceID.notNull())
+ mItem = item;
+ if (mItem && getAssetStatus() == PREVIEW_ASSET_UNLOADED)
{
- // erase old one
- preview_multimap_t::iterator found_it = sPreviewsBySource.find(mSourceID);
- for (; found_it != sPreviewsBySource.end(); ++found_it)
- {
- if (found_it->second == getHandle())
- {
- sPreviewsBySource.erase(found_it);
- break;
- }
- }
+ loadAsset();
}
- mSourceID = source_id;
- sPreviewsBySource.insert(preview_multimap_t::value_type(mSourceID, getHandle()));
}
-const LLViewerInventoryItem *LLPreview::getItem() const
+const LLInventoryItem *LLPreview::getItem() const
{
- if(mItem)
- return mItem;
- const LLViewerInventoryItem *item = NULL;
- if(mObjectUUID.isNull())
+ const LLInventoryItem *item = NULL;
+ if (mItem.notNull())
+ {
+ item = mItem;
+ }
+ else if (mObjectUUID.isNull())
{
// it's an inventory item, so get the item.
item = gInventory.getItem(mItemUUID);
@@ -180,7 +125,7 @@ const LLViewerInventoryItem *LLPreview::getItem() const
LLViewerObject* object = gObjectList.findObject(mObjectUUID);
if(object)
{
- item = (LLViewerInventoryItem*)object->getInventoryObject(mItemUUID);
+ item = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mItemUUID));
}
}
return item;
@@ -189,7 +134,7 @@ const LLViewerInventoryItem *LLPreview::getItem() const
// Sub-classes should override this function if they allow editing
void LLPreview::onCommit()
{
- const LLViewerInventoryItem *item = getItem();
+ const LLViewerInventoryItem *item = dynamic_cast<const LLViewerInventoryItem*>(getItem());
if(item)
{
if (!item->isComplete())
@@ -255,17 +200,24 @@ void LLPreview::draw()
if (mDirty)
{
mDirty = FALSE;
- const LLViewerInventoryItem *item = getItem();
- if (item)
- {
- refreshFromItem(item);
- }
+ refreshFromItem();
}
}
-void LLPreview::refreshFromItem(const LLInventoryItem* item)
+void LLPreview::refreshFromItem()
{
- setTitle(llformat("%s: %s",getTitleName(),item->getName().c_str()));
+ const LLInventoryItem* item = getItem();
+ if (!item)
+ {
+ return;
+ }
+ if (hasString("Title"))
+ {
+ LLStringUtil::format_map_t args;
+ args["[NAME]"] = item->getName();
+ LLUIString title = getString("Title", args);
+ setTitle(title.getString());
+ }
childSetText("desc",item->getDescription());
BOOL can_agent_manipulate = item->getPermissions().allowModifyBy(gAgent.getID());
@@ -286,81 +238,33 @@ void LLPreview::onRadio(LLUICtrl*, void* userdata)
self->onCommit();
}
-// static
-LLPreview* LLPreview::find(const LLUUID& item_uuid)
-{
- LLPreview* instance = NULL;
- preview_map_t::iterator found_it = LLPreview::sInstances.find(item_uuid);
- if(found_it != LLPreview::sInstances.end())
- {
- instance = found_it->second;
- }
- return instance;
-}
-
-// static
-LLPreview* LLPreview::show( const LLUUID& item_uuid, BOOL take_focus )
-{
- LLPreview* instance = LLPreview::find(item_uuid);
- if(instance)
- {
- if (LLFloater::getFloaterHost() && LLFloater::getFloaterHost() != instance->getHost())
- {
- // this preview window is being opened in a new context
- // needs to be rehosted
- LLFloater::getFloaterHost()->addFloater(instance, TRUE);
- }
- instance->open(); /*Flawfinder: ignore*/
- if (take_focus)
- {
- instance->setFocus(TRUE);
- }
- }
-
- return instance;
-}
-
-// static
-bool LLPreview::save( const LLUUID& item_uuid, LLPointer<LLInventoryItem>* itemptr )
-{
- bool res = false;
- LLPreview* instance = LLPreview::find(item_uuid);
- if(instance)
- {
- res = instance->saveItem(itemptr);
- }
- if (!res)
- {
- delete itemptr;
- }
- return res;
-}
-
// static
void LLPreview::hide(const LLUUID& item_uuid, BOOL no_saving /* = FALSE */ )
{
- preview_map_t::iterator found_it = LLPreview::sInstances.find(item_uuid);
- if(found_it != LLPreview::sInstances.end())
+ LLFloater* floater = LLFloaterReg::findInstance("preview", LLSD(item_uuid));
+ if (!floater) floater = LLFloaterReg::findInstance("preview_avatar", LLSD(item_uuid));
+
+ LLPreview* preview = dynamic_cast<LLPreview*>(floater);
+ if (preview)
{
- LLPreview* instance = found_it->second;
-
if ( no_saving )
{
- instance->mForceClose = TRUE;
+ preview->mForceClose = TRUE;
}
-
- instance->close();
+ preview->closeFloater();
}
}
// static
-void LLPreview::rename(const LLUUID& item_uuid, const std::string& new_name)
+void LLPreview::dirty(const LLUUID& item_uuid)
{
- preview_map_t::iterator found_it = LLPreview::sInstances.find(item_uuid);
- if(found_it != LLPreview::sInstances.end())
+ LLFloater* floater = LLFloaterReg::findInstance("preview", LLSD(item_uuid));
+ if (!floater) floater = LLFloaterReg::findInstance("preview_avatar", LLSD(item_uuid));
+
+ LLPreview* preview = dynamic_cast<LLPreview*>(floater);
+ if(preview)
{
- LLPreview* instance = found_it->second;
- instance->setTitle( new_name );
+ preview->mDirty = TRUE;
}
}
@@ -397,7 +301,7 @@ BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask)
{
S32 screen_x;
S32 screen_y;
- const LLViewerInventoryItem *item = getItem();
+ const LLInventoryItem *item = getItem();
localPointToScreen(x, y, &screen_x, &screen_y );
if(item
@@ -426,22 +330,14 @@ BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask)
return LLFloater::handleHover(x,y,mask);
}
-void LLPreview::open() /*Flawfinder: ignore*/
+void LLPreview::onOpen(const LLSD& key)
{
if (!getFloaterHost() && !getHost() && getAssetStatus() == PREVIEW_ASSET_UNLOADED)
{
loadAsset();
}
- LLFloater::open(); /*Flawfinder: ignore*/
-}
-
-// virtual
-bool LLPreview::saveItem(LLPointer<LLInventoryItem>* itemptr)
-{
- return false;
}
-
// static
void LLPreview::onBtnCopyToInv(void* userdata)
{
@@ -468,14 +364,14 @@ void LLPreview::onBtnCopyToInv(void* userdata)
cb);
}
}
- self->close();
+ self->closeFloater();
}
// static
void LLPreview::onKeepBtn(void* data)
{
LLPreview* self = (LLPreview*)data;
- self->close();
+ self->closeFloater();
}
// static
@@ -483,11 +379,11 @@ void LLPreview::onDiscardBtn(void* data)
{
LLPreview* self = (LLPreview*)data;
- const LLViewerInventoryItem* item = self->getItem();
+ const LLInventoryItem* item = self->getItem();
if (!item) return;
self->mForceClose = TRUE;
- self->close();
+ self->closeFloater();
// Delete the item entirely
/*
@@ -517,55 +413,60 @@ void LLPreview::onDiscardBtn(void* data)
}
}
-//static
-LLPreview* LLPreview::getFirstPreviewForSource(const LLUUID& source_id)
+void LLPreview::handleReshape(const LLRect& new_rect, bool by_user)
{
- preview_multimap_t::iterator found_it = sPreviewsBySource.find(source_id);
- if (found_it != sPreviewsBySource.end())
- {
- // just return first one
- return (LLPreview*)found_it->second.get();
- }
- return NULL;
-}
-
-void LLPreview::userSetShape(const LLRect& new_rect)
-{
- if(new_rect.getWidth() != getRect().getWidth() || new_rect.getHeight() != getRect().getHeight())
+ if(by_user
+ && (new_rect.getWidth() != getRect().getWidth() || new_rect.getHeight() != getRect().getHeight()))
{
userResized();
}
- LLFloater::userSetShape(new_rect);
+ LLFloater::handleReshape(new_rect, by_user);
}
//
// LLMultiPreview
//
-LLMultiPreview::LLMultiPreview(const LLRect& rect) : LLMultiFloater(std::string("Preview"), rect)
+LLMultiPreview::LLMultiPreview()
+ : LLMultiFloater()
{
+ // *TODO: There should be a .xml file for this
+ const LLRect& nextrect = LLFloaterReg::getFloaterRect("preview"); // place where the next preview should show up
+ if (nextrect.getWidth() > 0)
+ {
+ setRect(nextrect);
+ }
+ else
+ {
+ // start with a rect in the top-left corner ; will get resized
+ LLRect rect;
+ rect.setLeftTopAndSize(0, gViewerWindow->getWindowHeight(), 200, 200);
+ setRect(rect);
+ }
+ setTitle(LLTrans::getString("MultiPreviewTitle"));
+ buildTabContainer();
setCanResize(TRUE);
}
-void LLMultiPreview::open() /*Flawfinder: ignore*/
+void LLMultiPreview::onOpen(const LLSD& key)
{
- LLMultiFloater::open(); /*Flawfinder: ignore*/
LLPreview* frontmost_preview = (LLPreview*)mTabContainer->getCurrentPanel();
if (frontmost_preview && frontmost_preview->getAssetStatus() == LLPreview::PREVIEW_ASSET_UNLOADED)
{
frontmost_preview->loadAsset();
}
+ LLMultiFloater::onOpen(key);
}
-void LLMultiPreview::userSetShape(const LLRect& new_rect)
+void LLMultiPreview::handleReshape(const LLRect& new_rect, bool by_user)
{
if(new_rect.getWidth() != getRect().getWidth() || new_rect.getHeight() != getRect().getHeight())
{
LLPreview* frontmost_preview = (LLPreview*)mTabContainer->getCurrentPanel();
if (frontmost_preview) frontmost_preview->userResized();
}
- LLFloater::userSetShape(new_rect);
+ LLFloater::handleReshape(new_rect, by_user);
}
@@ -578,22 +479,3 @@ void LLMultiPreview::tabOpen(LLFloater* opened_floater, bool from_click)
}
}
-//static
-LLMultiPreview* LLMultiPreview::getAutoOpenInstance(const LLUUID& id)
-{
- handle_map_t::iterator found_it = sAutoOpenPreviewHandles.find(id);
- if (found_it != sAutoOpenPreviewHandles.end())
- {
- return (LLMultiPreview*)found_it->second.get();
- }
- return NULL;
-}
-
-//static
-void LLMultiPreview::setAutoOpenInstance(LLMultiPreview* previewp, const LLUUID& id)
-{
- if (previewp)
- {
- sAutoOpenPreviewHandles[id] = previewp->getHandle();
- }
-}
diff --git a/indra/newview/llpreview.h b/indra/newview/llpreview.h
index ff084bea27..f6042f065b 100644
--- a/indra/newview/llpreview.h
+++ b/indra/newview/llpreview.h
@@ -33,7 +33,7 @@
#ifndef LL_LLPREVIEW_H
#define LL_LLPREVIEW_H
-#include "llfloater.h"
+#include "llmultifloater.h"
#include "llresizehandle.h"
#include "llmap.h"
#include "lluuid.h"
@@ -49,18 +49,12 @@ class LLPreview;
class LLMultiPreview : public LLMultiFloater
{
public:
- LLMultiPreview(const LLRect& rect);
+ LLMultiPreview();
- /*virtual*/void open(); /*Flawfinder: ignore*/
+ /*virtual*/void onOpen(const LLSD& key);
/*virtual*/void tabOpen(LLFloater* opened_floater, bool from_click);
- /*virtual*/ void userSetShape(const LLRect& new_rect);
+ /*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false);
- static LLMultiPreview* getAutoOpenInstance(const LLUUID& id);
- static void setAutoOpenInstance(LLMultiPreview* previewp, const LLUUID& id);
-
-protected:
- typedef std::map<LLUUID, LLHandle<LLFloater> > handle_map_t;
- static handle_map_t sAutoOpenPreviewHandles;
};
// https://wiki.lindenlab.com/mediawiki/index.php?title=LLPreview&oldid=81373
@@ -76,28 +70,24 @@ public:
PREVIEW_ASSET_LOADED
} EAssetStatus;
public:
- // Used for XML-based construction.
- LLPreview(const std::string& name);
- LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize = FALSE, S32 min_width = 0, S32 min_height = 0, LLPointer<LLViewerInventoryItem> inv_item = NULL );
+ LLPreview(const LLSD& key );
virtual ~LLPreview();
-
- void setItemID(const LLUUID& item_id);
+
+ /*virtual*/ BOOL postBuild();
+
void setObjectID(const LLUUID& object_id);
- void setSourceID(const LLUUID& source_id);
- const LLViewerInventoryItem *getItem() const; // searches if not constructed with it
-
- static LLPreview* find(const LLUUID& item_uuid);
- static LLPreview* show(const LLUUID& item_uuid, BOOL take_focus = TRUE );
- static void hide(const LLUUID& item_uuid, BOOL no_saving = FALSE );
- static void rename(const LLUUID& item_uuid, const std::string& new_name);
- static bool save(const LLUUID& item_uuid, LLPointer<LLInventoryItem>* itemptr);
+ void setItem( LLInventoryItem* item );
+
+ const LLInventoryItem* getItem() const; // searches if not constructed with it
+ static void hide(const LLUUID& item_uuid, BOOL no_saving = FALSE );
+ static void dirty(const LLUUID& item_uuid);
+
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
virtual BOOL handleHover(S32 x, S32 y, MASK mask);
- virtual void open(); /*Flawfinder: ignore*/
- virtual bool saveItem(LLPointer<LLInventoryItem>* itemptr);
-
+ virtual void onOpen(const LLSD& key);
+
void setAuxItem( const LLInventoryItem* item )
{
if ( mAuxItem )
@@ -109,7 +99,7 @@ public:
void addKeepDiscardButtons();
static void onKeepBtn(void* data);
static void onDiscardBtn(void* data);
- /*virtual*/ void userSetShape(const LLRect& new_rect);
+ /*virtual*/ void handleReshape(const LLRect& new_rect, bool by_user = false);
void userResized() { mUserResized = TRUE; };
@@ -122,7 +112,7 @@ public:
// llview
virtual void draw();
- void refreshFromItem(const LLInventoryItem* item);
+ void refreshFromItem();
protected:
virtual void onCommit();
@@ -135,11 +125,9 @@ protected:
// for LLInventoryObserver
virtual void changed(U32 mask);
BOOL mDirty;
- virtual const char *getTitleName() const { return "Preview"; }
protected:
LLUUID mItemUUID;
- LLUUID mSourceID;
// mObjectID will have a value if it is associated with a task in
// the world, and will be == LLUUID::null if it's in the agent
@@ -149,6 +137,7 @@ protected:
LLRect mClientRect;
LLPointer<LLInventoryItem> mAuxItem; // HACK!
+ LLPointer<LLInventoryItem> mItem; // For embedded items (Landmarks)
LLButton* mCopyToInvBtn;
// Close without saving changes
@@ -162,27 +151,18 @@ protected:
EAssetStatus mAssetStatus;
- typedef std::map<LLUUID, LLPreview*> preview_map_t;
- typedef std::multimap<LLUUID, LLHandle<LLFloater> > preview_multimap_t;
-
- static preview_multimap_t sPreviewsBySource;
- static preview_map_t sInstances;
LLUUID mNotecardInventoryID;
LLUUID mObjectID;
- LLPointer<LLViewerInventoryItem> mItem;
};
const S32 PREVIEW_BORDER = 4;
const S32 PREVIEW_PAD = 5;
-const S32 PREVIEW_BUTTON_WIDTH = 100;
const S32 PREVIEW_LINE_HEIGHT = 19;
-const S32 PREVIEW_CLOSE_BOX_SIZE = 16;
const S32 PREVIEW_BORDER_WIDTH = 2;
const S32 PREVIEW_RESIZE_HANDLE_SIZE = S32(RESIZE_HANDLE_WIDTH * OO_SQRT2) + PREVIEW_BORDER_WIDTH;
const S32 PREVIEW_VPAD = 2;
-const S32 PREVIEW_HPAD = PREVIEW_RESIZE_HANDLE_SIZE;
const S32 PREVIEW_HEADER_SIZE = 2*PREVIEW_LINE_HEIGHT + 2 * PREVIEW_VPAD;
#endif // LL_LLPREVIEW_H
diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp
index 3212de0639..efe0d3b752 100644
--- a/indra/newview/llpreviewanim.cpp
+++ b/indra/newview/llpreviewanim.cpp
@@ -47,42 +47,54 @@
extern LLAgent gAgent;
-LLPreviewAnim::LLPreviewAnim(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const S32& activate, const LLUUID& object_uuid ) :
- LLPreview( name, rect, title, item_uuid, object_uuid)
+LLPreviewAnim::LLPreviewAnim(const LLSD& key)
+ : LLPreview( key )
{
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_animation.xml");
-
- childSetAction("Anim play btn",playAnim,this);
- childSetAction("Anim audition btn",auditionAnim,this);
-
- const LLInventoryItem* item = getItem();
-
- childSetCommitCallback("desc", LLPreview::onText, this);
- childSetText("desc", item->getDescription());
- childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe);
-
- setTitle(title);
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_animation.xml", FALSE);
+}
- if (!getHost())
+// static
+void LLPreviewAnim::endAnimCallback( void *userdata )
+{
+ LLHandle<LLFloater>* handlep = ((LLHandle<LLFloater>*)userdata);
+ LLFloater* self = handlep->get();
+ delete handlep; // done with the handle
+ if (self)
{
- LLRect curRect = getRect();
- translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
+ self->childSetValue("Anim play btn", FALSE);
+ self->childSetValue("Anim audition btn", FALSE);
}
+}
- // preload the animation
+// virtual
+BOOL LLPreviewAnim::postBuild()
+{
+ const LLInventoryItem* item = getItem();
if(item)
{
- gAgent.getAvatarObject()->createMotion(item->getAssetUUID());
+ gAgent.getAvatarObject()->createMotion(item->getAssetUUID()); // preload the animation
+ childSetText("desc", item->getDescription());
}
+
+ childSetAction("Anim play btn",playAnim, this);
+ childSetAction("Anim audition btn",auditionAnim, this);
+
+ childSetCommitCallback("desc", LLPreview::onText, this);
+ childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe);
- switch ( activate )
+ return LLPreview::postBuild();
+}
+
+void LLPreviewAnim::activate(e_activation_type type)
+{
+ switch ( type )
{
- case 1:
+ case PLAY:
{
playAnim( (void *) this );
break;
}
- case 2:
+ case AUDITION:
{
auditionAnim( (void *) this );
break;
@@ -94,19 +106,6 @@ LLPreviewAnim::LLPreviewAnim(const std::string& name, const LLRect& rect, const
}
}
-// static
-void LLPreviewAnim::endAnimCallback( void *userdata )
-{
- LLHandle<LLFloater>* handlep = ((LLHandle<LLFloater>*)userdata);
- LLFloater* self = handlep->get();
- delete handlep; // done with the handle
- if (self)
- {
- self->childSetValue("Anim play btn", FALSE);
- self->childSetValue("Anim audition btn", FALSE);
- }
-}
-
// static
void LLPreviewAnim::playAnim( void *userdata )
{
diff --git a/indra/newview/llpreviewanim.h b/indra/newview/llpreviewanim.h
index fe794d4283..ca42b7e731 100644
--- a/indra/newview/llpreviewanim.h
+++ b/indra/newview/llpreviewanim.h
@@ -39,18 +39,17 @@
class LLPreviewAnim : public LLPreview
{
public:
- LLPreviewAnim(const std::string& name, const LLRect& rect, const std::string& title,
- const LLUUID& item_uuid,
- const S32& activate,
- const LLUUID& object_uuid = LLUUID::null);
+ enum e_activation_type { NONE = 0, PLAY = 1, AUDITION = 2 };
+ LLPreviewAnim(const LLSD& key);
static void playAnim( void* userdata );
static void auditionAnim( void* userdata );
static void endAnimCallback( void *userdata );
-
+ /*virtual*/ BOOL postBuild();
+ void activate(e_activation_type type);
+
protected:
virtual void onClose(bool app_quitting);
- virtual const char *getTitleName() const { return "Animation"; }
LLAnimPauseRequest mPauseRequest;
LLUUID mItemID;
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp
index 76a9b80645..f973667fbd 100644
--- a/indra/newview/llpreviewgesture.cpp
+++ b/indra/newview/llpreviewgesture.cpp
@@ -41,6 +41,7 @@
#include "lldarray.h"
#include "llstring.h"
#include "lldir.h"
+#include "llfloaterreg.h"
#include "llmultigesture.h"
#include "llvfile.h"
@@ -59,6 +60,8 @@
#include "llnotify.h"
#include "llradiogroup.h"
#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
#include "lltextbox.h"
#include "lluictrlfactory.h"
#include "llviewerinventory.h"
@@ -70,12 +73,12 @@
#include "llappviewer.h" // gVFS
#include "llanimstatelabels.h"
#include "llresmgr.h"
+#include "lltrans.h"
-// *TODO: Translate?
-const std::string NONE_LABEL = "---";
-const std::string SHIFT_LABEL = "Shift";
-const std::string CTRL_LABEL = "Ctrl";
+std::string NONE_LABEL;
+std::string SHIFT_LABEL;
+std::string CTRL_LABEL;
void dialog_refresh_all();
@@ -92,12 +95,9 @@ protected:
void LLInventoryGestureAvailable::done()
{
- LLPreview* preview = NULL;
- item_ref_t::iterator it = mComplete.begin();
- item_ref_t::iterator end = mComplete.end();
- for(; it < end; ++it)
+ for(item_ref_t::iterator it = mComplete.begin(); it != mComplete.end(); ++it)
{
- preview = LLPreview::find((*it));
+ LLPreviewGesture* preview = LLFloaterReg::findTypedInstance<LLPreviewGesture>("preview_gesture", *it);
if(preview)
{
preview->refresh();
@@ -117,43 +117,16 @@ struct SortItemPtrsByName
};
// static
-LLPreviewGesture* LLPreviewGesture::show(const std::string& title, const LLUUID& item_id, const LLUUID& object_id, BOOL take_focus)
+LLPreviewGesture* LLPreviewGesture::show(const LLUUID& item_id, const LLUUID& object_id)
{
- LLPreviewGesture* previewp = (LLPreviewGesture*)LLPreview::find(item_id);
- if (previewp)
+ LLPreviewGesture* preview = LLFloaterReg::showTypedInstance<LLPreviewGesture>("preview_gesture", LLSD(item_id), TAKE_FOCUS_YES);
+ if (!preview)
{
- previewp->open(); /*Flawfinder: ignore*/
- if (take_focus)
- {
- previewp->setFocus(TRUE);
- }
- return previewp;
- }
-
- LLPreviewGesture* self = new LLPreviewGesture();
-
- // Finish internal construction
- self->init(item_id, object_id);
-
- // Builds and adds to gFloaterView
- LLUICtrlFactory::getInstance()->buildFloater(self, "floater_preview_gesture.xml");
- self->setTitle(title);
-
- // Move window to top-left of screen
- LLMultiFloater* hostp = self->getHost();
- if (hostp == NULL)
- {
- LLRect r = self->getRect();
- LLRect screen = gFloaterView->getRect();
- r.setLeftTopAndSize(0, screen.getHeight(), r.getWidth(), r.getHeight());
- self->setRect(r);
- }
- else
- {
- // re-add to host to update title
- hostp->addFloater(self, TRUE);
+ return NULL;
}
-
+
+ preview->setObjectID(object_id);
+
// Start speculative download of sounds and animations
LLUUID animation_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_ANIMATION);
gInventory.startBackgroundFetch(animation_folder_id);
@@ -162,8 +135,8 @@ LLPreviewGesture* LLPreviewGesture::show(const std::string& title, const LLUUID&
gInventory.startBackgroundFetch(sound_folder_id);
// this will call refresh when we have everything.
- LLViewerInventoryItem* item = (LLViewerInventoryItem*)self->getItem();
- if(item && !item->isComplete())
+ LLViewerInventoryItem* item = (LLViewerInventoryItem*)preview->getItem();
+ if (item && !item->isComplete())
{
LLInventoryGestureAvailable* observer;
observer = new LLInventoryGestureAvailable();
@@ -174,18 +147,12 @@ LLPreviewGesture* LLPreviewGesture::show(const std::string& title, const LLUUID&
else
{
// not sure this is necessary.
- self->refresh();
- }
-
- if (take_focus)
- {
- self->setFocus(TRUE);
+ preview->refresh();
}
- return self;
+ return preview;
}
-
// virtual
BOOL LLPreviewGesture::handleKeyHere(KEY key, MASK mask)
{
@@ -334,7 +301,7 @@ bool LLPreviewGesture::handleSaveChangesDialog(const LLSD& notification, const L
case 1: // "No"
gGestureManager.stopGesture(mPreviewGesture);
mDirty = FALSE; // Force the dirty flag because user has clicked NO on confirm save dialog...
- close();
+ closeFloater();
break;
case 2: // "Cancel"
@@ -347,8 +314,8 @@ bool LLPreviewGesture::handleSaveChangesDialog(const LLSD& notification, const L
}
-LLPreviewGesture::LLPreviewGesture()
-: LLPreview("Gesture Preview"),
+LLPreviewGesture::LLPreviewGesture(const LLSD& key)
+: LLPreview(key),
mTriggerEditor(NULL),
mModifierCombo(NULL),
mKeyCombo(NULL),
@@ -368,6 +335,12 @@ LLPreviewGesture::LLPreviewGesture()
mPreviewGesture(NULL),
mDirty(FALSE)
{
+ NONE_LABEL = LLTrans::getString("---");
+ SHIFT_LABEL = LLTrans::getString("KBShift");
+ CTRL_LABEL = LLTrans::getString("KBCtrl");
+
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_gesture.xml", FALSE);
+
}
@@ -396,10 +369,9 @@ BOOL LLPreviewGesture::postBuild()
LLCheckBoxCtrl* check;
edit = getChild<LLLineEditor>("trigger_editor");
- edit->setKeystrokeCallback(onKeystrokeCommit);
- edit->setCommitCallback(onCommitSetDirty);
+ edit->setKeystrokeCallback(onKeystrokeCommit, this);
+ edit->setCommitCallback(onCommitSetDirty, this);
edit->setCommitOnFocusLost(TRUE);
- edit->setCallbackUserData(this);
edit->setIgnoreTab(TRUE);
mTriggerEditor = edit;
@@ -409,56 +381,47 @@ BOOL LLPreviewGesture::postBuild()
edit = getChild<LLLineEditor>("replace_editor");
edit->setEnabled(FALSE);
- edit->setKeystrokeCallback(onKeystrokeCommit);
- edit->setCommitCallback(onCommitSetDirty);
+ edit->setKeystrokeCallback(onKeystrokeCommit, this);
+ edit->setCommitCallback(onCommitSetDirty, this);
edit->setCommitOnFocusLost(TRUE);
- edit->setCallbackUserData(this);
edit->setIgnoreTab(TRUE);
mReplaceEditor = edit;
combo = getChild<LLComboBox>( "modifier_combo");
- combo->setCommitCallback(onCommitSetDirty);
- combo->setCallbackUserData(this);
+ combo->setCommitCallback(onCommitSetDirty, this);
mModifierCombo = combo;
combo = getChild<LLComboBox>( "key_combo");
- combo->setCommitCallback(onCommitSetDirty);
- combo->setCallbackUserData(this);
+ combo->setCommitCallback(onCommitSetDirty, this);
mKeyCombo = combo;
list = getChild<LLScrollListCtrl>("library_list");
- list->setCommitCallback(onCommitLibrary);
- list->setDoubleClickCallback(onClickAdd);
- list->setCallbackUserData(this);
+ list->setCommitCallback(onCommitLibrary, this);
+ list->setDoubleClickCallback(onClickAdd, this);
mLibraryList = list;
btn = getChild<LLButton>( "add_btn");
- btn->setClickedCallback(onClickAdd);
- btn->setCallbackUserData(this);
+ btn->setClickedCallback(onClickAdd, this);
btn->setEnabled(FALSE);
mAddBtn = btn;
btn = getChild<LLButton>( "up_btn");
- btn->setClickedCallback(onClickUp);
- btn->setCallbackUserData(this);
+ btn->setClickedCallback(onClickUp, this);
btn->setEnabled(FALSE);
mUpBtn = btn;
btn = getChild<LLButton>( "down_btn");
- btn->setClickedCallback(onClickDown);
- btn->setCallbackUserData(this);
+ btn->setClickedCallback(onClickDown, this);
btn->setEnabled(FALSE);
mDownBtn = btn;
btn = getChild<LLButton>( "delete_btn");
- btn->setClickedCallback(onClickDelete);
- btn->setCallbackUserData(this);
+ btn->setClickedCallback(onClickDelete, this);
btn->setEnabled(FALSE);
mDeleteBtn = btn;
list = getChild<LLScrollListCtrl>("step_list");
- list->setCommitCallback(onCommitStep);
- list->setCallbackUserData(this);
+ list->setCommitCallback(onCommitStep, this);
mStepList = list;
// Options
@@ -468,69 +431,59 @@ BOOL LLPreviewGesture::postBuild()
combo = getChild<LLComboBox>( "animation_list");
combo->setVisible(FALSE);
- combo->setCommitCallback(onCommitAnimation);
- combo->setCallbackUserData(this);
+ combo->setCommitCallback(onCommitAnimation, this);
mAnimationCombo = combo;
LLRadioGroup* group;
group = getChild<LLRadioGroup>("animation_trigger_type");
group->setVisible(FALSE);
- group->setCommitCallback(onCommitAnimationTrigger);
- group->setCallbackUserData(this);
+ group->setCommitCallback(onCommitAnimationTrigger, this);
mAnimationRadio = group;
combo = getChild<LLComboBox>( "sound_list");
combo->setVisible(FALSE);
- combo->setCommitCallback(onCommitSound);
- combo->setCallbackUserData(this);
+ combo->setCommitCallback(onCommitSound, this);
mSoundCombo = combo;
edit = getChild<LLLineEditor>("chat_editor");
edit->setVisible(FALSE);
- edit->setCommitCallback(onCommitChat);
- //edit->setKeystrokeCallback(onKeystrokeCommit);
+ edit->setCommitCallback(onCommitChat, this);
+ //edit->setKeystrokeCallback(onKeystrokeCommit, this);
edit->setCommitOnFocusLost(TRUE);
- edit->setCallbackUserData(this);
edit->setIgnoreTab(TRUE);
mChatEditor = edit;
check = getChild<LLCheckBoxCtrl>( "wait_anim_check");
check->setVisible(FALSE);
- check->setCommitCallback(onCommitWait);
- check->setCallbackUserData(this);
+ check->setCommitCallback(onCommitWait, this);
mWaitAnimCheck = check;
check = getChild<LLCheckBoxCtrl>( "wait_time_check");
check->setVisible(FALSE);
- check->setCommitCallback(onCommitWait);
- check->setCallbackUserData(this);
+ check->setCommitCallback(onCommitWait, this);
mWaitTimeCheck = check;
edit = getChild<LLLineEditor>("wait_time_editor");
edit->setEnabled(FALSE);
edit->setVisible(FALSE);
edit->setPrevalidate(LLLineEditor::prevalidateFloat);
-// edit->setKeystrokeCallback(onKeystrokeCommit);
+// edit->setKeystrokeCallback(onKeystrokeCommit, this);
edit->setCommitOnFocusLost(TRUE);
- edit->setCommitCallback(onCommitWaitTime);
- edit->setCallbackUserData(this);
+ edit->setCommitCallback(onCommitWaitTime, this);
edit->setIgnoreTab(TRUE);
mWaitTimeEditor = edit;
// Buttons at the bottom
check = getChild<LLCheckBoxCtrl>( "active_check");
- check->setCommitCallback(onCommitActive);
- check->setCallbackUserData(this);
+ check->setCommitCallback(onCommitActive, this);
mActiveCheck = check;
btn = getChild<LLButton>( "save_btn");
- btn->setClickedCallback(onClickSave);
- btn->setCallbackUserData(this);
+ btn->setClickedCallback(onClickSave, this);
mSaveBtn = btn;
btn = getChild<LLButton>( "preview_btn");
- btn->setClickedCallback(onClickPreview);
- btn->setCallbackUserData(this);
+ btn->setClickedCallback(onClickPreview, this);
mPreviewBtn = btn;
@@ -540,7 +493,6 @@ BOOL LLPreviewGesture::postBuild()
addAnimations();
addSounds();
-
const LLInventoryItem* item = getItem();
if (item)
@@ -550,7 +502,7 @@ BOOL LLPreviewGesture::postBuild()
childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe);
}
- return TRUE;
+ return LLPreview::postBuild();
}
@@ -680,16 +632,9 @@ void LLPreviewGesture::addSounds()
}
-void LLPreviewGesture::init(const LLUUID& item_id, const LLUUID& object_id)
-{
- // Sets ID and adds to instance list
- setItemID(item_id);
- setObjectID(object_id);
-}
-
-
void LLPreviewGesture::refresh()
{
+ LLPreview::refresh();
// If previewing or item is incomplete, all controls are disabled
LLViewerInventoryItem* item = (LLViewerInventoryItem*)getItem();
bool is_complete = (item && item->isComplete()) ? true : false;
@@ -850,7 +795,7 @@ void LLPreviewGesture::initDefaultGesture()
item = addStep( STEP_ANIMATION );
LLGestureStepAnimation* anim = (LLGestureStepAnimation*)item->getUserdata();
anim->mAnimAssetID = ANIM_AGENT_HELLO;
- anim->mAnimName = "Wave";
+ anim->mAnimName = LLTrans::getString("Wave");
updateLabel(item);
item = addStep( STEP_WAIT );
@@ -860,7 +805,7 @@ void LLPreviewGesture::initDefaultGesture()
item = addStep( STEP_CHAT );
LLGestureStepChat* chat_step = (LLGestureStepChat*)item->getUserdata();
- chat_step->mChatText = "Hello, avatar!";
+ chat_step->mChatText = LLTrans::getString("HelloAvatar");
updateLabel(item);
// Start with item list selected
@@ -874,7 +819,11 @@ void LLPreviewGesture::initDefaultGesture()
void LLPreviewGesture::loadAsset()
{
const LLInventoryItem* item = getItem();
- if (!item) return;
+ if (!item)
+ {
+ mAssetStatus = PREVIEW_ASSET_ERROR;
+ return;
+ }
LLUUID asset_id = item->getAssetUUID();
if (asset_id.isNull())
@@ -883,6 +832,7 @@ void LLPreviewGesture::loadAsset()
// Blank gesture will be fine.
initDefaultGesture();
refresh();
+ mAssetStatus = PREVIEW_ASSET_LOADED;
return;
}
@@ -910,11 +860,10 @@ void LLPreviewGesture::onLoadComplete(LLVFS *vfs,
void* user_data, S32 status, LLExtStat ext_status)
{
LLUUID* item_idp = (LLUUID*)user_data;
- LLPreview* preview = LLPreview::find(*item_idp);
- if (preview)
- {
- LLPreviewGesture* self = (LLPreviewGesture*)preview;
+ LLPreviewGesture* self = LLFloaterReg::findTypedInstance<LLPreviewGesture>("preview_gesture", *item_idp);
+ if (self)
+ {
if (0 == status)
{
LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
@@ -1016,7 +965,7 @@ void LLPreviewGesture::loadUIFromGesture(LLMultiGesture* gesture)
LLGestureStep* step = gesture->mSteps[i];
LLGestureStep* new_step = NULL;
-
+
switch(step->getType())
{
case STEP_ANIMATION:
@@ -1061,7 +1010,7 @@ void LLPreviewGesture::loadUIFromGesture(LLMultiGesture* gesture)
// Create an enabled item with this step
LLSD row;
- row["columns"][0]["value"] = new_step->getLabel();
+ row["columns"][0]["value"] = getLabel( new_step->getLabel());
row["columns"][0]["font"] = "SANSSERIF_SMALL";
LLScrollListItem* item = mStepList->addElement(row);
item->setUserdata(new_step);
@@ -1262,10 +1211,10 @@ void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data,
}
// Find our window and close it if requested.
- LLPreviewGesture* previewp = (LLPreviewGesture*)LLPreview::find(info->mItemUUID);
+ LLPreviewGesture* previewp = LLFloaterReg::findTypedInstance<LLPreviewGesture>("preview_gesture", info->mItemUUID);
if (previewp && previewp->mCloseAfterSave)
{
- previewp->close();
+ previewp->closeFloater();
}
}
else
@@ -1374,7 +1323,7 @@ void LLPreviewGesture::updateLabel(LLScrollListItem* item)
LLScrollListCell* cell = item->getColumn(0);
LLScrollListText* text_cell = (LLScrollListText*)cell;
- std::string label = step->getLabel();
+ std::string label = getLabel( step->getLabel());
text_cell->setText(label);
}
@@ -1619,24 +1568,26 @@ LLScrollListItem* LLPreviewGesture::addStep( const EStepType step_type )
{
case STEP_ANIMATION:
step = new LLGestureStepAnimation();
+
break;
case STEP_SOUND:
step = new LLGestureStepSound();
break;
case STEP_CHAT:
- step = new LLGestureStepChat();
+ step = new LLGestureStepChat();
break;
case STEP_WAIT:
- step = new LLGestureStepWait();
+ step = new LLGestureStepWait();
break;
default:
llerrs << "Unknown step type: " << (S32)step_type << llendl;
return NULL;
}
+
// Create an enabled item with this step
LLSD row;
- row["columns"][0]["value"] = step->getLabel();
+ row["columns"][0]["value"] = getLabel(step->getLabel());
row["columns"][0]["font"] = "SANSSERIF_SMALL";
LLScrollListItem* step_item = mStepList->addElement(row);
step_item->setUserdata(step);
@@ -1650,6 +1601,42 @@ LLScrollListItem* LLPreviewGesture::addStep( const EStepType step_type )
return step_item;
}
+// static
+std::string LLPreviewGesture::getLabel(std::vector<std::string> labels)
+{
+ std::vector<std::string> v_labels = labels ;
+ std::string result("");
+
+ if( v_labels.size() != 2)
+ {
+ return result;
+ }
+
+ if(v_labels[0]=="Chat")
+ {
+ result=LLTrans::getString("Chat");
+ }
+ else if(v_labels[0]=="Sound")
+ {
+ result=LLTrans::getString("Sound");
+ }
+ else if(v_labels[0]=="Wait")
+ {
+ result=LLTrans::getString("Wait");
+ }
+ else if(v_labels[0]=="AnimFlagStop")
+ {
+ result=LLTrans::getString("AnimFlagStop");
+ }
+ else if(v_labels[0]=="AnimFlagStart")
+ {
+ result=LLTrans::getString("AnimFlagStart");
+ }
+
+ result.append(v_labels[1]);
+ return result;
+
+}
// static
void LLPreviewGesture::onClickUp(void* data)
{
diff --git a/indra/newview/llpreviewgesture.h b/indra/newview/llpreviewgesture.h
index c245c0e8da..d3e9c77789 100644
--- a/indra/newview/llpreviewgesture.h
+++ b/indra/newview/llpreviewgesture.h
@@ -52,40 +52,38 @@ class LLPreviewGesture : public LLPreview
public:
// Pass an object_id if this gesture is inside an object in the world,
// otherwise use LLUUID::null.
- static LLPreviewGesture* show(const std::string& title, const LLUUID& item_id, const LLUUID& object_id, BOOL take_focus = TRUE);
+ static LLPreviewGesture* show(const LLUUID& item_id, const LLUUID& object_id);
+
+ LLPreviewGesture(const LLSD& key);
+ virtual ~LLPreviewGesture();
// LLView
- virtual BOOL handleKeyHere(KEY key, MASK mask);
- virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+ /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
+ /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg);
// LLPanel
- virtual BOOL postBuild();
+ /*virtual*/ BOOL postBuild();
// LLFloater
- virtual BOOL canClose();
- virtual void setMinimized(BOOL minimize);
- virtual void onClose(bool app_quitting);
- virtual void onUpdateSucceeded();
+ /*virtual*/ BOOL canClose();
+ /*virtual*/ void setMinimized(BOOL minimize);
+ /*virtual*/ void onClose(bool app_quitting);
+ /*virtual*/ void onUpdateSucceeded();
+ /*virtual*/ void refresh();
+
protected:
- LLPreviewGesture();
- virtual ~LLPreviewGesture();
-
- void init(const LLUUID& item_id, const LLUUID& object_id);
-
// Populate various comboboxes
void addModifiers();
void addKeys();
void addAnimations();
void addSounds();
- void refresh();
-
void initDefaultGesture();
void loadAsset();
@@ -112,6 +110,7 @@ protected:
// "Sound", "Chat", or "Wait"
LLScrollListItem* addStep(const enum EStepType step_type);
+ static std::string getLabel(std::vector<std::string> labels);
static void updateLabel(LLScrollListItem* item);
static void onCommitSetDirty(LLUICtrl* ctrl, void* data);
@@ -139,8 +138,6 @@ protected:
static void onDonePreview(LLMultiGesture* gesture, void* data);
- virtual const char *getTitleName() const { return "Gesture"; }
-
protected:
// LLPreview contains mDescEditor
LLLineEditor* mTriggerEditor;
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp
index 4abe390bc5..f3d0dc538d 100644
--- a/indra/newview/llpreviewnotecard.cpp
+++ b/indra/newview/llpreviewnotecard.cpp
@@ -40,6 +40,7 @@
#include "llassetuploadresponders.h"
#include "llviewerwindow.h"
#include "llbutton.h"
+#include "llfloaterreg.h"
#include "llinventorymodel.h"
#include "lllineeditor.h"
#include "llnotify.h"
@@ -61,122 +62,71 @@
#include "lllineeditor.h"
#include "lluictrlfactory.h"
-///----------------------------------------------------------------------------
-/// Local function declarations, constants, enums, and typedefs
-///----------------------------------------------------------------------------
-
-const S32 PREVIEW_MIN_WIDTH =
- 2 * PREVIEW_BORDER +
- 2 * PREVIEW_BUTTON_WIDTH +
- PREVIEW_PAD + RESIZE_HANDLE_WIDTH +
- PREVIEW_PAD;
-const S32 PREVIEW_MIN_HEIGHT =
- 2 * PREVIEW_BORDER +
- 3*(20 + PREVIEW_PAD) +
- 2 * SCROLLBAR_SIZE + 128;
-
///----------------------------------------------------------------------------
/// Class LLPreviewNotecard
///----------------------------------------------------------------------------
// Default constructor
-LLPreviewNotecard::LLPreviewNotecard(const std::string& name,
- const LLRect& rect,
- const std::string& title,
- const LLUUID& item_id,
- const LLUUID& object_id,
- const LLUUID& asset_id,
- BOOL show_keep_discard,
- LLPointer<LLViewerInventoryItem> inv_item) :
- LLPreview(name, rect, title, item_id, object_id, TRUE,
- PREVIEW_MIN_WIDTH,
- PREVIEW_MIN_HEIGHT,
- inv_item),
- mAssetID( asset_id ),
- mNotecardItemID(item_id),
- mObjectID(object_id)
+LLPreviewNotecard::LLPreviewNotecard(const LLSD& key) //const LLUUID& item_id,
+ : LLPreview( key )
+{
+ const LLInventoryItem *item = getItem();
+ if (item)
+ {
+ mShowKeepDiscard = item->getPermissions().getCreator() != gAgent.getID();
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_notecard.xml", FALSE);
+ mAssetID = item->getAssetUUID();
+ }
+}
+
+LLPreviewNotecard::~LLPreviewNotecard()
{
- LLRect curRect = rect;
+}
- if (show_keep_discard)
+BOOL LLPreviewNotecard::postBuild()
+{
+ LLViewerTextEditor *ed = getChild<LLViewerTextEditor>("Notecard Editor");
+ if (ed)
+ {
+ ed->setNotecardInfo(mItemUUID, mObjectID, getKey());
+ ed->makePristine();
+ }
+ if (mShowKeepDiscard)
{
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_notecard_keep_discard.xml");
childSetAction("Keep",onKeepBtn,this);
childSetAction("Discard",onDiscardBtn,this);
}
else
{
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_notecard.xml");
- childSetAction("Save",onClickSave,this);
-
- if( mAssetID.isNull() )
- {
- const LLInventoryItem* item = getItem();
- if( item )
- {
- mAssetID = item->getAssetUUID();
- }
- }
- }
-
- // only assert shape if not hosted in a multifloater
- if (!getHost())
- {
- reshape(curRect.getWidth(), curRect.getHeight(), TRUE);
- setRect(curRect);
+ getChild<LLButton>("Keep")->setLabel(getString("Save"));
+ childSetAction("Keep",onClickSave,this);
+ childSetVisible("Discard", false);
}
-
+
childSetVisible("lock", FALSE);
-
+
const LLInventoryItem* item = getItem();
-
+
childSetCommitCallback("desc", LLPreview::onText, this);
if (item)
childSetText("desc", item->getDescription());
childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe);
- setTitle(title);
-
LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
if (editor)
{
editor->setWordWrap(TRUE);
- editor->setSourceID(item_id);
editor->setHandleEditKeysDirectly(TRUE);
}
-
- gAgent.changeCameraToDefault();
-}
-
-LLPreviewNotecard::~LLPreviewNotecard()
-{
-}
-
-BOOL LLPreviewNotecard::postBuild()
-{
- LLViewerTextEditor *ed = getChild<LLViewerTextEditor>("Notecard Editor");
- if (ed)
- {
- ed->setNotecardInfo(mNotecardItemID, mObjectID);
- ed->makePristine();
- }
- return TRUE;
+
+ return LLPreview::postBuild();
}
-bool LLPreviewNotecard::saveItem(LLPointer<LLInventoryItem>* itemptr)
+bool LLPreviewNotecard::saveItem()
{
- LLInventoryItem* item = NULL;
- if (itemptr && itemptr->notNull())
- {
- item = (LLInventoryItem*)(*itemptr);
- }
- bool res = saveIfNeeded(item);
- if (res)
- {
- delete itemptr;
- }
- return res;
+ LLInventoryItem* item = gInventory.getItem(mItemUUID);
+ return saveIfNeeded(item);
}
void LLPreviewNotecard::setEnabled( BOOL enabled )
@@ -187,7 +137,7 @@ void LLPreviewNotecard::setEnabled( BOOL enabled )
childSetEnabled("Notecard Editor", enabled);
childSetVisible("lock", !enabled);
childSetEnabled("desc", enabled);
- childSetEnabled("Save", enabled && editor && (!editor->isPristine()));
+ childSetEnabled("Keep", enabled && editor && (!editor->isPristine()));
}
@@ -195,13 +145,10 @@ void LLPreviewNotecard::setEnabled( BOOL enabled )
void LLPreviewNotecard::draw()
{
-
- //childSetFocus("Save", FALSE);
-
LLViewerTextEditor* editor = getChild<LLViewerTextEditor>("Notecard Editor");
BOOL script_changed = !editor->isPristine();
- childSetEnabled("Save", script_changed && getEnabled());
+ childSetEnabled("Keep", script_changed && getEnabled());
LLPreview::draw();
}
@@ -255,8 +202,13 @@ bool LLPreviewNotecard::hasEmbeddedInventory()
return editor->hasEmbeddedInventory();
}
-void LLPreviewNotecard::refreshFromInventory()
+void LLPreviewNotecard::refreshFromInventory(const LLUUID& new_item_id)
{
+ if (new_item_id.notNull())
+ {
+ mItemUUID = new_item_id;
+ setKey(LLSD(new_item_id));
+ }
lldebugs << "LLPreviewNotecard::refreshFromInventory()" << llendl;
loadAsset();
}
@@ -287,7 +239,6 @@ void LLPreviewNotecard::loadAsset()
}
else
{
- LLUUID* new_uuid = new LLUUID(mItemUUID);
LLHost source_sim = LLHost::invalid;
if (mObjectUUID.notNull())
{
@@ -305,7 +256,6 @@ void LLPreviewNotecard::loadAsset()
editor->makePristine();
editor->setEnabled(FALSE);
mAssetStatus = PREVIEW_ASSET_LOADED;
- delete new_uuid;
return;
}
}
@@ -318,7 +268,7 @@ void LLPreviewNotecard::loadAsset()
item->getAssetUUID(),
item->getType(),
&onLoadComplete,
- (void*)new_uuid,
+ (void*)new LLUUID(mItemUUID),
TRUE);
mAssetStatus = PREVIEW_ASSET_LOADING;
}
@@ -355,7 +305,8 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
{
llinfos << "LLPreviewNotecard::onLoadComplete()" << llendl;
LLUUID* item_id = (LLUUID*)user_data;
- LLPreviewNotecard* preview = LLPreviewNotecard::getInstance(*item_id);
+
+ LLPreviewNotecard* preview = LLFloaterReg::findTypedInstance<LLPreviewNotecard>("preview_notecard", LLSD(*item_id));
if( preview )
{
if(0 == status)
@@ -419,18 +370,6 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs,
delete item_id;
}
-// static
-LLPreviewNotecard* LLPreviewNotecard::getInstance(const LLUUID& item_id)
-{
- LLPreview* instance = NULL;
- preview_map_t::iterator found_it = LLPreview::sInstances.find(item_id);
- if(found_it != LLPreview::sInstances.end())
- {
- instance = found_it->second;
- }
- return (LLPreviewNotecard*)instance;
-}
-
// static
void LLPreviewNotecard::onClickSave(void* user_data)
{
@@ -590,10 +529,11 @@ void LLPreviewNotecard::onSaveComplete(const LLUUID& asset_uuid, void* user_data
}
// Find our window and close it if requested.
- LLPreviewNotecard* previewp = (LLPreviewNotecard*)LLPreview::find(info->mItemUUID);
+
+ LLPreviewNotecard* previewp = LLFloaterReg::findTypedInstance<LLPreviewNotecard>("preview_notecard", info->mItemUUID);
if (previewp && previewp->mCloseAfterSave)
{
- previewp->close();
+ previewp->closeFloater();
}
}
else
@@ -624,7 +564,7 @@ bool LLPreviewNotecard::handleSaveChangesDialog(const LLSD& notification, const
case 1: // "No"
mForceClose = TRUE;
- close();
+ closeFloater();
break;
case 2: // "Cancel"
@@ -636,16 +576,4 @@ bool LLPreviewNotecard::handleSaveChangesDialog(const LLSD& notification, const
return false;
}
-void LLPreviewNotecard::reshape(S32 width, S32 height, BOOL called_from_parent)
-{
- LLPreview::reshape( width, height, called_from_parent );
-
- if( !isMinimized() )
- {
- // So that next time you open a script it will have the same height and width
- // (although not the same position).
- gSavedSettings.setRect("NotecardEditorRect", getRect());
- }
-}
-
// EOF
diff --git a/indra/newview/llpreviewnotecard.h b/indra/newview/llpreviewnotecard.h
index f5cd2bb2a9..2a008be1e6 100644
--- a/indra/newview/llpreviewnotecard.h
+++ b/indra/newview/llpreviewnotecard.h
@@ -49,28 +49,21 @@ class LLButton;
class LLPreviewNotecard : public LLPreview
{
public:
- LLPreviewNotecard(const std::string& name, const LLRect& rect, const std::string& title,
- const LLUUID& item_id,
- const LLUUID& object_id = LLUUID::null,
- const LLUUID& asset_id = LLUUID::null,
- BOOL show_keep_discard = FALSE,
- LLPointer<LLViewerInventoryItem> inv_item = NULL);
+ LLPreviewNotecard(const LLSD& key);
virtual ~LLPreviewNotecard();
- // llpreview
- virtual bool saveItem(LLPointer<LLInventoryItem>* itemptr);
+ bool saveItem();
// llview
virtual void draw();
virtual BOOL handleKeyHere(KEY key, MASK mask);
virtual void setEnabled( BOOL enabled );
- virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
// llfloater
virtual BOOL canClose();
// llpanel
- virtual BOOL postBuild();
+ virtual BOOL postBuild();
// reach into the text editor, and grab the drag item
const LLInventoryItem* getDragItem();
@@ -82,15 +75,13 @@ public:
// After saving a notecard, the tcp based upload system will
// change the asset, therefore, we need to re-fetch it from the
// asset system. :(
- void refreshFromInventory();
+ void refreshFromInventory(const LLUUID& item_id = LLUUID::null);
protected:
virtual void loadAsset();
bool saveIfNeeded(LLInventoryItem* copyitem = NULL);
- static LLPreviewNotecard* getInstance(const LLUUID& uuid);
-
static void onLoadComplete(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,
@@ -104,16 +95,14 @@ protected:
bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response);
- virtual const char *getTitleName() const { return "Note"; }
-
protected:
LLViewerTextEditor* mEditor;
LLButton* mSaveBtn;
LLUUID mAssetID;
- LLUUID mNotecardItemID;
LLUUID mObjectID;
+ BOOL mShowKeepDiscard;
};
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 0bacb95d2d..025aa25170 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -40,6 +40,7 @@
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "lldir.h"
+#include "llfloaterreg.h"
#include "llinventorymodel.h"
#include "llkeyboard.h"
#include "lllineeditor.h"
@@ -48,6 +49,8 @@
#include "llscrollbar.h"
#include "llscrollcontainer.h"
#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
#include "llslider.h"
#include "lscript_rt_interface.h"
#include "lscript_export.h"
@@ -87,7 +90,7 @@
#include "llappviewer.h"
#include "llpanelinventory.h"
-
+#include "lltrans.h"
const std::string HELLO_LSL =
"default\n"
@@ -109,34 +112,8 @@ const std::string DEFAULT_SCRIPT_DESC = "(No Description)"; // *TODO:Translate?
// Description and header information
-const S32 SCRIPT_BORDER = 4;
-const S32 SCRIPT_PAD = 5;
-const S32 SCRIPT_BUTTON_WIDTH = 128;
-const S32 SCRIPT_BUTTON_HEIGHT = 24; // HACK: Use BTN_HEIGHT where possible.
-const S32 LINE_COLUMN_HEIGHT = 14;
-const S32 BTN_PAD = 8;
-
-const S32 SCRIPT_EDITOR_MIN_HEIGHT = 2 * SCROLLBAR_SIZE + 2 * LLPANEL_BORDER_WIDTH + 128;
-
-const S32 SCRIPT_MIN_WIDTH =
- 2 * SCRIPT_BORDER +
- 2 * SCRIPT_BUTTON_WIDTH +
- SCRIPT_PAD + RESIZE_HANDLE_WIDTH +
- SCRIPT_PAD;
-
-const S32 SCRIPT_MIN_HEIGHT =
- 2 * SCRIPT_BORDER +
- 3*(SCRIPT_BUTTON_HEIGHT + SCRIPT_PAD) +
- LINE_COLUMN_HEIGHT +
- SCRIPT_EDITOR_MIN_HEIGHT;
-
const S32 MAX_EXPORT_SIZE = 1000;
-const S32 SCRIPT_SEARCH_WIDTH = 300;
-const S32 SCRIPT_SEARCH_HEIGHT = 120;
-const S32 SCRIPT_SEARCH_LABEL_WIDTH = 50;
-const S32 SCRIPT_SEARCH_BUTTON_WIDTH = 80;
-const S32 TEXT_EDIT_COLUMN_HEIGHT = 16;
const S32 MAX_HISTORY_COUNT = 10;
const F32 LIVE_HELP_REFRESH_TIME = 1.f;
@@ -152,9 +129,10 @@ static bool have_script_upload_cap(LLUUID& object_id)
class LLFloaterScriptSearch : public LLFloater
{
public:
- LLFloaterScriptSearch(std::string title, LLRect rect, LLScriptEdCore* editor_core);
+ LLFloaterScriptSearch(LLScriptEdCore* editor_core);
~LLFloaterScriptSearch();
+ /*virtual*/ BOOL postBuild();
static void show(LLScriptEdCore* editor_core);
static void onBtnSearch(void* userdata);
void handleBtnSearch();
@@ -168,8 +146,6 @@ public:
LLScriptEdCore* getEditorCore() { return mEditorCore; }
static LLFloaterScriptSearch* getInstance() { return sInstance; }
- void open(); /*Flawfinder: ignore*/
-
private:
LLScriptEdCore* mEditorCore;
@@ -179,28 +155,14 @@ private:
LLFloaterScriptSearch* LLFloaterScriptSearch::sInstance = NULL;
-LLFloaterScriptSearch::LLFloaterScriptSearch(std::string title, LLRect rect, LLScriptEdCore* editor_core)
- : LLFloater("script search",rect,title), mEditorCore(editor_core)
+LLFloaterScriptSearch::LLFloaterScriptSearch(LLScriptEdCore* editor_core)
+: LLFloater(),
+ mEditorCore(editor_core)
{
-
LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_search.xml");
- childSetAction("search_btn", onBtnSearch,this);
- childSetAction("replace_btn", onBtnReplace,this);
- childSetAction("replace_all_btn", onBtnReplaceAll,this);
-
- setDefaultBtn("search_btn");
-
- if (!getHost())
- {
- LLRect curRect = getRect();
- translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
- }
-
sInstance = this;
-
- childSetFocus("search_text", TRUE);
-
+
// find floater in which script panel is embedded
LLView* viewp = (LLView*)editor_core;
while(viewp)
@@ -215,26 +177,33 @@ LLFloaterScriptSearch::LLFloaterScriptSearch(std::string title, LLRect rect, LLS
}
}
+BOOL LLFloaterScriptSearch::postBuild()
+{
+ childSetAction("search_btn", onBtnSearch,this);
+ childSetAction("replace_btn", onBtnReplace,this);
+ childSetAction("replace_all_btn", onBtnReplaceAll,this);
+
+ setDefaultBtn("search_btn");
+
+ return TRUE;
+}
+
//static
void LLFloaterScriptSearch::show(LLScriptEdCore* editor_core)
{
if (sInstance && sInstance->mEditorCore && sInstance->mEditorCore != editor_core)
{
- sInstance->close();
+ sInstance->closeFloater();
delete sInstance;
}
if (!sInstance)
{
- S32 left = 0;
- S32 top = 0;
- gFloaterView->getNewFloaterPosition(&left,&top);
-
// sInstance will be assigned in the constructor.
- new LLFloaterScriptSearch("Script Search",LLRect(left,top,left + SCRIPT_SEARCH_WIDTH,top - SCRIPT_SEARCH_HEIGHT),editor_core);
+ new LLFloaterScriptSearch(editor_core);
}
- sInstance->open(); /*Flawfinder: ignore*/
+ sInstance->openFloater();
}
LLFloaterScriptSearch::~LLFloaterScriptSearch()
@@ -281,19 +250,11 @@ void LLFloaterScriptSearch::handleBtnReplaceAll()
mEditorCore->mEditor->replaceTextAll(childGetText("search_text"), childGetText("replace_text"), caseChk->get());
}
-void LLFloaterScriptSearch::open() /*Flawfinder: ignore*/
-{
- LLFloater::open(); /*Flawfinder: ignore*/
- childSetFocus("search_text", TRUE);
-}
-
/// ---------------------------------------------------------------------------
/// LLScriptEdCore
/// ---------------------------------------------------------------------------
LLScriptEdCore::LLScriptEdCore(
- const std::string& name,
- const LLRect& rect,
const std::string& sample,
const std::string& help_url,
const LLHandle<LLFloater>& floater_handle,
@@ -303,7 +264,7 @@ LLScriptEdCore::LLScriptEdCore(
void* userdata,
S32 bottom_pad)
:
- LLPanel( std::string("name"), rect ),
+ LLPanel(),
mSampleText(sample),
mHelpURL(help_url),
mEditor( NULL ),
@@ -323,18 +284,6 @@ LLScriptEdCore::LLScriptEdCore(
LLUICtrlFactory::getInstance()->buildPanel(this, "floater_script_ed_panel.xml");
- mErrorList = getChild<LLScrollListCtrl>("lsl errors");
-
- mFunctions = getChild<LLComboBox>( "Insert...");
-
- childSetCommitCallback("Insert...", &LLScriptEdCore::onBtnInsertFunction, this);
-
- mEditor = getChild<LLViewerTextEditor>("Script Editor");
- mEditor->setFollowsAll();
- mEditor->setHandleEditKeysDirectly(TRUE);
- mEditor->setEnabled(TRUE);
- mEditor->setWordWrap(TRUE);
-
std::vector<std::string> funcs;
std::vector<std::string> tooltips;
for (S32 i = 0; i < gScriptLibrary.mNextNumber; i++)
@@ -366,20 +315,6 @@ LLScriptEdCore::LLScriptEdCore(
if (token->getColor() != color)
mFunctions->add(wstring_to_utf8str(token->getToken()));
}
-
-
- childSetCommitCallback("lsl errors", &LLScriptEdCore::onErrorList, this);
- childSetAction("Save_btn", onBtnSave,this);
-
- initMenu();
-
- // Do the work that addTabPanel() normally does.
- //LLRect tab_panel_rect( 0, getRect().getHeight(), getRect().getWidth(), 0 );
- //tab_panel_rect.stretch( -LLPANEL_BORDER_WIDTH );
- //mCodePanel->setFollowsAll();
- //mCodePanel->translate( tab_panel_rect.mLeft - mCodePanel->getRect().mLeft, tab_panel_rect.mBottom - mCodePanel->getRect().mBottom);
- //mCodePanel->reshape( tab_panel_rect.getWidth(), tab_panel_rect.getHeight(), TRUE );
-
}
LLScriptEdCore::~LLScriptEdCore()
@@ -390,57 +325,78 @@ LLScriptEdCore::~LLScriptEdCore()
LLFloaterScriptSearch* script_search = LLFloaterScriptSearch::getInstance();
if (script_search && script_search->getEditorCore() == this)
{
- script_search->close();
+ script_search->closeFloater();
delete script_search;
}
}
-void LLScriptEdCore::initMenu()
+BOOL LLScriptEdCore::postBuild()
{
- LLMenuItemCallGL* menuItem = getChild<LLMenuItemCallGL>("Save");
- menuItem->setMenuCallback(onBtnSave, this);
- menuItem->setEnabledCallback(hasChanged);
+ mErrorList = getChild<LLScrollListCtrl>("lsl errors");
+
+ mFunctions = getChild<LLComboBox>( "Insert...");
+
+ childSetCommitCallback("Insert...", &LLScriptEdCore::onBtnInsertFunction, this);
+
+ mEditor = getChild<LLViewerTextEditor>("Script Editor");
+ mEditor->setFollowsAll();
+ mEditor->setHandleEditKeysDirectly(TRUE);
+ mEditor->setEnabled(TRUE);
+ mEditor->setWordWrap(TRUE);
+
+ childSetCommitCallback("lsl errors", &LLScriptEdCore::onErrorList, this);
+ childSetAction("Save_btn", boost::bind(&LLScriptEdCore::doSave,this,FALSE));
+
+ initMenu();
+ return TRUE;
+}
+
+void LLScriptEdCore::initMenu()
+{
+ // *TODO: Skinning - make these callbacks data driven
+ LLMenuItemCallGL* menuItem;
+
+ menuItem = getChild<LLMenuItemCallGL>("Save");
+ menuItem->setClickCallback(boost::bind(&LLScriptEdCore::doSave, this, FALSE));
+ menuItem->setEnableCallback(boost::bind(&LLScriptEdCore::hasChanged, this));
menuItem = getChild<LLMenuItemCallGL>("Revert All Changes");
- menuItem->setMenuCallback(onBtnUndoChanges, this);
- menuItem->setEnabledCallback(hasChanged);
+ menuItem->setClickCallback(boost::bind(&LLScriptEdCore::onBtnUndoChanges, this));
+ menuItem->setEnableCallback(boost::bind(&LLScriptEdCore::hasChanged, this));
menuItem = getChild<LLMenuItemCallGL>("Undo");
- menuItem->setMenuCallback(onUndoMenu, this);
- menuItem->setEnabledCallback(enableUndoMenu);
+ menuItem->setClickCallback(boost::bind(&LLTextEditor::undo, mEditor));
+ menuItem->setEnableCallback(boost::bind(&LLTextEditor::canUndo, mEditor));
menuItem = getChild<LLMenuItemCallGL>("Redo");
- menuItem->setMenuCallback(onRedoMenu, this);
- menuItem->setEnabledCallback(enableRedoMenu);
+ menuItem->setClickCallback(boost::bind(&LLTextEditor::redo, mEditor));
+ menuItem->setEnableCallback(boost::bind(&LLTextEditor::canRedo, mEditor));
menuItem = getChild<LLMenuItemCallGL>("Cut");
- menuItem->setMenuCallback(onCutMenu, this);
- menuItem->setEnabledCallback(enableCutMenu);
+ menuItem->setClickCallback(boost::bind(&LLTextEditor::cut, mEditor));
+ menuItem->setEnableCallback(boost::bind(&LLTextEditor::canCut, mEditor));
menuItem = getChild<LLMenuItemCallGL>("Copy");
- menuItem->setMenuCallback(onCopyMenu, this);
- menuItem->setEnabledCallback(enableCopyMenu);
+ menuItem->setClickCallback(boost::bind(&LLTextEditor::copy, mEditor));
+ menuItem->setEnableCallback(boost::bind(&LLTextEditor::canCopy, mEditor));
menuItem = getChild<LLMenuItemCallGL>("Paste");
- menuItem->setMenuCallback(onPasteMenu, this);
- menuItem->setEnabledCallback(enablePasteMenu);
+ menuItem->setClickCallback(boost::bind(&LLTextEditor::paste, mEditor));
+ menuItem->setEnableCallback(boost::bind(&LLTextEditor::canPaste, mEditor));
menuItem = getChild<LLMenuItemCallGL>("Select All");
- menuItem->setMenuCallback(onSelectAllMenu, this);
- menuItem->setEnabledCallback(enableSelectAllMenu);
+ menuItem->setClickCallback(boost::bind(&LLTextEditor::selectAll, mEditor));
+ menuItem->setEnableCallback(boost::bind(&LLTextEditor::canSelectAll, mEditor));
menuItem = getChild<LLMenuItemCallGL>("Search / Replace...");
- menuItem->setMenuCallback(onSearchMenu, this);
- menuItem->setEnabledCallback(NULL);
+ menuItem->setClickCallback(boost::bind(&LLFloaterScriptSearch::show, this));
menuItem = getChild<LLMenuItemCallGL>("Help...");
- menuItem->setMenuCallback(onBtnHelp, this);
- menuItem->setEnabledCallback(NULL);
+ menuItem->setClickCallback(boost::bind(&LLScriptEdCore::onBtnHelp, this));
menuItem = getChild<LLMenuItemCallGL>("LSL Wiki Help...");
- menuItem->setMenuCallback(onBtnDynamicHelp, this);
- menuItem->setEnabledCallback(NULL);
+ menuItem->setClickCallback(boost::bind(&LLScriptEdCore::onBtnDynamicHelp, this));
}
void LLScriptEdCore::setScriptText(const std::string& text, BOOL is_valid)
@@ -452,17 +408,16 @@ void LLScriptEdCore::setScriptText(const std::string& text, BOOL is_valid)
}
}
-BOOL LLScriptEdCore::hasChanged(void* userdata)
+bool LLScriptEdCore::hasChanged()
{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return FALSE;
+ if (!mEditor) return false;
- return ((!self->mEditor->isPristine() || self->mEnableSave) && self->mHasScriptData);
+ return !mEditor->isPristine();
}
void LLScriptEdCore::draw()
{
- BOOL script_changed = hasChanged(this);
+ BOOL script_changed = hasChanged();
childSetEnabled("Save_btn", script_changed);
if( mEditor->hasFocus() )
@@ -470,8 +425,11 @@ void LLScriptEdCore::draw()
S32 line = 0;
S32 column = 0;
mEditor->getCurrentLineAndColumn( &line, &column, FALSE ); // don't include wordwrap
+ LLStringUtil::format_map_t args;
std::string cursor_pos;
- cursor_pos = llformat("Line %d, Column %d", line, column );
+ args["[LINE]"] = llformat ("%d", line);
+ args["[COLUMN]"] = llformat ("%d", column);
+ cursor_pos = LLTrans::getString("CursorPos", args);
childSetText("line_col", cursor_pos);
}
else
@@ -580,9 +538,7 @@ void LLScriptEdCore::addHelpItemToHistory(const std::string& help_string)
// separate history items from full item list
if (mLiveHelpHistorySize == 0)
{
- LLSD row;
- row["columns"][0]["type"] = "separator";
- history_combo->addElement(row, ADD_TOP);
+ history_combo->addSeparator(ADD_TOP);
}
// delete all history items over history limit
while(mLiveHelpHistorySize > MAX_HISTORY_COUNT - 1)
@@ -612,7 +568,7 @@ void LLScriptEdCore::addHelpItemToHistory(const std::string& help_string)
BOOL LLScriptEdCore::canClose()
{
- if(mForceClose || !hasChanged(this))
+ if(mForceClose || !hasChanged())
{
return TRUE;
}
@@ -631,14 +587,14 @@ bool LLScriptEdCore::handleSaveChangesDialog(const LLSD& notification, const LLS
{
case 0: // "Yes"
// close after saving
- LLScriptEdCore::doSave( this, TRUE );
+ doSave( TRUE );
break;
case 1: // "No"
mForceClose = TRUE;
// This will close immediately because mForceClose is true, so we won't
// infinite loop with these dialogs. JC
- ((LLFloater*) getParent())->close();
+ ((LLFloater*) getParent())->closeFloater();
break;
case 2: // "Cancel"
@@ -666,37 +622,33 @@ bool LLScriptEdCore::onHelpWebDialog(const LLSD& notification, const LLSD& respo
return false;
}
-// static
-void LLScriptEdCore::onBtnHelp(void* userdata)
+void LLScriptEdCore::onBtnHelp()
{
- LLScriptEdCore* corep = (LLScriptEdCore*)userdata;
LLSD payload;
- payload["help_url"] = corep->mHelpURL;
+ payload["help_url"] = mHelpURL;
LLNotifications::instance().add("WebLaunchLSLGuide", LLSD(), payload, onHelpWebDialog);
}
-// static
-void LLScriptEdCore::onBtnDynamicHelp(void* userdata)
+void LLScriptEdCore::onBtnDynamicHelp()
{
- LLScriptEdCore* corep = (LLScriptEdCore*)userdata;
-
- LLFloater* live_help_floater = corep->mLiveHelpHandle.get();
+ LLFloater* live_help_floater = mLiveHelpHandle.get();
if (live_help_floater)
{
live_help_floater->setFocus(TRUE);
- corep->updateDynamicHelp(TRUE);
+ updateDynamicHelp(TRUE);
return;
}
- live_help_floater = new LLFloater(std::string("lsl_help"));
+ live_help_floater = new LLFloater();
LLUICtrlFactory::getInstance()->buildFloater(live_help_floater, "floater_lsl_guide.xml");
- ((LLFloater*)corep->getParent())->addDependentFloater(live_help_floater, TRUE);
- live_help_floater->childSetCommitCallback("lock_check", onCheckLock, userdata);
+ LLFloater* parent = dynamic_cast<LLFloater*>(getParent());
+ parent->addDependentFloater(live_help_floater, TRUE);
+ live_help_floater->childSetCommitCallback("lock_check", onCheckLock, this);
live_help_floater->childSetValue("lock_check", gSavedSettings.getBOOL("ScriptHelpFollowsCursor"));
- live_help_floater->childSetCommitCallback("history_combo", onHelpComboCommit, userdata);
- live_help_floater->childSetAction("back_btn", onClickBack, userdata);
- live_help_floater->childSetAction("fwd_btn", onClickForward, userdata);
+ live_help_floater->childSetCommitCallback("history_combo", onHelpComboCommit, this);
+ live_help_floater->childSetAction("back_btn", onClickBack, this);
+ live_help_floater->childSetAction("fwd_btn", onClickForward, this);
LLWebBrowserCtrl* browser = live_help_floater->getChild<LLWebBrowserCtrl>("lsl_guide_html");
browser->setAlwaysRefresh(TRUE);
@@ -704,8 +656,8 @@ void LLScriptEdCore::onBtnDynamicHelp(void* userdata)
LLComboBox* help_combo = live_help_floater->getChild<LLComboBox>("history_combo");
LLKeywordToken *token;
LLKeywords::keyword_iterator_t token_it;
- for (token_it = corep->mEditor->keywordsBegin();
- token_it != corep->mEditor->keywordsEnd();
+ for (token_it = mEditor->keywordsBegin();
+ token_it != mEditor->keywordsEnd();
++token_it)
{
token = token_it->second;
@@ -714,10 +666,10 @@ void LLScriptEdCore::onBtnDynamicHelp(void* userdata)
help_combo->sortByName();
// re-initialize help variables
- corep->mLastHelpToken = NULL;
- corep->mLiveHelpHandle = live_help_floater->getHandle();
- corep->mLiveHelpHistorySize = 0;
- corep->updateDynamicHelp(TRUE);
+ mLastHelpToken = NULL;
+ mLiveHelpHandle = live_help_floater->getHandle();
+ mLiveHelpHistorySize = 0;
+ updateDynamicHelp(TRUE);
}
//static
@@ -805,154 +757,25 @@ void LLScriptEdCore::onBtnInsertFunction(LLUICtrl *ui, void* userdata)
self->setHelpPage(self->mFunctions->getSimple());
}
-// static
-void LLScriptEdCore::doSave( void* userdata, BOOL close_after_save )
+void LLScriptEdCore::doSave( BOOL close_after_save )
{
LLViewerStats::getInstance()->incStat( LLViewerStats::ST_LSL_SAVE_COUNT );
- LLScriptEdCore* self = (LLScriptEdCore*) userdata;
-
- if( self->mSaveCallback )
+ if( mSaveCallback )
{
- self->mSaveCallback( self->mUserdata, close_after_save );
+ mSaveCallback( mUserdata, close_after_save );
}
}
-// static
-void LLScriptEdCore::onBtnSave(void* data)
-{
- // do the save, but don't close afterwards
- doSave(data, FALSE);
-}
-// static
-void LLScriptEdCore::onBtnUndoChanges( void* userdata )
+void LLScriptEdCore::onBtnUndoChanges()
{
- LLScriptEdCore* self = (LLScriptEdCore*) userdata;
- if( !self->mEditor->tryToRevertToPristineState() )
+ if( !mEditor->tryToRevertToPristineState() )
{
- LLNotifications::instance().add("ScriptCannotUndo", LLSD(), LLSD(), boost::bind(&LLScriptEdCore::handleReloadFromServerDialog, self, _1, _2));
+ LLNotifications::instance().add("ScriptCannotUndo", LLSD(), LLSD(), boost::bind(&LLScriptEdCore::handleReloadFromServerDialog, this, _1, _2));
}
}
-void LLScriptEdCore::onSearchMenu(void* userdata)
-{
- LLScriptEdCore* sec = (LLScriptEdCore*)userdata;
- LLFloaterScriptSearch::show(sec);
-}
-
-// static
-void LLScriptEdCore::onUndoMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return;
- self->mEditor->undo();
-}
-
-// static
-void LLScriptEdCore::onRedoMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return;
- self->mEditor->redo();
-}
-
-// static
-void LLScriptEdCore::onCutMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return;
- self->mEditor->cut();
-}
-
-// static
-void LLScriptEdCore::onCopyMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return;
- self->mEditor->copy();
-}
-
-// static
-void LLScriptEdCore::onPasteMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return;
- self->mEditor->paste();
-}
-
-// static
-void LLScriptEdCore::onSelectAllMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return;
- self->mEditor->selectAll();
-}
-
-// static
-void LLScriptEdCore::onDeselectMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return;
- self->mEditor->deselect();
-}
-
-// static
-BOOL LLScriptEdCore::enableUndoMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return FALSE;
- return self->mEditor->canUndo();
-}
-
-// static
-BOOL LLScriptEdCore::enableRedoMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return FALSE;
- return self->mEditor->canRedo();
-}
-
-// static
-BOOL LLScriptEdCore::enableCutMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return FALSE;
- return self->mEditor->canCut();
-}
-
-// static
-BOOL LLScriptEdCore::enableCopyMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return FALSE;
- return self->mEditor->canCopy();
-}
-
-// static
-BOOL LLScriptEdCore::enablePasteMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return FALSE;
- return self->mEditor->canPaste();
-}
-
-// static
-BOOL LLScriptEdCore::enableSelectAllMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return FALSE;
- return self->mEditor->canSelectAll();
-}
-
-// static
-BOOL LLScriptEdCore::enableDeselectMenu(void* userdata)
-{
- LLScriptEdCore* self = (LLScriptEdCore*)userdata;
- if (!self || !self->mEditor) return FALSE;
- return self->mEditor->canDeselect();
-}
-
// static
void LLScriptEdCore::onErrorList(LLUICtrl*, void* user_data)
{
@@ -960,8 +783,7 @@ void LLScriptEdCore::onErrorList(LLUICtrl*, void* user_data)
LLScrollListItem* item = self->mErrorList->getFirstSelected();
if(item)
{
- // *FIX: This fucked up little hack is here because we don't
- // have a grep library. This is very brittle code.
+ // *FIX: replace with boost grep
S32 row = 0;
S32 column = 0;
const LLScrollListCell* cell = item->getColumn(0);
@@ -1080,8 +902,7 @@ void* LLPreviewLSL::createScriptEdPanel(void* userdata)
LLPreviewLSL *self = (LLPreviewLSL*)userdata;
- self->mScriptEd = new LLScriptEdCore("script panel",
- LLRect(),
+ self->mScriptEd = new LLScriptEdCore(
HELLO_LSL,
HELP_LSL_URL,
self->getHandle(),
@@ -1095,49 +916,32 @@ void* LLPreviewLSL::createScriptEdPanel(void* userdata)
}
-LLPreviewLSL::LLPreviewLSL(const std::string& name, const LLRect& rect,
- const std::string& title, const LLUUID& item_id )
-: LLPreview( name, rect, title, item_id, LLUUID::null, TRUE,
- SCRIPT_MIN_WIDTH, SCRIPT_MIN_HEIGHT ),
- mPendingUploads(0)
+LLPreviewLSL::LLPreviewLSL(const LLSD& key )
+ : LLPreview( key ),
+ mPendingUploads(0)
{
+ mFactoryMap["script panel"] = LLCallbackMap(LLPreviewLSL::createScriptEdPanel, this);
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_preview.xml", FALSE);
+}
- LLRect curRect = rect;
-
-
- LLCallbackMap::map_t factory_map;
- factory_map["script panel"] = LLCallbackMap(LLPreviewLSL::createScriptEdPanel, this);
-
-
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_script_preview.xml", &factory_map);
-
+// virtual
+BOOL LLPreviewLSL::postBuild()
+{
const LLInventoryItem* item = getItem();
childSetCommitCallback("desc", LLPreview::onText, this);
childSetText("desc", item->getDescription());
childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe);
- if (!getFloaterHost() && !getHost() && getAssetStatus() == PREVIEW_ASSET_UNLOADED)
- {
- loadAsset();
- }
-
- setTitle(title);
-
- if (!getHost())
- {
- reshape(curRect.getWidth(), curRect.getHeight(), TRUE);
- setRect(curRect);
- }
+ return LLPreview::postBuild();
}
// virtual
void LLPreviewLSL::callbackLSLCompileSucceeded()
{
llinfos << "LSL Bytecode saved" << llendl;
- // *TODO: Translate
- mScriptEd->mErrorList->addCommentText(std::string("Compile successful!"));
- mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
+ mScriptEd->mErrorList->setCommentText(LLTrans::getString("CompileSuccessful"));
+ mScriptEd->mErrorList->setCommentText(LLTrans::getString("SaveComplete"));
closeIfNeeded();
}
@@ -1228,16 +1032,10 @@ void LLPreviewLSL::closeIfNeeded()
mPendingUploads--;
if (mPendingUploads <= 0 && mCloseAfterSave)
{
- close();
+ closeFloater();
}
}
-//override the llpreview open which attempts to load asset, load after xml ui made
-void LLPreviewLSL::open() /*Flawfinder: ignore*/
-{
- LLFloater::open(); /*Flawfinder: ignore*/
-}
-
void LLPreviewLSL::onSearchReplace(void* userdata)
{
LLPreviewLSL* self = (LLPreviewLSL*)userdata;
@@ -1267,7 +1065,7 @@ void LLPreviewLSL::onSave(void* userdata, BOOL close_after_save)
void LLPreviewLSL::saveIfNeeded()
{
// llinfos << "LLPreviewLSL::saveIfNeeded()" << llendl;
- if(!LLScriptEdCore::hasChanged(mScriptEd))
+ if(!mScriptEd->hasChanged())
{
return;
}
@@ -1440,7 +1238,7 @@ void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32
}
// Find our window and close it if requested.
- LLPreviewLSL* self = (LLPreviewLSL*)LLPreview::find(info->mItemUUID);
+ LLPreviewLSL* self = LLFloaterReg::findTypedInstance<LLPreviewLSL>("preview_script", info->mItemUUID);
if (self)
{
getWindow()->decBusyCount();
@@ -1448,7 +1246,7 @@ void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32
if (self->mPendingUploads <= 0
&& self->mCloseAfterSave)
{
- self->close();
+ self->closeFloater();
}
}
}
@@ -1470,7 +1268,7 @@ void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_d
LLPreviewLSL* self = NULL;
if(instance_uuid)
{
- self = LLPreviewLSL::getInstance(*instance_uuid);
+ self = LLFloaterReg::findTypedInstance<LLPreviewLSL>("preview_script", *instance_uuid);
}
if (0 == status)
{
@@ -1487,7 +1285,7 @@ void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_d
if (self->mPendingUploads <= 0
&& self->mCloseAfterSave)
{
- self->close();
+ self->closeFloater();
}
}
}
@@ -1508,7 +1306,7 @@ void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAsset
lldebugs << "LLPreviewLSL::onLoadComplete: got uuid " << asset_uuid
<< llendl;
LLUUID* item_uuid = (LLUUID*)user_data;
- LLPreviewLSL* preview = LLPreviewLSL::getInstance(*item_uuid);
+ LLPreviewLSL* preview = LLFloaterReg::findTypedInstance<LLPreviewLSL>("preview_script", *item_uuid);
if( preview )
{
if(0 == status)
@@ -1559,37 +1357,10 @@ void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAsset
delete item_uuid;
}
-// static
-LLPreviewLSL* LLPreviewLSL::getInstance( const LLUUID& item_uuid )
-{
- LLPreview* instance = NULL;
- preview_map_t::iterator found_it = LLPreview::sInstances.find(item_uuid);
- if(found_it != LLPreview::sInstances.end())
- {
- instance = found_it->second;
- }
- return (LLPreviewLSL*)instance;
-}
-
-void LLPreviewLSL::reshape(S32 width, S32 height, BOOL called_from_parent)
-{
- LLPreview::reshape( width, height, called_from_parent );
-
- if( !isMinimized() )
- {
- // So that next time you open a script it will have the same height and width
- // (although not the same position).
- gSavedSettings.setRect("PreviewScriptRect", getRect());
- }
-}
-
/// ---------------------------------------------------------------------------
/// LLLiveLSLEditor
/// ---------------------------------------------------------------------------
-LLMap<LLUUID, LLLiveLSLEditor*> LLLiveLSLEditor::sInstances;
-
-
//static
void* LLLiveLSLEditor::createScriptEdPanel(void* userdata)
@@ -1597,8 +1368,7 @@ void* LLLiveLSLEditor::createScriptEdPanel(void* userdata)
LLLiveLSLEditor *self = (LLLiveLSLEditor*)userdata;
- self->mScriptEd = new LLScriptEdCore("script ed panel",
- LLRect(),
+ self->mScriptEd = new LLScriptEdCore(
HELLO_LSL,
HELP_LSL_URL,
self->getHandle(),
@@ -1612,72 +1382,40 @@ void* LLLiveLSLEditor::createScriptEdPanel(void* userdata)
}
-LLLiveLSLEditor::LLLiveLSLEditor(const std::string& name,
- const LLRect& rect,
- const std::string& title,
- const LLUUID& object_id,
- const LLUUID& item_id) :
- LLPreview(name, rect, title, item_id, object_id, TRUE, SCRIPT_MIN_WIDTH, SCRIPT_MIN_HEIGHT),
- mObjectID(object_id),
- mItemID(item_id),
+LLLiveLSLEditor::LLLiveLSLEditor(const LLSD& key) :
+ LLPreview(key),
mScriptEd(NULL),
mAskedForRunningInfo(FALSE),
mHaveRunningInfo(FALSE),
mCloseAfterSave(FALSE),
mPendingUploads(0),
- mIsModifiable(FALSE)
+ mIsModifiable(FALSE),
+ mIsNew(false)
{
+ mFactoryMap["script ed panel"] = LLCallbackMap(LLLiveLSLEditor::createScriptEdPanel, this);
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this,"floater_live_lsleditor.xml", FALSE);
+}
-
- BOOL is_new = FALSE;
- if(mItemID.isNull())
- {
- mItemID.generate();
- is_new = TRUE;
- }
-
-
- LLLiveLSLEditor::sInstances.addData(mItemID ^ mObjectID, this);
-
- LLCallbackMap::map_t factory_map;
- factory_map["script ed panel"] = LLCallbackMap(LLLiveLSLEditor::createScriptEdPanel, this);
-
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_live_lsleditor.xml", &factory_map);
-
- mMonoCheckbox = getChild<LLCheckBoxCtrl>("mono");
- childSetCommitCallback("mono", &LLLiveLSLEditor::onMonoCheckboxClicked, this);
- childSetEnabled("mono", FALSE);
-
+BOOL LLLiveLSLEditor::postBuild()
+{
childSetCommitCallback("running", LLLiveLSLEditor::onRunningCheckboxClicked, this);
childSetEnabled("running", FALSE);
childSetAction("Reset",&LLLiveLSLEditor::onReset,this);
childSetEnabled("Reset", TRUE);
+ mMonoCheckbox = getChild<LLCheckBoxCtrl>("mono");
+ childSetCommitCallback("mono", &LLLiveLSLEditor::onMonoCheckboxClicked, this);
+ childSetEnabled("mono", FALSE);
mScriptEd->mEditor->makePristine();
- loadAsset(is_new);
mScriptEd->mEditor->setFocus(TRUE);
-
- if (!getHost())
- {
- LLRect curRect = getRect();
- translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
- }
-
- setTitle(title);
+ return LLPreview::postBuild();
}
LLLiveLSLEditor::~LLLiveLSLEditor()
{
- LLLiveLSLEditor::sInstances.removeData(mItemID ^ mObjectID);
-}
-
-// this is called via LLPreview::loadAsset() virtual method
-void LLLiveLSLEditor::loadAsset()
-{
- loadAsset(FALSE);
}
// virtual
@@ -1686,9 +1424,8 @@ void LLLiveLSLEditor::callbackLSLCompileSucceeded(const LLUUID& task_id,
bool is_script_running)
{
lldebugs << "LSL Bytecode saved" << llendl;
- // *TODO: Translate
- mScriptEd->mErrorList->addCommentText(std::string("Compile successful!"));
- mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
+ mScriptEd->mErrorList->setCommentText(LLTrans::getString("Compilesuccessful"));
+ mScriptEd->mErrorList->setCommentText(LLTrans::getString("SaveComplete"));
closeIfNeeded();
}
@@ -1711,16 +1448,15 @@ void LLLiveLSLEditor::callbackLSLCompileFailed(const LLSD& compile_errors)
closeIfNeeded();
}
-void LLLiveLSLEditor::loadAsset(BOOL is_new)
+void LLLiveLSLEditor::loadAsset()
{
//llinfos << "LLLiveLSLEditor::loadAsset()" << llendl;
- if(!is_new)
+ if(!mIsNew)
{
- LLViewerObject* object = gObjectList.findObject(mObjectID);
+ LLViewerObject* object = gObjectList.findObject(mObjectUUID);
if(object)
{
- // HACK! we "know" that mItemID refers to a LLViewerInventoryItem...
- LLViewerInventoryItem* item = (LLViewerInventoryItem*)object->getInventoryObject(mItemID);
+ LLViewerInventoryItem* item = dynamic_cast<LLViewerInventoryItem*>(object->getInventoryObject(mItemUUID));
if(item
&& (gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE)
|| gAgent.isGodlike()))
@@ -1744,23 +1480,23 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
else if(item && mItem.notNull())
{
// request the text from the object
- LLUUID* user_data = new LLUUID(mItemID ^ mObjectID);
+ LLUUID* user_data = new LLUUID(mItemUUID); // ^ mObjectUUID
gAssetStorage->getInvItemAsset(object->getRegion()->getHost(),
- gAgent.getID(),
- gAgent.getSessionID(),
- item->getPermissions().getOwner(),
- object->getID(),
- item->getUUID(),
- item->getAssetUUID(),
- item->getType(),
- &LLLiveLSLEditor::onLoadComplete,
- (void*)user_data,
- TRUE);
+ gAgent.getID(),
+ gAgent.getSessionID(),
+ item->getPermissions().getOwner(),
+ object->getID(),
+ item->getUUID(),
+ item->getAssetUUID(),
+ item->getType(),
+ &LLLiveLSLEditor::onLoadComplete,
+ (void*)user_data,
+ TRUE);
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_GetScriptRunning);
msg->nextBlockFast(_PREHASH_Script);
- msg->addUUIDFast(_PREHASH_ObjectID, mObjectID);
- msg->addUUIDFast(_PREHASH_ItemID, mItemID);
+ msg->addUUIDFast(_PREHASH_ObjectID, mObjectUUID);
+ msg->addUUIDFast(_PREHASH_ItemID, mItemUUID);
msg->sendReliable(object->getRegion()->getHost());
mAskedForRunningInfo = TRUE;
mAssetStatus = PREVIEW_ASSET_LOADING;
@@ -1789,26 +1525,12 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
gMessageSystem->addUUID("AgentID", gAgent.getID());
U32 local_id = object->getLocalID();
gMessageSystem->addData("LocalID", &local_id);
- gMessageSystem->addUUID("ItemID", mItemID);
+ gMessageSystem->addUUID("ItemID", mItemUUID);
LLHost host(object->getRegion()->getIP(),
object->getRegion()->getPort());
gMessageSystem->sendReliable(host);
*/
}
-
- // Initialization of the asset failed. Probably the result
- // of a bug somewhere else. Set up this editor in a no-go mode.
- if(mItem.isNull())
- {
- // Set the inventory item to an incomplete item.
- // This may be better than having a accessible null pointer around,
- // though this newly allocated object will most likely be replaced.
- mItem = new LLViewerInventoryItem();
- mScriptEd->setScriptText(LLStringUtil::null, FALSE);
- mScriptEd->mEditor->makePristine();
- mScriptEd->mEditor->setEnabled(FALSE);
- mAssetStatus = PREVIEW_ASSET_LOADED;
- }
}
else
{
@@ -1817,17 +1539,17 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new)
LLPermissions perm;
perm.init(gAgent.getID(), gAgent.getID(), LLUUID::null, gAgent.getGroupID());
perm.initMasks(PERM_ALL, PERM_ALL, PERM_NONE, PERM_NONE, PERM_MOVE | PERM_TRANSFER);
- mItem = new LLViewerInventoryItem(mItemID,
- mObjectID,
- perm,
- LLUUID::null,
- LLAssetType::AT_LSL_TEXT,
- LLInventoryType::IT_LSL,
- DEFAULT_SCRIPT_NAME,
- DEFAULT_SCRIPT_DESC,
- LLSaleInfo::DEFAULT,
- LLInventoryItem::II_FLAGS_NONE,
- time_corrected());
+ mItem = new LLViewerInventoryItem(mItemUUID,
+ mObjectUUID,
+ perm,
+ LLUUID::null,
+ LLAssetType::AT_LSL_TEXT,
+ LLInventoryType::IT_LSL,
+ DEFAULT_SCRIPT_NAME,
+ DEFAULT_SCRIPT_DESC,
+ LLSaleInfo::DEFAULT,
+ LLInventoryItem::II_FLAGS_NONE,
+ time_corrected());
mAssetStatus = PREVIEW_ASSET_LOADED;
}
}
@@ -1839,12 +1561,12 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id,
{
lldebugs << "LLLiveLSLEditor::onLoadComplete: got uuid " << asset_id
<< llendl;
- LLLiveLSLEditor* instance = NULL;
LLUUID* xored_id = (LLUUID*)user_data;
-
- if( LLLiveLSLEditor::sInstances.checkData(*xored_id) )
+
+ LLLiveLSLEditor* instance = LLFloaterReg::findTypedInstance<LLLiveLSLEditor>("preview_scriptedit", *xored_id);
+
+ if(instance )
{
- instance = LLLiveLSLEditor::sInstances[*xored_id];
if( LL_ERR_NOERR == status )
{
instance->loadScriptText(vfs, asset_id, type);
@@ -1930,7 +1652,7 @@ void LLLiveLSLEditor::loadScriptText(LLVFS *vfs, const LLUUID &uuid, LLAssetType
void LLLiveLSLEditor::onRunningCheckboxClicked( LLUICtrl*, void* userdata )
{
LLLiveLSLEditor* self = (LLLiveLSLEditor*) userdata;
- LLViewerObject* object = gObjectList.findObject( self->mObjectID );
+ LLViewerObject* object = gObjectList.findObject( self->mObjectUUID );
LLCheckBoxCtrl* runningCheckbox = self->getChild<LLCheckBoxCtrl>("running");
BOOL running = runningCheckbox->get();
//self->mRunningCheckbox->get();
@@ -1942,8 +1664,8 @@ void LLLiveLSLEditor::onRunningCheckboxClicked( LLUICtrl*, void* userdata )
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->nextBlockFast(_PREHASH_Script);
- msg->addUUIDFast(_PREHASH_ObjectID, self->mObjectID);
- msg->addUUIDFast(_PREHASH_ItemID, self->mItemID);
+ msg->addUUIDFast(_PREHASH_ObjectID, self->mObjectUUID);
+ msg->addUUIDFast(_PREHASH_ItemID, self->mItemUUID);
msg->addBOOLFast(_PREHASH_Running, running);
msg->sendReliable(object->getRegion()->getHost());
}
@@ -1958,7 +1680,7 @@ void LLLiveLSLEditor::onReset(void *userdata)
{
LLLiveLSLEditor* self = (LLLiveLSLEditor*) userdata;
- LLViewerObject* object = gObjectList.findObject( self->mObjectID );
+ LLViewerObject* object = gObjectList.findObject( self->mObjectUUID );
if(object)
{
LLMessageSystem* msg = gMessageSystem;
@@ -1967,8 +1689,8 @@ void LLLiveLSLEditor::onReset(void *userdata)
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->nextBlockFast(_PREHASH_Script);
- msg->addUUIDFast(_PREHASH_ObjectID, self->mObjectID);
- msg->addUUIDFast(_PREHASH_ItemID, self->mItemID);
+ msg->addUUIDFast(_PREHASH_ObjectID, self->mObjectUUID);
+ msg->addUUIDFast(_PREHASH_ItemID, self->mItemUUID);
msg->sendReliable(object->getRegion()->getHost());
}
else
@@ -1979,7 +1701,7 @@ void LLLiveLSLEditor::onReset(void *userdata)
void LLLiveLSLEditor::draw()
{
- LLViewerObject* object = gObjectList.findObject(mObjectID);
+ LLViewerObject* object = gObjectList.findObject(mObjectUUID);
LLCheckBoxCtrl* runningCheckbox = getChild<LLCheckBoxCtrl>( "running");
if(object && mAskedForRunningInfo && mHaveRunningInfo)
{
@@ -2024,14 +1746,13 @@ void LLLiveLSLEditor::draw()
{
// HACK: Display this information in the title bar.
// Really ought to put in main window.
- // *TODO: Translate
- setTitle(std::string("Script (object out of range)"));
+ setTitle(LLTrans::getString("ObjectOutOfRange"));
runningCheckbox->setEnabled(FALSE);
// object may have fallen out of range.
mHaveRunningInfo = FALSE;
}
- LLFloater::draw();
+ LLPreview::draw();
}
@@ -2083,15 +1804,14 @@ void LLLiveLSLEditor::saveIfNeeded()
// name on save, because the viewer object version of the item,
// and the editor version would get out of synch. Here's a good
// place to synch them back up.
- // HACK! we "know" that mItemID refers to a LLInventoryItem...
- LLInventoryItem* inv_item = (LLInventoryItem*)object->getInventoryObject(mItemID);
+ LLInventoryItem* inv_item = dynamic_cast<LLInventoryItem*>(object->getInventoryObject(mItemUUID));
if(inv_item)
{
mItem->copyItem(inv_item);
}
// Don't need to save if we're pristine
- if(!LLScriptEdCore::hasChanged(mScriptEd))
+ if(!mScriptEd->hasChanged())
{
return;
}
@@ -2145,8 +1865,7 @@ void LLLiveLSLEditor::saveIfNeeded()
BOOL is_running = getChild<LLCheckBoxCtrl>( "running")->get();
if (!url.empty())
{
- uploadAssetViaCaps(url, filename, mObjectID,
- mItemID, is_running);
+ uploadAssetViaCaps(url, filename, mObjectID, mItemUUID, is_running);
}
else if (gAssetStorage)
{
@@ -2238,8 +1957,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
else
{
llinfos << "Compile worked!" << llendl;
- // *TODO: Translate
- mScriptEd->mErrorList->addCommentText(std::string("Compile successful, saving..."));
+ mScriptEd->mErrorList->setCommentText(LLTrans::getString("CompileSuccessfulSaving"));
if(gAssetStorage)
{
llinfos << "LLLiveLSLEditor::saveAsset "
@@ -2283,7 +2001,7 @@ void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_da
}
else
{
- LLLiveLSLEditor* self = sInstances.getIfThere(data->mItem->getUUID() ^ data->mObjectID);
+ LLLiveLSLEditor* self = LLFloaterReg::findTypedInstance<LLLiveLSLEditor>("preview_scriptedit", data->mItem->getUUID()); // ^ data->mObjectID
if (self)
{
self->getWindow()->decBusyCount();
@@ -2291,7 +2009,7 @@ void LLLiveLSLEditor::onSaveTextComplete(const LLUUID& asset_uuid, void* user_da
if (self->mPendingUploads <= 0
&& self->mCloseAfterSave)
{
- self->close();
+ self->closeFloater();
}
}
}
@@ -2308,20 +2026,18 @@ void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* use
if(0 ==status)
{
llinfos << "LSL Bytecode saved" << llendl;
- LLUUID xor_id = data->mItem->getUUID() ^ data->mObjectID;
- LLLiveLSLEditor* self = sInstances.getIfThere(xor_id);
- if(self)
+ LLLiveLSLEditor* self = LLFloaterReg::findTypedInstance<LLLiveLSLEditor>("preview_scriptedit", data->mItem->getUUID()); // ^ data->mObjectID
+ if (self)
{
// Tell the user that the compile worked.
- // *TODO: Translate
- self->mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
+ self->mScriptEd->mErrorList->setCommentText(LLTrans::getString("SaveComplete"));
// close the window if this completes both uploads
self->getWindow()->decBusyCount();
self->mPendingUploads--;
if (self->mPendingUploads <= 0
&& self->mCloseAfterSave)
{
- self->close();
+ self->closeFloater();
}
}
LLViewerObject* object = gObjectList.findObject(data->mObjectID);
@@ -2349,11 +2065,6 @@ void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* use
delete data;
}
-void LLLiveLSLEditor::open()
-{
- LLFloater::open(); /*Flawfinder: ignore*/
-}
-
BOOL LLLiveLSLEditor::canClose()
{
return (mScriptEd->canClose());
@@ -2365,7 +2076,7 @@ void LLLiveLSLEditor::closeIfNeeded()
mPendingUploads--;
if (mPendingUploads <= 0 && mCloseAfterSave)
{
- close();
+ closeFloater();
}
}
@@ -2384,42 +2095,6 @@ void LLLiveLSLEditor::onSave(void* userdata, BOOL close_after_save)
self->saveIfNeeded();
}
-// static
-LLLiveLSLEditor* LLLiveLSLEditor::show(const LLUUID& script_id, const LLUUID& object_id)
-{
- LLLiveLSLEditor* instance = NULL;
- LLUUID xored_id = script_id ^ object_id;
- if(LLLiveLSLEditor::sInstances.checkData(xored_id))
- {
- // Move the existing view to the front
- instance = LLLiveLSLEditor::sInstances[xored_id];
- instance->open(); /*Flawfinder: ignore*/
- }
- return instance;
-}
-
-// static
-void LLLiveLSLEditor::hide(const LLUUID& script_id, const LLUUID& object_id)
-{
- LLUUID xored_id = script_id ^ object_id;
- if( LLLiveLSLEditor::sInstances.checkData( xored_id ) )
- {
- LLLiveLSLEditor* instance = LLLiveLSLEditor::sInstances[xored_id];
- if(instance->getParent())
- {
- instance->getParent()->removeChild(instance);
- }
- delete instance;
- }
-}
-// static
-LLLiveLSLEditor* LLLiveLSLEditor::find(const LLUUID& script_id, const LLUUID& object_id)
-{
- LLUUID xored_id = script_id ^ object_id;
- return sInstances.getIfThere(xored_id);
-}
-
-
// static
void LLLiveLSLEditor::processScriptRunningReply(LLMessageSystem* msg, void**)
{
@@ -2427,10 +2102,10 @@ void LLLiveLSLEditor::processScriptRunningReply(LLMessageSystem* msg, void**)
LLUUID object_id;
msg->getUUIDFast(_PREHASH_Script, _PREHASH_ObjectID, object_id);
msg->getUUIDFast(_PREHASH_Script, _PREHASH_ItemID, item_id);
- LLUUID xored_id = item_id ^ object_id;
- if(LLLiveLSLEditor::sInstances.checkData(xored_id))
+
+ LLLiveLSLEditor* instance = LLFloaterReg::findTypedInstance<LLLiveLSLEditor>("preview_scriptedit", item_id); // ^ object_id
+ if(instance)
{
- LLLiveLSLEditor* instance = LLLiveLSLEditor::sInstances[xored_id];
instance->mHaveRunningInfo = TRUE;
BOOL running;
msg->getBOOLFast(_PREHASH_Script, _PREHASH_Running, running);
@@ -2444,18 +2119,6 @@ void LLLiveLSLEditor::processScriptRunningReply(LLMessageSystem* msg, void**)
}
}
-void LLLiveLSLEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
-{
- LLFloater::reshape( width, height, called_from_parent );
-
- if( !isMinimized() )
- {
- // So that next time you open a script it will have the same height and width
- // (although not the same position).
- gSavedSettings.setRect("PreviewScriptRect", getRect());
- }
-}
-
void LLLiveLSLEditor::onMonoCheckboxClicked(LLUICtrl*, void* userdata)
{
LLLiveLSLEditor* self = static_cast<LLLiveLSLEditor*>(userdata);
diff --git a/indra/newview/llpreviewscript.h b/indra/newview/llpreviewscript.h
index eb8b414709..623886101a 100644
--- a/indra/newview/llpreviewscript.h
+++ b/indra/newview/llpreviewscript.h
@@ -63,8 +63,6 @@ class LLScriptEdCore : public LLPanel
public:
LLScriptEdCore(
- const std::string& name,
- const LLRect& rect,
const std::string& sample,
const std::string& help_url,
const LLHandle<LLFloater>& floater_handle,
@@ -78,45 +76,30 @@ public:
void initMenu();
virtual void draw();
-
+ /*virtual*/ BOOL postBuild();
BOOL canClose();
void setScriptText(const std::string& text, BOOL is_valid);
+
+ void doSave( BOOL close_after_save );
bool handleSaveChangesDialog(const LLSD& notification, const LLSD& response);
bool handleReloadFromServerDialog(const LLSD& notification, const LLSD& response);
static bool onHelpWebDialog(const LLSD& notification, const LLSD& response);
- static void onBtnHelp(void* userdata);
- static void onBtnDynamicHelp(void* userdata);
static void onCheckLock(LLUICtrl*, void*);
static void onHelpComboCommit(LLUICtrl* ctrl, void* userdata);
static void onClickBack(void* userdata);
static void onClickForward(void* userdata);
static void onBtnInsertSample(void*);
static void onBtnInsertFunction(LLUICtrl*, void*);
- static void doSave( void* userdata, BOOL close_after_save );
- static void onBtnSave(void*);
- static void onBtnUndoChanges(void*);
- static void onSearchMenu(void* userdata);
-
- static void onUndoMenu(void* userdata);
- static void onRedoMenu(void* userdata);
- static void onCutMenu(void* userdata);
- static void onCopyMenu(void* userdata);
- static void onPasteMenu(void* userdata);
- static void onSelectAllMenu(void* userdata);
- static void onDeselectMenu(void* userdata);
-
- static BOOL enableUndoMenu(void* userdata);
- static BOOL enableRedoMenu(void* userdata);
- static BOOL enableCutMenu(void* userdata);
- static BOOL enableCopyMenu(void* userdata);
- static BOOL enablePasteMenu(void* userdata);
- static BOOL enableSelectAllMenu(void* userdata);
- static BOOL enableDeselectMenu(void* userdata);
-
- static BOOL hasChanged(void* userdata);
+
+private:
+ void onBtnHelp();
+ void onBtnDynamicHelp();
+ void onBtnUndoChanges();
+
+ bool hasChanged();
void selectFirstError();
@@ -131,8 +114,6 @@ protected:
void addHelpItemToHistory(const std::string& help_string);
static void onErrorList(LLUICtrl*, void* user_data);
- virtual const char *getTitleName() const { return "Script"; }
-
private:
std::string mSampleText;
std::string mHelpURL;
@@ -160,17 +141,15 @@ private:
class LLPreviewLSL : public LLPreview
{
public:
- LLPreviewLSL(const std::string& name, const LLRect& rect, const std::string& title,
- const LLUUID& item_uuid );
+ LLPreviewLSL(const LLSD& key );
virtual void callbackLSLCompileSucceeded();
virtual void callbackLSLCompileFailed(const LLSD& compile_errors);
- /*virtual*/ void open(); /*Flawfinder: ignore*/
+ /*virtual*/ BOOL postBuild();
protected:
virtual BOOL canClose();
void closeIfNeeded();
- virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
virtual void loadAsset();
void saveIfNeeded();
@@ -190,15 +169,13 @@ protected:
void* user_data, S32 status, LLExtStat ext_status);
static void onSaveComplete(const LLUUID& uuid, void* user_data, S32 status, LLExtStat ext_status);
static void onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
-public:
- static LLPreviewLSL* getInstance(const LLUUID& uuid);
+
protected:
static void* createScriptEdPanel(void* userdata);
protected:
- virtual const char *getTitleName() const { return "Script"; }
LLScriptEdCore* mScriptEd;
// Can safely close only after both text and bytecode are uploaded
S32 mPendingUploads;
@@ -210,16 +187,10 @@ protected:
class LLLiveLSLEditor : public LLPreview
{
public:
- LLLiveLSLEditor(const std::string& name, const LLRect& rect,
- const std::string& title,
- const LLUUID& object_id, const LLUUID& item_id);
+ LLLiveLSLEditor(const LLSD& key);
~LLLiveLSLEditor();
- static LLLiveLSLEditor* show(const LLUUID& item_id, const LLUUID& object_id);
- static void hide(const LLUUID& item_id, const LLUUID& object_id);
- static LLLiveLSLEditor* find(const LLUUID& item_id, const LLUUID& object_id);
-
static void processScriptRunningReply(LLMessageSystem* msg, void**);
virtual void callbackLSLCompileSucceeded(const LLUUID& task_id,
@@ -227,14 +198,14 @@ public:
bool is_script_running);
virtual void callbackLSLCompileFailed(const LLSD& compile_errors);
- // Overide LLPreview::open() to avoid calling loadAsset twice.
- /*virtual*/ void open(); /*Flawfinder: ignore*/
-
-protected:
+ /*virtual*/ BOOL postBuild();
+
+ void setIsNew() { mIsNew = TRUE; }
+
+private:
virtual BOOL canClose();
void closeIfNeeded();
virtual void draw();
- virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
virtual void loadAsset();
void loadAsset(BOOL is_new);
@@ -248,6 +219,8 @@ protected:
LLViewerObject* object,
const LLTransactionID& tid,
BOOL is_running);
+ BOOL monoChecked() const;
+
static void onSearchReplace(void* userdata);
static void onLoad(void* userdata);
@@ -268,30 +241,23 @@ protected:
static void* createScriptEdPanel(void* userdata);
+ static void onMonoCheckboxClicked(LLUICtrl*, void* userdata);
-protected:
- LLUUID mObjectID;
- LLUUID mItemID; // The inventory item this script is associated with
- BOOL mIsNew;
- LLScriptEdCore* mScriptEd;
+private:
+ bool mIsNew;
+ LLScriptEdCore* mScriptEd;
//LLUUID mTransmitID;
- LLCheckBoxCtrl *mRunningCheckbox;
- BOOL mAskedForRunningInfo;
- BOOL mHaveRunningInfo;
- LLButton *mResetButton;
+ LLCheckBoxCtrl* mRunningCheckbox;
+ BOOL mAskedForRunningInfo;
+ BOOL mHaveRunningInfo;
+ LLButton* mResetButton;
LLPointer<LLViewerInventoryItem> mItem;
- BOOL mCloseAfterSave;
+ BOOL mCloseAfterSave;
// need to save both text and script, so need to decide when done
- S32 mPendingUploads;
+ S32 mPendingUploads;
- static LLMap<LLUUID, LLLiveLSLEditor*> sInstances;
BOOL getIsModifiable() const { return mIsModifiable; } // Evaluated on load assert
-private:
-
- static void onMonoCheckboxClicked(LLUICtrl*, void* userdata);
- BOOL monoChecked() const;
-
LLCheckBoxCtrl* mMonoCheckbox;
BOOL mIsModifiable;
};
diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp
index 26d8da5a6b..7e7be5b2c6 100644
--- a/indra/newview/llpreviewsound.cpp
+++ b/indra/newview/llpreviewsound.cpp
@@ -49,12 +49,23 @@ extern LLAgent gAgent;
const F32 SOUND_GAIN = 1.0f;
-LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid) :
- LLPreview( name, rect, title, item_uuid, object_uuid)
+LLPreviewSound::LLPreviewSound(const LLSD& key)
+ : LLPreview( key )
{
-
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_sound.xml");
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_sound.xml", FALSE);
+}
+// virtual
+BOOL LLPreviewSound::postBuild()
+{
+ const LLInventoryItem* item = getItem();
+ if (item)
+ {
+ childSetText("desc", item->getDescription());
+ if (gAudiop)
+ gAudiop->preloadSound(item->getAssetUUID()); // preload the sound
+ }
+
childSetAction("Sound play btn",&LLPreviewSound::playSound,this);
childSetAction("Sound audition btn",&LLPreviewSound::auditionSound,this);
@@ -64,26 +75,10 @@ LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, cons
button = getChild<LLButton>("Sound audition btn");
button->setSoundFlags(LLView::SILENT);
- const LLInventoryItem* item = getItem();
-
childSetCommitCallback("desc", LLPreview::onText, this);
- childSetText("desc", item->getDescription());
childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe);
-
- // preload the sound
- if(item && gAudiop)
- {
- gAudiop->preloadSound(item->getAssetUUID());
- }
-
- setTitle(title);
-
- if (!getHost())
- {
- LLRect curRect = getRect();
- translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
- }
+ return LLPreview::postBuild();
}
// static
diff --git a/indra/newview/llpreviewsound.h b/indra/newview/llpreviewsound.h
index 061fbdf685..c4bf8c9a30 100644
--- a/indra/newview/llpreviewsound.h
+++ b/indra/newview/llpreviewsound.h
@@ -38,16 +38,13 @@
class LLPreviewSound : public LLPreview
{
public:
- LLPreviewSound(const std::string& name, const LLRect& rect, const std::string& title,
- const LLUUID& item_uuid,
- const LLUUID& object_uuid = LLUUID::null);
+ LLPreviewSound(const LLSD& key);
static void playSound( void* userdata );
static void auditionSound( void* userdata );
protected:
- virtual const char *getTitleName() const { return "Sound"; }
-
+ /* virtual */ BOOL postBuild();
};
#endif // LL_LLPREVIEWSOUND_H
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 13e7cca464..3204006e43 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -37,10 +37,12 @@
#include "llagent.h"
#include "llbutton.h"
#include "llfilepicker.h"
+#include "llfloaterreg.h"
#include "llimagetga.h"
#include "llinventoryview.h"
#include "llinventory.h"
#include "llresmgr.h"
+#include "lltrans.h"
#include "lltextbox.h"
#include "lltextureview.h"
#include "llui.h"
@@ -50,30 +52,24 @@
#include "llviewerwindow.h"
#include "lllineeditor.h"
-const S32 PREVIEW_TEXTURE_MIN_WIDTH = 300;
-const S32 PREVIEW_TEXTURE_MIN_HEIGHT = 120;
-
const S32 CLIENT_RECT_VPAD = 4;
const F32 SECONDS_TO_SHOW_FILE_SAVED_MSG = 8.f;
-LLPreviewTexture::LLPreviewTexture(const std::string& name,
- const LLRect& rect,
- const std::string& title,
- const LLUUID& item_uuid,
- const LLUUID& object_id,
- BOOL show_keep_discard)
-: LLPreview(name, rect, title, item_uuid, object_id, TRUE, PREVIEW_TEXTURE_MIN_WIDTH, PREVIEW_TEXTURE_MIN_HEIGHT ),
- mLoadingFullImage( FALSE ),
- mShowKeepDiscard(show_keep_discard),
- mCopyToInv(FALSE),
- mIsCopyable(FALSE),
- mLastHeight(0),
- mLastWidth(0)
+LLPreviewTexture::LLPreviewTexture(const LLSD& key)
+ : LLPreview( key ),
+ mLoadingFullImage( FALSE ),
+ mShowKeepDiscard(FALSE),
+ mCopyToInv(FALSE),
+ mIsCopyable(FALSE),
+ mUpdateDimensions(TRUE),
+ mLastHeight(0),
+ mLastWidth(0)
{
const LLInventoryItem *item = getItem();
if(item)
{
+ mShowKeepDiscard = item->getPermissions().getCreator() != gAgent.getID();
mImageID = item->getAssetUUID();
const LLPermissions& perm = item->getPermissions();
U32 mask = PERM_NONE;
@@ -94,52 +90,14 @@ LLPreviewTexture::LLPreviewTexture(const std::string& name,
mIsCopyable = TRUE;
}
}
-
- init();
-
- setTitle(title);
-
- if (!getHost())
+ else // not an item, assume it's an asset id
{
- LLRect curRect = getRect();
- translate(rect.mLeft - curRect.mLeft, rect.mTop - curRect.mTop);
+ mImageID = mItemUUID;
+ mCopyToInv = TRUE;
+ mIsCopyable = TRUE;
}
-}
-
-
-// Note: uses asset_id as a dummy item id.
-LLPreviewTexture::LLPreviewTexture(
- const std::string& name,
- const LLRect& rect,
- const std::string& title,
- const LLUUID& asset_id,
- BOOL copy_to_inv)
- :
- LLPreview(
- name,
- rect,
- title,
- asset_id,
- LLUUID::null,
- TRUE,
- PREVIEW_TEXTURE_MIN_WIDTH,
- PREVIEW_TEXTURE_MIN_HEIGHT ),
- mImageID(asset_id),
- mLoadingFullImage( FALSE ),
- mShowKeepDiscard(FALSE),
- mCopyToInv(copy_to_inv),
- mIsCopyable(TRUE),
- mLastHeight(0),
- mLastWidth(0)
-{
- init();
-
- setTitle(title);
-
- LLRect curRect = getRect();
- translate(curRect.mLeft - rect.mLeft, curRect.mTop - rect.mTop);
-
+ //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_texture.xml", FALSE);
}
@@ -153,32 +111,26 @@ LLPreviewTexture::~LLPreviewTexture()
mImage = NULL;
}
-
-void LLPreviewTexture::init()
+// virtual
+BOOL LLPreviewTexture::postBuild()
{
-
-
if (mCopyToInv)
{
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_embedded_texture.xml");
-
- childSetAction("Copy To Inventory",LLPreview::onBtnCopyToInv,this);
+ getChild<LLButton>("Keep")->setLabel(getString("Copy"));
+ childSetAction("Keep",LLPreview::onBtnCopyToInv,this);
+ childSetVisible("Discard", false);
}
-
else if (mShowKeepDiscard)
{
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_texture_keep_discard.xml");
-
childSetAction("Keep",onKeepBtn,this);
childSetAction("Discard",onDiscardBtn,this);
}
-
- else
+ else
{
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_texture.xml");
+ childSetVisible("Keep", false);
+ childSetVisible("Discard", false);
}
-
-
+
if (!mCopyToInv)
{
const LLInventoryItem* item = getItem();
@@ -190,12 +142,17 @@ void LLPreviewTexture::init()
childSetPrevalidate("desc", &LLLineEditor::prevalidatePrintableNotPipe);
}
}
+
+ return LLPreview::postBuild();
}
void LLPreviewTexture::draw()
{
- updateDimensions();
-
+ if (mUpdateDimensions)
+ {
+ updateDimensions();
+ }
+
LLPreview::draw();
if (!isMinimized())
@@ -241,11 +198,11 @@ void LLPreviewTexture::draw()
if( mLoadingFullImage )
{
- // *TODO: Translate
- LLFontGL::getFontSansSerif()->renderUTF8(std::string("Receiving:"), 0,
+ LLFontGL::getFontSansSerif()->renderUTF8(LLTrans::getString("Receiving:"), 0,
interior.mLeft + 4,
interior.mBottom + 4,
LLColor4::white, LLFontGL::LEFT, LLFontGL::BOTTOM,
+ LLFontGL::NORMAL,
LLFontGL::DROP_SHADOW);
F32 data_progress = mImage->mDownloadProgress;
@@ -278,11 +235,11 @@ void LLPreviewTexture::draw()
else
if( !mSavedFileTimer.hasExpired() )
{
- // *TODO: Translate
- LLFontGL::getFontSansSerif()->renderUTF8(std::string("File Saved"), 0,
+ LLFontGL::getFontSansSerif()->renderUTF8(LLTrans::getString("FileSaved"), 0,
interior.mLeft + 4,
interior.mBottom + 4,
LLColor4::white, LLFontGL::LEFT, LLFontGL::BOTTOM,
+ LLFontGL::NORMAL,
LLFontGL::DROP_SHADOW);
}
}
@@ -300,10 +257,11 @@ BOOL LLPreviewTexture::canSaveAs() const
// virtual
void LLPreviewTexture::saveAs()
{
- if( mLoadingFullImage ) return;
+ if( mLoadingFullImage )
+ return;
LLFilePicker& file_picker = LLFilePicker::instance();
- const LLViewerInventoryItem* item = getItem() ;
+ const LLInventoryItem* item = getItem() ;
if( !file_picker.getSaveFile( LLFilePicker::FFSAVE_TGA, item ? LLDir::getScrubbedFileName(item->getName()) : LLStringUtil::null) )
{
// User canceled or we failed to acquire save file.
@@ -317,6 +275,23 @@ void LLPreviewTexture::saveAs()
0, TRUE, FALSE, new LLUUID( mItemUUID ) );
}
+// virtual
+void LLPreviewTexture::reshape(S32 width, S32 height, BOOL called_from_parent)
+{
+// mLastHeight = 0;
+// mLastWidth = 0;
+ mUpdateDimensions = TRUE;
+ LLPreview::reshape(width, height, called_from_parent);
+}
+
+// virtual
+void LLPreviewTexture::onFocusReceived()
+{
+ mLastHeight = 0;
+ mLastWidth = 0;
+ mUpdateDimensions = TRUE;
+ LLPreview::onFocusReceived();
+}
// static
void LLPreviewTexture::onFileLoadedForSave(BOOL success,
@@ -328,12 +303,8 @@ void LLPreviewTexture::onFileLoadedForSave(BOOL success,
void* userdata)
{
LLUUID* item_uuid = (LLUUID*) userdata;
- LLPreviewTexture* self = NULL;
- preview_map_t::iterator found_it = LLPreview::sInstances.find(*item_uuid);
- if(found_it != LLPreview::sInstances.end())
- {
- self = (LLPreviewTexture*) found_it->second;
- }
+
+ LLPreviewTexture* self = LLFloaterReg::findTypedInstance<LLPreviewTexture>("preview_texture", *item_uuid);
if( final || !success )
{
@@ -381,8 +352,11 @@ void LLPreviewTexture::onFileLoadedForSave(BOOL success,
// When we receive it, reshape the window accordingly.
void LLPreviewTexture::updateDimensions()
{
- if (!mImage) return;
-
+ if (!mImage)
+ return;
+
+ mUpdateDimensions = FALSE;
+
S32 image_height = llmax(1, mImage->getHeight(0));
S32 image_width = llmax(1, mImage->getWidth(0));
// Attempt to make the image 1:1 on screen.
@@ -400,7 +374,7 @@ void LLPreviewTexture::updateDimensions()
client_width /= 2;
client_height /= 2;
}
-
+
S32 view_width = client_width + horiz_pad;
S32 view_height = client_height + vert_pad;
@@ -427,27 +401,36 @@ void LLPreviewTexture::updateDimensions()
view_width = llmax(view_width, getMinWidth());
view_height = llmax(view_height, getMinHeight());
- if (client_height != mLastHeight || client_width != mLastWidth)
+ if (view_height != mLastHeight || view_width != mLastWidth)
{
- mLastWidth = client_width;
- mLastHeight = client_height;
-
- S32 old_top = getRect().mTop;
- S32 old_left = getRect().mLeft;
if (getHost())
{
getHost()->growToFit(view_width, view_height);
+ reshape( view_width, view_height );
+ setOrigin( 0, getHost()->getRect().getHeight() - (view_height + PREVIEW_HEADER_SIZE) );
}
else
{
+ S32 old_top = getRect().mTop;
+ S32 old_left = getRect().mLeft;
reshape( view_width, view_height );
S32 new_bottom = old_top - getRect().getHeight();
setOrigin( old_left, new_bottom );
- // Try to keep whole view onscreen, don't allow partial offscreen.
+ }
+
+ // Try to keep whole view onscreen, don't allow partial offscreen.
+ if (getHost())
+ gFloaterView->adjustToFitScreen(getHost(), FALSE);
+ else
gFloaterView->adjustToFitScreen(this, FALSE);
+
+ if (image_height > 1 && image_width > 1)
+ {
+ // Resize until we know the image's height
+ mLastWidth = view_width;
+ mLastHeight = view_height;
}
}
-
if (!mUserResized)
{
@@ -484,6 +467,7 @@ void LLPreviewTexture::loadAsset()
mImage = gImageList.getImage(mImageID, MIPMAP_TRUE, FALSE);
mImage->setBoostLevel(LLViewerImage::BOOST_PREVIEW);
mAssetStatus = PREVIEW_ASSET_LOADING;
+ updateDimensions();
}
LLPreview::EAssetStatus LLPreviewTexture::getAssetStatus()
diff --git a/indra/newview/llpreviewtexture.h b/indra/newview/llpreviewtexture.h
index 75fd39eab0..45b173e7bf 100644
--- a/indra/newview/llpreviewtexture.h
+++ b/indra/newview/llpreviewtexture.h
@@ -43,19 +43,7 @@ class LLImageRaw;
class LLPreviewTexture : public LLPreview
{
public:
- LLPreviewTexture(
- const std::string& name,
- const LLRect& rect,
- const std::string& title,
- const LLUUID& item_uuid,
- const LLUUID& object_id,
- BOOL show_keep_discard = FALSE);
- LLPreviewTexture(
- const std::string& name,
- const LLRect& rect,
- const std::string& title,
- const LLUUID& asset_id,
- BOOL copy_to_inv = FALSE);
+ LLPreviewTexture(const LLSD& key);
~LLPreviewTexture();
virtual void draw();
@@ -65,7 +53,10 @@ public:
virtual void loadAsset();
virtual EAssetStatus getAssetStatus();
-
+
+ virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+ virtual void onFocusReceived();
+
static void saveToFile(void* userdata);
static void onFileLoadedForSave(
BOOL success,
@@ -79,9 +70,8 @@ public:
protected:
void init();
+ /* virtual */ BOOL postBuild();
- virtual const char *getTitleName() const { return "Texture"; }
-
private:
void updateDimensions();
LLUUID mImageID;
@@ -91,13 +81,14 @@ private:
LLFrameTimer mSavedFileTimer;
BOOL mShowKeepDiscard;
BOOL mCopyToInv;
-
+
// This is stored off in a member variable, because the save-as
// button and drag and drop functionality need to know.
BOOL mIsCopyable;
S32 mLastHeight;
S32 mLastWidth;
+ BOOL mUpdateDimensions;
};
diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index bfd14f709a..38d617e468 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -42,6 +42,7 @@
#include "llfontgl.h"
#include "llimagegl.h"
#include "lltimer.h"
+#include "lltextbox.h"
#include "llglheaders.h"
#include "llagent.h"
@@ -68,9 +69,9 @@ const F32 TOTAL_LOGIN_TIME = 10.f; // seconds, wild guess at time from GL contex
S32 gLastStartAnimationFrame = 0; // human-style indexing, first image = 1
const S32 ANIMATION_FRAMES = 1; //13;
-// XUI:translate
-LLProgressView::LLProgressView(const std::string& name, const LLRect &rect)
-: LLPanel(name, rect, FALSE),
+// XUI: Translate
+LLProgressView::LLProgressView(const LLRect &rect)
+: LLPanel(),
mPercentDone( 0.f ),
mURLInMessage(false),
mMouseDownInActiveArea( false )
@@ -84,7 +85,7 @@ BOOL LLProgressView::postBuild()
mProgressBar = getChild<LLProgressBar>("login_progress_bar");
mCancelBtn = getChild<LLButton>("cancel_btn");
- mCancelBtn->setClickedCallback( LLProgressView::onCancelButtonClicked );
+ mCancelBtn->setClickedCallback( LLProgressView::onCancelButtonClicked, NULL );
mFadeTimer.stop();
getChild<LLTextBox>("title_text")->setText(LLStringExplicit(LLAppViewer::instance()->getSecondLifeTitle()));
diff --git a/indra/newview/llprogressview.h b/indra/newview/llprogressview.h
index 9517ee1321..83574ff52a 100644
--- a/indra/newview/llprogressview.h
+++ b/indra/newview/llprogressview.h
@@ -43,7 +43,7 @@ class LLProgressBar;
class LLProgressView : public LLPanel
{
public:
- LLProgressView(const std::string& name, const LLRect& rect);
+ LLProgressView(const LLRect& rect);
virtual ~LLProgressView();
BOOL postBuild();
diff --git a/indra/newview/llsavedsettingsglue.cpp b/indra/newview/llsavedsettingsglue.cpp
index 073b51f80e..4736afa7ba 100644
--- a/indra/newview/llsavedsettingsglue.cpp
+++ b/indra/newview/llsavedsettingsglue.cpp
@@ -39,37 +39,27 @@
#include "llviewercontrol.h"
-void LLSavedSettingsGlue::setBOOL(LLUICtrl* ctrl, void* data)
+void LLSavedSettingsGlue::setBOOL(LLUICtrl* ctrl, const std::string& name)
{
- const char* name = (const char*)data;
- LLSD value = ctrl->getValue();
- gSavedSettings.setBOOL(name, value.asBoolean());
+ gSavedSettings.setBOOL(name, ctrl->getValue().asBoolean());
}
-void LLSavedSettingsGlue::setS32(LLUICtrl* ctrl, void* data)
+void LLSavedSettingsGlue::setS32(LLUICtrl* ctrl, const std::string& name)
{
- const char* name = (const char*)data;
- LLSD value = ctrl->getValue();
- gSavedSettings.setS32(name, value.asInteger());
+ gSavedSettings.setS32(name, ctrl->getValue().asInteger());
}
-void LLSavedSettingsGlue::setF32(LLUICtrl* ctrl, void* data)
+void LLSavedSettingsGlue::setF32(LLUICtrl* ctrl, const std::string& name)
{
- const char* name = (const char*)data;
- LLSD value = ctrl->getValue();
- gSavedSettings.setF32(name, (F32)value.asReal());
+ gSavedSettings.setF32(name, (F32)ctrl->getValue().asReal());
}
-void LLSavedSettingsGlue::setU32(LLUICtrl* ctrl, void* data)
+void LLSavedSettingsGlue::setU32(LLUICtrl* ctrl, const std::string& name)
{
- const char* name = (const char*)data;
- LLSD value = ctrl->getValue();
- gSavedSettings.setU32(name, (U32)value.asInteger());
+ gSavedSettings.setU32(name, (U32)ctrl->getValue().asInteger());
}
-void LLSavedSettingsGlue::setString(LLUICtrl* ctrl, void* data)
+void LLSavedSettingsGlue::setString(LLUICtrl* ctrl, const std::string& name)
{
- const char* name = (const char*)data;
- LLSD value = ctrl->getValue();
- gSavedSettings.setString(name, value.asString());
+ gSavedSettings.setString(name, ctrl->getValue().asString());
}
diff --git a/indra/newview/llsavedsettingsglue.h b/indra/newview/llsavedsettingsglue.h
index 8a0f36945c..6c8662dd58 100644
--- a/indra/newview/llsavedsettingsglue.h
+++ b/indra/newview/llsavedsettingsglue.h
@@ -42,11 +42,11 @@ class LLUICtrl;
class LLSavedSettingsGlue
{
public:
- static void setBOOL(LLUICtrl* ctrl, void* name);
- static void setS32(LLUICtrl* ctrl, void* name);
- static void setF32(LLUICtrl* ctrl, void* name);
- static void setU32(LLUICtrl* ctrl, void* name);
- static void setString(LLUICtrl* ctrl, void* name);
+ static void setBOOL(LLUICtrl* ctrl, const std::string& name);
+ static void setS32(LLUICtrl* ctrl, const std::string& name);
+ static void setF32(LLUICtrl* ctrl, const std::string& name);
+ static void setU32(LLUICtrl* ctrl, const std::string& name);
+ static void setString(LLUICtrl* ctrl, const std::string& name);
};
#endif
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 564313980d..0cca1ebe71 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -100,10 +100,10 @@ const S32 MAX_OBJECTS_PER_PACKET = 254;
// Globals
//
-BOOL gDebugSelectMgr = FALSE;
+//BOOL gDebugSelectMgr = FALSE;
-BOOL gHideSelectedObjects = FALSE;
-BOOL gAllowSelectAvatar = FALSE;
+//BOOL gHideSelectedObjects = FALSE;
+//BOOL gAllowSelectAvatar = FALSE;
BOOL LLSelectMgr::sRectSelectInclusive = TRUE;
BOOL LLSelectMgr::sRenderHiddenSelections = TRUE;
@@ -172,6 +172,9 @@ LLObjectSelection *get_null_object_selection()
// LLSelectMgr()
//-----------------------------------------------------------------------------
LLSelectMgr::LLSelectMgr()
+ : mHideSelectedObjects(LLCachedControl<bool>(gSavedSettings, "HideSelectedObjects", FALSE)),
+ mAllowSelectAvatar( LLCachedControl<bool>(gSavedSettings, "AllowSelectAvatar", FALSE)),
+ mDebugSelectMgr(LLCachedControl<bool>(gSavedSettings, "DebugSelectMgr", FALSE))
{
mTEMode = FALSE;
mLastCameraPos.clearVec();
@@ -184,12 +187,12 @@ LLSelectMgr::LLSelectMgr()
sHighlightUAnim = gSavedSettings.getF32("SelectionHighlightUAnim");
sHighlightVAnim = gSavedSettings.getF32("SelectionHighlightVAnim");
- sSilhouetteParentColor = gColors.getColor("SilhouetteParentColor");
- sSilhouetteChildColor = gColors.getColor("SilhouetteChildColor");
- sHighlightParentColor = gColors.getColor("HighlightParentColor");
- sHighlightChildColor = gColors.getColor("HighlightChildColor");
- sHighlightInspectColor = gColors.getColor("HighlightInspectColor");
- sContextSilhouetteColor = gColors.getColor("ContextSilhouetteColor")*0.5f;
+ sSilhouetteParentColor =gSavedSkinSettings.getColor("SilhouetteParentColor");
+ sSilhouetteChildColor = gSavedSkinSettings.getColor("SilhouetteChildColor");
+ sHighlightParentColor = gSavedSkinSettings.getColor("HighlightParentColor");
+ sHighlightChildColor = gSavedSkinSettings.getColor("HighlightChildColor");
+ sHighlightInspectColor = gSavedSkinSettings.getColor("HighlightInspectColor");
+ sContextSilhouetteColor = gSavedSkinSettings.getColor("ContextSilhouetteColor")*0.5f;
sRenderLightRadius = gSavedSettings.getBOOL("RenderLightRadius");
@@ -202,6 +205,8 @@ LLSelectMgr::LLSelectMgr()
mSelectedObjects = new LLObjectSelection();
mHoverObjects = new LLObjectSelection();
mHighlightedObjects = new LLObjectSelection();
+
+
}
@@ -673,7 +678,7 @@ void LLSelectMgr::addAsFamily(std::vector<LLViewerObject*>& objects, BOOL add_to
// Can't select yourself
if (objectp->mID == gAgentID
- && !gAllowSelectAvatar)
+ && !LLSelectMgr::getInstance()->mAllowSelectAvatar)
{
continue;
}
@@ -2691,7 +2696,7 @@ void LLSelectMgr::selectDelete()
}
LLNotification::Params params("ConfirmObjectDeleteLock");
- params.functor(boost::bind(&LLSelectMgr::confirmDelete, _1, _2, getSelection()));
+ params.functor.function(boost::bind(&LLSelectMgr::confirmDelete, _1, _2, getSelection()));
if(locked_but_deleteable_object ||
no_copy_but_deleteable_object ||
@@ -3443,7 +3448,7 @@ void LLSelectMgr::deselectAllIfTooFar()
if (select_dist_sq > deselect_dist_sq)
{
- if (gDebugSelectMgr)
+ if (mDebugSelectMgr)
{
llinfos << "Selection manager: auto-deselecting, select_dist = " << fsqrtf(select_dist_sq) << llendl;
llinfos << "agent pos global = " << gAgent.getPositionGlobal() << llendl;
@@ -4444,9 +4449,9 @@ void LLSelectMgr::processObjectPropertiesFamily(LLMessageSystem* msg, void** use
msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Description, desc);
// the reporter widget askes the server for info about picked objects
- if (request_flags & (COMPLAINT_REPORT_REQUEST | BUG_REPORT_REQUEST))
+ if (request_flags & COMPLAINT_REPORT_REQUEST )
{
- EReportType report_type = (COMPLAINT_REPORT_REQUEST & request_flags) ? COMPLAINT_REPORT : BUG_REPORT;
+ EReportType report_type = COMPLAINT_REPORT ;
LLFloaterReporter *reporterp = LLFloaterReporter::getReporter(report_type);
if (reporterp)
{
@@ -5387,10 +5392,7 @@ void dialog_refresh_all()
gFloaterTools->dirty();
- if( gPieObject->getVisible() )
- {
- gPieObject->arrange();
- }
+ gPieObject->needsArrange();
LLFloaterProperties::dirtyAll();
LLFloaterInspect::dirty();
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index d6c4b5485d..992cc1e906 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -38,7 +38,8 @@
#include "llstring.h"
#include "llundo.h"
#include "lluuid.h"
-#include "llmemory.h"
+#include "llpointer.h"
+#include "llsafehandle.h"
#include "llsaleinfo.h"
#include "llcategory.h"
#include "v3dmath.h"
@@ -48,7 +49,7 @@
#include "llbbox.h"
#include "llpermissions.h"
#include "llviewerobject.h"
-
+#include "llcontrol.h"
#include <deque>
#include "boost/iterator/filter_iterator.hpp"
@@ -338,6 +339,7 @@ public:
static BOOL sRectSelectInclusive; // do we need to surround an object to pick it?
static BOOL sRenderHiddenSelections; // do we show selection silhouettes that are occluded?
static BOOL sRenderLightRadius; // do we show the radius of selected lights?
+
static F32 sHighlightThickness;
static F32 sHighlightUScale;
static F32 sHighlightVScale;
@@ -352,6 +354,10 @@ public:
static LLColor4 sHighlightInspectColor;
static LLColor4 sContextSilhouetteColor;
+ LLCachedControl<bool> mHideSelectedObjects;
+ LLCachedControl<bool> mAllowSelectAvatar;
+ LLCachedControl<bool> mDebugSelectMgr;
+
public:
LLSelectMgr();
~LLSelectMgr();
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp
new file mode 100644
index 0000000000..bd93f5dd28
--- /dev/null
+++ b/indra/newview/llslurl.cpp
@@ -0,0 +1,114 @@
+/**
+ * @file llslurl.cpp
+ * @brief SLURL manipulation
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llslurl.h"
+
+#include "llweb.h"
+
+const std::string LLSLURL::PREFIX_SL_HELP = "secondlife://app.";
+const std::string LLSLURL::PREFIX_SL = "sl://";
+const std::string LLSLURL::PREFIX_SECONDLIFE = "secondlife://";
+const std::string LLSLURL::PREFIX_SLURL = "http://slurl.com/secondlife/";
+
+const std::string LLSLURL::APP_TOKEN = "app/";
+
+// static
+std::string LLSLURL::stripProtocol(const std::string& url)
+{
+ std::string stripped = url;
+ if (matchPrefix(stripped, PREFIX_SL_HELP))
+ {
+ stripped.erase(0, PREFIX_SL_HELP.length());
+ }
+ else if (matchPrefix(stripped, PREFIX_SL))
+ {
+ stripped.erase(0, PREFIX_SL.length());
+ }
+ else if (matchPrefix(stripped, PREFIX_SECONDLIFE))
+ {
+ stripped.erase(0, PREFIX_SECONDLIFE.length());
+ }
+ else if (matchPrefix(stripped, PREFIX_SLURL))
+ {
+ stripped.erase(0, PREFIX_SLURL.length());
+ }
+
+ return stripped;
+}
+
+// static
+bool LLSLURL::isSLURL(const std::string& url)
+{
+ if (matchPrefix(url, PREFIX_SL_HELP)) return true;
+ if (matchPrefix(url, PREFIX_SL)) return true;
+ if (matchPrefix(url, PREFIX_SECONDLIFE)) return true;
+ if (matchPrefix(url, PREFIX_SLURL)) return true;
+
+ return false;
+}
+
+// static
+bool LLSLURL::isSLURLCommand(const std::string& url)
+{
+ if (matchPrefix(url, PREFIX_SL + APP_TOKEN) ||
+ matchPrefix(url, PREFIX_SECONDLIFE + "/" + APP_TOKEN) ||
+ matchPrefix(url, PREFIX_SLURL + APP_TOKEN) )
+ {
+ return true;
+ }
+
+ return false;
+}
+
+// static
+bool LLSLURL::isSLURLHelp(const std::string& url)
+{
+ return matchPrefix(url, PREFIX_SL_HELP);
+}
+
+// static
+std::string LLSLURL::buildSLURL(const std::string& regionname, S32 x, S32 y, S32 z)
+{
+ std::string slurl = PREFIX_SLURL + regionname + llformat("/%d/%d/%d",x,y,z);
+ slurl = LLWeb::escapeURL( slurl );
+ return slurl;
+}
+
+// static
+bool LLSLURL::matchPrefix(const std::string& url, const std::string& prefix)
+{
+ std::string test_prefix = url.substr(0, prefix.length());
+ LLStringUtil::toLower(test_prefix);
+ return test_prefix == prefix;
+}
diff --git a/indra/newview/llslurl.h b/indra/newview/llslurl.h
new file mode 100644
index 0000000000..05788623d9
--- /dev/null
+++ b/indra/newview/llslurl.h
@@ -0,0 +1,85 @@
+/**
+ * @file llslurl.h
+ * @brief SLURL manipulation
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_SLURL_H
+#define LL_SLURL_H
+
+#include <string>
+
+// IAN BUG: where should this live?
+// IAN BUG: are static utility functions right? See LLUUID.
+// question of whether to have a LLSLURL object or a
+// some of this was moved from LLURLDispatcher
+
+/**
+ * SLURL manipulation
+ */
+class LLSLURL
+{
+public:
+ static const std::string PREFIX_SL_HELP;
+ static const std::string PREFIX_SL;
+ static const std::string PREFIX_SECONDLIFE;
+ static const std::string PREFIX_SLURL;
+
+ static const std::string APP_TOKEN;
+
+ /**
+ * Is this any sort of secondlife:// or sl:// URL?
+ */
+ static bool isSLURL(const std::string& url);
+
+ /**
+ * Is this a special secondlife://app/ URL?
+ */
+ static bool isSLURLCommand(const std::string& url);
+
+ /**
+ * Not sure what it is.
+ */
+ static bool isSLURLHelp(const std::string& url);
+
+ /**
+ * builds: http://slurl.com/secondlife/RegionName/x/y/z/
+ */
+ static std::string buildSLURL(const std::string& regionname, S32 x, S32 y, S32 z);
+
+ /**
+ * Strip protocol part from the URL.
+ */
+ static std::string stripProtocol(const std::string& url);
+
+private:
+ static bool matchPrefix(const std::string& url, const std::string& prefix);
+};
+
+#endif
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index 4d67b374c8..b6b801866c 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -35,9 +35,10 @@
#define SG_MIN_DIST_RATIO 0.00001f
-#include "llmemory.h"
#include "lldrawable.h"
#include "lloctree.h"
+#include "llpointer.h"
+#include "llrefcount.h"
#include "llvertexbuffer.h"
#include "llgltypes.h"
#include "llcubemap.h"
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 984646e959..4cf94b5bc4 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -56,15 +56,18 @@
#include "lldir.h"
#include "llerrorcontrol.h"
#include "llfiltersd2xmlrpc.h"
+#include "llfloaterreg.h"
#include "llfocusmgr.h"
#include "llhttpsender.h"
#include "imageids.h"
#include "lllandmark.h"
+#include "lllocationhistory.h"
#include "llloginflags.h"
#include "llmd5.h"
#include "llmemorystream.h"
#include "llmessageconfig.h"
#include "llmoveview.h"
+#include "llteleporthistory.h"
#include "llregionhandle.h"
#include "llsd.h"
#include "llsdserialize.h"
@@ -83,10 +86,8 @@
#include "llfloateravatarpicker.h"
#include "llcallbacklist.h"
#include "llcallingcard.h"
-#include "llcolorscheme.h"
#include "llconsole.h"
#include "llcontainerview.h"
-#include "llfloaterstats.h"
#include "lldebugview.h"
#include "lldrawable.h"
#include "lleventnotifier.h"
@@ -103,8 +104,6 @@
#include "llfloatertopobjects.h"
#include "llfloatertos.h"
#include "llfloaterworldmap.h"
-#include "llframestats.h"
-#include "llframestatview.h"
#include "llgesturemgr.h"
#include "llgroupmgr.h"
#include "llhudeffecttrail.h"
@@ -120,6 +119,7 @@
#include "llmutelist.h"
#include "llnotify.h"
#include "llpanelavatar.h"
+#include "llavatarpropertiesprocessor.h"
#include "llpaneldirbrowser.h"
#include "llpaneldirland.h"
#include "llpanelevent.h"
@@ -185,6 +185,8 @@
#include "llwlparammanager.h"
#include "llwaterparammanager.h"
#include "llagentlanguage.h"
+#include "llwearable.h"
+#include "llinventorybridge.h"
#if LL_LIBXUL_ENABLED
#include "llmozlib.h"
@@ -245,7 +247,6 @@ bool update_dialog_callback(const LLSD& notification, const LLSD& response);
void login_packet_failed(void**, S32 result);
void use_circuit_callback(void**, S32 result);
void register_viewer_callbacks(LLMessageSystem* msg);
-void init_stat_view();
void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32);
bool callback_choose_gender(const LLSD& notification, const LLSD& response);
void init_start_screen(S32 location_id);
@@ -253,7 +254,7 @@ void release_start_screen();
void reset_login();
void apply_udp_blacklist(const std::string& csv);
-void callback_cache_name(const LLUUID& id, const std::string& firstname, const std::string& lastname, BOOL is_group, void* data)
+void callback_cache_name(const LLUUID& id, const std::string& firstname, const std::string& lastname, BOOL is_group)
{
LLNameListCtrl::refreshAll(id, firstname, lastname, is_group);
LLNameBox::refreshAll(id, firstname, lastname, is_group);
@@ -355,15 +356,25 @@ bool idle_startup()
static bool stipend_since_login = false;
- static bool samename = false;
-
// HACK: These are things from the main loop that usually aren't done
// until initialization is complete, but need to be done here for things
// to work.
gIdleCallbacks.callFunctions();
- gViewerWindow->handlePerFrameHover();
+ gViewerWindow->updateUI();
LLMortician::updateClass();
+ const std::string delims (" ");
+ std::string system;
+ int begIdx, endIdx;
+ std::string osString = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
+
+ begIdx = osString.find_first_not_of (delims);
+ endIdx = osString.find_first_of (delims, begIdx);
+ system = osString.substr (begIdx, endIdx - begIdx);
+ system += "Locale";
+
+ LLStringUtil::setLocale (LLTrans::getString(system));
+
if (gNoRender)
{
// HACK, skip optional updates if you're running drones
@@ -431,8 +442,6 @@ bool idle_startup()
// Load autopilot and stats stuff
gAgentPilot.load(gSavedSettings.getString("StatsPilotFile"));
- gFrameStats.setFilename(gSavedSettings.getString("StatsFile"));
- gFrameStats.setSummaryFilename(gSavedSettings.getString("StatsSummaryFile"));
//gErrorStream.setTime(gSavedSettings.getBOOL("LogTimestamps"));
@@ -780,15 +789,11 @@ bool idle_startup()
// *NOTE: This is where gMuteList used to get allocated before becoming LLMuteList::getInstance().
- // Initialize UI
- if (!gNoRender)
+ // Login screen needs menus for preferences, but we can enter
+ // this startup phase more than once.
+ if (gLoginMenuBarView == NULL)
{
- // Initialize all our tools. Must be done after saved settings loaded.
- // NOTE: This also is where gToolMgr used to be instantiated before being turned into a singleton.
- LLToolMgr::getInstance()->initTools();
-
- // Quickly get something onscreen to look at.
- gViewerWindow->initWorldUI();
+ init_menus();
}
gViewerWindow->setNormalControlsVisible( FALSE );
@@ -857,10 +862,10 @@ bool idle_startup()
// Set PerAccountSettingsFile to the default value.
gSavedSettings.setString("PerAccountSettingsFile",
gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,
- LLAppViewer::instance()->getSettingsFilename("Default", "PerAccount")
- )
- );
+ LLAppViewer::instance()->getSettingsFilename("Default", "PerAccount")));
+ // Note: can't store warnings files per account because some come up before login
+
// Overwrite default user settings with user settings
LLAppViewer::instance()->loadSettingsFromDirectory("Account");
@@ -915,12 +920,12 @@ bool idle_startup()
LLURLSimString::setString( location );
// END TODO
- LLPanelLogin::close();
+ LLPanelLogin::closePanel();
}
//For HTML parsing in text boxes.
- LLTextEditor::setLinkColor( gSavedSettings.getColor4("HTMLLinkColor") );
+ LLTextEditor::setLinkColor( gSavedSkinSettings.getColor4("HTMLLinkColor") );
// Load URL History File
LLURLHistory::loadFile("url_history.xml");
@@ -943,7 +948,7 @@ bool idle_startup()
// UserLoginLocationReply arrives
location_which = START_LOCATION_ID_LAST;
}
- else if (gSavedSettings.getBOOL("LoginLastLocation"))
+ else if (gSavedSettings.getString("LoginLocation") == "last" )
{
agent_location_id = START_LOCATION_ID_LAST; // last location
location_which = START_LOCATION_ID_LAST;
@@ -963,7 +968,7 @@ bool idle_startup()
// Display the startup progress bar.
gViewerWindow->setShowProgress(TRUE);
- gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Quit")); // *TODO: Translate
+ gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Quit"));
// Poke the VFS, which could potentially block for a while if
// Windows XP is acting up
@@ -972,9 +977,6 @@ bool idle_startup()
gVFS->pokeFiles();
- // color init must be after saved settings loaded
- init_colors();
-
// skipping over STATE_UPDATE_CHECK because that just waits for input
LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
@@ -1037,9 +1039,7 @@ bool idle_startup()
sAuthUriNum = 0;
auth_method = "login_to_simulator";
- LLStringUtil::format_map_t args;
- args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle();
- auth_desc = LLTrans::getString("LoginInProgress", args);
+ auth_desc = LLTrans::getString("LoginInProgress");
LLStartUp::setStartupState( STATE_LOGIN_AUTHENTICATE );
}
@@ -1063,13 +1063,9 @@ bool idle_startup()
start << xml_escape_string(unescaped_start.str());
}
- else if (gSavedSettings.getBOOL("LoginLastLocation"))
- {
- start << "last";
- }
else
{
- start << "home";
+ start << gSavedSettings.getString("LoginLocation");
}
char hashed_mac_string[MD5HEX_STR_SIZE]; /* Flawfinder: ignore */
@@ -1107,7 +1103,7 @@ bool idle_startup()
LL_DEBUGS("AppInit") << "STATE_LOGIN_NO_DATA_YET" << LL_ENDL;
// If we get here we have gotten past the potential stall
// in curl, so take "may appear frozen" out of progress bar. JC
- auth_desc = "Logging in...";
+ auth_desc = LLTrans::getString("LoginInProgressNoFrozen");
set_startup_status(progress, auth_desc, auth_message);
// Process messages to keep from dropping circuit.
LLMessageSystem* msg = gMessageSystem;
@@ -1487,6 +1483,9 @@ bool idle_startup()
if((*it).second == "Y") gPacificDaylightTime = TRUE;
else gPacificDaylightTime = FALSE;
}
+
+ //setup map of datetime strings to codes and slt & local time offset from utc
+ LLStringOps::setupDatetimeInfo (gPacificDaylightTime);
}
options.clear();
if (LLUserAuth::getInstance()->getOptions("initial-outfit", options)
@@ -1589,7 +1588,7 @@ bool idle_startup()
//---------------------------------------------------------------------
if (STATE_WORLD_INIT == LLStartUp::getStartupState())
{
- set_startup_status(0.40f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);
+ set_startup_status(0.30f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);
display_startup();
// We should have an agent id by this point.
llassert(!(gAgentID == LLUUID::null));
@@ -1601,6 +1600,7 @@ bool idle_startup()
// Since we connected, save off the settings so the user doesn't have to
// type the name/password again if we crash.
gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
+ gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile"), TRUE);
//
// Initialize classes w/graphics stuff.
@@ -1617,8 +1617,16 @@ bool idle_startup()
LLWLParamManager::initClass();
LLWaterParamManager::initClass();
- // RN: don't initialize VO classes in drone mode, they are too closely tied to rendering
LLViewerObject::initVOClasses();
+ LLWearable::initClass();
+
+ // Initialize all our tools. Must be done after saved settings loaded.
+ // NOTE: This also is where gToolMgr used to be instantiated before being turned into a singleton.
+ LLToolMgr::getInstance()->initTools();
+
+ // Pre-load floaters, like the world map, that are slow to spawn
+ // due to XML complexity.
+ gViewerWindow->initWorldUI();
display_startup();
@@ -1662,6 +1670,14 @@ bool idle_startup()
if (STATE_MULTIMEDIA_INIT == LLStartUp::getStartupState())
{
LLStartUp::multimediaInit();
+ LLStartUp::setStartupState( STATE_FONT_INIT );
+ return FALSE;
+ }
+
+ // Loading fonts takes several seconds
+ if (STATE_FONT_INIT == LLStartUp::getStartupState())
+ {
+ LLStartUp::fontInit();
LLStartUp::setStartupState( STATE_SEED_GRANTED_WAIT );
return FALSE;
}
@@ -1689,14 +1705,12 @@ bool idle_startup()
}
gLoginMenuBarView->setVisible( FALSE );
gLoginMenuBarView->setEnabled( FALSE );
-
- LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0);
- gViewerWindow->adjustControlRectanglesForFirstUse(window);
-
- if(gSavedSettings.getBOOL("ShowMiniMap"))
- {
- LLFloaterMap::showInstance();
- }
+
+ // ProductEngine: Should be able to move this code near where we call loadSettingsFromDirectory()
+ LLTeleportHistory::getInstance()->load(); // *TODO: find a better place for doing this
+ LLLocationHistory::getInstance()->load(); // *TODO: find a better place for doing this
+
+ LLFloaterReg::showInitialVisibleInstances();
if (gSavedSettings.getBOOL("ShowCameraControls"))
{
@@ -1725,10 +1739,6 @@ bool idle_startup()
LLError::logToFixedBuffer(gDebugView->mDebugConsolep);
// set initial visibility of debug console
gDebugView->mDebugConsolep->setVisible(gSavedSettings.getBOOL("ShowDebugConsole"));
- if (gSavedSettings.getBOOL("ShowDebugStats"))
- {
- LLFloaterStats::showInstance();
- }
}
//
@@ -1752,8 +1762,10 @@ bool idle_startup()
if ( gCacheName == NULL )
{
gCacheName = new LLCacheName(gMessageSystem);
- gCacheName->addObserver(callback_cache_name);
-
+ gCacheName->addObserver(&callback_cache_name);
+ gCacheName->LocalizeCacheName("waiting", LLTrans::getString("CacheWaiting"));
+ gCacheName->LocalizeCacheName("nobody", LLTrans::getString("CacheNobody"));
+ gCacheName->LocalizeCacheName("none", LLTrans::getString("CacheNone"));
// Load stored cache if possible
LLAppViewer::instance()->loadNameCache();
}
@@ -1767,14 +1779,6 @@ bool idle_startup()
//reset statistics
LLViewerStats::getInstance()->resetStats();
- if (!gNoRender)
- {
- //
- // Set up all of our statistics UI stuff.
- //
- init_stat_view();
- }
-
display_startup();
//
// Set up region and surface defaults
@@ -2117,6 +2121,11 @@ bool idle_startup()
{
LLClassifiedInfo::loadCategories(options);
}
+
+
+ //all categories loaded. lets create "My Favourites" category
+ gInventory.findCategoryUUIDForType(LLAssetType::AT_FAVORITE,true);
+
gInventory.buildParentChildMap();
llinfos << "Setting Inventory changed mask and notifying observers" << llendl;
@@ -2145,17 +2154,9 @@ bool idle_startup()
llinfos << "Requesting Agent Data" << llendl;
gAgent.sendAgentDataUpdateRequest();
- bool shown_at_exit = gSavedSettings.getBOOL("ShowInventory");
-
// Create the inventory views
llinfos << "Creating Inventory Views" << llendl;
- LLInventoryView::showAgentInventory();
-
- // Hide the inventory if it wasn't shown at exit
- if(!shown_at_exit)
- {
- LLInventoryView::toggleVisibility(NULL);
- }
+ LLFloaterReg::getInstance("inventory");
LLStartUp::setStartupState( STATE_MISC );
return FALSE;
@@ -2211,6 +2212,7 @@ bool idle_startup()
// and make sure it's saved
gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
+ gSavedSkinSettings.saveToFile( gSavedSettings.getString("SkinningSettingsFile") , TRUE );
};
if (!gNoRender)
@@ -2296,38 +2298,20 @@ bool idle_startup()
//{
//}
+ // The reason we show the alert is because we want to
+ // reduce confusion for when you log in and your provided
+ // location is not your expected location. So, if this is
+ // your first login, then you do not have an expectation,
+ // thus, do not show this alert.
if (!gAgent.isFirstLogin())
{
bool url_ok = LLURLSimString::sInstance.parse();
- if (!((agent_start_location == "url" && url_ok) ||
- (!url_ok && ((agent_start_location == "last" && gSavedSettings.getBOOL("LoginLastLocation")) ||
- (agent_start_location == "home" && !gSavedSettings.getBOOL("LoginLastLocation"))))))
- {
- // The reason we show the alert is because we want to
- // reduce confusion for when you log in and your provided
- // location is not your expected location. So, if this is
- // your first login, then you do not have an expectation,
- // thus, do not show this alert.
- LLSD args;
- if (url_ok)
- {
- args["TYPE"] = "desired";
- args["HELP"] = "";
- }
- else if (gSavedSettings.getBOOL("LoginLastLocation"))
- {
- args["TYPE"] = "last";
- args["HELP"] = "";
- }
- else
- {
- args["TYPE"] = "home";
- args["HELP"] = "You may want to set a new home location.";
- }
- LLNotifications::instance().add("AvatarMoved", args);
- }
- else
+ if ((url_ok && agent_start_location == "url") ||
+ (!url_ok && ((agent_start_location == gSavedSettings.getString("LoginLocation")))))
{
+ // Start location is OK
+ // Disabled code to restore camera location and focus if logging in to default location
+ static bool samename = false;
if (samename)
{
// restore old camera pos
@@ -2342,6 +2326,23 @@ bool idle_startup()
gAgent.stopCameraAnimation();
}
}
+ else
+ {
+ std::string msg;
+ if (url_ok)
+ {
+ msg = "AvatarMovedDesired";
+ }
+ else if (gSavedSettings.getString("LoginLocation") == "home")
+ {
+ msg = "AvatarMovedHome";
+ }
+ else
+ {
+ msg = "AvatarMovedLast";
+ }
+ LLNotifications::instance().add(msg);
+ }
}
//DEV-17797. get null folder. Any items found here moved to Lost and Found
@@ -2477,11 +2478,9 @@ bool idle_startup()
set_startup_status(1.0, "", "");
// Let the map know about the inventory.
- if(gFloaterWorldMap)
- {
- gFloaterWorldMap->observeInventory(&gInventory);
- gFloaterWorldMap->observeFriends();
- }
+ LLFloaterWorldMap* floater_world_map = LLFloaterWorldMap::getInstance();
+ floater_world_map->observeInventory(&gInventory);
+ floater_world_map->observeFriends();
gViewerWindow->showCursor();
gViewerWindow->getWindow()->resetBusyCount();
@@ -2509,6 +2508,8 @@ bool idle_startup()
gAgentPilot.startPlayback();
}
+ show_debug_menus(); // Debug menu visiblity and First Use trigger
+
// If we've got a startup URL, dispatch it
LLStartUp::dispatchURL();
@@ -2597,6 +2598,7 @@ void login_callback(S32 option, void *userdata)
{
// turn off the setting and write out to disk
gSavedSettings.saveToFile( gSavedSettings.getString("ClientSettingsFile") , TRUE );
+ gSavedSkinSettings.saveToFile( gSavedSettings.getString("SkinningSettingsFile") , TRUE );
}
// Next iteration through main loop should shut down the app cleanly.
@@ -2604,7 +2606,7 @@ void login_callback(S32 option, void *userdata)
if (LLAppViewer::instance()->quitRequested())
{
- LLPanelLogin::close();
+ LLPanelLogin::closePanel();
}
return;
}
@@ -2761,7 +2763,7 @@ bool first_run_dialog_callback(const LLSD& notification, const LLSD& response)
if (0 == option)
{
LL_DEBUGS("AppInit") << "First run dialog cancelling" << LL_ENDL;
- LLWeb::loadURL( CREATE_ACCOUNT_URL );
+ LLWeb::loadURLExternal(LLTrans::getString("create_account_url") );
}
LLPanelLogin::giveFocus();
@@ -2786,12 +2788,12 @@ bool login_alert_status(const LLSD& notification, const LLSD& response)
{
case 0: // OK
break;
- case 1: // Help
- LLWeb::loadURL( SUPPORT_URL );
- break;
+ // case 1: // Help
+ // LLWeb::loadURL(LLNotifications::instance().getGlobalString("SUPPORT_URL") );
+ // break;
case 2: // Teleport
// Restart the login process, starting at our home locaton
- LLURLSimString::setString(LLURLSimString::sLocationStringHome);
+ LLURLSimString::setString("home");
LLStartUp::setStartupState( STATE_LOGIN_CLEANUP );
break;
default:
@@ -2806,14 +2808,13 @@ void update_app(BOOL mandatory, const std::string& auth_msg)
{
// store off config state, as we might quit soon
gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
-
+ gSavedSkinSettings.saveToFile(gSavedSettings.getString("SkinningSettingsFile"), TRUE);
std::ostringstream message;
- //*TODO:translate
std::string msg;
if (!auth_msg.empty())
{
- msg = "(" + auth_msg + ") \n";
+ msg = "("+ auth_msg + ") \n";
}
LLSD args;
@@ -2986,9 +2987,7 @@ bool update_dialog_callback(const LLSD& notification, const LLSD& response)
system(LLAppViewer::sUpdaterInfo->mUpdateExePath.c_str()); /* Flawfinder: ignore */
#elif LL_LINUX || LL_SOLARIS
- OSMessageBox("Automatic updating is not yet implemented for Linux.\n"
- "Please download the latest version from www.secondlife.com.",
- LLStringUtil::null, OSMB_OK);
+ OSMessageBox(LLTrans::getString("MBNoAutoUpdate"), LLStringUtil::null, OSMB_OK);
#endif
LLAppViewer::instance()->forceQuit();
return false;
@@ -3093,7 +3092,7 @@ void register_viewer_callbacks(LLMessageSystem* msg)
LLViewerParcelMgr::processParcelDwellReply);
msg->setHandlerFunc("AvatarPropertiesReply",
- LLPanelAvatar::processAvatarPropertiesReply);
+ LLAvatarPropertiesProcessor::processAvatarPropertiesReply);
msg->setHandlerFunc("AvatarInterestsReply",
LLPanelAvatar::processAvatarInterestsReply);
msg->setHandlerFunc("AvatarGroupsReply",
@@ -3202,14 +3201,6 @@ void register_viewer_callbacks(LLMessageSystem* msg)
msg->setHandlerFuncFast(_PREHASH_FeatureDisabled, process_feature_disabled_message);
}
-
-void init_stat_view()
-{
- LLFrameStatView *frameviewp = gDebugView->mFrameStatView;
- frameviewp->setup(gFrameStats);
- frameviewp->mShowPercent = FALSE;
-}
-
void asset_callback_nothing(LLVFS*, const LLUUID&, LLAssetType::EType, void*, S32)
{
// nothing
@@ -3287,8 +3278,6 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name,
}
// Loads a bitmap to display during load
-// location_id = 0 => last position
-// location_id = 1 => home position
void init_start_screen(S32 location_id)
{
if (gStartImageGL.notNull())
@@ -3406,7 +3395,7 @@ void reset_login()
}
// Hide any other stuff
- LLFloaterMap::hideInstance();
+ LLFloaterReg::hideVisibleInstances();
}
//---------------------------------------------------------------------------
@@ -3424,13 +3413,23 @@ void LLStartUp::multimediaInit()
{
LL_DEBUGS("AppInit") << "Initializing Multimedia...." << LL_ENDL;
std::string msg = LLTrans::getString("LoginInitializingMultimedia");
- set_startup_status(0.50f, msg.c_str(), gAgent.mMOTD.c_str());
+ set_startup_status(0.40f, msg.c_str(), gAgent.mMOTD.c_str());
display_startup();
LLViewerMedia::initClass();
LLViewerParcelMedia::initClass();
}
+void LLStartUp::fontInit()
+{
+ LL_DEBUGS("AppInit") << "Initializing fonts...." << LL_ENDL;
+ std::string msg = LLTrans::getString("LoginInitializingFonts");
+ set_startup_status(0.45f, msg.c_str(), gAgent.mMOTD.c_str());
+ display_startup();
+
+ LLFontGL::loadDefaultFonts();
+}
+
bool LLStartUp::dispatchURL()
{
// ok, if we've gotten this far and have a startup URL
diff --git a/indra/newview/llstartup.h b/indra/newview/llstartup.h
index fe347e9efe..93701800e9 100644
--- a/indra/newview/llstartup.h
+++ b/indra/newview/llstartup.h
@@ -58,6 +58,7 @@ typedef enum {
STATE_LOGIN_PROCESS_RESPONSE, // Check authentication reply
STATE_WORLD_INIT, // Start building the world
STATE_MULTIMEDIA_INIT, // Init the rest of multimedia library
+ STATE_FONT_INIT, // Load default fonts
STATE_SEED_GRANTED_WAIT, // Wait for seed cap grant
STATE_SEED_CAP_GRANTED, // Have seed cap grant
STATE_WORLD_WAIT, // Waiting for simulator
@@ -92,6 +93,9 @@ public:
static void multimediaInit();
// Initialize LLViewerMedia multimedia engine.
+ // Load default fonts not already loaded at start screen
+ static void fontInit();
+
// outfit_folder_name can be a folder anywhere in your inventory,
// but the name must be a case-sensitive exact match.
// gender_name is either "male" or "female"
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index f36d12d638..364214b9e7 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -53,6 +53,7 @@
#include "llmenugl.h"
#include "llnotify.h"
#include "llimview.h"
+#include "llsd.h"
#include "lltextbox.h"
#include "llui.h"
#include "llviewerparceloverlay.h"
@@ -73,9 +74,10 @@
#include "lltoolmgr.h"
#include "llfocusmgr.h"
#include "llappviewer.h"
-
+#include "lltrans.h"
// library includes
#include "imageids.h"
+#include "llfloaterreg.h"
#include "llfontgl.h"
#include "llrect.h"
#include "llerror.h"
@@ -123,13 +125,15 @@ std::vector<std::string> LLStatusBar::sDays;
std::vector<std::string> LLStatusBar::sMonths;
const U32 LLStatusBar::MAX_DATE_STRING_LENGTH = 2000;
-LLStatusBar::LLStatusBar(const std::string& name, const LLRect& rect)
-: LLPanel(name, LLRect(), FALSE), // not mouse opaque
-mBalance(0),
-mHealth(100),
-mSquareMetersCredit(0),
-mSquareMetersCommitted(0)
+LLStatusBar::LLStatusBar(const LLRect& rect)
+: LLPanel(),
+ mBalance(0),
+ mHealth(100),
+ mSquareMetersCredit(0),
+ mSquareMetersCommitted(0)
{
+ setRect(rect);
+
// status bar can possible overlay menus?
setMouseOpaque(FALSE);
setIsChrome(TRUE);
@@ -180,25 +184,28 @@ mSquareMetersCommitted(0)
S32 y = 0;
LLRect r;
r.set( x-SIM_STAT_WIDTH, y+MENU_BAR_HEIGHT-1, x, y+1);
- mSGBandwidth = new LLStatGraph("BandwidthGraph", r);
- mSGBandwidth->setFollows(FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
+ LLStatGraph::Params sgp;
+ sgp.name("BandwidthGraph");
+ sgp.rect(r);
+ sgp.follows.flags(FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
+ sgp.mouse_opaque(false);
+ mSGBandwidth = LLUICtrlFactory::create<LLStatGraph>(sgp);
mSGBandwidth->setStat(&LLViewerStats::getInstance()->mKBitStat);
- std::string text = childGetText("bandwidth_tooltip") + " ";
- LLUIString bandwidth_tooltip = text; // get the text from XML until this widget is XML driven
- mSGBandwidth->setLabel(bandwidth_tooltip.getString());
mSGBandwidth->setUnits("Kbps");
mSGBandwidth->setPrecision(0);
- mSGBandwidth->setMouseOpaque(FALSE);
addChild(mSGBandwidth);
x -= SIM_STAT_WIDTH + 2;
r.set( x-SIM_STAT_WIDTH, y+MENU_BAR_HEIGHT-1, x, y+1);
- mSGPacketLoss = new LLStatGraph("PacketLossPercent", r);
- mSGPacketLoss->setFollows(FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
+ //these don't seem to like being reused
+ LLStatGraph::Params pgp;
+ pgp.name("PacketLossPercent");
+ pgp.rect(r);
+ pgp.follows.flags(FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
+ pgp.mouse_opaque(false);
+
+ mSGPacketLoss = LLUICtrlFactory::create<LLStatGraph>(pgp);
mSGPacketLoss->setStat(&LLViewerStats::getInstance()->mPacketsLostPercentStat);
- text = childGetText("packet_loss_tooltip") + " ";
- LLUIString packet_loss_tooltip = text; // get the text from XML until this widget is XML driven
- mSGPacketLoss->setLabel(packet_loss_tooltip.getString());
mSGPacketLoss->setUnits("%");
mSGPacketLoss->setMin(0.f);
mSGPacketLoss->setMax(5.f);
@@ -206,7 +213,6 @@ mSquareMetersCommitted(0)
mSGPacketLoss->setThreshold(1, 1.f);
mSGPacketLoss->setThreshold(2, 3.f);
mSGPacketLoss->setPrecision(1);
- mSGPacketLoss->setMouseOpaque(FALSE);
mSGPacketLoss->mPerSec = FALSE;
addChild(mSGPacketLoss);
@@ -236,9 +242,10 @@ void LLStatusBar::draw()
if (isBackgroundVisible())
{
+ static LLUICachedControl<S32> drop_shadow_floater ("DropShadowFloater", 0);
+ static LLUICachedControl<LLColor4> color_drop_shadow ("ColorDropShadow");
gl_drop_shadow(0, getRect().getHeight(), getRect().getWidth(), 0,
- LLUI::sColorsGroup->getColor("ColorDropShadow"),
- LLUI::sConfigGroup->getS32("DropShadowFloater") );
+ color_drop_shadow, drop_shadow_floater );
}
LLPanel::draw();
}
@@ -254,51 +261,22 @@ void LLStatusBar::refresh()
mSGBandwidth->setThreshold(0, bwtotal*0.75f);
mSGBandwidth->setThreshold(1, bwtotal);
mSGBandwidth->setThreshold(2, bwtotal);
-
- // *TODO: Localize / translate time
-
+
// Get current UTC time, adjusted for the user's clock
// being off.
time_t utc_time;
utc_time = time_corrected();
- // There's only one internal tm buffer.
- struct tm* internal_time;
-
- // Convert to Pacific, based on server's opinion of whether
- // it's daylight savings time there.
- internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime);
-
- S32 hour = internal_time->tm_hour;
- S32 min = internal_time->tm_min;
-
- std::string am_pm = "AM";
- if (hour > 11)
- {
- hour -= 12;
- am_pm = "PM";
- }
-
- std::string tz = "PST";
- if (gPacificDaylightTime)
- {
- tz = "PDT";
- }
- // Zero hour is 12 AM
- if (hour == 0) hour = 12;
- std::ostringstream t;
- t << std::setfill(' ') << std::setw(2) << hour << ":"
- << std::setfill('0') << std::setw(2) << min
- << " " << am_pm << " " << tz;
- mTextTime->setText(t.str());
+ std::string timeStr = getString("time");
+ LLSD substitution;
+ substitution["datetime"] = (S32) utc_time;
+ LLStringUtil::format (timeStr, substitution);
+ mTextTime->setText(timeStr);
- // Year starts at 1900, set the tooltip to have the date
- std::ostringstream date;
- date << sDays[internal_time->tm_wday] << ", "
- << std::setfill('0') << std::setw(2) << internal_time->tm_mday << " "
- << sMonths[internal_time->tm_mon] << " "
- << internal_time->tm_year + 1900;
- mTextTime->setToolTip(date.str());
+ // set the tooltip to have the date
+ std::string dtStr = getString("timeTooltip");
+ LLStringUtil::format (dtStr, substitution);
+ mTextTime->setToolTip (dtStr);
LLRect r;
const S32 MENU_RIGHT = gMenuBarView->getRightmostMenuEdge();
@@ -492,7 +470,6 @@ void LLStatusBar::refresh()
mRegionDetails.mTime = mTextTime->getText();
mRegionDetails.mBalance = mBalance;
mRegionDetails.mAccessString = region->getSimAccessString();
- mRegionDetails.mPing = region->getNetDetailsForLCD();
if (parcel)
{
location_name = region->getName()
@@ -514,7 +491,7 @@ void LLStatusBar::refresh()
if (parcel->isPublic())
{
- mRegionDetails.mOwner = "Public";
+ mRegionDetails.mOwner = LLTrans::getString("Public");
}
else
{
@@ -526,7 +503,7 @@ void LLStatusBar::refresh()
}
else
{
- mRegionDetails.mOwner = "Group Owned";
+ mRegionDetails.mOwner = LLTrans::getString("GroupOwned");
}
}
else
@@ -544,31 +521,31 @@ void LLStatusBar::refresh()
region->getSimAccessString().c_str());
// keep these around for the LCD to use
mRegionDetails.mRegionName = region->getName();
- mRegionDetails.mParcelName = "Unknown";
+ mRegionDetails.mParcelName = LLTrans::getString("Unknown");
mRegionDetails.mX = pos_x;
mRegionDetails.mY = pos_y;
mRegionDetails.mZ = pos_z;
mRegionDetails.mArea = 0;
mRegionDetails.mForSale = FALSE;
- mRegionDetails.mOwner = "Unknown";
+ mRegionDetails.mOwner = LLTrans::getString("Unknown");
mRegionDetails.mTraffic = 0.0f;
}
}
else
{
// no region
- location_name = "(Unknown)";
+ location_name = LLTrans::getString("Unknown");
// keep these around for the LCD to use
- mRegionDetails.mRegionName = "Unknown";
- mRegionDetails.mParcelName = "Unknown";
- mRegionDetails.mAccessString = "Unknown";
+ mRegionDetails.mRegionName = LLTrans::getString("Unknown");
+ mRegionDetails.mParcelName = LLTrans::getString("Unknown");
+ mRegionDetails.mAccessString = LLTrans::getString("Unknown");
mRegionDetails.mX = 0;
mRegionDetails.mY = 0;
mRegionDetails.mZ = 0;
mRegionDetails.mArea = 0;
mRegionDetails.mForSale = FALSE;
- mRegionDetails.mOwner = "Unknown";
+ mRegionDetails.mOwner = LLTrans::getString("Unknown");
mRegionDetails.mTraffic = 0.0f;
}
@@ -920,7 +897,7 @@ void LLStatusBar::onClickSearch(void* data)
{
LLStatusBar* self = (LLStatusBar*)data;
std::string search_text = self->childGetText("search_editor");
- LLFloaterDirectory::showFindAll(search_text);
+ LLFloaterReg::showInstance("search", LLSD().insert("panel", "all").insert("id", LLSD(search_text)));
}
// static
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index c5b4be035a..7272441644 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -63,8 +63,7 @@ public:
mForSale(FALSE),
mOwner("Unknown"),
mTraffic(0),
- mBalance(0),
- mPing(0)
+ mBalance(0)
{
}
std::string mRegionName;
@@ -79,14 +78,13 @@ public:
F32 mTraffic;
S32 mBalance;
std::string mTime;
- U32 mPing;
};
class LLStatusBar
: public LLPanel
{
public:
- LLStatusBar(const std::string& name, const LLRect& rect );
+ LLStatusBar(const LLRect& rect );
/*virtual*/ ~LLStatusBar();
/*virtual*/ void draw();
diff --git a/indra/newview/llstylemap.cpp b/indra/newview/llstylemap.cpp
index a34b4b83f3..a1384c28ba 100644
--- a/indra/newview/llstylemap.cpp
+++ b/indra/newview/llstylemap.cpp
@@ -64,7 +64,7 @@ const LLStyleSP &LLStyleMap::lookupAgent(const LLUUID &source)
style->setFontName(LLStringUtil::null);
if (source != LLUUID::null && source != gAgent.getID() )
{
- style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
+ style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
std::string link = llformat("secondlife:///app/agent/%s/about",source.asString().c_str());
style->setLinkHREF(link);
}
@@ -90,7 +90,7 @@ const LLStyleSP &LLStyleMap::lookup(const LLUUID& id, const std::string& link)
style->setFontName(LLStringUtil::null);
if (id != LLUUID::null && !link.empty())
{
- style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
+ style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
style->setLinkHREF(link);
}
else
@@ -115,6 +115,6 @@ void LLStyleMap::update()
{
LLStyleSP &style = iter->second;
// Update the link color in case it has been changed.
- style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
+ style->setColor(gSavedSkinSettings.getColor4("HTMLLinkColor"));
}
}
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp
index a27f0e2254..51b946b8c0 100644
--- a/indra/newview/llsurface.cpp
+++ b/indra/newview/llsurface.cpp
@@ -68,7 +68,6 @@ LLColor4U MAX_WATER_COLOR(0, 48, 96, 240);
S32 LLSurface::sTextureSize = 256;
S32 LLSurface::sTexelsUpdated = 0;
F32 LLSurface::sTextureUpdateTime = 0.f;
-LLStat LLSurface::sTexelsUpdatedPerSecStat;
// ---------------- LLSurface:: Public Members ---------------
diff --git a/indra/newview/llsurface.h b/indra/newview/llsurface.h
index 003b2f2505..310ab5d2c3 100644
--- a/indra/newview/llsurface.h
+++ b/indra/newview/llsurface.h
@@ -173,7 +173,6 @@ public:
static F32 sTextureUpdateTime;
static S32 sTexelsUpdated;
- static LLStat sTexelsUpdatedPerSecStat;
protected:
void createSTexture();
diff --git a/indra/newview/llsurfacepatch.h b/indra/newview/llsurfacepatch.h
index 7e84f7f6c5..4cac977305 100644
--- a/indra/newview/llsurfacepatch.h
+++ b/indra/newview/llsurfacepatch.h
@@ -35,7 +35,7 @@
#include "v3math.h"
#include "v3dmath.h"
-#include "llmemory.h"
+#include "llpointer.h"
class LLSurface;
class LLVOSurfacePatch;
diff --git a/indra/newview/llteleporthistory.cpp b/indra/newview/llteleporthistory.cpp
new file mode 100644
index 0000000000..8dd7d2456e
--- /dev/null
+++ b/indra/newview/llteleporthistory.cpp
@@ -0,0 +1,251 @@
+/**
+ * @file llteleporthistory.cpp
+ * @brief Teleport history
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llteleporthistory.h"
+
+#include "llparcel.h"
+#include "llsdserialize.h"
+
+#include "llagent.h"
+#include "llslurl.h"
+#include "llurlsimstring.h"
+#include "llviewerparcelmgr.h"
+#include "llviewerregion.h"
+#include "llworldmap.h"
+
+//////////////////////////////////////////////////////////////////////////////
+// LLTeleportHistoryItem
+//////////////////////////////////////////////////////////////////////////////
+
+LLTeleportHistoryItem::LLTeleportHistoryItem(const LLSD& val)
+{
+ mTitle = val["title"].asString();
+ mGlobalPos.setValue(val["global_pos"]);
+}
+
+LLSD LLTeleportHistoryItem::toLLSD() const
+{
+ LLSD val;
+
+ val["title"] = mTitle;
+ val["global_pos"] = mGlobalPos.getValue();
+
+ return val;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// LLTeleportHistory
+//////////////////////////////////////////////////////////////////////////////
+
+LLTeleportHistory::LLTeleportHistory():
+ mCurrentItem(-1),
+ mHistoryTeleportInProgress(false),
+ mGotInitialUpdate(false),
+ mFilename("teleports.txt"),
+ mHistoryChangedCallback(NULL)
+{
+ mTeleportFinishedConn = LLViewerParcelMgr::getInstance()->
+ setTeleportFinishedCallback(boost::bind(&LLTeleportHistory::updateCurrentLocation, this));
+}
+
+LLTeleportHistory::~LLTeleportHistory()
+{
+ mTeleportFinishedConn.disconnect();
+}
+
+void LLTeleportHistory::goToItem(int idx)
+
+{
+ // Validate specified index.
+ if (idx < 0 || idx >= (int)mItems.size())
+ {
+ llwarns << "Invalid teleport history index (" << idx << ") specified" << llendl;
+ dump();
+ return;
+ }
+
+ if (idx == mCurrentItem)
+ {
+ llwarns << "Will not teleport to the same location." << llendl;
+ dump();
+ return;
+ }
+
+ // Make specified item current and teleport to it.
+ mCurrentItem = idx;
+ mHistoryTeleportInProgress = true;
+ onHistoryChanged();
+ gAgent.teleportViaLocation(mItems[mCurrentItem].mGlobalPos);
+}
+
+void LLTeleportHistory::updateCurrentLocation()
+{
+ if (mHistoryTeleportInProgress)
+ {
+ mHistoryTeleportInProgress = false;
+ }
+ else
+ {
+ // If we're getting the initial location update
+ // while we already have a (loaded) non-empty history,
+ // there's no need to purge forward items or add a new item.
+
+ if (mGotInitialUpdate || mItems.size() == 0)
+ {
+ // Purge forward items (if any).
+ if(mItems.size())
+ mItems.erase (mItems.begin() + mCurrentItem + 1, mItems.end());
+
+ // Append an empty item to the history and make it current.
+ mItems.push_back(LLTeleportHistoryItem("", LLVector3d()));
+ mCurrentItem++;
+ }
+ }
+
+ // Update current history item.
+ if (mCurrentItem < 0 || mCurrentItem >= (int) mItems.size()) // sanity check
+ {
+ llwarns << "Invalid current item. (this should not happen)" << llendl;
+ return;
+ }
+ mItems[mCurrentItem].mTitle = getCurrentLocationTitle();
+ mItems[mCurrentItem].mGlobalPos = gAgent.getPositionGlobal();
+ dump();
+
+ if (!mGotInitialUpdate)
+ mGotInitialUpdate = true;
+
+ // Signal the interesting party that we've changed.
+ onHistoryChanged();
+}
+
+void LLTeleportHistory::save() const
+{
+ // build filename for each user
+ std::string resolvedFilename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, mFilename);
+
+ // open the history file for writing
+ llofstream file (resolvedFilename);
+ if (!file.is_open())
+ {
+ llwarns << "can't open teleport history file \"" << mFilename << "\" for writing" << llendl;
+ return;
+ }
+
+ for (size_t i=0; i<mItems.size(); i++)
+ {
+ LLSD s_item = mItems[i].toLLSD();
+ s_item["is_current"] = (i == mCurrentItem);
+ file << LLSDOStreamer<LLSDNotationFormatter>(s_item) << std::endl;
+ }
+
+ file.close();
+}
+
+// *TODO: clean this up
+void LLTeleportHistory::load()
+{
+ // build filename for each user
+ std::string resolved_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, mFilename);
+
+ // open the history file for reading
+ llifstream file(resolved_filename);
+ if (!file.is_open())
+ {
+ llwarns << "can't load teleport history from file \"" << mFilename << "\"" << llendl;
+ return;
+ }
+
+ // remove current entries before we load over them
+ mItems.clear();
+ mCurrentItem = -1;
+
+ // the parser's destructor is protected so we cannot create in the stack.
+ LLPointer<LLSDParser> parser = new LLSDNotationParser();
+ std::string line;
+ for (int i = 0; std::getline(file, line); i++)
+ {
+ LLSD s_item;
+ std::istringstream iss(line);
+ if (parser->parse(iss, s_item, line.length()) == LLSDParser::PARSE_FAILURE)
+ {
+ llinfos << "Parsing saved teleport history failed" << llendl;
+ break;
+ }
+
+ mItems.push_back(s_item);
+ if (s_item["is_current"].asBoolean() == true)
+ mCurrentItem = i;
+ }
+
+ file.close();
+ onHistoryChanged();
+}
+
+void LLTeleportHistory::setHistoryChangedCallback(history_callback_t cb)
+{
+ mHistoryChangedCallback = cb;
+}
+
+void LLTeleportHistory::onHistoryChanged()
+{
+ if (mHistoryChangedCallback)
+ {
+ mHistoryChangedCallback();
+ }
+}
+
+// static
+std::string LLTeleportHistory::getCurrentLocationTitle()
+{
+ std::string location_name;
+
+ if (!gAgent.buildLocationString(location_name, LLAgent::LOCATION_FORMAT_NORMAL))
+ location_name = "Unknown";
+
+ return location_name;
+}
+
+void LLTeleportHistory::dump() const
+{
+ llinfos << "Teleport history dump (" << mItems.size() << " items):" << llendl;
+
+ for (size_t i=0; i<mItems.size(); i++)
+ {
+ std::stringstream line;
+ line << ((i == mCurrentItem) ? " * " : " ");
+ line << i << ": " << mItems[i].mTitle;
+ llinfos << line.str() << llendl;
+ }
+}
diff --git a/indra/newview/llteleporthistory.h b/indra/newview/llteleporthistory.h
new file mode 100644
index 0000000000..631857d7c8
--- /dev/null
+++ b/indra/newview/llteleporthistory.h
@@ -0,0 +1,212 @@
+/**
+ * @file llteleporthistory.h
+ * @brief Teleport history
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ *
+ * Copyright (c) 2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLTELEPORTHISTORY_H
+#define LL_LLTELEPORTHISTORY_H
+
+#include "llsingleton.h" // for LLSingleton
+
+#include <vector>
+#include <string>
+#include <boost/function.hpp>
+#include <boost/signals/connection.hpp>
+
+
+/**
+ * An item of the teleport history.
+ *
+ * Contains the location's global coordinates and its title.
+ */
+class LLTeleportHistoryItem
+{
+public:
+ LLTeleportHistoryItem()
+ {}
+
+ LLTeleportHistoryItem(std::string title, LLVector3d global_pos)
+ : mTitle(title), mGlobalPos(global_pos)
+ {}
+
+ LLTeleportHistoryItem(const LLSD& val);
+ LLSD toLLSD() const;
+
+ std::string mTitle; // human-readable location title
+ LLVector3d mGlobalPos; // global position
+};
+
+/**
+ * Teleport history.
+ *
+ * Along with the navigation bar "Back" and "Forward" buttons
+ * implements web browser-like navigation functionality.
+ *
+ * @see LLNavigationBar
+ */
+class LLTeleportHistory: public LLSingleton<LLTeleportHistory>
+{
+ LOG_CLASS(LLTeleportHistory);
+
+public:
+
+ typedef std::vector<LLTeleportHistoryItem> slurl_list_t;
+ typedef boost::function<void()> history_callback_t;
+
+ LLTeleportHistory();
+ ~LLTeleportHistory();
+
+ /**
+ * Go back in the history.
+ */
+ void goBack() { goToItem(getCurrentItemIndex() - 1); }
+
+ /**
+ * Go forward in the history.
+ */
+ void goForward() { goToItem(getCurrentItemIndex() + 1); }
+
+ /**
+ * Go to specific item in the history.
+ *
+ * The item is specified by its index (starting from 0).
+ */
+ void goToItem(int idx);
+
+ /**
+ * @return history items.
+ */
+ const slurl_list_t& getItems() const { return mItems; }
+
+ /**
+ * Is the history empty?
+ *
+ * History containing single item is treated as empty
+ * because the item points to the current location.
+ */
+ bool isEmpty() const { return mItems.size() <= 1; }
+
+ /**
+ * Get index of the current location in the history.
+ */
+ int getCurrentItemIndex() const { return mCurrentItem; }
+
+ /**
+ * Set a callback to be called upon history changes.
+ */
+ void setHistoryChangedCallback(history_callback_t cb);
+
+ /**
+ * Save the history to a file, so that it can be restored upon next logon.
+ */
+ void save() const;
+
+ /**
+ * Load previously saved history from a file.
+ */
+ void load();
+
+ /**
+ * Save history to a file so that we can restore it on startup.
+ *
+ * @see load()
+ */
+ void dump() const;
+
+private:
+
+ /**
+ * Update current location.
+ *
+ * Called when a teleport finishes.
+ *
+ * Takes mHistoryTeleportInProgress into consideration: if it's false
+ * (i.e. user is teleporting to an arbitrary location, not to a history item)
+ * we purge forward items.
+ *
+ * @see mHistoryTeleportInProgress
+ * @see mGotInitialUpdate
+ */
+ void updateCurrentLocation();
+
+ /**
+ * Invokes mHistoryChangedCallback.
+ */
+ void onHistoryChanged();
+
+ static std::string getCurrentLocationTitle();
+
+ /**
+ * Actually, the teleport history.
+ */
+ slurl_list_t mItems;
+
+ /**
+ * Current position within the history.
+ */
+ int mCurrentItem;
+
+ /**
+ * Indicates whether teleport back/forward is currently in progress.
+ *
+ * Helps to make sure we don't purge forward items
+ * when a teleport within history finishes.
+ *
+ * @see updateCurrentLocation()
+ */
+ bool mHistoryTeleportInProgress;
+
+ /**
+ * Have we received the initial location update?
+ *
+ * @see updateCurrentLocation()
+ */
+ bool mGotInitialUpdate;
+
+ /**
+ * File to store the history to.
+ */
+ std::string mFilename;
+
+ /**
+ * Callback to be called when the history gets changed.
+ */
+ history_callback_t mHistoryChangedCallback;
+
+ /**
+ * Teleport notification connection.
+ *
+ * Using this connection we get notified when a teleport finishes
+ * or initial location update occurs.
+ */
+ boost::signals::connection mTeleportFinishedConn;
+};
+
+#endif
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index a3966ed666..1b249d75d1 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -946,7 +946,7 @@ std::string LLTextureCache::getLocalFileName(const LLUUID& id)
// Does not include extension
std::string idstr = id.asString();
// TODO: should we be storing cached textures in skin directory?
- std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "default", "textures", idstr);
+ std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_LOCAL_ASSETS, idstr);
return filename;
}
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index dc34c5ad37..7a06f0df9e 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -59,6 +59,7 @@
#include "llscrollcontainer.h"
#include "lltoolmgr.h"
#include "lltoolpipette.h"
+#include "llsearcheditor.h"
#include "lltool.h"
#include "llviewerwindow.h"
@@ -69,26 +70,9 @@
#include "lltrans.h"
-static const S32 CLOSE_BTN_WIDTH = 100;
-const S32 PIPETTE_BTN_WIDTH = 32;
static const S32 HPAD = 4;
static const S32 VPAD = 4;
static const S32 LINE = 16;
-static const S32 SMALL_BTN_WIDTH = 64;
-static const S32 TEX_PICKER_MIN_WIDTH =
- (HPAD +
- CLOSE_BTN_WIDTH +
- HPAD +
- CLOSE_BTN_WIDTH +
- HPAD +
- SMALL_BTN_WIDTH +
- HPAD +
- SMALL_BTN_WIDTH +
- HPAD +
- 30 +
- RESIZE_HANDLE_WIDTH * 2);
-static const S32 CLEAR_BTN_WIDTH = 50;
-static const S32 TEX_PICKER_MIN_HEIGHT = 290;
static const S32 FOOTER_HEIGHT = 100;
static const S32 BORDER_PAD = HPAD;
static const S32 TEXTURE_INVENTORY_PADDING = 30;
@@ -108,7 +92,6 @@ class LLFloaterTexturePicker : public LLFloater
public:
LLFloaterTexturePicker(
LLTextureCtrl* owner,
- const LLRect& rect,
const std::string& label,
PermissionMask immediate_filter_perm_mask,
PermissionMask non_immediate_filter_perm_mask,
@@ -136,8 +119,6 @@ public:
const LLUUID& findItemID(const LLUUID& asset_id, BOOL copyable_only);
void setCanApplyImmediately(BOOL b);
- void setDirty( BOOL b ) { mIsDirty = b; }
- BOOL isDirty() const { return mIsDirty; }
void setActive( BOOL active );
LLTextureCtrl* getOwner() const { return mOwner; }
@@ -147,20 +128,21 @@ public:
PermissionMask getFilterPermMask();
void updateFilterPermMask();
void commitIfImmediateSet();
-
+
+ void onSearchEdit(const std::string& search_string );
+
static void onBtnSetToDefault( void* userdata );
static void onBtnSelect( void* userdata );
static void onBtnCancel( void* userdata );
- static void onBtnPipette( void* userdata );
+ void onBtnPipette( );
//static void onBtnRevert( void* userdata );
static void onBtnWhite( void* userdata );
static void onBtnNone( void* userdata );
static void onBtnClear( void* userdata );
- static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
+ void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action);
static void onShowFolders(LLUICtrl* ctrl, void* userdata);
static void onApplyImmediateCheck(LLUICtrl* ctrl, void* userdata);
- static void onSearchEdit(const std::string& search_string, void* user_data );
- static void onTextureSelect( const LLTextureEntry& te, void *data );
+ void onTextureSelect( const LLTextureEntry& te );
protected:
LLPointer<LLViewerImage> mTexturep;
@@ -179,7 +161,6 @@ protected:
LLTextBox* mResolutionLabel;
std::string mPendingName;
- BOOL mIsDirty;
BOOL mActive;
LLSearchEditor* mSearchEdit;
@@ -194,18 +175,12 @@ protected:
LLFloaterTexturePicker::LLFloaterTexturePicker(
LLTextureCtrl* owner,
- const LLRect& rect,
const std::string& label,
PermissionMask immediate_filter_perm_mask,
PermissionMask non_immediate_filter_perm_mask,
BOOL can_apply_immediately,
const std::string& fallback_image_name)
- :
- LLFloater( std::string("texture picker"),
- rect,
- std::string( "Pick: " ) + label,
- TRUE,
- TEX_PICKER_MIN_WIDTH, TEX_PICKER_MIN_HEIGHT ),
+: LLFloater(),
mOwner( owner ),
mImageAssetID( owner->getImageAssetID() ),
mFallbackImageName( fallback_image_name ),
@@ -214,78 +189,15 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
mLabel(label),
mTentativeLabel(NULL),
mResolutionLabel(NULL),
- mIsDirty( FALSE ),
mActive( TRUE ),
mSearchEdit(NULL),
mImmediateFilterPermMask(immediate_filter_perm_mask),
mNonImmediateFilterPermMask(non_immediate_filter_perm_mask),
mContextConeOpacity(0.f)
{
- LLUICtrlFactory::getInstance()->buildFloater(this,"floater_texture_ctrl.xml");
-
- mTentativeLabel = getChild<LLTextBox>("Multiple");
-
- mResolutionLabel = getChild<LLTextBox>("unknown");
-
-
- childSetAction("Default",LLFloaterTexturePicker::onBtnSetToDefault,this);
- childSetAction("None", LLFloaterTexturePicker::onBtnNone,this);
- childSetAction("Blank", LLFloaterTexturePicker::onBtnWhite,this);
-
-
- childSetCommitCallback("show_folders_check", onShowFolders, this);
- childSetVisible("show_folders_check", FALSE);
-
- mSearchEdit = getChild<LLSearchEditor>("inventory search editor");
- mSearchEdit->setSearchCallback(onSearchEdit, this);
-
- mInventoryPanel = getChild<LLInventoryPanel>("inventory panel");
-
- if(mInventoryPanel)
- {
- U32 filter_types = 0x0;
- filter_types |= 0x1 << LLInventoryType::IT_TEXTURE;
- filter_types |= 0x1 << LLInventoryType::IT_SNAPSHOT;
-
- mInventoryPanel->setFilterTypes(filter_types);
- //mInventoryPanel->setFilterPermMask(getFilterPermMask()); //Commented out due to no-copy texture loss.
- mInventoryPanel->setFilterPermMask(immediate_filter_perm_mask);
- mInventoryPanel->setSelectCallback(onSelectionChange, this);
- mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
- mInventoryPanel->setAllowMultiSelect(FALSE);
-
- // store this filter as the default one
- mInventoryPanel->getRootFolder()->getFilter()->markDefault();
-
- // Commented out to stop opening all folders with textures
- // mInventoryPanel->openDefaultFolderForType(LLAssetType::AT_TEXTURE);
-
- // don't put keyboard focus on selected item, because the selection callback
- // will assume that this was user input
- mInventoryPanel->setSelection(findItemID(mImageAssetID, FALSE), TAKE_FOCUS_NO);
- }
-
mCanApplyImmediately = can_apply_immediately;
- mNoCopyTextureSelected = FALSE;
-
- childSetValue("apply_immediate_check", gSavedSettings.getBOOL("ApplyTextureImmediately"));
- childSetCommitCallback("apply_immediate_check", onApplyImmediateCheck, this);
-
- if (!can_apply_immediately)
- {
- childSetEnabled("show_folders_check", FALSE);
- }
-
- childSetAction("Pipette", LLFloaterTexturePicker::onBtnPipette,this);
- childSetAction("Cancel", LLFloaterTexturePicker::onBtnCancel,this);
- childSetAction("Select", LLFloaterTexturePicker::onBtnSelect,this);
-
- // update permission filter once UI is fully initialized
- updateFilterPermMask();
-
+ LLUICtrlFactory::getInstance()->buildFloater(this,"floater_texture_ctrl.xml");
setCanMinimize(FALSE);
-
- mSavedFolderState.setApply(FALSE);
}
LLFloaterTexturePicker::~LLFloaterTexturePicker()
@@ -297,7 +209,7 @@ void LLFloaterTexturePicker::setImageID(const LLUUID& image_id)
if( mImageAssetID != image_id && mActive)
{
mNoCopyTextureSelected = FALSE;
- mIsDirty = TRUE;
+ mViewModel->setDirty(); // *TODO: shouldn't we be using setValue() here?
mImageAssetID = image_id;
LLUUID item_id = findItemID(mImageAssetID, FALSE);
if (item_id.isNull())
@@ -360,6 +272,10 @@ void LLFloaterTexturePicker::updateImageStats()
mResolutionLabel->setTextArg("[DIMENSIONS]", std::string("[? x ?]"));
}
}
+ else
+ {
+ mResolutionLabel->setTextArg("[DIMENSIONS]", std::string(""));
+ }
}
// virtual
@@ -474,13 +390,76 @@ BOOL LLFloaterTexturePicker::postBuild()
setTitle(pick + mLabel);
}
+ mTentativeLabel = getChild<LLTextBox>("Multiple");
+
+ mResolutionLabel = getChild<LLTextBox>("unknown");
+
+
+ childSetAction("Default",LLFloaterTexturePicker::onBtnSetToDefault,this);
+ childSetAction("None", LLFloaterTexturePicker::onBtnNone,this);
+ childSetAction("Blank", LLFloaterTexturePicker::onBtnWhite,this);
+
+
+ childSetCommitCallback("show_folders_check", onShowFolders, this);
+ childSetVisible("show_folders_check", FALSE);
+
+ mSearchEdit = getChild<LLSearchEditor>("inventory search editor");
+ mSearchEdit->setSearchCallback(boost::bind(&LLFloaterTexturePicker::onSearchEdit, this, _1));
+
+ mInventoryPanel = getChild<LLInventoryPanel>("inventory panel");
+
+ if(mInventoryPanel)
+ {
+ U32 filter_types = 0x0;
+ filter_types |= 0x1 << LLInventoryType::IT_TEXTURE;
+ filter_types |= 0x1 << LLInventoryType::IT_SNAPSHOT;
+
+ mInventoryPanel->setFilterTypes(filter_types);
+ //mInventoryPanel->setFilterPermMask(getFilterPermMask()); //Commented out due to no-copy texture loss.
+ mInventoryPanel->setFilterPermMask(mImmediateFilterPermMask);
+ mInventoryPanel->setSelectCallback(boost::bind(&LLFloaterTexturePicker::onSelectionChange, this, _1, _2));
+ mInventoryPanel->setShowFolderState(LLInventoryFilter::SHOW_NON_EMPTY_FOLDERS);
+ mInventoryPanel->setAllowMultiSelect(FALSE);
+
+ // store this filter as the default one
+ mInventoryPanel->getRootFolder()->getFilter()->markDefault();
+
+ // Commented out to stop opening all folders with textures
+ // mInventoryPanel->openDefaultFolderForType(LLAssetType::AT_TEXTURE);
+
+ // don't put keyboard focus on selected item, because the selection callback
+ // will assume that this was user input
+ mInventoryPanel->setSelection(findItemID(mImageAssetID, FALSE), TAKE_FOCUS_NO);
+ }
+
+
+ mNoCopyTextureSelected = FALSE;
+
+ childSetValue("apply_immediate_check", gSavedSettings.getBOOL("ApplyTextureImmediately"));
+ childSetCommitCallback("apply_immediate_check", onApplyImmediateCheck, this);
+
+ if (!mCanApplyImmediately)
+ {
+ childSetEnabled("show_folders_check", FALSE);
+ }
+
+ getChild<LLUICtrl>("Pipette")->setCommitCallback( boost::bind(&LLFloaterTexturePicker::onBtnPipette, this));
+ childSetAction("Cancel", LLFloaterTexturePicker::onBtnCancel,this);
+ childSetAction("Select", LLFloaterTexturePicker::onBtnSelect,this);
+ // update permission filter once UI is fully initialized
+ updateFilterPermMask();
+ mSavedFolderState.setApply(FALSE);
+
+ LLToolPipette::getInstance()->setToolSelectCallback(boost::bind(&LLFloaterTexturePicker::onTextureSelect, this, _1));
+
return TRUE;
}
// virtual
void LLFloaterTexturePicker::draw()
{
+ static LLUICachedControl<S32> floater_header_size ("UIFloaterHeaderSize", 0);
if (mOwner)
{
// draw cone of context pointing back to texture swatch
@@ -579,9 +558,9 @@ void LLFloaterTexturePicker::draw()
// Border
LLRect border( BORDER_PAD,
- getRect().getHeight() - LLFLOATER_HEADER_SIZE - BORDER_PAD,
- ((TEX_PICKER_MIN_WIDTH / 2) - TEXTURE_INVENTORY_PADDING - HPAD) - BORDER_PAD,
- BORDER_PAD + FOOTER_HEIGHT + (getRect().getHeight() - TEX_PICKER_MIN_HEIGHT));
+ getRect().getHeight() - floater_header_size - BORDER_PAD,
+ ((getMinWidth() / 2) - TEXTURE_INVENTORY_PADDING - HPAD) - BORDER_PAD,
+ BORDER_PAD + FOOTER_HEIGHT + (getRect().getHeight() - getMinHeight()));
gl_rect_2d( border, LLColor4::black, FALSE );
@@ -602,7 +581,7 @@ void LLFloaterTexturePicker::draw()
mTexturep->addTextureStats( (F32)(interior.getWidth() * interior.getHeight()) );
// Draw Tentative Label over the image
- if( mOwner->getTentative() && !mIsDirty )
+ if( mOwner->getTentative() && !mViewModel->isDirty() )
{
mTentativeLabel->setVisible( TRUE );
drawChild(mTentativeLabel);
@@ -719,7 +698,7 @@ void LLFloaterTexturePicker::onBtnRevert(void* userdata)
// TODO: Change this to tell the owner to cancel. It needs to be
// smart enough to restore multi-texture selections.
self->mOwner->onFloaterCommit();
- self->mIsDirty = FALSE;
+ self->mViewModel->resetDirty();
}*/
// static
@@ -731,8 +710,8 @@ void LLFloaterTexturePicker::onBtnCancel(void* userdata)
{
self->mOwner->onFloaterCommit(LLTextureCtrl::TEXTURE_CANCEL);
}
- self->mIsDirty = FALSE;
- self->close();
+ self->mViewModel->resetDirty();
+ self->closeFloater();
}
// static
@@ -743,52 +722,42 @@ void LLFloaterTexturePicker::onBtnSelect(void* userdata)
{
self->mOwner->onFloaterCommit(LLTextureCtrl::TEXTURE_SELECT);
}
- self->close();
+ self->closeFloater();
}
-// static
-void LLFloaterTexturePicker::onBtnPipette( void* userdata )
+void LLFloaterTexturePicker::onBtnPipette()
{
- LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
-
- if ( self)
+ BOOL pipette_active = childGetValue("Pipette").asBoolean();
+ pipette_active = !pipette_active;
+ if (pipette_active)
{
- BOOL pipette_active = self->childGetValue("Pipette").asBoolean();
- pipette_active = !pipette_active;
- if (pipette_active)
- {
- LLToolPipette::getInstance()->setSelectCallback(onTextureSelect, self);
- LLToolMgr::getInstance()->setTransientTool(LLToolPipette::getInstance());
- }
- else
- {
- LLToolMgr::getInstance()->clearTransientTool();
- }
+ LLToolMgr::getInstance()->setTransientTool(LLToolPipette::getInstance());
+ }
+ else
+ {
+ LLToolMgr::getInstance()->clearTransientTool();
}
-
}
-// static
-void LLFloaterTexturePicker::onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data)
+void LLFloaterTexturePicker::onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action)
{
- LLFloaterTexturePicker* self = (LLFloaterTexturePicker*)data;
if (items.size())
{
LLFolderViewItem* first_item = items.front();
LLInventoryItem* itemp = gInventory.getItem(first_item->getListener()->getUUID());
- self->mNoCopyTextureSelected = FALSE;
+ mNoCopyTextureSelected = FALSE;
if (itemp)
{
if (!itemp->getPermissions().allowCopyBy(gAgent.getID()))
{
- self->mNoCopyTextureSelected = TRUE;
+ mNoCopyTextureSelected = TRUE;
}
- self->mImageAssetID = itemp->getAssetUUID();
- self->mIsDirty = TRUE;
+ mImageAssetID = itemp->getAssetUUID();
+ mViewModel->setDirty(); // *TODO: shouldn't we be using setValue() here?
if (user_action)
{
// only commit intentional selections, not implicit ones
- self->commitIfImmediateSet();
+ commitIfImmediateSet();
}
}
}
@@ -827,67 +796,62 @@ void LLFloaterTexturePicker::updateFilterPermMask()
//mInventoryPanel->setFilterPermMask( getFilterPermMask() ); Commented out due to no-copy texture loss.
}
-void LLFloaterTexturePicker::onSearchEdit(const std::string& search_string, void* user_data )
+void LLFloaterTexturePicker::onSearchEdit(const std::string& search_string )
{
- LLFloaterTexturePicker* picker = (LLFloaterTexturePicker*)user_data;
-
std::string upper_case_search_string = search_string;
LLStringUtil::toUpper(upper_case_search_string);
if (upper_case_search_string.empty())
{
- if (picker->mInventoryPanel->getFilterSubString().empty())
+ if (mInventoryPanel->getFilterSubString().empty())
{
// current filter and new filter empty, do nothing
return;
}
- picker->mSavedFolderState.setApply(TRUE);
- picker->mInventoryPanel->getRootFolder()->applyFunctorRecursively(picker->mSavedFolderState);
+ mSavedFolderState.setApply(TRUE);
+ mInventoryPanel->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
// add folder with current item to list of previously opened folders
LLOpenFoldersWithSelection opener;
- picker->mInventoryPanel->getRootFolder()->applyFunctorRecursively(opener);
- picker->mInventoryPanel->getRootFolder()->scrollToShowSelection();
+ mInventoryPanel->getRootFolder()->applyFunctorRecursively(opener);
+ mInventoryPanel->getRootFolder()->scrollToShowSelection();
}
- else if (picker->mInventoryPanel->getFilterSubString().empty())
+ else if (mInventoryPanel->getFilterSubString().empty())
{
// first letter in search term, save existing folder open state
- if (!picker->mInventoryPanel->getRootFolder()->isFilterModified())
+ if (!mInventoryPanel->getRootFolder()->isFilterModified())
{
- picker->mSavedFolderState.setApply(FALSE);
- picker->mInventoryPanel->getRootFolder()->applyFunctorRecursively(picker->mSavedFolderState);
+ mSavedFolderState.setApply(FALSE);
+ mInventoryPanel->getRootFolder()->applyFunctorRecursively(mSavedFolderState);
}
}
- picker->mInventoryPanel->setFilterSubString(upper_case_search_string);
+ mInventoryPanel->setFilterSubString(upper_case_search_string);
}
-//static
-void LLFloaterTexturePicker::onTextureSelect( const LLTextureEntry& te, void *data )
+void LLFloaterTexturePicker::onTextureSelect( const LLTextureEntry& te )
{
- LLFloaterTexturePicker* self = (LLFloaterTexturePicker*)data;
-
- LLUUID inventory_item_id = self->findItemID(te.getID(), TRUE);
- if (self && inventory_item_id.notNull())
+ LLUUID inventory_item_id = findItemID(te.getID(), TRUE);
+ if (inventory_item_id.notNull())
{
LLToolPipette::getInstance()->setResult(TRUE, "");
- self->setImageID(te.getID());
+ setImageID(te.getID());
- self->mNoCopyTextureSelected = FALSE;
+ mNoCopyTextureSelected = FALSE;
LLInventoryItem* itemp = gInventory.getItem(inventory_item_id);
if (itemp && !itemp->getPermissions().allowCopyBy(gAgent.getID()))
{
// no copy texture
- self->mNoCopyTextureSelected = TRUE;
+ mNoCopyTextureSelected = TRUE;
}
- self->commitIfImmediateSet();
+ commitIfImmediateSet();
}
else
{
- LLToolPipette::getInstance()->setResult(FALSE, "You do not have a copy this \nof texture in your inventory");
+ LLToolPipette::getInstance()->setResult(FALSE, LLTrans::getString("InventoryNoTexture"));
}
}
@@ -896,38 +860,33 @@ void LLFloaterTexturePicker::onTextureSelect( const LLTextureEntry& te, void *da
static LLRegisterWidget<LLTextureCtrl> r("texture_picker");
-LLTextureCtrl::LLTextureCtrl(
- const std::string& name,
- const LLRect &rect,
- const std::string& label,
- const LLUUID &image_id,
- const LLUUID &default_image_id,
- const std::string& default_image_name )
- :
- LLUICtrl(name, rect, TRUE, NULL, NULL, FOLLOWS_LEFT | FOLLOWS_TOP),
+LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p)
+: LLUICtrl(p),
mDragCallback(NULL),
mDropCallback(NULL),
mOnCancelCallback(NULL),
mOnSelectCallback(NULL),
- mBorderColor( gColors.getColor("DefaultHighlightLight") ),
- mImageAssetID( image_id ),
- mDefaultImageAssetID( default_image_id ),
- mDefaultImageName( default_image_name ),
- mLabel( label ),
+ mBorderColor( p.border_color() ),
mAllowNoTexture( FALSE ),
mImmediateFilterPermMask( PERM_NONE ),
mNonImmediateFilterPermMask( PERM_NONE ),
mCanApplyImmediately( FALSE ),
mNeedsRawImageData( FALSE ),
mValid( TRUE ),
- mDirty( FALSE ),
- mShowLoadingPlaceholder( TRUE )
+ mShowLoadingPlaceholder( TRUE ),
+ mImageAssetID(p.image_id),
+ mDefaultImageAssetID(p.default_image_id),
+ mDefaultImageName(p.default_image_name)
{
- mCaption = new LLTextBox( label,
- LLRect( 0, BTN_HEIGHT_SMALL, getRect().getWidth(), 0 ),
- label,
- LLFontGL::getFontSansSerifSmall() );
- mCaption->setFollows( FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM );
+ setAllowNoTexture(p.allow_no_texture);
+ setCanApplyImmediately(p.can_apply_immediately);
+
+ LLTextBox::Params params(p.caption_text);
+ params.name(p.label);
+ params.rect(LLRect( 0, BTN_HEIGHT_SMALL, getRect().getWidth(), 0 ));
+ params.text(p.label);
+ params.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
+ mCaption = LLUICtrlFactory::create<LLTextBox> (params);
addChild( mCaption );
S32 image_top = getRect().getHeight();
@@ -935,92 +894,27 @@ LLTextureCtrl::LLTextureCtrl(
S32 image_middle = (image_top + image_bottom) / 2;
S32 line_height = llround(LLFontGL::getFontSansSerifSmall()->getLineHeight());
- mTentativeLabel = new LLTextBox( std::string("Multiple"),
- LLRect(
- 0, image_middle + line_height / 2,
- getRect().getWidth(), image_middle - line_height / 2 ),
- std::string("Multiple"),
- LLFontGL::getFontSansSerifSmall() );
- mTentativeLabel->setHAlign( LLFontGL::HCENTER );
- mTentativeLabel->setFollowsAll();
+ LLTextBox::Params tentative_label_p(p.multiselect_text);
+ tentative_label_p.name("Multiple");
+ tentative_label_p.rect(LLRect (0, image_middle + line_height / 2, getRect().getWidth(), image_middle - line_height / 2 ));
+ tentative_label_p.follows.flags(FOLLOWS_ALL);
+ mTentativeLabel = LLUICtrlFactory::create<LLTextBox> (tentative_label_p);
addChild( mTentativeLabel );
- LLRect border_rect(0, getRect().getHeight(), getRect().getWidth(), 0);
+ LLRect border_rect = getLocalRect();
border_rect.mBottom += BTN_HEIGHT_SMALL;
- mBorder = new LLViewBorder(std::string("border"), border_rect, LLViewBorder::BEVEL_IN);
- mBorder->setFollowsAll();
+ LLViewBorder::Params vbparams(p.border);
+ vbparams.name("border");
+ vbparams.rect(border_rect);
+ mBorder = LLUICtrlFactory::create<LLViewBorder> (vbparams);
addChild(mBorder);
- setEnabled(TRUE); // for the tooltip
mLoadingPlaceholderString = LLTrans::getString("texture_loading");
}
-
LLTextureCtrl::~LLTextureCtrl()
{
- closeFloater();
-}
-
-// virtual
-LLXMLNodePtr LLTextureCtrl::getXML(bool save_children) const
-{
- LLXMLNodePtr node = LLUICtrl::getXML();
-
- node->createChild("label", TRUE)->setStringValue(getLabel());
-
- node->createChild("default_image_name", TRUE)->setStringValue(getDefaultImageName());
-
- node->createChild("allow_no_texture", TRUE)->setBoolValue(mAllowNoTexture);
-
- node->createChild("can_apply_immediately", TRUE)->setBoolValue(mCanApplyImmediately );
-
- return node;
-}
-
-LLView* LLTextureCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("texture_picker");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent);
-
- std::string label;
- node->getAttributeString("label", label);
-
- std::string image_id("");
- node->getAttributeString("image", image_id);
-
- std::string default_image_id("");
- node->getAttributeString("default_image", default_image_id);
-
- std::string default_image_name("Default");
- node->getAttributeString("default_image_name", default_image_name);
-
- BOOL allow_no_texture = FALSE;
- node->getAttributeBOOL("allow_no_texture", allow_no_texture);
-
- BOOL can_apply_immediately = FALSE;
- node->getAttributeBOOL("can_apply_immediately", can_apply_immediately);
-
- if (label.empty())
- {
- label.assign(node->getValue());
- }
-
- LLTextureCtrl* texture_picker = new LLTextureCtrl(
- name,
- rect,
- label,
- LLUUID(image_id),
- LLUUID(default_image_id),
- default_image_name );
- texture_picker->setAllowNoTexture(allow_no_texture);
- texture_picker->setCanApplyImmediately(can_apply_immediately);
-
- texture_picker->initFromXML(node, parent);
-
- return texture_picker;
+ closeDependentFloater();
}
void LLTextureCtrl::setShowLoadingPlaceholder(BOOL showLoadingPlaceholder)
@@ -1047,7 +941,7 @@ void LLTextureCtrl::setVisible( BOOL visible )
{
if( !visible )
{
- closeFloater();
+ closeDependentFloater();
}
LLUICtrl::setVisible( visible );
}
@@ -1066,7 +960,7 @@ void LLTextureCtrl::setEnabled( BOOL enabled )
setToolTip( std::string() );
// *TODO: would be better to keep floater open and show
// disabled state.
- closeFloater();
+ closeDependentFloater();
}
if( floaterp )
@@ -1092,18 +986,6 @@ void LLTextureCtrl::setValid(BOOL valid )
}
}
-// virtual
-BOOL LLTextureCtrl::isDirty() const
-{
- return mDirty;
-}
-
-// virtual
-void LLTextureCtrl::resetDirty()
-{
- mDirty = FALSE;
-}
-
// virtual
void LLTextureCtrl::clear()
@@ -1124,20 +1006,12 @@ void LLTextureCtrl::showPicker(BOOL take_focus)
// Show the dialog
if( floaterp )
{
- floaterp->open( ); /* Flawfinder: ignore */
+ floaterp->openFloater();
}
else
{
- if( !mLastFloaterLeftTop.mX && !mLastFloaterLeftTop.mY )
- {
- gFloaterView->getNewFloaterPosition(&mLastFloaterLeftTop.mX, &mLastFloaterLeftTop.mY);
- }
- LLRect rect = gSavedSettings.getRect("TexturePickerRect");
- rect.translate( mLastFloaterLeftTop.mX - rect.mLeft, mLastFloaterLeftTop.mY - rect.mTop );
-
floaterp = new LLFloaterTexturePicker(
this,
- rect,
mLabel,
mImmediateFilterPermMask,
mNonImmediateFilterPermMask,
@@ -1147,7 +1021,7 @@ void LLTextureCtrl::showPicker(BOOL take_focus)
mFloaterHandle = floaterp->getHandle();
gFloaterView->getParentFloater(this)->addDependentFloater(floaterp);
- floaterp->open(); /* Flawfinder: ignore */
+ floaterp->openFloater();
}
if (take_focus)
@@ -1157,13 +1031,13 @@ void LLTextureCtrl::showPicker(BOOL take_focus)
}
-void LLTextureCtrl::closeFloater()
+void LLTextureCtrl::closeDependentFloater()
{
LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get();
if( floaterp )
{
floaterp->setOwner(NULL);
- floaterp->close();
+ floaterp->closeFloater();
}
}
@@ -1210,7 +1084,6 @@ void LLTextureCtrl::onFloaterClose()
if (floaterp)
{
floaterp->setOwner(NULL);
- mLastFloaterLeftTop.set( floaterp->getRect().mLeft, floaterp->getRect().mTop );
}
mFloaterHandle.markDead();
@@ -1222,7 +1095,11 @@ void LLTextureCtrl::onFloaterCommit(ETexturePickOp op)
if( floaterp && getEnabled())
{
- mDirty = (op != TEXTURE_CANCEL);
+ if (op == TEXTURE_CANCEL)
+ mViewModel->resetDirty();
+ else
+ mViewModel->setDirty(); // *TODO: shouldn't we be using setValue() here?
+
if( floaterp->isDirty() )
{
setTentative( FALSE );
@@ -1232,11 +1109,11 @@ void LLTextureCtrl::onFloaterCommit(ETexturePickOp op)
lldebugs << "mImageAssetID: " << mImageAssetID << llendl;
if (op == TEXTURE_SELECT && mOnSelectCallback)
{
- mOnSelectCallback(this, mCallbackUserData);
+ mOnSelectCallback( this, LLSD() );
}
else if (op == TEXTURE_CANCEL && mOnCancelCallback)
{
- mOnCancelCallback(this, mCallbackUserData);
+ mOnCancelCallback( this, LLSD() );
}
else
{
@@ -1256,7 +1133,7 @@ void LLTextureCtrl::setImageAssetID( const LLUUID& asset_id )
if( floaterp && getEnabled() )
{
floaterp->setImageID( asset_id );
- floaterp->setDirty( FALSE );
+ floaterp->resetDirty();
}
}
}
@@ -1320,7 +1197,7 @@ void LLTextureCtrl::draw()
// Border
LLRect border( 0, getRect().getHeight(), getRect().getWidth(), BTN_HEIGHT_SMALL );
- gl_rect_2d( border, mBorderColor, FALSE );
+ gl_rect_2d( border, mBorderColor.get(), FALSE );
// Interior
LLRect interior = border;
@@ -1388,7 +1265,7 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
{
if(mDragCallback)
{
- return mDragCallback(this, item, mCallbackUserData);
+ return mDragCallback(this, item);
}
else
{
@@ -1408,7 +1285,7 @@ BOOL LLTextureCtrl::doDrop(LLInventoryItem* item)
{
// if it returns TRUE, we return TRUE, and therefore the
// commit is called above.
- return mDropCallback(this, item, mCallbackUserData);
+ return mDropCallback(this, item);
}
// no callback installed, so just set the image ids and carry on.
@@ -1438,66 +1315,6 @@ LLSD LLTextureCtrl::getValue() const
}
-/////////////////////////////////////////////////////////////////////////////////
-// LLToolTexEyedropper
-
-class LLToolTexEyedropper : public LLTool
-{
-public:
- LLToolTexEyedropper( void (*callback)(const LLUUID& obj_id, const LLUUID& image_id, void* userdata ), void* userdata );
- virtual ~LLToolTexEyedropper();
- virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
- virtual BOOL handleHover(S32 x, S32 y, MASK mask);
-
-protected:
- void (*mCallback)(const LLUUID& obj_id, const LLUUID& image_id, void* userdata );
- void* mCallbackUserData;
-};
-
-
-LLToolTexEyedropper::LLToolTexEyedropper(
- void (*callback)(const LLUUID& obj_id, const LLUUID& image_id, void* userdata ),
- void* userdata )
- : LLTool(std::string("texeyedropper")),
- mCallback( callback ),
- mCallbackUserData( userdata )
-{
-}
-
-LLToolTexEyedropper::~LLToolTexEyedropper()
-{
-}
-
-
-BOOL LLToolTexEyedropper::handleMouseDown(S32 x, S32 y, MASK mask)
-{
- // this will affect framerate on mouse down
- const LLPickInfo& pick = gViewerWindow->pickImmediate(x, y, FALSE);
- LLViewerObject* hit_obj = pick.getObject();
- if (hit_obj &&
- !hit_obj->isAvatar())
- {
- if( (0 <= pick.mObjectFace) && (pick.mObjectFace < hit_obj->getNumTEs()) )
- {
- LLViewerImage* image = hit_obj->getTEImage( pick.mObjectFace );
- if( image )
- {
- if( mCallback )
- {
- mCallback( hit_obj->getID(), image->getID(), mCallbackUserData );
- }
- }
- }
- }
- return TRUE;
-}
-
-BOOL LLToolTexEyedropper::handleHover(S32 x, S32 y, MASK mask)
-{
- lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolTexEyedropper" << llendl;
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_CROSS); // TODO: better cursor
- return TRUE;
-}
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index 623f15eef5..ebe2cd2e5f 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -39,16 +39,17 @@
#include "llstring.h"
#include "lluictrl.h"
#include "llpermissionsflags.h"
+#include "lltextbox.h" // for params
+#include "llviewborder.h" // for params
class LLButton;
class LLFloaterTexturePicker;
class LLInventoryItem;
-class LLTextBox;
-class LLViewBorder;
class LLViewerImage;
// used for setting drag & drop callbacks.
-typedef BOOL (*drag_n_drop_callback)(LLUICtrl*, LLInventoryItem*, void*);
+typedef boost::function<BOOL (LLUICtrl*, LLInventoryItem*)> drag_n_drop_callback;
+
//////////////////////////////////////////////////////////////////////////////////////////
// LLTextureCtrl
@@ -66,17 +67,45 @@ public:
} ETexturePickOp;
public:
- LLTextureCtrl(
- const std::string& name, const LLRect& rect,
- const std::string& label,
- const LLUUID& image_id,
- const LLUUID& default_image_id,
- const std::string& default_image_name );
+ struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+ {
+ Optional<LLUUID> image_id;
+ Optional<LLUUID> default_image_id;
+ Optional<std::string> default_image_name;
+ Optional<bool> allow_no_texture;
+ Optional<bool> can_apply_immediately;
+ Optional<S32> label_width;
+ Optional<LLUIColor> border_color;
+
+ Optional<LLTextBox::Params> multiselect_text,
+ caption_text;
+
+ Optional<LLViewBorder::Params> border;
+
+ Params()
+ : image_id("image"),
+ default_image_id("default_image"),
+ default_image_name("default_image_name"),
+ allow_no_texture("allow_no_texture"),
+ can_apply_immediately("can_apply_immediately"),
+ label_width("label_width", -1),
+ border_color("border_color"),
+ multiselect_text("multiselect_text"),
+ caption_text("caption_text"),
+ border("border")
+ {
+ name = "texture picker";
+ mouse_opaque(true);
+ follows.flags(FOLLOWS_LEFT | FOLLOWS_TOP);
+ }
+ };
+protected:
+ LLTextureCtrl(const Params&);
+ friend class LLUICtrlFactory;
+public:
virtual ~LLTextureCtrl();
// LLView interface
- virtual LLXMLNodePtr getXML(bool save_children = true) const;
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,
@@ -90,9 +119,6 @@ public:
virtual void setVisible( BOOL visible );
virtual void setEnabled( BOOL enabled );
- virtual BOOL isDirty() const;
- virtual void resetDirty();
-
void setValid(BOOL valid);
// LLUICtrl interface
@@ -105,6 +131,7 @@ public:
// LLTextureCtrl interface
void showPicker(BOOL take_focus);
void setLabel(const std::string& label);
+ void setLabelWidth(S32 label_width) {mLabelWidth =label_width;}
const std::string& getLabel() const { return mLabel; }
void setAllowNoTexture( BOOL b ) { mAllowNoTexture = b; }
@@ -133,7 +160,7 @@ public:
PermissionMask getImmediateFilterPermMask() { return mImmediateFilterPermMask; }
PermissionMask getNonImmediateFilterPermMask() { return mNonImmediateFilterPermMask; }
- void closeFloater();
+ void closeDependentFloater();
void onFloaterClose();
void onFloaterCommit(ETexturePickOp op);
@@ -146,10 +173,10 @@ public:
// the drop happened - resulting in an on commit callback, but not
// necessariliy any other change.
void setDropCallback(drag_n_drop_callback cb) { mDropCallback = cb; }
-
- void setOnCancelCallback(LLUICtrlCallback cb) { mOnCancelCallback = cb; }
- void setOnSelectCallback(LLUICtrlCallback cb) { mOnSelectCallback = cb; }
+ void setOnCancelCallback(commit_callback_t cb) { mOnCancelCallback = cb; }
+
+ void setOnSelectCallback(commit_callback_t cb) { mOnSelectCallback = cb; }
void setShowLoadingPlaceholder(BOOL showLoadingPlaceholder);
@@ -160,10 +187,10 @@ private:
private:
drag_n_drop_callback mDragCallback;
drag_n_drop_callback mDropCallback;
- LLUICtrlCallback mOnCancelCallback;
- LLUICtrlCallback mOnSelectCallback;
+ commit_callback_t mOnCancelCallback;
+ commit_callback_t mOnSelectCallback;
LLPointer<LLViewerImage> mTexturep;
- LLColor4 mBorderColor;
+ LLUIColor mBorderColor;
LLUUID mImageItemID;
LLUUID mImageAssetID;
LLUUID mDefaultImageAssetID;
@@ -174,16 +201,15 @@ private:
LLTextBox* mCaption;
std::string mLabel;
BOOL mAllowNoTexture; // If true, the user can select "none" as an option
- LLCoordGL mLastFloaterLeftTop;
PermissionMask mImmediateFilterPermMask;
PermissionMask mNonImmediateFilterPermMask;
BOOL mCanApplyImmediately;
BOOL mNeedsRawImageData;
LLViewBorder* mBorder;
BOOL mValid;
- BOOL mDirty;
BOOL mShowLoadingPlaceholder;
std::string mLoadingPlaceholderString;
+ S32 mLabelWidth;
};
// XUI HACK: When floaters converted, switch this file to lltexturepicker.h/cpp
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index f00d5e5b48..a4fb9c4efc 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -83,12 +83,20 @@ public:
S32 mHilite;
public:
- LLTextureBar(const std::string& name, const LLRect& r, LLTextureView* texview)
- : LLView(name, r, FALSE),
- mHilite(0),
- mTextureView(texview)
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
{
- }
+ Mandatory<LLTextureView*> texture_view;
+ Params()
+ : texture_view("texture_view")
+ {
+ mouse_opaque(false);
+ }
+ };
+ LLTextureBar(const Params& p)
+ : LLView(p),
+ mHilite(0),
+ mTextureView(p.texture_view)
+ {}
virtual void draw();
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
@@ -366,13 +374,21 @@ LLRect LLTextureBar::getRequiredRect()
class LLGLTexMemBar : public LLView
{
public:
- LLGLTexMemBar(const std::string& name, LLTextureView* texview)
- : LLView(name, FALSE),
- mTextureView(texview)
+ struct Params : public LLInitParam::Block<Params, LLView::Params>
{
- S32 line_height = (S32)(LLFontGL::getFontMonospace()->getLineHeight() + .5f);
- setRect(LLRect(0,0,100,line_height * 4));
- }
+ Mandatory<LLTextureView*> texture_view;
+ Params()
+ : texture_view("texture_view")
+ {
+ S32 line_height = (S32)(LLFontGL::getFontMonospace()->getLineHeight() + .5f);
+ rect(LLRect(0,0,100,line_height * 4));
+ }
+ };
+
+ LLGLTexMemBar(const Params& p)
+ : LLView(p),
+ mTextureView(p.texture_view)
+ {}
virtual void draw();
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
@@ -521,8 +537,8 @@ LLRect LLGLTexMemBar::getRequiredRect()
////////////////////////////////////////////////////////////////////////////
-LLTextureView::LLTextureView(const std::string& name, const LLRect& rect)
- : LLContainerView(name, rect),
+LLTextureView::LLTextureView(const LLTextureView::Params& p)
+ : LLContainerView(p),
mFreezeView(FALSE),
mOrderFetch(FALSE),
mPrintList(FALSE),
@@ -709,7 +725,10 @@ void LLTextureView::draw()
else
sortChildren(LLTextureBar::sort());
- mGLTexMemBar = new LLGLTexMemBar("gl texmem bar", this);
+ LLGLTexMemBar::Params tmbp;
+ tmbp.name("gl texmem bar");
+ tmbp.texture_view(this);
+ mGLTexMemBar = LLUICtrlFactory::create<LLGLTexMemBar>(tmbp);
addChild(mGLTexMemBar);
reshape(getRect().getWidth(), getRect().getHeight(), TRUE);
@@ -746,7 +765,11 @@ BOOL LLTextureView::addBar(LLViewerImage *imagep, S32 hilite)
mNumTextureBars++;
- barp = new LLTextureBar("texture bar", r, this);
+ LLTextureBar::Params tbp;
+ tbp.name("texture bar");
+ tbp.rect(r);
+ tbp.texture_view(this);
+ barp = LLUICtrlFactory::create<LLTextureBar>(tbp);
barp->mImagep = imagep;
barp->mHilite = hilite;
diff --git a/indra/newview/lltextureview.h b/indra/newview/lltextureview.h
index f91a296b97..99b6db9662 100644
--- a/indra/newview/lltextureview.h
+++ b/indra/newview/lltextureview.h
@@ -43,8 +43,10 @@ class LLTextureView : public LLContainerView
{
friend class LLTextureBar;
friend class LLGLTexMemBar;
+protected:
+ LLTextureView(const Params&);
+ friend class LLUICtrlFactory;
public:
- LLTextureView(const std::string& name, const LLRect& rect);
~LLTextureView();
/*virtual*/ void draw();
diff --git a/indra/newview/lltool.cpp b/indra/newview/lltool.cpp
index 6a3ada0474..7b058e9efa 100644
--- a/indra/newview/lltool.cpp
+++ b/indra/newview/lltool.cpp
@@ -91,7 +91,7 @@ BOOL LLTool::handleMouseUp(S32 x, S32 y, MASK mask)
BOOL LLTool::handleHover(S32 x, S32 y, MASK mask)
{
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+ gViewerWindow->setCursor(UI_CURSOR_ARROW);
lldebugst(LLERR_USER_INPUT) << "hover handled by a tool" << llendl;
// by default, do nothing, say we handled it
return TRUE;
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index 33edb3ef27..67348b2a05 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -36,7 +36,9 @@
#include "lltoolbar.h"
#include "imageids.h"
+#include "llfloaterreg.h"
#include "llfontgl.h"
+#include "llflyoutbutton.h"
#include "llrect.h"
#include "llparcel.h"
@@ -57,6 +59,9 @@
#include "llui.h"
#include "llviewermenu.h"
#include "llfirstuse.h"
+#include "llscrolllistctrl.h"
+#include "llscrolllistitem.h"
+#include "llscrolllistcell.h"
#include "llviewerparcelmgr.h"
#include "lluictrlfactory.h"
#include "llviewerwindow.h"
@@ -65,29 +70,12 @@
#include "llfloaterchat.h"
#include "llfloatermute.h"
#include "llimpanel.h"
-#include "llscrolllistctrl.h"
+#include "lllayoutstack.h"
#if LL_DARWIN
#include "llresizehandle.h"
- // This class draws like an LLResizeHandle but has no interactivity.
- // It's just there to provide a cue to the user that the lower right corner of the window functions as a resize handle.
- class LLFakeResizeHandle : public LLResizeHandle
- {
- public:
- LLFakeResizeHandle(const std::string& name, const LLRect& rect, S32 min_width, S32 min_height, ECorner corner = RIGHT_BOTTOM )
- : LLResizeHandle(name, rect, min_width, min_height, corner )
- {
-
- }
-
- virtual BOOL handleHover(S32 x, S32 y, MASK mask) { return FALSE; };
- virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; };
- virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask) { return FALSE; };
-
- };
-
#endif // LL_DARWIN
//
@@ -95,7 +83,6 @@
//
LLToolBar *gToolBar = NULL;
-S32 TOOL_BAR_HEIGHT = 20;
//
// Statics
@@ -107,51 +94,20 @@ F32 LLToolBar::sInventoryAutoOpenTime = 1.f;
//
LLToolBar::LLToolBar()
-: LLPanel()
+ : LLPanel()
#if LL_DARWIN
, mResizeHandle(NULL)
#endif // LL_DARWIN
{
setIsChrome(TRUE);
setFocusRoot(TRUE);
+
+ mCommitCallbackRegistrar.add("HandleCommunicate", &LLToolBar::onClickCommunicate);
}
BOOL LLToolBar::postBuild()
{
- childSetCommitCallback("communicate_btn", onClickCommunicate, this);
- childSetControlName("communicate_btn", "ShowCommunicate");
-
- childSetAction("chat_btn", onClickChat, this);
- childSetControlName("chat_btn", "ChatVisible");
-
- childSetAction("appearance_btn", onClickAppearance, this);
- childSetControlName("appearance_btn", "");
-
- childSetAction("fly_btn", onClickFly, this);
- childSetControlName("fly_btn", "FlyBtnState");
-
- childSetAction("sit_btn", onClickSit, this);
- childSetControlName("sit_btn", "SitBtnState");
-
- childSetAction("snapshot_btn", onClickSnapshot, this);
- childSetControlName("snapshot_btn", "");
-
- childSetAction("directory_btn", onClickDirectory, this);
- childSetControlName("directory_btn", "ShowDirectory");
-
- childSetAction("build_btn", onClickBuild, this);
- childSetControlName("build_btn", "BuildBtnState");
-
- childSetAction("radar_btn", onClickRadar, this);
- childSetControlName("radar_btn", "ShowMiniMap");
-
- childSetAction("map_btn", onClickMap, this);
- childSetControlName("map_btn", "ShowWorldMap");
-
- childSetAction("inventory_btn", onClickInventory, this);
- childSetControlName("inventory_btn", "ShowInventory");
-
for (child_list_const_iter_t child_iter = getChildList()->begin();
child_iter != getChildList()->end(); ++child_iter)
{
@@ -167,8 +123,14 @@ BOOL LLToolBar::postBuild()
if(mResizeHandle == NULL)
{
LLRect rect(0, 0, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT);
- mResizeHandle = new LLFakeResizeHandle(std::string(""), rect, RESIZE_HANDLE_WIDTH, RESIZE_HANDLE_HEIGHT);
- this->addChildAtEnd(mResizeHandle);
+ LLResizeHandle::Params p;
+ p.name("");
+ p.rect(rect);
+ p.min_width(RESIZE_HANDLE_WIDTH);
+ p.min_height(RESIZE_HANDLE_HEIGHT);
+ p.enabled(false);
+ mResizeHandle = LLUICtrlFactory::create<LLResizeHandle>(p);
+ addChildInBack(mResizeHandle);
LLLayoutStack* toolbar_stack = getChild<LLLayoutStack>("toolbar_stack");
toolbar_stack->reshape(toolbar_stack->getRect().getWidth() - RESIZE_HANDLE_WIDTH, toolbar_stack->getRect().getHeight());
}
@@ -223,7 +185,7 @@ BOOL LLToolBar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
// static
void LLToolBar::toggle(void*)
{
- BOOL show = gSavedSettings.getBOOL("ShowToolBar");
+ BOOL show = gSavedSettings.getBOOL("ShowToolBar");
gSavedSettings.setBOOL("ShowToolBar", !show);
gToolBar->setVisible(!show);
}
@@ -290,19 +252,35 @@ void LLToolBar::refresh()
sitting = gAgent.getAvatarObject()->mIsSitting;
}
- childSetEnabled("fly_btn", (gAgent.canFly() || gAgent.getFlying()) && !sitting );
-
- childSetEnabled("build_btn", LLViewerParcelMgr::getInstance()->agentCanBuild() );
-
- // Check to see if we're in build mode
- BOOL build_mode = LLToolMgr::getInstance()->inEdit();
- // And not just clicking on a scripted object
- if (LLToolGrab::getInstance()->getHideBuildHighlight())
+ if (!gAgent.canFly())
{
- build_mode = FALSE;
+ gSavedSettings.setBOOL("FlyBtnEnabled", gAgent.getFlying() ? true : false);
+ gSavedSettings.setBOOL("FlyBtnState", false);
}
- gSavedSettings.setBOOL("BuildBtnState", build_mode);
-
+ else
+ {
+ gSavedSettings.setBOOL("FlyBtnEnabled", sitting ? false : true);
+ }
+
+ // Check to see if we're in build mode
+ bool build_enabled = LLToolMgr::getInstance()->canEdit();
+ if (build_enabled)
+ {
+ gSavedSettings.setBOOL("BuildBtnEnabled", true);
+ bool build_mode = LLToolMgr::getInstance()->inEdit();
+ // HACK: Not in mouselook and not just clicking on a scripted object
+ if (gAgent.cameraMouselook() || LLToolGrab::getInstance()->getHideBuildHighlight())
+ {
+ build_mode = FALSE;
+ }
+ gSavedSettings.setBOOL("BuildBtnState", build_mode);
+ }
+ else
+ {
+ gSavedSettings.setBOOL("BuildBtnEnabled", false);
+ gSavedSettings.setBOOL("BuildBtnState", false);
+ }
+
if (isInVisibleChain())
{
updateCommunicateList();
@@ -319,25 +297,34 @@ void LLToolBar::updateCommunicateList()
LLFloater* frontmost_floater = LLFloaterChatterBox::getInstance()->getActiveFloater();
LLScrollListItem* itemp = NULL;
- itemp = communicate_button->add(LLFloaterMyFriends::getInstance()->getShortTitle(), LLSD("contacts"), ADD_TOP);
+ LLSD contact_sd;
+ contact_sd["value"] = "contacts";
+ contact_sd["columns"][0]["value"] = LLFloaterMyFriends::getInstance()->getShortTitle();
if (LLFloaterMyFriends::getInstance() == frontmost_floater)
{
- ((LLScrollListText*)itemp->getColumn(0))->setFontStyle(LLFontGL::BOLD);
+ contact_sd["columns"][0]["font"]["style"] = "BOLD";
// make sure current tab is selected in list
if (selected.isUndefined())
{
- selected = itemp->getValue();
+ selected = "contacts";
}
}
- itemp = communicate_button->add(LLFloaterChat::getInstance()->getShortTitle(), LLSD("local chat"), ADD_TOP);
+ itemp = communicate_button->addElement(contact_sd, ADD_TOP);
+
+ LLSD communicate_sd;
+ communicate_sd["value"] = "local chat";
+ communicate_sd["columns"][0]["value"] = LLFloaterChat::getInstance()->getShortTitle();
+
if (LLFloaterChat::getInstance() == frontmost_floater)
{
- ((LLScrollListText*)itemp->getColumn(0))->setFontStyle(LLFontGL::BOLD);
+ communicate_sd["columns"][0]["font"]["style"] = "BOLD";
if (selected.isUndefined())
{
- selected = itemp->getValue();
+ selected = "local chat";
}
}
+ itemp = communicate_button->addElement(communicate_sd, ADD_TOP);
+
communicate_button->addSeparator(ADD_TOP);
communicate_button->add(getString("Redock Windows"), LLSD("redock"), ADD_TOP);
communicate_button->addSeparator(ADD_TOP);
@@ -357,38 +344,40 @@ void LLToolBar::updateCommunicateList()
{
std::string floater_title = im_floaterp->getNumUnreadMessages() > 0 ? "*" : "";
floater_title.append(im_floaterp->getShortTitle());
- itemp = communicate_button->add(floater_title, im_floaterp->getSessionID(), ADD_TOP);
+ LLSD im_sd;
+ im_sd["value"] = im_floaterp->getSessionID();
+ im_sd["columns"][0]["value"] = floater_title;
if (im_floaterp == frontmost_floater)
{
- ((LLScrollListText*)itemp->getColumn(0))->setFontStyle(LLFontGL::BOLD);
+ im_sd["columns"][0]["font"]["style"] = "BOLD";
if (selected.isUndefined())
{
- selected = itemp->getValue();
+ selected = im_floaterp->getSessionID();
}
}
+ itemp = communicate_button->addElement(im_sd, ADD_TOP);
}
}
- communicate_button->setToggleState(gSavedSettings.getBOOL("ShowCommunicate"));
communicate_button->setValue(selected);
}
// static
-void LLToolBar::onClickCommunicate(LLUICtrl* ctrl, void* user_data)
+void LLToolBar::onClickCommunicate(LLUICtrl* ctrl, const LLSD& user_data)
{
- LLToolBar* toolbar = (LLToolBar*)user_data;
- LLFlyoutButton* communicate_button = toolbar->getChild<LLFlyoutButton>("communicate_btn");
+ LLFlyoutButton* communicate_button = dynamic_cast<LLFlyoutButton*>(ctrl);
+ llassert_always(communicate_button);
LLSD selected_option = communicate_button->getValue();
if (selected_option.asString() == "contacts")
{
- LLFloaterMyFriends::showInstance();
+ LLFloaterReg::showInstance("contacts", "friends");
}
else if (selected_option.asString() == "local chat")
{
- LLFloaterChat::showInstance();
+ LLFloaterReg::showInstance("communicate", "local");
}
else if (selected_option.asString() == "redock")
{
@@ -410,7 +399,7 @@ void LLToolBar::onClickCommunicate(LLUICtrl* ctrl, void* user_data)
}
}
- LLFloaterChatterBox::showInstance(session_to_show);
+ LLFloaterReg::showInstance("communicate", session_to_show);
}
else if (selected_option.asString() == "mute list")
{
@@ -418,104 +407,12 @@ void LLToolBar::onClickCommunicate(LLUICtrl* ctrl, void* user_data)
}
else if (selected_option.isUndefined()) // user just clicked the communicate button, treat as toggle
{
- if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
- {
- LLFloaterMyFriends::toggleInstance();
- }
- else
- {
- LLFloaterChatterBox::toggleInstance();
- }
- }
- else // otherwise selection_option is a specific IM session id
- {
- LLFloaterChatterBox::showInstance(selected_option);
- }
-}
-
-
-// static
-void LLToolBar::onClickChat(void* user_data)
-{
- handle_chat(NULL);
-}
-
-// static
-void LLToolBar::onClickAppearance(void*)
-{
- if (gAgent.areWearablesLoaded())
- {
- gAgent.changeCameraToCustomizeAvatar();
+ LLFloaterReg::toggleInstance("communicate");
}
-}
-
-
-// static
-void LLToolBar::onClickFly(void*)
-{
- gAgent.toggleFlying();
-}
-
-
-// static
-void LLToolBar::onClickSit(void*)
-{
- if (!(gAgent.getControlFlags() & AGENT_CONTROL_SIT_ON_GROUND))
- {
- // sit down
- gAgent.setFlying(FALSE);
- gAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
-
- // Might be first sit
- LLFirstUse::useSit();
- }
- else
+ else // otherwise selection_option is undifined or a specific IM session id
{
- // stand up
- gAgent.setFlying(FALSE);
- gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
+ LLFloaterReg::showInstance("communicate", selected_option);
}
}
-// static
-void LLToolBar::onClickSnapshot(void*)
-{
- LLFloaterSnapshot::show (0);
-}
-
-
-// static
-void LLToolBar::onClickDirectory(void*)
-{
- handle_find(NULL);
-}
-
-
-// static
-void LLToolBar::onClickBuild(void*)
-{
- toggle_build_mode();
-}
-
-
-// static
-void LLToolBar::onClickRadar(void*)
-{
- handle_mini_map(NULL);
-}
-
-
-// static
-void LLToolBar::onClickMap(void*)
-{
- handle_map(NULL);
-}
-
-
-// static
-void LLToolBar::onClickInventory(void*)
-{
- handle_inventory(NULL);
-}
-
diff --git a/indra/newview/lltoolbar.h b/indra/newview/lltoolbar.h
index 094d016e39..954c6270a6 100644
--- a/indra/newview/lltoolbar.h
+++ b/indra/newview/lltoolbar.h
@@ -37,12 +37,7 @@
#include "llframetimer.h"
-// "Constants" loaded from settings.xml at start time
-extern S32 TOOL_BAR_HEIGHT;
-
-#if LL_DARWIN
- class LLFakeResizeHandle;
-#endif // LL_DARWIN
+class LLResizeHandle;
class LLToolBar
: public LLPanel
@@ -71,17 +66,7 @@ public:
void refresh();
// callbacks
- static void onClickCommunicate(LLUICtrl*, void*);
- static void onClickChat(void* data);
- static void onClickAppearance(void* data);
- static void onClickFly(void*);
- static void onClickSit(void*);
- static void onClickSnapshot(void* data);
- static void onClickDirectory(void* data);
- static void onClickBuild(void* data);
- static void onClickRadar(void* data);
- static void onClickMap(void* data);
- static void onClickInventory(void* data);
+ static void onClickCommunicate(LLUICtrl*, const LLSD&);
static F32 sInventoryAutoOpenTime;
@@ -94,7 +79,7 @@ private:
LLFrameTimer mInventoryAutoOpenTimer;
S32 mNumUnreadIMs;
#if LL_DARWIN
- LLFakeResizeHandle *mResizeHandle;
+ LLResizeHandle *mResizeHandle;
#endif // LL_DARWIN
};
diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp
index c42693d03f..0088a6a2a4 100644
--- a/indra/newview/lltoolbrush.cpp
+++ b/indra/newview/lltoolbrush.cpp
@@ -412,7 +412,7 @@ BOOL LLToolBrushLand::handleHover( S32 x, S32 y, MASK mask )
mMouseX = x;
mMouseY = y;
mGotHover = TRUE;
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLLAND);
+ gViewerWindow->setCursor(UI_CURSOR_TOOLLAND);
return TRUE;
}
diff --git a/indra/newview/lltoolcomp.cpp b/indra/newview/lltoolcomp.cpp
index 0b6e01886a..b95b33439e 100644
--- a/indra/newview/lltoolcomp.cpp
+++ b/indra/newview/lltoolcomp.cpp
@@ -34,6 +34,7 @@
#include "lltoolcomp.h"
+#include "llfloaterreg.h"
#include "llgl.h"
#include "indra_constants.h"
@@ -290,7 +291,7 @@ BOOL LLToolCompTranslate::handleDoubleClick(S32 x, S32 y, MASK mask)
{
// You should already have an object selected from the mousedown.
// If so, show its properties
- gFloaterTools->showPanel(LLFloaterTools::PANEL_CONTENTS);
+ LLFloaterReg::showInstance("build", "Content");
return TRUE;
}
// Nothing selected means the first mouse click was probably
@@ -407,8 +408,7 @@ BOOL LLToolCompScale::handleDoubleClick(S32 x, S32 y, MASK mask)
{
// You should already have an object selected from the mousedown.
// If so, show its properties
- gFloaterTools->showPanel(LLFloaterTools::PANEL_CONTENTS);
- //gBuildView->setPropertiesPanelOpen(TRUE);
+ LLFloaterReg::showInstance("build", "Content");
return TRUE;
}
else
@@ -605,8 +605,7 @@ BOOL LLToolCompRotate::handleDoubleClick(S32 x, S32 y, MASK mask)
{
// You should already have an object selected from the mousedown.
// If so, show its properties
- gFloaterTools->showPanel(LLFloaterTools::PANEL_CONTENTS);
- //gBuildView->setPropertiesPanelOpen(TRUE);
+ LLFloaterReg::showInstance("build", "Content");
return TRUE;
}
else
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 156093a21a..741492a88a 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -35,6 +35,7 @@
#include "message.h"
#include "lltooldraganddrop.h"
+#include "llfloaterreg.h"
#include "llinstantmessage.h"
#include "lldir.h"
@@ -1461,10 +1462,10 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj,
}
}
hit_obj->updateInventory(new_item, TASK_INVENTORY_ITEM_KEY, true);
- if (gFloaterTools->getVisible())
+ if (LLFloaterReg::instanceVisible("build"))
{
// *FIX: only show this if panel not expanded?
- gFloaterTools->showPanel(LLFloaterTools::PANEL_CONTENTS);
+ LLFloaterReg::showInstance("build", "Content");
}
// VEFFECT: AddToInventory
@@ -2897,11 +2898,10 @@ LLInventoryObject* LLToolDragAndDrop::locateInventory(
}
else if(mSource == SOURCE_NOTECARD)
{
- LLPreviewNotecard* card;
- card = (LLPreviewNotecard*)LLPreview::find(mSourceID);
- if(card)
+ LLPreviewNotecard* preview = LLFloaterReg::findTypedInstance<LLPreviewNotecard>("preview_notecard", mSourceID);
+ if(preview)
{
- item = (LLViewerInventoryItem*)card->getDragItem();
+ item = (LLViewerInventoryItem*)preview->getDragItem();
}
}
if(item) return item;
diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp
index d06e41c771..b335d7125a 100644
--- a/indra/newview/lltoolface.cpp
+++ b/indra/newview/lltoolface.cpp
@@ -36,14 +36,13 @@
#include "lltoolface.h"
// Library includes
+#include "llfloaterreg.h"
#include "v3math.h"
// Viewer includes
#include "llagent.h"
-//#include "llbuildview.h"
#include "llviewercontrol.h"
#include "llselectmgr.h"
-#include "lltoolview.h"
#include "llviewerobject.h"
#include "llviewerwindow.h"
#include "llfloatertools.h"
@@ -67,9 +66,7 @@ BOOL LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask)
{
// You should already have an object selected from the mousedown.
// If so, show its properties
- //gBuildView->showFacePanel();
- gFloaterTools->showPanel( LLFloaterTools::PANEL_FACE );
- //gBuildView->showMore(LLBuildView::PANEL_FACE);
+ LLFloaterReg::showInstance("build", "Texture");
return TRUE;
}
else
diff --git a/indra/newview/lltoolgrab.h b/indra/newview/lltoolgrab.h
index cf2405cafc..16ccb3f24f 100644
--- a/indra/newview/lltoolgrab.h
+++ b/indra/newview/lltoolgrab.h
@@ -36,7 +36,7 @@
#include "lltool.h"
#include "v3math.h"
#include "llquaternion.h"
-#include "llmemory.h"
+#include "llsingleton.h"
#include "lluuid.h"
#include "llviewerwindow.h" // for LLPickInfo
diff --git a/indra/newview/lltoolgun.cpp b/indra/newview/lltoolgun.cpp
index d21fd49647..72fd8b3bac 100644
--- a/indra/newview/lltoolgun.cpp
+++ b/indra/newview/lltoolgun.cpp
@@ -48,6 +48,9 @@
#include "lltoolmgr.h"
#include "lltoolgrab.h"
+// Linden library includes
+#include "llwindow.h" // setMouseClipping()
+
LLToolGun::LLToolGun( LLToolComposite* composite )
: LLTool( std::string("gun"), composite )
{
@@ -132,7 +135,7 @@ void LLToolGun::draw()
{
if( gSavedSettings.getBOOL("ShowCrosshairs") )
{
- LLUIImagePtr crosshair = LLUI::getUIImage("UIImgCrosshairsUUID");
+ LLUIImagePtr crosshair = LLUI::getUIImage("crosshairs.tga");
crosshair->draw(
( gViewerWindow->getWindowWidth() - crosshair->getWidth() ) / 2,
( gViewerWindow->getWindowHeight() - crosshair->getHeight() ) / 2);
diff --git a/indra/newview/lltoolindividual.cpp b/indra/newview/lltoolindividual.cpp
index 8382e0d72d..163c7cbd9b 100644
--- a/indra/newview/lltoolindividual.cpp
+++ b/indra/newview/lltoolindividual.cpp
@@ -41,6 +41,7 @@
#include "llviewerprecompiledheaders.h"
#include "lltoolindividual.h"
+#include "llfloaterreg.h"
#include "llselectmgr.h"
#include "llviewerobject.h"
#include "llviewerwindow.h"
@@ -93,9 +94,7 @@ BOOL LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
{
// You should already have an object selected from the mousedown.
// If so, show its inventory.
- //gBuildView->showInventoryPanel();
- //gBuildView->showPanel(LLBuildView::PANEL_CONTENTS);
- gFloaterTools->showPanel(LLFloaterTools::PANEL_CONTENTS);
+ LLFloaterReg::showInstance("build", "Content");
return TRUE;
}
else
diff --git a/indra/newview/lltoolmgr.cpp b/indra/newview/lltoolmgr.cpp
index 5ba7217c99..5a8dd62f8d 100644
--- a/indra/newview/lltoolmgr.cpp
+++ b/indra/newview/lltoolmgr.cpp
@@ -34,8 +34,13 @@
#include "lltoolmgr.h"
-#include "lltool.h"
+#include "lluictrl.h"
+#include "llmenugl.h"
+#include "llfloaterreg.h"
+
+#include "llfirstuse.h"
// tools and manipulators
+#include "lltool.h"
#include "llmanipscale.h"
#include "llselectmgr.h"
#include "lltoolbrush.h"
@@ -47,12 +52,14 @@
#include "lltoolindividual.h"
#include "lltoolmorph.h"
#include "lltoolpie.h"
-#include "lltoolplacer.h"
#include "lltoolselectland.h"
#include "lltoolobjpicker.h"
#include "lltoolpipette.h"
#include "llagent.h"
#include "llviewercontrol.h"
+#include "llviewerjoystick.h"
+#include "llviewermenu.h"
+#include "llviewerparcelmgr.h"
// Used when app not active to avoid processing hover.
@@ -76,6 +83,10 @@ LLToolMgr::LLToolMgr()
mSelectedTool( NULL ),
mCurrentToolset( NULL )
{
+ LLUICtrl::EnableCallbackRegistry::currentRegistrar().add("Build.Active", boost::bind(&LLToolMgr::inEdit, this));
+ LLUICtrl::EnableCallbackRegistry::currentRegistrar().add("Build.Enabled", boost::bind(&LLToolMgr::canEdit, this));
+ LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Build.Toggle", boost::bind(&LLToolMgr::toggleBuildMode, this));
+
gToolNull = new LLTool(LLStringUtil::null); // Does nothing
setCurrentTool(gToolNull);
@@ -172,7 +183,7 @@ void LLToolMgr::setCurrentTool( LLTool* tool )
LLTool* LLToolMgr::getCurrentTool()
{
- MASK override_mask = gKeyboard->currentMask(TRUE);
+ MASK override_mask = gKeyboard ? gKeyboard->currentMask(TRUE) : 0;
LLTool* cur_tool = NULL;
// always use transient tools if available
@@ -226,11 +237,77 @@ void LLToolMgr::updateToolStatus()
getCurrentTool();
}
-BOOL LLToolMgr::inEdit()
+bool LLToolMgr::inEdit()
{
return mBaseTool != LLToolPie::getInstance() && mBaseTool != gToolNull;
}
+bool LLToolMgr::canEdit()
+{
+ return LLViewerParcelMgr::getInstance()->agentCanBuild();
+}
+
+void LLToolMgr::toggleBuildMode()
+{
+ if (inBuildMode())
+ {
+ if (gSavedSettings.getBOOL("EditCameraMovement"))
+ {
+ // just reset the view, will pull us out of edit mode
+ handle_reset_view();
+ }
+ else
+ {
+ // manually disable edit mode, but do not affect the camera
+ gAgent.resetView(false);
+ LLFloaterReg::hideInstance("build");
+ gViewerWindow->showCursor();
+ }
+ // avoid spurious avatar movements pulling out of edit mode
+ LLViewerJoystick::getInstance()->setNeedsReset();
+ }
+ else
+ {
+ ECameraMode camMode = gAgent.getCameraMode();
+ if (CAMERA_MODE_MOUSELOOK == camMode || CAMERA_MODE_CUSTOMIZE_AVATAR == camMode)
+ {
+ // pull the user out of mouselook or appearance mode when entering build mode
+ handle_reset_view();
+ }
+
+ if (gSavedSettings.getBOOL("EditCameraMovement"))
+ {
+ // camera should be set
+ if (LLViewerJoystick::getInstance()->getOverrideCamera())
+ {
+ handle_toggle_flycam();
+ }
+
+ if (gAgent.getFocusOnAvatar())
+ {
+ // zoom in if we're looking at the avatar
+ gAgent.setFocusOnAvatar(FALSE, ANIMATE);
+ gAgent.setFocusGlobal(gAgent.getPositionGlobal() + 2.0 * LLVector3d(gAgent.getAtAxis()));
+ gAgent.cameraZoomIn(0.666f);
+ gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
+ }
+ }
+
+
+ setCurrentToolset(gBasicToolset);
+ getCurrentToolset()->selectTool( LLToolCompCreate::getInstance() );
+
+ // Could be first use
+ LLFirstUse::useBuild();
+
+ gAgent.resetView(false);
+
+ // avoid spurious avatar movements
+ LLViewerJoystick::getInstance()->setNeedsReset();
+
+ }
+}
+
bool LLToolMgr::inBuildMode()
{
// when entering mouselook inEdit() immediately returns true before
@@ -396,8 +473,6 @@ void LLToolset::selectPrevTool()
}
}
-void select_tool( void *tool_pointer )
-{
- LLTool *tool = (LLTool *)tool_pointer;
- LLToolMgr::getInstance()->getCurrentToolset()->selectTool( tool );
-}
+////////////////////////////////////////////////////////////////////////////
+
+
diff --git a/indra/newview/lltoolmgr.h b/indra/newview/lltoolmgr.h
index 92647c99de..22aec97864 100644
--- a/indra/newview/lltoolmgr.h
+++ b/indra/newview/lltoolmgr.h
@@ -58,7 +58,9 @@ public:
LLTool* getCurrentTool(); // returns active tool, taking into account keyboard state
LLTool* getBaseTool(); // returns active tool when overrides are deactivated
- BOOL inEdit();
+ bool inEdit();
+ bool canEdit();
+ void toggleBuildMode();
/* Determines if we are in Build mode or not. */
bool inBuildMode();
@@ -115,10 +117,6 @@ protected:
tool_list_t mToolList;
};
-// Handy callbacks for switching tools
-void select_tool(void *tool);
-
-
// Globals
extern LLToolset* gBasicToolset;
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp
index 75e19645a6..4577fc7677 100644
--- a/indra/newview/lltoolmorph.cpp
+++ b/indra/newview/lltoolmorph.cpp
@@ -56,7 +56,6 @@
#include "llsky.h"
#include "lltexlayer.h"
#include "lltoolmgr.h"
-#include "lltoolview.h"
#include "llui.h"
#include "llviewercamera.h"
#include "llviewerimagelist.h"
diff --git a/indra/newview/lltoolobjpicker.cpp b/indra/newview/lltoolobjpicker.cpp
index d69688706f..8a66069584 100644
--- a/indra/newview/lltoolobjpicker.cpp
+++ b/indra/newview/lltoolobjpicker.cpp
@@ -131,7 +131,7 @@ BOOL LLToolObjPicker::handleHover(S32 x, S32 y, MASK mask)
cursor = UI_CURSOR_TOOLPICKOBJECT3;
- gViewerWindow->getWindow()->setCursor(cursor);
+ gViewerWindow->setCursor(cursor);
}
return handled;
}
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 986555db49..171b03bc5f 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -79,7 +79,6 @@ static ECursorType cursor_from_parcel_media(U8 click_action);
LLToolPie::LLToolPie()
: LLTool(std::string("Select")),
- mPieMouseButtonDown( FALSE ),
mGrabMouseButtonDown( FALSE ),
mMouseOutsideSlop( FALSE ),
mClickAction(0)
@@ -98,32 +97,35 @@ BOOL LLToolPie::handleMouseDown(S32 x, S32 y, MASK mask)
void LLToolPie::leftMouseCallback(const LLPickInfo& pick_info)
{
LLToolPie::getInstance()->mPick = pick_info;
- LLToolPie::getInstance()->pickAndShowMenu(FALSE);
+ LLToolPie::getInstance()->pickLeftMouseDownCallback();
}
BOOL LLToolPie::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
- // don't pick transparent so users can't "pay" transparent objects
- gViewerWindow->pickAsync(x, y, mask, rightMouseCallback, FALSE, TRUE);
- mPieMouseButtonDown = TRUE;
- // don't steal focus from UI
return FALSE;
}
+BOOL LLToolPie::handleRightMouseUp(S32 x, S32 y, MASK mask)
+{
+ LLToolMgr::getInstance()->clearTransientTool();
+ gViewerWindow->pickAsync(x, y, mask, rightMouseCallback, FALSE, TRUE);
+ return LLTool::handleRightMouseUp(x, y, mask);
+}
+
// static
void LLToolPie::rightMouseCallback(const LLPickInfo& pick_info)
{
LLToolPie::getInstance()->mPick = pick_info;
- LLToolPie::getInstance()->pickAndShowMenu(TRUE);
+ LLToolPie::getInstance()->pickRightMouseUpCallback();
}
// True if you selected an object.
-BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
+BOOL LLToolPie::pickLeftMouseDownCallback()
{
S32 x = mPick.mMousePt.mX;
S32 y = mPick.mMousePt.mY;
MASK mask = mPick.mKeyMask;
- if (!always_show && mPick.mPickType == LLPickInfo::PICK_PARCEL_WALL)
+ if (mPick.mPickType == LLPickInfo::PICK_PARCEL_WALL)
{
LLParcel* parcel = LLViewerParcelMgr::getInstance()->getCollisionParcel();
if (parcel)
@@ -164,7 +166,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
|| (parent && parent->flagHandleTouch());
// If it's a left-click, and we have a special action, do it.
- if (useClickAction(always_show, mask, object, parent))
+ if (useClickAction(mask, object, parent))
{
mClickAction = 0;
if (object && object->getClickAction())
@@ -240,8 +242,8 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
// Switch to grab tool if physical or triggerable
if (object &&
!object->isAvatar() &&
- ((object->usePhysics() || (parent && !parent->isAvatar() && parent->usePhysics())) || touchable) &&
- !always_show)
+ ((object->usePhysics() || (parent && !parent->isAvatar() && parent->usePhysics())) || touchable)
+ )
{
gGrabTransientTool = this;
LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolGrab::getInstance() );
@@ -256,8 +258,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
// If left-click never selects or spawns a menu
// Eat the event.
- if (!gSavedSettings.getBOOL("LeftClickShowMenu")
- && !always_show)
+ if (!gSavedSettings.getBOOL("LeftClickShowMenu"))
{
// mouse already released
if (!mGrabMouseButtonDown)
@@ -292,7 +293,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
return LLTool::handleMouseDown(x, y, mask);
}
- if (!always_show && gAgent.leftButtonGrabbed())
+ if (gAgent.leftButtonGrabbed())
{
// if the left button is grabbed, don't put up the pie menu
return LLTool::handleMouseDown(x, y, mask);
@@ -302,116 +303,15 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE);
// Spawn pie menu
- if (mPick.mPickType == LLPickInfo::PICK_LAND)
- {
- LLParcelSelectionHandle selection = LLViewerParcelMgr::getInstance()->selectParcelAt( mPick.mPosGlobal );
- gMenuHolder->setParcelSelection(selection);
- gPieLand->show(x, y, mPieMouseButtonDown);
-
- // VEFFECT: ShowPie
- LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
- effectp->setPositionGlobal(mPick.mPosGlobal);
- effectp->setColor(LLColor4U(gAgent.getEffectColor()));
- effectp->setDuration(0.25f);
- }
- else if (mPick.mObjectID == gAgent.getID() )
- {
- if(!gPieSelf)
- {
- //either at very early startup stage or at late quitting stage,
- //this event is ignored.
- return TRUE ;
- }
-
- gPieSelf->show(x, y, mPieMouseButtonDown);
- }
- else if (object)
- {
- gMenuHolder->setObjectSelection(LLSelectMgr::getInstance()->getSelection());
-
- if (object->isAvatar()
- || (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner()))
- {
- // Find the attachment's avatar
- while( object && object->isAttachment())
- {
- object = (LLViewerObject*)object->getParent();
- }
-
- // Object is an avatar, so check for mute by id.
- LLVOAvatar* avatar = (LLVOAvatar*)object;
- std::string name = avatar->getFullname();
- if (LLMuteList::getInstance()->isMuted(avatar->getID(), name))
- {
- gMenuHolder->childSetText("Avatar Mute", std::string("Unmute")); // *TODO:Translate
- //gMutePieMenu->setLabel("Unmute");
- }
- else
- {
- gMenuHolder->childSetText("Avatar Mute", std::string("Mute")); // *TODO:Translate
- //gMutePieMenu->setLabel("Mute");
- }
-
- gPieAvatar->show(x, y, mPieMouseButtonDown);
- }
- else if (object->isAttachment())
- {
- gPieAttachment->show(x, y, mPieMouseButtonDown);
- }
- else
- {
- // BUG: What about chatting child objects?
- std::string name;
- LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
- if (node)
- {
- name = node->mName;
- }
- if (LLMuteList::getInstance()->isMuted(object->getID(), name))
- {
- gMenuHolder->childSetText("Object Mute", std::string("Unmute")); // *TODO:Translate
- //gMuteObjectPieMenu->setLabel("Unmute");
- }
- else
- {
- gMenuHolder->childSetText("Object Mute", std::string("Mute")); // *TODO:Translate
- //gMuteObjectPieMenu->setLabel("Mute");
- }
-
- gPieObject->show(x, y, mPieMouseButtonDown);
-
- // VEFFECT: ShowPie object
- // Don't show when you click on someone else, it freaks them
- // out.
- LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
- effectp->setPositionGlobal(mPick.mPosGlobal);
- effectp->setColor(LLColor4U(gAgent.getEffectColor()));
- effectp->setDuration(0.25f);
- }
- }
-
- if (always_show)
- {
- // ignore return value
- LLTool::handleRightMouseDown(x, y, mask);
- }
- else
- {
- // ignore return value
- LLTool::handleMouseDown(x, y, mask);
- }
-
- // We handled the event.
+ LLTool::handleRightMouseDown(x, y, mask);
return TRUE;
}
-BOOL LLToolPie::useClickAction(BOOL always_show,
- MASK mask,
+BOOL LLToolPie::useClickAction(MASK mask,
LLViewerObject* object,
LLViewerObject* parent)
{
- return !always_show
- && mask == MASK_NONE
+ return mask == MASK_NONE
&& object
&& !object->isAttachment()
&& LLPrimitive::isPrimitive(object->getPCode())
@@ -567,27 +467,27 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
parent = object->getRootEdit();
}
- if (object && useClickAction(FALSE, mask, object, parent))
+ if (object && useClickAction(mask, object, parent))
{
ECursorType cursor = cursor_from_object(object);
- gViewerWindow->getWindow()->setCursor(cursor);
+ gViewerWindow->setCursor(cursor);
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
}
else if ((object && !object->isAvatar() && object->usePhysics())
|| (parent && !parent->isAvatar() && parent->usePhysics()))
{
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLGRAB);
+ gViewerWindow->setCursor(UI_CURSOR_TOOLGRAB);
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
}
else if ( (object && object->flagHandleTouch())
|| (parent && parent->flagHandleTouch()))
{
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_HAND);
+ gViewerWindow->setCursor(UI_CURSOR_HAND);
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
}
else
{
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+ gViewerWindow->setCursor(UI_CURSOR_ARROW);
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPie (inactive)" << llendl;
}
@@ -610,7 +510,7 @@ BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask)
// the world. Keep the cursor an arrow, assuming that
// after the user moves off the UI, they won't be on the
// same object anymore.
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+ gViewerWindow->setCursor(UI_CURSOR_ARROW);
// Make sure the hover-picked object is ignored.
gHoverView->resetLastHoverObject();
break;
@@ -624,13 +524,6 @@ BOOL LLToolPie::handleMouseUp(S32 x, S32 y, MASK mask)
return LLTool::handleMouseUp(x, y, mask);
}
-BOOL LLToolPie::handleRightMouseUp(S32 x, S32 y, MASK mask)
-{
- mPieMouseButtonDown = FALSE;
- LLToolMgr::getInstance()->clearTransientTool();
- return LLTool::handleRightMouseUp(x, y, mask);
-}
-
BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
{
@@ -832,3 +725,116 @@ static ECursorType cursor_from_parcel_media(U8 click_action)
return UI_CURSOR_TOOLPLAY;
}
}
+
+
+// True if you selected an object.
+BOOL LLToolPie::pickRightMouseUpCallback()
+{
+ S32 x = mPick.mMousePt.mX;
+ S32 y = mPick.mMousePt.mY;
+ MASK mask = mPick.mKeyMask;
+
+ if (mPick.mPickType != LLPickInfo::PICK_LAND)
+ {
+ LLViewerParcelMgr::getInstance()->deselectLand();
+ }
+
+ // didn't click in any UI object, so must have clicked in the world
+ LLViewerObject *object = mPick.getObject();
+ LLViewerObject *parent = NULL;
+ if(object)
+ parent = object->getRootEdit();
+
+ // Can't ignore children here.
+ LLToolSelect::handleObjectSelection(mPick, FALSE, TRUE);
+
+ // Spawn pie menu
+ if (mPick.mPickType == LLPickInfo::PICK_LAND)
+ {
+ LLParcelSelectionHandle selection = LLViewerParcelMgr::getInstance()->selectParcelAt( mPick.mPosGlobal );
+ gMenuHolder->setParcelSelection(selection);
+ gPieLand->show(x, y);
+
+ showVisualContextMenuEffect();
+
+ }
+ else if (mPick.mObjectID == gAgent.getID() )
+ {
+ if(!gPieSelf)
+ {
+ //either at very early startup stage or at late quitting stage,
+ //this event is ignored.
+ return TRUE ;
+ }
+
+ gPieSelf->show(x, y);
+ }
+ else if (object)
+ {
+ gMenuHolder->setObjectSelection(LLSelectMgr::getInstance()->getSelection());
+
+ if (object->isAvatar()
+ || (object->isAttachment() && !object->isHUDAttachment() && !object->permYouOwner()))
+ {
+ // Find the attachment's avatar
+ while( object && object->isAttachment())
+ {
+ object = (LLViewerObject*)object->getParent();
+ }
+
+ // Object is an avatar, so check for mute by id.
+ LLVOAvatar* avatar = (LLVOAvatar*)object;
+ std::string name = avatar->getFullname();
+ if (LLMuteList::getInstance()->isMuted(avatar->getID(), avatar->getFullname()))
+ {
+ gMenuHolder->childSetText("Avatar Mute", std::string("Unmute")); // *TODO:Translate
+ }
+ else
+ {
+ gMenuHolder->childSetText("Avatar Mute", std::string("Mute")); // *TODO:Translate
+ }
+
+ gPieAvatar->show(x, y);
+ }
+ else if (object->isAttachment())
+ {
+ gPieAttachment->show(x, y);
+ }
+ else
+ {
+ // BUG: What about chatting child objects?
+ std::string name;
+ LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
+ if (node)
+ {
+ name = node->mName;
+ }
+ if (LLMuteList::getInstance()->isMuted(object->getID(), name))
+ {
+ gMenuHolder->childSetText("Object Mute", std::string("Unmute")); // *TODO:Translate
+ }
+ else
+ {
+ gMenuHolder->childSetText("Object Mute", std::string("Mute")); // *TODO:Translate
+ }
+
+ gPieObject->show(x, y);
+
+ showVisualContextMenuEffect();
+ }
+ }
+
+ LLTool::handleRightMouseUp(x, y, mask);
+ // We handled the event.
+ return TRUE;
+}
+
+void LLToolPie::showVisualContextMenuEffect()
+{
+ // VEFFECT: ShowPie
+ LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
+ effectp->setPositionGlobal(mPick.mPosGlobal);
+ effectp->setColor(LLColor4U(gAgent.getEffectColor()));
+ effectp->setDuration(0.25f);
+
+}
diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h
index 83df03cda2..82de2b363e 100644
--- a/indra/newview/lltoolpie.h
+++ b/indra/newview/lltoolpie.h
@@ -73,13 +73,13 @@ public:
private:
- BOOL outsideSlop(S32 x, S32 y, S32 start_x, S32 start_y);
- BOOL pickAndShowMenu(BOOL edit_menu);
- BOOL useClickAction(BOOL always_show, MASK mask, LLViewerObject* object,
- LLViewerObject* parent);
+ BOOL outsideSlop (S32 x, S32 y, S32 start_x, S32 start_y);
+ BOOL pickLeftMouseDownCallback();
+ BOOL pickRightMouseUpCallback();
+ BOOL useClickAction (MASK mask, LLViewerObject* object,LLViewerObject* parent);
+ void showVisualContextMenuEffect();
private:
- BOOL mPieMouseButtonDown;
BOOL mGrabMouseButtonDown;
BOOL mMouseOutsideSlop; // for this drag, has mouse moved outside slop region
LLPickInfo mPick;
diff --git a/indra/newview/lltoolpipette.cpp b/indra/newview/lltoolpipette.cpp
index 9d95ccc06f..878ed0f9a9 100644
--- a/indra/newview/lltoolpipette.cpp
+++ b/indra/newview/lltoolpipette.cpp
@@ -55,8 +55,6 @@ LLToolPipette::LLToolPipette()
: LLTool(std::string("Pipette")),
mSuccess(TRUE)
{
- mSelectCallback = NULL;
- mUserData = NULL;
}
@@ -106,6 +104,15 @@ BOOL LLToolPipette::handleToolTip(S32 x, S32 y, std::string& msg, LLRect *sticky
return TRUE;
}
+void LLToolPipette::setTextureEntry(const LLTextureEntry* entry)
+{
+ if (entry)
+ {
+ mTextureEntry = *entry;
+ mSignal(mTextureEntry);
+ }
+}
+
void LLToolPipette::pickCallback(const LLPickInfo& pick_info)
{
LLViewerObject* hit_obj = pick_info.getObject();
@@ -118,20 +125,11 @@ void LLToolPipette::pickCallback(const LLPickInfo& pick_info)
{
//TODO: this should highlight the selected face only
LLSelectMgr::getInstance()->highlightObjectOnly(hit_obj);
- LLToolPipette::getInstance()->mTextureEntry = *hit_obj->getTE(pick_info.mObjectFace);
- if (LLToolPipette::getInstance()->mSelectCallback)
- {
- LLToolPipette::getInstance()->mSelectCallback(LLToolPipette::getInstance()->mTextureEntry, LLToolPipette::getInstance()->mUserData);
- }
+ const LLTextureEntry* entry = hit_obj->getTE(pick_info.mObjectFace);
+ LLToolPipette::getInstance()->setTextureEntry(entry);
}
}
-void LLToolPipette::setSelectCallback(select_callback callback, void* user_data)
-{
- mSelectCallback = callback;
- mUserData = user_data;
-}
-
void LLToolPipette::setResult(BOOL success, const std::string& msg)
{
mTooltipMsg = msg;
diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h
index 54c24e9467..fcccafe1a4 100644
--- a/indra/newview/lltoolpipette.h
+++ b/indra/newview/lltoolpipette.h
@@ -40,6 +40,8 @@
#include "lltool.h"
#include "lltextureentry.h"
+#include <boost/function.hpp>
+#include <boost/signal.hpp>
class LLViewerObject;
class LLPickInfo;
@@ -56,18 +58,19 @@ public:
virtual BOOL handleHover(S32 x, S32 y, MASK mask);
virtual BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect *sticky_rect_screen);
- typedef void (*select_callback)(const LLTextureEntry& te, void *data);
- void setSelectCallback(select_callback callback, void* user_data);
+ // Note: Don't return connection; use boost::bind + boost::signal::trackable to disconnect slots
+ typedef boost::signal<void (const LLTextureEntry& te)> signal_t;
+ void setToolSelectCallback(const signal_t::slot_type& cb) { mSignal.connect(cb); }
void setResult(BOOL success, const std::string& msg);
-
+
+ void setTextureEntry(const LLTextureEntry* entry);
static void pickCallback(const LLPickInfo& pick_info);
protected:
LLTextureEntry mTextureEntry;
- select_callback mSelectCallback;
+ signal_t mSignal;
BOOL mSuccess;
std::string mTooltipMsg;
- void* mUserData;
};
#endif //LL_LLTOOLPIPETTE_H
diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp
index 88fddd9336..607818305e 100644
--- a/indra/newview/lltoolplacer.cpp
+++ b/indra/newview/lltoolplacer.cpp
@@ -35,9 +35,6 @@
// self header
#include "lltoolplacer.h"
-// linden library headers
-#include "llprimitive.h"
-
// viewer headers
#include "llbutton.h"
#include "llviewercontrol.h"
@@ -65,13 +62,17 @@
#include "llviewercamera.h"
#include "llviewerstats.h"
+// linden library headers
+#include "llprimitive.h"
+#include "llwindow.h" // incBusyCount()
+
const LLVector3 DEFAULT_OBJECT_SCALE(0.5f, 0.5f, 0.5f);
//static
LLPCode LLToolPlacer::sObjectType = LL_PCODE_CUBE;
LLToolPlacer::LLToolPlacer()
-: LLTool( std::string("Create") )
+: LLTool( "Create" )
{
}
@@ -521,7 +522,7 @@ BOOL LLToolPlacer::placeObject(S32 x, S32 y, MASK mask)
BOOL LLToolPlacer::handleHover(S32 x, S32 y, MASK mask)
{
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolPlacer" << llendl;
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLCREATE);
+ gViewerWindow->setCursor(UI_CURSOR_TOOLCREATE);
return TRUE;
}
@@ -534,92 +535,3 @@ void LLToolPlacer::handleDeselect()
{
}
-//////////////////////////////////////////////////////
-// LLToolPlacerPanel
-
-// static
-LLPCode LLToolPlacerPanel::sCube = LL_PCODE_CUBE;
-LLPCode LLToolPlacerPanel::sPrism = LL_PCODE_PRISM;
-LLPCode LLToolPlacerPanel::sPyramid = LL_PCODE_PYRAMID;
-LLPCode LLToolPlacerPanel::sTetrahedron = LL_PCODE_TETRAHEDRON;
-LLPCode LLToolPlacerPanel::sCylinder = LL_PCODE_CYLINDER;
-LLPCode LLToolPlacerPanel::sCylinderHemi= LL_PCODE_CYLINDER_HEMI;
-LLPCode LLToolPlacerPanel::sCone = LL_PCODE_CONE;
-LLPCode LLToolPlacerPanel::sConeHemi = LL_PCODE_CONE_HEMI;
-LLPCode LLToolPlacerPanel::sTorus = LL_PCODE_TORUS;
-LLPCode LLToolPlacerPanel::sSquareTorus = LLViewerObject::LL_VO_SQUARE_TORUS;
-LLPCode LLToolPlacerPanel::sTriangleTorus = LLViewerObject::LL_VO_TRIANGLE_TORUS;
-LLPCode LLToolPlacerPanel::sSphere = LL_PCODE_SPHERE;
-LLPCode LLToolPlacerPanel::sSphereHemi = LL_PCODE_SPHERE_HEMI;
-LLPCode LLToolPlacerPanel::sTree = LL_PCODE_LEGACY_TREE;
-LLPCode LLToolPlacerPanel::sGrass = LL_PCODE_LEGACY_GRASS;
-
-S32 LLToolPlacerPanel::sButtonsAdded = 0;
-LLButton* LLToolPlacerPanel::sButtons[ TOOL_PLACER_NUM_BUTTONS ];
-
-LLToolPlacerPanel::LLToolPlacerPanel(const std::string& name, const LLRect& rect)
- :
- LLPanel( name, rect )
-{
- /* DEPRECATED - JC
- addButton( "UIImgCubeUUID", "UIImgCubeSelectedUUID", &LLToolPlacerPanel::sCube );
- addButton( "UIImgPrismUUID", "UIImgPrismSelectedUUID", &LLToolPlacerPanel::sPrism );
- addButton( "UIImgPyramidUUID", "UIImgPyramidSelectedUUID", &LLToolPlacerPanel::sPyramid );
- addButton( "UIImgTetrahedronUUID", "UIImgTetrahedronSelectedUUID", &LLToolPlacerPanel::sTetrahedron );
- addButton( "UIImgCylinderUUID", "UIImgCylinderSelectedUUID", &LLToolPlacerPanel::sCylinder );
- addButton( "UIImgHalfCylinderUUID", "UIImgHalfCylinderSelectedUUID",&LLToolPlacerPanel::sCylinderHemi );
- addButton( "UIImgConeUUID", "UIImgConeSelectedUUID", &LLToolPlacerPanel::sCone );
- addButton( "UIImgHalfConeUUID", "UIImgHalfConeSelectedUUID", &LLToolPlacerPanel::sConeHemi );
- addButton( "UIImgSphereUUID", "UIImgSphereSelectedUUID", &LLToolPlacerPanel::sSphere );
- addButton( "UIImgHalfSphereUUID", "UIImgHalfSphereSelectedUUID", &LLToolPlacerPanel::sSphereHemi );
- addButton( "UIImgTreeUUID", "UIImgTreeSelectedUUID", &LLToolPlacerPanel::sTree );
- addButton( "UIImgGrassUUID", "UIImgGrassSelectedUUID", &LLToolPlacerPanel::sGrass );
- addButton( "ObjectTorusImageID", "ObjectTorusActiveImageID", &LLToolPlacerPanel::sTorus );
- addButton( "ObjectTubeImageID", "ObjectTubeActiveImageID", &LLToolPlacerPanel::sSquareTorus );
- */
-}
-
-void LLToolPlacerPanel::addButton( const std::string& up_state, const std::string& down_state, LLPCode* pcode )
-{
- const S32 TOOL_SIZE = 32;
- const S32 HORIZ_SPACING = TOOL_SIZE + 5;
- const S32 VERT_SPACING = TOOL_SIZE + 5;
- const S32 VPAD = 10;
- const S32 HPAD = 7;
-
- S32 row = sButtonsAdded / 4;
- S32 column = sButtonsAdded % 4;
-
- LLRect help_rect = gSavedSettings.getRect("ToolHelpRect");
-
- // Build the rectangle, recalling the origin is at lower left
- // and we want the icons to build down from the top.
- LLRect rect;
- rect.setLeftTopAndSize(
- HPAD + (column * HORIZ_SPACING),
- help_rect.mBottom - VPAD - (row * VERT_SPACING),
- TOOL_SIZE,
- TOOL_SIZE );
-
- LLButton* btn = new LLButton(
- std::string("ToolPlacerOptBtn"),
- rect,
- up_state,
- down_state,
- LLStringUtil::null, &LLToolPlacerPanel::setObjectType,
- pcode,
- LLFontGL::getFontSansSerif());
- btn->setFollowsBottom();
- btn->setFollowsLeft();
- addChild(btn);
-
- sButtons[sButtonsAdded] = btn;
- sButtonsAdded++;
-}
-
-// static
-void LLToolPlacerPanel::setObjectType( void* data )
-{
- LLPCode pcode = *(LLPCode*) data;
- LLToolPlacer::setObjectType( pcode );
-}
diff --git a/indra/newview/lltoolplacer.h b/indra/newview/lltoolplacer.h
index d478f7b1c2..b7422380d4 100644
--- a/indra/newview/lltoolplacer.h
+++ b/indra/newview/lltoolplacer.h
@@ -67,43 +67,4 @@ private:
BOOL addDuplicate(S32 x, S32 y);
};
-////////////////////////////////////////////////////
-// LLToolPlacerPanel
-
-
-const S32 TOOL_PLACER_NUM_BUTTONS = 14;
-
-
-class LLToolPlacerPanel : public LLPanel
-{
-public:
-
- LLToolPlacerPanel(const std::string& name, const LLRect& rect);
-
- static void setObjectType( void* data );
-
- static LLPCode sCube;
- static LLPCode sPrism;
- static LLPCode sPyramid;
- static LLPCode sTetrahedron;
- static LLPCode sCylinder;
- static LLPCode sCylinderHemi;
- static LLPCode sCone;
- static LLPCode sConeHemi;
- static LLPCode sTorus;
- static LLPCode sSquareTorus;
- static LLPCode sTriangleTorus;
- static LLPCode sSphere;
- static LLPCode sSphereHemi;
- static LLPCode sTree;
- static LLPCode sGrass;
-
-private:
- void addButton( const std::string& up_state, const std::string& down_state, LLPCode* pcode );
-
-private:
- static S32 sButtonsAdded;
- static LLButton* sButtons[ TOOL_PLACER_NUM_BUTTONS ];
-};
-
#endif
diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp
index 80e99174c7..23bb5bdd8b 100644
--- a/indra/newview/lltoolselect.cpp
+++ b/indra/newview/lltoolselect.cpp
@@ -52,7 +52,7 @@
#include "llworld.h"
// Globals
-extern BOOL gAllowSelectAvatar;
+//extern BOOL gAllowSelectAvatar;
const F32 SELECTION_ROTATION_TRESHOLD = 0.1f;
@@ -87,7 +87,7 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi
BOOL select_movable = gSavedSettings.getBOOL("SelectMovableOnly");
// *NOTE: These settings must be cleaned up at bottom of function.
- if (temp_select || gAllowSelectAvatar)
+ if (temp_select || LLSelectMgr::getInstance()->mAllowSelectAvatar)
{
gSavedSettings.setBOOL("SelectOwnedOnly", FALSE);
gSavedSettings.setBOOL("SelectMovableOnly", FALSE);
@@ -217,7 +217,7 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi
} //if(!object)
// Cleanup temp select settings above.
- if (temp_select || gAllowSelectAvatar)
+ if (temp_select ||LLSelectMgr::getInstance()->mAllowSelectAvatar)
{
gSavedSettings.setBOOL("SelectOwnedOnly", select_owned);
gSavedSettings.setBOOL("SelectMovableOnly", select_movable);
diff --git a/indra/newview/lltoolselectland.cpp b/indra/newview/lltoolselectland.cpp
index 91223904b7..07c996a84f 100644
--- a/indra/newview/lltoolselectland.cpp
+++ b/indra/newview/lltoolselectland.cpp
@@ -43,7 +43,6 @@
#include "llfloatertools.h"
#include "llselectmgr.h"
#include "llstatusbar.h"
-#include "lltoolview.h"
#include "llviewerparcelmgr.h"
#include "llviewerwindow.h"
@@ -177,13 +176,13 @@ BOOL LLToolSelectLand::handleHover(S32 x, S32 y, MASK mask)
roundXY(mEastNorthTop);
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolSelectLand (active, land)" << llendl;
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+ gViewerWindow->setCursor(UI_CURSOR_ARROW);
}
else
{
mDragEndValid = FALSE;
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolSelectLand (active, no land)" << llendl;
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_NO);
+ gViewerWindow->setCursor(UI_CURSOR_NO);
}
mDragEndX = x;
@@ -192,13 +191,13 @@ BOOL LLToolSelectLand::handleHover(S32 x, S32 y, MASK mask)
else
{
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolSelectLand (active, in slop)" << llendl;
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+ gViewerWindow->setCursor(UI_CURSOR_ARROW);
}
}
else
{
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolSelectLand (inactive)" << llendl;
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+ gViewerWindow->setCursor(UI_CURSOR_ARROW);
}
return TRUE;
diff --git a/indra/newview/lltoolselectrect.cpp b/indra/newview/lltoolselectrect.cpp
index d544bff992..f87d1480d7 100644
--- a/indra/newview/lltoolselectrect.cpp
+++ b/indra/newview/lltoolselectrect.cpp
@@ -44,7 +44,6 @@
#include "llviewercontrol.h"
#include "llui.h"
#include "llselectmgr.h"
-#include "lltoolview.h"
#include "lltoolmgr.h"
#include "llviewerobject.h"
#include "llviewerobjectlist.h"
@@ -159,7 +158,7 @@ BOOL LLToolSelectRect::handleHover(S32 x, S32 y, MASK mask)
lldebugst(LLERR_USER_INPUT) << "hover handled by LLToolSelectRect (inactive)" << llendl;
}
- gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
+ gViewerWindow->setCursor(UI_CURSOR_ARROW);
return TRUE;
}
diff --git a/indra/newview/lltoolview.cpp b/indra/newview/lltoolview.cpp
index 9f6a77d245..f8393ebc47 100644
--- a/indra/newview/lltoolview.cpp
+++ b/indra/newview/lltoolview.cpp
@@ -65,9 +65,9 @@ LLToolContainer::~LLToolContainer()
LLToolView::LLToolView(const std::string& name, const LLRect& rect)
-: LLView(name, rect, MOUSE_OPAQUE),
- mButtonCount(0)
+: mButtonCount(0)
{
+ LLView::init(LLView::Params().name(name).rect(rect).mouse_opaque(true));
}
diff --git a/indra/newview/lltracker.cpp b/indra/newview/lltracker.cpp
index d54cc798d2..8e4f637832 100644
--- a/indra/newview/lltracker.cpp
+++ b/indra/newview/lltracker.cpp
@@ -39,7 +39,7 @@
#include "llgl.h"
#include "llrender.h"
#include "llinventory.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llstring.h"
#include "lluuid.h"
#include "v3math.h"
@@ -51,7 +51,6 @@
#include "lltracker.h"
#include "llagent.h"
#include "llcallingcard.h"
-#include "llcolorscheme.h"
#include "llfloaterworldmap.h"
#include "llhudtext.h"
#include "llhudview.h"
@@ -113,12 +112,14 @@ void LLTracker::stopTracking(void* userdata)
// static virtual
void LLTracker::drawHUDArrow()
{
+ static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
+
/* tracking autopilot destination has been disabled
-- 2004.01.09, Leviathan
// Draw dot for autopilot target
if (gAgent.getAutoPilot())
{
- instance()->drawMarker( gAgent.getAutoPilotTargetGlobal(), gTrackColor );
+ instance()->drawMarker( gAgent.getAutoPilotTargetGlobal(), map_track_color );
return;
}
*/
@@ -128,12 +129,12 @@ void LLTracker::drawHUDArrow()
// Tracked avatar
if(LLAvatarTracker::instance().haveTrackingInfo())
{
- instance()->drawMarker( LLAvatarTracker::instance().getGlobalPos(), gTrackColor );
+ instance()->drawMarker( LLAvatarTracker::instance().getGlobalPos(), map_track_color );
}
break;
case TRACKING_LANDMARK:
- instance()->drawMarker( getTrackedPositionGlobal(), gTrackColor );
+ instance()->drawMarker( getTrackedPositionGlobal(), map_track_color );
break;
case TRACKING_LOCATION:
@@ -145,7 +146,7 @@ void LLTracker::drawHUDArrow()
+ 0.1f * (LLWorld::getInstance()->resolveLandHeightGlobal(getTrackedPositionGlobal()) + 1.5f);
#endif
instance()->mTrackedPositionGlobal.mdV[VZ] = llclamp((F32)instance()->mTrackedPositionGlobal.mdV[VZ], LLWorld::getInstance()->resolveLandHeightGlobal(getTrackedPositionGlobal()) + 1.5f, (F32)instance()->getTrackedPositionGlobal().mdV[VZ]);
- instance()->drawMarker( getTrackedPositionGlobal(), gTrackColor );
+ instance()->drawMarker( getTrackedPositionGlobal(), map_track_color );
break;
default:
@@ -161,7 +162,9 @@ void LLTracker::render3D()
{
return;
}
-
+
+ static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
+
// Arbitary location beacon
if( instance()->mIsTrackingLocation )
{
@@ -181,7 +184,7 @@ void LLTracker::render3D()
}
else
{
- renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor,
+ renderBeacon( instance()->mTrackedPositionGlobal, map_track_color,
instance()->mBeaconText, instance()->mTrackedLocationName );
}
}
@@ -223,7 +226,7 @@ void LLTracker::render3D()
// and back again
instance()->mHasReachedLandmark = FALSE;
}
- renderBeacon( instance()->mTrackedPositionGlobal, gTrackColor,
+ renderBeacon( instance()->mTrackedPositionGlobal, map_track_color,
instance()->mBeaconText, instance()->mTrackedLandmarkName );
}
}
@@ -252,7 +255,7 @@ void LLTracker::render3D()
}
else
{
- renderBeacon( av_tracker.getGlobalPos(), gTrackColor,
+ renderBeacon( av_tracker.getGlobalPos(), map_track_color,
instance()->mBeaconText, av_tracker.getName() );
}
}
diff --git a/indra/newview/lltracker.h b/indra/newview/lltracker.h
index 2850365272..bfe9d6c6b5 100644
--- a/indra/newview/lltracker.h
+++ b/indra/newview/lltracker.h
@@ -40,7 +40,7 @@
#define LL_LLTRACKER_H
#include "lldarray.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llstring.h"
#include "lluuid.h"
#include "v3dmath.h"
diff --git a/indra/newview/lluploaddialog.cpp b/indra/newview/lluploaddialog.cpp
index 7f63972c8d..2fddccfb36 100644
--- a/indra/newview/lluploaddialog.cpp
+++ b/indra/newview/lluploaddialog.cpp
@@ -64,8 +64,7 @@ void LLUploadDialog::modalUploadFinished()
// Private methods
LLUploadDialog::LLUploadDialog( const std::string& msg)
- :
- LLPanel( std::string("Uploading..."), LLRect(0,100,100,0) ) // dummy rect. Will reshape below.
+ : LLPanel()
{
setBackgroundVisible( TRUE );
@@ -75,11 +74,16 @@ LLUploadDialog::LLUploadDialog( const std::string& msg)
}
LLUploadDialog::sDialog = this;
- const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
+ const LLFontGL* font = LLFontGL::getFontSansSerif();
LLRect msg_rect;
for (int line_num=0; line_num<16; ++line_num)
{
- mLabelBox[line_num] = new LLTextBox( std::string("Filename"), msg_rect, std::string("Filename"), font );
+ LLTextBox::Params params;
+ params.name("Filename");
+ params.rect(msg_rect);
+ params.text("Filename");
+ params.font(font);
+ mLabelBox[line_num] = LLUICtrlFactory::create<LLTextBox> (params);
addChild(mLabelBox[line_num]);
}
@@ -91,7 +95,7 @@ LLUploadDialog::LLUploadDialog( const std::string& msg)
void LLUploadDialog::setMessage( const std::string& msg)
{
- const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
+ const LLFontGL* font = LLFontGL::getFontSansSerif();
const S32 VPAD = 16;
const S32 HPAD = 25;
@@ -139,7 +143,7 @@ void LLUploadDialog::setMessage( const std::string& msg)
msg_rect.setOriginAndSize( msg_x, msg_y, max_msg_width, line_height );
mLabelBox[line_num]->setRect(msg_rect);
mLabelBox[line_num]->setText(cur_line);
- mLabelBox[line_num]->setColor( gColors.getColor( "LabelTextColor" ) );
+ mLabelBox[line_num]->setColor( gSavedSkinSettings.getColor( "LabelTextColor" ) );
mLabelBox[line_num]->setVisible(TRUE);
msg_y -= line_height;
++line_num;
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index 85ab44bc13..6c8e7e1f69 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -42,6 +42,7 @@
#include "llfloaterworldmap.h"
#include "llfloaterhtmlhelp.h"
#include "llpanellogin.h"
+#include "llslurl.h"
#include "llstartup.h" // gStartupState
#include "llurlsimstring.h"
#include "llweb.h"
@@ -50,20 +51,9 @@
// library includes
#include "llsd.h"
-const std::string SLURL_SL_HELP_PREFIX = "secondlife://app.";
-const std::string SLURL_SL_PREFIX = "sl://";
-const std::string SLURL_SECONDLIFE_PREFIX = "secondlife://";
-const std::string SLURL_SLURL_PREFIX = "http://slurl.com/secondlife/";
-
-const std::string SLURL_APP_TOKEN = "app/";
-
class LLURLDispatcherImpl
{
public:
- static bool isSLURL(const std::string& url);
-
- static bool isSLURLCommand(const std::string& url);
-
static bool dispatch(const std::string& url,
LLWebBrowserCtrl* web,
bool trusted_browser);
@@ -104,35 +94,9 @@ private:
// Called by LLWorldMap when a region name has been resolved to a
// location in-world, used by places-panel display.
- static bool matchPrefix(const std::string& url, const std::string& prefix);
-
- static std::string stripProtocol(const std::string& url);
-
friend class LLTeleportHandler;
};
-// static
-bool LLURLDispatcherImpl::isSLURL(const std::string& url)
-{
- if (matchPrefix(url, SLURL_SL_HELP_PREFIX)) return true;
- if (matchPrefix(url, SLURL_SL_PREFIX)) return true;
- if (matchPrefix(url, SLURL_SECONDLIFE_PREFIX)) return true;
- if (matchPrefix(url, SLURL_SLURL_PREFIX)) return true;
- return false;
-}
-
-// static
-bool LLURLDispatcherImpl::isSLURLCommand(const std::string& url)
-{
- if (matchPrefix(url, SLURL_SL_PREFIX + SLURL_APP_TOKEN)
- || matchPrefix(url, SLURL_SECONDLIFE_PREFIX + "/" + SLURL_APP_TOKEN)
- || matchPrefix(url, SLURL_SLURL_PREFIX + SLURL_APP_TOKEN) )
- {
- return true;
- }
- return false;
-}
-
// static
bool LLURLDispatcherImpl::dispatchCore(const std::string& url,
bool right_mouse,
@@ -178,7 +142,7 @@ bool LLURLDispatcherImpl::dispatchRightClick(const std::string& url)
bool LLURLDispatcherImpl::dispatchHelp(const std::string& url, bool right_mouse)
{
#if LL_LIBXUL_ENABLED
- if (matchPrefix(url, SLURL_SL_HELP_PREFIX))
+ if (LLSLURL::isURLHelp(url))
{
gViewerHtmlHelp.show();
return true;
@@ -193,7 +157,7 @@ bool LLURLDispatcherImpl::dispatchApp(const std::string& url,
LLWebBrowserCtrl* web,
bool trusted_browser)
{
- if (!isSLURL(url))
+ if (!LLSLURL::isSLURL(url))
{
return false;
}
@@ -211,7 +175,7 @@ bool LLURLDispatcherImpl::dispatchApp(const std::string& url,
// static
bool LLURLDispatcherImpl::dispatchRegion(const std::string& url, bool right_mouse)
{
- if (!isSLURL(url))
+ if (!LLSLURL::isSLURL(url))
{
return false;
}
@@ -230,7 +194,7 @@ bool LLURLDispatcherImpl::dispatchRegion(const std::string& url, bool right_mous
return true;
}
- std::string sim_string = stripProtocol(url);
+ std::string sim_string = LLSLURL::stripProtocol(url);
std::string region_name;
S32 x = 128;
S32 y = 128;
@@ -251,7 +215,7 @@ bool LLURLDispatcherImpl::dispatchRegion(const std::string& url, bool right_mous
/*static*/
void LLURLDispatcherImpl::regionNameCallback(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)
{
- std::string sim_string = stripProtocol(url);
+ std::string sim_string = LLSLURL::stripProtocol(url);
std::string region_name;
S32 x = 128;
S32 y = 128;
@@ -289,7 +253,7 @@ void LLURLDispatcherImpl::regionNameCallback(U64 region_handle, const std::strin
/* static */
void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)
{
- std::string sim_string = stripProtocol(url);
+ std::string sim_string = LLSLURL::stripProtocol(url);
std::string region_name;
S32 x = 128;
S32 y = 128;
@@ -316,10 +280,7 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::str
LLVector3d global_pos = from_region_handle(region_handle);
global_pos += LLVector3d(local_pos);
gAgent.teleportViaLocation(global_pos);
- if(gFloaterWorldMap)
- {
- gFloaterWorldMap->trackLocation(global_pos);
- }
+ LLFloaterWorldMap::getInstance()->trackLocation(global_pos);
}
else
{
@@ -337,37 +298,6 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::str
}
}
-// static
-bool LLURLDispatcherImpl::matchPrefix(const std::string& url, const std::string& prefix)
-{
- std::string test_prefix = url.substr(0, prefix.length());
- LLStringUtil::toLower(test_prefix);
- return test_prefix == prefix;
-}
-
-// static
-std::string LLURLDispatcherImpl::stripProtocol(const std::string& url)
-{
- std::string stripped = url;
- if (matchPrefix(stripped, SLURL_SL_HELP_PREFIX))
- {
- stripped.erase(0, SLURL_SL_HELP_PREFIX.length());
- }
- else if (matchPrefix(stripped, SLURL_SL_PREFIX))
- {
- stripped.erase(0, SLURL_SL_PREFIX.length());
- }
- else if (matchPrefix(stripped, SLURL_SECONDLIFE_PREFIX))
- {
- stripped.erase(0, SLURL_SECONDLIFE_PREFIX.length());
- }
- else if (matchPrefix(stripped, SLURL_SLURL_PREFIX))
- {
- stripped.erase(0, SLURL_SLURL_PREFIX.length());
- }
- return stripped;
-}
-
//---------------------------------------------------------------------------
// Teleportation links are handled here because they are tightly coupled
// to URL parsing and sim-fragment parsing
@@ -390,7 +320,7 @@ public:
std::string region_name = LLURLSimString::unescapeRegionName(tokens[0]);
// build secondlife://De%20Haro/123/45/67 for use in callback
- std::string url = SLURL_SECONDLIFE_PREFIX;
+ std::string url = LLSLURL::PREFIX_SECONDLIFE;
for (int i = 0; i < tokens.size(); ++i)
{
url += tokens[i].asString() + "/";
@@ -406,18 +336,6 @@ LLTeleportHandler gTeleportHandler;
//---------------------------------------------------------------------------
-// static
-bool LLURLDispatcher::isSLURL(const std::string& url)
-{
- return LLURLDispatcherImpl::isSLURL(url);
-}
-
-// static
-bool LLURLDispatcher::isSLURLCommand(const std::string& url)
-{
- return LLURLDispatcherImpl::isSLURLCommand(url);
-}
-
// static
bool LLURLDispatcher::dispatch(const std::string& url,
LLWebBrowserCtrl* web,
@@ -445,12 +363,3 @@ bool LLURLDispatcher::dispatchFromTextEditor(const std::string& url)
LLWebBrowserCtrl* web = NULL;
return LLURLDispatcherImpl::dispatch(url, web, trusted_browser);
}
-
-// static
-std::string LLURLDispatcher::buildSLURL(const std::string& regionname,
- S32 x, S32 y, S32 z)
-{
- std::string slurl = SLURL_SLURL_PREFIX + regionname + llformat("/%d/%d/%d",x,y,z);
- slurl = LLWeb::escapeURL( slurl );
- return slurl;
-}
diff --git a/indra/newview/llurldispatcher.h b/indra/newview/llurldispatcher.h
index a4f6866a07..15e3ec73d8 100644
--- a/indra/newview/llurldispatcher.h
+++ b/indra/newview/llurldispatcher.h
@@ -38,12 +38,6 @@ class LLWebBrowserCtrl;
class LLURLDispatcher
{
public:
- static bool isSLURL(const std::string& url);
- // Is this any sort of secondlife:// or sl:// URL?
-
- static bool isSLURLCommand(const std::string& url);
- // Is this a special secondlife://app/ URL?
-
static bool dispatch(const std::string& url,
LLWebBrowserCtrl* web,
bool trusted_browser);
@@ -63,9 +57,6 @@ public:
static bool dispatchRightClick(const std::string& url);
static bool dispatchFromTextEditor(const std::string& url);
-
- static std::string buildSLURL(const std::string& regionname, S32 x, S32 y, S32 z);
- // builds: http://slurl.com/secondlife/RegionName/x/y/z/
};
#endif
diff --git a/indra/newview/llviewchildren.cpp b/indra/newview/llviewchildren.cpp
index 1a66b24891..842ffc7f9a 100644
--- a/indra/newview/llviewchildren.cpp
+++ b/indra/newview/llviewchildren.cpp
@@ -94,10 +94,10 @@ void LLViewChildren::setBadge(const std::string& id, Badge badge, bool visible)
switch (badge)
{
default:
- case BADGE_OK: child->setImage(std::string("badge_ok.j2c")); break;
- case BADGE_NOTE: child->setImage(std::string("badge_note.j2c")); break;
- case BADGE_WARN: child->setImage(std::string("badge_warn.j2c")); break;
- case BADGE_ERROR: child->setImage(std::string("badge_error.j2c")); break;
+ case BADGE_OK: child->setValue(std::string("badge_ok.j2c")); break;
+ case BADGE_NOTE: child->setValue(std::string("badge_note.j2c")); break;
+ case BADGE_WARN: child->setValue(std::string("badge_warn.j2c")); break;
+ case BADGE_ERROR: child->setValue(std::string("badge_error.j2c")); break;
}
}
}
diff --git a/indra/newview/llviewercamera.cpp b/indra/newview/llviewercamera.cpp
index f54830f39f..a6d4dc1345 100644
--- a/indra/newview/llviewercamera.cpp
+++ b/indra/newview/llviewercamera.cpp
@@ -31,18 +31,12 @@
*/
#include "llviewerprecompiledheaders.h"
-#include "llviewercamera.h"
-
-#include <iomanip> // for setprecision
-#include "llquaternion.h"
+#include "llviewercamera.h"
+// Viewer includes
#include "llagent.h"
#include "llviewercontrol.h"
-#include "lldrawable.h"
-#include "llface.h"
-#include "llgl.h"
-#include "llglheaders.h"
#include "llviewerobjectlist.h"
#include "llviewerregion.h"
#include "llviewerwindow.h"
@@ -51,6 +45,17 @@
#include "lltoolmgr.h"
#include "llviewerjoystick.h"
+// Linden library includes
+#include "lldrawable.h"
+#include "llface.h"
+#include "llgl.h"
+#include "llglheaders.h"
+#include "llquaternion.h"
+#include "llwindow.h" // getPixelAspectRatio()
+
+// System includes
+#include <iomanip> // for setprecision
+
//glu pick matrix implementation borrowed from Mesa3D
glh::matrix4f gl_pick_matrix(GLfloat x, GLfloat y, GLfloat width, GLfloat height, GLint* viewport)
{
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index eb8cdd82b3..ed280073ee 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -35,7 +35,8 @@
#include "llviewercontrol.h"
-#include "indra_constants.h"
+// Library includes
+#include "llwindow.h" // getGamma()
// For Listeners
#include "audioengine.h"
@@ -77,11 +78,11 @@ BOOL gHackGodmode = FALSE;
#endif
-std::map<std::string, LLControlGroup*> gSettings;
-LLControlGroup gSavedSettings; // saved at end of session
-LLControlGroup gSavedPerAccountSettings; // saved at end of session
-LLControlGroup gColors; // read-only
-LLControlGroup gCrashSettings; // saved at end of session
+LLControlGroup gSavedSettings("Global"); // saved at end of session
+LLControlGroup gSavedSkinSettings("Skinning"); // saved at end of session
+LLControlGroup gSavedPerAccountSettings("PerAccount"); // saved at end of session
+LLControlGroup gCrashSettings("CrashSettings"); // saved at end of session
+LLControlGroup gWarningSettings("Warnings"); // persists ignored dialogs/warnings
std::string gLastRunVersion;
std::string gCurrentVersion;
@@ -427,6 +428,16 @@ bool handleVectorizeChanged(const LLSD& newvalue)
return true;
}
+bool handleHighResSnapshotChanged(const LLSD& newvalue)
+{
+ // High Res Snapshot active, must uncheck RenderUIInSnapshot
+ if (newvalue.asBoolean())
+ {
+ gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE );
+ }
+ return true;
+}
+
bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
{
if(gVoiceClient)
@@ -436,214 +447,161 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
return true;
}
+bool handleVelocityInterpolate(const LLSD& newvalue)
+{
+ LLMessageSystem* msg = gMessageSystem;
+ if ( newvalue.asBoolean() )
+ {
+ msg->newMessageFast(_PREHASH_VelocityInterpolateOn);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ gAgent.sendReliableMessage();
+ llinfos << "Velocity Interpolation On" << llendl;
+ }
+ else
+ {
+ msg->newMessageFast(_PREHASH_VelocityInterpolateOff);
+ msg->nextBlockFast(_PREHASH_AgentData);
+ msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+ msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ gAgent.sendReliableMessage();
+ llinfos << "Velocity Interpolation Off" << llendl;
+ }
+ return true;
+}
+
////////////////////////////////////////////////////////////////////////////
void settings_setup_listeners()
{
- gSavedSettings.getControl("FirstPersonAvatarVisible")->getSignal()->connect(boost::bind(&handleRenderAvatarMouselookChanged, _1));
- gSavedSettings.getControl("RenderFarClip")->getSignal()->connect(boost::bind(&handleRenderFarClipChanged, _1));
- gSavedSettings.getControl("RenderTerrainDetail")->getSignal()->connect(boost::bind(&handleTerrainDetailChanged, _1));
- gSavedSettings.getControl("RenderAnimateTrees")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _1));
- gSavedSettings.getControl("RenderAvatarVP")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
- gSavedSettings.getControl("VertexShaderEnable")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
- gSavedSettings.getControl("RenderGlow")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _1));
- gSavedSettings.getControl("RenderGlow")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
- gSavedSettings.getControl("EnableRippleWater")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
- gSavedSettings.getControl("RenderGlowResolutionPow")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _1));
- gSavedSettings.getControl("RenderAvatarCloth")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
- gSavedSettings.getControl("WindLightUseAtmosShaders")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
- gSavedSettings.getControl("RenderGammaFull")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
- gSavedSettings.getControl("RenderAvatarMaxVisible")->getSignal()->connect(boost::bind(&handleAvatarMaxVisibleChanged, _1));
- gSavedSettings.getControl("RenderAvatarInvisible")->getSignal()->connect(boost::bind(&handleSetSelfInvisible, _1));
- gSavedSettings.getControl("RenderVolumeLODFactor")->getSignal()->connect(boost::bind(&handleVolumeLODChanged, _1));
- gSavedSettings.getControl("RenderAvatarLODFactor")->getSignal()->connect(boost::bind(&handleAvatarLODChanged, _1));
- gSavedSettings.getControl("RenderTerrainLODFactor")->getSignal()->connect(boost::bind(&handleTerrainLODChanged, _1));
- gSavedSettings.getControl("RenderTreeLODFactor")->getSignal()->connect(boost::bind(&handleTreeLODChanged, _1));
- gSavedSettings.getControl("RenderFlexTimeFactor")->getSignal()->connect(boost::bind(&handleFlexLODChanged, _1));
- gSavedSettings.getControl("ThrottleBandwidthKBPS")->getSignal()->connect(boost::bind(&handleBandwidthChanged, _1));
- gSavedSettings.getControl("RenderGamma")->getSignal()->connect(boost::bind(&handleGammaChanged, _1));
- gSavedSettings.getControl("RenderFogRatio")->getSignal()->connect(boost::bind(&handleFogRatioChanged, _1));
- gSavedSettings.getControl("RenderMaxPartCount")->getSignal()->connect(boost::bind(&handleMaxPartCountChanged, _1));
- gSavedSettings.getControl("RenderDynamicLOD")->getSignal()->connect(boost::bind(&handleRenderDynamicLODChanged, _1));
- gSavedSettings.getControl("RenderDebugTextureBind")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _1));
- gSavedSettings.getControl("RenderFastAlpha")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _1));
- gSavedSettings.getControl("RenderObjectBump")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _1));
- gSavedSettings.getControl("RenderMaxVBOSize")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _1));
- gSavedSettings.getControl("RenderUseFBO")->getSignal()->connect(boost::bind(&handleRenderUseFBOChanged, _1));
- gSavedSettings.getControl("RenderDeferredNoise")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _1));
- gSavedSettings.getControl("RenderUseImpostors")->getSignal()->connect(boost::bind(&handleRenderUseImpostorsChanged, _1));
- gSavedSettings.getControl("RenderDebugGL")->getSignal()->connect(boost::bind(&handleRenderDebugGLChanged, _1));
- gSavedSettings.getControl("RenderDebugPipeline")->getSignal()->connect(boost::bind(&handleRenderDebugPipelineChanged, _1));
- gSavedSettings.getControl("RenderResolutionDivisor")->getSignal()->connect(boost::bind(&handleRenderResolutionDivisorChanged, _1));
- gSavedSettings.getControl("RenderDeferred")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _1));
- gSavedSettings.getControl("TextureMemory")->getSignal()->connect(boost::bind(&handleVideoMemoryChanged, _1));
- gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&handleChatFontSizeChanged, _1));
- gSavedSettings.getControl("ChatPersistTime")->getSignal()->connect(boost::bind(&handleChatPersistTimeChanged, _1));
- gSavedSettings.getControl("ConsoleMaxLines")->getSignal()->connect(boost::bind(&handleConsoleMaxLinesChanged, _1));
- gSavedSettings.getControl("UploadBakedTexOld")->getSignal()->connect(boost::bind(&handleUploadBakedTexOldChanged, _1));
- gSavedSettings.getControl("UseOcclusion")->getSignal()->connect(boost::bind(&handleUseOcclusionChanged, _1));
- gSavedSettings.getControl("AudioLevelMaster")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("AudioLevelSFX")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("AudioLevelUI")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("AudioLevelAmbient")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("AudioLevelMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("AudioLevelMedia")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("AudioLevelVoice")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("AudioLevelDistance")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("AudioLevelDoppler")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("AudioLevelRolloff")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("AudioStreamingMusic")->getSignal()->connect(boost::bind(&handleAudioStreamMusicChanged, _1));
- gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("MuteMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("MuteMedia")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("MuteVoice")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("MuteAmbient")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("MuteUI")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _1));
- gSavedSettings.getControl("RenderVBOEnable")->getSignal()->connect(boost::bind(&handleRenderUseVBOChanged, _1));
- gSavedSettings.getControl("WLSkyDetail")->getSignal()->connect(boost::bind(&handleWLSkyDetailChanged, _1));
- gSavedSettings.getControl("RenderLightingDetail")->getSignal()->connect(boost::bind(&handleRenderLightingDetailChanged, _1));
- gSavedSettings.getControl("NumpadControl")->getSignal()->connect(boost::bind(&handleNumpadControlChanged, _1));
- gSavedSettings.getControl("JoystickAxis0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("JoystickAxis1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("JoystickAxis2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("JoystickAxis3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("JoystickAxis4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("JoystickAxis5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("JoystickAxis6")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisScale0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisScale1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisScale2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisScale3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisScale4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisScale5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisScale6")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisDeadZone0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisDeadZone1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisDeadZone2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisDeadZone3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisDeadZone4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisDeadZone5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("FlycamAxisDeadZone6")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisScale0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisScale1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisScale2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisScale3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisScale4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisScale5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisDeadZone0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisDeadZone1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisDeadZone2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisDeadZone3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisDeadZone4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("AvatarAxisDeadZone5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisScale0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisScale1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisScale2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisScale3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisScale4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisScale5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisDeadZone0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisDeadZone1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisDeadZone2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisDeadZone3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisDeadZone4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("BuildAxisDeadZone5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _1));
- gSavedSettings.getControl("DebugViews")->getSignal()->connect(boost::bind(&handleDebugViewsChanged, _1));
- gSavedSettings.getControl("UserLogFile")->getSignal()->connect(boost::bind(&handleLogFileChanged, _1));
- gSavedSettings.getControl("RenderHideGroupTitle")->getSignal()->connect(boost::bind(handleHideGroupTitleChanged, _1));
- gSavedSettings.getControl("EffectColor")->getSignal()->connect(boost::bind(handleEffectColorChanged, _1));
- gSavedSettings.getControl("VectorizePerfTest")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _1));
- gSavedSettings.getControl("VectorizeEnable")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _1));
- gSavedSettings.getControl("VectorizeProcessor")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _1));
- gSavedSettings.getControl("VectorizeSkin")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _1));
- gSavedSettings.getControl("EnableVoiceChat")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
- gSavedSettings.getControl("PTTCurrentlyEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
- gSavedSettings.getControl("PushToTalkButton")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
- gSavedSettings.getControl("PushToTalkToggle")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
- gSavedSettings.getControl("VoiceEarLocation")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
- gSavedSettings.getControl("VoiceInputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
- gSavedSettings.getControl("VoiceOutputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
- gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
- gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
-}
-
-template <> eControlType get_control_type<U32>(const U32& in, LLSD& out)
-{
- out = (LLSD::Integer)in;
- return TYPE_U32;
-}
-
-template <> eControlType get_control_type<S32>(const S32& in, LLSD& out)
-{
- out = in;
- return TYPE_S32;
-}
-
-template <> eControlType get_control_type<F32>(const F32& in, LLSD& out)
-{
- out = in;
- return TYPE_F32;
-}
-
-template <> eControlType get_control_type<bool> (const bool& in, LLSD& out)
-{
- out = in;
- return TYPE_BOOLEAN;
-}
-/*
-// Yay BOOL, its really an S32.
-template <> eControlType get_control_type<BOOL> (const BOOL& in, LLSD& out)
-{
- out = in;
- return TYPE_BOOLEAN;
-}
-*/
-template <> eControlType get_control_type<std::string>(const std::string& in, LLSD& out)
-{
- out = in;
- return TYPE_STRING;
-}
-
-template <> eControlType get_control_type<LLVector3>(const LLVector3& in, LLSD& out)
-{
- out = in.getValue();
- return TYPE_VEC3;
-}
-
-template <> eControlType get_control_type<LLVector3d>(const LLVector3d& in, LLSD& out)
-{
- out = in.getValue();
- return TYPE_VEC3D;
-}
-
-template <> eControlType get_control_type<LLRect>(const LLRect& in, LLSD& out)
-{
- out = in.getValue();
- return TYPE_RECT;
-}
-
-template <> eControlType get_control_type<LLColor4>(const LLColor4& in, LLSD& out)
-{
- out = in.getValue();
- return TYPE_COL4;
-}
-
-template <> eControlType get_control_type<LLColor3>(const LLColor3& in, LLSD& out)
-{
- out = in.getValue();
- return TYPE_COL3;
-}
-
-template <> eControlType get_control_type<LLColor4U>(const LLColor4U& in, LLSD& out)
-{
- out = in.getValue();
- return TYPE_COL4U;
-}
-
-template <> eControlType get_control_type<LLSD>(const LLSD& in, LLSD& out)
-{
- out = in;
- return TYPE_LLSD;
+ gSavedSettings.getControl("FirstPersonAvatarVisible")->getSignal()->connect(boost::bind(&handleRenderAvatarMouselookChanged, _2));
+ gSavedSettings.getControl("RenderFarClip")->getSignal()->connect(boost::bind(&handleRenderFarClipChanged, _2));
+ gSavedSettings.getControl("RenderTerrainDetail")->getSignal()->connect(boost::bind(&handleTerrainDetailChanged, _2));
+ gSavedSettings.getControl("RenderAnimateTrees")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
+ gSavedSettings.getControl("RenderAvatarVP")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
+ gSavedSettings.getControl("VertexShaderEnable")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
+ gSavedSettings.getControl("RenderGlow")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _2));
+ gSavedSettings.getControl("RenderGlow")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
+ gSavedSettings.getControl("EnableRippleWater")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
+ gSavedSettings.getControl("RenderGlowResolutionPow")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _2));
+ gSavedSettings.getControl("RenderAvatarCloth")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
+ gSavedSettings.getControl("WindLightUseAtmosShaders")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
+ gSavedSettings.getControl("RenderGammaFull")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
+ gSavedSettings.getControl("RenderAvatarMaxVisible")->getSignal()->connect(boost::bind(&handleAvatarMaxVisibleChanged, _2));
+ gSavedSettings.getControl("RenderAvatarInvisible")->getSignal()->connect(boost::bind(&handleSetSelfInvisible, _2));
+ gSavedSettings.getControl("RenderVolumeLODFactor")->getSignal()->connect(boost::bind(&handleVolumeLODChanged, _2));
+ gSavedSettings.getControl("RenderAvatarLODFactor")->getSignal()->connect(boost::bind(&handleAvatarLODChanged, _2));
+ gSavedSettings.getControl("RenderTerrainLODFactor")->getSignal()->connect(boost::bind(&handleTerrainLODChanged, _2));
+ gSavedSettings.getControl("RenderTreeLODFactor")->getSignal()->connect(boost::bind(&handleTreeLODChanged, _2));
+ gSavedSettings.getControl("RenderFlexTimeFactor")->getSignal()->connect(boost::bind(&handleFlexLODChanged, _2));
+ gSavedSettings.getControl("ThrottleBandwidthKBPS")->getSignal()->connect(boost::bind(&handleBandwidthChanged, _2));
+ gSavedSettings.getControl("RenderGamma")->getSignal()->connect(boost::bind(&handleGammaChanged, _2));
+ gSavedSettings.getControl("RenderFogRatio")->getSignal()->connect(boost::bind(&handleFogRatioChanged, _2));
+ gSavedSettings.getControl("RenderMaxPartCount")->getSignal()->connect(boost::bind(&handleMaxPartCountChanged, _2));
+ gSavedSettings.getControl("RenderDynamicLOD")->getSignal()->connect(boost::bind(&handleRenderDynamicLODChanged, _2));
+ gSavedSettings.getControl("RenderDebugTextureBind")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
+ gSavedSettings.getControl("RenderFastAlpha")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
+ gSavedSettings.getControl("RenderObjectBump")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
+ gSavedSettings.getControl("RenderMaxVBOSize")->getSignal()->connect(boost::bind(&handleResetVertexBuffersChanged, _2));
+ gSavedSettings.getControl("RenderUseFBO")->getSignal()->connect(boost::bind(&handleRenderUseFBOChanged, _2));
+ gSavedSettings.getControl("RenderDeferredNoise")->getSignal()->connect(boost::bind(&handleReleaseGLBufferChanged, _2));
+ gSavedSettings.getControl("RenderUseImpostors")->getSignal()->connect(boost::bind(&handleRenderUseImpostorsChanged, _2));
+ gSavedSettings.getControl("RenderDebugGL")->getSignal()->connect(boost::bind(&handleRenderDebugGLChanged, _2));
+ gSavedSettings.getControl("RenderDebugPipeline")->getSignal()->connect(boost::bind(&handleRenderDebugPipelineChanged, _2));
+ gSavedSettings.getControl("RenderResolutionDivisor")->getSignal()->connect(boost::bind(&handleRenderResolutionDivisorChanged, _2));
+ gSavedSettings.getControl("RenderDeferred")->getSignal()->connect(boost::bind(&handleSetShaderChanged, _2));
+ gSavedSettings.getControl("TextureMemory")->getSignal()->connect(boost::bind(&handleVideoMemoryChanged, _2));
+ gSavedSettings.getControl("ChatFontSize")->getSignal()->connect(boost::bind(&handleChatFontSizeChanged, _2));
+ gSavedSettings.getControl("ChatPersistTime")->getSignal()->connect(boost::bind(&handleChatPersistTimeChanged, _2));
+ gSavedSettings.getControl("ConsoleMaxLines")->getSignal()->connect(boost::bind(&handleConsoleMaxLinesChanged, _2));
+ gSavedSettings.getControl("UploadBakedTexOld")->getSignal()->connect(boost::bind(&handleUploadBakedTexOldChanged, _2));
+ gSavedSettings.getControl("UseOcclusion")->getSignal()->connect(boost::bind(&handleUseOcclusionChanged, _2));
+ gSavedSettings.getControl("AudioLevelMaster")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("AudioLevelSFX")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("AudioLevelUI")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("AudioLevelAmbient")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("AudioLevelMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("AudioLevelMedia")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("AudioLevelVoice")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("AudioLevelDistance")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("AudioLevelDoppler")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("AudioLevelRolloff")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("AudioStreamingMusic")->getSignal()->connect(boost::bind(&handleAudioStreamMusicChanged, _2));
+ gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("MuteMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("MuteMedia")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("MuteVoice")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("MuteAmbient")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("MuteUI")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+ gSavedSettings.getControl("RenderVBOEnable")->getSignal()->connect(boost::bind(&handleRenderUseVBOChanged, _2));
+ gSavedSettings.getControl("WLSkyDetail")->getSignal()->connect(boost::bind(&handleWLSkyDetailChanged, _2));
+ gSavedSettings.getControl("RenderLightingDetail")->getSignal()->connect(boost::bind(&handleRenderLightingDetailChanged, _2));
+ gSavedSettings.getControl("NumpadControl")->getSignal()->connect(boost::bind(&handleNumpadControlChanged, _2));
+ gSavedSettings.getControl("JoystickAxis0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("JoystickAxis1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("JoystickAxis2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("JoystickAxis3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("JoystickAxis4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("JoystickAxis5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("JoystickAxis6")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisScale0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisScale1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisScale2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisScale3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisScale4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisScale5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisScale6")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisDeadZone0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisDeadZone1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisDeadZone2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisDeadZone3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisDeadZone4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisDeadZone5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("FlycamAxisDeadZone6")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisScale0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisScale1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisScale2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisScale3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisScale4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisScale5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisDeadZone0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisDeadZone1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisDeadZone2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisDeadZone3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisDeadZone4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("AvatarAxisDeadZone5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisScale0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisScale1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisScale2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisScale3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisScale4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisScale5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisDeadZone0")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisDeadZone1")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisDeadZone2")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisDeadZone3")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisDeadZone4")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("BuildAxisDeadZone5")->getSignal()->connect(boost::bind(&handleJoystickChanged, _2));
+ gSavedSettings.getControl("DebugViews")->getSignal()->connect(boost::bind(&handleDebugViewsChanged, _2));
+ gSavedSettings.getControl("UserLogFile")->getSignal()->connect(boost::bind(&handleLogFileChanged, _2));
+ gSavedSettings.getControl("RenderHideGroupTitle")->getSignal()->connect(boost::bind(handleHideGroupTitleChanged, _2));
+ gSavedSkinSettings.getControl("EffectColor")->getSignal()->connect(boost::bind(handleEffectColorChanged, _2));
+ gSavedSettings.getControl("HighResSnapshot")->getSignal()->connect(boost::bind(handleHighResSnapshotChanged, _2));
+ gSavedSettings.getControl("VectorizePerfTest")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _2));
+ gSavedSettings.getControl("VectorizeEnable")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _2));
+ gSavedSettings.getControl("VectorizeProcessor")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _2));
+ gSavedSettings.getControl("VectorizeSkin")->getSignal()->connect(boost::bind(&handleVectorizeChanged, _2));
+ gSavedSettings.getControl("EnableVoiceChat")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
+ gSavedSettings.getControl("PTTCurrentlyEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
+ gSavedSettings.getControl("PushToTalkButton")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
+ gSavedSettings.getControl("PushToTalkToggle")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
+ gSavedSettings.getControl("VoiceEarLocation")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
+ gSavedSettings.getControl("VoiceInputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
+ gSavedSettings.getControl("VoiceOutputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
+ gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
+ gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
+ gSavedSettings.getControl("VelocityInterpolate")->getSignal()->connect(boost::bind(&handleVelocityInterpolate, _2));
}
diff --git a/indra/newview/llviewercontrol.h b/indra/newview/llviewercontrol.h
index d0dc80cb9a..3271e5fe9b 100644
--- a/indra/newview/llviewercontrol.h
+++ b/indra/newview/llviewercontrol.h
@@ -47,17 +47,14 @@ extern BOOL gHackGodmode;
//setting variables are declared in this function
void settings_setup_listeners();
-extern std::map<std::string, LLControlGroup*> gSettings;
-
// for the graphics settings
void create_graphics_group(LLControlGroup& group);
// saved at end of session
extern LLControlGroup gSavedSettings;
+extern LLControlGroup gSavedSkinSettings;
extern LLControlGroup gSavedPerAccountSettings;
-
-// Read-only
-extern LLControlGroup gColors;
+extern LLControlGroup gWarningSettings;
// Saved at end of session
extern LLControlGroup gCrashSettings;
@@ -66,114 +63,5 @@ extern LLControlGroup gCrashSettings;
extern std::string gLastRunVersion;
extern std::string gCurrentVersion;
-//! Helper function for LLCachedControl
-template <class T>
-eControlType get_control_type(const T& in, LLSD& out)
-{
- llerrs << "Usupported control type: " << typeid(T).name() << "." << llendl;
- return TYPE_COUNT;
-}
-
-//! Publish/Subscribe object to interact with LLControlGroups.
-
-//! An LLCachedControl instance to connect to a LLControlVariable
-//! without have to manually create and bind a listener to a local
-//! object.
-template <class T>
-class LLCachedControl
-{
- T mCachedValue;
- LLPointer<LLControlVariable> mControl;
- boost::signals::connection mConnection;
-
-public:
- LLCachedControl(const std::string& name,
- const T& default_value,
- const std::string& comment = "Declared In Code")
- {
- mControl = gSavedSettings.getControl(name);
- if(mControl.isNull())
- {
- declareTypedControl(gSavedSettings, name, default_value, comment);
- mControl = gSavedSettings.getControl(name);
- if(mControl.isNull())
- {
- llerrs << "The control could not be created!!!" << llendl;
- }
-
- mCachedValue = default_value;
- }
- else
- {
- mCachedValue = (const T&)mControl->getValue();
- }
-
- // Add a listener to the controls signal...
- mControl->getSignal()->connect(
- boost::bind(&LLCachedControl<T>::handleValueChange, this, _1)
- );
- }
-
- ~LLCachedControl()
- {
- if(mConnection.connected())
- {
- mConnection.disconnect();
- }
- }
-
- LLCachedControl& operator =(const T& newvalue)
- {
- setTypeValue(*mControl, newvalue);
- }
-
- operator const T&() { return mCachedValue; }
-
-private:
- void declareTypedControl(LLControlGroup& group,
- const std::string& name,
- const T& default_value,
- const std::string& comment)
- {
- LLSD init_value;
- eControlType type = get_control_type<T>(default_value, init_value);
- if(type < TYPE_COUNT)
- {
- group.declareControl(name, type, init_value, comment, FALSE);
- }
- }
-
- bool handleValueChange(const LLSD& newvalue)
- {
- mCachedValue = (const T &)newvalue;
- return true;
- }
-
- void setTypeValue(LLControlVariable& c, const T& v)
- {
- // Implicit conversion from T to LLSD...
- c.set(v);
- }
-};
-
-template <> eControlType get_control_type<U32>(const U32& in, LLSD& out);
-template <> eControlType get_control_type<S32>(const S32& in, LLSD& out);
-template <> eControlType get_control_type<F32>(const F32& in, LLSD& out);
-template <> eControlType get_control_type<bool> (const bool& in, LLSD& out);
-// Yay BOOL, its really an S32.
-//template <> eControlType get_control_type<BOOL> (const BOOL& in, LLSD& out)
-template <> eControlType get_control_type<std::string>(const std::string& in, LLSD& out);
-template <> eControlType get_control_type<LLVector3>(const LLVector3& in, LLSD& out);
-template <> eControlType get_control_type<LLVector3d>(const LLVector3d& in, LLSD& out);
-template <> eControlType get_control_type<LLRect>(const LLRect& in, LLSD& out);
-template <> eControlType get_control_type<LLColor4>(const LLColor4& in, LLSD& out);
-template <> eControlType get_control_type<LLColor3>(const LLColor3& in, LLSD& out);
-template <> eControlType get_control_type<LLColor4U>(const LLColor4U& in, LLSD& out);
-template <> eControlType get_control_type<LLSD>(const LLSD& in, LLSD& out);
-
-//#define TEST_CACHED_CONTROL 1
-#ifdef TEST_CACHED_CONTROL
-void test_cached_control();
-#endif // TEST_CACHED_CONTROL
#endif // LL_LLVIEWERCONTROL_H
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 54c6f0a71f..e3f70db238 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -46,10 +46,10 @@
#include "lldrawpoolalpha.h"
#include "llfeaturemanager.h"
#include "llfirstuse.h"
-#include "llframestats.h"
#include "llhudmanager.h"
#include "llimagebmp.h"
#include "llimagegl.h"
+#include "llmemory.h"
#include "llselectmgr.h"
#include "llsky.h"
#include "llstartup.h"
@@ -58,6 +58,7 @@
#include "lltooldraganddrop.h"
#include "lltoolpie.h"
#include "lltracker.h"
+#include "lltrans.h"
#include "llui.h"
#include "llviewercamera.h"
#include "llviewerobjectlist.h"
@@ -199,7 +200,7 @@ void display_stats()
F32 mem_log_freq = gSavedSettings.getF32("MemoryLogFrequency");
if (mem_log_freq > 0.f && gRecentMemoryTime.getElapsedTimeF32() >= mem_log_freq)
{
- gMemoryAllocated = getCurrentRSS();
+ gMemoryAllocated = LLMemory::getCurrentRSS();
U32 memory = (U32)(gMemoryAllocated / (1024*1024));
llinfos << llformat("MEMORY: %d MB", memory) << llendl;
gRecentMemoryTime.reset();
@@ -238,7 +239,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
// Clean up memory the pools may have allocated
if (rebuild)
{
- gFrameStats.start(LLFrameStats::REBUILD);
gPipeline.rebuildPools();
}
@@ -299,7 +299,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
//
LLAppViewer::instance()->pingMainloopTimeout("Display:TextureStats");
- gFrameStats.start(LLFrameStats::UPDATE_TEX_STATS);
stop_glerror();
LLImageGL::updateStats(gFrameTimeSeconds);
@@ -369,7 +368,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
case LLAgent::TELEPORT_START_ARRIVAL:
// Transition to ARRIVING. Viewer has received avatar update, etc., from destination simulator
gTeleportArrivalTimer.reset();
- gViewerWindow->setProgressCancelButtonVisible(FALSE, std::string("Cancel")); //TODO: Translate
+ gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
gViewerWindow->setProgressPercent(75.f);
gAgent.setTeleportState( LLAgent::TELEPORT_ARRIVING );
gAgent.setTeleportMessage(
@@ -388,7 +387,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
LLFirstUse::useTeleport();
gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
}
- gViewerWindow->setProgressCancelButtonVisible(FALSE, std::string("Cancel")); //TODO: Translate
+ gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
gViewerWindow->setProgressPercent( arrival_fraction * 25.f + 75.f);
gViewerWindow->setProgressString(message);
}
@@ -527,13 +526,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
LLHUDObject::updateAll();
stop_glerror();
- gFrameStats.start(LLFrameStats::UPDATE_GEOM);
const F32 max_geom_update_time = 0.005f*10.f*gFrameIntervalSeconds; // 50 ms/second update time
gPipeline.createObjects(max_geom_update_time);
gPipeline.updateGeom(max_geom_update_time);
stop_glerror();
- gFrameStats.start(LLFrameStats::UPDATE_CULL);
S32 water_clip = 0;
if ((LLViewerShaderMgr::instance()->getVertexShaderLevel(LLViewerShaderMgr::SHADER_ENVIRONMENT) > 1) &&
gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_WATER))
@@ -664,7 +661,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
LLAppViewer::instance()->pingMainloopTimeout("Display:UpdateImages");
LLError::LLCallStacks::clear() ;
llpushcallstacks ;
- gFrameStats.start(LLFrameStats::IMAGE_UPDATE);
{
LLFastTimer t(LLFastTimer::FTM_IMAGE_UPDATE);
@@ -689,7 +685,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
//
LLAppViewer::instance()->pingMainloopTimeout("Display:StateSort");
{
- gFrameStats.start(LLFrameStats::STATE_SORT);
gPipeline.stateSort(*LLViewerCamera::getInstance(), result);
stop_glerror();
@@ -700,7 +695,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
// rebuildPools
//
//
- gFrameStats.start(LLFrameStats::REBUILD);
gPipeline.rebuildPools();
stop_glerror();
}
@@ -736,7 +730,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
// glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_TRUE);
// glLoadIdentity();
- // LLRect floater_rect = frontmost_floaterp->getScreenRect();
+ // LLRect floater_rect = frontmost_floaterp->calcScreenRect();
// // deflate by one pixel so rounding errors don't occlude outside of floater extents
// floater_rect.stretch(-1);
// LLRectf floater_3d_rect((F32)floater_rect.mLeft / (F32)gViewerWindow->getWindowWidth(),
@@ -839,16 +833,15 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
LLAppViewer::instance()->pingMainloopTimeout("Display:RenderUI");
if (!for_snapshot)
{
- gFrameStats.start(LLFrameStats::RENDER_UI);
+ LLFastTimer t(LLFastTimer::FTM_RENDER_UI);
render_ui();
}
LLSpatialGroup::sNoDelete = FALSE;
}
-
+
LLAppViewer::instance()->pingMainloopTimeout("Display:FrameStats");
- gFrameStats.start(LLFrameStats::MISC_END);
stop_glerror();
if (LLPipeline::sRenderFrameTest)
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
new file mode 100644
index 0000000000..95fd896138
--- /dev/null
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -0,0 +1,95 @@
+/**
+ * @file llviewerfloaterreg.cpp
+ * @brief LLViewerFloaterReg class registers floaters used in the viewer
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterreg.h"
+
+#include "llviewerfloaterreg.h"
+
+#include "llcompilequeue.h"
+#include "llfloateravatarinfo.h"
+#include "llfloaterchat.h"
+#include "llfloaterchatterbox.h"
+#include "llfloaterdirectory.h"
+#include "llfloaterjoystick.h"
+#include "llfloatermap.h"
+#include "llfloatermemleak.h"
+#include "llfloaterpreference.h"
+#include "llfloatersnapshot.h"
+#include "llfloatertools.h"
+#include "llfloaterworldmap.h"
+#include "llinventoryview.h"
+
+#include "llpreviewanim.h"
+#include "llpreviewgesture.h"
+#include "llpreviewlandmark.h"
+#include "llpreviewnotecard.h"
+#include "llpreviewscript.h"
+#include "llpreviewsound.h"
+#include "llpreviewtexture.h"
+
+void LLViewerFloaterReg::registerFloaters()
+{
+ LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);
+ LLFloaterReg::add("snapshot", "floater_snapshot.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSnapshot>);
+ LLFloaterReg::add("search", "floater_directory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDirectory>);
+ LLFloaterReg::add("build", "floater_tools.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterTools>);
+ LLFloaterReg::add("world_map", "floater_world_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterWorldMap>);
+ LLFloaterReg::add("mini_map", "floater_map.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMap>);
+ LLFloaterReg::add("inventory", "floater_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLInventoryView>);
+
+ LLFloaterReg::add("pref_joystick", "floater_joystick.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterJoystick>);
+
+ LLFloaterReg::add("communicate", "floater_chatterbox.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterChatterBox>);
+ LLFloaterReg::add("chat", "floater_chat_history.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterChat>);
+ LLFloaterReg::add("contacts", "floater_my_friends.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterMyFriends>);
+
+ LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);
+ LLFloaterReg::add("reset_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterResetQueue>);
+ LLFloaterReg::add("start_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterRunQueue>);
+ LLFloaterReg::add("stop_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterNotRunQueue>);
+
+ LLFloaterReg::add("preview_avatar", "floater_profile.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAvatarInfo>);
+
+ LLFloaterReg::add("preview_anim", "floater_preview_animation.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewAnim>, "preview");
+ LLFloaterReg::add("preview_gesture", "floater_preview_gesture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewGesture>, "preview");
+ LLFloaterReg::add("preview_landmark", "floater_preview_existing_landmark.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewLandmark>, "preview");
+ LLFloaterReg::add("preview_notecard", "floater_preview_notecard.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewNotecard>, "preview");
+ LLFloaterReg::add("preview_script", "floater_script_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewLSL>, "preview");
+ LLFloaterReg::add("preview_scriptedit", "floater_live_lsleditor.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLLiveLSLEditor>, "preview");
+ LLFloaterReg::add("preview_sound", "floater_preview_sound.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewSound>, "preview");
+ LLFloaterReg::add("preview_texture", "floater_preview_texture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLPreviewTexture>, "preview");
+
+ LLFloaterReg::add("stats", "floater_stats.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloater>);
+}
diff --git a/indra/newview/llviewerfloaterreg.h b/indra/newview/llviewerfloaterreg.h
new file mode 100644
index 0000000000..08c9589ebb
--- /dev/null
+++ b/indra/newview/llviewerfloaterreg.h
@@ -0,0 +1,43 @@
+/**
+ * @file llviewerfloaterreg.h
+ * @brief The LLViewerFloaterReg class declaration
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ *
+ * Copyright (c) 2007-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLVIEWERFLOATERREG_H
+#define LL_LLVIEWERFLOATERREG_H
+
+class LLViewerFloaterReg
+{
+public:
+ static void registerFloaters();
+};
+
+
+#endif // LL_LLVIEWERFLOATERREG_H
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 7f1f0fe6d0..52c49dd05d 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -50,6 +50,7 @@
#include "llviewerobjectlist.h"
#include "llpreviewgesture.h"
#include "llviewerwindow.h"
+#include "lltrans.h"
///----------------------------------------------------------------------------
/// Local function declarations, constants, enums, and typedefs
@@ -684,12 +685,9 @@ void CreateGestureCallback::fire(const LLUUID& inv_item)
gInventory.updateItem(item);
gInventory.notifyObservers();
- if(!LLPreview::show(inv_item,FALSE))
- {
- LLPreviewGesture* preview = LLPreviewGesture::show(std::string("Gesture: ") + item->getName(), inv_item, LLUUID::null);
- // Force to be entirely onscreen.
- gFloaterView->adjustToFitScreen(preview, FALSE);
- }
+ LLPreviewGesture* preview = LLPreviewGesture::show(inv_item, LLUUID::null);
+ // Force to be entirely onscreen.
+ gFloaterView->adjustToFitScreen(preview, FALSE);
}
LLInventoryCallbackManager gInventoryCallbacks;
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index 15c814829c..bbcb6240b6 100644
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -224,7 +224,7 @@ void agent_toggle_fly( EKeystate s )
// Only catch the edge
if (KEYSTATE_DOWN == s )
{
- gAgent.toggleFlying();
+ LLAgent::toggleFlying();
}
}
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 70fc78d277..c2724b7cdd 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -553,7 +553,7 @@ void LLViewerMedia::buildMediaManagerData( LLMediaManagerData* init_data )
// Users can change skins while client is running, so make sure
// we pick up on changes.
gSavedSettings.getControl("SkinCurrent")->getSignal()->connect(
- boost::bind( LLViewerMediaImpl::handleSkinCurrentChanged, _1 ) );
+ boost::bind( LLViewerMediaImpl::handleSkinCurrentChanged, _2 ) );
}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index a50ff1df9f..0abdaff4b6 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -1,5 +1,4 @@
-
-/**
+ /**
* @file llviewermenu.cpp
* @brief Builds menus out of items.
*
@@ -42,9 +41,11 @@
// linden library includes
#include "audioengine.h"
+#include "llfloaterreg.h"
#include "indra_constants.h"
#include "llassetstorage.h"
#include "llchat.h"
+#include "llcombobox.h"
#include "llfeaturemanager.h"
#include "llfocusmgr.h"
#include "llfontgl.h"
@@ -99,7 +100,6 @@
#include "llfloatercustomize.h"
#include "llfloaterdaycycle.h"
#include "llfloaterdirectory.h"
-#include "llfloatereditui.h"
#include "llfloaterchatterbox.h"
#include "llfloaterfriends.h"
#include "llfloaterfonttest.h"
@@ -120,7 +120,6 @@
#include "llfloatermap.h"
#include "llfloatermute.h"
#include "llfloateropenobject.h"
-#include "llfloaterpermissionsmgr.h"
#include "llfloaterperms.h"
#include "llfloaterpostprocess.h"
#include "llfloaterpreference.h"
@@ -129,15 +128,11 @@
#include "llfloaterscriptdebug.h"
#include "llfloatersettingsdebug.h"
#include "llfloaterenvsettings.h"
-#include "llfloaterstats.h"
-#include "llfloatertest.h"
#include "llfloatertools.h"
#include "llfloaterwater.h"
#include "llfloaterwindlight.h"
#include "llfloaterworldmap.h"
#include "llfloatermemleak.h"
-#include "llframestats.h"
-#include "llframestatview.h"
#include "llfasttimerview.h"
#include "llmemoryview.h"
#include "llgivemoney.h"
@@ -178,19 +173,18 @@
#include "lltoolgrab.h"
#include "lltoolmgr.h"
#include "lltoolpie.h"
-#include "lltoolplacer.h"
#include "lltoolselectland.h"
+#include "lltrans.h"
#include "lluictrlfactory.h"
#include "lluploaddialog.h"
#include "lluserauth.h"
#include "lluuid.h"
-#include "llvelocitybar.h"
#include "llviewercamera.h"
#include "llviewergenericmessage.h"
#include "llviewergesture.h"
#include "llviewerimagelist.h" // gImageList
#include "llviewerinventory.h"
-#include "llviewermenufile.h" // init_menu_file()
+#include "llviewermenufile.h"// init_menu_file()
#include "llviewermessage.h"
#include "llviewernetwork.h"
#include "llviewerobjectlist.h"
@@ -216,15 +210,6 @@
#include "lltexlayer.h"
using namespace LLVOAvatarDefines;
-void init_client_menu(LLMenuGL* menu);
-void init_server_menu(LLMenuGL* menu);
-
-void init_debug_world_menu(LLMenuGL* menu);
-void init_debug_rendering_menu(LLMenuGL* menu);
-void init_debug_ui_menu(LLMenuGL* menu);
-void init_debug_xui_menu(LLMenuGL* menu);
-void init_debug_avatar_menu(LLMenuGL* menu);
-void init_debug_baked_texture_menu(LLMenuGL* menu);
BOOL enable_land_build(void*);
BOOL enable_object_build(void*);
@@ -236,13 +221,14 @@ void handle_test_load_url(void*);
//
// Evil hackish imported globals
-//
-extern BOOL gRenderLightGlows;
-extern BOOL gRenderAvatar;
-extern BOOL gHideSelectedObjects;
-extern BOOL gShowOverlayTitle;
-extern BOOL gOcclusionCull;
-extern BOOL gAllowSelectAvatar;
+
+//extern BOOL gHideSelectedObjects;
+//extern BOOL gAllowSelectAvatar;
+//extern BOOL gDebugAvatarRotation;
+extern BOOL gDebugClicks;
+extern BOOL gDebugWindowProc;
+//extern BOOL gDebugTextEditorTips;
+//extern BOOL gDebugSelectMgr;
//
// Globals
@@ -254,15 +240,11 @@ LLMenuGL *gPopupMenuView = NULL;
LLMenuBarGL *gLoginMenuBarView = NULL;
// Pie menus
-LLPieMenu *gPieSelf = NULL;
-LLPieMenu *gPieAvatar = NULL;
-LLPieMenu *gPieObject = NULL;
-LLPieMenu *gPieAttachment = NULL;
-LLPieMenu *gPieLand = NULL;
-
-// local constants
-const std::string CLIENT_MENU_NAME("Advanced");
-const std::string SERVER_MENU_NAME("Admin");
+LLContextMenu *gPieSelf = NULL;
+LLContextMenu *gPieAvatar = NULL;
+LLContextMenu *gPieObject = NULL;
+LLContextMenu *gPieAttachment = NULL;
+LLContextMenu *gPieLand = NULL;
const std::string SAVE_INTO_INVENTORY("Save Object Back to My Inventory");
const std::string SAVE_INTO_TASK_INVENTORY("Save Object Back to Object Contents");
@@ -270,27 +252,24 @@ const std::string SAVE_INTO_TASK_INVENTORY("Save Object Back to Object Contents"
LLMenuGL* gAttachSubMenu = NULL;
LLMenuGL* gDetachSubMenu = NULL;
LLMenuGL* gTakeOffClothes = NULL;
-LLPieMenu* gPieRate = NULL;
-LLPieMenu* gAttachScreenPieMenu = NULL;
-LLPieMenu* gAttachPieMenu = NULL;
-LLPieMenu* gAttachBodyPartPieMenus[8];
-LLPieMenu* gDetachPieMenu = NULL;
-LLPieMenu* gDetachScreenPieMenu = NULL;
-LLPieMenu* gDetachBodyPartPieMenus[8];
+LLContextMenu* gPieRate = NULL;
+LLContextMenu* gAttachScreenPieMenu = NULL;
+LLContextMenu* gAttachPieMenu = NULL;
+LLContextMenu* gAttachBodyPartPieMenus[8];
+LLContextMenu* gDetachPieMenu = NULL;
+LLContextMenu* gDetachScreenPieMenu = NULL;
+LLContextMenu* gDetachBodyPartPieMenus[8];
LLMenuItemCallGL* gAFKMenu = NULL;
LLMenuItemCallGL* gBusyMenu = NULL;
-typedef LLMemberListener<LLView> view_listener_t;
-
//
// Local prototypes
-//
-void handle_leave_group(void *);
// File Menu
+const char* upload_pick(void* data);
void handle_compress_image(void*);
-BOOL enable_save_as(void *);
+
// Edit menu
void handle_dump_group_info(void *);
@@ -305,7 +284,7 @@ void handle_region_clear_temp_asset_data(void*);
BOOL sitting_on_selection();
void near_sit_object();
-void label_sit_or_stand(std::string& label, void*);
+//void label_sit_or_stand(std::string& label, void*);
// buy and take alias into the same UI positions, so these
// declarations handle this mess.
BOOL is_selection_buy_not_take();
@@ -317,51 +296,31 @@ BOOL enable_buy(void*);
void handle_buy(void *);
void handle_buy_object(LLSaleInfo sale_info);
void handle_buy_contents(LLSaleInfo sale_info);
-void label_touch(std::string& label, void*);
// Land pie menu
void near_sit_down_point(BOOL success, void *);
// Avatar pie menu
-void handle_follow(void *userdata);
-void handle_talk_to(void *userdata);
// Debug menu
-void show_permissions_control(void*);
-void toggle_build_options(void* user_data);
-void reload_ui(void*);
-void handle_agent_stop_moving(void*);
-void print_packets_lost(void*);
-void drop_packet(void*);
-void velocity_interpolate( void* data );
-void toggle_wind_audio(void);
-void toggle_water_audio(void);
+
+
+void velocity_interpolate( void* );
+
void handle_rebake_textures(void*);
BOOL check_admin_override(void*);
void handle_admin_override_toggle(void*);
#ifdef TOGGLE_HACKED_GODLIKE_VIEWER
void handle_toggle_hacked_godmode(void*);
BOOL check_toggle_hacked_godmode(void*);
+bool enable_toggle_hacked_godmode(void*);
#endif
-void toggle_glow(void *);
-BOOL check_glow(void *);
-
-void toggle_vertex_shaders(void *);
-BOOL check_vertex_shaders(void *);
-
-void toggle_cull_small(void *);
-
void toggle_show_xui_names(void *);
BOOL check_show_xui_names(void *);
-void run_vectorize_perf_test(void *)
-{
- gSavedSettings.setBOOL("VectorizePerfTest", TRUE);
-}
-
// Debug UI
-void handle_web_search_demo(void*);
+
void handle_web_browser_test(void*);
void handle_buy_currency_test(void*);
void handle_save_to_xml(void*);
@@ -372,16 +331,12 @@ void handle_god_mode(void*);
// God menu
void handle_leave_god_mode(void*);
-BOOL is_inventory_visible( void* user_data );
+
void handle_reset_view();
-void disabled_duplicate(void*);
void handle_duplicate_in_place(void*);
-void handle_repeat_duplicate(void*);
-void handle_export(void*);
-// void handle_deed_object_to_group(void*);
-// BOOL enable_deed_object_to_group(void*);
+
void handle_object_owner_self(void*);
void handle_object_owner_permissive(void*);
void handle_object_lock(void*);
@@ -396,11 +351,8 @@ void handle_force_parcel_owner_to_me(void*);
void handle_force_parcel_to_content(void*);
void handle_claim_public_land(void*);
-void handle_god_request_havok(void *);
void handle_god_request_avatar_geometry(void *); // Hack for easy testing of new avatar geometry
-void reload_personal_settings_overrides(void *);
void reload_vertex_shader(void *);
-void slow_mo_animations(void *);
void handle_disconnect_viewer(void *);
void force_error_breakpoint(void *);
@@ -410,25 +362,13 @@ void force_error_infinite_loop(void *);
void force_error_software_exception(void *);
void force_error_driver_crash(void *);
-void handle_stopall(void*);
-//void handle_hinge(void*);
-//void handle_ptop(void*);
-//void handle_lptop(void*);
-//void handle_wheel(void*);
-//void handle_dehinge(void*);
-BOOL enable_dehinge(void*);
void handle_force_delete(void*);
void print_object_info(void*);
void print_agent_nvpairs(void*);
void toggle_debug_menus(void*);
-void export_info_callback(LLAssetInfo *info, void **user_data, S32 result);
-void export_data_callback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type, void **user_data, S32 result);
void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExtStat ext_status);
-BOOL menu_check_build_tool( void* user_data );
-void handle_reload_settings(void*);
-void focus_here(void*);
void dump_select_mgr(void*);
-void dump_volume_mgr(void*);
+
void dump_inventory(void*);
void edit_ui(void*);
void toggle_visibility(void*);
@@ -438,52 +378,30 @@ BOOL get_visibility(void*);
void request_friendship(const LLUUID& agent_id);
// Tools menu
-void handle_force_unlock(void*);
void handle_selected_texture_info(void*);
-void handle_dump_image_list(void*);
-void handle_crash(void*);
void handle_dump_followcam(void*);
void handle_viewer_enable_message_log(void*);
void handle_viewer_disable_message_log(void*);
-void handle_send_postcard(void*);
-void handle_gestures_old(void*);
-void handle_focus(void *);
+
BOOL enable_buy_land(void*);
-void handle_move(void*);
-void handle_show_inventory(void*);
-void handle_activate(void*);
-BOOL enable_activate(void*);
// Help menu
-void handle_buy_currency(void*);
void handle_test_male(void *);
void handle_test_female(void *);
void handle_toggle_pg(void*);
void handle_dump_attachments(void *);
-void handle_show_overlay_title(void*);
void handle_dump_avatar_local_textures(void*);
void handle_debug_avatar_textures(void*);
void handle_grab_texture(void*);
BOOL enable_grab_texture(void*);
void handle_dump_region_object_cache(void*);
-BOOL menu_ui_enabled(void *user_data);
-BOOL menu_check_control( void* user_data);
-void menu_toggle_variable( void* user_data );
-BOOL menu_check_variable( void* user_data);
-BOOL enable_land_selected( void* );
-BOOL enable_more_than_one_selected(void* );
-BOOL enable_selection_you_own_all(void*);
-BOOL enable_selection_you_own_one(void*);
BOOL enable_save_into_inventory(void*);
BOOL enable_save_into_task_inventory(void*);
-BOOL enable_not_thirdperson(void*);
-// BOOL enable_export_selected(void *);
-BOOL enable_have_card(void*);
-BOOL enable_detach(void*);
-BOOL enable_region_owner(void*);
+
+BOOL enable_detach(const LLSD& = LLSD());
void menu_toggle_attached_lights(void* user_data);
void menu_toggle_attached_particles(void* user_data);
@@ -517,27 +435,6 @@ void LLMenuParcelObserver::changed()
}
-//-----------------------------------------------------------------------------
-// Menu Construction
-//-----------------------------------------------------------------------------
-
-// code required to calculate anything about the menus
-void pre_init_menus()
-{
- // static information
- LLColor4 color;
- color = gColors.getColor( "MenuDefaultBgColor" );
- LLMenuGL::setDefaultBackgroundColor( color );
- color = gColors.getColor( "MenuItemEnabledColor" );
- LLMenuItemGL::setEnabledColor( color );
- color = gColors.getColor( "MenuItemDisabledColor" );
- LLMenuItemGL::setDisabledColor( color );
- color = gColors.getColor( "MenuItemHighlightBgColor" );
- LLMenuItemGL::setHighlightBGColor( color );
- color = gColors.getColor( "MenuItemHighlightFgColor" );
- LLMenuItemGL::setHighlightFGColor( color );
-}
-
void initialize_menus();
//-----------------------------------------------------------------------------
@@ -589,62 +486,63 @@ void init_menus()
/// The popup menu is now populated by the show_context_menu()
/// method.
- gPopupMenuView = new LLMenuGL( "Popup" );
- gPopupMenuView->setVisible( FALSE );
+ LLMenuGL::Params menu_params;
+ menu_params.name = "Popup";
+ menu_params.visible = false;
+ gPopupMenuView = LLUICtrlFactory::create<LLMenuGL>(menu_params);
gMenuHolder->addChild( gPopupMenuView );
///
/// Pie menus
///
- gPieSelf = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_self.xml", gMenuHolder);
+ gPieSelf = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_self.xml", gMenuHolder);
// TomY TODO: what shall we do about these?
- gDetachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach HUD", true);
- gDetachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Detach", true);
+ gDetachScreenPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Detach HUD", true);
+ gDetachPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Detach", true);
- gPieAvatar = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_avatar.xml", gMenuHolder);
+ gPieAvatar = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_avatar.xml", gMenuHolder);
- gPieObject = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_object.xml", gMenuHolder);
+ gPieObject = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_object.xml", gMenuHolder);
- gAttachScreenPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach HUD");
- gAttachPieMenu = gMenuHolder->getChild<LLPieMenu>("Object Attach");
- gPieRate = gMenuHolder->getChild<LLPieMenu>("Rate Menu");
+ gAttachScreenPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Attach HUD");
+ gAttachPieMenu = gMenuHolder->getChild<LLContextMenu>("Object Attach");
+ gPieRate = gMenuHolder->getChild<LLContextMenu>("Rate Menu");
- gPieAttachment = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_attachment.xml", gMenuHolder);
+ gPieAttachment = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_attachment.xml", gMenuHolder);
- gPieLand = LLUICtrlFactory::getInstance()->buildPieMenu("menu_pie_land.xml", gMenuHolder);
+ gPieLand = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>("menu_pie_land.xml", gMenuHolder);
///
/// set up the colors
///
LLColor4 color;
- LLColor4 pie_color = gColors.getColor("PieMenuBgColor");
- gPieSelf->setBackgroundColor( pie_color );
- gPieAvatar->setBackgroundColor( pie_color );
- gPieObject->setBackgroundColor( pie_color );
- gPieAttachment->setBackgroundColor( pie_color );
- gPieLand->setBackgroundColor( pie_color );
+ LLColor4 context_menu_color = gSavedSkinSettings.getColor("MenuPopupBgColor");
+
+ gPieSelf->setBackgroundColor( context_menu_color );
+ gPieAvatar->setBackgroundColor( context_menu_color );
+ gPieObject->setBackgroundColor( context_menu_color );
+ gPieAttachment->setBackgroundColor( context_menu_color );
+
+ gPieLand->setBackgroundColor( context_menu_color );
- color = gColors.getColor( "MenuPopupBgColor" );
+ color = gSavedSkinSettings.getColor( "MenuPopupBgColor" );
gPopupMenuView->setBackgroundColor( color );
// If we are not in production, use a different color to make it apparent.
if (LLViewerLogin::getInstance()->isInProductionGrid())
{
- color = gColors.getColor( "MenuBarBgColor" );
+ color = gSavedSkinSettings.getColor( "MenuBarBgColor" );
}
else
{
- color = gColors.getColor( "MenuNonProductionBgColor" );
+ color = gSavedSkinSettings.getColor( "MenuNonProductionBgColor" );
}
- gMenuBarView = (LLMenuBarGL*)LLUICtrlFactory::getInstance()->buildMenu("menu_viewer.xml", gMenuHolder);
+ gMenuBarView = LLUICtrlFactory::getInstance()->createFromFile<LLMenuBarGL>("menu_viewer.xml", gMenuHolder);
gMenuBarView->setRect(LLRect(0, top, 0, top - MENU_BAR_HEIGHT));
gMenuBarView->setBackgroundColor( color );
- // gMenuBarView->setItemVisible("Tools", FALSE);
- gMenuBarView->arrange();
-
gMenuHolder->addChild(gMenuBarView);
// menu holder appears on top of menu bar so you can see the menu title
@@ -655,6 +553,7 @@ void init_menus()
LLViewerLogin::getInstance()->isInProductionGrid());
// Assume L$10 for now, the server will tell us the real cost at login
+ // *TODO:Also fix cost in llfolderview.cpp for Inventory menus
const std::string upload_cost("10");
gMenuHolder->childSetLabelArg("Upload Image", "[COST]", upload_cost);
gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost);
@@ -666,824 +565,1879 @@ void init_menus()
gAttachSubMenu = gMenuBarView->getChildMenuByName("Attach Object", TRUE);
gDetachSubMenu = gMenuBarView->getChildMenuByName("Detach Object", TRUE);
- // TomY TODO convert these two
- LLMenuGL*menu;
-
- menu = new LLMenuGL(CLIENT_MENU_NAME);
- init_client_menu(menu);
- gMenuBarView->appendMenu( menu );
- menu->updateParent(LLMenuGL::sMenuContainer);
-
- menu = new LLMenuGL(SERVER_MENU_NAME);
- init_server_menu(menu);
- gMenuBarView->appendMenu( menu );
- menu->updateParent(LLMenuGL::sMenuContainer);
-
gMenuBarView->createJumpKeys();
// Let land based option enable when parcel changes
gMenuParcelObserver = new LLMenuParcelObserver();
- //
- // Debug menu visiblity
- //
- show_debug_menus();
-
- gLoginMenuBarView = (LLMenuBarGL*)LLUICtrlFactory::getInstance()->buildMenu("menu_login.xml", gMenuHolder);
+ gLoginMenuBarView = LLUICtrlFactory::getInstance()->createFromFile<LLMenuBarGL>("menu_login.xml", gMenuHolder);
+ gLoginMenuBarView->arrangeAndClear();
LLRect menuBarRect = gLoginMenuBarView->getRect();
gLoginMenuBarView->setRect(LLRect(menuBarRect.mLeft, menuBarRect.mTop, gViewerWindow->getRootView()->getRect().getWidth() - menuBarRect.mLeft, menuBarRect.mBottom));
-
gLoginMenuBarView->setBackgroundColor( color );
-
gMenuHolder->addChild(gLoginMenuBarView);
}
+///////////////////
+// SHOW CONSOLES //
+///////////////////
-void init_client_menu(LLMenuGL* menu)
+class LLAdvancedToggleConsole : public view_listener_t
{
- LLMenuGL* sub_menu = NULL;
-
- //menu->append(new LLMenuItemCallGL("Permissions Control", &show_permissions_control));
- // this is now in the view menu so we don't need it here!
-
+ bool handleEvent(const LLSD& userdata)
{
- // *TODO: Translate
- LLMenuGL* sub = new LLMenuGL("Consoles");
- menu->appendMenu(sub);
- sub->append(new LLMenuItemCheckGL("Frame Console",
- &toggle_visibility,
- NULL,
- &get_visibility,
- (void*)gDebugView->mFrameStatView,
- '2', MASK_CONTROL|MASK_SHIFT ) );
- sub->append(new LLMenuItemCheckGL("Texture Console",
- &toggle_visibility,
- NULL,
- &get_visibility,
- (void*)gTextureView,
- '3', MASK_CONTROL|MASK_SHIFT ) );
- LLView* debugview = gDebugView->mDebugConsolep;
- sub->append(new LLMenuItemCheckGL("Debug Console",
- &toggle_visibility,
- NULL,
- &get_visibility,
- debugview,
- '4', MASK_CONTROL|MASK_SHIFT ) );
-
- sub->append(new LLMenuItemCheckGL("Fast Timers",
- &toggle_visibility,
- NULL,
- &get_visibility,
- (void*)gDebugView->mFastTimerView,
- '9', MASK_CONTROL|MASK_SHIFT ) );
+ std::string console_type = userdata.asString();
+ if ("texture" == console_type)
+ {
+ toggle_visibility( (void*)gTextureView );
+ }
+ else if ("debug" == console_type)
+ {
+ toggle_visibility( (void*)((LLView*)gDebugView->mDebugConsolep) );
+ }
+ else if ("fast timers" == console_type)
+ {
+ toggle_visibility( (void*)gDebugView->mFastTimerView );
+ }
#if MEM_TRACK_MEM
- sub->append(new LLMenuItemCheckGL("Memory",
- &toggle_visibility,
- NULL,
- &get_visibility,
- (void*)gDebugView->mMemoryView,
- '0', MASK_CONTROL|MASK_SHIFT ) );
+ else if ("memory view" == console_type)
+ {
+ toggle_visibility( (void*)gDebugView->mMemoryView );
+ }
#endif
- sub->appendSeparator();
- sub->append(new LLMenuItemCallGL("Region Info to Debug Console",
- &handle_region_dump_settings, NULL));
- sub->append(new LLMenuItemCallGL("Group Info to Debug Console",
- &handle_dump_group_info, NULL, NULL));
- sub->append(new LLMenuItemCallGL("Capabilities Info to Debug Console",
- &handle_dump_capabilities_info, NULL, NULL));
- sub->createJumpKeys();
+ return true;
}
-
- // neither of these works particularly well at the moment
- /*menu->append(new LLMenuItemCallGL( "Reload UI XML", &reload_ui,
- NULL, NULL) );*/
- /*menu->append(new LLMenuItemCallGL("Reload settings/colors",
- &handle_reload_settings, NULL, NULL));*/
- menu->append(new LLMenuItemCallGL("Reload personal setting overrides",
- &reload_personal_settings_overrides, NULL, NULL, KEY_F12, MASK_CONTROL|MASK_SHIFT));
-
- sub_menu = new LLMenuGL("HUD Info");
- {
- sub_menu->append(new LLMenuItemCheckGL("Velocity",
- &toggle_visibility,
- NULL,
- &get_visibility,
- (void*)gVelocityBar));
-
- sub_menu->append(new LLMenuItemToggleGL("Camera", &gDisplayCameraPos ) );
- sub_menu->append(new LLMenuItemToggleGL("Wind", &gDisplayWindInfo) );
- sub_menu->append(new LLMenuItemToggleGL("FOV", &gDisplayFOV ) );
- sub_menu->createJumpKeys();
- }
- menu->appendMenu(sub_menu);
-
- menu->appendSeparator();
-
- menu->append(new LLMenuItemCheckGL( "High-res Snapshot",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"HighResSnapshot"));
-
- menu->append(new LLMenuItemCheckGL( "Quiet Snapshots to Disk",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"QuietSnapshotsToDisk"));
-
- menu->append(new LLMenuItemCheckGL("Show Mouselook Crosshairs",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"ShowCrosshairs"));
-
- menu->append(new LLMenuItemCheckGL("Debug Permissions",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"DebugPermissions"));
-
-
-
-#ifdef TOGGLE_HACKED_GODLIKE_VIEWER
- if (!LLViewerLogin::getInstance()->isInProductionGrid())
+};
+class LLAdvancedCheckConsole : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
{
- menu->append(new LLMenuItemCheckGL("Hacked Godmode",
- &handle_toggle_hacked_godmode,
- NULL,
- &check_toggle_hacked_godmode,
- (void*)"HackedGodmode"));
- }
+ std::string console_type = userdata.asString();
+ bool new_value = false;
+ if ("texture" == console_type)
+ {
+ new_value = get_visibility( (void*)gTextureView );
+ }
+ else if ("debug" == console_type)
+ {
+ new_value = get_visibility( (void*)((LLView*)gDebugView->mDebugConsolep) );
+ }
+ else if ("fast timers" == console_type)
+ {
+ new_value = get_visibility( (void*)gDebugView->mFastTimerView );
+ }
+#if MEM_TRACK_MEM
+ else if ("memory view" == console_type)
+ {
+ new_value = get_visibility( (void*)gDebugView->mMemoryView );
+ }
#endif
- menu->append(new LLMenuItemCallGL("Clear Group Cache",
- LLGroupMgr::debugClearAllGroups));
- menu->appendSeparator();
-
- sub_menu = new LLMenuGL("Rendering");
- init_debug_rendering_menu(sub_menu);
- menu->appendMenu(sub_menu);
-
- sub_menu = new LLMenuGL("World");
- init_debug_world_menu(sub_menu);
- menu->appendMenu(sub_menu);
+ return new_value;
+ }
+};
- sub_menu = new LLMenuGL("UI");
- init_debug_ui_menu(sub_menu);
- menu->appendMenu(sub_menu);
- sub_menu = new LLMenuGL("XUI");
- init_debug_xui_menu(sub_menu);
- menu->appendMenu(sub_menu);
+//////////////////////////
+// DUMP INFO TO CONSOLE //
+//////////////////////////
- sub_menu = new LLMenuGL("Character");
- init_debug_avatar_menu(sub_menu);
- menu->appendMenu(sub_menu);
+class LLAdvancedDumpInfoToConsole : public view_listener_t
{
- LLMenuGL* sub = NULL;
- sub = new LLMenuGL("Network");
-
- sub->append(new LLMenuItemCallGL("Enable Message Log",
- &handle_viewer_enable_message_log, NULL));
- sub->append(new LLMenuItemCallGL("Disable Message Log",
- &handle_viewer_disable_message_log, NULL));
-
- sub->appendSeparator();
+ bool handleEvent(const LLSD& userdata)
+ {
+ std::string info_type = userdata.asString();
+ if ("region" == info_type)
+ {
+ handle_region_dump_settings(NULL);
+ }
+ else if ("group" == info_type)
+ {
+ handle_dump_group_info(NULL);
+ }
+ else if ("capabilities" == info_type)
+ {
+ handle_dump_capabilities_info(NULL);
+ }
+ return true;
+ }
+};
- sub->append(new LLMenuItemCheckGL("Velocity Interpolate Objects",
- &velocity_interpolate,
- NULL,
- &menu_check_control,
- (void*)"VelocityInterpolate"));
- sub->append(new LLMenuItemCheckGL("Ping Interpolate Object Positions",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"PingInterpolate"));
- sub->appendSeparator();
+//////////////
+// HUD INFO //
+//////////////
- sub->append(new LLMenuItemCallGL("Drop a Packet",
- &drop_packet, NULL, NULL,
- 'L', MASK_ALT | MASK_CONTROL));
- menu->appendMenu( sub );
- sub->createJumpKeys();
- }
+class LLAdvancedToggleHUDInfo : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
{
- LLMenuGL* sub = NULL;
- sub = new LLMenuGL("Recorder");
-
- sub->append(new LLMenuItemCheckGL("Full Session Logging", &menu_toggle_control, NULL, &menu_check_control, (void*)"StatsSessionTrackFrameStats"));
-
- sub->append(new LLMenuItemCallGL("Start Logging", &LLFrameStats::startLogging, NULL));
- sub->append(new LLMenuItemCallGL("Stop Logging", &LLFrameStats::stopLogging, NULL));
- sub->append(new LLMenuItemCallGL("Log 10 Seconds", &LLFrameStats::timedLogging10, NULL));
- sub->append(new LLMenuItemCallGL("Log 30 Seconds", &LLFrameStats::timedLogging30, NULL));
- sub->append(new LLMenuItemCallGL("Log 60 Seconds", &LLFrameStats::timedLogging60, NULL));
- sub->appendSeparator();
- sub->append(new LLMenuItemCallGL("Start Playback", &LLAgentPilot::startPlayback, NULL));
- sub->append(new LLMenuItemCallGL("Stop Playback", &LLAgentPilot::stopPlayback, NULL));
- sub->append(new LLMenuItemToggleGL("Loop Playback", &LLAgentPilot::sLoop) );
- sub->append(new LLMenuItemCallGL("Start Record", &LLAgentPilot::startRecord, NULL));
- sub->append(new LLMenuItemCallGL("Stop Record", &LLAgentPilot::saveRecord, NULL));
+ std::string info_type = userdata.asString();
- menu->appendMenu( sub );
- sub->createJumpKeys();
+ if ("camera" == info_type)
+ {
+ gDisplayCameraPos = !(gDisplayCameraPos);
+ }
+ else if ("wind" == info_type)
+ {
+ gDisplayWindInfo = !(gDisplayWindInfo);
+ }
+ else if ("fov" == info_type)
+ {
+ gDisplayFOV = !(gDisplayFOV);
+ }
+ return true;
}
+};
- menu->appendSeparator();
-
- menu->append(new LLMenuItemToggleGL("Show Updates",
- &gShowObjectUpdates));
-
- menu->appendSeparator();
-
- menu->append(new LLMenuItemCallGL("Compress Images...",
- &handle_compress_image, NULL, NULL));
-
- menu->append(new LLMenuItemCheckGL("Limit Select Distance",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"LimitSelectDistance"));
-
- menu->append(new LLMenuItemCheckGL("Disable Camera Constraints",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"DisableCameraConstraints"));
-
- menu->append(new LLMenuItemCheckGL("Mouse Smoothing",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*) "MouseSmooth"));
- menu->appendSeparator();
-
- menu->append(new LLMenuItemCheckGL( "Console Window",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"ShowConsoleWindow"));
-
- if(gSavedSettings.getBOOL("QAMode"))
- {
- LLMenuGL* sub = NULL;
- sub = new LLMenuGL("Debugging");
-#if LL_WINDOWS
- sub->append(new LLMenuItemCallGL("Force Breakpoint", &force_error_breakpoint, NULL, NULL, 'B', MASK_CONTROL | MASK_ALT));
-#endif
- sub->append(new LLMenuItemCallGL("Force LLError And Crash", &force_error_llerror));
- sub->append(new LLMenuItemCallGL("Force Bad Memory Access", &force_error_bad_memory_access));
- sub->append(new LLMenuItemCallGL("Force Infinite Loop", &force_error_infinite_loop));
- sub->append(new LLMenuItemCallGL("Force Driver Crash", &force_error_driver_crash));
- sub->append(new LLMenuItemCallGL("Force Disconnect Viewer", &handle_disconnect_viewer));
- // *NOTE:Mani this isn't handled yet... sub->append(new LLMenuItemCallGL("Force Software Exception", &force_error_unhandled_exception));
- sub->createJumpKeys();
- menu->appendMenu(sub);
+class LLAdvancedCheckHUDInfo : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ std::string info_type = userdata.asString();
+ bool new_value = false;
+ if ("camera" == info_type)
+ {
+ new_value = gDisplayCameraPos;
+ }
+ else if ("wind" == info_type)
+ {
+ new_value = gDisplayWindInfo;
+ }
+ else if ("fov" == info_type)
+ {
+ new_value = gDisplayFOV;
+ }
+ return new_value;
}
+};
- menu->append(new LLMenuItemCheckGL( "Output Debug Minidump",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"SaveMinidump"));
-
- menu->append(new LLMenuItemCallGL("Debug Settings...", LLFloaterSettingsDebug::show, NULL, NULL));
- menu->append(new LLMenuItemCheckGL("View Admin Options", &handle_admin_override_toggle, NULL, &check_admin_override, NULL, 'V', MASK_CONTROL | MASK_ALT));
-
- menu->append(new LLMenuItemCallGL("Request Admin Status",
- &handle_god_mode, NULL, NULL, 'G', MASK_ALT | MASK_CONTROL));
+///////////////////////
+// CLEAR GROUP CACHE //
+///////////////////////
- menu->append(new LLMenuItemCallGL("Leave Admin Status",
- &handle_leave_god_mode, NULL, NULL, 'G', MASK_ALT | MASK_SHIFT | MASK_CONTROL));
+class LLAdvancedClearGroupCache : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLGroupMgr::debugClearAllGroups(NULL);
+ return true;
+ }
+};
- menu->createJumpKeys();
-}
-void init_debug_world_menu(LLMenuGL* menu)
-{
-/* REMOVE mouse move sun from menu options
- menu->append(new LLMenuItemCheckGL("Mouse Moves Sun",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"MouseSun",
- 'M', MASK_CONTROL|MASK_ALT));
-*/
- menu->append(new LLMenuItemCheckGL("Sim Sun Override",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"SkyOverrideSimSunPosition"));
- menu->append(new LLMenuItemCallGL("Dump Scripted Camera",
- &handle_dump_followcam, NULL, NULL));
- menu->append(new LLMenuItemCheckGL("Fixed Weather",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"FixedWeather"));
- menu->append(new LLMenuItemCallGL("Dump Region Object Cache",
- &handle_dump_region_object_cache, NULL, NULL));
- menu->createJumpKeys();
-}
-void handle_export_menus_to_xml(void*)
+/////////////////
+// RENDER TYPE //
+/////////////////
+U32 render_type_from_string(std::string render_type)
{
-
- LLFilePicker& picker = LLFilePicker::instance();
- if(!picker.getSaveFile(LLFilePicker::FFSAVE_XML))
+ if ("simple" == render_type)
{
- llwarns << "No file" << llendl;
- return;
+ return LLPipeline::RENDER_TYPE_SIMPLE;
+ }
+ else if ("alpha" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_ALPHA;
+ }
+ else if ("tree" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_TREE;
+ }
+ else if ("character" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_AVATAR;
+ }
+ else if ("surfacePath" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_TERRAIN;
+ }
+ else if ("sky" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_SKY;
+ }
+ else if ("water" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_WATER;
+ }
+ else if ("ground" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_GROUND;
+ }
+ else if ("volume" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_VOLUME;
+ }
+ else if ("grass" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_GRASS;
+ }
+ else if ("clouds" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_CLOUDS;
+ }
+ else if ("particles" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_PARTICLES;
+ }
+ else if ("bump" == render_type)
+ {
+ return LLPipeline::RENDER_TYPE_BUMP;
+ }
+ else
+ {
+ return 0;
}
- std::string filename = picker.getFirstFile();
-
- llofstream out(filename);
- LLXMLNodePtr node = gMenuBarView->getXML();
- node->writeToOstream(out);
- out.close();
}
-extern BOOL gDebugClicks;
-extern BOOL gDebugWindowProc;
-extern BOOL gDebugTextEditorTips;
-extern BOOL gDebugSelectMgr;
-
-void init_debug_ui_menu(LLMenuGL* menu)
-{
- menu->append(new LLMenuItemCheckGL("Rotate Mini-Map", menu_toggle_control, NULL, menu_check_control, (void*)"MiniMapRotate"));
- menu->append(new LLMenuItemCheckGL("Use default system color picker", menu_toggle_control, NULL, menu_check_control, (void*)"UseDefaultColorPicker"));
- menu->append(new LLMenuItemCheckGL("Show search panel in overlay bar", menu_toggle_control, NULL, menu_check_control, (void*)"ShowSearchBar"));
- menu->appendSeparator();
-
- menu->append(new LLMenuItemCallGL("Web Browser Test", &handle_web_browser_test));
- menu->append(new LLMenuItemCallGL("Buy Currency Test", &handle_buy_currency_test));
- menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui));
- menu->append(new LLMenuItemCallGL( "Dump SelectMgr", &dump_select_mgr));
- menu->append(new LLMenuItemCallGL( "Dump Inventory", &dump_inventory));
- menu->append(new LLMenuItemCallGL( "Dump Focus Holder", &handle_dump_focus, NULL, NULL, 'F', MASK_ALT | MASK_CONTROL));
- menu->append(new LLMenuItemCallGL( "Print Selected Object Info", &print_object_info, NULL, NULL, 'P', MASK_CONTROL|MASK_SHIFT ));
- menu->append(new LLMenuItemCallGL( "Print Agent Info", &print_agent_nvpairs, NULL, NULL, 'P', MASK_SHIFT ));
- menu->append(new LLMenuItemCallGL( "Memory Stats", &output_statistics, NULL, NULL, 'M', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
- menu->append(new LLMenuItemCheckGL("Double-Click Auto-Pilot",
- menu_toggle_control, NULL, menu_check_control,
- (void*)"DoubleClickAutoPilot"));
- menu->appendSeparator();
-// menu->append(new LLMenuItemCallGL( "Print Packets Lost", &print_packets_lost, NULL, NULL, 'L', MASK_SHIFT ));
- menu->append(new LLMenuItemToggleGL("Debug SelectMgr", &gDebugSelectMgr));
- menu->append(new LLMenuItemToggleGL("Debug Clicks", &gDebugClicks));
- menu->append(new LLMenuItemToggleGL("Debug Views", &LLView::sDebugRects));
- menu->append(new LLMenuItemCheckGL("Show Name Tooltips", toggle_show_xui_names, NULL, check_show_xui_names, NULL));
- menu->append(new LLMenuItemToggleGL("Debug Mouse Events", &LLView::sDebugMouseHandling));
- menu->append(new LLMenuItemToggleGL("Debug Keys", &LLView::sDebugKeys));
- menu->append(new LLMenuItemToggleGL("Debug WindowProc", &gDebugWindowProc));
- menu->append(new LLMenuItemToggleGL("Debug Text Editor Tips", &gDebugTextEditorTips));
- menu->appendSeparator();
- menu->append(new LLMenuItemCheckGL("Show Time", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowTime"));
- menu->append(new LLMenuItemCheckGL("Show Render Info", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderInfo"));
- menu->append(new LLMenuItemCheckGL("Show Matrices", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderMatrices"));
- menu->append(new LLMenuItemCheckGL("Show Color Under Cursor", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowColor"));
-
- menu->createJumpKeys();
-}
-void init_debug_xui_menu(LLMenuGL* menu)
+class LLAdvancedToggleRenderType : public view_listener_t
{
- menu->append(new LLMenuItemCallGL("Floater Test...", LLFloaterTest::show));
- menu->append(new LLMenuItemCallGL("Font Test...", LLFloaterFontTest::show));
- menu->append(new LLMenuItemCallGL("Export Menus to XML...", handle_export_menus_to_xml));
- menu->append(new LLMenuItemCallGL("Edit UI...", LLFloaterEditUI::show));
- menu->append(new LLMenuItemCallGL("Load from XML...", handle_load_from_xml));
- menu->append(new LLMenuItemCallGL("Save to XML...", handle_save_to_xml));
- menu->append(new LLMenuItemCheckGL("Show XUI Names", toggle_show_xui_names, NULL, check_show_xui_names, NULL));
+ bool handleEvent(const LLSD& userdata)
+ {
+ U32 render_type = render_type_from_string( userdata.asString() );
+ if ( render_type != 0 )
+ {
+ LLPipeline::toggleRenderTypeControl( (void*)render_type );
+ }
+ return true;
+ }
+};
- //menu->append(new LLMenuItemCallGL("Buy Currency...", handle_buy_currency));
- menu->createJumpKeys();
-}
-void init_debug_rendering_menu(LLMenuGL* menu)
+class LLAdvancedCheckRenderType : public view_listener_t
{
- LLMenuGL* sub_menu = NULL;
-
- ///////////////////////////
- //
- // Debug menu for types/pools
- //
- sub_menu = new LLMenuGL("Types");
- menu->appendMenu(sub_menu);
-
- sub_menu->append(new LLMenuItemCheckGL("Simple",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_SIMPLE, '1', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Alpha",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_ALPHA, '2', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Tree",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_TREE, '3', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Character",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_AVATAR, '4', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("SurfacePatch",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_TERRAIN, '5', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Sky",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_SKY, '6', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Water",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_WATER, '7', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Ground",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_GROUND, '8', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Volume",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_VOLUME, '9', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Grass",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_GRASS, '0', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Clouds",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_CLOUDS, '-', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Particles",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_PARTICLES, '`', MASK_ALT|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Bump",
- &LLPipeline::toggleRenderTypeControl, NULL,
- &LLPipeline::hasRenderTypeControl,
- (void*)LLPipeline::RENDER_TYPE_BUMP, '\\', MASK_ALT|MASK_SHIFT));
-
- sub_menu->createJumpKeys();
- sub_menu = new LLMenuGL("Features");
- menu->appendMenu(sub_menu);
- sub_menu->append(new LLMenuItemCheckGL("UI",
- &LLPipeline::toggleRenderDebugFeature, NULL,
- &LLPipeline::toggleRenderDebugFeatureControl,
- (void*)LLPipeline::RENDER_DEBUG_FEATURE_UI, KEY_F1, MASK_CONTROL|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Selected",
- &LLPipeline::toggleRenderDebugFeature, NULL,
- &LLPipeline::toggleRenderDebugFeatureControl,
- (void*)LLPipeline::RENDER_DEBUG_FEATURE_SELECTED, KEY_F2, MASK_CONTROL|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Highlighted",
- &LLPipeline::toggleRenderDebugFeature, NULL,
- &LLPipeline::toggleRenderDebugFeatureControl,
- (void*)LLPipeline::RENDER_DEBUG_FEATURE_HIGHLIGHTED, KEY_F3, MASK_CONTROL|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Dynamic Textures",
- &LLPipeline::toggleRenderDebugFeature, NULL,
- &LLPipeline::toggleRenderDebugFeatureControl,
- (void*)LLPipeline::RENDER_DEBUG_FEATURE_DYNAMIC_TEXTURES, KEY_F4, MASK_CONTROL|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL( "Foot Shadows",
- &LLPipeline::toggleRenderDebugFeature, NULL,
- &LLPipeline::toggleRenderDebugFeatureControl,
- (void*)LLPipeline::RENDER_DEBUG_FEATURE_FOOT_SHADOWS, KEY_F5, MASK_CONTROL|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Fog",
- &LLPipeline::toggleRenderDebugFeature, NULL,
- &LLPipeline::toggleRenderDebugFeatureControl,
- (void*)LLPipeline::RENDER_DEBUG_FEATURE_FOG, KEY_F6, MASK_CONTROL|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL("Test FRInfo",
- &LLPipeline::toggleRenderDebugFeature, NULL,
- &LLPipeline::toggleRenderDebugFeatureControl,
- (void*)LLPipeline::RENDER_DEBUG_FEATURE_FR_INFO, KEY_F8, MASK_CONTROL|MASK_SHIFT));
- sub_menu->append(new LLMenuItemCheckGL( "Flexible Objects",
- &LLPipeline::toggleRenderDebugFeature, NULL,
- &LLPipeline::toggleRenderDebugFeatureControl,
- (void*)LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE, KEY_F9, MASK_CONTROL|MASK_SHIFT));
- sub_menu->createJumpKeys();
-
- /////////////////////////////
- //
- // Debug menu for info displays
- //
- sub_menu = new LLMenuGL("Info Displays");
- menu->appendMenu(sub_menu);
-
- sub_menu->append(new LLMenuItemCheckGL("Verify", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_VERIFY));
- sub_menu->append(new LLMenuItemCheckGL("BBoxes", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_BBOXES));
- sub_menu->append(new LLMenuItemCheckGL("Points", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_POINTS));
- sub_menu->append(new LLMenuItemCheckGL("Octree", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_OCTREE));
- sub_menu->append(new LLMenuItemCheckGL("Shadow Frusta", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA));
- sub_menu->append(new LLMenuItemCheckGL("Occlusion", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_OCCLUSION));
- sub_menu->append(new LLMenuItemCheckGL("Render Batches", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_BATCH_SIZE));
- sub_menu->append(new LLMenuItemCheckGL("Animated Textures", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_TEXTURE_ANIM));
- sub_menu->append(new LLMenuItemCheckGL("Texture Priority", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY));
- sub_menu->append(new LLMenuItemCheckGL("Avatar Rendering Cost", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_SHAME));
- sub_menu->append(new LLMenuItemCheckGL("Texture Area (sqrt(A))",&LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_TEXTURE_AREA));
- sub_menu->append(new LLMenuItemCheckGL("Face Area (sqrt(A))",&LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_FACE_AREA));
- sub_menu->append(new LLMenuItemCheckGL("Lights", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_LIGHTS));
- sub_menu->append(new LLMenuItemCheckGL("Particles", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_PARTICLES));
- sub_menu->append(new LLMenuItemCheckGL("Composition", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_COMPOSITION));
- sub_menu->append(new LLMenuItemCheckGL("Glow",&LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_GLOW));
- sub_menu->append(new LLMenuItemCheckGL("Raycasting", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_RAYCAST));
- sub_menu->append(new LLMenuItemCheckGL("Sculpt", &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_SCULPTED));
-
- sub_menu->append(new LLMenuItemCallGL("Vectorize Perf Test", &run_vectorize_perf_test));
-
- sub_menu = new LLMenuGL("Render Tests");
-
- sub_menu->append(new LLMenuItemCheckGL("Camera Offset",
- &menu_toggle_control,
- NULL,
- &menu_check_control,
- (void*)"CameraOffset"));
-
- sub_menu->append(new LLMenuItemToggleGL("Randomize Framerate", &gRandomizeFramerate));
-
- sub_menu->append(new LLMenuItemToggleGL("Periodic Slow Frame", &gPeriodicSlowFrame));
-
- sub_menu->append(new LLMenuItemToggleGL("Frame Test", &LLPipeline::sRenderFrameTest));
-
- sub_menu->createJumpKeys();
-
- menu->appendMenu( sub_menu );
-
- menu->appendSeparator();
- menu->append(new LLMenuItemCheckGL("Axes", menu_toggle_control, NULL, menu_check_control, (void*)"ShowAxes"));
-// menu->append(new LLMenuItemCheckGL("Cull Small Objects", toggle_cull_small, NULL, menu_check_control, (void*)"RenderCullBySize"));
-
- menu->appendSeparator();
- menu->append(new LLMenuItemToggleGL("Hide Selected", &gHideSelectedObjects));
- menu->appendSeparator();
- menu->append(new LLMenuItemCheckGL("Tangent Basis", menu_toggle_control, NULL, menu_check_control, (void*)"ShowTangentBasis"));
- menu->append(new LLMenuItemCallGL("Selected Texture Info", handle_selected_texture_info, NULL, NULL, 'T', MASK_CONTROL|MASK_SHIFT|MASK_ALT));
- //menu->append(new LLMenuItemCallGL("Dump Image List", handle_dump_image_list, NULL, NULL, 'I', MASK_CONTROL|MASK_SHIFT));
-
- menu->append(new LLMenuItemToggleGL("Wireframe", &gUseWireframe,
- 'R', MASK_CONTROL|MASK_SHIFT));
+ bool handleEvent(const LLSD& userdata)
+ {
+ U32 render_type = render_type_from_string( userdata.asString() );
+ bool new_value = false;
- LLMenuItemCheckGL* item;
- item = new LLMenuItemCheckGL("Object-Object Occlusion", menu_toggle_control, NULL, menu_check_control, (void*)"UseOcclusion", 'O', MASK_CONTROL|MASK_SHIFT);
- item->setEnabled(gGLManager.mHasOcclusionQuery && LLFeatureManager::getInstance()->isFeatureAvailable("UseOcclusion"));
- menu->append(item);
+ if ( render_type != 0 )
+ {
+ new_value = LLPipeline::hasRenderTypeControl( (void*)render_type );
+ }
- item = new LLMenuItemCheckGL("Debug GL", menu_toggle_control, NULL, menu_check_control, (void*)"RenderDebugGL");
- menu->append(item);
-
- item = new LLMenuItemCheckGL("Debug Pipeline", menu_toggle_control, NULL, menu_check_control, (void*)"RenderDebugPipeline");
- menu->append(item);
-
- item = new LLMenuItemCheckGL("Fast Alpha", menu_toggle_control, NULL, menu_check_control, (void*)"RenderFastAlpha");
- menu->append(item);
-
- item = new LLMenuItemCheckGL("Animate Textures", menu_toggle_control, NULL, menu_check_control, (void*)"AnimateTextures");
- menu->append(item);
-
- item = new LLMenuItemCheckGL("Disable Textures", menu_toggle_variable, NULL, menu_check_variable, (void*)&LLViewerImage::sDontLoadVolumeTextures);
- menu->append(item);
-
-#ifndef LL_RELEASE_FOR_DOWNLOAD
- item = new LLMenuItemCheckGL("HTTP Get Textures", menu_toggle_control, NULL, menu_check_control, (void*)"ImagePipelineUseHTTP");
- menu->append(item);
-#endif
-
- item = new LLMenuItemCheckGL("Run Multiple Threads", menu_toggle_control, NULL, menu_check_control, (void*)"RunMultipleThreads");
- menu->append(item);
+ return new_value;
+ }
+};
- item = new LLMenuItemCheckGL("Cheesy Beacon", menu_toggle_control, NULL, menu_check_control, (void*)"CheesyBeacon");
- menu->append(item);
- item = new LLMenuItemCheckGL("Attached Lights", menu_toggle_attached_lights, NULL, menu_check_control, (void*)"RenderAttachedLights");
- menu->append(item);
+/////////////
+// FEATURE //
+/////////////
+U32 feature_from_string(std::string feature)
+{
+ if ("ui" == feature)
+ {
+ return LLPipeline::RENDER_DEBUG_FEATURE_UI;
+ }
+ else if ("selected" == feature)
+ {
+ return LLPipeline::RENDER_DEBUG_FEATURE_SELECTED;
+ }
+ else if ("highlighted" == feature)
+ {
+ return LLPipeline::RENDER_DEBUG_FEATURE_HIGHLIGHTED;
+ }
+ else if ("dynamic textures" == feature)
+ {
+ return LLPipeline::RENDER_DEBUG_FEATURE_DYNAMIC_TEXTURES;
+ }
+ else if ("foot shadows" == feature)
+ {
+ return LLPipeline::RENDER_DEBUG_FEATURE_FOOT_SHADOWS;
+ }
+ else if ("fog" == feature)
+ {
+ return LLPipeline::RENDER_DEBUG_FEATURE_FOG;
+ }
+ else if ("fr info" == feature)
+ {
+ return LLPipeline::RENDER_DEBUG_FEATURE_FR_INFO;
+ }
+ else if ("flexible" == feature)
+ {
+ return LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE;
+ }
+ else
+ {
+ return 0;
+ }
+};
- item = new LLMenuItemCheckGL("Attached Particles", menu_toggle_attached_particles, NULL, menu_check_control, (void*)"RenderAttachedParticles");
- menu->append(item);
-#ifndef LL_RELEASE_FOR_DOWNLOAD
- menu->appendSeparator();
- menu->append(new LLMenuItemCallGL("Memory Leaking Simulation", LLFloaterMemLeak::show, NULL, NULL));
-#else
- if(gSavedSettings.getBOOL("QAMode"))
+class LLAdvancedToggleFeature : public view_listener_t{
+ bool handleEvent(const LLSD& userdata)
{
- menu->appendSeparator();
- menu->append(new LLMenuItemCallGL("Memory Leaking Simulation", LLFloaterMemLeak::show, NULL, NULL));
+ U32 feature = feature_from_string( userdata.asString() );
+ if ( feature != 0 )
+ {
+ LLPipeline::toggleRenderDebugFeature( (void*)feature );
+ }
+ return true;
}
-#endif
-
- menu->createJumpKeys();
-}
-
-void init_debug_avatar_menu(LLMenuGL* menu)
-{
- LLMenuGL* sub_menu = new LLMenuGL("Grab Baked Texture");
- init_debug_baked_texture_menu(sub_menu);
- menu->appendMenu(sub_menu);
-
- sub_menu = new LLMenuGL("Character Tests");
- sub_menu->append(new LLMenuItemCheckGL("Go Away/AFK When Idle",
- menu_toggle_control,
- NULL,
- menu_check_control,
- (void*)"AllowIdleAFK"));
-
- sub_menu->append(new LLMenuItemCallGL("Appearance To XML",
- &LLVOAvatar::dumpArchetypeXML));
-
- // HACK for easy testing of avatar geometry
- sub_menu->append(new LLMenuItemCallGL( "Toggle Character Geometry",
- &handle_god_request_avatar_geometry, &enable_god_customer_service, NULL));
-
- sub_menu->append(new LLMenuItemCallGL("Test Male",
- handle_test_male));
-
- sub_menu->append(new LLMenuItemCallGL("Test Female",
- handle_test_female));
-
- sub_menu->append(new LLMenuItemCallGL("Toggle PG", handle_toggle_pg));
-
- sub_menu->append(new LLMenuItemToggleGL("Allow Select Avatar", &gAllowSelectAvatar));
- sub_menu->createJumpKeys();
-
- menu->appendMenu(sub_menu);
-
- menu->append(new LLMenuItemCheckGL("Enable Lip Sync (Beta)", menu_toggle_control, NULL, menu_check_control, (void*)"LipSyncEnabled"));
- menu->append(new LLMenuItemToggleGL("Tap-Tap-Hold To Run", &gAllowTapTapHoldRun));
- menu->append(new LLMenuItemCallGL("Force Params to Default", &LLAgent::clearVisualParams, NULL));
- menu->append(new LLMenuItemCallGL("Reload Vertex Shader", &reload_vertex_shader, NULL));
- menu->append(new LLMenuItemToggleGL("Animation Info", &LLVOAvatar::sShowAnimationDebug));
- menu->append(new LLMenuItemCallGL("Slow Motion Animations", &slow_mo_animations, NULL));
- menu->append(new LLMenuItemToggleGL("Show Look At", &LLHUDEffectLookAt::sDebugLookAt));
- menu->append(new LLMenuItemToggleGL("Show Point At", &LLHUDEffectPointAt::sDebugPointAt));
- menu->append(new LLMenuItemToggleGL("Debug Joint Updates", &LLVOAvatar::sJointDebug));
- menu->append(new LLMenuItemToggleGL("Disable LOD", &LLViewerJoint::sDisableLOD));
- menu->append(new LLMenuItemToggleGL("Debug Character Vis", &LLVOAvatar::sDebugInvisible));
- //menu->append(new LLMenuItemToggleGL("Show Attachment Points", &LLVOAvatar::sShowAttachmentPoints));
- //diabling collision plane due to DEV-14477 -brad
- //menu->append(new LLMenuItemToggleGL("Show Collision Plane", &LLVOAvatar::sShowFootPlane));
- menu->append(new LLMenuItemCheckGL("Show Collision Skeleton",
- &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_AVATAR_VOLUME));
- menu->append(new LLMenuItemCheckGL("Display Agent Target",
- &LLPipeline::toggleRenderDebug, NULL,
- &LLPipeline::toggleRenderDebugControl,
- (void*)LLPipeline::RENDER_DEBUG_AGENT_TARGET));
- menu->append(new LLMenuItemToggleGL( "Debug Rotation", &LLVOAvatar::sDebugAvatarRotation));
- menu->append(new LLMenuItemCallGL("Dump Attachments", handle_dump_attachments));
- menu->append(new LLMenuItemCallGL("Rebake Textures", handle_rebake_textures, NULL, NULL, 'R', MASK_ALT | MASK_CONTROL ));
-#ifndef LL_RELEASE_FOR_DOWNLOAD
- menu->append(new LLMenuItemCallGL("Debug Avatar Textures", handle_debug_avatar_textures, NULL, NULL, 'A', MASK_SHIFT|MASK_CONTROL|MASK_ALT));
- menu->append(new LLMenuItemCallGL("Dump Local Textures", handle_dump_avatar_local_textures, NULL, NULL, 'M', MASK_SHIFT|MASK_ALT ));
-#endif
- menu->createJumpKeys();
-}
+};
-void init_debug_baked_texture_menu(LLMenuGL* menu)
+class LLAdvancedCheckFeature : public view_listener_t
+{bool handleEvent(const LLSD& userdata)
{
- menu->append(new LLMenuItemCallGL("Iris", handle_grab_texture, enable_grab_texture, (void*) TEX_EYES_BAKED));
- menu->append(new LLMenuItemCallGL("Head", handle_grab_texture, enable_grab_texture, (void*) TEX_HEAD_BAKED));
- menu->append(new LLMenuItemCallGL("Upper Body", handle_grab_texture, enable_grab_texture, (void*) TEX_UPPER_BAKED));
- menu->append(new LLMenuItemCallGL("Lower Body", handle_grab_texture, enable_grab_texture, (void*) TEX_LOWER_BAKED));
- menu->append(new LLMenuItemCallGL("Skirt", handle_grab_texture, enable_grab_texture, (void*) TEX_SKIRT_BAKED));
- menu->append(new LLMenuItemCallGL("Hair", handle_grab_texture, enable_grab_texture, (void*) TEX_HAIR_BAKED));
- menu->createJumpKeys();
-}
+ U32 feature = feature_from_string( userdata.asString() );
+ bool new_value = false;
-void init_server_menu(LLMenuGL* menu)
-{
+ if ( feature != 0 )
{
- LLMenuGL* sub = new LLMenuGL("Object");
- menu->appendMenu(sub);
+ new_value = LLPipeline::toggleRenderDebugFeatureControl( (void*)feature );
+ }
- sub->append(new LLMenuItemCallGL( "Take Copy",
- &force_take_copy, &enable_god_customer_service, NULL,
- 'O', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
-#ifdef _CORY_TESTING
- sub->append(new LLMenuItemCallGL( "Export Copy",
- &force_export_copy, NULL, NULL));
- sub->append(new LLMenuItemCallGL( "Import Geometry",
- &force_import_geometry, NULL, NULL));
-#endif
- //sub->append(new LLMenuItemCallGL( "Force Public",
- // &handle_object_owner_none, NULL, NULL));
- //sub->append(new LLMenuItemCallGL( "Force Ownership/Permissive",
- // &handle_object_owner_self_and_permissive, NULL, NULL, 'K', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
- sub->append(new LLMenuItemCallGL( "Force Owner To Me",
- &handle_object_owner_self, &enable_god_customer_service));
- sub->append(new LLMenuItemCallGL( "Force Owner Permissive",
- &handle_object_owner_permissive, &enable_god_customer_service));
- //sub->append(new LLMenuItemCallGL( "Force Totally Permissive",
- // &handle_object_permissive));
- sub->append(new LLMenuItemCallGL( "Delete",
- &handle_force_delete, &enable_god_customer_service, NULL, KEY_DELETE, MASK_SHIFT | MASK_ALT | MASK_CONTROL));
- sub->append(new LLMenuItemCallGL( "Lock",
- &handle_object_lock, &enable_god_customer_service, NULL, 'L', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
- sub->append(new LLMenuItemCallGL( "Get Asset IDs",
- &handle_object_asset_ids, &enable_god_customer_service, NULL, 'I', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
- sub->createJumpKeys();
- }
- {
- LLMenuGL* sub = new LLMenuGL("Parcel");
- menu->appendMenu(sub);
-
- sub->append(new LLMenuItemCallGL("Owner To Me",
- &handle_force_parcel_owner_to_me,
- &enable_god_customer_service, NULL));
- sub->append(new LLMenuItemCallGL("Set to Linden Content",
- &handle_force_parcel_to_content,
- &enable_god_customer_service, NULL,
- 'C', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
- sub->appendSeparator();
- sub->append(new LLMenuItemCallGL("Claim Public Land",
- &handle_claim_public_land, &enable_god_customer_service));
-
- sub->createJumpKeys();
- }
- {
- LLMenuGL* sub = new LLMenuGL("Region");
- menu->appendMenu(sub);
- sub->append(new LLMenuItemCallGL("Dump Temp Asset Data",
- &handle_region_dump_temp_asset_data,
- &enable_god_customer_service, NULL));
- sub->createJumpKeys();
- }
- menu->append(new LLMenuItemCallGL( "God Tools...",
- &LLFloaterGodTools::show, &enable_god_basic, NULL));
-
- menu->appendSeparator();
-
- menu->append(new LLMenuItemCallGL("Save Region State",
- &LLPanelRegionTools::onSaveState, &enable_god_customer_service, NULL));
-
-// menu->append(new LLMenuItemCallGL("Force Join Group", handle_force_join_group));
-//
-// menu->appendSeparator();
-//
-// menu->append(new LLMenuItemCallGL( "OverlayTitle",
-// &handle_show_overlay_title, &enable_god_customer_service, NULL));
- menu->createJumpKeys();
+ return new_value;
}
+};
-static std::vector<LLPointer<view_listener_t> > sMenus;
-//-----------------------------------------------------------------------------
-// cleanup_menus()
-//-----------------------------------------------------------------------------
-void cleanup_menus()
+//////////////////
+// INFO DISPLAY //
+//////////////////
+U32 info_display_from_string(std::string info_display)
{
- delete gMenuParcelObserver;
- gMenuParcelObserver = NULL;
-
- delete gPieSelf;
- gPieSelf = NULL;
-
- delete gPieAvatar;
- gPieAvatar = NULL;
-
- delete gPieObject;
- gPieObject = NULL;
+ if ("verify" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_VERIFY;
+ }
+ else if ("bboxes" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_BBOXES;
+ }
+ else if ("points" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_POINTS;
+ }
+ else if ("octree" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_OCTREE;
+ }
+ else if ("shadow frusta" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA;
+ }
+ else if ("occlusion" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_OCCLUSION;
+ }
+ else if ("render batches" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_BATCH_SIZE;
+ }
+ else if ("texture anim" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_TEXTURE_ANIM;
+ }
+ else if ("texture priority" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_TEXTURE_PRIORITY;
+ }
+ else if ("shame" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_SHAME;
+ }
+ else if ("texture area" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_TEXTURE_AREA;
+ }
+ else if ("face area" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_FACE_AREA;
+ }
+ else if ("lights" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_LIGHTS;
+ }
+ else if ("particles" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_PARTICLES;
+ }
+ else if ("composition" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_COMPOSITION;
+ }
+ else if ("glow" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_GLOW;
+ }
+ else if ("collision skeleton" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_AVATAR_VOLUME;
+ }
+ else if ("agent target" == info_display)
+ {
+ return LLPipeline::RENDER_DEBUG_AGENT_TARGET;
+ }
+ else
+ {
+ return 0;
+ }
+};
+
+class LLAdvancedToggleInfoDisplay : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ U32 info_display = info_display_from_string( userdata.asString() );
+
+ if ( info_display != 0 )
+ {
+ LLPipeline::toggleRenderDebug( (void*)info_display );
+ }
+
+ return true;
+ }
+};
+
+
+class LLAdvancedCheckInfoDisplay : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ U32 info_display = info_display_from_string( userdata.asString() );
+ bool new_value = false;
+
+ if ( info_display != 0 )
+ {
+ new_value = LLPipeline::toggleRenderDebugControl( (void*)info_display );
+ }
+
+ return new_value;
+ }
+};
+
+
+///////////////////////////
+//// RANDOMIZE FRAMERATE //
+///////////////////////////
+
+
+class LLAdvancedToggleRandomizeFramerate : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ gRandomizeFramerate = !(gRandomizeFramerate);
+ return true;
+ }
+};
+
+class LLAdvancedCheckRandomizeFramerate : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = gRandomizeFramerate;
+ return new_value;
+ }
+};
+
+void run_vectorize_perf_test(void *)
+{
+ gSavedSettings.setBOOL("VectorizePerfTest", TRUE);
+}
+
+
+////////////////////////////////
+// RUN Vectorized Perform Test//
+////////////////////////////////
+
+
+class LLAdvancedVectorizePerfTest : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ run_vectorize_perf_test(NULL);
+ return true;
+ }
+};
+
+///////////////////////////
+//// PERIODIC SLOW FRAME //
+///////////////////////////
+
+
+class LLAdvancedTogglePeriodicSlowFrame : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ gPeriodicSlowFrame = !(gPeriodicSlowFrame);
+ return true;
+ }
+};
+
+class LLAdvancedCheckPeriodicSlowFrame : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = gPeriodicSlowFrame;
+ return new_value;
+ }
+};
+
+
+
+////////////////
+// FRAME TEST //
+////////////////
+
+
+class LLAdvancedToggleFrameTest : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLPipeline::sRenderFrameTest = !(LLPipeline::sRenderFrameTest);
+ return true;
+ }
+};
+
+class LLAdvancedCheckFrameTest : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLPipeline::sRenderFrameTest;
+ return new_value;
+ }
+};
+
+
+//
+/////////////////////////////
+//// HIDE SELECTED OBJECTS //
+/////////////////////////////
+//
+//
+//class LLAdvancedToggleHideSelectedObjects : public view_listener_t
+//{
+// bool handleEvent(const LLSD& userdata)
+// {
+// LLSelectMgr::sHideSelectedObjects = !(LLSelectMgr::sHideSelectedObjects);
+// return true;
+// }
+//};
+//
+//class LLAdvancedCheckHideSelectedObjects : public view_listener_t
+//{
+// bool handleEvent(const LLSD& userdata)
+// {
+// bool new_value = gHideSelectedObjects;
+// return new_value;
+// }
+//};
+
+///////////////////////////
+// SELECTED TEXTURE INFO //
+///////////////////////////
+
+
+class LLAdvancedSelectedTextureInfo : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_selected_texture_info(NULL);
+ return true;
+ }
+};
+
+//////////////////////
+// TOGGLE WIREFRAME //
+//////////////////////
+
+class LLAdvancedToggleWireframe : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ gUseWireframe = !(gUseWireframe);
+ return true;
+ }
+};
+
+class LLAdvancedCheckWireframe : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = gUseWireframe;
+ return new_value;
+ }
+};
+
+//////////////////////
+// DISABLE TEXTURES //
+//////////////////////
+
+class LLAdvancedToggleDisableTextures : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLViewerImage::sDontLoadVolumeTextures = !LLViewerImage::sDontLoadVolumeTextures;
+ return true;
+ }
+};
+
+class LLAdvancedCheckDisableTextures : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLViewerImage::sDontLoadVolumeTextures; // <-- make this using LLCacheControl
+ return new_value;
+ }
+};
+
+//////////////////////////
+// DUMP SCRIPTED CAMERA //
+//////////////////////////
+
+class LLAdvancedDumpScriptedCamera : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_dump_followcam(NULL);
+ return true;
+ }
+};
+
+
+
+//////////////////////////////
+// DUMP REGION OBJECT CACHE //
+//////////////////////////////
+
+
+class LLAdvancedDumpRegionObjectCache : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_dump_region_object_cache(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedWebBrowserTest : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_web_browser_test(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedBuyCurrencyTest : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_buy_currency_test(NULL);
+ return true;
+ }
+};
+
+
+////////////////////////
+// TOGGLE EDITABLE UI //
+////////////////////////
+
+
+class LLAdvancedToggleEditableUI : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ edit_ui(NULL);
+ return true;
+ }
+};
+
+
+/////////////////////
+// DUMP SELECT MGR //
+/////////////////////
+
+
+class LLAdvancedDumpSelectMgr : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ dump_select_mgr(NULL);
+ return true;
+ }
+};
+
+
+
+////////////////////
+// DUMP INVENTORY //
+////////////////////
+
+
+class LLAdvancedDumpInventory : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ dump_inventory(NULL);
+ return true;
+ }
+};
+
+
+
+///////////////////////
+// DUMP FOCUS HOLDER //
+///////////////////////
+
+
+class LLAdvancedDumpFocusHolder : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_dump_focus(NULL);
+ return true;
+ }
+};
+
+
+
+////////////////////////////////
+// PRINT SELECTED OBJECT INFO //
+////////////////////////////////
+
+
+class LLAdvancedPrintSelectedObjectInfo : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ print_object_info(NULL);
+ return true;
+ }
+};
+
+
+
+//////////////////////
+// PRINT AGENT INFO //
+//////////////////////
+
+
+class LLAdvancedPrintAgentInfo : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ print_agent_nvpairs(NULL);
+ return true;
+ }
+};
+
+
+
+////////////////////////////////
+// PRINT TEXTURE MEMORY STATS //
+////////////////////////////////
+
+
+class LLAdvancedPrintTextureMemoryStats : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ output_statistics(NULL);
+ return true;
+ }
+};
+
+//////////////////
+// DEBUG CLICKS //
+//////////////////
+
+
+class LLAdvancedToggleDebugClicks : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ gDebugClicks = !(gDebugClicks);
+ return true;
+ }
+};
+
+class LLAdvancedCheckDebugClicks : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = gDebugClicks;
+ return new_value;
+ }
+};
+
+
+
+/////////////////
+// DEBUG VIEWS //
+/////////////////
+
+
+class LLAdvancedToggleDebugViews : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLView::sDebugRects = !(LLView::sDebugRects);
+ return true;
+ }
+};
+
+class LLAdvancedCheckDebugViews : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLView::sDebugRects;
+ return new_value;
+ }
+};
+
+
+
+///////////////////////
+// XUI NAME TOOLTIPS //
+///////////////////////
+
+
+class LLAdvancedToggleXUINameTooltips : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ toggle_show_xui_names(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedCheckXUINameTooltips : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = check_show_xui_names(NULL);
+ return new_value;
+ }
+};
+
+
+
+////////////////////////
+// DEBUG MOUSE EVENTS //
+////////////////////////
+
+
+class LLAdvancedToggleDebugMouseEvents : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLView::sDebugMouseHandling = !(LLView::sDebugMouseHandling);
+ return true;
+ }
+};
+
+class LLAdvancedCheckDebugMouseEvents : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLView::sDebugMouseHandling;
+ return new_value;
+ }
+};
+
+
+
+////////////////
+// DEBUG KEYS //
+////////////////
+
+
+class LLAdvancedToggleDebugKeys : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLView::sDebugKeys = !(LLView::sDebugKeys);
+ return true;
+ }
+};
+
+class LLAdvancedCheckDebugKeys : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLView::sDebugKeys;
+ return new_value;
+ }
+};
+
+
+
+///////////////////////
+// DEBUG WINDOW PROC //
+///////////////////////
+
+
+class LLAdvancedToggleDebugWindowProc : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ gDebugWindowProc = !(gDebugWindowProc);
+ return true;
+ }
+};
+
+class LLAdvancedCheckDebugWindowProc : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = gDebugWindowProc;
+ return new_value;
+ }
+};
+
+// ------------------------------XUI MENU ---------------------------
+
+
+class LLAdvancedShowFontTest : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLFloaterFontTest::show(NULL);
+ return true;
+ }
+};
+
+//////////////////////
+// LOAD UI FROM XML //
+//////////////////////
+
+
+class LLAdvancedLoadUIFromXML : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_load_from_xml(NULL);
+ return true;
+ }
+};
+
+
+
+////////////////////
+// SAVE UI TO XML //
+////////////////////
+
+
+class LLAdvancedSaveUIToXML : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_save_to_xml(NULL);
+ return true;
+ }
+};
+
+
+
+///////////////
+// XUI NAMES //
+///////////////
+
+
+class LLAdvancedToggleXUINames : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ toggle_show_xui_names(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedCheckXUINames : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = check_show_xui_names(NULL);
+ return new_value;
+ }
+};
+
+
+////////////////////////
+// GRAB BAKED TEXTURE //
+////////////////////////
+
+
+class LLAdvancedGrabBakedTexture : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ std::string texture_type = userdata.asString();
+ if ("iris" == texture_type)
+ {
+ handle_grab_texture( (void*)TEX_EYES_BAKED );
+ }
+ else if ("head" == texture_type)
+ {
+ handle_grab_texture( (void*)TEX_HEAD_BAKED );
+ }
+ else if ("upper" == texture_type)
+ {
+ handle_grab_texture( (void*)TEX_UPPER_BAKED );
+ }
+ else if ("lower" == texture_type)
+ {
+ handle_grab_texture( (void*)TEX_SKIRT_BAKED );
+ }
+ else if ("skirt" == texture_type)
+ {
+ handle_grab_texture( (void*)TEX_SKIRT_BAKED );
+ }
+ else if ("hair" == texture_type)
+ {
+ handle_grab_texture( (void*)TEX_HAIR_BAKED );
+ }
+
+ return true;
+ }
+};
+
+class LLAdvancedEnableGrabBakedTexture : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ std::string texture_type = userdata.asString();
+ bool new_value = false;
+
+ if ("iris" == texture_type)
+ {
+ new_value = enable_grab_texture( (void*)TEX_EYES_BAKED );
+ }
+ else if ("head" == texture_type)
+ {
+ new_value = enable_grab_texture( (void*)TEX_HEAD_BAKED );
+ }
+ else if ("upper" == texture_type)
+ {
+ new_value = enable_grab_texture( (void*)TEX_UPPER_BAKED );
+ }
+ else if ("lower" == texture_type)
+ {
+ new_value = enable_grab_texture( (void*)TEX_LOWER_BAKED );
+ }
+ else if ("skirt" == texture_type)
+ {
+ new_value = enable_grab_texture( (void*)TEX_SKIRT_BAKED );
+ }
+
+ return new_value;
+ }
+};
+
+///////////////////////
+// APPEARANCE TO XML //
+///////////////////////
+
+
+class LLAdvancedAppearanceToXML : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLVOAvatar::dumpArchetypeXML(NULL);
+ return true;
+ }
+};
+
+
+
+///////////////////////////////
+// TOGGLE CHARACTER GEOMETRY //
+///////////////////////////////
+
+
+class LLAdvancedToggleCharacterGeometry : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_god_request_avatar_geometry(NULL);
+ return true;
+ }
+};
+
+class LLEnableGodCustomerService : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = enable_god_customer_service(NULL);
+ return new_value;
+ }
+};
+
+
+
+/////////////////////////////
+// TEST MALE / TEST FEMALE //
+/////////////////////////////
+
+class LLAdvancedTestMale : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_test_male(NULL);
+ return true;
+ }
+};
+
+
+class LLAdvancedTestFemale : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_test_female(NULL);
+ return true;
+ }
+};
+
+
+
+///////////////
+// TOGGLE PG //
+///////////////
+
+
+class LLAdvancedTogglePG : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_toggle_pg(NULL);
+ return true;
+ }
+};
+
+
+
+////////////////////////////
+// ALLOW TAP-TAP-HOLD RUN //
+////////////////////////////
+
+
+class LLAdvancedToggleAllowTapTapHoldRun : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ gAllowTapTapHoldRun = !(gAllowTapTapHoldRun);
+ return true;
+ }
+};
+
+class LLAdvancedCheckAllowTapTapHoldRun : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = gAllowTapTapHoldRun;
+ return new_value;
+ }
+};
+
+
+
+
+
+class LLAdvancedForceParamsToDefault : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLAgent::clearVisualParams(NULL);
+ return true;
+ }
+};
+
+
+
+//////////////////////////
+// RELOAD VERTEX SHADER //
+//////////////////////////
+
+
+class LLAdvancedReloadVertexShader : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ reload_vertex_shader(NULL);
+ return true;
+ }
+};
+
+
+
+////////////////////
+// ANIMATION INFO //
+////////////////////
+
+
+class LLAdvancedToggleAnimationInfo : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLVOAvatar::sShowAnimationDebug = !(LLVOAvatar::sShowAnimationDebug);
+ return true;
+ }
+};
+
+class LLAdvancedCheckAnimationInfo : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLVOAvatar::sShowAnimationDebug;
+ return new_value;
+ }
+};
+
+
+//////////////////
+// SHOW LOOK AT //
+//////////////////
+
+
+class LLAdvancedToggleShowLookAt : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLHUDEffectLookAt::sDebugLookAt = !(LLHUDEffectLookAt::sDebugLookAt);
+ return true;
+ }
+};
+
+class LLAdvancedCheckShowLookAt : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLHUDEffectLookAt::sDebugLookAt;
+ return new_value;
+ }
+};
+
+
+
+///////////////////
+// SHOW POINT AT //
+///////////////////
+
+
+class LLAdvancedToggleShowPointAt : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLHUDEffectPointAt::sDebugPointAt = !(LLHUDEffectPointAt::sDebugPointAt);
+ return true;
+ }
+};
+
+class LLAdvancedCheckShowPointAt : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLHUDEffectPointAt::sDebugPointAt;
+ return new_value;
+ }
+};
+
+
+
+/////////////////////////
+// DEBUG JOINT UPDATES //
+/////////////////////////
+
+
+class LLAdvancedToggleDebugJointUpdates : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLVOAvatar::sJointDebug = !(LLVOAvatar::sJointDebug);
+ return true;
+ }
+};
+
+class LLAdvancedCheckDebugJointUpdates : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLVOAvatar::sJointDebug;
+ return new_value;
+ }
+};
+
+
+
+/////////////////
+// DISABLE LOD //
+/////////////////
+
+
+class LLAdvancedToggleDisableLOD : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLViewerJoint::sDisableLOD = !(LLViewerJoint::sDisableLOD);
+ return true;
+ }
+};
+
+class LLAdvancedCheckDisableLOD : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLViewerJoint::sDisableLOD;
+ return new_value;
+ }
+};
+
+
+
+/////////////////////////
+// DEBUG CHARACTER VIS //
+/////////////////////////
+
+
+class LLAdvancedToggleDebugCharacterVis : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLVOAvatar::sDebugInvisible = !(LLVOAvatar::sDebugInvisible);
+ return true;
+ }
+};
+
+class LLAdvancedCheckDebugCharacterVis : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLVOAvatar::sDebugInvisible;
+ return new_value;
+ }
+};
+
+
+//////////////////////
+// DUMP ATTACHMENTS //
+//////////////////////
+
+
+class LLAdvancedDumpAttachments : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_dump_attachments(NULL);
+ return true;
+ }
+};
+
+
+
+/////////////////////
+// REBAKE TEXTURES //
+/////////////////////
+
+
+class LLAdvancedRebakeTextures : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_rebake_textures(NULL);
+ return true;
+ }
+};
+
+
+#ifndef LL_RELEASE_FOR_DOWNLOAD
+///////////////////////////
+// DEBUG AVATAR TEXTURES //
+///////////////////////////
+
+
+class LLAdvancedDebugAvatarTextures : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_debug_avatar_textures(NULL);
+ return true;
+ }
+};
+
+////////////////////////////////
+// DUMP AVATAR LOCAL TEXTURES //
+////////////////////////////////
+
+
+class LLAdvancedDumpAvatarLocalTextures : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_dump_avatar_local_textures(NULL);
+ return true;
+ }
+};
+
+////////////////////////////////
+// Memory Leaking Simulation //
+////////////////////////////////
+class LLAdvancedMemoryLeakingSimulation : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLFloaterMemLeak::show(NULL);
+ return true;
+ }
+};
+
+#endif
+
+/////////////////
+// MESSAGE LOG //
+/////////////////
+
+
+class LLAdvancedEnableMessageLog : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_viewer_enable_message_log(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedDisableMessageLog : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_viewer_disable_message_log(NULL);
+ return true;
+ }
+};
+
+/////////////////
+// DROP PACKET //
+/////////////////
+
+
+class LLAdvancedDropPacket : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ gMessageSystem->mPacketRing.dropPackets(1);
+ return true;
+ }
+};
+
+
+
+/////////////////
+// AGENT PILOT //
+/////////////////
+
+
+class LLAdvancedAgentPilot : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ std::string command = userdata.asString();
+ if ("start playback" == command)
+ {
+ LLAgentPilot::startPlayback(NULL);
+ }
+ else if ("stop playback" == command)
+ {
+ LLAgentPilot::stopPlayback(NULL);
+ }
+ else if ("start record" == command)
+ {
+ LLAgentPilot::startRecord(NULL);
+ }
+ else if ("stop record" == command)
+ {
+ LLAgentPilot::saveRecord(NULL);
+ }
+
+ return true;
+ }
+};
+
+
+
+//////////////////////
+// AGENT PILOT LOOP //
+//////////////////////
+
+
+class LLAdvancedToggleAgentPilotLoop : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLAgentPilot::sLoop = !(LLAgentPilot::sLoop);
+ return true;
+ }
+};
+
+class LLAdvancedCheckAgentPilotLoop : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = LLAgentPilot::sLoop;
+ return new_value;
+ }
+};
+
+
+/////////////////////////
+// SHOW OBJECT UPDATES //
+/////////////////////////
+
+
+class LLAdvancedToggleShowObjectUpdates : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ gShowObjectUpdates = !(gShowObjectUpdates);
+ return true;
+ }
+};
+
+class LLAdvancedCheckShowObjectUpdates : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = gShowObjectUpdates;
+ return new_value;
+ }
+};
+
+
+
+////////////////////
+// COMPRESS IMAGE //
+////////////////////
+
+
+class LLAdvancedCompressImage : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_compress_image(NULL);
+ return true;
+ }
+};
+
+
+
+/////////////////////////
+// SHOW DEBUG SETTINGS //
+/////////////////////////
+
+
+class LLAdvancedShowDebugSettings : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLFloaterSettingsDebug::showInstance(userdata);
+ return true;
+ }
+};
+
+
+
+////////////////////////
+// VIEW ADMIN OPTIONS //
+////////////////////////
+
+
+class LLAdvancedToggleViewAdminOptions : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_admin_override_toggle(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedCheckViewAdminOptions : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = check_admin_override(NULL);
+ return new_value;
+ }
+};
+
+/////////////////////////////////////
+// Enable Object Object Occlusion ///
+/////////////////////////////////////
+class LLAdvancedEnableObjectObjectOcclusion: public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+
+ bool new_value = gGLManager.mHasOcclusionQuery && LLFeatureManager::getInstance()->isFeatureAvailable(userdata.asString());
+ return new_value;
+ }
+};
+
+
+
+//////////////////
+// ADMIN STATUS //
+//////////////////
+
+
+class LLAdvancedRequestAdminStatus : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_god_mode(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedLeaveAdminStatus : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_leave_god_mode(NULL);
+ return true;
+ }
+};
+
+//////////////////////////
+// Advanced > Debugging //
+//////////////////////////
+
+
+class LLAdvancedForceErrorBreakpoint : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ force_error_breakpoint(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedForceErrorLlerror : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ force_error_llerror(NULL);
+ return true;
+ }
+};
+class LLAdvancedForceErrorBadMemoryAccess : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ force_error_bad_memory_access(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedForceErrorInfiniteLoop : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ force_error_infinite_loop(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedForceErrorSoftwareException : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ force_error_software_exception(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedForceErrorDriverCrash : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ force_error_driver_crash(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedForceErrorDisconnectViewer : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_disconnect_viewer(NULL);
+ return true;
+ }
+};
+
+
+#ifdef TOGGLE_HACKED_GODLIKE_VIEWER
+
+class LLAdvancedHandleToggleHackedGodmode : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_toggle_hacked_godmode(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedCheckToggleHackedGodmode : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ check_toggle_hacked_godmode(NULL);
+ return true;
+ }
+};
+
+class LLAdvancedEnableToggleHackedGodmode : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = enable_toggle_hacked_godmode(NULL);
+ return new_value;
+ }
+};
+#endif
+
+
+//
+////-------------------------------------------------------------------
+//// Advanced menu
+////-------------------------------------------------------------------
+
+//////////////////
+// ADMIN MENU //
+//////////////////
+
+// Admin > Object
+class LLAdminForceTakeCopy : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ force_take_copy(NULL);
+ return true;
+ }
+};
+
+class LLAdminHandleObjectOwnerSelf : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_object_owner_self(NULL);
+ return true;
+ }
+};
+class LLAdminHandleObjectOwnerPermissive : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_object_owner_permissive(NULL);
+ return true;
+ }
+};
+
+class LLAdminHandleForceDelete : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_force_delete(NULL);
+ return true;
+ }
+};
+
+class LLAdminHandleObjectLock : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_object_lock(NULL);
+ return true;
+ }
+};
+
+class LLAdminHandleObjectAssetIDs: public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_object_asset_ids(NULL);
+ return true;
+ }
+};
+
+//Admin >Parcel
+class LLAdminHandleForceParcelOwnerToMe: public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_force_parcel_owner_to_me(NULL);
+ return true;
+ }
+};
+class LLAdminHandleForceParcelToContent: public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_force_parcel_to_content(NULL);
+ return true;
+ }
+};
+class LLAdminHandleClaimPublicLand: public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_claim_public_land(NULL);
+ return true;
+ }
+};
+
+// Admin > Region
+class LLAdminHandleRegionDumpTempAssetData: public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ handle_region_dump_temp_asset_data(NULL);
+ return true;
+ }
+};
+//Admin (Top Level)
+class LLAdminShowGodTools: public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLFloaterGodTools::showInstance(LLSD());
+ return true;
+ }
+};
+
+class LLAdminOnSaveState: public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLPanelRegionTools::onSaveState(NULL);
+ return true;
+ }
+};
+
+
+//-----------------------------------------------------------------------------
+// cleanup_menus()
+//-----------------------------------------------------------------------------
+void cleanup_menus()
+{
+ delete gMenuParcelObserver;
+ gMenuParcelObserver = NULL;
+
+ delete gPieSelf;
+ gPieSelf = NULL;
+
+ delete gPieAvatar;
+ gPieAvatar = NULL;
+
+ delete gPieObject;
+ gPieObject = NULL;
delete gPieAttachment;
gPieAttachment = NULL;
@@ -1499,8 +2453,6 @@ void cleanup_menus()
delete gMenuHolder;
gMenuHolder = NULL;
-
- sMenus.clear();
}
//-----------------------------------------------------------------------------
@@ -1509,7 +2461,7 @@ void cleanup_menus()
class LLObjectReportAbuse : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (objectp)
@@ -1523,17 +2475,16 @@ class LLObjectReportAbuse : public view_listener_t
// Enabled it you clicked an object
class LLObjectEnableReportAbuse : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLSelectMgr::getInstance()->getSelection()->getObjectCount() != 0;
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLObjectTouch : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (!object) return true;
@@ -1584,11 +2535,10 @@ class LLObjectTouch : public view_listener_t
// One object must have touch sensor
class LLObjectEnableTouch : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
bool new_value = obj && obj->flagHandleTouch();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
// Update label based on the node touch name if available.
LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
@@ -1598,25 +2548,25 @@ class LLObjectEnableTouch : public view_listener_t
}
else
{
- gMenuHolder->childSetText("Object Touch", userdata["data"].asString());
+ gMenuHolder->childSetText("Object Touch", userdata.asString());
}
- return true;
+ return new_value;
}
};
-void label_touch(std::string& label, void*)
-{
- LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
- if (node && node->mValid && !node->mTouchName.empty())
- {
- label.assign(node->mTouchName);
- }
- else
- {
- label.assign("Touch");
- }
-}
+//void label_touch(std::string& label, void*)
+//{
+// LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
+// if (node && node->mValid && !node->mTouchName.empty())
+// {
+// label.assign(node->mTouchName);
+// }
+// else
+// {
+// label.assign("Touch");
+// }
+//}
bool handle_object_open()
{
@@ -1629,7 +2579,7 @@ bool handle_object_open()
class LLObjectOpen : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
return handle_object_open();
}
@@ -1637,7 +2587,7 @@ class LLObjectOpen : public view_listener_t
class LLObjectEnableOpen : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// Look for contents in root object, which is all the LLFloaterOpenObject
// understands.
@@ -1649,96 +2599,14 @@ class LLObjectEnableOpen : public view_listener_t
if (!root) new_value = false;
else new_value = root->allowOpen();
}
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
- }
-};
-
-
-class LLViewCheckBuildMode : public view_listener_t
-{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
- {
- bool new_value = LLToolMgr::getInstance()->inEdit();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
- }
-};
-
-bool toggle_build_mode()
-{
- if (LLToolMgr::getInstance()->inBuildMode())
- {
- if (gSavedSettings.getBOOL("EditCameraMovement"))
- {
- // just reset the view, will pull us out of edit mode
- handle_reset_view();
- }
- else
- {
- // manually disable edit mode, but do not affect the camera
- gAgent.resetView(false);
- gFloaterTools->close();
- gViewerWindow->showCursor();
- }
- // avoid spurious avatar movements pulling out of edit mode
- LLViewerJoystick::getInstance()->setNeedsReset();
- }
- else
- {
- ECameraMode camMode = gAgent.getCameraMode();
- if (CAMERA_MODE_MOUSELOOK == camMode || CAMERA_MODE_CUSTOMIZE_AVATAR == camMode)
- {
- // pull the user out of mouselook or appearance mode when entering build mode
- handle_reset_view();
- }
-
- if (gSavedSettings.getBOOL("EditCameraMovement"))
- {
- // camera should be set
- if (LLViewerJoystick::getInstance()->getOverrideCamera())
- {
- handle_toggle_flycam();
- }
-
- if (gAgent.getFocusOnAvatar())
- {
- // zoom in if we're looking at the avatar
- gAgent.setFocusOnAvatar(FALSE, ANIMATE);
- gAgent.setFocusGlobal(gAgent.getPositionGlobal() + 2.0 * LLVector3d(gAgent.getAtAxis()));
- gAgent.cameraZoomIn(0.666f);
- gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
- }
- }
-
-
- LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
- LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCompCreate::getInstance() );
-
- // Could be first use
- LLFirstUse::useBuild();
-
- gAgent.resetView(false);
-
- // avoid spurious avatar movements
- LLViewerJoystick::getInstance()->setNeedsReset();
-
- }
- return true;
-}
-
-class LLViewBuildMode : public view_listener_t
-{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
- {
- return toggle_build_mode();
+ return new_value;
}
};
class LLViewJoystickFlycam : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
handle_toggle_flycam();
return true;
@@ -1747,31 +2615,13 @@ class LLViewJoystickFlycam : public view_listener_t
class LLViewCheckJoystickFlycam : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
- {
- bool new_val = LLViewerJoystick::getInstance()->getOverrideCamera();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_val);
- return true;
- }
-};
-
-class LLViewCommunicate : public view_listener_t
-{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
- if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
- {
- LLFloaterMyFriends::toggleInstance();
- }
- else
- {
- LLFloaterChatterBox::toggleInstance();
- }
- return true;
+ bool new_value = LLViewerJoystick::getInstance()->getOverrideCamera();
+ return new_value;
}
};
-
void handle_toggle_flycam()
{
LLViewerJoystick::getInstance()->toggleFlycam();
@@ -1779,7 +2629,7 @@ void handle_toggle_flycam()
class LLObjectBuild : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if (gAgent.getFocusOnAvatar() && !LLToolMgr::getInstance()->inEdit() && gSavedSettings.getBOOL("EditCameraMovement") )
{
@@ -1807,7 +2657,7 @@ class LLObjectBuild : public view_listener_t
class LLObjectEdit : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLViewerParcelMgr::getInstance()->deselectLand();
@@ -1830,15 +2680,15 @@ class LLObjectEdit : public view_listener_t
{
// zoom in on object center instead of where we clicked, as we need to see the manipulator handles
gAgent.setFocusGlobal(selected_objectp->getPositionGlobal(), selected_objectp->getID());
- gAgent.cameraZoomIn(0.666f);
- gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
- gViewerWindow->moveCursorToCenter();
+ gAgent.cameraZoomIn(0.666f);
+ gAgent.cameraOrbitOver( 30.f * DEG_TO_RAD );
+ gViewerWindow->moveCursorToCenter();
+ }
}
}
- }
- gFloaterTools->open(); /* Flawfinder: ignore */
-
+ LLFloaterReg::showInstance("build");
+
LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
gFloaterTools->setEditTool( LLToolCompTranslate::getInstance() );
@@ -1853,7 +2703,7 @@ class LLObjectEdit : public view_listener_t
class LLObjectInspect : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLFloaterInspect::show();
return true;
@@ -1866,7 +2716,7 @@ class LLObjectInspect : public view_listener_t
//---------------------------------------------------------------------------
class LLLandBuild : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLViewerParcelMgr::getInstance()->deselectLand();
@@ -1898,7 +2748,7 @@ class LLLandBuild : public view_listener_t
class LLLandBuyPass : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLPanelLandGeneral::onClickBuyPass((void *)FALSE);
return true;
@@ -1907,11 +2757,10 @@ class LLLandBuyPass : public view_listener_t
class LLLandEnableBuyPass : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLPanelLandGeneral::enableBuyPass(NULL);
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
@@ -1947,7 +2796,7 @@ BOOL enable_object_build(void*)
class LLEnableEdit : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// *HACK: The new "prelude" Help Islands have a build sandbox area,
// so users need the Edit and Create pie menu options when they are
@@ -1960,14 +2809,13 @@ class LLEnableEdit : public view_listener_t
enable = LLViewerParcelMgr::getInstance()->agentCanBuild()
|| LLSelectMgr::getInstance()->getSelection()->isAttachment();
}
- gMenuHolder->findControl(userdata["control"].asString())->setValue(enable);
- return true;
+ return enable;
}
};
class LLSelfRemoveAllAttachments : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLAgent::userRemoveAllAttachments(NULL);
return true;
@@ -1976,14 +2824,14 @@ class LLSelfRemoveAllAttachments : public view_listener_t
class LLSelfEnableRemoveAllAttachments : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = false;
if (gAgent.getAvatarObject())
{
LLVOAvatar* avatarp = gAgent.getAvatarObject();
for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin();
- iter != avatarp->mAttachmentPoints.end(); )
+ iter != avatarp->mAttachmentPoints.end(); )
{
LLVOAvatar::attachment_map_t::iterator curiter = iter++;
LLViewerJointAttachment* attachment = curiter->second;
@@ -1994,8 +2842,7 @@ class LLSelfEnableRemoveAllAttachments : public view_listener_t
}
}
}
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
@@ -2008,19 +2855,19 @@ BOOL enable_has_attachments(void*)
//---------------------------------------------------------------------------
// Avatar pie menu
//---------------------------------------------------------------------------
-void handle_follow(void *userdata)
-{
- // follow a given avatar by ID
- LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
- if (objectp)
- {
- gAgent.startFollowPilot(objectp->getID());
- }
-}
+//void handle_follow(void *userdata)
+//{
+// // follow a given avatar by ID
+// LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+// if (objectp)
+// {
+// gAgent.startFollowPilot(objectp->getID());
+// }
+//}
class LLObjectEnableMute : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
bool new_value = (object != NULL);
@@ -2036,18 +2883,17 @@ class LLObjectEnableMute : public view_listener_t
new_value = !is_linden && !is_self;
}
}
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLObjectMute : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (!object) return true;
-
+
LLUUID id;
std::string name;
LLMute::EType type;
@@ -2064,7 +2910,7 @@ class LLObjectMute : public view_listener_t
name += " ";
name += lastname->getString();
}
-
+
type = LLMute::AGENT;
}
else
@@ -2077,10 +2923,10 @@ class LLObjectMute : public view_listener_t
{
name = node->mName;
}
-
+
type = LLMute::OBJECT;
}
-
+
LLMute mute(id, name, type);
if (LLMuteList::getInstance()->isMuted(mute.mID, mute.mName))
{
@@ -2091,7 +2937,7 @@ class LLObjectMute : public view_listener_t
LLMuteList::getInstance()->add(mute);
LLFloaterMute::showInstance();
}
-
+
return true;
}
};
@@ -2129,12 +2975,26 @@ bool handle_go_to()
class LLGoToObject : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
return handle_go_to();
}
};
+class LLAvatarReportAbuse : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
+ if(avatar)
+ {
+ LLFloaterReporter::showFromObject(avatar->getID());
+ }
+ return true;
+ }
+};
+
+
//---------------------------------------------------------------------------
// Parcel freeze, eject, etc.
//---------------------------------------------------------------------------
@@ -2173,7 +3033,7 @@ bool callback_freeze(const LLSD& notification, const LLSD& response)
class LLAvatarFreeze : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if( avatar )
@@ -2205,27 +3065,23 @@ class LLAvatarFreeze : public view_listener_t
class LLAvatarVisibleDebug : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
- bool new_value = gAgent.isGodlike();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return gAgent.isGodlike();
}
};
class LLAvatarEnableDebug : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
- bool new_value = gAgent.isGodlike();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return gAgent.isGodlike();
}
};
class LLAvatarDebug : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if( avatar )
@@ -2298,7 +3154,7 @@ bool callback_eject(const LLSD& notification, const LLSD& response)
class LLAvatarEject : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if( avatar )
@@ -2357,7 +3213,7 @@ class LLAvatarEject : public view_listener_t
class LLAvatarEnableFreezeEject : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
bool new_value = (avatar != NULL);
@@ -2380,14 +3236,13 @@ class LLAvatarEnableFreezeEject : public view_listener_t
}
}
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLAvatarGiveCard : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
llinfos << "handle_give_card()" << llendl;
LLViewerObject* dest = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
@@ -2442,7 +3297,7 @@ void login_done(S32 which, void *user)
{
llinfos << "Login done " << which << llendl;
- LLPanelLogin::close();
+ LLPanelLogin::closePanel();
}
@@ -2464,33 +3319,23 @@ bool callback_leave_group(const LLSD& notification, const LLSD& response)
return false;
}
-void handle_leave_group(void *)
-{
- if (gAgent.getGroupID() != LLUUID::null)
- {
- LLSD args;
- args["GROUP"] = gAgent.mGroupName;
- LLNotifications::instance().add("GroupLeaveConfirmMember", args, LLSD(), callback_leave_group);
- }
-}
-
void append_aggregate(std::string& string, const LLAggregatePermissions& ag_perm, PermissionBit bit, const char* txt)
{
LLAggregatePermissions::EValue val = ag_perm.getValue(bit);
std::string buffer;
switch(val)
{
- case LLAggregatePermissions::AP_NONE:
+ case LLAggregatePermissions::AP_NONE:
buffer = llformat( "* %s None\n", txt);
break;
- case LLAggregatePermissions::AP_SOME:
+ case LLAggregatePermissions::AP_SOME:
buffer = llformat( "* %s Some\n", txt);
break;
- case LLAggregatePermissions::AP_ALL:
+ case LLAggregatePermissions::AP_ALL:
buffer = llformat( "* %s All\n", txt);
break;
- case LLAggregatePermissions::AP_EMPTY:
- default:
+ case LLAggregatePermissions::AP_EMPTY:
+ default:
break;
}
string.append(buffer);
@@ -2498,32 +3343,31 @@ void append_aggregate(std::string& string, const LLAggregatePermissions& ag_perm
BOOL enable_buy(void*)
{
- // In order to buy, there must only be 1 purchaseable object in
- // the selection manger.
+ // In order to buy, there must only be 1 purchaseable object in
+ // the selection manger.
if(LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() != 1) return FALSE;
- LLViewerObject* obj = NULL;
- LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
+ LLViewerObject* obj = NULL;
+ LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
if(node)
- {
- obj = node->getObject();
- if(!obj) return FALSE;
+ {
+ obj = node->getObject();
+ if(!obj) return FALSE;
if(node->mSaleInfo.isForSale() && node->mPermissions->getMaskOwner() & PERM_TRANSFER &&
(node->mPermissions->getMaskOwner() & PERM_COPY || node->mSaleInfo.getSaleType() != LLSaleInfo::FS_COPY))
{
if(obj->permAnyOwner()) return TRUE;
}
- }
+ }
return FALSE;
}
class LLObjectEnableBuy : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = enable_buy(NULL);
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
@@ -2557,7 +3401,7 @@ void handle_buy_object(LLSaleInfo sale_info)
}
S32 price = sale_info.getSalePrice();
-
+
if (price > 0 && price > gStatusBar->getBalance())
{
LLFloaterBuyCurrency::buyCurrency("This object costs", price);
@@ -2641,7 +3485,7 @@ void handle_dump_focus(void *)
class LLSelfStandUp : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
return true;
@@ -2650,11 +3494,10 @@ class LLSelfStandUp : public view_listener_t
class LLSelfEnableStandUp : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = gAgent.getAvatarObject() && gAgent.getAvatarObject()->mIsSitting;
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
@@ -2698,13 +3541,13 @@ void set_god_level(U8 god_level)
// inventory in items may change in god mode
gObjectList.dirtyAllObjectInventory();
- if(gViewerWindow)
- {
- gViewerWindow->setMenuBackgroundColor(god_level > GOD_NOT,
- LLViewerLogin::getInstance()->isInProductionGrid());
- }
-
- LLSD args;
+ if(gViewerWindow)
+ {
+ gViewerWindow->setMenuBackgroundColor(god_level > GOD_NOT,
+ LLViewerLogin::getInstance()->isInProductionGrid());
+ }
+
+ LLSD args;
if(god_level > GOD_NOT)
{
args["LEVEL"] = llformat("%d",(S32)god_level);
@@ -2716,7 +3559,6 @@ void set_god_level(U8 god_level)
LLNotifications::instance().add("LeavingGodMode", args);
}
-
// changing god-level can affect which menus we see
show_debug_menus();
}
@@ -2732,6 +3574,11 @@ BOOL check_toggle_hacked_godmode(void*)
{
return gHackGodmode;
}
+
+bool enable_toggle_hacked_godmode(void*)
+{
+ return !LLViewerLogin::getInstance()->isInProductionGrid();
+}
#endif
void process_grant_godlike_powers(LLMessageSystem* msg, void**)
@@ -2800,35 +3647,15 @@ BOOL is_agent_mappable(const LLUUID& agent_id)
);
}
-// Enable a menu item when you have someone's card.
-/*
-BOOL enable_have_card(void *userdata)
-{
- LLUUID* avatar_id = (LLUUID *)userdata;
- if (gAgent.isGodlike())
- {
- return TRUE;
- }
- else if(avatar_id)
- {
- return is_agent_friend(*avatar_id);
- }
- else
- {
- return FALSE;
- }
-}
-*/
// Enable a menu item when you don't have someone's card.
class LLAvatarEnableAddFriend : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
bool new_value = avatar && !is_agent_friend(avatar->getID());
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
@@ -2863,11 +3690,10 @@ void request_friendship(const LLUUID& dest_id)
class LLEditEnableCustomizeAvatar : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = gAgent.areWearablesLoaded();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
@@ -2891,6 +3717,7 @@ bool handle_sit_or_stand()
if (object && object->getPCode() == LL_PCODE_VOLUME)
{
+
gMessageSystem->newMessageFast(_PREHASH_AgentRequestSit);
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@@ -2906,7 +3733,7 @@ bool handle_sit_or_stand()
class LLObjectSitOrStand : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
return handle_sit_or_stand();
}
@@ -2926,13 +3753,13 @@ void near_sit_down_point(BOOL success, void *)
class LLLandSit : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
LLViewerParcelMgr::getInstance()->deselectLand();
LLVector3d posGlobal = LLToolPie::getInstance()->getPick().mPosGlobal;
-
+
LLQuaternion target_rot;
if (gAgent.getAvatarObject())
{
@@ -2947,136 +3774,50 @@ class LLLandSit : public view_listener_t
}
};
-void show_permissions_control(void*)
-{
- LLFloaterPermissionsMgr* floaterp = LLFloaterPermissionsMgr::show();
- floaterp->mPermissions->addPermissionsData("foo1", LLUUID::null, 0);
- floaterp->mPermissions->addPermissionsData("foo2", LLUUID::null, 0);
- floaterp->mPermissions->addPermissionsData("foo3", LLUUID::null, 0);
-}
-
-
-class LLCreateLandmarkCallback : public LLInventoryCallback
-{
-public:
- /*virtual*/ void fire(const LLUUID& inv_item)
- {
- llinfos << "Created landmark with inventory id " << inv_item
- << llendl;
- }
-};
-
-void reload_ui(void *)
-{
- LLUICtrlFactory::getInstance()->rebuild();
-}
-
-class LLWorldFly : public view_listener_t
-{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
- {
- gAgent.toggleFlying();
- return true;
- }
-};
-
-class LLWorldEnableFly : public view_listener_t
-{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
- {
- BOOL sitting = FALSE;
- if (gAgent.getAvatarObject())
- {
- sitting = gAgent.getAvatarObject()->mIsSitting;
- }
- gMenuHolder->findControl(userdata["control"].asString())->setValue(!sitting);
- return true;
- }
-};
-
-
-void handle_agent_stop_moving(void*)
-{
- // stop agent
- gAgent.setControlFlags(AGENT_CONTROL_STOP);
-
- // cancel autopilot
- gAgent.stopAutoPilot();
-}
-
-void print_packets_lost(void*)
-{
- LLWorld::getInstance()->printPacketsLost();
-}
-
-
-void drop_packet(void*)
-{
- gMessageSystem->mPacketRing.dropPackets(1);
-}
-
-
-void velocity_interpolate( void* data )
-{
- BOOL toggle = gSavedSettings.getBOOL("VelocityInterpolate");
- LLMessageSystem* msg = gMessageSystem;
- if ( !toggle )
- {
- msg->newMessageFast(_PREHASH_VelocityInterpolateOn);
- msg->nextBlockFast(_PREHASH_AgentData);
- msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
- msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
- gAgent.sendReliableMessage();
- llinfos << "Velocity Interpolation On" << llendl;
- }
- else
- {
- msg->newMessageFast(_PREHASH_VelocityInterpolateOff);
- msg->nextBlockFast(_PREHASH_AgentData);
- msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
- msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
- gAgent.sendReliableMessage();
- llinfos << "Velocity Interpolation Off" << llendl;
- }
- // BUG this is a hack because of the change in menu behavior. The
- // old menu system would automatically change a control's value,
- // but the new LLMenuGL system doesn't know what a control
- // is. However, it's easy to distinguish between the two callers
- // because LLMenuGL passes in the name of the user data (the
- // control name) to the callback function, and the user data goes
- // unused in the old menu code. Thus, if data is not null, then we
- // need to swap the value of the control.
- if( data )
- {
- gSavedSettings.setBOOL( static_cast<char*>(data), !toggle );
- }
-}
-
-
-void toggle_wind_audio(void)
-{
- if (gAudiop)
- {
- gAudiop->enableWind(!(gAudiop->isWindEnabled()));
- }
-}
-
-
-// Callback for enablement
-BOOL is_inventory_visible( void* user_data )
-{
- LLInventoryView* iv = reinterpret_cast<LLInventoryView*>(user_data);
- if( iv )
- {
- return iv->getVisible();
- }
- return FALSE;
-}
+// ---legacy functions for landmark , not using anymore - angela ---
+//void manage_landmarks(void*)
+//{
+// LLFloaterLandmark::showInstance(1);
+//}
+//
+//void create_new_landmark(void*)
+//{
+// // Note this is temporary cut and paste of legacy functionality.
+// // TODO: Make this spawn a floater allowing user customize before creating the inventory object
+//
+// LLViewerRegion* agent_region = gAgent.getRegion();
+// if(!agent_region)
+// {
+// llwarns << "No agent region" << llendl;
+// return;
+// }
+// LLParcel* agent_parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+// if (!agent_parcel)
+// {
+// llwarns << "No agent parcel" << llendl;
+// return;
+// }
+// if (!agent_parcel->getAllowLandmark()
+// && !LLViewerParcelMgr::isParcelOwnedByAgent(agent_parcel, GP_LAND_ALLOW_LANDMARK))
+// {
+// gViewerWindow->alertXml("CannotCreateLandmarkNotOwner");
+// return;
+// }
+//
+// LLUUID folder_id;
+// folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
+// std::string pos_string;
+// gAgent.buildLocationString(pos_string);
+//
+// create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
+// folder_id, LLTransactionID::tnull,
+// pos_string, pos_string, // name, desc
+// LLAssetType::AT_LANDMARK,
+// LLInventoryType::IT_LANDMARK,
+// NOT_WEARABLE, PERM_ALL,
+// NULL);
+//}
-void handle_show_newest_map(void*)
-{
- LLFloaterWorldMap::show(NULL, FALSE);
-}
//-------------------------------------------------------------------
// Help menu functions
@@ -3085,24 +3826,24 @@ void handle_show_newest_map(void*)
//
// Major mode switching
//
-void reset_view_final( BOOL proceed, void* );
+void reset_view_final( BOOL proceed );
void handle_reset_view()
{
if( (CAMERA_MODE_CUSTOMIZE_AVATAR == gAgent.getCameraMode()) && gFloaterCustomize )
{
// Show dialog box if needed.
- gFloaterCustomize->askToSaveIfDirty( reset_view_final, NULL );
+ gFloaterCustomize->askToSaveIfDirty( reset_view_final );
}
else
{
- reset_view_final( TRUE, NULL );
+ reset_view_final( TRUE );
}
}
class LLViewResetView : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
handle_reset_view();
return true;
@@ -3110,7 +3851,7 @@ class LLViewResetView : public view_listener_t
};
// Note: extra parameters allow this function to be called from dialog.
-void reset_view_final( BOOL proceed, void* )
+void reset_view_final( BOOL proceed )
{
if( !proceed )
{
@@ -3122,7 +3863,7 @@ void reset_view_final( BOOL proceed, void* )
class LLViewLookAtLastChatter : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
gAgent.lookAtLastChat();
return true;
@@ -3131,7 +3872,7 @@ class LLViewLookAtLastChatter : public view_listener_t
class LLViewMouselook : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if (!gAgent.cameraMouselook())
{
@@ -3147,7 +3888,7 @@ class LLViewMouselook : public view_listener_t
class LLViewFullscreen : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
gViewerWindow->toggleFullscreen(TRUE);
return true;
@@ -3156,7 +3897,7 @@ class LLViewFullscreen : public view_listener_t
class LLViewDefaultUISize : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
gSavedSettings.setF32("UIScaleFactor", 1.0f);
gSavedSettings.setBOOL("UIAutoScale", FALSE);
@@ -3167,7 +3908,7 @@ class LLViewDefaultUISize : public view_listener_t
class LLEditDuplicate : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if(LLEditMenuHandler::gEditMenuHandler)
{
@@ -3179,23 +3920,13 @@ class LLEditDuplicate : public view_listener_t
class LLEditEnableDuplicate : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canDuplicate();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
-
-void disabled_duplicate(void*)
-{
- if (LLSelectMgr::getInstance()->getSelection()->getPrimaryObject())
- {
- LLNotifications::instance().add("CopyFailed");
- }
-}
-
void handle_duplicate_in_place(void*)
{
llinfos << "handle_duplicate_in_place" << llendl;
@@ -3204,11 +3935,6 @@ void handle_duplicate_in_place(void*)
LLSelectMgr::getInstance()->selectDuplicate(offset, TRUE);
}
-void handle_repeat_duplicate(void*)
-{
- LLSelectMgr::getInstance()->repeatDuplicate();
-}
-
/* dead code 30-apr-2008
void handle_deed_object_to_group(void*)
{
@@ -3356,41 +4082,10 @@ void handle_claim_public_land(void*)
msg->addString("Parameter", buffer);
buffer = llformat( "%f", east_north.mV[VY]);
msg->nextBlock("ParamList");
- msg->addString("Parameter", buffer);
- gAgent.sendReliableMessage();
-}
-
-void handle_god_request_havok(void *)
-{
- if (gAgent.isGodlike())
- {
- LLSelectMgr::getInstance()->sendGodlikeRequest("havok", "infoverbose");
- }
+ msg->addString("Parameter", buffer);
+ gAgent.sendReliableMessage();
}
-//void handle_god_request_foo(void *)
-//{
-// if (gAgent.isGodlike())
-// {
-// LLSelectMgr::getInstance()->sendGodlikeRequest(GOD_WANTS_FOO);
-// }
-//}
-
-//void handle_god_request_terrain_save(void *)
-//{
-// if (gAgent.isGodlike())
-// {
-// LLSelectMgr::getInstance()->sendGodlikeRequest("terrain", "save");
-// }
-//}
-
-//void handle_god_request_terrain_load(void *)
-//{
-// if (gAgent.isGodlike())
-// {
-// LLSelectMgr::getInstance()->sendGodlikeRequest("terrain", "load");
-// }
-//}
// HACK for easily testing new avatar geometry
@@ -3403,12 +4098,6 @@ void handle_god_request_avatar_geometry(void *)
}
-void handle_show_overlay_title(void*)
-{
- gShowOverlayTitle = !gShowOverlayTitle;
- gSavedSettings.setBOOL("ShowOverlayTitle", gShowOverlayTitle);
-}
-
void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
{
if(gAgent.cameraMouselook())
@@ -3419,12 +4108,12 @@ void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
std::string error;
LLDynamicArray<LLViewerObject*> derez_objects;
-
+
// Check conditions that we can't deal with, building a list of
// everything that we'll actually be derezzing.
LLViewerRegion* first_region = NULL;
for (LLObjectSelection::valid_root_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_root_begin();
- iter != LLSelectMgr::getInstance()->getSelection()->valid_root_end(); iter++)
+ iter != LLSelectMgr::getInstance()->getSelection()->valid_root_end(); iter++)
{
LLSelectNode* node = *iter;
LLViewerObject* object = node->getObject();
@@ -3439,7 +4128,7 @@ void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
{
// Derez doesn't work at all if the some of the objects
// are in regions besides the first object selected.
-
+
// ...crosses region boundaries
error = "AcquireErrorObjectSpan";
break;
@@ -3483,7 +4172,7 @@ void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
default:
if((node->mPermissions->allowTransferTo(gAgent.getID())
&& object->permCopy())
- || gAgent.isGodlike())
+ || gAgent.isGodlike())
{
can_derez_current = TRUE;
}
@@ -3564,7 +4253,7 @@ void derez_objects(EDeRezDestination dest, const LLUUID& dest_id)
class LLToolsTakeCopy : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) return true;
@@ -3579,10 +4268,10 @@ class LLToolsTakeCopy : public view_listener_t
// You can return an object to its owner if it is on your land.
class LLObjectReturn : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if (LLSelectMgr::getInstance()->getSelection()->isEmpty()) return true;
-
+
mObjectSelection = LLSelectMgr::getInstance()->getEditSelection();
LLNotifications::instance().add("ReturnToOwner", LLSD(), LLSD(), boost::bind(&LLObjectReturn::onReturnToOwner, this, _1, _2));
@@ -3612,7 +4301,7 @@ protected:
// over land you own.
class LLObjectEnableReturn : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
#ifdef HACKED_GODLIKE_VIEWER
bool new_value = true;
@@ -3649,8 +4338,7 @@ class LLObjectEnableReturn : public view_listener_t
}
}
#endif
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
@@ -3669,13 +4357,13 @@ void handle_take()
{
return;
}
-
+
BOOL you_own_everything = TRUE;
BOOL locked_but_takeable_object = FALSE;
LLUUID category_id;
-
+
for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
- iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
+ iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
{
LLSelectNode* node = *iter;
LLViewerObject* object = node->getObject();
@@ -3717,7 +4405,7 @@ void handle_take()
}
if(category_id.notNull())
{
- // check trash
+ // check trash
LLUUID trash;
trash = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH);
if(category_id == trash || gInventory.isObjectDescendentOf(category_id, trash))
@@ -3741,16 +4429,15 @@ void handle_take()
payload["folder_id"] = category_id;
LLNotification::Params params("ConfirmObjectTakeLock");
- params.payload(payload)
- .functor(confirm_take);
+ params.payload(payload);
+ params.functor.function(confirm_take);
if(locked_but_takeable_object ||
- !you_own_everything)
+ !you_own_everything)
{
if(locked_but_takeable_object && you_own_everything)
{
params.name("ConfirmObjectTakeLock");
-
}
else if(!locked_but_takeable_object && !you_own_everything)
{
@@ -3790,7 +4477,7 @@ BOOL enable_take()
}
for (LLObjectSelection::valid_root_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_root_begin();
- iter != LLSelectMgr::getInstance()->getSelection()->valid_root_end(); iter++)
+ iter != LLSelectMgr::getInstance()->getSelection()->valid_root_end(); iter++)
{
LLSelectNode* node = *iter;
LLViewerObject* object = node->getObject();
@@ -3805,14 +4492,14 @@ BOOL enable_take()
#else
# ifdef TOGGLE_HACKED_GODLIKE_VIEWER
if (!LLViewerLogin::getInstance()->isInProductionGrid()
- && gAgent.isGodlike())
+ && gAgent.isGodlike())
{
return TRUE;
}
# endif
if((node->mPermissions->allowTransferTo(gAgent.getID())
&& object->permModify())
- || (node->mPermissions->getOwner() == gAgent.getID()))
+ || (node->mPermissions->getOwner() == gAgent.getID()))
{
return TRUE;
}
@@ -3823,7 +4510,7 @@ BOOL enable_take()
class LLToolsBuyOrTake : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if (LLSelectMgr::getInstance()->getSelection()->isEmpty())
{
@@ -3854,17 +4541,16 @@ class LLToolsBuyOrTake : public view_listener_t
class LLToolsEnableBuyOrTake : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool is_buy = is_selection_buy_not_take();
bool new_value = is_buy ? enable_buy(NULL) : enable_take();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
// Update label
std::string label;
std::string buy_text;
std::string take_text;
- std::string param = userdata["data"].asString();
+ std::string param = userdata.asString();
std::string::size_type offset = param.find(",");
if (offset != param.npos)
{
@@ -3882,7 +4568,7 @@ class LLToolsEnableBuyOrTake : public view_listener_t
gMenuHolder->childSetText("Pie Object Take", label);
gMenuHolder->childSetText("Menu Object Take", label);
- return true;
+ return new_value;
}
};
@@ -3905,7 +4591,7 @@ class LLToolsEnableBuyOrTake : public view_listener_t
BOOL is_selection_buy_not_take()
{
for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
- iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
+ iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
{
LLSelectNode* node = *iter;
LLViewerObject* obj = node->getObject();
@@ -3923,7 +4609,7 @@ S32 selection_price()
{
S32 total_price = 0;
for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
- iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
+ iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
{
LLSelectNode* node = *iter;
LLViewerObject* obj = node->getObject();
@@ -3937,42 +4623,36 @@ S32 selection_price()
return total_price;
}
-
+/*
bool callback_show_buy_currency(const LLSD& notification, const LLSD& response)
{
S32 option = LLNotification::getSelectedOption(notification, response);
if (0 == option)
{
- llinfos << "Loading page " << BUY_CURRENCY_URL << llendl;
- LLWeb::loadURL(BUY_CURRENCY_URL);
+ llinfos << "Loading page " << LLNotifications::instance().getGlobalString("BUY_CURRENCY_URL") << llendl;
+ LLWeb::loadURL(LLNotifications::instance().getGlobalString("BUY_CURRENCY_URL"));
}
return false;
}
-
+*/
void show_buy_currency(const char* extra)
{
// Don't show currency web page for branded clients.
-
+/*
std::ostringstream mesg;
if (extra != NULL)
{
mesg << extra << "\n \n";
}
- mesg << "Go to " << BUY_CURRENCY_URL << "\nfor information on purchasing currency?";
-
+ mesg << "Go to " << LLNotifications::instance().getGlobalString("BUY_CURRENCY_URL")<< "\nfor information on purchasing currency?";
+*/
LLSD args;
if (extra != NULL)
{
args["EXTRA"] = extra;
}
- args["URL"] = BUY_CURRENCY_URL;
- LLNotifications::instance().add("PromptGoToCurrencyPage", args, LLSD(), callback_show_buy_currency);
-}
-
-void handle_buy_currency(void*)
-{
-// LLFloaterBuyCurrency::buyCurrency();
+ LLNotifications::instance().add("PromptGoToCurrencyPage", args);//, LLSD(), callback_show_buy_currency);
}
void handle_buy(void*)
@@ -3995,7 +4675,7 @@ void handle_buy(void*)
class LLObjectBuy : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
handle_buy(NULL);
return true;
@@ -4031,9 +4711,21 @@ BOOL sitting_on_selection()
return (avatar->mIsSitting && avatar->getRoot() == root_object);
}
+class LLToolsSaveToInventory : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ if(enable_save_into_inventory(NULL))
+ {
+ derez_objects(DRD_SAVE_INTO_AGENT_INVENTORY, LLUUID::null);
+ }
+ return true;
+ }
+};
+
class LLToolsSaveToObjectInventory : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
if(node && (node->mValid) && (!node->mFromTaskID.isNull()))
@@ -4048,12 +4740,12 @@ class LLToolsSaveToObjectInventory : public view_listener_t
// Round the position of all root objects to the grid
class LLToolsSnapObjectXY : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
F64 snap_size = (F64)gSavedSettings.getF32("GridResolution");
for (LLObjectSelection::root_iterator iter = LLSelectMgr::getInstance()->getSelection()->root_begin();
- iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
+ iter != LLSelectMgr::getInstance()->getSelection()->root_end(); iter++)
{
LLSelectNode* node = *iter;
LLViewerObject* obj = node->getObject();
@@ -4102,7 +4794,7 @@ class LLToolsSnapObjectXY : public view_listener_t
// reasonable expectation for the link to work, but it will fail.
class LLToolsEnableLink : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = false;
// check if there are at least 2 objects selected, and that the
@@ -4124,14 +4816,13 @@ class LLToolsEnableLink : public view_listener_t
new_value = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
}
}
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLToolsLink : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if(!LLSelectMgr::getInstance()->selectGetAllRootsValid())
{
@@ -4177,19 +4868,18 @@ class LLToolsLink : public view_listener_t
class LLToolsEnableUnlink : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() &&
!LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject()->isAttachment();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLToolsUnlink : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLSelectMgr::getInstance()->sendDelink();
return true;
@@ -4199,7 +4889,7 @@ class LLToolsUnlink : public view_listener_t
class LLToolsStopAllAnimations : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
gAgent.stopCurrentAnimations();
return true;
@@ -4208,7 +4898,7 @@ class LLToolsStopAllAnimations : public view_listener_t
class LLToolsReleaseKeys : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
gAgent.forceReleaseControls();
@@ -4218,58 +4908,25 @@ class LLToolsReleaseKeys : public view_listener_t
class LLToolsEnableReleaseKeys : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
- gMenuHolder->findControl(userdata["control"].asString())->setValue( gAgent.anyControlGrabbed() );
- return true;
+ return gAgent.anyControlGrabbed();
}
};
-//void handle_hinge(void*)
-//{
-// LLSelectMgr::getInstance()->sendHinge(1);
-//}
-
-//void handle_ptop(void*)
-//{
-// LLSelectMgr::getInstance()->sendHinge(2);
-//}
-
-//void handle_lptop(void*)
-//{
-// LLSelectMgr::getInstance()->sendHinge(3);
-//}
-
-//void handle_wheel(void*)
-//{
-// LLSelectMgr::getInstance()->sendHinge(4);
-//}
-
-//void handle_dehinge(void*)
-//{
-// LLSelectMgr::getInstance()->sendDehinge();
-//}
-
-//BOOL enable_dehinge(void*)
-//{
-// LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject();
-// return obj && !obj->isAttachment();
-//}
-
class LLEditEnableCut : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canCut();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLEditCut : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if( LLEditMenuHandler::gEditMenuHandler )
{
@@ -4281,17 +4938,16 @@ class LLEditCut : public view_listener_t
class LLEditEnableCopy : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canCopy();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLEditCopy : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if( LLEditMenuHandler::gEditMenuHandler )
{
@@ -4303,17 +4959,16 @@ class LLEditCopy : public view_listener_t
class LLEditEnablePaste : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canPaste();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLEditPaste : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if( LLEditMenuHandler::gEditMenuHandler )
{
@@ -4325,17 +4980,16 @@ class LLEditPaste : public view_listener_t
class LLEditEnableDelete : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canDoDelete();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLEditDelete : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// If a text field can do a deletion, it gets precedence over deleting
// an object in the world.
@@ -4349,14 +5003,14 @@ class LLEditDelete : public view_listener_t
// When deleting an object we may not actually be done
// Keep selection so we know what to delete when confirmation is needed about the delete
- gPieObject->hide(TRUE);
+ gPieObject->hide();
return true;
}
};
class LLObjectEnableDelete : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value =
#ifdef HACKED_GODLIKE_VIEWER
@@ -4364,27 +5018,17 @@ class LLObjectEnableDelete : public view_listener_t
#else
# ifdef TOGGLE_HACKED_GODLIKE_VIEWER
(!LLViewerLogin::getInstance()->isInProductionGrid()
- && gAgent.isGodlike()) ||
+ && gAgent.isGodlike()) ||
# endif
LLSelectMgr::getInstance()->canDoDelete();
#endif
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
- }
-};
-
-class LLEditSearch : public view_listener_t
-{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
- {
- LLFloaterDirectory::toggleFind(NULL);
- return true;
+ return new_value;
}
};
class LLObjectDelete : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if (LLSelectMgr::getInstance())
{
@@ -4396,7 +5040,7 @@ class LLObjectDelete : public view_listener_t
// When deleting an object we may not actually be done
// Keep selection so we know what to delete when confirmation is needed about the delete
- gPieObject->hide(TRUE);
+ gPieObject->hide();
return true;
}
};
@@ -4408,38 +5052,35 @@ void handle_force_delete(void*)
class LLViewEnableJoystickFlycam : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = (gSavedSettings.getBOOL("JoystickEnabled") && gSavedSettings.getBOOL("JoystickFlycamEnabled"));
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLViewEnableLastChatter : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// *TODO: add check that last chatter is in range
bool new_value = (gAgent.cameraThirdPerson() && gAgent.getLastChatter().notNull());
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLEditEnableDeselect : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canDeselect();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLEditDeselect : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if( LLEditMenuHandler::gEditMenuHandler )
{
@@ -4451,18 +5092,17 @@ class LLEditDeselect : public view_listener_t
class LLEditEnableSelectAll : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canSelectAll();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLEditSelectAll : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if( LLEditMenuHandler::gEditMenuHandler )
{
@@ -4475,17 +5115,16 @@ class LLEditSelectAll : public view_listener_t
class LLEditEnableUndo : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canUndo();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLEditUndo : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if( LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canUndo() )
{
@@ -4497,17 +5136,16 @@ class LLEditUndo : public view_listener_t
class LLEditEnableRedo : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canRedo();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLEditRedo : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if( LLEditMenuHandler::gEditMenuHandler && LLEditMenuHandler::gEditMenuHandler->canRedo() )
{
@@ -4549,25 +5187,26 @@ void show_debug_menus()
if ( gMenuBarView )
{
BOOL debug = gSavedSettings.getBOOL("UseDebugMenus");
-
+
if(debug)
{
LLFirstUse::useDebugMenus();
}
- gMenuBarView->setItemVisible(CLIENT_MENU_NAME, debug);
- gMenuBarView->setItemEnabled(CLIENT_MENU_NAME, debug);
+ gMenuBarView->setItemVisible("Advanced", debug);
+ gMenuBarView->setItemEnabled("Advanced", debug);
+
+ gMenuBarView->setItemVisible("Debug", debug);
+ gMenuBarView->setItemEnabled("Debug", debug);
+ gMenuBarView->setItemVisible("Develop", debug);
+ gMenuBarView->setItemEnabled("Develop", debug);
+
// Server ('Admin') menu hidden when not in godmode.
const bool show_server_menu = debug && (gAgent.getGodLevel() > GOD_NOT);
- gMenuBarView->setItemVisible(SERVER_MENU_NAME, show_server_menu);
- gMenuBarView->setItemEnabled(SERVER_MENU_NAME, show_server_menu);
-
- //gMenuBarView->setItemVisible("DebugOptions", visible);
- //gMenuBarView->setItemVisible(std::string(AVI_TOOLS), visible);
-
- gMenuBarView->arrange(); // clean-up positioning
- };
+ gMenuBarView->setItemVisible("Admin", show_server_menu);
+ gMenuBarView->setItemEnabled("Admin", show_server_menu);
+ }
}
void toggle_debug_menus(void*)
@@ -4615,27 +5254,12 @@ void toggle_debug_menus(void*)
// gExportDialog = LLUploadDialog::modalUploadDialog("Exporting selected objects...");
// }
+//
-BOOL menu_check_build_tool( void* user_data )
-{
- S32 index = (intptr_t) user_data;
- return LLToolMgr::getInstance()->getCurrentToolset()->isToolSelected( index );
-}
-
-void handle_reload_settings(void*)
-{
- gSavedSettings.resetToDefaults();
- gSavedSettings.loadFromFile(gSavedSettings.getString("ClientSettingsFile"));
-
- llinfos << "Loading colors from colors.xml" << llendl;
- std::string color_file = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS,"colors.xml");
- gColors.resetToDefaults();
- gColors.loadFromFileLegacy(color_file, FALSE, TYPE_COL4U);
-}
class LLWorldSetHomeLocation : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// we just send the message and let the server check for failure cases
// server will echo back a "Home position set." alert if it succeeds
@@ -4647,7 +5271,7 @@ class LLWorldSetHomeLocation : public view_listener_t
class LLWorldTeleportHome : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
gAgent.teleportHome();
return true;
@@ -4656,7 +5280,7 @@ class LLWorldTeleportHome : public view_listener_t
class LLWorldAlwaysRun : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// as well as altering the default walk-vs-run state,
// we also change the *current* walk-vs-run state.
@@ -4680,17 +5304,16 @@ class LLWorldAlwaysRun : public view_listener_t
class LLWorldCheckAlwaysRun : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = gAgent.getAlwaysRun();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLWorldSetAway : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if (gAgent.getAFK())
{
@@ -4706,7 +5329,7 @@ class LLWorldSetAway : public view_listener_t
class LLWorldSetBusy : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if (gAgent.getBusy())
{
@@ -4741,7 +5364,7 @@ bool can_create_landmark()
class LLWorldCreateLandmark : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if (!can_create_landmark())
{
@@ -4753,21 +5376,21 @@ class LLWorldCreateLandmark : public view_listener_t
folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
std::string pos_string;
gAgent.buildLocationString(pos_string);
-
+
create_inventory_item(gAgent.getID(), gAgent.getSessionID(),
folder_id, LLTransactionID::tnull,
pos_string, pos_string, // name, desc
LLAssetType::AT_LANDMARK,
LLInventoryType::IT_LANDMARK,
NOT_WEARABLE, PERM_ALL,
- new LLCreateLandmarkCallback);
+ NULL);
return true;
}
};
class LLToolsLookAtSelection : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
const F32 PADDING_FACTOR = 2.f;
BOOL zoom = (userdata.asString() == "zoom");
@@ -4802,11 +5425,11 @@ class LLToolsLookAtSelection : public view_listener_t
}
};
-void callback_invite_to_group(LLUUID group_id, void *user_data)
+void callback_invite_to_group(LLUUID group_id, LLUUID dest_id)
{
std::vector<LLUUID> agent_ids;
- agent_ids.push_back(*(LLUUID *)user_data);
-
+ agent_ids.push_back(dest_id);
+
LLFloaterGroupInvite::showForGroup(group_id, &agent_ids);
}
@@ -4821,14 +5444,14 @@ void invite_to_group(const LLUUID& dest_id)
{
widget->center();
widget->setPowersMask(GP_MEMBER_INVITE);
- widget->setSelectCallback(callback_invite_to_group, (void *)&dest_id);
+ widget->setSelectGroupCallback(boost::bind(callback_invite_to_group, _1, dest_id));
}
}
}
class LLAvatarInviteToGroup : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(avatar)
@@ -4841,7 +5464,7 @@ class LLAvatarInviteToGroup : public view_listener_t
class LLAvatarAddFriend : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(avatar && !is_agent_friend(avatar->getID()))
@@ -4891,7 +5514,7 @@ bool complete_give_money(const LLSD& notification, const LLSD& response, LLObjec
bool handle_give_money_dialog()
{
LLNotification::Params params("BusyModePay");
- params.functor(boost::bind(complete_give_money, _1, _2, LLSelectMgr::getInstance()->getSelection()));
+ params.functor.function(boost::bind(complete_give_money, _1, _2, LLSelectMgr::getInstance()->getSelection()));
if (gAgent.getBusy())
{
@@ -4907,7 +5530,7 @@ bool handle_give_money_dialog()
class LLPayObject : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
return handle_give_money_dialog();
}
@@ -4915,7 +5538,7 @@ class LLPayObject : public view_listener_t
class LLEnablePayObject : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
bool new_value = (avatar != NULL);
@@ -4931,14 +5554,13 @@ class LLEnablePayObject : public view_listener_t
}
}
}
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLObjectEnableSitOrStand : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = false;
LLViewerObject* dest_object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
@@ -4950,13 +5572,11 @@ class LLObjectEnableSitOrStand : public view_listener_t
new_value = true;
}
}
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-
// Update label
std::string label;
std::string sit_text;
std::string stand_text;
- std::string param = userdata["data"].asString();
+ std::string param = userdata.asString();
std::string::size_type offset = param.find(",");
if (offset != param.npos)
{
@@ -4981,7 +5601,7 @@ class LLObjectEnableSitOrStand : public view_listener_t
}
gMenuHolder->childSetText("Object Sit", label);
- return true;
+ return new_value;
}
};
@@ -5000,29 +5620,6 @@ void dump_inventory(void*)
gInventory.dumpInventory();
}
-// forcibly unlock an object
-void handle_force_unlock(void*)
-{
- // First, make it public.
- LLSelectMgr::getInstance()->sendOwner(LLUUID::null, LLUUID::null, TRUE);
-
- // Second, lie to the viewer and mark it editable and unowned
-
- struct f : public LLSelectedObjectFunctor
- {
- virtual bool apply(LLViewerObject* object)
- {
- object->mFlags |= FLAGS_OBJECT_MOVE;
- object->mFlags |= FLAGS_OBJECT_MODIFY;
- object->mFlags |= FLAGS_OBJECT_COPY;
-
- object->mFlags &= ~FLAGS_OBJECT_ANY_OWNER;
- object->mFlags &= ~FLAGS_OBJECT_YOU_OWNER;
- return true;
- }
- } func;
- LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func);
-}
void handle_dump_followcam(void*)
{
@@ -5039,10 +5636,9 @@ void handle_viewer_disable_message_log(void*)
gMessageSystem->stopLogging();
}
-// TomY TODO: Move!
class LLShowFloater : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
std::string floater_name = userdata.asString();
if (floater_name == "gestures")
@@ -5056,30 +5652,10 @@ class LLShowFloater : public view_listener_t
gAgent.changeCameraToCustomizeAvatar();
}
}
- else if (floater_name == "friends")
- {
- LLFloaterMyFriends::toggleInstance(0);
- }
- else if (floater_name == "preferences")
- {
- LLFloaterPreference::show(NULL);
- }
else if (floater_name == "toolbar")
{
LLToolBar::toggle(NULL);
}
- else if (floater_name == "chat history")
- {
- LLFloaterChat::toggleInstance(LLSD());
- }
- else if (floater_name == "im")
- {
- LLFloaterChatterBox::toggleInstance(LLSD());
- }
- else if (floater_name == "inventory")
- {
- LLInventoryView::toggleVisibility(NULL);
- }
else if (floater_name == "mute list")
{
LLFloaterMute::toggleInstance();
@@ -5092,18 +5668,6 @@ class LLShowFloater : public view_listener_t
{
LLFloaterMove::toggleInstance();
}
- else if (floater_name == "world map")
- {
- LLFloaterWorldMap::toggle(NULL);
- }
- else if (floater_name == "mini map")
- {
- LLFloaterMap::toggleInstance();
- }
- else if (floater_name == "stat bar")
- {
- LLFloaterStats::toggleInstance();
- }
else if (floater_name == "my land")
{
LLFloaterLandHoldings::show(NULL);
@@ -5117,22 +5681,22 @@ class LLShowFloater : public view_listener_t
LLFloaterLand::showInstance();
}
+ else if (floater_name == "about region")
+ {
+ LLFloaterRegionInfo::showInstance();
+ }
else if (floater_name == "buy land")
{
if (LLViewerParcelMgr::getInstance()->selectionEmpty())
{
LLViewerParcelMgr::getInstance()->selectParcelAt(gAgent.getPositionGlobal());
}
-
+
LLViewerParcelMgr::getInstance()->startBuyLand();
}
- else if (floater_name == "about region")
- {
- LLFloaterRegionInfo::showInstance();
- }
else if (floater_name == "grid options")
{
- LLFloaterBuildOptions::show(NULL);
+ LLFloaterBuildOptions::showInstance();
}
else if (floater_name == "script errors")
{
@@ -5156,26 +5720,20 @@ class LLShowFloater : public view_listener_t
{
if (!gNoRender)
{
- LLFloaterBump::show(NULL);
+ LLFloaterBump::showInstance();
}
}
else if (floater_name == "lag meter")
{
LLFloaterLagMeter::showInstance();
}
- else if (floater_name == "bug reporter")
- {
- // Prevent menu from appearing in screen shot.
- gMenuHolder->hideMenus();
- LLFloaterReporter::showFromMenu(BUG_REPORT);
- }
else if (floater_name == "buy currency")
{
LLFloaterBuyCurrency::buyCurrency();
}
else if (floater_name == "about")
{
- LLFloaterAbout::show(NULL);
+ LLFloaterAbout::showInstance();
}
else if (floater_name == "active speakers")
{
@@ -5189,37 +5747,24 @@ class LLShowFloater : public view_listener_t
{
LLFloaterPerms::toggleInstance(LLSD());
}
+ else
+ {
+ LLFloaterReg::toggleInstance(floater_name);
+ }
return true;
}
};
class LLFloaterVisible : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
- std::string control_name = userdata["control"].asString();
- std::string floater_name = userdata["data"].asString();
+ std::string floater_name = userdata.asString();
bool new_value = false;
- if (floater_name == "friends")
- {
- new_value = LLFloaterMyFriends::instanceVisible(0);
- }
- else if (floater_name == "communicate")
- {
- new_value = LLFloaterChatterBox::instanceVisible();
- }
- else if (floater_name == "toolbar")
+ if (floater_name == "toolbar")
{
new_value = LLToolBar::visible(NULL);
}
- else if (floater_name == "chat history")
- {
- new_value = LLFloaterChat::instanceVisible();
- }
- else if (floater_name == "im")
- {
- new_value = LLFloaterMyFriends::instanceVisible(0);
- }
else if (floater_name == "mute list")
{
new_value = LLFloaterMute::instanceVisible();
@@ -5234,7 +5779,7 @@ class LLFloaterVisible : public view_listener_t
}
else if (floater_name == "stat bar")
{
- new_value = LLFloaterStats::instanceVisible();
+ new_value = gSavedSettings.getBOOL("ShowDebugStats");
}
else if (floater_name == "active speakers")
{
@@ -5244,13 +5789,11 @@ class LLFloaterVisible : public view_listener_t
{
new_value = LLFloaterBeacons::instanceVisible(LLSD());
}
- else if (floater_name == "inventory")
+ else
{
- LLInventoryView* iv = LLInventoryView::getActiveInventory();
- new_value = (NULL != iv && TRUE == iv->getVisible());
+ new_value = LLFloaterReg::instanceVisible(floater_name);
}
- gMenuHolder->findControl(control_name)->setValue(new_value);
- return true;
+ return new_value;
}
};
@@ -5266,7 +5809,7 @@ bool callback_show_url(const LLSD& notification, const LLSD& response)
class LLPromptShowURL : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
std::string param = userdata.asString();
std::string::size_type offset = param.find(",");
@@ -5306,7 +5849,7 @@ bool callback_show_file(const LLSD& notification, const LLSD& response)
class LLPromptShowFile : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
std::string param = userdata.asString();
std::string::size_type offset = param.find(",");
@@ -5329,7 +5872,7 @@ class LLPromptShowFile : public view_listener_t
class LLShowAgentProfile : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLUUID agent_id;
if (userdata.asString() == "agent")
@@ -5358,44 +5901,9 @@ class LLShowAgentProfile : public view_listener_t
}
};
-class LLShowAgentGroups : public view_listener_t
-{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
- {
- LLFloaterMyFriends::toggleInstance(1);
- return true;
- }
-};
-
-void handle_focus(void *)
-{
- if (gDisconnected)
- {
- return;
- }
-
- if (gAgent.getFocusOnAvatar())
- {
- // zoom in if we're looking at the avatar
- gAgent.setFocusOnAvatar(FALSE, ANIMATE);
- gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
- gAgent.cameraZoomIn(0.666f);
- }
- else
- {
- gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
- }
-
- gViewerWindow->moveCursorToCenter();
-
- // Switch to camera toolset
-// LLToolMgr::getInstance()->setCurrentToolset(gCameraToolset);
- LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolCamera::getInstance() );
-}
-
class LLLandEdit : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if (gAgent.getFocusOnAvatar() && gSavedSettings.getBOOL("EditCameraMovement") )
{
@@ -5415,7 +5923,7 @@ class LLLandEdit : public view_listener_t
LLViewerParcelMgr::getInstance()->selectParcelAt( LLToolPie::getInstance()->getPick().mPosGlobal );
- gFloaterView->bringToFront( gFloaterTools );
+ LLFloaterReg::showInstance("build");
// Switch to land edit toolset
LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolSelectLand::getInstance() );
@@ -5425,15 +5933,14 @@ class LLLandEdit : public view_listener_t
class LLWorldEnableBuyLand : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLViewerParcelMgr::getInstance()->canAgentBuyParcel(
LLViewerParcelMgr::getInstance()->selectionEmpty()
? LLViewerParcelMgr::getInstance()->getAgentParcel()
: LLViewerParcelMgr::getInstance()->getParcelSelection()->getParcel(),
false);
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
@@ -5444,26 +5951,6 @@ BOOL enable_buy_land(void*)
}
-void handle_move(void*)
-{
- if (gAgent.getFocusOnAvatar())
- {
- // zoom in if we're looking at the avatar
- gAgent.setFocusOnAvatar(FALSE, ANIMATE);
- gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
-
- gAgent.cameraZoomIn(0.666f);
- }
- else
- {
- gAgent.setFocusGlobal(LLToolPie::getInstance()->getPick());
- }
-
- gViewerWindow->moveCursorToCenter();
-
- LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
- LLToolMgr::getInstance()->getCurrentToolset()->selectTool( LLToolGrab::getInstance() );
-}
class LLObjectAttachToAvatar : public view_listener_t
{
@@ -5471,7 +5958,7 @@ public:
static void setObjectSelection(LLObjectSelectionHandle selection) { sObjectSelection = selection; }
private:
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
setObjectSelection(LLSelectMgr::getInstance()->getSelection());
LLViewerObject* selectedObject = sObjectSelection->getFirstRootObject();
@@ -5497,7 +5984,7 @@ void near_attach_object(BOOL success, void *user_data)
if (success)
{
LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
-
+
U8 attachment_id = 0;
if (attachment)
{
@@ -5539,7 +6026,7 @@ void confirm_replace_attachment(S32 option, void* user_data)
}
LLVector3 walkToSpot = selectedObject->getPositionAgent();
-
+
// make sure we stop in front of the object
LLVector3 delta = walkToSpot - gAgent.getPositionAgent();
delta.normVec();
@@ -5554,7 +6041,7 @@ void confirm_replace_attachment(S32 option, void* user_data)
class LLAttachmentDrop : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// Called when the user clicked on an object attached to them
// and selected "Drop".
@@ -5598,63 +6085,57 @@ class LLAttachmentDrop : public view_listener_t
};
// called from avatar pie menu
-void handle_detach_from_avatar(void* user_data)
+class LLAttachmentDetachFromPoint : public view_listener_t
{
- LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
-
- LLViewerObject* attached_object = attachment->getObject();
-
- if (attached_object)
+ bool handleEvent(const LLSD& user_data)
{
- gMessageSystem->newMessage("ObjectDetach");
- gMessageSystem->nextBlockFast(_PREHASH_AgentData);
- gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
- gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-
- gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
- gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, attached_object->getLocalID());
- gMessageSystem->sendReliable( gAgent.getRegionHost() );
- }
-}
+ LLViewerJointAttachment *attachment = get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, user_data.asInteger(), (LLViewerJointAttachment*)NULL);
+
+ LLViewerObject* attached_object = attachment ? attachment->getObject() : NULL;
-void attach_label(std::string& label, void* user_data)
-{
- LLViewerJointAttachment* attachmentp = (LLViewerJointAttachment*)user_data;
- if (attachmentp)
- {
- label = attachmentp->getName();
- if (attachmentp->getObject())
+ if (attached_object)
{
- LLViewerInventoryItem* itemp = gInventory.getItem(attachmentp->getItemID());
- if (itemp)
- {
- label += std::string(" (") + itemp->getName() + std::string(")");
- }
+ gMessageSystem->newMessage("ObjectDetach");
+ gMessageSystem->nextBlockFast(_PREHASH_AgentData);
+ gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
+ gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+
+ gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
+ gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, attached_object->getLocalID());
+ gMessageSystem->sendReliable( gAgent.getRegionHost() );
}
+ return true;
}
-}
+};
-void detach_label(std::string& label, void* user_data)
+static bool onEnableAttachmentLabel(LLUICtrl* ctrl, const LLSD& data)
{
- LLViewerJointAttachment* attachmentp = (LLViewerJointAttachment*)user_data;
- if (attachmentp)
+ std::string label;
+ LLMenuItemGL* menu = dynamic_cast<LLMenuItemGL*>(ctrl);
+ if (menu)
{
- label = attachmentp->getName();
- if (attachmentp->getObject())
+ LLViewerJointAttachment *attachmentp = get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, data["index"].asInteger(), (LLViewerJointAttachment*)NULL);
+ if (attachmentp)
{
- LLViewerInventoryItem* itemp = gInventory.getItem(attachmentp->getItemID());
- if (itemp)
+ label = data["label"].asString();
+ if (attachmentp->getObject())
{
- label += std::string(" (") + itemp->getName() + std::string(")");
+ LLViewerInventoryItem* itemp = gInventory.getItem(attachmentp->getItemID());
+ if (itemp)
+ {
+ label += std::string(" (") + itemp->getName() + std::string(")");
+ }
}
}
+ menu->setLabel(label);
}
+ return true;
}
class LLAttachmentDetach : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// Called when the user clicked on an object attached to them
// and selected "Detach".
@@ -5723,7 +6204,7 @@ protected:
// You can only drop items on parcels where you can build.
class LLAttachmentEnableDrop : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
BOOL can_build = gAgent.isGodlike() || (LLViewerParcelMgr::getInstance()->agentCanBuild());
@@ -5743,7 +6224,7 @@ class LLAttachmentEnableDrop : public view_listener_t
if ( object )
{
- S32 attachmentID = ATTACHMENT_ID_FROM_STATE(object->getState());
+ S32 attachmentID = ATTACHMENT_ID_FROM_STATE(object->getState());
attachment_pt = get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, attachmentID, (LLViewerJointAttachment*)NULL);
if ( attachment_pt )
@@ -5751,7 +6232,7 @@ class LLAttachmentEnableDrop : public view_listener_t
// make sure item is in your inventory (it could be a delayed attach message being sent from the sim)
// so check to see if the item is in the inventory already
item = gInventory.getItem(attachment_pt->getItemID());
-
+
if ( !item )
{
// Item does not exist, make an observer to enable the pie menu
@@ -5762,22 +6243,21 @@ class LLAttachmentEnableDrop : public view_listener_t
LLInventoryFetchObserver::item_ref_t items; //add item to the inventory item to be fetched
items.push_back(attachment_pt->getItemID());
-
+
wornItemFetched->fetchItems(items);
gInventory.addObserver(wornItemFetched);
}
}
}
-
+
//now check to make sure that the item is actually in the inventory before we enable dropping it
- bool new_value = enable_detach(NULL) && can_build && item;
+ bool new_value = enable_detach() && can_build && item;
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
-BOOL enable_detach(void*)
+BOOL enable_detach(const LLSD&)
{
LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
if (!object) return FALSE;
@@ -5801,21 +6281,19 @@ BOOL enable_detach(void*)
class LLAttachmentEnableDetach : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
- bool new_value = enable_detach(NULL);
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ bool new_value = enable_detach();
+ return new_value;
}
};
// Used to tell if the selected object can be attached to your avatar.
-BOOL object_selected_and_point_valid(void *user_data)
+BOOL object_selected_and_point_valid(const LLSD&)
{
- //LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
for (LLObjectSelection::root_iterator iter = selection->root_begin();
- iter != selection->root_end(); iter++)
+ iter != selection->root_end(); iter++)
{
LLSelectNode* node = *iter;
LLViewerObject* object = node->getObject();
@@ -5841,7 +6319,7 @@ BOOL object_selected_and_point_valid(void *user_data)
BOOL object_is_wearable()
{
- if (!object_selected_and_point_valid(NULL))
+ if (!object_selected_and_point_valid(LLSD()))
{
return FALSE;
}
@@ -5851,7 +6329,7 @@ BOOL object_is_wearable()
}
LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
for (LLObjectSelection::valid_root_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_root_begin();
- iter != LLSelectMgr::getInstance()->getSelection()->valid_root_end(); iter++)
+ iter != LLSelectMgr::getInstance()->getSelection()->valid_root_end(); iter++)
{
LLSelectNode* node = *iter;
if (node->mPermissions->getOwner() == gAgent.getID())
@@ -5866,25 +6344,29 @@ BOOL object_is_wearable()
// Also for seeing if object can be attached. See above.
class LLObjectEnableWear : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
- bool is_wearable = object_selected_and_point_valid(NULL);
- gMenuHolder->findControl(userdata["control"].asString())->setValue(is_wearable);
- return TRUE;
+ return object_selected_and_point_valid(LLSD());
}
};
-
-BOOL object_attached(void *user_data)
+class LLAttachmentPointFilled : public view_listener_t
{
- LLViewerJointAttachment *attachment = (LLViewerJointAttachment *)user_data;
-
- return attachment->getObject() != NULL;
-}
+ bool handleEvent(const LLSD& user_data)
+ {
+ bool enable = false;
+ LLVOAvatar::attachment_map_t::iterator found_it = gAgent.getAvatarObject()->mAttachmentPoints.find(user_data.asInteger());
+ if (found_it != gAgent.getAvatarObject()->mAttachmentPoints.end())
+ {
+ enable = found_it->second->getObject() != NULL;
+ }
+ return enable;
+ }
+};
class LLAvatarSendIM : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
if(avatar)
@@ -5899,26 +6381,15 @@ class LLAvatarSendIM : public view_listener_t
name.append( last->getString() );
}
- gIMMgr->setFloaterOpen(TRUE);
//EInstantMessage type = have_agent_callingcard(gLastHitObjectID)
// ? IM_SESSION_ADD : IM_SESSION_CARDLESS_START;
gIMMgr->addSession(name,
IM_NOTHING_SPECIAL,
- avatar->getID());
- }
- return true;
- }
-};
-
-
-void handle_activate(void*)
-{
-}
-
-BOOL enable_activate(void*)
-{
- return FALSE;
-}
+ avatar->getID());
+ }
+ return true;
+ }
+};
namespace
{
@@ -5946,7 +6417,7 @@ namespace
};
}
-void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, const std::string& nomodmsg)
+void queue_actions(LLFloaterScriptQueue* q, const std::string& msg)
{
QueueObjects func(q);
LLSelectMgr *mgr = LLSelectMgr::getInstance();
@@ -5956,10 +6427,12 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
{
if ( !func.scripted )
{
+ std::string noscriptmsg = std::string("Cannot") + msg + "SelectObjectsNoScripts";
LLNotifications::instance().add(noscriptmsg);
}
else if ( !func.modifiable )
{
+ std::string nomodmsg = std::string("Cannot") + msg + "SelectObjectsNoPermission";
LLNotifications::instance().add(nomodmsg);
}
else
@@ -5976,62 +6449,51 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
}
}
-void handle_compile_queue(std::string to_lang)
-{
- LLFloaterCompileQueue* queue;
- if (to_lang == "mono")
- {
- queue = LLFloaterCompileQueue::create(TRUE);
- }
- else
- {
- queue = LLFloaterCompileQueue::create(FALSE);
- }
- queue_actions(queue, "CannotRecompileSelectObjectsNoScripts", "CannotRecompileSelectObjectsNoPermission");
-}
-
-void handle_reset_selection(void)
-{
- LLFloaterResetQueue* queue = LLFloaterResetQueue::create();
- queue_actions(queue, "CannotResetSelectObjectsNoScripts", "CannotResetSelectObjectsNoPermission");
-}
-
-void handle_set_run_selection(void)
-{
- LLFloaterRunQueue* queue = LLFloaterRunQueue::create();
- queue_actions(queue, "CannotSetRunningSelectObjectsNoScripts", "CannotSerRunningSelectObjectsNoPermission");
-}
-
-void handle_set_not_run_selection(void)
-{
- LLFloaterNotRunQueue* queue = LLFloaterNotRunQueue::create();
- queue_actions(queue, "CannotSetRunningNotSelectObjectsNoScripts", "CannotSerRunningNotSelectObjectsNoPermission");
-}
-
class LLToolsSelectedScriptAction : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
std::string action = userdata.asString();
+ bool mono = false;
+ std::string msg, name;
if (action == "compile mono")
{
- handle_compile_queue("mono");
+ name = "compile_queue";
+ mono = true;
+ msg = "Recompile";
}
if (action == "compile lsl")
{
- handle_compile_queue("lsl");
+ name = "compile_queue";
+ msg = "Recompile";
}
else if (action == "reset")
{
- handle_reset_selection();
+ name = "reset_queue";
+ msg = "Reset";
}
else if (action == "start")
{
- handle_set_run_selection();
+ name = "start_queue";
+ msg = "Running";
}
else if (action == "stop")
{
- handle_set_not_run_selection();
+ name = "stop_queue";
+ msg = "RunningNot";
+ }
+ LLUUID id; id.generate();
+ LLFloater* floater = LLFloaterReg::getInstance(name, LLSD(id));
+ LLFloaterScriptQueue* queue = dynamic_cast<LLFloaterScriptQueue*>(floater);
+ if (queue)
+ {
+ queue->setMono(mono);
+ queue_actions(queue, msg);
+ }
+ else
+ {
+ llwarns << "Failed to generate LLFloaterScriptQueue with action: " << action << llendl;
+ delete floater;
}
return true;
}
@@ -6040,10 +6502,10 @@ class LLToolsSelectedScriptAction : public view_listener_t
void handle_selected_texture_info(void*)
{
for (LLObjectSelection::valid_iterator iter = LLSelectMgr::getInstance()->getSelection()->valid_begin();
- iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++)
+ iter != LLSelectMgr::getInstance()->getSelection()->valid_end(); iter++)
{
LLSelectNode* node = *iter;
-
+
std::string msg;
msg.assign("Texture info for: ");
msg.append(node->mName);
@@ -6086,11 +6548,6 @@ void handle_selected_texture_info(void*)
}
}
-void handle_dump_image_list(void*)
-{
- gImageList.dump();
-}
-
void handle_test_male(void*)
{
wear_outfit_by_name("Male Shape & Outfit");
@@ -6122,7 +6579,7 @@ void handle_dump_attachments(void*)
}
for (LLVOAvatar::attachment_map_t::iterator iter = avatar->mAttachmentPoints.begin();
- iter != avatar->mAttachmentPoints.end(); )
+ iter != avatar->mAttachmentPoints.end(); )
{
LLVOAvatar::attachment_map_t::iterator curiter = iter++;
LLViewerJointAttachment* attachment = curiter->second;
@@ -6141,107 +6598,76 @@ void handle_dump_attachments(void*)
}
}
-//---------------------------------------------------------------------
-// Callbacks for enabling/disabling items
-//---------------------------------------------------------------------
-
-BOOL menu_ui_enabled(void *user_data)
-{
- BOOL high_res = gSavedSettings.getBOOL( "HighResSnapshot" );
- return !high_res;
-}
-
-// TomY TODO DEPRECATE & REMOVE
-void menu_toggle_control( void* user_data )
-{
- BOOL checked = gSavedSettings.getBOOL( static_cast<char*>(user_data) );
- if (std::string(static_cast<char*>(user_data)) == "HighResSnapshot" && !checked)
- {
- // High Res Snapshot active, must uncheck RenderUIInSnapshot
- gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE );
- }
- gSavedSettings.setBOOL( static_cast<char*>(user_data), !checked );
-}
-
// these are used in the gl menus to set control values.
class LLToggleControl : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
std::string control_name = userdata.asString();
BOOL checked = gSavedSettings.getBOOL( control_name );
- if (control_name == "HighResSnapshot" && !checked)
- {
- // High Res Snapshot active, must uncheck RenderUIInSnapshot
- gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE );
- }
gSavedSettings.setBOOL( control_name, !checked );
return true;
}
};
-BOOL menu_check_control( void* user_data)
-{
- return gSavedSettings.getBOOL((char*)user_data);
-}
-
-//
-void menu_toggle_variable( void* user_data )
+class LLCheckControl : public view_listener_t
{
- BOOL checked = *(BOOL*)user_data;
- *(BOOL*)user_data = !checked;
-}
-
-BOOL menu_check_variable( void* user_data)
-{
- return *(BOOL*)user_data;
-}
-
+ bool handleEvent( const LLSD& userdata)
+ {
+ std::string callback_data = userdata.asString();
+ bool new_value = gSavedSettings.getBOOL(callback_data);
+ return new_value;
+ }
-BOOL enable_land_selected( void* )
-{
- return !(LLViewerParcelMgr::getInstance()->selectionEmpty());
-}
+};
void menu_toggle_attached_lights(void* user_data)
{
- menu_toggle_control(user_data);
LLPipeline::sRenderAttachedLights = gSavedSettings.getBOOL("RenderAttachedLights");
}
void menu_toggle_attached_particles(void* user_data)
{
- menu_toggle_control(user_data);
LLPipeline::sRenderAttachedParticles = gSavedSettings.getBOOL("RenderAttachedParticles");
}
+class LLAdvancedHandleAttchedLightParticles: public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ std::string control_name = userdata.asString();
+ if (control_name == "RenderAttachedLights")
+ {
+ menu_toggle_attached_lights(NULL);
+ }
+ else if (control_name == "RenderAttachedParticles")
+ {
+ menu_toggle_attached_particles(NULL);
+ }
+ return true;
+ }
+};
+
class LLSomethingSelected : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = !(LLSelectMgr::getInstance()->getSelection()->isEmpty());
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLSomethingSelectedNoHUD : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
bool new_value = !(selection->isEmpty()) && !(selection->getSelectType() == SELECT_TYPE_HUD);
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
-BOOL enable_more_than_one_selected(void* )
-{
- return (LLSelectMgr::getInstance()->getSelection()->getObjectCount() > 1);
-}
-
static bool is_editable_selected()
{
return (LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject() != NULL);
@@ -6249,32 +6675,30 @@ static bool is_editable_selected()
class LLEditableSelected : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
- gMenuHolder->findControl(userdata["control"].asString())->setValue(is_editable_selected());
- return true;
+ return is_editable_selected();
}
};
class LLEditableSelectedMono : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
+ bool new_value = false;
LLViewerRegion* region = gAgent.getRegion();
- if(region && gMenuHolder && gMenuHolder->findControl(userdata["control"].asString()))
+ if(region && gMenuHolder)
{
bool have_cap = (! region->getCapability("UpdateScriptTask").empty());
- bool selected = is_editable_selected() && have_cap;
- gMenuHolder->findControl(userdata["control"].asString())->setValue(selected);
- return true;
+ new_value = is_editable_selected() && have_cap;
}
- return false;
+ return new_value;
}
};
class LLToolsEnableTakeCopy : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool all_valid = false;
if (LLSelectMgr::getInstance())
@@ -6303,52 +6727,10 @@ class LLToolsEnableTakeCopy : public view_listener_t
}
}
- gMenuHolder->findControl(userdata["control"].asString())->setValue(all_valid);
- return true;
+ return all_valid;
}
};
-BOOL enable_selection_you_own_all(void*)
-{
- if (LLSelectMgr::getInstance())
- {
- struct f : public LLSelectedObjectFunctor
- {
- virtual bool apply(LLViewerObject* obj)
- {
- return (!obj->permYouOwner());
- }
- } func;
- const bool firstonly = true;
- bool no_perms = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
- if (no_perms)
- {
- return FALSE;
- }
- }
- return TRUE;
-}
-
-BOOL enable_selection_you_own_one(void*)
-{
- if (LLSelectMgr::getInstance())
- {
- struct f : public LLSelectedObjectFunctor
- {
- virtual bool apply(LLViewerObject* obj)
- {
- return (obj->permYouOwner());
- }
- } func;
- const bool firstonly = true;
- bool any_perms = LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func, firstonly);
- if (!any_perms)
- {
- return FALSE;
- }
- }
- return TRUE;
-}
class LLHasAsset : public LLInventoryCollectFunctor
{
@@ -6410,6 +6792,15 @@ BOOL enable_save_into_inventory(void*)
return FALSE;
}
+class LLToolsEnableSaveToInventory : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ bool new_value = enable_save_into_inventory(NULL);
+ return new_value;
+ }
+};
+
BOOL enable_save_into_task_inventory(void*)
{
LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstRootNode();
@@ -6427,101 +6818,65 @@ BOOL enable_save_into_task_inventory(void*)
class LLToolsEnableSaveToObjectInventory : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = enable_save_into_task_inventory(NULL);
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
-BOOL enable_not_thirdperson(void*)
-{
- return !gAgent.cameraThirdPerson();
-}
-
-
-// BOOL enable_export_selected(void *)
-// {
-// if (LLSelectMgr::getInstance()->getSelection()->isEmpty())
-// {
-// return FALSE;
-// }
-// if (!gExporterRequestID.isNull())
-// {
-// return FALSE;
-// }
-// if (!LLUploadDialog::modalUploadIsFinished())
-// {
-// return FALSE;
-// }
-// return TRUE;
-// }
class LLViewEnableMouselook : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// You can't go directly from customize avatar to mouselook.
// TODO: write code with appropriate dialogs to handle this transition.
bool new_value = (CAMERA_MODE_CUSTOMIZE_AVATAR != gAgent.getCameraMode() && !gSavedSettings.getBOOL("FreezeTime"));
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLToolsEnableToolNotPie : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = ( LLToolMgr::getInstance()->getBaseTool() != LLToolPie::getInstance() );
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLWorldEnableCreateLandmark : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = can_create_landmark();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
-
- return true;
+ return new_value;
}
};
class LLWorldEnableSetHomeLocation : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = gAgent.isGodlike() ||
(gAgent.getRegion() && gAgent.getRegion()->getAllowSetHome());
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLWorldEnableTeleportHome : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLViewerRegion* regionp = gAgent.getRegion();
bool agent_on_prelude = (regionp && regionp->isPrelude());
bool enable_teleport_home = gAgent.isGodlike() || !agent_on_prelude;
- gMenuHolder->findControl(userdata["control"].asString())->setValue(enable_teleport_home);
- return true;
+ return enable_teleport_home;
}
};
-BOOL enable_region_owner(void*)
-{
- if(gAgent.getRegion() && gAgent.getRegion()->getOwner() == gAgent.getID())
- return TRUE;
- return enable_god_customer_service(NULL);
-}
-
BOOL enable_god_full(void*)
{
return gAgent.getGodLevel() >= GOD_FULL;
@@ -6542,23 +6897,11 @@ BOOL enable_god_basic(void*)
return gAgent.getGodLevel() > GOD_NOT;
}
-#if 0 // 1.9.2
-void toggle_vertex_shaders(void *)
-{
- BOOL use_shaders = gPipeline.getUseVertexShaders();
- gPipeline.setUseVertexShaders(use_shaders);
-}
-
-BOOL check_vertex_shaders(void *)
-{
- return gPipeline.getUseVertexShaders();
-}
-#endif
void toggle_show_xui_names(void *)
{
BOOL showXUINames = gSavedSettings.getBOOL("ShowXUINames");
-
+
showXUINames = !showXUINames;
gSavedSettings.setBOOL("ShowXUINames", showXUINames);
}
@@ -6568,18 +6911,9 @@ BOOL check_show_xui_names(void *)
return gSavedSettings.getBOOL("ShowXUINames");
}
-
-
-void toggle_cull_small(void *)
-{
-// gPipeline.mCullBySize = !gPipeline.mCullBySize;
-//
-// gSavedSettings.setBOOL("RenderCullBySize", gPipeline.mCullBySize);
-}
-
class LLToolsSelectOnlyMyObjects : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
BOOL cur_val = gSavedSettings.getBOOL("SelectOwnedOnly");
@@ -6591,7 +6925,7 @@ class LLToolsSelectOnlyMyObjects : public view_listener_t
class LLToolsSelectOnlyMovableObjects : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
BOOL cur_val = gSavedSettings.getBOOL("SelectMovableOnly");
@@ -6603,7 +6937,7 @@ class LLToolsSelectOnlyMovableObjects : public view_listener_t
class LLToolsSelectBySurrounding : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLSelectMgr::sRectSelectInclusive = !LLSelectMgr::sRectSelectInclusive;
@@ -6614,7 +6948,7 @@ class LLToolsSelectBySurrounding : public view_listener_t
class LLToolsShowHiddenSelection : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// TomY TODO Merge these
LLSelectMgr::sRenderHiddenSelections = !LLSelectMgr::sRenderHiddenSelections;
@@ -6626,7 +6960,7 @@ class LLToolsShowHiddenSelection : public view_listener_t
class LLToolsShowSelectionLightRadius : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// TomY TODO merge these
LLSelectMgr::sRenderLightRadius = !LLSelectMgr::sRenderLightRadius;
@@ -6638,7 +6972,7 @@ class LLToolsShowSelectionLightRadius : public view_listener_t
class LLToolsEditLinkedParts : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
BOOL select_individuals = gSavedSettings.getBOOL("EditLinkedParts");
if (select_individuals)
@@ -6653,33 +6987,11 @@ class LLToolsEditLinkedParts : public view_listener_t
}
};
-void reload_personal_settings_overrides(void *)
-{
- llinfos << "Loading overrides from " << gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,"overrides.xml") << llendl;
-
- gSavedSettings.loadFromFile(gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT,"overrides.xml"));
-}
-
void reload_vertex_shader(void *)
{
//THIS WOULD BE AN AWESOME PLACE TO RELOAD SHADERS... just a thought - DaveP
}
-void slow_mo_animations(void*)
-{
- static BOOL slow_mo = FALSE;
- if (slow_mo)
- {
- gAgent.getAvatarObject()->setAnimTimeFactor(1.f);
- slow_mo = FALSE;
- }
- else
- {
- gAgent.getAvatarObject()->setAnimTimeFactor(0.2f);
- slow_mo = TRUE;
- }
-}
-
void handle_dump_avatar_local_textures(void*)
{
LLVOAvatar* avatar = gAgent.getAvatarObject();
@@ -6842,27 +7154,27 @@ void handle_disconnect_viewer(void *)
void force_error_breakpoint(void *)
{
- LLAppViewer::instance()->forceErrorBreakpoint();
+ LLAppViewer::instance()->forceErrorBreakpoint();
}
void force_error_llerror(void *)
{
- LLAppViewer::instance()->forceErrorLLError();
+ LLAppViewer::instance()->forceErrorLLError();
}
void force_error_bad_memory_access(void *)
{
- LLAppViewer::instance()->forceErrorBadMemoryAccess();
+ LLAppViewer::instance()->forceErrorBadMemoryAccess();
}
void force_error_infinite_loop(void *)
{
- LLAppViewer::instance()->forceErrorInifiniteLoop();
+ LLAppViewer::instance()->forceErrorInifiniteLoop();
}
void force_error_software_exception(void *)
{
- LLAppViewer::instance()->forceErrorSoftwareException();
+ LLAppViewer::instance()->forceErrorSoftwareException();
}
void force_error_driver_crash(void *)
@@ -6872,7 +7184,7 @@ void force_error_driver_crash(void *)
class LLToolsUseSelectionForGrid : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLSelectMgr::getInstance()->clearGridObjects();
struct f : public LLSelectedObjectFunctor
@@ -6905,10 +7217,6 @@ void handle_test_load_url(void*)
// LLViewerMenuHolderGL
//
-LLViewerMenuHolderGL::LLViewerMenuHolderGL() : LLMenuHolderGL()
-{
-}
-
BOOL LLViewerMenuHolderGL::hideMenus()
{
BOOL handled = LLMenuHolderGL::hideMenus();
@@ -6972,7 +7280,7 @@ void handle_load_from_xml(void*)
if (picker.getOpenFile(LLFilePicker::FFLOAD_XML))
{
std::string filename = picker.getFirstFile();
- LLFloater* floater = new LLFloater("sample_floater");
+ LLFloater* floater = new LLFloater();
LLUICtrlFactory::getInstance()->buildFloater(floater, filename);
}
}
@@ -7050,7 +7358,7 @@ BOOL get_visibility(void* user_data)
// TomY TODO: Get rid of these?
class LLViewShowHoverTips : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLHoverView::sShowHoverTips = !LLHoverView::sShowHoverTips;
return true;
@@ -7059,18 +7367,17 @@ class LLViewShowHoverTips : public view_listener_t
class LLViewCheckShowHoverTips : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLHoverView::sShowHoverTips;
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
// TomY TODO: Get rid of these?
class LLViewHighlightTransparent : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLDrawPoolAlpha::sShowDebugAlpha = !LLDrawPoolAlpha::sShowDebugAlpha;
return true;
@@ -7079,17 +7386,157 @@ class LLViewHighlightTransparent : public view_listener_t
class LLViewCheckHighlightTransparent : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLDrawPoolAlpha::sShowDebugAlpha;
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
+ return new_value;
+ }
+};
+
+class LLViewBeaconWidth : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ std::string width = userdata.asString();
+ if(width == "1")
+ {
+ gSavedSettings.setS32("DebugBeaconLineWidth", 1);
+ }
+ else if(width == "4")
+ {
+ gSavedSettings.setS32("DebugBeaconLineWidth", 4);
+ }
+ else if(width == "16")
+ {
+ gSavedSettings.setS32("DebugBeaconLineWidth", 16);
+ }
+ else if(width == "32")
+ {
+ gSavedSettings.setS32("DebugBeaconLineWidth", 32);
+ }
+
+ return true;
+ }
+};
+
+
+class LLViewToggleBeacon : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ std::string beacon = userdata.asString();
+ if (beacon == "scriptsbeacon")
+ {
+ LLPipeline::toggleRenderScriptedBeacons(NULL);
+ gSavedSettings.setBOOL( "scriptsbeacon", LLPipeline::getRenderScriptedBeacons(NULL) );
+ // toggle the other one off if it's on
+ if (LLPipeline::getRenderScriptedBeacons(NULL) && LLPipeline::getRenderScriptedTouchBeacons(NULL))
+ {
+ LLPipeline::toggleRenderScriptedTouchBeacons(NULL);
+ gSavedSettings.setBOOL( "scripttouchbeacon", LLPipeline::getRenderScriptedTouchBeacons(NULL) );
+ }
+ }
+ else if (beacon == "physicalbeacon")
+ {
+ LLPipeline::toggleRenderPhysicalBeacons(NULL);
+ gSavedSettings.setBOOL( "physicalbeacon", LLPipeline::getRenderPhysicalBeacons(NULL) );
+ }
+ else if (beacon == "soundsbeacon")
+ {
+ LLPipeline::toggleRenderSoundBeacons(NULL);
+ gSavedSettings.setBOOL( "soundsbeacon", LLPipeline::getRenderSoundBeacons(NULL) );
+ }
+ else if (beacon == "particlesbeacon")
+ {
+ LLPipeline::toggleRenderParticleBeacons(NULL);
+ gSavedSettings.setBOOL( "particlesbeacon", LLPipeline::getRenderParticleBeacons(NULL) );
+ }
+ else if (beacon == "scripttouchbeacon")
+ {
+ LLPipeline::toggleRenderScriptedTouchBeacons(NULL);
+ gSavedSettings.setBOOL( "scripttouchbeacon", LLPipeline::getRenderScriptedTouchBeacons(NULL) );
+ // toggle the other one off if it's on
+ if (LLPipeline::getRenderScriptedBeacons(NULL) && LLPipeline::getRenderScriptedTouchBeacons(NULL))
+ {
+ LLPipeline::toggleRenderScriptedBeacons(NULL);
+ gSavedSettings.setBOOL( "scriptsbeacon", LLPipeline::getRenderScriptedBeacons(NULL) );
+ }
+ }
+ else if (beacon == "renderbeacons")
+ {
+ LLPipeline::toggleRenderBeacons(NULL);
+ gSavedSettings.setBOOL( "renderbeacons", LLPipeline::getRenderBeacons(NULL) );
+ // toggle the other one on if it's not
+ if (!LLPipeline::getRenderBeacons(NULL) && !LLPipeline::getRenderHighlights(NULL))
+ {
+ LLPipeline::toggleRenderHighlights(NULL);
+ gSavedSettings.setBOOL( "renderhighlights", LLPipeline::getRenderHighlights(NULL) );
+ }
+ }
+ else if (beacon == "renderhighlights")
+ {
+ LLPipeline::toggleRenderHighlights(NULL);
+ gSavedSettings.setBOOL( "renderhighlights", LLPipeline::getRenderHighlights(NULL) );
+ // toggle the other one on if it's not
+ if (!LLPipeline::getRenderBeacons(NULL) && !LLPipeline::getRenderHighlights(NULL))
+ {
+ LLPipeline::toggleRenderBeacons(NULL);
+ gSavedSettings.setBOOL( "renderbeacons", LLPipeline::getRenderBeacons(NULL) );
+ }
+ }
+
return true;
}
};
+class LLViewCheckBeaconEnabled : public view_listener_t
+{
+ bool handleEvent(const LLSD& userdata)
+ {
+ std::string beacon = userdata.asString();
+ bool new_value = false;
+ if (beacon == "scriptsbeacon")
+ {
+ new_value = gSavedSettings.getBOOL( "scriptsbeacon");
+ LLPipeline::setRenderScriptedBeacons(new_value);
+ }
+ else if (beacon == "physicalbeacon")
+ {
+ new_value = gSavedSettings.getBOOL( "physicalbeacon");
+ LLPipeline::setRenderPhysicalBeacons(new_value);
+ }
+ else if (beacon == "soundsbeacon")
+ {
+ new_value = gSavedSettings.getBOOL( "soundsbeacon");
+ LLPipeline::setRenderSoundBeacons(new_value);
+ }
+ else if (beacon == "particlesbeacon")
+ {
+ new_value = gSavedSettings.getBOOL( "particlesbeacon");
+ LLPipeline::setRenderParticleBeacons(new_value);
+ }
+ else if (beacon == "scripttouchbeacon")
+ {
+ new_value = gSavedSettings.getBOOL( "scripttouchbeacon");
+ LLPipeline::setRenderScriptedTouchBeacons(new_value);
+ }
+ else if (beacon == "renderbeacons")
+ {
+ new_value = gSavedSettings.getBOOL( "renderbeacons");
+ LLPipeline::setRenderBeacons(new_value);
+ }
+ else if (beacon == "renderhighlights")
+ {
+ new_value = gSavedSettings.getBOOL( "renderhighlights");
+ LLPipeline::setRenderHighlights(new_value);
+ }
+ return new_value;
+ }
+};
+
class LLViewToggleRenderType : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
std::string type = userdata.asString();
if (type == "hideparticles")
@@ -7102,22 +7549,21 @@ class LLViewToggleRenderType : public view_listener_t
class LLViewCheckRenderType : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
- std::string type = userdata["data"].asString();
+ std::string type = userdata.asString();
bool new_value = false;
if (type == "hideparticles")
{
new_value = LLPipeline::toggleRenderTypeControlNegated((void *)LLPipeline::RENDER_TYPE_PARTICLES);
}
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLViewShowHUDAttachments : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLPipeline::sShowHUDAttachments = !LLPipeline::sShowHUDAttachments;
return true;
@@ -7126,20 +7572,18 @@ class LLViewShowHUDAttachments : public view_listener_t
class LLViewCheckHUDAttachments : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = LLPipeline::sShowHUDAttachments;
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLEditEnableTakeOff : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
- std::string control_name = userdata["control"].asString();
- std::string clothing = userdata["data"].asString();
+ std::string clothing = userdata.asString();
bool new_value = false;
if (clothing == "shirt")
{
@@ -7177,14 +7621,13 @@ class LLEditEnableTakeOff : public view_listener_t
{
new_value = LLAgent::selfHasWearable((void *)WT_SKIRT);
}
- gMenuHolder->findControl(control_name)->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLEditTakeOff : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
std::string clothing = userdata.asString();
if (clothing == "shirt")
@@ -7231,18 +7674,9 @@ class LLEditTakeOff : public view_listener_t
}
};
-class LLWorldChat : public view_listener_t
-{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
- {
- handle_chat(NULL);
- return true;
- }
-};
-
class LLToolsSelectTool : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
std::string tool_name = userdata.asString();
if (tool_name == "focus")
@@ -7272,11 +7706,11 @@ class LLToolsSelectTool : public view_listener_t
/// WINDLIGHT callbacks
class LLWorldEnvSettings : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
std::string tod = userdata.asString();
LLVector3 sun_direction;
-
+
if (tod == "editor")
{
// if not there or is hidden, show it
@@ -7288,11 +7722,11 @@ class LLWorldEnvSettings : public view_listener_t
}
else
{
- LLFloaterEnvSettings::instance()->close();
+ LLFloaterEnvSettings::instance()->closeFloater();
}
return true;
}
-
+
if (tod == "sunrise")
{
// set the value, turn off animation
@@ -7349,7 +7783,7 @@ class LLWorldEnvSettings : public view_listener_t
/// Water Menu callbacks
class LLWorldWaterSettings : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
// if not there or is hidden, show it
if( !LLFloaterWater::isOpen() ||
@@ -7360,7 +7794,7 @@ class LLWorldWaterSettings : public view_listener_t
}
else
{
- LLFloaterWater::instance()->close();
+ LLFloaterWater::instance()->closeFloater();
}
return true;
}
@@ -7369,7 +7803,7 @@ class LLWorldWaterSettings : public view_listener_t
/// Post-Process callbacks
class LLWorldPostProcess : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLFloaterPostProcess::show();
return true;
@@ -7379,7 +7813,7 @@ class LLWorldPostProcess : public view_listener_t
/// Day Cycle callbacks
class LLWorldDayCycle : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLFloaterDayCycle::show();
return true;
@@ -7388,12 +7822,6 @@ class LLWorldDayCycle : public view_listener_t
-static void addMenu(view_listener_t *menu, const std::string& name)
-{
- sMenus.push_back(menu);
- menu->registerListener(gMenuHolder, name);
-}
-
void initialize_menus()
{
// A parameterized event handler used as ctrl-8/9/0 zoom controls below.
@@ -7402,7 +7830,7 @@ void initialize_menus()
public:
// The "mult" parameter says whether "val" is a multiplier or used to set the value.
LLZoomer(F32 val, bool mult=true) : mVal(val), mMult(mult) {}
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
F32 new_fov_rad = mMult ? LLViewerCamera::getInstance()->getDefaultFOV() * mVal : mVal;
LLViewerCamera::getInstance()->setDefaultFOV(new_fov_rad);
@@ -7414,217 +7842,375 @@ void initialize_menus()
bool mMult;
};
- class LLAvatarReportAbuse : public view_listener_t
- {
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
- {
- LLVOAvatar* avatar = find_avatar_from_object( LLSelectMgr::getInstance()->getSelection()->getPrimaryObject() );
- if(avatar)
- {
- LLFloaterReporter::showFromObject(avatar->getID());
- }
- return true;
- }
- };
+ LLUICtrl::EnableCallbackRegistry::Registrar& enable = LLUICtrl::EnableCallbackRegistry::currentRegistrar();
+ LLUICtrl::CommitCallbackRegistry::Registrar& commit = LLUICtrl::CommitCallbackRegistry::currentRegistrar();
+
+ // Enable God Mode
+ view_listener_t::addMenu(new LLEnableGodCustomerService(), "EnableGodCustomerService");
+ // Agent
+ commit.add("Agent.toggleFlying", boost::bind(&LLAgent::toggleFlying));
+ enable.add("Agent.emableFlying", boost::bind(&LLAgent::enableFlying));
+
// File menu
init_menu_file();
// Edit menu
- addMenu(new LLEditUndo(), "Edit.Undo");
- addMenu(new LLEditRedo(), "Edit.Redo");
- addMenu(new LLEditCut(), "Edit.Cut");
- addMenu(new LLEditCopy(), "Edit.Copy");
- addMenu(new LLEditPaste(), "Edit.Paste");
- addMenu(new LLEditDelete(), "Edit.Delete");
- addMenu(new LLEditSearch(), "Edit.Search");
- addMenu(new LLEditSelectAll(), "Edit.SelectAll");
- addMenu(new LLEditDeselect(), "Edit.Deselect");
- addMenu(new LLEditDuplicate(), "Edit.Duplicate");
- addMenu(new LLEditTakeOff(), "Edit.TakeOff");
-
- addMenu(new LLEditEnableUndo(), "Edit.EnableUndo");
- addMenu(new LLEditEnableRedo(), "Edit.EnableRedo");
- addMenu(new LLEditEnableCut(), "Edit.EnableCut");
- addMenu(new LLEditEnableCopy(), "Edit.EnableCopy");
- addMenu(new LLEditEnablePaste(), "Edit.EnablePaste");
- addMenu(new LLEditEnableDelete(), "Edit.EnableDelete");
- addMenu(new LLEditEnableSelectAll(), "Edit.EnableSelectAll");
- addMenu(new LLEditEnableDeselect(), "Edit.EnableDeselect");
- addMenu(new LLEditEnableDuplicate(), "Edit.EnableDuplicate");
- addMenu(new LLEditEnableTakeOff(), "Edit.EnableTakeOff");
- addMenu(new LLEditEnableCustomizeAvatar(), "Edit.EnableCustomizeAvatar");
+ view_listener_t::addMenu(new LLEditUndo(), "Edit.Undo");
+ view_listener_t::addMenu(new LLEditRedo(), "Edit.Redo");
+ view_listener_t::addMenu(new LLEditCut(), "Edit.Cut");
+ view_listener_t::addMenu(new LLEditCopy(), "Edit.Copy");
+ view_listener_t::addMenu(new LLEditPaste(), "Edit.Paste");
+ view_listener_t::addMenu(new LLEditDelete(), "Edit.Delete");
+ view_listener_t::addMenu(new LLEditSelectAll(), "Edit.SelectAll");
+ view_listener_t::addMenu(new LLEditDeselect(), "Edit.Deselect");
+ view_listener_t::addMenu(new LLEditDuplicate(), "Edit.Duplicate");
+ view_listener_t::addMenu(new LLEditTakeOff(), "Edit.TakeOff");
+
+ view_listener_t::addMenu(new LLEditEnableUndo(), "Edit.EnableUndo");
+ view_listener_t::addMenu(new LLEditEnableRedo(), "Edit.EnableRedo");
+ view_listener_t::addMenu(new LLEditEnableCut(), "Edit.EnableCut");
+ view_listener_t::addMenu(new LLEditEnableCopy(), "Edit.EnableCopy");
+ view_listener_t::addMenu(new LLEditEnablePaste(), "Edit.EnablePaste");
+ view_listener_t::addMenu(new LLEditEnableDelete(), "Edit.EnableDelete");
+ view_listener_t::addMenu(new LLEditEnableSelectAll(), "Edit.EnableSelectAll");
+ view_listener_t::addMenu(new LLEditEnableDeselect(), "Edit.EnableDeselect");
+ view_listener_t::addMenu(new LLEditEnableDuplicate(), "Edit.EnableDuplicate");
+ view_listener_t::addMenu(new LLEditEnableTakeOff(), "Edit.EnableTakeOff");
+ view_listener_t::addMenu(new LLEditEnableCustomizeAvatar(), "Edit.EnableCustomizeAvatar");
// View menu
- addMenu(new LLViewMouselook(), "View.Mouselook");
- addMenu(new LLViewBuildMode(), "View.BuildMode");
- addMenu(new LLViewJoystickFlycam(), "View.JoystickFlycam");
- addMenu(new LLViewCommunicate(), "View.Communicate");
- addMenu(new LLViewResetView(), "View.ResetView");
- addMenu(new LLViewLookAtLastChatter(), "View.LookAtLastChatter");
- addMenu(new LLViewShowHoverTips(), "View.ShowHoverTips");
- addMenu(new LLViewHighlightTransparent(), "View.HighlightTransparent");
- addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType");
- addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments");
- addMenu(new LLZoomer(1.2f), "View.ZoomOut");
- addMenu(new LLZoomer(1/1.2f), "View.ZoomIn");
- addMenu(new LLZoomer(DEFAULT_FIELD_OF_VIEW, false), "View.ZoomDefault");
- addMenu(new LLViewFullscreen(), "View.Fullscreen");
- addMenu(new LLViewDefaultUISize(), "View.DefaultUISize");
-
- addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
- addMenu(new LLViewEnableJoystickFlycam(), "View.EnableJoystickFlycam");
- addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
-
- addMenu(new LLViewCheckBuildMode(), "View.CheckBuildMode");
- addMenu(new LLViewCheckJoystickFlycam(), "View.CheckJoystickFlycam");
- addMenu(new LLViewCheckShowHoverTips(), "View.CheckShowHoverTips");
- addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
- addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
- addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
+ view_listener_t::addMenu(new LLViewMouselook(), "View.Mouselook");
+ view_listener_t::addMenu(new LLViewJoystickFlycam(), "View.JoystickFlycam");
+ view_listener_t::addMenu(new LLViewResetView(), "View.ResetView");
+ view_listener_t::addMenu(new LLViewLookAtLastChatter(), "View.LookAtLastChatter");
+ view_listener_t::addMenu(new LLViewShowHoverTips(), "View.ShowHoverTips");
+ view_listener_t::addMenu(new LLViewHighlightTransparent(), "View.HighlightTransparent");
+ view_listener_t::addMenu(new LLViewToggleRenderType(), "View.ToggleRenderType");
+ view_listener_t::addMenu(new LLViewShowHUDAttachments(), "View.ShowHUDAttachments");
+ view_listener_t::addMenu(new LLZoomer(1.2f), "View.ZoomOut");
+ view_listener_t::addMenu(new LLZoomer(1/1.2f), "View.ZoomIn");
+ view_listener_t::addMenu(new LLZoomer(DEFAULT_FIELD_OF_VIEW, false), "View.ZoomDefault");
+ view_listener_t::addMenu(new LLViewFullscreen(), "View.Fullscreen");
+ view_listener_t::addMenu(new LLViewDefaultUISize(), "View.DefaultUISize");
+
+ view_listener_t::addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
+ view_listener_t::addMenu(new LLViewEnableJoystickFlycam(), "View.EnableJoystickFlycam");
+ view_listener_t::addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
+
+ view_listener_t::addMenu(new LLViewCheckJoystickFlycam(), "View.CheckJoystickFlycam");
+ view_listener_t::addMenu(new LLViewCheckShowHoverTips(), "View.CheckShowHoverTips");
+ view_listener_t::addMenu(new LLViewCheckHighlightTransparent(), "View.CheckHighlightTransparent");
+ view_listener_t::addMenu(new LLViewCheckRenderType(), "View.CheckRenderType");
+ view_listener_t::addMenu(new LLViewCheckHUDAttachments(), "View.CheckHUDAttachments");
// World menu
- addMenu(new LLWorldChat(), "World.Chat");
- addMenu(new LLWorldAlwaysRun(), "World.AlwaysRun");
- addMenu(new LLWorldFly(), "World.Fly");
- addMenu(new LLWorldEnableFly(), "World.EnableFly");
- addMenu(new LLWorldCreateLandmark(), "World.CreateLandmark");
- addMenu(new LLWorldSetHomeLocation(), "World.SetHomeLocation");
- addMenu(new LLWorldTeleportHome(), "World.TeleportHome");
- addMenu(new LLWorldSetAway(), "World.SetAway");
- addMenu(new LLWorldSetBusy(), "World.SetBusy");
-
- addMenu(new LLWorldEnableCreateLandmark(), "World.EnableCreateLandmark");
- addMenu(new LLWorldEnableSetHomeLocation(), "World.EnableSetHomeLocation");
- addMenu(new LLWorldEnableTeleportHome(), "World.EnableTeleportHome");
- addMenu(new LLWorldEnableBuyLand(), "World.EnableBuyLand");
-
- addMenu(new LLWorldCheckAlwaysRun(), "World.CheckAlwaysRun");
-
- (new LLWorldEnvSettings())->registerListener(gMenuHolder, "World.EnvSettings");
- (new LLWorldWaterSettings())->registerListener(gMenuHolder, "World.WaterSettings");
- (new LLWorldPostProcess())->registerListener(gMenuHolder, "World.PostProcess");
- (new LLWorldDayCycle())->registerListener(gMenuHolder, "World.DayCycle");
+ commit.add("World.Chat", boost::bind(&handle_chat, (void*)NULL));
+ view_listener_t::addMenu(new LLWorldAlwaysRun(), "World.AlwaysRun");
+ view_listener_t::addMenu(new LLWorldCreateLandmark(), "World.CreateLandmark");
+ view_listener_t::addMenu(new LLWorldSetHomeLocation(), "World.SetHomeLocation");
+ view_listener_t::addMenu(new LLWorldTeleportHome(), "World.TeleportHome");
+ view_listener_t::addMenu(new LLWorldSetAway(), "World.SetAway");
+ view_listener_t::addMenu(new LLWorldSetBusy(), "World.SetBusy");
+
+ view_listener_t::addMenu(new LLWorldEnableCreateLandmark(), "World.EnableCreateLandmark");
+ view_listener_t::addMenu(new LLWorldEnableSetHomeLocation(), "World.EnableSetHomeLocation");
+ view_listener_t::addMenu(new LLWorldEnableTeleportHome(), "World.EnableTeleportHome");
+ view_listener_t::addMenu(new LLWorldEnableBuyLand(), "World.EnableBuyLand");
+
+ view_listener_t::addMenu(new LLWorldCheckAlwaysRun(), "World.CheckAlwaysRun");
+
+ view_listener_t::addMenu(new LLWorldEnvSettings(), "World.EnvSettings");
+ view_listener_t::addMenu(new LLWorldWaterSettings(), "World.WaterSettings");
+ view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess");
+ view_listener_t::addMenu(new LLWorldDayCycle(), "World.DayCycle");
// Tools menu
- addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
- addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");
- addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects");
- addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding");
- addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection");
- addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius");
- addMenu(new LLToolsEditLinkedParts(), "Tools.EditLinkedParts");
- addMenu(new LLToolsSnapObjectXY(), "Tools.SnapObjectXY");
- addMenu(new LLToolsUseSelectionForGrid(), "Tools.UseSelectionForGrid");
- addMenu(new LLToolsLink(), "Tools.Link");
- addMenu(new LLToolsUnlink(), "Tools.Unlink");
- addMenu(new LLToolsStopAllAnimations(), "Tools.StopAllAnimations");
- addMenu(new LLToolsReleaseKeys(), "Tools.ReleaseKeys");
- addMenu(new LLToolsEnableReleaseKeys(), "Tools.EnableReleaseKeys");
- addMenu(new LLToolsLookAtSelection(), "Tools.LookAtSelection");
- addMenu(new LLToolsBuyOrTake(), "Tools.BuyOrTake");
- addMenu(new LLToolsTakeCopy(), "Tools.TakeCopy");
- addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory");
- addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction");
-
- addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie");
- addMenu(new LLToolsEnableLink(), "Tools.EnableLink");
- addMenu(new LLToolsEnableUnlink(), "Tools.EnableUnlink");
- addMenu(new LLToolsEnableBuyOrTake(), "Tools.EnableBuyOrTake");
- addMenu(new LLToolsEnableTakeCopy(), "Tools.EnableTakeCopy");
- addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.EnableSaveToObjectInventory");
-
- /*addMenu(new LLToolsVisibleBuyObject(), "Tools.VisibleBuyObject");
- addMenu(new LLToolsVisibleTakeObject(), "Tools.VisibleTakeObject");*/
+ view_listener_t::addMenu(new LLToolsSelectTool(), "Tools.SelectTool");
+ view_listener_t::addMenu(new LLToolsSelectOnlyMyObjects(), "Tools.SelectOnlyMyObjects");
+ view_listener_t::addMenu(new LLToolsSelectOnlyMovableObjects(), "Tools.SelectOnlyMovableObjects");
+ view_listener_t::addMenu(new LLToolsSelectBySurrounding(), "Tools.SelectBySurrounding");
+ view_listener_t::addMenu(new LLToolsShowHiddenSelection(), "Tools.ShowHiddenSelection");
+ view_listener_t::addMenu(new LLToolsShowSelectionLightRadius(), "Tools.ShowSelectionLightRadius");
+ view_listener_t::addMenu(new LLToolsEditLinkedParts(), "Tools.EditLinkedParts");
+ view_listener_t::addMenu(new LLToolsSnapObjectXY(), "Tools.SnapObjectXY");
+ view_listener_t::addMenu(new LLToolsUseSelectionForGrid(), "Tools.UseSelectionForGrid");
+ view_listener_t::addMenu(new LLToolsLink(), "Tools.Link");
+ view_listener_t::addMenu(new LLToolsUnlink(), "Tools.Unlink");
+ view_listener_t::addMenu(new LLToolsStopAllAnimations(), "Tools.StopAllAnimations");
+ view_listener_t::addMenu(new LLToolsReleaseKeys(), "Tools.ReleaseKeys");
+ view_listener_t::addMenu(new LLToolsEnableReleaseKeys(), "Tools.EnableReleaseKeys");
+ view_listener_t::addMenu(new LLToolsLookAtSelection(), "Tools.LookAtSelection");
+ view_listener_t::addMenu(new LLToolsBuyOrTake(), "Tools.BuyOrTake");
+ view_listener_t::addMenu(new LLToolsTakeCopy(), "Tools.TakeCopy");
+ view_listener_t::addMenu(new LLToolsSaveToInventory(), "Tools.SaveToInventory");
+ view_listener_t::addMenu(new LLToolsSaveToObjectInventory(), "Tools.SaveToObjectInventory");
+ view_listener_t::addMenu(new LLToolsSelectedScriptAction(), "Tools.SelectedScriptAction");
+
+ view_listener_t::addMenu(new LLToolsEnableToolNotPie(), "Tools.EnableToolNotPie");
+ view_listener_t::addMenu(new LLToolsEnableLink(), "Tools.EnableLink");
+ view_listener_t::addMenu(new LLToolsEnableUnlink(), "Tools.EnableUnlink");
+ view_listener_t::addMenu(new LLToolsEnableBuyOrTake(), "Tools.EnableBuyOrTake");
+ view_listener_t::addMenu(new LLToolsEnableTakeCopy(), "Tools.EnableTakeCopy");
+ view_listener_t::addMenu(new LLToolsEnableSaveToInventory(), "Tools.EnableSaveToInventory");
+ view_listener_t::addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.EnableSaveToObjectInventory");
+
+ /*view_listener_t::addMenu(new LLToolsVisibleBuyObject(), "Tools.VisibleBuyObject");
+ view_listener_t::addMenu(new LLToolsVisibleTakeObject(), "Tools.VisibleTakeObject");*/
// Help menu
// most items use the ShowFloater method
+ // Advance menu
+ view_listener_t::addMenu(new LLAdvancedToggleConsole(), "Advanced.ToggleConsole");
+ view_listener_t::addMenu(new LLAdvancedCheckConsole(), "Advanced.CheckConsole");
+ view_listener_t::addMenu(new LLAdvancedDumpInfoToConsole(), "Advanced.DumpInfoToConsole");
+ // Advanced > HUD Info
+ view_listener_t::addMenu(new LLAdvancedToggleHUDInfo(), "Advanced.ToggleHUDInfo");
+ view_listener_t::addMenu(new LLAdvancedCheckHUDInfo(), "Advanced.CheckHUDInfo");
+
+ // Advanced Other Settings
+ view_listener_t::addMenu(new LLAdvancedClearGroupCache(), "Advanced.ClearGroupCache");
+
+ // Advanced > Render > Types
+ view_listener_t::addMenu(new LLAdvancedToggleRenderType(), "Advanced.ToggleRenderType");
+ view_listener_t::addMenu(new LLAdvancedCheckRenderType(), "Advanced.CheckRenderType");
+
+ //// Advanced > Render > Features
+ view_listener_t::addMenu(new LLAdvancedToggleFeature(), "Advanced.ToggleFeature");
+ view_listener_t::addMenu(new LLAdvancedCheckFeature(), "Advanced.CheckFeature");
+ // Advanced > Render > Info Displays
+ view_listener_t::addMenu(new LLAdvancedToggleInfoDisplay(), "Advanced.ToggleInfoDisplay");
+ view_listener_t::addMenu(new LLAdvancedCheckInfoDisplay(), "Advanced.CheckInfoDisplay");
+ view_listener_t::addMenu(new LLAdvancedSelectedTextureInfo(), "Advanced.SelectedTextureInfo");
+ view_listener_t::addMenu(new LLAdvancedToggleWireframe(), "Advanced.ToggleWireframe");
+ view_listener_t::addMenu(new LLAdvancedCheckWireframe(), "Advanced.CheckWireframe");
+ view_listener_t::addMenu(new LLAdvancedToggleDisableTextures(), "Advanced.ToggleDisableTextures");
+ view_listener_t::addMenu(new LLAdvancedCheckDisableTextures(), "Advanced.CheckDisableTextures");
+ view_listener_t::addMenu(new LLAdvancedEnableObjectObjectOcclusion(), "Advanced.EnableObjectObjectOcclusion");
+ view_listener_t::addMenu(new LLAdvancedToggleRandomizeFramerate(), "Advanced.ToggleRandomizeFramerate");
+ view_listener_t::addMenu(new LLAdvancedCheckRandomizeFramerate(), "Advanced.CheckRandomizeFramerate");
+ view_listener_t::addMenu(new LLAdvancedTogglePeriodicSlowFrame(), "Advanced.TogglePeriodicSlowFrame");
+ view_listener_t::addMenu(new LLAdvancedCheckPeriodicSlowFrame(), "Advanced.CheckPeriodicSlowFrame");
+ view_listener_t::addMenu(new LLAdvancedVectorizePerfTest(), "Advanced.VectorizePerfTest");
+ view_listener_t::addMenu(new LLAdvancedToggleFrameTest(), "Advanced.ToggleFrameTest");
+ view_listener_t::addMenu(new LLAdvancedCheckFrameTest(), "Advanced.CheckFrameTest");
+ view_listener_t::addMenu(new LLAdvancedHandleAttchedLightParticles(), "Advanced.HandleAttchedLightParticles");
+
+
+ #ifdef TOGGLE_HACKED_GODLIKE_VIEWER
+ view_listener_t::addMenu(new LLAdvancedHandleToggleHackedGodmode(), "Advanced.HandleToggleHackedGodmode");
+ view_listener_t::addMenu(new LLAdvancedCheckToggleHackedGodmode(), "Advanced.CheckToggleHackedGodmode");
+ view_listener_t::addMenu(new LLAdvancedEnableToggleHackedGodmode(), "Advanced.EnableToggleHackedGodmode");
+ #endif
+
+ // Advanced > World
+ view_listener_t::addMenu(new LLAdvancedDumpScriptedCamera(), "Advanced.DumpScriptedCamera");
+ view_listener_t::addMenu(new LLAdvancedDumpRegionObjectCache(), "Advanced.DumpRegionObjectCache");
+
+ // Advanced > UI
+ view_listener_t::addMenu(new LLAdvancedWebBrowserTest(), "Advanced.WebBrowserTest");
+ view_listener_t::addMenu(new LLAdvancedBuyCurrencyTest(), "Advanced.BuyCurrencyTest");
+ view_listener_t::addMenu(new LLAdvancedToggleEditableUI(), "Advanced.ToggleEditableUI");
+ view_listener_t::addMenu(new LLAdvancedDumpSelectMgr(), "Advanced.DumpSelectMgr");
+ view_listener_t::addMenu(new LLAdvancedDumpInventory(), "Advanced.DumpInventory");
+ view_listener_t::addMenu(new LLAdvancedDumpFocusHolder(), "Advanced.DumpFocusHolder");
+ view_listener_t::addMenu(new LLAdvancedPrintSelectedObjectInfo(), "Advanced.PrintSelectedObjectInfo");
+ view_listener_t::addMenu(new LLAdvancedPrintAgentInfo(), "Advanced.PrintAgentInfo");
+ view_listener_t::addMenu(new LLAdvancedPrintTextureMemoryStats(), "Advanced.PrintTextureMemoryStats");
+ view_listener_t::addMenu(new LLAdvancedToggleDebugClicks(), "Advanced.ToggleDebugClicks");
+ view_listener_t::addMenu(new LLAdvancedCheckDebugClicks(), "Advanced.CheckDebugClicks");
+ view_listener_t::addMenu(new LLAdvancedCheckDebugViews(), "Advanced.CheckDebugViews");
+ view_listener_t::addMenu(new LLAdvancedToggleDebugViews(), "Advanced.ToggleDebugViews");
+ view_listener_t::addMenu(new LLAdvancedToggleXUINameTooltips(), "Advanced.ToggleXUINameTooltips");
+ view_listener_t::addMenu(new LLAdvancedCheckXUINameTooltips(), "Advanced.CheckXUINameTooltips");
+ view_listener_t::addMenu(new LLAdvancedToggleDebugMouseEvents(), "Advanced.ToggleDebugMouseEvents");
+ view_listener_t::addMenu(new LLAdvancedCheckDebugMouseEvents(), "Advanced.CheckDebugMouseEvents");
+ view_listener_t::addMenu(new LLAdvancedToggleDebugKeys(), "Advanced.ToggleDebugKeys");
+ view_listener_t::addMenu(new LLAdvancedCheckDebugKeys(), "Advanced.CheckDebugKeys");
+ view_listener_t::addMenu(new LLAdvancedToggleDebugWindowProc(), "Advanced.ToggleDebugWindowProc");
+ view_listener_t::addMenu(new LLAdvancedCheckDebugWindowProc(), "Advanced.CheckDebugWindowProc");
+
+
+ // Advanced > XUI
+ view_listener_t::addMenu(new LLAdvancedShowFontTest(), "Advanced.ShowFontTest");
+ view_listener_t::addMenu(new LLAdvancedLoadUIFromXML(), "Advanced.LoadUIFromXML");
+ view_listener_t::addMenu(new LLAdvancedSaveUIToXML(), "Advanced.SaveUIToXML");
+ view_listener_t::addMenu(new LLAdvancedToggleXUINames(), "Advanced.ToggleXUINames");
+ view_listener_t::addMenu(new LLAdvancedCheckXUINames(), "Advanced.CheckXUINames");
+
+ // Advanced > Character > Grab Baked Texture
+ view_listener_t::addMenu(new LLAdvancedGrabBakedTexture(), "Advanced.GrabBakedTexture");
+ view_listener_t::addMenu(new LLAdvancedEnableGrabBakedTexture(), "Advanced.EnableGrabBakedTexture");
+
+ // Advanced > Character > Character Tests
+ view_listener_t::addMenu(new LLAdvancedAppearanceToXML(), "Advanced.AppearanceToXML");
+ view_listener_t::addMenu(new LLAdvancedToggleCharacterGeometry(), "Advanced.ToggleCharacterGeometry");
+
+ view_listener_t::addMenu(new LLAdvancedTestMale(), "Advanced.TestMale");
+ view_listener_t::addMenu(new LLAdvancedTestFemale(), "Advanced.TestFemale");
+ view_listener_t::addMenu(new LLAdvancedTogglePG(), "Advanced.TogglePG");
+
+ // Advanced > Character (toplevel)
+ view_listener_t::addMenu(new LLAdvancedToggleAllowTapTapHoldRun(), "Advanced.ToggleAllowTapTapHoldRun");
+ view_listener_t::addMenu(new LLAdvancedCheckAllowTapTapHoldRun(), "Advanced.CheckAllowTapTapHoldRun");
+ view_listener_t::addMenu(new LLAdvancedForceParamsToDefault(), "Advanced.ForceParamsToDefault");
+ view_listener_t::addMenu(new LLAdvancedReloadVertexShader(), "Advanced.ReloadVertexShader");
+ view_listener_t::addMenu(new LLAdvancedToggleAnimationInfo(), "Advanced.ToggleAnimationInfo");
+ view_listener_t::addMenu(new LLAdvancedCheckAnimationInfo(), "Advanced.CheckAnimationInfo");
+ view_listener_t::addMenu(new LLAdvancedToggleShowLookAt(), "Advanced.ToggleShowLookAt");
+ view_listener_t::addMenu(new LLAdvancedCheckShowLookAt(), "Advanced.CheckShowLookAt");
+ view_listener_t::addMenu(new LLAdvancedToggleShowPointAt(), "Advanced.ToggleShowPointAt");
+ view_listener_t::addMenu(new LLAdvancedCheckShowPointAt(), "Advanced.CheckShowPointAt");
+ view_listener_t::addMenu(new LLAdvancedToggleDebugJointUpdates(), "Advanced.ToggleDebugJointUpdates");
+ view_listener_t::addMenu(new LLAdvancedCheckDebugJointUpdates(), "Advanced.CheckDebugJointUpdates");
+ view_listener_t::addMenu(new LLAdvancedToggleDisableLOD(), "Advanced.ToggleDisableLOD");
+ view_listener_t::addMenu(new LLAdvancedCheckDisableLOD(), "Advanced.CheckDisableLOD");
+ view_listener_t::addMenu(new LLAdvancedToggleDebugCharacterVis(), "Advanced.ToggleDebugCharacterVis");
+ view_listener_t::addMenu(new LLAdvancedCheckDebugCharacterVis(), "Advanced.CheckDebugCharacterVis");
+ view_listener_t::addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments");
+ view_listener_t::addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures");
+ #ifndef LL_RELEASE_FOR_DOWNLOAD
+ view_listener_t::addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures");
+ view_listener_t::addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures");
+ view_listener_t::addMenu(new LLAdvancedMemoryLeakingSimulation(), "Advanced.MemoryLeakingSimulation");
+ #endif
+ // Advanced > Network
+ view_listener_t::addMenu(new LLAdvancedEnableMessageLog(), "Advanced.EnableMessageLog");
+ view_listener_t::addMenu(new LLAdvancedDisableMessageLog(), "Advanced.DisableMessageLog");
+ view_listener_t::addMenu(new LLAdvancedDropPacket(), "Advanced.DropPacket");
+
+ // Advanced > Recorder
+ view_listener_t::addMenu(new LLAdvancedAgentPilot(), "Advanced.AgentPilot");
+ view_listener_t::addMenu(new LLAdvancedToggleAgentPilotLoop(), "Advanced.ToggleAgentPilotLoop");
+ view_listener_t::addMenu(new LLAdvancedCheckAgentPilotLoop(), "Advanced.CheckAgentPilotLoop");
+
+ // Advanced > Debugging
+ view_listener_t::addMenu(new LLAdvancedForceErrorBreakpoint(), "Advanced.ForceErrorBreakpoint");
+ view_listener_t::addMenu(new LLAdvancedForceErrorLlerror(), "Advanced.ForceErrorLlerror");
+ view_listener_t::addMenu(new LLAdvancedForceErrorBadMemoryAccess(), "Advanced.ForceErrorBadMemoryAccess");
+ view_listener_t::addMenu(new LLAdvancedForceErrorInfiniteLoop(), "Advanced.ForceErrorInfiniteLoop");
+ view_listener_t::addMenu(new LLAdvancedForceErrorSoftwareException(), "Advanced.ForceErrorSoftwareException");
+ view_listener_t::addMenu(new LLAdvancedForceErrorDriverCrash(), "Advanced.ForceErrorDriverCrash");
+ view_listener_t::addMenu(new LLAdvancedForceErrorDriverCrash(), "Advanced.ForceErrorDisconnectViewer");
+
+ // Advanced (toplevel)
+ view_listener_t::addMenu(new LLAdvancedToggleShowObjectUpdates(), "Advanced.ToggleShowObjectUpdates");
+ view_listener_t::addMenu(new LLAdvancedCheckShowObjectUpdates(), "Advanced.CheckShowObjectUpdates");
+ view_listener_t::addMenu(new LLAdvancedCompressImage(), "Advanced.CompressImage");
+ view_listener_t::addMenu(new LLAdvancedShowDebugSettings(), "Advanced.ShowDebugSettings");
+ view_listener_t::addMenu(new LLAdvancedToggleViewAdminOptions(), "Advanced.ToggleViewAdminOptions");
+ view_listener_t::addMenu(new LLAdvancedCheckViewAdminOptions(), "Advanced.CheckViewAdminOptions");
+ view_listener_t::addMenu(new LLAdvancedRequestAdminStatus(), "Advanced.RequestAdminStatus");
+ view_listener_t::addMenu(new LLAdvancedLeaveAdminStatus(), "Advanced.LeaveAdminStatus");
+
+
+ // Admin >Object
+ view_listener_t::addMenu(new LLAdminForceTakeCopy(), "Admin.ForceTakeCopy");
+ view_listener_t::addMenu(new LLAdminHandleObjectOwnerSelf(), "Admin.HandleObjectOwnerSelf");
+ view_listener_t::addMenu(new LLAdminHandleObjectOwnerPermissive(), "Admin.HandleObjectOwnerPermissive");
+ view_listener_t::addMenu(new LLAdminHandleForceDelete(), "Admin.HandleForceDelete");
+ view_listener_t::addMenu(new LLAdminHandleObjectLock(), "Admin.HandleObjectLock");
+ view_listener_t::addMenu(new LLAdminHandleObjectAssetIDs(), "Admin.HandleObjectAssetIDs");
+
+ // Admin >Parcel
+ view_listener_t::addMenu(new LLAdminHandleForceParcelOwnerToMe(), "Admin.HandleForceParcelOwnerToMe");
+ view_listener_t::addMenu(new LLAdminHandleForceParcelToContent(), "Admin.HandleForceParcelToContent");
+ view_listener_t::addMenu(new LLAdminHandleClaimPublicLand(), "Admin.HandleClaimPublicLand");
+
+ // Admin >Region
+ view_listener_t::addMenu(new LLAdminHandleRegionDumpTempAssetData(), "Admin.HandleRegionDumpTempAssetData");
+ // Admin top level
+ view_listener_t::addMenu(new LLAdminShowGodTools(), "Admin.ShowGodTools");
+ view_listener_t::addMenu(new LLAdminOnSaveState(), "Admin.OnSaveState");
+
// Self pie menu
- addMenu(new LLSelfStandUp(), "Self.StandUp");
- addMenu(new LLSelfRemoveAllAttachments(), "Self.RemoveAllAttachments");
-
- addMenu(new LLSelfEnableStandUp(), "Self.EnableStandUp");
- addMenu(new LLSelfEnableRemoveAllAttachments(), "Self.EnableRemoveAllAttachments");
-
- // Avatar pie menu
- addMenu(new LLObjectMute(), "Avatar.Mute");
- addMenu(new LLAvatarAddFriend(), "Avatar.AddFriend");
- addMenu(new LLAvatarFreeze(), "Avatar.Freeze");
- addMenu(new LLAvatarDebug(), "Avatar.Debug");
- addMenu(new LLAvatarVisibleDebug(), "Avatar.VisibleDebug");
- addMenu(new LLAvatarEnableDebug(), "Avatar.EnableDebug");
- addMenu(new LLAvatarInviteToGroup(), "Avatar.InviteToGroup");
- addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard");
- addMenu(new LLAvatarEject(), "Avatar.Eject");
- addMenu(new LLAvatarSendIM(), "Avatar.SendIM");
- addMenu(new LLAvatarReportAbuse(), "Avatar.ReportAbuse");
+ view_listener_t::addMenu(new LLSelfStandUp(), "Self.StandUp");
+ view_listener_t::addMenu(new LLSelfRemoveAllAttachments(), "Self.RemoveAllAttachments");
+
+ view_listener_t::addMenu(new LLSelfEnableStandUp(), "Self.EnableStandUp");
+ view_listener_t::addMenu(new LLSelfEnableRemoveAllAttachments(), "Self.EnableRemoveAllAttachments");
+
+ // Avatar pie menu
+ view_listener_t::addMenu(new LLObjectMute(), "Avatar.Mute");
+ view_listener_t::addMenu(new LLAvatarAddFriend(), "Avatar.AddFriend");
+ view_listener_t::addMenu(new LLAvatarFreeze(), "Avatar.Freeze");
+ view_listener_t::addMenu(new LLAvatarDebug(), "Avatar.Debug");
+ view_listener_t::addMenu(new LLAvatarVisibleDebug(), "Avatar.VisibleDebug");
+ view_listener_t::addMenu(new LLAvatarEnableDebug(), "Avatar.EnableDebug");
+ view_listener_t::addMenu(new LLAvatarInviteToGroup(), "Avatar.InviteToGroup");
+ view_listener_t::addMenu(new LLAvatarGiveCard(), "Avatar.GiveCard");
+ view_listener_t::addMenu(new LLAvatarEject(), "Avatar.Eject");
+ view_listener_t::addMenu(new LLAvatarSendIM(), "Avatar.SendIM");
+ view_listener_t::addMenu(new LLAvatarReportAbuse(), "Avatar.ReportAbuse");
- addMenu(new LLObjectEnableMute(), "Avatar.EnableMute");
- addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend");
- addMenu(new LLAvatarEnableFreezeEject(), "Avatar.EnableFreezeEject");
+ view_listener_t::addMenu(new LLObjectEnableMute(), "Avatar.EnableMute");
+ view_listener_t::addMenu(new LLAvatarEnableAddFriend(), "Avatar.EnableAddFriend");
+ view_listener_t::addMenu(new LLAvatarEnableFreezeEject(), "Avatar.EnableFreezeEject");
// Object pie menu
- addMenu(new LLObjectOpen(), "Object.Open");
- addMenu(new LLObjectBuild(), "Object.Build");
- addMenu(new LLObjectTouch(), "Object.Touch");
- addMenu(new LLObjectSitOrStand(), "Object.SitOrStand");
- addMenu(new LLObjectDelete(), "Object.Delete");
- addMenu(new LLObjectAttachToAvatar(), "Object.AttachToAvatar");
- addMenu(new LLObjectReturn(), "Object.Return");
- addMenu(new LLObjectReportAbuse(), "Object.ReportAbuse");
- addMenu(new LLObjectMute(), "Object.Mute");
- addMenu(new LLObjectBuy(), "Object.Buy");
- addMenu(new LLObjectEdit(), "Object.Edit");
- addMenu(new LLObjectInspect(), "Object.Inspect");
-
- addMenu(new LLObjectEnableOpen(), "Object.EnableOpen");
- addMenu(new LLObjectEnableTouch(), "Object.EnableTouch");
- addMenu(new LLObjectEnableSitOrStand(), "Object.EnableSitOrStand");
- addMenu(new LLObjectEnableDelete(), "Object.EnableDelete");
- addMenu(new LLObjectEnableWear(), "Object.EnableWear");
- addMenu(new LLObjectEnableReturn(), "Object.EnableReturn");
- addMenu(new LLObjectEnableReportAbuse(), "Object.EnableReportAbuse");
- addMenu(new LLObjectEnableMute(), "Object.EnableMute");
- addMenu(new LLObjectEnableBuy(), "Object.EnableBuy");
-
- /*addMenu(new LLObjectVisibleTouch(), "Object.VisibleTouch");
- addMenu(new LLObjectVisibleCustomTouch(), "Object.VisibleCustomTouch");
- addMenu(new LLObjectVisibleStandUp(), "Object.VisibleStandUp");
- addMenu(new LLObjectVisibleSitHere(), "Object.VisibleSitHere");
- addMenu(new LLObjectVisibleCustomSit(), "Object.VisibleCustomSit");*/
+ view_listener_t::addMenu(new LLObjectOpen(), "Object.Open");
+ view_listener_t::addMenu(new LLObjectBuild(), "Object.Build");
+ view_listener_t::addMenu(new LLObjectTouch(), "Object.Touch");
+ view_listener_t::addMenu(new LLObjectSitOrStand(), "Object.SitOrStand");
+ view_listener_t::addMenu(new LLObjectDelete(), "Object.Delete");
+ view_listener_t::addMenu(new LLObjectAttachToAvatar(), "Object.AttachToAvatar");
+ view_listener_t::addMenu(new LLObjectReturn(), "Object.Return");
+ view_listener_t::addMenu(new LLObjectReportAbuse(), "Object.ReportAbuse");
+ view_listener_t::addMenu(new LLObjectMute(), "Object.Mute");
+ view_listener_t::addMenu(new LLObjectBuy(), "Object.Buy");
+ view_listener_t::addMenu(new LLObjectEdit(), "Object.Edit");
+ view_listener_t::addMenu(new LLObjectInspect(), "Object.Inspect");
+
+ view_listener_t::addMenu(new LLObjectEnableOpen(), "Object.EnableOpen");
+ view_listener_t::addMenu(new LLObjectEnableTouch(), "Object.EnableTouch");
+ view_listener_t::addMenu(new LLObjectEnableSitOrStand(), "Object.EnableSitOrStand");
+ view_listener_t::addMenu(new LLObjectEnableDelete(), "Object.EnableDelete");
+ view_listener_t::addMenu(new LLObjectEnableWear(), "Object.EnableWear");
+ view_listener_t::addMenu(new LLObjectEnableReturn(), "Object.EnableReturn");
+ view_listener_t::addMenu(new LLObjectEnableReportAbuse(), "Object.EnableReportAbuse");
+ view_listener_t::addMenu(new LLObjectEnableMute(), "Object.EnableMute");
+ view_listener_t::addMenu(new LLObjectEnableBuy(), "Object.EnableBuy");
+
+ /*view_listener_t::addMenu(new LLObjectVisibleTouch(), "Object.VisibleTouch");
+ view_listener_t::addMenu(new LLObjectVisibleCustomTouch(), "Object.VisibleCustomTouch");
+ view_listener_t::addMenu(new LLObjectVisibleStandUp(), "Object.VisibleStandUp");
+ view_listener_t::addMenu(new LLObjectVisibleSitHere(), "Object.VisibleSitHere");
+ view_listener_t::addMenu(new LLObjectVisibleCustomSit(), "Object.VisibleCustomSit");*/
// Attachment pie menu
- addMenu(new LLAttachmentDrop(), "Attachment.Drop");
- addMenu(new LLAttachmentDetach(), "Attachment.Detach");
-
- addMenu(new LLAttachmentEnableDrop(), "Attachment.EnableDrop");
- addMenu(new LLAttachmentEnableDetach(), "Attachment.EnableDetach");
+ enable.add("Attachment.Label", boost::bind(&onEnableAttachmentLabel, _1, _2));
+ view_listener_t::addMenu(new LLAttachmentDrop(), "Attachment.Drop");
+ view_listener_t::addMenu(new LLAttachmentDetachFromPoint(), "Attachment.DetachFromPoint");
+ view_listener_t::addMenu(new LLAttachmentDetach(), "Attachment.Detach");
+ view_listener_t::addMenu(new LLAttachmentPointFilled(), "Attachment.PointFilled");
+ view_listener_t::addMenu(new LLAttachmentEnableDrop(), "Attachment.EnableDrop");
+ view_listener_t::addMenu(new LLAttachmentEnableDetach(), "Attachment.EnableDetach");
// Land pie menu
- addMenu(new LLLandBuild(), "Land.Build");
- addMenu(new LLLandSit(), "Land.Sit");
- addMenu(new LLLandBuyPass(), "Land.BuyPass");
- addMenu(new LLLandEdit(), "Land.Edit");
+ view_listener_t::addMenu(new LLLandBuild(), "Land.Build");
+ view_listener_t::addMenu(new LLLandSit(), "Land.Sit");
+ view_listener_t::addMenu(new LLLandBuyPass(), "Land.BuyPass");
+ view_listener_t::addMenu(new LLLandEdit(), "Land.Edit");
- addMenu(new LLLandEnableBuyPass(), "Land.EnableBuyPass");
+ view_listener_t::addMenu(new LLLandEnableBuyPass(), "Land.EnableBuyPass");
// Generic actions
- addMenu(new LLShowFloater(), "ShowFloater");
- addMenu(new LLPromptShowURL(), "PromptShowURL");
- addMenu(new LLShowAgentProfile(), "ShowAgentProfile");
- addMenu(new LLShowAgentGroups(), "ShowAgentGroups");
- addMenu(new LLToggleControl(), "ToggleControl");
-
- addMenu(new LLGoToObject(), "GoToObject");
- addMenu(new LLPayObject(), "PayObject");
-
- addMenu(new LLEnablePayObject(), "EnablePayObject");
- addMenu(new LLEnableEdit(), "EnableEdit");
-
- addMenu(new LLFloaterVisible(), "FloaterVisible");
- addMenu(new LLSomethingSelected(), "SomethingSelected");
- addMenu(new LLSomethingSelectedNoHUD(), "SomethingSelectedNoHUD");
- addMenu(new LLEditableSelected(), "EditableSelected");
- addMenu(new LLEditableSelectedMono(), "EditableSelectedMono");
+ view_listener_t::addMenu(new LLShowFloater(), "ShowFloater");
+ view_listener_t::addMenu(new LLPromptShowURL(), "PromptShowURL");
+ view_listener_t::addMenu(new LLShowAgentProfile(), "ShowAgentProfile");
+ view_listener_t::addMenu(new LLToggleControl(), "ToggleControl");
+ view_listener_t::addMenu(new LLCheckControl(), "CheckControl");
+ view_listener_t::addMenu(new LLGoToObject(), "GoToObject");
+ view_listener_t::addMenu(new LLPayObject(), "PayObject");
+
+ view_listener_t::addMenu(new LLEnablePayObject(), "EnablePayObject");
+ view_listener_t::addMenu(new LLEnableEdit(), "EnableEdit");
+
+ view_listener_t::addMenu(new LLFloaterVisible(), "FloaterVisible");
+ view_listener_t::addMenu(new LLSomethingSelected(), "SomethingSelected");
+ view_listener_t::addMenu(new LLSomethingSelectedNoHUD(), "SomethingSelectedNoHUD");
+ view_listener_t::addMenu(new LLEditableSelected(), "EditableSelected");
+ view_listener_t::addMenu(new LLEditableSelectedMono(), "EditableSelectedMono");
+
}
diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index e9fedf37d8..99994bdf5b 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -34,6 +34,7 @@
#define LL_LLVIEWERMENU_H
#include "llmenugl.h"
+#include "llsafehandle.h"
//newview includes
#include "llfilepicker.h"
@@ -44,7 +45,6 @@ class LLParcelSelection;
class LLObjectSelection;
-void pre_init_menus();
void init_menus();
void cleanup_menus();
@@ -79,26 +79,22 @@ BOOL enable_redo(void*);
BOOL is_agent_friend(const LLUUID& agent_id);
BOOL is_agent_mappable(const LLUUID& agent_id);
-void menu_toggle_control( void* user_data );
void confirm_replace_attachment(S32 option, void* user_data);
-void handle_detach_from_avatar(void* user_data);
-void attach_label(std::string& label, void* user_data);
-void detach_label(std::string& label, void* user_data);
-BOOL object_selected_and_point_valid(void* user_data);
-BOOL object_attached(void* user_data);
+void handle_detach_from_avatar(const LLSD& user_data);
+void attach_label(std::string& label, const LLSD&);
+void detach_label(std::string& label, const LLSD&);
+BOOL object_selected_and_point_valid(const LLSD&);
void handle_detach(void*);
BOOL enable_god_full(void* user_data);
BOOL enable_god_liaison(void* user_data);
BOOL enable_god_customer_service(void* user_data);
BOOL enable_god_basic(void* user_data);
-void handle_show_newest_map(void*);
void set_underclothes_menu_options();
void exchange_callingcard(const LLUUID& dest_id);
void handle_gestures(void*);
void handle_sit_down(void*);
-bool toggle_build_mode();
void handle_object_build(void*);
void handle_save_snapshot(void *);
void handle_toggle_flycam();
@@ -119,8 +115,6 @@ class LLPermissions;
class LLViewerMenuHolderGL : public LLMenuHolderGL
{
public:
- LLViewerMenuHolderGL();
-
virtual BOOL hideMenus();
void setParcelSelection(LLSafeHandle<LLParcelSelection> selection);
@@ -142,30 +136,31 @@ extern LLViewerMenuHolderGL* gMenuHolder;
extern LLMenuBarGL* gLoginMenuBarView;
// Pie menus
-extern LLPieMenu *gPieSelf;
-extern LLPieMenu *gPieAvatar;
-extern LLPieMenu *gPieObject;
-extern LLPieMenu *gPieAttachment;
-extern LLPieMenu *gPieLand;
-extern LLPieMenu* gPieRate;
+extern LLContextMenu *gPieSelf;
+extern LLContextMenu *gPieAvatar;
+extern LLContextMenu *gPieObject;
+extern LLContextMenu *gPieAttachment;
+
+extern LLContextMenu *gPieLand;
+extern LLContextMenu *gPieRate;
// Pie menus
-extern LLPieMenu *gPieSelfSimple;
-extern LLPieMenu *gPieAvatarSimple;
-extern LLPieMenu *gPieObjectSimple;
-extern LLPieMenu *gPieAttachmentSimple;
-extern LLPieMenu *gPieLandSimple;
+extern LLContextMenu *gPieSelfSimple;
+extern LLContextMenu *gPieAvatarSimple;
+extern LLContextMenu *gPieObjectSimple;
+extern LLContextMenu *gPieAttachmentSimple;
+extern LLContextMenu *gPieLandSimple;
// Needed to build menus when attachment site list available
extern LLMenuGL* gAttachSubMenu;
extern LLMenuGL* gDetachSubMenu;
extern LLMenuGL* gTakeOffClothes;
-extern LLPieMenu* gAttachScreenPieMenu;
-extern LLPieMenu* gDetachScreenPieMenu;
-extern LLPieMenu* gAttachPieMenu;
-extern LLPieMenu* gDetachPieMenu;
-extern LLPieMenu* gAttachBodyPartPieMenus[8];
-extern LLPieMenu* gDetachBodyPartPieMenus[8];
+extern LLContextMenu* gAttachScreenPieMenu;
+extern LLContextMenu* gDetachScreenPieMenu;
+extern LLContextMenu* gAttachPieMenu;
+extern LLContextMenu* gDetachPieMenu;
+extern LLContextMenu* gAttachBodyPartPieMenus[8];
+extern LLContextMenu* gDetachBodyPartPieMenus[8];
extern LLMenuItemCallGL* gAFKMenu;
extern LLMenuItemCallGL* gBusyMenu;
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 5240fd3211..97b121d71d 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -55,13 +55,13 @@
#include "llviewerwindow.h"
#include "llappviewer.h"
#include "lluploaddialog.h"
+#include "lltrans.h"
// linden libraries
#include "llassetuploadresponders.h"
#include "lleconomy.h"
#include "llhttpclient.h"
-#include "llmemberlistener.h"
#include "llsdserialize.h"
#include "llstring.h"
#include "lltransactiontypes.h"
@@ -71,26 +71,21 @@
// system libraries
#include <boost/tokenizer.hpp>
-typedef LLMemberListener<LLView> view_listener_t;
-
-
class LLFileEnableSaveAs : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = gFloaterView->getFrontmost() && gFloaterView->getFrontmost()->canSaveAs();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLFileEnableUpload : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = gStatusBar && LLGlobalEconomy::Singleton::getInstance() && (gStatusBar->getBalance() >= LLGlobalEconomy::Singleton::getInstance()->getPriceUpload());
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
@@ -253,7 +248,7 @@ const std::string upload_pick(void* data)
class LLFileUploadImage : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
std::string filename = upload_pick((void *)LLFilePicker::FFLOAD_IMAGE);
if (!filename.empty())
@@ -267,7 +262,7 @@ class LLFileUploadImage : public view_listener_t
class LLFileUploadSound : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
std::string filename = upload_pick((void*)LLFilePicker::FFLOAD_WAV);
if (!filename.empty())
@@ -282,7 +277,7 @@ class LLFileUploadSound : public view_listener_t
class LLFileUploadAnim : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
const std::string filename = upload_pick((void*)LLFilePicker::FFLOAD_ANIM);
if (!filename.empty())
@@ -296,7 +291,7 @@ class LLFileUploadAnim : public view_listener_t
class LLFileUploadBulk : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
if( gAgent.cameraMouselook() )
{
@@ -358,19 +353,16 @@ void upload_error(const std::string& error_message, const std::string& label, co
class LLFileEnableCloseWindow : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool new_value = NULL != LLFloater::getClosableFloaterFromFocus();
-
- // horrendously opaque, this code
- gMenuHolder->findControl(userdata["control"].asString())->setValue(new_value);
- return true;
+ return new_value;
}
};
class LLFileCloseWindow : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLFloater::closeFocusedFloater();
@@ -380,17 +372,16 @@ class LLFileCloseWindow : public view_listener_t
class LLFileEnableCloseAllWindows : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool open_children = gFloaterView->allChildrenClosed();
- gMenuHolder->findControl(userdata["control"].asString())->setValue(!open_children);
- return true;
+ return !open_children;
}
};
class LLFileCloseAllWindows : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
bool app_quitting = false;
gFloaterView->closeAllChildren(app_quitting);
@@ -401,7 +392,7 @@ class LLFileCloseAllWindows : public view_listener_t
class LLFileSaveTexture : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLFloater* top = gFloaterView->getFrontmost();
if (top)
@@ -412,18 +403,9 @@ class LLFileSaveTexture : public view_listener_t
}
};
-class LLFileTakeSnapshot : public view_listener_t
-{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
- {
- LLFloaterSnapshot::show(NULL);
- return true;
- }
-};
-
class LLFileTakeSnapshotToDisk : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLPointer<LLImageRaw> raw = new LLImageRaw;
@@ -475,23 +457,13 @@ class LLFileTakeSnapshotToDisk : public view_listener_t
class LLFileQuit : public view_listener_t
{
- bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+ bool handleEvent(const LLSD& userdata)
{
LLAppViewer::instance()->userQuit();
return true;
}
};
-void handle_upload(void* data)
-{
- const std::string filename = upload_pick(data);
- if (!filename.empty())
- {
- LLFloaterNameDesc* floaterp = new LLFloaterNameDesc(filename);
- LLUICtrlFactory::getInstance()->buildFloater(floaterp, "floater_name_description.xml");
- floaterp->childSetLabelArg("ok_btn", "[AMOUNT]", llformat("%d", LLGlobalEconomy::Singleton::getInstance()->getPriceUpload() ));
- }
-}
void handle_compress_image(void*)
{
@@ -775,8 +747,7 @@ void upload_new_resource(const std::string& src_filename, std::string name,
else
{
// Unknown extension
- // *TODO: Translate?
- error_message = llformat("Unknown file extension .%s\nExpected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh", exten.c_str());
+ error_message = llformat(LLTrans::getString("UnknownFileExtension").c_str(), exten.c_str());
error = TRUE;;
}
@@ -856,9 +827,9 @@ void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
if(!(can_afford_transaction(expected_upload_cost)))
{
LLFloaterBuyCurrency::buyCurrency(
- llformat("Uploading %s costs",
- data->mAssetInfo.getName().c_str()), // *TODO: Translate
- expected_upload_cost);
+ llformat(LLTrans::getString("UploadingCosts").c_str(),
+ data->mAssetInfo.getName().c_str()),
+ expected_upload_cost);
is_balance_sufficient = FALSE;
}
else if(region)
@@ -1073,22 +1044,20 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
}
}
-
void init_menu_file()
{
- (new LLFileUploadImage())->registerListener(gMenuHolder, "File.UploadImage");
- (new LLFileUploadSound())->registerListener(gMenuHolder, "File.UploadSound");
- (new LLFileUploadAnim())->registerListener(gMenuHolder, "File.UploadAnim");
- (new LLFileUploadBulk())->registerListener(gMenuHolder, "File.UploadBulk");
- (new LLFileCloseWindow())->registerListener(gMenuHolder, "File.CloseWindow");
- (new LLFileCloseAllWindows())->registerListener(gMenuHolder, "File.CloseAllWindows");
- (new LLFileEnableCloseWindow())->registerListener(gMenuHolder, "File.EnableCloseWindow");
- (new LLFileEnableCloseAllWindows())->registerListener(gMenuHolder, "File.EnableCloseAllWindows");
- (new LLFileSaveTexture())->registerListener(gMenuHolder, "File.SaveTexture");
- (new LLFileTakeSnapshot())->registerListener(gMenuHolder, "File.TakeSnapshot");
- (new LLFileTakeSnapshotToDisk())->registerListener(gMenuHolder, "File.TakeSnapshotToDisk");
- (new LLFileQuit())->registerListener(gMenuHolder, "File.Quit");
-
- (new LLFileEnableUpload())->registerListener(gMenuHolder, "File.EnableUpload");
- (new LLFileEnableSaveAs())->registerListener(gMenuHolder, "File.EnableSaveAs");
+ view_listener_t::addCommit(new LLFileUploadImage(), "File.UploadImage");
+ view_listener_t::addCommit(new LLFileUploadSound(), "File.UploadSound");
+ view_listener_t::addCommit(new LLFileUploadAnim(), "File.UploadAnim");
+ view_listener_t::addCommit(new LLFileUploadBulk(), "File.UploadBulk");
+ view_listener_t::addCommit(new LLFileCloseWindow(), "File.CloseWindow");
+ view_listener_t::addCommit(new LLFileCloseAllWindows(), "File.CloseAllWindows");
+ view_listener_t::addEnable(new LLFileEnableCloseWindow(), "File.EnableCloseWindow");
+ view_listener_t::addEnable(new LLFileEnableCloseAllWindows(), "File.EnableCloseAllWindows");
+ view_listener_t::addCommit(new LLFileSaveTexture(), "File.SaveTexture");
+ view_listener_t::addCommit(new LLFileTakeSnapshotToDisk(), "File.TakeSnapshotToDisk");
+ view_listener_t::addCommit(new LLFileQuit(), "File.Quit");
+
+ view_listener_t::addEnable(new LLFileEnableUpload(), "File.EnableUpload");
+ view_listener_t::addEnable(new LLFileEnableSaveAs(), "File.EnableSaveAs");
}
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 520de0e403..d02e667d19 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -48,6 +48,7 @@
#include "lldbstrings.h"
#include "lleconomy.h"
#include "llfilepicker.h"
+#include "llfloaterreg.h"
#include "llfocusmgr.h"
#include "llfollowcamparams.h"
#include "llinstantmessage.h"
@@ -160,7 +161,7 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name);
bool check_offer_throttle(const std::string& from_name, bool check_only);
void callbackCacheEstateOwnerName(const LLUUID& id,
const std::string& first, const std::string& last,
- BOOL is_group, void*);
+ BOOL is_group);
//inventory offer throttle globals
LLFrameTimer gThrottleTimer;
@@ -867,13 +868,14 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
LLInventoryItem* item;
for(; it != end; ++it)
{
- item = gInventory.getItem(*it);
+ const LLUUID& id = *it;
+ item = gInventory.getItem(id);
if(!item)
{
- LL_WARNS("Messaging") << "Unable to show inventory item: " << *it << LL_ENDL;
+ LL_WARNS("Messaging") << "Unable to show inventory item: " << id << LL_ENDL;
continue;
}
- if(gInventory.isObjectDescendentOf(*it, trash_id))
+ if(gInventory.isObjectDescendentOf(id, trash_id))
{
continue;
}
@@ -882,40 +884,43 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
//if we are throttled, don't display them
if (check_offer_throttle(from_name, false))
{
- // I'm not sure this is a good idea.
- bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
- //bool show_keep_discard = true;
+ // If we opened this ourselves, focus it
+ BOOL take_focus = from_name.empty() ? TAKE_FOCUS_YES : TAKE_FOCUS_NO;
switch(asset_type)
{
- case LLAssetType::AT_NOTECARD:
- open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(), LLUUID::null, show_keep_discard, LLUUID::null, FALSE);
+ case LLAssetType::AT_NOTECARD:
+ LLFloaterReg::showInstance("preview_notecard", LLSD(id), take_focus);
break;
- case LLAssetType::AT_LANDMARK:
- open_landmark((LLViewerInventoryItem*)item, std::string("Landmark: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);
+ case LLAssetType::AT_LANDMARK:
+ LLFloaterReg::showInstance("preview_landmark", LLSD(id), take_focus);
break;
- case LLAssetType::AT_TEXTURE:
- open_texture(*it, std::string("Texture: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE);
+ case LLAssetType::AT_TEXTURE:
+ LLFloaterReg::showInstance("preview_texture", LLSD(id), take_focus);
break;
- default:
+ default:
break;
}
}
//highlight item, if it's not in the trash or lost+found
// Don't auto-open the inventory floater
- LLInventoryView* view = LLInventoryView::getActiveInventory();
- if(!view)
- {
- return;
- }
-
+ LLInventoryView* view = NULL;
if(gSavedSettings.getBOOL("ShowInInventory") &&
asset_type != LLAssetType::AT_CALLINGCARD &&
item->getInventoryType() != LLInventoryType::IT_ATTACHMENT &&
!from_name.empty())
{
- LLInventoryView::showAgentInventory(TRUE);
+ view = LLInventoryView::showAgentInventory();
+ }
+ else
+ {
+ view = LLInventoryView::getActiveInventory();
}
+ if(!view)
+ {
+ return;
+ }
+
//Trash Check
LLUUID trash_id;
trash_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_TRASH);
@@ -941,17 +946,19 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
LL_DEBUGS("Messaging") << "Highlighting" << item->getUUID() << LL_ENDL;
//highlight item
- LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
- view->getPanel()->setSelection(item->getUUID(), TAKE_FOCUS_NO);
- gFocusMgr.setKeyboardFocus(focus_ctrl);
+ if (view->getPanel())
+ {
+ LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
+ view->getPanel()->setSelection(item->getUUID(), TAKE_FOCUS_NO);
+ gFocusMgr.setKeyboardFocus(focus_ctrl);
+ }
}
}
void inventory_offer_mute_callback(const LLUUID& blocked_id,
const std::string& first_name,
const std::string& last_name,
- BOOL is_group,
- void* user_data)
+ BOOL is_group)
{
std::string from_name;
LLMute::EType type;
@@ -1040,7 +1047,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
// * we can't build two messages at once.
if (2 == button)
{
- gCacheName->get(mFromID, mFromGroup, inventory_offer_mute_callback, this);
+ gCacheName->get(mFromID, mFromGroup, &inventory_offer_mute_callback);
}
LLMessageSystem* msg = gMessageSystem;
@@ -1070,7 +1077,6 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
itemp = (LLViewerInventoryItem*)gInventory.getItem(mObjectID);
}
- // *TODO:translate
std::string from_string; // Used in the pop-up.
std::string chatHistory_string; // Used in chat history.
if (mFromObject == TRUE)
@@ -1080,13 +1086,18 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
std::string group_name;
if (gCacheName->getGroupName(mFromID, group_name))
{
- from_string = std::string("An object named '") + mFromName + "' owned by the group '" + group_name + "'";
- chatHistory_string = mFromName + " owned by the group '" + group_name + "'";
+ from_string = LLTrans::getString("InvOfferAnObjectNamed") + " "+"'"
+ + mFromName + LLTrans::getString("'") +" " + LLTrans::getString("InvOfferOwnedByGroup")
+ + " "+ "'" + group_name + "'";
+
+ chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByGroup")
+ + " " + group_name + "'";
}
else
{
- from_string = std::string("An object named '") + mFromName + "' owned by an unknown group";
- chatHistory_string = mFromName + " owned by an unknown group";
+ from_string = LLTrans::getString("InvOfferAnObjectNamed") + " "+"'"
+ + mFromName +"'"+ " " + LLTrans::getString("InvOfferOwnedByUnknownGroup");
+ chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup");
}
}
else
@@ -1094,13 +1105,15 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
std::string first_name, last_name;
if (gCacheName->getName(mFromID, first_name, last_name))
{
- from_string = std::string("An object named '") + mFromName + "' owned by " + first_name + " " + last_name;
- chatHistory_string = mFromName + " owned by " + first_name + " " + last_name;
+ from_string = LLTrans::getString("InvOfferAnObjectNamed") + " "+ LLTrans::getString("'") + mFromName
+ + LLTrans::getString("'")+" " + LLTrans::getString("InvOfferOwnedBy") + first_name + " " + last_name;
+ chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedBy") + " " + first_name + " " + last_name;
}
else
{
- from_string = std::string("An object named '") + mFromName + "' owned by an unknown user";
- chatHistory_string = mFromName + " owned by an unknown user";
+ from_string = LLTrans::getString("InvOfferAnObjectNamed") + " "+LLTrans::getString("'")
+ + mFromName + LLTrans::getString("'")+" " + LLTrans::getString("InvOfferOwnedByUnknownUser");
+ chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownUser");
}
}
}
@@ -1128,7 +1141,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
//don't spam them if they are getting flooded
if (check_offer_throttle(mFromName, true))
{
- log_message = chatHistory_string + " gave you " + mDesc + ".";
+ log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + mDesc + LLTrans::getString(".");
chat.mText = log_message;
LLFloaterChat::addChatHistory(chat);
}
@@ -1191,7 +1204,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
// send the message
msg->sendReliable(mHost);
- log_message = "You decline " + mDesc + " from " + mFromName + ".";
+ log_message = LLTrans::getString("InvOfferYouDecline") + " " + mDesc + " " + LLTrans::getString("InvOfferFrom") + " " + mFromName +".";
chat.mText = log_message;
if( LLMuteList::getInstance()->isMuted(mFromID ) && ! LLMuteList::getInstance()->isLinden(mFromName) ) // muting for SL-42269
{
@@ -1232,10 +1245,6 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
gInventory.addObserver(opener);
}
- // Allow these to stack up, but once you deal with one, reset the
- // position.
- gFloaterView->resetStartingFloaterPosition();
-
delete this;
return false;
}
@@ -1329,7 +1338,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
args["NAME"] = info->mFromName;
LLNotification::Params p("ObjectGiveItem");
- p.substitutions(args).payload(payload).functor(boost::bind(&LLOfferInfo::inventory_offer_callback, info, _1, _2));
+ p.substitutions(args).payload(payload).functor.function(boost::bind(&LLOfferInfo::inventory_offer_callback, info, _1, _2));
if (from_task)
{
@@ -1415,7 +1424,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
LLChat chat;
std::string buffer;
- // *TODO:translate - need to fix the full name to first/last (maybe)
+ // *TODO: Translate - need to fix the full name to first/last (maybe)
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, from_id);
msg->getBOOLFast(_PREHASH_MessageBlock, _PREHASH_FromGroup, from_group);
msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_ToAgentID, to_id);
@@ -1466,7 +1475,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
case IM_CONSOLE_AND_CHAT_HISTORY:
// These are used for system messages, hence don't need the name,
// as it is always "Second Life".
- // *TODO:translate
+ // *TODO: Translate
args["MESSAGE"] = message;
// Note: don't put the message in the IM history, even though was sent
@@ -1611,7 +1620,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
case IM_MESSAGEBOX:
{
// This is a block, modeless dialog.
- //*TODO:translate
+ //*TODO: Translate
args["MESSAGE"] = message;
LLNotifications::instance().add("SystemMessage", args);
}
@@ -1969,7 +1978,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
else
{
LLSD args;
- // *TODO:translate -> [FIRST] [LAST] (maybe)
+ // *TODO: Translate -> [FIRST] [LAST] (maybe)
args["NAME"] = name;
args["MESSAGE"] = message;
LLSD payload;
@@ -2430,7 +2439,7 @@ void process_teleport_start(LLMessageSystem *msg, void**)
}
else
{
- gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Cancel")); // *TODO: Translate
+ gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Cancel"));
}
// Freeze the UI and show progress bar
@@ -2465,7 +2474,7 @@ void process_teleport_progress(LLMessageSystem* msg, void**)
}
else
{
- gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Cancel")); //TODO: Translate
+ gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Cancel"));
}
std::string buffer;
msg->getString("Info", "Message", buffer);
@@ -4094,7 +4103,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
{
// Make the user confirm the transaction, since they might
// have missed something during an event.
- // *TODO:translate
+ // *TODO: Translate
LLSD args;
args["MESSAGE"] = desc;
LLNotifications::instance().add("SystemMessage", args);
@@ -4170,7 +4179,7 @@ bool handle_special_notification(std::string notificationID, LLSD& llsdBlock)
bool attempt_standard_notification(LLMessageSystem* msgsystem)
{
// if we have additional alert data
- if (msgsystem->getNumberOfBlocksFast(_PREHASH_AlertInfo) > 0)
+ if (msgsystem->has(_PREHASH_AlertInfo) && msgsystem->getNumberOfBlocksFast(_PREHASH_AlertInfo) > 0)
{
// notification was specified using the new mechanism, so we can just handle it here
std::string notificationID;
@@ -4316,21 +4325,21 @@ void process_alert_core(const std::string& message, BOOL modal)
}
else
{
- // *TODO:translate
+ // *TODO: Translate
args["MESSAGE"] = text;
LLNotifications::instance().add("SystemMessage", args);
}
}
else if (modal)
{
- // *TODO:translate
+ // *TODO: Translate
LLSD args;
args["ERROR_MESSAGE"] = message;
LLNotifications::instance().add("ErrorMessage", args);
}
else
{
- // *TODO:translate
+ // *TODO: Translate
LLSD args;
args["MESSAGE"] = message;
LLNotifications::instance().add("SystemMessageTip", args);
@@ -4347,10 +4356,10 @@ void handle_show_mean_events(void *)
return;
}
- LLFloaterBump::show(NULL);
+ LLFloaterBump::showInstance();
}
-void mean_name_callback(const LLUUID &id, const std::string& first, const std::string& last, BOOL always_false, void* data)
+void mean_name_callback(const LLUUID &id, const std::string& first, const std::string& last, BOOL always_false)
{
if (gNoRender)
{
@@ -4428,7 +4437,7 @@ void process_mean_collision_alert_message(LLMessageSystem *msgsystem, void **use
LLMeanCollisionData *mcd = new LLMeanCollisionData(gAgentID, perp, time, type, mag);
gMeanCollisionList.push_front(mcd);
const BOOL is_group = FALSE;
- gCacheName->get(perp, is_group, mean_name_callback);
+ gCacheName->get(perp, is_group, &mean_name_callback);
}
}
}
@@ -4480,7 +4489,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
// located in [REGIONNAME] at [REGIONPOS],
// has been <granted|denied> permission to: [PERMISSIONS]."
- LLUIString notice(LLFloaterChat::getInstance()->getString(granted ? "ScriptQuestionCautionChatGranted" : "ScriptQuestionCautionChatDenied"));
+ LLUIString notice(LLTrans::getString(granted ? "ScriptQuestionCautionChatGranted" : "ScriptQuestionCautionChatDenied"));
// always include the object name and owner name
notice.setArg("[OBJECTNAME]", notification["payload"]["object_name"].asString());
@@ -4534,7 +4543,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
perms.append(", ");
}
- perms.append(LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i]));
+ perms.append(LLTrans::getString(SCRIPT_QUESTIONS[i]));
}
}
@@ -4628,7 +4637,7 @@ static LLNotificationFunctorRegistration script_question_cb_reg_2("ScriptQuestio
void process_script_question(LLMessageSystem *msg, void **user_data)
{
- // *TODO:translate owner name -> [FIRST] [LAST]
+ // *TODO: Translate owner name -> [FIRST] [LAST]
LLHost sender = msg->getSender();
@@ -4696,7 +4705,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
if (questions & LSCRIPTRunTimePermissionBits[i])
{
count++;
- script_question += " " + LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i]) + "\n";
+ script_question += " " + LLTrans::getString(SCRIPT_QUESTIONS[i]) + "\n";
// check whether permission question should cause special caution dialog
caution |= (SCRIPT_QUESTION_IS_CAUTION[i]);
@@ -4752,7 +4761,7 @@ void container_inventory_arrived(LLViewerObject* object,
LLUUID cat_id;
cat_id = gInventory.createNewCategory(gAgent.getInventoryRootID(),
LLAssetType::AT_NONE,
- std::string("Acquired Items")); //TODO: Translate
+ LLTrans::getString("AcquiredItems"));
InventoryObjectList::const_iterator it = inventory->begin();
InventoryObjectList::const_iterator end = inventory->end();
@@ -4846,10 +4855,11 @@ void container_inventory_arrived(LLViewerObject* object,
// method to format the time.
std::string formatted_time(const time_t& the_time)
{
- char buffer[30]; /* Flawfinder: ignore */
- LLStringUtil::copy(buffer, ctime(&the_time), 30);
- buffer[24] = '\0';
- return std::string(buffer);
+ std::string dateStr = LLTrans::getString("ViewerMsgGenericTime");
+ LLSD substitution;
+ substitution["datetime"] = (S32) the_time;
+ LLStringUtil::format (dateStr, substitution);
+ return dateStr;
}
@@ -4860,7 +4870,7 @@ void process_teleport_failed(LLMessageSystem *msg, void**)
LLSD args;
// if we have additional alert data
- if (msg->getNumberOfBlocksFast(_PREHASH_AlertInfo) > 0)
+ if (msg->has(_PREHASH_AlertInfo) && msg->getSizeFast(_PREHASH_AlertInfo, _PREHASH_Message) > 0)
{
// Get the message ID
msg->getStringFast(_PREHASH_AlertInfo, _PREHASH_Message, reason);
@@ -5073,7 +5083,7 @@ void handle_lure(const LLUUID& invitee)
}
// Prompt for a message to the invited user.
-void handle_lure(LLDynamicArray<LLUUID>& ids)
+void handle_lure(std::vector<LLUUID>& ids)
{
LLSD edit_args;
edit_args["REGION"] = gAgent.getRegion()->getName();
@@ -5297,7 +5307,7 @@ static LLNotificationFunctorRegistration callback_load_url_reg("LoadWebPage", ca
// We've got the name of the person who owns the object hurling the url.
// Display confirmation dialog.
-void callback_load_url_name(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* data)
+void callback_load_url_name(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group)
{
std::vector<LLSD>::iterator it;
for (it = gLoadUrlList.begin(); it != gLoadUrlList.end(); )
@@ -5310,7 +5320,7 @@ void callback_load_url_name(const LLUUID& id, const std::string& first, const st
std::string owner_name;
if (is_group)
{
- owner_name = first + " (group)";
+ owner_name = first + LLTrans::getString("Group");
}
else
{
@@ -5374,7 +5384,7 @@ void process_load_url(LLMessageSystem* msg, void**)
// Add to list of pending name lookups
gLoadUrlList.push_back(payload);
- gCacheName->get(owner_id, owner_is_group, callback_load_url_name);
+ gCacheName->get(owner_id, owner_is_group, &callback_load_url_name);
}
@@ -5430,12 +5440,13 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
msg->getVector3("Data", "SimPosition", pos);
msg->getVector3("Data", "LookAt", look_at);
- gFloaterWorldMap->trackURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]);
- LLFloaterWorldMap::show(NULL, TRUE);
+ LLFloaterWorldMap::getInstance()->trackURL(
+ sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]);
+ LLFloaterReg::showInstance("world_map", "center");
// remove above two lines and replace with below line
// to re-enable parcel browser for llMapDestination()
- // LLURLDispatcher::dispatch(LLURLDispatcher::buildSLURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]), FALSE);
+ // LLURLDispatcher::dispatch(LLSLURL::buildSLURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]), FALSE);
}
@@ -5454,13 +5465,16 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
LLFloaterBuyLand::updateEstateName(estate_name);
// standard message, not from system
- std::string last_modified = std::string("Last Modified ") + formatted_time((time_t)covenant_timestamp);
+ std::string last_modified = LLTrans::getString("last_modified");
+ LLSD substitution;
+ substitution["datetime"] = (S32) covenant_timestamp;
+ LLStringUtil::format (last_modified, substitution);
LLPanelEstateCovenant::updateLastModified(last_modified);
LLPanelLandCovenant::updateLastModified(last_modified);
LLFloaterBuyLand::updateLastModified(last_modified);
- gCacheName->getName(estate_owner_id, callbackCacheEstateOwnerName);
+ gCacheName->get(estate_owner_id, false, &callbackCacheEstateOwnerName);
// load the actual covenant asset data
const BOOL high_priority = TRUE;
@@ -5482,11 +5496,11 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
if (estate_owner_id.isNull())
{
// mainland
- covenant_text = "There is no Covenant provided for this Estate.";
+ covenant_text = LLTrans::getString("RegionNoCovenant");
}
else
{
- covenant_text = "There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.";
+ covenant_text = LLTrans::getString("RegionNoCovenantOtherOwner");
}
LLPanelEstateCovenant::updateCovenantText(covenant_text, covenant_id);
LLPanelLandCovenant::updateCovenantText(covenant_text);
@@ -5496,13 +5510,13 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
void callbackCacheEstateOwnerName(const LLUUID& id,
const std::string& first, const std::string& last,
- BOOL is_group, void*)
+ BOOL is_group)
{
std::string name;
if (id.isNull())
{
- name = "(none)";
+ name = LLTrans::getString("none_text");
}
else
{
@@ -5533,10 +5547,10 @@ void onCovenantLoadComplete(LLVFS *vfs,
if( (file_length > 19) && !strncmp( &buffer[0], "Linden text version", 19 ) )
{
- LLViewerTextEditor* editor =
- new LLViewerTextEditor(std::string("temp"),
- LLRect(0,0,0,0),
- file_length+1);
+ LLViewerTextEditor::Params params;
+ params.name("temp");
+ params.max_text_length(file_length+1);
+ LLViewerTextEditor * editor = LLUICtrlFactory::create<LLViewerTextEditor> (params);
if( !editor->importBuffer( &buffer[0], file_length+1 ) )
{
LL_WARNS("Messaging") << "Problem importing estate covenant." << LL_ENDL;
@@ -5611,6 +5625,6 @@ void invalid_message_callback(LLMessageSystem* msg,
void LLOfferInfo::forceResponse(InventoryOfferResponse response)
{
LLNotification::Params params("UserGiveItem");
- params.functor(boost::bind(&LLOfferInfo::inventory_offer_callback, this, _1, _2));
+ params.functor.function(boost::bind(&LLOfferInfo::inventory_offer_callback, this, _1, _2));
LLNotifications::instance().forceResponse(params, response);
}
diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h
index e7a4303a8e..40e64f1ebe 100644
--- a/indra/newview/llviewermessage.h
+++ b/indra/newview/llviewermessage.h
@@ -151,7 +151,7 @@ void send_group_notice(const LLUUID& group_id,
const LLInventoryItem* item);
void handle_lure(const LLUUID& invitee);
-void handle_lure(LLDynamicArray<LLUUID>& ids);
+void handle_lure(std::vector<LLUUID>& ids);
// always from gAgent and
// routes through the gAgent's current simulator
diff --git a/indra/newview/llviewernetwork.cpp b/indra/newview/llviewernetwork.cpp
index 8719557cbc..918b15ef09 100644
--- a/indra/newview/llviewernetwork.cpp
+++ b/indra/newview/llviewernetwork.cpp
@@ -218,7 +218,7 @@ void LLViewerLogin::setGridChoice(const std::string& grid_name)
void LLViewerLogin::resetURIs()
{
// Clear URIs when picking a new server
- gSavedSettings.setValue("CmdLineLoginURI", LLSD::emptyArray());
+ gSavedSettings.setLLSD("CmdLineLoginURI", LLSD::emptyArray());
gSavedSettings.setString("CmdLineHelperURI", "");
}
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index d4e594656b..f0693c1b79 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -97,6 +97,7 @@
#include "llviewernetwork.h"
#include "llvowlsky.h"
#include "llmanip.h"
+#include "lltrans.h"
//#define DEBUG_UPDATE_TYPE
@@ -2461,7 +2462,7 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data)
LLPointer<LLInventoryObject> obj;
obj = new LLInventoryObject(object->mID, LLUUID::null,
LLAssetType::AT_CATEGORY,
- std::string("Contents"));
+ LLTrans::getString("ViewerObjectContents").c_str());
object->mInventory->push_front(obj);
object->doInventoryCallback();
delete ft;
@@ -2528,6 +2529,7 @@ void LLViewerObject::loadTaskInvFile(const std::string& filename)
{
LLPointer<LLInventoryObject> inv = new LLInventoryObject;
inv->importLegacyStream(ifs);
+ inv->rename(LLTrans::getString("ViewerObjectContents").c_str());
mInventory->push_front(inv);
}
else
@@ -2587,11 +2589,6 @@ void LLViewerObject::removeInventory(const LLUUID& item_id)
msg->sendReliable(mRegionp->getHost());
deleteInventoryItem(item_id);
++mInventorySerialNum;
-
- // The viewer object should not refresh UI since this is a utility
- // function. The UI functionality that called this method should
- // refresh the views if necessary.
- //gBuildView->refresh();
}
void LLViewerObject::updateInventory(
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 16a3b98d12..5ef2b960d4 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -40,7 +40,7 @@
#include "llhudtext.h"
#include "llhudicon.h"
#include "llinventory.h"
-#include "llmemory.h"
+#include "llrefcount.h"
#include "llmemtype.h"
#include "llprimitive.h"
#include "lluuid.h"
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index e0741e7233..926c5040fc 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -38,6 +38,7 @@
#include "timing.h"
#include "llfasttimer.h"
#include "llrender.h"
+#include "llwindow.h" // decBusyCount()
#include "llviewercontrol.h"
#include "llface.h"
@@ -251,7 +252,7 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
objectp->mCreateSelected = false;
gViewerWindow->getWindow()->decBusyCount();
- gViewerWindow->getWindow()->setCursor( UI_CURSOR_ARROW );
+ gViewerWindow->setCursor( UI_CURSOR_ARROW );
}
}
@@ -768,10 +769,10 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
}
*/
- mNumObjectsStat.addValue(mObjects.count());
- mNumActiveObjectsStat.addValue(num_active_objects);
- mNumSizeCulledStat.addValue(mNumSizeCulled);
- mNumVisCulledStat.addValue(mNumVisCulled);
+ LLViewerStats::getInstance()->mNumObjectsStat.addValue(mObjects.count());
+ LLViewerStats::getInstance()->mNumActiveObjectsStat.addValue(num_active_objects);
+ LLViewerStats::getInstance()->mNumSizeCulledStat.addValue(mNumSizeCulled);
+ LLViewerStats::getInstance()->mNumVisCulledStat.addValue(mNumVisCulled);
}
void LLViewerObjectList::clearDebugText()
@@ -1016,16 +1017,16 @@ void LLViewerObjectList::shiftObjects(const LLVector3 &offset)
void LLViewerObjectList::renderObjectsForMap(LLNetMap &netmap)
{
- LLColor4 above_water_color = gColors.getColor( "NetMapOtherOwnAboveWater" );
- LLColor4 below_water_color = gColors.getColor( "NetMapOtherOwnBelowWater" );
+ LLColor4 above_water_color = gSavedSkinSettings.getColor( "NetMapOtherOwnAboveWater" );
+ LLColor4 below_water_color = gSavedSkinSettings.getColor( "NetMapOtherOwnBelowWater" );
LLColor4 you_own_above_water_color =
- gColors.getColor( "NetMapYouOwnAboveWater" );
+ gSavedSkinSettings.getColor( "NetMapYouOwnAboveWater" );
LLColor4 you_own_below_water_color =
- gColors.getColor( "NetMapYouOwnBelowWater" );
+ gSavedSkinSettings.getColor( "NetMapYouOwnBelowWater" );
LLColor4 group_own_above_water_color =
- gColors.getColor( "NetMapGroupOwnAboveWater" );
+ gSavedSkinSettings.getColor( "NetMapGroupOwnAboveWater" );
LLColor4 group_own_below_water_color =
- gColors.getColor( "NetMapGroupOwnBelowWater" );
+ gSavedSkinSettings.getColor( "NetMapGroupOwnBelowWater" );
for (S32 i = 0; i < mMapObjects.count(); i++)
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index ba31f70c3d..0f906a4d7f 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -150,19 +150,8 @@ public:
U32 mCurBin; // Current bin we're working on...
- //////////////////////
- //
- // Statistics data
- //
- //
- LLStat mNumObjectsStat;
- LLStat mNumActiveObjectsStat;
- LLStat mNumNewObjectsStat;
- LLStat mNumSizeCulledStat;
- LLStat mNumVisCulledStat;
-
+ // Statistics data (see also LLViewerStats)
S32 mNumNewObjects;
-
S32 mNumSizeCulled;
S32 mNumVisCulled;
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index b98f418d49..08e03c97f2 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -166,7 +166,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
}
// First use warning
- if( gSavedSettings.getWarning("FirstStreamingVideo") )
+ if( gWarningSettings.getBOOL("FirstStreamingVideo") )
{
LLNotifications::instance().add("ParcelCanPlayMedia", LLSD(), LLSD(),
boost::bind(callback_play_media, _1, _2, parcel));
@@ -189,9 +189,9 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
std::string mediaUrl = std::string ( parcel->getMediaURL () );
if (!mediaUrl.empty ())
{
- if (gSavedSettings.getWarning("QuickTimeInstalled"))
+ if (gWarningSettings.getBOOL("QuickTimeInstalled"))
{
- gSavedSettings.setWarning("QuickTimeInstalled", FALSE);
+ gWarningSettings.setBOOL("QuickTimeInstalled", FALSE);
LLNotifications::instance().add("NoQuickTime" );
};
@@ -395,7 +395,7 @@ bool callback_play_media(const LLSD& notification, const LLSD& response, LLParce
{
gSavedSettings.setBOOL("AudioStreamingVideo", FALSE);
}
- gSavedSettings.setWarning("FirstStreamingVideo", FALSE);
+ gWarningSettings.setBOOL("FirstStreamingVideo", FALSE);
return false;
}
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 193dfaae96..20723ec360 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -155,6 +155,8 @@ LLViewerParcelMgr::LLViewerParcelMgr()
{
mAgentParcelOverlay[i] = 0;
}
+
+ mTeleportInProgress = TRUE; // the initial parcel update is treated like teleport
}
@@ -646,7 +648,7 @@ LLParcel *LLViewerParcelMgr::getAgentParcel() const
}
// Return whether the agent can build on the land they are on
-BOOL LLViewerParcelMgr::agentCanBuild() const
+bool LLViewerParcelMgr::agentCanBuild() const
{
if (mAgentParcel)
{
@@ -938,7 +940,7 @@ void LLViewerParcelMgr::sendParcelGodForceOwner(const LLUUID& owner_id)
payload["parcel_local_id"] = mCurrentParcel->getLocalID();
payload["region_host"] = region->getHost().getIPandPort();
LLNotification::Params params("ForceOwnerAuctionWarning");
- params.payload(payload).functor(callback_god_force_owner);
+ params.payload(payload).functor.function(callback_god_force_owner);
if(mCurrentParcel->getAuctionID())
{
@@ -1513,6 +1515,17 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
LLViewerParcelMgr::getInstance()->writeAgentParcelFromBitmap(bitmap);
delete[] bitmap;
+
+ // Let interesting parties know about agent parcel change.
+ LLViewerParcelMgr* instance = LLViewerParcelMgr::getInstance();
+
+ instance->mAgentParcelChangedSignal();
+
+ if (instance->mTeleportInProgress)
+ {
+ instance->mTeleportInProgress = FALSE;
+ instance->mTeleportFinishedSignal();
+ }
}
}
@@ -2378,3 +2391,24 @@ LLViewerImage* LLViewerParcelMgr::getPassImage() const
{
return sPassImage;
}
+
+boost::signals::connection LLViewerParcelMgr::setAgentParcelChangedCallback(parcel_changed_callback_t cb)
+{
+ return mAgentParcelChangedSignal.connect(cb);
+}
+
+boost::signals::connection LLViewerParcelMgr::setTeleportFinishedCallback(parcel_changed_callback_t cb)
+{
+ return mTeleportFinishedSignal.connect(cb);
+}
+
+/* Ok, we're notified that teleport has been finished.
+ * We should now propagate the notification via mTeleportFinishedSignal
+ * to all interested parties.
+ * However the agent parcel data has not been updated yet.
+ * Let's wait for the update and then emit the signal.
+ */
+void LLViewerParcelMgr::onTeleportFinished()
+{
+ mTeleportInProgress = TRUE;
+}
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h
index 9f762a186c..2f3583e33b 100644
--- a/indra/newview/llviewerparcelmgr.h
+++ b/indra/newview/llviewerparcelmgr.h
@@ -36,10 +36,14 @@
#include "v3dmath.h"
#include "lldarray.h"
#include "llframetimer.h"
-#include "llmemory.h"
+#include "llsingleton.h"
#include "llparcelselection.h"
#include "llui.h"
+#include <boost/function.hpp>
+#include <boost/signal.hpp>
+#include <boost/signals/connection.hpp>
+
class LLUUID;
class LLMessageSystem;
class LLParcel;
@@ -79,6 +83,9 @@ class LLViewerParcelMgr : public LLSingleton<LLViewerParcelMgr>
{
public:
+ typedef boost::function<void()> parcel_changed_callback_t;
+ typedef boost::signal <void()> parcel_changed_signal_t;
+
LLViewerParcelMgr();
~LLViewerParcelMgr();
@@ -163,7 +170,7 @@ public:
BOOL agentCanTakeDamage() const;
BOOL agentCanFly() const;
F32 agentDrawDistance() const;
- BOOL agentCanBuild() const;
+ bool agentCanBuild() const;
F32 getHoverParcelWidth() const
{ return F32(mHoverEastNorth.mdV[VX] - mHoverWestSouth.mdV[VX]); }
@@ -256,6 +263,10 @@ public:
// the agent is banned or not in the allowed group
BOOL isCollisionBanned();
+ boost::signals::connection setAgentParcelChangedCallback(parcel_changed_callback_t cb);
+ boost::signals::connection setTeleportFinishedCallback(parcel_changed_callback_t cb);
+ void onTeleportFinished();
+
static BOOL isParcelOwnedByAgent(const LLParcel* parcelp, U64 group_proxy_power);
static BOOL isParcelModifiableByAgent(const LLParcel* parcelp, U64 group_proxy_power);
@@ -303,6 +314,10 @@ private:
LLDynamicArray<LLParcelObserver*> mObservers;
+ BOOL mTeleportInProgress;
+ parcel_changed_signal_t mTeleportFinishedSignal;
+ parcel_changed_signal_t mAgentParcelChangedSignal;
+
// Array of pieces of parcel edges to potentially draw
// Has (parcels_per_edge + 1) * (parcels_per_edge + 1) elements so
// we can represent edges of the grid.
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp
index 866c2a91eb..d76ec0dedb 100644
--- a/indra/newview/llviewerparceloverlay.cpp
+++ b/indra/newview/llviewerparceloverlay.cpp
@@ -36,6 +36,7 @@
// indra includes
#include "llparcel.h"
+#include "llfloaterreg.h"
#include "llgl.h"
#include "llrender.h"
#include "v4color.h"
@@ -205,13 +206,12 @@ void LLViewerParcelOverlay::updateOverlayTexture()
{
return;
}
- // Can do this because gColors are actually stored as LLColor4U
- const LLColor4U avail = gColors.getColor4U("PropertyColorAvail");
- const LLColor4U owned = gColors.getColor4U("PropertyColorOther");
- const LLColor4U group = gColors.getColor4U("PropertyColorGroup");
- const LLColor4U self = gColors.getColor4U("PropertyColorSelf");
- const LLColor4U for_sale = gColors.getColor4U("PropertyColorForSale");
- const LLColor4U auction = gColors.getColor4U("PropertyColorAuction");
+ const LLColor4U avail = gSavedSkinSettings.getColor4("PropertyColorAvail");
+ const LLColor4U owned = gSavedSkinSettings.getColor4("PropertyColorOther");
+ const LLColor4U group = gSavedSkinSettings.getColor4("PropertyColorGroup");
+ const LLColor4U self = gSavedSkinSettings.getColor4("PropertyColorSelf");
+ const LLColor4U for_sale = gSavedSkinSettings.getColor4("PropertyColorForSale");
+ const LLColor4U auction = gSavedSkinSettings.getColor4("PropertyColorAuction");
// Create the base texture.
U8 *raw = mImageRaw->getData();
@@ -314,12 +314,11 @@ void LLViewerParcelOverlay::updatePropertyLines()
S32 row, col;
- // Can do this because gColors are actually stored as LLColor4U
- const LLColor4U self_coloru = gColors.getColor4U("PropertyColorSelf");
- const LLColor4U other_coloru = gColors.getColor4U("PropertyColorOther");
- const LLColor4U group_coloru = gColors.getColor4U("PropertyColorGroup");
- const LLColor4U for_sale_coloru = gColors.getColor4U("PropertyColorForSale");
- const LLColor4U auction_coloru = gColors.getColor4U("PropertyColorAuction");
+ const LLColor4U self_coloru = gSavedSkinSettings.getColor4("PropertyColorSelf");
+ const LLColor4U other_coloru = gSavedSkinSettings.getColor4("PropertyColorOther");
+ const LLColor4U group_coloru = gSavedSkinSettings.getColor4("PropertyColorGroup");
+ const LLColor4U for_sale_coloru = gSavedSkinSettings.getColor4("PropertyColorForSale");
+ const LLColor4U auction_coloru = gSavedSkinSettings.getColor4("PropertyColorAuction");
// Build into dynamic arrays, then copy into static arrays.
LLDynamicArray<LLVector3, 256> new_vertex_array;
@@ -841,8 +840,8 @@ S32 LLViewerParcelOverlay::renderPropertyLines ()
drawn += vertex_per_edge;
gGL.end();
-
- if (LLSelectMgr::sRenderHiddenSelections && gFloaterTools && gFloaterTools->getVisible())
+
+ if (LLSelectMgr::sRenderHiddenSelections && LLFloaterReg::instanceVisible("build"))
{
LLGLDepthTest depth(GL_TRUE, GL_FALSE, GL_GREATER);
diff --git a/indra/newview/llviewerpartsim.h b/indra/newview/llviewerpartsim.h
index 21bc37f891..208675e7bf 100644
--- a/indra/newview/llviewerpartsim.h
+++ b/indra/newview/llviewerpartsim.h
@@ -35,7 +35,7 @@
#include "lldarrayptr.h"
#include "llframetimer.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "llpartdata.h"
#include "llviewerpartsource.h"
diff --git a/indra/newview/llviewerpartsource.h b/indra/newview/llviewerpartsource.h
index 4258b9170f..31e671af3a 100644
--- a/indra/newview/llviewerpartsource.h
+++ b/indra/newview/llviewerpartsource.h
@@ -33,8 +33,9 @@
#ifndef LL_LLVIEWERPARTSOURCE_H
#define LL_LLVIEWERPARTSOURCE_H
-#include "llmemory.h"
+#include "llrefcount.h"
#include "llpartdata.h"
+#include "llpointer.h"
#include "llquaternion.h"
#include "v3math.h"
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index 49319b13b1..b85edc4f58 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -76,11 +76,11 @@
#include "llapp.h"
#include "llapr.h"
#include "llcriticaldamp.h"
-#include "lldarray.h"
-#include "lldarrayptr.h"
+//#include "lldarray.h"
+//#include "lldarrayptr.h"
#include "lldefs.h"
#include "lldepthstack.h"
-#include "lldqueueptr.h"
+//#include "lldqueueptr.h"
#include "llendianswizzle.h"
#include "llerror.h"
#include "llfasttimer.h"
@@ -89,11 +89,16 @@
#include "llhash.h"
#include "lllocalidhashmap.h"
#include "llmap.h"
-#include "llmemory.h"
+//#include "llmemory.h"
#include "llnametable.h"
+#include "llpointer.h"
#include "llpriqueuemap.h"
#include "llprocessor.h"
+#include "llrefcount.h"
+#include "llsafehandle.h"
//#include "llsecondlifeurls.h"
+#include "llsd.h"
+#include "llsingleton.h"
#include "llstack.h"
#include "llstat.h"
#include "llstl.h"
@@ -114,20 +119,13 @@
#include "u64.h"
// Library includes from llimage
-//#include "kdc_flow_control.h"
-//#include "kde_flow_control.h"
-//#include "kdu_image.h"
-//#include "kdu_image_local.h"
//#include "llblockdata.h"
-//#include "llblockdecoder.h"
-//#include "llblockencoder.h"
#include "llimage.h"
#include "llimagebmp.h"
#include "llimagepng.h"
#include "llimagej2c.h"
#include "llimagejpeg.h"
#include "llimagetga.h"
-//#include "llkdumem.h"
#include "llmapimagetype.h"
// Library includes from llmath project
@@ -232,4 +230,8 @@
#include "llvfile.h"
#include "llvfs.h"
+// Library includes from llui
+// In skinning-7, llui.h dependencies are changing too often.
+//#include "llui.h"
+
#endif
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 12d9c1a992..47619919b3 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -35,6 +35,7 @@
#include "llviewerregion.h"
#include "indra_constants.h"
+#include "llfloaterreg.h"
#include "llmath.h"
#include "llhttpclient.h"
#include "llregionflags.h"
@@ -764,11 +765,6 @@ void LLViewerRegion::calculateCameraDistance()
mCameraDistanceSquared = (F32)(gAgent.getCameraPositionGlobal() - getCenterGlobal()).magVecSquared();
}
-U32 LLViewerRegion::getNetDetailsForLCD()
-{
- return mPingDelay;
-}
-
std::ostream& operator<<(std::ostream &s, const LLViewerRegion ®ion)
{
s << "{ ";
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index b0a98a99b8..f43167f93a 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -275,9 +275,6 @@ public:
friend std::ostream& operator<<(std::ostream &s, const LLViewerRegion ®ion);
- // used by LCD to get details for debug screen
- U32 getNetDetailsForLCD();
-
LLSpatialPartition* getSpatialPartition(U32 type);
public:
struct CompareDistance
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 648fbd4714..3382adaec5 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -36,6 +36,8 @@
#include "llviewerthrottle.h"
#include "message.h"
+#include "llfloaterreg.h"
+#include "llmemory.h"
#include "lltimer.h"
#include "llappviewer.h"
@@ -60,9 +62,6 @@
#include "llworld.h"
#include "llfeaturemanager.h"
#include "llviewernetwork.h"
-#if LL_LCD_COMPILE
-#include "lllcd.h"
-#endif
class StatAttributes
@@ -199,16 +198,76 @@ const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] =
// ST_TEX_BAKES
StatAttributes("Texture Bakes", FALSE, FALSE),
// ST_TEX_REBAKES
- StatAttributes("Texture Rebakes", FALSE, FALSE),
-
- // ST_LOGITECH_KEYBOARD
- StatAttributes("Logitech LCD", FALSE, FALSE)
+ StatAttributes("Texture Rebakes", FALSE, FALSE)
};
-LLViewerStats::LLViewerStats()
- : mPacketsLostPercentStat(64),
- mLastTimeDiff(0.0)
+LLViewerStats::LLViewerStats() :
+ mKBitStat("kbitstat"),
+ mLayersKBitStat("layerskbitstat"),
+ mObjectKBitStat("objectkbitstat"),
+ mAssetKBitStat("assetkbitstat"),
+ mTextureKBitStat("texturekbitstat"),
+ mVFSPendingOperations("vfspendingoperations"),
+ mObjectsDrawnStat("objectsdrawnstat"),
+ mObjectsCulledStat("objectsculledstat"),
+ mObjectsTestedStat("objectstestedstat"),
+ mObjectsComparedStat("objectscomparedstat"),
+ mObjectsOccludedStat("objectsoccludedstat"),
+ mFPSStat("fpsstat"),
+ mPacketsInStat("packetsinstat"),
+ mPacketsLostStat("packetsloststat"),
+ mPacketsOutStat("packetsoutstat"),
+ mPacketsLostPercentStat("packetslostpercentstat", 64),
+ mTexturePacketsStat("texturepacketsstat"),
+ mActualInKBitStat("actualinkbitstat"),
+ mActualOutKBitStat("actualoutkbitstat"),
+ mTrianglesDrawnStat("trianglesdrawnstat"),
+ mSimTimeDilation("simtimedilation"),
+ mSimFPS("simfps"),
+ mSimPhysicsFPS("simphysicsfps"),
+ mSimAgentUPS("simagentups"),
+ mSimScriptEPS("simscripteps"),
+ mSimFrameMsec("simframemsec"),
+ mSimNetMsec("simnetmsec"),
+ mSimSimOtherMsec("simsimothermsec"),
+ mSimSimPhysicsMsec("simsimphysicsmsec"),
+ mSimSimPhysicsStepMsec("simsimphysicsstepmsec"),
+ mSimSimPhysicsShapeUpdateMsec("simsimphysicsshapeupdatemsec"),
+ mSimSimPhysicsOtherMsec("simsimphysicsothermsec"),
+ mSimAgentMsec("simagentmsec"),
+ mSimImagesMsec("simimagesmsec"),
+ mSimScriptMsec("simscriptmsec"),
+ mSimSpareMsec("simsparemsec"),
+ mSimSleepMsec("simsleepmsec"),
+ mSimPumpIOMsec("simpumpiomsec"),
+ mSimMainAgents("simmainagents"),
+ mSimChildAgents("simchildagents"),
+ mSimObjects("simobjects"),
+ mSimActiveObjects("simactiveobjects"),
+ mSimActiveScripts("simactivescripts"),
+ mSimInPPS("siminpps"),
+ mSimOutPPS("simoutpps"),
+ mSimPendingDownloads("simpendingdownloads"),
+ mSimPendingUploads("simpendinguploads"),
+ mSimPendingLocalUploads("simpendinglocaluploads"),
+ mSimTotalUnackedBytes("simtotalunackedbytes"),
+ mPhysicsPinnedTasks("physicspinnedtasks"),
+ mPhysicsLODTasks("physicslodtasks"),
+ mPhysicsMemoryAllocated("physicsmemoryallocated"),
+ mSimPingStat("simpingstat"),
+ mNumImagesStat("numimagesstat", 32, TRUE),
+ mNumRawImagesStat("numrawimagesstat", 32, TRUE),
+ mGLTexMemStat("gltexmemstat", 32, TRUE),
+ mGLBoundMemStat("glboundmemstat", 32, TRUE),
+ mRawMemStat("rawmemstat", 32, TRUE),
+ mFormattedMemStat("formattedmemstat", 32, TRUE),
+ mNumObjectsStat("numobjectsstat"),
+ mNumActiveObjectsStat("numactiveobjectsstat"),
+ mNumNewObjectsStat("numnewobjectsstat"),
+ mNumSizeCulledStat("numsizeculledstat"),
+ mNumVisCulledStat("numvisculledstat"),
+ mLastTimeDiff(0.0)
{
for (S32 i = 0; i < ST_COUNT; i++)
{
@@ -353,7 +412,6 @@ void reset_statistics()
{
if (LLSurface::sTextureUpdateTime)
{
- LLSurface::sTexelsUpdatedPerSecStat.addValue(0.001f*(LLSurface::sTexelsUpdated / LLSurface::sTextureUpdateTime));
LLSurface::sTexelsUpdated = 0;
LLSurface::sTextureUpdateTime = 0.f;
}
@@ -507,7 +565,7 @@ void update_statistics(U32 frame_count)
{
gTotalWorldBytes += gVLManager.getTotalBytes();
gTotalObjectBytes += gObjectBits / 8;
- gTotalTextureBytes += LLViewerImageList::sTextureBits / 8;
+ gTotalTextureBytes += gImageList.mTextureBits / 8;
// make sure we have a valid time delta for this frame
if (gFrameIntervalSeconds > 0.f)
@@ -520,7 +578,7 @@ void update_statistics(U32 frame_count)
{
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_AVATAR_EDIT_SECONDS, gFrameIntervalSeconds);
}
- else if (gFloaterTools && gFloaterTools->getVisible())
+ else if (LLFloaterReg::instanceVisible("build"))
{
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_TOOLBOX_SECONDS, gFrameIntervalSeconds);
}
@@ -559,7 +617,7 @@ void update_statistics(U32 frame_count)
F32 layer_bits = (F32)(gVLManager.getLandBits() + gVLManager.getWindBits() + gVLManager.getCloudBits());
LLViewerStats::getInstance()->mLayersKBitStat.addValue(layer_bits/1024.f);
LLViewerStats::getInstance()->mObjectKBitStat.addValue(gObjectBits/1024.f);
- LLViewerStats::getInstance()->mTextureKBitStat.addValue(LLViewerImageList::sTextureBits/1024.f);
+ LLViewerStats::getInstance()->mTextureKBitStat.addValue(gImageList.mTextureBits/1024.f);
LLViewerStats::getInstance()->mVFSPendingOperations.addValue(LLVFile::getVFSThread()->getPending());
LLViewerStats::getInstance()->mAssetKBitStat.addValue(gTransferManager.getTransferBitsIn(LLTCT_ASSET)/1024.f);
gTransferManager.resetTransferBitsIn(LLTCT_ASSET);
@@ -573,7 +631,7 @@ void update_statistics(U32 frame_count)
gDebugTimers[0].unpause();
}
- LLViewerStats::getInstance()->mTexturePacketsStat.addValue(LLViewerImageList::sTexturePackets);
+ LLViewerStats::getInstance()->mTexturePacketsStat.addValue(gImageList.mTexturePackets);
{
static F32 visible_avatar_frames = 0.f;
@@ -594,15 +652,9 @@ void update_statistics(U32 frame_count)
gObjectBits = 0;
// gDecodedBits = 0;
- LLViewerImageList::sTextureBits = 0;
- LLViewerImageList::sTexturePackets = 0;
+ gImageList.mTextureBits = 0;
+ gImageList.mTexturePackets = 0;
-#if LL_LCD_COMPILE
- bool LCDenabled = gLcdScreen->Enabled();
- LLViewerStats::getInstance()->setStat(LLViewerStats::ST_LOGITECH_LCD, LCDenabled);
-#else
- LLViewerStats::getInstance()->setStat(LLViewerStats::ST_LOGITECH_LCD, false);
-#endif
}
class ViewerStatsResponder : public LLHTTPClient::Responder
@@ -692,7 +744,7 @@ void send_stats()
agent["ping"] = gAvgSimPing;
agent["meters_traveled"] = gAgent.getDistanceTraveled();
agent["regions_visited"] = gAgent.getRegionsVisited();
- agent["mem_use"] = getCurrentRSS() / 1024.0;
+ agent["mem_use"] = LLMemory::getCurrentRSS() / 1024.0;
LLSD &system = body["system"];
diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h
index d3fd4f2466..ba89fbf02a 100644
--- a/indra/newview/llviewerstats.h
+++ b/indra/newview/llviewerstats.h
@@ -57,6 +57,7 @@ public:
LLStat mTexturePacketsStat;
LLStat mActualInKBitStat; // From the packet ring (when faking a bad connection)
LLStat mActualOutKBitStat; // From the packet ring (when faking a bad connection)
+ LLStat mTrianglesDrawnStat;
// Simulator stats
LLStat mSimTimeDilation;
@@ -98,15 +99,22 @@ public:
LLStat mPhysicsPinnedTasks;
LLStat mPhysicsLODTasks;
LLStat mPhysicsMemoryAllocated;
- /*
- LLStat mSimCPUUsageStat;
- LLStat mSimMemTotalStat;
- LLStat mSimMemRSSStat;
- */
-
LLStat mSimPingStat;
+ LLStat mNumImagesStat;
+ LLStat mNumRawImagesStat;
+ LLStat mGLTexMemStat;
+ LLStat mGLBoundMemStat;
+ LLStat mRawMemStat;
+ LLStat mFormattedMemStat;
+
+ LLStat mNumObjectsStat;
+ LLStat mNumActiveObjectsStat;
+ LLStat mNumNewObjectsStat;
+ LLStat mNumSizeCulledStat;
+ LLStat mNumVisCulledStat;
+
void resetStats();
public:
// If you change this, please also add a corresponding text label
@@ -171,9 +179,8 @@ public:
ST_WINDOW_HEIGHT = 55,
ST_TEX_BAKES = 56,
ST_TEX_REBAKES = 57,
- ST_LOGITECH_LCD = 58,
- ST_COUNT = 59
+ ST_COUNT = 58
};
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp
index 728509e39c..290e6f50ff 100644
--- a/indra/newview/llviewertexteditor.cpp
+++ b/indra/newview/llviewertexteditor.cpp
@@ -32,13 +32,14 @@
#include "llviewerprecompiledheaders.h"
+#include "llfloaterreg.h"
#include "llfocusmgr.h"
#include "audioengine.h"
#include "llagent.h"
#include "llinventory.h"
+#include "llinventorybridge.h"
#include "llinventorymodel.h"
#include "llinventoryview.h"
-#include "llinventorybridge.h" // for landmark prefix string
#include "llviewertexteditor.h"
@@ -51,6 +52,7 @@
#include "llpreviewlandmark.h"
#include "llscrollbar.h"
#include "lltooldraganddrop.h"
+#include "lltrans.h"
#include "llviewercontrol.h"
#include "llviewerimagelist.h"
#include "llviewerwindow.h"
@@ -96,31 +98,9 @@ public:
}
else
{
- // See if we can bring an existing preview to the front
- if(!LLPreview::show(item->getUUID(), true))
+ if(!gSavedSettings.getBOOL("ShowNewInventory"))
{
- if(!gSavedSettings.getBOOL("ShowNewInventory"))
- {
- // There isn't one, so make a new preview
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("NotecardEditorRect");
- rect.translate(left - rect.mLeft, top - rect.mTop);
- LLPreviewNotecard* preview;
- preview = new LLPreviewNotecard("preview notecard",
- rect,
- std::string("Embedded Note: ") + item->getName(),
- item->getUUID(),
- LLUUID::null,
- item->getAssetUUID(),
- true,
- (LLViewerInventoryItem*)item);
- preview->setSourceID(LLUUID::null);
- preview->setFocus(TRUE);
-
- // Force to be entirely onscreen.
- gFloaterView->adjustToFitScreen(preview, FALSE);
- }
+ LLFloaterReg::showInstance("preview_notecard", LLSD(item->getUUID()), TAKE_FOCUS_YES);
}
}
}
@@ -430,6 +410,8 @@ void LLEmbeddedItems::bindEmbeddedChars( const LLFontGL* font ) const
case LLAssetType::AT_BODYPART: img_name = "inv_item_skin.tga"; break;
case LLAssetType::AT_ANIMATION: img_name = "inv_item_animation.tga";break;
case LLAssetType::AT_GESTURE: img_name = "inv_item_gesture.tga"; break;
+ //TODO need img_name
+ case LLAssetType::AT_FAVORITE: img_name = "inv_item_landmark.tga"; break;
default: llassert(0); continue;
}
@@ -561,32 +543,15 @@ struct LLNotecardCopyInfo
//
// Member functions
//
-
-LLViewerTextEditor::LLViewerTextEditor(const std::string& name,
- const LLRect& rect,
- S32 max_length,
- const std::string& default_text,
- const LLFontGL* font,
- BOOL allow_embedded_items)
- : LLTextEditor(name, rect, max_length, default_text, font, allow_embedded_items),
- mDragItemSaved(FALSE),
- mInventoryCallback(new LLEmbeddedNotecardOpener)
+LLViewerTextEditor::LLViewerTextEditor(const LLViewerTextEditor::Params& p)
+: LLTextEditor(p),
+ mDragItemChar(0),
+ mDragItemSaved(FALSE),
+ mInventoryCallback(new LLEmbeddedNotecardOpener)
{
+ mParseHTML = p.allow_html;
mEmbeddedItemList = new LLEmbeddedItems(this);
mInventoryCallback->setEditor(this);
-
- // *TODO: Add right click menus for SLURLs
- // Build the right click menu
- // make the popup menu available
-
- //LLMenuGL* menu = LLUICtrlFactory::getInstance()->buildMenu("menu_slurl.xml", this);
- //if (!menu)
- //{
- // menu = new LLMenuGL(LLStringUtil::null);
- //}
- //menu->setBackgroundColor(gColors.getColor("MenuPopupBgColor"));
- //// menu->setVisible(FALSE);
- //mPopupMenuHandle = menu->getHandle();
}
LLViewerTextEditor::~LLViewerTextEditor()
@@ -694,6 +659,7 @@ BOOL LLViewerTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
if (item_at_pos)
{
mDragItem = item_at_pos;
+ mDragItemChar = wc;
mDragItemSaved = LLEmbeddedItems::getEmbeddedItemSaved(wc);
gFocusMgr.setMouseCapture( this );
mMouseDownX = x;
@@ -779,6 +745,7 @@ BOOL LLViewerTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
BOOL LLViewerTextEditor::handleHover(S32 x, S32 y, MASK mask)
{
+ static LLUICachedControl<S32> scrollbar_size ("UIScrollbarSize", 0);
BOOL handled = FALSE;
if (!mDragItem)
@@ -823,7 +790,7 @@ BOOL LLViewerTextEditor::handleHover(S32 x, S32 y, MASK mask)
LLAssetType::lookupDragAndDropType( mDragItem->getType() ),
mDragItem->getUUID(),
LLToolDragAndDrop::SOURCE_NOTECARD,
- getSourceID(), mObjectID);
+ mPreviewID, mObjectID);
return LLToolDragAndDrop::getInstance()->handleHover( x, y, mask );
}
@@ -876,7 +843,7 @@ BOOL LLViewerTextEditor::handleHover(S32 x, S32 y, MASK mask)
if( !handled )
{
lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (inactive)" << llendl;
- if (!mScrollbar->getVisible() || x < getRect().getWidth() - SCROLLBAR_SIZE)
+ if (!mScrollbar->getVisible() || x < getRect().getWidth() - scrollbar_size)
{
getWindow()->setCursor(UI_CURSOR_IBEAM);
}
@@ -907,8 +874,9 @@ BOOL LLViewerTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
{
if(mDragItemSaved)
{
- openEmbeddedItem(mDragItem);
- }else
+ openEmbeddedItem(mDragItem, mDragItemChar);
+ }
+ else
{
showUnsavedAlertDialog(mDragItem);
}
@@ -1060,7 +1028,15 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
std::string& tooltip_msg)
{
BOOL handled = FALSE;
-
+
+ LLToolDragAndDrop::ESource source = LLToolDragAndDrop::getInstance()->getSource();
+ if (LLToolDragAndDrop::SOURCE_NOTECARD == source)
+ {
+ // We currently do not handle dragging items from one notecard to another
+ // since items in a notecard must be in Inventory to be verified. See DEV-2891.
+ return FALSE;
+ }
+
if (mTakesNonScrollClicks)
{
if (getEnabled() && acceptsTextInput())
@@ -1096,7 +1072,7 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
case DAD_GESTURE:
{
LLInventoryItem *item = (LLInventoryItem *)cargo_data;
- if( allowsEmbeddedItems() )
+ if( item && allowsEmbeddedItems() )
{
U32 mask_next = item->getPermissions().getMaskNextOwner();
if((mask_next & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED)
@@ -1123,6 +1099,7 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask,
*accept = ACCEPT_NO;
if (tooltip_msg.empty())
{
+ // *TODO: Translate
tooltip_msg.assign("Only items with unrestricted\n"
"'next owner' permissions \n"
"can be attached to notecards.");
@@ -1236,17 +1213,14 @@ std::string LLViewerTextEditor::appendTime(bool prepend_newline)
time_t utc_time;
utc_time = time_corrected();
- // There's only one internal tm buffer.
- struct tm* timep;
-
- // Convert to Pacific, based on server's opinion of whether
- // it's daylight savings time there.
- timep = utc_to_pacific_time(utc_time, gPacificDaylightTime);
+ std::string timeStr = LLTrans::getString("TextEditorTimeStr");
+ LLSD substitution;
- std::string text = llformat("[%d:%02d] ", timep->tm_hour, timep->tm_min);
- appendColoredText(text, false, prepend_newline, LLColor4::grey);
+ substitution["datetime"] = (S32) utc_time;
+ LLStringUtil::format (timeStr, substitution);
+ appendColoredText(timeStr, false, prepend_newline, LLColor4::grey);
- return text;
+ return timeStr;
}
//----------------------------------------------------------------------------
@@ -1302,13 +1276,14 @@ BOOL LLViewerTextEditor::openEmbeddedItemAtPos(S32 pos)
{
if( pos < getLength())
{
- LLInventoryItem* item = LLEmbeddedItems::getEmbeddedItem( getWChar(pos) );
+ llwchar wc = getWChar(pos);
+ LLInventoryItem* item = LLEmbeddedItems::getEmbeddedItem( wc );
if( item )
{
- BOOL saved = LLEmbeddedItems::getEmbeddedItemSaved( getWChar(pos) );
+ BOOL saved = LLEmbeddedItems::getEmbeddedItemSaved( wc );
if (saved)
{
- return openEmbeddedItem(item);
+ return openEmbeddedItem(item, wc);
}
else
{
@@ -1320,25 +1295,25 @@ BOOL LLViewerTextEditor::openEmbeddedItemAtPos(S32 pos)
}
-BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item)
+BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item, llwchar wc)
{
switch( item->getType() )
{
case LLAssetType::AT_TEXTURE:
- openEmbeddedTexture( item );
+ openEmbeddedTexture( item, wc );
return TRUE;
case LLAssetType::AT_SOUND:
- openEmbeddedSound( item );
+ openEmbeddedSound( item, wc );
return TRUE;
case LLAssetType::AT_NOTECARD:
- openEmbeddedNotecard( item );
+ openEmbeddedNotecard( item, wc );
return TRUE;
case LLAssetType::AT_LANDMARK:
- openEmbeddedLandmark( item );
+ openEmbeddedLandmark( item, wc );
return TRUE;
case LLAssetType::AT_LSL_TEXT:
@@ -1347,7 +1322,7 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item)
case LLAssetType::AT_BODYPART:
case LLAssetType::AT_ANIMATION:
case LLAssetType::AT_GESTURE:
- showCopyToInvDialog( item );
+ showCopyToInvDialog( item, wc );
return TRUE;
default:
return FALSE;
@@ -1356,35 +1331,22 @@ BOOL LLViewerTextEditor::openEmbeddedItem(LLInventoryItem* item)
}
-void LLViewerTextEditor::openEmbeddedTexture( LLInventoryItem* item )
+void LLViewerTextEditor::openEmbeddedTexture( LLInventoryItem* item, llwchar wc )
{
- // See if we can bring an existing preview to the front
// *NOTE: Just for embedded Texture , we should use getAssetUUID(),
// not getUUID(), because LLPreviewTexture pass in AssetUUID into
// LLPreview constructor ItemUUID parameter.
-
- if( !LLPreview::show( item->getAssetUUID() ) )
+ if (!item)
+ return;
+ LLPreviewTexture* preview = LLFloaterReg::showTypedInstance<LLPreviewTexture>("preview_texture", LLSD(item->getAssetUUID()), TAKE_FOCUS_YES);
+ if (preview)
{
- // There isn't one, so make a new preview
- if(item)
- {
- S32 left, top;
- gFloaterView->getNewFloaterPosition(&left, &top);
- LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
- rect.translate( left - rect.mLeft, top - rect.mTop );
-
- LLPreviewTexture* preview = new LLPreviewTexture("preview texture",
- rect,
- item->getName(),
- item->getAssetUUID(),
- TRUE);
- preview->setAuxItem( item );
- preview->setNotecardInfo(mNotecardInventoryID, mObjectID);
- }
+ preview->setAuxItem( item );
+ preview->setNotecardInfo(mNotecardInventoryID, mObjectID);
}
}
-void LLViewerTextEditor::openEmbeddedSound( LLInventoryItem* item )
+void LLViewerTextEditor::openEmbeddedSound( LLInventoryItem* item, llwchar wc )
{
// Play sound locally
LLVector3d lpos_global = gAgent.getPositionGlobal();
@@ -1393,18 +1355,22 @@ void LLViewerTextEditor::openEmbeddedSound( LLInventoryItem* item )
{
gAudiop->triggerSound(item->getAssetUUID(), gAgentID, SOUND_GAIN, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
}
- showCopyToInvDialog( item );
+ showCopyToInvDialog( item, wc );
}
-void LLViewerTextEditor::openEmbeddedLandmark( LLInventoryItem* item )
+void LLViewerTextEditor::openEmbeddedLandmark( LLInventoryItem* item, llwchar wc )
{
- std::string title =
- std::string(" ") + LLLandmarkBridge::prefix() + item->getName();
- open_landmark((LLViewerInventoryItem*)item, title, FALSE, item->getUUID(), TRUE);
+ if (!item)
+ return;
+ LLPreviewLandmark* preview = LLFloaterReg::showTypedInstance<LLPreviewLandmark>("preview_landmark", LLSD(item->getUUID()), TAKE_FOCUS_YES);
+ if (preview)
+ {
+ preview->setItem( item );
+ }
}
-void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item )
+void LLViewerTextEditor::openEmbeddedNotecard( LLInventoryItem* item, llwchar wc )
{
copyInventory(item, gInventoryCallbacks.registerCB(mInventoryCallback));
}
@@ -1423,20 +1389,23 @@ bool LLViewerTextEditor::onNotecardDialog(const LLSD& notification, const LLSD&
S32 option = LLNotification::getSelectedOption(notification, response);
if( option == 0 )
{
- // itemptr is deleted by LLPreview::save
- LLPointer<LLInventoryItem>* itemptr = new LLPointer<LLInventoryItem>(gInventory.getItem(notification["payload"]["item_id"].asUUID()));
- LLPreview::save( notification["payload"]["notecard_id"].asUUID() , itemptr);
+ LLPreviewNotecard* preview = LLFloaterReg::findTypedInstance<LLPreviewNotecard>("preview_notecard", notification["payload"]["notecard_id"]);;
+ if (preview)
+ {
+ preview->saveItem();
+ }
}
return false;
}
-void LLViewerTextEditor::showCopyToInvDialog( LLInventoryItem* item )
+void LLViewerTextEditor::showCopyToInvDialog( LLInventoryItem* item, llwchar wc )
{
LLSD payload;
- payload["item_id"] = item->getUUID();
- payload["notecard_id"] = mNotecardInventoryID;
+ LLUUID item_id = item->getUUID();
+ payload["item_id"] = item_id;
+ payload["item_wc"] = LLSD::Integer(wc);
LLNotifications::instance().add( "ConfirmItemCopy", LLSD(), payload,
boost::bind(&LLViewerTextEditor::onCopyToInvDialog, this, _1, _2));
}
@@ -1446,8 +1415,11 @@ bool LLViewerTextEditor::onCopyToInvDialog(const LLSD& notification, const LLSD&
S32 option = LLNotification::getSelectedOption(notification, response);
if( 0 == option )
{
- LLInventoryItem* itemp = gInventory.getItem(notification["payload"]["item_id"].asUUID());
- copyInventory(itemp);
+ LLUUID item_id = notification["payload"]["item_id"].asUUID();
+ llwchar wc = llwchar(notification["payload"]["item_wc"].asInteger());
+ LLInventoryItem* itemp = LLEmbeddedItems::getEmbeddedItem(wc);
+ if (itemp)
+ copyInventory(itemp);
}
return false;
}
@@ -1525,61 +1497,3 @@ BOOL LLViewerTextEditor::exportBuffer( std::string& buffer )
return TRUE;
}
-LLView* LLViewerTextEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
-{
- std::string name("text_editor");
- node->getAttributeString("name", name);
-
- LLRect rect;
- createRect(node, rect, parent, LLRect());
-
- U32 max_text_length = 255;
- node->getAttributeU32("max_length", max_text_length);
-
- BOOL allow_embedded_items = FALSE;
- node->getAttributeBOOL("embedded_items", allow_embedded_items);
-
- LLFontGL* font = LLView::selectFont(node);
-
- // std::string text = node->getValue();
- std::string text = node->getTextContents().substr(0, max_text_length - 1);
-
- if (text.size() > max_text_length)
- {
- // Erase everything from max_text_length on.
- text.erase(max_text_length);
- }
-
- LLViewerTextEditor* text_editor = new LLViewerTextEditor(name,
- rect,
- max_text_length,
- LLStringUtil::null,
- font,
- allow_embedded_items);
-
- BOOL ignore_tabs = text_editor->tabsToNextField();
- node->getAttributeBOOL("ignore_tab", ignore_tabs);
- text_editor->setTabsToNextField(ignore_tabs);
-
- text_editor->setTextEditorParameters(node);
-
- BOOL hide_scrollbar = FALSE;
- node->getAttributeBOOL("hide_scrollbar",hide_scrollbar);
- text_editor->setHideScrollbarForShortDocs(hide_scrollbar);
-
- BOOL hide_border = !text_editor->isBorderVisible();
- node->getAttributeBOOL("hide_border", hide_border);
- text_editor->setBorderVisible(!hide_border);
-
- BOOL parse_html = text_editor->mParseHTML;
- node->getAttributeBOOL("allow_html", parse_html);
- text_editor->setParseHTML(parse_html);
- text_editor->setParseHighlights(TRUE);
-
- text_editor->initFromXML(node, parent);
-
- // add text after all parameters have been set
- text_editor->appendStyledText(text, FALSE, FALSE);
-
- return text_editor;
-}
diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h
index 1ed60a57fe..bc373c858a 100644
--- a/indra/newview/llviewertexteditor.h
+++ b/indra/newview/llviewertexteditor.h
@@ -41,21 +41,27 @@
//
class LLViewerTextEditor : public LLTextEditor
{
-
public:
- LLViewerTextEditor(const std::string& name,
- const LLRect& rect,
- S32 max_length,
- const std::string& default_text = std::string(),
- const LLFontGL* glfont = NULL,
- BOOL allow_embedded_items = FALSE);
+ struct Params : public LLInitParam::Block<Params, LLTextEditor::Params>
+ {
+ Optional<bool> allow_html;
+
+ Params()
+ : allow_html("allow_html", false)
+ {
+ name = "text_editor";
+ }
+ };
+protected:
+ LLViewerTextEditor(const Params&);
+ friend class LLUICtrlFactory;
+
+public:
virtual ~LLViewerTextEditor();
virtual void makePristine();
- static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-
// mousehandler overrides
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
@@ -74,10 +80,11 @@ public:
virtual BOOL importBuffer(const char* buffer, S32 length);
virtual bool importStream(std::istream& str);
virtual BOOL exportBuffer(std::string& buffer);
- void setNotecardInfo(const LLUUID& notecard_item_id, const LLUUID& object_id)
+ void setNotecardInfo(const LLUUID& notecard_item_id, const LLUUID& object_id, const LLUUID& preview_id)
{
mNotecardInventoryID = notecard_item_id;
mObjectID = object_id;
+ mPreviewID = preview_id;
}
void setASCIIEmbeddedText(const std::string& instr);
@@ -105,26 +112,28 @@ private:
BOOL getEmbeddedItemToolTipAtPos(S32 pos, LLWString &wmsg) const;
BOOL openEmbeddedItemAtPos( S32 pos );
- BOOL openEmbeddedItem(LLInventoryItem* item);
+ BOOL openEmbeddedItem(LLInventoryItem* item, llwchar wc);
S32 insertEmbeddedItem(S32 pos, LLInventoryItem* item);
- void openEmbeddedTexture( LLInventoryItem* item );
- void openEmbeddedSound( LLInventoryItem* item );
- void openEmbeddedLandmark( LLInventoryItem* item );
- void openEmbeddedNotecard( LLInventoryItem* item);
- void showCopyToInvDialog( LLInventoryItem* item );
+ void openEmbeddedTexture( LLInventoryItem* item, llwchar wc );
+ void openEmbeddedSound( LLInventoryItem* item, llwchar wc );
+ void openEmbeddedLandmark( LLInventoryItem* item, llwchar wc );
+ void openEmbeddedNotecard( LLInventoryItem* item, llwchar wc);
+ void showCopyToInvDialog( LLInventoryItem* item, llwchar wc );
void showUnsavedAlertDialog( LLInventoryItem* item );
bool onCopyToInvDialog(const LLSD& notification, const LLSD& response );
static bool onNotecardDialog(const LLSD& notification, const LLSD& response );
LLPointer<LLInventoryItem> mDragItem;
+ llwchar mDragItemChar;
BOOL mDragItemSaved;
class LLEmbeddedItems* mEmbeddedItemList;
LLUUID mObjectID;
LLUUID mNotecardInventoryID;
+ LLUUID mPreviewID;
LLPointer<class LLEmbeddedNotecardOpener> mInventoryCallback;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index c827d3fcf4..4a58f7d955 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -36,7 +36,9 @@
#include <stdio.h>
#include <iostream>
#include <fstream>
+#include <algorithm>
+#include "llfloaterreg.h"
#include "llpanellogin.h"
#include "llviewerkeyboard.h"
#include "llviewerwindow.h"
@@ -48,7 +50,6 @@
#include "llvoiceclient.h" // for push-to-talk button handling
-
//
// TODO: Many of these includes are unnecessary. Remove them.
//
@@ -98,16 +99,15 @@
#include "llfloaterchat.h"
#include "llfloaterchatterbox.h"
#include "llfloatercustomize.h"
-#include "llfloatereditui.h" // HACK JAMESDEBUG for ui editor
#include "llfloaterland.h"
#include "llfloaterinspect.h"
+#include "llfloatermap.h"
#include "llfloaternamedesc.h"
#include "llfloaterpreference.h"
#include "llfloatersnapshot.h"
#include "llfloatertools.h"
#include "llfloaterworldmap.h"
#include "llfocusmgr.h"
-#include "llframestatview.h"
#include "llgesturemgr.h"
#include "llglheaders.h"
#include "llhoverview.h"
@@ -122,12 +122,12 @@
#include "llmodaldialog.h"
#include "llmorphview.h"
#include "llmoveview.h"
+#include "llnavigationbar.h"
#include "llnotify.h"
#include "lloverlaybar.h"
#include "llpreviewtexture.h"
#include "llprogressview.h"
#include "llresmgr.h"
-#include "llrootview.h"
#include "llselectmgr.h"
#include "llrendersphere.h"
#include "llstartup.h"
@@ -151,9 +151,8 @@
#include "lltoolmgr.h"
#include "lltoolmorph.h"
#include "lltoolpie.h"
-#include "lltoolplacer.h"
#include "lltoolselectland.h"
-#include "lltoolview.h"
+#include "lltrans.h"
#include "lluictrlfactory.h"
#include "lluploaddialog.h"
#include "llurldispatcher.h" // SLURL from other app instance
@@ -183,7 +182,6 @@
#include "llviewernetwork.h"
#include "llpostprocess.h"
-#include "llfloatertest.h" // HACK!
#include "llfloaternotificationsconsole.h"
#if LL_WINDOWS
@@ -194,7 +192,6 @@
// Globals
//
void render_ui(F32 zoom_factor = 1.f, int subfield = 0);
-LLBottomPanel* gBottomPanel = NULL;
extern BOOL gDebugClicks;
extern BOOL gDisplaySwapBuffers;
@@ -203,7 +200,6 @@ extern BOOL gResizeScreenTexture;
extern S32 gJamesInt;
LLViewerWindow *gViewerWindow = NULL;
-LLVelocityBar *gVelocityBar = NULL;
BOOL gDebugSelect = FALSE;
@@ -250,6 +246,22 @@ std::string LLViewerWindow::sMovieBaseName;
extern void toggle_debug_menus(void*);
+class LLBottomPanel : public LLPanel
+{
+public:
+ LLBottomPanel(const LLRect& rect);
+ void setFocusIndicator(LLView * indicator);
+ LLView * getFocusIndicator() { return mIndicator; }
+ /*virtual*/ void draw();
+
+ static void* createHUD(void* data);
+ static void* createOverlayBar(void* data);
+ static void* createToolBar(void* data);
+
+protected:
+ LLView * mIndicator;
+};
+LLBottomPanel* gBottomPanel = NULL;
////////////////////////////////////////////////////////////////////////////
//
@@ -557,7 +569,7 @@ public:
const Line& line = *iter;
LLFontGL::getFontMonospace()->renderUTF8(line.text, 0, (F32)line.x, (F32)line.y, mTextColor,
LLFontGL::LEFT, LLFontGL::TOP,
- LLFontGL::NORMAL, S32_MAX, S32_MAX, NULL, FALSE);
+ LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE);
}
mLineList.clear();
}
@@ -1186,6 +1198,27 @@ void LLViewerWindow::handlePauseWatchdog(LLWindow *window)
LLAppViewer::instance()->pauseMainloopTimeout();
}
+//virtual
+std::string LLViewerWindow::translateString(const char* tag)
+{
+ return LLTrans::getString( std::string(tag) );
+}
+
+//virtual
+std::string LLViewerWindow::translateString(const char* tag,
+ const std::map<std::string, std::string>& args)
+{
+ // LLTrans uses a special subclass of std::string for format maps,
+ // but we must use std::map<> in these callbacks, otherwise we create
+ // a dependency between LLWindow and LLFormatMapString. So copy the data.
+ LLStringUtil::format_map_t args_copy;
+ std::map<std::string,std::string>::const_iterator it = args.begin();
+ for ( ; it != args.end(); ++it)
+ {
+ args_copy[it->first] = it->second;
+ }
+ return LLTrans::getString( std::string(tag), args_copy);
+}
//
// Classes
@@ -1196,6 +1229,7 @@ LLViewerWindow::LLViewerWindow(
S32 width, S32 height,
BOOL fullscreen, BOOL ignore_pixel_depth)
:
+ mWindow(NULL),
mActive(TRUE),
mWantFullscreen(fullscreen),
mShowFullscreenProgress(FALSE),
@@ -1231,7 +1265,7 @@ LLViewerWindow::LLViewerWindow(
resetSnapshotLoc();
// create window
- mWindow = LLWindowManager::createWindow(
+ mWindow = LLWindowManager::createWindow(this,
title, name, x, y, width, height, 0,
fullscreen,
gNoRender,
@@ -1309,23 +1343,29 @@ LLViewerWindow::LLViewerWindow(
}
- // set callbacks
- mWindow->setCallbacks(this);
-
// Init the image list. Must happen after GL is initialized and before the images that
// LLViewerWindow needs are requested.
gImageList.init();
LLViewerImage::initClass();
gBumpImageList.init();
-
+
+ // Init font system, but don't actually load the fonts yet
+ // because our window isn't onscreen and they take several
+ // seconds to parse.
+ LLFontGL::initClass( gSavedSettings.getF32("FontScreenDPI"),
+ mDisplayScale.mV[VX],
+ mDisplayScale.mV[VY],
+ gDirUtilp->getAppRODataDir(),
+ LLUI::getXUIPaths());
+
// Create container for all sub-views
- mRootView = new LLRootView("root", mVirtualWindowRect, FALSE);
-
- if (!gNoRender)
- {
- // Init default fonts
- initFonts();
- }
+ LLView::Params rvp;
+ rvp.name("root");
+ rvp.rect(mVirtualWindowRect);
+ rvp.mouse_opaque(false);
+ rvp.follows.flags(FOLLOWS_NONE);
+ mRootView = LLUICtrlFactory::create<LLView>(rvp);
+ LLUI::setRootView(mRootView);
// Make avatar head look forward at start
mCurrentMousePoint.mX = getWindowWidth() / 2;
@@ -1381,8 +1421,6 @@ void LLViewerWindow::initBase()
LLRect full_window(0, height, width, 0);
- adjustRectanglesForFirstUse(full_window);
-
////////////////////
//
// Set the gamma
@@ -1405,6 +1443,9 @@ void LLViewerWindow::initBase()
// make space for menu bar if we have one
floater_view_rect.mTop -= MENU_BAR_HEIGHT;
+ // make space for nav bar
+ floater_view_rect.mTop -= NAVIGATION_BAR_HEIGHT;
+
// TODO: Eliminate magic constants - please used named constants if changing this
floater_view_rect.mBottom += STATUS_BAR_HEIGHT + 12 + 16 + 2;
@@ -1414,10 +1455,20 @@ void LLViewerWindow::initBase()
{
floater_view_rect.mBottom = floater_view_bottom;
}
- gFloaterView = new LLFloaterView("Floater View", floater_view_rect );
- gFloaterView->setVisible(TRUE);
-
- gSnapshotFloaterView = new LLSnapshotFloaterView("Snapshot Floater View", full_window);
+ LLFloaterView::Params fvparams;
+ fvparams.name("Floater View");
+ fvparams.rect(floater_view_rect);
+ fvparams.mouse_opaque(false);
+ fvparams.follows.flags(FOLLOWS_ALL);
+ fvparams.tab_stop(false);
+ gFloaterView = LLUICtrlFactory::create<LLFloaterView> (fvparams);
+
+ LLSnapshotFloaterView::Params snapParams;
+ snapParams.name("Snapshot Floater View");
+ snapParams.rect(full_window);
+ snapParams.enabled(false);
+ gSnapshotFloaterView = LLUICtrlFactory::create<LLSnapshotFloaterView> (snapParams);
+
// Snapshot floater must start invisible otherwise it eats all
// the tooltips. JC
gSnapshotFloaterView->setVisible(FALSE);
@@ -1443,19 +1494,23 @@ void LLViewerWindow::initBase()
console_rect.mRight = console_rect.mLeft + 2 * width / 3;
}
- gConsole = new LLConsole(
- "console",
- gSavedSettings.getS32("ConsoleBufferSize"),
- console_rect,
- gSavedSettings.getS32("ChatFontSize"),
- gSavedSettings.getF32("ChatPersistTime") );
- gConsole->setFollows(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
+ LLConsole::Params cp;
+ cp.name("console");
+ cp.max_lines(gSavedSettings.getS32("ConsoleBufferSize"));
+ cp.rect(console_rect);
+ cp.persist_time(gSavedSettings.getF32("ChatPersistTime"));
+ cp.font_size_index(gSavedSettings.getS32("ChatFontSize"));
+ cp.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
+ gConsole = LLUICtrlFactory::create<LLConsole>(cp);
mRootView->addChild(gConsole);
// Debug view over the console
- gDebugView = new LLDebugView("gDebugView", full_window);
- gDebugView->setFollowsAll();
- gDebugView->setVisible(TRUE);
+ LLDebugView::Params debug_p;
+ debug_p.name("DebugView");
+ debug_p.rect(full_window);
+ debug_p.follows.flags(FOLLOWS_ALL);
+ debug_p.visible(true);
+ gDebugView = LLUICtrlFactory::create<LLDebugView>(debug_p);
mRootView->addChild(gDebugView);
// Add floater view at the end so it will be on top, and give it tab priority over others
@@ -1463,264 +1518,114 @@ void LLViewerWindow::initBase()
mRootView->addChild(gSnapshotFloaterView);
// notify above floaters!
- LLRect notify_rect = full_window;
+ LLRect notify_rect = floater_view_rect;
//notify_rect.mTop -= 24;
notify_rect.mBottom += STATUS_BAR_HEIGHT;
- gNotifyBoxView = new LLNotifyBoxView("notify_container", notify_rect, FALSE, FOLLOWS_ALL);
+ LLNotifyBoxView::Params p;
+ p.name("notify_container");
+ p.rect(notify_rect);
+ p.mouse_opaque(false);
+ p.follows.flags(FOLLOWS_ALL);
+ gNotifyBoxView = LLUICtrlFactory::create<LLNotifyBoxView> (p);
mRootView->addChild(gNotifyBoxView, -2);
// Tooltips go above floaters
- mToolTip = new LLTextBox( std::string("tool tip"), LLRect(0, 1, 1, 0 ) );
- mToolTip->setHPad( 4 );
- mToolTip->setVPad( 2 );
- mToolTip->setColor( gColors.getColor( "ToolTipTextColor" ) );
- mToolTip->setBorderColor( gColors.getColor( "ToolTipBorderColor" ) );
- mToolTip->setBorderVisible( FALSE );
- mToolTip->setBackgroundColor( gColors.getColor( "ToolTipBgColor" ) );
- mToolTip->setBackgroundVisible( TRUE );
- mToolTip->setFontStyle(LLFontGL::NORMAL);
- mToolTip->setBorderDropshadowVisible( TRUE );
- mToolTip->setVisible( FALSE );
+ LLTextBox::Params params;
+ params.text("tool tip");
+ params.name(params.text);
+ params.rect(LLRect (0, 1, 1, 0));
+ params.h_pad(4);
+ params.v_pad(2);
+ params.text_color(gSavedSkinSettings.getColor( "ToolTipTextColor" ));
+ params.border_color(gSavedSkinSettings.getColor( "ToolTipBorderColor" ));
+ params.border_visible(false);
+ params.background_color(gSavedSkinSettings.getColor( "ToolTipBgColor" ));
+ params.bg_visible(true);
+ params.font.style("NORMAL");
+ params.border_drop_shadow_visible(true);
+ params.visible(false);
+ mToolTip = LLUICtrlFactory::create<LLTextBox> (params);
// Add the progress bar view (startup view), which overrides everything
- mProgressView = new LLProgressView(std::string("ProgressView"), full_window);
+ mProgressView = new LLProgressView(full_window);
mRootView->addChild(mProgressView);
setShowProgress(FALSE);
setProgressCancelButtonVisible(FALSE);
}
-
-void adjust_rect_top_left(const std::string& control, const LLRect& window)
-{
- LLRect r = gSavedSettings.getRect(control);
- if (r.mLeft == 0 && r.mBottom == 0)
- {
- r.setLeftTopAndSize(0, window.getHeight(), r.getWidth(), r.getHeight());
- gSavedSettings.setRect(control, r);
- }
-}
-
-void adjust_rect_top_center(const std::string& control, const LLRect& window)
-{
- LLRect r = gSavedSettings.getRect(control);
- if (r.mLeft == 0 && r.mBottom == 0)
- {
- r.setLeftTopAndSize( window.getWidth()/2 - r.getWidth()/2,
- window.getHeight(),
- r.getWidth(),
- r.getHeight() );
- gSavedSettings.setRect(control, r);
- }
-}
-
-void adjust_rect_top_right(const std::string& control, const LLRect& window)
-{
- LLRect r = gSavedSettings.getRect(control);
- if (r.mLeft == 0 && r.mBottom == 0)
- {
- r.setLeftTopAndSize(window.getWidth() - r.getWidth(),
- window.getHeight(),
- r.getWidth(),
- r.getHeight());
- gSavedSettings.setRect(control, r);
- }
-}
-
-// *TODO: Adjust based on XUI XML
-const S32 TOOLBAR_HEIGHT = 64;
-
-void adjust_rect_bottom_left(const std::string& control, const LLRect& window)
-{
- LLRect r = gSavedSettings.getRect(control);
- if (r.mLeft == 0 && r.mBottom == 0)
- {
- r.setOriginAndSize(0, TOOLBAR_HEIGHT, r.getWidth(), r.getHeight());
- gSavedSettings.setRect(control, r);
- }
-}
-
-void adjust_rect_bottom_center(const std::string& control, const LLRect& window)
-{
- LLRect r = gSavedSettings.getRect(control);
- if (r.mLeft == 0 && r.mBottom == 0)
- {
- r.setOriginAndSize(
- window.getWidth()/2 - r.getWidth()/2,
- TOOLBAR_HEIGHT,
- r.getWidth(),
- r.getHeight());
- gSavedSettings.setRect(control, r);
- }
-}
-
-void adjust_rect_centered_partial_zoom(const std::string& control,
- const LLRect& window)
-{
- LLRect rect = gSavedSettings.getRect(control);
- // Only adjust on first use
- if (rect.mLeft == 0 && rect.mBottom == 0)
- {
- S32 width = window.getWidth();
- S32 height = window.getHeight();
- rect.set(0, height-STATUS_BAR_HEIGHT, width, TOOL_BAR_HEIGHT);
- // Make floater fill 80% of window, leaving 20% padding on
- // the sides.
- const F32 ZOOM_FRACTION = 0.8f;
- S32 dx = (S32)(width * (1.f - ZOOM_FRACTION));
- S32 dy = (S32)(height * (1.f - ZOOM_FRACTION));
- rect.stretch(-dx/2, -dy/2);
- gSavedSettings.setRect(control, rect);
- }
-}
-
-
-// Many rectangles can't be placed until we know the screen size.
-// These rectangles have their bottom-left corner as 0,0
-void LLViewerWindow::adjustRectanglesForFirstUse(const LLRect& window)
-{
- LLRect r;
-
- // *NOTE: The width and height of these floaters must be
- // identical in settings.xml and their relevant floater.xml
- // files, otherwise the window construction will get
- // confused. JC
- adjust_rect_bottom_center("FloaterMoveRect2", window);
-
- adjust_rect_top_center("FloaterCameraRect3", window);
-
- adjust_rect_top_left("FloaterCustomizeAppearanceRect", window);
-
- adjust_rect_top_left("FloaterLandRect5", window);
-
- adjust_rect_top_left("FloaterFindRect2", window);
-
- adjust_rect_top_left("FloaterGestureRect2", window);
-
- adjust_rect_top_right("FloaterMiniMapRect", window);
-
- adjust_rect_top_right("FloaterLagMeter", window);
-
- adjust_rect_top_left("FloaterBuildOptionsRect", window);
-
- adjust_rect_bottom_left("FloaterActiveSpeakersRect", window);
-
- adjust_rect_bottom_left("FloaterBumpRect", window);
-
- adjust_rect_bottom_left("FloaterRegionInfo", window);
-
- adjust_rect_bottom_left("FloaterEnvRect", window);
-
- adjust_rect_bottom_left("FloaterAdvancedSkyRect", window);
-
- adjust_rect_bottom_left("FloaterAdvancedWaterRect", window);
-
- adjust_rect_bottom_left("FloaterDayCycleRect", window);
-
- adjust_rect_top_right("FloaterStatisticsRect", window);
-
-
- // bottom-right
- r = gSavedSettings.getRect("FloaterInventoryRect");
- if (r.mLeft == 0 && r.mBottom == 0)
- {
- r.setOriginAndSize(
- window.getWidth() - r.getWidth(),
- 0,
- r.getWidth(),
- r.getHeight());
- gSavedSettings.setRect("FloaterInventoryRect", r);
- }
-
-// adjust_rect_top_left("FloaterHUDRect2", window);
-
- // slightly off center to be left of the avatar.
- r = gSavedSettings.getRect("FloaterHUDRect2");
- if (r.mLeft == 0 && r.mBottom == 0)
- {
- r.setOriginAndSize(
- window.getWidth()/4 - r.getWidth()/2,
- 2*window.getHeight()/3 - r.getHeight()/2,
- r.getWidth(),
- r.getHeight());
- gSavedSettings.setRect("FloaterHUDRect2", r);
- }
-}
-
-//Rectangles need to be adjusted after the window is constructed
-//in order for proper centering to take place
-void LLViewerWindow::adjustControlRectanglesForFirstUse(const LLRect& window)
-{
- adjust_rect_bottom_center("FloaterMoveRect2", window);
- adjust_rect_top_center("FloaterCameraRect3", window);
-}
-
void LLViewerWindow::initWorldUI()
{
- pre_init_menus();
-
S32 height = mRootView->getRect().getHeight();
S32 width = mRootView->getRect().getWidth();
LLRect full_window(0, height, width, 0);
if ( gBottomPanel == NULL ) // Don't re-enter if objects are alreay created
- {
+ {
// panel containing chatbar, toolbar, and overlay, over floaters
gBottomPanel = new LLBottomPanel(mRootView->getRect());
mRootView->addChild(gBottomPanel);
// View for hover information
- gHoverView = new LLHoverView(std::string("gHoverView"), full_window);
- gHoverView->setVisible(TRUE);
+ LLHoverView::Params hvp;
+ hvp.name("gHoverview");
+ hvp.rect(full_window);
+ gHoverView = LLUICtrlFactory::create<LLHoverView>(hvp);
mRootView->addChild(gHoverView);
+
+ // Pre initialize instance communicate instance;
+ // currently needs to happen before initializing chat or IM
+ LLFloaterReg::getInstance("communicate");
gIMMgr = LLIMMgr::getInstance();
if ( gSavedPerAccountSettings.getBOOL("LogShowHistory") )
{
- LLFloaterChat::getInstance(LLSD())->loadHistory();
+ LLFloaterChat::loadHistory();
}
LLRect morph_view_rect = full_window;
morph_view_rect.stretch( -STATUS_BAR_HEIGHT );
morph_view_rect.mTop = full_window.mTop - 32;
- gMorphView = new LLMorphView(std::string("gMorphView"), morph_view_rect );
+ LLMorphView::Params mvp;
+ mvp.name("MorphView");
+ mvp.rect(morph_view_rect);
+ mvp.visible(false);
+ gMorphView = LLUICtrlFactory::create<LLMorphView>(mvp);
mRootView->addChild(gMorphView);
- gMorphView->setVisible(FALSE);
// *Note: this is where gFloaterMute used to be initialized.
LLWorldMapView::initClass();
+
+ // Force gFloaterWorldMap to initialize
+ LLFloaterReg::getInstance("world_map");
+ LLFloaterReg::hideInstance("world_map");
- adjust_rect_centered_partial_zoom("FloaterWorldMapRect2", full_window);
-
- gFloaterWorldMap = new LLFloaterWorldMap();
- gFloaterWorldMap->setVisible(FALSE);
-
- //
- // Tools for building
- //
-
- // Toolbox floater
- init_menus();
-
- gFloaterTools = new LLFloaterTools();
- gFloaterTools->setVisible(FALSE);
+ // Force gFloaterTools to initialize
+ LLFloaterReg::getInstance("build");
+ LLFloaterReg::hideInstance("build");
// Status bar
S32 menu_bar_height = gMenuBarView->getRect().getHeight();
LLRect root_rect = getRootView()->getRect();
LLRect status_rect(0, root_rect.getHeight(), root_rect.getWidth(), root_rect.getHeight() - menu_bar_height);
- gStatusBar = new LLStatusBar(std::string("status"), status_rect);
+ gStatusBar = new LLStatusBar(status_rect);
gStatusBar->setFollows(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_TOP);
gStatusBar->reshape(root_rect.getWidth(), gStatusBar->getRect().getHeight(), TRUE);
gStatusBar->translate(0, root_rect.getHeight() - gStatusBar->getRect().getHeight());
// sync bg color with menu bar
- gStatusBar->setBackgroundColor( gMenuBarView->getBackgroundColor() );
+ gStatusBar->setBackgroundColor( gMenuBarView->getBackgroundColor().get() );
- LLFloaterChatterBox::createInstance(LLSD());
+ // Navigation bar
+ LLNavigationBar* navbar = LLNavigationBar::getInstance();
+ navbar->reshape(root_rect.getWidth(), navbar->getRect().getHeight(), TRUE); // *TODO: redundant?
+ navbar->translate(0, root_rect.getHeight() - menu_bar_height - navbar->getRect().getHeight()); // FIXME
+ navbar->setBackgroundColor(gMenuBarView->getBackgroundColor().get());
+
getRootView()->addChild(gStatusBar);
+ getRootView()->addChild(navbar);
// menu holder appears on top to get first pass at all mouse events
getRootView()->sendChildToFront(gMenuHolder);
@@ -1746,7 +1651,6 @@ void LLViewerWindow::shutdownViews()
mRootView = NULL;
// Automatically deleted as children of mRootView. Fix the globals.
- gFloaterTools = NULL;
gStatusBar = NULL;
gIMMgr = NULL;
gHoverView = NULL;
@@ -1965,6 +1869,12 @@ void LLViewerWindow::setNormalControlsVisible( BOOL visible )
gStatusBar->setVisible( visible );
gStatusBar->setEnabled( visible );
}
+
+ LLNavigationBar* navbarp = LLUI::getRootView()->findChild<LLNavigationBar>("navigation_bar");
+ if (navbarp)
+ {
+ navbarp->setVisible( visible );
+ }
}
void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
@@ -1974,19 +1884,19 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
if(god_mode && LLViewerLogin::getInstance()->isInProductionGrid())
{
- new_bg_color = gColors.getColor( "MenuBarGodBgColor" );
+ new_bg_color = gSavedSkinSettings.getColor( "MenuBarGodBgColor" );
}
else if(god_mode && !LLViewerLogin::getInstance()->isInProductionGrid())
{
- new_bg_color = gColors.getColor( "MenuNonProductionGodBgColor" );
+ new_bg_color = gSavedSkinSettings.getColor( "MenuNonProductionGodBgColor" );
}
else if(!god_mode && !LLViewerLogin::getInstance()->isInProductionGrid())
{
- new_bg_color = gColors.getColor( "MenuNonProductionBgColor" );
+ new_bg_color = gSavedSkinSettings.getColor( "MenuNonProductionBgColor" );
}
else
{
- new_bg_color = gColors.getColor( "MenuBarBgColor" );
+ new_bg_color = gSavedSkinSettings.getColor( "MenuBarBgColor" );
}
if(gMenuBarView)
@@ -1997,6 +1907,8 @@ void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
if(gStatusBar)
{
gStatusBar->setBackgroundColor( new_bg_color );
+ gStatusBar->getChild<LLTextBox>("HealthText")->setBackgroundColor(new_bg_color);
+ gStatusBar->getChild<LLTextBox>("ParcelNameText")->setBackgroundColor(new_bg_color);
}
}
@@ -2040,7 +1952,7 @@ void LLViewerWindow::draw()
glLoadIdentity();
microsecondsToTimecodeString(gFrameTime,text);
- const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
+ const LLFontGL* font = LLFontGL::getFontSansSerif();
font->renderUTF8(text, 0,
llround((getWindowWidth()/2)-100.f),
llround((getWindowHeight()-60.f)),
@@ -2145,6 +2057,9 @@ void LLViewerWindow::draw()
#if LL_DEBUG
LLView::sIsDrawing = FALSE;
#endif
+
+ // UI post-draw Updates
+ gNotifyBoxView->updateNotifyBoxView();
}
// Takes a single keydown event, usually when UI is visible
@@ -2163,14 +2078,14 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
}
}
- // HACK look for UI editing keys
- if (LLView::sEditingUI)
- {
- if (LLFloaterEditUI::processKeystroke(key, mask))
- {
- return TRUE;
- }
- }
+ //// HACK look for UI editing keys
+ //if (LLView::sEditingUI)
+ //{
+ // if (LLFloaterEditUI::processKeystroke(key, mask))
+ // {
+ // return TRUE;
+ // }
+ //}
// Hide tooltips on keypress
mToolTipBlocked = TRUE; // block until next time mouse is moved
@@ -2205,9 +2120,10 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask)
}
}
- // Debugging view for unified notifications -- we need Ctrl+Shift+Alt to get it
- // since Ctrl+Shift maps to Nighttime under windlight.
- if ((MASK_SHIFT & mask)
+ // Debugging view for unified notifications: Control-Alt-N because
+ // Ctrl-Shift-N maps to Nighttime under windlight.
+ // Ctrl-Alt-Shift-N is Show beacons
+ if (!(MASK_SHIFT & mask)
&& (MASK_CONTROL & mask)
&& (MASK_ALT & mask)
&& ('N' == key || 'n' == key))
@@ -2471,7 +2387,7 @@ void LLViewerWindow::moveCursorToCenter()
// Update UI based on stored mouse position from mouse-move
// event processing.
-BOOL LLViewerWindow::handlePerFrameHover()
+void LLViewerWindow::updateUI()
{
static std::string last_handle_msg;
@@ -2481,93 +2397,110 @@ BOOL LLViewerWindow::handlePerFrameHover()
S32 y = mCurrentMousePoint.mY;
MASK mask = gKeyboard->currentMask(TRUE);
- //RN: fix for asynchronous notification of mouse leaving window not working
- LLCoordWindow mouse_pos;
- mWindow->getCursorPosition(&mouse_pos);
- if (mouse_pos.mX < 0 ||
- mouse_pos.mY < 0 ||
- mouse_pos.mX > mWindowRect.getWidth() ||
- mouse_pos.mY > mWindowRect.getHeight())
- {
- mMouseInWindow = FALSE;
- }
- else
+ if (gNoRender)
{
- mMouseInWindow = TRUE;
+ return;
}
+ updateMouseDelta();
+ updateKeyboardFocus();
- S32 dx = lltrunc((F32) (mCurrentMousePoint.mX - mLastMousePoint.mX) * LLUI::sGLScaleFactor.mV[VX]);
- S32 dy = lltrunc((F32) (mCurrentMousePoint.mY - mLastMousePoint.mY) * LLUI::sGLScaleFactor.mV[VY]);
-
- LLVector2 mouse_vel;
+ BOOL handled = FALSE;
- if (gSavedSettings.getBOOL("MouseSmooth"))
- {
- static F32 fdx = 0.f;
- static F32 fdy = 0.f;
+ BOOL handled_by_top_ctrl = FALSE;
+ LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
+ LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
- F32 amount = 16.f;
- fdx = fdx + ((F32) dx - fdx) * llmin(gFrameIntervalSeconds*amount,1.f);
- fdy = fdy + ((F32) dy - fdy) * llmin(gFrameIntervalSeconds*amount,1.f);
+ //build set of views containing mouse cursor by traversing UI hierarchy and testing
+ //screen rect against mouse cursor
+ view_handle_set_t mouse_hover_set;
- mCurrentMouseDelta.set(llround(fdx), llround(fdy));
- mouse_vel.setVec(fdx,fdy);
- }
- else
+ // start at current mouse captor (if is a view) or UI root
+ LLView* root_view = NULL;
+ root_view = dynamic_cast<LLView*>(mouse_captor);
+ if (!root_view)
{
- mCurrentMouseDelta.set(dx, dy);
- mouse_vel.setVec((F32) dx, (F32) dy);
+ root_view = mRootView;
}
-
- mMouseVelocityStat.addValue(mouse_vel.magVec());
- if (gNoRender)
+ for (LLView::tree_iterator_t it = root_view->beginTree();
+ it != root_view->endTree();
+ ++it)
{
- return TRUE;
+ LLView* viewp = *it;
+ // calculating the screen rect involves traversing the parent, so this is less than optimal
+ if (!viewp->getVisible()
+ || !viewp->calcScreenBoundingRect().pointInRect(x, y))
+ {
+ // skip this view and all of its children
+ it.skipChildren();
+ continue;
+ }
+
+ // we have a view that contains the mouse, add it to the set
+ mouse_hover_set.insert(viewp->getHandle());
}
- // clean up current focus
- LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
- if (cur_focus)
+ // now do the same aggregation for the "top" ctrl, whose parent does not necessarily contain the mouse
+ if (top_ctrl)
{
- if (!cur_focus->isInVisibleChain() || !cur_focus->isInEnabledChain())
+ for (LLView::tree_iterator_t it = top_ctrl->beginTree();
+ it != root_view->endTree();
+ ++it)
{
- gFocusMgr.releaseFocusIfNeeded(cur_focus);
-
- LLUICtrl* parent = cur_focus->getParentUICtrl();
- const LLUICtrl* focus_root = cur_focus->findRootMostFocusRoot();
- while(parent)
+ LLView* viewp = *it;
+ if (!viewp->getVisible()
+ || !viewp->calcScreenBoundingRect().pointInRect(x, y))
{
- if (parent->isCtrl() &&
- (parent->hasTabStop() || parent == focus_root) &&
- !parent->getIsChrome() &&
- parent->isInVisibleChain() &&
- parent->isInEnabledChain())
- {
- if (!parent->focusFirstItem())
- {
- parent->setFocus(TRUE);
- }
- break;
- }
- parent = parent->getParentUICtrl();
+ // skip this view and all of its children
+ it.skipChildren();
+ continue;
}
+
+ // we have a view that contains the mouse, add it to the set
+ mouse_hover_set.insert(viewp->getHandle());
}
- else if (cur_focus->isFocusRoot())
+ }
+
+ typedef std::vector<LLHandle<LLView> > view_handle_list_t;
+
+ // call onMouseEnter() on all views which contain the mouse cursor but did not before
+ view_handle_list_t mouse_enter_views;
+ std::set_difference(mouse_hover_set.begin(), mouse_hover_set.end(),
+ mMouseHoverViews.begin(), mMouseHoverViews.end(),
+ std::back_inserter(mouse_enter_views));
+ for (view_handle_list_t::iterator it = mouse_enter_views.begin();
+ it != mouse_enter_views.end();
+ ++it)
+ {
+ LLView* viewp = it->get();
+ if (viewp)
{
- // focus roots keep trying to delegate focus to their first valid descendant
- // this assumes that focus roots are not valid focus holders on their own
- cur_focus->focusFirstItem();
+ LLRect view_screen_rect = viewp->calcScreenRect();
+ viewp->onMouseEnter(x - view_screen_rect.mLeft, y - view_screen_rect.mBottom, mask);
}
}
- BOOL handled = FALSE;
+ // call onMouseLeave() on all views which no longer contain the mouse cursor
+ view_handle_list_t mouse_leave_views;
+ std::set_difference(mMouseHoverViews.begin(), mMouseHoverViews.end(),
+ mouse_hover_set.begin(), mouse_hover_set.end(),
+ std::back_inserter(mouse_leave_views));
+ for (view_handle_list_t::iterator it = mouse_leave_views.begin();
+ it != mouse_leave_views.end();
+ ++it)
+ {
+ LLView* viewp = it->get();
+ if (viewp)
+ {
+ LLRect view_screen_rect = viewp->calcScreenRect();
+ viewp->onMouseLeave(x - view_screen_rect.mLeft, y - view_screen_rect.mBottom, mask);
+ }
+ }
- BOOL handled_by_top_ctrl = FALSE;
- LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
+ // store resulting hover set for next frame
+ swap(mMouseHoverViews, mouse_hover_set);
- LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
if( mouse_captor )
{
// Pass hover events to object capturing mouse events.
@@ -2710,39 +2643,114 @@ BOOL LLViewerWindow::handlePerFrameHover()
}
}
- if (tool && tool != gToolNull && tool != LLToolCompInspect::getInstance() && tool != LLToolDragAndDrop::getInstance() && !gSavedSettings.getBOOL("FreezeTime"))
+ updateLayout();
+
+ mLastMousePoint = mCurrentMousePoint;
+
+ // cleanup unused selections when no modal dialogs are open
+ if (LLModalDialog::activeCount() == 0)
+ {
+ LLViewerParcelMgr::getInstance()->deselectUnused();
+ }
+
+ if (LLModalDialog::activeCount() == 0)
+ {
+ LLSelectMgr::getInstance()->deselectUnused();
+ }
+
+ updatePicking(x, y, mask);
+}
+
+void LLViewerWindow::updatePicking(S32 x, S32 y, MASK mask)
+{
+ // per frame picking - for tooltips and changing cursor over interactive objects
+ static S32 previous_x = -1;
+ static S32 previous_y = -1;
+ static BOOL mouse_moved_since_pick = FALSE;
+
+ if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_RAYCAST))
+ {
+ gDebugRaycastFaceHit = -1;
+ gDebugRaycastObject = cursorIntersect(-1, -1, 512.f, NULL, -1, FALSE,
+ &gDebugRaycastFaceHit,
+ &gDebugRaycastIntersection,
+ &gDebugRaycastTexCoord,
+ &gDebugRaycastNormal,
+ &gDebugRaycastBinormal);
+ }
+
+
+ if ((previous_x != x) || (previous_y != y))
+ mouse_moved_since_pick = TRUE;
+
+ BOOL do_pick = FALSE;
+
+ F32 picks_moving = gSavedSettings.getF32("PicksPerSecondMouseMoving");
+ if ((mouse_moved_since_pick) && (picks_moving > 0.0) && (mPickTimer.getElapsedTimeF32() > 1.0f / picks_moving))
+ {
+ do_pick = TRUE;
+ }
+
+ F32 picks_stationary = gSavedSettings.getF32("PicksPerSecondMouseStationary");
+ if ((!mouse_moved_since_pick) && (picks_stationary > 0.0) && (mPickTimer.getElapsedTimeF32() > 1.0f / picks_stationary))
+ {
+ do_pick = TRUE;
+ }
+
+ if (getCursorHidden())
+ {
+ do_pick = FALSE;
+ }
+
+ if (do_pick)
+ {
+ mouse_moved_since_pick = FALSE;
+ mPickTimer.reset();
+ pickAsync(getCurrentMouseX(), getCurrentMouseY(), mask, hoverPickCallback, TRUE);
+ }
+
+ previous_x = x;
+ previous_y = y;
+}
+
+void LLViewerWindow::updateLayout()
+{
+ LLTool* tool = LLToolMgr::getInstance()->getCurrentTool();
+ if (gFloaterTools != NULL
+ && tool != NULL
+ && tool != gToolNull
+ && tool != LLToolCompInspect::getInstance()
+ && tool != LLToolDragAndDrop::getInstance()
+ && !gSavedSettings.getBOOL("FreezeTime"))
{
LLMouseHandler *captor = gFocusMgr.getMouseCapture();
// With the null, inspect, or drag and drop tool, don't muck
// with visibility.
- if (gFloaterTools->isMinimized() ||
- (tool != LLToolPie::getInstance() // not default tool
- && tool != LLToolCompGun::getInstance() // not coming out of mouselook
- && !mSuppressToolbox // not override in third person
- && LLToolMgr::getInstance()->getCurrentToolset() != gFaceEditToolset // not special mode
- && LLToolMgr::getInstance()->getCurrentToolset() != gMouselookToolset
- && (!captor || captor->isView())) // not dragging
- )
+ if (gFloaterTools->isMinimized()
+ || (tool != LLToolPie::getInstance() // not default tool
+ && tool != LLToolCompGun::getInstance() // not coming out of mouselook
+ && !mSuppressToolbox // not override in third person
+ && LLToolMgr::getInstance()->getCurrentToolset() != gFaceEditToolset // not special mode
+ && LLToolMgr::getInstance()->getCurrentToolset() != gMouselookToolset
+ && (!captor || captor->isView()))) // not dragging
{
// Force floater tools to be visible (unless minimized)
if (!gFloaterTools->getVisible())
{
- gFloaterTools->open(); /* Flawfinder: ignore */
+ gFloaterTools->openFloater();
}
// Update the location of the blue box tool popup
LLCoordGL select_center_screen;
- gFloaterTools->updatePopup( select_center_screen, mask );
+ gFloaterTools->updatePopup( select_center_screen, gKeyboard->currentMask(TRUE) );
}
else
{
gFloaterTools->setVisible(FALSE);
}
- // In the future we may wish to hide the tools menu unless you
- // are building. JC
- //gMenuBarView->setItemVisible("Tools", gFloaterTools->getVisible());
- //gMenuBarView->arrange();
+ gMenuBarView->setItemVisible("BuildTools", gFloaterTools->getVisible());
}
+
if (gToolBar)
{
gToolBar->refresh();
@@ -2817,7 +2825,87 @@ BOOL LLViewerWindow::handlePerFrameHover()
gConsole->setRect(console_rect);
}
- mLastMousePoint = mCurrentMousePoint;
+}
+
+void LLViewerWindow::updateMouseDelta()
+{
+ S32 dx = lltrunc((F32) (mCurrentMousePoint.mX - mLastMousePoint.mX) * LLUI::sGLScaleFactor.mV[VX]);
+ S32 dy = lltrunc((F32) (mCurrentMousePoint.mY - mLastMousePoint.mY) * LLUI::sGLScaleFactor.mV[VY]);
+
+ //RN: fix for asynchronous notification of mouse leaving window not working
+ LLCoordWindow mouse_pos;
+ mWindow->getCursorPosition(&mouse_pos);
+ if (mouse_pos.mX < 0 ||
+ mouse_pos.mY < 0 ||
+ mouse_pos.mX > mWindowRect.getWidth() ||
+ mouse_pos.mY > mWindowRect.getHeight())
+ {
+ mMouseInWindow = FALSE;
+ }
+ else
+ {
+ mMouseInWindow = TRUE;
+ }
+
+ LLVector2 mouse_vel;
+
+ if (gSavedSettings.getBOOL("MouseSmooth"))
+ {
+ static F32 fdx = 0.f;
+ static F32 fdy = 0.f;
+
+ F32 amount = 16.f;
+ fdx = fdx + ((F32) dx - fdx) * llmin(gFrameIntervalSeconds*amount,1.f);
+ fdy = fdy + ((F32) dy - fdy) * llmin(gFrameIntervalSeconds*amount,1.f);
+
+ mCurrentMouseDelta.set(llround(fdx), llround(fdy));
+ mouse_vel.setVec(fdx,fdy);
+ }
+ else
+ {
+ mCurrentMouseDelta.set(dx, dy);
+ mouse_vel.setVec((F32) dx, (F32) dy);
+ }
+
+ mMouseVelocityStat.addValue(mouse_vel.magVec());
+}
+
+void LLViewerWindow::updateKeyboardFocus()
+{
+ // clean up current focus
+ LLUICtrl* cur_focus = gFocusMgr.getKeyboardFocus();
+ if (cur_focus)
+ {
+ if (!cur_focus->isInVisibleChain() || !cur_focus->isInEnabledChain())
+ {
+ gFocusMgr.releaseFocusIfNeeded(cur_focus);
+
+ LLUICtrl* parent = cur_focus->getParentUICtrl();
+ const LLUICtrl* focus_root = cur_focus->findRootMostFocusRoot();
+ while(parent)
+ {
+ if (parent->isCtrl() &&
+ (parent->hasTabStop() || parent == focus_root) &&
+ !parent->getIsChrome() &&
+ parent->isInVisibleChain() &&
+ parent->isInEnabledChain())
+ {
+ if (!parent->focusFirstItem())
+ {
+ parent->setFocus(TRUE);
+ }
+ break;
+ }
+ parent = parent->getParentUICtrl();
+ }
+ }
+ else if (cur_focus->isFocusRoot())
+ {
+ // focus roots keep trying to delegate focus to their first valid descendant
+ // this assumes that focus roots are not valid focus holders on their own
+ cur_focus->focusFirstItem();
+ }
+ }
// last ditch force of edit menu to selection manager
if (LLEditMenuHandler::gEditMenuHandler == NULL && LLSelectMgr::getInstance()->getSelection()->getObjectCount())
@@ -2859,67 +2947,7 @@ BOOL LLViewerWindow::handlePerFrameHover()
gChatBar->startChat(NULL);
}
- // cleanup unused selections when no modal dialogs are open
- if (LLModalDialog::activeCount() == 0)
- {
- LLViewerParcelMgr::getInstance()->deselectUnused();
- }
-
- if (LLModalDialog::activeCount() == 0)
- {
- LLSelectMgr::getInstance()->deselectUnused();
- }
-
- if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_RAYCAST))
- {
- gDebugRaycastFaceHit = -1;
- gDebugRaycastObject = cursorIntersect(-1, -1, 512.f, NULL, -1, FALSE,
- &gDebugRaycastFaceHit,
- &gDebugRaycastIntersection,
- &gDebugRaycastTexCoord,
- &gDebugRaycastNormal,
- &gDebugRaycastBinormal);
- }
-
-
- // per frame picking - for tooltips and changing cursor over interactive objects
- static S32 previous_x = -1;
- static S32 previous_y = -1;
- static BOOL mouse_moved_since_pick = FALSE;
-
- if ((previous_x != x) || (previous_y != y))
- mouse_moved_since_pick = TRUE;
-
- BOOL do_pick = FALSE;
- F32 picks_moving = gSavedSettings.getF32("PicksPerSecondMouseMoving");
- if ((mouse_moved_since_pick) && (picks_moving > 0.0) && (mPickTimer.getElapsedTimeF32() > 1.0f / picks_moving))
- {
- do_pick = TRUE;
- }
-
- F32 picks_stationary = gSavedSettings.getF32("PicksPerSecondMouseStationary");
- if ((!mouse_moved_since_pick) && (picks_stationary > 0.0) && (mPickTimer.getElapsedTimeF32() > 1.0f / picks_stationary))
- {
- do_pick = TRUE;
- }
-
- if (getCursorHidden())
- {
- do_pick = FALSE;
- }
-
- if (do_pick)
- {
- mouse_moved_since_pick = FALSE;
- mPickTimer.reset();
- pickAsync(getCurrentMouseX(), getCurrentMouseY(), mask, hoverPickCallback, TRUE);
- }
-
- previous_x = x;
- previous_y = y;
-
- return handled;
}
@@ -3183,7 +3211,7 @@ void LLViewerWindow::pickAsync(S32 x, S32 y_from_bot, MASK mask, void (*callback
}
// push back pick info object
- BOOL in_build_mode = gFloaterTools && gFloaterTools->getVisible();
+ BOOL in_build_mode = LLFloaterReg::instanceVisible("build");
if (in_build_mode || LLDrawPoolAlpha::sShowDebugAlpha)
{
// build mode allows interaction with all transparent objects
@@ -4234,8 +4262,8 @@ void LLViewerWindow::destroyWindow()
void LLViewerWindow::drawMouselookInstructions()
{
// Draw instructions for mouselook ("Press ESC to leave Mouselook" in a box at the top of the screen.)
- const std::string instructions = "Press ESC to leave Mouselook.";
- const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
+ const std::string instructions = LLTrans::getString("LeaveMouselook");
+ const LLFontGL* font = LLFontGL::getFontSansSerif();
const S32 INSTRUCTIONS_PAD = 5;
LLRect instructions_rect;
@@ -4270,6 +4298,21 @@ S32 LLViewerWindow::getWindowWidth() const
return mVirtualWindowRect.getWidth();
}
+void* LLViewerWindow::getPlatformWindow() const
+{
+ return mWindow->getPlatformWindow();
+}
+
+void* LLViewerWindow::getMediaWindow() const
+{
+ return mWindow->getMediaWindow();
+}
+
+void LLViewerWindow::focusClient() const
+{
+ return mWindow->focusClient();
+}
+
S32 LLViewerWindow::getWindowDisplayHeight() const
{
return mWindowRect.getHeight();
@@ -4482,12 +4525,16 @@ void LLViewerWindow::restoreGL(const std::string& progress_message)
void LLViewerWindow::initFonts(F32 zoom_factor)
{
LLFontGL::destroyAllGL();
- LLFontGL::initDefaultFonts( gSavedSettings.getF32("FontScreenDPI"),
+ // Initialize with possibly different zoom factor
+ LLFontGL::initClass( gSavedSettings.getF32("FontScreenDPI"),
mDisplayScale.mV[VX] * zoom_factor,
mDisplayScale.mV[VY] * zoom_factor,
gDirUtilp->getAppRODataDir(),
- LLUICtrlFactory::getXUIPaths());
+ LLUI::getXUIPaths());
+ // Force font reloads, which can be very slow
+ LLFontGL::loadDefaultFonts();
}
+
void LLViewerWindow::toggleFullscreen(BOOL show_progress)
{
if (mWindow)
@@ -4520,6 +4567,11 @@ void LLViewerWindow::getTargetWindow(BOOL& fullscreen, S32& width, S32& height)
}
}
+void LLViewerWindow::requestResolutionUpdate()
+{
+ mResDirty = true;
+}
+
void LLViewerWindow::requestResolutionUpdate(bool fullscreen_checked)
{
mResDirty = true;
@@ -4654,7 +4706,7 @@ BOOL LLViewerWindow::changeDisplaySettings(BOOL fullscreen, LLCoordScreen size,
}
// Close floaters that don't handle settings change
- LLFloaterSnapshot::hide(0);
+ LLFloaterReg::hideInstance("snapshot");
BOOL result_first_try = FALSE;
BOOL result_second_try = FALSE;
@@ -4814,6 +4866,8 @@ void LLViewerWindow::calcDisplayScale()
}
}
+S32 TOOL_BAR_HEIGHT = 20; // *TODO:Skinning Fix
+
S32 LLViewerWindow::getChatConsoleBottomPad()
{
S32 offset = 0;
@@ -4851,9 +4905,10 @@ bool LLViewerWindow::onAlert(const LLSD& notify)
////////////////////////////////////////////////////////////////////////////
LLBottomPanel::LLBottomPanel(const LLRect &rect) :
- LLPanel(LLStringUtil::null, rect, FALSE),
+ LLPanel(),
mIndicator(NULL)
{
+ setRect(rect);
// bottom panel is focus root, so Tab moves through the toolbar and button bar, and overlay
setFocusRoot(TRUE);
// flag this panel as chrome so buttons don't grab keyboard focus
@@ -4862,7 +4917,7 @@ LLBottomPanel::LLBottomPanel(const LLRect &rect) :
mFactoryMap["toolbar"] = LLCallbackMap(createToolBar, NULL);
mFactoryMap["overlay"] = LLCallbackMap(createOverlayBar, NULL);
mFactoryMap["hud"] = LLCallbackMap(createHUD, NULL);
- LLUICtrlFactory::getInstance()->buildPanel(this, "panel_bars.xml", &getFactoryMap());
+ LLUICtrlFactory::getInstance()->buildPanel(this, "panel_bars.xml");
setOrigin(rect.mLeft, rect.mBottom);
reshape(rect.getWidth(), rect.getHeight());
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index e0ddac6fa5..01ef91e7b2 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -44,12 +44,12 @@
#include "v3dmath.h"
#include "v2math.h"
-#include "llwindow.h"
+#include "llwindowcallbacks.h"
#include "lltimer.h"
#include "llstat.h"
-#include "llalertdialog.h"
#include "llnotifications.h"
#include "llmousehandler.h"
+#include "llcursortypes.h"
class LLView;
class LLViewerObject;
@@ -60,6 +60,7 @@ class LLVelocityBar;
class LLTextBox;
class LLImageRaw;
class LLHUDIcon;
+class LLWindow;
#define PICK_HALF_WIDTH 5
#define PICK_DIAMETER (2 * PICK_HALF_WIDTH + 1)
@@ -181,7 +182,9 @@ public:
/*virtual*/ void handlePingWatchdog(LLWindow *window, const char * msg);
/*virtual*/ void handlePauseWatchdog(LLWindow *window);
/*virtual*/ void handleResumeWatchdog(LLWindow *window);
-
+ /*virtual*/ std::string translateString(const char* tag);
+ /*virtual*/ std::string translateString(const char* tag,
+ const std::map<std::string, std::string>& args);
//
// ACCESSORS
@@ -200,9 +203,9 @@ public:
S32 getWindowWidth() const;
LLWindow* getWindow() const { return mWindow; }
- void* getPlatformWindow() const { return mWindow->getPlatformWindow(); }
- void* getMediaWindow() const { return mWindow->getMediaWindow(); }
- void focusClient() const { return mWindow->focusClient(); };
+ void* getPlatformWindow() const;
+ void* getMediaWindow() const;
+ void focusClient() const;
LLCoordGL getLastMouse() const { return mLastMousePoint; }
S32 getLastMouseX() const { return mLastMousePoint.mX; }
@@ -261,7 +264,11 @@ public:
void updateObjectUnderCursor();
- BOOL handlePerFrameHover(); // Once per frame, update UI based on mouse position
+ void updateUI(); // Once per frame, update UI based on mouse position, calls following update* functions
+ void updateLayout();
+ void updateMouseDelta();
+ void updateKeyboardFocus();
+ void updatePicking(S32 x, S32 y, MASK mask);
BOOL handleKey(KEY key, MASK mask);
void handleScrollWheel (S32 clicks);
@@ -349,6 +356,7 @@ public:
// handle shutting down GL and bringing it back up
void requestResolutionUpdate(bool fullscreen_checked);
+ void requestResolutionUpdate(); // doesn't affect fullscreen
BOOL checkSettings();
void restartDisplay(BOOL show_progress_bar);
BOOL changeDisplaySettings(BOOL fullscreen, LLCoordScreen size, BOOL disable_vsync, BOOL show_progress_bar);
@@ -400,6 +408,8 @@ protected:
BOOL mMouseInWindow; // True if the mouse is over our window or if we have captured the mouse.
BOOL mFocusCycleMode;
+ typedef std::set<LLHandle<LLView> > view_handle_set_t;
+ view_handle_set_t mMouseHoverViews;
// Variables used for tool override switching based on modifier keys. JC
MASK mLastMask; // used to detect changes in modifier mask
@@ -434,36 +444,16 @@ protected:
static std::string sMovieBaseName;
};
-class LLBottomPanel : public LLPanel
-{
-public:
- LLBottomPanel(const LLRect& rect);
- void setFocusIndicator(LLView * indicator);
- LLView * getFocusIndicator() { return mIndicator; }
- /*virtual*/ void draw();
-
- static void* createHUD(void* data);
- static void* createOverlayBar(void* data);
- static void* createToolBar(void* data);
-
-protected:
- LLView * mIndicator;
-};
-extern LLBottomPanel * gBottomPanel;
-
void toggle_flying(void*);
void toggle_first_person();
void toggle_build(void*);
void reset_viewer_state_on_sim(void);
void update_saved_window_size(const std::string& control,S32 delta_width, S32 delta_height);
-
-
//
// Globals
//
-extern LLVelocityBar* gVelocityBar;
extern LLViewerWindow* gViewerWindow;
extern LLFrameTimer gMouseIdleTimer; // how long has it been since the mouse last moved?
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index b06652a5dc..0612277b32 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -78,6 +78,8 @@
#include "llviewershadermgr.h"
#include "llsky.h"
#include "llanimstatelabels.h"
+#include "lltrans.h"
+
#include "llgesturemgr.h" //needed to trigger the voice gesticulations
#include "llvoiceclient.h"
#include "llvoicevisualizer.h" // Ventrella
@@ -651,7 +653,6 @@ private:
//-----------------------------------------------------------------------------
LLXmlTree LLVOAvatar::sXMLTree;
LLXmlTree LLVOAvatar::sSkeletonXMLTree;
-BOOL LLVOAvatar::sDebugAvatarRotation = FALSE;
LLVOAvatarSkeletonInfo* LLVOAvatar::sAvatarSkeletonInfo = NULL;
LLVOAvatarXmlInfo* LLVOAvatar::sAvatarXmlInfo = NULL;
LLVOAvatarDictionary *LLVOAvatar::sAvatarDictionary = NULL;
@@ -742,7 +743,9 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
mNeedsSkin(FALSE),
mUpdatePeriod(1),
mFullyLoadedInitialized(FALSE),
- mHasBakedHair( FALSE )
+ mHasBakedHair( FALSE ),
+ mDebugAvatarRotation (LLCachedControl<bool>(gSavedSettings, "DebugAvatarRotation", FALSE))
+
{
LLMemType mt(LLMemType::MTYPE_AVATAR);
//VTResume(); // VTune
@@ -976,6 +979,7 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id,
mVoiceVisualizer->setVoiceEnabled( gVoiceClient->getVoiceEnabled( mID ) );
mCurrentGesticulationLevel = 0;
+
}
//------------------------------------------------------------------------
@@ -1933,30 +1937,69 @@ void LLVOAvatar::buildCharacter()
//-------------------------------------------------------------------------
if (mIsSelf)
{
- // *TODO: Translate
gAttachBodyPartPieMenus[0] = NULL;
- gAttachBodyPartPieMenus[1] = new LLPieMenu(std::string("Right Arm >"));
- gAttachBodyPartPieMenus[2] = new LLPieMenu(std::string("Head >"));
- gAttachBodyPartPieMenus[3] = new LLPieMenu(std::string("Left Arm >"));
+
+ LLContextMenu::Params params;
+ params.label(LLTrans::getString("BodyPartsRightArm") + " >");
+ params.name(params.label);
+ params.visible(false);
+ gAttachBodyPartPieMenus[1] = LLUICtrlFactory::create<LLContextMenu> (params);
+
+ params.label(LLTrans::getString("BodyPartsHead") + " >");
+ params.name(params.label);
+ gAttachBodyPartPieMenus[2] = LLUICtrlFactory::create<LLContextMenu> (params);
+
+ params.label(LLTrans::getString("BodyPartsLeftArm") + " >");
+ params.name(params.label);
+ gAttachBodyPartPieMenus[3] = LLUICtrlFactory::create<LLContextMenu> (params);
+
gAttachBodyPartPieMenus[4] = NULL;
- gAttachBodyPartPieMenus[5] = new LLPieMenu(std::string("Left Leg >"));
- gAttachBodyPartPieMenus[6] = new LLPieMenu(std::string("Torso >"));
- gAttachBodyPartPieMenus[7] = new LLPieMenu(std::string("Right Leg >"));
+
+ params.label(LLTrans::getString("BodyPartsLeftLeg") + " >");
+ params.name(params.label);
+ gAttachBodyPartPieMenus[5] = LLUICtrlFactory::create<LLContextMenu> (params);
+
+ params.label(LLTrans::getString("BodyPartsTorso") + " >");
+ params.name(params.label);
+ gAttachBodyPartPieMenus[6] = LLUICtrlFactory::create<LLContextMenu> (params);
+
+ params.label(LLTrans::getString("BodyPartsRightLeg") + " >");
+ params.name(params.label);
+ gAttachBodyPartPieMenus[7] = LLUICtrlFactory::create<LLContextMenu> (params);
gDetachBodyPartPieMenus[0] = NULL;
- gDetachBodyPartPieMenus[1] = new LLPieMenu(std::string("Right Arm >"));
- gDetachBodyPartPieMenus[2] = new LLPieMenu(std::string("Head >"));
- gDetachBodyPartPieMenus[3] = new LLPieMenu(std::string("Left Arm >"));
+
+ params.label(LLTrans::getString("BodyPartsRightArm") + " >");
+ params.name(params.label);
+ gDetachBodyPartPieMenus[1] = LLUICtrlFactory::create<LLContextMenu> (params);
+
+ params.label(LLTrans::getString("BodyPartsHead") + " >");
+ params.name(params.label);
+ gDetachBodyPartPieMenus[2] = LLUICtrlFactory::create<LLContextMenu> (params);
+
+ params.label(LLTrans::getString("BodyPartsLeftArm") + " >");
+ params.name(params.label);
+ gDetachBodyPartPieMenus[3] = LLUICtrlFactory::create<LLContextMenu> (params);
+
gDetachBodyPartPieMenus[4] = NULL;
- gDetachBodyPartPieMenus[5] = new LLPieMenu(std::string("Left Leg >"));
- gDetachBodyPartPieMenus[6] = new LLPieMenu(std::string("Torso >"));
- gDetachBodyPartPieMenus[7] = new LLPieMenu(std::string("Right Leg >"));
+
+ params.label(LLTrans::getString("BodyPartsLeftLeg") + " >");
+ params.name(params.label);
+ gDetachBodyPartPieMenus[5] = LLUICtrlFactory::create<LLContextMenu> (params);
+
+ params.label(LLTrans::getString("BodyPartsTorso") + " >");
+ params.name(params.label);
+ gDetachBodyPartPieMenus[6] = LLUICtrlFactory::create<LLContextMenu> (params);
+
+ params.label(LLTrans::getString("BodyPartsRightLeg") + " >");
+ params.name(params.label);
+ gDetachBodyPartPieMenus[7] = LLUICtrlFactory::create<LLContextMenu> (params);
for (S32 i = 0; i < 8; i++)
{
if (gAttachBodyPartPieMenus[i])
{
- gAttachPieMenu->appendPieMenu( gAttachBodyPartPieMenus[i] );
+ gAttachPieMenu->appendContextSubMenu( gAttachBodyPartPieMenus[i] );
}
else
{
@@ -1968,13 +2011,25 @@ void LLVOAvatar::buildCharacter()
LLViewerJointAttachment* attachment = curiter->second;
if (attachment->getGroup() == i)
{
- LLMenuItemCallGL* item;
- item = new LLMenuItemCallGL(attachment->getName(),
- NULL,
- object_selected_and_point_valid);
- item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", curiter->first);
+ LLMenuItemCallGL::Params item_params;
- gAttachPieMenu->append(item);
+ std::string sub_piemenu_name = attachment->getName();
+ if (LLTrans::getString(sub_piemenu_name) != "")
+ {
+ item_params.label = LLTrans::getString(sub_piemenu_name);
+ }
+ else
+ {
+ item_params.label = sub_piemenu_name;
+ }
+ item_params.name =(item_params.label );
+ item_params.on_click.function_name = "Object.AttachToAvatar";
+ item_params.on_click.parameter = curiter->first;
+ item_params.on_enable.function_name = "Object.EnableWear";
+ item_params.on_enable.parameter = curiter->first;
+ LLMenuItemCallGL* item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
+
+ gAttachPieMenu->addChild(item);
attachment_found = TRUE;
break;
@@ -1984,13 +2039,13 @@ void LLVOAvatar::buildCharacter()
if (!attachment_found)
{
- gAttachPieMenu->appendSeparator();
+ gAttachPieMenu->addSeparator();
}
}
if (gDetachBodyPartPieMenus[i])
{
- gDetachPieMenu->appendPieMenu( gDetachBodyPartPieMenus[i] );
+ gDetachPieMenu->appendContextSubMenu( gDetachBodyPartPieMenus[i] );
}
else
{
@@ -2002,9 +2057,25 @@ void LLVOAvatar::buildCharacter()
LLViewerJointAttachment* attachment = curiter->second;
if (attachment->getGroup() == i)
{
- gDetachPieMenu->append(new LLMenuItemCallGL(attachment->getName(),
- &handle_detach_from_avatar, object_attached, attachment));
-
+ LLMenuItemCallGL::Params item_params;
+ std::string sub_piemenu_name = attachment->getName();
+ if (LLTrans::getString(sub_piemenu_name) != "")
+ {
+ item_params.label = LLTrans::getString(sub_piemenu_name);
+ }
+ else
+ {
+ item_params.label = sub_piemenu_name;
+ }
+ item_params.name =(item_params.label );
+ item_params.on_click.function_name = "Attachment.Detach";
+ item_params.on_click.parameter = curiter->first;
+ item_params.on_enable.function_name = "Attachment.EnableDetach";
+ item_params.on_enable.parameter = curiter->first;
+ LLMenuItemCallGL* item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
+
+ gDetachPieMenu->addChild(item);
+
attachment_found = TRUE;
break;
}
@@ -2012,7 +2083,7 @@ void LLVOAvatar::buildCharacter()
if (!attachment_found)
{
- gDetachPieMenu->appendSeparator();
+ gDetachPieMenu->addSeparator();
}
}
}
@@ -2025,19 +2096,40 @@ void LLVOAvatar::buildCharacter()
LLViewerJointAttachment* attachment = curiter->second;
if (attachment->getGroup() == 8)
{
- LLMenuItemCallGL* item;
- item = new LLMenuItemCallGL(attachment->getName(),
- NULL,
- object_selected_and_point_valid);
- item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", curiter->first);
- gAttachScreenPieMenu->append(item);
- gDetachScreenPieMenu->append(new LLMenuItemCallGL(attachment->getName(),
- &handle_detach_from_avatar, object_attached, attachment));
+ LLMenuItemCallGL::Params item_params;
+ std::string sub_piemenu_name = attachment->getName();
+ if (LLTrans::getString(sub_piemenu_name) != "")
+ {
+ item_params.label = LLTrans::getString(sub_piemenu_name);
+ }
+ else
+ {
+ item_params.label = sub_piemenu_name;
+ }
+ item_params.name =(item_params.label );
+ item_params.on_click.function_name = "Object.AttachToAvatar";
+ item_params.on_click.parameter = curiter->first;
+ item_params.on_enable.function_name = "Object.EnableWear";
+ item_params.on_enable.parameter = curiter->first;
+ LLMenuItemCallGL* item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
+ gAttachScreenPieMenu->addChild(item);
+
+ item_params.on_click.function_name = "Attachment.DetachFromPoint";
+ item_params.on_click.parameter = curiter->first;
+ item_params.on_enable.function_name = "Attachment.PointFilled";
+ item_params.on_enable.parameter = curiter->first;
+ item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
+ gDetachScreenPieMenu->addChild(item);
}
}
for (S32 pass = 0; pass < 2; pass++)
{
+ // *TODO: Skinning - gAttachSubMenu is an awful, awful hack
+ if (!gAttachSubMenu)
+ {
+ break;
+ }
for (attachment_map_t::iterator iter = mAttachmentPoints.begin();
iter != mAttachmentPoints.end(); )
{
@@ -2047,21 +2139,44 @@ void LLVOAvatar::buildCharacter()
{
continue;
}
- LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(),
- NULL, &object_selected_and_point_valid,
- &attach_label, attachment);
- item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", curiter->first);
- gAttachSubMenu->append(item);
-
- gDetachSubMenu->append(new LLMenuItemCallGL(attachment->getName(),
- &handle_detach_from_avatar, object_attached, &detach_label, attachment));
+ LLMenuItemCallGL::Params item_params;
+ std::string sub_piemenu_name = attachment->getName();
+ if (LLTrans::getString(sub_piemenu_name) != "")
+ {
+ item_params.label = LLTrans::getString(sub_piemenu_name);
+ }
+ else
+ {
+ item_params.label = sub_piemenu_name;
+ }
+ item_params.name =(item_params.label );
+ item_params.on_click.function_name = "Object.AttachToAvatar";
+ item_params.on_click.parameter = curiter->first;
+ item_params.on_enable.function_name = "Object.EnableWear";
+ item_params.on_enable.parameter = curiter->first;
+ //* TODO: Skinning:
+ //LLSD params;
+ //params["index"] = curiter->first;
+ //params["label"] = attachment->getName();
+ //item->addEventHandler("on_enable", LLMenuItemCallGL::MenuCallback().function_name("Attachment.Label").parameter(params));
+ LLMenuItemCallGL* item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
+ gAttachSubMenu->addChild(item);
+
+ item_params.on_click.function_name = "Attachment.DetachFromPoint";
+ item_params.on_click.parameter = curiter->first;
+ item_params.on_enable.function_name = "Attachment.PointFilled";
+ item_params.on_enable.parameter = curiter->first;
+ //* TODO: Skinning: item->addEventHandler("on_enable", LLMenuItemCallGL::MenuCallback().function_name("Attachment.Label").parameter(params));
+
+ item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
+ gDetachSubMenu->addChild(item);
}
if (pass == 0)
{
// put separator between non-hud and hud attachments
- gAttachSubMenu->appendSeparator();
- gDetachSubMenu->appendSeparator();
+ gAttachSubMenu->addSeparator();
+ gDetachSubMenu->addSeparator();
}
}
@@ -2098,21 +2213,31 @@ void LLVOAvatar::buildCharacter()
S32 attach_index = attach_it->second;
while (cur_pie_slice < requested_pie_slice)
{
- gAttachBodyPartPieMenus[group]->appendSeparator();
- gDetachBodyPartPieMenus[group]->appendSeparator();
+ gAttachBodyPartPieMenus[group]->addSeparator();
+ gDetachBodyPartPieMenus[group]->addSeparator();
cur_pie_slice++;
}
LLViewerJointAttachment* attachment = get_if_there(mAttachmentPoints, attach_index, (LLViewerJointAttachment*)NULL);
if (attachment)
{
- LLMenuItemCallGL* item = new LLMenuItemCallGL(attachment->getName(),
- NULL, object_selected_and_point_valid);
- gAttachBodyPartPieMenus[group]->append(item);
- item->addListener(gMenuHolder->getListenerByName("Object.AttachToAvatar"), "on_click", attach_index);
- gDetachBodyPartPieMenus[group]->append(new LLMenuItemCallGL(attachment->getName(),
- &handle_detach_from_avatar,
- object_attached, attachment));
+ LLMenuItemCallGL::Params item_params;
+ item_params.name = attachment->getName();
+ item_params.label = attachment->getName();
+ item_params.on_click.function_name = "Object.AttachToAvatar";
+ item_params.on_click.parameter = attach_index;
+ item_params.on_enable.function_name = "Object.EnableWear";
+ item_params.on_enable.parameter = attach_index;
+
+ LLMenuItemCallGL* item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
+ gAttachBodyPartPieMenus[group]->addChild(item);
+
+ item_params.on_click.function_name = "Attachment.DetachFromPoint";
+ item_params.on_click.parameter = attach_index;
+ item_params.on_enable.function_name = "Attachment.PointFilled";
+ item_params.on_enable.parameter = attach_index;
+ item = LLUICtrlFactory::create<LLMenuItemCallGL>(item_params);
+ gDetachBodyPartPieMenus[group]->addChild(item);
cur_pie_slice++;
}
}
@@ -3001,7 +3126,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
new_name = TRUE;
}
- LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" );
+ LLColor4 avatar_name_color = gSavedSkinSettings.getColor( "AvatarNameColor" );
avatar_name_color.setAlpha(alpha);
mNameText->setColor(avatar_name_color);
@@ -3089,7 +3214,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
line += " (";
if (is_away)
{
- line += "Away";
+ line += LLTrans::getString("AvatarAway");
need_comma = TRUE;
}
if (is_busy)
@@ -3098,7 +3223,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
{
line += ", ";
}
- line += "Busy";
+ line += LLTrans::getString("AvatarBusy");
need_comma = TRUE;
}
if (is_muted)
@@ -3107,7 +3232,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
{
line += ", ";
}
- line += "Muted";
+ line += LLTrans::getString("AvatarMuted");
need_comma = TRUE;
}
line += ")";
@@ -3115,7 +3240,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
if (is_appearance)
{
line += "\n";
- line += "(Editing Appearance)";
+ line += LLTrans::getString("AvatarEditingAppearance");
}
mNameAway = is_away;
mNameBusy = is_busy;
@@ -3143,7 +3268,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
std::deque<LLChat>::iterator chat_iter = mChats.begin();
mNameText->clearString();
- LLColor4 new_chat = gColors.getColor( "AvatarNameColor" );
+ LLColor4 new_chat = gSavedSkinSettings.getColor( "AvatarNameColor" );
LLColor4 normal_chat = lerp(new_chat, LLColor4(0.8f, 0.8f, 0.8f, 1.f), 0.7f);
LLColor4 old_chat = lerp(normal_chat, LLColor4(0.6f, 0.6f, 0.6f, 1.f), 0.7f);
if (mTyping && mChats.size() >= MAX_BUBBLE_CHAT_UTTERANCES)
@@ -3607,7 +3732,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
F32 root_roll, root_pitch, root_yaw;
root_rotation.getEulerAngles(&root_roll, &root_pitch, &root_yaw);
- if (sDebugAvatarRotation)
+ if (mDebugAvatarRotation)
{
llinfos << "root_roll " << RAD_TO_DEG * root_roll
<< " root_pitch " << RAD_TO_DEG * root_pitch
@@ -7491,6 +7616,7 @@ void LLVOAvatar::updateAttachmentVisibility(U32 camera_mode)
}
// Given a texture entry, determine which wearable type owns it.
+
// static
LLUUID LLVOAvatar::getDefaultTEImageID(ETextureIndex index )
{
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 50eec80ba7..c48d509f26 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -48,6 +48,7 @@
#include "llrendertarget.h"
#include "llwearable.h"
#include "llvoavatardefines.h"
+#include "llcontrol.h"
extern const LLUUID ANIM_AGENT_BODY_NOISE;
extern const LLUUID ANIM_AGENT_BREATHE_ROT;
@@ -361,6 +362,8 @@ private:
S32 mFullyLoadedFrameCounter;
LLFrameTimer mFullyLoadedTimer;
+ LLCachedControl<bool> mDebugAvatarRotation; // show animation debug info
+
//--------------------------------------------------------------------
// Collision Volumes
//--------------------------------------------------------------------
@@ -520,7 +523,6 @@ public:
static BOOL sShowAttachmentPoints;
static F32 sLODFactor; // user-settable LOD factor
static BOOL sJointDebug; // output total number of joints being touched for each avatar
- static BOOL sDebugAvatarRotation;
static S32 sNumVisibleAvatars; // Number of instances of this class
diff --git a/indra/newview/llvoavatardefines.cpp b/indra/newview/llvoavatardefines.cpp
index 19ad90a8e2..371ecbb7ab 100644
--- a/indra/newview/llvoavatardefines.cpp
+++ b/indra/newview/llvoavatardefines.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
- * Copyright (c) 2001-2007, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/newview/llvoavatardefines.h b/indra/newview/llvoavatardefines.h
index bc1a1f1c1f..1da27b0fe0 100644
--- a/indra/newview/llvoavatardefines.h
+++ b/indra/newview/llvoavatardefines.h
@@ -5,7 +5,7 @@
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
*
- * Copyright (c) 2001-2007, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -13,12 +13,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp
index fe4a2fdc76..a956ec8ab3 100644
--- a/indra/newview/llvograss.cpp
+++ b/indra/newview/llvograss.cpp
@@ -165,16 +165,6 @@ void LLVOGrass::initClass()
grass_def->getFastAttributeUUID(texture_id_string, id);
newGrass->mTextureID = id;
- if (newGrass->mTextureID.isNull())
- {
- std::string textureName;
-
- static LLStdStringHandle texture_name_string = LLXmlTree::addAttributeString("texture_name");
- success &= grass_def->getFastAttributeString(texture_name_string, textureName);
- LLViewerImage* grass_image = gImageList.getImageFromFile(textureName);
- newGrass->mTextureID = grass_image->getID();
- }
-
static LLStdStringHandle blade_sizex_string = LLXmlTree::addAttributeString("blade_size_x");
success &= grass_def->getFastAttributeF32(blade_sizex_string, F32_val);
newGrass->mBladeSizeX = F32_val;
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 94407ed08c..47487a6da2 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -1103,58 +1103,61 @@ static void killGateway()
///////////////////////////////////////////////////////////////////////////////////////////////
-LLVoiceClient::LLVoiceClient()
-{
- gVoiceClient = this;
- mWriteInProgress = false;
- mAreaVoiceDisabled = false;
- mPTT = true;
- mUserPTTState = false;
- mMuteMic = false;
- mSessionTerminateRequested = false;
- mRelogRequested = false;
- mCommandCookie = 0;
- mCurrentParcelLocalID = 0;
- mLoginRetryCount = 0;
-
- mSpeakerVolume = 0;
- mMicVolume = 0;
-
- mAudioSession = NULL;
- mAudioSessionChanged = false;
-
- // Initial dirty state
- mSpatialCoordsDirty = false;
- mPTTDirty = true;
- mFriendsListDirty = true;
- mSpeakerVolumeDirty = true;
- mMicVolumeDirty = true;
- mBuddyListMapPopulated = false;
- mBlockRulesListReceived = false;
- mAutoAcceptRulesListReceived = false;
- mCaptureDeviceDirty = false;
- mRenderDeviceDirty = false;
-
- // Use default values for everything then call updateSettings() after preferences are loaded
- mVoiceEnabled = false;
- mUsePTT = true;
- mPTTIsToggle = false;
- mEarLocation = 0;
- mLipSyncEnabled = false;
+LLVoiceClient::LLVoiceClient() :
+ mState(stateDisabled),
+ mSessionTerminateRequested(false),
+ mRelogRequested(false),
+ mConnected(false),
+ mPump(NULL),
+
+ mTuningMode(false),
+ mTuningEnergy(0.0f),
+ mTuningMicVolume(0),
+ mTuningMicVolumeDirty(true),
+ mTuningSpeakerVolume(0),
+ mTuningSpeakerVolumeDirty(true),
+ mTuningExitState(stateDisabled),
+
+ mAreaVoiceDisabled(false),
+ mAudioSession(NULL),
+ mAudioSessionChanged(false),
+ mNextAudioSession(NULL),
+
+ mCurrentParcelLocalID(0),
+ mNumberOfAliases(0),
+ mCommandCookie(0),
+ mLoginRetryCount(0),
+
+ mBuddyListMapPopulated(false),
+ mBlockRulesListReceived(false),
+ mAutoAcceptRulesListReceived(false),
+ mCaptureDeviceDirty(false),
+ mRenderDeviceDirty(false),
+ mSpatialCoordsDirty(false),
+
+ mPTTDirty(true),
+ mPTT(true),
+ mUsePTT(true),
+ mPTTIsMiddleMouse(false),
+ mPTTKey(0),
+ mPTTIsToggle(false),
+ mUserPTTState(false),
+ mMuteMic(false),
+ mFriendsListDirty(true),
+
+ mEarLocation(0),
+ mSpeakerVolumeDirty(true),
+ mSpeakerMuteDirty(true),
+ mSpeakerVolume(0),
+ mMicVolume(0),
+ mMicVolumeDirty(true),
- mTuningMode = false;
- mTuningEnergy = 0.0f;
- mTuningMicVolume = 0;
- mTuningMicVolumeDirty = true;
- mTuningSpeakerVolume = 0;
- mTuningSpeakerVolumeDirty = true;
-
- // gMuteListp isn't set up at this point, so we defer this until later.
-// gMuteListp->addObserver(&mutelist_listener);
+ mVoiceEnabled(false),
+ mWriteInProgress(false),
- // stash the pump for later use
- // This now happens when init() is called instead.
- mPump = NULL;
+ mLipSyncEnabled(false)
+{
+ gVoiceClient = this;
#if LL_DARWIN || LL_LINUX || LL_SOLARIS
// HACK: THIS DOES NOT BELONG HERE
@@ -5773,6 +5776,11 @@ void LLVoiceClient::setMuteMic(bool muted)
mMuteMic = muted;
}
+bool LLVoiceClient::getMuteMic() const
+{
+ return mMuteMic;
+}
+
void LLVoiceClient::setUserPTTState(bool ptt)
{
mUserPTTState = ptt;
@@ -6901,11 +6909,11 @@ void LLVoiceClient::notifyFriendObservers()
void LLVoiceClient::lookupName(const LLUUID &id)
{
- gCacheName->getName(id, onAvatarNameLookup);
+ gCacheName->get(id, FALSE, &LLVoiceClient::onAvatarNameLookup);
}
//static
-void LLVoiceClient::onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data)
+void LLVoiceClient::onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group)
{
if(gVoiceClient)
{
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index cfc336b27d..1066ac73f1 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -178,6 +178,7 @@ static void updatePosition(void);
void setMuteMic(bool muted); // Use this to mute the local mic (for when the client is minimized, etc), ignoring user PTT state.
+ bool getMuteMic() const;
void setUserPTTState(bool ptt);
bool getUserPTTState();
void toggleUserPTTState(void);
@@ -461,7 +462,7 @@ static void updatePosition(void);
void removeObserver(LLFriendObserver* observer);
void lookupName(const LLUUID &id);
- static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data);
+ static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group);
void avatarNameResolved(const LLUUID &id, const std::string &name);
typedef std::vector<std::string> deviceList;
@@ -727,7 +728,6 @@ static std::string nameFromsipURI(const std::string &uri);
bool mVoiceEnabled;
bool mWriteInProgress;
std::string mWriteString;
- size_t mWriteOffset;
LLTimer mUpdateTimer;
diff --git a/indra/newview/llvoicevisualizer.cpp b/indra/newview/llvoicevisualizer.cpp
index 5606398aaf..a361a1160c 100644
--- a/indra/newview/llvoicevisualizer.cpp
+++ b/indra/newview/llvoicevisualizer.cpp
@@ -131,13 +131,13 @@ LLVoiceVisualizer::LLVoiceVisualizer( const U8 type )
const char* sound_level_img[] =
{
- "041ee5a0-cb6a-9ac5-6e49-41e9320507d5.j2c",
- "29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
- "29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
- "29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
- "29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
- "29de489d-0491-fb00-7dab-f9e686d31e83.j2c",
- "29de489d-0491-fb00-7dab-f9e686d31e83.j2c"
+ "voice_meter_dot.j2c",
+ "voice_meter_rings.j2c",
+ "voice_meter_rings.j2c",
+ "voice_meter_rings.j2c",
+ "voice_meter_rings.j2c",
+ "voice_meter_rings.j2c",
+ "voice_meter_rings.j2c"
};
for (int i=0; i<NUM_VOICE_SYMBOL_WAVES; i++)
@@ -157,12 +157,12 @@ LLVoiceVisualizer::LLVoiceVisualizer( const U8 type )
setPreferences();
// Set up our listener to get updates on all prefs values we care about.
- gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _1));
- gSavedSettings.getControl("LipSyncOohAahRate")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _1));
- gSavedSettings.getControl("LipSyncOoh")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _1));
- gSavedSettings.getControl("LipSyncAah")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _1));
- gSavedSettings.getControl("LipSyncOohPowerTransfer")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _1));
- gSavedSettings.getControl("LipSyncAahPowerTransfer")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _1));
+ gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _2));
+ gSavedSettings.getControl("LipSyncOohAahRate")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _2));
+ gSavedSettings.getControl("LipSyncOoh")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _2));
+ gSavedSettings.getControl("LipSyncAah")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _2));
+ gSavedSettings.getControl("LipSyncOohPowerTransfer")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _2));
+ gSavedSettings.getControl("LipSyncAahPowerTransfer")->getSignal()->connect(boost::bind(&handleVoiceVisualizerPrefsChanged, _2));
sPrefsInitialized = true;
}
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp
index c3366cad90..e747ab585f 100644
--- a/indra/newview/llvosky.cpp
+++ b/indra/newview/llvosky.cpp
@@ -368,7 +368,7 @@ LLVOSky::LLVOSky(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
initSunDirection(mSunDefaultPosition, LLVector3(0, 0, 0));
}
mAmbientScale = gSavedSettings.getF32("SkyAmbientScale");
- mNightColorShift = gSavedSettings.getColor3("SkyNightColorShift");
+ mNightColorShift = gSavedSkinSettings.getColor3("SkyNightColorShift");
mFogColor.mV[VRED] = mFogColor.mV[VGREEN] = mFogColor.mV[VBLUE] = 0.5f;
mFogColor.mV[VALPHA] = 0.0f;
mFogRatio = 1.2f;
diff --git a/indra/newview/llvotree.cpp b/indra/newview/llvotree.cpp
index 3b76127eb2..fecffd72ad 100644
--- a/indra/newview/llvotree.cpp
+++ b/indra/newview/llvotree.cpp
@@ -55,7 +55,7 @@
#include "noise.h"
#include "pipeline.h"
#include "llspatialpartition.h"
-#include "llviewerwindow.h"
+#include "llnotifications.h"
extern LLPipeline gPipeline;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 8f11661b30..5f2c67efdf 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -72,7 +72,7 @@ const F32 FORCE_CULL_AREA = 8.f;
const S32 MAX_SCULPT_REZ = 128;
BOOL gAnimateTextures = TRUE;
-extern BOOL gHideSelectedObjects;
+//extern BOOL gHideSelectedObjects;
F32 LLVOVolume::sLODFactor = 1.f;
F32 LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop
@@ -1941,10 +1941,9 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e
LLVector3* intersection,LLVector2* tex_coord, LLVector3* normal, LLVector3* bi_normal)
{
- if (!mbCanSelect ||
- (gHideSelectedObjects && isSelected()) ||
- mDrawable->isDead() ||
- !gPipeline.hasRenderType(mDrawable->getRenderType()))
+ if (!mbCanSelect
+ || mDrawable->isDead()
+ || !gPipeline.hasRenderType(mDrawable->getRenderType()))
{
return FALSE;
}
@@ -2084,7 +2083,7 @@ void LLVolumeGeometryManager::registerFace(LLSpatialGroup* group, LLFace* facep,
{
LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
- if (facep->getViewerObject()->isSelected() && gHideSelectedObjects)
+ if (facep->getViewerObject()->isSelected() && LLSelectMgr::getInstance()->mHideSelectedObjects)
{
return;
}
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp
index f705531723..af2ed1d1ab 100644
--- a/indra/newview/llwearable.cpp
+++ b/indra/newview/llwearable.cpp
@@ -48,11 +48,13 @@
#include "llviewerregion.h"
#include "llvoavatar.h"
#include "llwearable.h"
+#include "lltrans.h"
using namespace LLVOAvatarDefines;
// static
S32 LLWearable::sCurrentDefinitionVersion = 1;
+std::string LLWearable::sTypeLabel [WT_COUNT+1];
// static
const std::string LLWearable::sTypeName[ WT_COUNT+1 ] =
@@ -73,25 +75,13 @@ const std::string LLWearable::sTypeName[ WT_COUNT+1 ] =
"invalid"
};
-// static
-const std::string LLWearable::sTypeLabel[ WT_COUNT+1 ] =
+void LLWearable::initClass ()
{
- "Shape",
- "Skin",
- "Hair",
- "Eyes",
- "Shirt",
- "Pants",
- "Shoes",
- "Socks",
- "Jacket",
- "Gloves",
- "Undershirt",
- "Underpants",
- "Skirt",
- "invalid"
-};
-
+ for (int i = 0; i <= WT_COUNT; i++)
+ {
+ sTypeLabel[i] = LLTrans::getString(sTypeName[i]);
+ }
+}
// static
LLAssetType::EType LLWearable::typeToAssetType(EWearableType wearable_type)
@@ -685,7 +675,7 @@ void LLWearable::writeToAvatar( BOOL set_by_user )
}
}
gFloaterCustomize->setWearable(mType, this, perm_mask, is_complete);
- LLFloaterCustomize::setCurrentWearableType( mType );
+ gFloaterCustomize->setCurrentWearableType( mType );
}
ESex new_sex = avatar->getSex();
diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h
index 683a8fa928..8fa609c57b 100644
--- a/indra/newview/llwearable.h
+++ b/indra/newview/llwearable.h
@@ -80,6 +80,7 @@ public:
BOOL exportFile(LLFILE* file);
BOOL importFile(LLFILE* file);
+ static void initClass ();
EWearableType getType() const { return mType; }
void setType( EWearableType type ) { mType = type; }
@@ -140,7 +141,7 @@ private:
te_map_t mTEMap; // maps TE to Image ID
static const std::string sTypeName[ WT_COUNT+1 ];
- static const std::string sTypeLabel[ WT_COUNT+1 ];
+ static std::string sTypeLabel[ WT_COUNT+1 ];
};
#endif // LL_LLWEARABLE_H
diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp
index 512c03fa4d..480c8e42bf 100644
--- a/indra/newview/llwearablelist.cpp
+++ b/indra/newview/llwearablelist.cpp
@@ -42,7 +42,7 @@
//#include "llfloaterchat.h"
#include "llviewerstats.h"
#include "llnotify.h"
-
+#include "lltrans.h"
// Globals
LLWearableList gWearableList; // Globally constructed; be careful that there's no dependency with gAgent.
@@ -187,8 +187,7 @@ void LLWearableList::processGetAssetReply( const char* filename, const LLAssetID
else
{
LLSD args;
- // *TODO:translate
- args["TYPE"] = LLAssetType::lookupHumanReadable(data->mAssetType);
+ args["TYPE"] =LLTrans::getString(LLAssetType::lookupHumanReadable(data->mAssetType));
if (isNewWearable)
{
LLNotifications::instance().add("InvalidWearable");
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index a5691d8a1c..781f8298f7 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -35,10 +35,30 @@
#include "llweb.h"
-#include "llviewerwindow.h"
+// Library includes
+#include "llwindow.h" // spawnWebBrowser()
+#include "llviewerwindow.h"
#include "llviewercontrol.h"
#include "llfloaterhtmlhelp.h"
+#include "llalertdialog.h"
+
+class URLLoader : public LLAlertDialog::URLLoader
+{
+ virtual void load(const std::string& url , bool force_open_externally)
+ {
+ if (force_open_externally)
+ {
+ LLWeb::loadURLExternal(url);
+ }
+ else
+ {
+ LLWeb::loadURL(url);
+ }
+ }
+};
+static URLLoader sAlertURLLoader;
+
// static
void LLWeb::initClass()
@@ -93,12 +113,3 @@ std::string LLWeb::escapeURL(const std::string& url)
}
return escaped_url;
}
-
-// virtual
-void LLWeb::URLLoader::load(const std::string& url)
-{
- loadURL(url);
-}
-
-// static
-LLWeb::URLLoader LLWeb::sAlertURLLoader;
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h
index 278821bac5..71cc236621 100644
--- a/indra/newview/llweb.h
+++ b/indra/newview/llweb.h
@@ -35,7 +35,6 @@
#define LL_LLWEB_H
#include <string>
-#include "llalertdialog.h"
class LLWeb
{
@@ -54,12 +53,6 @@ public:
// Returns escaped (eg, " " to "%20") url
static std::string escapeURL(const std::string& url);
- class URLLoader : public LLAlertDialog::URLLoader
- {
- virtual void load(const std::string& url);
- };
-
- static URLLoader sAlertURLLoader;
};
#endif
diff --git a/indra/newview/llwldaycycle.cpp b/indra/newview/llwldaycycle.cpp
index 1d17c6047f..10a9703d1a 100644
--- a/indra/newview/llwldaycycle.cpp
+++ b/indra/newview/llwldaycycle.cpp
@@ -35,8 +35,7 @@
#include "llwldaycycle.h"
#include "llsdserialize.h"
#include "llwlparammanager.h"
-
-#include "llviewerwindow.h"
+#include "llnotifications.h"
#include <map>
diff --git a/indra/newview/llwldaycycle.h b/indra/newview/llwldaycycle.h
index f045a6d1b0..eed6a78c18 100644
--- a/indra/newview/llwldaycycle.h
+++ b/indra/newview/llwldaycycle.h
@@ -35,8 +35,6 @@
class LLWLDayCycle;
-#include "llfloater.h"
-
#include <vector>
#include <map>
#include <string>
diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h
index ce83cbd97c..b5380a6f6c 100644
--- a/indra/newview/llworld.h
+++ b/indra/newview/llworld.h
@@ -42,7 +42,7 @@
#include "llmath.h"
#include "v3math.h"
-#include "llmemory.h"
+#include "llsingleton.h"
#include "llstring.h"
#include "llviewerpartsim.h"
#include "llviewerimage.h"
diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp
index 572f31f566..915ff04344 100644
--- a/indra/newview/llworldmap.cpp
+++ b/indra/newview/llworldmap.cpp
@@ -46,6 +46,7 @@
#include "llviewerimagelist.h"
#include "llviewerregion.h"
#include "llregionflags.h"
+#include "lltrans.h"
const F32 REQUEST_ITEMS_TIMER = 10.f * 60.f; // 10 minutes
@@ -757,18 +758,11 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
case MAP_ITEM_MATURE_EVENT:
case MAP_ITEM_ADULT_EVENT:
{
- struct tm* timep;
- // Convert to Pacific, based on server's opinion of whether
- // it's daylight savings time there.
- timep = utc_to_pacific_time(extra, gPacificDaylightTime);
-
- S32 display_hour = timep->tm_hour % 12;
- if (display_hour == 0) display_hour = 12;
-
- new_item.mToolTip = llformat( "%d:%02d %s",
- display_hour,
- timep->tm_min,
- (timep->tm_hour < 12 ? "AM" : "PM") );
+ std::string timeStr = LLTrans::getString ("WorldMapTimeStr");
+ LLSD substitution;
+ substitution["datetime"] = (S32) extra;
+ LLStringUtil::format (timeStr, substitution);
+ new_item.mToolTip = timeStr;
// HACK: store Z in extra2
new_item.mPosGlobal.mdV[VZ] = (F64)extra2;
diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h
index bb3c97cfd9..1db081c74a 100644
--- a/indra/newview/llworldmap.h
+++ b/indra/newview/llworldmap.h
@@ -36,13 +36,15 @@
#include <map>
#include <string>
#include <vector>
+#include <boost/function.hpp>
#include "v3math.h"
#include "v3dmath.h"
#include "llframetimer.h"
#include "llmapimagetype.h"
#include "lluuid.h"
-#include "llmemory.h"
+#include "llpointer.h"
+#include "llsingleton.h"
#include "llviewerimage.h"
#include "lleventinfo.h"
#include "v3color.h"
@@ -114,7 +116,8 @@ struct LLWorldMapLayer
class LLWorldMap : public LLSingleton<LLWorldMap>
{
public:
- typedef void(*url_callback_t)(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport);
+ typedef boost::function<void(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)>
+ url_callback_t;
LLWorldMap();
~LLWorldMap();
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 99f559cc79..d80cd317c3 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -39,11 +39,11 @@
#include "llmath.h" // clampf()
#include "llregionhandle.h"
#include "lleventflags.h"
+#include "llfloaterreg.h"
#include "llrender.h"
#include "llagent.h"
#include "llcallingcard.h"
-#include "llcolorscheme.h"
#include "llviewercontrol.h"
#include "llcylinder.h"
#include "llfloaterdirectory.h"
@@ -164,8 +164,8 @@ void LLWorldMapView::cleanupClass()
sForSaleAdultImage = NULL;
}
-LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect )
-: LLPanel(name, rect, BORDER_NO),
+LLWorldMapView::LLWorldMapView()
+: LLPanel(),
mBackgroundColor( LLColor4( 4.f/255.f, 4.f/255.f, 75.f/255.f, 1.f ) ),
mItemPicked(FALSE),
mPanning( FALSE ),
@@ -178,46 +178,33 @@ LLWorldMapView::LLWorldMapView(const std::string& name, const LLRect& rect )
sPixelsPerMeter = gMapScale / REGION_WIDTH_METERS;
clearLastClick();
- const S32 DIR_WIDTH = 10;
- const S32 DIR_HEIGHT = 10;
- LLRect major_dir_rect( 0, DIR_HEIGHT, DIR_WIDTH, 0 );
- LLColor4 minor_color( 1.f, 1.f, 1.f, .7f );
-
- mTextBoxNorth = new LLTextBox( std::string("N"), major_dir_rect );
- mTextBoxNorth->setColor( minor_color );
- addChild( mTextBoxNorth );
-
- mTextBoxEast = new LLTextBox( std::string("E"), major_dir_rect );
- mTextBoxEast->setColor( minor_color );
- addChild( mTextBoxEast );
-
- major_dir_rect.mRight += 1 ;
- mTextBoxWest = new LLTextBox( std::string("W"), major_dir_rect );
- mTextBoxWest->setColor( minor_color );
- addChild( mTextBoxWest );
- major_dir_rect.mRight -= 1 ;
-
- mTextBoxSouth = new LLTextBox( std::string("S"), major_dir_rect );
- mTextBoxSouth->setColor( minor_color );
- addChild( mTextBoxSouth );
-
- LLRect minor_dir_rect( 0, DIR_HEIGHT, DIR_WIDTH * 2, 0 );
-
- mTextBoxSouthEast = new LLTextBox( std::string("SE"), minor_dir_rect );
- mTextBoxSouthEast->setColor( minor_color );
- addChild( mTextBoxSouthEast );
+ LLUICtrlFactory::getInstance()->buildPanel(this, "panel_worldmap.xml");
+ mTextBoxNorth = getChild<LLTextBox> ("floater_map_north");
+ mTextBoxEast = getChild<LLTextBox> ("floater_map_east");
+ mTextBoxWest = getChild<LLTextBox> ("floater_map_west");
+ mTextBoxSouth = getChild<LLTextBox> ("floater_map_south");
+ mTextBoxSouthEast = getChild<LLTextBox> ("floater_map_southeast");
+ mTextBoxNorthEast = getChild<LLTextBox> ("floater_map_northeast");
+ mTextBoxSouthWest = getChild<LLTextBox> ("floater_map_southwest");
+ mTextBoxNorthWest = getChild<LLTextBox> ("floater_map_northwest");
- mTextBoxNorthEast = new LLTextBox( std::string("NE"), minor_dir_rect );
- mTextBoxNorthEast->setColor( minor_color );
- addChild( mTextBoxNorthEast );
+ mTextBoxNorth->setText(getString("world_map_north"));
+ mTextBoxEast->setText(getString ("world_map_east"));
+ mTextBoxWest->setText(getString("world_map_west"));
+ mTextBoxSouth->setText(getString ("world_map_south"));
+ mTextBoxSouthEast ->setText(getString ("world_map_southeast"));
+ mTextBoxNorthEast ->setText(getString ("world_map_northeast"));
+ mTextBoxSouthWest->setText(getString ("world_map_southwest"));
+ mTextBoxNorthWest ->setText(getString("world_map_northwest"));
- mTextBoxSouthWest = new LLTextBox( std::string("SW"), minor_dir_rect );
- mTextBoxSouthWest->setColor( minor_color );
- addChild( mTextBoxSouthWest );
-
- mTextBoxNorthWest = new LLTextBox( std::string("NW"), minor_dir_rect );
- mTextBoxNorthWest->setColor( minor_color );
- addChild( mTextBoxNorthWest );
+ mTextBoxNorth->reshapeToFitText();
+ mTextBoxEast->reshapeToFitText();
+ mTextBoxWest->reshapeToFitText();
+ mTextBoxSouth->reshapeToFitText();
+ mTextBoxSouthEast ->reshapeToFitText();
+ mTextBoxNorthEast ->reshapeToFitText();
+ mTextBoxSouthWest->reshapeToFitText();
+ mTextBoxNorthWest ->reshapeToFitText();
}
@@ -293,6 +280,8 @@ BOOL is_agent_in_region(LLViewerRegion* region, LLSimInfo* info)
void LLWorldMapView::draw()
{
+ static LLCachedControl<LLColor4> map_track_color(gSavedSkinSettings, "MapTrackColor", LLColor4::white);
+
LLTextureView::clearDebugImages();
F64 current_time = LLTimer::getElapsedSeconds();
@@ -698,6 +687,7 @@ void LLWorldMapView::draw()
LLColor4::white,
LLFontGL::LEFT,
LLFontGL::BASELINE,
+ LLFontGL::NORMAL,
LLFontGL::DROP_SHADOW);
// If map texture is still loading,
@@ -713,6 +703,7 @@ void LLWorldMapView::draw()
LLColor4::white,
LLFontGL::LEFT,
LLFontGL::BASELINE,
+ LLFontGL::NORMAL,
LLFontGL::DROP_SHADOW);
}
}
@@ -801,7 +792,7 @@ void LLWorldMapView::draw()
LLTracker::ETrackingStatus tracking_status = LLTracker::getTrackingStatus();
if ( LLTracker::TRACKING_AVATAR == tracking_status )
{
- drawTracking( LLAvatarTracker::instance().getGlobalPos(), gTrackColor, TRUE, LLTracker::getLabel(), "" );
+ drawTracking( LLAvatarTracker::instance().getGlobalPos(), map_track_color, TRUE, LLTracker::getLabel(), "" );
}
else if ( LLTracker::TRACKING_LANDMARK == tracking_status
|| LLTracker::TRACKING_LOCATION == tracking_status )
@@ -811,7 +802,7 @@ void LLWorldMapView::draw()
LLVector3d pos_global = LLTracker::getTrackedPositionGlobal();
if (!pos_global.isExactlyZero())
{
- drawTracking( pos_global, gTrackColor, TRUE, LLTracker::getLabel(), LLTracker::getToolTip() );
+ drawTracking( pos_global, map_track_color, TRUE, LLTracker::getLabel(), LLTracker::getToolTip() );
}
}
else if (LLWorldMap::getInstance()->mIsTrackingUnknownLocation)
@@ -820,14 +811,14 @@ void LLWorldMapView::draw()
{
// We know this location to be invalid
LLColor4 loading_color(0.0, 0.5, 1.0, 1.0);
- drawTracking( LLWorldMap::getInstance()->mUnknownLocation, loading_color, TRUE, "Invalid Location", "");
+ drawTracking( LLWorldMap::getInstance()->mUnknownLocation, loading_color, TRUE, getString("InvalidLocation"), "");
}
else
{
double value = fmod(current_time, 2);
value = 0.5 + 0.5*cos(value * 3.14159f);
LLColor4 loading_color(0.0, F32(value/2), F32(value), 1.0);
- drawTracking( LLWorldMap::getInstance()->mUnknownLocation, loading_color, TRUE, "Loading...", "");
+ drawTracking( LLWorldMap::getInstance()->mUnknownLocation, loading_color, TRUE, getString("Loading"), "");
}
}
// #endif used to be here
@@ -913,10 +904,10 @@ void LLWorldMapView::drawImageStack(const LLVector3d& global_pos, LLUIImagePtr i
void LLWorldMapView::drawAgents()
{
- F32 agents_scale = (gMapScale * 0.9f) / 256.f;
+ static LLCachedControl<LLColor4> map_avatar_color(gSavedSkinSettings, "MapAvatarColor", LLColor4::white);
+ static LLCachedControl<LLColor4> map_avatar_friend_color(gSavedSkinSettings, "MapAvatarFriendColor", LLColor4::white);
- LLColor4 avatar_color = gColors.getColor( "MapAvatar" );
- // LLColor4 friend_color = gColors.getColor( "MapFriend" );
+ F32 agents_scale = (gMapScale * 0.9f) / 256.f;
for (handle_list_t::iterator iter = mVisibleRegions.begin(); iter != mVisibleRegions.end(); ++iter)
{
@@ -939,8 +930,8 @@ void LLWorldMapView::drawAgents()
S32 agent_count = info.mExtra;
sim_agent_count += info.mExtra;
// Here's how we'd choose the color if info.mID were available but it's not being sent:
- //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? friend_color : avatar_color;
- drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, avatar_color);
+ //LLColor4 color = (agent_count == 1 && is_agent_friend(info.mID)) ? map_avatar_friend_color : map_avatar_color;
+ drawImageStack(info.mPosGlobal, sAvatarSmallImage, agent_count, 3.f, map_avatar_color);
}
LLWorldMap::getInstance()->mNumAgents[handle] = sim_agent_count; // override mNumAgents for this sim
}
@@ -955,7 +946,7 @@ void LLWorldMapView::drawAgents()
region_center[VY] += REGION_WIDTH_METERS / 2;
// Reduce the stack size as you zoom out - always display at lease one agent where there is one or more
S32 agent_count = (S32)(((num_agents-1) * agents_scale + (num_agents-1) * 0.1f)+.1f) + 1;
- drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, avatar_color);
+ drawImageStack(region_center, sAvatarSmallImage, agent_count, 3.f, map_avatar_color);
}
}
}
@@ -1142,7 +1133,7 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
text_x,
text_y,
LLColor4::white, LLFontGL::HCENTER,
- LLFontGL::BASELINE, LLFontGL::DROP_SHADOW);
+ LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::DROP_SHADOW);
if (tooltip != "")
{
@@ -1153,7 +1144,7 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
text_x,
text_y,
LLColor4::white, LLFontGL::HCENTER,
- LLFontGL::BASELINE, LLFontGL::DROP_SHADOW);
+ LLFontGL::BASELINE, LLFontGL::NORMAL, LLFontGL::DROP_SHADOW);
}
}
}
@@ -1338,6 +1329,7 @@ void LLWorldMapView::drawIconName(F32 x_pixels,
color,
LLFontGL::HCENTER,
LLFontGL::TOP,
+ LLFontGL::NORMAL,
LLFontGL::DROP_SHADOW);
text_y -= llround(LLFontGL::getFontSansSerif()->getLineHeight());
@@ -1349,6 +1341,7 @@ void LLWorldMapView::drawIconName(F32 x_pixels,
color,
LLFontGL::HCENTER,
LLFontGL::TOP,
+ LLFontGL::NORMAL,
LLFontGL::DROP_SHADOW);
}
@@ -1886,27 +1879,27 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
case MAP_ITEM_MATURE_EVENT:
case MAP_ITEM_ADULT_EVENT:
{
- gFloaterWorldMap->close();
+ LLFloaterReg::hideInstance("world_map");
// This is an ungainly hack
std::string uuid_str;
S32 event_id;
id.toString(uuid_str);
uuid_str = uuid_str.substr(28);
sscanf(uuid_str.c_str(), "%X", &event_id);
- LLFloaterDirectory::showEvents(event_id);
+ LLFloaterReg::showInstance("search", LLSD().insert("panel", "event").insert("id", event_id));
break;
}
case MAP_ITEM_LAND_FOR_SALE:
case MAP_ITEM_LAND_FOR_SALE_ADULT:
{
- gFloaterWorldMap->close();
- LLFloaterDirectory::showLandForSale(id);
+ LLFloaterReg::hideInstance("world_map");
+ LLFloaterReg::showInstance("search", LLSD().insert("panel", "land").insert("id", id));
break;
}
case MAP_ITEM_CLASSIFIED:
{
- gFloaterWorldMap->close();
- LLFloaterDirectory::showClassified(id);
+ LLFloaterReg::hideInstance("world_map");
+ LLFloaterReg::showInstance("search", LLSD().insert("panel", "classified").insert("id", id));
break;
}
default:
diff --git a/indra/newview/llworldmapview.h b/indra/newview/llworldmapview.h
index 1717b76beb..5b36e308dd 100644
--- a/indra/newview/llworldmapview.h
+++ b/indra/newview/llworldmapview.h
@@ -60,7 +60,7 @@ public:
static void initClass();
static void cleanupClass();
- LLWorldMapView(const std::string& name, const LLRect& rect );
+ LLWorldMapView();
virtual ~LLWorldMapView();
virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE );
diff --git a/indra/newview/macview_Prefix.h b/indra/newview/macview_Prefix.h
index 8cbabb5103..33cf7d8cb0 100644
--- a/indra/newview/macview_Prefix.h
+++ b/indra/newview/macview_Prefix.h
@@ -69,7 +69,6 @@
#include "llfloatercustomize.h"
#include "llfloaterdirectory.h"
#include "llfloatergroups.h"
-#include "llfloatermap.h"
#include "llfloaterworldmap.h"
#include "llfloatermute.h"
#include "llconversation.h"
@@ -92,7 +91,6 @@
#include "lltoolgrab.h"
#include "lltoolmgr.h"
#include "lltoolpie.h"
-#include "lltoolview.h"
#include "llui.h" // for make_ui_sound
#include "llviewercamera.h"
#include "llviewermenu.h"
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 8dec9b9ba8..49083c5927 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -41,9 +41,9 @@
#include "llviewercontrol.h"
#include "llfasttimer.h"
#include "llfontgl.h"
-#include "llmemory.h"
#include "llmemtype.h"
#include "llnamevalue.h"
+#include "llpointer.h"
#include "llprimitive.h"
#include "llvolume.h"
#include "material_codes.h"
@@ -52,6 +52,7 @@
#include "llui.h"
#include "llglheaders.h"
#include "llrender.h"
+#include "llwindow.h" // swapBuffers()
// newview includes
#include "llagent.h"
@@ -65,7 +66,6 @@
#include "llface.h"
#include "llfeaturemanager.h"
#include "llfloatertelehub.h"
-#include "llframestats.h"
#include "llgldbg.h"
#include "llhudmanager.h"
#include "lllightconstants.h"
@@ -93,8 +93,8 @@
#include "llvopartgroup.h"
#include "llworld.h"
#include "llcubemap.h"
-#include "lldebugmessagebox.h"
#include "llviewershadermgr.h"
+#include "llviewerstats.h"
#include "llviewerjoystick.h"
#include "llviewerdisplay.h"
#include "llwlparammanager.h"
@@ -121,8 +121,7 @@ const U32 REFLECTION_MAP_RES = 128;
const S32 MAX_OCCLUDER_COUNT = 2;
extern S32 gBoxFrame;
-extern BOOL gRenderLightGlows;
-extern BOOL gHideSelectedObjects;
+//extern BOOL gHideSelectedObjects;
extern BOOL gDisplaySwapBuffers;
extern BOOL gDebugGL;
@@ -337,7 +336,7 @@ void LLPipeline::init()
getPool(LLDrawPool::POOL_BUMP);
getPool(LLDrawPool::POOL_GLOW);
- mTrianglesDrawnStat.reset();
+ LLViewerStats::getInstance()->mTrianglesDrawnStat.reset();
resetFrameStats();
mRenderTypeMask = 0xffffffff; // All render types start on
@@ -1093,7 +1092,7 @@ void LLPipeline::resetFrameStats()
{
assertInitialized();
- mTrianglesDrawnStat.addValue(mTrianglesDrawn/1000.f);
+ LLViewerStats::getInstance()->mTrianglesDrawnStat.addValue(mTrianglesDrawn/1000.f);
if (mBatchCount > 0)
{
@@ -1960,7 +1959,7 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
return;
}
- if (gHideSelectedObjects)
+ if (LLSelectMgr::getInstance()->mHideSelectedObjects)
{
if (drawablep->getVObj().notNull() &&
drawablep->getVObj()->isSelected())
@@ -2509,7 +2508,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
//
stop_glerror();
- gFrameStats.start(LLFrameStats::RENDER_SYNC);
LLVertexBuffer::unbind();
@@ -2535,7 +2533,6 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
if(forceVBOUpdate)
gSky.mVOSkyp->updateDummyVertexBuffer() ;
- gFrameStats.start(LLFrameStats::RENDER_GEOM);
// Initialize lots of GL state to "safe" values
glMatrixMode(GL_TEXTURE);
@@ -3295,7 +3292,7 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects, BOOL render
LLDrawable* drawable = vobj->mDrawable;
if (vobj->isDead() ||
vobj->isHUDAttachment() ||
- (gHideSelectedObjects && vobj->isSelected()) ||
+ (LLSelectMgr::getInstance()->mHideSelectedObjects && vobj->isSelected()) ||
drawable->isDead() ||
!hasRenderType(drawable->getRenderType()))
{
@@ -5073,8 +5070,8 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield)
F32 minLum = llmax(gSavedSettings.getF32("RenderGlowMinLuminance"), 0.0f);
F32 maxAlpha = gSavedSettings.getF32("RenderGlowMaxExtractAlpha");
F32 warmthAmount = gSavedSettings.getF32("RenderGlowWarmthAmount");
- LLVector3 lumWeights = gSavedSettings.getVector3("RenderGlowLumWeights");
- LLVector3 warmthWeights = gSavedSettings.getVector3("RenderGlowWarmthWeights");
+ LLVector3 lumWeights = gSavedSkinSettings.getVector3("RenderGlowLumWeights");
+ LLVector3 warmthWeights = gSavedSkinSettings.getVector3("RenderGlowWarmthWeights");
gGlowExtractProgram.uniform1f("minLuminance", minLum);
gGlowExtractProgram.uniform1f("maxExtractAlpha", maxAlpha);
gGlowExtractProgram.uniform3f("lumWeights", lumWeights.mV[0], lumWeights.mV[1], lumWeights.mV[2]);
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 0ec4e43806..5e14260a6d 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -36,11 +36,10 @@
#include "llerror.h"
#include "lldarrayptr.h"
#include "lldqueueptr.h"
-#include "llstat.h"
#include "lldrawpool.h"
#include "llspatialpartition.h"
#include "m4math.h"
-#include "llmemory.h"
+#include "llpointer.h"
#include "lldrawpool.h"
#include "llgl.h"
#include "lldrawable.h"
@@ -382,7 +381,6 @@ public:
S32 mMeanBatchSize;
S32 mTrianglesDrawn;
S32 mNumVisibleNodes;
- LLStat mTrianglesDrawnStat;
S32 mVerticesRelit;
S32 mLightingChanges;
diff --git a/indra/newview/res/bitmap2.bmp b/indra/newview/res/bitmap2.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..770b07558cf2e4c7ce98f08e1a0a7ce3099b84f6
GIT binary patch
literal 25118
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
Tn48M=i5=wG7T0h3LdE|9@IW^$
literal 0
HcmV?d00001
diff --git a/indra/newview/res/install_icon.BMP b/indra/newview/res/install_icon.BMP
new file mode 100644
index 0000000000000000000000000000000000000000..09df573870e6aac8b5ea331fd143fd0ae4cd095e
GIT binary patch
literal 262198
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%0AucO0?&25DhCpIehpvSUoPC+#eHcn
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
literal 0
HcmV?d00001
diff --git a/indra/newview/res/loginbackground.bmp b/indra/newview/res/loginbackground.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..288a0b03987b51f440e19130bd603a698f25d5ed
GIT binary patch
literal 336054
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%0AUda55zc}$*@0f$T*WEtF<(u!B=6vql
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⁢i#)KzmpS9l-nF-1V>b0hNA~hwcT)(WS$vk
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
YzNUxzKmJ9LVfrM?8S&qFG_?Q!1^3_N6951J
literal 0
HcmV?d00001
diff --git a/indra/newview/res/uninstall_icon.BMP b/indra/newview/res/uninstall_icon.BMP
new file mode 100644
index 0000000000000000000000000000000000000000..562b56676a9a87037f773cdd4ce2f2f1ba66b9d3
GIT binary patch
literal 262198
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	Pe9k
zdeG|i2$I*}Q<g7Z75a$V!1hX?ka&Su#6I-~h$p0eAsy-(5FI74$Oseqgunu)?n6^?
z8yb&nwr#t~IXYUJi#ei5;DC&4SLBSu1UVJYmk7=gS^+th`UAiMm?M2?2%M`ov}qkA
zRH`@-YXJ2Lr=oB5e^>`X5dTU&@bo(Pb-)3IbN+H*r7<`+{lvO;M~dEF+r>F^u2P-P
zHGIhVs-6dWKA!W#VTB{CU;op0J$h^(3%uV1H9FVu+S-;bWoK8WX!GXdY*6b1@6X|Q
zzeS6Q$oZqd@eN^h>iin-mo2N}{bGm+E%slvWx>(W89K?Em<?3c0Hc9o92}tq4-hXv
zwE@L`OpKY|Qaun3UVvkPlS-d3H1t976DK5}tW5bJa6l^7fy|6_DGmKaaD&oWnkB^V
zsXq`2ZqTs)^K{Y6>r0`Q3;KhO{lO0og=XkeT<4f&DYuW-fnW6qo`wfrt^7}MAEwm#
z(DLY<=78HDtbePjuh_0#pnm)~y%-euP=M{FFm9aLK(S9TKXs}^u^$fHAHHf;{_()T
zv~{&>PsP4B<y~;Sat$wP{SwWakF|UE-8JC%7h3TCRMh%}_lGk#w}AzCziQPstbBRm
z_f@=a^Qv9;+UF^B26VdG&@LuJGo67NUq=65sR>9gKz#x_qHz!=h{hT~>p&E^LDCEv
zfCWyT`h}f5ejB_(Hs%^ktrHWa4X6jsUjGqT;HsRC9%Bly0K7%yc+v`xc9=9n+qd6A
z9@7i%&1VZ0E2x^GIluxNITm=mFaVEzeD0m7^FQM`zhVVn(XIY?v0vY>aGugd^z#dH
zKGpYB=M&zaHqC5APv5X{<AVdEN1qI`x9{r#2~WYyo{de3;>hpd_m^?J4}Kqbe=_2J
z40`&0;P<^a-mhN03wz@Y74N?Rj*sL3TFx&NDzEgn&Nb?@E#L$W9FU>QlsGpKg}l$#
zfoO#vQ1Ae_!I*sL2Eh#yFMu@w{(+nqIC$t5G{g_8LK86c(hug7&<mwqzb0iQCCRCH
zEY}Xho{%^J;s(RR!X(40RmozXK5GT%>O-Ly8lZQ8j!maqjyy=3q2I>=|NHr0jeDx|
zH}T$x6SO>4s`%*Jw4Ni59CcJbfBrqp?x-A}qTPjtm-IZG=fn25Cs(e#ytQlB&xhOE
zHfxBBl*D+B#fp{1mN%7(Hfl7q2=si&`EyX~Pe)Im@cu~P{Xxk2eK8l;6aIMZpyg`{
zk1QAP`{gYBz83qhbihC1!&R)<5Hrp{fY-wsa7@t+D*PaD0M!A618`f=AFyD7hzMW-
z5&B_Zfn&#RLwo$t=FlOj4|ss@PzxkozlwSwLr#O<fVjZ|tpMr)aD%dO>((3M#7SX7
z<3`iPisgMo`?Az0n2UV)4b}kCz`lxgzZ(1BBJNk>^G+7am-7*8*YX$Ne}A<&BOpl(
z43v0Z4}CnY;iZ^Y51P|ozC7<}KtSAz8Z}102Wt+}@DjgoZ);nsMB~Q8!0)dCzrT?5
zJm~39g^q6=!+OB#*Z09J%fG<!b;VqKD|qA7#|C*-nT-wEduaUr6GG#)xvNT*=J0M2
z;4PBOxk2Iw4I<@w#6RHxtO2}F0B$e_{6Gw_0Nqc#fC0RKfHmOMsXM⪼G-@v$JQV
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
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index cf9466fad3..4c76c73e77 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -1,3 +1,3189 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings version = "101">
-</settings>
+<?xml version="1.0"?>
+<llsd>
+ <map>
+ <key>AgentChatColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from other residents</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>AlertBoxColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Alert Box Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>AlertCautionBoxColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Alert Caution Box Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>0.82</real>
+ <real>0.46</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>AlertCautionTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Alert Caution Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>AlertTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Alert Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.58</real>
+ <real>0.66</real>
+ <real>0.84</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>AvatarNameColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Avatar Name Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.98</real>
+ <real>0.69</real>
+ <real>0.36</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>BackgroundChatColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat bubble background</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>BalanceTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Balance Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>1</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ButtonBorderColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Border Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.94</real>
+ <real>0.61</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ButtonCautionImageColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Caution Image Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ButtonColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ButtonFlashBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>0.75</real>
+ <real>0.24</real>
+ <real>0.5</real>
+ </array>
+ </map>
+ <key>ButtonImageColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Image Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ButtonLabelColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Label Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.86</real>
+ <real>0.86</real>
+ <real>0.86</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ButtonLabelDisabledColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Label Disabled Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.58</real>
+ <real>0.66</real>
+ <real>0.84</real>
+ <real>0.78</real>
+ </array>
+ </map>
+ <key>ButtonLabelSelectedColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Label Selected Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.86</real>
+ <real>0.86</real>
+ <real>0.86</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ButtonLabelSelectedDisabledColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Label Selected Disabled Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.64</real>
+ <real>0.75</real>
+ <real>0.93</real>
+ <real>0.78</real>
+ </array>
+ </map>
+ <key>ButtonSelectedBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Selected Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ButtonSelectedColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Selected Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ButtonUnselectedBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Unselected Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ButtonUnselectedFgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Button Unselected Fg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ChatHistoryBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Chat History Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ </array>
+ </map>
+ <key>ChatHistoryTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Chat History Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ColorDropShadow</key>
+ <map>
+ <key>Comment</key>
+ <string>Color Drop Shadow</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.78</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry01</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry02</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>0.5</real>
+ <real>0.5</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry03</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry04</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>0.5</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry05</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>0.5</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry06</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>0.5</real>
+ <real>0.5</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry07</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>0.5</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry08</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>0.0</real>
+ <real>0.5</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry09</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>0.5</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry10</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>0.25</real>
+ <real>0.25</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry11</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>0.5</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry12</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>0.25</real>
+ <real>0.5</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry13</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry14</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>0.25</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry15</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry16</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry17</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry18</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.75</real>
+ <real>0.75</real>
+ <real>0.75</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry19</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry20</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry21</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry22</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry23</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry24</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry25</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>0.5</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry26</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>0.5</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry27</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry28</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>0.5</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry29</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>0.5</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry30</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>0.5</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry31</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ColorPaletteEntry32</key>
+ <map>
+ <key>Comment</key>
+ <string>Color picker palette entry</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ConsoleBackground</key>
+ <map>
+ <key>Comment</key>
+ <string>Console Background</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ContextSilhouetteColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Context Silhouette Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.94</real>
+ <real>0.61</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>DefaultHighlightDark</key>
+ <map>
+ <key>Comment</key>
+ <string>Default Highlight Dark</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.1</real>
+ <real>0.1</real>
+ <real>0.1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>DefaultHighlightLight</key>
+ <map>
+ <key>Comment</key>
+ <string>Default Highlight Light</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.45</real>
+ <real>0.52</real>
+ <real>0.61</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>DefaultShadowDark</key>
+ <map>
+ <key>Comment</key>
+ <string>Default Shadow Dark</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.1</real>
+ <real>0.1</real>
+ <real>0.1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>DefaultShadowLight</key>
+ <map>
+ <key>Comment</key>
+ <string>Default Shadow Light</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>EffectColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Particle effects color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>FilterBackgroundColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Filter Background Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0.08</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>FilterTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Filter Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>0.78</real>
+ <real>0.27</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>FloaterButtonImageColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Floater Button Image Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.94</real>
+ <real>0.61</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>FloaterDefaultBackgroundColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Default Background Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.55</real>
+ </array>
+ </map>
+ <key>FloaterFocusBackgroundColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Focus Background Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>FloaterFocusBorderColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Floater Focus Border Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.31</real>
+ </array>
+ </map>
+ <key>FloaterUnfocusBorderColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Floater Unfocus Border Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.31</real>
+ </array>
+ </map>
+ <key>FocusColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Focus Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.94</real>
+ <real>0.61</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>FolderViewLoadingMessageTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Folder View Loading Message Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.94</real>
+ <real>0.65</real>
+ <real>0.35</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>GridFocusPointColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Grid Focus Point Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>0.5</real>
+ </array>
+ </map>
+ <key>GridlineBGColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Gridline BGColor</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.92</real>
+ <real>0.92</real>
+ <real>1</real>
+ <real>0.78</real>
+ </array>
+ </map>
+ <key>GridlineColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Gridline Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>GridlineShadowColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Gridline Shadow Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.31</real>
+ </array>
+ </map>
+ <key>GroupNotifyBoxColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Group Notify Box Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.27</real>
+ <real>0.67</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>GroupNotifyTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Group Notify Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0.12</real>
+ <real>0.24</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>GroupOverTierColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Group Over Tier Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.43</real>
+ <real>0.06</real>
+ <real>0.06</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>HTMLLinkColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of hyperlinks</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.60</real>
+ <real>0.60</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>HealthTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Health Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>HelpBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Help Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.78</real>
+ <real>0.82</real>
+ <real>0.8</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>HelpFgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Help Fg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>HelpScrollHighlightColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Help Scroll Highlight Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.45</real>
+ <real>0.52</real>
+ <real>0.61</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>HelpScrollShadowColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Help Scroll Shadow Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>HelpScrollThumbColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Help Scroll Thumb Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.31</real>
+ <real>0.38</real>
+ <real>0.49</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>HelpScrollTrackColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Help Scroll Track Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.72</real>
+ <real>0.72</real>
+ <real>0.74</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>HighlightChildColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Highlight Child Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.67</real>
+ <real>0.83</real>
+ <real>0.96</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>HighlightInspectColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Highlight Inspect Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>0</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>HighlightParentColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Highlight Parent Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.67</real>
+ <real>0.83</real>
+ <real>0.96</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>IMChatColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of instant messages from other residents</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>IMHistoryBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>IMHistory Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0.12</real>
+ <real>0.31</real>
+ <real>0.78</real>
+ </array>
+ </map>
+ <key>IMHistoryTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>IMHistory Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>IconDisabledColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Icon Disabled Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.58</real>
+ <real>0.66</real>
+ <real>0.84</real>
+ <real>0.78</real>
+ </array>
+ </map>
+ <key>IconEnabledColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Icon Enabled Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>InventoryBackgroundColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Inventory Background Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.31</real>
+ </array>
+ </map>
+ <key>InventoryItemSuffixColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Inventory Item Suffix Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.75</real>
+ <real>0.85</real>
+ <real>0.85</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>InventorySearchStatusColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Inventory Search Status Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>LabelDisabledColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Label Disabled Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.58</real>
+ <real>0.66</real>
+ <real>0.84</real>
+ <real>0.3</real>
+ </array>
+ </map>
+ <key>LabelSelectedColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Label Selected Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>LabelSelectedDisabledColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Label Selected Disabled Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.64</real>
+ <real>0.75</real>
+ <real>0.93</real>
+ <real>0.5</real>
+ </array>
+ </map>
+ <key>LabelTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Label Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.58</real>
+ <real>0.66</real>
+ <real>0.84</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>LoginProgressBarBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Login Progress Bar Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>LoginProgressBarFgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Login Progress Bar Fg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>LoginProgressBoxBorderColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Login Progress Box Border Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0.12</real>
+ <real>0.24</real>
+ <real>0</real>
+ </array>
+ </map>
+ <key>LoginProgressBoxCenterColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Login Progress Box Center Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.78</real>
+ </array>
+ </map>
+ <key>LoginProgressBoxShadowColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Login Progress Box Shadow Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.78</real>
+ </array>
+ </map>
+ <key>LoginProgressBoxTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Login Progress Box Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+
+ <key>MapAvatarColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from other residents</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>MapAvatarFriendColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from other residents</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>MapAvatarSelfColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from other residents</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>MapFrustumColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from other residents</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>0.1</real>
+ </array>
+ </map>
+ <key>MapFrustumRotatingColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from other residents</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>0.2</real>
+ </array>
+ </map>
+ <key>MapTrackColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from other residents</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>MapTrackDisabledColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from other residents</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+
+
+ <key>MenuBarBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Menu Bar Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MenuBarGodBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Menu Bar God Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.5</real>
+ <real>0.24</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MenuDefaultBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Menu Default Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MenuItemDisabledColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Menu Item Disabled Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.52</real>
+ <real>0.52</real>
+ <real>0.64</real>
+ <real>0.5</real>
+ </array>
+ </map>
+ <key>MenuItemEnabledColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Menu Item Enabled Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MenuItemHighlightBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Menu Item Highlight Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.72</real>
+ <real>0.72</real>
+ <real>0.74</real>
+ <real>0.39</real>
+ </array>
+ </map>
+ <key>MenuItemHighlightFgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Menu Item Highlight Fg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MenuNonProductionBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Menu Non Production Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MenuNonProductionGodBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Menu Non Production God Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0.5</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MenuPopupBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Menu Popup Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MultiSliderDisabledThumbColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Multi Slider Disabled Thumb Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MultiSliderThumbCenterColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Multi Slider Thumb Center Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.72</real>
+ <real>0.72</real>
+ <real>0.74</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MultiSliderThumbCenterSelectedColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Multi Slider Thumb Center Selected Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>0.2</real>
+ <real>0.2</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MultiSliderThumbOutlineColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Multi Slider Thumb Outline Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MultiSliderTrackColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Multi Slider Track Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.12</real>
+ <real>0.12</real>
+ <real>0.12</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>MultiSliderTriangleColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Multi Slider Triangle Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>0.2</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>NetMapBackgroundColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Net Map Background Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.3</real>
+ </array>
+ </map>
+ <key>NetMapGroupOwnAboveWater</key>
+ <map>
+ <key>Comment</key>
+ <string>Net Map Group Own Above Water</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>0</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>NetMapGroupOwnBelowWater</key>
+ <map>
+ <key>Comment</key>
+ <string>Net Map Group Own Below Water</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.78</real>
+ <real>0</real>
+ <real>0.78</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>NetMapOtherOwnAboveWater</key>
+ <map>
+ <key>Comment</key>
+ <string>Net Map Other Own Above Water</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>NetMapOtherOwnBelowWater</key>
+ <map>
+ <key>Comment</key>
+ <string>Net Map Other Own Below Water</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.12</real>
+ <real>0.12</real>
+ <real>0.12</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>NetMapYouOwnAboveWater</key>
+ <map>
+ <key>Comment</key>
+ <string>Net Map You Own Above Water</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>NetMapYouOwnBelowWater</key>
+ <map>
+ <key>Comment</key>
+ <string>Net Map You Own Below Water</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0.78</real>
+ <real>0.78</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>NotifyBoxColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Notify Box Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.27</real>
+ <real>0.67</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>NotifyCautionBoxColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Notify Caution Box Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>0.82</real>
+ <real>0.46</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>NotifyCautionWarnColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Notify Caution Warn Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>NotifyTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Notify Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ObjectChatColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from objects</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.7</real>
+ <real>0.9</real>
+ <real>0.7</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>OverdrivenColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of various indicators when resident is speaking too loud.</string>
+ <key>Persist</key>
+ <integer>0</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>PanelDefaultBackgroundColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Default Background Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.55</real>
+ </array>
+ </map>
+ <key>PanelDefaultHighlightLight</key>
+ <map>
+ <key>Comment</key>
+ <string>Default Highlight Light</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.45</real>
+ <real>0.52</real>
+ <real>0.61</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>PanelFocusBackgroundColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Focus Background Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ParcelHoverColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Parcel Hover Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ParcelTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Parcel Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.56</real>
+ <real>0.65</real>
+ <real>0.82</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>PieMenuBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Pie Menu Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.59</real>
+ </array>
+ </map>
+ <key>PieMenuLineColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Pie Menu Line Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.5</real>
+ </array>
+ </map>
+ <key>PieMenuSelectedColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Pie Menu Selected Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.72</real>
+ <real>0.72</real>
+ <real>0.74</real>
+ <real>0.3</real>
+ </array>
+ </map>
+ <key>PropertyColorAuction</key>
+ <map>
+ <key>Comment</key>
+ <string>Property Color Auction</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.50</real>
+ <real>0</real>
+ <real>1</real>
+ <real>0.4</real>
+ </array>
+ </map>
+ <key>PropertyColorAvail</key>
+ <map>
+ <key>Comment</key>
+ <string>Property Color Avail</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ </array>
+ </map>
+ <key>PropertyColorForSale</key>
+ <map>
+ <key>Comment</key>
+ <string>Property Color For Sale</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>0.50</real>
+ <real>0</real>
+ <real>0.4</real>
+ </array>
+ </map>
+ <key>PropertyColorGroup</key>
+ <map>
+ <key>Comment</key>
+ <string>Property Color Group</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0.72</real>
+ <real>0.72</real>
+ <real>0.4</real>
+ </array>
+ </map>
+ <key>PropertyColorOther</key>
+ <map>
+ <key>Comment</key>
+ <string>Property Color Other</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.4</real>
+ </array>
+ </map>
+ <key>PropertyColorSelf</key>
+ <map>
+ <key>Comment</key>
+ <string>Property Color Self</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>1</real>
+ <real>0</real>
+ <real>0.4</real>
+ </array>
+ </map>
+ <key>RenderGlowLumWeights</key>
+ <map>
+ <key>Comment</key>
+ <string>Weights for each color channel to be used in calculating luminance (should add up to 1.0)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Vector3</string>
+ <key>Value</key>
+ <array>
+ <real>0.299</real>
+ <real>0.587</real>
+ <real>0.114</real>
+ </array>
+ </map>
+ <key>RenderGlowWarmthWeights</key>
+ <map>
+ <key>Comment</key>
+ <string>Weight of each color channel used before finding the max warmth</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Vector3</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>0.5</real>
+ <real>0.7</real>
+ </array>
+ </map>
+ <key>ScriptBgReadOnlyColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Script Bg Read Only Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.39</real>
+ <real>0.39</real>
+ <real>0.39</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ScriptErrorColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of script error messages</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.82</real>
+ <real>0.27</real>
+ <real>0.27</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>ScrollBGStripeColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scroll BGStripe Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.39</real>
+ <real>0.39</real>
+ <real>0.39</real>
+ <real>0.16</real>
+ </array>
+ </map>
+ <key>ScrollBgReadOnlyColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scroll Bg Read Only Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.78</real>
+ <real>0.82</real>
+ <real>0.8</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ScrollBgWriteableColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scroll Bg Writeable Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.78</real>
+ <real>0.82</real>
+ <real>0.8</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ScrollDisabledColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scroll Disabled Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.5</real>
+ <real>0.5</real>
+ <real>0.5</real>
+ <real>0.8</real>
+ </array>
+ </map>
+ <key>ScrollHighlightedColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scroll Highlighted Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.72</real>
+ <real>0.72</real>
+ <real>0.74</real>
+ <real>0.5</real>
+ </array>
+ </map>
+ <key>ScrollHoveredColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scroll Hovered Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.72</real>
+ <real>0.72</real>
+ <real>0.74</real>
+ <real>0.5</real>
+ </array>
+ </map>
+ <key>ScrollSelectedBGColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scroll Selected BGColor</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.39</real>
+ <real>0.39</real>
+ <real>0.74</real>
+ <real>0.59</real>
+ </array>
+ </map>
+ <key>ScrollSelectedFGColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scroll Selected FGColor</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.8</real>
+ </array>
+ </map>
+ <key>ScrollUnselectedColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scroll Unselected Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.8</real>
+ </array>
+ </map>
+ <key>ScrollbarThumbColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scrollbar Thumb Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.3</real>
+ <real>0.49</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ScrollbarTrackColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Scrollbar Track Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.6</real>
+ <real>0.6</real>
+ <real>0.62</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>SilhouetteChildColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Silhouette Child Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.13</real>
+ <real>0.42</real>
+ <real>0.77</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>SilhouetteParentColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Silhouette Parent Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>SkyNightColorShift</key>
+ <map>
+ <key>Comment</key>
+ <string>Controls moonlight color (base color applied to moon as light source)</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color3</string>
+ <key>Value</key>
+ <array>
+ <real>0.67</real>
+ <real>0.67</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>SliderDisabledThumbColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Slider Disabled Thumb Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>SliderThumbCenterColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Slider Thumb Center Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.78</real>
+ <real>0.78</real>
+ <real>0.78</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>SliderThumbOutlineColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Slider Thumb Outline Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>SliderTrackColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Slider Track Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>SpeakingColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of various indicators when resident is speaking on a voice channel.</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.0</real>
+ <real>1.0</real>
+ <real>0.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>SystemChatColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from SL System</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.800000011921</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>TextBgFocusColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Text Bg Focus Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.78</real>
+ <real>0.82</real>
+ <real>0.8</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>TextBgReadOnlyColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Text Bg Read Only Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.24</real>
+ <real>0.63</real>
+ </array>
+ </map>
+ <key>TextBgWriteableColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Text Bg Writeable Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.78</real>
+ <real>0.82</real>
+ <real>0.8</real>
+ <real>0.9</real>
+ </array>
+ </map>
+ <key>TextCursorColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Text Cursor Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>TextDefaultColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Text Default Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0.08</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>TextEmbeddedItemColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Text Embedded Item Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0.5</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>TextEmbeddedItemReadOnlyColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Text Embedded Item Read Only Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.23</real>
+ <real>0.58</real>
+ <real>0.95</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>TextFgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Text Fg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>TextFgReadOnlyColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Text Fg Read Only Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>0.78</real>
+ </array>
+ </map>
+ <key>TextFgTentativeColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Text Fg Tentative Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>0.5</real>
+ </array>
+ </map>
+ <key>TimeTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Time Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>TitleBarFocusColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Title Bar Focus Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1</real>
+ <real>1</real>
+ <real>1</real>
+ <real>0.12</real>
+ </array>
+ </map>
+ <key>ToolTipBgColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Tool Tip Bg Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.72</real>
+ <real>0.72</real>
+ <real>0.74</real>
+ <real>0.78</real>
+ </array>
+ </map>
+ <key>ToolTipBorderColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Tool Tip Border Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.67</real>
+ <real>0.83</real>
+ <real>0.96</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>ToolTipTextColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Tool Tip Text Color</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0</real>
+ <real>0</real>
+ <real>0</real>
+ <real>1</real>
+ </array>
+ </map>
+ <key>UserChatColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of your chat messages</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ <key>llOwnerSayChatColor</key>
+ <map>
+ <key>Comment</key>
+ <string>Color of chat messages from objects only visible to the owner</string>
+ <key>Persist</key>
+ <integer>1</integer>
+ <key>Type</key>
+ <string>Color4</string>
+ <key>Value</key>
+ <array>
+ <real>0.99</real>
+ <real>0.99</real>
+ <real>0.67</real>
+ <real>1.0</real>
+ </array>
+ </map>
+ </map>
+</llsd>
diff --git a/indra/newview/skins/default/textures/jump_left_in.tga b/indra/newview/skins/default/textures/jump_left_in.tga
new file mode 100644
index 0000000000000000000000000000000000000000..e0656c901dfccea9fbdeadb68d058ca6bf1bcc19
GIT binary patch
literal 812
zcmZQzU}As)0R{mE35LW$3>fCT2O=~FVv4{OV5-Lyfhz_w&}1Q8Ac?F7nT@O-u9z70
z$cky99_|;2MaXVOW~0f%U4^U$nT@6%D1|A4Up+(%vYNrhhUJEkpitK^&tOk~Kivp7
JPaju31^@+vJcR%N
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/jump_left_out.tga b/indra/newview/skins/default/textures/jump_left_out.tga
new file mode 100644
index 0000000000000000000000000000000000000000..fb6dac0c3d2f654dcd2fa686706e432ad21f99df
GIT binary patch
literal 812
zcmZQzU}As)0R{mE2^fbII+17qF_mcLiD>Hg?AQ)OXxfoQ2&zXj0l#{PVj|6lD<(!g
zvSM1O2L=(c74Q(FqJJS~LTn+@e7F`|>fz$J7-;Utr3@|(QBM{b5)|qh<{9ki@24B#
K=IP_A#{dB51s9P3
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/jump_right_in.tga b/indra/newview/skins/default/textures/jump_right_in.tga
new file mode 100644
index 0000000000000000000000000000000000000000..010c748c2a127bd8f2d2bac4ffcf4ffcc78e8b9e
GIT binary patch
literal 812
zcmZQzU}As)0R{mE35LW$3>fCTM{^xe1XB>M22&PO1g;p!fXE^nNThnW7UI=Iw9rmH
z#9u_34-W)l)Wa3SLkw92nGNwHnh2&KvVs9;!*WANP^fE|XRxQgpKgSkr;n>10{{`T
BJcR%N
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/jump_right_out.tga b/indra/newview/skins/default/textures/jump_right_out.tga
new file mode 100644
index 0000000000000000000000000000000000000000..33355262d41e333dc0700867d2a40bf2ad114d77
GIT binary patch
literal 812
zcmZQzU}As)0R{mE2^fbII+17qF_mcLiD>Hg?AVT`7bt=(h^Zb~7O0mP^~hR?R1eoe
zyn2Wh+Np;G6p`k`LzNiyaK*%gC$eIK>d_Qqa?#=!QvsR?L_Jw#NKmM2m}ju3zn^Y|
Ko2QSf9s>Xd1Q(G2
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/menu_separator.png b/indra/newview/skins/default/textures/menu_separator.png
new file mode 100644
index 0000000000000000000000000000000000000000..89dcdcdff5f3169619732dca5ca11fa0268c3504
GIT binary patch
literal 2831
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
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 34c9dea7e6..19f283e99d 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -1,21 +1,21 @@
<textures version="101">
- <texture name="icn_scrollbar_thumb.tga" preload="true" scale_top="7" scale_left="4" scale_bottom="8" scale_right="4" />
- <texture name="icn_scrollbar_bg.tga" preload="true" scale_top="7" scale_left="4" scale_bottom="8" scale_right="4" />
- <texture name="sm_rounded_corners_simple.tga" scale_left="4" scale_top="4" scale_bottom="4" scale_right="4"/>
- <texture name="icn_textfield_enabled.tga" scale_left="5" scale_top="5" scale_bottom="5" scale_right="5"/>
+ <texture name="icn_scrollbar_thumb.tga" preload="true" scale.top="7" scale.left="4" scale.bottom="8" scale.right="4" />
+ <texture name="icn_scrollbar_bg.tga" preload="true" scale.top="7" scale.left="4" scale.bottom="8" scale.right="4" />
+ <texture name="sm_rounded_corners_simple.tga" scale.left="4" scale.top="4" scale.bottom="4" scale.right="4"/>
+ <texture name="icn_textfield_enabled.tga" scale.left="5" scale.top="5" scale.bottom="5" scale.right="5"/>
- <texture name="button_disabled_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" />
+ <texture name="button_disabled_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
- <texture name="button_enabled_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" />
+ <texture name="button_enabled_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
- <texture name="toolbar_btn_enabled.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" />
+ <texture name="toolbar_btn_enabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
- <texture name="toolbar_btn_disabled.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" />
+ <texture name="toolbar_btn_disabled.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
- <texture name="toolbar_btn_selected.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" />
+ <texture name="toolbar_btn_selected.tga" scale.left="7" scale.top="32" scale.right="121" scale.bottom="0" />
- <texture name="button_enabled_selected_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" />
+ <texture name="button_enabled_selected_32x128.tga" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16" />
<texture name="checkbox_disabled_false.tga" preload="true"/>
<texture name="checkbox_disabled_true.tga" preload="true"/>
@@ -23,7 +23,8 @@
<texture name="checkbox_enabled_true.tga" preload="true"/>
<texture name="close_in_blue.tga" preload="true"/>
-
+
+ <texture name="minimize_inactive.tga" preload="true"/>
<texture name="minimize.tga" preload="true"/>
<texture name="minimize_pressed.tga" preload="true"/>
@@ -36,15 +37,15 @@
<texture name="resize_handle_bottom_right_blue.tga" preload="true"/>
- <texture name="rounded_square.tga" file_name="rounded_square.j2c" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16"/>
+ <texture name="rounded_square.tga" file_name="rounded_square.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16"/>
- <texture name="rounded_square_soft.tga" file_name="rounded_square_soft.j2c" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16"/>
+ <texture name="rounded_square_soft.tga" file_name="rounded_square_soft.j2c" preload="true" scale.left="16" scale.top="16" scale.right="112" scale.bottom="16"/>
- <texture name="toolbar_tab.tga" preload="true" scale_left="6" scale_top="42" scale_right="104" scale_bottom="8"/>
- <texture name="toolbar_bg.tga" preload="true" scale_left="6" scale_top="42" scale_right="96" scale_bottom="16"/>
+ <texture name="toolbar_tab.tga" preload="true" scale.left="6" scale.top="42" scale.right="104" scale.bottom="8"/>
+ <texture name="toolbar_bg.tga" preload="true" scale.left="6" scale.top="42" scale.right="96" scale.bottom="16"/>
- <texture name="progressbar_fill.tga" preload="true" scale_left="10" scale_top="7" scale_right="65" scale_bottom="7"/>
- <texture name="progressbar_track.tga" preload="true" scale_left="10" scale_top="7" scale_right="80" scale_bottom="7"/>
+ <texture name="progressbar_fill.tga" preload="true" scale.left="10" scale.top="7" scale.right="65" scale.bottom="7"/>
+ <texture name="progressbar_track.tga" preload="true" scale.left="10" scale.top="7" scale.right="80" scale.bottom="7"/>
<texture name="scrollbutton_down_in_blue.tga" preload="true"/>
<texture name="scrollbutton_down_out_blue.tga" preload="true"/>
@@ -59,15 +60,15 @@
<texture name="spin_up_in_blue.tga" preload="true"/>
<texture name="spin_up_out_blue.tga" preload="true"/>
- <texture name="square_btn_32x128.tga" preload="true" scale_left="8" scale_top="10" scale_right="120" scale_bottom="10"/>
- <texture name="square_btn_selected_32x128.tga" preload="true" scale_left="2" scale_top="10" scale_right="126" scale_bottom="10"/>
+ <texture name="square_btn_32x128.tga" preload="true" scale.left="8" scale.top="10" scale.right="120" scale.bottom="10"/>
+ <texture name="square_btn_selected_32x128.tga" preload="true" scale.left="2" scale.top="10" scale.right="126" scale.bottom="10"/>
- <texture name="tab_bottom_blue.tga" preload="true" scale_left="8" scale_top="8" scale_right="120" scale_bottom="9"/>
- <texture name="tab_bottom_selected_blue.tga" preload="true" scale_left="8" scale_top="8" scale_right="96" scale_bottom="9"/>
- <texture name="tab_left.tga" preload="true" scale_left="8" scale_top="8" scale_right="120" scale_bottom="9"/>
- <texture name="tab_left_selected.tga" preload="true" scale_left="8" scale_top="8" scale_right="96" scale_bottom="9"/>
- <texture name="tab_top_blue.tga" preload="true" scale_left="8" scale_top="8" scale_right="120" scale_bottom="9"/>
- <texture name="tab_top_selected_blue.tga" preload="true" scale_left="8" scale_top="8" scale_right="96" scale_bottom="9"/>
+ <texture name="tab_bottom_blue.tga" preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
+ <texture name="tab_bottom_selected_blue.tga" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
+ <texture name="tab_left.tga" preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
+ <texture name="tab_left_selected.tga" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
+ <texture name="tab_top_blue.tga" preload="true" scale.left="8" scale.top="8" scale.right="120" scale.bottom="9"/>
+ <texture name="tab_top_selected_blue.tga" preload="true" scale.left="8" scale.top="8" scale.right="96" scale.bottom="9"/>
<texture name="startup_logo.j2c" preload="true"/>
<texture name="color_swatch_alpha.tga" preload="true"/>
@@ -236,9 +237,9 @@
<texture name="mute_icon.tga"/>
- <texture name="icn_slide-groove_dark.tga" scale_left="2" scale_top="5" scale_right="29" scale_bottom="4"/>
- <texture name="icn_slide-highlight.tga" scale_left="2" scale_top="5" scale_right="29" scale_bottom="4"/>
- <texture name="icn_slide-thumb_dark.tga" scale_left="2" scale_top="5" scale_right="29" scale_bottom="4"/>
+ <texture name="icn_slide-groove_dark.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/>
+ <texture name="icn_slide-highlight.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/>
+ <texture name="icn_slide-thumb_dark.tga" scale.left="2" scale.top="5" scale.right="29" scale.bottom="4"/>
<texture name="icn_speaker-muted_dark.tga"/>
<texture name="icn_speaker_dark.tga"/>
@@ -255,39 +256,32 @@
<texture name="icn_media_movie.tga" preload="true"/>
<texture name="icn_chatbar.tga"/>
- <texture name="btn_chatbar.tga" scale_left="20" scale_top="24" scale_right="44" scale_bottom="0"/>
- <texture name="btn_chatbar_selected.tga" scale_left="20" scale_top="24" scale_right="44" scale_bottom="0"/>
-
- <texture name="icn_rounded-text-field.tga"/>
-
- <texture name="flyout_btn_right_selected.tga" scale_left="0" scale_top="30" scale_right="32" scale_bottom="0"/>
-
- <texture name="flyout_btn_right.tga" scale_left="0" scale_top="30" scale_right="32" scale_bottom="0"/>
+ <texture name="btn_chatbar.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
+ <texture name="btn_chatbar_selected.tga" scale.left="20" scale.top="24" scale.right="44" scale.bottom="0"/>
- <texture name="flyout_btn_right_disabled.tga" scale_left="0" scale_top="30" scale_right="32" scale_bottom="0"/>
-
- <texture name="flyout_btn_left_selected.tga" scale_left="16" scale_top="15" scale_right="112" scale_bottom="15"/>
-
- <texture name="flyout_btn_left.tga" scale_left="16" scale_top="15" scale_right="112" scale_bottom="15"/>
-
- <texture name="flyout_btn_left_disabled.tga" scale_left="16" scale_top="15" scale_right="112" scale_bottom="15"/>
+ <texture name="icn_rounded-text-field.tga" scale.left="14" scale.bottom="16" scale.top="16" scale.right="114"/>
- <texture name="UIImgResizeBottomRightUUID" file_name="resize_handle_bottom_right_blue.tga"/>
+ <texture name="flyout_btn_right_selected.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/>
+ <texture name="flyout_btn_right.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/>
+ <texture name="flyout_btn_right_disabled.tga" scale.left="0" scale.top="30" scale.right="32" scale.bottom="0"/>
+ <texture name="flyout_btn_left_selected.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/>
+ <texture name="flyout_btn_left.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/>
+ <texture name="flyout_btn_left_disabled.tga" scale.left="16" scale.top="15" scale.right="112" scale.bottom="15"/>
- <texture name="UIImgBtnForwardOutUUID" file_name="move_forward_out.tga" preload="true"/>
- <texture name="UIImgBtnForwardInUUID" file_name="move_forward_in.tga" preload="true"/>
- <texture name="UIImgBtnSlideLeftOutUUID" file_name="move_left_out.tga" preload="true"/>
- <texture name="UIImgBtnSlideLeftInUUID" file_name="move_left_in.tga" preload="true"/>
- <texture name="UIImgBtnLeftOutUUID" file_name="move_turn_left_out.tga" preload="true"/>
- <texture name="UIImgBtnLeftInUUID" file_name="move_turn_left_in.tga" preload="true"/>
- <texture name="UIImgBtnRightOutUUID" file_name="move_turn_right_out.tga" preload="true"/>
- <texture name="UIImgBtnRightInUUID" file_name="move_turn_right_in.tga" preload="true"/>
- <texture name="UIImgBtnSlideRightOutUUID" file_name="move_right_out.tga" preload="true"/>
- <texture name="UIImgBtnSlideRightInUUID" file_name="move_right_in.tga" preload="true"/>
- <texture name="UIImgBtnMoveUpInUUID" file_name="move_up_in.tga" preload="true"/>
- <texture name="UIImgBtnMoveUpOutUUID" file_name="move_up_out.tga" preload="true"/>
- <texture name="UIImgBtnMoveDownInUUID" file_name="move_down_in.tga" preload="true"/>
- <texture name="UIImgBtnMoveDownOutUUID" file_name="move_down_out.tga" preload="true"/>
+ <texture name="move_forward_out.tga" preload="true"/>
+ <texture name="move_forward_in.tga" preload="true"/>
+ <texture name="move_left_out.tga" preload="true"/>
+ <texture name="move_left_in.tga" preload="true"/>
+ <texture name="move_turn_left_out.tga" preload="true"/>
+ <texture name="move_turn_left_in.tga" preload="true"/>
+ <texture name="move_turn_right_out.tga" preload="true"/>
+ <texture name="move_turn_right_in.tga" preload="true"/>
+ <texture name="move_right_out.tga" preload="true"/>
+ <texture name="move_right_in.tga" preload="true"/>
+ <texture name="move_up_in.tga" preload="true"/>
+ <texture name="move_up_out.tga" preload="true"/>
+ <texture name="move_down_in.tga" preload="true"/>
+ <texture name="move_down_out.tga" preload="true"/>
<texture name="cam_rotate_out.tga" preload="true"/>
<texture name="cam_rotate_in.tga" preload="true"/>
@@ -295,73 +289,34 @@
<texture name="cam_zoom_plus_in.tga" preload="true"/>
<texture name="cam_zoom_minus_in.tga" preload="true"/>
- <texture name="UIImgBtnScrollUpOutUUID" file_name="scrollbutton_up_out_blue.tga"/>
- <texture name="UIImgBtnScrollUpInUUID" file_name="scrollbutton_up_in_blue.tga"/>
- <texture name="UIImgBtnScrollDownOutUUID" file_name="scrollbutton_down_out_blue.tga"/>
- <texture name="UIImgBtnScrollDownInUUID" file_name="scrollbutton_down_in_blue.tga"/>
- <texture name="UIImgBtnScrollLeftOutUUID" file_name="scrollbutton_left_out_blue.tga"/>
- <texture name="UIImgBtnScrollLeftInUUID" file_name="scrollbutton_left_in_blue.tga"/>
- <texture name="UIImgBtnScrollRightOutUUID" file_name="scrollbutton_right_out_blue.tga"/>
- <texture name="UIImgBtnScrollRightInUUID" file_name="scrollbutton_right_in_blue.tga"/>
-
- <texture name="UIImgBtnJumpLeftOutUUID" file_name="3c18c87e-5f50-14e2-e744-f44734aa365f.tga"/>
- <texture name="UIImgBtnJumpLeftInUUID" file_name="9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga"/>
- <texture name="UIImgBtnJumpRightOutUUID" file_name="ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga"/>
- <texture name="UIImgBtnJumpRightInUUID" file_name="7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga"/>
+ <texture name="jump_left_out.tga"/>
+ <texture name="jump_left_in.tga"/>
+ <texture name="jump_right_out.tga"/>
+ <texture name="jump_right_in.tga"/>
- <texture name="UIImgBtnSpinUpOutUUID" file_name="spin_up_out_blue.tga"/>
- <texture name="UIImgBtnSpinUpInUUID" file_name="spin_up_in_blue.tga"/>
- <texture name="UIImgBtnSpinDownOutUUID" file_name="spin_down_out_blue.tga"/>
- <texture name="UIImgBtnSpinDownInUUID" file_name="spin_down_in_blue.tga"/>
+ <texture name="tool_grab.tga"/>
+ <texture name="tool_grab_active.tga"/>
- <texture name="UIImgRadioActiveUUID" file_name="radio_active_false.tga"/>
- <texture name="UIImgRadioActiveSelectedUUID" file_name="radio_active_true.tga"/>
- <texture name="UIImgRadioInactiveUUID" file_name="radio_inactive_false.tga"/>
- <texture name="UIImgRadioInactiveSelectedUUID" file_name="radio_inactive_true.tga"/>
+ <texture name="tool_face.tga"/>
+ <texture name="tool_face_active.tga"/>
- <texture name="UIImgCheckboxActiveUUID" file_name="checkbox_enabled_false.tga"/>
- <texture name="UIImgCheckboxActiveSelectedUUID" file_name="checkbox_enabled_true.tga"/>
- <texture name="UIImgCheckboxInactiveUUID" file_name="checkbox_disabled_false.tga"/>
- <texture name="UIImgCheckboxInactiveSelectedUUID" file_name="checkbox_disabled_true.tga"/>
+ <texture name="tool_create.tga"/>
+ <texture name="tool_create_active.tga"/>
- <texture name="UIImgBtnTabTopOutUUID" file_name="tab_top_blue.tga"/>
- <texture name="UIImgBtnTabTopInUUID" file_name="tab_top_selected_blue.tga"/>
- <texture name="UIImgBtnTabBottomOutUUID" file_name="tab_bottom_blue.tga"/>
- <texture name="UIImgBtnTabBottomInUUID" file_name="tab_bottom_selected_blue.tga"/>
-
- <texture name="UIImgGrabUUID" file_name="c63f124c-6340-4fbf-b59e-0869a44adb64.tga"/>
- <texture name="UIImgGrabSelectedUUID" file_name="c1e21504-f136-451d-b8e9-929037812f1d.tga"/>
-
- <!--<texture name="UIImgScaleUUID" file_name="88a90fef-b448-4883-9344-ecf378a60433.tga"/>-->
-
- <texture name="UIImgFaceUUID" file_name="ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga"/>
- <texture name="UIImgFaceSelectedUUID" file_name="b4870163-6208-42a9-9801-93133bf9a6cd.tga"/>
-
- <texture name="UIImgCreateUUID" file_name="7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga"/>
- <texture name="UIImgCreateSelectedUUID" file_name="0098b015-3daf-4cfe-a72f-915369ea97c2.tga"/>
-
- <texture name="UIImgBtnCloseInactiveUUID" file_name="close_inactive_blue.tga"/>
- <texture name="UIImgBtnCloseActiveUUID" file_name="closebox.tga"/>
- <texture name="UIImgBtnClosePressedUUID" file_name="close_in_blue.tga"/>
+ <texture name="close_inactive_blue.tga"/>
+ <texture name="closebox.tga"/>
<texture name="icn_clear_lineeditor.tga" />
<texture name="up_arrow.tga" file_name="up_arrow.png"/>
<texture name="down_arrow.tga" file_name="down_arrow.png"/>
+ <texture name="restore_inactive.tga"/>
+ <texture name="restore.tga"/>
+ <texture name="restore_pressed.tga"/>
- <texture name="UIImgBtnMinimizeInactiveUUID" file_name="minimize_inactive.tga"/>
- <texture name="UIImgBtnMinimizeActiveUUID" file_name="minimize.tga"/>
- <texture name="UIImgBtnMinimizePressedUUID" file_name="minimize_pressed.tga"/>
-
- <texture name="UIImgBtnRestoreInactiveUUID" file_name="restore_inactive.tga"/>
- <texture name="UIImgBtnRestoreActiveUUID" file_name="restore.tga"/>
- <texture name="UIImgBtnRestorePressedUUID" file_name="restore_pressed.tga"/>
-
- <texture name="UIImgBtnTearOffInactiveUUID" file_name="tearoffbox.tga"/>
- <texture name="UIImgBtnTearOffActiveUUID" file_name="tearoffbox.tga"/>
- <texture name="UIImgBtnTearOffPressedUUID" file_name="tearoff_pressed.tga"/>
+ <texture name="tearoffbox.tga"/>
+ <texture name="tearoff_pressed.tga"/>
- <texture name="UIImgCrosshairsUUID" file_name="crosshairs.tga"/>
<texture name="icn_label_music.tga"/>
<texture name="icn_label_media.tga"/>
<texture name="arrow_down.tga"/>
@@ -373,4 +328,5 @@
<texture name="default_land_picture.j2c"/>
<texture name="default_profile_picture.j2c"/>
<texture name="locked_image.j2c"/>
+ <texture name="menu_separator" file_name="menu_separator.png"/>
</textures>
diff --git a/indra/newview/skins/default/textures/transparent.j2c b/indra/newview/skins/default/textures/transparent.j2c
new file mode 100644
index 0000000000000000000000000000000000000000..1068e940b9237289d148851aa5394c97afff506b
GIT binary patch
literal 172
zcmezG|38qyhyer?pcupk0R<=qu^AXx*cln&=zkCc4^WJek(Gsof#H7)gR)Y&TscEI
zL)oKzhJ1#+N9jI5m=eGYgs$P2fH3iY3WFd6qjzF<VoIrQnTei}p5gxq3|wHd^%xlc
XPrhFvz|z~$aDRdTyF~*Q@c$+N73(WV
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/voice_meter_dot.j2c b/indra/newview/skins/default/textures/voice_meter_dot.j2c
new file mode 100644
index 0000000000000000000000000000000000000000..e536c3338afbb9a958be9dbaf7afed960abce4bd
GIT binary patch
literal 499
zcmezG|38qyhyer?pcupk0R<=qu^AXx*cln&=zkCc4^WJek(Gsof#H7)gR)Y&TscEI
zL)oKzhJ1#+N9jI5m=eGYgs$P2fH3iY3WFd6qjzF<VoIrQnTei}p5gxq3|t_i8A}-$
z|4+XEfrq8{XhXyKH*B0aYZ@9F4u558f5pmwg@frEvm~<uP~`jrsd|RXKiCCo8{01*
z5@>K=Q?`TuNW-;bH-$m!-wQOq;ctE;puD>2$o`P}=`~jIhpdhLIixGfN_-Y2+G`vW
zD71QTP~x=3$|ZLv7w$UaV>Ts7P!Fi}_zg$-j6d>*6I@Hzt|+c=`WK{Nd&KOJ!MlAP
zuW#CR-s$DEKDGFq<3%kEfgs@v?17Ohd{W-5b?96BHo7A|Xk+l52}iDPs%WU!wBTaT
zXw+VC^u^pt-#jMq^Ev;-4<|+xfgFGMm2vx(Q06C26BkBTeHEH<&*RMV#V-mkesg&I
z+T`RigBcGuL`~MRzPakug)?F{k6skN6zu-jVX!Lmt>C2QvdG1k97DDgdJF$~Z_)19
zd2hy<hJrmt<@zPw)~dOi?`+@9ICb;lWn~we^y;5vZ<97We=C{WG%Zrb+E?{%NASXF
QmUFu@xhwS}8~)z}0KZAh2><{9
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/voice_meter_rings.j2c b/indra/newview/skins/default/textures/voice_meter_rings.j2c
new file mode 100644
index 0000000000000000000000000000000000000000..17e7c6c6a1ca686cdebd34e7bb2da4c3d1502d83
GIT binary patch
literal 2518
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
Wtsz>On{r6d9WbQQ=K6m@o%<KAqqS!M
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index b747bdaf53..5795053a14 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_about" title="Om Second Life">
- <text_editor name="credits_editor">
- Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
-
-Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
-
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
- DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
- expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
- FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
- GL Copyright (C) 1999-2004 Brian Paul.
- Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
- jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
- jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
- ogg/vorbis Copyright (C) 2001, Xiphophorus
- OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
- SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
- SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
- google-perftools Copyright (c) 2005, Google Inc.
-
-Alle rettigheder forbeholdes. Se licenses.txt for detaljer.
-
-Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
-I get by with a little help from my friends. --Richard Starkey
- </text_editor>
- <string name="you_are_at">
- Du er ved [POSITION]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="Om Second Life">
+ <text_editor name="credits_editor">
+ Second Life er gjort muligt for dig af Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les and many others.
+
+Tak til følgende beboerne for at bidrage til at sikre, at dette er den bedste version til dato: afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
+
+ 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+ APR Copyright (C) 2000-2004 The Apache Software Foundation
+ cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+ DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+ expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+ FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+ GL Copyright (C) 1999-2004 Brian Paul.
+ Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+ jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+ jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+ ogg/vorbis Copyright (C) 2001, Xiphophorus
+ OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+ SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+ SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+ zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+ google-perftools Copyright (c) 2005, Google Inc.
+
+Alle rettigheder forbeholdes. Se licenses.txt for detaljer.
+
+Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+
+
+I get by with a little help from my friends. --Richard Starkey
+ </text_editor>
+ <string name="you_are_at">
+ Du er ved [POSITION]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_about_land.xml b/indra/newview/skins/default/xui/da/floater_about_land.xml
index 53be71fdd1..70f7690d42 100644
--- a/indra/newview/skins/default/xui/da/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_about_land.xml
@@ -1,461 +1,458 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floaterland" title="Om land">
- <tab_container name="landtab">
- <panel label="Generelt" name="land_general_panel">
- <text type="string" length="1" name="Name:">
- Navn:
- </text>
- <text type="string" length="1" name="Description:">
- Beskrivelse:
- </text>
- <text type="string" length="1" name="Owner:">
- Ejer:
- </text>
- <text type="string" length="1" name="OwnerText">
- Leyla Linden
- </text>
- <button label="Profil..." label_selected="Profil..." name="Profile..." />
- <text type="string" length="1" name="Group:">
- Gruppe:
- </text>
- <button label="Vælg..." label_selected="Vælg..." name="Set..." />
- <check_box label="Tillad dedikering til gruppe" name="check deed"
- tool_tip="En gruppe administrator kan dedikere denne jord til gruppen, så det vil blive støttet af gruppen's jord tildeling." />
- <button label="Dedikér..." label_selected="Dedikér..." name="Deed..."
- tool_tip="Du kan kun dedikere jord, hvis du er en administrator i den valgte gruppe." />
- <check_box label="Ejer bidrager ved dedikering" name="check contrib"
- tool_tip="Når land dedikeres til gruppe, kan den tidligere bidrage med nok land til at dække krav." />
- <text type="string" length="1" name="For Sale:">
- Til salg:
- </text>
- <text type="string" length="1" name="Not for sale.">
- Ikke til salg.
- </text>
- <text type="string" length="1" name="For Sale: Price L$[PRICE].">
- Pris: L$[PRICE].
- </text>
- <button label="Sælg land..." label_selected="Sælg land..." name="Sell Land..." />
- <text type="string" length="1" name="For sale to">
- Til salg til: [BUYER]
- </text>
- <text type="string" length="1" name="Sell with landowners objects in parcel.">
- Objekter er inkluderet i salg.
- </text>
- <text type="string" length="1" name="Selling with no objects in parcel.">
- Objekter er ikke inkluderet i salg.
- </text>
- <button label="Annullér salg af land" label_selected="Annullér salg af land"
- name="Cancel Land Sale" />
- <text type="string" length="1" name="Claimed:">
- Købt:
- </text>
- <text type="string" length="1" name="DateClaimText">
- Tue Aug 15 13:47:25 2006
- </text>
- <text type="string" length="1" name="PriceLabel">
- Område:
- </text>
- <text type="string" length="1" name="PriceText">
- 4048 m²
- </text>
- <text type="string" length="1" name="Traffic:">
- Trafik:
- </text>
- <text type="string" length="1" name="DwellText">
- 0
- </text>
- <button label="Køb land..." label_selected="Køb land..." name="Buy Land..." />
- <button label="Køb til gruppe..." label_selected="Køb til gruppe..."
- name="Buy For Group..." />
- <button label="Køb adgang..." label_selected="Køb adgang..." name="Buy Pass..."
- tool_tip="Giver adgang til midlertidig adgang til dette område." />
- <button label="Efterlad land..." label_selected="Efterlad land..."
- name="Abandon Land..." />
- <button label="Kræv tilbage..." label_selected="Kræv tilbage..."
- name="Reclaim Land..." />
- <button label="Linden lalg..." label_selected="Linden lalg..." name="Linden salg..."
- tool_tip="Land skal være ejet og ikke allerede på auktion" />
- <string name="new users only">
- Kun nye brugere
- </string>
- <string name="anyone">
- Alle
- </string>
- <string name="area_text">
- Størrelse
- </string>
- <string name="area_size_text">
- [AREA] m²
- </string>
- <string name="auction_id_text">
- Auktion nr: [ID]
- </string>
- <string name="need_tier_to_modify">
- Du skal godkende dit køb for at kunne æmdre på dette land.
- </string>
- <string name="group_owned_text">
- (Gruppe ejet)
- </string>
- <string name="profile_text">
- Profil...
- </string>
- <string name="info_text">
- Info...
- </string>
- <string name="public_text">
- (offentlig)
- </string>
- <string name="none_text">
- (ingen)
- </string>
- <string name="sale_pending_text">
- (Salg i gang)
- </string>
- <string name="no_selection_text">
- Pacel ikke valgt.
-Gå til 'Verden' > 'Om land' eller vælg en anden parcel for at se detaljer.
- </string>
- </panel>
- <panel label="Regler" name="land_covenant_panel">
- <text type="string" length="1" name="covenant_timestamp_text">
- Sidst rettet Wed Dec 31 16:00:00 1969
- </text>
- <text type="string" length="1" name="region_name_lbl">
- Region:
- </text>
- <text type="string" length="1" name="region_name_text">
- leyla
- </text>
- <text type="string" length="1" name="estate_name_lbl">
- Estate:
- </text>
- <text type="string" length="1" name="estate_name_text">
- Hovedland
- </text>
- <text type="string" length="1" name="estate_owner_lbl">
- Estate ejer:
- </text>
- <text type="string" length="1" name="estate_owner_text">
- (ingen)
- </text>
- <text type="string" length="1" name="resellable_clause">
- Købt jord i denne region må ikke videresælges.
- </text>
- <text type="string" length="1" name="changeable_clause">
- Købt jord i denne region må gerne samles eller opdeles.
- </text>
- <text_editor type="string" length="1" name="covenant_editor">
- Der er ikke angivet specielle regler for denne Estate
- </text_editor>
- <string name="can_resell">
- Købt land i denne region må sælges videre
- </string>
- <string name="can_not_resell">
- Købt land i denne region må ikke sælges videre
- </string>
- <string name="can_change">
- Købt jord i denne region må gerne samles eller opdeles.
- </string>
- <string name="can_not_change">
- Købt jord i denne region mÃ¥ Ãkke samles eller opdeles.
- </string>
- </panel>
- <panel label="Objekter" name="land_objects_panel">
- <text type="string" length="1" name="parcel_object_bonus">
- Region objekt bonus faktor: [BONUS]
- </text>
- <text type="string" length="1" name="Simulator primitive usage:">
- Prims brugt i denne Sim:
- </text>
- <text type="string" length="1" name="objects_available">
- [COUNT] ud af [MAX] ([AVAILABLE] ledige)
- </text>
- <string name="objects_available_text">
- [COUNT] ud af [MAX] ([AVAILABLE] ledige)
- </string>
- <string name="objects_deleted_text">
- [COUNT] ud af [MAX] ([DELETED] bliver slettet)
- </string>
- <text type="string" length="1" name="Primitives parcel supports:">
- Prims til rådighed:
- </text>
- <text type="string" length="1" name="object_contrib_text">
- [COUNT]
- </text>
- <text type="string" length="1" name="Primitives on parcel:">
- Prims brugt på parcel:
- </text>
- <text type="string" length="1" name="total_objects_text">
- [COUNT]
- </text>
- <text type="string" length="1" name="Owned by parcel owner:">
- Ejet af Parcel ejer:
- </text>
- <text type="string" length="1" name="owner_objects_text">
- [COUNT]
- </text>
- <button label="Vis" label_selected="Vis" name="ShowOwner" />
- <button label="Returnér..." label_selected="Returnér..." name="ReturnOwner..."
- tool_tip="Returnér objekter til deres ejere." />
- <text type="string" length="1" name="Set to group:">
- Sat til gruppe:
- </text>
- <text type="string" length="1" name="group_objects_text">
- [COUNT]
- </text>
- <button label="Vis" label_selected="Vis" name="ShowGroup" />
- <button label="Returnér..." label_selected="Returnér..." name="ReturnGroup..."
- tool_tip="Returnér objekter til deres ejere." />
- <text type="string" length="1" name="Owned by others:">
- Ejet af andre:
- </text>
- <text type="string" length="1" name="other_objects_text">
- [COUNT]
- </text>
- <button label="Vis" label_selected="Vis" name="ShowOther" />
- <button label="Returnér..." label_selected="Returnér..." name="ReturnOther..."
- tool_tip="Returnér objekter til deres ejere." />
- <text type="string" length="1" name="Selected / sat upon:">
- Valgt/siddet på:
- </text>
- <text type="string" length="1" name="selected_objects_text">
- [COUNT]
- </text>
- <text type="string" length="1" name="Autoreturn">
- Autoreturnér andres objekter efter (minutter, 0 = aldrig):
- </text>
- <text type="string" length="1" name="Object Owners:">
- Objekt ejere:
- </text>
- <button label="Gentegn liste" label_selected="Gentegn liste" name="Refresh List" />
- <button label="Returnér objekter..." label_selected="Returnér objekter..."
- name="Return objects..." />
- <name_list name="owner list">
- <column label="Type" name="type" />
- <column label="Navn" name="name" />
- <column label="Antal" name="count" />
- <column label="Nyeste" name="mostrecent" />
- </name_list>
- </panel>
- <panel label="Indstillinger" name="land_options_panel">
- <text type="string" length="1" name="allow_label">
- Tillad andre beboere at:
- </text>
- <check_box label="Redigere terræn" name="edit land check"
- tool_tip="Hvis dette er valg, kan enhver redigere dit land. Det er bedst ikke at vælge her, da det altid er muligt for dig som ejer at ændre terræn på dit eget land." />
- <check_box label="Lave landemærker" name="check landmark" />
- <check_box label="Flyve" name="check fly"
- tool_tip="Hvis valgt, kan beboere flyve på dit land. Hvis ikke valgt kan beboere kun flyve ind på dit land og over dit land." />
- <text type="string" length="1" name="allow_label2">
- Lave objekter:
- </text>
- <check_box label="Alle beboere" name="edit objects check" />
- <check_box label="Gruppe" name="edit group objects check" />
- <text type="string" length="1" name="allow_label3">
- Anbringe objekter:
- </text>
- <check_box label="Alle beboere" name="all object entry check" />
- <check_box label="Gruppe" name="group object entry check" />
- <text type="string" length="1" name="allow_label4">
- Køre scripts:
- </text>
- <check_box label="Alle beboere" name="check other scripts" />
- <check_box label="Gruppe" name="check group scripts" />
- <text type="string" length="1" name="land_options_label">
- Land instillinger:
- </text>
- <check_box label="Sikker (ingen skade)" name="check safe"
- tool_tip="Hvis valgt, er det ikke muligt at forårsage skade på andre beboere. Hvis fravalgt er det muligt at få skader (f.eks. ved kamp)." />
- <check_box label="Skub forbudt" name="PushRestrictCheck"
- tool_tip="Forhindrer scripts i at skubbe. Valg af denne mulighed, kan være nyttigt for at forhindre forstyrrende adfærd på dit land." />
- <check_box label="Vis sted i søgning (L$30/uge) i kategorien:" name="ShowDirectoryCheck"
- tool_tip="Lad dit parcel blive vist i søge resultaterne" />
- <combo_box name="land category">
- <combo_item name="AnyCategory">
- Alle kategorier
- </combo_item>
- <combo_item name="LindenLocation">
- Linden Location
- </combo_item>
-
-
- <combo_item name="Arts&Culture">
- Kunst & kultur
- </combo_item>
- <combo_item name="Business">
- Business
- </combo_item>
- <combo_item name="Educational">
- Uddannelse
- </combo_item>
- <combo_item name="Gaming">
- Spil
- </combo_item>
- <combo_item name="Hangout">
- Afslapning
- </combo_item>
- <combo_item name="NewcomerFriendly">
- Nybegynder venligt
- </combo_item>
- <combo_item name="Parks&Nature">
- Parker & natur
- </combo_item>
- <combo_item name="Residential">
- Beboelse
- </combo_item>
- <combo_item name="Shopping">
- Indkøb
- </combo_item>
- <combo_item name="Other">
- Andet
- </combo_item>
- </combo_box>
- <button label="?" label_selected="?" name="?" />
- <check_box name="MatureCheck" />
- <text type="string" length="1" name="Snapshot:">
- Foto:
- </text>
- <texture_picker label="" name="snapshot_ctrl" tool_tip="Klik for at vælge et billede" />
- <text type="string" length="1" name="landing_point">
- Landingspunkt: [LANDING]
- </text>
- <string name="landing_point_none">
- (ingen)
- </string>
- <button label="Vælg" label_selected="Vælg" name="Set"
- tool_tip="Indstiller landingspunkt, hvor de besøgende ankommer. Sættes til din avatars aktuelle placering i denne parcel." />
- <button label="Fjern" label_selected="Fjern" name="Clear"
- tool_tip="Fjerner oplysning om landingspunkt." />
- <text type="string" length="1" name="Teleport Routing: ">
- Teleport valg:
- </text>
- <combo_box name="landing type"
- tool_tip="Vælg hvordan du vil håndtere teleporteringer til dit land.">
- <combo_item type="string" length="1" name="Blocked">
- Blokeret
- </combo_item>
- <combo_item type="string" length="1" name="LandingPoint">
- Landingspunkt
- </combo_item>
- <combo_item type="string" length="1" name="Anywhere">
- Hvor som helst
- </combo_item>
- </combo_box>
- <string name="push_restrict_text">
- Skub forbudt
- </string>
- <string name="push_restrict_region_text">
- Skub forbudt (Uanset region indstilling)
- </string>
- </panel>
- <panel label="Medier" name="land_media_panel">
- <text type="string" length="1" name="with media:">
- Medie type:
- </text>
- <combo_box name="media type"
- tool_tip="Specificer om URL-adressen er til en film, hjemmeside eller et andet medie." />
- <text type="string" length="1" name="at URL:">
- Medie URL:
- </text>
- <button label="Vælg..." label_selected="Vælg..." name="set_media_url" />
- <text type="string" length="1" name="Description:">
- Beskrivelse:
- </text>
- <line_editor name="url_description" tool_tip="Tekst vist ved siden af Afspil/Hent knappen" />
- <text type="string" length="1" name="Media texture:">
- Erstat tekstur:
- </text>
- <texture_picker label="" name="media texture" tool_tip="Klik for at vælge billede" />
- <text type="string" length="1" name="replace_texture_help">
- (Objekter der har denne tekstur vil vise filmen eller
-web-siden, efter du klikker på play knappen.)
- </text>
- <text type="string" length="1" name="Options:">
- Medie valg:
- </text>
- <check_box label="Auto skalér" name="media_auto_scale"
- tool_tip="Vælg denne mulighed for at skalere indholdet for dette parcel automatisk. Det kan være lidt langsommere og have lavere kvalitet, men ingen anden tekstur skalering eller tilpasning vil være nødvendigt." />
- <check_box label="Gentag afspil" name="media_loop"
- tool_tip="Gentager automatisk medie, når det er færdigt med at spille starter det automatisk forfra." />
- <check_box label="Skjul medie URL" name="hide_media_url"
- tool_tip="Klik her for at skjule medie adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den." />
- <check_box label="Skjul musik URL" name="hide_music_url"
- tool_tip="Klik her for at skjule musik adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den." />
- <text type="string" length="1" name="media_size"
- tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." width="105">
- Medie Størrelse:
- </text>
- <spinner name="media_size_width" left_delta="89"
- tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." />
- <spinner name="media_size_height"
- tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." />
- <text type="string" length="1" name="pixels">
- pixels
- </text>
- <text type="string" length="1" name="MusicURL:">
- Musik URL:
- </text>
- <text type="string" length="1" name="Sound:">
- Lyd:
- </text>
- <check_box label="Isolér lyde til denne parcel" name="check sound local" />
- <text type="string" length="1" name="Voice settings:">
- Stemme:
- </text>
- <radio_group name="parcel_voice_channel">
- <radio_item type="string" length="1" name="Estate">
- Brug Estate kanalen
- </radio_item>
- <radio_item type="string" length="1" name="Private">
- Brug en privat kanal
- </radio_item>
- <radio_item type="string" length="1" name="Disabled">
- Slå stemme chat fra på denne parcel
- </radio_item>
- </radio_group>
- </panel>
- <panel label="Adgang" name="land_access_panel">
- <text type="string" length="1" name="Limit access to this parcel to:">
- Adgang til denne parcel
- </text>
- <check_box label="Tillad offentlig adgang" name="public_access" />
- <text type="string" length="1" name="Only Allow">
- Blokér adgang for:
- </text>
- <check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab"
- name="limit_payment"
- tool_tip="Blokér beboere der ikke har afgivet identifikationsoplysninger." />
- <check_box label="Beboere der ikke er godkendt som voksne" name="limit_age_verified"
- tool_tip="Blokér beboere der ikke har verificeret deres alder. Se support.secondlife.com for mere information." />
- <string name="estate_override">
- En eller flere af disse valg er indstillet på estate niveau
- </string>
- <check_box label="Tillad adgang til gruppen: [GROUP]" name="GroupCheck"
- tool_tip="Vælg gruppe under fanen 'generelt'." />
- <check_box label="Sælg adgang til:" name="PassCheck"
- tool_tip="Tillader midlertidig adgang til denne parcel" />
- <combo_box name="pass_combo">
- <combo_item name="Anyone">
- Alle
- </combo_item>
- <combo_item name="Group">
- Gruppe
- </combo_item>
- </combo_box>
- <spinner label="Pris i L$:" name="PriceSpin" />
- <spinner label="Timers adgang:" name="HoursSpin" />
- <text label="Tillad altid" name="AllowedText">
- Altid godkendte beboere
- </text>
- <name_list name="AccessList" tool_tip="([LISTED] vist, [MAX] max)" />
- <button label="Tilføj..." label_selected="Tilføj..." name="add_allowed" />
- <button label="Fjern" label_selected="Fjern" name="remove_allowed" />
- <text label="Blokér" name="BanCheck">
- Blokerede beboere
- </text>
- <name_list name="BannedList" tool_tip="([LISTED] vist, [MAX] max)" />
- <button label="Tilføj..." label_selected="Tilføj..." name="add_banned" />
- <button label="Fjern" label_selected="Fjern" name="remove_banned" />
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floaterland" title="Om land">
+ <tab_container name="landtab">
+ <panel label="Generelt" name="land_general_panel">
+ <text type="string" length="1" name="Name:">
+ Navn:
+ </text>
+ <text type="string" length="1" name="Description:">
+ Beskrivelse:
+ </text>
+ <text type="string" length="1" name="Owner:">
+ Ejer:
+ </text>
+ <text type="string" length="1" name="OwnerText">
+ Leyla Linden
+ </text>
+ <button label="Profil..." label_selected="Profil..." name="Profile..." />
+ <text type="string" length="1" name="Group:">
+ Gruppe:
+ </text>
+ <button label="Vælg..." label_selected="Vælg..." name="Set..." />
+ <check_box label="Tillad dedikering til gruppe" name="check deed"
+ tool_tip="En gruppe administrator kan dedikere denne jord til gruppen, så det vil blive støttet af gruppen's jord tildeling." />
+ <button label="Dedikér..." label_selected="Dedikér..." name="Deed..."
+ tool_tip="Du kan kun dedikere jord, hvis du er en administrator i den valgte gruppe." />
+ <check_box label="Ejer bidrager ved dedikering" name="check contrib"
+ tool_tip="Når land dedikeres til gruppe, kan den tidligere bidrage med nok land til at dække krav." />
+ <text type="string" length="1" name="For Sale:">
+ Til salg:
+ </text>
+ <text type="string" length="1" name="Not for sale.">
+ Ikke til salg.
+ </text>
+ <text type="string" length="1" name="For Sale: Price L$[PRICE].">
+ Pris: L$[PRICE].
+ </text>
+ <button label="Sælg land..." label_selected="Sælg land..." name="Sell Land..." />
+ <text type="string" length="1" name="For sale to">
+ Til salg til: [BUYER]
+ </text>
+ <text type="string" length="1" name="Sell with landowners objects in parcel.">
+ Objekter er inkluderet i salg.
+ </text>
+ <text type="string" length="1" name="Selling with no objects in parcel.">
+ Objekter er ikke inkluderet i salg.
+ </text>
+ <button label="Annullér salg af land" label_selected="Annullér salg af land"
+ name="Cancel Land Sale" />
+ <text type="string" length="1" name="Claimed:">
+ Købt:
+ </text>
+ <text type="string" length="1" name="DateClaimText">
+ Tue Aug 15 13:47:25 2006
+ </text>
+ <text type="string" length="1" name="PriceLabel">
+ Område:
+ </text>
+ <text type="string" length="1" name="PriceText">
+ 4048 m²
+ </text>
+ <text type="string" length="1" name="Traffic:">
+ Trafik:
+ </text>
+ <text type="string" length="1" name="DwellText">
+ 0
+ </text>
+ <button label="Køb land..." label_selected="Køb land..." name="Buy Land..." />
+ <button label="Køb til gruppe..." label_selected="Køb til gruppe..."
+ name="Buy For Group..." />
+ <button label="Køb adgang..." label_selected="Køb adgang..." name="Buy Pass..."
+ tool_tip="Giver adgang til midlertidig adgang til dette område." />
+ <button label="Efterlad land..." label_selected="Efterlad land..."
+ name="Abandon Land..." />
+ <button label="Kræv tilbage..." label_selected="Kræv tilbage..."
+ name="Reclaim Land..." />
+ <button label="Linden lalg..." label_selected="Linden lalg..." name="Linden salg..."
+ tool_tip="Land skal være ejet og ikke allerede på auktion" />
+ <string name="new users only">
+ Kun nye brugere
+ </string>
+ <string name="anyone">
+ Alle
+ </string>
+ <string name="area_text">
+ Størrelse
+ </string>
+ <string name="area_size_text">
+ [AREA] m²
+ </string>
+ <string name="auction_id_text">
+ Auktion nr: [ID]
+ </string>
+ <string name="need_tier_to_modify">
+ Du skal godkende dit køb for at kunne æmdre på dette land.
+ </string>
+ <string name="group_owned_text">
+ (Gruppe ejet)
+ </string>
+ <string name="profile_text">
+ Profil...
+ </string>
+ <string name="info_text">
+ Info...
+ </string>
+ <string name="public_text">
+ (offentlig)
+ </string>
+ <string name="none_text">
+ (ingen)
+ </string>
+ <string name="sale_pending_text">
+ (Salg i gang)
+ </string>
+ <string name="no_selection_text">
+ Pacel ikke valgt.
+Gå til 'Verden' > 'Om land' eller vælg en anden parcel for at se detaljer.
+ </string>
+ </panel>
+ <panel label="Regler" name="land_covenant_panel">
+ <text type="string" length="1" name="covenant_timestamp_text">
+ Sidst rettet Wed Dec 31 16:00:00 1969
+ </text>
+ <text type="string" length="1" name="region_name_lbl">
+ Region:
+ </text>
+ <text type="string" length="1" name="region_name_text">
+ leyla
+ </text>
+ <text type="string" length="1" name="estate_name_lbl">
+ Estate:
+ </text>
+ <text type="string" length="1" name="estate_name_text">
+ Hovedland
+ </text>
+ <text type="string" length="1" name="estate_owner_lbl">
+ Estate ejer:
+ </text>
+ <text type="string" length="1" name="estate_owner_text">
+ (ingen)
+ </text>
+ <text type="string" length="1" name="resellable_clause">
+ Købt jord i denne region må ikke videresælges.
+ </text>
+ <text type="string" length="1" name="changeable_clause">
+ Købt jord i denne region må gerne samles eller opdeles.
+ </text>
+ <text_editor type="string" length="1" name="covenant_editor">
+ Der er ikke angivet specielle regler for denne Estate
+ </text_editor>
+ <string name="can_resell">
+ Købt land i denne region må sælges videre
+ </string>
+ <string name="can_not_resell">
+ Købt land i denne region må ikke sælges videre
+ </string>
+ <string name="can_change">
+ Købt jord i denne region må gerne samles eller opdeles.
+ </string>
+ <string name="can_not_change">
+ Købt jord i denne region mÃ¥ Ãkke samles eller opdeles.
+ </string>
+ </panel>
+ <panel label="Objekter" name="land_objects_panel">
+ <text type="string" length="1" name="parcel_object_bonus">
+ Region objekt bonus faktor: [BONUS]
+ </text>
+ <text type="string" length="1" name="Simulator primitive usage:">
+ Prims brugt i denne Sim:
+ </text>
+ <text type="string" length="1" name="objects_available">
+ [COUNT] ud af [MAX] ([AVAILABLE] ledige)
+ </text>
+ <string name="objects_available_text">
+ [COUNT] ud af [MAX] ([AVAILABLE] ledige)
+ </string>
+ <string name="objects_deleted_text">
+ [COUNT] ud af [MAX] ([DELETED] bliver slettet)
+ </string>
+ <text type="string" length="1" name="Primitives parcel supports:">
+ Prims til rådighed:
+ </text>
+ <text type="string" length="1" name="object_contrib_text">
+ [COUNT]
+ </text>
+ <text type="string" length="1" name="Primitives on parcel:">
+ Prims brugt på parcel:
+ </text>
+ <text type="string" length="1" name="total_objects_text">
+ [COUNT]
+ </text>
+ <text type="string" length="1" name="Owned by parcel owner:">
+ Ejet af Parcel ejer:
+ </text>
+ <text type="string" length="1" name="owner_objects_text">
+ [COUNT]
+ </text>
+ <button label="Vis" label_selected="Vis" name="ShowOwner" />
+ <button label="Returnér..." label_selected="Returnér..." name="ReturnOwner..."
+ tool_tip="Returnér objekter til deres ejere." />
+ <text type="string" length="1" name="Set to group:">
+ Sat til gruppe:
+ </text>
+ <text type="string" length="1" name="group_objects_text">
+ [COUNT]
+ </text>
+ <button label="Vis" label_selected="Vis" name="ShowGroup" />
+ <button label="Returnér..." label_selected="Returnér..." name="ReturnGroup..."
+ tool_tip="Returnér objekter til deres ejere." />
+ <text type="string" length="1" name="Owned by others:">
+ Ejet af andre:
+ </text>
+ <text type="string" length="1" name="other_objects_text">
+ [COUNT]
+ </text>
+ <button label="Vis" label_selected="Vis" name="ShowOther" />
+ <button label="Returnér..." label_selected="Returnér..." name="ReturnOther..."
+ tool_tip="Returnér objekter til deres ejere." />
+ <text type="string" length="1" name="Selected / sat upon:">
+ Valgt/siddet på:
+ </text>
+ <text type="string" length="1" name="selected_objects_text">
+ [COUNT]
+ </text>
+ <text type="string" length="1" name="Autoreturn">
+ Autoreturnér andres objekter efter (minutter, 0 = aldrig):
+ </text>
+ <text type="string" length="1" name="Object Owners:">
+ Objekt ejere:
+ </text>
+ <button label="Gentegn liste" label_selected="Gentegn liste" name="Refresh List" />
+ <button label="Returnér objekter..." label_selected="Returnér objekter..."
+ name="Return objects..." />
+ <name_list name="owner list">
+ <column label="Type" name="type" />
+ <column label="Navn" name="name" />
+ <column label="Antal" name="count" />
+ <column label="Nyeste" name="mostrecent" />
+ </name_list>
+ </panel>
+ <panel label="Indstillinger" name="land_options_panel">
+ <text type="string" length="1" name="allow_label">
+ Tillad andre beboere at:
+ </text>
+ <check_box label="Redigere terræn" name="edit land check"
+ tool_tip="Hvis dette er valg, kan enhver redigere dit land. Det er bedst ikke at vælge her, da det altid er muligt for dig som ejer at ændre terræn på dit eget land." />
+ <check_box label="Lave landemærker" name="check landmark" />
+ <check_box label="Flyve" name="check fly"
+ tool_tip="Hvis valgt, kan beboere flyve på dit land. Hvis ikke valgt kan beboere kun flyve ind på dit land og over dit land." />
+ <text type="string" length="1" name="allow_label2">
+ Lave objekter:
+ </text>
+ <check_box label="Alle beboere" name="edit objects check" />
+ <check_box label="Gruppe" name="edit group objects check" />
+ <text type="string" length="1" name="allow_label3">
+ Anbringe objekter:
+ </text>
+ <check_box label="Alle beboere" name="all object entry check" />
+ <check_box label="Gruppe" name="group object entry check" />
+ <text type="string" length="1" name="allow_label4">
+ Køre scripts:
+ </text>
+ <check_box label="Alle beboere" name="check other scripts" />
+ <check_box label="Gruppe" name="check group scripts" />
+ <text type="string" length="1" name="land_options_label">
+ Land instillinger:
+ </text>
+ <check_box label="Sikker (ingen skade)" name="check safe"
+ tool_tip="Hvis valgt, er det ikke muligt at forårsage skade på andre beboere. Hvis fravalgt er det muligt at få skader (f.eks. ved kamp)." />
+ <check_box label="Skub forbudt" name="PushRestrictCheck"
+ tool_tip="Forhindrer scripts i at skubbe. Valg af denne mulighed, kan være nyttigt for at forhindre forstyrrende adfærd på dit land." />
+ <check_box label="Vis sted i søgning (L$30/uge) i kategorien:" name="ShowDirectoryCheck"
+ tool_tip="Lad dit parcel blive vist i søge resultaterne" />
+ <combo_box name="land category">
+ <combo_box.item name="AnyCategory">
+ Alle kategorier
+ </combo_box.item>
+ <combo_box.item name="LindenLocation">
+ Linden Location
+ </combo_box.item>
+ <combo_box.item name="Arts&Culture">
+ Kunst & kultur
+ </combo_box.item>
+ <combo_box.item name="Business">
+ Business
+ </combo_box.item>
+ <combo_box.item name="Educational">
+ Uddannelse
+ </combo_box.item>
+ <combo_box.item name="Gaming">
+ Spil
+ </combo_box.item>
+ <combo_box.item name="Hangout">
+ Afslapning
+ </combo_box.item>
+ <combo_box.item name="NewcomerFriendly">
+ Nybegynder venligt
+ </combo_box.item>
+ <combo_box.item name="Parks&Nature">
+ Parker & natur
+ </combo_box.item>
+ <combo_box.item name="Residential">
+ Beboelse
+ </combo_box.item>
+ <combo_box.item name="Shopping">
+ Indkøb
+ </combo_box.item>
+ <combo_box.item name="Other">
+ Andet
+ </combo_box.item>
+ </combo_box>
+ <button label="?" label_selected="?" name="?" />
+ <check_box name="MatureCheck" />
+ <text type="string" length="1" name="Snapshot:">
+ Foto:
+ </text>
+ <texture_picker label="" name="snapshot_ctrl" tool_tip="Klik for at vælge et billede" />
+ <text type="string" length="1" name="landing_point">
+ Landingspunkt: [LANDING]
+ </text>
+ <string name="landing_point_none">
+ (ingen)
+ </string>
+ <button label="Vælg" label_selected="Vælg" name="Set"
+ tool_tip="Indstiller landingspunkt, hvor de besøgende ankommer. Sættes til din avatars aktuelle placering i denne parcel." />
+ <button label="Fjern" label_selected="Fjern" name="Clear"
+ tool_tip="Fjerner oplysning om landingspunkt." />
+ <text type="string" length="1" name="Teleport Routing: ">
+ Teleport valg:
+ </text>
+ <combo_box name="landing type" tool_tip="Vælg hvordan du vil håndtere teleporteringer til dit land.">
+ <combo_box.item length="1" name="Blocked" type="string">
+ Blokeret
+ </combo_box.item>
+ <combo_box.item length="1" name="LandingPoint" type="string">
+ Landingspunkt
+ </combo_box.item>
+ <combo_box.item length="1" name="Anywhere" type="string">
+ Hvor som helst
+ </combo_box.item>
+ </combo_box>
+ <string name="push_restrict_text">
+ Skub forbudt
+ </string>
+ <string name="push_restrict_region_text">
+ Skub forbudt (Uanset region indstilling)
+ </string>
+ </panel>
+ <panel label="Medier" name="land_media_panel">
+ <text type="string" length="1" name="with media:">
+ Medie type:
+ </text>
+ <combo_box name="media type"
+ tool_tip="Specificer om URL-adressen er til en film, hjemmeside eller et andet medie." />
+ <text type="string" length="1" name="at URL:">
+ Medie URL:
+ </text>
+ <button label="Vælg..." label_selected="Vælg..." name="set_media_url" />
+ <text type="string" length="1" name="Description:">
+ Beskrivelse:
+ </text>
+ <line_editor name="url_description" tool_tip="Tekst vist ved siden af Afspil/Hent knappen" />
+ <text type="string" length="1" name="Media texture:">
+ Erstat tekstur:
+ </text>
+ <texture_picker label="" name="media texture" tool_tip="Klik for at vælge billede" />
+ <text type="string" length="1" name="replace_texture_help">
+ (Objekter der har denne tekstur vil vise filmen eller
+web-siden, efter du klikker på play knappen.)
+ </text>
+ <text type="string" length="1" name="Options:">
+ Medie valg:
+ </text>
+ <check_box label="Auto skalér" name="media_auto_scale"
+ tool_tip="Vælg denne mulighed for at skalere indholdet for dette parcel automatisk. Det kan være lidt langsommere og have lavere kvalitet, men ingen anden tekstur skalering eller tilpasning vil være nødvendigt." />
+ <check_box label="Gentag afspil" name="media_loop"
+ tool_tip="Gentager automatisk medie, når det er færdigt med at spille starter det automatisk forfra." />
+ <check_box label="Skjul medie URL" name="hide_media_url"
+ tool_tip="Klik her for at skjule medie adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den." />
+ <check_box label="Skjul musik URL" name="hide_music_url"
+ tool_tip="Klik her for at skjule musik adressen så det kun er dig og evt. parcel gruppens ejer/administratorer der kan se den." />
+ <text type="string" length="1" name="media_size"
+ tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." width="105">
+ Medie Størrelse:
+ </text>
+ <spinner name="media_size_width" left_delta="89"
+ tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." />
+ <spinner name="media_size_height"
+ tool_tip="Størrelse for rendering af Web medie, benyt 0 for standard." />
+ <text type="string" length="1" name="pixels">
+ pixels
+ </text>
+ <text type="string" length="1" name="MusicURL:">
+ Musik URL:
+ </text>
+ <text type="string" length="1" name="Sound:">
+ Lyd:
+ </text>
+ <check_box label="Isolér lyde til denne parcel" name="check sound local" />
+ <text type="string" length="1" name="Voice settings:">
+ Stemme:
+ </text>
+ <radio_group name="parcel_voice_channel">
+ <radio_item type="string" length="1" name="Estate">
+ Brug Estate kanalen
+ </radio_item>
+ <radio_item type="string" length="1" name="Private">
+ Brug en privat kanal
+ </radio_item>
+ <radio_item type="string" length="1" name="Disabled">
+ Slå stemme chat fra på denne parcel
+ </radio_item>
+ </radio_group>
+ </panel>
+ <panel label="Adgang" name="land_access_panel">
+ <text type="string" length="1" name="Limit access to this parcel to:">
+ Adgang til denne parcel
+ </text>
+ <check_box label="Tillad offentlig adgang" name="public_access" />
+ <text type="string" length="1" name="Only Allow">
+ Blokér adgang for:
+ </text>
+ <check_box label="Beboere der ikke har givet betalings oplysninger til Linden Lab"
+ name="limit_payment"
+ tool_tip="Blokér beboere der ikke har afgivet identifikationsoplysninger." />
+ <check_box label="Beboere der ikke er godkendt som voksne" name="limit_age_verified"
+ tool_tip="Blokér beboere der ikke har verificeret deres alder. Se support.secondlife.com for mere information." />
+ <string name="estate_override">
+ En eller flere af disse valg er indstillet på estate niveau
+ </string>
+ <check_box label="Tillad adgang til gruppen: [GROUP]" name="GroupCheck"
+ tool_tip="Vælg gruppe under fanen 'generelt'." />
+ <check_box label="Sælg adgang til:" name="PassCheck"
+ tool_tip="Tillader midlertidig adgang til denne parcel" />
+ <combo_box name="pass_combo">
+ <combo_box.item name="Anyone">
+ Alle
+ </combo_box.item>
+ <combo_box.item name="Group">
+ Gruppe
+ </combo_box.item>
+ </combo_box>
+ <spinner label="Pris i L$:" name="PriceSpin" />
+ <spinner label="Timers adgang:" name="HoursSpin" />
+ <text label="Tillad altid" name="AllowedText">
+ Altid godkendte beboere
+ </text>
+ <name_list name="AccessList" tool_tip="([LISTED] vist, [MAX] max)" />
+ <button label="Tilføj..." label_selected="Tilføj..." name="add_allowed" />
+ <button label="Fjern" label_selected="Fjern" name="remove_allowed" />
+ <text label="Blokér" name="BanCheck">
+ Blokerede beboere
+ </text>
+ <name_list name="BannedList" tool_tip="([LISTED] vist, [MAX] max)" />
+ <button label="Tilføj..." label_selected="Tilføj..." name="add_banned" />
+ <button label="Fjern" label_selected="Fjern" name="remove_banned" />
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_animation_preview.xml b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
index eead286334..45fa6ca78f 100644
--- a/indra/newview/skins/default/xui/da/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_animation_preview.xml
@@ -1,172 +1,172 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Animation Preview" title="">
- <text name="name_label">
- Navn:
- </text>
- <text name="description_label">
- Beskrivelse:
- </text>
- <spinner label="Prioritet" name="priority"
- tool_tip="Vælg hvilke andre animationer der har lavere prioritet end denne." />
- <check_box label="Gentag" name="loop_check" tool_tip="Gentager animationen konstant." />
- <spinner label="Ind(%)" name="loop_in_point"
- tool_tip="Sætter punktet hvor gentagelsen genstarter fra." />
- <spinner label="Ud (%)" name="loop_out_point"
- tool_tip="Sætter punktet i animationen der afslutter gentagelsen." />
- <text name="hand_label">
- HÃ¥nd posering
- </text>
- <combo_box label="" name="hand_pose_combo"
- tool_tip="Kontrollerer hvad hænderne går i løbet af animationen.">
- <combo_item name="Spread">
- Spredt
- </combo_item>
- <combo_item name="Relaxed">
- Afslappet
- </combo_item>
- <combo_item name="PointBoth">
- Peg begge
- </combo_item>
- <combo_item name="Fist">
- Knytnæver
- </combo_item>
- <combo_item name="RelaxedLeft">
- Afslappet venstre
- </combo_item>
- <combo_item name="PointLeft">
- Peg venstre
- </combo_item>
- <combo_item name="FistLeft">
- Knytnæve venstre
- </combo_item>
- <combo_item name="RelaxedRight">
- Afslappet højre
- </combo_item>
- <combo_item name="PointRight">
- Peg højre
- </combo_item>
- <combo_item name="FistRight">
- Knytnæve højre
- </combo_item>
- <combo_item name="SaluteRight">
- Honnør højre
- </combo_item>
- <combo_item name="Typing">
- Skriver
- </combo_item>
- <combo_item name="PeaceRight">
- Fredstegn højre
- </combo_item>
- </combo_box>
- <text name="emote_label">
- Ansigtsudtryk
- </text>
- <combo_box label="" name="emote_combo"
- tool_tip="Angiver hvad ansigtet gør under animationen">
- <combo_item name="[None]">
- [Intet]
- </combo_item>
- <combo_item name="Aaaaah">
- Aaaaah
- </combo_item>
- <combo_item name="Afraid">
- Bange
- </combo_item>
- <combo_item name="Angry">
- Vred
- </combo_item>
- <combo_item name="BigSmile">
- Stort smil
- </combo_item>
- <combo_item name="Bored">
- Keder sig
- </combo_item>
- <combo_item name="Cry">
- Græder
- </combo_item>
- <combo_item name="Disdain">
- Forarget
- </combo_item>
- <combo_item name="Embarrassed">
- Flov
- </combo_item>
- <combo_item name="Frown">
- Skuler
- </combo_item>
- <combo_item name="Kiss">
- Kysser
- </combo_item>
- <combo_item name="Laugh">
- Griner
- </combo_item>
- <combo_item name="Plllppt">
- Plllppt
- </combo_item>
- <combo_item name="Repulsed">
- Frastødt
- </combo_item>
- <combo_item name="Sad">
- Ked af det
- </combo_item>
- <combo_item name="Shrug">
- Skuldertræk
- </combo_item>
- <combo_item name="Smile">
- Smiler
- </combo_item>
- <combo_item name="Surprise">
- Overrasket
- </combo_item>
- <combo_item name="Wink">
- Blinker
- </combo_item>
- <combo_item name="Worry">
- Bekymret
- </combo_item>
- </combo_box>
- <text name="preview_label">
- Vis mens
- </text>
- <combo_box label="" name="preview_base_anim"
- tool_tip="Se hvordan animation ser ud i forskellige typiske avatar-situationer.">
- <combo_item name="Standing">
- Står
- </combo_item>
- <combo_item name="Walking">
- GÃ¥r
- </combo_item>
- <combo_item name="Sitting">
- Sidder
- </combo_item>
- <combo_item name="Flying">
- Flyver
- </combo_item>
- </combo_box>
- <spinner label="start (sec)" name="ease_in_time"
- tool_tip="Tid i sekunder animationen bruger på at komme i gang." />
- <spinner label="Afslut (sec)" name="ease_out_time"
- tool_tip="Tid i sekunder animationen bruger på at afslutte." />
- <button label="" name="play_btn" tool_tip="Start/pause din animation." />
- <button label="" name="stop_btn" tool_tip="Stop afspilning af animation" />
- <slider label="" name="playback_slider" />
- <text name="bad_animation_text">
- Kan ikke læse animations fil.
-
- Vi anbefaler BVH filer der er exporteret fra Poser 4.
- </text>
- <button label="Annullér" name="cancel_btn" />
- <button label="Hent (L$[AMOUNT])" name="ok_btn" />
- <string name="failed_to_initialize">
- Fejlede at starte bevægelse
- </string>
- <string name="anim_too_long">
- Animations filen er [LENGTH] sekunder lang.
-
-Maksimal animations længde er [MAX_LENGTH] sekunder.
- </string>
- <string name="failed_file_read">
- Kan ikke læse animations fil.
-
-[STATUS]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Animation Preview" title="">
+ <text name="name_label">
+ Navn:
+ </text>
+ <text name="description_label">
+ Beskrivelse:
+ </text>
+ <spinner label="Prioritet" name="priority"
+ tool_tip="Vælg hvilke andre animationer der har lavere prioritet end denne." />
+ <check_box label="Gentag" name="loop_check" tool_tip="Gentager animationen konstant." />
+ <spinner label="Ind(%)" name="loop_in_point"
+ tool_tip="Sætter punktet hvor gentagelsen genstarter fra." />
+ <spinner label="Ud (%)" name="loop_out_point"
+ tool_tip="Sætter punktet i animationen der afslutter gentagelsen." />
+ <text name="hand_label">
+ HÃ¥nd posering
+ </text>
+ <combo_box label="" name="hand_pose_combo"
+ tool_tip="Kontrollerer hvad hænderne går i løbet af animationen.">
+ <combo_box.item name="Spread">
+ Spredt
+ </combo_box.item>
+ <combo_box.item name="Relaxed">
+ Afslappet
+ </combo_box.item>
+ <combo_box.item name="PointBoth">
+ Peg begge
+ </combo_box.item>
+ <combo_box.item name="Fist">
+ Knytnæver
+ </combo_box.item>
+ <combo_box.item name="RelaxedLeft">
+ Afslappet venstre
+ </combo_box.item>
+ <combo_box.item name="PointLeft">
+ Peg venstre
+ </combo_box.item>
+ <combo_box.item name="FistLeft">
+ Knytnæve venstre
+ </combo_box.item>
+ <combo_box.item name="RelaxedRight">
+ Afslappet højre
+ </combo_box.item>
+ <combo_box.item name="PointRight">
+ Peg højre
+ </combo_box.item>
+ <combo_box.item name="FistRight">
+ Knytnæve højre
+ </combo_box.item>
+ <combo_box.item name="SaluteRight">
+ Honnør højre
+ </combo_box.item>
+ <combo_box.item name="Typing">
+ Skriver
+ </combo_box.item>
+ <combo_box.item name="PeaceRight">
+ Fredstegn højre
+ </combo_box.item>
+ </combo_box>
+ <text name="emote_label">
+ Ansigtsudtryk
+ </text>
+ <combo_box label="" name="emote_combo"
+ tool_tip="Angiver hvad ansigtet gør under animationen">
+ <combo_box.item name="[None]">
+ [Intet]
+ </combo_box.item>
+ <combo_box.item name="Aaaaah">
+ Aaaaah
+ </combo_box.item>
+ <combo_box.item name="Afraid">
+ Bange
+ </combo_box.item>
+ <combo_box.item name="Angry">
+ Vred
+ </combo_box.item>
+ <combo_box.item name="BigSmile">
+ Stort smil
+ </combo_box.item>
+ <combo_box.item name="Bored">
+ Keder sig
+ </combo_box.item>
+ <combo_box.item name="Cry">
+ Græder
+ </combo_box.item>
+ <combo_box.item name="Disdain">
+ Forarget
+ </combo_box.item>
+ <combo_box.item name="Embarrassed">
+ Flov
+ </combo_box.item>
+ <combo_box.item name="Frown">
+ Skuler
+ </combo_box.item>
+ <combo_box.item name="Kiss">
+ Kysser
+ </combo_box.item>
+ <combo_box.item name="Laugh">
+ Griner
+ </combo_box.item>
+ <combo_box.item name="Plllppt">
+ Plllppt
+ </combo_box.item>
+ <combo_box.item name="Repulsed">
+ Frastødt
+ </combo_box.item>
+ <combo_box.item name="Sad">
+ Ked af det
+ </combo_box.item>
+ <combo_box.item name="Shrug">
+ Skuldertræk
+ </combo_box.item>
+ <combo_box.item name="Smile">
+ Smiler
+ </combo_box.item>
+ <combo_box.item name="Surprise">
+ Overrasket
+ </combo_box.item>
+ <combo_box.item name="Wink">
+ Blinker
+ </combo_box.item>
+ <combo_box.item name="Worry">
+ Bekymret
+ </combo_box.item>
+ </combo_box>
+ <text name="preview_label">
+ Vis mens
+ </text>
+ <combo_box label="" name="preview_base_anim"
+ tool_tip="Se hvordan animation ser ud i forskellige typiske avatar-situationer.">
+ <combo_box.item name="Standing">
+ Står
+ </combo_box.item>
+ <combo_box.item name="Walking">
+ GÃ¥r
+ </combo_box.item>
+ <combo_box.item name="Sitting">
+ Sidder
+ </combo_box.item>
+ <combo_box.item name="Flying">
+ Flyver
+ </combo_box.item>
+ </combo_box>
+ <spinner label="start (sec)" name="ease_in_time"
+ tool_tip="Tid i sekunder animationen bruger på at komme i gang." />
+ <spinner label="Afslut (sec)" name="ease_out_time"
+ tool_tip="Tid i sekunder animationen bruger på at afslutte." />
+ <button label="" name="play_btn" tool_tip="Start/pause din animation." />
+ <button label="" name="stop_btn" tool_tip="Stop afspilning af animation" />
+ <slider label="" name="playback_slider" />
+ <text name="bad_animation_text">
+ Kan ikke læse animations fil.
+
+ Vi anbefaler BVH filer der er exporteret fra Poser 4.
+ </text>
+ <button label="Annullér" name="cancel_btn" />
+ <button label="Hent (L$[AMOUNT])" name="ok_btn" />
+ <string name="failed_to_initialize">
+ Fejlede at starte bevægelse
+ </string>
+ <string name="anim_too_long">
+ Animations filen er [LENGTH] sekunder lang.
+
+Maksimal animations længde er [MAX_LENGTH] sekunder.
+ </string>
+ <string name="failed_file_read">
+ Kan ikke læse animations fil.
+
+[STATUS]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_auction.xml b/indra/newview/skins/default/xui/da/floater_auction.xml
index 8187905f54..f981242f8a 100644
--- a/indra/newview/skins/default/xui/da/floater_auction.xml
+++ b/indra/newview/skins/default/xui/da/floater_auction.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_auction" title="Start Linden land salg">
- <check_box label="Vis også gul aftegning af område" name="fence_check" />
- <button label="Foto" label_selected="Foto" name="snapshot_btn" />
- <button label="OK" label_selected="OK" name="ok_btn" />
- <string name="already for sale">
- Du kan ikke sætte jord på auktion der allerede er sat til salg.
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_auction" title="Start Linden land salg">
+ <check_box label="Vis også gul aftegning af område" name="fence_check" />
+ <button label="Foto" label_selected="Foto" name="snapshot_btn" />
+ <button label="OK" label_selected="OK" name="ok_btn" />
+ <string name="already for sale">
+ Du kan ikke sætte jord på auktion der allerede er sat til salg.
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
index c67d544e2a..d2c8f3a003 100644
--- a/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/da/floater_avatar_picker.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="avatarpicker" title="Vælg beboer">
- <text name="instruct_search_resident_name">
- Skriv en del eller hele navnet på beboeren:
- </text>
- <button label="Find" label_selected="Find" name="Find" />
- <text name="Or select their calling card:">
- Eller vælg deres visitkort:
- </text>
- <button label="Luk" label_selected="Luk" name="Close" />
- <button label="Vælg" label_selected="Vælg" name="Select" />
- <string name="NotFound">
- '[TEXT]' ikke fundet
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="avatarpicker" title="Vælg beboer">
+ <text name="instruct_search_resident_name">
+ Skriv en del eller hele navnet på beboeren:
+ </text>
+ <button label="Find" label_selected="Find" name="Find" />
+ <text name="Or select their calling card:">
+ Eller vælg deres visitkort:
+ </text>
+ <button label="Luk" label_selected="Luk" name="Close" />
+ <button label="Vælg" label_selected="Vælg" name="Select" />
+ <string name="NotFound">
+ '[TEXT]' ikke fundet
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
index e6a4016282..e3a736b200 100644
--- a/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/da/floater_avatar_textures.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="avatar_texture_debug" title="Avatar teksturer">
- <text name="baked_label">
- Faste teksturer
- </text>
- <text name="composite_label">
- Blandede teksturer
- </text>
- <texture_picker label="Hoved" name="baked_head" />
- <texture_picker label="Makeup" name="head_bodypaint" />
- <texture_picker label="HÃ¥r" name="hair" />
- <button label="Drop" label_selected="Dump" name="Dump" />
- <texture_picker label="øjne" name="baked_eyes" />
- <texture_picker label="øje" name="eye_texture" />
- <texture_picker label="Overkrop" name="baked_upper_body" />
- <texture_picker label="Tatovering overkrop" name="upper_bodypaint" />
- <texture_picker label="Undertrøje" name="undershirt" />
- <texture_picker label="Handsker" name="gloves" />
- <texture_picker label="Trøje" name="shirt" />
- <texture_picker label="øvre jakke" name="upper_jacket" />
- <texture_picker label="Underkrop" name="baked_lower_body" />
- <texture_picker label="Tatovering underkrop" name="lower_bodypaint" />
- <texture_picker label="Underbukser" name="underpants" />
- <texture_picker label="Strømper" name="socks" />
- <texture_picker label="Sko" name="shoes" />
- <texture_picker label="Bukser" name="pants" />
- <texture_picker label="Jakke" name="jacket" />
- <texture_picker label="Nederdel" name="baked_skirt" />
- <texture_picker label="Nederdel" name="skirt_texture" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="avatar_texture_debug" title="Avatar teksturer">
+ <text name="baked_label">
+ Faste teksturer
+ </text>
+ <text name="composite_label">
+ Blandede teksturer
+ </text>
+ <texture_picker label="Hoved" name="baked_head" />
+ <texture_picker label="Makeup" name="head_bodypaint" />
+ <texture_picker label="HÃ¥r" name="hair" />
+ <button label="Drop" label_selected="Dump" name="Dump" />
+ <texture_picker label="øjne" name="baked_eyes" />
+ <texture_picker label="øje" name="eye_texture" />
+ <texture_picker label="Overkrop" name="baked_upper_body" />
+ <texture_picker label="Tatovering overkrop" name="upper_bodypaint" />
+ <texture_picker label="Undertrøje" name="undershirt" />
+ <texture_picker label="Handsker" name="gloves" />
+ <texture_picker label="Trøje" name="shirt" />
+ <texture_picker label="øvre jakke" name="upper_jacket" />
+ <texture_picker label="Underkrop" name="baked_lower_body" />
+ <texture_picker label="Tatovering underkrop" name="lower_bodypaint" />
+ <texture_picker label="Underbukser" name="underpants" />
+ <texture_picker label="Strømper" name="socks" />
+ <texture_picker label="Sko" name="shoes" />
+ <texture_picker label="Bukser" name="pants" />
+ <texture_picker label="Jakke" name="jacket" />
+ <texture_picker label="Nederdel" name="baked_skirt" />
+ <texture_picker label="Nederdel" name="skirt_texture" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_beacons.xml b/indra/newview/skins/default/xui/da/floater_beacons.xml
index a643a7face..27422761d9 100644
--- a/indra/newview/skins/default/xui/da/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/da/floater_beacons.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="beacons" title="Pejlelys">
- <panel name="beacons_panel">
- <check_box label="Kun scriptede objekter med "rør"" name="touch_only" />
- <check_box label="Scriptede objekter" name="scripted" />
- <check_box label="Fysiske objekter" name="physical" />
- <check_box label="Lyd kilder" name="sounds" />
- <check_box label="Partikel kilder" name="particles" />
- <check_box label="Rendér highlights" name="highlights" />
- <check_box label="Rendér pejlelys" name="beacons" />
- <text type="string" length="1" name="beacon_width_label">
- Pejlelys bredde:
- </text>
- </panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="beacons" title="Pejlelys">
+ <panel name="beacons_panel">
+ <check_box label="Kun scriptede objekter med "rør"" name="touch_only" />
+ <check_box label="Scriptede objekter" name="scripted" />
+ <check_box label="Fysiske objekter" name="physical" />
+ <check_box label="Lyd kilder" name="sounds" />
+ <check_box label="Partikel kilder" name="particles" />
+ <check_box label="Rendér highlights" name="highlights" />
+ <check_box label="Rendér pejlelys" name="beacons" />
+ <text type="string" length="1" name="beacon_width_label">
+ Pejlelys bredde:
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_build_options.xml b/indra/newview/skins/default/xui/da/floater_build_options.xml
index 45255a9fb2..7e5b61bd84 100644
--- a/indra/newview/skins/default/xui/da/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/da/floater_build_options.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="build options floater" title="Gitter indstillinger">
- <spinner label="Gitter enhed (meter)" name="GridResolution" />
- <spinner label="Gitter rækkevidde (meter)" name="GridDrawSize" />
- <check_box label="Aktiver låsning til under-enheder" name="GridSubUnit" />
- <check_box label="Vis 'cross sections'" name="GridCrossSection" />
- <slider label="Gitter synlighed" name="GridOpacity" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="build options floater" title="Gitter indstillinger">
+ <spinner label="Gitter enhed (meter)" name="GridResolution" />
+ <spinner label="Gitter rækkevidde (meter)" name="GridDrawSize" />
+ <check_box label="Aktiver låsning til under-enheder" name="GridSubUnit" />
+ <check_box label="Vis 'cross sections'" name="GridCrossSection" />
+ <slider label="Gitter synlighed" name="GridOpacity" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_bumps.xml b/indra/newview/skins/default/xui/da/floater_bumps.xml
index f354e7129f..62a1cd9e5c 100644
--- a/indra/newview/skins/default/xui/da/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/da/floater_bumps.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_bumps" title="Bump, skub & slag">
- <string name="none_detected">
- Ingen registreret
- </string>
- <string name="bump">
- [TIME] [FIRST] [LAST] ramte dig
- </string>
- <string name="llpushobject">
- [TIME] [FIRST] [LAST] skubbede dig med et script
- </string>
- <string name="selected_object_collide">
- [TIME] [FIRST] [LAST] ramte dig med et objekt
- </string>
- <string name="scripted_object_collide">
- [TIME] [FIRST] [LAST] ramte dig med et scriptet objekt
- </string>
- <string name="physical_object_collide">
- [TIME] [FIRST] [LAST] ramte dig med et fysisk objekt
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_bumps" title="Bump, skub & slag">
+ <string name="none_detected">
+ Ingen registreret
+ </string>
+ <string name="bump">
+ [TIME] [FIRST] [LAST] ramte dig
+ </string>
+ <string name="llpushobject">
+ [TIME] [FIRST] [LAST] skubbede dig med et script
+ </string>
+ <string name="selected_object_collide">
+ [TIME] [FIRST] [LAST] ramte dig med et objekt
+ </string>
+ <string name="scripted_object_collide">
+ [TIME] [FIRST] [LAST] ramte dig med et scriptet objekt
+ </string>
+ <string name="physical_object_collide">
+ [TIME] [FIRST] [LAST] ramte dig med et fysisk objekt
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_contents.xml b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
index 9185dc0ea7..c9df548747 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_contents.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_buy_contents" title="Køb indhold">
- <text name="contains_text">
- [NAME] indeholder:
- </text>
- <text name="buy_text">
- Køb for L$[AMOUNT] fra [NAME]?
- </text>
- <button label="Annullér" label_selected="Annullér" name="cancel_btn" />
- <button label="Køb" label_selected="Køb" name="buy_btn" />
- <check_box label="Tag tøj på nu" name="wear_check" />
- <string name="no_copy_text">
- (kopiér ej)
- </string>
- <string name="no_modify_text">
- (ændre ej)
- </string>
- <string name="no_transfer_text">
- (videregiv ej)
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_buy_contents" title="Køb indhold">
+ <text name="contains_text">
+ [NAME] indeholder:
+ </text>
+ <text name="buy_text">
+ Køb for L$[AMOUNT] fra [NAME]?
+ </text>
+ <button label="Annullér" label_selected="Annullér" name="cancel_btn" />
+ <button label="Køb" label_selected="Køb" name="buy_btn" />
+ <check_box label="Tag tøj på nu" name="wear_check" />
+ <string name="no_copy_text">
+ (kopiér ej)
+ </string>
+ <string name="no_modify_text">
+ (ændre ej)
+ </string>
+ <string name="no_transfer_text">
+ (videregiv ej)
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_currency.xml b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
index 856ca4ac4c..da2e7dbd66 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_currency.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="buy currency" title="Køb valuta">
- <text name="info_buying">
- Køber valuta:
- </text>
- <text name="info_cannot_buy">
- Kan ikke købe nu:
- </text>
- <text name="info_need_more">
- Du har ikke penge nok:
- </text>
- <text name="error_message">
- Noget er gået galt.
- </text>
- <button label="GÃ¥ til hjemmeside" name="error_web" />
- <text name="contacting">
- Kontakter LindeX...
- </text>
- <text name="buy_action_unknown">
- Køb L$ på LindeX valuta marked
- </text>
- <text name="buy_action">
- [NAME] L$ [PRICE]
- </text>
- <text name="currency_action">
- Køb L$
- </text>
- <line_editor name="currency_amt">
- 1234
- </line_editor>
- <text name="currency_est">
- for ca. US$ [USD]
- </text>
- <text name="getting_data">
- Henter data...
- </text>
- <text name="balance_label">
- Du har i øjeblikket
- </text>
- <text name="balance_amount">
- L$ [AMT]
- </text>
- <text name="buying_label">
- Du køber
- </text>
- <text name="buying_amount">
- L$ [AMT]
- </text>
- <text name="total_label">
- Din balance bliver
- </text>
- <text name="total_amount">
- L$ [AMT]
- </text>
- <text name="purchase_warning_repurchase">
- Bekræfter at denne handel kun omfatter valuta.
-Gentag operationen venligst igen.
- </text>
- <text name="purchase_warning_notenough">
- Du køber ikke nok valuta, tast et større beløb
-og prøv igen.
- </text>
- <button label="Annullér" name="cancel_btn" />
- <button label="Køb" name="buy_btn" />
- <string name="buy_currency">
- Buy L$ [LINDENS] for approx. US$ [USD]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="buy currency" title="Køb valuta">
+ <text name="info_buying">
+ Køber valuta:
+ </text>
+ <text name="info_cannot_buy">
+ Kan ikke købe nu:
+ </text>
+ <text name="info_need_more">
+ Du har ikke penge nok:
+ </text>
+ <text name="error_message">
+ Noget er gået galt.
+ </text>
+ <button label="GÃ¥ til hjemmeside" name="error_web" />
+ <text name="contacting">
+ Kontakter LindeX...
+ </text>
+ <text name="buy_action_unknown">
+ Køb L$ på LindeX valuta marked
+ </text>
+ <text name="buy_action">
+ [NAME] L$ [PRICE]
+ </text>
+ <text name="currency_action">
+ Køb L$
+ </text>
+ <line_editor name="currency_amt">
+ 1234
+ </line_editor>
+ <text name="currency_est">
+ for ca. US$ [USD]
+ </text>
+ <text name="getting_data">
+ Henter data...
+ </text>
+ <text name="balance_label">
+ Du har i øjeblikket
+ </text>
+ <text name="balance_amount">
+ L$ [AMT]
+ </text>
+ <text name="buying_label">
+ Du køber
+ </text>
+ <text name="buying_amount">
+ L$ [AMT]
+ </text>
+ <text name="total_label">
+ Din balance bliver
+ </text>
+ <text name="total_amount">
+ L$ [AMT]
+ </text>
+ <text name="purchase_warning_repurchase">
+ Bekræfter at denne handel kun omfatter valuta.
+Gentag operationen venligst igen.
+ </text>
+ <text name="purchase_warning_notenough">
+ Du køber ikke nok valuta, tast et større beløb
+og prøv igen.
+ </text>
+ <button label="Annullér" name="cancel_btn" />
+ <button label="Køb" name="buy_btn" />
+ <string name="buy_currency">
+ Buy L$ [LINDENS] for approx. US$ [USD]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_land.xml b/indra/newview/skins/default/xui/da/floater_buy_land.xml
index 89bd77cd4a..6eef76023f 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_land.xml
@@ -1,229 +1,229 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="buy land" title="Køb land">
- <text name="region_name_label">
- Region:
- </text>
- <text name="region_name_text">
- (ukendt)
- </text>
- <text name="estate_name_label">
- Estate:
- </text>
- <text name="estate_name_text">
- (ukendt)
- </text>
- <text name="estate_owner_label">
- Estate ejer:
- </text>
- <text name="estate_owner_text">
- (ukendt)
- </text>
- <text name="resellable_changeable_label">
- Købt land i denne region:
- </text>
- <text name="resellable_clause">
- Købt land i denne region kan eller kan ikke videresælges.
- </text>
- <text name="changeable_clause">
- kan eller kan ikke samles eller opdeles.
- </text>
- <text name="covenant_text">
- Du skal acceptere Estate reglerne:
- </text>
- <text_editor name="covenant_editor">
- Indlæser...
- </text_editor>
- <check_box label="Jeg acceptere betingelserne der er beskrevet." name="agree_covenant" />
- <text name="info_parcel_label">
- Parcel:
- </text>
- <text name="info_parcel" left_delta="62">
- Scotopteryx 138,204
- </text>
- <text name="info_size_label" width="60">
- Størrelse:
- </text>
- <text name="info_size" left_delta="62">
- 1024 m²
- </text>
- <text name="info_price_label">
- Pris:
- </text>
- <text name="info_price" left_delta="62">
- L$ 1500, objekter inkluderet
- </text>
- <text name="info_action">
- Køb af dette land vil:
- </text>
- <text name="error_message">
- Noget er ikke rigtigt.
- </text>
- <button label="Go to website" name="error_web" />
- <text name="account_action">
- Opgrader dig til premium medlemsskab.
- </text>
- <text name="account_reason">
- Kun premium medlemmer kan eje land.
- </text>
- <combo_box name="account_level">
- <combo_item name="US$9.95/month,billedmonthly">
- US$9.95/md, månedlig afregning
- </combo_item>
- <combo_item name="US$7.50/month,billedquarterly">
- US$7.50/md, kvartalsvis afregning
- </combo_item>
- <combo_item name="US$6.00/month,billedannually">
- US$6.00/md, årlig afregning
- </combo_item>
- </combo_box>
- <text name="land_use_action">
- Forøg dine månedlige arealanvendelse gebyrer til US $ 40/måned.
- </text>
- <text name="land_use_reason">
- Du har 1.309 kvadratmeter jord.
-Dette parcel er på 512 kvadratmeter jord.
- </text>
- <text name="purchase_action">
- Betal Joe Resident L$ 4000 dette areal
- </text>
- <text name="currency_reason">
- Du har L$2,100.
- </text>
- <text name="currency_action">
- Køb yderligere L$
- </text>
- <line_editor name="currency_amt">
- 1000
- </line_editor>
- <text name="currency_est">
- for ca. US$ [AMOUNT2]
- </text>
- <text name="currency_balance">
- Du har L$2,100.
- </text>
- <check_box label="Fjern [AMOUNT] kvadratmeter af bidrag fra gruppe."
- name="remove_contribution" />
- <button label="Køb" name="buy_btn" />
- <button label="Annullér" name="cancel_btn" />
- <string name="can_resell">
- Kan videresælges.
- </string>
- <string name="can_not_resell">
- Kan ikke videresælges.
- </string>
- <string name="can_change">
- Kan samles eller opdeles.
- </string>
- <string name="can_not_change">
- Kan ikke samles eller opdeles.
- </string>
- <string name="cant_buy_for_group">
- Du har ikke tilladelse til at købe land for din aktive gruppe.
- </string>
- <string name="no_land_selected">
- Intet land er valgt.
- </string>
- <string name="multiple_parcels_selected">
- Flere forskellige parceller er valgt.
-Prøv at vælge et mindre område.
- </string>
- <string name="no_permission">
- Du har ikke tilladelse til at købe jord for din aktive gruppe.
- </string>
- <string name="parcel_not_for_sale">
- Det udvalgte parcel er ikke til salg.
- </string>
- <string name="group_already_owns">
- Gruppen ejer allerede parcellet.
- </string>
- <string name="you_already_own">
- Du ejer allerede parcellet.
- </string>
- <string name="set_to_sell_to_other">
- Det udvalgte parcel er sat til salg til en anden.
- </string>
- <string name="no_public_land">
- Det valgte område har ingen offentlige arealer.
- </string>
- <string name="not_owned_by_you">
- Jord, der ejes af en anden bruger er valgt.
-Prøv at vælge et mindre område.
- </string>
- <string name="processing">
- Forarbejder dit køb...
-
-(Dette kan tage et minut eller to.)
- </string>
- <string name="fetching_error">
- Der er sket en fejl under hentning af jord købs oplysninger.
- </string>
- <string name="buying_will">
- Køb af dette areal vil:
- </string>
- <string name="buying_for_group">
- Køb jord til gruppe:
- </string>
- <string name="cannot_buy_now">
- Kan ikke købe nu:
- </string>
- <string name="not_for_sale">
- Ikke til salg:
- </string>
- <string name="none_needed">
- ikke nødvendigt
- </string>
- <string name="must_upgrade">
- Din konto skal være opgraderet for at eje jord.
- </string>
- <string name="cant_own_land">
- Din konto kan eje jord.
- </string>
- <string name="land_holdings">
- Du har [BUYER] kvadratmeter jord.
- </string>
- <string name="pay_to_for_land">
- Betal L$ [AMOUNT] til [SELLER] for dette stykke jord
- </string>
- <string name="buy_for_US">
- Køb L$ [AMOUNT] for omkring US$ [AMOUNT2] ,
- </string>
- <string name="parcel_meters">
- Dette parcel er [AMOUNT] kvadratmeter.
- </string>
- <string name="premium_land">
- Dette stykke jord er premium, og vil tælle som [AMOUNT] kvadratmeter.
- </string>
- <string name="discounted_land">
- Dette stykke jord er på tilbud, og vil tælle som [AMOUNT] kvadratmeter.
- </string>
- <string name="meters_supports_object">
- [AMOUNT] m²
-indeholder [AMOUNT2] objekter
- </string>
- <string name="sold_with_objects">
- solgt med objekter
- </string>
- <string name="insufficient_land_credits">
- Gruppen [GROUP] skal bruge nok tildelt jord brugs
-kredit for at dække dette parcel før købet vil blive
-gennemført.
- </string>
- <string name="have_enough_lindens">
- Du har L$ [AMOUNT], hvilket er nok til at købe denne jord.
- </string>
- <string name="not_enough_lindens">
- Du har kun L$ [AMOUNT], og har brug for yderligere L$ [AMOUNT2].
- </string>
- <string name="balance_left">
- Efter købet, vil du have L$ [AMOUNT] tilbage.
- </string>
- <string name="balance_needed">
- Du skal købe mindst L$ [AMOUNT] for at have råd til denne jord.
- </string>
- <string name="no_parcel_selected">
- (intet parcel er valgt)
- </string>
- <string name="buy_currency">
- Køb L$ [LINDENS] for omkring US$ [USD]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="buy land" title="Køb land">
+ <text name="region_name_label">
+ Region:
+ </text>
+ <text name="region_name_text">
+ (ukendt)
+ </text>
+ <text name="estate_name_label">
+ Estate:
+ </text>
+ <text name="estate_name_text">
+ (ukendt)
+ </text>
+ <text name="estate_owner_label">
+ Estate ejer:
+ </text>
+ <text name="estate_owner_text">
+ (ukendt)
+ </text>
+ <text name="resellable_changeable_label">
+ Købt land i denne region:
+ </text>
+ <text name="resellable_clause">
+ Købt land i denne region kan eller kan ikke videresælges.
+ </text>
+ <text name="changeable_clause">
+ kan eller kan ikke samles eller opdeles.
+ </text>
+ <text name="covenant_text">
+ Du skal acceptere Estate reglerne:
+ </text>
+ <text_editor name="covenant_editor">
+ Indlæser...
+ </text_editor>
+ <check_box label="Jeg acceptere betingelserne der er beskrevet." name="agree_covenant" />
+ <text name="info_parcel_label">
+ Parcel:
+ </text>
+ <text name="info_parcel" left_delta="62">
+ Scotopteryx 138,204
+ </text>
+ <text name="info_size_label" width="60">
+ Størrelse:
+ </text>
+ <text name="info_size" left_delta="62">
+ 1024 m²
+ </text>
+ <text name="info_price_label">
+ Pris:
+ </text>
+ <text name="info_price" left_delta="62">
+ L$ 1500, objekter inkluderet
+ </text>
+ <text name="info_action">
+ Køb af dette land vil:
+ </text>
+ <text name="error_message">
+ Noget er ikke rigtigt.
+ </text>
+ <button label="Go to website" name="error_web" />
+ <text name="account_action">
+ Opgrader dig til premium medlemsskab.
+ </text>
+ <text name="account_reason">
+ Kun premium medlemmer kan eje land.
+ </text>
+ <combo_box name="account_level">
+ <combo_box.item name="US$9.95/month,billedmonthly">
+ US$9.95/md, månedlig afregning
+ </combo_box.item>
+ <combo_box.item name="US$7.50/month,billedquarterly">
+ US$7.50/md, kvartalsvis afregning
+ </combo_box.item>
+ <combo_box.item name="US$6.00/month,billedannually">
+ US$6.00/md, årlig afregning
+ </combo_box.item>
+ </combo_box>
+ <text name="land_use_action">
+ Forøg dine månedlige arealanvendelse gebyrer til US $ 40/måned.
+ </text>
+ <text name="land_use_reason">
+ Du har 1.309 kvadratmeter jord.
+Dette parcel er på 512 kvadratmeter jord.
+ </text>
+ <text name="purchase_action">
+ Betal Joe Resident L$ 4000 dette areal
+ </text>
+ <text name="currency_reason">
+ Du har L$2,100.
+ </text>
+ <text name="currency_action">
+ Køb yderligere L$
+ </text>
+ <line_editor name="currency_amt">
+ 1000
+ </line_editor>
+ <text name="currency_est">
+ for ca. US$ [AMOUNT2]
+ </text>
+ <text name="currency_balance">
+ Du har L$2,100.
+ </text>
+ <check_box label="Fjern [AMOUNT] kvadratmeter af bidrag fra gruppe."
+ name="remove_contribution" />
+ <button label="Køb" name="buy_btn" />
+ <button label="Annullér" name="cancel_btn" />
+ <string name="can_resell">
+ Kan videresælges.
+ </string>
+ <string name="can_not_resell">
+ Kan ikke videresælges.
+ </string>
+ <string name="can_change">
+ Kan samles eller opdeles.
+ </string>
+ <string name="can_not_change">
+ Kan ikke samles eller opdeles.
+ </string>
+ <string name="cant_buy_for_group">
+ Du har ikke tilladelse til at købe land for din aktive gruppe.
+ </string>
+ <string name="no_land_selected">
+ Intet land er valgt.
+ </string>
+ <string name="multiple_parcels_selected">
+ Flere forskellige parceller er valgt.
+Prøv at vælge et mindre område.
+ </string>
+ <string name="no_permission">
+ Du har ikke tilladelse til at købe jord for din aktive gruppe.
+ </string>
+ <string name="parcel_not_for_sale">
+ Det udvalgte parcel er ikke til salg.
+ </string>
+ <string name="group_already_owns">
+ Gruppen ejer allerede parcellet.
+ </string>
+ <string name="you_already_own">
+ Du ejer allerede parcellet.
+ </string>
+ <string name="set_to_sell_to_other">
+ Det udvalgte parcel er sat til salg til en anden.
+ </string>
+ <string name="no_public_land">
+ Det valgte område har ingen offentlige arealer.
+ </string>
+ <string name="not_owned_by_you">
+ Jord, der ejes af en anden bruger er valgt.
+Prøv at vælge et mindre område.
+ </string>
+ <string name="processing">
+ Forarbejder dit køb...
+
+(Dette kan tage et minut eller to.)
+ </string>
+ <string name="fetching_error">
+ Der er sket en fejl under hentning af jord købs oplysninger.
+ </string>
+ <string name="buying_will">
+ Køb af dette areal vil:
+ </string>
+ <string name="buying_for_group">
+ Køb jord til gruppe:
+ </string>
+ <string name="cannot_buy_now">
+ Kan ikke købe nu:
+ </string>
+ <string name="not_for_sale">
+ Ikke til salg:
+ </string>
+ <string name="none_needed">
+ ikke nødvendigt
+ </string>
+ <string name="must_upgrade">
+ Din konto skal være opgraderet for at eje jord.
+ </string>
+ <string name="cant_own_land">
+ Din konto kan eje jord.
+ </string>
+ <string name="land_holdings">
+ Du har [BUYER] kvadratmeter jord.
+ </string>
+ <string name="pay_to_for_land">
+ Betal L$ [AMOUNT] til [SELLER] for dette stykke jord
+ </string>
+ <string name="buy_for_US">
+ Køb L$ [AMOUNT] for omkring US$ [AMOUNT2] ,
+ </string>
+ <string name="parcel_meters">
+ Dette parcel er [AMOUNT] kvadratmeter.
+ </string>
+ <string name="premium_land">
+ Dette stykke jord er premium, og vil tælle som [AMOUNT] kvadratmeter.
+ </string>
+ <string name="discounted_land">
+ Dette stykke jord er på tilbud, og vil tælle som [AMOUNT] kvadratmeter.
+ </string>
+ <string name="meters_supports_object">
+ [AMOUNT] m²
+indeholder [AMOUNT2] objekter
+ </string>
+ <string name="sold_with_objects">
+ solgt med objekter
+ </string>
+ <string name="insufficient_land_credits">
+ Gruppen [GROUP] skal bruge nok tildelt jord brugs
+kredit for at dække dette parcel før købet vil blive
+gennemført.
+ </string>
+ <string name="have_enough_lindens">
+ Du har L$ [AMOUNT], hvilket er nok til at købe denne jord.
+ </string>
+ <string name="not_enough_lindens">
+ Du har kun L$ [AMOUNT], og har brug for yderligere L$ [AMOUNT2].
+ </string>
+ <string name="balance_left">
+ Efter købet, vil du have L$ [AMOUNT] tilbage.
+ </string>
+ <string name="balance_needed">
+ Du skal købe mindst L$ [AMOUNT] for at have råd til denne jord.
+ </string>
+ <string name="no_parcel_selected">
+ (intet parcel er valgt)
+ </string>
+ <string name="buy_currency">
+ Køb L$ [LINDENS] for omkring US$ [USD]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_buy_object.xml b/indra/newview/skins/default/xui/da/floater_buy_object.xml
index 500423cd10..f0e22c8eee 100644
--- a/indra/newview/skins/default/xui/da/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/da/floater_buy_object.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="contents" title="Køb kopi af objekt">
- <text name="contents_text">
- og dets indhold:
- </text>
- <text name="buy_text">
- Køb for L$[AMOUNT] fra [NAME]?
- </text>
- <button label="Annullér" label_selected="Annullér" name="cancel_btn" />
- <button label="Køb" label_selected="Køb" name="buy_btn" />
- <string name="title_buy_text">
- Køb
- </string>
- <string name="title_buy_copy_text">
- Køb en kopi af
- </string>
- <string name="no_copy_text">
- (kopiér ej)
- </string>
- <string name="no_modify_text">
- (ændre ej)
- </string>
- <string name="no_transfer_text">
- (videregiv ej)
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="contents" title="Køb kopi af objekt">
+ <text name="contents_text">
+ og dets indhold:
+ </text>
+ <text name="buy_text">
+ Køb for L$[AMOUNT] fra [NAME]?
+ </text>
+ <button label="Annullér" label_selected="Annullér" name="cancel_btn" />
+ <button label="Køb" label_selected="Køb" name="buy_btn" />
+ <string name="title_buy_text">
+ Køb
+ </string>
+ <string name="title_buy_copy_text">
+ Køb en kopi af
+ </string>
+ <string name="no_copy_text">
+ (kopiér ej)
+ </string>
+ <string name="no_modify_text">
+ (ændre ej)
+ </string>
+ <string name="no_transfer_text">
+ (videregiv ej)
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_camera.xml b/indra/newview/skins/default/xui/da/floater_camera.xml
index 42be5319f5..0eb090d2e4 100644
--- a/indra/newview/skins/default/xui/da/floater_camera.xml
+++ b/indra/newview/skins/default/xui/da/floater_camera.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater" title="">
- <string name="rotate_tooltip">
- Roter kamera omkring fokus
- </string>
- <string name="zoom_tooltip">
- Zoom kamera mod fokus
- </string>
- <string name="move_tooltip">
- Flyt kamera op og ned, til venstre og højre
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater" title="">
+ <string name="rotate_tooltip">
+ Roter kamera omkring fokus
+ </string>
+ <string name="zoom_tooltip">
+ Zoom kamera mod fokus
+ </string>
+ <string name="move_tooltip">
+ Flyt kamera op og ned, til venstre og højre
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_choose_group.xml b/indra/newview/skins/default/xui/da/floater_choose_group.xml
index 346361f2f3..01c5bf3367 100644
--- a/indra/newview/skins/default/xui/da/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/da/floater_choose_group.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="Grupper">
- <text name="groupdesc">
- Vælg en gruppe:
- </text>
- <button label="OK" label_selected="OK" name="OK" />
- <button label="Annullér" label_selected="Annullér" name="Cancel" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="groups" title="Grupper">
+ <text name="groupdesc">
+ Vælg en gruppe:
+ </text>
+ <button label="OK" label_selected="OK" name="OK" />
+ <button label="Annullér" label_selected="Annullér" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_color_picker.xml b/indra/newview/skins/default/xui/da/floater_color_picker.xml
index 54c958c17f..e6cc5774ed 100644
--- a/indra/newview/skins/default/xui/da/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/da/floater_color_picker.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="ColorPicker" title="Farve vælger">
- <text name="r_val_text">
- Rød:
- </text>
- <text name="g_val_text">
- Grøn:
- </text>
- <text name="b_val_text">
- Blå:
- </text>
- <text name="h_val_text">
- Nuance:
- </text>
- <text name="s_val_text">
- Mætning:
- </text>
- <text name="l_val_text">
- Lysstyrke:
- </text>
- <check_box label="Anvend straks" name="apply_immediate" />
- <button label="" label_selected="" name="color_pipette" />
- <button label="Annullér" label_selected="Annullér" name="cancel_btn" />
- <button label="Vælg" label_selected="Vælg" name="select_btn" />
- <text name="Current color:">
- Nuværende Farve:
- </text>
- <text name="(Drag below to save.)">
- (Træk ned og gem.)
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="ColorPicker" title="Farve vælger">
+ <text name="r_val_text">
+ Rød:
+ </text>
+ <text name="g_val_text">
+ Grøn:
+ </text>
+ <text name="b_val_text">
+ Blå:
+ </text>
+ <text name="h_val_text">
+ Nuance:
+ </text>
+ <text name="s_val_text">
+ Mætning:
+ </text>
+ <text name="l_val_text">
+ Lysstyrke:
+ </text>
+ <check_box label="Anvend straks" name="apply_immediate" />
+ <button label="" label_selected="" name="color_pipette" />
+ <button label="Annullér" label_selected="Annullér" name="cancel_btn" />
+ <button label="Vælg" label_selected="Vælg" name="select_btn" />
+ <text name="Current color:">
+ Nuværende Farve:
+ </text>
+ <text name="(Drag below to save.)">
+ (Træk ned og gem.)
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_critical.xml b/indra/newview/skins/default/xui/da/floater_critical.xml
index df8b5f978a..8c2672f39f 100644
--- a/indra/newview/skins/default/xui/da/floater_critical.xml
+++ b/indra/newview/skins/default/xui/da/floater_critical.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title="">
- <button label="Fortsæt" label_selected="Fortsæt" name="Continue" />
- <button label="Annullér" label_selected="Annullér" name="Cancel" />
- <text name="tos_heading">
- Læs venligst den følgende besked grundigt.
- </text>
- <text_editor name="tos_text">
- TOS_TEXT
- </text_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+ <button label="Fortsæt" label_selected="Fortsæt" name="Continue" />
+ <button label="Annullér" label_selected="Annullér" name="Cancel" />
+ <text name="tos_heading">
+ Læs venligst den følgende besked grundigt.
+ </text>
+ <text_editor name="tos_text">
+ TOS_TEXT
+ </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_customize.xml b/indra/newview/skins/default/xui/da/floater_customize.xml
index 11c5e51cc1..0f6a59eb4a 100644
--- a/indra/newview/skins/default/xui/da/floater_customize.xml
+++ b/indra/newview/skins/default/xui/da/floater_customize.xml
@@ -1,447 +1,447 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater customize" title="Appearance">
- <tab_container name="customize tab container">
- <panel label="Krops Dele" name="body_parts_placeholder" />
- <panel label="Kropsbygning" name="Shape">
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- <button label="Krop" label_selected="Krop" name="Body" />
- <button label="Hoved" label_selected="Hoved" name="Head" />
- <button label="Øjne" label_selected="Øjne" name="Eyes" />
- <button label="Ører" label_selected="Ører" name="Ears" />
- <button label="Næse" label_selected="Næse" name="Nose" />
- <button label="Mund" label_selected="Mund" name="Mouth" />
- <button label="Kinder" label_selected="Kinder" name="Chin" />
- <button label="Overkrop" label_selected="Overkrop" name="Torso" />
- <button label="Ben" label_selected="Ben" name="Legs" />
- <radio_group name="sex radio">
- <radio_item type="string" length="1" name="radio">
- Kvinde
- </radio_item>
- <radio_item type="string" length="1" name="radio2">
- Mand
- </radio_item>
- </radio_group>
- <button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Vælg en ny krop ved at trække en sådan fra din beholdning
-over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- <button label="Lav ny krop" label_selected="Lav ny krop" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- </panel>
- <panel label="Hud" name="Skin">
- <button label="Hudfarve" label_selected="Hudfarve" name="Skin Color" />
- <button label="Detaljer" label_selected="Detaljer" name="Face Detail" />
- <button label="Sminke" label_selected="Sminke" name="Makeup" />
- <button label="Kropsdetaljer" label_selected="Kropsdetaljer" name="Body Detail" />
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag en ny hud på ved at trække en sådan fra din beholdning
-over på din avatar. Du kan også oprette en hud fra bunden og bagefter 'tage den på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- <texture_picker label="Tatoveringer hoved" name="Head Tattoos" />
- <texture_picker label="Tatoveringer overkrop" name="Upper Tattoos" />
- <texture_picker label="Tatoveringer underkrop" name="Lower Tattoos" />
- <button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
- <button label="Lav ny hud" label_selected="Lav nyt hud" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- </panel>
- <panel label="HÃ¥r" name="Hair">
- <button label="Farve" label_selected="Farve" name="Color" />
- <button label="Stil" label_selected="Stil" name="Style" />
- <button label="Øjenbryn" label_selected="Øjenbryn" name="Eyebrows" />
- <button label="Skæg" label_selected="Skæg" name="Facial" />
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag et ny hår på ved at trække et fra din beholdning
-over på din avatar. Du kan også oprette et nyt hår fra bunden og bagefter 'tage det på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- <texture_picker label="Tekstur" name="Texture" />
- <button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
- <button label="Lav nyt hår" label_selected="Lav nyt hår" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- </panel>
- <panel label="Øjne" name="Eyes">
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag et ny sæt øjne på ved at trække et sæt fra din beholdning
-over på din avatar. Du kan også oprette et nyt sæt øjne fra bunden og bagefter 'tage dem på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- <texture_picker label="Iris" name="Iris" />
- <button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
- <button label="Lav nye øjne" label_selected="Lav nye øjne" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- </panel>
- <panel label="Tøje" name="clothes_placeholder" />
- <panel label="Trøje" name="Shirt">
- <texture_picker label="Stof" name="Fabric" />
- <color_swatch label="Farve" name="Color/Tint" />
- <button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag en ny Tøje på ved at trække en fra din beholdning
-over på din avatar.
-Du kan også oprette en ny Tøje fra bunden og bagefter 'tage den på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- </panel>
- <panel label="Bukser" name="Pants">
- <texture_picker label="Stof" name="Fabric" />
- <color_swatch label="Farve" name="Color/Tint" />
- <button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag nyr bukser på ved at trække dem fra din beholdning
-over på din avatar.
-Du kan også oprette ny bukser fra bunden og bagefter 'tage dem på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- </panel>
- <panel label="Sko" name="Shoes">
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag et ny par sko på ved at trække dem fra din beholdning
-over på din avatar. Du kan også oprette et nyt par sko fra bunden og bagefter 'tage dem på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- <texture_picker label="Stof" name="Fabric" />
- <color_swatch label="Farve" name="Color/Tint" />
- <button label="Lav nye sko" label_selected="Lav nye sko" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- </panel>
- <panel label="Strømper" name="Socks">
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag et ny par Strømper på ved at trække dem fra din beholdning
-over på din avatar. Du kan også oprette et nyt par Strømper fra bunden og bagefter 'tage dem på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- <texture_picker label="Stof" name="Fabric" />
- <color_swatch label="Farve" name="Color/Tint" />
- <button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- </panel>
- <panel label="Jakke" name="Jacket">
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag en ny jakke på ved at trække en fra din beholdning
-over på din avatar.
-Du kan også oprette en ny jakke fra bunden og bagefter 'tage den på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- <texture_picker label="Stof øverst" name="Upper Fabric" />
- <texture_picker label="Stof nederst" name="Lower Fabric" />
- <color_swatch label="Farve" name="Color/Tint" />
- <button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- </panel>
- <panel label="Handsker" name="Gloves">
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag nye handsker på ved at trække et par fra din beholdning
-over på din avatar.
-Du kan også oprette nye handsker fra bunden og bagefter 'tage dem på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- <texture_picker label="Stof" name="Fabric" />
- <color_swatch label="Farve" name="Color/Tint" />
- <button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- </panel>
- <panel label="Undertrøje" name="Undershirt">
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag en ny undertrøje på ved at trække en fra din beholdning
-over på din avatar.
-Du kan også oprette en ny undertrøje fra bunden og bagefter 'tage den på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- <texture_picker label="Stof" name="Fabric" />
- <color_swatch label="Farve" name="Color/Tint" />
- <button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- </panel>
- <panel label="Underbukser" name="Underpants">
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag nye underbukser på ved at trække dem fra din beholdning
-over på din avatar.
-Du kan også oprette en par nye underbukser fra bunden og bagefter 'tage dem på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- <texture_picker label="Stof" name="Fabric" />
- <color_swatch label="Farve" name="Color/Tint" />
- <button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- </panel>
- <panel label="Nederdel" name="Skirt">
- <text type="string" length="1" name="title">
- [DESC]
- </text>
- <text type="string" length="1" name="title_no_modify">
- [DESC]: Kan ikke redigeres
- </text>
- <text type="string" length="1" name="title_loading">
- [DESC]: indlæser...
- </text>
- <text type="string" length="1" name="title_not_worn">
- [DESC]: ikke båret
- </text>
- <text type="string" length="1" name="path">
- Fundet i [PATH]
- </text>
- <text type="string" length="1" name="not worn instructions">
- Tag en ny nederdel på ved at trække en fra din beholdning
-over på din avatar.
-Du kan også oprette en ny nederdel fra bunden og bagefter 'tage den på'.
- </text>
- <text type="string" length="1" name="no modify instructions">
- Du har ikke rettigheder til at redigere denne del.
- </text>
- <texture_picker label="Stof" name="Fabric" />
- <color_swatch label="Farve" name="Color/Tint" />
- <button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New" />
- <button label="Tag af" label_selected="Tag af" name="Take Off" />
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Gem som" label_selected="Gem som" name="Save As" />
- <button label="Annullér" label_selected="Annullér" name="Revert" />
- </panel>
- </tab_container>
- <button label="Luk" label_selected="Luk" name="Close" />
- <button label="Gem alt" label_selected="Gem alt" name="Save All" />
- <button label="Opret sæt" label_selected="Opret sæt" name="Make Outfit" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater customize" title="Appearance">
+ <tab_container name="customize tab container">
+ <panel label="Krops Dele" name="body_parts_placeholder" />
+ <panel label="Kropsbygning" name="Shape">
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ <button label="Krop" label_selected="Krop" name="Body" />
+ <button label="Hoved" label_selected="Hoved" name="Head" />
+ <button label="Øjne" label_selected="Øjne" name="Eyes" />
+ <button label="Ører" label_selected="Ører" name="Ears" />
+ <button label="Næse" label_selected="Næse" name="Nose" />
+ <button label="Mund" label_selected="Mund" name="Mouth" />
+ <button label="Kinder" label_selected="Kinder" name="Chin" />
+ <button label="Overkrop" label_selected="Overkrop" name="Torso" />
+ <button label="Ben" label_selected="Ben" name="Legs" />
+ <radio_group name="sex radio">
+ <radio_item type="string" length="1" name="radio">
+ Kvinde
+ </radio_item>
+ <radio_item type="string" length="1" name="radio2">
+ Mand
+ </radio_item>
+ </radio_group>
+ <button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Vælg en ny krop ved at trække en sådan fra din beholdning
+over på din avatar. Du kan også oprette en fra bunden og bagefter 'tage den på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ <button label="Lav ny krop" label_selected="Lav ny krop" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ </panel>
+ <panel label="Hud" name="Skin">
+ <button label="Hudfarve" label_selected="Hudfarve" name="Skin Color" />
+ <button label="Detaljer" label_selected="Detaljer" name="Face Detail" />
+ <button label="Sminke" label_selected="Sminke" name="Makeup" />
+ <button label="Kropsdetaljer" label_selected="Kropsdetaljer" name="Body Detail" />
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag en ny hud på ved at trække en sådan fra din beholdning
+over på din avatar. Du kan også oprette en hud fra bunden og bagefter 'tage den på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ <texture_picker label="Tatoveringer hoved" name="Head Tattoos" />
+ <texture_picker label="Tatoveringer overkrop" name="Upper Tattoos" />
+ <texture_picker label="Tatoveringer underkrop" name="Lower Tattoos" />
+ <button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
+ <button label="Lav ny hud" label_selected="Lav nyt hud" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ </panel>
+ <panel label="HÃ¥r" name="Hair">
+ <button label="Farve" label_selected="Farve" name="Color" />
+ <button label="Stil" label_selected="Stil" name="Style" />
+ <button label="Øjenbryn" label_selected="Øjenbryn" name="Eyebrows" />
+ <button label="Skæg" label_selected="Skæg" name="Facial" />
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag et ny hår på ved at trække et fra din beholdning
+over på din avatar. Du kan også oprette et nyt hår fra bunden og bagefter 'tage det på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ <texture_picker label="Tekstur" name="Texture" />
+ <button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
+ <button label="Lav nyt hår" label_selected="Lav nyt hår" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ </panel>
+ <panel label="Øjne" name="Eyes">
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag et ny sæt øjne på ved at trække et sæt fra din beholdning
+over på din avatar. Du kan også oprette et nyt sæt øjne fra bunden og bagefter 'tage dem på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ <texture_picker label="Iris" name="Iris" />
+ <button label="Tilfældig" label_selected="Tilfældig" name="Randomize" />
+ <button label="Lav nye øjne" label_selected="Lav nye øjne" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ </panel>
+ <panel label="Tøje" name="clothes_placeholder" />
+ <panel label="Trøje" name="Shirt">
+ <texture_picker label="Stof" name="Fabric" />
+ <color_swatch label="Farve" name="Color/Tint" />
+ <button label="Lav ny trøje" label_selected="Lav ny trøje" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag en ny Tøje på ved at trække en fra din beholdning
+over på din avatar.
+Du kan også oprette en ny Tøje fra bunden og bagefter 'tage den på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ </panel>
+ <panel label="Bukser" name="Pants">
+ <texture_picker label="Stof" name="Fabric" />
+ <color_swatch label="Farve" name="Color/Tint" />
+ <button label="Lav nye bukser" label_selected="Lav nye bukser" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag nyr bukser på ved at trække dem fra din beholdning
+over på din avatar.
+Du kan også oprette ny bukser fra bunden og bagefter 'tage dem på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ </panel>
+ <panel label="Sko" name="Shoes">
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag et ny par sko på ved at trække dem fra din beholdning
+over på din avatar. Du kan også oprette et nyt par sko fra bunden og bagefter 'tage dem på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ <texture_picker label="Stof" name="Fabric" />
+ <color_swatch label="Farve" name="Color/Tint" />
+ <button label="Lav nye sko" label_selected="Lav nye sko" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ </panel>
+ <panel label="Strømper" name="Socks">
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag et ny par Strømper på ved at trække dem fra din beholdning
+over på din avatar. Du kan også oprette et nyt par Strømper fra bunden og bagefter 'tage dem på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ <texture_picker label="Stof" name="Fabric" />
+ <color_swatch label="Farve" name="Color/Tint" />
+ <button label="Lav nye strømper" label_selected="Lav nye strømper" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ </panel>
+ <panel label="Jakke" name="Jacket">
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag en ny jakke på ved at trække en fra din beholdning
+over på din avatar.
+Du kan også oprette en ny jakke fra bunden og bagefter 'tage den på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ <texture_picker label="Stof øverst" name="Upper Fabric" />
+ <texture_picker label="Stof nederst" name="Lower Fabric" />
+ <color_swatch label="Farve" name="Color/Tint" />
+ <button label="Lav ny jakke" label_selected="Lav ny jakke" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ </panel>
+ <panel label="Handsker" name="Gloves">
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag nye handsker på ved at trække et par fra din beholdning
+over på din avatar.
+Du kan også oprette nye handsker fra bunden og bagefter 'tage dem på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ <texture_picker label="Stof" name="Fabric" />
+ <color_swatch label="Farve" name="Color/Tint" />
+ <button label="Lav nye handsker" label_selected="Lav nye handsker" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ </panel>
+ <panel label="Undertrøje" name="Undershirt">
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag en ny undertrøje på ved at trække en fra din beholdning
+over på din avatar.
+Du kan også oprette en ny undertrøje fra bunden og bagefter 'tage den på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ <texture_picker label="Stof" name="Fabric" />
+ <color_swatch label="Farve" name="Color/Tint" />
+ <button label="Lav ny undertrøje" label_selected="Lav ny undertrøje" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ </panel>
+ <panel label="Underbukser" name="Underpants">
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag nye underbukser på ved at trække dem fra din beholdning
+over på din avatar.
+Du kan også oprette en par nye underbukser fra bunden og bagefter 'tage dem på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ <texture_picker label="Stof" name="Fabric" />
+ <color_swatch label="Farve" name="Color/Tint" />
+ <button label="Lav nye underbukser" label_selected="Lav nye underbukser" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ </panel>
+ <panel label="Nederdel" name="Skirt">
+ <text type="string" length="1" name="title">
+ [DESC]
+ </text>
+ <text type="string" length="1" name="title_no_modify">
+ [DESC]: Kan ikke redigeres
+ </text>
+ <text type="string" length="1" name="title_loading">
+ [DESC]: indlæser...
+ </text>
+ <text type="string" length="1" name="title_not_worn">
+ [DESC]: ikke båret
+ </text>
+ <text type="string" length="1" name="path">
+ Fundet i [PATH]
+ </text>
+ <text type="string" length="1" name="not worn instructions">
+ Tag en ny nederdel på ved at trække en fra din beholdning
+over på din avatar.
+Du kan også oprette en ny nederdel fra bunden og bagefter 'tage den på'.
+ </text>
+ <text type="string" length="1" name="no modify instructions">
+ Du har ikke rettigheder til at redigere denne del.
+ </text>
+ <texture_picker label="Stof" name="Fabric" />
+ <color_swatch label="Farve" name="Color/Tint" />
+ <button label="Lav ny nederdel" label_selected="Lav ny nederdel" name="Create New" />
+ <button label="Tag af" label_selected="Tag af" name="Take Off" />
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Gem som" label_selected="Gem som" name="Save As" />
+ <button label="Annullér" label_selected="Annullér" name="Revert" />
+ </panel>
+ </tab_container>
+ <button label="Luk" label_selected="Luk" name="Close" />
+ <button label="Gem alt" label_selected="Gem alt" name="Save All" />
+ <button label="Opret sæt" label_selected="Opret sæt" name="Make Outfit" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml
index 94aaa6c688..140b3d47d6 100644
--- a/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/da/floater_day_cycle_options.xml
@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Day Cycle Floater" title="Dag cyklus opsætning">
- <tab_container name="Day Cycle Tabs">
- <panel label="Dag cyklus" name="Day Cycle">
- <button label="?" name="WLDayCycleHelp" />
- <multi_slider label="" name="WLTimeSlider" />
- <multi_slider label="" name="WLDayCycleKeys" />
- <text type="string" length="1" name="WL12am">
- 00:00
- </text>
- <text type="string" length="1" name="WL3am">
- 03:00
- </text>
- <text type="string" length="1" name="WL6am">
- 06:00
- </text>
- <text type="string" length="1" name="WL9amHash">
- 09:00
- </text>
- <text type="string" length="1" name="WL12pmHash">
- 12:00
- </text>
- <text type="string" length="1" name="WL3pm">
- 15:00
- </text>
- <text type="string" length="1" name="WL6pm">
- 18:00
- </text>
- <text type="string" length="1" name="WL9pm">
- 21:00
- </text>
- <text type="string" length="1" name="WL12am2">
- 00:00
- </text>
- <text type="string" length="1" name="WL12amHash">
- |
- </text>
- <text type="string" length="1" name="WL3amHash">
- I
- </text>
- <text type="string" length="1" name="WL6amHash">
- |
- </text>
- <text type="string" length="1" name="WL9amHash2">
- I
- </text>
- <text type="string" length="1" name="WL12pmHash2">
- |
- </text>
- <text type="string" length="1" name="WL3pmHash">
- I
- </text>
- <text type="string" length="1" name="WL6pmHash">
- |
- </text>
- <text type="string" length="1" name="WL9pmHash">
- I
- </text>
- <text type="string" length="1" name="WL12amHash2">
- |
- </text>
- <button label="Tilføj key" label_selected="Tilføj key" name="WLAddKey" />
- <button label="Slet key" label_selected="Slet key" name="WLDeleteKey" />
- <text type="string" length="1" name="WLCurKeyFrameText">
- Key-frame indstillinger:
- </text>
- <text type="string" length="1" name="WLCurKeyTimeText">
- Key tid:
- </text>
- <spinner label="Timer" name="WLCurKeyHour" />
- <spinner label="Min." name="WLCurKeyMin" />
- <text type="string" length="1" name="WLCurKeyTimeText2">
- Key fast indstilling:
- </text>
- <combo_box label="Faste" name="WLKeyPresets" />
- <text type="string" length="1" name="DayCycleText">
- Snap:
- </text>
- <combo_box label="5 min" name="WLSnapOptions" />
- <text type="string" length="1" name="DayCycleText2">
- Cycluslængde:
- </text>
- <spinner label="Timer" name="WLLengthOfDayHour" />
- <spinner label="Min." name="WLLengthOfDayMin" />
- <spinner label="Sek." name="WLLengthOfDaySec" />
- <text type="string" length="1" name="DayCycleText3">
- Vis:
- </text>
- <button label="Afspil" label_selected="Afspil" name="WLAnimSky" />
- <button label="Stop!" label_selected="Stop" name="WLStopAnimSky" />
- <button label="Benyt estate tid" label_selected="GÃ¥ til estate tid"
- name="WLUseLindenTime" />
- <button label="Gem test-dag" label_selected="Gem test-dag" name="WLSaveDayCycle" />
- <button label="Hent test-dag" label_selected="Hent test-dag" name="WLLoadDayCycle" />
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Day Cycle Floater" title="Dag cyklus opsætning">
+ <tab_container name="Day Cycle Tabs">
+ <panel label="Dag cyklus" name="Day Cycle">
+ <button label="?" name="WLDayCycleHelp" />
+ <multi_slider label="" name="WLTimeSlider" />
+ <multi_slider label="" name="WLDayCycleKeys" />
+ <text type="string" length="1" name="WL12am">
+ 00:00
+ </text>
+ <text type="string" length="1" name="WL3am">
+ 03:00
+ </text>
+ <text type="string" length="1" name="WL6am">
+ 06:00
+ </text>
+ <text type="string" length="1" name="WL9amHash">
+ 09:00
+ </text>
+ <text type="string" length="1" name="WL12pmHash">
+ 12:00
+ </text>
+ <text type="string" length="1" name="WL3pm">
+ 15:00
+ </text>
+ <text type="string" length="1" name="WL6pm">
+ 18:00
+ </text>
+ <text type="string" length="1" name="WL9pm">
+ 21:00
+ </text>
+ <text type="string" length="1" name="WL12am2">
+ 00:00
+ </text>
+ <text type="string" length="1" name="WL12amHash">
+ |
+ </text>
+ <text type="string" length="1" name="WL3amHash">
+ I
+ </text>
+ <text type="string" length="1" name="WL6amHash">
+ |
+ </text>
+ <text type="string" length="1" name="WL9amHash2">
+ I
+ </text>
+ <text type="string" length="1" name="WL12pmHash2">
+ |
+ </text>
+ <text type="string" length="1" name="WL3pmHash">
+ I
+ </text>
+ <text type="string" length="1" name="WL6pmHash">
+ |
+ </text>
+ <text type="string" length="1" name="WL9pmHash">
+ I
+ </text>
+ <text type="string" length="1" name="WL12amHash2">
+ |
+ </text>
+ <button label="Tilføj key" label_selected="Tilføj key" name="WLAddKey" />
+ <button label="Slet key" label_selected="Slet key" name="WLDeleteKey" />
+ <text type="string" length="1" name="WLCurKeyFrameText">
+ Key-frame indstillinger:
+ </text>
+ <text type="string" length="1" name="WLCurKeyTimeText">
+ Key tid:
+ </text>
+ <spinner label="Timer" name="WLCurKeyHour" />
+ <spinner label="Min." name="WLCurKeyMin" />
+ <text type="string" length="1" name="WLCurKeyTimeText2">
+ Key fast indstilling:
+ </text>
+ <combo_box label="Faste" name="WLKeyPresets" />
+ <text type="string" length="1" name="DayCycleText">
+ Snap:
+ </text>
+ <combo_box label="5 min" name="WLSnapOptions" />
+ <text type="string" length="1" name="DayCycleText2">
+ Cycluslængde:
+ </text>
+ <spinner label="Timer" name="WLLengthOfDayHour" />
+ <spinner label="Min." name="WLLengthOfDayMin" />
+ <spinner label="Sek." name="WLLengthOfDaySec" />
+ <text type="string" length="1" name="DayCycleText3">
+ Vis:
+ </text>
+ <button label="Afspil" label_selected="Afspil" name="WLAnimSky" />
+ <button label="Stop!" label_selected="Stop" name="WLStopAnimSky" />
+ <button label="Benyt estate tid" label_selected="GÃ¥ til estate tid"
+ name="WLUseLindenTime" />
+ <button label="Gem test-dag" label_selected="Gem test-dag" name="WLSaveDayCycle" />
+ <button label="Hent test-dag" label_selected="Hent test-dag" name="WLLoadDayCycle" />
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_device_settings.xml b/indra/newview/skins/default/xui/da/floater_device_settings.xml
index d683251030..28afd7c459 100644
--- a/indra/newview/skins/default/xui/da/floater_device_settings.xml
+++ b/indra/newview/skins/default/xui/da/floater_device_settings.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_device_settings" title="Stemme chat indstillinger" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_device_settings" title="Stemme chat indstillinger" />
diff --git a/indra/newview/skins/default/xui/da/floater_inventory.xml b/indra/newview/skins/default/xui/da/floater_inventory.xml
index 4015d51776..0b931bd7f4 100644
--- a/indra/newview/skins/default/xui/da/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/da/floater_inventory.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Inventory" title="Beholdning">
- <search_editor label="Skriv her for at søge" name="inventory search editor" />
- <tab_container name="inventory filter tabs">
- <inventory_panel label="Alle ting" name="All Items" />
- <inventory_panel label="Nye ting" name="Recent Items" />
- </tab_container>
- <menu_bar name="Inventory Menu">
- <menu label="Filer" name="File">
- <menu_item_call label="Ã…ben" name="Open" />
- <menu_item_call label="Nyt vindue" name="New Window" />
- <menu_item_call label="Vis filtre" name="Show Filters" />
- <menu_item_call label="Nulstil filtre" name="Reset Current" />
- <menu_item_call label="Luk alle mapper" name="Close All Folders" />
- <menu_item_call label="Tøm papirkurv" name="Empty Trash" />
- </menu>
- <menu label="Opret" name="Create">
- <menu_item_call label="Ny mappe" name="New Folder" />
- <menu_item_call label="Nyt script" name="New Script" />
- <menu_item_call label="Ny note" name="New Note" />
- <menu_item_call label="Ny bevægelse" name="New Gesture" />
- <menu name="New Clothes">
- <menu_item_call label="Ny trøje" name="New Shirt" />
- <menu_item_call label="Nye bukser" name="New Pants" />
- <menu_item_call label="Nye sko" name="New Shoes" />
- <menu_item_call label="Nye strømper" name="New Socks" />
- <menu_item_call label="Ny jakke" name="New Jacket" />
- <menu_item_call label="Ny nederdel" name="New Skirt" />
- <menu_item_call label="Nye handsker" name="New Gloves" />
- <menu_item_call label="Ny undertrøje" name="New Undershirt" />
- <menu_item_call label="Nye underbukser" name="New Underpants" />
- </menu>
- <menu name="New Body Parts">
- <menu_item_call label="Ny figur" name="New Shape" />
- <menu_item_call label="Ny hud" name="New Skin" />
- <menu_item_call label="Nyt hår" name="New Hair" />
- <menu_item_call label="Nye øjne" name="New Eyes" />
- </menu>
- </menu>
- <menu label="Sortér" name="Sort">
- <menu_item_check label="Efter navn" name="By Name" />
- <menu_item_check label="Efter dato" name="By Date" />
- <menu_item_check label="Altid mapper efter navn" name="Folders Always By Name" />
- <menu_item_check label="System-mapper i toppen" name="System Folders To Top" />
- </menu>
- </menu_bar>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Inventory" title="Beholdning">
+ <search_editor label="Skriv her for at søge" name="inventory search editor" />
+ <tab_container name="inventory filter tabs">
+ <inventory_panel label="Alle ting" name="All Items" />
+ <inventory_panel label="Nye ting" name="Recent Items" />
+ </tab_container>
+ <menu_bar name="Inventory Menu">
+ <menu label="Filer" name="File">
+ <menu_item_call label="Ã…ben" name="Open" />
+ <menu_item_call label="Nyt vindue" name="New Window" />
+ <menu_item_call label="Vis filtre" name="Show Filters" />
+ <menu_item_call label="Nulstil filtre" name="Reset Current" />
+ <menu_item_call label="Luk alle mapper" name="Close All Folders" />
+ <menu_item_call label="Tøm papirkurv" name="Empty Trash" />
+ </menu>
+ <menu label="Opret" name="Create">
+ <menu_item_call label="Ny mappe" name="New Folder" />
+ <menu_item_call label="Nyt script" name="New Script" />
+ <menu_item_call label="Ny note" name="New Note" />
+ <menu_item_call label="Ny bevægelse" name="New Gesture" />
+ <menu name="New Clothes">
+ <menu_item_call label="Ny trøje" name="New Shirt" />
+ <menu_item_call label="Nye bukser" name="New Pants" />
+ <menu_item_call label="Nye sko" name="New Shoes" />
+ <menu_item_call label="Nye strømper" name="New Socks" />
+ <menu_item_call label="Ny jakke" name="New Jacket" />
+ <menu_item_call label="Ny nederdel" name="New Skirt" />
+ <menu_item_call label="Nye handsker" name="New Gloves" />
+ <menu_item_call label="Ny undertrøje" name="New Undershirt" />
+ <menu_item_call label="Nye underbukser" name="New Underpants" />
+ </menu>
+ <menu name="New Body Parts">
+ <menu_item_call label="Ny figur" name="New Shape" />
+ <menu_item_call label="Ny hud" name="New Skin" />
+ <menu_item_call label="Nyt hår" name="New Hair" />
+ <menu_item_call label="Nye øjne" name="New Eyes" />
+ </menu>
+ </menu>
+ <menu label="Sortér" name="Sort">
+ <menu_item_check label="Efter navn" name="By Name" />
+ <menu_item_check label="Efter dato" name="By Date" />
+ <menu_item_check label="Altid mapper efter navn" name="Folders Always By Name" />
+ <menu_item_check label="System-mapper i toppen" name="System Folders To Top" />
+ </menu>
+ </menu_bar>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
index a17db85fea..96039c8444 100644
--- a/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="item properties" title="Egenskaber for Objekt i Beholdning">
- <text name="LabelItemNameTitle">
- Navn:
- </text>
- <text name="LabelItemDescTitle">
- Beskrivelse:
- </text>
- <text name="LabelCreatorTitle">
- Skaber:
- </text>
- <text name="LabelCreatorName">
- Nicole Linden
- </text>
- <button label="Profil..." label_selected="" name="BtnCreator" />
- <text name="LabelOwnerTitle">
- Ejer:
- </text>
- <text name="LabelOwnerName">
- Thrax Linden
- </text>
- <button label="Profil..." label_selected="" name="BtnOwner" />
- <text name="LabelAcquiredTitle">
- Erhvervet:
- </text>
- <text name="LabelAcquiredDate">
- Wed May 24 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- Du kan:
- </text>
- <check_box label="Redigere" name="CheckOwnerModify" />
- <check_box label="Kopiere" name="CheckOwnerCopy" />
- <check_box label="Sælge/give væk" name="CheckOwnerTransfer" />
- <text name="BaseMaskDebug">
- S:
- </text>
- <text name="OwnerMaskDebug">
- E:
- </text>
- <text name="GroupMaskDebug">
- G:
- </text>
- <text name="EveryoneMaskDebug">
- A:
- </text>
- <text name="NextMaskDebug">
- N:
- </text>
- <check_box label="Del med gruppe" name="CheckShareWithGroup" />
- <check_box label="Tillad alle at kopiere" name="CheckEveryoneCopy" />
- <text name="NextOwnerLabel">
- Næste ejer kan:
- </text>
- <check_box label="Redigere" name="CheckNextOwnerModify" />
- <check_box label="Kopiere" name="CheckNextOwnerCopy" />
- <check_box label="Sælge/Give væk" name="CheckNextOwnerTransfer" />
- <text name="SaleLabel">
- Markér ting:
- </text>
- <check_box label="Til salg" name="CheckPurchase" />
- <radio_group name="RadioSaleType">
- <radio_item name="radio">
- Original
- </radio_item>
- <radio_item name="radio2">
- Kopi
- </radio_item>
- </radio_group>
- <text name="TextPrice">
- Pris: L$
- </text>
- <string name="unknown">
- (ukendt)
- </string>
- <string name="public">
- (offentlig)
- </string>
- <string name="you_can">
- Du kan:
- </string>
- <string name="owner_can">
- Ejer kan:
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="item properties" title="Egenskaber for Objekt i Beholdning">
+ <text name="LabelItemNameTitle">
+ Navn:
+ </text>
+ <text name="LabelItemDescTitle">
+ Beskrivelse:
+ </text>
+ <text name="LabelCreatorTitle">
+ Skaber:
+ </text>
+ <text name="LabelCreatorName">
+ Nicole Linden
+ </text>
+ <button label="Profil..." label_selected="" name="BtnCreator" />
+ <text name="LabelOwnerTitle">
+ Ejer:
+ </text>
+ <text name="LabelOwnerName">
+ Thrax Linden
+ </text>
+ <button label="Profil..." label_selected="" name="BtnOwner" />
+ <text name="LabelAcquiredTitle">
+ Erhvervet:
+ </text>
+ <text name="LabelAcquiredDate">
+ Wed May 24 12:50:46 2006
+ </text>
+ <text name="OwnerLabel">
+ Du kan:
+ </text>
+ <check_box label="Redigere" name="CheckOwnerModify" />
+ <check_box label="Kopiere" name="CheckOwnerCopy" />
+ <check_box label="Sælge/give væk" name="CheckOwnerTransfer" />
+ <text name="BaseMaskDebug">
+ S:
+ </text>
+ <text name="OwnerMaskDebug">
+ E:
+ </text>
+ <text name="GroupMaskDebug">
+ G:
+ </text>
+ <text name="EveryoneMaskDebug">
+ A:
+ </text>
+ <text name="NextMaskDebug">
+ N:
+ </text>
+ <check_box label="Del med gruppe" name="CheckShareWithGroup" />
+ <check_box label="Tillad alle at kopiere" name="CheckEveryoneCopy" />
+ <text name="NextOwnerLabel">
+ Næste ejer kan:
+ </text>
+ <check_box label="Redigere" name="CheckNextOwnerModify" />
+ <check_box label="Kopiere" name="CheckNextOwnerCopy" />
+ <check_box label="Sælge/Give væk" name="CheckNextOwnerTransfer" />
+ <text name="SaleLabel">
+ Markér ting:
+ </text>
+ <check_box label="Til salg" name="CheckPurchase" />
+ <radio_group name="RadioSaleType">
+ <radio_item name="radio">
+ Original
+ </radio_item>
+ <radio_item name="radio2">
+ Kopi
+ </radio_item>
+ </radio_group>
+ <text name="TextPrice">
+ Pris: L$
+ </text>
+ <string name="unknown">
+ (ukendt)
+ </string>
+ <string name="public">
+ (offentlig)
+ </string>
+ <string name="you_can">
+ Du kan:
+ </string>
+ <string name="owner_can">
+ Ejer kan:
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_joystick.xml b/indra/newview/skins/default/xui/da/floater_joystick.xml
index 343c80f678..72439ac4e0 100644
--- a/indra/newview/skins/default/xui/da/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/da/floater_joystick.xml
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Joystick" title="Joystick opsætning">
- <check_box name="enable_joystick">
- Aktiver Joystick:
- </check_box>
- <spinner label="X akse mapping" name="JoystickAxis1" />
- <spinner label="Y akse mapping" name="JoystickAxis2" />
- <spinner label="Z akse mapping" name="JoystickAxis0" />
- <spinner label="Hældning mapping" name="JoystickAxis4" />
- <spinner label="Drejning mapping" name="JoystickAxis5" />
- <spinner label="Rulning mapping" name="JoystickAxis3" />
- <spinner label="Zoom mapping" name="JoystickAxis6" />
- <check_box label="Direkte zoom" name="ZoomDirect" />
- <check_box label="3D Cursor" name="Cursor3D" />
- <check_box label="Auto opret" name="AutoLeveling" />
- <text type="string" length="1" name="Control Modes:">
- Kontrollér:
- </text>
- <check_box name="JoystickAvatarEnabled">
- Avatar
- </check_box>
- <check_box name="JoystickBuildEnabled">
- Build
- </check_box>
- <check_box name="JoystickFlycamEnabled">
- Flycam
- </check_box>
- <text name="XScale">
- X følsomhed
- </text>
- <text name="YScale">
- Y følsomhed
- </text>
- <text name="ZScale">
- Z følsomhed
- </text>
- <text name="PitchScale">
- Hæld følsomhed
- </text>
- <text name="YawScale">
- Drej følsomhed
- </text>
- <text name="RollScale">
- Rul følsomhed
- </text>
- <text name="XDeadZone">
- X min. udslag
- </text>
- <text name="YDeadZone">
- Y min. udslag
- </text>
- <text name="ZDeadZone">
- Z min. udslag
- </text>
- <text name="PitchDeadZone">
- Hæld min. udslag
- </text>
- <text name="YawDeadZone">
- Drej min. udslag
- </text>
- <text name="RollDeadZone">
- Rul min. udslag
- </text>
- <text name="Feathering">
- Respons
- </text>
- <slider label="" name="AvatarFeathering" />
- <slider label="" name="BuildFeathering" />
- <slider label="" name="FlycamFeathering" />
- <text name="ZoomScale2">
- Zoom følsomhed
- </text>
- <spinner label="" name="FlycamAxisScale6" />
- <text name="ZoomDeadZone">
- Zoom min. udslag
- </text>
- <spinner label="" name="FlycamAxisDeadZone6" />
- <button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults" />
- <string name="JoystickMonitor">
- Joystick Overvågning
- </string>
- <string name="Axis">
- Akse [NUM]
- </string>
- <string name="NoDevice">
- intet joystick fundet
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Joystick" title="Joystick opsætning">
+ <check_box name="enable_joystick">
+ Aktiver Joystick:
+ </check_box>
+ <spinner label="X akse mapping" name="JoystickAxis1" />
+ <spinner label="Y akse mapping" name="JoystickAxis2" />
+ <spinner label="Z akse mapping" name="JoystickAxis0" />
+ <spinner label="Hældning mapping" name="JoystickAxis4" />
+ <spinner label="Drejning mapping" name="JoystickAxis5" />
+ <spinner label="Rulning mapping" name="JoystickAxis3" />
+ <spinner label="Zoom mapping" name="JoystickAxis6" />
+ <check_box label="Direkte zoom" name="ZoomDirect" />
+ <check_box label="3D Cursor" name="Cursor3D" />
+ <check_box label="Auto opret" name="AutoLeveling" />
+ <text type="string" length="1" name="Control Modes:">
+ Kontrollér:
+ </text>
+ <check_box name="JoystickAvatarEnabled">
+ Avatar
+ </check_box>
+ <check_box name="JoystickBuildEnabled">
+ Build
+ </check_box>
+ <check_box name="JoystickFlycamEnabled">
+ Flycam
+ </check_box>
+ <text name="XScale">
+ X følsomhed
+ </text>
+ <text name="YScale">
+ Y følsomhed
+ </text>
+ <text name="ZScale">
+ Z følsomhed
+ </text>
+ <text name="PitchScale">
+ Hæld følsomhed
+ </text>
+ <text name="YawScale">
+ Drej følsomhed
+ </text>
+ <text name="RollScale">
+ Rul følsomhed
+ </text>
+ <text name="XDeadZone">
+ X min. udslag
+ </text>
+ <text name="YDeadZone">
+ Y min. udslag
+ </text>
+ <text name="ZDeadZone">
+ Z min. udslag
+ </text>
+ <text name="PitchDeadZone">
+ Hæld min. udslag
+ </text>
+ <text name="YawDeadZone">
+ Drej min. udslag
+ </text>
+ <text name="RollDeadZone">
+ Rul min. udslag
+ </text>
+ <text name="Feathering">
+ Respons
+ </text>
+ <slider label="" name="AvatarFeathering" />
+ <slider label="" name="BuildFeathering" />
+ <slider label="" name="FlycamFeathering" />
+ <text name="ZoomScale2">
+ Zoom følsomhed
+ </text>
+ <spinner label="" name="FlycamAxisScale6" />
+ <text name="ZoomDeadZone">
+ Zoom min. udslag
+ </text>
+ <spinner label="" name="FlycamAxisDeadZone6" />
+ <button label="SpaceNavigator Defaults" name="SpaceNavigatorDefaults" />
+ <string name="JoystickMonitor">
+ Joystick Overvågning
+ </string>
+ <string name="Axis">
+ Akse [NUM]
+ </string>
+ <string name="NoDevice">
+ intet joystick fundet
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_lagmeter.xml b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
index decf0f69e5..b2cbebfe52 100644
--- a/indra/newview/skins/default/xui/da/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/da/floater_lagmeter.xml
@@ -1,156 +1,156 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_lagmeter" title="Lag måler">
- <button label="" label_selected="" name="client_lagmeter" />
- <text name="client">
- Klient:
- </text>
- <text name="client_text">
- Normal
- </text>
- <button label="" label_selected="" name="network_lagmeter"
- tool_tip="Network lag status" />
- <text name="network">
- Netværk:
- </text>
- <text name="network_text">
- Normal
- </text>
- <button label="" label_selected="" name="server_lagmeter" />
- <text name="server">
- Server:
- </text>
- <text name="server_text">
- Normal
- </text>
- <button label="?" name="server_help" />
- <button label=">>" name="minimize" />
- <string name="max_title_msg">
- Lag måler
- </string>
- <string name="max_width_px">
- 360
- </string>
- <string name="min_title_msg">
- Lag
- </string>
- <string name="min_width_px">
- 90
- </string>
- <string name="client_text_msg">
- Klient
- </string>
- <string name="client_frame_rate_critical_fps">
- 10
- </string>
- <string name="client_frame_rate_warning_fps">
- 15
- </string>
- <string name="client_frame_time_window_bg_msg">
- Normal, vindue i baggrund
- </string>
- <string name="client_frame_time_critical_msg">
- Klients billeder/sek under [CLIENT_FRAME_RATE_CRITICAL]
- </string>
- <string name="client_frame_time_warning_msg">
- Klients billeder/sek mellem [CLIENT_FRAME_RATE_CRITICAL] og [CLIENT_FRAME_RATE_WARNING]
- </string>
- <string name="client_frame_time_normal_msg">
- Normal
- </string>
- <string name="client_draw_distance_cause_msg">
- Mulig årsag: 'Vis afstand' sat for højt i grafik indstillinger
- </string>
- <string name="client_texture_loading_cause_msg">
- Mulig årsag: Billeder hentes
- </string>
- <string name="client_texture_memory_cause_msg">
- Mulig årsag: For mange billeder i hukommelse
- </string>
- <string name="client_complex_objects_cause_msg">
- Mulig årsag: For mange komplekse objekter i scenariet
- </string>
- <string name="network_text_msg">
- Netværk
- </string>
- <string name="network_packet_loss_critical_pct">
- 10
- </string>
- <string name="network_packet_loss_warning_pct">
- 5
- </string>
- <string name="network_packet_loss_critical_msg">
- Forbindelsen mister over [NETWORK_PACKET_LOSS_CRITICAL]% pakker
- </string>
- <string name="network_packet_loss_warning_msg">
- Forbindelsen mister [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% pakker
- </string>
- <string name="network_performance_normal_msg">
- Normal
- </string>
- <string name="network_ping_critical_ms">
- 600
- </string>
- <string name="network_ping_warning_ms">
- 300
- </string>
- <string name="network_ping_critical_msg">
- Forbindelsens ping tider er over [NETWORK_PING_CRITICAL] ms
- </string>
- <string name="network_ping_warning_msg">
- Forbindelsens ping tider er [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
- </string>
- <string name="network_packet_loss_cause_msg">
- Muligvis dårlig forbindelse eller 'båndbredde' sat for højt i netværksopsætning.
- </string>
- <string name="network_ping_cause_msg">
- Muligvis dårlig forbindelse eller fil delings program.
- </string>
- <string name="server_text_msg">
- Server
- </string>
- <string name="server_frame_rate_critical_fps">
- 20
- </string>
- <string name="server_frame_rate_warning_fps">
- 30
- </string>
- <string name="server_single_process_max_time_ms">
- 20
- </string>
- <string name="server_frame_time_critical_msg">
- Simulator framerate er under [SERVER_FRAME_RATE_CRITICAL]
- </string>
- <string name="server_frame_time_warning_msg">
- Simulator framerate er mellem [SERVER_FRAME_RATE_CRITICAL] og [SERVER_FRAME_RATE_WARNING]
- </string>
- <string name="server_frame_time_normal_msg">
- Normal
- </string>
- <string name="server_frame_time_normal_msg">
- Normal
- </string>
- <string name="server_physics_cause_msg">
- Mulig årsag: For mange fysiske objekter
- </string>
- <string name="server_scripts_cause_msg">
- Mulig årsag: For mange objekter med script
- </string>
- <string name="server_net_cause_msg">
- Mulig årsag: For meget netværks trafik
- </string>
- <string name="server_agent_cause_msg">
- Mulig årsag: For mange avatarer i bevægelse i regionen
- </string>
- <string name="server_images_cause_msg">
- Mulig årsag: For mange billed udregninger
- </string>
- <string name="server_generic_cause_msg">
- Mulig årsag: Simulator belastning for stor
- </string>
- <string name="smaller_label">
- >>
- </string>
- <string name="bigger_label">
- <<
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_lagmeter" title="Lag måler">
+ <button label="" label_selected="" name="client_lagmeter" />
+ <text name="client">
+ Klient:
+ </text>
+ <text name="client_text">
+ Normal
+ </text>
+ <button label="" label_selected="" name="network_lagmeter"
+ tool_tip="Network lag status" />
+ <text name="network">
+ Netværk:
+ </text>
+ <text name="network_text">
+ Normal
+ </text>
+ <button label="" label_selected="" name="server_lagmeter" />
+ <text name="server">
+ Server:
+ </text>
+ <text name="server_text">
+ Normal
+ </text>
+ <button label="?" name="server_help" />
+ <button label=">>" name="minimize" />
+ <string name="max_title_msg">
+ Lag måler
+ </string>
+ <string name="max_width_px">
+ 360
+ </string>
+ <string name="min_title_msg">
+ Lag
+ </string>
+ <string name="min_width_px">
+ 90
+ </string>
+ <string name="client_text_msg">
+ Klient
+ </string>
+ <string name="client_frame_rate_critical_fps">
+ 10
+ </string>
+ <string name="client_frame_rate_warning_fps">
+ 15
+ </string>
+ <string name="client_frame_time_window_bg_msg">
+ Normal, vindue i baggrund
+ </string>
+ <string name="client_frame_time_critical_msg">
+ Klients billeder/sek under [CLIENT_FRAME_RATE_CRITICAL]
+ </string>
+ <string name="client_frame_time_warning_msg">
+ Klients billeder/sek mellem [CLIENT_FRAME_RATE_CRITICAL] og [CLIENT_FRAME_RATE_WARNING]
+ </string>
+ <string name="client_frame_time_normal_msg">
+ Normal
+ </string>
+ <string name="client_draw_distance_cause_msg">
+ Mulig årsag: 'Vis afstand' sat for højt i grafik indstillinger
+ </string>
+ <string name="client_texture_loading_cause_msg">
+ Mulig årsag: Billeder hentes
+ </string>
+ <string name="client_texture_memory_cause_msg">
+ Mulig årsag: For mange billeder i hukommelse
+ </string>
+ <string name="client_complex_objects_cause_msg">
+ Mulig årsag: For mange komplekse objekter i scenariet
+ </string>
+ <string name="network_text_msg">
+ Netværk
+ </string>
+ <string name="network_packet_loss_critical_pct">
+ 10
+ </string>
+ <string name="network_packet_loss_warning_pct">
+ 5
+ </string>
+ <string name="network_packet_loss_critical_msg">
+ Forbindelsen mister over [NETWORK_PACKET_LOSS_CRITICAL]% pakker
+ </string>
+ <string name="network_packet_loss_warning_msg">
+ Forbindelsen mister [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% pakker
+ </string>
+ <string name="network_performance_normal_msg">
+ Normal
+ </string>
+ <string name="network_ping_critical_ms">
+ 600
+ </string>
+ <string name="network_ping_warning_ms">
+ 300
+ </string>
+ <string name="network_ping_critical_msg">
+ Forbindelsens ping tider er over [NETWORK_PING_CRITICAL] ms
+ </string>
+ <string name="network_ping_warning_msg">
+ Forbindelsens ping tider er [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+ </string>
+ <string name="network_packet_loss_cause_msg">
+ Muligvis dårlig forbindelse eller 'båndbredde' sat for højt i netværksopsætning.
+ </string>
+ <string name="network_ping_cause_msg">
+ Muligvis dårlig forbindelse eller fil delings program.
+ </string>
+ <string name="server_text_msg">
+ Server
+ </string>
+ <string name="server_frame_rate_critical_fps">
+ 20
+ </string>
+ <string name="server_frame_rate_warning_fps">
+ 30
+ </string>
+ <string name="server_single_process_max_time_ms">
+ 20
+ </string>
+ <string name="server_frame_time_critical_msg">
+ Simulator framerate er under [SERVER_FRAME_RATE_CRITICAL]
+ </string>
+ <string name="server_frame_time_warning_msg">
+ Simulator framerate er mellem [SERVER_FRAME_RATE_CRITICAL] og [SERVER_FRAME_RATE_WARNING]
+ </string>
+ <string name="server_frame_time_normal_msg">
+ Normal
+ </string>
+ <string name="server_frame_time_normal_msg">
+ Normal
+ </string>
+ <string name="server_physics_cause_msg">
+ Mulig årsag: For mange fysiske objekter
+ </string>
+ <string name="server_scripts_cause_msg">
+ Mulig årsag: For mange objekter med script
+ </string>
+ <string name="server_net_cause_msg">
+ Mulig årsag: For meget netværks trafik
+ </string>
+ <string name="server_agent_cause_msg">
+ Mulig årsag: For mange avatarer i bevægelse i regionen
+ </string>
+ <string name="server_images_cause_msg">
+ Mulig årsag: For mange billed udregninger
+ </string>
+ <string name="server_generic_cause_msg">
+ Mulig årsag: Simulator belastning for stor
+ </string>
+ <string name="smaller_label">
+ >>
+ </string>
+ <string name="bigger_label">
+ <<
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_land_holdings.xml b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
index 14043cadab..fcb159664c 100644
--- a/indra/newview/skins/default/xui/da/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/da/floater_land_holdings.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="land holdings floater" title="Mit land">
- <scroll_list name="parcel list">
- <column label="Navn" name="name" />
- <column label="Lokation" name="location" />
- <column label="Område" name="area" />
- <column label="" name="hidden" />
- </scroll_list>
- <button label="Teleport" label_selected="Teleport" name="Teleport" />
- <button label="Vis på kort" label_selected="Vis på kort" name="Show on Map" />
- <text name="contrib_label">
- Bidrag til dine grupper:
- </text>
- <scroll_list name="grant list">
- <column label="Gruppe" name="group" />
- <column label="Område" name="area" />
- </scroll_list>
- <text name="allowed_label">
- Tilladt land ifølge nuværende betalingsaftale:
- </text>
- <text name="allowed_text">
- [AREA] m²
- </text>
- <text name="current_label">
- Nuværende besiddelser:
- </text>
- <text name="current_text">
- [AREA] m²
- </text>
- <text name="available_label">
- Antal m² der kan købes:
- </text>
- <text name="available_text">
- [AREA] m²
- </text>
- <string name="area_string">
- [AREA] m²
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="land holdings floater" title="Mit land">
+ <scroll_list name="parcel list">
+ <column label="Navn" name="name" />
+ <column label="Lokation" name="location" />
+ <column label="Område" name="area" />
+ <column label="" name="hidden" />
+ </scroll_list>
+ <button label="Teleport" label_selected="Teleport" name="Teleport" />
+ <button label="Vis på kort" label_selected="Vis på kort" name="Show on Map" />
+ <text name="contrib_label">
+ Bidrag til dine grupper:
+ </text>
+ <scroll_list name="grant list">
+ <column label="Gruppe" name="group" />
+ <column label="Område" name="area" />
+ </scroll_list>
+ <text name="allowed_label">
+ Tilladt land ifølge nuværende betalingsaftale:
+ </text>
+ <text name="allowed_text">
+ [AREA] m²
+ </text>
+ <text name="current_label">
+ Nuværende besiddelser:
+ </text>
+ <text name="current_text">
+ [AREA] m²
+ </text>
+ <text name="available_label">
+ Antal m² der kan købes:
+ </text>
+ <text name="available_text">
+ [AREA] m²
+ </text>
+ <string name="area_string">
+ [AREA] m²
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
index 388e7d7ad3..112dc70e45 100644
--- a/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/da/floater_live_lsleditor.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script ed float" title="Script: Nyt script">
- <button label="Nulstil" label_selected="Reset" name="Reset" />
- <check_box label="Kører" name="running" />
- <check_box label="Mono" name="mono" />
- <string name="not_allowed">
- Du har ikke rettigheder til at se dette script.
- </string>
- <string name="script_running">
- Kører
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="Script: Nyt script">
+ <button label="Nulstil" label_selected="Reset" name="Reset" />
+ <check_box label="Kører" name="running" />
+ <check_box label="Mono" name="mono" />
+ <string name="not_allowed">
+ Du har ikke rettigheder til at se dette script.
+ </string>
+ <string name="script_running">
+ Kører
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
index 4ba8787651..07ea6930ea 100644
--- a/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/da/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script ed float" title="LSL Wiki">
- <check_box label="Følg markøreren" name="lock_check" />
- <combo_box label="LÃ¥s" name="history_combo" />
- <button label="Tilbage" name="back_btn" />
- <button label="Frem" name="fwd_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="LSL Wiki">
+ <check_box label="Følg markøreren" name="lock_check" />
+ <combo_box label="LÃ¥s" name="history_combo" />
+ <button label="Tilbage" name="back_btn" />
+ <button label="Frem" name="fwd_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_media_browser.xml b/indra/newview/skins/default/xui/da/floater_media_browser.xml
index 84bb0a37a7..50004cfa0c 100644
--- a/indra/newview/skins/default/xui/da/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/da/floater_media_browser.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_about" title="Medie vælger">
- <layout_stack name="stack1">
- <layout_panel name="nav_controls">
- <button label="Tilbage" name="back" />
- <button label="Frem" name="forward" />
- <button label="Opdater" name="reload" />
- <button label="GÃ¥ til" name="go" />
- </layout_panel>
- <layout_panel name="parcel_owner_controls">
- <button label="Send nuværende URL til parcel" name="assign" />
- </layout_panel>
- <layout_panel name="external_controls">
- <button label="Ã…ben i min browser" name="open_browser" />
- <check_box label="Ã…ben altid i min browser" name="open_always" />
- <button label="Luk" name="close" />
- </layout_panel>
- </layout_stack>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="Medie vælger">
+ <layout_stack name="stack1">
+ <layout_panel name="nav_controls">
+ <button label="Tilbage" name="back" />
+ <button label="Frem" name="forward" />
+ <button label="Opdater" name="reload" />
+ <button label="GÃ¥ til" name="go" />
+ </layout_panel>
+ <layout_panel name="parcel_owner_controls">
+ <button label="Send nuværende URL til parcel" name="assign" />
+ </layout_panel>
+ <layout_panel name="external_controls">
+ <button label="Ã…ben i min browser" name="open_browser" />
+ <check_box label="Ã…ben altid i min browser" name="open_always" />
+ <button label="Luk" name="close" />
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_moveview.xml b/indra/newview/skins/default/xui/da/floater_moveview.xml
index dd966efefd..70f3d9e3fd 100644
--- a/indra/newview/skins/default/xui/da/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/da/floater_moveview.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater" title="">
- <button label="" label_selected="" name="turn left btn" tool_tip="Drej til venstre" />
- <button label="" label_selected="" name="turn right btn" tool_tip="Drej til højre" />
- <button label="" label_selected="" name="move up btn" tool_tip="Hop eller flyv op" />
- <button label="" label_selected="" name="move down btn" tool_tip="Duk eller flyv ned" />
- <joystick_slide name="slide left btn" tool_tip="GÃ¥ til venstre" />
- <joystick_slide name="slide right btn" tool_tip="Gå til højre" />
- <joystick_turn name="forward btn" tool_tip="GÃ¥ fremad" />
- <joystick_turn name="backward btn" tool_tip="GÃ¥ bagud" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater" title="">
+ <button label="" label_selected="" name="turn left btn" tool_tip="Drej til venstre" />
+ <button label="" label_selected="" name="turn right btn" tool_tip="Drej til højre" />
+ <button label="" label_selected="" name="move up btn" tool_tip="Hop eller flyv op" />
+ <button label="" label_selected="" name="move down btn" tool_tip="Duk eller flyv ned" />
+ <joystick_slide name="slide left btn" tool_tip="GÃ¥ til venstre" />
+ <joystick_slide name="slide right btn" tool_tip="Gå til højre" />
+ <joystick_turn name="forward btn" tool_tip="GÃ¥ fremad" />
+ <joystick_turn name="backward btn" tool_tip="GÃ¥ bagud" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_mute_object.xml b/indra/newview/skins/default/xui/da/floater_mute_object.xml
index 09a9274cc9..e64557b177 100644
--- a/indra/newview/skins/default/xui/da/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/da/floater_mute_object.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute by name" title="Bloker objekt via navn">
- <text name="message">
- Blokering via navn har ikke betydning for lyde.
-Du skal skrive det præcise navn på objektet.
- </text>
- <line_editor name="object_name">
- Objekt navn
- </line_editor>
- <button label="OK" name="OK" />
- <button label="Annullér" name="Cancel" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="mute by name" title="Bloker objekt via navn">
+ <text name="message">
+ Blokering via navn har ikke betydning for lyde.
+Du skal skrive det præcise navn på objektet.
+ </text>
+ <line_editor name="object_name">
+ Objekt navn
+ </line_editor>
+ <button label="OK" name="OK" />
+ <button label="Annullér" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_my_friends.xml b/indra/newview/skins/default/xui/da/floater_my_friends.xml
index 53aa90c976..687266a08a 100644
--- a/indra/newview/skins/default/xui/da/floater_my_friends.xml
+++ b/indra/newview/skins/default/xui/da/floater_my_friends.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_my_friends" title="Kontakter">
- <tab_container name="friends_and_groups">
- <panel label="Venner" name="friends_panel" />
- <panel label="Grupper" name="groups_panel" />
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_my_friends" title="Kontakter">
+ <tab_container name="friends_and_groups">
+ <panel label="Venner" name="friends_panel" />
+ <panel label="Grupper" name="groups_panel" />
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_openobject.xml b/indra/newview/skins/default/xui/da/floater_openobject.xml
index 1f7c026f2c..12e4a95a5e 100644
--- a/indra/newview/skins/default/xui/da/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/da/floater_openobject.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="objectcontents" title="Objekt indhold">
- <text type="string" length="1" name="object_name">
- [DESC]:
- </text>
- <button label="Kopiér til beholdning" label_selected="Kopiér til beholdning"
- name="copy_to_inventory_button" />
- <button label="Kopiér og tag på" label_selected="Kopiér og tag på"
- name="copy_and_wear_button" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="objectcontents" title="Objekt indhold">
+ <text type="string" length="1" name="object_name">
+ [DESC]:
+ </text>
+ <button label="Kopiér til beholdning" label_selected="Kopiér til beholdning"
+ name="copy_to_inventory_button" />
+ <button label="Kopiér og tag på" label_selected="Kopiér og tag på"
+ name="copy_and_wear_button" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_pay.xml b/indra/newview/skins/default/xui/da/floater_pay.xml
index ef24a8f942..cca4240934 100644
--- a/indra/newview/skins/default/xui/da/floater_pay.xml
+++ b/indra/newview/skins/default/xui/da/floater_pay.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
- <button label="L$1" label_selected="L$1" name="fastpay 1" />
- <button label="L$5" label_selected="L$5" name="fastpay 5" />
- <button label="L$10" label_selected="L$10" name="fastpay 10" />
- <button label="L$20" label_selected="L$20" name="fastpay 20" />
- <button label="Betal" label_selected="Betal" name="pay btn" />
- <button label="Annullér" label_selected="Annullér" name="cancel btn" />
- <text type="string" length="1" name="payee_label" left="5" width="81">
- Betal beboer:
- </text>
- <text type="string" length="1" name="payee_name">
- [FIRST] [LAST]
- </text>
- <text type="string" length="1" name="fastpay text">
- Hurtig betal:
- </text>
- <text type="string" length="1" name="amount text" left="4" >
- Beløb:
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Give Money" title="">
+ <button label="L$1" label_selected="L$1" name="fastpay 1" />
+ <button label="L$5" label_selected="L$5" name="fastpay 5" />
+ <button label="L$10" label_selected="L$10" name="fastpay 10" />
+ <button label="L$20" label_selected="L$20" name="fastpay 20" />
+ <button label="Betal" label_selected="Betal" name="pay btn" />
+ <button label="Annullér" label_selected="Annullér" name="cancel btn" />
+ <text type="string" length="1" name="payee_label" left="5" width="81">
+ Betal beboer:
+ </text>
+ <text type="string" length="1" name="payee_name">
+ [FIRST] [LAST]
+ </text>
+ <text type="string" length="1" name="fastpay text">
+ Hurtig betal:
+ </text>
+ <text type="string" length="1" name="amount text" left="4" >
+ Beløb:
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_pay_object.xml b/indra/newview/skins/default/xui/da/floater_pay_object.xml
index 6cd3f9676a..465f7e8e3e 100644
--- a/indra/newview/skins/default/xui/da/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/da/floater_pay_object.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
- <text type="string" length="1" name="payee_group">
- Betal gruppe:
- </text>
- <text type="string" length="1" name="payee_resident">
- Betal beboer:
- </text>
- <text type="string" length="1" name="payee_name">
- [FIRST] [LAST]
- </text>
- <text type="string" length="1" name="object_name_label">
- Via objekt:
- </text>
- <text type="string" length="1" name="object_name_text">
- ...
- </text>
- <text type="string" length="1" name="fastpay text">
- Hurtig betal:
- </text>
- <text type="string" length="1" name="amount text">
- Beløb:
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1" />
- <button label="L$5" label_selected="L$5" name="fastpay 5" />
- <button label="L$10" label_selected="L$10" name="fastpay 10" />
- <button label="L$20" label_selected="L$20" name="fastpay 20" />
- <button label="Betal" label_selected="Betal" name="pay btn" />
- <button label="Annullér" label_selected="Annullér" name="cancel btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Give Money" title="">
+ <text type="string" length="1" name="payee_group">
+ Betal gruppe:
+ </text>
+ <text type="string" length="1" name="payee_resident">
+ Betal beboer:
+ </text>
+ <text type="string" length="1" name="payee_name">
+ [FIRST] [LAST]
+ </text>
+ <text type="string" length="1" name="object_name_label">
+ Via objekt:
+ </text>
+ <text type="string" length="1" name="object_name_text">
+ ...
+ </text>
+ <text type="string" length="1" name="fastpay text">
+ Hurtig betal:
+ </text>
+ <text type="string" length="1" name="amount text">
+ Beløb:
+ </text>
+ <button label="L$1" label_selected="L$1" name="fastpay 1" />
+ <button label="L$5" label_selected="L$5" name="fastpay 5" />
+ <button label="L$10" label_selected="L$10" name="fastpay 10" />
+ <button label="L$20" label_selected="L$20" name="fastpay 20" />
+ <button label="Betal" label_selected="Betal" name="pay btn" />
+ <button label="Annullér" label_selected="Annullér" name="cancel btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_postcard.xml b/indra/newview/skins/default/xui/da/floater_postcard.xml
index bdc1f7d3ab..6b02f43633 100644
--- a/indra/newview/skins/default/xui/da/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/da/floater_postcard.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="E-mail billede">
- <text name="to_label">
- Send til:
- </text>
- <text name="from_label">
- Din e-mail:
- </text>
- <text name="name_label">
- Dit navn:
- </text>
- <text name="subject_label">
- Emne:
- </text>
- <line_editor label="Skriv dit emne her." name="subject_form" />
- <text name="msg_label">
- Besked:
- </text>
- <text_editor name="msg_form">
- Skriv din besked her.
- </text_editor>
- <text name="fine_print">
- Hvis din modtager opretter en konto i SL, vil du få en henvisnings bonus.
- </text>
- <button label="Annullér" name="cancel_btn" />
- <button label="Send" name="send_btn" />
- <string name="default_subject">
- Postkort fra Second Life.
- </string>
- <string name="default_message">
- Tjek det her ud!
- </string>
- <string name="upload_message">
- Sender...
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Postcard" title="E-mail billede">
+ <text name="to_label">
+ Send til:
+ </text>
+ <text name="from_label">
+ Din e-mail:
+ </text>
+ <text name="name_label">
+ Dit navn:
+ </text>
+ <text name="subject_label">
+ Emne:
+ </text>
+ <line_editor label="Skriv dit emne her." name="subject_form" />
+ <text name="msg_label">
+ Besked:
+ </text>
+ <text_editor name="msg_form">
+ Skriv din besked her.
+ </text_editor>
+ <text name="fine_print">
+ Hvis din modtager opretter en konto i SL, vil du få en henvisnings bonus.
+ </text>
+ <button label="Annullér" name="cancel_btn" />
+ <button label="Send" name="send_btn" />
+ <string name="default_subject">
+ Postkort fra Second Life.
+ </string>
+ <string name="default_message">
+ Tjek det her ud!
+ </string>
+ <string name="upload_message">
+ Sender...
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preferences.xml b/indra/newview/skins/default/xui/da/floater_preferences.xml
index 9c359a191a..26e932e3cc 100644
--- a/indra/newview/skins/default/xui/da/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/da/floater_preferences.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Preferences" title="Indstillinger">
- <button label="OK" label_selected="OK" name="OK" />
- <button label="Annullér" label_selected="Annullér" name="Cancel" />
- <button label="Gem" label_selected="Gem" name="Apply" />
- <button label="Om" label_selected="Om" name="About..." />
- <button label="Hjælp" label_selected="Hjælp" name="Help" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Preferences" title="Indstillinger">
+ <button label="OK" label_selected="OK" name="OK" />
+ <button label="Annullér" label_selected="Annullér" name="Cancel" />
+ <button label="Gem" label_selected="Gem" name="Apply" />
+ <button label="Om" label_selected="Om" name="About..." />
+ <button label="Hjælp" label_selected="Hjælp" name="Help" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_animation.xml b/indra/newview/skins/default/xui/da/floater_preview_animation.xml
index 455889281e..14cf13e317 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_animation.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_anim">
- <text type="string" length="1" name="desc txt">
- Beskrivelse:
- </text>
- <button label="Afspil i verden" label_selected="Stop" name="Anim play btn"
- tool_tip="Afspil denne animation så andre kan se den." />
- <button label="Afspil lokalt" label_selected="Stop" name="Anim audition btn"
- tool_tip="Afspil denne animation så kun du kan se den." />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_anim">
+ <text type="string" length="1" name="desc txt">
+ Beskrivelse:
+ </text>
+ <button label="Afspil i verden" label_selected="Stop" name="Anim play btn"
+ tool_tip="Afspil denne animation så andre kan se den." />
+ <button label="Afspil lokalt" label_selected="Stop" name="Anim audition btn"
+ tool_tip="Afspil denne animation så kun du kan se den." />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_classified.xml b/indra/newview/skins/default/xui/da/floater_preview_classified.xml
index 25892d84e6..6cc4c139f1 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_classified.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="classified_preview" title="Annonce information" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="classified_preview" title="Annonce information" />
diff --git a/indra/newview/skins/default/xui/da/floater_preview_event.xml b/indra/newview/skins/default/xui/da/floater_preview_event.xml
index eb0f34e60b..f1be35e1c3 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_event.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_event.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="event_preview" title="Event information" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="event_preview" title="Event information" />
diff --git a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
index 3686259398..cf3445e1a6 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_gesture.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gesture_preview">
- <string name="stop_txt">
- Stop
- </string>
- <string name="preview_txt">
- Vis
- </string>
- <string name="none_text">
- -- Intet --
- </string>
- <text name="desc_label">
- Beskrivelse:
- </text>
- <text name="trigger_label">
- Udløser:
- </text>
- <text name="replace_text"
- tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture!">
- Erstat med:
- </text>
- <line_editor name="replace_editor"
- tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture" />
- <text name="key_label">
- Genvejstast:
- </text>
- <combo_box label="Ingen" name="modifier_combo" />
- <combo_box label="Ingen" name="key_combo" />
- <text name="library_label">
- Type:
- </text>
- <text name="steps_label">
- Trin:
- </text>
- <button label="Tilføj >>" name="add_btn" />
- <button label="Flyt op" name="up_btn" />
- <button label="Flyt ned" name="down_btn" />
- <button label="Fjern" name="delete_btn" />
- <text name="help_label">
- Alle trin vil ske samtidigt,
-medmindre du tilføjer vente trin.
- </text>
- <radio_group name="animation_trigger_type">
- <radio_item name="start">
- Start
- </radio_item>
- <radio_item name="stop">
- Stop
- </radio_item>
- </radio_group>
- <check_box label="Indtil animation er færdig" name="wait_anim_check" />
- <check_box label="tid i sekunder" name="wait_time_check" />
- <check_box label="Aktiv" name="active_check" />
- <button label="Vis" name="preview_btn" />
- <button label="Gem" name="save_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gesture_preview">
+ <string name="stop_txt">
+ Stop
+ </string>
+ <string name="preview_txt">
+ Vis
+ </string>
+ <string name="none_text">
+ -- Intet --
+ </string>
+ <text name="desc_label">
+ Beskrivelse:
+ </text>
+ <text name="trigger_label">
+ Udløser:
+ </text>
+ <text name="replace_text"
+ tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture!">
+ Erstat med:
+ </text>
+ <line_editor name="replace_editor"
+ tool_tip="Replace the trigger word(s) with these words. For example, trigger 'hello' replace with 'howdy' will turn the chat 'I wanted to say hello' into 'I wanted to say howdy' as well as playing the gesture" />
+ <text name="key_label">
+ Genvejstast:
+ </text>
+ <combo_box label="Ingen" name="modifier_combo" />
+ <combo_box label="Ingen" name="key_combo" />
+ <text name="library_label">
+ Type:
+ </text>
+ <text name="steps_label">
+ Trin:
+ </text>
+ <button label="Tilføj >>" name="add_btn" />
+ <button label="Flyt op" name="up_btn" />
+ <button label="Flyt ned" name="down_btn" />
+ <button label="Fjern" name="delete_btn" />
+ <text name="help_label">
+ Alle trin vil ske samtidigt,
+medmindre du tilføjer vente trin.
+ </text>
+ <radio_group name="animation_trigger_type">
+ <radio_item name="start">
+ Start
+ </radio_item>
+ <radio_item name="stop">
+ Stop
+ </radio_item>
+ </radio_group>
+ <check_box label="Indtil animation er færdig" name="wait_anim_check" />
+ <check_box label="tid i sekunder" name="wait_time_check" />
+ <check_box label="Aktiv" name="active_check" />
+ <button label="Vis" name="preview_btn" />
+ <button label="Gem" name="save_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
index 3df1e428a5..c9bee41b6a 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_notecard.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview notecard" title="Note:">
- <button label="Gem" label_selected="Gem" name="Save" />
- <text type="string" length="1" name="desc txt">
- Beskrivelse:
- </text>
- <text_editor type="string" length="1" name="Notecard Editor">
- Indlæser...
- </text_editor>
- <string name="not_allowed">
- Du har ikke tilladelse til at læse denne note.
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview notecard" title="Note:">
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <text type="string" length="1" name="desc txt">
+ Beskrivelse:
+ </text>
+ <text_editor type="string" length="1" name="Notecard Editor">
+ Indlæser...
+ </text_editor>
+ <string name="not_allowed">
+ Du har ikke tilladelse til at læse denne note.
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_sound.xml b/indra/newview/skins/default/xui/da/floater_preview_sound.xml
index 9094520745..95a068ae65 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_sound.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_sound">
- <text type="string" length="1" name="desc txt">
- Beskrivelse:
- </text>
- <button label="Afspil lokalt" label_selected="Afspil lokalt" name="Sound audition btn"
- tool_tip="Afspil denne lyd så kun du kan høre den." />
- <button label="Afspil i verden" label_selected="Afspil i verden" name="Sound play btn"
- tool_tip="Afspil denne lyd så den kan høres af andre." />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_sound">
+ <text type="string" length="1" name="desc txt">
+ Beskrivelse:
+ </text>
+ <button label="Afspil lokalt" label_selected="Afspil lokalt" name="Sound audition btn"
+ tool_tip="Afspil denne lyd så kun du kan høre den." />
+ <button label="Afspil i verden" label_selected="Afspil i verden" name="Sound play btn"
+ tool_tip="Afspil denne lyd så den kan høres af andre." />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_preview_texture.xml b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
index dc9b9fbf9c..593e32e4bf 100644
--- a/indra/newview/skins/default/xui/da/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/da/floater_preview_texture.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_texture">
- <text type="string" length="1" name="desc txt">
- Beskrivelse:
- </text>
- <text type="string" length="1" name="dimensions">
- Størrelse: [WIDTH] x [HEIGHT]
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_texture">
+ <text type="string" length="1" name="desc txt">
+ Beskrivelse:
+ </text>
+ <text type="string" length="1" name="dimensions">
+ Størrelse: [WIDTH] x [HEIGHT]
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_report_abuse.xml b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
index a8dee3c11f..64e39da8fe 100644
--- a/indra/newview/skins/default/xui/da/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/da/floater_report_abuse.xml
@@ -1,184 +1,184 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_report_abuse" title="Rapportér misbrug">
- <texture_picker label="" name="screenshot" />
- <check_box label="Inkludér billede" name="screen_check" />
- <text name="reporter_title">
- Anmelder:
- </text>
- <text name="reporter_field">
- Loremipsum Dolorsitamut
- </text>
- <text name="sim_title">
- Region:
- </text>
- <text name="sim_field">
- Region navn
- </text>
- <text name="pos_title">
- Position:
- </text>
- <text name="pos_field">
- {128.1, 128.1, 15.4}
- </text>
- <text name="select_object_label">
- Klik på knappen derefter objektet:
- </text>
- <button label="" label_selected="" name="pick_btn"
- tool_tip="Objekt vælger - Identificér et objekt denne rapport omhandler" />
- <text name="object_name_label">
- Navn:
- </text>
- <text name="object_name">
- Consetetur Sadipscing
- </text>
- <text name="owner_name_label">
- Ejer:
- </text>
- <text name="owner_name">
- Hendrerit Vulputate
- </text>
- <combo_box name="category_combo"
- tool_tip="Kategori -- Vælg en kategori der passer bedst på denne rapport">
- <combo_item name="Select_category">
- Vælg kategori
- </combo_item>
- <combo_item name="Age__Age_play">
- Alder > Falsk alder
- </combo_item>
- <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
- Alder > Voksen beboer på Teen Second Life
- </combo_item>
-
-
-
- <combo_item name="Assault__Combat_sandbox___unsafe_area">
- Overfald > Kamp sandkasse / Usikkert område
- </combo_item>
- <combo_item name="Assault__Safe_area">
- Overfald > Sikkert område
- </combo_item>
- <combo_item name="Assault__Weapons_testing_sandbox">
- Overfald > Sandkasse til våbentest
- </combo_item>
- <combo_item name="Commerce__Failure_to_deliver_product_or_service">
- Handel > Vare eller ydelse ikke leveret
- </combo_item>
- <combo_item name="Disclosure__Real_world_information">
- Offentliggørelse > Om oplysninger i den virkelige verden
- </combo_item>
- <combo_item name="Disclosure__Remotely_monitoring chat">
- Offentliggørelse > Fjernaflytning af chat
- </combo_item>
- <combo_item name="Disclosure__Second_Life_information_chat_IMs">
- Offentliggørelse > Information/chat/IM fra Second Life
- </combo_item>
- <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
- Forstyrrelse af fred > Unfair brug af region ressourcer
- </combo_item>
- <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
- Forstyrrelse af fred > Overdreven brug af objekter med script
- </combo_item>
- <combo_item name="Disturbing_the_peace__Object_littering">
- Forstyrrelse af fred > Object affald
- </combo_item>
- <combo_item name="Disturbing_the_peace__Repetitive_spam">
- Forstyrring af fred > Gentagen spam
- </combo_item>
- <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
- Forstyrrelse af fred > Uønsket reklame spam
- </combo_item>
- <combo_item name="Fraud__L$">
- Bedrageri > L$
- </combo_item>
- <combo_item name="Fraud__Land">
- Bedrageri > Land
- </combo_item>
- <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
- Bedrageri > Pyramide spil eller kædebreve
- </combo_item>
- <combo_item name="Fraud__US$">
- Bedrageri > US$
- </combo_item>
- <combo_item name="Harassment__Advert_farms___visual_spam">
- Chikane > reklame farm / billedeligt spam
- </combo_item>
- <combo_item name="Harassment__Defaming_individuals_or_groups">
- Chikane > Injurier/bagvask enkeltpersoner eller grupper
- </combo_item>
- <combo_item name="Harassment__Impeding_movement">
- Chikane > Hindre bevægelse
- </combo_item>
- <combo_item name="Harassment__Sexual_harassment">
- Chikane > Sex chikane
- </combo_item>
- <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
- Chikane > Opfordrer/kræver at andre overtræder licensbetingelser
- </combo_item>
- <combo_item name="Harassment__Verbal_abuse">
- Chikane > Verbalt chikane
- </combo_item>
- <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
- Uanstændighed > Meget stødende indhold eller adfærd
- </combo_item>
-
-
-
- <combo_item name="Indecency__Inappropriate_avatar_name">
- Uanstændighed > Upassende avatar navn
- </combo_item>
-
-
-
- <combo_item name="Intellectual_property_infringement_Content_Removal">
- Krænkelse af intellektuelle ejendomsrettigheder > Indholds fjernelse
- </combo_item>
- <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
- Krænkelse af intellektuelle ejendomsrettigheder > CopyBot eller omgåelse af rettighedsbeskyttelse
- </combo_item>
- <combo_item name="Intolerance">
- Intolerance
- </combo_item>
- <combo_item name="Land__Abuse_of_sandbox_resources">
- Land > Misbrug af sandkasse resourcer
- </combo_item>
- <combo_item name="Land__Encroachment__Objects_textures">
- Land > Overgreb > Objekter/teksturer
- </combo_item>
- <combo_item name="Land__Encroachment__Particles">
- Land > Overgreb > Partikler
- </combo_item>
- <combo_item name="Land__Encroachment__Trees_plants">
- Land > Overgreb > Træer/planter
- </combo_item>
- <combo_item name="Wagering_gambling">
- Væddemål/gambling
- </combo_item>
- <combo_item name="Other">
- Andet
- </combo_item>
- </combo_box>
- <text name="abuser_name_title">
- Udøvers navn:
- </text>
- <button label="Vælg beboer" label_selected="" name="select_abuser"
- tool_tip="Vælg navnet på udøveren fra denne liste" />
- <check_box label="Kender ikke udøvers navn" name="omit_abuser_name"
- tool_tip="Afkryds her, hvis du ikke kender navn på udøvers" />
- <text name="abuser_name_title2">
- Sted for misbrug/overgreb:
- </text>
- <text name="sum_title">
- Opsummering:
- </text>
- <text name="dscr_title">
- Detaljer:
- </text>
- <text name="bug_aviso">
- Vær venligst præcis omkring dato, sted, overgrebets natur, relevant chat/IM og vælg objekt hvis muligt.
- </text>
- <text name="incomplete_title">
- Note: Ufuldstændige rapporter vil ikke blive undersøgt.
- </text>
- <button label="Annullér" label_selected="Annullér" name="cancel_btn" />
- <button label="Rapporter misbrug" label_selected="Rapporter misbrug" name="send_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_report_abuse" title="Rapportér misbrug">
+ <texture_picker label="" name="screenshot" />
+ <check_box label="Inkludér billede" name="screen_check" />
+ <text name="reporter_title">
+ Anmelder:
+ </text>
+ <text name="reporter_field">
+ Loremipsum Dolorsitamut
+ </text>
+ <text name="sim_title">
+ Region:
+ </text>
+ <text name="sim_field">
+ Region navn
+ </text>
+ <text name="pos_title">
+ Position:
+ </text>
+ <text name="pos_field">
+ {128.1, 128.1, 15.4}
+ </text>
+ <text name="select_object_label">
+ Klik på knappen derefter objektet:
+ </text>
+ <button label="" label_selected="" name="pick_btn"
+ tool_tip="Objekt vælger - Identificér et objekt denne rapport omhandler" />
+ <text name="object_name_label">
+ Navn:
+ </text>
+ <text name="object_name">
+ Consetetur Sadipscing
+ </text>
+ <text name="owner_name_label">
+ Ejer:
+ </text>
+ <text name="owner_name">
+ Hendrerit Vulputate
+ </text>
+ <combo_box name="category_combo"
+ tool_tip="Kategori -- Vælg en kategori der passer bedst på denne rapport">
+ <combo_item name="Select_category">
+ Vælg kategori
+ </combo_item>
+ <combo_item name="Age__Age_play">
+ Alder > Falsk alder
+ </combo_item>
+ <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+ Alder > Voksen beboer på Teen Second Life
+ </combo_item>
+
+
+
+ <combo_item name="Assault__Combat_sandbox___unsafe_area">
+ Overfald > Kamp sandkasse / Usikkert område
+ </combo_item>
+ <combo_item name="Assault__Safe_area">
+ Overfald > Sikkert område
+ </combo_item>
+ <combo_item name="Assault__Weapons_testing_sandbox">
+ Overfald > Sandkasse til våbentest
+ </combo_item>
+ <combo_item name="Commerce__Failure_to_deliver_product_or_service">
+ Handel > Vare eller ydelse ikke leveret
+ </combo_item>
+ <combo_item name="Disclosure__Real_world_information">
+ Offentliggørelse > Om oplysninger i den virkelige verden
+ </combo_item>
+ <combo_item name="Disclosure__Remotely_monitoring chat">
+ Offentliggørelse > Fjernaflytning af chat
+ </combo_item>
+ <combo_item name="Disclosure__Second_Life_information_chat_IMs">
+ Offentliggørelse > Information/chat/IM fra Second Life
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+ Forstyrrelse af fred > Unfair brug af region ressourcer
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+ Forstyrrelse af fred > Overdreven brug af objekter med script
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Object_littering">
+ Forstyrrelse af fred > Object affald
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Repetitive_spam">
+ Forstyrring af fred > Gentagen spam
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+ Forstyrrelse af fred > Uønsket reklame spam
+ </combo_item>
+ <combo_item name="Fraud__L$">
+ Bedrageri > L$
+ </combo_item>
+ <combo_item name="Fraud__Land">
+ Bedrageri > Land
+ </combo_item>
+ <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+ Bedrageri > Pyramide spil eller kædebreve
+ </combo_item>
+ <combo_item name="Fraud__US$">
+ Bedrageri > US$
+ </combo_item>
+ <combo_item name="Harassment__Advert_farms___visual_spam">
+ Chikane > reklame farm / billedeligt spam
+ </combo_item>
+ <combo_item name="Harassment__Defaming_individuals_or_groups">
+ Chikane > Injurier/bagvask enkeltpersoner eller grupper
+ </combo_item>
+ <combo_item name="Harassment__Impeding_movement">
+ Chikane > Hindre bevægelse
+ </combo_item>
+ <combo_item name="Harassment__Sexual_harassment">
+ Chikane > Sex chikane
+ </combo_item>
+ <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+ Chikane > Opfordrer/kræver at andre overtræder licensbetingelser
+ </combo_item>
+ <combo_item name="Harassment__Verbal_abuse">
+ Chikane > Verbalt chikane
+ </combo_item>
+ <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+ Uanstændighed > Meget stødende indhold eller adfærd
+ </combo_item>
+
+
+
+ <combo_item name="Indecency__Inappropriate_avatar_name">
+ Uanstændighed > Upassende avatar navn
+ </combo_item>
+
+
+
+ <combo_item name="Intellectual_property_infringement_Content_Removal">
+ Krænkelse af intellektuelle ejendomsrettigheder > Indholds fjernelse
+ </combo_item>
+ <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+ Krænkelse af intellektuelle ejendomsrettigheder > CopyBot eller omgåelse af rettighedsbeskyttelse
+ </combo_item>
+ <combo_item name="Intolerance">
+ Intolerance
+ </combo_item>
+ <combo_item name="Land__Abuse_of_sandbox_resources">
+ Land > Misbrug af sandkasse resourcer
+ </combo_item>
+ <combo_item name="Land__Encroachment__Objects_textures">
+ Land > Overgreb > Objekter/teksturer
+ </combo_item>
+ <combo_item name="Land__Encroachment__Particles">
+ Land > Overgreb > Partikler
+ </combo_item>
+ <combo_item name="Land__Encroachment__Trees_plants">
+ Land > Overgreb > Træer/planter
+ </combo_item>
+ <combo_item name="Wagering_gambling">
+ Væddemål/gambling
+ </combo_item>
+ <combo_item name="Other">
+ Andet
+ </combo_item>
+ </combo_box>
+ <text name="abuser_name_title">
+ Udøvers navn:
+ </text>
+ <button label="Vælg beboer" label_selected="" name="select_abuser"
+ tool_tip="Vælg navnet på udøveren fra denne liste" />
+ <check_box label="Kender ikke udøvers navn" name="omit_abuser_name"
+ tool_tip="Afkryds her, hvis du ikke kender navn på udøvers" />
+ <text name="abuser_name_title2">
+ Sted for misbrug/overgreb:
+ </text>
+ <text name="sum_title">
+ Opsummering:
+ </text>
+ <text name="dscr_title">
+ Detaljer:
+ </text>
+ <text name="bug_aviso">
+ Vær venligst præcis omkring dato, sted, overgrebets natur, relevant chat/IM og vælg objekt hvis muligt.
+ </text>
+ <text name="incomplete_title">
+ Note: Ufuldstændige rapporter vil ikke blive undersøgt.
+ </text>
+ <button label="Annullér" label_selected="Annullér" name="cancel_btn" />
+ <button label="Rapporter misbrug" label_selected="Rapporter misbrug" name="send_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_script_debug.xml b/indra/newview/skins/default/xui/da/floater_script_debug.xml
index f19b9aeb69..17e14cd9b9 100644
--- a/indra/newview/skins/default/xui/da/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_debug.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="script debug floater" title="Script advarsel/fejl">
- <tab_container name="Preview Tabs">
- <floater label="Script" name="all_scripts" title="[All scripts]" />
- </tab_container>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="script debug floater" title="Script advarsel/fejl">
+ <tab_container name="Preview Tabs">
+ <floater label="Script" name="all_scripts" title="[All scripts]" />
+ </tab_container>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/da/floater_script_preview.xml b/indra/newview/skins/default/xui/da/floater_script_preview.xml
index 28fc577505..26371d864f 100644
--- a/indra/newview/skins/default/xui/da/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_preview.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview lsl text" title="Script: Rotation Script">
- <text type="string" length="1" name="desc txt">
- Beskrivelse:
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview lsl text" title="Script: Rotation Script">
+ <text type="string" length="1" name="desc txt">
+ Beskrivelse:
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_script_queue.xml b/indra/newview/skins/default/xui/da/floater_script_queue.xml
index 7f0d737fa5..47dbf534bd 100644
--- a/indra/newview/skins/default/xui/da/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_queue.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="queue" title="Nulstil forløb">
- <button label="Luk" label_selected="Luk" name="close" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="queue" title="Nulstil forløb">
+ <button label="Luk" label_selected="Luk" name="close" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_script_search.xml b/indra/newview/skins/default/xui/da/floater_script_search.xml
index cd230342a9..9f51d3bbfd 100644
--- a/indra/newview/skins/default/xui/da/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/da/floater_script_search.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script search" title="Script søgning">
- <check_box label="Store/små bogstaver har ingen betydning" name="case_text" />
- <button label="Søg" label_selected="Søg" name="search_btn" />
- <button label="Erstat" label_selected="Erstat" name="replace_btn" />
- <button label="Erstat alle" label_selected="Erstat alle" name="replace_all_btn" />
- <text type="string" length="1" name="txt">
- Søg
- </text>
- <text type="string" length="1" name="txt2">
- Erstat
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script search" title="Script søgning">
+ <check_box label="Store/små bogstaver har ingen betydning" name="case_text" />
+ <button label="Søg" label_selected="Søg" name="search_btn" />
+ <button label="Erstat" label_selected="Erstat" name="replace_btn" />
+ <button label="Erstat alle" label_selected="Erstat alle" name="replace_all_btn" />
+ <text type="string" length="1" name="txt">
+ Søg
+ </text>
+ <text type="string" length="1" name="txt2">
+ Erstat
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_select_key.xml b/indra/newview/skins/default/xui/da/floater_select_key.xml
index 11afeb2211..53bb7dd525 100644
--- a/indra/newview/skins/default/xui/da/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/da/floater_select_key.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title="">
- <button label="Annullér" label_selected="Annullér" name="Cancel" />
- <text type="string" length="1" name="Save item as:">
- Tryk på en taste for at vælge
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+ <button label="Annullér" label_selected="Annullér" name="Cancel" />
+ <text type="string" length="1" name="Save item as:">
+ Tryk på en taste for at vælge
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_sell_land.xml b/indra/newview/skins/default/xui/da/floater_sell_land.xml
index 32905594a4..cd3b36cf93 100644
--- a/indra/newview/skins/default/xui/da/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/da/floater_sell_land.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="sell land" title="Sælg land">
- <text name="info_parcel_label">
- Parcel:
- </text>
- <text name="info_parcel">
- PARCEL NAME
- </text>
- <text name="info_size_label">
- Størrelse:
- </text>
- <text name="info_size">
- [AREA] m²
- </text>
- <text name="info_action">
- Sælg denne parcel:
- </text>
- <text name="price_label">
- Sæt en pris:
- </text>
- <text name="price_text">
- Vælg en passende pris for jorden.
- </text>
- <text name="price_ld">
- L$
- </text>
- <text name="price_per_m">
- (L$[PER_METER] pr. kvadratmeter)
- </text>
- <text name="sell_to_label">
- Sælg denne jord til:
- </text>
- <text name="sell_to_text">
- Vælg om du vil sælge til hvem som helst eller en specifik køber.
- </text>
- <combo_box name="sell_to">
- <combo_item name="--selectone--">
- -- Vælg --
- </combo_item>
- <combo_item name="Anyone">
- Alle
- </combo_item>
- <combo_item name="Specificuser:">
- Specifik bruger:
- </combo_item>
- </combo_box>
- <button label="Vælg..." name="sell_to_select_agent" />
- <text name="sell_objects_label">
- Sælg objekter sammen med jorden?
- </text>
- <text name="sell_objects_text">
- Dine objekter der kan videregives sælges med jorden.
- </text>
- <radio_group name="sell_objects">
- <radio_item name="no">
- Nej, behold ejerskab til objekterne
- </radio_item>
- <radio_item name="yes">
- Ja, sælg objekter med jorden
- </radio_item>
- </radio_group>
- <button label="Vis objekter" name="show_objects" />
- <text name="nag_message_label">
- HUSK: Alle salg er endegyldige.
- </text>
- <button label="Sæt land til salg" name="sell_btn" />
- <button label="Annullér" name="cancel_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="sell land" title="Sælg land">
+ <text name="info_parcel_label">
+ Parcel:
+ </text>
+ <text name="info_parcel">
+ PARCEL NAME
+ </text>
+ <text name="info_size_label">
+ Størrelse:
+ </text>
+ <text name="info_size">
+ [AREA] m²
+ </text>
+ <text name="info_action">
+ Sælg denne parcel:
+ </text>
+ <text name="price_label">
+ Sæt en pris:
+ </text>
+ <text name="price_text">
+ Vælg en passende pris for jorden.
+ </text>
+ <text name="price_ld">
+ L$
+ </text>
+ <text name="price_per_m">
+ (L$[PER_METER] pr. kvadratmeter)
+ </text>
+ <text name="sell_to_label">
+ Sælg denne jord til:
+ </text>
+ <text name="sell_to_text">
+ Vælg om du vil sælge til hvem som helst eller en specifik køber.
+ </text>
+ <combo_box name="sell_to">
+ <combo_box.item name="--selectone--">
+ -- Vælg --
+ </combo_box.item>
+ <combo_box.item name="Anyone">
+ Alle
+ </combo_box.item>
+ <combo_box.item name="Specificuser:">
+ Specifik bruger:
+ </combo_box.item>
+ </combo_box>
+ <button label="Vælg..." name="sell_to_select_agent" />
+ <text name="sell_objects_label">
+ Sælg objekter sammen med jorden?
+ </text>
+ <text name="sell_objects_text">
+ Dine objekter der kan videregives sælges med jorden.
+ </text>
+ <radio_group name="sell_objects">
+ <radio_item name="no">
+ Nej, behold ejerskab til objekterne
+ </radio_item>
+ <radio_item name="yes">
+ Ja, sælg objekter med jorden
+ </radio_item>
+ </radio_group>
+ <button label="Vis objekter" name="show_objects" />
+ <text name="nag_message_label">
+ HUSK: Alle salg er endegyldige.
+ </text>
+ <button label="Sæt land til salg" name="sell_btn" />
+ <button label="Annullér" name="cancel_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_settings_debug.xml b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
index efbb7f01c7..8fa351c108 100644
--- a/indra/newview/skins/default/xui/da/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/da/floater_settings_debug.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="settings_debug" title="Tekniske indstillinger">
- <combo_box name="boolean_combo">
- <combo_item name="TRUE">
- TRUE (Valgt)
- </combo_item>
- <combo_item name="FALSE">
- FALSE (Fravalgt)
- </combo_item>
- </combo_box>
- <color_swatch label="Farve" name="color_swatch" />
- <spinner label="x" name="val_spinner_1" />
- <spinner label="x" name="val_spinner_2" />
- <spinner label="x" name="val_spinner_3" />
- <spinner label="x" name="val_spinner_4" />
- <button label="Sæt til standard" name="default_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="settings_debug" title="Tekniske indstillinger">
+ <combo_box name="boolean_combo">
+ <combo_box.item name="TRUE">
+ TRUE (Valgt)
+ </combo_box.item>
+ <combo_box.item name="FALSE">
+ FALSE (Fravalgt)
+ </combo_box.item>
+ </combo_box>
+ <color_swatch label="Farve" name="color_swatch" />
+ <spinner label="x" name="val_spinner_1" />
+ <spinner label="x" name="val_spinner_2" />
+ <spinner label="x" name="val_spinner_3" />
+ <spinner label="x" name="val_spinner_4" />
+ <button label="Sæt til standard" name="default_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_snapshot.xml b/indra/newview/skins/default/xui/da/floater_snapshot.xml
index 5db963cc6f..8fc98220db 100644
--- a/indra/newview/skins/default/xui/da/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/da/floater_snapshot.xml
@@ -1,127 +1,127 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Snapshot" title="Se foto">
- <text name="type_label">
- Hvor skal foto hen?
- </text>
- <radio_group label="Snapshot type" name="snapshot_type_radio">
- <radio_item name="postcard">
- Send via e-mail
- </radio_item>
- <radio_item name="texture">
- Gem i din beholdning (L$[AMOUNT])
- </radio_item>
- <radio_item name="local">
- Gem på din computer
- </radio_item>
- </radio_group>
- <text name="file_size_label">
- Fil størrelse: [SIZE] KB
- </text>
- <button label="Tag nyt foto" name="new_snapshot_btn" />
- <button label="Send" name="send_btn" />
- <button label="Gem (L$[AMOUNT])" name="upload_btn" />
- <flyout_button label="Gem" name="save_btn" />
- <button label="Annullér" name="discard_btn" />
- <button label="Mere >>" name="more_btn" />
- <button label="<< Mindre" name="less_btn" />
- <text name="type_label2">
- Størrelse
- </text>
- <text name="format_label">
- Format
- </text>
- <combo_box label="Opløsning" name="postcard_size_combo">
- <combo_item name="CurrentWindow">
- Aktuelle vindue
- </combo_item>
- <combo_item name="640x480">
- 640x480
- </combo_item>
- <combo_item name="800x600">
- 800x600
- </combo_item>
- <combo_item name="1024x768">
- 1024x768
- </combo_item>
- <combo_item name="Custom">
- Manuel
- </combo_item>
- </combo_box>
- <combo_box label="Opløsning" name="texture_size_combo">
- <combo_item name="CurrentWindow">
- Aktuelle vindue
- </combo_item>
- <combo_item name="Small(128x128)">
- Lille (128x128)
- </combo_item>
- <combo_item name="Medium(256x256)">
- Medium (256x256)
- </combo_item>
- <combo_item name="Large(512x512)">
- Stor (512x512)
- </combo_item>
- <combo_item name="Custom">
- Manuel
- </combo_item>
- </combo_box>
- <combo_box label="Opløsning" name="local_size_combo">
- <combo_item name="CurrentWindow">
- Aktuelle vindue
- </combo_item>
- <combo_item name="320x240">
- 320x240
- </combo_item>
- <combo_item name="640x480">
- 640x480
- </combo_item>
- <combo_item name="800x600">
- 800x600
- </combo_item>
- <combo_item name="1024x768">
- 1024x768
- </combo_item>
- <combo_item name="1280x1024">
- 1280x1024
- </combo_item>
- <combo_item name="1600x1200">
- 1600x1200
- </combo_item>
- <combo_item name="Custom">
- Manuelt
- </combo_item>
- </combo_box>
- <combo_box label="Fil-format" name="local_format_combo">
- <combo_item name="PNG">
- PNG
- </combo_item>
- <combo_item name="JPEG">
- JPEG
- </combo_item>
- <combo_item name="BMP">
- BMP
- </combo_item>
- </combo_box>
- <spinner label="Bredde" name="snapshot_width" />
- <spinner label="Højde" name="snapshot_height" />
- <check_box label="Fasthold proportioner" name="keep_aspect_check" />
- <slider label="Billed-kvalitet" name="image_quality_slider" />
- <text name="layer_type_label">
- Benyt:
- </text>
- <combo_box label="Billedlag" name="layer_types">
- <combo_item name="Colors">
- Farver
- </combo_item>
- <combo_item name="Depth">
- Dybde
- </combo_item>
- <combo_item name="ObjectMattes">
- Materinger
- </combo_item>
- </combo_box>
- <check_box label="Vis brugerflade på foto" name="ui_check" />
- <check_box label="Vis HUD objekter på foto" name="hud_check" />
- <check_box label="Luk ikke vindue ved gemning" name="keep_open_check" />
- <check_box label="Frys billede og vis" name="freeze_frame_check" />
- <check_box label="Auto-opdater" name="auto_snapshot_check" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Snapshot" title="Se foto">
+ <text name="type_label">
+ Hvor skal foto hen?
+ </text>
+ <radio_group label="Snapshot type" name="snapshot_type_radio">
+ <radio_item name="postcard">
+ Send via e-mail
+ </radio_item>
+ <radio_item name="texture">
+ Gem i din beholdning (L$[AMOUNT])
+ </radio_item>
+ <radio_item name="local">
+ Gem på din computer
+ </radio_item>
+ </radio_group>
+ <text name="file_size_label">
+ Fil størrelse: [SIZE] KB
+ </text>
+ <button label="Tag nyt foto" name="new_snapshot_btn" />
+ <button label="Send" name="send_btn" />
+ <button label="Gem (L$[AMOUNT])" name="upload_btn" />
+ <flyout_button label="Gem" name="save_btn" />
+ <button label="Annullér" name="discard_btn" />
+ <button label="Mere >>" name="more_btn" />
+ <button label="<< Mindre" name="less_btn" />
+ <text name="type_label2">
+ Størrelse
+ </text>
+ <text name="format_label">
+ Format
+ </text>
+ <combo_box label="Opløsning" name="postcard_size_combo">
+ <combo_item name="CurrentWindow">
+ Aktuelle vindue
+ </combo_item>
+ <combo_item name="640x480">
+ 640x480
+ </combo_item>
+ <combo_item name="800x600">
+ 800x600
+ </combo_item>
+ <combo_item name="1024x768">
+ 1024x768
+ </combo_item>
+ <combo_item name="Custom">
+ Manuel
+ </combo_item>
+ </combo_box>
+ <combo_box label="Opløsning" name="texture_size_combo">
+ <combo_item name="CurrentWindow">
+ Aktuelle vindue
+ </combo_item>
+ <combo_item name="Small(128x128)">
+ Lille (128x128)
+ </combo_item>
+ <combo_item name="Medium(256x256)">
+ Medium (256x256)
+ </combo_item>
+ <combo_item name="Large(512x512)">
+ Stor (512x512)
+ </combo_item>
+ <combo_item name="Custom">
+ Manuel
+ </combo_item>
+ </combo_box>
+ <combo_box label="Opløsning" name="local_size_combo">
+ <combo_item name="CurrentWindow">
+ Aktuelle vindue
+ </combo_item>
+ <combo_item name="320x240">
+ 320x240
+ </combo_item>
+ <combo_item name="640x480">
+ 640x480
+ </combo_item>
+ <combo_item name="800x600">
+ 800x600
+ </combo_item>
+ <combo_item name="1024x768">
+ 1024x768
+ </combo_item>
+ <combo_item name="1280x1024">
+ 1280x1024
+ </combo_item>
+ <combo_item name="1600x1200">
+ 1600x1200
+ </combo_item>
+ <combo_item name="Custom">
+ Manuelt
+ </combo_item>
+ </combo_box>
+ <combo_box label="Fil-format" name="local_format_combo">
+ <combo_item name="PNG">
+ PNG
+ </combo_item>
+ <combo_item name="JPEG">
+ JPEG
+ </combo_item>
+ <combo_item name="BMP">
+ BMP
+ </combo_item>
+ </combo_box>
+ <spinner label="Bredde" name="snapshot_width" />
+ <spinner label="Højde" name="snapshot_height" />
+ <check_box label="Fasthold proportioner" name="keep_aspect_check" />
+ <slider label="Billed-kvalitet" name="image_quality_slider" />
+ <text name="layer_type_label">
+ Benyt:
+ </text>
+ <combo_box label="Billedlag" name="layer_types">
+ <combo_item name="Colors">
+ Farver
+ </combo_item>
+ <combo_item name="Depth">
+ Dybde
+ </combo_item>
+ <combo_item name="ObjectMattes">
+ Materinger
+ </combo_item>
+ </combo_box>
+ <check_box label="Vis brugerflade på foto" name="ui_check" />
+ <check_box label="Vis HUD objekter på foto" name="hud_check" />
+ <check_box label="Luk ikke vindue ved gemning" name="keep_open_check" />
+ <check_box label="Frys billede og vis" name="freeze_frame_check" />
+ <check_box label="Auto-opdater" name="auto_snapshot_check" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_sound_preview.xml b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
index e4590201c3..c0d2f76ea9 100644
--- a/indra/newview/skins/default/xui/da/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/da/floater_sound_preview.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Name/Description" title="sound.wav">
- <text name="name_label">
- Navn:
- </text>
- <text name="description_label">
- Beskrivelse:
- </text>
- <button label="Annullér" label_selected="Annullér" name="cancel_btn" />
- <button label="Hent (L$[AMOUNT])" label_selected="Hent (L$[AMOUNT])" name="ok_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Name/Description" title="sound.wav">
+ <text name="name_label">
+ Navn:
+ </text>
+ <text name="description_label">
+ Beskrivelse:
+ </text>
+ <button label="Annullér" label_selected="Annullér" name="cancel_btn" />
+ <button label="Hent (L$[AMOUNT])" label_selected="Hent (L$[AMOUNT])" name="ok_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_telehub.xml b/indra/newview/skins/default/xui/da/floater_telehub.xml
index d045850573..32c5448508 100644
--- a/indra/newview/skins/default/xui/da/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/da/floater_telehub.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="Telehub">
- <text name="status_text_connected">
- Telehub forbundet til objekt [OBJECT]
- </text>
- <text name="status_text_not_connected">
- Ingen telehub forbundet.
- </text>
- <text name="help_text_connected">
- For at fjerne, tryk 'Afslut'.
- </text>
- <text name="help_text_not_connected">
- 230;lg objekt og klik 'Forbind telehub'.
- </text>
- <button label="Forbind telehub" name="connect_btn" />
- <button label="Afslut" name="disconnect_btn" />
- <text name="spawn_points_text">
- Ankomst punkter (positioner, ikke objekter):
- </text>
- <button label="Tilføj punkt" name="add_spawn_point_btn" />
- <button label="Fjern punkt" name="remove_spawn_point_btn" />
- <text name="spawn_point_help">
- Vælg objekt og klik på 'Tilføj punkt'for at angive position.
-Du kan derefter flytte eller slette objektet.
-Positioner er i forhold til telehub center.
-Vælg emne i listen for at vise position i verden.
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="telehub" title="Telehub">
+ <text name="status_text_connected">
+ Telehub forbundet til objekt [OBJECT]
+ </text>
+ <text name="status_text_not_connected">
+ Ingen telehub forbundet.
+ </text>
+ <text name="help_text_connected">
+ For at fjerne, tryk 'Afslut'.
+ </text>
+ <text name="help_text_not_connected">
+ 230;lg objekt og klik 'Forbind telehub'.
+ </text>
+ <button label="Forbind telehub" name="connect_btn" />
+ <button label="Afslut" name="disconnect_btn" />
+ <text name="spawn_points_text">
+ Ankomst punkter (positioner, ikke objekter):
+ </text>
+ <button label="Tilføj punkt" name="add_spawn_point_btn" />
+ <button label="Fjern punkt" name="remove_spawn_point_btn" />
+ <text name="spawn_point_help">
+ Vælg objekt og klik på 'Tilføj punkt'for at angive position.
+Du kan derefter flytte eller slette objektet.
+Positioner er i forhold til telehub center.
+Vælg emne i listen for at vise position i verden.
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
index 1fb5bc01a4..513a629bfa 100644
--- a/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/da/floater_texture_ctrl.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="texture picker" title="Vælg: Tekstur">
- <string name="choose_picture">
- Klik for at vælge et billede
- </string>
- <text type="string" length="1" name="Multiple">
- Flere
- </text>
- <text type="string" length="1" name="unknown">
- Størrelse: [DIMENSIONS]
- </text>
- <button label="Standard" label_selected="Standard" name="Default" />
- <button label="Ingen" label_selected="Ingen" name="None" />
- <button label="Blank" label_selected="Blank" name="Blank" />
- <check_box label="Vis mapper" name="show_folders_check" />
- <search_editor label="Skriv her for at søge" name="inventory search editor" />
- <check_box label="Benyt straks" name="apply_immediate_check" />
- <button label="" label_selected="" name="Pipette" />
- <button label="Annullér" label_selected="Annullér" name="Cancel" />
- <button label="Vælg" label_selected="Vælg" name="Select" />
- <string name="pick title">
- Vælg:
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="texture picker" title="Vælg: Tekstur">
+ <string name="choose_picture">
+ Klik for at vælge et billede
+ </string>
+ <text type="string" length="1" name="Multiple">
+ Flere
+ </text>
+ <text type="string" length="1" name="unknown">
+ Størrelse: [DIMENSIONS]
+ </text>
+ <button label="Standard" label_selected="Standard" name="Default" />
+ <button label="Ingen" label_selected="Ingen" name="None" />
+ <button label="Blank" label_selected="Blank" name="Blank" />
+ <check_box label="Vis mapper" name="show_folders_check" />
+ <search_editor label="Skriv her for at søge" name="inventory search editor" />
+ <check_box label="Benyt straks" name="apply_immediate_check" />
+ <button label="" label_selected="" name="Pipette" />
+ <button label="Annullér" label_selected="Annullér" name="Cancel" />
+ <button label="Vælg" label_selected="Vælg" name="Select" />
+ <string name="pick title">
+ Vælg:
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml
index 0f5c29b6d4..bc15db0e25 100644
--- a/indra/newview/skins/default/xui/da/floater_tools.xml
+++ b/indra/newview/skins/default/xui/da/floater_tools.xml
@@ -1,556 +1,556 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="toolbox floater" title="">
- <button label="" label_selected="" name="button focus" tool_tip="Fokus" />
- <button label="" label_selected="" name="button move" tool_tip="Flyt" />
- <button label="" label_selected="" name="button edit" tool_tip="Redigér" />
- <button label="" label_selected="" name="button create" tool_tip="Opret" />
- <button label="" label_selected="" name="button land" tool_tip="Land" />
- <check_box label="Zoom" name="radio zoom" />
- <check_box label="Kredsløb (Ctrl)" name="radio orbit" />
- <check_box label="Panorér (Ctrl-Shift)" name="radio pan" />
- <check_box label="Flyt" name="radio move" />
- <check_box label="Løft (Ctrl)" name="radio lift" />
- <check_box label="Spin (Ctrl-Shift)" name="radio spin" />
- <check_box label="Position" name="radio position" />
- <check_box label="Rotér (Ctrl)" name="radio rotate" />
- <check_box label="Stræk (Ctrl-Shift)" name="radio stretch" />
- <check_box label="Vælg tekstur" name="radio select face" />
- <check_box label="Redigér sammenlænkede dele" name="checkbox edit linked parts" />
- <text name="text ruler mode">
- Lineal:
- </text>
- <combo_box name="combobox grid mode">
- <combo_item name="World">
- Verden
- </combo_item>
- <combo_item name="Local">
- Lokal
- </combo_item>
- <combo_item name="Reference">
- Reference
- </combo_item>
- </combo_box>
- <check_box label="Stræk begge sider" name="checkbox uniform" />
- <check_box label="Stræk teksturer" name="checkbox stretch textures" />
- <check_box label="Benyt gitter" name="checkbox snap to grid" />
- <button label="Valg..." label_selected="Valg..." name="Options..." />
- <text name="text status">
- Træk for at flytte, shift+træk for at kopiere
- </text>
- <button label="" label_selected="" name="ToolCube" tool_tip="Terning" />
- <button label="" label_selected="" name="ToolPrism" tool_tip="Prisme" />
- <button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide" />
- <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraed" />
- <button label="" label_selected="" name="ToolCylinder" tool_tip="Cylinder" />
- <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Hemicylinder" />
- <button label="" label_selected="" name="ToolCone" tool_tip="Kegle" />
- <button label="" label_selected="" name="ToolHemiCone" tool_tip="Hemikegle" />
- <button label="" label_selected="" name="ToolSphere" tool_tip="Sfære" />
- <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Hemisfære" />
- <button label="" label_selected="" name="ToolTorus" tool_tip="Kuglering" />
- <button label="" label_selected="" name="ToolTube" tool_tip="Rør" />
- <button label="" label_selected="" name="ToolRing" tool_tip="Ring" />
- <button label="" label_selected="" name="ToolTree" tool_tip="Træ" />
- <button label="" label_selected="" name="ToolGrass" tool_tip="Græs" />
- <check_box label="Hold værktøjet valgt" name="checkbox sticky" />
- <check_box label="Kopiér valgte" name="checkbox copy selection" />
- <check_box label="Centréret kopi" name="checkbox copy centers" />
- <check_box label="Rotér kopi" name="checkbox copy rotates" />
- <check_box label="Vælg land" name="radio select land" />
- <check_box label="Udflad land" name="radio flatten" />
- <check_box label="Hæv land" name="radio raise" />
- <check_box label="Sænk land" name="radio lower" />
- <check_box label="Udjævn land" name="radio smooth" />
- <check_box label="Gør land ujævnt" name="radio noise" />
- <check_box label="Tilbagefør" name="radio revert" />
- <combo_box name="combobox brush size">
- <combo_item name="Small">
- Lille
- </combo_item>
- <combo_item name="Medium">
- Mellem
- </combo_item>
- <combo_item name="Large">
- Stor
- </combo_item>
- </combo_box>
- <text type="string" length="1" name="Strength:">
- Styrke:
- </text>
- <button label="Anvend på valgte" label_selected="Anvend på valgte"
- name="button apply to selection" tool_tip="Redigér valgt land" />
- <check_box label="Vis ejere" name="checkbox show owners" />
- <button label="Mere >>" name="button more" tool_tip="Adancerede valgmuligheder" />
- <button label="<< Mindre" name="button less" tool_tip="Adancerede valgmuligheder" />
- <tab_container name="Object Info Tabs">
- <panel label="Generelt" name="General">
- <text name="Name:">
- Navn:
- </text>
- <text name="Description:">
- Beskrivelse:
- </text>
- <text name="Creator:">
- Skaber:
- </text>
- <text name="Creator Name">
- Thrax Linden
- </text>
- <button label="Profil..." label_selected="Profil..." name="button creator profile" />
- <text name="Owner:">
- Ejer:
- </text>
- <text name="Owner Name">
- Thrax Linden
- </text>
- <button label="Profil..." label_selected="Profil..." name="button owner profile" />
- <text name="Group:">
- Gruppe:
- </text>
- <text name="Group Name Proxy">
- The Lindens
- </text>
- <button label="Sæt..." label_selected="Sæt..." name="button set group" />
- <text name="prim info">
- 1 Objekt, 1 Prim
- </text>
- <text name="Permissions:">
- Tilladelser:
- </text>
- <text name="perm_modify">
- Du kan redigére dette objekt.
- </text>
- <check_box label="Del med gruppe" name="checkbox share with group"
- tool_tip="Tillad gruppemedlemmer at flytte, ændre, kopiere og slette." />
- <string name="text deed continued">
- Deed...
- </string>
- <string name="text deed">
- Deed
- </string>
- <button label="Dedikér..." label_selected="Dedikér..." name="button deed"
- tool_tip="Gruppedelte genstande kan dedikeres af en gruppeadministrator." />
- <check_box label="Tillad enhver at flytte" name="checkbox allow everyone move" />
- <check_box label="Tillad enhver at kopiére" name="checkbox allow everyone copy" />
- <check_box label="Vis i søgning" name="search_check"
- tool_tip="Lad folk se dette objekt i søgeresultater" />
- <check_box label="Til salg" name="checkbox for sale" />
- <text name="Cost">
- Pris: L$
- </text>
- <radio_group name="sale type">
- <radio_item name="Original">
- Original
- </radio_item>
- <radio_item name="Copy">
- Kopi
- </radio_item>
- <radio_item name="Contents">
- Indhold
- </radio_item>
- </radio_group>
- <text name="Next owner can:">
- Næste ejer kan:
- </text>
- <check_box label="Redigére" name="checkbox next owner can modify" />
- <check_box label="Kopiére" name="checkbox next owner can copy" />
- <check_box label="Sælge/Give væk" name="checkbox next owner can transfer" />
- <text name="label click action">
- NÃ¥r der venstreklikkes:
- </text>
- <combo_box name="clickaction">
- <combo_item name="Touch/grab(default)">
- Rør/tag (standard)
- </combo_item>
- <combo_item name="Sitonobject">
- Sid på objekt
- </combo_item>
- <combo_item name="Buyobject">
- Køb objekt
- </combo_item>
- <combo_item name="Payobject">
- Betal objekt
- </combo_item>
- <combo_item name="Open">
- Ã…ben
- </combo_item>
- <combo_item name="Play">
- Afspil medie på parcel
- </combo_item>
- <combo_item name="Opemmedia">
- Åben media på parcel
- </combo_item>
- </combo_box>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
- </panel>
- <panel label="Objekt" name="Object">
- <text name="select_single">
- Vælg kun én prim for at ændre indstillinger.
- </text>
- <text name="edit_object">
- Ret objektets indstillinger:
- </text>
- <check_box label="LÃ¥st" name="checkbox locked"
- tool_tip="Forhindrer objektet i at blive flyttet eller slettet. Ofte brugbar under byggeri for at forhindre utilsigtet ændring." />
- <check_box label="Fysisk" name="Physical Checkbox Ctrl"
- tool_tip="Tillader objekter at blive skubbet og at være påvirkelig af tyngdekraften" />
- <check_box label="Temporær" name="Temporary Checkbox Ctrl"
- tool_tip="Medfårer at objekter bliver slettet 1 minut efter de er skabt." />
- <check_box label="Uden masse" name="Phantom Checkbox Ctrl"
- tool_tip="FÃ¥r objektet til ikke at kollidere med andre objekter eller personer" />
- <text name="label position">
- Position (meter)
- </text>
- <spinner label="X" name="Pos X" />
- <spinner label="Y" name="Pos Y" />
- <spinner label="Z" name="Pos Z" />
- <text name="label size">
- Størrelse (meter)
- </text>
- <spinner label="X" name="Scale X" />
- <spinner label="Y" name="Scale Y" />
- <spinner label="Z" name="Scale Z" />
- <text name="label rotation">
- Rotation (grader)
- </text>
- <spinner label="X" name="Rot X" />
- <spinner label="Y" name="Rot Y" />
- <spinner label="Z" name="Rot Z" />
- <text name="label material">
- Materiale
- </text>
- <combo_box name="material">
- <combo_item name="Stone">
- Sten
- </combo_item>
- <combo_item name="Metal">
- Metal
- </combo_item>
- <combo_item name="Glass">
- Glas
- </combo_item>
- <combo_item name="Wood">
- Træ
- </combo_item>
- <combo_item name="Flesh">
- Kød
- </combo_item>
- <combo_item name="Plastic">
- Plastik
- </combo_item>
- <combo_item name="Rubber">
- Gummi
- </combo_item>
- </combo_box>
- <text name="label basetype">
- Byggegeometrisk figur
- </text>
- <combo_box name="comboBaseType">
- <combo_item name="Box">
- Terning
- </combo_item>
- <combo_item name="Cylinder">
- Cylinder
- </combo_item>
- <combo_item name="Prism">
- Prisme
- </combo_item>
- <combo_item name="Sphere">
- Spfære
- </combo_item>
- <combo_item name="Torus">
- Kuglering
- </combo_item>
- <combo_item name="Tube">
- Rør
- </combo_item>
- <combo_item name="Ring">
- Ring
- </combo_item>
- <combo_item name="Sculpted">
- Sculpted
- </combo_item>
- </combo_box>
- <text name="text cut">
- Snit begynd og slut
- </text>
- <spinner label="B" name="cut begin" />
- <spinner label="E" name="cut end" />
- <text name="text hollow">
- Hul
- </text>
- <text name="text skew">
- Skævhed
- </text>
- <text name="Hollow Shape">
- Form på hul
- </text>
- <combo_box name="hole">
- <combo_item name="Default">
- Standard
- </combo_item>
- <combo_item name="Circle">
- Cirkel
- </combo_item>
- <combo_item name="Square">
- Firkant
- </combo_item>
- <combo_item name="Triangle">
- Trekant
- </combo_item>
- </combo_box>
- <text name="text twist">
- Vrid - start og slut
- </text>
- <spinner label="B" name="Twist Begin" />
- <spinner label="E" name="Twist End" />
- <text name="scale_taper">
- Konus
- </text>
- <text name="scale_hole">
- Hulstørrelse
- </text>
- <spinner label="X" name="Taper Scale X" />
- <spinner label="Y" name="Taper Scale Y" />
- <text name="text topshear">
- Topforskydning
- </text>
- <spinner label="X" name="Shear X" />
- <spinner label="Y" name="Shear Y" />
- <text name="advanced_cut">
- Profilsnit - begynd og slut
- </text>
- <text name="advanced_dimple">
- Fordybning - begynd og slut
- </text>
- <spinner label="B" name="Path Limit Begin" />
- <spinner label="E" name="Path Limit End" />
- <text name="text taper2">
- Konus
- </text>
- <spinner label="X" name="Taper X" />
- <spinner label="Y" name="Taper Y" />
- <text name="text radius delta">
- Radius
- </text>
- <text name="text revolutions">
- Omdrejninger
- </text>
- <texture_picker label="Sculpt tekstur" name="sculpt texture control"
- tool_tip="Klik her for at vælge billede" />
- <check_box label="Spejlet" name="sculpt mirror control"
- tool_tip="Spejler sculpted prim omkring X aksen." />
- <check_box label="Vrangen ud" name="sculpt invert control"
- tool_tip="Vender 'vrangen' ud på sculpted prim." />
- <text name="label sculpt type">
- Sting type
- </text>
- <combo_box name="sculpt type control">
- <combo_item name="None">
- (ingen)
- </combo_item>
- <combo_item name="Sphere">
- Sfære
- </combo_item>
- <combo_item name="Torus">
- Kuglering
- </combo_item>
- <combo_item name="Plane">
- Plan
- </combo_item>
- <combo_item name="Cylinder">
- Cylinder
- </combo_item>
- </combo_box>
- </panel>
- <panel label="Features" name="Features">
- <text name="select_single">
- Vælg kun én prim for at ændre egenskaber.
- </text>
- <text name="edit_object">
- Redigér objektets egenskaber:
- </text>
- <check_box label="Fleksibel/blød" name="Flexible1D Checkbox Ctrl"
- tool_tip="Tillader objektet at ændre form omkring Z-aksen. (Kun på klient-siden)" />
- <spinner label="Blødhed" name="FlexNumSections" />
- <spinner label="Tyngdekraft" name="FlexGravity" />
- <spinner label="Træk" name="FlexFriction" />
- <spinner label="Vind" name="FlexWind" />
- <spinner label="Spændstighed" name="FlexTension" />
- <spinner label="Kraft X" name="FlexForceX" />
- <spinner label="Kraft Y" name="FlexForceY" />
- <spinner label="Kraft Z" name="FlexForceZ" />
- <check_box label="Lys" name="Light Checkbox Ctrl"
- tool_tip="Medfårer at objektet afgiver lys" />
- <text name="label color">
- Farve
- </text>
- <color_swatch label="" name="colorswatch" tool_tip="Klik for at åbne farvevælger" />
- <spinner label="Intensitet" name="Light Intensity" />
- <spinner label="Radius" name="Light Radius" />
- <spinner label="Udfasning" name="Light Falloff" />
- </panel>
- <panel label="Tekstur" name="Texture">
- <texture_picker label="Tekstur" name="texture control" tool_tip="Klik for at vælge billede" />
- <color_swatch label="Farve" name="colorswatch" tool_tip="Klik for at åbne farvevælger" />
- <text name="color trans">
- Gennemsigtighed %
- </text>
- <text name="glow label">
- Glød
- </text>
- <check_box label="Selvlysende" name="checkbox fullbright" />
- <text name="tex gen">
- Afbildning
- </text>
- <combo_box name="combobox texgen">
- <combo_item name="Default">
- Standard
- </combo_item>
- <combo_item name="Planar">
- Plan
- </combo_item>
- </combo_box>
- <text name="label shininess">
- Blankhed
- </text>
- <combo_box name="combobox shininess">
- <combo_item name="None">
- Ingen
- </combo_item>
- <combo_item name="Low">
- Lav
- </combo_item>
- <combo_item name="Medium">
- Mellem
- </combo_item>
- <combo_item name="High">
- Høj
- </combo_item>
- </combo_box>
- <text name="label bumpiness">
- Struktur
- </text>
- <combo_box name="combobox bumpiness">
- <combo_item name="None">
- Ingen
- </combo_item>
- <combo_item name="Brightness">
- Lysintensitet
- </combo_item>
- <combo_item name="Darkness">
- Mørke
- </combo_item>
- <combo_item name="woodgrain">
- træårer
- </combo_item>
- <combo_item name="bark">
- bark
- </combo_item>
- <combo_item name="bricks">
- mursten
- </combo_item>
- <combo_item name="checker">
- tern
- </combo_item>
- <combo_item name="concrete">
- beton
- </combo_item>
- <combo_item name="crustytile">
- rustik flise
- </combo_item>
- <combo_item name="cutstone">
- Skåret sten
- </combo_item>
- <combo_item name="discs">
- plader
- </combo_item>
- <combo_item name="gravel">
- grus
- </combo_item>
- <combo_item name="petridish">
- petriskål
- </combo_item>
- <combo_item name="siding">
- udvendig beklædning
- </combo_item>
- <combo_item name="stonetile">
- stenflise
- </combo_item>
- <combo_item name="stucco">
- puds
- </combo_item>
- <combo_item name="suction">
- rør
- </combo_item>
- <combo_item name="weave">
- væv
- </combo_item>
- </combo_box>
- <text name="tex scale">
- Gentagelser pr. overflade
- </text>
- <spinner label="Vandret (U)" name="TexScaleU" />
- <check_box label="Vend" name="checkbox flip s" />
- <spinner label="Lodret (V)" name="TexScaleV" />
- <check_box label="Vend" name="checkbox flip t" />
- <text name="tex rotate">
- Rotation (grader)
- </text>
- <string name="string repeats per meter">
- Gentagelser pr. meter
- </string>
- <string name="string repeats per face">
- Gentagelser pr. overflade
- </string>
- <text name="rpt">
- Gentagelser pr. meter
- </text>
- <button label="Gem" label_selected="Gem" name="button apply" />
- <text name="tex offset">
- Offset
- </text>
- <spinner label="Vandret (U)" name="TexOffsetU" />
- <spinner label="Lodret (V)" name="TexOffsetV" />
- <text name="textbox autofix">
- Rette medie tekstur ind
-(skal indlæses først)
- </text>
- <button label="Ret ind" label_selected="Ret ind" name="button align" />
- </panel>
- <panel label="Indhold" name="Contents">
- <button label="Nyt script..." label_selected="Nyt script..." name="button new script" />
- </panel>
- </tab_container>
- <panel name="land info panel">
- <text name="label_area_price">
- Pris: L$[PRICE] for [AREA] m².
- </text>
- <text name="label_area">
- Område: [AREA] m².
- </text>
- <button label="Køb land..." label_selected="Køb land..." name="button buy land" />
- <button label="Flyt fra land..." label_selected="Flyt fra land..."
- name="button abandon land" />
- <button label="Opdel..." label_selected="Opdel..." name="button subdivide land" />
- <button label="Saml..." label_selected="Saml..." name="button join land" />
- <button label="Om land..." label_selected="Om land..." name="button about land" />
- </panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="toolbox floater" title="">
+ <button label="" label_selected="" name="button focus" tool_tip="Fokus" />
+ <button label="" label_selected="" name="button move" tool_tip="Flyt" />
+ <button label="" label_selected="" name="button edit" tool_tip="Redigér" />
+ <button label="" label_selected="" name="button create" tool_tip="Opret" />
+ <button label="" label_selected="" name="button land" tool_tip="Land" />
+ <check_box label="Zoom" name="radio zoom" />
+ <check_box label="Kredsløb (Ctrl)" name="radio orbit" />
+ <check_box label="Panorér (Ctrl-Shift)" name="radio pan" />
+ <check_box label="Flyt" name="radio move" />
+ <check_box label="Løft (Ctrl)" name="radio lift" />
+ <check_box label="Spin (Ctrl-Shift)" name="radio spin" />
+ <check_box label="Position" name="radio position" />
+ <check_box label="Rotér (Ctrl)" name="radio rotate" />
+ <check_box label="Stræk (Ctrl-Shift)" name="radio stretch" />
+ <check_box label="Vælg tekstur" name="radio select face" />
+ <check_box label="Redigér sammenlænkede dele" name="checkbox edit linked parts" />
+ <text name="text ruler mode">
+ Lineal:
+ </text>
+ <combo_box name="combobox grid mode">
+ <combo_item name="World">
+ Verden
+ </combo_item>
+ <combo_item name="Local">
+ Lokal
+ </combo_item>
+ <combo_item name="Reference">
+ Reference
+ </combo_item>
+ </combo_box>
+ <check_box label="Stræk begge sider" name="checkbox uniform" />
+ <check_box label="Stræk teksturer" name="checkbox stretch textures" />
+ <check_box label="Benyt gitter" name="checkbox snap to grid" />
+ <button label="Valg..." label_selected="Valg..." name="Options..." />
+ <text name="text status">
+ Træk for at flytte, shift+træk for at kopiere
+ </text>
+ <button label="" label_selected="" name="ToolCube" tool_tip="Terning" />
+ <button label="" label_selected="" name="ToolPrism" tool_tip="Prisme" />
+ <button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide" />
+ <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraed" />
+ <button label="" label_selected="" name="ToolCylinder" tool_tip="Cylinder" />
+ <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Hemicylinder" />
+ <button label="" label_selected="" name="ToolCone" tool_tip="Kegle" />
+ <button label="" label_selected="" name="ToolHemiCone" tool_tip="Hemikegle" />
+ <button label="" label_selected="" name="ToolSphere" tool_tip="Sfære" />
+ <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Hemisfære" />
+ <button label="" label_selected="" name="ToolTorus" tool_tip="Kuglering" />
+ <button label="" label_selected="" name="ToolTube" tool_tip="Rør" />
+ <button label="" label_selected="" name="ToolRing" tool_tip="Ring" />
+ <button label="" label_selected="" name="ToolTree" tool_tip="Træ" />
+ <button label="" label_selected="" name="ToolGrass" tool_tip="Græs" />
+ <check_box label="Hold værktøjet valgt" name="checkbox sticky" />
+ <check_box label="Kopiér valgte" name="checkbox copy selection" />
+ <check_box label="Centréret kopi" name="checkbox copy centers" />
+ <check_box label="Rotér kopi" name="checkbox copy rotates" />
+ <check_box label="Vælg land" name="radio select land" />
+ <check_box label="Udflad land" name="radio flatten" />
+ <check_box label="Hæv land" name="radio raise" />
+ <check_box label="Sænk land" name="radio lower" />
+ <check_box label="Udjævn land" name="radio smooth" />
+ <check_box label="Gør land ujævnt" name="radio noise" />
+ <check_box label="Tilbagefør" name="radio revert" />
+ <combo_box name="combobox brush size">
+ <combo_item name="Small">
+ Lille
+ </combo_item>
+ <combo_item name="Medium">
+ Mellem
+ </combo_item>
+ <combo_item name="Large">
+ Stor
+ </combo_item>
+ </combo_box>
+ <text type="string" length="1" name="Strength:">
+ Styrke:
+ </text>
+ <button label="Anvend på valgte" label_selected="Anvend på valgte"
+ name="button apply to selection" tool_tip="Redigér valgt land" />
+ <check_box label="Vis ejere" name="checkbox show owners" />
+ <button label="Mere >>" name="button more" tool_tip="Adancerede valgmuligheder" />
+ <button label="<< Mindre" name="button less" tool_tip="Adancerede valgmuligheder" />
+ <tab_container name="Object Info Tabs">
+ <panel label="Generelt" name="General">
+ <text name="Name:">
+ Navn:
+ </text>
+ <text name="Description:">
+ Beskrivelse:
+ </text>
+ <text name="Creator:">
+ Skaber:
+ </text>
+ <text name="Creator Name">
+ Thrax Linden
+ </text>
+ <button label="Profil..." label_selected="Profil..." name="button creator profile" />
+ <text name="Owner:">
+ Ejer:
+ </text>
+ <text name="Owner Name">
+ Thrax Linden
+ </text>
+ <button label="Profil..." label_selected="Profil..." name="button owner profile" />
+ <text name="Group:">
+ Gruppe:
+ </text>
+ <text name="Group Name Proxy">
+ The Lindens
+ </text>
+ <button label="Sæt..." label_selected="Sæt..." name="button set group" />
+ <text name="prim info">
+ 1 Objekt, 1 Prim
+ </text>
+ <text name="Permissions:">
+ Tilladelser:
+ </text>
+ <text name="perm_modify">
+ Du kan redigére dette objekt.
+ </text>
+ <check_box label="Del med gruppe" name="checkbox share with group"
+ tool_tip="Tillad gruppemedlemmer at flytte, ændre, kopiere og slette." />
+ <string name="text deed continued">
+ Deed...
+ </string>
+ <string name="text deed">
+ Deed
+ </string>
+ <button label="Dedikér..." label_selected="Dedikér..." name="button deed"
+ tool_tip="Gruppedelte genstande kan dedikeres af en gruppeadministrator." />
+ <check_box label="Tillad enhver at flytte" name="checkbox allow everyone move" />
+ <check_box label="Tillad enhver at kopiére" name="checkbox allow everyone copy" />
+ <check_box label="Vis i søgning" name="search_check"
+ tool_tip="Lad folk se dette objekt i søgeresultater" />
+ <check_box label="Til salg" name="checkbox for sale" />
+ <text name="Cost">
+ Pris: L$
+ </text>
+ <radio_group name="sale type">
+ <radio_item name="Original">
+ Original
+ </radio_item>
+ <radio_item name="Copy">
+ Kopi
+ </radio_item>
+ <radio_item name="Contents">
+ Indhold
+ </radio_item>
+ </radio_group>
+ <text name="Next owner can:">
+ Næste ejer kan:
+ </text>
+ <check_box label="Redigére" name="checkbox next owner can modify" />
+ <check_box label="Kopiére" name="checkbox next owner can copy" />
+ <check_box label="Sælge/Give væk" name="checkbox next owner can transfer" />
+ <text name="label click action">
+ NÃ¥r der venstreklikkes:
+ </text>
+ <combo_box name="clickaction">
+ <combo_item name="Touch/grab(default)">
+ Rør/tag (standard)
+ </combo_item>
+ <combo_item name="Sitonobject">
+ Sid på objekt
+ </combo_item>
+ <combo_item name="Buyobject">
+ Køb objekt
+ </combo_item>
+ <combo_item name="Payobject">
+ Betal objekt
+ </combo_item>
+ <combo_item name="Open">
+ Ã…ben
+ </combo_item>
+ <combo_item name="Play">
+ Afspil medie på parcel
+ </combo_item>
+ <combo_item name="Opemmedia">
+ Åben media på parcel
+ </combo_item>
+ </combo_box>
+ <text name="B:">
+ B:
+ </text>
+ <text name="O:">
+ O:
+ </text>
+ <text name="G:">
+ G:
+ </text>
+ <text name="E:">
+ E:
+ </text>
+ <text name="N:">
+ N:
+ </text>
+ <text name="F:">
+ F:
+ </text>
+ </panel>
+ <panel label="Objekt" name="Object">
+ <text name="select_single">
+ Vælg kun én prim for at ændre indstillinger.
+ </text>
+ <text name="edit_object">
+ Ret objektets indstillinger:
+ </text>
+ <check_box label="LÃ¥st" name="checkbox locked"
+ tool_tip="Forhindrer objektet i at blive flyttet eller slettet. Ofte brugbar under byggeri for at forhindre utilsigtet ændring." />
+ <check_box label="Fysisk" name="Physical Checkbox Ctrl"
+ tool_tip="Tillader objekter at blive skubbet og at være påvirkelig af tyngdekraften" />
+ <check_box label="Temporær" name="Temporary Checkbox Ctrl"
+ tool_tip="Medfårer at objekter bliver slettet 1 minut efter de er skabt." />
+ <check_box label="Uden masse" name="Phantom Checkbox Ctrl"
+ tool_tip="FÃ¥r objektet til ikke at kollidere med andre objekter eller personer" />
+ <text name="label position">
+ Position (meter)
+ </text>
+ <spinner label="X" name="Pos X" />
+ <spinner label="Y" name="Pos Y" />
+ <spinner label="Z" name="Pos Z" />
+ <text name="label size">
+ Størrelse (meter)
+ </text>
+ <spinner label="X" name="Scale X" />
+ <spinner label="Y" name="Scale Y" />
+ <spinner label="Z" name="Scale Z" />
+ <text name="label rotation">
+ Rotation (grader)
+ </text>
+ <spinner label="X" name="Rot X" />
+ <spinner label="Y" name="Rot Y" />
+ <spinner label="Z" name="Rot Z" />
+ <text name="label material">
+ Materiale
+ </text>
+ <combo_box name="material">
+ <combo_item name="Stone">
+ Sten
+ </combo_item>
+ <combo_item name="Metal">
+ Metal
+ </combo_item>
+ <combo_item name="Glass">
+ Glas
+ </combo_item>
+ <combo_item name="Wood">
+ Træ
+ </combo_item>
+ <combo_item name="Flesh">
+ Kød
+ </combo_item>
+ <combo_item name="Plastic">
+ Plastik
+ </combo_item>
+ <combo_item name="Rubber">
+ Gummi
+ </combo_item>
+ </combo_box>
+ <text name="label basetype">
+ Byggegeometrisk figur
+ </text>
+ <combo_box name="comboBaseType">
+ <combo_item name="Box">
+ Terning
+ </combo_item>
+ <combo_item name="Cylinder">
+ Cylinder
+ </combo_item>
+ <combo_item name="Prism">
+ Prisme
+ </combo_item>
+ <combo_item name="Sphere">
+ Spfære
+ </combo_item>
+ <combo_item name="Torus">
+ Kuglering
+ </combo_item>
+ <combo_item name="Tube">
+ Rør
+ </combo_item>
+ <combo_item name="Ring">
+ Ring
+ </combo_item>
+ <combo_item name="Sculpted">
+ Sculpted
+ </combo_item>
+ </combo_box>
+ <text name="text cut">
+ Snit begynd og slut
+ </text>
+ <spinner label="B" name="cut begin" />
+ <spinner label="E" name="cut end" />
+ <text name="text hollow">
+ Hul
+ </text>
+ <text name="text skew">
+ Skævhed
+ </text>
+ <text name="Hollow Shape">
+ Form på hul
+ </text>
+ <combo_box name="hole">
+ <combo_item name="Default">
+ Standard
+ </combo_item>
+ <combo_item name="Circle">
+ Cirkel
+ </combo_item>
+ <combo_item name="Square">
+ Firkant
+ </combo_item>
+ <combo_item name="Triangle">
+ Trekant
+ </combo_item>
+ </combo_box>
+ <text name="text twist">
+ Vrid - start og slut
+ </text>
+ <spinner label="B" name="Twist Begin" />
+ <spinner label="E" name="Twist End" />
+ <text name="scale_taper">
+ Konus
+ </text>
+ <text name="scale_hole">
+ Hulstørrelse
+ </text>
+ <spinner label="X" name="Taper Scale X" />
+ <spinner label="Y" name="Taper Scale Y" />
+ <text name="text topshear">
+ Topforskydning
+ </text>
+ <spinner label="X" name="Shear X" />
+ <spinner label="Y" name="Shear Y" />
+ <text name="advanced_cut">
+ Profilsnit - begynd og slut
+ </text>
+ <text name="advanced_dimple">
+ Fordybning - begynd og slut
+ </text>
+ <spinner label="B" name="Path Limit Begin" />
+ <spinner label="E" name="Path Limit End" />
+ <text name="text taper2">
+ Konus
+ </text>
+ <spinner label="X" name="Taper X" />
+ <spinner label="Y" name="Taper Y" />
+ <text name="text radius delta">
+ Radius
+ </text>
+ <text name="text revolutions">
+ Omdrejninger
+ </text>
+ <texture_picker label="Sculpt tekstur" name="sculpt texture control"
+ tool_tip="Klik her for at vælge billede" />
+ <check_box label="Spejlet" name="sculpt mirror control"
+ tool_tip="Spejler sculpted prim omkring X aksen." />
+ <check_box label="Vrangen ud" name="sculpt invert control"
+ tool_tip="Vender 'vrangen' ud på sculpted prim." />
+ <text name="label sculpt type">
+ Sting type
+ </text>
+ <combo_box name="sculpt type control">
+ <combo_item name="None">
+ (ingen)
+ </combo_item>
+ <combo_item name="Sphere">
+ Sfære
+ </combo_item>
+ <combo_item name="Torus">
+ Kuglering
+ </combo_item>
+ <combo_item name="Plane">
+ Plan
+ </combo_item>
+ <combo_item name="Cylinder">
+ Cylinder
+ </combo_item>
+ </combo_box>
+ </panel>
+ <panel label="Features" name="Features">
+ <text name="select_single">
+ Vælg kun én prim for at ændre egenskaber.
+ </text>
+ <text name="edit_object">
+ Redigér objektets egenskaber:
+ </text>
+ <check_box label="Fleksibel/blød" name="Flexible1D Checkbox Ctrl"
+ tool_tip="Tillader objektet at ændre form omkring Z-aksen. (Kun på klient-siden)" />
+ <spinner label="Blødhed" name="FlexNumSections" />
+ <spinner label="Tyngdekraft" name="FlexGravity" />
+ <spinner label="Træk" name="FlexFriction" />
+ <spinner label="Vind" name="FlexWind" />
+ <spinner label="Spændstighed" name="FlexTension" />
+ <spinner label="Kraft X" name="FlexForceX" />
+ <spinner label="Kraft Y" name="FlexForceY" />
+ <spinner label="Kraft Z" name="FlexForceZ" />
+ <check_box label="Lys" name="Light Checkbox Ctrl"
+ tool_tip="Medfårer at objektet afgiver lys" />
+ <text name="label color">
+ Farve
+ </text>
+ <color_swatch label="" name="colorswatch" tool_tip="Klik for at åbne farvevælger" />
+ <spinner label="Intensitet" name="Light Intensity" />
+ <spinner label="Radius" name="Light Radius" />
+ <spinner label="Udfasning" name="Light Falloff" />
+ </panel>
+ <panel label="Tekstur" name="Texture">
+ <texture_picker label="Tekstur" name="texture control" tool_tip="Klik for at vælge billede" />
+ <color_swatch label="Farve" name="colorswatch" tool_tip="Klik for at åbne farvevælger" />
+ <text name="color trans">
+ Gennemsigtighed %
+ </text>
+ <text name="glow label">
+ Glød
+ </text>
+ <check_box label="Selvlysende" name="checkbox fullbright" />
+ <text name="tex gen">
+ Afbildning
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_item name="Default">
+ Standard
+ </combo_item>
+ <combo_item name="Planar">
+ Plan
+ </combo_item>
+ </combo_box>
+ <text name="label shininess">
+ Blankhed
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_item name="None">
+ Ingen
+ </combo_item>
+ <combo_item name="Low">
+ Lav
+ </combo_item>
+ <combo_item name="Medium">
+ Mellem
+ </combo_item>
+ <combo_item name="High">
+ Høj
+ </combo_item>
+ </combo_box>
+ <text name="label bumpiness">
+ Struktur
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_item name="None">
+ Ingen
+ </combo_item>
+ <combo_item name="Brightness">
+ Lysintensitet
+ </combo_item>
+ <combo_item name="Darkness">
+ Mørke
+ </combo_item>
+ <combo_item name="woodgrain">
+ træårer
+ </combo_item>
+ <combo_item name="bark">
+ bark
+ </combo_item>
+ <combo_item name="bricks">
+ mursten
+ </combo_item>
+ <combo_item name="checker">
+ tern
+ </combo_item>
+ <combo_item name="concrete">
+ beton
+ </combo_item>
+ <combo_item name="crustytile">
+ rustik flise
+ </combo_item>
+ <combo_item name="cutstone">
+ Skåret sten
+ </combo_item>
+ <combo_item name="discs">
+ plader
+ </combo_item>
+ <combo_item name="gravel">
+ grus
+ </combo_item>
+ <combo_item name="petridish">
+ petriskål
+ </combo_item>
+ <combo_item name="siding">
+ udvendig beklædning
+ </combo_item>
+ <combo_item name="stonetile">
+ stenflise
+ </combo_item>
+ <combo_item name="stucco">
+ puds
+ </combo_item>
+ <combo_item name="suction">
+ rør
+ </combo_item>
+ <combo_item name="weave">
+ væv
+ </combo_item>
+ </combo_box>
+ <text name="tex scale">
+ Gentagelser pr. overflade
+ </text>
+ <spinner label="Vandret (U)" name="TexScaleU" />
+ <check_box label="Vend" name="checkbox flip s" />
+ <spinner label="Lodret (V)" name="TexScaleV" />
+ <check_box label="Vend" name="checkbox flip t" />
+ <text name="tex rotate">
+ Rotation (grader)
+ </text>
+ <string name="string repeats per meter">
+ Gentagelser pr. meter
+ </string>
+ <string name="string repeats per face">
+ Gentagelser pr. overflade
+ </string>
+ <text name="rpt">
+ Gentagelser pr. meter
+ </text>
+ <button label="Gem" label_selected="Gem" name="button apply" />
+ <text name="tex offset">
+ Offset
+ </text>
+ <spinner label="Vandret (U)" name="TexOffsetU" />
+ <spinner label="Lodret (V)" name="TexOffsetV" />
+ <text name="textbox autofix">
+ Rette medie tekstur ind
+(skal indlæses først)
+ </text>
+ <button label="Ret ind" label_selected="Ret ind" name="button align" />
+ </panel>
+ <panel label="Indhold" name="Contents">
+ <button label="Nyt script..." label_selected="Nyt script..." name="button new script" />
+ </panel>
+ </tab_container>
+ <panel name="land info panel">
+ <text name="label_area_price">
+ Pris: L$[PRICE] for [AREA] m².
+ </text>
+ <text name="label_area">
+ Område: [AREA] m².
+ </text>
+ <button label="Køb land..." label_selected="Køb land..." name="button buy land" />
+ <button label="Flyt fra land..." label_selected="Flyt fra land..."
+ name="button abandon land" />
+ <button label="Opdel..." label_selected="Opdel..." name="button subdivide land" />
+ <button label="Saml..." label_selected="Saml..." name="button join land" />
+ <button label="Om land..." label_selected="Om land..." name="button about land" />
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_tos.xml b/indra/newview/skins/default/xui/da/floater_tos.xml
index c62b5ca1a7..8d341f6a12 100644
--- a/indra/newview/skins/default/xui/da/floater_tos.xml
+++ b/indra/newview/skins/default/xui/da/floater_tos.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title="">
- <button label="Fortsæt" label_selected="Fortsæt" name="Continue" />
- <button label="Annullér" label_selected="Annullér" name="Cancel" />
- <check_box label="Jeg accepterer vilkårene for brug af tjenesten" name="agree_chk" />
- <text name="tos_heading">
- Læs venligst de almindelige bestemmelser og vilkår igennem, for at fortsætte til Second Life skal du acceptere vilkårene.
- </text>
- <text_editor name="tos_text">
- TOS_TEXT
- </text_editor>
- <string name="real_url">
- http://secondlife.com/app/tos/
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+ <button label="Fortsæt" label_selected="Fortsæt" name="Continue" />
+ <button label="Annullér" label_selected="Annullér" name="Cancel" />
+ <check_box label="Jeg accepterer vilkårene for brug af tjenesten" name="agree_chk" />
+ <text name="tos_heading">
+ Læs venligst de almindelige bestemmelser og vilkår igennem, for at fortsætte til Second Life skal du acceptere vilkårene.
+ </text>
+ <text_editor name="tos_text">
+ TOS_TEXT
+ </text_editor>
+ <string name="real_url">
+ http://secondlife.com/app/tos/
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml
index 4c1dcd2e39..145768a7e3 100644
--- a/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/da/floater_wearable_save_as.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title="">
- <button label="Gem" label_selected="Gem" name="Save" />
- <button label="Annullér" label_selected="Annullér" name="Cancel" />
- <text type="string" length="1" name="Save item as:">
- Gem ting som::
- </text>
- <line_editor name="name ed">
- Ny [DESC]
- </line_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+ <button label="Gem" label_selected="Gem" name="Save" />
+ <button label="Annullér" label_selected="Annullér" name="Cancel" />
+ <text type="string" length="1" name="Save item as:">
+ Gem ting som::
+ </text>
+ <line_editor name="name ed">
+ Ny [DESC]
+ </line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_world_map.xml b/indra/newview/skins/default/xui/da/floater_world_map.xml
index 3fe985fbb6..9d1c799471 100644
--- a/indra/newview/skins/default/xui/da/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/da/floater_world_map.xml
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="worldmap" title="Verdenskort">
- <tab_container name="maptab">
- <panel label="Objekter" name="objects_mapview" />
- <panel label="Terræn" name="terrain_mapview" />
- </tab_container>
- <text name="land_for_sale_label">
- Land til salg
- </text>
- <text name="auction_label">
- Auktion
- </text>
- <text name="you_label">
- Dig
- </text>
- <text name="home_label">
- Hjem
- </text>
- <button label="Tag hjem" label_selected="Tag hjem" name="Go Home"
- tool_tip="Teleporter til dit hjem" />
- <text name="person_label">
- Person
- </text>
- <check_box label=" " name="people_chk" />
- <text name="infohub_label">
- Infohub
- </text>
- <check_box label="" name="infohub_chk" />
- <text name="telehub_label">
- Telehub
- </text>
- <check_box label="" name="telehubchk" />
- <text name="land_for_sale_label2">
- Land til salg
- </text>
- <check_box label="" name="land_for_sale_chk" />
- <text name="events_label">
- Events
- </text>
- <check_box label="" name="event_chk" />
- <text name="events_mature_label" />
- <check_box label="" name="event_mature_chk" />
- <combo_box label="Venner online" name="friend combo"
- tool_tip="Ven der skal vises på kortet">
- <combo_item name="none_selected">
- Venner online
- </combo_item>
- </combo_box>
- <combo_box label="Landemærker" name="landmark combo"
- tool_tip="Landemærke der skal vises på kortet">
- <combo_item name="none_selected">
- Landemærker
- </combo_item>
- </combo_box>
- <line_editor label="Søg på region navn" name="location"
- tool_tip="Skriv navnet på en region" />
- <button label="Søg" name="DoSearch" tool_tip="Søg efter en region" />
- <text name="search_label">
- Søgeresultater:
- </text>
- <scroll_list name="search_results">
- <column label="" name="icon" />
- <column label="" name="sim_name" />
- </scroll_list>
- <text name="location_label">
- Lokation:
- </text>
- <spinner name="spin x" tool_tip="X koordinat for lokation der skal vises på kortet" />
- <spinner name="spin y" tool_tip="Y koordinat for lokation der skal vises på kortet" />
- <spinner name="spin z" tool_tip="Z koordinat for lokation der skal vises på kortet" />
- <button label="Teleport" label_selected="Teleport" name="Teleport"
- tool_tip="Teleportér til den valgte lokation" />
- <button label="Vis destination" label_selected="Vis destination"
- name="Show Destination" tool_tip="Centrér kortet på valgte lokation" />
- <button label="Slet" label_selected="Slet" name="Clear" tool_tip="Stop søg" />
- <button label="Vis min position" label_selected="Vis min position"
- name="Show My Location" tool_tip="Centrer kortet på din avatars lokation" />
- <button label="Kopiér SLURL til udklipsholder" name="copy_slurl"
- tool_tip="Kopierer den nuværende lokation som et SLURL, så det kan bruges på nettet." />
- <slider label="Zoom" name="zoom slider" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="worldmap" title="Verdenskort">
+ <tab_container name="maptab">
+ <panel label="Objekter" name="objects_mapview" />
+ <panel label="Terræn" name="terrain_mapview" />
+ </tab_container>
+ <text name="land_for_sale_label">
+ Land til salg
+ </text>
+ <text name="auction_label">
+ Auktion
+ </text>
+ <text name="you_label">
+ Dig
+ </text>
+ <text name="home_label">
+ Hjem
+ </text>
+ <button label="Tag hjem" label_selected="Tag hjem" name="Go Home"
+ tool_tip="Teleporter til dit hjem" />
+ <text name="person_label">
+ Person
+ </text>
+ <check_box label=" " name="people_chk" />
+ <text name="infohub_label">
+ Infohub
+ </text>
+ <check_box label="" name="infohub_chk" />
+ <text name="telehub_label">
+ Telehub
+ </text>
+ <check_box label="" name="telehubchk" />
+ <text name="land_for_sale_label2">
+ Land til salg
+ </text>
+ <check_box label="" name="land_for_sale_chk" />
+ <text name="events_label">
+ Events
+ </text>
+ <check_box label="" name="event_chk" />
+ <text name="events_mature_label" />
+ <check_box label="" name="event_mature_chk" />
+ <combo_box label="Venner online" name="friend combo"
+ tool_tip="Ven der skal vises på kortet">
+ <combo_box.item name="none_selected">
+ Venner online
+ </combo_box.item>
+ </combo_box>
+ <combo_box label="Landemærker" name="landmark combo"
+ tool_tip="Landemærke der skal vises på kortet">
+ <combo_box.item name="none_selected">
+ Landemærker
+ </combo_box.item>
+ </combo_box>
+ <line_editor label="Søg på region navn" name="location"
+ tool_tip="Skriv navnet på en region" />
+ <button label="Søg" name="DoSearch" tool_tip="Søg efter en region" />
+ <text name="search_label">
+ Søgeresultater:
+ </text>
+ <scroll_list name="search_results">
+ <column label="" name="icon" />
+ <column label="" name="sim_name" />
+ </scroll_list>
+ <text name="location_label">
+ Lokation:
+ </text>
+ <spinner name="spin x" tool_tip="X koordinat for lokation der skal vises på kortet" />
+ <spinner name="spin y" tool_tip="Y koordinat for lokation der skal vises på kortet" />
+ <spinner name="spin z" tool_tip="Z koordinat for lokation der skal vises på kortet" />
+ <button label="Teleport" label_selected="Teleport" name="Teleport"
+ tool_tip="Teleportér til den valgte lokation" />
+ <button label="Vis destination" label_selected="Vis destination"
+ name="Show Destination" tool_tip="Centrér kortet på valgte lokation" />
+ <button label="Slet" label_selected="Slet" name="Clear" tool_tip="Stop søg" />
+ <button label="Vis min position" label_selected="Vis min position"
+ name="Show My Location" tool_tip="Centrer kortet på din avatars lokation" />
+ <button label="Kopiér SLURL til udklipsholder" name="copy_slurl"
+ tool_tip="Kopierer den nuværende lokation som et SLURL, så det kan bruges på nettet." />
+ <slider label="Zoom" name="zoom slider" />
+</floater>
diff --git a/indra/newview/skins/default/xui/da/menu_inventory.xml b/indra/newview/skins/default/xui/da/menu_inventory.xml
index 7b1fae4273..2c47703ef2 100644
--- a/indra/newview/skins/default/xui/da/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/da/menu_inventory.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="Popup">
- <menu_item_call label="Køb" name="Task Buy" />
- <menu_item_call label="Ã¥ben" name="Task Open" />
- <menu_item_call label="Afspil" name="Task Play" />
- <menu_item_call label="Egenskaber" name="Task Properties" />
- <menu_item_call label="Omdøb" name="Task Rename" />
- <menu_item_call label="Slet" name="Task Remove" />
- <menu_item_call label="Tøm papirkurv" name="Empty Trash" />
- <menu_item_call label="Tøm 'Lost and found'" name="Empty Lost And Found" />
- <menu_item_call label="Ny mappe" name="New Folder" />
- <menu_item_call label="Nyt script" name="New Script" />
- <menu_item_call label="Ny note" name="New Note" />
- <menu_item_call label="Ny bevægelse" name="New Gesture" />
- <menu name="New Clothes">
- <menu_item_call label="Ny trøje" name="New Shirt" />
- <menu_item_call label="Nye bukser" name="New Pants" />
- <menu_item_call label="Nye sko" name="New Shoes" />
- <menu_item_call label="Nye strømper" name="New Socks" />
- <menu_item_call label="Ny jakke" name="New Jacket" />
- <menu_item_call label="Ny nederdel" name="New Skirt" />
- <menu_item_call label="Nye handsker" name="New Gloves" />
- <menu_item_call label="Ny undertrøje" name="New Undershirt" />
- <menu_item_call label="Nye underbukser" name="New Underpants" />
- </menu>
- <menu name="New Body Parts">
- <menu_item_call label="Ny figur" name="New Shape" />
- <menu_item_call label="Nyt hud" name="New Skin" />
- <menu_item_call label="Nyt hår" name="New Hair" />
- <menu_item_call label="Nye øjne" name="New Eyes" />
- </menu>
- <menu_item_call label="Teleport" name="Landmark Open" />
- <menu_item_call label="Ã¥ben" name="Animation Open" />
- <menu_item_call label="Ã¥ben" name="Sound Open" />
- <menu_item_call label="Slet ting" name="Purge Item" />
- <menu_item_call label="Genskab ting" name="Restore Item" />
- <menu_item_call label="Ã¥ben" name="Open" />
- <menu_item_call label="Egenskaber" name="Properties" />
- <menu_item_call label="Omdøb" name="Rename" />
- <menu_item_call label="Kopiér asset UUID" name="Copy Asset UUID" />
- <menu_item_call label="Kopiér" name="Copy" />
- <menu_item_call label="Indsæt" name="Paste" />
- <menu_item_call label="Slet" name="Delete" />
- <menu_item_call label="Tag ting af" name="Take Off Items" />
- <menu_item_call label="Tilføj til påklædning" name="Add To Outfit" />
- <menu_item_call label="Erstat påklædning" name="Replace Outfit" />
- <menu_item_call label="start konference chat" name="Conference Chat Folder" />
- <menu_item_call label="Afspil" name="Sound Play" />
- <menu_item_call label="Om landemærke" name="Teleport To Landmark" />
- <menu_item_call label="Afspil offentligt" name="Animation Play" />
- <menu_item_call label="Afspil lokalt" name="Animation Audition" />
- <menu_item_call label="Send privat besked (IM)" name="Send Instant Message" />
- <menu_item_call label="Tilbyd teleport..." name="Offer Teleport..." />
- <menu_item_call label="start konference Chat" name="Conference Chat" />
- <menu_item_call label="Aktivér" name="Activate" />
- <menu_item_call label="Deaktivér" name="Deactivate" />
- <menu_item_call label="Tag af dig selv" name="Detach From Yourself" />
- <menu_item_call label="Tag på" name="Object Wear" />
- <menu label="Vedhæft" name="Attach To" />
- <menu label="Vedhæft til HUD" name="Attach To HUD" />
- <menu_item_call label="Redigér" name="Wearable Edit" />
- <menu_item_call label="Tag på" name="Wearable Wear" />
- <menu_item_call label="Tag af" name="Take Off" />
- <menu_item_call label="--ingen valg--" name="--no options--" />
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="Popup">
+ <menu_item_call label="Køb" name="Task Buy" />
+ <menu_item_call label="Ã¥ben" name="Task Open" />
+ <menu_item_call label="Afspil" name="Task Play" />
+ <menu_item_call label="Egenskaber" name="Task Properties" />
+ <menu_item_call label="Omdøb" name="Task Rename" />
+ <menu_item_call label="Slet" name="Task Remove" />
+ <menu_item_call label="Tøm papirkurv" name="Empty Trash" />
+ <menu_item_call label="Tøm 'Lost and found'" name="Empty Lost And Found" />
+ <menu_item_call label="Ny mappe" name="New Folder" />
+ <menu_item_call label="Nyt script" name="New Script" />
+ <menu_item_call label="Ny note" name="New Note" />
+ <menu_item_call label="Ny bevægelse" name="New Gesture" />
+ <menu name="New Clothes">
+ <menu_item_call label="Ny trøje" name="New Shirt" />
+ <menu_item_call label="Nye bukser" name="New Pants" />
+ <menu_item_call label="Nye sko" name="New Shoes" />
+ <menu_item_call label="Nye strømper" name="New Socks" />
+ <menu_item_call label="Ny jakke" name="New Jacket" />
+ <menu_item_call label="Ny nederdel" name="New Skirt" />
+ <menu_item_call label="Nye handsker" name="New Gloves" />
+ <menu_item_call label="Ny undertrøje" name="New Undershirt" />
+ <menu_item_call label="Nye underbukser" name="New Underpants" />
+ </menu>
+ <menu name="New Body Parts">
+ <menu_item_call label="Ny figur" name="New Shape" />
+ <menu_item_call label="Nyt hud" name="New Skin" />
+ <menu_item_call label="Nyt hår" name="New Hair" />
+ <menu_item_call label="Nye øjne" name="New Eyes" />
+ </menu>
+ <menu_item_call label="Teleport" name="Landmark Open" />
+ <menu_item_call label="Ã¥ben" name="Animation Open" />
+ <menu_item_call label="Ã¥ben" name="Sound Open" />
+ <menu_item_call label="Slet ting" name="Purge Item" />
+ <menu_item_call label="Genskab ting" name="Restore Item" />
+ <menu_item_call label="Ã¥ben" name="Open" />
+ <menu_item_call label="Egenskaber" name="Properties" />
+ <menu_item_call label="Omdøb" name="Rename" />
+ <menu_item_call label="Kopiér asset UUID" name="Copy Asset UUID" />
+ <menu_item_call label="Kopiér" name="Copy" />
+ <menu_item_call label="Indsæt" name="Paste" />
+ <menu_item_call label="Slet" name="Delete" />
+ <menu_item_call label="Tag ting af" name="Take Off Items" />
+ <menu_item_call label="Tilføj til påklædning" name="Add To Outfit" />
+ <menu_item_call label="Erstat påklædning" name="Replace Outfit" />
+ <menu_item_call label="start konference chat" name="Conference Chat Folder" />
+ <menu_item_call label="Afspil" name="Sound Play" />
+ <menu_item_call label="Om landemærke" name="Teleport To Landmark" />
+ <menu_item_call label="Afspil offentligt" name="Animation Play" />
+ <menu_item_call label="Afspil lokalt" name="Animation Audition" />
+ <menu_item_call label="Send privat besked (IM)" name="Send Instant Message" />
+ <menu_item_call label="Tilbyd teleport..." name="Offer Teleport..." />
+ <menu_item_call label="start konference Chat" name="Conference Chat" />
+ <menu_item_call label="Aktivér" name="Activate" />
+ <menu_item_call label="Deaktivér" name="Deactivate" />
+ <menu_item_call label="Tag af dig selv" name="Detach From Yourself" />
+ <menu_item_call label="Tag på" name="Object Wear" />
+ <menu label="Vedhæft" name="Attach To" />
+ <menu label="Vedhæft til HUD" name="Attach To HUD" />
+ <menu_item_call label="Redigér" name="Wearable Edit" />
+ <menu_item_call label="Tag på" name="Wearable Wear" />
+ <menu_item_call label="Tag af" name="Take Off" />
+ <menu_item_call label="--ingen valg--" name="--no options--" />
+</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_login.xml b/indra/newview/skins/default/xui/da/menu_login.xml
index f0c827ae7d..26276ff3eb 100644
--- a/indra/newview/skins/default/xui/da/menu_login.xml
+++ b/indra/newview/skins/default/xui/da/menu_login.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar name="Login Menu">
- <menu label="Filer" name="File">
- <menu_item_call label="Afslut" name="Quit" />
- </menu>
- <menu label="Rediger" name="Edit">
- <menu_item_call label="Indstillinger..." name="Preferences..." />
- </menu>
- <menu label="Hjælp" name="Help">
- <menu_item_call label="Second Life hjælp" name="Second Life Help" />
- <menu_item_call label="Om Second Life..." name="About Second Life..." />
- </menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar name="Login Menu">
+ <menu label="Filer" name="File">
+ <menu_item_call label="Afslut" name="Quit" />
+ </menu>
+ <menu label="Rediger" name="Edit">
+ <menu_item_call label="Indstillinger..." name="Preferences..." />
+ </menu>
+ <menu label="Hjælp" name="Help">
+ <menu_item_call label="Second Life hjælp" name="Second Life Help" />
+ <menu_item_call label="Om Second Life..." name="About Second Life..." />
+ </menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/da/menu_slurl.xml b/indra/newview/skins/default/xui/da/menu_slurl.xml
index 1c3bc692dc..ef5cfd7200 100644
--- a/indra/newview/skins/default/xui/da/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/da/menu_slurl.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="Popup">
- <menu_item_call label="Om URL" name="about_url" />
- <menu_item_call label="Teleportér til URL" name="teleport_to_url" />
- <menu_item_call label="Vis på kort" name="show_on_map" />
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="Popup">
+ <menu_item_call label="Om URL" name="about_url" />
+ <menu_item_call label="Teleportér til URL" name="teleport_to_url" />
+ <menu_item_call label="Vis på kort" name="show_on_map" />
+</menu>
diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml
index f5bb98379f..8ac2718353 100644
--- a/indra/newview/skins/default/xui/da/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/da/menu_viewer.xml
@@ -1,211 +1,211 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar name="Main Menu">
- <menu label="Filer" name="File">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
- <menu label="Hent" name="upload">
- <menu_item_call label="Hent billede (L$[COST])..." name="Upload Image" />
- <menu_item_call label="Hent lyd (L$[COST])..." name="Upload Sound" />
- <menu_item_call label="Hent animation (L$[COST])..." name="Upload Animation" />
- <menu_item_call label="Hent mange (L$[COST] per file)..." name="Bulk Upload" />
- </menu>
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="Luk vindue" name="Close Window" />
- <menu_item_call label="Luk alle vinduer" name="Close All Windows" />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_call label="Gem tekstur som..." name="Save Texture As..." />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_call label="Tag foto" name="Take Snapshot" />
- <menu_item_call label="Tag foto til disk" name="Snapshot to Disk" />
- <menu_item_separator label="-----------" name="separator4" />
- <menu_item_call label="Afslut" name="Quit" />
- </menu>
- <menu label="Redigér" name="Edit">
- <menu_item_call label="Annullér" name="Undo" />
- <menu_item_call label="Gentag" name="Redo" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="Klip" name="Cut" />
- <menu_item_call label="Kopier" name="Copy" />
- <menu_item_call label="Sæt ind" name="Paste" />
- <menu_item_call label="Slet" name="Delete" />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_call label="Søg..." name="Search..." />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_call label="Vælg alt" name="Select All" />
- <menu_item_call label="Vælg intet" name="Deselect" />
- <menu_item_separator label="-----------" name="separator4" />
- <menu_item_call label="Duplikér" name="Duplicate" />
- <menu_item_separator label="-----------" name="separator5" />
- <menu label="Vedhæft objekt" name="Attach Object" />
- <menu label="Tag objekt af" name="Detach Object" />
- <menu label="Tag tøj af" name="Take Off Clothing">
- <menu_item_call label="Trøje" name="Shirt" />
- <menu_item_call label="Bukser" name="Pants" />
- <menu_item_call label="Sko" name="Shoes" />
- <menu_item_call label="Strømper" name="Socks" />
- <menu_item_call label="Jakke" name="Jacket" />
- <menu_item_call label="Handsker" name="Gloves" />
- <menu_item_call label="Undertrøje" name="Menu Undershirt" />
- <menu_item_call label="Underbukser" name="Menu Underpants" />
- <menu_item_call label="Nederdel" name="Skirt" />
- <menu_item_call label="Alt tøj" name="All Clothes" />
- </menu>
- <menu_item_separator label="-----------" name="separator6" />
- <menu_item_call label="Bevægelser..." name="Gestures..." />
- <menu_item_call label="Profil..." name="Profile..." />
- <menu_item_call label="Udseende..." name="Appearance..." />
- <menu_item_separator label="-----------" name="separator7" />
- <menu_item_check label="Venner..." name="Friends..." />
- <menu_item_call label="Grupper..." name="Groups..." />
- <menu_item_separator label="-----------" name="separator8" />
- <menu_item_call label="Indstillinger..." name="Preferences..." />
- </menu>
- <menu label="Vis" name="View">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
- <menu_item_call label="Første person" name="Mouselook" />
- <menu_item_check label="Byg" name="Build" />
- <menu_item_check label="Flyv via joystick" name="Joystick Flycam" />
- <menu_item_call label="Nulstil kamera" name="Reset View" />
- <menu_item_call label="Se på sidste chatter" name="Look at Last Chatter" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_check label="Værktøjslinie" name="Toolbar" />
- <menu_item_check label="Local chat" name="Chat History" />
- <menu_item_check label="Kommunikér" name="Instant Message" />
- <menu_item_check label="Beholdning" name="Inventory" />
- <menu_item_check label="Aktive talere" name="Active Speakers" />
- <menu_item_check label="Vis blokerede avatarer" name="Mute List" />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_check label="Kamera kontrol" name="Camera Controls" />
- <menu_item_check label="Bevægelses kontrol" name="Movement Controls" />
- <menu_item_check label="Verdenskort" name="World Map" />
- <menu_item_check label="Lokalt kort" name="Mini-Map" />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_check label="Teknisk info" name="Statistics Bar" />
- <menu_item_check label="Parcel skel" name="Property Lines" />
- <menu_item_check label="Grundejere" name="Land Owners" />
- <menu_item_separator label="-----------" name="separator4" />
- <menu label="Tips visning" name="Hover Tips">
- <menu_item_check label="Vis tips" name="Show Tips" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_check label="Tips om land" name="Land Tips" />
- <menu_item_check label="Tips på alle objekter" name="Tips On All Objects" />
- </menu>
- <menu_item_check label="Fremhæv gennemsigtigt" name="Highlight Transparent" />
- <menu_item_check label="Pejlelys" name="beacons" />
- <menu_item_check label="Skjul partikler" name="Hide Particles" />
- <menu_item_check label="Vis HUD vedhæftninger" name="Show HUD Attachments" />
- <menu_item_separator label="-----------" name="separator5" />
- <menu_item_call label="Zoom ind" name="Zoom In" />
- <menu_item_call label="Zoom standard" name="Zoom Default" />
- <menu_item_call label="Zoom ud" name="Zoom Out" />
- <menu_item_separator label="-----------" name="separator6" />
- <menu_item_call label="Skift fuld skærm/vindue" name="Toggle Fullscreen" />
- <menu_item_call label="Sæt brugerfladestørrelse til normal" name="Set UI Size to Default" />
- </menu>
- <menu label="Verden" name="World">
- <menu_item_call label="Chat" name="Chat" />
- <menu_item_check label="Løb" name="Always Run" />
- <menu_item_check label="Flyv" name="Fly" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="Opret landemærke her" name="Create Landmark Here" />
- <menu_item_call label="Sæt hjem til her" name="Set Home to Here" />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_call label="Teleporter hjem" name="Teleport Home" />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_call label="Sæt 'ikke til stede'" name="Set Away" />
- <menu_item_call label="Sæt 'optaget'" name="Set Busy" />
- <menu_item_call label="Stop all animationer" name="Stop All Animations" />
- <menu_item_call label="Frigiv taster" name="Release Keys" />
- <menu_item_separator label="-----------" name="separator4" />
- <menu_item_call label="Konto historik..." name="Account History..." />
- <menu_item_call label="Vedligehold konto..." name="Manage My Account..." />
- <menu_item_call label="Køb L$..." name="Buy and Sell L$..." />
- <menu_item_separator label="-----------" name="separator5" />
- <menu_item_call label="Mit land..." name="My Land..." />
- <menu_item_call label="Om land..." name="About Land..." />
- <menu_item_call label="Køb land..." name="Buy Land..." />
- <menu_item_call label="Region/Estate..." name="Region/Estate..." />
- <menu_item_separator label="-----------" name="separator6" />
- <menu label="Indstillinger for omgivelser" name="Environment Settings">
- <menu_item_call label="Solopgang" name="Sunrise" />
- <menu_item_call label="Middag" name="Noon" />
- <menu_item_call label="Solnedgang" name="Sunset" />
- <menu_item_call label="Midnat" name="Midnight" />
- <menu_item_call label="Gendan til standard for region" name="Revert to Region Default" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="Redigering af omgivelser" name="Environment Editor" />
- </menu>
- </menu>
- <menu label="Funktioner" name="Tools">
- <menu label="Vælg værktøj" name="Select Tool">
- <menu_item_call label="Fokus" name="Focus" />
- <menu_item_call label="Flyt" name="Move" />
- <menu_item_call label="Rediger" name="Edit" />
- <menu_item_call label="Byg" name="Create" />
- <menu_item_call label="Land" name="Land" />
- </menu>
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects" />
- <menu_item_check label="Vælg kun flytbare objekter" name="Select Only Movable Objects" />
- <menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding" />
- <menu_item_check label="Vis skjulte objekter" name="Show Hidden Selection" />
- <menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection" />
- <menu_item_check label="Vis guidelys for valgte" name="Show Selection Beam" />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_check label="Ret ind til gitter" name="Snap to Grid" />
- <menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid" />
- <menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid" />
- <menu_item_call label="Gitter indstillinger..." name="Grid Options..." />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_check label="Rediger sammekædede objekter" name="Edit Linked Parts" />
- <menu_item_call label="Sammenkæd" name="Link" />
- <menu_item_call label="Adskil" name="Unlink" />
- <menu_item_separator label="-----------" name="separator4" />
- <menu_item_call label="Fokusér på valgte" name="Focus on Selection" />
- <menu_item_call label="Zoom på valgte" name="Zoom to Selection" />
- <menu_item_call label="Køb objekt" name="Menu Object Take" />
- <menu_item_call label="Tag kopi" name="Take Copy" />
- <menu_item_call label="Opdatér objekt i beholdning med ændringer"
- name="Save Object Back to My Inventory" />
- <menu_item_call label="Opdatér ændringer i indhold på objekt"
- name="Save Object Back to Object Contents" />
- <menu_item_separator label="-----------" name="separator6" />
- <menu_item_call label="Vis vindue med advarsler/fejl fra scripts"
- name="Show Script Warning/Error Window" />
- <menu label="Rekompilér scripts i valgte objekter"
- name="Recompile Scripts in Selection">
- <menu_item_call label="Mono" name="Mono" />
- <menu_item_call label="LSL" name="LSL" />
- </menu>
- <menu_item_call label="Genstart scripts i valgte objekter" name="Reset Scripts in Selection" />
- <menu_item_call label="Sæt scripts til 'Running' i valgte objekter"
- name="Set Scripts to Running in Selection" />
- <menu_item_call label="Sæt scripts til ' Not running' i valgte objekter"
- name="Set Scripts to Not Running in Selection" />
- </menu>
- <menu label="Hjælp" name="Help">
- <menu_item_call label="Second Life Hjælp" name="Second Life Help" />
- <menu_item_call label="Tutorial" name="Tutorial" />
- <menu_item_separator label="-----------" name="separator" />
- <menu_item_call label="Officiel Linden Blog..." name="Official Linden Blog..." />
- <menu_item_separator label="-----------" name="separator2" />
- <menu_item_call label="Portal om scripts..." name="Scripting Portal..." />
- <menu_item_separator label="-----------" name="separator3" />
- <menu_item_call label="Rapporter misbrug..." name="Report Abuse..." />
- <menu_item_call label="Stød, skub & slag..." name="Bumps, Pushes &amp; Hits..." />
- <menu_item_call label="Lag meter" name="Lag Meter" />
- <menu_item_separator label="-----------" name="separator7" />
- <menu label="Fejlrapport" name="Bug Reporting">
- <menu_item_call label="Second Life sagsstyring..." name="Public Issue Tracker..." />
- <menu_item_call label="Hjælp til Second Life sagsstyring..."
- name="Publc Issue Tracker Help..." />
- <menu_item_separator label="-----------" name="separator7" />
- <menu_item_call label="Om fejlrapportering..." name="Bug Reporing 101..." />
- <menu_item_call label="Anmeld sikkerhedshændelser..." name="Security Issues..." />
- <menu_item_call label="QA Wiki..." name="QA Wiki..." />
- <menu_item_separator label="-----------" name="separator9" />
- <menu_item_call label="Anmeld fejl..." name="Report Bug..." />
- </menu>
- <menu_item_call label="Om Second Life..." name="About Second Life..." />
- ,
- </menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar name="Main Menu">
+ <menu label="Filer" name="File">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
+ <menu label="Hent" name="upload">
+ <menu_item_call label="Hent billede (L$[COST])..." name="Upload Image" />
+ <menu_item_call label="Hent lyd (L$[COST])..." name="Upload Sound" />
+ <menu_item_call label="Hent animation (L$[COST])..." name="Upload Animation" />
+ <menu_item_call label="Hent mange (L$[COST] per file)..." name="Bulk Upload" />
+ </menu>
+ <menu_item_separator label="-----------" name="separator" />
+ <menu_item_call label="Luk vindue" name="Close Window" />
+ <menu_item_call label="Luk alle vinduer" name="Close All Windows" />
+ <menu_item_separator label="-----------" name="separator2" />
+ <menu_item_call label="Gem tekstur som..." name="Save Texture As..." />
+ <menu_item_separator label="-----------" name="separator3" />
+ <menu_item_call label="Tag foto" name="Take Snapshot" />
+ <menu_item_call label="Tag foto til disk" name="Snapshot to Disk" />
+ <menu_item_separator label="-----------" name="separator4" />
+ <menu_item_call label="Afslut" name="Quit" />
+ </menu>
+ <menu label="Redigér" name="Edit">
+ <menu_item_call label="Annullér" name="Undo" />
+ <menu_item_call label="Gentag" name="Redo" />
+ <menu_item_separator label="-----------" name="separator" />
+ <menu_item_call label="Klip" name="Cut" />
+ <menu_item_call label="Kopier" name="Copy" />
+ <menu_item_call label="Sæt ind" name="Paste" />
+ <menu_item_call label="Slet" name="Delete" />
+ <menu_item_separator label="-----------" name="separator2" />
+ <menu_item_call label="Søg..." name="Search..." />
+ <menu_item_separator label="-----------" name="separator3" />
+ <menu_item_call label="Vælg alt" name="Select All" />
+ <menu_item_call label="Vælg intet" name="Deselect" />
+ <menu_item_separator label="-----------" name="separator4" />
+ <menu_item_call label="Duplikér" name="Duplicate" />
+ <menu_item_separator label="-----------" name="separator5" />
+ <menu label="Vedhæft objekt" name="Attach Object" />
+ <menu label="Tag objekt af" name="Detach Object" />
+ <menu label="Tag tøj af" name="Take Off Clothing">
+ <menu_item_call label="Trøje" name="Shirt" />
+ <menu_item_call label="Bukser" name="Pants" />
+ <menu_item_call label="Sko" name="Shoes" />
+ <menu_item_call label="Strømper" name="Socks" />
+ <menu_item_call label="Jakke" name="Jacket" />
+ <menu_item_call label="Handsker" name="Gloves" />
+ <menu_item_call label="Undertrøje" name="Menu Undershirt" />
+ <menu_item_call label="Underbukser" name="Menu Underpants" />
+ <menu_item_call label="Nederdel" name="Skirt" />
+ <menu_item_call label="Alt tøj" name="All Clothes" />
+ </menu>
+ <menu_item_separator label="-----------" name="separator6" />
+ <menu_item_call label="Bevægelser..." name="Gestures..." />
+ <menu_item_call label="Profil..." name="Profile..." />
+ <menu_item_call label="Udseende..." name="Appearance..." />
+ <menu_item_separator label="-----------" name="separator7" />
+ <menu_item_check label="Venner..." name="Friends..." />
+ <menu_item_call label="Grupper..." name="Groups..." />
+ <menu_item_separator label="-----------" name="separator8" />
+ <menu_item_call label="Indstillinger..." name="Preferences..." />
+ </menu>
+ <menu label="Vis" name="View">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
+ <menu_item_call label="Første person" name="Mouselook" />
+ <menu_item_check label="Byg" name="Build" />
+ <menu_item_check label="Flyv via joystick" name="Joystick Flycam" />
+ <menu_item_call label="Nulstil kamera" name="Reset View" />
+ <menu_item_call label="Se på sidste chatter" name="Look at Last Chatter" />
+ <menu_item_separator label="-----------" name="separator" />
+ <menu_item_check label="Værktøjslinie" name="Toolbar" />
+ <menu_item_check label="Local chat" name="Chat History" />
+ <menu_item_check label="Kommunikér" name="Instant Message" />
+ <menu_item_check label="Beholdning" name="Inventory" />
+ <menu_item_check label="Aktive talere" name="Active Speakers" />
+ <menu_item_check label="Vis blokerede avatarer" name="Mute List" />
+ <menu_item_separator label="-----------" name="separator2" />
+ <menu_item_check label="Kamera kontrol" name="Camera Controls" />
+ <menu_item_check label="Bevægelses kontrol" name="Movement Controls" />
+ <menu_item_check label="Verdenskort" name="World Map" />
+ <menu_item_check label="Lokalt kort" name="Mini-Map" />
+ <menu_item_separator label="-----------" name="separator3" />
+ <menu_item_check label="Teknisk info" name="Statistics Bar" />
+ <menu_item_check label="Parcel skel" name="Property Lines" />
+ <menu_item_check label="Grundejere" name="Land Owners" />
+ <menu_item_separator label="-----------" name="separator4" />
+ <menu label="Tips visning" name="Hover Tips">
+ <menu_item_check label="Vis tips" name="Show Tips" />
+ <menu_item_separator label="-----------" name="separator" />
+ <menu_item_check label="Tips om land" name="Land Tips" />
+ <menu_item_check label="Tips på alle objekter" name="Tips On All Objects" />
+ </menu>
+ <menu_item_check label="Fremhæv gennemsigtigt" name="Highlight Transparent" />
+ <menu_item_check label="Pejlelys" name="beacons" />
+ <menu_item_check label="Skjul partikler" name="Hide Particles" />
+ <menu_item_check label="Vis HUD vedhæftninger" name="Show HUD Attachments" />
+ <menu_item_separator label="-----------" name="separator5" />
+ <menu_item_call label="Zoom ind" name="Zoom In" />
+ <menu_item_call label="Zoom standard" name="Zoom Default" />
+ <menu_item_call label="Zoom ud" name="Zoom Out" />
+ <menu_item_separator label="-----------" name="separator6" />
+ <menu_item_call label="Skift fuld skærm/vindue" name="Toggle Fullscreen" />
+ <menu_item_call label="Sæt brugerfladestørrelse til normal" name="Set UI Size to Default" />
+ </menu>
+ <menu label="Verden" name="World">
+ <menu_item_call label="Chat" name="Chat" />
+ <menu_item_check label="Løb" name="Always Run" />
+ <menu_item_check label="Flyv" name="Fly" />
+ <menu_item_separator label="-----------" name="separator" />
+ <menu_item_call label="Opret landemærke her" name="Create Landmark Here" />
+ <menu_item_call label="Sæt hjem til her" name="Set Home to Here" />
+ <menu_item_separator label="-----------" name="separator2" />
+ <menu_item_call label="Teleporter hjem" name="Teleport Home" />
+ <menu_item_separator label="-----------" name="separator3" />
+ <menu_item_call label="Sæt 'ikke til stede'" name="Set Away" />
+ <menu_item_call label="Sæt 'optaget'" name="Set Busy" />
+ <menu_item_call label="Stop all animationer" name="Stop All Animations" />
+ <menu_item_call label="Frigiv taster" name="Release Keys" />
+ <menu_item_separator label="-----------" name="separator4" />
+ <menu_item_call label="Konto historik..." name="Account History..." />
+ <menu_item_call label="Vedligehold konto..." name="Manage My Account..." />
+ <menu_item_call label="Køb L$..." name="Buy and Sell L$..." />
+ <menu_item_separator label="-----------" name="separator5" />
+ <menu_item_call label="Mit land..." name="My Land..." />
+ <menu_item_call label="Om land..." name="About Land..." />
+ <menu_item_call label="Køb land..." name="Buy Land..." />
+ <menu_item_call label="Region/Estate..." name="Region/Estate..." />
+ <menu_item_separator label="-----------" name="separator6" />
+ <menu label="Indstillinger for omgivelser" name="Environment Settings">
+ <menu_item_call label="Solopgang" name="Sunrise" />
+ <menu_item_call label="Middag" name="Noon" />
+ <menu_item_call label="Solnedgang" name="Sunset" />
+ <menu_item_call label="Midnat" name="Midnight" />
+ <menu_item_call label="Gendan til standard for region" name="Revert to Region Default" />
+ <menu_item_separator label="-----------" name="separator" />
+ <menu_item_call label="Redigering af omgivelser" name="Environment Editor" />
+ </menu>
+ </menu>
+ <menu label="Funktioner" name="Tools">
+ <menu label="Vælg værktøj" name="Select Tool">
+ <menu_item_call label="Fokus" name="Focus" />
+ <menu_item_call label="Flyt" name="Move" />
+ <menu_item_call label="Rediger" name="Edit" />
+ <menu_item_call label="Byg" name="Create" />
+ <menu_item_call label="Land" name="Land" />
+ </menu>
+ <menu_item_separator label="-----------" name="separator" />
+ <menu_item_check label="Vælg kun egne objekter" name="Select Only My Objects" />
+ <menu_item_check label="Vælg kun flytbare objekter" name="Select Only Movable Objects" />
+ <menu_item_check label="Vælg ved at omkrandse" name="Select By Surrounding" />
+ <menu_item_check label="Vis skjulte objekter" name="Show Hidden Selection" />
+ <menu_item_check label="Vis lys-radius for valgte" name="Show Light Radius for Selection" />
+ <menu_item_check label="Vis guidelys for valgte" name="Show Selection Beam" />
+ <menu_item_separator label="-----------" name="separator2" />
+ <menu_item_check label="Ret ind til gitter" name="Snap to Grid" />
+ <menu_item_call label="Ret XY for objekt ind til gitter" name="Snap Object XY to Grid" />
+ <menu_item_call label="Benyt valgte som grundlag for gitter" name="Use Selection for Grid" />
+ <menu_item_call label="Gitter indstillinger..." name="Grid Options..." />
+ <menu_item_separator label="-----------" name="separator3" />
+ <menu_item_check label="Rediger sammekædede objekter" name="Edit Linked Parts" />
+ <menu_item_call label="Sammenkæd" name="Link" />
+ <menu_item_call label="Adskil" name="Unlink" />
+ <menu_item_separator label="-----------" name="separator4" />
+ <menu_item_call label="Fokusér på valgte" name="Focus on Selection" />
+ <menu_item_call label="Zoom på valgte" name="Zoom to Selection" />
+ <menu_item_call label="Køb objekt" name="Menu Object Take" />
+ <menu_item_call label="Tag kopi" name="Take Copy" />
+ <menu_item_call label="Opdatér objekt i beholdning med ændringer"
+ name="Save Object Back to My Inventory" />
+ <menu_item_call label="Opdatér ændringer i indhold på objekt"
+ name="Save Object Back to Object Contents" />
+ <menu_item_separator label="-----------" name="separator6" />
+ <menu_item_call label="Vis vindue med advarsler/fejl fra scripts"
+ name="Show Script Warning/Error Window" />
+ <menu label="Rekompilér scripts i valgte objekter"
+ name="Recompile Scripts in Selection">
+ <menu_item_call label="Mono" name="Mono" />
+ <menu_item_call label="LSL" name="LSL" />
+ </menu>
+ <menu_item_call label="Genstart scripts i valgte objekter" name="Reset Scripts in Selection" />
+ <menu_item_call label="Sæt scripts til 'Running' i valgte objekter"
+ name="Set Scripts to Running in Selection" />
+ <menu_item_call label="Sæt scripts til ' Not running' i valgte objekter"
+ name="Set Scripts to Not Running in Selection" />
+ </menu>
+ <menu label="Hjælp" name="Help">
+ <menu_item_call label="Second Life Hjælp" name="Second Life Help" />
+ <menu_item_call label="Tutorial" name="Tutorial" />
+ <menu_item_separator label="-----------" name="separator" />
+ <menu_item_call label="Officiel Linden Blog..." name="Official Linden Blog..." />
+ <menu_item_separator label="-----------" name="separator2" />
+ <menu_item_call label="Portal om scripts..." name="Scripting Portal..." />
+ <menu_item_separator label="-----------" name="separator3" />
+ <menu_item_call label="Rapporter misbrug..." name="Report Abuse..." />
+ <menu_item_call label="Stød, skub & slag..." name="Bumps, Pushes &amp; Hits..." />
+ <menu_item_call label="Lag meter" name="Lag Meter" />
+ <menu_item_separator label="-----------" name="separator7" />
+ <menu label="Fejlrapport" name="Bug Reporting">
+ <menu_item_call label="Second Life sagsstyring..." name="Public Issue Tracker..." />
+ <menu_item_call label="Hjælp til Second Life sagsstyring..."
+ name="Publc Issue Tracker Help..." />
+ <menu_item_separator label="-----------" name="separator7" />
+ <menu_item_call label="Om fejlrapportering..." name="Bug Reporing 101..." />
+ <menu_item_call label="Anmeld sikkerhedshændelser..." name="Security Issues..." />
+ <menu_item_call label="QA Wiki..." name="QA Wiki..." />
+ <menu_item_separator label="-----------" name="separator9" />
+ <menu_item_call label="Anmeld fejl..." name="Report Bug..." />
+ </menu>
+ <menu_item_call label="Om Second Life..." name="About Second Life..." />
+ ,
+ </menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/da/panel_login.xml b/indra/newview/skins/default/xui/da/panel_login.xml
index 9ef1a0f2b9..308db3d299 100644
--- a/indra/newview/skins/default/xui/da/panel_login.xml
+++ b/indra/newview/skins/default/xui/da/panel_login.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_login">
- <string name="real_url">
- http://secondlife.com/app/login/
- </string>
- <string name="forgot_password_url">
- http://secondlife.com/account/request.php
- </string>
- <text name="first_name_text">
- Fornavn:
- </text>
- <text name="last_name_text">
- Efternavn:
- </text>
- <text name="password_text">
- Password:
- </text>
- <text name="start_location_text">
- Start lokation:
- </text>
- <combo_box name="start_location_combo">
- <combo_item name="MyHome">
- Hjem
- </combo_item>
- <combo_item name="MyLastLocation">
- Min sidste lokation
- </combo_item>
- <combo_item name="Typeregionname">
- <Skriv navn på region>
- </combo_item>
- </combo_box>
- <check_box label="Husk password" name="remember_check" />
- <button label="Log ind" label_selected="Log ind" name="connect_btn" />
- <text name="create_new_account_text">
- Opret bruger
- </text>
- <text name="forgot_password_text">
- Glemt navn eller password?
- </text>
- <text name="channel_text">
- [VERSION]
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_login">
+ <string name="real_url">
+ http://secondlife.com/app/login/
+ </string>
+ <string name="forgot_password_url">
+ http://secondlife.com/account/request.php
+ </string>
+ <text name="first_name_text">
+ Fornavn:
+ </text>
+ <text name="last_name_text">
+ Efternavn:
+ </text>
+ <text name="password_text">
+ Password:
+ </text>
+ <text name="start_location_text">
+ Start lokation:
+ </text>
+ <combo_box name="start_location_combo">
+ <combo_box.item name="MyHome">
+ Hjem
+ </combo_box.item>
+ <combo_box.item name="MyLastLocation">
+ Min sidste lokation
+ </combo_box.item>
+ <combo_box.item name="Typeregionname">
+ <Skriv navn på region>
+ </combo_box.item>
+ </combo_box>
+ <check_box label="Husk password" name="remember_check" />
+ <button label="Log ind" label_selected="Log ind" name="connect_btn" />
+ <text name="create_new_account_text">
+ Opret bruger
+ </text>
+ <text name="forgot_password_text">
+ Glemt navn eller password?
+ </text>
+ <text name="channel_text">
+ [VERSION]
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
index 6e15a7ef4b..254cd6ddb9 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_chat.xml
@@ -1,61 +1,61 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Tekst chat" name="chat">
- <text type="string" length="1" name="text_box">
- Chat skriftstørrelse:
- </text>
- <radio_group name="chat_font_size">
- <radio_item type="string" length="1" name="radio">
- Lille
- </radio_item>
- <radio_item type="string" length="1" name="radio2">
- Mellem
- </radio_item>
- <radio_item type="string" length="1" name="radio3">
- Stor
- </radio_item>
- </radio_group>
- <text type="string" length="1" name="text_box2">
- Chat farve:
- </text>
- <color_swatch label="Dig" name="user" />
- <color_swatch label="Andre" name="agent" />
- <color_swatch label="IM" name="im" />
- <color_swatch label="System" name="system" />
- <color_swatch label="Fejl" name="script_error" />
- <color_swatch label="Objekter" name="objects" />
- <color_swatch label="Ejer" name="owner" />
- <color_swatch label="Bobler" name="background" />
- <color_swatch label="URL'er" name="links" />
- <text type="string" length="1" name="text_box8">
- Script fejl:
- </text>
- <check_box label="Vis script fejl og advarsler i almindelig chat"
- name="script_errors_as_chat" />
- <text type="string" length="1" name="text_box3">
- Chat vindue:
- </text>
- <spinner label="Udfas chat efter" name="fade_chat_time" label_width="90" width="140" />
- <text type="string" length="1" name="text_box4" left="292" >
- (sekunder)
- </text>
- <spinner left="350" name="max_chat_count"/>
- <text type="string" length="1" name="text_box5" left="415">
- (linier)
- </text>
- <slider label="Gennemsigtighed" name="console_opacity" />
- <check_box label="Brug fuldskærms bredde (Kræver genstart)"
- name="chat_full_width_check" />
- <text type="string" length="1" name="text_box6">
- Chat indstillinger:
- </text>
- <check_box label="Luk chat efter tryk på enter" name="close_chat_on_return_check" />
- <check_box label="Piletaster flytter altid figur under chat"
- name="arrow_keys_move_avatar_check" />
- <check_box label="Vis klokkeslæt i lokal chat" name="show_timestamps_check" />
- <check_box label="Afspil skrive animation ved chat" name="play_typing_animation" />
- <text type="string" length="1" name="text_box7">
- Chat talebobler:
- </text>
- <check_box label="Vis chat bobler" name="bubble_text_chat" />
- <slider label="Gennemsigtighed" name="bubble_chat_opacity" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Tekst chat" name="chat">
+ <text type="string" length="1" name="text_box">
+ Chat skriftstørrelse:
+ </text>
+ <radio_group name="chat_font_size">
+ <radio_item type="string" length="1" name="radio">
+ Lille
+ </radio_item>
+ <radio_item type="string" length="1" name="radio2">
+ Mellem
+ </radio_item>
+ <radio_item type="string" length="1" name="radio3">
+ Stor
+ </radio_item>
+ </radio_group>
+ <text type="string" length="1" name="text_box2">
+ Chat farve:
+ </text>
+ <color_swatch label="Dig" name="user" />
+ <color_swatch label="Andre" name="agent" />
+ <color_swatch label="IM" name="im" />
+ <color_swatch label="System" name="system" />
+ <color_swatch label="Fejl" name="script_error" />
+ <color_swatch label="Objekter" name="objects" />
+ <color_swatch label="Ejer" name="owner" />
+ <color_swatch label="Bobler" name="background" />
+ <color_swatch label="URL'er" name="links" />
+ <text type="string" length="1" name="text_box8">
+ Script fejl:
+ </text>
+ <check_box label="Vis script fejl og advarsler i almindelig chat"
+ name="script_errors_as_chat" />
+ <text type="string" length="1" name="text_box3">
+ Chat vindue:
+ </text>
+ <spinner label="Udfas chat efter" name="fade_chat_time" label_width="90" width="140" />
+ <text type="string" length="1" name="text_box4" left="292" >
+ (sekunder)
+ </text>
+ <spinner left="350" name="max_chat_count"/>
+ <text type="string" length="1" name="text_box5" left="415">
+ (linier)
+ </text>
+ <slider label="Gennemsigtighed" name="console_opacity" />
+ <check_box label="Brug fuldskærms bredde (Kræver genstart)"
+ name="chat_full_width_check" />
+ <text type="string" length="1" name="text_box6">
+ Chat indstillinger:
+ </text>
+ <check_box label="Luk chat efter tryk på enter" name="close_chat_on_return_check" />
+ <check_box label="Piletaster flytter altid figur under chat"
+ name="arrow_keys_move_avatar_check" />
+ <check_box label="Vis klokkeslæt i lokal chat" name="show_timestamps_check" />
+ <check_box label="Afspil skrive animation ved chat" name="play_typing_animation" />
+ <text type="string" length="1" name="text_box7">
+ Chat talebobler:
+ </text>
+ <check_box label="Vis chat bobler" name="bubble_text_chat" />
+ <slider label="Gennemsigtighed" name="bubble_chat_opacity" />
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
index 9fa256b553..74a1ab1d7a 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml
@@ -1,118 +1,118 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Generelt" name="general_panel">
- <radio_group name="default_start_location">
- <radio_item name="MyHome" tool_tip="Log ind til min hjemme lokation som standard.">
- Mit hjem
- </radio_item>
- <radio_item name="MyLastLocation" tool_tip="Log ind til min sidste lokation som standard.">
- Min sidste lokation
- </radio_item>
- </radio_group>
- <check_box label="Vis start lokation på login billedet" name="show_location_checkbox" />
- <combo_box name="fade_out_combobox">
- <combo_item name="Never">
- Aldrig
- </combo_item>
- <combo_item name="Show Temporarily">
- Vis midlertidigt
- </combo_item>
- <combo_item name="Always">
- Altid
- </combo_item>
- </combo_box>
- <check_box label="Små avatar navne" name="small_avatar_names_checkbox" />
- <check_box label="Skjul mit navn på min skærm" name="show_my_name_checkbox" />
- <text type="string" length="1" name="group_titles_textbox">
- Gruppe titler:
- </text>
- <check_box label="Skjul alle gruppe titler" name="show_all_title_checkbox" />
- <check_box label="Gem min gruppe titel" name="show_my_title_checkbox" />
- <color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger" />
- <text type="string" length="1" name="UI Size:">
- UI Størrelse:
- </text>
- <check_box label="Brug opløsnings uafhængig skalering" name="ui_auto_scale" />
- <spinner label="Tid før inaktiv:" name="afk_timeout_spinner" />
- <check_box label="Rotér mini-kort" name="rotate_mini_map_checkbox" />
- <check_box label="Giv besked når Linden dollars (L$) bliver brugt eller modtaget"
- name="notify_money_change_checkbox" />
- <check_box label="Brug standard farve vælger" name="use_system_color_picker_checkbox"
- tool_tip="Brug dit systems standard farve vælger i stedet for den der er indbygget i Second Life." />
- <check_box label="Vis Søg i øverste højre hjørne" name="show_search_panel"
- tool_tip="Vis indbygget søgepanel." />
- <text type="string" length="1" name="start_location_textbox">
- Start lokation:
- </text>
- <text type="string" length="1" name="show_names_textbox">
- Vis navne:
- </text>
- <text type="string" length="1" name="effects_color_textbox">
- Farve til mine effekter:
- </text>
- <text type="string" length="1" name="seconds_textbox">
- sekunder
- </text>
- <text type="string" length="1" name="crash_report_textbox">
- Nedbrudsrapporter:
- </text>
- <text type="string" length="1" name="language_textbox">
- Sprog:
- </text>
- <text type="string" length="1" name="language_textbox2">
- (Kræver genstart for at virke optimalt)
- </text>
- <string name="region_name_prompt">
- <Skriv regions navn>
- </string>
- <combo_box name="crash_behavior_combobox">
- <combo_item type="string" length="1" name="Askbeforesending">
- Bed om bekræftigelse
- </combo_item>
- <combo_item type="string" length="1" name="Alwayssend">
- Send altid
- </combo_item>
- <combo_item type="string" length="1" name="Neversend">
- Send aldrig
- </combo_item>
- </combo_box>
- <combo_box name="language_combobox">
- <combo_item type="string" length="1" name="System Default Language">
- System standard
- </combo_item>
- <combo_item type="string" length="1" name="English">
- English (Engelsk)
- </combo_item>
- <combo_item type="string" length="1" name="Danish">
- Dansk - Beta
- </combo_item>
- <combo_item type="string" length="1" name="Deutsch(German)">
- Deutsch (Tysk) - Beta
- </combo_item>
- <combo_item type="string" length="1" name="Spanish">
- Español (Spansk) - Beta
- </combo_item>
- <combo_item type="string" length="1" name="French">
- Français (Fransk) - Beta
- </combo_item>
- <combo_item type="string" length="1" name="Hungarian">
- Magyar (Ungarsk) - Beta
- </combo_item>
- <combo_item type="string" length="1" name="Polish">
- Polski (Polsk) - Beta
- </combo_item>
- <combo_item type="string" length="1" name="Portugese">
- Portugués (Portugisisk) - Beta
- </combo_item>
- <combo_item type="string" length="1" name="Chinese">
- ä¸æ–‡ (简体) (Kinesisk) - Beta
- </combo_item>
- <combo_item type="string" length="1" name="(Japanese)">
- 日本語 (Japansk) - Beta
- </combo_item>
- <combo_item type="string" length="1" name="(Korean)">
- í•œêµì–´ (Koreansk) - Beta
- </combo_item>
- </combo_box>
- <check_box label="Del sprog med objekter" name="language_is_public"
- tool_tip="Dette lader objekter i verden vide hvad dit foretrukne sprog er." />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Generelt" name="general_panel">
+ <radio_group name="default_start_location">
+ <radio_item name="MyHome" tool_tip="Log ind til min hjemme lokation som standard.">
+ Mit hjem
+ </radio_item>
+ <radio_item name="MyLastLocation" tool_tip="Log ind til min sidste lokation som standard.">
+ Min sidste lokation
+ </radio_item>
+ </radio_group>
+ <check_box label="Vis start lokation på login billedet" name="show_location_checkbox" />
+ <combo_box name="fade_out_combobox">
+ <combo_item name="Never">
+ Aldrig
+ </combo_item>
+ <combo_item name="Show Temporarily">
+ Vis midlertidigt
+ </combo_item>
+ <combo_item name="Always">
+ Altid
+ </combo_item>
+ </combo_box>
+ <check_box label="Små avatar navne" name="small_avatar_names_checkbox" />
+ <check_box label="Skjul mit navn på min skærm" name="show_my_name_checkbox" />
+ <text type="string" length="1" name="group_titles_textbox">
+ Gruppe titler:
+ </text>
+ <check_box label="Skjul alle gruppe titler" name="show_all_title_checkbox" />
+ <check_box label="Gem min gruppe titel" name="show_my_title_checkbox" />
+ <color_swatch label="" name="effect_color_swatch" tool_tip="Klik for at åbne farvevælger" />
+ <text type="string" length="1" name="UI Size:">
+ UI Størrelse:
+ </text>
+ <check_box label="Brug opløsnings uafhængig skalering" name="ui_auto_scale" />
+ <spinner label="Tid før inaktiv:" name="afk_timeout_spinner" />
+ <check_box label="Rotér mini-kort" name="rotate_mini_map_checkbox" />
+ <check_box label="Giv besked når Linden dollars (L$) bliver brugt eller modtaget"
+ name="notify_money_change_checkbox" />
+ <check_box label="Brug standard farve vælger" name="use_system_color_picker_checkbox"
+ tool_tip="Brug dit systems standard farve vælger i stedet for den der er indbygget i Second Life." />
+ <check_box label="Vis Søg i øverste højre hjørne" name="show_search_panel"
+ tool_tip="Vis indbygget søgepanel." />
+ <text type="string" length="1" name="start_location_textbox">
+ Start lokation:
+ </text>
+ <text type="string" length="1" name="show_names_textbox">
+ Vis navne:
+ </text>
+ <text type="string" length="1" name="effects_color_textbox">
+ Farve til mine effekter:
+ </text>
+ <text type="string" length="1" name="seconds_textbox">
+ sekunder
+ </text>
+ <text type="string" length="1" name="crash_report_textbox">
+ Nedbrudsrapporter:
+ </text>
+ <text type="string" length="1" name="language_textbox">
+ Sprog:
+ </text>
+ <text type="string" length="1" name="language_textbox2">
+ (Kræver genstart for at virke optimalt)
+ </text>
+ <string name="region_name_prompt">
+ <Skriv regions navn>
+ </string>
+ <combo_box name="crash_behavior_combobox">
+ <combo_item type="string" length="1" name="Askbeforesending">
+ Bed om bekræftigelse
+ </combo_item>
+ <combo_item type="string" length="1" name="Alwayssend">
+ Send altid
+ </combo_item>
+ <combo_item type="string" length="1" name="Neversend">
+ Send aldrig
+ </combo_item>
+ </combo_box>
+ <combo_box name="language_combobox">
+ <combo_item type="string" length="1" name="System Default Language">
+ System standard
+ </combo_item>
+ <combo_item type="string" length="1" name="English">
+ English (Engelsk)
+ </combo_item>
+ <combo_item type="string" length="1" name="Danish">
+ Dansk - Beta
+ </combo_item>
+ <combo_item type="string" length="1" name="Deutsch(German)">
+ Deutsch (Tysk) - Beta
+ </combo_item>
+ <combo_item type="string" length="1" name="Spanish">
+ Español (Spansk) - Beta
+ </combo_item>
+ <combo_item type="string" length="1" name="French">
+ Français (Fransk) - Beta
+ </combo_item>
+ <combo_item type="string" length="1" name="Hungarian">
+ Magyar (Ungarsk) - Beta
+ </combo_item>
+ <combo_item type="string" length="1" name="Polish">
+ Polski (Polsk) - Beta
+ </combo_item>
+ <combo_item type="string" length="1" name="Portugese">
+ Portugués (Portugisisk) - Beta
+ </combo_item>
+ <combo_item type="string" length="1" name="Chinese">
+ ä¸æ–‡ (简体) (Kinesisk) - Beta
+ </combo_item>
+ <combo_item type="string" length="1" name="(Japanese)">
+ 日本語 (Japansk) - Beta
+ </combo_item>
+ <combo_item type="string" length="1" name="(Korean)">
+ í•œêµì–´ (Koreansk) - Beta
+ </combo_item>
+ </combo_box>
+ <check_box label="Del sprog med objekter" name="language_is_public"
+ tool_tip="Dette lader objekter i verden vide hvad dit foretrukne sprog er." />
+</panel>
diff --git a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
index a074e85869..8add1304ae 100644
--- a/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/da/panel_preferences_graphics1.xml
@@ -1,179 +1,179 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Grafik" name="Display panel">
- <button label="?" name="GraphicsPreferencesHelpButton" />
- <check_box label="Kør Second Life i et vindue" name="windowed mode" />
- <text_editor type="string" length="1" name="FullScreenInfo">
- Hvis dette ikke er valgt kører Second Life i Fuld skærm.
- </text_editor>
- <text type="string" length="1" name="WindowSizeLabel">
- Opløsning:
- </text>
- <combo_box name="windowsize combo">
- <combo_item type="string" length="1" name="640x480">
- 640x480
- </combo_item>
- <combo_item type="string" length="1" name="800x600">
- 800x600
- </combo_item>
- <combo_item type="string" length="1" name="720x480">
- 720x480 (NTSC)
- </combo_item>
- <combo_item type="string" length="1" name="768x576">
- 768x576 (PAL)
- </combo_item>
- <combo_item type="string" length="1" name="1024x768">
- 1024x768
- </combo_item>
- </combo_box>
- <text type="string" length="1" name="DisplayResLabel">
- Skærm opløsning:
- </text>
- <text type="string" length="1" name="AspectRatioLabel1" tool_tip="bredde / højde">
- Format:
- </text>
- <combo_box name="aspect_ratio" tool_tip="bredde/ højde">
- <combo_item type="string" length="1" name="4:3(StandardCRT)">
- 4:3 (Standard CRT)
- </combo_item>
- <combo_item type="string" length="1" name="5:4(1280x1024LCD)">
- 5:4 (1280x1024 LCD)
- </combo_item>
- <combo_item type="string" length="1" name="8:5(Widescreen)">
- 8:5 (Widescreen)
- </combo_item>
- <combo_item type="string" length="1" name="16:9(Widescreen)">
- 16:9 (Widescreen)
- </combo_item>
- </combo_box>
- <check_box label="Auto-detect format" name="aspect_auto_detect" />
- <text type="string" length="1" name="HigherText">
- Kvalitet og
- </text>
- <text type="string" length="1" name="QualityText">
- Ydelse:
- </text>
- <text type="string" length="1" name="FasterText">
- Hurtigere
- </text>
- <text type="string" length="1" name="ShadersPrefText">
- Lav
- </text>
- <text type="string" length="1" name="ShadersPrefText2">
- Middel
- </text>
- <text type="string" length="1" name="ShadersPrefText3">
- Høj
- </text>
- <text type="string" length="1" name="ShadersPrefText4">
- Ultra
- </text>
- <text type="string" length="1" name="HigherText2">
- Højere
- </text>
- <text type="string" length="1" name="QualityText2">
- Kvalitet
- </text>
- <slider label="" name="QualityPerformanceSelection" />
- <check_box label="Manuelt" name="CustomSettings" />
- <text type="string" length="1" name="ShadersText">
- Overflader:
- </text>
- <check_box label="Glatte flader og skin" name="BumpShiny" />
- <check_box label="Basale flader" name="BasicShaders"
- tool_tip="Ved at slå dette valg fra, kan det forhindres at visse grafikkort drivere crasher." />
- <check_box label="Atmosfæriske flader" name="WindLightUseAtmosShaders" />
- <check_box label="Reflektioner i vand" name="Reflections" />
- <text type="string" length="1" name="ReflectionDetailText">
- Spejlnings detaljer:
- </text>
- <radio_group name="ReflectionDetailRadio">
- <radio_item type="string" length="1" name="0">
- Terræn og træer
- </radio_item>
- <radio_item type="string" length="1" name="1">
- Alle statiske objekter
- </radio_item>
- <radio_item type="string" length="1" name="2">
- Alle avatarer og objekter
- </radio_item>
- <radio_item type="string" length="1" name="3">
- Alt
- </radio_item>
- </radio_group>
- <text type="string" length="1" name="AvatarRenderingText">
- Avatar gengivelse
- </text>
- <check_box label="Mini-figurer på lang afstand" name="AvatarImpostors" />
- <check_box label="Hardware Skinning" name="AvatarVertexProgram" />
- <check_box label="Avatar tøj" name="AvatarCloth" />
- <text type="string" length="1" name="DrawDistanceMeterText1">
- m
- </text>
- <text type="string" length="1" name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="Maks. visnings-afstand:" name="DrawDistance" />
- <slider label="Maks. antal partikler:" name="MaxParticleCount" />
- <slider label="Efterbehandlingskvalitet:" name="RenderPostProcess" />
- <text type="string" length="1" name="MeshDetailText">
- Netmaske detaljer:
- </text>
- <slider label=" Objekter:" name="ObjectMeshDetail" />
- <slider label=" Flexiprims:" name="FlexibleMeshDetail" />
- <slider label=" Træer:" name="TreeMeshDetail" />
- <slider label=" Avatarer:" name="AvatarMeshDetail" />
- <slider label=" Terræn:" name="TerrainMeshDetail" />
- <slider label=" Himmel:" name="SkyMeshDetail" />
- <text type="string" length="1" name="PostProcessText">
- Lav
- </text>
- <text type="string" length="1" name="ObjectMeshDetailText">
- Lav
- </text>
- <text type="string" length="1" name="FlexibleMeshDetailText">
- Lav
- </text>
- <text type="string" length="1" name="TreeMeshDetailText">
- Lav
- </text>
- <text type="string" length="1" name="AvatarMeshDetailText">
- Lav
- </text>
- <text type="string" length="1" name="TerrainMeshDetailText">
- Lav
- </text>
- <text type="string" length="1" name="SkyMeshDetailText">
- Lav
- </text>
- <text type="string" length="1" name="LightingDetailText">
- Lys detaljer:
- </text>
- <radio_group name="LightingDetailRadio">
- <radio_item type="string" length="1" name="SunMoon">
- Kun sol og måne
- </radio_item>
- <radio_item type="string" length="1" name="LocalLights">
- Lys i nærheden
- </radio_item>
- </radio_group>
- <text type="string" length="1" name="TerrainDetailText">
- Terræn detaljer:
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item type="string" length="1" name="0">
- Lav
- </radio_item>
- <radio_item type="string" length="1" name="2">
- Høj
- </radio_item>
- </radio_group>
- <button label="Anbefalede indstillinger" name="Defaults" />
- <button label="Hardware valg" label_selected="Hardware Options"
- name="GraphicsHardwareButton" />
- <string name="resolution_format">
- [RES_X] x [RES_Y]
- </string>
- <string name="aspect_ratio_text">
- [NUM]:[DEN]
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Grafik" name="Display panel">
+ <button label="?" name="GraphicsPreferencesHelpButton" />
+ <check_box label="Kør Second Life i et vindue" name="windowed mode" />
+ <text_editor type="string" length="1" name="FullScreenInfo">
+ Hvis dette ikke er valgt kører Second Life i Fuld skærm.
+ </text_editor>
+ <text type="string" length="1" name="WindowSizeLabel">
+ Opløsning:
+ </text>
+ <combo_box name="windowsize combo">
+ <combo_box.item type="string" length="1" name="640x480">
+ 640x480
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="800x600">
+ 800x600
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="720x480">
+ 720x480 (NTSC)
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="768x576">
+ 768x576 (PAL)
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="1024x768">
+ 1024x768
+ </combo_box.item>
+ </combo_box>
+ <text type="string" length="1" name="DisplayResLabel">
+ Skærm opløsning:
+ </text>
+ <text type="string" length="1" name="AspectRatioLabel1" tool_tip="bredde / højde">
+ Format:
+ </text>
+ <combo_box name="aspect_ratio" tool_tip="bredde/ højde">
+ <combo_box.item type="string" length="1" name="4:3(StandardCRT)">
+ 4:3 (Standard CRT)
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="5:4(1280x1024LCD)">
+ 5:4 (1280x1024 LCD)
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="8:5(Widescreen)">
+ 8:5 (Widescreen)
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="16:9(Widescreen)">
+ 16:9 (Widescreen)
+ </combo_box.item>
+ </combo_box>
+ <check_box label="Auto-detect format" name="aspect_auto_detect" />
+ <text type="string" length="1" name="HigherText">
+ Kvalitet og
+ </text>
+ <text type="string" length="1" name="QualityText">
+ Ydelse:
+ </text>
+ <text type="string" length="1" name="FasterText">
+ Hurtigere
+ </text>
+ <text type="string" length="1" name="ShadersPrefText">
+ Lav
+ </text>
+ <text type="string" length="1" name="ShadersPrefText2">
+ Middel
+ </text>
+ <text type="string" length="1" name="ShadersPrefText3">
+ Høj
+ </text>
+ <text type="string" length="1" name="ShadersPrefText4">
+ Ultra
+ </text>
+ <text type="string" length="1" name="HigherText2">
+ Højere
+ </text>
+ <text type="string" length="1" name="QualityText2">
+ Kvalitet
+ </text>
+ <slider label="" name="QualityPerformanceSelection" />
+ <check_box label="Manuelt" name="CustomSettings" />
+ <text type="string" length="1" name="ShadersText">
+ Overflader:
+ </text>
+ <check_box label="Glatte flader og skin" name="BumpShiny" />
+ <check_box label="Basale flader" name="BasicShaders"
+ tool_tip="Ved at slå dette valg fra, kan det forhindres at visse grafikkort drivere crasher." />
+ <check_box label="Atmosfæriske flader" name="WindLightUseAtmosShaders" />
+ <check_box label="Reflektioner i vand" name="Reflections" />
+ <text type="string" length="1" name="ReflectionDetailText">
+ Spejlnings detaljer:
+ </text>
+ <radio_group name="ReflectionDetailRadio">
+ <radio_item type="string" length="1" name="0">
+ Terræn og træer
+ </radio_item>
+ <radio_item type="string" length="1" name="1">
+ Alle statiske objekter
+ </radio_item>
+ <radio_item type="string" length="1" name="2">
+ Alle avatarer og objekter
+ </radio_item>
+ <radio_item type="string" length="1" name="3">
+ Alt
+ </radio_item>
+ </radio_group>
+ <text type="string" length="1" name="AvatarRenderingText">
+ Avatar gengivelse
+ </text>
+ <check_box label="Mini-figurer på lang afstand" name="AvatarImpostors" />
+ <check_box label="Hardware Skinning" name="AvatarVertexProgram" />
+ <check_box label="Avatar tøj" name="AvatarCloth" />
+ <text type="string" length="1" name="DrawDistanceMeterText1">
+ m
+ </text>
+ <text type="string" length="1" name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="Maks. visnings-afstand:" name="DrawDistance" />
+ <slider label="Maks. antal partikler:" name="MaxParticleCount" />
+ <slider label="Efterbehandlingskvalitet:" name="RenderPostProcess" />
+ <text type="string" length="1" name="MeshDetailText">
+ Netmaske detaljer:
+ </text>
+ <slider label=" Objekter:" name="ObjectMeshDetail" />
+ <slider label=" Flexiprims:" name="FlexibleMeshDetail" />
+ <slider label=" Træer:" name="TreeMeshDetail" />
+ <slider label=" Avatarer:" name="AvatarMeshDetail" />
+ <slider label=" Terræn:" name="TerrainMeshDetail" />
+ <slider label=" Himmel:" name="SkyMeshDetail" />
+ <text type="string" length="1" name="PostProcessText">
+ Lav
+ </text>
+ <text type="string" length="1" name="ObjectMeshDetailText">
+ Lav
+ </text>
+ <text type="string" length="1" name="FlexibleMeshDetailText">
+ Lav
+ </text>
+ <text type="string" length="1" name="TreeMeshDetailText">
+ Lav
+ </text>
+ <text type="string" length="1" name="AvatarMeshDetailText">
+ Lav
+ </text>
+ <text type="string" length="1" name="TerrainMeshDetailText">
+ Lav
+ </text>
+ <text type="string" length="1" name="SkyMeshDetailText">
+ Lav
+ </text>
+ <text type="string" length="1" name="LightingDetailText">
+ Lys detaljer:
+ </text>
+ <radio_group name="LightingDetailRadio">
+ <radio_item type="string" length="1" name="SunMoon">
+ Kun sol og måne
+ </radio_item>
+ <radio_item type="string" length="1" name="LocalLights">
+ Lys i nærheden
+ </radio_item>
+ </radio_group>
+ <text type="string" length="1" name="TerrainDetailText">
+ Terræn detaljer:
+ </text>
+ <radio_group name="TerrainDetailRadio">
+ <radio_item type="string" length="1" name="0">
+ Lav
+ </radio_item>
+ <radio_item type="string" length="1" name="2">
+ Høj
+ </radio_item>
+ </radio_group>
+ <button label="Anbefalede indstillinger" name="Defaults" />
+ <button label="Hardware valg" label_selected="Hardware Options"
+ name="GraphicsHardwareButton" />
+ <string name="resolution_format">
+ [RES_X] x [RES_Y]
+ </string>
+ <string name="aspect_ratio_text">
+ [NUM]:[DEN]
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml
index 874e9b04fd..bd34d39993 100644
--- a/indra/newview/skins/default/xui/da/strings.xml
+++ b/indra/newview/skins/default/xui/da/strings.xml
@@ -1,405 +1,405 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<strings>
- <string name="LoginInProgress">
- Logger p. [APP_NAME] kan virke laast. Vent venligst.
- </string>
- <string name="LoginAuthenticating">
- Validerer adgang
- </string>
- <string name="LoginMaintenance">
- Udfører konto vedligeholdelse...
- </string>
- <string name="LoginAttempt">
- Tidligere forsø på login fejlede. Logger på, forsøg [NUMBER]
- </string>
- <string name="LoginPrecaching">
- verden...
- </string>
- <string name="LoginInitializingBrowser">
- Klargør indbyggede web browser...
- </string>
- <string name="LoginInitializingMultimedia">
- Klargør multimedia...
- </string>
- <string name="LoginVerifyingCache">
- Verificérer cache filer (kan tage 60-90 sekunder)...
- </string>
- <string name="LoginProcessingResponse">
- Behandler svar...
- </string>
- <string name="LoginInitializingWorld">
- Initialiserer verden...
- </string>
- <string name="LoginDecodingImages">
- Behandler billeder...
- </string>
- <string name="LoginInitializingQuicktime">
- Initialiserer QuickTime...
- </string>
- <string name="LoginQuicktimeNotFound">
- QuickTime ikke fundet- kunne derfor ikke initialisere.
- </string>
- <string name="LoginQuicktimeOK">
- QuickTime initialiseret.
- </string>
- <string name="LoginWaitingForRegionHandshake">
- Venter på svar fra region...
- </string>
- <string name="LoginConnectingToRegion">
- Tilslutter til region...
- </string>
- <string name="LoginDownloadingClothing">
- Henter tøj...
- </string>
- <string name="LoginFailedNoNetwork">
- Netværks fejl: Kunne ikke oprette forbindelse, tjek venligst din netværksforbindelse.
- </string>
- <string name="AgentLostConnection">
- Denne region kan have problemer. Tjek venligst din forbindelse til internettet.
- </string>
- <string name="TooltipOwner">
- Ejer:
- </string>
- <string name="TooltipPublic">
- Offentlig
- </string>
- <string name="TooltipIsGroup">
- (Gruppe)
- </string>
- <string name="TooltipFlagScript">
- Script
- </string>
- <string name="TooltipFlagPhysics">
- Fysik
- </string>
- <string name="TooltipFlagTouch">
- Rør
- </string>
- <string name="TooltipFlagL$">
- L$
- </string>
- <string name="TooltipFlagPhantom">
- Fantom
- </string>
- <string name="TooltipFlagTemporary">
- Temporær
- </string>
- <string name="TooltipFreeToCopy">
- Kan kopieres
- </string>
- <string name="TooltipForSaleL$">
- Til salg: L$[AMOUNT]
- </string>
- <string name="TooltipForSaleMsg">
- Til salg: [MESSAGE]
- </string>
- <string name="TooltipFlagGroupBuild">
- Gruppe byg
- </string>
- <string name="TooltipFlagNoBuild">
- MÃ¥ ikke bygge
- </string>
- <string name="TooltipFlagNoEdit">
- Gruppe byg
- </string>
- <string name="TooltipFlagNotSafe">
- Ikke sikker område
- </string>
- <string name="TooltipFlagNoFly">
- Ingen flyvning
- </string>
- <string name="TooltipFlagGroupScripts">
- Gruppe scripts
- </string>
- <string name="TooltipFlagNoScripts">
- Ingen Scripts
- </string>
- <string name="TooltipLand">
- Land:
- </string>
- <string name="TooltipMustSingleDrop">
- Kun et enkelt element kan trækkes ind her
- </string>
- <string name="RetrievingData">
- Henter...
- </string>
- <string name="ReleaseNotes">
- Noter om version
- </string>
- <string name="LoadingData">
- Henter...
- </string>
- <string name="AvatarNameNobody">
- (ingen)
- </string>
- <string name="AvatarNameWaiting">
- (venter)
- </string>
- <string name="AvatarNameHippos">
- (hippos)
- </string>
- <string name="GroupNameNone">
- (ingen)
- </string>
- <string name="AssetErrorNone">
- Ingen fejl
- </string>
- <string name="AssetErrorRequestFailed">
- Element forespørgsel: fejlede
- </string>
- <string name="AssetErrorNonexistentFile">
- Element forespørgsel: fil findes ikke
- </string>
- <string name="AssetErrorNotInDatabase">
- Element forespørgsel: element ikke fundet i database
- </string>
- <string name="AssetErrorEOF">
- Slutning af fil
- </string>
- <string name="AssetErrorCannotOpenFile">
- Kan ikke åbne fil
- </string>
- <string name="AssetErrorFileNotFound">
- Fil ikke fundet
- </string>
- <string name="AssetErrorTCPTimeout">
- Tidsgrænse overskredet ved filhentning
- </string>
- <string name="AssetErrorCircuitGone">
- Forbindelsen mistet
- </string>
- <string name="AssetErrorUnknownStatus">
- Ukendt status
- </string>
- <string name="AvatarEditingApparance">
- (Ændrer udseende)
- </string>
- <string name="AvatarAway">
- Væk
- </string>
- <string name="AvatarBusy">
- Optaget
- </string>
- <string name="AvatarMuted">
- Blokeret
- </string>
- <string name="anim_express_afraid">
- Bange
- </string>
- <string name="anim_express_anger">
- Vred
- </string>
- <string name="anim_away">
- Væk
- </string>
- <string name="anim_backflip">
- Baglæns salto
- </string>
- <string name="anim_express_laugh">
- Hjertelig latter
- </string>
- <string name="anim_express_toothsmile">
- Stort smil
- </string>
- <string name="anim_blowkiss">
- Sende kys
- </string>
- <string name="anim_express_bored">
- Keder sig
- </string>
- <string name="anim_bow">
- Buk
- </string>
- <string name="anim_clap">
- Klap
- </string>
- <string name="anim_courtbow">
- Højtideligt buk
- </string>
- <string name="anim_express_cry">
- Græd
- </string>
- <string name="anim_dance1">
- Dans 1
- </string>
- <string name="anim_dance2">
- Dans 2
- </string>
- <string name="anim_dance3">
- Dans 3
- </string>
- <string name="anim_dance4">
- Dans 4
- </string>
- <string name="anim_dance5">
- Dans 5
- </string>
- <string name="anim_dance6">
- Dans 6
- </string>
- <string name="anim_dance7">
- Dans 7
- </string>
- <string name="anim_dance8">
- Dans 8
- </string>
- <string name="anim_express_disdain">
- Foragt
- </string>
- <string name="anim_drink">
- Drik
- </string>
- <string name="anim_express_embarrased">
- Flov
- </string>
- <string name="anim_angry_fingerwag">
- Løftet finger
- </string>
- <string name="anim_fist_pump">
- Knytnæve
- </string>
- <string name="anim_yoga_float">
- Svævende yoga
- </string>
- <string name="anim_express_frown">
- Mistroisk
- </string>
- <string name="anim_impatient">
- Utålmodig
- </string>
- <string name="anim_jumpforjoy">
- Glædeshop
- </string>
- <string name="anim_kissmybutt">
- Kys min r..
- </string>
- <string name="anim_express_kiss">
- Kys
- </string>
- <string name="anim_laugh_short">
- Grin
- </string>
- <string name="anim_musclebeach">
- Bodybuilder
- </string>
- <string name="anim_no_unhappy">
- Nej (sur)
- </string>
- <string name="anim_no_head">
- Nej
- </string>
- <string name="anim_nyanya">
- Æv-bæv
- </string>
- <string name="anim_punch_onetwo">
- Et-to slag
- </string>
- <string name="anim_express_open_mouth">
- Ã…ben mund
- </string>
- <string name="anim_peace">
- Peace
- </string>
- <string name="anim_point_you">
- Peg på andre
- </string>
- <string name="anim_point_me">
- Peg på dig selv
- </string>
- <string name="anim_punch_l">
- Slå venstre
- </string>
- <string name="anim_punch_r">
- Slå højre
- </string>
- <string name="anim_rps_countdown">
- SSP - Tæl
- </string>
- <string name="anim_rps_paper">
- SSP - Papir
- </string>
- <string name="anim_rps_rock">
- SSP - Sten
- </string>
- <string name="anim_rps_scissors">
- SSP - Saks
- </string>
- <string name="anim_express_repulsed">
- Misfornøjet
- </string>
- <string name="anim_kick_roundhouse_r">
- Karatepark
- </string>
- <string name="anim_express_sad">
- Ked af det
- </string>
- <string name="anim_salute">
- Honnør
- </string>
- <string name="anim_shout">
- RÃ¥b
- </string>
- <string name="anim_express_shrug">
- Skuldertræk
- </string>
- <string name="anim_express_smile">
- Smil
- </string>
- <string name="anim_smoke_idle">
- Ryg
- </string>
- <string name="anim_smoke_inhale">
- Indhalér
- </string>
- <string name="anim_smoke_throw_down">
- Smid cigaret
- </string>
- <string name="anim_express_surprise">
- Overrasket
- </string>
- <string name="anim_sword_strike_r">
- Sværdslag
- </string>
- <string name="anim_angry_tantrum">
- Ekstatisk
- </string>
- <string name="anim_express_tongue_out">
- Tunge ud
- </string>
- <string name="anim_hello">
- Vink
- </string>
- <string name="anim_whisper">
- Knib øje i
- </string>
- <string name="anim_whistle">
- Pift
- </string>
- <string name="anim_express_wink">
- Blink
- </string>
- <string name="anim_wink_hollywood">
- Blink (Hollywood)
- </string>
- <string name="anim_express_worry">
- Bekymret
- </string>
- <string name="anim_yes_happy">
- Ja (glad)
- </string>
- <string name="anim_yes_head">
- Ja
- </string>
- <string name="texture_loading">
- Henter...
- </string>
- <string name="worldmap_offline">
- Offline
- </string>
- <string name="whisper">
- hvisker:
- </string>
- <string name="shout">
- råber:
- </string>
-</strings>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<strings>
+ <string name="LoginInProgress">
+ Logger p. [APP_NAME] kan virke laast. Vent venligst.
+ </string>
+ <string name="LoginAuthenticating">
+ Validerer adgang
+ </string>
+ <string name="LoginMaintenance">
+ Udfører konto vedligeholdelse...
+ </string>
+ <string name="LoginAttempt">
+ Tidligere forsø på login fejlede. Logger på, forsøg [NUMBER]
+ </string>
+ <string name="LoginPrecaching">
+ verden...
+ </string>
+ <string name="LoginInitializingBrowser">
+ Klargør indbyggede web browser...
+ </string>
+ <string name="LoginInitializingMultimedia">
+ Klargør multimedia...
+ </string>
+ <string name="LoginVerifyingCache">
+ Verificérer cache filer (kan tage 60-90 sekunder)...
+ </string>
+ <string name="LoginProcessingResponse">
+ Behandler svar...
+ </string>
+ <string name="LoginInitializingWorld">
+ Initialiserer verden...
+ </string>
+ <string name="LoginDecodingImages">
+ Behandler billeder...
+ </string>
+ <string name="LoginInitializingQuicktime">
+ Initialiserer QuickTime...
+ </string>
+ <string name="LoginQuicktimeNotFound">
+ QuickTime ikke fundet- kunne derfor ikke initialisere.
+ </string>
+ <string name="LoginQuicktimeOK">
+ QuickTime initialiseret.
+ </string>
+ <string name="LoginWaitingForRegionHandshake">
+ Venter på svar fra region...
+ </string>
+ <string name="LoginConnectingToRegion">
+ Tilslutter til region...
+ </string>
+ <string name="LoginDownloadingClothing">
+ Henter tøj...
+ </string>
+ <string name="LoginFailedNoNetwork">
+ Netværks fejl: Kunne ikke oprette forbindelse, tjek venligst din netværksforbindelse.
+ </string>
+ <string name="AgentLostConnection">
+ Denne region kan have problemer. Tjek venligst din forbindelse til internettet.
+ </string>
+ <string name="TooltipOwner">
+ Ejer:
+ </string>
+ <string name="TooltipPublic">
+ Offentlig
+ </string>
+ <string name="TooltipIsGroup">
+ (Gruppe)
+ </string>
+ <string name="TooltipFlagScript">
+ Script
+ </string>
+ <string name="TooltipFlagPhysics">
+ Fysik
+ </string>
+ <string name="TooltipFlagTouch">
+ Rør
+ </string>
+ <string name="TooltipFlagL$">
+ L$
+ </string>
+ <string name="TooltipFlagPhantom">
+ Fantom
+ </string>
+ <string name="TooltipFlagTemporary">
+ Temporær
+ </string>
+ <string name="TooltipFreeToCopy">
+ Kan kopieres
+ </string>
+ <string name="TooltipForSaleL$">
+ Til salg: L$[AMOUNT]
+ </string>
+ <string name="TooltipForSaleMsg">
+ Til salg: [MESSAGE]
+ </string>
+ <string name="TooltipFlagGroupBuild">
+ Gruppe byg
+ </string>
+ <string name="TooltipFlagNoBuild">
+ MÃ¥ ikke bygge
+ </string>
+ <string name="TooltipFlagNoEdit">
+ Gruppe byg
+ </string>
+ <string name="TooltipFlagNotSafe">
+ Ikke sikker område
+ </string>
+ <string name="TooltipFlagNoFly">
+ Ingen flyvning
+ </string>
+ <string name="TooltipFlagGroupScripts">
+ Gruppe scripts
+ </string>
+ <string name="TooltipFlagNoScripts">
+ Ingen Scripts
+ </string>
+ <string name="TooltipLand">
+ Land:
+ </string>
+ <string name="TooltipMustSingleDrop">
+ Kun et enkelt element kan trækkes ind her
+ </string>
+ <string name="RetrievingData">
+ Henter...
+ </string>
+ <string name="ReleaseNotes">
+ Noter om version
+ </string>
+ <string name="LoadingData">
+ Henter...
+ </string>
+ <string name="AvatarNameNobody">
+ (ingen)
+ </string>
+ <string name="AvatarNameWaiting">
+ (venter)
+ </string>
+ <string name="AvatarNameHippos">
+ (hippos)
+ </string>
+ <string name="GroupNameNone">
+ (ingen)
+ </string>
+ <string name="AssetErrorNone">
+ Ingen fejl
+ </string>
+ <string name="AssetErrorRequestFailed">
+ Element forespørgsel: fejlede
+ </string>
+ <string name="AssetErrorNonexistentFile">
+ Element forespørgsel: fil findes ikke
+ </string>
+ <string name="AssetErrorNotInDatabase">
+ Element forespørgsel: element ikke fundet i database
+ </string>
+ <string name="AssetErrorEOF">
+ Slutning af fil
+ </string>
+ <string name="AssetErrorCannotOpenFile">
+ Kan ikke åbne fil
+ </string>
+ <string name="AssetErrorFileNotFound">
+ Fil ikke fundet
+ </string>
+ <string name="AssetErrorTCPTimeout">
+ Tidsgrænse overskredet ved filhentning
+ </string>
+ <string name="AssetErrorCircuitGone">
+ Forbindelsen mistet
+ </string>
+ <string name="AssetErrorUnknownStatus">
+ Ukendt status
+ </string>
+ <string name="AvatarEditingApparance">
+ (Ændrer udseende)
+ </string>
+ <string name="AvatarAway">
+ Væk
+ </string>
+ <string name="AvatarBusy">
+ Optaget
+ </string>
+ <string name="AvatarMuted">
+ Blokeret
+ </string>
+ <string name="anim_express_afraid">
+ Bange
+ </string>
+ <string name="anim_express_anger">
+ Vred
+ </string>
+ <string name="anim_away">
+ Væk
+ </string>
+ <string name="anim_backflip">
+ Baglæns salto
+ </string>
+ <string name="anim_express_laugh">
+ Hjertelig latter
+ </string>
+ <string name="anim_express_toothsmile">
+ Stort smil
+ </string>
+ <string name="anim_blowkiss">
+ Sende kys
+ </string>
+ <string name="anim_express_bored">
+ Keder sig
+ </string>
+ <string name="anim_bow">
+ Buk
+ </string>
+ <string name="anim_clap">
+ Klap
+ </string>
+ <string name="anim_courtbow">
+ Højtideligt buk
+ </string>
+ <string name="anim_express_cry">
+ Græd
+ </string>
+ <string name="anim_dance1">
+ Dans 1
+ </string>
+ <string name="anim_dance2">
+ Dans 2
+ </string>
+ <string name="anim_dance3">
+ Dans 3
+ </string>
+ <string name="anim_dance4">
+ Dans 4
+ </string>
+ <string name="anim_dance5">
+ Dans 5
+ </string>
+ <string name="anim_dance6">
+ Dans 6
+ </string>
+ <string name="anim_dance7">
+ Dans 7
+ </string>
+ <string name="anim_dance8">
+ Dans 8
+ </string>
+ <string name="anim_express_disdain">
+ Foragt
+ </string>
+ <string name="anim_drink">
+ Drik
+ </string>
+ <string name="anim_express_embarrased">
+ Flov
+ </string>
+ <string name="anim_angry_fingerwag">
+ Løftet finger
+ </string>
+ <string name="anim_fist_pump">
+ Knytnæve
+ </string>
+ <string name="anim_yoga_float">
+ Svævende yoga
+ </string>
+ <string name="anim_express_frown">
+ Mistroisk
+ </string>
+ <string name="anim_impatient">
+ Utålmodig
+ </string>
+ <string name="anim_jumpforjoy">
+ Glædeshop
+ </string>
+ <string name="anim_kissmybutt">
+ Kys min r..
+ </string>
+ <string name="anim_express_kiss">
+ Kys
+ </string>
+ <string name="anim_laugh_short">
+ Grin
+ </string>
+ <string name="anim_musclebeach">
+ Bodybuilder
+ </string>
+ <string name="anim_no_unhappy">
+ Nej (sur)
+ </string>
+ <string name="anim_no_head">
+ Nej
+ </string>
+ <string name="anim_nyanya">
+ Æv-bæv
+ </string>
+ <string name="anim_punch_onetwo">
+ Et-to slag
+ </string>
+ <string name="anim_express_open_mouth">
+ Ã…ben mund
+ </string>
+ <string name="anim_peace">
+ Peace
+ </string>
+ <string name="anim_point_you">
+ Peg på andre
+ </string>
+ <string name="anim_point_me">
+ Peg på dig selv
+ </string>
+ <string name="anim_punch_l">
+ Slå venstre
+ </string>
+ <string name="anim_punch_r">
+ Slå højre
+ </string>
+ <string name="anim_rps_countdown">
+ SSP - Tæl
+ </string>
+ <string name="anim_rps_paper">
+ SSP - Papir
+ </string>
+ <string name="anim_rps_rock">
+ SSP - Sten
+ </string>
+ <string name="anim_rps_scissors">
+ SSP - Saks
+ </string>
+ <string name="anim_express_repulsed">
+ Misfornøjet
+ </string>
+ <string name="anim_kick_roundhouse_r">
+ Karatepark
+ </string>
+ <string name="anim_express_sad">
+ Ked af det
+ </string>
+ <string name="anim_salute">
+ Honnør
+ </string>
+ <string name="anim_shout">
+ RÃ¥b
+ </string>
+ <string name="anim_express_shrug">
+ Skuldertræk
+ </string>
+ <string name="anim_express_smile">
+ Smil
+ </string>
+ <string name="anim_smoke_idle">
+ Ryg
+ </string>
+ <string name="anim_smoke_inhale">
+ Indhalér
+ </string>
+ <string name="anim_smoke_throw_down">
+ Smid cigaret
+ </string>
+ <string name="anim_express_surprise">
+ Overrasket
+ </string>
+ <string name="anim_sword_strike_r">
+ Sværdslag
+ </string>
+ <string name="anim_angry_tantrum">
+ Ekstatisk
+ </string>
+ <string name="anim_express_tongue_out">
+ Tunge ud
+ </string>
+ <string name="anim_hello">
+ Vink
+ </string>
+ <string name="anim_whisper">
+ Knib øje i
+ </string>
+ <string name="anim_whistle">
+ Pift
+ </string>
+ <string name="anim_express_wink">
+ Blink
+ </string>
+ <string name="anim_wink_hollywood">
+ Blink (Hollywood)
+ </string>
+ <string name="anim_express_worry">
+ Bekymret
+ </string>
+ <string name="anim_yes_happy">
+ Ja (glad)
+ </string>
+ <string name="anim_yes_head">
+ Ja
+ </string>
+ <string name="texture_loading">
+ Henter...
+ </string>
+ <string name="worldmap_offline">
+ Offline
+ </string>
+ <string name="whisper">
+ hvisker:
+ </string>
+ <string name="shout">
+ råber:
+ </string>
+</strings>
diff --git a/indra/newview/skins/default/xui/da/xui_version.xml b/indra/newview/skins/default/xui/da/xui_version.xml
index ee2a0be745..0e777751d3 100644
--- a/indra/newview/skins/default/xui/da/xui_version.xml
+++ b/indra/newview/skins/default/xui/da/xui_version.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xui_version>
- 1.0
-</xui_version>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xui_version>
+ 1.0
+</xui_version>
diff --git a/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
index 299b6a7f7e..48df5fd917 100644
--- a/indra/newview/skins/default/xui/de/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
@@ -15,127 +15,127 @@
Handhaltung
</text>
<combo_box label="" name="hand_pose_combo" tool_tip="Steuert während der Animation die Bewegung der Hände.">
- <combo_item name="Spread">
+ <combo_box.item name="Spread">
Dehnen
- </combo_item>
- <combo_item name="Relaxed">
+ </combo_box.item>
+ <combo_box.item name="Relaxed">
Entspannt
- </combo_item>
- <combo_item name="PointBoth">
+ </combo_box.item>
+ <combo_box.item name="PointBoth">
Beide zeigen
- </combo_item>
- <combo_item name="Fist">
+ </combo_box.item>
+ <combo_box.item name="Fist">
Faust
- </combo_item>
- <combo_item name="RelaxedLeft">
+ </combo_box.item>
+ <combo_box.item name="RelaxedLeft">
Links entspannt
- </combo_item>
- <combo_item name="PointLeft">
+ </combo_box.item>
+ <combo_box.item name="PointLeft">
Nach links zeigen
- </combo_item>
- <combo_item name="FistLeft">
+ </combo_box.item>
+ <combo_box.item name="FistLeft">
Linke Faust
- </combo_item>
- <combo_item name="RelaxedRight">
+ </combo_box.item>
+ <combo_box.item name="RelaxedRight">
Rechts entspannt
- </combo_item>
- <combo_item name="PointRight">
+ </combo_box.item>
+ <combo_box.item name="PointRight">
Nach rechts zeigen
- </combo_item>
- <combo_item name="FistRight">
+ </combo_box.item>
+ <combo_box.item name="FistRight">
Rechte Faust
- </combo_item>
- <combo_item name="SaluteRight">
+ </combo_box.item>
+ <combo_box.item name="SaluteRight">
Rechts salutieren
- </combo_item>
- <combo_item name="Typing">
+ </combo_box.item>
+ <combo_box.item name="Typing">
Tippt
- </combo_item>
- <combo_item name="PeaceRight">
+ </combo_box.item>
+ <combo_box.item name="PeaceRight">
Friedensrecht
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="emote_label">
Ausdruck
</text>
<combo_box label="" name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation.">
- <combo_item name="[None]">
+ <combo_box.item name="[None]">
[Keine]
- </combo_item>
- <combo_item name="Aaaaah">
+ </combo_box.item>
+ <combo_box.item name="Aaaaah">
Aaaaah
- </combo_item>
- <combo_item name="Afraid">
+ </combo_box.item>
+ <combo_box.item name="Afraid">
Ängstlich
- </combo_item>
- <combo_item name="Angry">
+ </combo_box.item>
+ <combo_box.item name="Angry">
Verärgert
- </combo_item>
- <combo_item name="BigSmile">
+ </combo_box.item>
+ <combo_box.item name="BigSmile">
Grinst
- </combo_item>
- <combo_item name="Bored">
+ </combo_box.item>
+ <combo_box.item name="Bored">
Gelangweilt
- </combo_item>
- <combo_item name="Cry">
+ </combo_box.item>
+ <combo_box.item name="Cry">
Weinen
- </combo_item>
- <combo_item name="Disdain">
+ </combo_box.item>
+ <combo_box.item name="Disdain">
Verachten
- </combo_item>
- <combo_item name="Embarrassed">
+ </combo_box.item>
+ <combo_box.item name="Embarrassed">
Verlegen
- </combo_item>
- <combo_item name="Frown">
+ </combo_box.item>
+ <combo_box.item name="Frown">
Stirnrunzeln
- </combo_item>
- <combo_item name="Kiss">
+ </combo_box.item>
+ <combo_box.item name="Kiss">
Küssen
- </combo_item>
- <combo_item name="Laugh">
+ </combo_box.item>
+ <combo_box.item name="Laugh">
Lachen
- </combo_item>
- <combo_item name="Plllppt">
+ </combo_box.item>
+ <combo_box.item name="Plllppt">
Bäääh
- </combo_item>
- <combo_item name="Repulsed">
+ </combo_box.item>
+ <combo_box.item name="Repulsed">
Zurückgestoßen
- </combo_item>
- <combo_item name="Sad">
+ </combo_box.item>
+ <combo_box.item name="Sad">
Traurig
- </combo_item>
- <combo_item name="Shrug">
+ </combo_box.item>
+ <combo_box.item name="Shrug">
Schulterzucken
- </combo_item>
- <combo_item name="Smile">
+ </combo_box.item>
+ <combo_box.item name="Smile">
Lächeln
- </combo_item>
- <combo_item name="Surprise">
+ </combo_box.item>
+ <combo_box.item name="Surprise">
Ãœberraschung
- </combo_item>
- <combo_item name="Wink">
+ </combo_box.item>
+ <combo_box.item name="Wink">
Zwinkern
- </combo_item>
- <combo_item name="Worry">
+ </combo_box.item>
+ <combo_box.item name="Worry">
Sorgenvoll
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="preview_label" width="97">
Vorschau während:
</text>
<combo_box label="" left_delta="107" name="preview_base_anim" tool_tip="Hiermit können Sie das Verhalten Ihres Avatars testen, während Ihr Avatar normale Bewegungen ausführt.">
- <combo_item name="Standing">
+ <combo_box.item name="Standing">
Stehend
- </combo_item>
- <combo_item name="Walking">
+ </combo_box.item>
+ <combo_box.item name="Walking">
Geht
- </combo_item>
- <combo_item name="Sitting">
+ </combo_box.item>
+ <combo_box.item name="Sitting">
Sitzt
- </combo_item>
- <combo_item name="Flying">
+ </combo_box.item>
+ <combo_box.item name="Flying">
Fliegend
- </combo_item>
+ </combo_box.item>
</combo_box>
<spinner label="Eingang glätten (s)" label_width="105" name="ease_in_time" tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
<spinner bottom_delta="-20" label="Ausgang glätten (s)" label_width="105" left="10" name="ease_out_time" tool_tip="Ausblendungsgeschwindigkeit von Animationen (in Sekunden)." width="175"/>
diff --git a/indra/newview/skins/default/xui/de/floater_beacons.xml b/indra/newview/skins/default/xui/de/floater_beacons.xml
index d1ec9d968d..0992727e73 100644
--- a/indra/newview/skins/default/xui/de/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/de/floater_beacons.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="Beacons">
- <panel name="beacons_panel">
- <check_box label="Auf Berührung beschränkte Skriptobjekte" name="touch_only"/>
- <check_box label="Skripting-Objekte" name="scripted"/>
- <check_box label="Physische Objekte" name="physical"/>
- <check_box label="Soundquellen" name="sounds"/>
- <check_box label="Partikelquellen" name="particles"/>
- <check_box label="Glanzlichter anzeigen" name="highlights"/>
- <check_box label="Beacons anzeigen" name="beacons"/>
- <text name="beacon_width_label">
- Beacon-Breite:
- </text>
- </panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Beacons">
+ <panel name="beacons_panel">
+ <check_box label="Auf Berührung beschränkte Skriptobjekte" name="touch_only"/>
+ <check_box label="Skripting-Objekte" name="scripted"/>
+ <check_box label="Physische Objekte" name="physical"/>
+ <check_box label="Soundquellen" name="sounds"/>
+ <check_box label="Partikelquellen" name="particles"/>
+ <check_box label="Glanzlichter anzeigen" name="highlights"/>
+ <check_box label="Beacons anzeigen" name="beacons"/>
+ <text name="beacon_width_label">
+ Beacon-Breite:
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_buy_land.xml b/indra/newview/skins/default/xui/de/floater_buy_land.xml
index 332c900190..0b2f86ed8f 100644
--- a/indra/newview/skins/default/xui/de/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_buy_land.xml
@@ -66,15 +66,15 @@
Landbesitz ist Premium-Mitgliedern vorbehalten.
</text>
<combo_box name="account_level">
- <combo_item name="US$9.95/month,billedmonthly">
+ <combo_box.item name="US$9.95/month,billedmonthly">
9,95 US$/Monat, monatliche Abrechnung
- </combo_item>
- <combo_item name="US$7.50/month,billedquarterly">
+ </combo_box.item>
+ <combo_box.item name="US$7.50/month,billedquarterly">
7,50 US$/Monat, vierteljährliche Abrechnung
- </combo_item>
- <combo_item name="US$6.00/month,billedannually">
+ </combo_box.item>
+ <combo_box.item name="US$6.00/month,billedannually">
6,00 US$/Monat, jährliche Abrechnung
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="land_use_action">
Erhöhen Sie Ihre monatlichen Landnutzungsgebühren auf 40 US$/month.
diff --git a/indra/newview/skins/default/xui/de/floater_camera.xml b/indra/newview/skins/default/xui/de/floater_camera.xml
index bb36ebd7fd..198b5b07f2 100644
--- a/indra/newview/skins/default/xui/de/floater_camera.xml
+++ b/indra/newview/skins/default/xui/de/floater_camera.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater">
- <string name="rotate_tooltip">
- Kamera um Fokus drehen
- </string>
- <string name="zoom_tooltip">
- Kamera auf Fokus zoomen
- </string>
- <string name="move_tooltip">
- Kamera nach oben, unten, links und rechts bewegen
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater">
+ <string name="rotate_tooltip">
+ Kamera um Fokus drehen
+ </string>
+ <string name="zoom_tooltip">
+ Kamera auf Fokus zoomen
+ </string>
+ <string name="move_tooltip">
+ Kamera nach oben, unten, links und rechts bewegen
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
index d2e981c492..d5a216a0b5 100644
--- a/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_day_cycle_options.xml
@@ -1,96 +1,96 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Day Cycle Floater" title="Tageszyklus-Editor">
- <tab_container name="Day Cycle Tabs">
- <panel label="Tageszyklus" name="Day Cycle">
- <button label=" ?" name="WLDayCycleHelp" />
- <text name="WL12am">
- 24:00
- </text>
- <text name="WL3am">
- 03:00
- </text>
- <text name="WL6am">
- 06:00
- </text>
- <text name="WL9amHash">
- 09:00
- </text>
- <text name="WL12pmHash">
- 12:00
- </text>
- <text name="WL3pm">
- 15:00
- </text>
- <text name="WL6pm">
- 18:00
- </text>
- <text name="WL9pm">
- 21:00
- </text>
- <text name="WL12am2">
- 24:00
- </text>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <button label="Key hinzu" label_selected="Key hinzu" name="WLAddKey" />
- <button label="Key löschen" label_selected="Key löschen" name="WLDeleteKey" />
- <text name="WLCurKeyFrameText">
- Keyframe-Einstellungen:
- </text>
- <text name="WLCurKeyTimeText">
- Key-Zeit:
- </text>
- <spinner label="Std." name="WLCurKeyHour" />
- <spinner label="Min." name="WLCurKeyMin" />
- <text name="WLCurKeyTimeText2">
- Key-Voreinstellung:
- </text>
- <combo_box label="Voreinstellung" name="WLKeyPresets" />
- <text name="DayCycleText">
- Einrasten:
- </text>
- <combo_box label="5 min" name="WLSnapOptions" />
- <text name="DayCycleText2">
- Zykluslänge:
- </text>
- <spinner label="Std." name="WLLengthOfDayHour" />
- <spinner label="Min." name="WLLengthOfDayMin" />
- <spinner label="Sek." name="WLLengthOfDaySec" />
- <text name="DayCycleText3">
- Vorschau:
- </text>
- <button label="Start" label_selected="Start" name="WLAnimSky" />
- <button label="Stopp" label_selected="Stopp" name="WLStopAnimSky" />
- <button label="Grundstückszeit verw" label_selected="Zur Grundstückszeit"
- name="WLUseLindenTime" />
- <button label="Testtag speichern" label_selected="Testtag speichern"
- name="WLSaveDayCycle" />
- <button label="Testtag laden" label_selected="Testtag laden" name="WLLoadDayCycle" />
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Day Cycle Floater" title="Tageszyklus-Editor">
+ <tab_container name="Day Cycle Tabs">
+ <panel label="Tageszyklus" name="Day Cycle">
+ <button label=" ?" name="WLDayCycleHelp" />
+ <text name="WL12am">
+ 24:00
+ </text>
+ <text name="WL3am">
+ 03:00
+ </text>
+ <text name="WL6am">
+ 06:00
+ </text>
+ <text name="WL9amHash">
+ 09:00
+ </text>
+ <text name="WL12pmHash">
+ 12:00
+ </text>
+ <text name="WL3pm">
+ 15:00
+ </text>
+ <text name="WL6pm">
+ 18:00
+ </text>
+ <text name="WL9pm">
+ 21:00
+ </text>
+ <text name="WL12am2">
+ 24:00
+ </text>
+ <text name="WL12amHash">
+ |
+ </text>
+ <text name="WL3amHash">
+ I
+ </text>
+ <text name="WL6amHash">
+ |
+ </text>
+ <text name="WL9amHash2">
+ I
+ </text>
+ <text name="WL12pmHash2">
+ |
+ </text>
+ <text name="WL3pmHash">
+ I
+ </text>
+ <text name="WL6pmHash">
+ |
+ </text>
+ <text name="WL9pmHash">
+ I
+ </text>
+ <text name="WL12amHash2">
+ |
+ </text>
+ <button label="Key hinzu" label_selected="Key hinzu" name="WLAddKey" />
+ <button label="Key löschen" label_selected="Key löschen" name="WLDeleteKey" />
+ <text name="WLCurKeyFrameText">
+ Keyframe-Einstellungen:
+ </text>
+ <text name="WLCurKeyTimeText">
+ Key-Zeit:
+ </text>
+ <spinner label="Std." name="WLCurKeyHour" />
+ <spinner label="Min." name="WLCurKeyMin" />
+ <text name="WLCurKeyTimeText2">
+ Key-Voreinstellung:
+ </text>
+ <combo_box label="Voreinstellung" name="WLKeyPresets" />
+ <text name="DayCycleText">
+ Einrasten:
+ </text>
+ <combo_box label="5 min" name="WLSnapOptions" />
+ <text name="DayCycleText2">
+ Zykluslänge:
+ </text>
+ <spinner label="Std." name="WLLengthOfDayHour" />
+ <spinner label="Min." name="WLLengthOfDayMin" />
+ <spinner label="Sek." name="WLLengthOfDaySec" />
+ <text name="DayCycleText3">
+ Vorschau:
+ </text>
+ <button label="Start" label_selected="Start" name="WLAnimSky" />
+ <button label="Stopp" label_selected="Stopp" name="WLStopAnimSky" />
+ <button label="Grundstückszeit verw" label_selected="Zur Grundstückszeit"
+ name="WLUseLindenTime" />
+ <button label="Testtag speichern" label_selected="Testtag speichern"
+ name="WLSaveDayCycle" />
+ <button label="Testtag laden" label_selected="Testtag laden" name="WLLoadDayCycle" />
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_device_settings.xml b/indra/newview/skins/default/xui/de/floater_device_settings.xml
index 6feebdf1d2..734f4e942c 100644
--- a/indra/newview/skins/default/xui/de/floater_device_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_device_settings.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_device_settings" title="Geräte-Einstellungen für Voice-Chat" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_device_settings" title="Geräte-Einstellungen für Voice-Chat" />
diff --git a/indra/newview/skins/default/xui/de/floater_env_settings.xml b/indra/newview/skins/default/xui/de/floater_env_settings.xml
index bb9e5efc36..3717ff6a48 100644
--- a/indra/newview/skins/default/xui/de/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_env_settings.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Environment Editor Floater" title="Umwelt-Editor">
- <text name="EnvTimeText">
- Tageszeit
- </text>
- <text name="EnvTimeText2">
- 12:00
- </text>
- <text name="EnvCloudText">
- Wolkendecke
- </text>
- <text name="EnvWaterColorText">
- Wasserfarbe
- </text>
- <color_swatch name="EnvWaterColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
- <text name="EnvWaterFogText">
- Wasser-
-trübung
- </text>
- <button label="Grundstückszeit verw." name="EnvUseEstateTimeButton" />
- <button label="Himmel (erweitert)" name="EnvAdvancedSkyButton" />
- <button label="Wasser (erweitert)" name="EnvAdvancedWaterButton" />
- <button label=" ?" name="EnvSettingsHelpButton" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Environment Editor Floater" title="Umwelt-Editor">
+ <text name="EnvTimeText">
+ Tageszeit
+ </text>
+ <text name="EnvTimeText2">
+ 12:00
+ </text>
+ <text name="EnvCloudText">
+ Wolkendecke
+ </text>
+ <text name="EnvWaterColorText">
+ Wasserfarbe
+ </text>
+ <color_swatch name="EnvWaterColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
+ <text name="EnvWaterFogText">
+ Wasser-
+trübung
+ </text>
+ <button label="Grundstückszeit verw." name="EnvUseEstateTimeButton" />
+ <button label="Himmel (erweitert)" name="EnvAdvancedSkyButton" />
+ <button label="Wasser (erweitert)" name="EnvAdvancedWaterButton" />
+ <button label=" ?" name="EnvSettingsHelpButton" />
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_god_tools.xml b/indra/newview/skins/default/xui/de/floater_god_tools.xml
index dcb6982588..15143f59d3 100644
--- a/indra/newview/skins/default/xui/de/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_god_tools.xml
@@ -115,29 +115,29 @@
Ziel:
</text>
<combo_box name="destination">
- <combo_item name="Selection">
+ <combo_box.item name="Selection">
Auswahl
- </combo_item>
- <combo_item name="AgentRegion">
+ </combo_box.item>
+ <combo_box.item name="AgentRegion">
Avatar-Region
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="Request:">
Anfrage:
</text>
<combo_box name="request">
- <combo_item name="colliders<steps>">
+ <combo_box.item name="colliders<steps>">
Kollisionsobjekte <Schritte>
- </combo_item>
- <combo_item name="scripts<count>,<optionalpattern>">
+ </combo_box.item>
+ <combo_box.item name="scripts<count>,<optionalpattern>">
Skripts <Zähler>,<Optionales Muster>
- </combo_item>
- <combo_item name="objects<pattern>">
+ </combo_box.item>
+ <combo_box.item name="objects<pattern>">
Objekte <Muster>
- </combo_item>
- <combo_item name="rez<asset_id>">
+ </combo_box.item>
+ <combo_box.item name="rez<asset_id>">
<asset_id> erstellen
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="Parameter:">
Parameter:
diff --git a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
index 4149d8de06..6642de7e6a 100644
--- a/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/de/floater_hardware_settings.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Hardware Settings Floater" title="Hardware-Einstellungen">
- <text name="Filtering:">
- Filtern:
- </text>
- <check_box label="Anisotropische Filterung (langsamer, wenn aktiviert)" name="ani" />
- <text name="Antialiasing:">
- Antialiasing:
- </text>
- <combo_box label="Antialiasing" name="fsaa">
- <combo_item name="FSAADisabled">
- Deaktiviert
- </combo_item>
- <combo_item name="2x">
- 2x
- </combo_item>
- <combo_item name="4x">
- 4x
- </combo_item>
- <combo_item name="8x">
- 8x
- </combo_item>
- <combo_item name="16x">
- 16x
- </combo_item>
- </combo_box>
- <spinner label="Gamma:" name="gamma" />
- <text name="(brightness, lower is brighter)">
- (Helligkeit, niedriger ist heller, 0=Standard)
- </text>
- <text name="Enable VBO:">
- VBO aktivieren:
- </text>
- <check_box label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo"
- tool_tip="Wenn Sie über moderne Grafikhardware verfügen, können Sie durch Aktivieren dieser Option die Geschwindigkeit verbessern. Bei alter Hardware sind die VBO oft schlecht implementiert, was zu Abstürzen führen kann, wenn diese Option aktiviert ist." />
- <slider label="Texturspeicher (MB):" name="GrapicsCardTextureMemory"
- tool_tip="Speicherplatz, der für Texturen zur Verfügung steht. In der Regel handelt es sich um Grafikkartenspeicher. Ein kleinerer Wert kann die Geschwindigkeit erhöhen, aber auch zu Texturunschärfen führen." />
- <spinner label="Nebeldistanzverhältnis:" name="fog" />
- <button label="OK" label_selected="OK" name="OK" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Hardware Settings Floater" title="Hardware-Einstellungen">
+ <text name="Filtering:">
+ Filtern:
+ </text>
+ <check_box label="Anisotropische Filterung (langsamer, wenn aktiviert)" name="ani" />
+ <text name="Antialiasing:">
+ Antialiasing:
+ </text>
+ <combo_box label="Antialiasing" name="fsaa">
+ <combo_box.item name="FSAADisabled">
+ Deaktiviert
+ </combo_box.item>
+ <combo_box.item name="2x">
+ 2x
+ </combo_box.item>
+ <combo_box.item name="4x">
+ 4x
+ </combo_box.item>
+ <combo_box.item name="8x">
+ 8x
+ </combo_box.item>
+ <combo_box.item name="16x">
+ 16x
+ </combo_box.item>
+ </combo_box>
+ <spinner label="Gamma:" name="gamma" />
+ <text name="(brightness, lower is brighter)">
+ (Helligkeit, niedriger ist heller, 0=Standard)
+ </text>
+ <text name="Enable VBO:">
+ VBO aktivieren:
+ </text>
+ <check_box label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo"
+ tool_tip="Wenn Sie über moderne Grafikhardware verfügen, können Sie durch Aktivieren dieser Option die Geschwindigkeit verbessern. Bei alter Hardware sind die VBO oft schlecht implementiert, was zu Abstürzen führen kann, wenn diese Option aktiviert ist." />
+ <slider label="Texturspeicher (MB):" name="GrapicsCardTextureMemory"
+ tool_tip="Speicherplatz, der für Texturen zur Verfügung steht. In der Regel handelt es sich um Grafikkartenspeicher. Ein kleinerer Wert kann die Geschwindigkeit erhöhen, aber auch zu Texturunschärfen führen." />
+ <spinner label="Nebeldistanzverhältnis:" name="fog" />
+ <button label="OK" label_selected="OK" name="OK" />
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_hud.xml b/indra/newview/skins/default/xui/de/floater_hud.xml
index adf9cae60a..0f11e2346d 100644
--- a/indra/newview/skins/default/xui/de/floater_hud.xml
+++ b/indra/newview/skins/default/xui/de/floater_hud.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_hud" title="Tutorial" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_hud" title="Tutorial" />
diff --git a/indra/newview/skins/default/xui/de/floater_image_preview.xml b/indra/newview/skins/default/xui/de/floater_image_preview.xml
index 145e0bbc33..db0930f657 100644
--- a/indra/newview/skins/default/xui/de/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_image_preview.xml
@@ -10,36 +10,36 @@
Bildvorschau als:
</text>
<combo_box label="Kleidungstyp" name="clothing_type_combo">
- <combo_item name="Image">
+ <combo_box.item name="Image">
Bild
- </combo_item>
- <combo_item name="Hair">
+ </combo_box.item>
+ <combo_box.item name="Hair">
Haar
- </combo_item>
- <combo_item name="FemaleHead">
+ </combo_box.item>
+ <combo_box.item name="FemaleHead">
Kopf (Frau)
- </combo_item>
- <combo_item name="FemaleUpperBody">
+ </combo_box.item>
+ <combo_box.item name="FemaleUpperBody">
Oberkörper (Frau)
- </combo_item>
- <combo_item name="FemaleLowerBody">
+ </combo_box.item>
+ <combo_box.item name="FemaleLowerBody">
Unterkörper (Frau)
- </combo_item>
- <combo_item name="MaleHead">
+ </combo_box.item>
+ <combo_box.item name="MaleHead">
Kopf (Mann)
- </combo_item>
- <combo_item name="MaleUpperBody">
+ </combo_box.item>
+ <combo_box.item name="MaleUpperBody">
Oberkörper (Mann)
- </combo_item>
- <combo_item name="MaleLowerBody">
+ </combo_box.item>
+ <combo_box.item name="MaleLowerBody">
Unterkörper (Mann)
- </combo_item>
- <combo_item name="Skirt">
+ </combo_box.item>
+ <combo_box.item name="Skirt">
Rock
- </combo_item>
- <combo_item name="SculptedPrim">
+ </combo_box.item>
+ <combo_box.item name="SculptedPrim">
Geformtes Primitiv
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="bad_image_text">
Bild kann nicht gelesen werden.
diff --git a/indra/newview/skins/default/xui/de/floater_inspect.xml b/indra/newview/skins/default/xui/de/floater_inspect.xml
index afe7bec2fa..f8c9b62824 100644
--- a/indra/newview/skins/default/xui/de/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/de/floater_inspect.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="Objekt prüfen" min_width="450" >
- <scroll_list name="object_list"
- tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Second Life-Welt zu markieren">
- <column label="Objektname" name="object_name" />
- <column label="Besitzer" name="owner_name" />
- <column label="Ersteller" name="creator_name" />
- <column label="Erstellungsdatum" name="creation_date" />
- </scroll_list>
- <button label="Besitzerprofil einsehen..." name="button owner"
- tool_tip="Profil des Besitzers des markierten Objekts einsehen" width="155" />
- <button label="Erstellerprofil einsehen..." name="button creator"
- tool_tip="Profil des ursprünglichen Erstellers des markierten Objekts einsehen" width="155" left="175"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="inspect" title="Objekt prüfen" min_width="450" >
+ <scroll_list name="object_list"
+ tool_tip="Wählen Sie ein Objekt aus dieser Liste, um es in der Second Life-Welt zu markieren">
+ <column label="Objektname" name="object_name" />
+ <column label="Besitzer" name="owner_name" />
+ <column label="Ersteller" name="creator_name" />
+ <column label="Erstellungsdatum" name="creation_date" />
+ </scroll_list>
+ <button label="Besitzerprofil einsehen..." name="button owner"
+ tool_tip="Profil des Besitzers des markierten Objekts einsehen" width="155" />
+ <button label="Erstellerprofil einsehen..." name="button creator"
+ tool_tip="Profil des ursprünglichen Erstellers des markierten Objekts einsehen" width="155" left="175"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_joystick.xml b/indra/newview/skins/default/xui/de/floater_joystick.xml
index 837ac7d975..bf3083a14b 100644
--- a/indra/newview/skins/default/xui/de/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/de/floater_joystick.xml
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Joystick" title="Joystick-Konfiguration">
- <check_box name="enable_joystick" width="80" >Joystick aktivieren:</check_box>
- <text name="joystick_type" left="140" width="360"></text>
- <spinner label="X-Achse" name="JoystickAxis1" />
- <spinner label="Y-Achse" name="JoystickAxis2" />
- <spinner label="Z-Achse" name="JoystickAxis0" />
- <spinner label="Neigungswinkel" name="JoystickAxis4" />
- <spinner label="Gierwinkel" name="JoystickAxis5" />
- <spinner label="Rollwinkel" name="JoystickAxis3" />
- <spinner label="Zoom" name="JoystickAxis6" />
- <check_box label="Direkt-Zoom" name="ZoomDirect" />
- <check_box label="3D-Cursor" left="300" name="Cursor3D" />
- <check_box label="Automatisch ausrichten" left="390" name="AutoLeveling" />
- <text name="Control Modes:">
- Steuermodi:
- </text>
- <check_box name="JoystickAvatarEnabled">Avatar</check_box>
- <check_box name="JoystickBuildEnabled">Bauen</check_box>
- <check_box name="JoystickFlycamEnabled">Flycam</check_box>
- <text name="XScale">
- X-Skala
- </text>
- <text name="YScale">
- Y-Skala
- </text>
- <text name="ZScale">
- Z-Skala
- </text>
- <text name="PitchScale">
- Neigungsskala
- </text>
- <text name="YawScale">
- Gierskala
- </text>
- <text name="RollScale">
- Rollskala
- </text>
- <text name="XDeadZone">
- X-Totzone
- </text>
- <text name="YDeadZone">
- Y-Totzone
- </text>
- <text name="ZDeadZone">
- Z-Totzone
- </text>
- <text name="PitchDeadZone">
- Neigen-Totzone
- </text>
- <text name="YawDeadZone">
- Gieren-Totzone
- </text>
- <text name="RollDeadZone">
- Rollen-Totzone
- </text>
- <text name="Feathering">
- Auslaufen
- </text>
- <text name="ZoomScale2">
- Zoom-Skala
- </text>
- <text name="ZoomDeadZone">
- Zoom-Totzone
- </text>
- <button label="SpaceNavigator-Standards" name="SpaceNavigatorDefaults" />
- <string name="JoystickMonitor">
- Joystick-Monitor
- </string>
- <string name="Axis">
- Achse [NUM]
- </string>
- <string name="NoDevice">
- Kein Gerät erkannt
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Joystick" title="Joystick-Konfiguration">
+ <check_box name="enable_joystick" width="80" >Joystick aktivieren:</check_box>
+ <text name="joystick_type" left="140" width="360"></text>
+ <spinner label="X-Achse" name="JoystickAxis1" />
+ <spinner label="Y-Achse" name="JoystickAxis2" />
+ <spinner label="Z-Achse" name="JoystickAxis0" />
+ <spinner label="Neigungswinkel" name="JoystickAxis4" />
+ <spinner label="Gierwinkel" name="JoystickAxis5" />
+ <spinner label="Rollwinkel" name="JoystickAxis3" />
+ <spinner label="Zoom" name="JoystickAxis6" />
+ <check_box label="Direkt-Zoom" name="ZoomDirect" />
+ <check_box label="3D-Cursor" left="300" name="Cursor3D" />
+ <check_box label="Automatisch ausrichten" left="390" name="AutoLeveling" />
+ <text name="Control Modes:">
+ Steuermodi:
+ </text>
+ <check_box name="JoystickAvatarEnabled">Avatar</check_box>
+ <check_box name="JoystickBuildEnabled">Bauen</check_box>
+ <check_box name="JoystickFlycamEnabled">Flycam</check_box>
+ <text name="XScale">
+ X-Skala
+ </text>
+ <text name="YScale">
+ Y-Skala
+ </text>
+ <text name="ZScale">
+ Z-Skala
+ </text>
+ <text name="PitchScale">
+ Neigungsskala
+ </text>
+ <text name="YawScale">
+ Gierskala
+ </text>
+ <text name="RollScale">
+ Rollskala
+ </text>
+ <text name="XDeadZone">
+ X-Totzone
+ </text>
+ <text name="YDeadZone">
+ Y-Totzone
+ </text>
+ <text name="ZDeadZone">
+ Z-Totzone
+ </text>
+ <text name="PitchDeadZone">
+ Neigen-Totzone
+ </text>
+ <text name="YawDeadZone">
+ Gieren-Totzone
+ </text>
+ <text name="RollDeadZone">
+ Rollen-Totzone
+ </text>
+ <text name="Feathering">
+ Auslaufen
+ </text>
+ <text name="ZoomScale2">
+ Zoom-Skala
+ </text>
+ <text name="ZoomDeadZone">
+ Zoom-Totzone
+ </text>
+ <button label="SpaceNavigator-Standards" name="SpaceNavigatorDefaults" />
+ <string name="JoystickMonitor">
+ Joystick-Monitor
+ </string>
+ <string name="Axis">
+ Achse [NUM]
+ </string>
+ <string name="NoDevice">
+ Kein Gerät erkannt
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_lagmeter.xml b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
index 91ae544887..4dd9fd6c76 100644
--- a/indra/newview/skins/default/xui/de/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/de/floater_lagmeter.xml
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_lagmeter" title="Lag-Anzeige">
- <button name="client_lagmeter" tool_tip="Client-Lag-Status" />
- <text name="client">
- Client:
- </text>
- <text name="client_text">
- Normal
- </text>
- <button name="network_lagmeter" tool_tip="Netzwerk-Lag-Status" />
- <text name="network">
- Netzwerk:
- </text>
- <text name="network_text">
- Normal
- </text>
- <button name="server_lagmeter" tool_tip="Server-Lag-Status" />
- <text name="server">
- Server:
- </text>
- <text name="server_text">
- Normal
- </text>
- <button label="?" name="server_help" />
- <button label=">>Â " name="minimize" />
- <text name="max_title_msg">
- Lag-Anzeige
- </text>
- <text name="max_width_px">
- 350
- </text>
- <text name="min_title_msg">
- Lag
- </text>
- <text name="min_width_px">
- 90
- </text>
- <text name="client_text_msg">
- Client
- </text>
- <text name="client_frame_rate_critical_fps">
- 10
- </text>
- <text name="client_frame_rate_warning_fps">
- 15
- </text>
- <text name="client_frame_time_window_bg_msg">
- Normal, Fenster im Hintergrund
- </text>
- <text name="client_frame_time_critical_msg">
- Client-Frame-Rate unter [CLIENT_FRAME_RATE_CRITICAL]
- </text>
- <text name="client_frame_time_warning_msg">
- Client-Frame-Rate zwischen [CLIENT_FRAME_RATE_CRITICAL] und [CLIENT_FRAME_RATE_WARNING]
- </text>
- <text name="client_frame_time_normal_msg">
- Normal
- </text>
- <text name="client_draw_distance_cause_msg">
- Mögliche Ursache: Sichtweite zu groß
- </text>
- <text name="client_texture_loading_cause_msg">
- Mögliche Ursache: Bilder werden geladen
- </text>
- <text name="client_texture_memory_cause_msg">
- Mögliche Ursache: Zu viele Bilder im Speicher
- </text>
- <text name="client_complex_objects_cause_msg">
- Mögliche Ursache: Zu viele komplexe Objekte in der Szene
- </text>
- <text name="network_text_msg">
- Netzwerk
- </text>
- <text name="network_packet_loss_critical_pct">
- 10
- </text>
- <text name="network_packet_loss_warning_pct">
- 5
- </text>
- <text name="network_packet_loss_critical_msg">
- Paketverlust der Verbindung übersteigt [NETWORK_PACKET_LOSS_CRITICAL]%
- </text>
- <text name="network_packet_loss_warning_msg">
- Paketverlust der Verbindung liegt bei [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]%
- </text>
- <text name="network_performance_normal_msg">
- Normal
- </text>
- <text name="network_ping_critical_ms">
- 600
- </text>
- <text name="network_ping_warning_ms">
- 300
- </text>
- <text name="network_ping_critical_msg">
- Ping-Zeit der Verbindung übersteigt [NETWORK_PING_CRITICAL] ms
- </text>
- <text name="network_ping_warning_msg">
- Ping-Zeit der Verbindung liegt bei [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
- </text>
- <text name="network_packet_loss_cause_msg">
- Möglicherweise schlechte Verbindung oder zu hoher Wert für „Bandbreite“.
- </text>
- <text name="network_ping_cause_msg">
- Möglicherweise schlechte Verbindung oder File-Sharing-Anwendung.
- </text>
- <text name="server_text_msg">
- Server
- </text>
- <text name="server_frame_rate_critical_fps">
- 20
- </text>
- <text name="server_frame_rate_warning_fps">
- 30
- </text>
- <text name="server_single_process_max_time_ms">
- 20
- </text>
- <text name="server_frame_time_critical_msg">
- Simulator-Frame-Rate liegt unter [SERVER_FRAME_RATE_CRITICAL]
- </text>
- <text name="server_frame_time_warning_msg">
- Simulator-Frame-Rate liegt zwischen [SERVER_FRAME_RATE_CRITICAL] und [SERVER_FRAME_RATE_WARNING]
- </text>
- <text name="server_frame_time_normal_msg">
- Normal
- </text>
- <text name="server_physics_cause_msg">
- Mögliche Ursache: Zu viele physische Objekte
- </text>
- <text name="server_scripts_cause_msg">
- Mögliche Ursache: Zu viele geskriptete Objekte
- </text>
- <text name="server_net_cause_msg">
- Mögliche Ursache: Zu viel Netzwerktraffic
- </text>
- <text name="server_agent_cause_msg">
- Mögliche Ursache: Zu viele Personen in Bewegung in der Region
- </text>
- <text name="server_images_cause_msg">
- Mögliche Ursache: Zu viele Bildberechnungen
- </text>
- <text name="server_generic_cause_msg">
- Mögliche Ursache: Zu hohe Simulator-Last
- </text>
- <text name="smaller_label">
- >>Â
- </text>
- <text name="bigger_label">
- <<Â
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_lagmeter" title="Lag-Anzeige">
+ <button name="client_lagmeter" tool_tip="Client-Lag-Status" />
+ <text name="client">
+ Client:
+ </text>
+ <text name="client_text">
+ Normal
+ </text>
+ <button name="network_lagmeter" tool_tip="Netzwerk-Lag-Status" />
+ <text name="network">
+ Netzwerk:
+ </text>
+ <text name="network_text">
+ Normal
+ </text>
+ <button name="server_lagmeter" tool_tip="Server-Lag-Status" />
+ <text name="server">
+ Server:
+ </text>
+ <text name="server_text">
+ Normal
+ </text>
+ <button label="?" name="server_help" />
+ <button label=">>Â " name="minimize" />
+ <text name="max_title_msg">
+ Lag-Anzeige
+ </text>
+ <text name="max_width_px">
+ 350
+ </text>
+ <text name="min_title_msg">
+ Lag
+ </text>
+ <text name="min_width_px">
+ 90
+ </text>
+ <text name="client_text_msg">
+ Client
+ </text>
+ <text name="client_frame_rate_critical_fps">
+ 10
+ </text>
+ <text name="client_frame_rate_warning_fps">
+ 15
+ </text>
+ <text name="client_frame_time_window_bg_msg">
+ Normal, Fenster im Hintergrund
+ </text>
+ <text name="client_frame_time_critical_msg">
+ Client-Frame-Rate unter [CLIENT_FRAME_RATE_CRITICAL]
+ </text>
+ <text name="client_frame_time_warning_msg">
+ Client-Frame-Rate zwischen [CLIENT_FRAME_RATE_CRITICAL] und [CLIENT_FRAME_RATE_WARNING]
+ </text>
+ <text name="client_frame_time_normal_msg">
+ Normal
+ </text>
+ <text name="client_draw_distance_cause_msg">
+ Mögliche Ursache: Sichtweite zu groß
+ </text>
+ <text name="client_texture_loading_cause_msg">
+ Mögliche Ursache: Bilder werden geladen
+ </text>
+ <text name="client_texture_memory_cause_msg">
+ Mögliche Ursache: Zu viele Bilder im Speicher
+ </text>
+ <text name="client_complex_objects_cause_msg">
+ Mögliche Ursache: Zu viele komplexe Objekte in der Szene
+ </text>
+ <text name="network_text_msg">
+ Netzwerk
+ </text>
+ <text name="network_packet_loss_critical_pct">
+ 10
+ </text>
+ <text name="network_packet_loss_warning_pct">
+ 5
+ </text>
+ <text name="network_packet_loss_critical_msg">
+ Paketverlust der Verbindung übersteigt [NETWORK_PACKET_LOSS_CRITICAL]%
+ </text>
+ <text name="network_packet_loss_warning_msg">
+ Paketverlust der Verbindung liegt bei [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]%
+ </text>
+ <text name="network_performance_normal_msg">
+ Normal
+ </text>
+ <text name="network_ping_critical_ms">
+ 600
+ </text>
+ <text name="network_ping_warning_ms">
+ 300
+ </text>
+ <text name="network_ping_critical_msg">
+ Ping-Zeit der Verbindung übersteigt [NETWORK_PING_CRITICAL] ms
+ </text>
+ <text name="network_ping_warning_msg">
+ Ping-Zeit der Verbindung liegt bei [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+ </text>
+ <text name="network_packet_loss_cause_msg">
+ Möglicherweise schlechte Verbindung oder zu hoher Wert für „Bandbreite“.
+ </text>
+ <text name="network_ping_cause_msg">
+ Möglicherweise schlechte Verbindung oder File-Sharing-Anwendung.
+ </text>
+ <text name="server_text_msg">
+ Server
+ </text>
+ <text name="server_frame_rate_critical_fps">
+ 20
+ </text>
+ <text name="server_frame_rate_warning_fps">
+ 30
+ </text>
+ <text name="server_single_process_max_time_ms">
+ 20
+ </text>
+ <text name="server_frame_time_critical_msg">
+ Simulator-Frame-Rate liegt unter [SERVER_FRAME_RATE_CRITICAL]
+ </text>
+ <text name="server_frame_time_warning_msg">
+ Simulator-Frame-Rate liegt zwischen [SERVER_FRAME_RATE_CRITICAL] und [SERVER_FRAME_RATE_WARNING]
+ </text>
+ <text name="server_frame_time_normal_msg">
+ Normal
+ </text>
+ <text name="server_physics_cause_msg">
+ Mögliche Ursache: Zu viele physische Objekte
+ </text>
+ <text name="server_scripts_cause_msg">
+ Mögliche Ursache: Zu viele geskriptete Objekte
+ </text>
+ <text name="server_net_cause_msg">
+ Mögliche Ursache: Zu viel Netzwerktraffic
+ </text>
+ <text name="server_agent_cause_msg">
+ Mögliche Ursache: Zu viele Personen in Bewegung in der Region
+ </text>
+ <text name="server_images_cause_msg">
+ Mögliche Ursache: Zu viele Bildberechnungen
+ </text>
+ <text name="server_generic_cause_msg">
+ Mögliche Ursache: Zu hohe Simulator-Last
+ </text>
+ <text name="smaller_label">
+ >>Â
+ </text>
+ <text name="bigger_label">
+ <<Â
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
index f45983b9d6..d7f56b302d 100644
--- a/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/de/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script ed float" title="LSL-Wiki">
- <check_box label="Cursor folgen" name="lock_check" />
- <combo_box label="Sperren" name="history_combo" />
- <button label="Zurück" name="back_btn" />
- <button label="Weiter" name="fwd_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="LSL-Wiki">
+ <check_box label="Cursor folgen" name="lock_check" />
+ <combo_box label="Sperren" name="history_combo" />
+ <button label="Zurück" name="back_btn" />
+ <button label="Weiter" name="fwd_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_media_browser.xml b/indra/newview/skins/default/xui/de/floater_media_browser.xml
index 5dda873db7..ee2532127e 100644
--- a/indra/newview/skins/default/xui/de/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/de/floater_media_browser.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_about" title="Medienbrowser">
- <layout_stack name="stack1">
- <layout_panel name="nav_controls">
- <button label="Zurück" name="back" />
- <button label="Weiter" name="forward" />
- <button label="Neu laden" name="reload" />
- <button label="Los" name="go" />
- </layout_panel>
- <layout_panel name="parcel_owner_controls">
- <button label="Aktuelle URL an Parzelle senden" name="assign" />
- </layout_panel>
- <layout_panel name="external_controls">
- <button label="In meinem Browser öffnen" name="open_browser" />
- <check_box label="Immer in meinem Browser öffnen" name="open_always" />
- <button label="Schließen" name="close" />
- </layout_panel>
- </layout_stack>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="Medienbrowser">
+ <layout_stack name="stack1">
+ <layout_panel name="nav_controls">
+ <button label="Zurück" name="back" />
+ <button label="Weiter" name="forward" />
+ <button label="Neu laden" name="reload" />
+ <button label="Los" name="go" />
+ </layout_panel>
+ <layout_panel name="parcel_owner_controls">
+ <button label="Aktuelle URL an Parzelle senden" name="assign" />
+ </layout_panel>
+ <layout_panel name="external_controls">
+ <button label="In meinem Browser öffnen" name="open_browser" />
+ <check_box label="Immer in meinem Browser öffnen" name="open_always" />
+ <button label="Schließen" name="close" />
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
index 4fe3058dfe..0b77a7fe9d 100644
--- a/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/de/floater_mem_leaking.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="MemLeak" title="Speicherverlust-Simulation">
- <spinner label="Verlustgeschwindigkeit (Bytes pro Frame):" name="leak_speed" />
- <spinner label="Max. Speicherverlust (MB):" name="max_leak" />
- <text name="total_leaked_label">
- Aktueller Speicherverlust:[SIZE] KB
- </text>
- <text name="note_label_1">
- [NOTE1]
- </text>
- <text name="note_label_2">
- [NOTE2]
- </text>
- <button label="Start" name="start_btn" />
- <button label="Stopp" name="stop_btn" />
- <button label="Freigeben" name="release_btn" />
- <button label="Schließen" name="close_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="MemLeak" title="Speicherverlust-Simulation">
+ <spinner label="Verlustgeschwindigkeit (Bytes pro Frame):" name="leak_speed" />
+ <spinner label="Max. Speicherverlust (MB):" name="max_leak" />
+ <text name="total_leaked_label">
+ Aktueller Speicherverlust:[SIZE] KB
+ </text>
+ <text name="note_label_1">
+ [NOTE1]
+ </text>
+ <text name="note_label_2">
+ [NOTE2]
+ </text>
+ <button label="Start" name="start_btn" />
+ <button label="Stopp" name="stop_btn" />
+ <button label="Freigeben" name="release_btn" />
+ <button label="Schließen" name="close_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_mute_object.xml b/indra/newview/skins/default/xui/de/floater_mute_object.xml
index c6351cc6e0..02eafbcb68 100644
--- a/indra/newview/skins/default/xui/de/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/de/floater_mute_object.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute by name" title="Objekt nach Name stummschalten">
- <text name="message">
- Stummschalten nach Name betrifft nur Chat und IM, keine Sounds.
-Sie müssen den Objektnamen exakt angeben.
- </text>
- <line_editor name="object_name">
- Objektname
- </line_editor>
- <button label="OK" name="OK" />
- <button label="Abbrechen" name="Cancel" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="mute by name" title="Objekt nach Name stummschalten">
+ <text name="message">
+ Stummschalten nach Name betrifft nur Chat und IM, keine Sounds.
+Sie müssen den Objektnamen exakt angeben.
+ </text>
+ <line_editor name="object_name">
+ Objektname
+ </line_editor>
+ <button label="OK" name="OK" />
+ <button label="Abbrechen" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_my_friends.xml b/indra/newview/skins/default/xui/de/floater_my_friends.xml
index 7d650a2964..fc24bcece4 100644
--- a/indra/newview/skins/default/xui/de/floater_my_friends.xml
+++ b/indra/newview/skins/default/xui/de/floater_my_friends.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_my_friends" title="Kontakte">
- <tab_container name="friends_and_groups">
- <panel label="Freunde" name="friends_panel" />
- <panel label="Gruppen" name="groups_panel" />
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_my_friends" title="Kontakte">
+ <tab_container name="friends_and_groups">
+ <panel label="Freunde" name="friends_panel" />
+ <panel label="Gruppen" name="groups_panel" />
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_post_process.xml b/indra/newview/skins/default/xui/de/floater_post_process.xml
index f2abb9ced1..e10806d255 100644
--- a/indra/newview/skins/default/xui/de/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/de/floater_post_process.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Post-Process Floater" title="Post-Processing-Einstellungen">
- <tab_container name="Post-Process Tabs">
- <panel label="Farbfilter" name="wmiColorFilterPanel">
- <check_box label="Ein" name="wmiColorFilterToggle" />
- <text name="wmiColorFilterBrightnessText">
- Helligkeit
- </text>
- <text name="wmiColorFilterSaturationText">
- Sättigung
- </text>
- <text name="wmiColorFilterContrastText">
- Kontrast
- </text>
- <text name="wmiColorFilterBaseText">
- Kontrast-Grundfarbe
- </text>
- <slider label="R" name="wmiColorFilterBaseR" />
- <slider label="G" name="wmiColorFilterBaseG" />
- <slider label="B" name="wmiColorFilterBaseB" />
- <slider label="I" name="wmiColorFilterBaseI" />
- </panel>
- <panel label="Nachtsicht" name="wmiNightVisionPanel">
- <check_box label="Ein" name="wmiNightVisionToggle" />
- <text name="wmiNightVisionBrightMultText">
- Lichtverstärkungsmultiplikator
- </text>
- <text name="wmiNightVisionNoiseSizeText">
- Rauschen-Größe
- </text>
- <text name="wmiNightVisionNoiseStrengthText">
- Rauschen-Stärke
- </text>
- </panel>
- <panel label="Bloom" name="wmiBloomPanel">
- <check_box label="Ein" name="wmiBloomToggle" />
- <text name="wmiBloomExtractText">
- Luminanz-Extraktion
- </text>
- <text name="wmiBloomSizeText">
- Bloom-Größe
- </text>
- <text name="wmiBloomStrengthText">
- Bloom-Stärke
- </text>
- </panel>
- <panel label="Extras" name="Extras">
- <button label="Effekt laden" label_selected="Effekt laden" name="PPLoadEffect" />
- <button label="Effekt speichern" label_selected="Effekt speichern" name="PPSaveEffect" />
- <line_editor label="Effektname" name="PPEffectNameEditor" />
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Post-Process Floater" title="Post-Processing-Einstellungen">
+ <tab_container name="Post-Process Tabs">
+ <panel label="Farbfilter" name="wmiColorFilterPanel">
+ <check_box label="Ein" name="wmiColorFilterToggle" />
+ <text name="wmiColorFilterBrightnessText">
+ Helligkeit
+ </text>
+ <text name="wmiColorFilterSaturationText">
+ Sättigung
+ </text>
+ <text name="wmiColorFilterContrastText">
+ Kontrast
+ </text>
+ <text name="wmiColorFilterBaseText">
+ Kontrast-Grundfarbe
+ </text>
+ <slider label="R" name="wmiColorFilterBaseR" />
+ <slider label="G" name="wmiColorFilterBaseG" />
+ <slider label="B" name="wmiColorFilterBaseB" />
+ <slider label="I" name="wmiColorFilterBaseI" />
+ </panel>
+ <panel label="Nachtsicht" name="wmiNightVisionPanel">
+ <check_box label="Ein" name="wmiNightVisionToggle" />
+ <text name="wmiNightVisionBrightMultText">
+ Lichtverstärkungsmultiplikator
+ </text>
+ <text name="wmiNightVisionNoiseSizeText">
+ Rauschen-Größe
+ </text>
+ <text name="wmiNightVisionNoiseStrengthText">
+ Rauschen-Stärke
+ </text>
+ </panel>
+ <panel label="Bloom" name="wmiBloomPanel">
+ <check_box label="Ein" name="wmiBloomToggle" />
+ <text name="wmiBloomExtractText">
+ Luminanz-Extraktion
+ </text>
+ <text name="wmiBloomSizeText">
+ Bloom-Größe
+ </text>
+ <text name="wmiBloomStrengthText">
+ Bloom-Stärke
+ </text>
+ </panel>
+ <panel label="Extras" name="Extras">
+ <button label="Effekt laden" label_selected="Effekt laden" name="PPLoadEffect" />
+ <button label="Effekt speichern" label_selected="Effekt speichern" name="PPSaveEffect" />
+ <line_editor label="Effektname" name="PPEffectNameEditor" />
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preview_classified.xml b/indra/newview/skins/default/xui/de/floater_preview_classified.xml
index caf544a652..2257785fda 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_classified.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="classified_preview" title="Vertrauliche Informationen" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="classified_preview" title="Vertrauliche Informationen" />
diff --git a/indra/newview/skins/default/xui/de/floater_preview_event.xml b/indra/newview/skins/default/xui/de/floater_preview_event.xml
index a0512a3a9a..75e1113eff 100644
--- a/indra/newview/skins/default/xui/de/floater_preview_event.xml
+++ b/indra/newview/skins/default/xui/de/floater_preview_event.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="event_preview" title="Event-Informationen" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="event_preview" title="Event-Informationen" />
diff --git a/indra/newview/skins/default/xui/de/floater_region_info.xml b/indra/newview/skins/default/xui/de/floater_region_info.xml
index fe87232795..4c28c7f5b0 100644
--- a/indra/newview/skins/default/xui/de/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/de/floater_region_info.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="regioninfo" title="Region/Grundstück" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="regioninfo" title="Region/Grundstück" />
diff --git a/indra/newview/skins/default/xui/de/floater_select_key.xml b/indra/newview/skins/default/xui/de/floater_select_key.xml
index d8b2a5d8b4..6094d11359 100644
--- a/indra/newview/skins/default/xui/de/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/de/floater_select_key.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container">
- <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
- <text name="Save item as:">
- Zur Auswahl gewünschte
-Taste drücken.
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container">
+ <button label="Abbrechen" label_selected="Abbrechen" name="Cancel" />
+ <text name="Save item as:">
+ Zur Auswahl gewünschte
+Taste drücken.
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_sell_land.xml b/indra/newview/skins/default/xui/de/floater_sell_land.xml
index 554957c8b0..e16a44f920 100644
--- a/indra/newview/skins/default/xui/de/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_sell_land.xml
@@ -44,15 +44,15 @@ dieser Parzelle:
beschränkt ist.
</text>
<combo_box follows="top|right" height="16" left="72" name="sell_to" bottom_delta="-32" width="140">
- <combo_item name="--selectone--">
+ <combo_box.item name="--selectone--">
-- select one --
- </combo_item>
- <combo_item name="Anyone">
+ </combo_box.item>
+ <combo_box.item name="Anyone">
Jeder
- </combo_item>
- <combo_item name="Specificuser:">
+ </combo_box.item>
+ <combo_box.item name="Specificuser:">
Bestimmter Benutzer:
- </combo_item>
+ </combo_box.item>
</combo_box>
<button label="Auswählen..." name="sell_to_select_agent" />
<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/de/floater_settings_debug.xml b/indra/newview/skins/default/xui/de/floater_settings_debug.xml
index d64b9dccf9..f34fa8a5be 100644
--- a/indra/newview/skins/default/xui/de/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/de/floater_settings_debug.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="settings_debug" title="Debug-Einstellungen">
<combo_box name="boolean_combo">
- <combo_item name="TRUE">
+ <combo_box.item name="TRUE">
WAHR
- </combo_item>
- <combo_item name="FALSE">
+ </combo_box.item>
+ <combo_box.item name="FALSE">
FALSCH
- </combo_item>
+ </combo_box.item>
</combo_box>
<color_swatch label="Farbe" name="color_swatch" />
<spinner label="x" name="val_spinner_1" />
diff --git a/indra/newview/skins/default/xui/de/floater_snapshot.xml b/indra/newview/skins/default/xui/de/floater_snapshot.xml
index c7a366ae87..9b3dd1fc01 100644
--- a/indra/newview/skins/default/xui/de/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/de/floater_snapshot.xml
@@ -21,12 +21,12 @@
<button label="Senden" name="send_btn"/>
<button label="Speichern (L$10)" name="upload_btn"/>
<flyout_button label="Speichern" name="save_btn" tool_tip="Bild als Datei speichern">
- <flyout_button_item name="save_item">
- Speichern
- </flyout_button_item>
- <flyout_button_item name="saveas_item">
- Speichern unter...
- </flyout_button_item>
+ <flyout_button.item name="save_item">
+ Speichern
+ </flyout_button.item>
+ <flyout_button.item name="saveas_item">
+ Speichern unter...
+ </flyout_button.item>
</flyout_button>
<button label="Abbrechen" name="discard_btn"/>
<button label="Mehr >>" name="more_btn" tool_tip="Erweiterte Optionen"/>
@@ -38,75 +38,75 @@
Format
</text>
<combo_box label="Auflösung" name="postcard_size_combo">
- <combo_item name="CurrentWindow">
+ <combo_box.item name="CurrentWindow">
Aktuelles Fenster
- </combo_item>
- <combo_item name="640x480">
+ </combo_box.item>
+ <combo_box.item name="640x480">
640x480
- </combo_item>
- <combo_item name="800x600">
+ </combo_box.item>
+ <combo_box.item name="800x600">
800x600
- </combo_item>
- <combo_item name="1024x768">
+ </combo_box.item>
+ <combo_box.item name="1024x768">
1024x768
- </combo_item>
- <combo_item name="Custom">
+ </combo_box.item>
+ <combo_box.item name="Custom">
Benutzerdefiniert
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="Auflösung" name="texture_size_combo">
- <combo_item name="CurrentWindow">
+ <combo_box.item name="CurrentWindow">
Aktuelles Fenster
- </combo_item>
- <combo_item name="Small(128x128)">
+ </combo_box.item>
+ <combo_box.item name="Small(128x128)">
Klein (128x128)
- </combo_item>
- <combo_item name="Medium(256x256)">
+ </combo_box.item>
+ <combo_box.item name="Medium(256x256)">
Mittel (256x256)
- </combo_item>
- <combo_item name="Large(512x512)">
+ </combo_box.item>
+ <combo_box.item name="Large(512x512)">
Groß (512x512)
- </combo_item>
- <combo_item name="Custom">
+ </combo_box.item>
+ <combo_box.item name="Custom">
Benutzerdefiniert
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="Auflösung" name="local_size_combo">
- <combo_item name="CurrentWindow">
+ <combo_box.item name="CurrentWindow">
Aktuelles Fenster
- </combo_item>
- <combo_item name="320x240">
+ </combo_box.item>
+ <combo_box.item name="320x240">
320x240
- </combo_item>
- <combo_item name="640x480">
+ </combo_box.item>
+ <combo_box.item name="640x480">
640x480
- </combo_item>
- <combo_item name="800x600">
+ </combo_box.item>
+ <combo_box.item name="800x600">
800x600
- </combo_item>
- <combo_item name="1024x768">
+ </combo_box.item>
+ <combo_box.item name="1024x768">
1024x768
- </combo_item>
- <combo_item name="1280x1024">
+ </combo_box.item>
+ <combo_box.item name="1280x1024">
1280x1024
- </combo_item>
- <combo_item name="1600x1200">
+ </combo_box.item>
+ <combo_box.item name="1600x1200">
1600x1200
- </combo_item>
- <combo_item name="Custom">
+ </combo_box.item>
+ <combo_box.item name="Custom">
Benutzerdefiniert
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="Format" name="local_format_combo">
- <combo_item name="PNG">
+ <combo_box.item name="PNG">
PNG
- </combo_item>
- <combo_item name="JPEG">
+ </combo_box.item>
+ <combo_box.item name="JPEG">
JPEG
- </combo_item>
- <combo_item name="BMP">
+ </combo_box.item>
+ <combo_box.item name="BMP">
BMP
- </combo_item>
+ </combo_box.item>
</combo_box>
<spinner label="Breite" name="snapshot_width"/>
<spinner label="Höhe" name="snapshot_height"/>
@@ -116,15 +116,15 @@
Aufnehmen:
</text>
<combo_box label="Bildlayer" name="layer_types" width="132" left="73">
- <combo_item name="Colors">
+ <combo_box.item name="Colors">
Farben
- </combo_item>
- <combo_item name="Depth">
+ </combo_box.item>
+ <combo_box.item name="Depth">
Tiefe
- </combo_item>
- <combo_item name="ObjectMattes">
+ </combo_box.item>
+ <combo_box.item name="ObjectMattes">
Objektmasken
- </combo_item>
+ </combo_box.item>
</combo_box>
<check_box label="Interface auf Foto anzeigen" name="ui_check"/>
<check_box label="HUD-Objekte auf Foto anzeigen" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index b428585f12..f83d57dc6f 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -10,17 +10,23 @@
<text left="170" name="tool label4" width="70" />
<button label="" label_selected="" name="button land" tool_tip="Land" />
<text left="240" name="tool label5" />
- <check_box label="Zoom" name="radio zoom" />
- <check_box label="Orbit (Strg)" name="radio orbit" />
- <check_box label="Schwenken (Strg-Umschalt)" name="radio pan" />
- <check_box label="Verschieben" name="radio move" />
- <check_box label="Heben (Strg)" name="radio lift" />
- <check_box label="Rotieren (Strg-Umschalt)" name="radio spin" />
- <check_box label="Position" name="radio position" />
- <check_box label="Drehen (Strg)" name="radio rotate" />
- <check_box label="Dehnen (Strg-Umschalt)" name="radio stretch" />
- <check_box label="Textur auswählen" name="radio select face" />
- <check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts" />
+ <radio_group name="focus_radio_group">
+ <radio_item label="Zoom" name="radio zoom" />
+ <radio_item label="Orbit (Strg)" name="radio orbit" />
+ <radio_item label="Schwenken (Strg-Umschalt)" name="radio pan" />
+ </radio_group>
+ <radio_group name="move_radio_group">
+ <radio_item label="Verschieben" name="radio move" />
+ <radio_item label="Heben (Strg)" name="radio lift" />
+ <radio_item label="Rotieren (Strg-Umschalt)" name="radio spin" />
+ </radio_group>
+ <radio_group name="edit_radio_group">
+ <radio_item label="Position" name="radio position" />
+ <radio_item label="Drehen (Strg)" name="radio rotate" />
+ <radio_item label="Dehnen (Strg-Umschalt)" name="radio stretch" />
+ <radio_item label="Textur auswählen" name="radio select face" />
+ </radio_group>
+ <check_box label="Verknüpfte Teile bearbeiten" name="checkbox edit linked parts" />
<check_box label="Raster verwenden" name="checkbox snap to grid" />
<button label="Optionen..." label_selected="Optionen..." name="Options..." />
<check_box label="Beide Seiten dehnen" name="checkbox uniform" />
@@ -32,15 +38,15 @@
Zum Verschieben ziehen, zum Kopieren Umschalttaste-Ziehen
</text>
<combo_box name="combobox grid mode">
- <combo_item name="World">
+ <combo_box.item name="World">
Welt
- </combo_item>
- <combo_item name="Local">
+ </combo_box.item>
+ <combo_box.item name="Local">
Lokal
- </combo_item>
- <combo_item name="Reference">
+ </combo_box.item>
+ <combo_box.item name="Reference">
Referenz
- </combo_item>
+ </combo_box.item>
</combo_box>
<button label="" label_selected="" name="ToolCube" tool_tip="Würfel" />
<button label="" label_selected="" name="ToolPrism" tool_tip="Prisma" />
@@ -61,23 +67,26 @@
<check_box label="Tool ausgewählt lassen" name="checkbox sticky" />
<check_box label="Kopie zentrieren" name="checkbox copy centers" />
<check_box label="Kopie drehen" name="checkbox copy rotates" />
- <check_box label="Land auswählen" name="radio select land" />
- <check_box label="Land einebnen" name="radio flatten" />
- <check_box label="Land anheben" name="radio raise" />
- <check_box label="Land absenken" name="radio lower" />
- <check_box label="Land glätten" name="radio smooth" />
- <check_box label="Land rau machen" name="radio noise" />
- <check_box label="Land zurückführen" name="radio revert" />
+
+ <radio_group name="land_radio_group">
+ <radio_item label="Land auswählen" name="radio select land" />
+ <radio_item label="Land einebnen" name="radio flatten" />
+ <radio_item label="Land anheben" name="radio raise" />
+ <radio_item label="Land absenken" name="radio lower" />
+ <radio_item label="Land glätten" name="radio smooth" />
+ <radio_item label="Land rau machen" name="radio noise" />
+ <radio_item label="Land zurückführen" name="radio revert" />
+ </radio_group>
<combo_box name="combobox brush size">
- <combo_item name="Small">
+ <combo_box.item name="Small">
Klein
- </combo_item>
- <combo_item name="Medium">
+ </combo_box.item>
+ <combo_box.item name="Medium">
Mittel
- </combo_item>
- <combo_item name="Large">
+ </combo_box.item>
+ <combo_box.item name="Large">
Groß
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="Strength:">
Stärke:
@@ -169,27 +178,27 @@
Bei Linksklicken:
</text>
<combo_box name="clickaction" width="178">
- <combo_item name="Touch/grab(default)">
+ <combo_box.item name="Touch/grab(default)">
Berühren/Greifen (Standard)
- </combo_item>
- <combo_item name="Sitonobject">
+ </combo_box.item>
+ <combo_box.item name="Sitonobject">
Auf Objekt sitzen
- </combo_item>
- <combo_item name="Buyobject">
+ </combo_box.item>
+ <combo_box.item name="Buyobject">
Objekt kaufen
- </combo_item>
- <combo_item name="Payobject">
+ </combo_box.item>
+ <combo_box.item name="Payobject">
Objekt bezahlen
- </combo_item>
- <combo_item name="Open">
+ </combo_box.item>
+ <combo_box.item name="Open">
Öffnen
- </combo_item>
- <combo_item name="Play">
+ </combo_box.item>
+ <combo_box.item name="Play">
Parzellenmedien wiedergeben
- </combo_item>
- <combo_item name="Opemmedia">
+ </combo_box.item>
+ <combo_box.item name="Opemmedia">
Parzellenmedien öffnen
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="B:">
B:
@@ -277,56 +286,56 @@
Material
</text>
<combo_box name="material">
- <combo_item name="Stone">
+ <combo_box.item name="Stone">
Stein
- </combo_item>
- <combo_item name="Metal">
+ </combo_box.item>
+ <combo_box.item name="Metal">
Metall
- </combo_item>
- <combo_item name="Glass">
+ </combo_box.item>
+ <combo_box.item name="Glass">
Glas
- </combo_item>
- <combo_item name="Wood">
+ </combo_box.item>
+ <combo_box.item name="Wood">
Holz
- </combo_item>
- <combo_item name="Flesh">
+ </combo_box.item>
+ <combo_box.item name="Flesh">
Fleisch
- </combo_item>
- <combo_item name="Plastic">
+ </combo_box.item>
+ <combo_box.item name="Plastic">
Kunststoff
- </combo_item>
- <combo_item name="Rubber">
+ </combo_box.item>
+ <combo_box.item name="Rubber">
Gummi
- </combo_item>
+ </combo_box.item>
</combo_box>
<text left="115" name="label basetype">
Bausteintyp
</text>
<combo_box left="115" name="comboBaseType">
- <combo_item name="Box">
+ <combo_box.item name="Box">
Quader
- </combo_item>
- <combo_item name="Cylinder">
+ </combo_box.item>
+ <combo_box.item name="Cylinder">
Zylinder
- </combo_item>
- <combo_item name="Prism">
+ </combo_box.item>
+ <combo_box.item name="Prism">
Prisma
- </combo_item>
- <combo_item name="Sphere">
+ </combo_box.item>
+ <combo_box.item name="Sphere">
Kugel
- </combo_item>
- <combo_item name="Torus">
+ </combo_box.item>
+ <combo_box.item name="Torus">
Torus
- </combo_item>
- <combo_item name="Tube">
+ </combo_box.item>
+ <combo_box.item name="Tube">
Rohr
- </combo_item>
- <combo_item name="Ring">
+ </combo_box.item>
+ <combo_box.item name="Ring">
Ring
- </combo_item>
- <combo_item name="Sculpted">
+ </combo_box.item>
+ <combo_box.item name="Sculpted">
Geformt
- </combo_item>
+ </combo_box.item>
</combo_box>
<text left="115" name="text cut" width="146">
Pfadschnitt Beginn und Ende
@@ -345,18 +354,18 @@
Hohlform
</text>
<combo_box left="115" name="hole">
- <combo_item name="Default">
+ <combo_box.item name="Default">
Standard
- </combo_item>
- <combo_item name="Circle">
+ </combo_box.item>
+ <combo_box.item name="Circle">
Kreis
- </combo_item>
- <combo_item name="Square">
+ </combo_box.item>
+ <combo_box.item name="Square">
Quadrat
- </combo_item>
- <combo_item name="Triangle">
+ </combo_box.item>
+ <combo_box.item name="Triangle">
Dreieck
- </combo_item>
+ </combo_box.item>
</combo_box>
<text left="115" name="text twist">
Torsion
@@ -406,21 +415,21 @@
Naht
</text>
<combo_box name="sculpt type control">
- <combo_item name="None">
+ <combo_box.item name="None">
(keiner)
- </combo_item>
- <combo_item name="Sphere">
+ </combo_box.item>
+ <combo_box.item name="Sphere">
Kugel
- </combo_item>
- <combo_item name="Torus">
+ </combo_box.item>
+ <combo_box.item name="Torus">
Torus
- </combo_item>
- <combo_item name="Plane">
+ </combo_box.item>
+ <combo_box.item name="Plane">
Fläche
- </combo_item>
- <combo_item name="Cylinder">
+ </combo_box.item>
+ <combo_box.item name="Cylinder">
Zylinder
- </combo_item>
+ </combo_box.item>
</combo_box>
</panel>
<panel label="Eigenschaften" name="Features">
@@ -465,88 +474,88 @@
Zuordnung
</text>
<combo_box name="combobox texgen">
- <combo_item name="Default">
+ <combo_box.item name="Default">
Standard
- </combo_item>
- <combo_item name="Planar">
+ </combo_box.item>
+ <combo_box.item name="Planar">
Eben
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="label shininess">
Glanz
</text>
<combo_box name="combobox shininess">
- <combo_item name="None">
+ <combo_box.item name="None">
Kein
- </combo_item>
- <combo_item name="Low">
+ </combo_box.item>
+ <combo_box.item name="Low">
Niedrig
- </combo_item>
- <combo_item name="Medium">
+ </combo_box.item>
+ <combo_box.item name="Medium">
Mittel
- </combo_item>
- <combo_item name="High">
+ </combo_box.item>
+ <combo_box.item name="High">
Hoch
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="label bumpiness">
Holprigkeit
</text>
<combo_box name="combobox bumpiness">
- <combo_item name="None">
+ <combo_box.item name="None">
Keine
- </combo_item>
- <combo_item name="Brightness">
+ </combo_box.item>
+ <combo_box.item name="Brightness">
Helligkeit
- </combo_item>
- <combo_item name="Darkness">
+ </combo_box.item>
+ <combo_box.item name="Darkness">
Dunkelheit
- </combo_item>
- <combo_item name="woodgrain">
+ </combo_box.item>
+ <combo_box.item name="woodgrain">
Holzmaserung
- </combo_item>
- <combo_item name="bark">
+ </combo_box.item>
+ <combo_box.item name="bark">
Rinde
- </combo_item>
- <combo_item name="bricks">
+ </combo_box.item>
+ <combo_box.item name="bricks">
Ziegel
- </combo_item>
- <combo_item name="checker">
+ </combo_box.item>
+ <combo_box.item name="checker">
Karo
- </combo_item>
- <combo_item name="concrete">
+ </combo_box.item>
+ <combo_box.item name="concrete">
Beton
- </combo_item>
- <combo_item name="crustytile">
+ </combo_box.item>
+ <combo_box.item name="crustytile">
verkrustete Fliesen
- </combo_item>
- <combo_item name="cutstone">
+ </combo_box.item>
+ <combo_box.item name="cutstone">
Steinplatten
- </combo_item>
- <combo_item name="discs">
+ </combo_box.item>
+ <combo_box.item name="discs">
Scheiben
- </combo_item>
- <combo_item name="gravel">
+ </combo_box.item>
+ <combo_box.item name="gravel">
Kies
- </combo_item>
- <combo_item name="petridish">
+ </combo_box.item>
+ <combo_box.item name="petridish">
Petrischale
- </combo_item>
- <combo_item name="siding">
+ </combo_box.item>
+ <combo_box.item name="siding">
Verkleidung
- </combo_item>
- <combo_item name="stonetile">
+ </combo_box.item>
+ <combo_box.item name="stonetile">
Steinfliesen
- </combo_item>
- <combo_item name="stucco">
+ </combo_box.item>
+ <combo_box.item name="stucco">
Stuck
- </combo_item>
- <combo_item name="suction">
+ </combo_box.item>
+ <combo_box.item name="suction">
Saugen
- </combo_item>
- <combo_item name="weave">
+ </combo_box.item>
+ <combo_box.item name="weave">
gewoben
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="tex scale">
Wiederholungen
diff --git a/indra/newview/skins/default/xui/de/floater_url_entry.xml b/indra/newview/skins/default/xui/de/floater_url_entry.xml
index c230d9c6c3..392d53a33d 100644
--- a/indra/newview/skins/default/xui/de/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/de/floater_url_entry.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="url_entry">
- <text name="media_label">
- Medien-URL:
- </text>
- <button label="OK" name="ok_btn" />
- <button label="Abbrechen" name="cancel_btn" width="75" />
- <button label="Löschen" name="clear_btn" />
- <text name="loading_label">
- Wird geladen...
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="url_entry">
+ <text name="media_label">
+ Medien-URL:
+ </text>
+ <button label="OK" name="ok_btn" />
+ <button label="Abbrechen" name="cancel_btn" width="75" />
+ <button label="Löschen" name="clear_btn" />
+ <text name="loading_label">
+ Wird geladen...
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_water.xml b/indra/newview/skins/default/xui/de/floater_water.xml
index d8ec1a2fa5..95b469434a 100644
--- a/indra/newview/skins/default/xui/de/floater_water.xml
+++ b/indra/newview/skins/default/xui/de/floater_water.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Water Floater" title="Erweiterter Wasser-Editor">
- <text name="KeyFramePresetsText">
- Voreinstellungen:
- </text>
- <button label="Neu" label_selected="Neu" name="WaterNewPreset" />
- <button label="Speichern" label_selected="Speichern" name="WaterSavePreset" />
- <button label="Löschen" label_selected="Löschen" name="WaterDeletePreset" />
- <tab_container name="Water Tabs">
- <panel label="Einstellungen" name="Settings">
- <text name="BHText">
- Wassertrübungsfarbe
- </text>
- <button label=" ?" name="WaterFogColorHelp" left="175" />
- <color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
- <text name="WaterFogDensText">
- Wassertrübungsdichte
- </text>
- <button label=" ?" name="WaterFogDensityHelp" left="175" />
- <text name="WaterUnderWaterFogModText">
- Wassertrübungs-Modifikator
- </text>
- <button label=" ?" name="WaterUnderWaterFogModHelp" left="175" />
- <slider bottom_delta="-34" name="WaterUnderWaterFogMod" />
- <text name="BDensText">
- Reflexionswellengröße
- </text>
- <button label=" ?" name="WaterNormalScaleHelp" />
- <text name="BHText2">
- 1
- </text>
- <text name="BHText3">
- 2
- </text>
- <text name="BHText4">
- 3
- </text>
- <text name="HDText">
- Fresnel-Skalierung
- </text>
- <button label=" ?" name="WaterFresnelScaleHelp" />
- <text name="FresnelOffsetText">
- Fresnel-Versatz
- </text>
- <button label=" ?" name="WaterFresnelOffsetHelp" />
- <text name="DensMultText">
- Brechungsstärke oben
- </text>
- <button label=" ?" name="WaterScaleAboveHelp" />
- <text name="WaterScaleBelowText">
- Brechungsstärke unten
- </text>
- <button label=" ?" name="WaterScaleBelowHelp" />
- <text name="MaxAltText">
- Mischungsmultiplikator
- </text>
- <button label=" ?" name="WaterBlurMultiplierHelp" />
- </panel>
- <panel label="Bild" name="Waves">
- <text name="BHText">
- Richtung große Welle
- </text>
- <button label=" ?" name="WaterWave1Help" />
- <text name="WaterWave1DirXText">
- X
- </text>
- <text name="WaterWave1DirYText">
- Y
- </text>
- <text name="BHText2">
- Richtung kleine Welle
- </text>
- <button label=" ?" name="WaterWave2Help" />
- <text name="WaterWave2DirXText">
- X
- </text>
- <text name="WaterWave2DirYText">
- Y
- </text>
- <text name="BHText3">
- Normal-Map
- </text>
- <button label=" ?" name="WaterNormalMapHelp" />
- </panel>
- </tab_container>
- <string name="WLDefaultWaterNames">
- Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Water Floater" title="Erweiterter Wasser-Editor">
+ <text name="KeyFramePresetsText">
+ Voreinstellungen:
+ </text>
+ <button label="Neu" label_selected="Neu" name="WaterNewPreset" />
+ <button label="Speichern" label_selected="Speichern" name="WaterSavePreset" />
+ <button label="Löschen" label_selected="Löschen" name="WaterDeletePreset" />
+ <tab_container name="Water Tabs">
+ <panel label="Einstellungen" name="Settings">
+ <text name="BHText">
+ Wassertrübungsfarbe
+ </text>
+ <button label=" ?" name="WaterFogColorHelp" left="175" />
+ <color_swatch name="WaterFogColor" tool_tip="Klicken Sie hier, um die Farbauswahl zu öffnen" />
+ <text name="WaterFogDensText">
+ Wassertrübungsdichte
+ </text>
+ <button label=" ?" name="WaterFogDensityHelp" left="175" />
+ <text name="WaterUnderWaterFogModText">
+ Wassertrübungs-Modifikator
+ </text>
+ <button label=" ?" name="WaterUnderWaterFogModHelp" left="175" />
+ <slider bottom_delta="-34" name="WaterUnderWaterFogMod" />
+ <text name="BDensText">
+ Reflexionswellengröße
+ </text>
+ <button label=" ?" name="WaterNormalScaleHelp" />
+ <text name="BHText2">
+ 1
+ </text>
+ <text name="BHText3">
+ 2
+ </text>
+ <text name="BHText4">
+ 3
+ </text>
+ <text name="HDText">
+ Fresnel-Skalierung
+ </text>
+ <button label=" ?" name="WaterFresnelScaleHelp" />
+ <text name="FresnelOffsetText">
+ Fresnel-Versatz
+ </text>
+ <button label=" ?" name="WaterFresnelOffsetHelp" />
+ <text name="DensMultText">
+ Brechungsstärke oben
+ </text>
+ <button label=" ?" name="WaterScaleAboveHelp" />
+ <text name="WaterScaleBelowText">
+ Brechungsstärke unten
+ </text>
+ <button label=" ?" name="WaterScaleBelowHelp" />
+ <text name="MaxAltText">
+ Mischungsmultiplikator
+ </text>
+ <button label=" ?" name="WaterBlurMultiplierHelp" />
+ </panel>
+ <panel label="Bild" name="Waves">
+ <text name="BHText">
+ Richtung große Welle
+ </text>
+ <button label=" ?" name="WaterWave1Help" />
+ <text name="WaterWave1DirXText">
+ X
+ </text>
+ <text name="WaterWave1DirYText">
+ Y
+ </text>
+ <text name="BHText2">
+ Richtung kleine Welle
+ </text>
+ <button label=" ?" name="WaterWave2Help" />
+ <text name="WaterWave2DirXText">
+ X
+ </text>
+ <text name="WaterWave2DirYText">
+ Y
+ </text>
+ <text name="BHText3">
+ Normal-Map
+ </text>
+ <button label=" ?" name="WaterNormalMapHelp" />
+ </panel>
+ </tab_container>
+ <string name="WLDefaultWaterNames">
+ Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_windlight_options.xml b/indra/newview/skins/default/xui/de/floater_windlight_options.xml
index b8751262fb..8df412dab6 100644
--- a/indra/newview/skins/default/xui/de/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/de/floater_windlight_options.xml
@@ -1,190 +1,190 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="WindLight floater" title="Erweiterter Himmel-Editor">
- <text name="KeyFramePresetsText">
- Voreinstellungen:
- </text>
- <button label="Neu" label_selected="Neu" name="WLNewPreset" />
- <button label="Speichern" label_selected="Speichern" name="WLSavePreset" />
- <button label="Löschen" label_selected="Löschen" name="WLDeletePreset" />
- <button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor"
- name="WLDayCycleMenuButton" />
- <tab_container name="WindLight Tabs">
- <panel label="Atmosphäre" name="Atmosphere">
- <text name="BHText">
- Horizontfarbe
- </text>
- <button label=" ?" name="WLBlueHorizonHelp" />
- <text name="BHText2">
- R
- </text>
- <text name="BHText3">
- G
- </text>
- <text name="BHText4">
- B
- </text>
- <text name="BHText5">
- I
- </text>
- <text name="BDensText">
- Horizonttrübung
- </text>
- <button label=" ?" name="WLHazeHorizonHelp" />
- <text name="BDensText2">
- Farbintensität
- </text>
- <button label=" ?" name="WLBlueDensityHelp" />
- <text name="BHText6">
- R
- </text>
- <text name="BHText7">
- G
- </text>
- <text name="BHText8">
- B
- </text>
- <text name="BHText9">
- I
- </text>
- <text name="HDText">
- Trübungsintensität
- </text>
- <button label=" ?" name="WLHazeDensityHelp" />
- <text name="DensMultText">
- Dichtemultiplikator
- </text>
- <button label=" ?" name="WLDensityMultHelp" />
- <text name="WLDistanceMultText">
- Entfernungsmultiplikator
- </text>
- <button label=" ?" name="WLDistanceMultHelp" />
- <text name="MaxAltText">
- Max. Höhe
- </text>
- <button label=" ?" name="WLMaxAltitudeHelp" />
- </panel>
- <panel label="Licht" name="Lighting">
- <text name="SLCText">
- Sonne/Mond-Farbe
- </text>
- <button label=" ?" name="WLSunlightColorHelp" />
- <text name="BHText">
- R
- </text>
- <text name="BHText2">
- G
- </text>
- <text name="BHText3">
- B
- </text>
- <text name="BHText4">
- I
- </text>
- <text name="TODText">
- Sonne/Mond-Stand
- </text>
- <button label=" ?" name="WLTimeOfDayHelp" />
- <text name="WLAmbientText">
- Umgebung
- </text>
- <button label=" ?" name="WLAmbientHelp" />
- <text name="BHText5">
- R
- </text>
- <text name="BHText6">
- G
- </text>
- <text name="BHText7">
- B
- </text>
- <text name="BHText8">
- I
- </text>
- <text name="WLEastAngleText">
- Ostausrichtung
- </text>
- <button label=" ?" name="WLEastAngleHelp" />
- <text name="SunGlowText">
- Sonnenleuchtkraft
- </text>
- <button label=" ?" name="WLSunGlowHelp" />
- <slider label="Fokus " name="WLGlowB" />
- <slider label="Größe " name="WLGlowR" />
- <text name="SceneGammaText">
- Gamma in Szene
- </text>
- <button label=" ?" name="WLSceneGammaHelp" />
- <text name="WLStarText">
- Sternenleuchtkraft
- </text>
- <button label=" ?" name="WLStarBrightnessHelp" />
- </panel>
- <panel label="Wolken" name="Clouds">
- <text name="WLCloudColorText">
- Wolkenfarbe
- </text>
- <button label=" ?" name="WLCloudColorHelp" />
- <text name="BHText">
- R
- </text>
- <text name="BHText2">
- G
- </text>
- <text name="BHText3">
- B
- </text>
- <text name="BHText4">
- I
- </text>
- <text name="WLCloudColorText2">
- Wolken-XY/Dichte
- </text>
- <button label=" ?" name="WLCloudDensityHelp" />
- <text name="BHText5">
- X
- </text>
- <text name="BHText6">
- Y
- </text>
- <text name="BHText7">
- D
- </text>
- <text name="WLCloudCoverageText">
- Wolkendichte
- </text>
- <button label=" ?" name="WLCloudCoverageHelp" />
- <text name="WLCloudScaleText">
- Wolkenskalierung
- </text>
- <button label=" ?" name="WLCloudScaleHelp" />
- <text name="WLCloudDetailText">
- Wolkendetails (XY/Dichte)
- </text>
- <button label=" ?" name="WLCloudDetailHelp" />
- <text name="BHText8">
- X
- </text>
- <text name="BHText9">
- Y
- </text>
- <text name="BHText10">
- D
- </text>
- <text name="WLCloudScrollXText">
- Wolkenbewegung X
- </text>
- <button label=" ?" name="WLCloudScrollXHelp" />
- <check_box label="Fest" name="WLCloudLockX" />
- <text name="WLCloudScrollYText">
- Wolkenbewegung Y
- </text>
- <button label=" ?" name="WLCloudScrollYHelp" />
- <check_box label="Fest" name="WLCloudLockY" />
- <check_box label="Klassische Wolken" name="DrawClassicClouds" />
- <button label=" ?" name="WLClassicCloudsHelp" />
- </panel>
- </tab_container>
- <string name="WLDefaultSkyNames">
- A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="WindLight floater" title="Erweiterter Himmel-Editor">
+ <text name="KeyFramePresetsText">
+ Voreinstellungen:
+ </text>
+ <button label="Neu" label_selected="Neu" name="WLNewPreset" />
+ <button label="Speichern" label_selected="Speichern" name="WLSavePreset" />
+ <button label="Löschen" label_selected="Löschen" name="WLDeletePreset" />
+ <button label="Tageszyklus-Editor" label_selected="Tageszyklus-Editor"
+ name="WLDayCycleMenuButton" />
+ <tab_container name="WindLight Tabs">
+ <panel label="Atmosphäre" name="Atmosphere">
+ <text name="BHText">
+ Horizontfarbe
+ </text>
+ <button label=" ?" name="WLBlueHorizonHelp" />
+ <text name="BHText2">
+ R
+ </text>
+ <text name="BHText3">
+ G
+ </text>
+ <text name="BHText4">
+ B
+ </text>
+ <text name="BHText5">
+ I
+ </text>
+ <text name="BDensText">
+ Horizonttrübung
+ </text>
+ <button label=" ?" name="WLHazeHorizonHelp" />
+ <text name="BDensText2">
+ Farbintensität
+ </text>
+ <button label=" ?" name="WLBlueDensityHelp" />
+ <text name="BHText6">
+ R
+ </text>
+ <text name="BHText7">
+ G
+ </text>
+ <text name="BHText8">
+ B
+ </text>
+ <text name="BHText9">
+ I
+ </text>
+ <text name="HDText">
+ Trübungsintensität
+ </text>
+ <button label=" ?" name="WLHazeDensityHelp" />
+ <text name="DensMultText">
+ Dichtemultiplikator
+ </text>
+ <button label=" ?" name="WLDensityMultHelp" />
+ <text name="WLDistanceMultText">
+ Entfernungsmultiplikator
+ </text>
+ <button label=" ?" name="WLDistanceMultHelp" />
+ <text name="MaxAltText">
+ Max. Höhe
+ </text>
+ <button label=" ?" name="WLMaxAltitudeHelp" />
+ </panel>
+ <panel label="Licht" name="Lighting">
+ <text name="SLCText">
+ Sonne/Mond-Farbe
+ </text>
+ <button label=" ?" name="WLSunlightColorHelp" />
+ <text name="BHText">
+ R
+ </text>
+ <text name="BHText2">
+ G
+ </text>
+ <text name="BHText3">
+ B
+ </text>
+ <text name="BHText4">
+ I
+ </text>
+ <text name="TODText">
+ Sonne/Mond-Stand
+ </text>
+ <button label=" ?" name="WLTimeOfDayHelp" />
+ <text name="WLAmbientText">
+ Umgebung
+ </text>
+ <button label=" ?" name="WLAmbientHelp" />
+ <text name="BHText5">
+ R
+ </text>
+ <text name="BHText6">
+ G
+ </text>
+ <text name="BHText7">
+ B
+ </text>
+ <text name="BHText8">
+ I
+ </text>
+ <text name="WLEastAngleText">
+ Ostausrichtung
+ </text>
+ <button label=" ?" name="WLEastAngleHelp" />
+ <text name="SunGlowText">
+ Sonnenleuchtkraft
+ </text>
+ <button label=" ?" name="WLSunGlowHelp" />
+ <slider label="Fokus " name="WLGlowB" />
+ <slider label="Größe " name="WLGlowR" />
+ <text name="SceneGammaText">
+ Gamma in Szene
+ </text>
+ <button label=" ?" name="WLSceneGammaHelp" />
+ <text name="WLStarText">
+ Sternenleuchtkraft
+ </text>
+ <button label=" ?" name="WLStarBrightnessHelp" />
+ </panel>
+ <panel label="Wolken" name="Clouds">
+ <text name="WLCloudColorText">
+ Wolkenfarbe
+ </text>
+ <button label=" ?" name="WLCloudColorHelp" />
+ <text name="BHText">
+ R
+ </text>
+ <text name="BHText2">
+ G
+ </text>
+ <text name="BHText3">
+ B
+ </text>
+ <text name="BHText4">
+ I
+ </text>
+ <text name="WLCloudColorText2">
+ Wolken-XY/Dichte
+ </text>
+ <button label=" ?" name="WLCloudDensityHelp" />
+ <text name="BHText5">
+ X
+ </text>
+ <text name="BHText6">
+ Y
+ </text>
+ <text name="BHText7">
+ D
+ </text>
+ <text name="WLCloudCoverageText">
+ Wolkendichte
+ </text>
+ <button label=" ?" name="WLCloudCoverageHelp" />
+ <text name="WLCloudScaleText">
+ Wolkenskalierung
+ </text>
+ <button label=" ?" name="WLCloudScaleHelp" />
+ <text name="WLCloudDetailText">
+ Wolkendetails (XY/Dichte)
+ </text>
+ <button label=" ?" name="WLCloudDetailHelp" />
+ <text name="BHText8">
+ X
+ </text>
+ <text name="BHText9">
+ Y
+ </text>
+ <text name="BHText10">
+ D
+ </text>
+ <text name="WLCloudScrollXText">
+ Wolkenbewegung X
+ </text>
+ <button label=" ?" name="WLCloudScrollXHelp" />
+ <check_box label="Fest" name="WLCloudLockX" />
+ <text name="WLCloudScrollYText">
+ Wolkenbewegung Y
+ </text>
+ <button label=" ?" name="WLCloudScrollYHelp" />
+ <check_box label="Fest" name="WLCloudLockY" />
+ <check_box label="Klassische Wolken" name="DrawClassicClouds" />
+ <button label=" ?" name="WLClassicCloudsHelp" />
+ </panel>
+ </tab_container>
+ <string name="WLDefaultSkyNames">
+ A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml
index 44d5dd0496..b937fdda01 100644
--- a/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_world_map.xml
@@ -42,14 +42,14 @@
<check_box label=" " name="event_mature_chk"/>
<combo_box label="Online-Freunde" name="friend combo" tool_tip="Freund, der auf Karte angezeigt werden soll">
- <combo_item name="none_selected">
+ <combo_box.item name="none_selected">
Online-Freunde
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="Landmarken" name="landmark combo" tool_tip="Landmarke, die auf Karte angezeigt werden soll">
- <combo_item name="none_selected">
+ <combo_box.item name="none_selected">
Landmarken
- </combo_item>
+ </combo_box.item>
</combo_box>
<line_editor label="Nach Regionsname suchen" name="location" tool_tip="Geben Sie den Namen einer Region ein"/>
<button label="Suchen" name="DoSearch" tool_tip="Nach einer Region suchen"/>
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index 86629638e7..29330d894a 100644
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar name="Login Menu">
- <menu label="Datei" name="File">
- <menu_item_call label="Beenden" name="Quit" />
- </menu>
- <menu label="Bearbeiten" name="Edit">
- <menu_item_call label="Einstellungen..." name="Preferences..." />
- </menu>
- <menu label="Hilfe" name="Help">
- <menu_item_call label="Hilfe zu Second Life" name="Second Life Help" />
- <menu_item_call label="Ãœber Second Life..." name="About Second Life..." />
- </menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar name="Login Menu">
+ <menu label="Datei" name="File">
+ <menu_item_call label="Beenden" name="Quit" />
+ </menu>
+ <menu label="Bearbeiten" name="Edit">
+ <menu_item_call label="Einstellungen..." name="Preferences..." />
+ </menu>
+ <menu label="Hilfe" name="Help">
+ <menu_item_call label="Hilfe zu Second Life" name="Second Life Help" />
+ <menu_item_call label="Ãœber Second Life..." name="About Second Life..." />
+ </menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/de/menu_slurl.xml b/indra/newview/skins/default/xui/de/menu_slurl.xml
index 13b91b533b..d9793e5906 100644
--- a/indra/newview/skins/default/xui/de/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/de/menu_slurl.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="Popup">
- <menu_item_call label="URL-Info" name="about_url" />
- <menu_item_call label="Zu URL teleportieren" name="teleport_to_url" />
- <menu_item_call label="Auf Karte" name="show_on_map" />
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="Popup">
+ <menu_item_call label="URL-Info" name="about_url" />
+ <menu_item_call label="Zu URL teleportieren" name="teleport_to_url" />
+ <menu_item_call label="Auf Karte" name="show_on_map" />
+</menu>
diff --git a/indra/newview/skins/default/xui/de/mime_types.xml b/indra/newview/skins/default/xui/de/mime_types.xml
index 5384559446..e01649e911 100644
--- a/indra/newview/skins/default/xui/de/mime_types.xml
+++ b/indra/newview/skins/default/xui/de/mime_types.xml
@@ -1,230 +1,230 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<mimetypes name="default">
- <widgetset name="web">
- <label name="web_label">
- Webinhalt
- </label>
- <tooltip name="web_tooltip">
- Dieser Ort verfügt über Webinhalte
- </tooltip>
- <playtip name="web_playtip">
- Webinhalt anzeigen
- </playtip>
- </widgetset>
- <widgetset name="movie">
- <label name="movie_label">
- Video
- </label>
- <tooltip name="movie_tooltip">
- Ein Video wurde gefunden.
- </tooltip>
- <playtip name="movie_playtip">
- Video wiedergeben
- </playtip>
- </widgetset>
- <widgetset name="none">
- <label name="none_label">
- Keine Inhalte
- </label>
- <tooltip name="none_tooltip">
- Keine Medien gefunden
- </tooltip>
- </widgetset>
- <widgetset name="image">
- <label name="image_label">
- Bild
- </label>
- <tooltip name="image_tooltip">
- Dieser Ort verfügt über Bildinhalte
- </tooltip>
- <playtip name="image_playtip">
- Das Bild an diesem Ort anzeigen
- </playtip>
- </widgetset>
- <widgetset name="audio">
- <label name="audio_label">
- Audio
- </label>
- <tooltip name="audio_tooltip">
- Dieser Ort verfügt über Audioinhalte
- </tooltip>
- <playtip name="audio_playtip">
- Audio an diesem Ort wiedergeben
- </playtip>
- </widgetset>
- <scheme name="rtsp">
- <label name="rtsp_label">
- Echtzeit-Streaming
- </label>
- </scheme>
- <mimetype name="blank">
- <label name="blank_label">
- - Keine -
- </label>
- </mimetype>
- <mimetype name="none/none">
- <label name="none/none_label">
- - Keine -
- </label>
- </mimetype>
- <mimetype name="audio/*">
- <label name="audio2_label">
- Audio
- </label>
- </mimetype>
- <mimetype name="video/*">
- <label name="video2_label">
- Video
- </label>
- </mimetype>
- <mimetype name="image/*">
- <label name="image2_label">
- Bild
- </label>
- </mimetype>
- <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
- <label name="vnd.secondlife.qt.legacy_label">
- Video (QuickTime)
- </label>
- </mimetype>
- <mimetype name="application/javascript">
- <label name="application/javascript_label">
- Javascript
- </label>
- </mimetype>
- <mimetype name="application/ogg">
- <label name="application/ogg_label">
- Ogg Audio/Video
- </label>
- </mimetype>
- <mimetype name="application/pdf">
- <label name="application/pdf_label">
- PDF-Dokument
- </label>
- </mimetype>
- <mimetype name="application/postscript">
- <label name="application/postscript_label">
- Postscript-Dokument
- </label>
- </mimetype>
- <mimetype name="application/rtf">
- <label name="application/rtf_label">
- Rich Text (RTF)
- </label>
- </mimetype>
- <mimetype name="application/smil">
- <label name="application/smil_label">
- Synchronized Multimedia Integration Language (SMIL)
- </label>
- </mimetype>
- <mimetype name="application/xhtml+xml">
- <label name="application/xhtml+xml_label">
- Webseite (XHTML)
- </label>
- </mimetype>
- <mimetype name="application/x-director">
- <label name="application/x-director_label">
- Macromedia Director
- </label>
- </mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- </mimetype>
- <mimetype name="audio/mid">
- <label name="audio/mid_label">
- Audio (MIDI)
- </label>
- </mimetype>
- <mimetype name="audio/mpeg">
- <label name="audio/mpeg_label">
- Audio (MP3)
- </label>
- </mimetype>
- <mimetype name="audio/x-aiff">
- <label name="audio/x-aiff_label">
- Audio (AIFF)
- </label>
- </mimetype>
- <mimetype name="audio/x-wav">
- <label name="audio/x-wav_label">
- Audio (WAV)
- </label>
- </mimetype>
- <mimetype menu="1" name="image/bmp">
- <label name="image/bmp_label">
- Bild (BMP)
- </label>
- </mimetype>
- <mimetype menu="1" name="image/gif">
- <label name="image/gif_label">
- Bild (GIF)
- </label>
- </mimetype>
- <mimetype menu="1" name="image/jpeg">
- <label name="image/jpeg_label">
- Bild (JPEG)
- </label>
- </mimetype>
- <mimetype menu="1" name="image/png">
- <label name="image/png_label">
- Bild (PNG)
- </label>
- </mimetype>
- <mimetype name="image/svg+xml">
- <label name="image/svg+xml_label">
- Bild (SVG)
- </label>
- </mimetype>
- <mimetype menu="1" name="image/tiff">
- <label name="image/tiff_label">
- Bild (TIFF)
- </label>
- </mimetype>
- <mimetype menu="1" name="text/html">
- <label name="text/html_label">
- Webseite
- </label>
- </mimetype>
- <mimetype menu="1" name="text/plain">
- <label name="text/plain_label">
- Text
- </label>
- </mimetype>
- <mimetype name="text/xml">
- <label name="text/xml_label">
- XML
- </label>
- </mimetype>
- <mimetype menu="1" name="video/mpeg">
- <label name="video/mpeg_label">
- Video (MPEG)
- </label>
- </mimetype>
- <mimetype name="video/mp4">
- <label name="video/mp4_label">
- Video (MP4)
- </label>
- </mimetype>
- <mimetype menu="1" name="video/quicktime">
- <label name="video/quicktime_label">
- Video (QuickTime)
- </label>
- </mimetype>
- <mimetype name="video/x-ms-asf">
- <label name="video/x-ms-asf_label">
- Video (Windows Media ASF)
- </label>
- </mimetype>
- <mimetype name="video/x-ms-wmv">
- <label name="video/x-ms-wmv_label">
- Video (Windows Media WMV)
- </label>
- </mimetype>
- <mimetype menu="1" name="video/x-msvideo">
- <label name="video/x-msvideo_label">
- Video (AVI)
- </label>
- </mimetype>
-</mimetypes>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<mimetypes name="default">
+ <widgetset name="web">
+ <label name="web_label">
+ Webinhalt
+ </label>
+ <tooltip name="web_tooltip">
+ Dieser Ort verfügt über Webinhalte
+ </tooltip>
+ <playtip name="web_playtip">
+ Webinhalt anzeigen
+ </playtip>
+ </widgetset>
+ <widgetset name="movie">
+ <label name="movie_label">
+ Video
+ </label>
+ <tooltip name="movie_tooltip">
+ Ein Video wurde gefunden.
+ </tooltip>
+ <playtip name="movie_playtip">
+ Video wiedergeben
+ </playtip>
+ </widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Keine Inhalte
+ </label>
+ <tooltip name="none_tooltip">
+ Keine Medien gefunden
+ </tooltip>
+ </widgetset>
+ <widgetset name="image">
+ <label name="image_label">
+ Bild
+ </label>
+ <tooltip name="image_tooltip">
+ Dieser Ort verfügt über Bildinhalte
+ </tooltip>
+ <playtip name="image_playtip">
+ Das Bild an diesem Ort anzeigen
+ </playtip>
+ </widgetset>
+ <widgetset name="audio">
+ <label name="audio_label">
+ Audio
+ </label>
+ <tooltip name="audio_tooltip">
+ Dieser Ort verfügt über Audioinhalte
+ </tooltip>
+ <playtip name="audio_playtip">
+ Audio an diesem Ort wiedergeben
+ </playtip>
+ </widgetset>
+ <scheme name="rtsp">
+ <label name="rtsp_label">
+ Echtzeit-Streaming
+ </label>
+ </scheme>
+ <mimetype name="blank">
+ <label name="blank_label">
+ - Keine -
+ </label>
+ </mimetype>
+ <mimetype name="none/none">
+ <label name="none/none_label">
+ - Keine -
+ </label>
+ </mimetype>
+ <mimetype name="audio/*">
+ <label name="audio2_label">
+ Audio
+ </label>
+ </mimetype>
+ <mimetype name="video/*">
+ <label name="video2_label">
+ Video
+ </label>
+ </mimetype>
+ <mimetype name="image/*">
+ <label name="image2_label">
+ Bild
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+ <label name="vnd.secondlife.qt.legacy_label">
+ Video (QuickTime)
+ </label>
+ </mimetype>
+ <mimetype name="application/javascript">
+ <label name="application/javascript_label">
+ Javascript
+ </label>
+ </mimetype>
+ <mimetype name="application/ogg">
+ <label name="application/ogg_label">
+ Ogg Audio/Video
+ </label>
+ </mimetype>
+ <mimetype name="application/pdf">
+ <label name="application/pdf_label">
+ PDF-Dokument
+ </label>
+ </mimetype>
+ <mimetype name="application/postscript">
+ <label name="application/postscript_label">
+ Postscript-Dokument
+ </label>
+ </mimetype>
+ <mimetype name="application/rtf">
+ <label name="application/rtf_label">
+ Rich Text (RTF)
+ </label>
+ </mimetype>
+ <mimetype name="application/smil">
+ <label name="application/smil_label">
+ Synchronized Multimedia Integration Language (SMIL)
+ </label>
+ </mimetype>
+ <mimetype name="application/xhtml+xml">
+ <label name="application/xhtml+xml_label">
+ Webseite (XHTML)
+ </label>
+ </mimetype>
+ <mimetype name="application/x-director">
+ <label name="application/x-director_label">
+ Macromedia Director
+ </label>
+ </mimetype>
+ <mimetype name="application/x-shockwave-flash">
+ <label name="application/x-shockwave-flash_label">
+ Flash
+ </label>
+ </mimetype>
+ <mimetype name="audio/mid">
+ <label name="audio/mid_label">
+ Audio (MIDI)
+ </label>
+ </mimetype>
+ <mimetype name="audio/mpeg">
+ <label name="audio/mpeg_label">
+ Audio (MP3)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-aiff">
+ <label name="audio/x-aiff_label">
+ Audio (AIFF)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-wav">
+ <label name="audio/x-wav_label">
+ Audio (WAV)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/bmp">
+ <label name="image/bmp_label">
+ Bild (BMP)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/gif">
+ <label name="image/gif_label">
+ Bild (GIF)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/jpeg">
+ <label name="image/jpeg_label">
+ Bild (JPEG)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/png">
+ <label name="image/png_label">
+ Bild (PNG)
+ </label>
+ </mimetype>
+ <mimetype name="image/svg+xml">
+ <label name="image/svg+xml_label">
+ Bild (SVG)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/tiff">
+ <label name="image/tiff_label">
+ Bild (TIFF)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="text/html">
+ <label name="text/html_label">
+ Webseite
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="text/plain">
+ <label name="text/plain_label">
+ Text
+ </label>
+ </mimetype>
+ <mimetype name="text/xml">
+ <label name="text/xml_label">
+ XML
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="video/mpeg">
+ <label name="video/mpeg_label">
+ Video (MPEG)
+ </label>
+ </mimetype>
+ <mimetype name="video/mp4">
+ <label name="video/mp4_label">
+ Video (MP4)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="video/quicktime">
+ <label name="video/quicktime_label">
+ Video (QuickTime)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-asf">
+ <label name="video/x-ms-asf_label">
+ Video (Windows Media ASF)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-wmv">
+ <label name="video/x-ms-wmv_label">
+ Video (Windows Media WMV)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="video/x-msvideo">
+ <label name="video/x-msvideo_label">
+ Video (AVI)
+ </label>
+ </mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/de/panel_audio_device.xml b/indra/newview/skins/default/xui/de/panel_audio_device.xml
index 006d768c18..6ecd1f0241 100644
--- a/indra/newview/skins/default/xui/de/panel_audio_device.xml
+++ b/indra/newview/skins/default/xui/de/panel_audio_device.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="device_settings">
- <text name="Audio Devices">
- Audiogeräte
- </text>
- <text name="Output device (speakers):">
- Ausgabegerät (Lautsprecher):
- </text>
- <text name="Input device (microphone):">
- Eingabegerät (Mikro):
- </text>
- <text name="Input level:">
- Eingangslautstärke
- </text>
- <text_editor name="voice_intro_text1">
- Mit dem Regler steuern Sie, wie laut andere Einwohner Sie hören. Testen Sie die Eingangslautstärke, indem Sie in das Mikro sprechen.
- </text_editor>
- <volume_slider name="mic_volume_slider" tool_tip="Ändern Sie die Lautstärke mit dem Regler" />
- <text name="wait_text">
- Bitte warten
- </text>
- <text name="default_text">
- Standard
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="device_settings">
+ <text name="Audio Devices">
+ Audiogeräte
+ </text>
+ <text name="Output device (speakers):">
+ Ausgabegerät (Lautsprecher):
+ </text>
+ <text name="Input device (microphone):">
+ Eingabegerät (Mikro):
+ </text>
+ <text name="Input level:">
+ Eingangslautstärke
+ </text>
+ <text_editor name="voice_intro_text1">
+ Mit dem Regler steuern Sie, wie laut andere Einwohner Sie hören. Testen Sie die Eingangslautstärke, indem Sie in das Mikro sprechen.
+ </text_editor>
+ <volume_slider name="mic_volume_slider" tool_tip="Ändern Sie die Lautstärke mit dem Regler" />
+ <text name="wait_text">
+ Bitte warten
+ </text>
+ <text name="default_text">
+ Standard
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_friends.xml b/indra/newview/skins/default/xui/de/panel_friends.xml
index 17c073427c..bb2adb36fe 100644
--- a/indra/newview/skins/default/xui/de/panel_friends.xml
+++ b/indra/newview/skins/default/xui/de/panel_friends.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="friends">
- <string name="Multiple">
- Mehrere Freunde...
- </string>
- <scroll_list name="friend_list"
- tool_tip="Halten Sie die Tasten „Umschalt“ oder „Strg“ gedrückt, um durch Klicken mehrere Freunde auszuwählen.">
- <column name="icon_online_status" tool_tip="Online-Status" />
- <column label="Name" name="friend_name" tool_tip="Name" />
- <column name="icon_visible_online" tool_tip="Freund kann sehen, wenn Sie online sind" />
- <column name="icon_visible_map" tool_tip="Freund kann Sie auf der Karte finden" />
- <column name="icon_edit_mine"
- tool_tip="Freunde können Objekte bearbeiten, löschen und an sich nehmen" />
- <column name="icon_edit_theirs"
- tool_tip="Sie können die Objekte dieses Freunds bearbeiten" />
- </scroll_list>
- <panel name="rights_container">
- <text name="friend_name_label">
- Wählen Sie den/die Freund(e) aus, dessen/deren Rechte Sie ändern möchten...
- </text>
- <check_box label="Kann meinen Online-Status sehen" name="online_status_cb"
- tool_tip="Festlegen, ob dieser Freund meinen Online-Status auf seiner Freundesliste oder Visitenkarte einsehen kann" />
- <check_box label="Kann mich auf der Weltkarte sehen" name="map_status_cb"
- tool_tip="Festlegen, ob dieser Freund auf seiner Karte meinen Standort sehen kann" />
- <check_box label="Kann meine Objekte verändern" name="modify_status_cb"
- tool_tip="Festlegen, ob dieser Freund meine Objekte verändern kann" />
- <text name="process_rights_label">
- Rechte werden geändert...
- </text>
- </panel>
- <button label="IM/Anruf" name="im_btn" tool_tip="Beginnt eine Instant Message-Sitzung" />
- <button label="Profil" name="profile_btn"
- tool_tip="Bilder, Gruppen und andere Informationen anzeigen" />
- <button label="Teleport" name="offer_teleport_btn"
- tool_tip="Bieten Sie diesem Freund einen Teleport an Ihre Position an" />
- <button label="Zahlen" name="pay_btn" tool_tip="Diesem Freund Linden-Dollar (L$) geben" />
- <button label="Entfernen" name="remove_btn"
- tool_tip="Diese Person von Ihrer Freundesliste entfernen" />
- <button label="Hinzufügen" name="add_btn"
- tool_tip="Bieten Sie einem Einwohner die Freundschaft an" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="friends">
+ <string name="Multiple">
+ Mehrere Freunde...
+ </string>
+ <scroll_list name="friend_list"
+ tool_tip="Halten Sie die Tasten „Umschalt“ oder „Strg“ gedrückt, um durch Klicken mehrere Freunde auszuwählen.">
+ <column name="icon_online_status" tool_tip="Online-Status" />
+ <column label="Name" name="friend_name" tool_tip="Name" />
+ <column name="icon_visible_online" tool_tip="Freund kann sehen, wenn Sie online sind" />
+ <column name="icon_visible_map" tool_tip="Freund kann Sie auf der Karte finden" />
+ <column name="icon_edit_mine"
+ tool_tip="Freunde können Objekte bearbeiten, löschen und an sich nehmen" />
+ <column name="icon_edit_theirs"
+ tool_tip="Sie können die Objekte dieses Freunds bearbeiten" />
+ </scroll_list>
+ <panel name="rights_container">
+ <text name="friend_name_label">
+ Wählen Sie den/die Freund(e) aus, dessen/deren Rechte Sie ändern möchten...
+ </text>
+ <check_box label="Kann meinen Online-Status sehen" name="online_status_cb"
+ tool_tip="Festlegen, ob dieser Freund meinen Online-Status auf seiner Freundesliste oder Visitenkarte einsehen kann" />
+ <check_box label="Kann mich auf der Weltkarte sehen" name="map_status_cb"
+ tool_tip="Festlegen, ob dieser Freund auf seiner Karte meinen Standort sehen kann" />
+ <check_box label="Kann meine Objekte verändern" name="modify_status_cb"
+ tool_tip="Festlegen, ob dieser Freund meine Objekte verändern kann" />
+ <text name="process_rights_label">
+ Rechte werden geändert...
+ </text>
+ </panel>
+ <button label="IM/Anruf" name="im_btn" tool_tip="Beginnt eine Instant Message-Sitzung" />
+ <button label="Profil" name="profile_btn"
+ tool_tip="Bilder, Gruppen und andere Informationen anzeigen" />
+ <button label="Teleport" name="offer_teleport_btn"
+ tool_tip="Bieten Sie diesem Freund einen Teleport an Ihre Position an" />
+ <button label="Zahlen" name="pay_btn" tool_tip="Diesem Freund Linden-Dollar (L$) geben" />
+ <button label="Entfernen" name="remove_btn"
+ tool_tip="Diese Person von Ihrer Freundesliste entfernen" />
+ <button label="Hinzufügen" name="add_btn"
+ tool_tip="Bieten Sie einem Einwohner die Freundschaft an" />
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_groups.xml b/indra/newview/skins/default/xui/de/panel_groups.xml
index 00148d15da..95a2ef14f9 100644
--- a/indra/newview/skins/default/xui/de/panel_groups.xml
+++ b/indra/newview/skins/default/xui/de/panel_groups.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="groups">
- <text name="groupdesc">
- Die derzeit aktive Gruppe ist fett hervorgehoben.
- </text>
- <text name="groupcount">
- Sie sind Mitglied bei [COUNT] Gruppen (von max. [MAX]).
- </text>
- <button label="IM/Anruf" name="IM" tool_tip="Beginnt eine Instant Message-Sitzung" />
- <button label="Info" name="Info" />
- <button label="Aktivieren" name="Activate" />
- <button label="Verlassen" name="Leave" />
- <button label="Erstellen..." name="Create" />
- <button label="Suchen..." name="Search..." />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="groups">
+ <text name="groupdesc">
+ Die derzeit aktive Gruppe ist fett hervorgehoben.
+ </text>
+ <text name="groupcount">
+ Sie sind Mitglied bei [COUNT] Gruppen (von max. [MAX]).
+ </text>
+ <button label="IM/Anruf" name="IM" tool_tip="Beginnt eine Instant Message-Sitzung" />
+ <button label="Info" name="Info" />
+ <button label="Aktivieren" name="Activate" />
+ <button label="Verlassen" name="Leave" />
+ <button label="Erstellen..." name="Create" />
+ <button label="Suchen..." name="Search..." />
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
index 6846b1536c..5b5a6d8c77 100644
--- a/indra/newview/skins/default/xui/de/panel_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_login.xml
@@ -13,15 +13,15 @@
Startposition:
</text>
<combo_box name="start_location_combo">
- <combo_item name="MyHome">
+ <combo_box.item name="MyHome">
Mein Heimatort
- </combo_item>
- <combo_item name="MyLastLocation">
+ </combo_box.item>
+ <combo_box.item name="MyLastLocation">
Mein letzter Standort
- </combo_item>
- <combo_item name="Typeregionname">
+ </combo_box.item>
+ <combo_box.item name="Typeregionname">
<Region eingeben>
- </combo_item>
+ </combo_box.item>
</combo_box>
<check_box label="Kennwort merken" name="remember_check"/>
<text name="full_screen_text">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 3365c5c428..18fd2f2baa 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -10,15 +10,9 @@
</radio_group>
<check_box label="Startposition auf Anmeldebildschirm anzeigen" name="show_location_checkbox"/>
<combo_box name="fade_out_combobox">
- <combo_item name="Never">
- Nie
- </combo_item>
- <combo_item name="Show Temporarily">
- Temporär anzeigen
- </combo_item>
- <combo_item name="Always">
- Immer
- </combo_item>
+ <combo_box.item name="Never" label="Nie" />
+ <combo_box.item name="Show Temporarily" label="Temporär anzeigen" />
+ <combo_box.item name="Always" label="Immer" />
</combo_box>
<check_box label="Kleine Avatarnamen" name="small_avatar_names_checkbox"/>
<check_box label="Meinen Namen auf meinem Bildschirm ausblenden" name="show_my_name_checkbox"/>
@@ -62,53 +56,23 @@
<Region eingeben>
</string>
<combo_box name="crash_behavior_combobox">
- <combo_item name="Askbeforesending">
- Vor dem Senden fragen
- </combo_item>
- <combo_item name="Alwayssend">
- Immer senden
- </combo_item>
- <combo_item name="Neversend">
- Nie senden
- </combo_item>
+ <combo_box.item name="Askbeforesending" label="Vor dem Senden fragen" />
+ <combo_box.item name="Alwayssend" label="Immer senden" />
+ <combo_box.item name="Neversend" label="Nie senden" />
</combo_box>
<combo_box name="language_combobox">
- <combo_item name="System Default Language">
- Betriebssystem-Einstellung
- </combo_item>
- <combo_item name="English">
- English (Englisch)
- </combo_item>
- <combo_item name="Danish">
- Danks (Dänisch) - Beta
- </combo_item>
- <combo_item name="Deutsch(German)">
- Deutsch - Beta
- </combo_item>
- <combo_item name="Spanish">
- Español (Spanisch) - Beta
- </combo_item>
- <combo_item name="French">
- Français (Französisch) - Beta
- </combo_item>
- <combo_item name="Hungarian">
- Magyar (Ungarisch) - Beta
- </combo_item>
- <combo_item name="Polish">
- Polski (Polnisch) - Beta
- </combo_item>
- <combo_item name="Portugese">
- Português (Portugiesisch) - Beta
- </combo_item>
- <combo_item name="Chinese">
- ä¸æ–‡ (简体) (Chinesisch) - Beta
- </combo_item>
- <combo_item name="(Japanese)">
- 日本語 (Japanisch) - Beta
- </combo_item>
- <combo_item name="(Korean)">
- í•œêµì–´ (Koreanisch) - Beta
- </combo_item>
+ <combo_box.item name="System Default Language" label="Betriebssystem-Einstellung" />
+ <combo_box.item name="English" label="English (Englisch)" />
+ <combo_box.item name="Danish" label="Danks (Dänisch) - Beta" />
+ <combo_box.item name="Deutsch(German)" label="Deutsch - Beta" />
+ <combo_box.item name="Spanish" label="Español (Spanisch) - Beta" />
+ <combo_box.item name="French" label="Français (Französisch) - Beta" />
+ <combo_box.item name="Hungarian" label="Magyar (Ungarisch) - Beta" />
+ <combo_box.item name="Polish" label="Polski (Polnisch) - Beta" />
+ <combo_box.item name="Portugese" label="Português (Portugiesisch) - Beta" />
+ <combo_box.item name="Chinese" label="ä¸æ–‡ (简体) (Chinesisch) - Beta" />
+ <combo_box.item name="(Japanese)" label="日本語 (Japanisch) - Beta" />
+ <combo_box.item name="(Korean)" label="í•œêµì–´ (Koreanisch) - Beta" />
</combo_box>
<check_box label="Objekten Sprache mitteilen" name="language_is_public" tool_tip="In-Welt-Objekten wird Ihre bevorzugte Spracheinstellung mitgeteilt."/>
</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index bc40ec0da1..2276fd8a9d 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -21,21 +21,21 @@
Fenstergröße:
</text>
<combo_box left="115" name="windowsize combo">
- <combo_item name="640x480">
+ <combo_box.item name="640x480">
640x480
- </combo_item>
- <combo_item name="800x600">
+ </combo_box.item>
+ <combo_box.item name="800x600">
800x600
- </combo_item>
- <combo_item name="720x480">
+ </combo_box.item>
+ <combo_box.item name="720x480">
720x480 (NTSC)
- </combo_item>
- <combo_item name="768x576">
+ </combo_box.item>
+ <combo_box.item name="768x576">
768x576 (PAL)
- </combo_item>
- <combo_item name="1024x768">
+ </combo_box.item>
+ <combo_box.item name="1024x768">
1024x768
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="DisplayResLabel" width="100">
Anzeigeauflösung:
@@ -45,18 +45,18 @@
Aspektverhältnis:
</text>
<combo_box left="115" name="aspect_ratio" tool_tip="Breite/Höhe">
- <combo_item type="string" length="1" name="4:3(StandardCRT)">
+ <combo_box.item type="string" length="1" name="4:3(StandardCRT)">
4:3 (Standard-CRT)
- </combo_item>
- <combo_item type="string" length="1" name="5:4(1280x1024LCD)">
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="5:4(1280x1024LCD)">
5:4 (1280x1024 LCD)
- </combo_item>
- <combo_item name="8:5(Widescreen)">
+ </combo_box.item>
+ <combo_box.item name="8:5(Widescreen)">
8:5 (Widescreen)
- </combo_item>
- <combo_item type="string" length="1" name="16:9(Widescreen)">
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="16:9(Widescreen)">
16:9 (Widescreen)
- </combo_item>
+ </combo_box.item>
</combo_box>
<check_box label="Verhältnis automatisch erkennen" left="275" name="aspect_auto_detect" />
<text type="string" length="1" name="UI Size:">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 56cc7560ed..07f3269541 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1,443 +1,443 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- This file contains strings that used to be hardcoded in the source.
- It is only for those strings which don't belong in a floater.
- For example, the strings used in avatar chat bubbles, and strings
- that are returned from one component and may appear in many places-->
-<strings>
- <!-- Login -->
- <string name="LoginInProgress">
- Anmeldevorgang gestartet. [APP_NAME] reagiert möglicherweise nicht. Bitte warten.
- </string>
- <string name="LoginAuthenticating">
- Authentifizierung
- </string>
- <string name="LoginMaintenance">
- Account wird aktualisiert...
- </string>
- <string name="LoginAttempt">
- Ein früherer Anmeldeversuch ist fehlgeschlagen. Anmeldung, Versuch [NUMBER]
- </string>
- <string name="LoginPrecaching">
- Welt wird geladen...
- </string>
- <string name="LoginInitializingBrowser">
- Integrierter Webbrowser wird initialisiert...
- </string>
- <string name="LoginInitializingMultimedia">
- Multimedia wird initialisiert...
- </string>
- <string name="LoginVerifyingCache">
- Cache-Dateien werden überprüft (dauert 60-90 Sekunden)...
- </string>
- <string name="LoginProcessingResponse">
- Antwort wird verarbeitet...
- </string>
- <string name="LoginInitializingWorld">
- Welt wird initialisiert...
- </string>
- <string name="LoginDecodingImages">
- Bilder werden entpackt...
- </string>
- <string name="LoginInitializingQuicktime">
- QuickTime wird initialisiert...
- </string>
- <string name="LoginQuicktimeNotFound">
- QuickTime nicht gefunden - Initialisierung nicht möglich.
- </string>
- <string name="LoginQuicktimeOK">
- QuickTime wurde initialisiert.
- </string>
- <string name="LoginWaitingForRegionHandshake">
- Region-Handshake...
- </string>
- <string name="LoginConnectingToRegion">
- Region-Verbindung...
- </string>
- <string name="LoginDownloadingClothing">
- Kleidung wird geladen...
- </string>
- <string name="LoginFailedNoNetwork">
- Netzwerk Fehler: Eine Verbindung konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Netzwerkverbindung.
- </string>
- <!-- Disconnection -->
- <string name="AgentLostConnection">
- In dieser Region kann es zu Problemen kommen. Bitte überprüfen Sie Ihre Internetverbindung.
- </string>
- <!-- Tooltip, llhoverview.cpp -->
- <string name="TooltipPerson">
- Person
- </string>
- <!-- Object under mouse pointer is an avatar -->
- <string name="TooltipNoName">
- (namenlos)
- </string>
- <!-- No name on an object -->
- <string name="TooltipOwner">
- Eigentümer:
- </string>
- <!-- Owner name follows -->
- <string name="TooltipPublic">
- Öffentlich
- </string>
- <!-- Public permissions on an object -->
- <string name="TooltipIsGroup">
- (Gruppe)
- </string>
- <!-- The name before this text is that of a group -->
- <string name="TooltipFlagScript">
- Skript
- </string>
- <string name="TooltipFlagPhysics">
- Physik
- </string>
- <string name="TooltipFlagTouch">
- Berühren
- </string>
- <string name="TooltipFlagL$">
- L$
- </string>
- <string name="TooltipFlagDropInventory">
- Inventar fallen lassen
- </string>
- <string name="TooltipFlagPhantom">
- Phantom
- </string>
- <string name="TooltipFlagTemporary">
- Temporär
- </string>
- <string name="TooltipFlagRightClickMenu">
- (Rechtsklick für Menü)
- </string>
- <string name="TooltipFreeToCopy">
- Kopieren möglich
- </string>
- <string name="TooltipForSaleL$">
- Zum Verkauf: [AMOUNT] L$
- </string>
- <!-- L$ version -->
- <string name="TooltipForSaleMsg">
- Zum Verkauf: [MESSAGE]
- </string>
- <!-- Message (RetrievingData) -->
- <string name="TooltipFlagGroupBuild">
- Gruppenbau
- </string>
- <string name="TooltipFlagNoBuild">
- Bauen aus
- </string>
- <string name="TooltipFlagNoEdit">
- Gruppenbau
- </string>
- <string name="TooltipFlagNotSafe">
- Unsicher
- </string>
- <!-- damage area -->
- <string name="TooltipFlagNoFly">
- Fliegen aus
- </string>
- <string name="TooltipFlagGroupScripts">
- Gruppenskripte
- </string>
- <string name="TooltipFlagNoScripts">
- Skripte aus
- </string>
- <string name="TooltipLand">
- Land:
- </string>
- <string name="TooltipMustSingleDrop">
- Sie können nur ein einzelnes Objekt hierher ziehen
- </string>
- <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
- <string name="RetrievingData">
- Laden...
- </string>
- <string name="ReleaseNotes">
- Versionshinweise
- </string>
- <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
- <string name="LoadingData">
- Wird geladen...
- </string>
- <!-- namecache -->
- <!-- Avatar name: text shown for LLUUID::null -->
- <string name="AvatarNameNobody">
- (niemand)
- </string>
- <!-- Avatar name: text shown while fetching name -->
- <string name="AvatarNameWaiting">
- (wartet)
- </string>
- <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
- <string name="AvatarNameHippos">
- (hippos)
- </string>
- <!-- Group name: text shown for LLUUID::null -->
- <string name="GroupNameNone">
- (keiner)
- </string>
- <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
- <string name="AssetErrorNone">
- Kein Fehler
- </string>
- <string name="AssetErrorRequestFailed">
- Asset-Anforderung: fehlgeschlagen
- </string>
- <string name="AssetErrorNonexistentFile">
- Asset-Anforderung: Datei existiert nicht
- </string>
- <string name="AssetErrorNotInDatabase">
- Asset-Anforderung: Asset in Datenbank nicht gefunden
- </string>
- <string name="AssetErrorEOF">
- Ende der Datei
- </string>
- <string name="AssetErrorCannotOpenFile">
- Datei kann nicht geöffnet werden
- </string>
- <string name="AssetErrorFileNotFound">
- Datei nicht gefunden
- </string>
- <string name="AssetErrorTCPTimeout">
- Zeitüberschreitung bei Dateiübertragung
- </string>
- <string name="AssetErrorCircuitGone">
- Verbindung verloren
- </string>
- <string name="AssetErrorUnknownStatus">
- Status unbekannt
- </string>
- <!-- llvoavatar. Displayed in the avatar's chat bubble -->
- <string name="AvatarEditingApparance">
- (Aussehen wird bearbeitet)
- </string>
- <string name="AvatarAway">
- Abwesend
- </string>
- <string name="AvatarBusy">
- Beschäftigt
- </string>
- <string name="AvatarMuted">
- Stummgeschaltet
- </string>
- <!-- animations -->
- <string name="anim_express_afraid">
- Ängstlich
- </string>
- <string name="anim_express_anger">
- Verärgert
- </string>
- <string name="anim_away">
- Abwesend
- </string>
- <string name="anim_backflip">
- Rückwärtssalto
- </string>
- <string name="anim_express_laugh">
- Lachkrampf
- </string>
- <string name="anim_express_toothsmile">
- Grinsen
- </string>
- <string name="anim_blowkiss">
- Kusshand
- </string>
- <string name="anim_express_bored">
- Gelangweilt
- </string>
- <string name="anim_bow">
- Verbeugen
- </string>
- <string name="anim_clap">
- Klatschen
- </string>
- <string name="anim_courtbow">
- Diener
- </string>
- <string name="anim_express_cry">
- Weinen
- </string>
- <string name="anim_dance1">
- Tanz 1
- </string>
- <string name="anim_dance2">
- Tanz 2
- </string>
- <string name="anim_dance3">
- Tanz 3
- </string>
- <string name="anim_dance4">
- Tanz 4
- </string>
- <string name="anim_dance5">
- Tanz 5
- </string>
- <string name="anim_dance6">
- Tanz 6
- </string>
- <string name="anim_dance7">
- Tanz 7
- </string>
- <string name="anim_dance8">
- Tanz 8
- </string>
- <string name="anim_express_disdain">
- Verachten
- </string>
- <string name="anim_drink">
- Trinken
- </string>
- <string name="anim_express_embarrased">
- Verlegen
- </string>
- <string name="anim_angry_fingerwag">
- Drohen
- </string>
- <string name="anim_fist_pump">
- Faust pumpen
- </string>
- <string name="anim_yoga_float">
- Yogaflieger
- </string>
- <string name="anim_express_frown">
- Stirnrunzeln
- </string>
- <string name="anim_impatient">
- Ungeduldig
- </string>
- <string name="anim_jumpforjoy">
- Freudensprung
- </string>
- <string name="anim_kissmybutt">
- LMA
- </string>
- <string name="anim_express_kiss">
- Küssen
- </string>
- <string name="anim_laugh_short">
- Lachen
- </string>
- <string name="anim_musclebeach">
- Posen
- </string>
- <string name="anim_no_unhappy">
- Nein (Bedauernd)
- </string>
- <string name="anim_no_head">
- Nein
- </string>
- <string name="anim_nyanya">
- Ällabätsch
- </string>
- <string name="anim_punch_onetwo">
- Eins-Zwei-Punch
- </string>
- <string name="anim_express_open_mouth">
- Mund offen
- </string>
- <string name="anim_peace">
- Friede
- </string>
- <string name="anim_point_you">
- Auf anderen zeigen
- </string>
- <string name="anim_point_me">
- Auf mich zeigen
- </string>
- <string name="anim_punch_l">
- Linker Haken
- </string>
- <string name="anim_punch_r">
- Rechter Haken
- </string>
- <string name="anim_rps_countdown">
- SSP zählen
- </string>
- <string name="anim_rps_paper">
- SSP Papier
- </string>
- <string name="anim_rps_rock">
- SSP Stein
- </string>
- <string name="anim_rps_scissors">
- SSP Schere
- </string>
- <string name="anim_express_repulsed">
- Angewidert
- </string>
- <string name="anim_kick_roundhouse_r">
- Rundkick
- </string>
- <string name="anim_express_sad">
- Traurig
- </string>
- <string name="anim_salute">
- Salutieren
- </string>
- <string name="anim_shout">
- Rufen
- </string>
- <string name="anim_express_shrug">
- Schulterzucken
- </string>
- <string name="anim_express_smile">
- Lächeln
- </string>
- <string name="anim_smoke_idle">
- Zigarette halten
- </string>
- <string name="anim_smoke_inhale">
- Rauchen
- </string>
- <string name="anim_smoke_throw_down">
- Zigarette wegwerfen
- </string>
- <string name="anim_express_surprise">
- Ãœberraschung
- </string>
- <string name="anim_sword_strike_r">
- Schwerthieb
- </string>
- <string name="anim_angry_tantrum">
- Wutanfall
- </string>
- <string name="anim_express_tongue_out">
- Zunge rausstrecken
- </string>
- <string name="anim_hello">
- Winken
- </string>
- <string name="anim_whisper">
- Flüstern
- </string>
- <string name="anim_whistle">
- Pfeifen
- </string>
- <string name="anim_express_wink">
- Zwinkern
- </string>
- <string name="anim_wink_hollywood">
- Zwinkern (Hollywood)
- </string>
- <string name="anim_express_worry">
- Sorgenvoll
- </string>
- <string name="anim_yes_happy">
- Ja (Erfreut)
- </string>
- <string name="anim_yes_head">
- Ja
- </string>
- <string name="texture_loading">
- Wird geladen...
- </string>
- <string name="worldmap_offline">
- Offline
- </string>
- <!-- Chat -->
- <string name="whisper">
- flüstert:
- </string>
- <string name="shout">
- ruft:
- </string>
-</strings>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This file contains strings that used to be hardcoded in the source.
+ It is only for those strings which don't belong in a floater.
+ For example, the strings used in avatar chat bubbles, and strings
+ that are returned from one component and may appear in many places-->
+<strings>
+ <!-- Login -->
+ <string name="LoginInProgress">
+ Anmeldevorgang gestartet. [APP_NAME] reagiert möglicherweise nicht. Bitte warten.
+ </string>
+ <string name="LoginAuthenticating">
+ Authentifizierung
+ </string>
+ <string name="LoginMaintenance">
+ Account wird aktualisiert...
+ </string>
+ <string name="LoginAttempt">
+ Ein früherer Anmeldeversuch ist fehlgeschlagen. Anmeldung, Versuch [NUMBER]
+ </string>
+ <string name="LoginPrecaching">
+ Welt wird geladen...
+ </string>
+ <string name="LoginInitializingBrowser">
+ Integrierter Webbrowser wird initialisiert...
+ </string>
+ <string name="LoginInitializingMultimedia">
+ Multimedia wird initialisiert...
+ </string>
+ <string name="LoginVerifyingCache">
+ Cache-Dateien werden überprüft (dauert 60-90 Sekunden)...
+ </string>
+ <string name="LoginProcessingResponse">
+ Antwort wird verarbeitet...
+ </string>
+ <string name="LoginInitializingWorld">
+ Welt wird initialisiert...
+ </string>
+ <string name="LoginDecodingImages">
+ Bilder werden entpackt...
+ </string>
+ <string name="LoginInitializingQuicktime">
+ QuickTime wird initialisiert...
+ </string>
+ <string name="LoginQuicktimeNotFound">
+ QuickTime nicht gefunden - Initialisierung nicht möglich.
+ </string>
+ <string name="LoginQuicktimeOK">
+ QuickTime wurde initialisiert.
+ </string>
+ <string name="LoginWaitingForRegionHandshake">
+ Region-Handshake...
+ </string>
+ <string name="LoginConnectingToRegion">
+ Region-Verbindung...
+ </string>
+ <string name="LoginDownloadingClothing">
+ Kleidung wird geladen...
+ </string>
+ <string name="LoginFailedNoNetwork">
+ Netzwerk Fehler: Eine Verbindung konnte nicht hergestellt werden. Bitte überprüfen Sie Ihre Netzwerkverbindung.
+ </string>
+ <!-- Disconnection -->
+ <string name="AgentLostConnection">
+ In dieser Region kann es zu Problemen kommen. Bitte überprüfen Sie Ihre Internetverbindung.
+ </string>
+ <!-- Tooltip, llhoverview.cpp -->
+ <string name="TooltipPerson">
+ Person
+ </string>
+ <!-- Object under mouse pointer is an avatar -->
+ <string name="TooltipNoName">
+ (namenlos)
+ </string>
+ <!-- No name on an object -->
+ <string name="TooltipOwner">
+ Eigentümer:
+ </string>
+ <!-- Owner name follows -->
+ <string name="TooltipPublic">
+ Öffentlich
+ </string>
+ <!-- Public permissions on an object -->
+ <string name="TooltipIsGroup">
+ (Gruppe)
+ </string>
+ <!-- The name before this text is that of a group -->
+ <string name="TooltipFlagScript">
+ Skript
+ </string>
+ <string name="TooltipFlagPhysics">
+ Physik
+ </string>
+ <string name="TooltipFlagTouch">
+ Berühren
+ </string>
+ <string name="TooltipFlagL$">
+ L$
+ </string>
+ <string name="TooltipFlagDropInventory">
+ Inventar fallen lassen
+ </string>
+ <string name="TooltipFlagPhantom">
+ Phantom
+ </string>
+ <string name="TooltipFlagTemporary">
+ Temporär
+ </string>
+ <string name="TooltipFlagRightClickMenu">
+ (Rechtsklick für Menü)
+ </string>
+ <string name="TooltipFreeToCopy">
+ Kopieren möglich
+ </string>
+ <string name="TooltipForSaleL$">
+ Zum Verkauf: [AMOUNT] L$
+ </string>
+ <!-- L$ version -->
+ <string name="TooltipForSaleMsg">
+ Zum Verkauf: [MESSAGE]
+ </string>
+ <!-- Message (RetrievingData) -->
+ <string name="TooltipFlagGroupBuild">
+ Gruppenbau
+ </string>
+ <string name="TooltipFlagNoBuild">
+ Bauen aus
+ </string>
+ <string name="TooltipFlagNoEdit">
+ Gruppenbau
+ </string>
+ <string name="TooltipFlagNotSafe">
+ Unsicher
+ </string>
+ <!-- damage area -->
+ <string name="TooltipFlagNoFly">
+ Fliegen aus
+ </string>
+ <string name="TooltipFlagGroupScripts">
+ Gruppenskripte
+ </string>
+ <string name="TooltipFlagNoScripts">
+ Skripte aus
+ </string>
+ <string name="TooltipLand">
+ Land:
+ </string>
+ <string name="TooltipMustSingleDrop">
+ Sie können nur ein einzelnes Objekt hierher ziehen
+ </string>
+ <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
+ <string name="RetrievingData">
+ Laden...
+ </string>
+ <string name="ReleaseNotes">
+ Versionshinweise
+ </string>
+ <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
+ <string name="LoadingData">
+ Wird geladen...
+ </string>
+ <!-- namecache -->
+ <!-- Avatar name: text shown for LLUUID::null -->
+ <string name="AvatarNameNobody">
+ (niemand)
+ </string>
+ <!-- Avatar name: text shown while fetching name -->
+ <string name="AvatarNameWaiting">
+ (wartet)
+ </string>
+ <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
+ <string name="AvatarNameHippos">
+ (hippos)
+ </string>
+ <!-- Group name: text shown for LLUUID::null -->
+ <string name="GroupNameNone">
+ (keiner)
+ </string>
+ <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
+ <string name="AssetErrorNone">
+ Kein Fehler
+ </string>
+ <string name="AssetErrorRequestFailed">
+ Asset-Anforderung: fehlgeschlagen
+ </string>
+ <string name="AssetErrorNonexistentFile">
+ Asset-Anforderung: Datei existiert nicht
+ </string>
+ <string name="AssetErrorNotInDatabase">
+ Asset-Anforderung: Asset in Datenbank nicht gefunden
+ </string>
+ <string name="AssetErrorEOF">
+ Ende der Datei
+ </string>
+ <string name="AssetErrorCannotOpenFile">
+ Datei kann nicht geöffnet werden
+ </string>
+ <string name="AssetErrorFileNotFound">
+ Datei nicht gefunden
+ </string>
+ <string name="AssetErrorTCPTimeout">
+ Zeitüberschreitung bei Dateiübertragung
+ </string>
+ <string name="AssetErrorCircuitGone">
+ Verbindung verloren
+ </string>
+ <string name="AssetErrorUnknownStatus">
+ Status unbekannt
+ </string>
+ <!-- llvoavatar. Displayed in the avatar's chat bubble -->
+ <string name="AvatarEditingApparance">
+ (Aussehen wird bearbeitet)
+ </string>
+ <string name="AvatarAway">
+ Abwesend
+ </string>
+ <string name="AvatarBusy">
+ Beschäftigt
+ </string>
+ <string name="AvatarMuted">
+ Stummgeschaltet
+ </string>
+ <!-- animations -->
+ <string name="anim_express_afraid">
+ Ängstlich
+ </string>
+ <string name="anim_express_anger">
+ Verärgert
+ </string>
+ <string name="anim_away">
+ Abwesend
+ </string>
+ <string name="anim_backflip">
+ Rückwärtssalto
+ </string>
+ <string name="anim_express_laugh">
+ Lachkrampf
+ </string>
+ <string name="anim_express_toothsmile">
+ Grinsen
+ </string>
+ <string name="anim_blowkiss">
+ Kusshand
+ </string>
+ <string name="anim_express_bored">
+ Gelangweilt
+ </string>
+ <string name="anim_bow">
+ Verbeugen
+ </string>
+ <string name="anim_clap">
+ Klatschen
+ </string>
+ <string name="anim_courtbow">
+ Diener
+ </string>
+ <string name="anim_express_cry">
+ Weinen
+ </string>
+ <string name="anim_dance1">
+ Tanz 1
+ </string>
+ <string name="anim_dance2">
+ Tanz 2
+ </string>
+ <string name="anim_dance3">
+ Tanz 3
+ </string>
+ <string name="anim_dance4">
+ Tanz 4
+ </string>
+ <string name="anim_dance5">
+ Tanz 5
+ </string>
+ <string name="anim_dance6">
+ Tanz 6
+ </string>
+ <string name="anim_dance7">
+ Tanz 7
+ </string>
+ <string name="anim_dance8">
+ Tanz 8
+ </string>
+ <string name="anim_express_disdain">
+ Verachten
+ </string>
+ <string name="anim_drink">
+ Trinken
+ </string>
+ <string name="anim_express_embarrased">
+ Verlegen
+ </string>
+ <string name="anim_angry_fingerwag">
+ Drohen
+ </string>
+ <string name="anim_fist_pump">
+ Faust pumpen
+ </string>
+ <string name="anim_yoga_float">
+ Yogaflieger
+ </string>
+ <string name="anim_express_frown">
+ Stirnrunzeln
+ </string>
+ <string name="anim_impatient">
+ Ungeduldig
+ </string>
+ <string name="anim_jumpforjoy">
+ Freudensprung
+ </string>
+ <string name="anim_kissmybutt">
+ LMA
+ </string>
+ <string name="anim_express_kiss">
+ Küssen
+ </string>
+ <string name="anim_laugh_short">
+ Lachen
+ </string>
+ <string name="anim_musclebeach">
+ Posen
+ </string>
+ <string name="anim_no_unhappy">
+ Nein (Bedauernd)
+ </string>
+ <string name="anim_no_head">
+ Nein
+ </string>
+ <string name="anim_nyanya">
+ Ällabätsch
+ </string>
+ <string name="anim_punch_onetwo">
+ Eins-Zwei-Punch
+ </string>
+ <string name="anim_express_open_mouth">
+ Mund offen
+ </string>
+ <string name="anim_peace">
+ Friede
+ </string>
+ <string name="anim_point_you">
+ Auf anderen zeigen
+ </string>
+ <string name="anim_point_me">
+ Auf mich zeigen
+ </string>
+ <string name="anim_punch_l">
+ Linker Haken
+ </string>
+ <string name="anim_punch_r">
+ Rechter Haken
+ </string>
+ <string name="anim_rps_countdown">
+ SSP zählen
+ </string>
+ <string name="anim_rps_paper">
+ SSP Papier
+ </string>
+ <string name="anim_rps_rock">
+ SSP Stein
+ </string>
+ <string name="anim_rps_scissors">
+ SSP Schere
+ </string>
+ <string name="anim_express_repulsed">
+ Angewidert
+ </string>
+ <string name="anim_kick_roundhouse_r">
+ Rundkick
+ </string>
+ <string name="anim_express_sad">
+ Traurig
+ </string>
+ <string name="anim_salute">
+ Salutieren
+ </string>
+ <string name="anim_shout">
+ Rufen
+ </string>
+ <string name="anim_express_shrug">
+ Schulterzucken
+ </string>
+ <string name="anim_express_smile">
+ Lächeln
+ </string>
+ <string name="anim_smoke_idle">
+ Zigarette halten
+ </string>
+ <string name="anim_smoke_inhale">
+ Rauchen
+ </string>
+ <string name="anim_smoke_throw_down">
+ Zigarette wegwerfen
+ </string>
+ <string name="anim_express_surprise">
+ Ãœberraschung
+ </string>
+ <string name="anim_sword_strike_r">
+ Schwerthieb
+ </string>
+ <string name="anim_angry_tantrum">
+ Wutanfall
+ </string>
+ <string name="anim_express_tongue_out">
+ Zunge rausstrecken
+ </string>
+ <string name="anim_hello">
+ Winken
+ </string>
+ <string name="anim_whisper">
+ Flüstern
+ </string>
+ <string name="anim_whistle">
+ Pfeifen
+ </string>
+ <string name="anim_express_wink">
+ Zwinkern
+ </string>
+ <string name="anim_wink_hollywood">
+ Zwinkern (Hollywood)
+ </string>
+ <string name="anim_express_worry">
+ Sorgenvoll
+ </string>
+ <string name="anim_yes_happy">
+ Ja (Erfreut)
+ </string>
+ <string name="anim_yes_head">
+ Ja
+ </string>
+ <string name="texture_loading">
+ Wird geladen...
+ </string>
+ <string name="worldmap_offline">
+ Offline
+ </string>
+ <!-- Chat -->
+ <string name="whisper">
+ flüstert:
+ </string>
+ <string name="shout">
+ ruft:
+ </string>
+</strings>
diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml
index 6beba54540..7d1a154310 100644
--- a/indra/newview/skins/default/xui/de/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/de/teleport_strings.xml
@@ -1,90 +1,90 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<teleport_messages name="">
- <message_set name="errors">
- <message name="invalid_tport">
- Bei der Bearbeitung Ihrer Teleport-Anfrage ist ein Problem aufgetreten. Sie müssen
-sich zum Teleportieren eventuell neu anmelden. Wenn Sie diese
-Nachricht weiterhin erhalten, konsultieren Sie bitte die Tech-Support-FAQ unter:
-www.secondlife.com/support
- </message>
- <message name="invalid_region_handoff">
- Bei der Bearbeitung Ihres Regionswechsels ist ein Problem aufgetreten. Sie müssen
-sich zum Wechsel der Region eventuell neu anmelden. Wenn Sie diese
-Nachricht weiterhin erhalten, konsultieren Sie bitte die Tech-Support-FAQ unter:
-www.secondlife.com/support.
- </message>
- <message name="blocked_tport">
- Teleportieren ist zurzeit leider nicht möglich. Versuchen Sie es später noch einmal.
-Wenn der Teleport dann immer noch nicht funktioniert, melden Sie
-sich bitte ab und wieder an.
- </message>
- <message name="nolandmark_tport">
- Das System konnte das Landmarken-Ziel nicht finden.
- </message>
- <message name="timeout_tport">
- Das System konnte keine Teleport-Verbindung herstellen.
-Versuchen Sie es später noch einmal.
- </message>
- <message name="noaccess_tport">
- Sie haben leider keinen Zugang zu diesem Teleport-Ziel.
- </message>
- <message name="missing_attach_tport">
- Ihre Anhänge sind noch nicht eingetroffen. Warten Sie kurz
-oder melden Sie sich ab und wieder an, bevor Sie einen neuen
-Teleport-Versuch unternehmen.
- </message>
- <message name="too_many_uploads_tport">
- Die Asset-Warteschlange in dieser Region ist zurzeit überlastet.
-Ihre Teleport-Anfrage kann nicht sofort bearbeitet werden. Versuchen Sie es
-in einigen Minuten erneut oder besuchen Sie eine weniger überfüllte Region.
- </message>
- <message name="expired_tport">
- Das System konnte Ihre Teleport-Anfrage nicht
-rechtzeitig bearbeiten. Versuchen Sie es in einigen Minuten erneut.
- </message>
- <message name="expired_region_handoff">
- Das System konnte Ihre Anfrage zum Regionswechsel nicht
-rechtzeitig bearbeiten. Versuchen Sie es in einigen Minuten erneut.
- </message>
- <message name="no_host">
- Teleport-Ziel wurde nicht gefunden. Das Ziel ist
-entweder im Moment nicht verfügbar oder existiert nicht mehr. Versuchen Sie es
-in einigen Minuten erneut.
- </message>
- <message name="no_inventory_host">
- Das Inventarsystem ist zurzeit nicht verfügbar.
- </message>
- </message_set>
- <message_set name="progress">
- <message name="sending_dest">
- Transport zum Ziel.
- </message>
- <message name="redirecting">
- Weiterleitung an anderes Ziel.
- </message>
- <message name="relaying">
- Weiterleitung zum Ziel.
- </message>
- <message name="sending_home">
- Zuhause-Position wird ermittelt.
- </message>
- <message name="sending_landmark">
- Landmarken-Position wird ermittelt.
- </message>
- <message name="completing">
- Teleport wird abgeschlossen.
- </message>
- <message name="resolving">
- Ziel wird ermittelt.
- </message>
- <message name="contacting">
- Verbindung zu neuer Region.
- </message>
- <message name="arriving">
- Ziel erreicht...
- </message>
- <message name="requesting">
- Teleport wird initialisiert...
- </message>
- </message_set>
-</teleport_messages>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<teleport_messages name="">
+ <message_set name="errors">
+ <message name="invalid_tport">
+ Bei der Bearbeitung Ihrer Teleport-Anfrage ist ein Problem aufgetreten. Sie müssen
+sich zum Teleportieren eventuell neu anmelden. Wenn Sie diese
+Nachricht weiterhin erhalten, konsultieren Sie bitte die Tech-Support-FAQ unter:
+www.secondlife.com/support
+ </message>
+ <message name="invalid_region_handoff">
+ Bei der Bearbeitung Ihres Regionswechsels ist ein Problem aufgetreten. Sie müssen
+sich zum Wechsel der Region eventuell neu anmelden. Wenn Sie diese
+Nachricht weiterhin erhalten, konsultieren Sie bitte die Tech-Support-FAQ unter:
+www.secondlife.com/support.
+ </message>
+ <message name="blocked_tport">
+ Teleportieren ist zurzeit leider nicht möglich. Versuchen Sie es später noch einmal.
+Wenn der Teleport dann immer noch nicht funktioniert, melden Sie
+sich bitte ab und wieder an.
+ </message>
+ <message name="nolandmark_tport">
+ Das System konnte das Landmarken-Ziel nicht finden.
+ </message>
+ <message name="timeout_tport">
+ Das System konnte keine Teleport-Verbindung herstellen.
+Versuchen Sie es später noch einmal.
+ </message>
+ <message name="noaccess_tport">
+ Sie haben leider keinen Zugang zu diesem Teleport-Ziel.
+ </message>
+ <message name="missing_attach_tport">
+ Ihre Anhänge sind noch nicht eingetroffen. Warten Sie kurz
+oder melden Sie sich ab und wieder an, bevor Sie einen neuen
+Teleport-Versuch unternehmen.
+ </message>
+ <message name="too_many_uploads_tport">
+ Die Asset-Warteschlange in dieser Region ist zurzeit überlastet.
+Ihre Teleport-Anfrage kann nicht sofort bearbeitet werden. Versuchen Sie es
+in einigen Minuten erneut oder besuchen Sie eine weniger überfüllte Region.
+ </message>
+ <message name="expired_tport">
+ Das System konnte Ihre Teleport-Anfrage nicht
+rechtzeitig bearbeiten. Versuchen Sie es in einigen Minuten erneut.
+ </message>
+ <message name="expired_region_handoff">
+ Das System konnte Ihre Anfrage zum Regionswechsel nicht
+rechtzeitig bearbeiten. Versuchen Sie es in einigen Minuten erneut.
+ </message>
+ <message name="no_host">
+ Teleport-Ziel wurde nicht gefunden. Das Ziel ist
+entweder im Moment nicht verfügbar oder existiert nicht mehr. Versuchen Sie es
+in einigen Minuten erneut.
+ </message>
+ <message name="no_inventory_host">
+ Das Inventarsystem ist zurzeit nicht verfügbar.
+ </message>
+ </message_set>
+ <message_set name="progress">
+ <message name="sending_dest">
+ Transport zum Ziel.
+ </message>
+ <message name="redirecting">
+ Weiterleitung an anderes Ziel.
+ </message>
+ <message name="relaying">
+ Weiterleitung zum Ziel.
+ </message>
+ <message name="sending_home">
+ Zuhause-Position wird ermittelt.
+ </message>
+ <message name="sending_landmark">
+ Landmarken-Position wird ermittelt.
+ </message>
+ <message name="completing">
+ Teleport wird abgeschlossen.
+ </message>
+ <message name="resolving">
+ Ziel wird ermittelt.
+ </message>
+ <message name="contacting">
+ Verbindung zu neuer Region.
+ </message>
+ <message name="arriving">
+ Ziel erreicht...
+ </message>
+ <message name="requesting">
+ Teleport wird initialisiert...
+ </message>
+ </message_set>
+</teleport_messages>
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 9ff8293f84..0b3143a0e8 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="Acerca de Second Life">
- <text_editor name="credits_editor">
- Le ofrecen Second Life Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, y otros muchos.
-
- Gracias a todos estos residentes por contribuir a garantizar que, por el momento, esta es la mejor versión:
-
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
- DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
- expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
- FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
- GL Copyright (C) 1999-2004 Brian Paul.
- Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
- jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
- jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
- ogg/vorbis Copyright (C) 2001, Xiphophorus
- OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
- SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
- SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
- google-perftools Copyright (c) 2005, Google Inc.
-
- All rights reserved. See licenses.txt for details.
-
- Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
- Me las apañaré con un poco de ayuda de mis amigos. -- Richard Starkey
- </text_editor>
- <string name="you_are_at">
- Está en [POSITION]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="Acerca de Second Life">
+ <text_editor name="credits_editor">
+ Le ofrecen Second Life Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, y otros muchos.
+
+ Gracias a todos estos residentes por contribuir a garantizar que, por el momento, esta es la mejor versión:
+
+ 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+ APR Copyright (C) 2000-2004 The Apache Software Foundation
+ cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+ DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+ expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+ FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+ GL Copyright (C) 1999-2004 Brian Paul.
+ Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+ jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+ jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+ ogg/vorbis Copyright (C) 2001, Xiphophorus
+ OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+ SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+ SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+ zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+ google-perftools Copyright (c) 2005, Google Inc.
+
+ All rights reserved. See licenses.txt for details.
+
+ Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+
+
+ Me las apañaré con un poco de ayuda de mis amigos. -- Richard Starkey
+ </text_editor>
+ <string name="you_are_at">
+ Está en [POSITION]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index ad1031fcbc..526327d28b 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -1,428 +1,428 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterland" title="Acerca del terreno">
- <tab_container name="landtab">
- <panel label="General" name="land_general_panel">
- <text length="1" name="Name:" type="string">
- Nombre:
- </text>
- <text length="1" name="Description:" type="string">
- Descripción:
- </text>
- <text length="1" name="Owner:" type="string">
- Propietario:
- </text>
- <text length="1" name="OwnerText" type="string">
- Leyla Linden
- </text>
- <button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
- <text length="1" name="Group:" type="string">
- Grupo:
- </text>
- <button label="Configurar..." label_selected="Configurar..." name="Set..."/>
- <check_box label="Permitir transferir al grupo" name="check deed" tool_tip="Un oficial del grupo puede transferir este terreno al grupo. El terreno será apoyado por el grupo en sus asignaciones de terreno."/>
- <button label="Transferir..." label_selected="Transferir..." name="Deed..." tool_tip="Sólo si es usted un oficial del grupo seleccionado puede transferir terreno."/>
- <check_box label="El propietario hace una contribución transfiriendo" name="check contrib" tool_tip="Cuando el terreno se transfiere al grupo, el antiguo propietario contribuye con una asignación suficiente de terreno."/>
- <text length="1" name="For Sale:" type="string">
- En venta:
- </text>
- <text length="1" name="Not for sale." type="string">
- No está en venta.
- </text>
- <text length="1" name="For Sale: Price L$[PRICE]." type="string">
- Precio: [PRICE] L$
- </text>
- <button label="Vender el terreno..." label_selected="Vender el terreno..." name="Sell Land..."/>
- <text length="1" name="For sale to" type="string">
- En venta a: [BUYER]
- </text>
- <text length="1" name="Sell with landowners objects in parcel." type="string">
- Los objetos se incluyen en la venta.
- </text>
- <text length="1" name="Selling with no objects in parcel." type="string">
- Los objetos no se incluyen en la venta.
- </text>
- <button label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/>
- <text length="1" name="Claimed:" type="string">
- Reclamada:
- </text>
- <text length="1" name="DateClaimText" type="string">
- Mar 15 Ago 15 13:47:25 2006
- </text>
- <text length="1" name="PriceLabel" type="string">
- Superficie:
- </text>
- <text length="1" name="PriceText" type="string">
- 4048 m²
- </text>
- <text length="1" name="Traffic:" type="string">
- Tráfico:
- </text>
- <text length="1" name="DwellText" type="string">
- 0
- </text>
- <button label="Comprar terreno..." label_selected="Comprar terreno..." name="Buy Land..."/>
- <button label="Comprar para el grupo..." label_selected="Comprar para el grupo..." name="Buy For Group..."/>
- <button label="Comprar un pase..." label_selected="Comprar un pase..." name="Buy Pass..." tool_tip="Un pase le da acceso temporal a este terreno."/>
- <button label="Abandonar el terreno..." label_selected="Abandonar el terreno..." name="Abandon Land..."/>
- <button label="Reclamar el terreno..." label_selected="Reclamar el terreno..." name="Reclaim Land..."/>
- <button label="Venta Linden..." label_selected="Venta Linden..." name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/>
- <string name="new users only">
- Sólo usuarios nuevos
- </string>
- <string name="anyone">
- Cualquiera
- </string>
- <string name="area_text">
- Superficie
- </string>
- <string name="area_size_text">
- [AREA] m²
- </string>
- <string name="auction_id_text">
- ID de la subasta: [ID]
- </string>
- <string name="need_tier_to_modify">
- Debe aprobar su compra para modificar este terreno.
- </string>
- <string name="group_owned_text">
- (Propiedad del grupo)
- </string>
- <string name="profile_text">
- Perfil...
- </string>
- <string name="info_text">
- Información...
- </string>
- <string name="public_text">
- (público)
- </string>
- <string name="none_text">
- (ninguno)
- </string>
- <string name="sale_pending_text">
- (Venta pendiente)
- </string>
- <string name="no_selection_text">
- No se ha seleccionado una parcela.
-Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver sus caracterÃsticas.
- </string>
- </panel>
- <panel label="Contrato" name="land_covenant_panel">
- <text length="1" name="covenant_timestamp_text" type="string">
- Última modificación, Dic Miér 31 16:00:00 1969
- </text>
- <text length="1" name="region_name_lbl" type="string">
- Región:
- </text>
- <text length="1" name="region_name_text" type="string">
- leyla
- </text>
- <text length="1" name="estate_name_lbl" type="string">
- Estado:
- </text>
- <text length="1" name="estate_name_text" type="string">
- mainland
- </text>
- <text length="1" name="estate_owner_lbl" type="string">
- Propietario del estado:
- </text>
- <text length="1" name="estate_owner_text" type="string">
- (nadie)
- </text>
- <text length="1" name="resellable_clause" type="string">
- El terreno comprado en esta región no se podrá revender.
- </text>
- <text length="1" name="changeable_clause" type="string">
- El terreno comprado en esta región no se podrá unir/dividir.
- </text>
- <text_editor length="1" name="covenant_editor" type="string">
- No se ha aportado un contrato para este estado.
- </text_editor>
- <string name="can_resell">
- El terreno comprado en esta región se podrá revender.
- </string>
- <string name="can_not_resell">
- El terreno comprado en esta región no se podrá revender.
- </string>
- <string name="can_change">
- El terreno comprado en esta región se podrá unir o dividir.
- </string>
- <string name="can_not_change">
- PEl terreno comprado en esta región no se podrá unir o dividir.
- </string>
- </panel>
- <panel label="Objetos" name="land_objects_panel">
- <text name="parcel_object_bonus">
- Plus de objetos en la región: [BONUS]
- </text>
- <text length="1" name="Simulator primitive usage:" type="string">
- Simulador de uso de prims:
- </text>
- <text name="objects_available">
- [COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles)
- </text>
- <string name="objects_available_text">
- [COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles)
- </string>
- <string name="objects_deleted_text">
- [COUNT] de un máximo de [MAX] ([DELETED] se borrarán)
- </string>
- <text length="1" name="Primitives parcel supports:" type="string">
- Prims que admite la parcela:
- </text>
- <text name="object_contrib_text">
- [COUNT]
- </text>
- <text length="1" name="Primitives on parcel:" type="string">
- Prims en la parcela:
- </text>
- <text name="total_objects_text">
- [COUNT]
- </text>
- <text length="1" name="Owned by parcel owner:" type="string">
- Del propietario de la parcela:
- </text>
- <text name="owner_objects_text">
- [COUNT]
- </text>
- <button label="Mostrar" label_selected="Mostrar" name="ShowOwner"/>
- <button label="Devolver..." label_selected="Devolver..." name="ReturnOwner..." tool_tip="Devolver los objetos a sus propietarios."/>
- <text length="1" name="Set to group:" type="string">
- Del grupo:
- </text>
- <text name="group_objects_text">
- [COUNT]
- </text>
- <button label="Mostrar" label_selected="Mostrar" name="ShowGroup"/>
- <button label="Devolver..." label_selected="Devolver..." name="ReturnGroup..." tool_tip="Devolver los objetos a sus propietarios."/>
- <text length="1" name="Owned by others:" type="string">
- Propiedad de otros:
- </text>
- <text name="other_objects_text">
- [COUNT]
- </text>
- <button label="Mostrar" label_selected="Mostrar" name="ShowOther"/>
- <button label="Devolver..." label_selected="Devolver..." name="ReturnOther..." tool_tip="Devolver los objetos a sus propietarios."/>
- <text length="1" name="Selected / sat upon:" type="string">
- Seleccionados / con gente sentada:
- </text>
- <text name="selected_objects_text">
- [COUNT]
- </text>
- <text name="Autoreturn">
- Autodevolución de objetos a otros residentes (minutos; 0 la desactiva):
- </text>
- <text length="1" name="Object Owners:" type="string">
- Propietarios de los objetos:
- </text>
- <button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh List"/>
- <button label="Devolver los objetos..." label_selected="Devolver los objetos..." name="Return objects..."/>
- <name_list name="owner list">
- <column label="Tipo" name="type"/>
- <column label="Nombre" name="name"/>
- <column label="Número" name="count"/>
- <column label="Más recientes" name="mostrecent"/>
- </name_list>
- </panel>
- <panel label="Opciones" name="land_options_panel">
- <text length="1" name="allow_label" type="string">
- Permitir a otros residentes:
- </text>
- <check_box label="Editar el terreno" name="edit land check" tool_tip="Si se marca, cualquiera podrá modificar su terreno. Mejor dejarlo desmarcado, pues usted siempre puede modificar su terreno."/>
- <check_box label="Crear hitos" name="check landmark"/>
- <check_box label="Volar" name="check fly" tool_tip="Si se marca, los residentes podrán volar en su terreno. Si no, sólo podrán volar al cruzarlo o hasta que aterricen en él."/>
- <text length="1" name="allow_label2" type="string">
- Crear objetos:
- </text>
- <check_box label="Todos los residentes" name="edit objects check"/>
- <check_box label="El grupo" name="edit group objects check"/>
- <text length="1" name="allow_label3" type="string">
- Dejar objetos:
- </text>
- <check_box label="Todos los residentes" name="all object entry check"/>
- <check_box label="El grupo" name="group object entry check"/>
- <text length="1" name="allow_label4" type="string">
- Ejecutar scripts:
- </text>
- <check_box label="Todos los residentes" name="check other scripts"/>
- <check_box label="El grupo" name="check group scripts"/>
- <text length="1" name="land_options_label" type="string">
- Opciones del terreno:
- </text>
- <check_box label="Seguro (sin daño)" name="check safe" tool_tip="Si se marca, convierte el terreno en 'seguro', desactivando el daño en combate. Si no, se activa el daño en combate."/>
- <check_box label="Sin 'empujones'" name="PushRestrictCheck" tool_tip="Previene scripts que empujen. Marcando esta opción prevendrá que en su terreno haya comportamientos destructivos."/>
- <check_box label="Mostrar la parcela en Buscar (30 L$/semana) en" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/>
- <combo_box name="land category">
- <combo_item name="AnyCategory">
- Cualquier categorÃa
- </combo_item>
- <combo_item name="LindenLocation">
- Localización Linden
- </combo_item>
-
- <combo_item name="Arts&Culture">
- Arte y Cultura
- </combo_item>
- <combo_item name="Business">
- Negocios
- </combo_item>
- <combo_item name="Educational">
- Educativo
- </combo_item>
- <combo_item name="Gaming">
- Juegos de azar
- </combo_item>
- <combo_item name="Hangout">
- Entretenimiento
- </combo_item>
- <combo_item name="NewcomerFriendly">
- Para recién llegados
- </combo_item>
- <combo_item name="Parks&Nature">
- Parques y Naturaleza
- </combo_item>
- <combo_item name="Residential">
- Residencial
- </combo_item>
- <combo_item name="Shopping">
- Compras
- </combo_item>
- <combo_item name="Other">
- Otra
- </combo_item>
- </combo_box>
- <button label="?" label_selected="?" name="?"/>
- <check_box name="MatureCheck" />
- <text length="1" name="Snapshot:" type="string">
- Foto:
- </text>
- <texture_picker label="" name="snapshot_ctrl" tool_tip="Pulse para elegir una imagen"/>
- <text name="landing_point">
- Punto de llegada: [LANDING]
- </text>
- <string name="landing_point_none">
- (ninguno)
- </string>
- <button label="Definir" label_selected="Definir" name="Set" tool_tip="Configura el punto de llegada donde aparecerán los visitantes. Configúrelo a la posición de su avatar dentro de esta parcela."/>
- <button label="Borrar" label_selected="Borrar" name="Clear" tool_tip="Borrar el punto de llegada."/>
- <text length="1" name="Teleport Routing: " type="string">
- Punto de teleporte:
- </text>
- <combo_box name="landing type" tool_tip="Punto de teleporte: defina cómo manejar en su terreno los teleportes.">
- <combo_item length="1" name="Blocked" type="string">
- Bloqueado
- </combo_item>
- <combo_item length="1" name="LandingPoint" type="string">
- Punto de llegada
- </combo_item>
- <combo_item length="1" name="Anywhere" type="string">
- Cualquiera
- </combo_item>
- </combo_box>
- <string name="push_restrict_text">
- Sin 'empujones'
- </string>
- <string name="push_restrict_region_text">
- Sin 'empujones' (prevalece lo marcado en la región)
- </string>
- </panel>
- <panel label="Media" name="land_media_panel">
- <text name="with media:">
- Tipo de media:
- </text>
- <combo_box name="media type" tool_tip="Especifique si la URL es una pelÃcula, una web, u otro media"/>
- <text name="at URL:">
- URL del media:
- </text>
- <button label="Definir..." label_selected="Definir..." name="set_media_url"/>
- <text name="Description:">
- Descripción:
- </text>
- <line_editor name="url_description" tool_tip="Texto a mostrar cerca del botón play/cargar"/>
- <text length="1" name="Media texture:" type="string">
- Cambiar
-la textura:
- </text>
- <texture_picker label="" name="media texture" tool_tip="Pulse para elegir una imagen"/>
- <text name="replace_texture_help">
- (Los objetos que usen esta textura mostrarán la pelÃcula o la web
-cuando pulse la flecha de play)
- </text>
- <text name="Options:">
- Opciones de
-los media:
- </text>
- <check_box label="Escala automática" name="media_auto_scale" tool_tip="Marcando esta opción, se ajustará el tamaño del contenido automáticamente. Puede ser ligeramente más lento y con menor calidad visual, pero no tendrá que ajustar ni alinear ninguna textura."/>
- <check_box label="Media en bucle" name="media_loop" tool_tip="Ejecuta el media en bucle: cuando acaba su ejecución, vuelve a empezar."/>
- <check_box label="Ocultar la URL del media" name="hide_media_url" tool_tip="Marcando esta opción esconderá en la información de esta parcela -a quien no esté autorizado a verla- la URL del media. Note que esto no está disponible para HTML."/>
- <check_box label="Ocultar la URL de la música" name="hide_music_url" tool_tip="Marcando esta opción esconderá en la información de esta parcela -a quien no esté autorizado a verla- la URL de la música"/>
- <text name="media_size" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto).">
- Tamaño del media:
- </text>
- <spinner name="media_size_width" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto)."/>
- <spinner name="media_size_height" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto)."/>
- <text name="pixels">
- pÃxeles
- </text>
- <text name="MusicURL:">
- URL de la música:
- </text>
- <text name="Sound:">
- Sonido:
- </text>
- <check_box label="Limitar el sonido a sólo esta parcela" name="check sound local"/>
- <text name="Voice settings:">
- Voz:
- </text>
- <radio_group name="parcel_voice_channel">
- <radio_item name="Estate">
- Usar el canal del estado
- </radio_item>
- <radio_item name="Private">
- Usar un canal privado
- </radio_item>
- <radio_item name="Disabled">
- Desactivar el audio ambiental en esta parcela
- </radio_item>
- </radio_group>
- </panel>
- <panel label="Acceso" name="land_access_panel">
- <text length="1" name="Limit access to this parcel to:" type="string">
- Acceso a esta parcela
- </text>
- <check_box label="Permitir el acceso público" name="public_access"/>
- <text name="Only Allow">
- Impedir el acceso a:
- </text>
- <check_box label="Residentes que no hayan dado a Linden Lab información de su forma de pago" name="limit_payment" tool_tip="Impedir el acceso a los residentes no identificados."/>
- <check_box label="Residentes de los que no se ha verificado si son adultos" name="limit_age_verified" tool_tip="Residentes que no hayan verificado su edad. Para más información, vea support.secondlife.com"/>
- <string name="estate_override">
- Una o más de esta opciones está configurada a nivel del estado
- </string>
- <check_box label="Acceso permitido al grupo: [GROUP]" name="GroupCheck" tool_tip="Elija el grupo en la pestaña General."/>
- <check_box label="Vender pases a:" name="PassCheck" tool_tip="Permitir acceso temporal a esta parcela"/>
- <combo_box name="pass_combo">
- <combo_item name="Anyone">
- Cualquiera
- </combo_item>
- <combo_item name="Group">
- Grupo
- </combo_item>
- </combo_box>
- <spinner label="Precio en L$:" name="PriceSpin"/>
- <spinner label="Horas de acceso:" name="HoursSpin"/>
- <text label="Permitir siempre" name="AllowedText">
- Residentes autorizados
- </text>
- <name_list name="AccessList" tool_tip="([LISTED] listados, el máx. es de [MAX])"/>
- <button label="Añadir..." label_selected="Añadir..." name="add_allowed"/>
- <button label="Quitar" label_selected="Quitar" name="remove_allowed"/>
- <text label="Prohibir el acceso" name="BanCheck">
- Residentes con el acceso prohibido
- </text>
- <name_list name="BannedList" tool_tip="([LISTED] listados, el máx. es de [MAX])"/>
- <button label="Añadir..." label_selected="Añadir..." name="add_banned"/>
- <button label="Quitar" label_selected="Quitar" name="remove_banned"/>
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterland" title="Acerca del terreno">
+ <tab_container name="landtab">
+ <panel label="General" name="land_general_panel">
+ <text length="1" name="Name:" type="string">
+ Nombre:
+ </text>
+ <text length="1" name="Description:" type="string">
+ Descripción:
+ </text>
+ <text length="1" name="Owner:" type="string">
+ Propietario:
+ </text>
+ <text length="1" name="OwnerText" type="string">
+ Leyla Linden
+ </text>
+ <button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
+ <text length="1" name="Group:" type="string">
+ Grupo:
+ </text>
+ <button label="Configurar..." label_selected="Configurar..." name="Set..."/>
+ <check_box label="Permitir transferir al grupo" name="check deed" tool_tip="Un oficial del grupo puede transferir este terreno al grupo. El terreno será apoyado por el grupo en sus asignaciones de terreno."/>
+ <button label="Transferir..." label_selected="Transferir..." name="Deed..." tool_tip="Sólo si es usted un oficial del grupo seleccionado puede transferir terreno."/>
+ <check_box label="El propietario hace una contribución transfiriendo" name="check contrib" tool_tip="Cuando el terreno se transfiere al grupo, el antiguo propietario contribuye con una asignación suficiente de terreno."/>
+ <text length="1" name="For Sale:" type="string">
+ En venta:
+ </text>
+ <text length="1" name="Not for sale." type="string">
+ No está en venta.
+ </text>
+ <text length="1" name="For Sale: Price L$[PRICE]." type="string">
+ Precio: [PRICE] L$
+ </text>
+ <button label="Vender el terreno..." label_selected="Vender el terreno..." name="Sell Land..."/>
+ <text length="1" name="For sale to" type="string">
+ En venta a: [BUYER]
+ </text>
+ <text length="1" name="Sell with landowners objects in parcel." type="string">
+ Los objetos se incluyen en la venta.
+ </text>
+ <text length="1" name="Selling with no objects in parcel." type="string">
+ Los objetos no se incluyen en la venta.
+ </text>
+ <button label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/>
+ <text length="1" name="Claimed:" type="string">
+ Reclamada:
+ </text>
+ <text length="1" name="DateClaimText" type="string">
+ Mar 15 Ago 15 13:47:25 2006
+ </text>
+ <text length="1" name="PriceLabel" type="string">
+ Superficie:
+ </text>
+ <text length="1" name="PriceText" type="string">
+ 4048 m²
+ </text>
+ <text length="1" name="Traffic:" type="string">
+ Tráfico:
+ </text>
+ <text length="1" name="DwellText" type="string">
+ 0
+ </text>
+ <button label="Comprar terreno..." label_selected="Comprar terreno..." name="Buy Land..."/>
+ <button label="Comprar para el grupo..." label_selected="Comprar para el grupo..." name="Buy For Group..."/>
+ <button label="Comprar un pase..." label_selected="Comprar un pase..." name="Buy Pass..." tool_tip="Un pase le da acceso temporal a este terreno."/>
+ <button label="Abandonar el terreno..." label_selected="Abandonar el terreno..." name="Abandon Land..."/>
+ <button label="Reclamar el terreno..." label_selected="Reclamar el terreno..." name="Reclaim Land..."/>
+ <button label="Venta Linden..." label_selected="Venta Linden..." name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/>
+ <string name="new users only">
+ Sólo usuarios nuevos
+ </string>
+ <string name="anyone">
+ Cualquiera
+ </string>
+ <string name="area_text">
+ Superficie
+ </string>
+ <string name="area_size_text">
+ [AREA] m²
+ </string>
+ <string name="auction_id_text">
+ ID de la subasta: [ID]
+ </string>
+ <string name="need_tier_to_modify">
+ Debe aprobar su compra para modificar este terreno.
+ </string>
+ <string name="group_owned_text">
+ (Propiedad del grupo)
+ </string>
+ <string name="profile_text">
+ Perfil...
+ </string>
+ <string name="info_text">
+ Información...
+ </string>
+ <string name="public_text">
+ (público)
+ </string>
+ <string name="none_text">
+ (ninguno)
+ </string>
+ <string name="sale_pending_text">
+ (Venta pendiente)
+ </string>
+ <string name="no_selection_text">
+ No se ha seleccionado una parcela.
+Vaya al menú Mundo > Acerca del terreno o seleccione otra parcela para ver sus caracterÃsticas.
+ </string>
+ </panel>
+ <panel label="Contrato" name="land_covenant_panel">
+ <text length="1" name="covenant_timestamp_text" type="string">
+ Última modificación, Dic Miér 31 16:00:00 1969
+ </text>
+ <text length="1" name="region_name_lbl" type="string">
+ Región:
+ </text>
+ <text length="1" name="region_name_text" type="string">
+ leyla
+ </text>
+ <text length="1" name="estate_name_lbl" type="string">
+ Estado:
+ </text>
+ <text length="1" name="estate_name_text" type="string">
+ mainland
+ </text>
+ <text length="1" name="estate_owner_lbl" type="string">
+ Propietario del estado:
+ </text>
+ <text length="1" name="estate_owner_text" type="string">
+ (nadie)
+ </text>
+ <text length="1" name="resellable_clause" type="string">
+ El terreno comprado en esta región no se podrá revender.
+ </text>
+ <text length="1" name="changeable_clause" type="string">
+ El terreno comprado en esta región no se podrá unir/dividir.
+ </text>
+ <text_editor length="1" name="covenant_editor" type="string">
+ No se ha aportado un contrato para este estado.
+ </text_editor>
+ <string name="can_resell">
+ El terreno comprado en esta región se podrá revender.
+ </string>
+ <string name="can_not_resell">
+ El terreno comprado en esta región no se podrá revender.
+ </string>
+ <string name="can_change">
+ El terreno comprado en esta región se podrá unir o dividir.
+ </string>
+ <string name="can_not_change">
+ PEl terreno comprado en esta región no se podrá unir o dividir.
+ </string>
+ </panel>
+ <panel label="Objetos" name="land_objects_panel">
+ <text name="parcel_object_bonus">
+ Plus de objetos en la región: [BONUS]
+ </text>
+ <text length="1" name="Simulator primitive usage:" type="string">
+ Simulador de uso de prims:
+ </text>
+ <text name="objects_available">
+ [COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles)
+ </text>
+ <string name="objects_available_text">
+ [COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles)
+ </string>
+ <string name="objects_deleted_text">
+ [COUNT] de un máximo de [MAX] ([DELETED] se borrarán)
+ </string>
+ <text length="1" name="Primitives parcel supports:" type="string">
+ Prims que admite la parcela:
+ </text>
+ <text name="object_contrib_text">
+ [COUNT]
+ </text>
+ <text length="1" name="Primitives on parcel:" type="string">
+ Prims en la parcela:
+ </text>
+ <text name="total_objects_text">
+ [COUNT]
+ </text>
+ <text length="1" name="Owned by parcel owner:" type="string">
+ Del propietario de la parcela:
+ </text>
+ <text name="owner_objects_text">
+ [COUNT]
+ </text>
+ <button label="Mostrar" label_selected="Mostrar" name="ShowOwner"/>
+ <button label="Devolver..." label_selected="Devolver..." name="ReturnOwner..." tool_tip="Devolver los objetos a sus propietarios."/>
+ <text length="1" name="Set to group:" type="string">
+ Del grupo:
+ </text>
+ <text name="group_objects_text">
+ [COUNT]
+ </text>
+ <button label="Mostrar" label_selected="Mostrar" name="ShowGroup"/>
+ <button label="Devolver..." label_selected="Devolver..." name="ReturnGroup..." tool_tip="Devolver los objetos a sus propietarios."/>
+ <text length="1" name="Owned by others:" type="string">
+ Propiedad de otros:
+ </text>
+ <text name="other_objects_text">
+ [COUNT]
+ </text>
+ <button label="Mostrar" label_selected="Mostrar" name="ShowOther"/>
+ <button label="Devolver..." label_selected="Devolver..." name="ReturnOther..." tool_tip="Devolver los objetos a sus propietarios."/>
+ <text length="1" name="Selected / sat upon:" type="string">
+ Seleccionados / con gente sentada:
+ </text>
+ <text name="selected_objects_text">
+ [COUNT]
+ </text>
+ <text name="Autoreturn">
+ Autodevolución de objetos a otros residentes (minutos; 0 la desactiva):
+ </text>
+ <text length="1" name="Object Owners:" type="string">
+ Propietarios de los objetos:
+ </text>
+ <button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh List"/>
+ <button label="Devolver los objetos..." label_selected="Devolver los objetos..." name="Return objects..."/>
+ <name_list name="owner list">
+ <column label="Tipo" name="type"/>
+ <column label="Nombre" name="name"/>
+ <column label="Número" name="count"/>
+ <column label="Más recientes" name="mostrecent"/>
+ </name_list>
+ </panel>
+ <panel label="Opciones" name="land_options_panel">
+ <text length="1" name="allow_label" type="string">
+ Permitir a otros residentes:
+ </text>
+ <check_box label="Editar el terreno" name="edit land check" tool_tip="Si se marca, cualquiera podrá modificar su terreno. Mejor dejarlo desmarcado, pues usted siempre puede modificar su terreno."/>
+ <check_box label="Crear hitos" name="check landmark"/>
+ <check_box label="Volar" name="check fly" tool_tip="Si se marca, los residentes podrán volar en su terreno. Si no, sólo podrán volar al cruzarlo o hasta que aterricen en él."/>
+ <text length="1" name="allow_label2" type="string">
+ Crear objetos:
+ </text>
+ <check_box label="Todos los residentes" name="edit objects check"/>
+ <check_box label="El grupo" name="edit group objects check"/>
+ <text length="1" name="allow_label3" type="string">
+ Dejar objetos:
+ </text>
+ <check_box label="Todos los residentes" name="all object entry check"/>
+ <check_box label="El grupo" name="group object entry check"/>
+ <text length="1" name="allow_label4" type="string">
+ Ejecutar scripts:
+ </text>
+ <check_box label="Todos los residentes" name="check other scripts"/>
+ <check_box label="El grupo" name="check group scripts"/>
+ <text length="1" name="land_options_label" type="string">
+ Opciones del terreno:
+ </text>
+ <check_box label="Seguro (sin daño)" name="check safe" tool_tip="Si se marca, convierte el terreno en 'seguro', desactivando el daño en combate. Si no, se activa el daño en combate."/>
+ <check_box label="Sin 'empujones'" name="PushRestrictCheck" tool_tip="Previene scripts que empujen. Marcando esta opción prevendrá que en su terreno haya comportamientos destructivos."/>
+ <check_box label="Mostrar la parcela en Buscar (30 L$/semana) en" name="ShowDirectoryCheck" tool_tip="Let people see this parcel in search results"/>
+ <combo_box name="land category">
+ <combo_item name="AnyCategory">
+ Cualquier categorÃa
+ </combo_item>
+ <combo_item name="LindenLocation">
+ Localización Linden
+ </combo_item>
+
+ <combo_item name="Arts&Culture">
+ Arte y Cultura
+ </combo_item>
+ <combo_item name="Business">
+ Negocios
+ </combo_item>
+ <combo_item name="Educational">
+ Educativo
+ </combo_item>
+ <combo_item name="Gaming">
+ Juegos de azar
+ </combo_item>
+ <combo_item name="Hangout">
+ Entretenimiento
+ </combo_item>
+ <combo_item name="NewcomerFriendly">
+ Para recién llegados
+ </combo_item>
+ <combo_item name="Parks&Nature">
+ Parques y Naturaleza
+ </combo_item>
+ <combo_item name="Residential">
+ Residencial
+ </combo_item>
+ <combo_item name="Shopping">
+ Compras
+ </combo_item>
+ <combo_item name="Other">
+ Otra
+ </combo_item>
+ </combo_box>
+ <button label="?" label_selected="?" name="?"/>
+ <check_box name="MatureCheck" />
+ <text length="1" name="Snapshot:" type="string">
+ Foto:
+ </text>
+ <texture_picker label="" name="snapshot_ctrl" tool_tip="Pulse para elegir una imagen"/>
+ <text name="landing_point">
+ Punto de llegada: [LANDING]
+ </text>
+ <string name="landing_point_none">
+ (ninguno)
+ </string>
+ <button label="Definir" label_selected="Definir" name="Set" tool_tip="Configura el punto de llegada donde aparecerán los visitantes. Configúrelo a la posición de su avatar dentro de esta parcela."/>
+ <button label="Borrar" label_selected="Borrar" name="Clear" tool_tip="Borrar el punto de llegada."/>
+ <text length="1" name="Teleport Routing: " type="string">
+ Punto de teleporte:
+ </text>
+ <combo_box name="landing type" tool_tip="Punto de teleporte: defina cómo manejar en su terreno los teleportes.">
+ <combo_item length="1" name="Blocked" type="string">
+ Bloqueado
+ </combo_item>
+ <combo_item length="1" name="LandingPoint" type="string">
+ Punto de llegada
+ </combo_item>
+ <combo_item length="1" name="Anywhere" type="string">
+ Cualquiera
+ </combo_item>
+ </combo_box>
+ <string name="push_restrict_text">
+ Sin 'empujones'
+ </string>
+ <string name="push_restrict_region_text">
+ Sin 'empujones' (prevalece lo marcado en la región)
+ </string>
+ </panel>
+ <panel label="Media" name="land_media_panel">
+ <text name="with media:">
+ Tipo de media:
+ </text>
+ <combo_box name="media type" tool_tip="Especifique si la URL es una pelÃcula, una web, u otro media"/>
+ <text name="at URL:">
+ URL del media:
+ </text>
+ <button label="Definir..." label_selected="Definir..." name="set_media_url"/>
+ <text name="Description:">
+ Descripción:
+ </text>
+ <line_editor name="url_description" tool_tip="Texto a mostrar cerca del botón play/cargar"/>
+ <text length="1" name="Media texture:" type="string">
+ Cambiar
+la textura:
+ </text>
+ <texture_picker label="" name="media texture" tool_tip="Pulse para elegir una imagen"/>
+ <text name="replace_texture_help">
+ (Los objetos que usen esta textura mostrarán la pelÃcula o la web
+cuando pulse la flecha de play)
+ </text>
+ <text name="Options:">
+ Opciones de
+los media:
+ </text>
+ <check_box label="Escala automática" name="media_auto_scale" tool_tip="Marcando esta opción, se ajustará el tamaño del contenido automáticamente. Puede ser ligeramente más lento y con menor calidad visual, pero no tendrá que ajustar ni alinear ninguna textura."/>
+ <check_box label="Media en bucle" name="media_loop" tool_tip="Ejecuta el media en bucle: cuando acaba su ejecución, vuelve a empezar."/>
+ <check_box label="Ocultar la URL del media" name="hide_media_url" tool_tip="Marcando esta opción esconderá en la información de esta parcela -a quien no esté autorizado a verla- la URL del media. Note que esto no está disponible para HTML."/>
+ <check_box label="Ocultar la URL de la música" name="hide_music_url" tool_tip="Marcando esta opción esconderá en la información de esta parcela -a quien no esté autorizado a verla- la URL de la música"/>
+ <text name="media_size" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto).">
+ Tamaño del media:
+ </text>
+ <spinner name="media_size_width" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto)."/>
+ <spinner name="media_size_height" tool_tip="Tamaño en el que mostrar las web (marque 0 para por defecto)."/>
+ <text name="pixels">
+ pÃxeles
+ </text>
+ <text name="MusicURL:">
+ URL de la música:
+ </text>
+ <text name="Sound:">
+ Sonido:
+ </text>
+ <check_box label="Limitar el sonido a sólo esta parcela" name="check sound local"/>
+ <text name="Voice settings:">
+ Voz:
+ </text>
+ <radio_group name="parcel_voice_channel">
+ <radio_item name="Estate">
+ Usar el canal del estado
+ </radio_item>
+ <radio_item name="Private">
+ Usar un canal privado
+ </radio_item>
+ <radio_item name="Disabled">
+ Desactivar el audio ambiental en esta parcela
+ </radio_item>
+ </radio_group>
+ </panel>
+ <panel label="Acceso" name="land_access_panel">
+ <text length="1" name="Limit access to this parcel to:" type="string">
+ Acceso a esta parcela
+ </text>
+ <check_box label="Permitir el acceso público" name="public_access"/>
+ <text name="Only Allow">
+ Impedir el acceso a:
+ </text>
+ <check_box label="Residentes que no hayan dado a Linden Lab información de su forma de pago" name="limit_payment" tool_tip="Impedir el acceso a los residentes no identificados."/>
+ <check_box label="Residentes de los que no se ha verificado si son adultos" name="limit_age_verified" tool_tip="Residentes que no hayan verificado su edad. Para más información, vea support.secondlife.com"/>
+ <string name="estate_override">
+ Una o más de esta opciones está configurada a nivel del estado
+ </string>
+ <check_box label="Acceso permitido al grupo: [GROUP]" name="GroupCheck" tool_tip="Elija el grupo en la pestaña General."/>
+ <check_box label="Vender pases a:" name="PassCheck" tool_tip="Permitir acceso temporal a esta parcela"/>
+ <combo_box name="pass_combo">
+ <combo_item name="Anyone">
+ Cualquiera
+ </combo_item>
+ <combo_item name="Group">
+ Grupo
+ </combo_item>
+ </combo_box>
+ <spinner label="Precio en L$:" name="PriceSpin"/>
+ <spinner label="Horas de acceso:" name="HoursSpin"/>
+ <text label="Permitir siempre" name="AllowedText">
+ Residentes autorizados
+ </text>
+ <name_list name="AccessList" tool_tip="([LISTED] listados, el máx. es de [MAX])"/>
+ <button label="Añadir..." label_selected="Añadir..." name="add_allowed"/>
+ <button label="Quitar" label_selected="Quitar" name="remove_allowed"/>
+ <text label="Prohibir el acceso" name="BanCheck">
+ Residentes con el acceso prohibido
+ </text>
+ <name_list name="BannedList" tool_tip="([LISTED] listados, el máx. es de [MAX])"/>
+ <button label="Añadir..." label_selected="Añadir..." name="add_banned"/>
+ <button label="Quitar" label_selected="Quitar" name="remove_banned"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_animation_preview.xml b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
index 73522e51c1..a5b9847c4f 100644
--- a/indra/newview/skins/default/xui/es/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
@@ -1,164 +1,164 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
- <text name="name_label">
- Nombre:
- </text>
- <text name="description_label">
- Descripción:
- </text>
- <spinner label="Prioridad" name="priority" tool_tip="Controle qué otras animaciones pueden ser anuladas por ésta."/>
- <check_box label="Bucle" name="loop_check" tool_tip="Haga esta animación en bucle."/>
- <spinner label="Empieza(%)" name="loop_in_point" tool_tip="Indique el punto en el que la animación empieza el bucle."/>
- <spinner label="Acaba(%)" name="loop_out_point" tool_tip="Indique el punto en el que la animación acaba el bucle."/>
- <text name="hand_label">
- Posición de las manos
- </text>
- <combo_box label="" name="hand_pose_combo" tool_tip="Control de lo que hacen las manos durante la animación.">
- <combo_item name="Spread">
- Extendidas
- </combo_item>
- <combo_item name="Relaxed">
- Relajadas
- </combo_item>
- <combo_item name="PointBoth">
- Ambas señalan
- </combo_item>
- <combo_item name="Fist">
- Puño
- </combo_item>
- <combo_item name="RelaxedLeft">
- La izquierda relajada
- </combo_item>
- <combo_item name="PointLeft">
- La izquierda señala
- </combo_item>
- <combo_item name="FistLeft">
- Puño en la izquierda
- </combo_item>
- <combo_item name="RelaxedRight">
- La derecha relajada
- </combo_item>
- <combo_item name="PointRight">
- La derecha señala
- </combo_item>
- <combo_item name="FistRight">
- Puño en la derecha
- </combo_item>
- <combo_item name="SaluteRight">
- La derecha saluda
- </combo_item>
- <combo_item name="Typing">
- Escribiendo
- </combo_item>
- <combo_item name="PeaceRight">
- Paz en la derecha
- </combo_item>
- </combo_box>
- <text name="emote_label">
- Expresión
- </text>
- <combo_box label="" name="emote_combo" tool_tip="Controle qué hace la cara durante la animación.">
- <combo_item name="[None]">
- [Nada]
- </combo_item>
- <combo_item name="Aaaaah">
- Aaaaah
- </combo_item>
- <combo_item name="Afraid">
- Con miedo
- </combo_item>
- <combo_item name="Angry">
- Enfadada
- </combo_item>
- <combo_item name="BigSmile">
- Gran sonrisa
- </combo_item>
- <combo_item name="Bored">
- Aburrida
- </combo_item>
- <combo_item name="Cry">
- Llorar
- </combo_item>
- <combo_item name="Disdain">
- Desdén
- </combo_item>
- <combo_item name="Embarrassed">
- Avergonzada
- </combo_item>
- <combo_item name="Frown">
- Fruncir el ceño
- </combo_item>
- <combo_item name="Kiss">
- Besar
- </combo_item>
- <combo_item name="Laugh">
- ReÃr
- </combo_item>
- <combo_item name="Plllppt">
- Sacar la lengua
- </combo_item>
- <combo_item name="Repulsed">
- Rechazo
- </combo_item>
- <combo_item name="Sad">
- Triste
- </combo_item>
- <combo_item name="Shrug">
- Encogerse de hombros
- </combo_item>
- <combo_item name="Smile">
- Sonrisa
- </combo_item>
- <combo_item name="Surprise">
- Sorpresa
- </combo_item>
- <combo_item name="Wink">
- Guiño
- </combo_item>
- <combo_item name="Worry">
- Preocupación
- </combo_item>
- </combo_box>
- <text name="preview_label">
- Vista previa mientras
- </text>
- <combo_box label="" name="preview_base_anim" tool_tip="Compruebe cómo se comporta su animación a la vez que el avatar realiza acciones comunes.">
- <combo_item name="Standing">
- Estar de pie
- </combo_item>
- <combo_item name="Walking">
- Caminar
- </combo_item>
- <combo_item name="Sitting">
- Estar sentado
- </combo_item>
- <combo_item name="Flying">
- Volar
- </combo_item>
- </combo_box>
- <spinner label="Combinar (sec)" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones."/>
- <spinner label="Dejar de combinar (sec)" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones."/>
- <button label="" name="play_btn" tool_tip="Mover/Pausar su animación."/>
- <button label="" name="stop_btn" tool_tip="Parar la repetición de la animación"/>
- <slider label="" name="playback_slider"/>
- <text name="bad_animation_text">
- No se ha podido leer el archivo de la animación.
-
-Recomendamos usar archivos BVH exportados de Poser 4.
- </text>
- <button label="Cancelar" name="cancel_btn"/>
- <button label="Subir ([AMOUNT] L$)" name="ok_btn"/>
- <string name="failed_to_initialize">
- Fallo al iniciar el movimiento
- </string>
- <string name="anim_too_long">
- El archivo de la animación dura [LENGTH] segundos.
-
-La duración máxima de una animación es de [MAX_LENGTH] segundos.
- </string>
- <string name="failed_file_read">
- No se ha podido leer el archivo de la animación.
-
-[STATUS]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Animation Preview" title="">
+ <text name="name_label">
+ Nombre:
+ </text>
+ <text name="description_label">
+ Descripción:
+ </text>
+ <spinner label="Prioridad" name="priority" tool_tip="Controle qué otras animaciones pueden ser anuladas por ésta."/>
+ <check_box label="Bucle" name="loop_check" tool_tip="Haga esta animación en bucle."/>
+ <spinner label="Empieza(%)" name="loop_in_point" tool_tip="Indique el punto en el que la animación empieza el bucle."/>
+ <spinner label="Acaba(%)" name="loop_out_point" tool_tip="Indique el punto en el que la animación acaba el bucle."/>
+ <text name="hand_label">
+ Posición de las manos
+ </text>
+ <combo_box label="" name="hand_pose_combo" tool_tip="Control de lo que hacen las manos durante la animación.">
+ <combo_item name="Spread">
+ Extendidas
+ </combo_item>
+ <combo_item name="Relaxed">
+ Relajadas
+ </combo_item>
+ <combo_item name="PointBoth">
+ Ambas señalan
+ </combo_item>
+ <combo_item name="Fist">
+ Puño
+ </combo_item>
+ <combo_item name="RelaxedLeft">
+ La izquierda relajada
+ </combo_item>
+ <combo_item name="PointLeft">
+ La izquierda señala
+ </combo_item>
+ <combo_item name="FistLeft">
+ Puño en la izquierda
+ </combo_item>
+ <combo_item name="RelaxedRight">
+ La derecha relajada
+ </combo_item>
+ <combo_item name="PointRight">
+ La derecha señala
+ </combo_item>
+ <combo_item name="FistRight">
+ Puño en la derecha
+ </combo_item>
+ <combo_item name="SaluteRight">
+ La derecha saluda
+ </combo_item>
+ <combo_item name="Typing">
+ Escribiendo
+ </combo_item>
+ <combo_item name="PeaceRight">
+ Paz en la derecha
+ </combo_item>
+ </combo_box>
+ <text name="emote_label">
+ Expresión
+ </text>
+ <combo_box label="" name="emote_combo" tool_tip="Controle qué hace la cara durante la animación.">
+ <combo_item name="[None]">
+ [Nada]
+ </combo_item>
+ <combo_item name="Aaaaah">
+ Aaaaah
+ </combo_item>
+ <combo_item name="Afraid">
+ Con miedo
+ </combo_item>
+ <combo_item name="Angry">
+ Enfadada
+ </combo_item>
+ <combo_item name="BigSmile">
+ Gran sonrisa
+ </combo_item>
+ <combo_item name="Bored">
+ Aburrida
+ </combo_item>
+ <combo_item name="Cry">
+ Llorar
+ </combo_item>
+ <combo_item name="Disdain">
+ Desdén
+ </combo_item>
+ <combo_item name="Embarrassed">
+ Avergonzada
+ </combo_item>
+ <combo_item name="Frown">
+ Fruncir el ceño
+ </combo_item>
+ <combo_item name="Kiss">
+ Besar
+ </combo_item>
+ <combo_item name="Laugh">
+ ReÃr
+ </combo_item>
+ <combo_item name="Plllppt">
+ Sacar la lengua
+ </combo_item>
+ <combo_item name="Repulsed">
+ Rechazo
+ </combo_item>
+ <combo_item name="Sad">
+ Triste
+ </combo_item>
+ <combo_item name="Shrug">
+ Encogerse de hombros
+ </combo_item>
+ <combo_item name="Smile">
+ Sonrisa
+ </combo_item>
+ <combo_item name="Surprise">
+ Sorpresa
+ </combo_item>
+ <combo_item name="Wink">
+ Guiño
+ </combo_item>
+ <combo_item name="Worry">
+ Preocupación
+ </combo_item>
+ </combo_box>
+ <text name="preview_label">
+ Vista previa mientras
+ </text>
+ <combo_box label="" name="preview_base_anim" tool_tip="Compruebe cómo se comporta su animación a la vez que el avatar realiza acciones comunes.">
+ <combo_item name="Standing">
+ Estar de pie
+ </combo_item>
+ <combo_item name="Walking">
+ Caminar
+ </combo_item>
+ <combo_item name="Sitting">
+ Estar sentado
+ </combo_item>
+ <combo_item name="Flying">
+ Volar
+ </combo_item>
+ </combo_box>
+ <spinner label="Combinar (sec)" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones."/>
+ <spinner label="Dejar de combinar (sec)" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones."/>
+ <button label="" name="play_btn" tool_tip="Mover/Pausar su animación."/>
+ <button label="" name="stop_btn" tool_tip="Parar la repetición de la animación"/>
+ <slider label="" name="playback_slider"/>
+ <text name="bad_animation_text">
+ No se ha podido leer el archivo de la animación.
+
+Recomendamos usar archivos BVH exportados de Poser 4.
+ </text>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Subir ([AMOUNT] L$)" name="ok_btn"/>
+ <string name="failed_to_initialize">
+ Fallo al iniciar el movimiento
+ </string>
+ <string name="anim_too_long">
+ El archivo de la animación dura [LENGTH] segundos.
+
+La duración máxima de una animación es de [MAX_LENGTH] segundos.
+ </string>
+ <string name="failed_file_read">
+ No se ha podido leer el archivo de la animación.
+
+[STATUS]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_auction.xml b/indra/newview/skins/default/xui/es/floater_auction.xml
index 1fcba4a3e3..c6d89891bc 100644
--- a/indra/newview/skins/default/xui/es/floater_auction.xml
+++ b/indra/newview/skins/default/xui/es/floater_auction.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_auction" title="Empezar venta de terreno Linden">
- <check_box label="Incluir la valla amarilla de selección" name="fence_check"/>
- <button label="Foto" label_selected="Foto" name="snapshot_btn"/>
- <button label="OK" label_selected="OK" name="ok_btn"/>
- <text name="already for sale">
- No puede subastar parcelas que ya están en venta.
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_auction" title="Empezar venta de terreno Linden">
+ <check_box label="Incluir la valla amarilla de selección" name="fence_check"/>
+ <button label="Foto" label_selected="Foto" name="snapshot_btn"/>
+ <button label="OK" label_selected="OK" name="ok_btn"/>
+ <text name="already for sale">
+ No puede subastar parcelas que ya están en venta.
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
index e5291c6e5e..a75243cb38 100644
--- a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatarpicker" title="Elegir a un residente">
- <text name="instruct_search_resident_name">
- Escriba parte del nombre del residente:
- </text>
- <button label="Encontrar" label_selected="Encontrar" name="Find"/>
- <text name="Or select their calling card:">
- O elija una tarjeta de visita:
- </text>
- <button label="Cerrar" label_selected="Cerrar" name="Close"/>
- <button label="Elegir" label_selected="Elegir" name="Select"/>
- <string name="NotFound">
- No se ha encontrado '[TEXT]'
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarpicker" title="Elegir a un residente">
+ <text name="instruct_search_resident_name">
+ Escriba parte del nombre del residente:
+ </text>
+ <button label="Encontrar" label_selected="Encontrar" name="Find"/>
+ <text name="Or select their calling card:">
+ O elija una tarjeta de visita:
+ </text>
+ <button label="Cerrar" label_selected="Cerrar" name="Close"/>
+ <button label="Elegir" label_selected="Elegir" name="Select"/>
+ <string name="NotFound">
+ No se ha encontrado '[TEXT]'
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
index b79fd4ba4c..6344768c7f 100644
--- a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatar_texture_debug" title="Texturas del avatar">
- <text name="baked_label">
- Texturas predeterminadas
- </text>
- <text name="composite_label">
- Texturas compuestas
- </text>
- <texture_picker label="Cabeza" name="baked_head"/>
- <texture_picker label="Maquillaje" name="head_bodypaint"/>
- <texture_picker label="Pelo" name="hair"/>
- <button label="Soltar" label_selected="Soltar" name="Dump"/>
- <texture_picker label="Ojos" name="baked_eyes"/>
- <texture_picker label="Ojo" name="eye_texture"/>
- <texture_picker label="Parte superior del cuerpo" name="baked_upper_body"/>
- <texture_picker label="Tatuaje de la parte superior del cuerpo" name="upper_bodypaint"/>
- <texture_picker label="Camiseta" name="undershirt"/>
- <texture_picker label="Guantes" name="gloves"/>
- <texture_picker label="Camisa" name="shirt"/>
- <texture_picker label="Parte superior de la chaqueta" name="upper_jacket"/>
- <texture_picker label="Parte inferior del cuerpo" name="baked_lower_body"/>
- <texture_picker label="Tatuaje de la parte inferior del cuerpo" name="lower_bodypaint"/>
- <texture_picker label="Ropa interior" name="underpants"/>
- <texture_picker label="Calcetines" name="socks"/>
- <texture_picker label="Zapatos" name="shoes"/>
- <texture_picker label="Pantalones" name="pants"/>
- <texture_picker label="Chaqueta" name="jacket"/>
- <texture_picker label="Falda" name="baked_skirt"/>
- <texture_picker label="Falda" name="skirt_texture"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatar_texture_debug" title="Texturas del avatar">
+ <text name="baked_label">
+ Texturas predeterminadas
+ </text>
+ <text name="composite_label">
+ Texturas compuestas
+ </text>
+ <texture_picker label="Cabeza" name="baked_head"/>
+ <texture_picker label="Maquillaje" name="head_bodypaint"/>
+ <texture_picker label="Pelo" name="hair"/>
+ <button label="Soltar" label_selected="Soltar" name="Dump"/>
+ <texture_picker label="Ojos" name="baked_eyes"/>
+ <texture_picker label="Ojo" name="eye_texture"/>
+ <texture_picker label="Parte superior del cuerpo" name="baked_upper_body"/>
+ <texture_picker label="Tatuaje de la parte superior del cuerpo" name="upper_bodypaint"/>
+ <texture_picker label="Camiseta" name="undershirt"/>
+ <texture_picker label="Guantes" name="gloves"/>
+ <texture_picker label="Camisa" name="shirt"/>
+ <texture_picker label="Parte superior de la chaqueta" name="upper_jacket"/>
+ <texture_picker label="Parte inferior del cuerpo" name="baked_lower_body"/>
+ <texture_picker label="Tatuaje de la parte inferior del cuerpo" name="lower_bodypaint"/>
+ <texture_picker label="Ropa interior" name="underpants"/>
+ <texture_picker label="Calcetines" name="socks"/>
+ <texture_picker label="Zapatos" name="shoes"/>
+ <texture_picker label="Pantalones" name="pants"/>
+ <texture_picker label="Chaqueta" name="jacket"/>
+ <texture_picker label="Falda" name="baked_skirt"/>
+ <texture_picker label="Falda" name="skirt_texture"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml
index 313fcab38f..bbb5b0e36d 100644
--- a/indra/newview/skins/default/xui/es/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_build_options.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="build options floater" title="Opciones de la cuadrÃcula">
- <spinner label="Unidad de la cuadrÃcula (metros)" name="GridResolution"/>
- <spinner label="Graduación de la cuadrÃcula (metros)" name="GridDrawSize"/>
- <check_box label="Activar subunidades" name="GridSubUnit"/>
- <check_box label="Ver la sección transversal" name="GridCrossSection"/>
- <slider label="Opacidad de la cuadrÃcula" name="GridOpacity"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="build options floater" title="Opciones de la cuadrÃcula">
+ <spinner label="Unidad de la cuadrÃcula (metros)" name="GridResolution"/>
+ <spinner label="Graduación de la cuadrÃcula (metros)" name="GridDrawSize"/>
+ <check_box label="Activar subunidades" name="GridSubUnit"/>
+ <check_box label="Ver la sección transversal" name="GridCrossSection"/>
+ <slider label="Opacidad de la cuadrÃcula" name="GridOpacity"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml
index dce3b457a4..ed43e93688 100644
--- a/indra/newview/skins/default/xui/es/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/es/floater_bumps.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_bumps" title="Choques, empujones, e impactos">
- <text name="none_detected">
- No se han detectado
- </text>
- <text name="bump">
- [TIME] [FIRST] [LAST] ha chocado con usted
- </text>
- <text name="llpushobject">
- [TIME] [FIRST] [LAST] le ha empujado con un script
- </text>
- <text name="selected_object_collide">
- [TIME] [FIRST] [LAST] ha hecho que un objeto impacte con usted
- </text>
- <text name="scripted_object_collide">
- [TIME] [FIRST] [LAST] ha hecho que un objeto con script impacte con usted
- </text>
- <text name="physical_object_collide">
- [TIME] [FIRST] [LAST] ha hecho que un objeto material impacte con usted
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_bumps" title="Choques, empujones, e impactos">
+ <text name="none_detected">
+ No se han detectado
+ </text>
+ <text name="bump">
+ [TIME] [FIRST] [LAST] ha chocado con usted
+ </text>
+ <text name="llpushobject">
+ [TIME] [FIRST] [LAST] le ha empujado con un script
+ </text>
+ <text name="selected_object_collide">
+ [TIME] [FIRST] [LAST] ha hecho que un objeto impacte con usted
+ </text>
+ <text name="scripted_object_collide">
+ [TIME] [FIRST] [LAST] ha hecho que un objeto con script impacte con usted
+ </text>
+ <text name="physical_object_collide">
+ [TIME] [FIRST] [LAST] ha hecho que un objeto material impacte con usted
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
index 24a3eb431d..e93b8bce2d 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_contents" title="Comprar el contenido">
- <text name="contains_text">
- [NAME] contiene:
- </text>
- <text name="buy_text">
- ¿Comprar por [AMOUNT] L$ a [NAME]?
- </text>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
- <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
- <check_box label="Vestirse ahora la ropa" name="wear_check"/>
- <string name="no_copy_text">
- (no copiable)
- </string>
- <string name="no_modify_text">
- (no modificable)
- </string>
- <string name="no_transfer_text">
- (no transferible)
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_buy_contents" title="Comprar el contenido">
+ <text name="contains_text">
+ [NAME] contiene:
+ </text>
+ <text name="buy_text">
+ ¿Comprar por [AMOUNT] L$ a [NAME]?
+ </text>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+ <check_box label="Vestirse ahora la ropa" name="wear_check"/>
+ <string name="no_copy_text">
+ (no copiable)
+ </string>
+ <string name="no_modify_text">
+ (no modificable)
+ </string>
+ <string name="no_transfer_text">
+ (no transferible)
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index 5b37713d4c..03a6d511ab 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy currency" title="Comprar dinero">
- <text name="info_buying">
- Comprando dinero:
- </text>
- <text name="info_cannot_buy">
- No puede comprar en este momento:
- </text>
- <text name="info_need_more">
- Necesita más dinero:
- </text>
- <text name="error_message">
- Algo no va bien.
- </text>
- <button label="Ir al sitio web" name="error_web"/>
- <text name="contacting">
- Contactando con el LindeX...
- </text>
- <text name="buy_action_unknown">
- Comprar L$ en el sistema LindeX de cambio de moneda
- </text>
- <text name="buy_action">
- [NAME] [PRICE] L$
- </text>
- <text name="currency_action">
- Comprar L$
- </text>
- <line_editor name="currency_amt">
- 1234
- </line_editor>
- <text name="currency_est">
- por, aprox., [USD] US$
- </text>
- <text name="getting_data">
- Obteniendo los datos...
- </text>
- <text name="balance_label">
- Actualmente, tiene
- </text>
- <text name="balance_amount">
- [AMT] L$
- </text>
- <text name="buying_label">
- Está comprando
- </text>
- <text name="buying_amount">
- [AMT] L$
- </text>
- <text name="total_label">
- Su saldo será de
- </text>
- <text name="total_amount">
- [AMT] L$
- </text>
- <text name="purchase_warning_repurchase">
- Confirmando esta compra sólo compra la moneda.
-Tendrá que intentar de nuevo la operación.
- </text>
- <text name="purchase_warning_notenough">
- No está comprando dinero suficiente.
-Aumente la cantidad a comprar.
- </text>
- <button label="Cancelar" name="cancel_btn"/>
- <button label="Comprar" name="buy_btn"/>
- <string name="buy_currency">
- Comprar L$ [LINDENS] por, aprox., [USD] U$D
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy currency" title="Comprar dinero">
+ <text name="info_buying">
+ Comprando dinero:
+ </text>
+ <text name="info_cannot_buy">
+ No puede comprar en este momento:
+ </text>
+ <text name="info_need_more">
+ Necesita más dinero:
+ </text>
+ <text name="error_message">
+ Algo no va bien.
+ </text>
+ <button label="Ir al sitio web" name="error_web"/>
+ <text name="contacting">
+ Contactando con el LindeX...
+ </text>
+ <text name="buy_action_unknown">
+ Comprar L$ en el sistema LindeX de cambio de moneda
+ </text>
+ <text name="buy_action">
+ [NAME] [PRICE] L$
+ </text>
+ <text name="currency_action">
+ Comprar L$
+ </text>
+ <line_editor name="currency_amt">
+ 1234
+ </line_editor>
+ <text name="currency_est">
+ por, aprox., [USD] US$
+ </text>
+ <text name="getting_data">
+ Obteniendo los datos...
+ </text>
+ <text name="balance_label">
+ Actualmente, tiene
+ </text>
+ <text name="balance_amount">
+ [AMT] L$
+ </text>
+ <text name="buying_label">
+ Está comprando
+ </text>
+ <text name="buying_amount">
+ [AMT] L$
+ </text>
+ <text name="total_label">
+ Su saldo será de
+ </text>
+ <text name="total_amount">
+ [AMT] L$
+ </text>
+ <text name="purchase_warning_repurchase">
+ Confirmando esta compra sólo compra la moneda.
+Tendrá que intentar de nuevo la operación.
+ </text>
+ <text name="purchase_warning_notenough">
+ No está comprando dinero suficiente.
+Aumente la cantidad a comprar.
+ </text>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Comprar" name="buy_btn"/>
+ <string name="buy_currency">
+ Comprar L$ [LINDENS] por, aprox., [USD] U$D
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml
index 16d1ac8de0..c5286b1d14 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml
@@ -1,228 +1,228 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy land" title="Comprar terreno">
- <text name="region_name_label">
- Región:
- </text>
- <text name="region_name_text">
- (desconocida)
- </text>
- <text name="estate_name_label">
- Estado:
- </text>
- <text name="estate_name_text">
- (desconocido)
- </text>
- <text name="estate_owner_label">
- Propietario del estado:
- </text>
- <text name="estate_owner_text">
- (desconocido)
- </text>
- <text name="resellable_changeable_label">
- El terreno comprado en esta región:
- </text>
- <text name="resellable_clause">
- El terreno comprado en esta región puede o no puede ser revendido.
- </text>
- <text name="changeable_clause">
- puede o no puede ser unido o subdividido.
- </text>
- <text name="covenant_text">
- Deve aceptar el Contrato del Estado:
- </text>
- <text_editor name="covenant_editor">
- Cargando...
- </text_editor>
- <check_box label="Estoy de acuerdo con el contrato descrito arriba." name="agree_covenant"/>
- <text name="info_parcel_label">
- Parcela:
- </text>
- <text name="info_parcel">
- Scotopteryx 138,204
- </text>
- <text name="info_size_label">
- Tamaño:
- </text>
- <text name="info_size">
- 1024 m²
- </text>
- <text name="info_price_label">
- Precio:
- </text>
- <text name="info_price">
- 1500 L$, objetos incluidos
- </text>
- <text name="info_action">
- Al comprar este terreno:
- </text>
- <text name="error_message">
- Algo no está bien.
- </text>
- <button label="Ir al sitio web" name="error_web"/>
- <text name="account_action">
- Ascienda a la categorÃa de miembro premium.
- </text>
- <text name="account_reason">
- Sólo pueden ser propietarios de terreno los miembros premium.
- </text>
- <combo_box name="account_level">
- <combo_item name="US$9.95/month,billedmonthly">
- 9.95 US$/mes, facturados mensualmente
- </combo_item>
- <combo_item name="US$7.50/month,billedquarterly">
- 7.50 US$/mes, facturados cuatrimestralmente
- </combo_item>
- <combo_item name="US$6.00/month,billedannually">
- 6.00 US$/mes, facturados anualmente
- </combo_item>
- </combo_box>
- <text name="land_use_action">
- Aumenta su cuota mensual por uso de terreno a 40 US$/mes.
- </text>
- <text name="land_use_reason">
- Usted es propietario de 1.309 m² de terreno.
-Esta parcela tiene 512 m² de terreno.
- </text>
- <text name="purchase_action">
- Pagar al residente Joe 4.000 L$ por el terreno
- </text>
- <text name="currency_reason">
- Tiene 2.100 L$.
- </text>
- <text name="currency_action">
- Comprar más L$
- </text>
- <line_editor name="currency_amt">
- 1.000
- </line_editor>
- <text name="currency_est">
- por, aprox., [AMOUNT2] US$
- </text>
- <text name="currency_balance">
- Tiene 2.100 L$.
- </text>
- <check_box label="Quitar [AMOUNT] m² de la contribución del grupo." name="remove_contribution"/>
- <button label="Comprar" name="buy_btn"/>
- <button label="Cancelar" name="cancel_btn"/>
- <string name="can_resell">
- Puede revenderse.
- </string>
- <string name="can_not_resell">
- No se puede revender.
- </string>
- <string name="can_change">
- Puede unirse o dividirse.
- </string>
- <string name="can_not_change">
- No puede unirse ni dividirse.
- </string>
- <string name="cant_buy_for_group">
- No tiene permiso de comprar terreno para el grupo que tiene activado.
- </string>
- <string name="no_land_selected">
- No se ha seleccionado terreno.
- </string>
- <string name="multiple_parcels_selected">
- Se han seleccionado varias parcelas diferentes.
-Inténtelo seleccionando un área más pequeña.
- </string>
- <string name="no_permission">
- No tiene permiso de comprar terreno para el grupo que tiene activado.
- </string>
- <string name="parcel_not_for_sale">
- La parcela seleccionada no está en venta.
- </string>
- <string name="group_already_owns">
- El grupo ya es propietario de la parcela.
- </string>
- <string name="you_already_own">
- Usted ya es propietario de la parcela.
- </string>
- <string name="set_to_sell_to_other">
- La parcela seleccionada está marcada para ser vendida a otro
- </string>
- <string name="no_public_land">
- El área seleccionada no tiene terreno público.
- </string>
- <string name="not_owned_by_you">
- Se ha seleccionado terreno propiedad de otro.
-Inténtelo seleccionando un área más pequeña.
- </string>
- <string name="processing">
- Procesando su compra...
-
-(Llevará uno o dos minutos).
- </string>
- <string name="fetching_error">
- Se ha producido un error al ir a buscar la información de compra de terreno.
- </string>
- <string name="buying_will">
- Al comprar este terreno:
- </string>
- <string name="buying_for_group">
- Comprando terreno para el grupo:
- </string>
- <string name="cannot_buy_now">
- No se puede comprar ahora:
- </string>
- <string name="not_for_sale">
- No está en venta:
- </string>
- <string name="none_needed">
- no necesita
- </string>
- <string name="must_upgrade">
- Para poseer terreno, su cuenta debe ascender de categorÃa.
- </string>
- <string name="cant_own_land">
- Su cuenta puede poseer terreno.
- </string>
- <string name="land_holdings">
- Usted tiene [BUYER] m² de terreno.
- </string>
- <string name="pay_to_for_land">
- Pagar por este terreno [AMOUNT] L$ a [SELLER]
- </string>
- <string name="buy_for_US">
- Comprar [AMOUNT] L$ por, aprox., [AMOUNT2] US$ ,
- </string>
- <string name="parcel_meters">
- Esta parcela tiene [AMOUNT] m².
- </string>
- <string name="premium_land">
- Este terreno es premium, y se contará como de [AMOUNT] m².
- </string>
- <string name="discounted_land">
- Este terreno tiene descuento, y se contará como de [AMOUNT] m².
- </string>
- <string name="meters_supports_object">
- [AMOUNT] m²
-admite [AMOUNT2] objetos
- </string>
- <string name="sold_with_objects">
- vendido con los objetos
- </string>
- <string name="insufficient_land_credits">
- Antes de que se complete la compra, el grupo [GROUP] necesitará
-los suficientes créditos de uso en contribución de terreno
-para cubrir esta parcela.
- </string>
- <string name="have_enough_lindens">
- Tiene [AMOUNT] L$, cantidad suficiente para comprar este terreno.
- </string>
- <string name="not_enough_lindens">
- Sólo tiene [AMOUNT] L$. NecesitarÃa [AMOUNT2] L$ más.
- </string>
- <string name="balance_left">
- Tras la compra, aún tendrá [AMOUNT] L$.
- </string>
- <string name="balance_needed">
- Para costearse este terreno, deberá comprar, al menos, [AMOUNT] L$.
- </string>
- <string name="no_parcel_selected">
- (No se ha seleccionado una parcela)
- </string>
- <string name="buy_currency">
- Comprar [LINDENS] L$ por, aprox., [USD] US$
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy land" title="Comprar terreno">
+ <text name="region_name_label">
+ Región:
+ </text>
+ <text name="region_name_text">
+ (desconocida)
+ </text>
+ <text name="estate_name_label">
+ Estado:
+ </text>
+ <text name="estate_name_text">
+ (desconocido)
+ </text>
+ <text name="estate_owner_label">
+ Propietario del estado:
+ </text>
+ <text name="estate_owner_text">
+ (desconocido)
+ </text>
+ <text name="resellable_changeable_label">
+ El terreno comprado en esta región:
+ </text>
+ <text name="resellable_clause">
+ El terreno comprado en esta región puede o no puede ser revendido.
+ </text>
+ <text name="changeable_clause">
+ puede o no puede ser unido o subdividido.
+ </text>
+ <text name="covenant_text">
+ Deve aceptar el Contrato del Estado:
+ </text>
+ <text_editor name="covenant_editor">
+ Cargando...
+ </text_editor>
+ <check_box label="Estoy de acuerdo con el contrato descrito arriba." name="agree_covenant"/>
+ <text name="info_parcel_label">
+ Parcela:
+ </text>
+ <text name="info_parcel">
+ Scotopteryx 138,204
+ </text>
+ <text name="info_size_label">
+ Tamaño:
+ </text>
+ <text name="info_size">
+ 1024 m²
+ </text>
+ <text name="info_price_label">
+ Precio:
+ </text>
+ <text name="info_price">
+ 1500 L$, objetos incluidos
+ </text>
+ <text name="info_action">
+ Al comprar este terreno:
+ </text>
+ <text name="error_message">
+ Algo no está bien.
+ </text>
+ <button label="Ir al sitio web" name="error_web"/>
+ <text name="account_action">
+ Ascienda a la categorÃa de miembro premium.
+ </text>
+ <text name="account_reason">
+ Sólo pueden ser propietarios de terreno los miembros premium.
+ </text>
+ <combo_box name="account_level">
+ <combo_box.item name="US$9.95/month,billedmonthly">
+ 9.95 US$/mes, facturados mensualmente
+ </combo_box.item>
+ <combo_box.item name="US$7.50/month,billedquarterly">
+ 7.50 US$/mes, facturados cuatrimestralmente
+ </combo_box.item>
+ <combo_box.item name="US$6.00/month,billedannually">
+ 6.00 US$/mes, facturados anualmente
+ </combo_box.item>
+ </combo_box>
+ <text name="land_use_action">
+ Aumenta su cuota mensual por uso de terreno a 40 US$/mes.
+ </text>
+ <text name="land_use_reason">
+ Usted es propietario de 1.309 m² de terreno.
+Esta parcela tiene 512 m² de terreno.
+ </text>
+ <text name="purchase_action">
+ Pagar al residente Joe 4.000 L$ por el terreno
+ </text>
+ <text name="currency_reason">
+ Tiene 2.100 L$.
+ </text>
+ <text name="currency_action">
+ Comprar más L$
+ </text>
+ <line_editor name="currency_amt">
+ 1.000
+ </line_editor>
+ <text name="currency_est">
+ por, aprox., [AMOUNT2] US$
+ </text>
+ <text name="currency_balance">
+ Tiene 2.100 L$.
+ </text>
+ <check_box label="Quitar [AMOUNT] m² de la contribución del grupo." name="remove_contribution"/>
+ <button label="Comprar" name="buy_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <string name="can_resell">
+ Puede revenderse.
+ </string>
+ <string name="can_not_resell">
+ No se puede revender.
+ </string>
+ <string name="can_change">
+ Puede unirse o dividirse.
+ </string>
+ <string name="can_not_change">
+ No puede unirse ni dividirse.
+ </string>
+ <string name="cant_buy_for_group">
+ No tiene permiso de comprar terreno para el grupo que tiene activado.
+ </string>
+ <string name="no_land_selected">
+ No se ha seleccionado terreno.
+ </string>
+ <string name="multiple_parcels_selected">
+ Se han seleccionado varias parcelas diferentes.
+Inténtelo seleccionando un área más pequeña.
+ </string>
+ <string name="no_permission">
+ No tiene permiso de comprar terreno para el grupo que tiene activado.
+ </string>
+ <string name="parcel_not_for_sale">
+ La parcela seleccionada no está en venta.
+ </string>
+ <string name="group_already_owns">
+ El grupo ya es propietario de la parcela.
+ </string>
+ <string name="you_already_own">
+ Usted ya es propietario de la parcela.
+ </string>
+ <string name="set_to_sell_to_other">
+ La parcela seleccionada está marcada para ser vendida a otro
+ </string>
+ <string name="no_public_land">
+ El área seleccionada no tiene terreno público.
+ </string>
+ <string name="not_owned_by_you">
+ Se ha seleccionado terreno propiedad de otro.
+Inténtelo seleccionando un área más pequeña.
+ </string>
+ <string name="processing">
+ Procesando su compra...
+
+(Llevará uno o dos minutos).
+ </string>
+ <string name="fetching_error">
+ Se ha producido un error al ir a buscar la información de compra de terreno.
+ </string>
+ <string name="buying_will">
+ Al comprar este terreno:
+ </string>
+ <string name="buying_for_group">
+ Comprando terreno para el grupo:
+ </string>
+ <string name="cannot_buy_now">
+ No se puede comprar ahora:
+ </string>
+ <string name="not_for_sale">
+ No está en venta:
+ </string>
+ <string name="none_needed">
+ no necesita
+ </string>
+ <string name="must_upgrade">
+ Para poseer terreno, su cuenta debe ascender de categorÃa.
+ </string>
+ <string name="cant_own_land">
+ Su cuenta puede poseer terreno.
+ </string>
+ <string name="land_holdings">
+ Usted tiene [BUYER] m² de terreno.
+ </string>
+ <string name="pay_to_for_land">
+ Pagar por este terreno [AMOUNT] L$ a [SELLER]
+ </string>
+ <string name="buy_for_US">
+ Comprar [AMOUNT] L$ por, aprox., [AMOUNT2] US$ ,
+ </string>
+ <string name="parcel_meters">
+ Esta parcela tiene [AMOUNT] m².
+ </string>
+ <string name="premium_land">
+ Este terreno es premium, y se contará como de [AMOUNT] m².
+ </string>
+ <string name="discounted_land">
+ Este terreno tiene descuento, y se contará como de [AMOUNT] m².
+ </string>
+ <string name="meters_supports_object">
+ [AMOUNT] m²
+admite [AMOUNT2] objetos
+ </string>
+ <string name="sold_with_objects">
+ vendido con los objetos
+ </string>
+ <string name="insufficient_land_credits">
+ Antes de que se complete la compra, el grupo [GROUP] necesitará
+los suficientes créditos de uso en contribución de terreno
+para cubrir esta parcela.
+ </string>
+ <string name="have_enough_lindens">
+ Tiene [AMOUNT] L$, cantidad suficiente para comprar este terreno.
+ </string>
+ <string name="not_enough_lindens">
+ Sólo tiene [AMOUNT] L$. NecesitarÃa [AMOUNT2] L$ más.
+ </string>
+ <string name="balance_left">
+ Tras la compra, aún tendrá [AMOUNT] L$.
+ </string>
+ <string name="balance_needed">
+ Para costearse este terreno, deberá comprar, al menos, [AMOUNT] L$.
+ </string>
+ <string name="no_parcel_selected">
+ (No se ha seleccionado una parcela)
+ </string>
+ <string name="buy_currency">
+ Comprar [LINDENS] L$ por, aprox., [USD] US$
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_object.xml b/indra/newview/skins/default/xui/es/floater_buy_object.xml
index f37fa546ea..8e713f362b 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_object.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="Comprar una copia del objeto">
- <text name="contents_text">
- y sus contenidos:
- </text>
- <text name="buy_text">
- ¿Comprarlo por [AMOUNT] L$ a [NAME]?
- </text>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
- <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
- <string name="title_buy_text">
- Comprar
- </string>
- <string name="title_buy_copy_text">
- Comprar una copia de
- </string>
- <string name="no_copy_text">
- (no copiable)
- </string>
- <string name="no_modify_text">
- (no modificable)
- </string>
- <string name="no_transfer_text">
- (no transferible)
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="contents" title="Comprar una copia del objeto">
+ <text name="contents_text">
+ y sus contenidos:
+ </text>
+ <text name="buy_text">
+ ¿Comprarlo por [AMOUNT] L$ a [NAME]?
+ </text>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+ <string name="title_buy_text">
+ Comprar
+ </string>
+ <string name="title_buy_copy_text">
+ Comprar una copia de
+ </string>
+ <string name="no_copy_text">
+ (no copiable)
+ </string>
+ <string name="no_modify_text">
+ (no modificable)
+ </string>
+ <string name="no_transfer_text">
+ (no transferible)
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_choose_group.xml b/indra/newview/skins/default/xui/es/floater_choose_group.xml
index c3238638d1..71331abb65 100644
--- a/indra/newview/skins/default/xui/es/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/es/floater_choose_group.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="groups" title="Grupos">
- <text name="groupdesc">
- Elegir un grupo:
- </text>
- <button label="OK" label_selected="OK" name="OK"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="groups" title="Grupos">
+ <text name="groupdesc">
+ Elegir un grupo:
+ </text>
+ <button label="OK" label_selected="OK" name="OK"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml
index f9ba1c1219..238853c58d 100644
--- a/indra/newview/skins/default/xui/es/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_color_picker.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="ColorPicker" title="Paleta de colores">
- <text name="r_val_text">
- Rojo:
- </text>
- <text name="g_val_text">
- Verde:
- </text>
- <text name="b_val_text">
- Azul:
- </text>
- <text name="h_val_text">
- Tono:
- </text>
- <text name="s_val_text">
- Sat.:
- </text>
- <text name="l_val_text">
- Lumin.:
- </text>
- <check_box label="Aplicar ahora mismo" name="apply_immediate"/>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
- <button label="Elegir" label_selected="Elegir" name="select_btn"/>
- <text name="Current color:">
- Color actual:
- </text>
- <text name="(Drag below to save.)">
- (Arrástrelo abajo para guardarlo)
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ColorPicker" title="Paleta de colores">
+ <text name="r_val_text">
+ Rojo:
+ </text>
+ <text name="g_val_text">
+ Verde:
+ </text>
+ <text name="b_val_text">
+ Azul:
+ </text>
+ <text name="h_val_text">
+ Tono:
+ </text>
+ <text name="s_val_text">
+ Sat.:
+ </text>
+ <text name="l_val_text">
+ Lumin.:
+ </text>
+ <check_box label="Aplicar ahora mismo" name="apply_immediate"/>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Elegir" label_selected="Elegir" name="select_btn"/>
+ <text name="Current color:">
+ Color actual:
+ </text>
+ <text name="(Drag below to save.)">
+ (Arrástrelo abajo para guardarlo)
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_critical.xml b/indra/newview/skins/default/xui/es/floater_critical.xml
index 31e0081f40..e5cbea8810 100644
--- a/indra/newview/skins/default/xui/es/floater_critical.xml
+++ b/indra/newview/skins/default/xui/es/floater_critical.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title=" ">
- <button label="Continuar" label_selected="Continuar" name="Continue"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <text name="tos_heading">
- Por favor, lea cuidadosamente el siguiente mensaje.
- </text>
- <text_editor name="tos_text">
- TOS_TEXT
- </text_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title=" ">
+ <button label="Continuar" label_selected="Continuar" name="Continue"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <text name="tos_heading">
+ Por favor, lea cuidadosamente el siguiente mensaje.
+ </text>
+ <text_editor name="tos_text">
+ TOS_TEXT
+ </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml
index a03375f81f..4922d08178 100644
--- a/indra/newview/skins/default/xui/es/floater_customize.xml
+++ b/indra/newview/skins/default/xui/es/floater_customize.xml
@@ -1,427 +1,427 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="Apariencia">
- <tab_container name="customize tab container">
- <panel label="Partes del cuerpo" name="body_parts_placeholder"/>
- <panel label="Forma" name="Shape">
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- <button label="Cuerpo" label_selected="Cuerpo" name="Body"/>
- <button label="Cabeza" label_selected="Cabeza" name="Head"/>
- <button label="Ojos" label_selected="Ojos" name="Eyes"/>
- <button label="Ojos" label_selected="Orejas" name="Ears"/>
- <button label="Nariz" label_selected="Nariz" name="Nose"/>
- <button label="Boca" label_selected="Boca" name="Mouth"/>
- <button label="Barbilla" label_selected="Barbilla" name="Chin"/>
- <button label="Torso" label_selected="Torso" name="Torso"/>
- <button label="Piernas" label_selected="Piernas" name="Legs"/>
- <radio_group name="sex radio">
- <radio_item length="1" name="radio" type="string">
- Mujer
- </radio_item>
- <radio_item length="1" name="radio2" type="string">
- Varón
- </radio_item>
- </radio_group>
- <button label="Aleatoria" label_selected="Aleatoria" name="Randomize"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificable
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situada en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase una forma nueva arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- <button label="Crear una forma nueva" label_selected="Crear una forma nueva" name="Create New"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- </panel>
- <panel label="Piel" name="Skin">
- <button label="Color de piel" label_selected="Color de piel" name="Skin Color"/>
- <button label="Detalles faciales" label_selected="Detalles faciales" name="Face Detail"/>
- <button label="Maquillaje" label_selected="Maquillaje" name="Makeup"/>
- <button label="Detalles del cuerpo" label_selected="Detalles del cuerpo" name="Body Detail"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificable
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situada en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otra piel arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- <texture_picker label="Tatuajes de la cabeza" name="Head Tattoos" tool_tip="Pulse para elegir una imagen"/>
- <texture_picker label="Tatuajes superiores" name="Upper Tattoos" tool_tip="Pulse para elegir una imagen"/>
- <texture_picker label="Tatuajes inferiores" name="Lower Tattoos" tool_tip="Pulse para elegir una imagen"/>
- <button label="Aleatoria" label_selected="Aleatoria" name="Randomize"/>
- <button label="Crear una piel nueva" label_selected="Crear una piel nueva" name="Create New"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Pelo" name="Hair">
- <button label="Color" label_selected="Color" name="Color"/>
- <button label="Peinado" label_selected="Peinado" name="Style"/>
- <button label="Cejas" label_selected="Cejas" name="Eyebrows"/>
- <button label="Facial" label_selected="Facial" name="Facial"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificable
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situado en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otro pelo arrastrando uno desde su inventario hasta su avatar. O parta de cero creando uno nueva y vistiéndolo.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- <texture_picker label="Textura" name="Texture" tool_tip="Pulse para elegir una imagen"/>
- <button label="Aleatorio" label_selected="Aleatorio" name="Randomize"/>
- <button label="Crear un pelo nuevo" label_selected="Crear un pelo nuevo" name="Create New"/>
- <button label="Quitarlo" label_selected="Quitarlo" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Ojos" name="Eyes">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificables
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situados en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otros ojos arrastrando unos desde su inventario hasta su avatar. O parta de cero creando unos nuevos y vistiéndoselos.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- <texture_picker label="Iris" name="Iris" tool_tip="Pulse para elegir una imagen"/>
- <button label="Aleatorios" label_selected="Aleatorios" name="Randomize"/>
- <button label="Crear unos ojos nuevos" label_selected="Crear unos ojos nuevos" name="Create New"/>
- <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Ropa" name="clothes_placeholder"/>
- <panel label="Camisa" name="Shirt">
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
- <button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificable
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situada en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otra camisa arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- </panel>
- <panel label="Pantalones" name="Pants">
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
- <button label="Crear unos pantalones nuevos" label_selected="Crear unos pantalones nuevos" name="Create New"/>
- <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificables
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situados en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otros pantalones arrastrando unos desde su inventario hasta su avatar. O parta de cero creando unos nuevos y vistiéndoselos.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- </panel>
- <panel label="Shoes" name="Shoes">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificables
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situados en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otros zapatos arrastrando unos desde su inventario hasta su avatar. O parta de cero creando unos nuevos y vistiéndoselos.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
- <button label="Crear unos zapatos nuevos" label_selected="Crear unos zapatos nuevos" name="Create New"/>
- <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Calcetines" name="Socks">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificables
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situados en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otros calcetines arrastrando unos desde su inventario hasta su avatar. O parta de cero creando unos nuevos y vistiéndoselos.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
- <button label="Crear unos calcetines nuevos" label_selected="Crear unos calcetines nuevos" name="Create New"/>
- <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Chaqueta" name="Jacket">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificable
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situada en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otra chaqueta arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- <texture_picker label="Tela superior" name="Upper Fabric" tool_tip="Pulse para elegir una imagen"/>
- <texture_picker label="Tela inferior" name="Lower Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
- <button label="Crear una chaqueta nueva" label_selected="Crear una chaqueta nueva" name="Create New"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Guantes" name="Gloves">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificables
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situados en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otros guantes arrastrando unos desde su inventario hasta su avatar. O parta de cero creando unos nuevos y vistiéndoselos.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
- <button label="Crear unos guantes nuevos" label_selected="Crear unos guantes nuevos" name="Create New"/>
- <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Camiseta" name="Undershirt">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificable
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situada en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otra camiseta arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
- <button label="Crear una camiseta nueva" label_selected="Crear una camiseta nueva" name="Create New"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Ropa interior" name="Underpants">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificable
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situada en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otra ropa interior arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
- <button label="Crear una ropa interior nueva" label_selected="Crear una ropa interior nueva" name="Create New"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- <panel label="Falda" name="Skirt">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: no modificable
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: cargando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: no lleva
- </text>
- <text length="1" name="path" type="string">
- Situada en [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Póngase otra falda arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
- </text>
- <text length="1" name="no modify instructions" type="string">
- No tiene permiso para modificar este Ãtem.
- </text>
- <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
- <button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/>
- <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
- <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
- </panel>
- </tab_container>
- <button label="Cerrar" label_selected="Cerrar" name="Close"/>
- <button label="Guardar todo" label_selected="Guardar todo" name="Save All"/>
- <button label="Hacer un vestuario" label_selected="Hacer un vestuario" name="Make Outfit"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater customize" title="Apariencia">
+ <tab_container name="customize tab container">
+ <panel label="Partes del cuerpo" name="body_parts_placeholder"/>
+ <panel label="Forma" name="Shape">
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ <button label="Cuerpo" label_selected="Cuerpo" name="Body"/>
+ <button label="Cabeza" label_selected="Cabeza" name="Head"/>
+ <button label="Ojos" label_selected="Ojos" name="Eyes"/>
+ <button label="Ojos" label_selected="Orejas" name="Ears"/>
+ <button label="Nariz" label_selected="Nariz" name="Nose"/>
+ <button label="Boca" label_selected="Boca" name="Mouth"/>
+ <button label="Barbilla" label_selected="Barbilla" name="Chin"/>
+ <button label="Torso" label_selected="Torso" name="Torso"/>
+ <button label="Piernas" label_selected="Piernas" name="Legs"/>
+ <radio_group name="sex radio">
+ <radio_item length="1" name="radio" type="string">
+ Mujer
+ </radio_item>
+ <radio_item length="1" name="radio2" type="string">
+ Varón
+ </radio_item>
+ </radio_group>
+ <button label="Aleatoria" label_selected="Aleatoria" name="Randomize"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificable
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situada en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase una forma nueva arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ <button label="Crear una forma nueva" label_selected="Crear una forma nueva" name="Create New"/>
+ <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ </panel>
+ <panel label="Piel" name="Skin">
+ <button label="Color de piel" label_selected="Color de piel" name="Skin Color"/>
+ <button label="Detalles faciales" label_selected="Detalles faciales" name="Face Detail"/>
+ <button label="Maquillaje" label_selected="Maquillaje" name="Makeup"/>
+ <button label="Detalles del cuerpo" label_selected="Detalles del cuerpo" name="Body Detail"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificable
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situada en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otra piel arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ <texture_picker label="Tatuajes de la cabeza" name="Head Tattoos" tool_tip="Pulse para elegir una imagen"/>
+ <texture_picker label="Tatuajes superiores" name="Upper Tattoos" tool_tip="Pulse para elegir una imagen"/>
+ <texture_picker label="Tatuajes inferiores" name="Lower Tattoos" tool_tip="Pulse para elegir una imagen"/>
+ <button label="Aleatoria" label_selected="Aleatoria" name="Randomize"/>
+ <button label="Crear una piel nueva" label_selected="Crear una piel nueva" name="Create New"/>
+ <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ </panel>
+ <panel label="Pelo" name="Hair">
+ <button label="Color" label_selected="Color" name="Color"/>
+ <button label="Peinado" label_selected="Peinado" name="Style"/>
+ <button label="Cejas" label_selected="Cejas" name="Eyebrows"/>
+ <button label="Facial" label_selected="Facial" name="Facial"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificable
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situado en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otro pelo arrastrando uno desde su inventario hasta su avatar. O parta de cero creando uno nueva y vistiéndolo.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ <texture_picker label="Textura" name="Texture" tool_tip="Pulse para elegir una imagen"/>
+ <button label="Aleatorio" label_selected="Aleatorio" name="Randomize"/>
+ <button label="Crear un pelo nuevo" label_selected="Crear un pelo nuevo" name="Create New"/>
+ <button label="Quitarlo" label_selected="Quitarlo" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ </panel>
+ <panel label="Ojos" name="Eyes">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificables
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situados en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otros ojos arrastrando unos desde su inventario hasta su avatar. O parta de cero creando unos nuevos y vistiéndoselos.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ <texture_picker label="Iris" name="Iris" tool_tip="Pulse para elegir una imagen"/>
+ <button label="Aleatorios" label_selected="Aleatorios" name="Randomize"/>
+ <button label="Crear unos ojos nuevos" label_selected="Crear unos ojos nuevos" name="Create New"/>
+ <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ </panel>
+ <panel label="Ropa" name="clothes_placeholder"/>
+ <panel label="Camisa" name="Shirt">
+ <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
+ <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
+ <button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/>
+ <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificable
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situada en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otra camisa arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ </panel>
+ <panel label="Pantalones" name="Pants">
+ <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
+ <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
+ <button label="Crear unos pantalones nuevos" label_selected="Crear unos pantalones nuevos" name="Create New"/>
+ <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificables
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situados en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otros pantalones arrastrando unos desde su inventario hasta su avatar. O parta de cero creando unos nuevos y vistiéndoselos.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ </panel>
+ <panel label="Shoes" name="Shoes">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificables
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situados en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otros zapatos arrastrando unos desde su inventario hasta su avatar. O parta de cero creando unos nuevos y vistiéndoselos.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
+ <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
+ <button label="Crear unos zapatos nuevos" label_selected="Crear unos zapatos nuevos" name="Create New"/>
+ <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ </panel>
+ <panel label="Calcetines" name="Socks">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificables
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situados en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otros calcetines arrastrando unos desde su inventario hasta su avatar. O parta de cero creando unos nuevos y vistiéndoselos.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
+ <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
+ <button label="Crear unos calcetines nuevos" label_selected="Crear unos calcetines nuevos" name="Create New"/>
+ <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ </panel>
+ <panel label="Chaqueta" name="Jacket">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificable
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situada en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otra chaqueta arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ <texture_picker label="Tela superior" name="Upper Fabric" tool_tip="Pulse para elegir una imagen"/>
+ <texture_picker label="Tela inferior" name="Lower Fabric" tool_tip="Pulse para elegir una imagen"/>
+ <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
+ <button label="Crear una chaqueta nueva" label_selected="Crear una chaqueta nueva" name="Create New"/>
+ <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ </panel>
+ <panel label="Guantes" name="Gloves">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificables
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situados en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otros guantes arrastrando unos desde su inventario hasta su avatar. O parta de cero creando unos nuevos y vistiéndoselos.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
+ <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
+ <button label="Crear unos guantes nuevos" label_selected="Crear unos guantes nuevos" name="Create New"/>
+ <button label="Quitarlos" label_selected="Quitarlos" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ </panel>
+ <panel label="Camiseta" name="Undershirt">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificable
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situada en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otra camiseta arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
+ <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
+ <button label="Crear una camiseta nueva" label_selected="Crear una camiseta nueva" name="Create New"/>
+ <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ </panel>
+ <panel label="Ropa interior" name="Underpants">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificable
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situada en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otra ropa interior arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
+ <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
+ <button label="Crear una ropa interior nueva" label_selected="Crear una ropa interior nueva" name="Create New"/>
+ <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ </panel>
+ <panel label="Falda" name="Skirt">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: no modificable
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: cargando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: no lleva
+ </text>
+ <text length="1" name="path" type="string">
+ Situada en [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Póngase otra falda arrastrando una desde su inventario hasta su avatar. O parta de cero creando una nueva y vistiéndola.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ No tiene permiso para modificar este Ãtem.
+ </text>
+ <texture_picker label="Tela" name="Fabric" tool_tip="Pulse para elegir una imagen"/>
+ <color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulse para abrir el selector de color"/>
+ <button label="Crear una falda nueva" label_selected="Crear una falda nueva" name="Create New"/>
+ <button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Guardar como" label_selected="Guardar como" name="Save As"/>
+ <button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+ </panel>
+ </tab_container>
+ <button label="Cerrar" label_selected="Cerrar" name="Close"/>
+ <button label="Guardar todo" label_selected="Guardar todo" name="Save All"/>
+ <button label="Hacer un vestuario" label_selected="Hacer un vestuario" name="Make Outfit"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml
index fff60e64e1..4f19286d01 100644
--- a/indra/newview/skins/default/xui/es/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_gesture.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="gestures" title="Gestos disponibles">
- <text name="help_label">
- Pulse dos veces en un gesto para reproducir las animaciones y sonidos.
- </text>
- <scroll_list name="gesture_list">
- <column label="Botón" name="trigger"/>
- <column label="Tecla" name="shortcut"/>
- <column label="Nombre" name="name"/>
- </scroll_list>
- <button label="Nuevo" name="new_gesture_btn"/>
- <button label="Editar" name="edit_btn"/>
- <button label="Reproducir" name="play_btn"/>
- <button label="Parar" name="stop_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="gestures" title="Gestos disponibles">
+ <text name="help_label">
+ Pulse dos veces en un gesto para reproducir las animaciones y sonidos.
+ </text>
+ <scroll_list name="gesture_list">
+ <column label="Botón" name="trigger"/>
+ <column label="Tecla" name="shortcut"/>
+ <column label="Nombre" name="name"/>
+ </scroll_list>
+ <button label="Nuevo" name="new_gesture_btn"/>
+ <button label="Editar" name="edit_btn"/>
+ <button label="Reproducir" name="play_btn"/>
+ <button label="Parar" name="stop_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml
index 2b734ecc4b..b429d1ccaf 100644
--- a/indra/newview/skins/default/xui/es/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_god_tools.xml
@@ -1,147 +1,147 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="godtools floater" title="Herramientas de Dios">
- <tab_container name="GodTools Tabs">
- <panel label="Red" name="grid">
- <button label="Expulsar a todos los usuarios"
- label_selected="Expulsar a todos los usuarios" name="Kick all users" />
- <button label="Vaciar los caches de visibilidad del mapa de la región"
- label_selected="Vaciar los caches de visibilidad del mapa de la región"
- name="Flush This Region's Map Visibility Caches" />
- </panel>
- <panel label="Región" name="region">
- <text name="Sim Name:">
- Nombre del Sim:
- </text>
- <check_box label="Preludio" name="check prelude"
- tool_tip="Defina esté para hacer un preludio de la región." />
- <check_box label="Sol fijo" name="check fixed sun"
- tool_tip="Fijar la posición del sol (asà como en Región/Propiedad > Terreno." />
- <check_box label="Restaurar casa en el teletransporte" name="check reset home"
- tool_tip="Cuando el residente sea teletransportado hacia fuera, restaurar su casa para la posición de destino." />
- <check_box label="Visible" name="check visible"
- tool_tip="Defina esté para tornar la región visible a no dioses." />
- <check_box label="Daño" name="check damage"
- tool_tip="Defina esté para activar el daño en esta región." />
- <check_box label="Bloquear rastreo de tráfico" name="block dwell"
- tool_tip="Defina esté para hacer que una región no compute el tráfico." />
- <check_box label="Bloquear formar terreno" name="block terraform"
- tool_tip="Defina esté para no permitir que personas muden la formación del terreno de ellas" />
- <check_box label="Caja de arena" name="is sandbox"
- tool_tip="Activar/desactivar si ésta es una región caja de arena." />
- <button label="Formar terreno" label_selected="Formar terreno" name="Bake Terrain"
- tool_tip="Guardar el terreno actual como patrón." />
- <button label="Revertir terreno" label_selected="Revertir terreno"
- name="Revert Terrain"
- tool_tip="Sustituir el terreno actual por el patrón." />
- <button label="Cambiar terreno" label_selected="Cambiar terreno" name="Swap Terrain"
- tool_tip="Cambiar terreno actual por el patrón." />
- <text name="estate id">
- ID de la propiedad:
- </text>
- <text name="parent id">
- ID del padre:
- </text>
- <line_editor name="parentestate" tool_tip="Ésta es una propiedad padre para esta región" />
- <text name="Grid Pos: ">
- Red Pos:
- </text>
- <line_editor name="gridposx" tool_tip="Ésta es la posición x de la reja para esta región" />
- <line_editor name="gridposy" tool_tip="Ésta es la posición y de la reja para esta región" />
- <text name="Redirect to Grid: ">
- Redireccionar para red:
- </text>
- <text name="billable factor text">
- Factor cobrable:
- </text>
- <text name="land cost text">
- L$ por m2:
- </text>
- <button label="Actualizar" label_selected="Actualizar" name="Refresh"
- tool_tip="Haga clic aquà para actualizar la información arriba." />
- <button label="Aplicar" label_selected="Aplicar" name="Apply"
- tool_tip="Haga clic aquà para aplicar cualesquiera de las mudanzas arriba." />
- <button label="Seleccionar región" label_selected="Seleccionar región"
- name="Select Region"
- tool_tip="Seleccione toda la región con esta herramienta de terreno." />
- <button label="Guardado automático ahora" label_selected="Guardado automático ahora"
- name="Autosave now"
- tool_tip="Guardar estado con gzip en el directorio de guardado automático." />
- </panel>
- <panel label="Objetos" name="objects">
- <text name="Sim Name:">
- Nombre del Sim:
- </text>
- <text name="region name">
- Galés
- </text>
- <check_box label="Desactivar scripts" name="disable scripts"
- tool_tip="Defina esté para desactivar todos los scripts en esta región" />
- <check_box label="Desactivar colisiones" name="disable collisions"
- tool_tip="Defina esté para desactivar las colisiones entre no agentes en esta región" />
- <check_box label="Desactivar fÃsica" name="disable physics"
- tool_tip="Defina esté para desactivar toda la fÃsica en esta región" />
- <button label="Aplicar" label_selected="Aplicar" name="Apply"
- tool_tip="Haga clic aquà para aplicar cualesquiera de las mudanzas arriba." />
- <button label="Definir blanco" label_selected="Definir blanco" name="Set Target"
- tool_tip="Ajuste el avatar del blanco para la exclusión del objeto." />
- <text name="target_avatar_name">
- (sin blanco)
- </text>
- <button label="Borrar objetos con script del blanco en otros terrenos"
- label_selected="Borrar objetos con script del blanco en otros terrenos"
- name="Delete Target's Scripted Objects On Others Land"
- tool_tip="Borrar todos los objetos con script pertenecientes al blanco en el terreno que no pertenece a él. Objetos (sin copia) retornarán." />
- <button label="Borrar objetos con script del blanco en *TODOS* los terrenos"
- label_selected="Borrar objetos con script del blanco en *TODOS* los terrenos"
- name="Delete Target's Scripted Objects On *Any* Land"
- tool_tip="Borrar todos los objetos con script pertenecientes al blanco en esta región. Objetos (sin copia) retornarán." />
- <button label="Borrar *TODOS* los objetos del blanco"
- label_selected="Borrar *TODOS* los objetos del blanco"
- name="Delete *ALL* Of Target's Objects"
- tool_tip="Borrar todos los objetos pertenecientes al blanco en esta región. Objetos (sin copia) retornarán." />
- <button label="Obtener top de colisionadores"
- label_selected="Obtener top de colisionadores" name="Get Top Colliders"
- tool_tip="Coger lista de objetos que están recibiendo narrowphase callbacks." />
- <button label="Obtener top de scripts" label_selected="Obtener top de scripts"
- name="Get Top Scripts"
- tool_tip="Coger lista de objetos que están consumiendo más tiempo de ejecución de scripts." />
- <button label="Compilador de scripts" label_selected="Compilador de scripts"
- name="Scripts digest"
- tool_tip="Coger una lista de todos los scripts y sus respectivos números de ocurrencia." />
- </panel>
- <panel label="Requerir" name="request">
- <text name="Destination:">
- Destino:
- </text>
- <combo_box name="destination">
- <combo_item name="Selection">
- Selección
- </combo_item>
- <combo_item name="AgentRegion">
- Agente de región
- </combo_item>
- </combo_box>
- <text name="Request:">
- Exigencia:
- </text>
- <combo_box name="request">
- <combo_item name="colliders<steps>">
- colisionadores <pasos>
- </combo_item>
- <combo_item name="scripts<count>,<optionalpattern>">
- scripts <contar>,<patrón opcional>
- </combo_item>
- <combo_item name="objects<pattern>">
- objetos <patrón>
- </combo_item>
- <combo_item name="rez<asset_id>">
- rez <asset_id>
- </combo_item>
- </combo_box>
- <text name="Parameter:">
- Parámetro:
- </text>
- <button label="Hacer exigencia" label_selected="Hacer exigencia" name="Make Request" />
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="godtools floater" title="Herramientas de Dios">
+ <tab_container name="GodTools Tabs">
+ <panel label="Red" name="grid">
+ <button label="Expulsar a todos los usuarios"
+ label_selected="Expulsar a todos los usuarios" name="Kick all users" />
+ <button label="Vaciar los caches de visibilidad del mapa de la región"
+ label_selected="Vaciar los caches de visibilidad del mapa de la región"
+ name="Flush This Region's Map Visibility Caches" />
+ </panel>
+ <panel label="Región" name="region">
+ <text name="Sim Name:">
+ Nombre del Sim:
+ </text>
+ <check_box label="Preludio" name="check prelude"
+ tool_tip="Defina esté para hacer un preludio de la región." />
+ <check_box label="Sol fijo" name="check fixed sun"
+ tool_tip="Fijar la posición del sol (asà como en Región/Propiedad > Terreno." />
+ <check_box label="Restaurar casa en el teletransporte" name="check reset home"
+ tool_tip="Cuando el residente sea teletransportado hacia fuera, restaurar su casa para la posición de destino." />
+ <check_box label="Visible" name="check visible"
+ tool_tip="Defina esté para tornar la región visible a no dioses." />
+ <check_box label="Daño" name="check damage"
+ tool_tip="Defina esté para activar el daño en esta región." />
+ <check_box label="Bloquear rastreo de tráfico" name="block dwell"
+ tool_tip="Defina esté para hacer que una región no compute el tráfico." />
+ <check_box label="Bloquear formar terreno" name="block terraform"
+ tool_tip="Defina esté para no permitir que personas muden la formación del terreno de ellas" />
+ <check_box label="Caja de arena" name="is sandbox"
+ tool_tip="Activar/desactivar si ésta es una región caja de arena." />
+ <button label="Formar terreno" label_selected="Formar terreno" name="Bake Terrain"
+ tool_tip="Guardar el terreno actual como patrón." />
+ <button label="Revertir terreno" label_selected="Revertir terreno"
+ name="Revert Terrain"
+ tool_tip="Sustituir el terreno actual por el patrón." />
+ <button label="Cambiar terreno" label_selected="Cambiar terreno" name="Swap Terrain"
+ tool_tip="Cambiar terreno actual por el patrón." />
+ <text name="estate id">
+ ID de la propiedad:
+ </text>
+ <text name="parent id">
+ ID del padre:
+ </text>
+ <line_editor name="parentestate" tool_tip="Ésta es una propiedad padre para esta región" />
+ <text name="Grid Pos: ">
+ Red Pos:
+ </text>
+ <line_editor name="gridposx" tool_tip="Ésta es la posición x de la reja para esta región" />
+ <line_editor name="gridposy" tool_tip="Ésta es la posición y de la reja para esta región" />
+ <text name="Redirect to Grid: ">
+ Redireccionar para red:
+ </text>
+ <text name="billable factor text">
+ Factor cobrable:
+ </text>
+ <text name="land cost text">
+ L$ por m2:
+ </text>
+ <button label="Actualizar" label_selected="Actualizar" name="Refresh"
+ tool_tip="Haga clic aquà para actualizar la información arriba." />
+ <button label="Aplicar" label_selected="Aplicar" name="Apply"
+ tool_tip="Haga clic aquà para aplicar cualesquiera de las mudanzas arriba." />
+ <button label="Seleccionar región" label_selected="Seleccionar región"
+ name="Select Region"
+ tool_tip="Seleccione toda la región con esta herramienta de terreno." />
+ <button label="Guardado automático ahora" label_selected="Guardado automático ahora"
+ name="Autosave now"
+ tool_tip="Guardar estado con gzip en el directorio de guardado automático." />
+ </panel>
+ <panel label="Objetos" name="objects">
+ <text name="Sim Name:">
+ Nombre del Sim:
+ </text>
+ <text name="region name">
+ Galés
+ </text>
+ <check_box label="Desactivar scripts" name="disable scripts"
+ tool_tip="Defina esté para desactivar todos los scripts en esta región" />
+ <check_box label="Desactivar colisiones" name="disable collisions"
+ tool_tip="Defina esté para desactivar las colisiones entre no agentes en esta región" />
+ <check_box label="Desactivar fÃsica" name="disable physics"
+ tool_tip="Defina esté para desactivar toda la fÃsica en esta región" />
+ <button label="Aplicar" label_selected="Aplicar" name="Apply"
+ tool_tip="Haga clic aquà para aplicar cualesquiera de las mudanzas arriba." />
+ <button label="Definir blanco" label_selected="Definir blanco" name="Set Target"
+ tool_tip="Ajuste el avatar del blanco para la exclusión del objeto." />
+ <text name="target_avatar_name">
+ (sin blanco)
+ </text>
+ <button label="Borrar objetos con script del blanco en otros terrenos"
+ label_selected="Borrar objetos con script del blanco en otros terrenos"
+ name="Delete Target's Scripted Objects On Others Land"
+ tool_tip="Borrar todos los objetos con script pertenecientes al blanco en el terreno que no pertenece a él. Objetos (sin copia) retornarán." />
+ <button label="Borrar objetos con script del blanco en *TODOS* los terrenos"
+ label_selected="Borrar objetos con script del blanco en *TODOS* los terrenos"
+ name="Delete Target's Scripted Objects On *Any* Land"
+ tool_tip="Borrar todos los objetos con script pertenecientes al blanco en esta región. Objetos (sin copia) retornarán." />
+ <button label="Borrar *TODOS* los objetos del blanco"
+ label_selected="Borrar *TODOS* los objetos del blanco"
+ name="Delete *ALL* Of Target's Objects"
+ tool_tip="Borrar todos los objetos pertenecientes al blanco en esta región. Objetos (sin copia) retornarán." />
+ <button label="Obtener top de colisionadores"
+ label_selected="Obtener top de colisionadores" name="Get Top Colliders"
+ tool_tip="Coger lista de objetos que están recibiendo narrowphase callbacks." />
+ <button label="Obtener top de scripts" label_selected="Obtener top de scripts"
+ name="Get Top Scripts"
+ tool_tip="Coger lista de objetos que están consumiendo más tiempo de ejecución de scripts." />
+ <button label="Compilador de scripts" label_selected="Compilador de scripts"
+ name="Scripts digest"
+ tool_tip="Coger una lista de todos los scripts y sus respectivos números de ocurrencia." />
+ </panel>
+ <panel label="Requerir" name="request">
+ <text name="Destination:">
+ Destino:
+ </text>
+ <combo_box name="destination">
+ <combo_box.item name="Selection">
+ Selección
+ </combo_box.item>
+ <combo_box.item name="AgentRegion">
+ Agente de región
+ </combo_box.item>
+ </combo_box>
+ <text name="Request:">
+ Exigencia:
+ </text>
+ <combo_box name="request">
+ <combo_box.item name="colliders<steps>">
+ colisionadores <pasos>
+ </combo_box.item>
+ <combo_box.item name="scripts<count>,<optionalpattern>">
+ scripts <contar>,<patrón opcional>
+ </combo_box.item>
+ <combo_box.item name="objects<pattern>">
+ objetos <patrón>
+ </combo_box.item>
+ <combo_box.item name="rez<asset_id>">
+ rez <asset_id>
+ </combo_box.item>
+ </combo_box>
+ <text name="Parameter:">
+ Parámetro:
+ </text>
+ <button label="Hacer exigencia" label_selected="Hacer exigencia" name="Make Request" />
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im.xml b/indra/newview/skins/default/xui/es/floater_im.xml
index fd43613221..3e92003bac 100644
--- a/indra/newview/skins/default/xui/es/floater_im.xml
+++ b/indra/newview/skins/default/xui/es/floater_im.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="im_floater" title="Mensaje Instantáneo">
- <string name="only_user_message">
- Usted es el único usuario en esta sesión.
- </string>
- <string name="offline_message">
- [FIRST] [LAST] no está conectado.
- </string>
- <string name="invite_message">
- Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz.
- </string>
- <string name="muted_message">
- Ha ignorado a este residente. Al enviarle un mensaje, automáticamente dejará de ignorarle.
- </string>
- <string name="generic_request_error">
- Error al hacer lo solicitado; por favor, inténtelo más tarde.
- </string>
- <string name="insufficient_perms_error">
- Usted no tiene permisos suficientes.
- </string>
- <string name="session_does_not_exist_error">
- La sesión ya acabó
- </string>
- <string name="no_ability_error">
- Usted no tiene esa capacidad.
- </string>
- <string name="not_a_mod_error">
- Usted no es un moderador de la sesión.
- </string>
- <string name="muted_error">
- Un moderador del grupo le ha desactivado el chat de texto.
- </string>
- <string name="add_session_event">
- No se ha podido añadir usuarios a la sesión de chat con [RECIPIENT].
- </string>
- <string name="message_session_event">
- No se ha podido enviar su mensaje a la sesión de chat con [RECIPIENT].
- </string>
- <string name="removed_from_group">
- Ha sido eliminado del grupo.
- </string>
- <string name="close_on_no_ability">
- Usted ya no tendrá más la capacidad de estar en la sesión de chat.
- </string>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="im_floater" title="Mensaje Instantáneo">
+ <string name="only_user_message">
+ Usted es el único usuario en esta sesión.
+ </string>
+ <string name="offline_message">
+ [FIRST] [LAST] no está conectado.
+ </string>
+ <string name="invite_message">
+ Pulse el botón [BUTTON NAME] para aceptar/conectar este chat de voz.
+ </string>
+ <string name="muted_message">
+ Ha ignorado a este residente. Al enviarle un mensaje, automáticamente dejará de ignorarle.
+ </string>
+ <string name="generic_request_error">
+ Error al hacer lo solicitado; por favor, inténtelo más tarde.
+ </string>
+ <string name="insufficient_perms_error">
+ Usted no tiene permisos suficientes.
+ </string>
+ <string name="session_does_not_exist_error">
+ La sesión ya acabó
+ </string>
+ <string name="no_ability_error">
+ Usted no tiene esa capacidad.
+ </string>
+ <string name="not_a_mod_error">
+ Usted no es un moderador de la sesión.
+ </string>
+ <string name="muted_error">
+ Un moderador del grupo le ha desactivado el chat de texto.
+ </string>
+ <string name="add_session_event">
+ No se ha podido añadir usuarios a la sesión de chat con [RECIPIENT].
+ </string>
+ <string name="message_session_event">
+ No se ha podido enviar su mensaje a la sesión de chat con [RECIPIENT].
+ </string>
+ <string name="removed_from_group">
+ Ha sido eliminado del grupo.
+ </string>
+ <string name="close_on_no_ability">
+ Usted ya no tendrá más la capacidad de estar en la sesión de chat.
+ </string>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml
index fc71757c44..8e242d848d 100644
--- a/indra/newview/skins/default/xui/es/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_image_preview.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Image Preview" title="">
- <text name="name_label">
- Nombre:
- </text>
- <text name="description_label">
- Descripción:
- </text>
- <text name="preview_label">
- Previsualizar la imagen como:
- </text>
- <combo_box label="Tipo de ropa" name="clothing_type_combo">
- <combo_item name="Image">
- Imagen
- </combo_item>
- <combo_item name="Hair">
- Pelo
- </combo_item>
- <combo_item name="FemaleHead">
- Cabeza de mujer
- </combo_item>
- <combo_item name="FemaleUpperBody">
- Mujer: parte superior del cuerpo
- </combo_item>
- <combo_item name="FemaleLowerBody">
- Mujer: parte inferior del cuerpo
- </combo_item>
- <combo_item name="MaleHead">
- Cabeza de varón
- </combo_item>
- <combo_item name="MaleUpperBody">
- Varón: parte superior del cuerpo
- </combo_item>
- <combo_item name="MaleLowerBody">
- Varón: parte inferior del cuerpo
- </combo_item>
- <combo_item name="Skirt">
- Falda
- </combo_item>
- <combo_item name="SculptedPrim">
- Prim sculpted
- </combo_item>
- </combo_box>
- <text name="bad_image_text">
- Imposible leer la imagen.
-
-Pruebe a guardar la imagen como Targa (.tga) de 24 bites.
- </text>
- <check_box label="Usar compresión sin pérdida" name="lossless_check"/>
- <button label="Cancelar" name="cancel_btn"/>
- <button label="Subir ([AMOUNT] 10L$)" name="ok_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Image Preview" title="">
+ <text name="name_label">
+ Nombre:
+ </text>
+ <text name="description_label">
+ Descripción:
+ </text>
+ <text name="preview_label">
+ Previsualizar la imagen como:
+ </text>
+ <combo_box label="Tipo de ropa" name="clothing_type_combo">
+ <combo_box.item name="Image">
+ Imagen
+ </combo_box.item>
+ <combo_box.item name="Hair">
+ Pelo
+ </combo_box.item>
+ <combo_box.item name="FemaleHead">
+ Cabeza de mujer
+ </combo_box.item>
+ <combo_box.item name="FemaleUpperBody">
+ Mujer: parte superior del cuerpo
+ </combo_box.item>
+ <combo_box.item name="FemaleLowerBody">
+ Mujer: parte inferior del cuerpo
+ </combo_box.item>
+ <combo_box.item name="MaleHead">
+ Cabeza de varón
+ </combo_box.item>
+ <combo_box.item name="MaleUpperBody">
+ Varón: parte superior del cuerpo
+ </combo_box.item>
+ <combo_box.item name="MaleLowerBody">
+ Varón: parte inferior del cuerpo
+ </combo_box.item>
+ <combo_box.item name="Skirt">
+ Falda
+ </combo_box.item>
+ <combo_item name="SculptedPrim">
+ Prim sculpted
+ </combo_item>
+ </combo_box>
+ <text name="bad_image_text">
+ Imposible leer la imagen.
+
+Pruebe a guardar la imagen como Targa (.tga) de 24 bites.
+ </text>
+ <check_box label="Usar compresión sin pérdida" name="lossless_check"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Subir ([AMOUNT] 10L$)" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory.xml b/indra/newview/skins/default/xui/es/floater_inventory.xml
index 339b8b7d69..7da14c0579 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="Inventario">
- <search_editor label="Escriba aquà para buscar" name="inventory search editor"/>
- <tab_container name="inventory filter tabs">
- <inventory_panel label="Todos los Ãtems" name="All Items"/>
- <inventory_panel label="Ãtems recientes" name="Recent Items"/>
- </tab_container>
- <menu_bar name="Inventory Menu">
- <menu label="Archivo" name="File">
- <menu_item_call label="Abrir" name="Open"/>
- <menu_item_call label="Nueva ventana" name="New Window"/>
- <menu_item_call label="Ver los filtros" name="Show Filters"/>
- <menu_item_call label="Restablecer los filtros" name="Reset Current"/>
- <menu_item_call label="Cerrar todas las carpetas" name="Close All Folders"/>
- <menu_item_call label="Vaciar la papelera" name="Empty Trash"/>
- </menu>
- <menu label="Crear" name="Create">
- <menu_item_call label="Carpeta nueva" name="New Folder"/>
- <menu_item_call label="Script nuevo" name="New Script"/>
- <menu_item_call label="Nota nueva" name="New Note"/>
- <menu_item_call label="Gesto nuevo" name="New Gesture"/>
- <menu name="New Clothes">
- <menu_item_call label="Falda nueva" name="New Shirt"/>
- <menu_item_call label="Pantalones nuevos" name="New Pants"/>
- <menu_item_call label="Zapatos nuevos" name="New Shoes"/>
- <menu_item_call label="Calcetines nuevos" name="New Socks"/>
- <menu_item_call label="Chaqueta nueva" name="New Jacket"/>
- <menu_item_call label="Falda nueva" name="New Skirt"/>
- <menu_item_call label="Guantes nuevos" name="New Gloves"/>
- <menu_item_call label="Camiseta nueva" name="New Undershirt"/>
- <menu_item_call label="Ropa interior nueva" name="New Underpants"/>
- </menu>
- <menu name="New Body Parts">
- <menu_item_call label="Forma nueva" name="New Shape"/>
- <menu_item_call label="Piel nueva" name="New Skin"/>
- <menu_item_call label="Pelo nuevo" name="New Hair"/>
- <menu_item_call label="Ojos nuevos" name="New Eyes"/>
- </menu>
- </menu>
- <menu label="Ordenar" name="Sort">
- <menu_item_check label="Por el nombre" name="By Name"/>
- <menu_item_check label="Por la fecha" name="By Date"/>
- <menu_item_check label="Las carpetas, siempre por la fecha" name="Folders Always By Name"/>
- <menu_item_check label="Las carpetas del sistema, arriba" name="System Folders To Top"/>
- </menu>
- </menu_bar>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory" title="Inventario">
+ <search_editor label="Escriba aquà para buscar" name="inventory search editor"/>
+ <tab_container name="inventory filter tabs">
+ <inventory_panel label="Todos los Ãtems" name="All Items"/>
+ <inventory_panel label="Ãtems recientes" name="Recent Items"/>
+ </tab_container>
+ <menu_bar name="Inventory Menu">
+ <menu label="Archivo" name="File">
+ <menu_item_call label="Abrir" name="Open"/>
+ <menu_item_call label="Nueva ventana" name="New Window"/>
+ <menu_item_call label="Ver los filtros" name="Show Filters"/>
+ <menu_item_call label="Restablecer los filtros" name="Reset Current"/>
+ <menu_item_call label="Cerrar todas las carpetas" name="Close All Folders"/>
+ <menu_item_call label="Vaciar la papelera" name="Empty Trash"/>
+ </menu>
+ <menu label="Crear" name="Create">
+ <menu_item_call label="Carpeta nueva" name="New Folder"/>
+ <menu_item_call label="Script nuevo" name="New Script"/>
+ <menu_item_call label="Nota nueva" name="New Note"/>
+ <menu_item_call label="Gesto nuevo" name="New Gesture"/>
+ <menu name="New Clothes">
+ <menu_item_call label="Falda nueva" name="New Shirt"/>
+ <menu_item_call label="Pantalones nuevos" name="New Pants"/>
+ <menu_item_call label="Zapatos nuevos" name="New Shoes"/>
+ <menu_item_call label="Calcetines nuevos" name="New Socks"/>
+ <menu_item_call label="Chaqueta nueva" name="New Jacket"/>
+ <menu_item_call label="Falda nueva" name="New Skirt"/>
+ <menu_item_call label="Guantes nuevos" name="New Gloves"/>
+ <menu_item_call label="Camiseta nueva" name="New Undershirt"/>
+ <menu_item_call label="Ropa interior nueva" name="New Underpants"/>
+ </menu>
+ <menu name="New Body Parts">
+ <menu_item_call label="Forma nueva" name="New Shape"/>
+ <menu_item_call label="Piel nueva" name="New Skin"/>
+ <menu_item_call label="Pelo nuevo" name="New Hair"/>
+ <menu_item_call label="Ojos nuevos" name="New Eyes"/>
+ </menu>
+ </menu>
+ <menu label="Ordenar" name="Sort">
+ <menu_item_check label="Por el nombre" name="By Name"/>
+ <menu_item_check label="Por la fecha" name="By Date"/>
+ <menu_item_check label="Las carpetas, siempre por la fecha" name="Folders Always By Name"/>
+ <menu_item_check label="Las carpetas del sistema, arriba" name="System Folders To Top"/>
+ </menu>
+ </menu_bar>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
index 543e75867b..dfe0b8e520 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="Propiedades del Ãtem del inventario">
- <text name="LabelItemNameTitle">
- Nombre:
- </text>
- <text name="LabelItemDescTitle">
- Descripción:
- </text>
- <text name="LabelCreatorTitle">
- Creador:
- </text>
- <text name="LabelCreatorName">
- Nicole Linden
- </text>
- <button label="Perfil..." label_selected="" name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- Propietario:
- </text>
- <text name="LabelOwnerName">
- Thrax Linden
- </text>
- <button label="Perfil..." label_selected="" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- Adquirido:
- </text>
- <text name="LabelAcquiredDate">
- May Mié 24 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- Usted puede:
- </text>
- <check_box label="Modificarlo" name="CheckOwnerModify"/>
- <check_box label="Copiarlo" name="CheckOwnerCopy"/>
- <check_box label="Venderlo/darlo" name="CheckOwnerTransfer"/>
- <text name="BaseMaskDebug">
- B:
- </text>
- <text name="OwnerMaskDebug">
- O:
- </text>
- <text name="GroupMaskDebug">
- G:
- </text>
- <text name="EveryoneMaskDebug">
- E:
- </text>
- <text name="NextMaskDebug">
- N:
- </text>
- <check_box label="Compartir con el grupo" name="CheckShareWithGroup"/>
- <check_box label="Permitir a cualquiera que lo copie" name="CheckEveryoneCopy"/>
- <text name="NextOwnerLabel">
- El próximo propietario puede:
- </text>
- <check_box label="Modificarlo" name="CheckNextOwnerModify"/>
- <check_box label="Copiarlo" name="CheckNextOwnerCopy"/>
- <check_box label="Revenderlo/darlo" name="CheckNextOwnerTransfer"/>
- <text name="SaleLabel">
- Marcar Ãtem como:
- </text>
- <check_box label="En venta" name="CheckPurchase"/>
- <radio_group name="RadioSaleType">
- <radio_item name="radio">
- Original
- </radio_item>
- <radio_item name="radio2">
- Copia
- </radio_item>
- </radio_group>
- <text name="TextPrice">
- Precio: L$
- </text>
- <string name="unknown">
- (desconocido)
- </string>
- <string name="public">
- (público)
- </string>
- <string name="you_can">
- Usted puede:
- </string>
- <string name="owner_can">
- El propietario puede:
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="item properties" title="Propiedades del Ãtem del inventario">
+ <text name="LabelItemNameTitle">
+ Nombre:
+ </text>
+ <text name="LabelItemDescTitle">
+ Descripción:
+ </text>
+ <text name="LabelCreatorTitle">
+ Creador:
+ </text>
+ <text name="LabelCreatorName">
+ Nicole Linden
+ </text>
+ <button label="Perfil..." label_selected="" name="BtnCreator"/>
+ <text name="LabelOwnerTitle">
+ Propietario:
+ </text>
+ <text name="LabelOwnerName">
+ Thrax Linden
+ </text>
+ <button label="Perfil..." label_selected="" name="BtnOwner"/>
+ <text name="LabelAcquiredTitle">
+ Adquirido:
+ </text>
+ <text name="LabelAcquiredDate">
+ May Mié 24 12:50:46 2006
+ </text>
+ <text name="OwnerLabel">
+ Usted puede:
+ </text>
+ <check_box label="Modificarlo" name="CheckOwnerModify"/>
+ <check_box label="Copiarlo" name="CheckOwnerCopy"/>
+ <check_box label="Venderlo/darlo" name="CheckOwnerTransfer"/>
+ <text name="BaseMaskDebug">
+ B:
+ </text>
+ <text name="OwnerMaskDebug">
+ O:
+ </text>
+ <text name="GroupMaskDebug">
+ G:
+ </text>
+ <text name="EveryoneMaskDebug">
+ E:
+ </text>
+ <text name="NextMaskDebug">
+ N:
+ </text>
+ <check_box label="Compartir con el grupo" name="CheckShareWithGroup"/>
+ <check_box label="Permitir a cualquiera que lo copie" name="CheckEveryoneCopy"/>
+ <text name="NextOwnerLabel">
+ El próximo propietario puede:
+ </text>
+ <check_box label="Modificarlo" name="CheckNextOwnerModify"/>
+ <check_box label="Copiarlo" name="CheckNextOwnerCopy"/>
+ <check_box label="Revenderlo/darlo" name="CheckNextOwnerTransfer"/>
+ <text name="SaleLabel">
+ Marcar Ãtem como:
+ </text>
+ <check_box label="En venta" name="CheckPurchase"/>
+ <radio_group name="RadioSaleType">
+ <radio_item name="radio">
+ Original
+ </radio_item>
+ <radio_item name="radio2">
+ Copia
+ </radio_item>
+ </radio_group>
+ <text name="TextPrice">
+ Precio: L$
+ </text>
+ <string name="unknown">
+ (desconocido)
+ </string>
+ <string name="public">
+ (público)
+ </string>
+ <string name="you_can">
+ Usted puede:
+ </string>
+ <string name="owner_can">
+ El propietario puede:
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
index fc3e6912c3..d341de17e9 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory Finder" title="Ãtems_recientes_del_inventario">
- <check_box label="Animaciones" name="check_animation"/>
- <check_box label="Tarjetas de visita" name="check_calling_card"/>
- <check_box label="Ropa" name="check_clothing"/>
- <check_box label="Gestos" name="check_gesture"/>
- <check_box label="Hitos" name="check_landmark"/>
- <check_box label="Notas" name="check_notecard"/>
- <check_box label="Objetos" name="check_object"/>
- <check_box label="Scripts" name="check_script"/>
- <check_box label="Sonidos" name="check_sound"/>
- <check_box label="Texturas" name="check_texture"/>
- <check_box label="Fotos" name="check_snapshot"/>
- <button label="Todo" label_selected="Todo" name="All"/>
- <button label="Nada" label_selected="Nada" name="None"/>
- <check_box label="Mostrar siempre las carpetas" name="check_show_empty"/>
- <check_box label="Desde el fin de sesión" name="check_since_logoff"/>
- <text length="1" name="- OR -" type="string">
- - O -
- </text>
- <spinner label="horas atrás" name="spin_hours_ago"/>
- <spinner label="dÃas atrás" name="spin_days_ago"/>
- <button label="Cerrar" label_selected="Cerrar" name="Close"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory Finder" title="Ãtems_recientes_del_inventario">
+ <check_box label="Animaciones" name="check_animation"/>
+ <check_box label="Tarjetas de visita" name="check_calling_card"/>
+ <check_box label="Ropa" name="check_clothing"/>
+ <check_box label="Gestos" name="check_gesture"/>
+ <check_box label="Hitos" name="check_landmark"/>
+ <check_box label="Notas" name="check_notecard"/>
+ <check_box label="Objetos" name="check_object"/>
+ <check_box label="Scripts" name="check_script"/>
+ <check_box label="Sonidos" name="check_sound"/>
+ <check_box label="Texturas" name="check_texture"/>
+ <check_box label="Fotos" name="check_snapshot"/>
+ <button label="Todo" label_selected="Todo" name="All"/>
+ <button label="Nada" label_selected="Nada" name="None"/>
+ <check_box label="Mostrar siempre las carpetas" name="check_show_empty"/>
+ <check_box label="Desde el fin de sesión" name="check_since_logoff"/>
+ <text length="1" name="- OR -" type="string">
+ - O -
+ </text>
+ <spinner label="horas atrás" name="spin_hours_ago"/>
+ <spinner label="dÃas atrás" name="spin_days_ago"/>
+ <button label="Cerrar" label_selected="Cerrar" name="Close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
index 93f219a00f..7c18e63155 100644
--- a/indra/newview/skins/default/xui/es/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="land holdings floater" title="Mi terreno">
- <scroll_list name="parcel list">
- <column label="Nombre" name="name"/>
- <column label="Localización" name="location"/>
- <column label="Superficie" name="area"/>
- <column label="" name="hidden"/>
- </scroll_list>
- <button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportar al centro de este terreno."/>
- <button label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="Show on Map" tool_tip="Mostrar este terreno en el mapa del mundo."/>
- <text name="contrib_label">
- Contribuciones a sus grupos:
- </text>
- <scroll_list name="grant list">
- <column label="Grupo" name="group"/>
- <column label="Superficie" name="area"/>
- </scroll_list>
- <text name="allowed_label">
- Propiedades de terreno permitidas en el plan de pago actual:
- </text>
- <text name="allowed_text">
- [AREA] m²
- </text>
- <text name="current_label">
- Propiedades de terreno actuales:
- </text>
- <text name="current_text">
- [AREA] m²
- </text>
- <text name="available_label">
- Disponible para compras de terreno:
- </text>
- <text name="available_text">
- [AREA] m²
- </text>
- <string name="area_string">
- [AREA] m²
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="land holdings floater" title="Mi terreno">
+ <scroll_list name="parcel list">
+ <column label="Nombre" name="name"/>
+ <column label="Localización" name="location"/>
+ <column label="Superficie" name="area"/>
+ <column label="" name="hidden"/>
+ </scroll_list>
+ <button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportar al centro de este terreno."/>
+ <button label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="Show on Map" tool_tip="Mostrar este terreno en el mapa del mundo."/>
+ <text name="contrib_label">
+ Contribuciones a sus grupos:
+ </text>
+ <scroll_list name="grant list">
+ <column label="Grupo" name="group"/>
+ <column label="Superficie" name="area"/>
+ </scroll_list>
+ <text name="allowed_label">
+ Propiedades de terreno permitidas en el plan de pago actual:
+ </text>
+ <text name="allowed_text">
+ [AREA] m²
+ </text>
+ <text name="current_label">
+ Propiedades de terreno actuales:
+ </text>
+ <text name="current_text">
+ [AREA] m²
+ </text>
+ <text name="available_label">
+ Disponible para compras de terreno:
+ </text>
+ <text name="available_text">
+ [AREA] m²
+ </text>
+ <string name="area_string">
+ [AREA] m²
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
index a2592c58d7..00a6995575 100644
--- a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="Script: script nuevo">
- <button label="Reiniciar" label_selected="Reiniciar" name="Reset"/>
- <check_box label="Ejecutándose" name="running"/>
- <check_box label="Mono" name="mono"/>
- <string name="not_allowed">
- No está autorizado para ver este script.
- </string>
- <string name="script_running">
- Ejecutándose
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script ed float" title="Script: script nuevo">
+ <button label="Reiniciar" label_selected="Reiniciar" name="Reset"/>
+ <check_box label="Ejecutándose" name="running"/>
+ <check_box label="Mono" name="mono"/>
+ <string name="not_allowed">
+ No está autorizado para ver este script.
+ </string>
+ <string name="script_running">
+ Ejecutándose
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml
index a449e714c4..a5cd2f3097 100644
--- a/indra/newview/skins/default/xui/es/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/es/floater_moveview.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
- <button label="" label_selected="" name="turn left btn" tool_tip="Girar a la izquierda"/>
- <button label="" label_selected="" name="turn right btn" tool_tip="Girar a la derecha"/>
- <button label="" label_selected="" name="move up btn" tool_tip="Saltar o ascender"/>
- <button label="" label_selected="" name="move down btn" tool_tip="Agacharse o descender"/>
- <joystick_slide name="slide left btn" tool_tip="Ir hacia la izquierda"/>
- <joystick_slide name="slide right btn" tool_tip="Ir hacia la derecha"/>
- <joystick_turn name="forward btn" tool_tip="Ir hacia adelante"/>
- <joystick_turn name="backward btn" tool_tip="Ir hacia atrás"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="move floater" title="">
+ <button label="" label_selected="" name="turn left btn" tool_tip="Girar a la izquierda"/>
+ <button label="" label_selected="" name="turn right btn" tool_tip="Girar a la derecha"/>
+ <button label="" label_selected="" name="move up btn" tool_tip="Saltar o ascender"/>
+ <button label="" label_selected="" name="move down btn" tool_tip="Agacharse o descender"/>
+ <joystick_slide name="slide left btn" tool_tip="Ir hacia la izquierda"/>
+ <joystick_slide name="slide right btn" tool_tip="Ir hacia la derecha"/>
+ <joystick_turn name="forward btn" tool_tip="Ir hacia adelante"/>
+ <joystick_turn name="backward btn" tool_tip="Ir hacia atrás"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_openobject.xml b/indra/newview/skins/default/xui/es/floater_openobject.xml
index fced746cdd..c7846afa6a 100644
--- a/indra/newview/skins/default/xui/es/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/es/floater_openobject.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="objectcontents" title="Contenido del objeto">
- <text length="1" name="object_name" type="string">
- [DESC]:
- </text>
- <button label="Copiar al inventario" label_selected="Copiar al inventario" name="copy_to_inventory_button"/>
- <button label="Copiar y vestirse" label_selected="Copiar y vestirse" name="copy_and_wear_button"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="objectcontents" title="Contenido del objeto">
+ <text length="1" name="object_name" type="string">
+ [DESC]:
+ </text>
+ <button label="Copiar al inventario" label_selected="Copiar al inventario" name="copy_to_inventory_button"/>
+ <button label="Copiar y vestirse" label_selected="Copiar y vestirse" name="copy_and_wear_button"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml
index 8cce1fe9b7..9770e90bf4 100644
--- a/indra/newview/skins/default/xui/es/floater_pay.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
- <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
- <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
- <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
- <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
- <button label="Pagar" label_selected="Pagar" name="pay btn"/>
- <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
- <text length="1" name="payee_label" type="string">
- Pagar al residente:
- </text>
- <text length="1" name="payee_name" type="string">
- [FIRST] [LAST]
- </text>
- <text length="1" name="fastpay text" type="string">
- Pago rápido:
- </text>
- <text length="1" name="amount text" type="string">
- Cantidad:
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Give Money" title="">
+ <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
+ <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
+ <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
+ <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
+ <button label="Pagar" label_selected="Pagar" name="pay btn"/>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+ <text length="1" name="payee_label" type="string">
+ Pagar al residente:
+ </text>
+ <text length="1" name="payee_name" type="string">
+ [FIRST] [LAST]
+ </text>
+ <text length="1" name="fastpay text" type="string">
+ Pago rápido:
+ </text>
+ <text length="1" name="amount text" type="string">
+ Cantidad:
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pay_object.xml b/indra/newview/skins/default/xui/es/floater_pay_object.xml
index 2885d9a785..86b3af76f8 100644
--- a/indra/newview/skins/default/xui/es/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay_object.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
- <text length="1" name="payee_group" type="string">
- Pagar al grupo:
- </text>
- <text length="1" name="payee_resident" type="string">
- Pagar al residente:
- </text>
- <text length="1" name="payee_name" type="string">
- [FIRST] [LAST]
- </text>
- <text length="1" name="object_name_label" type="string">
- A través del objeto:
- </text>
- <text length="1" name="object_name_text" type="string">
- ...
- </text>
- <text length="1" name="fastpay text" type="string">
- Pago rápido:
- </text>
- <text length="1" name="amount text" type="string">
- Cantidad:
- </text>
- <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
- <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
- <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
- <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
- <button label="Pagar" label_selected="Pagar" name="pay btn"/>
- <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Give Money" title="">
+ <text length="1" name="payee_group" type="string">
+ Pagar al grupo:
+ </text>
+ <text length="1" name="payee_resident" type="string">
+ Pagar al residente:
+ </text>
+ <text length="1" name="payee_name" type="string">
+ [FIRST] [LAST]
+ </text>
+ <text length="1" name="object_name_label" type="string">
+ A través del objeto:
+ </text>
+ <text length="1" name="object_name_text" type="string">
+ ...
+ </text>
+ <text length="1" name="fastpay text" type="string">
+ Pago rápido:
+ </text>
+ <text length="1" name="amount text" type="string">
+ Cantidad:
+ </text>
+ <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
+ <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
+ <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
+ <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
+ <button label="Pagar" label_selected="Pagar" name="pay btn"/>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_postcard.xml b/indra/newview/skins/default/xui/es/floater_postcard.xml
index 11e319793a..06f8e7294a 100644
--- a/indra/newview/skins/default/xui/es/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/es/floater_postcard.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="Foto por correo electrónico">
- <text name="to_label">
- Correo electrónico del destinatario:
- </text>
- <text name="from_label">
- Su correo electrónico:
- </text>
- <text name="name_label">
- Su nombre:
- </text>
- <text name="subject_label">
- Asunto:
- </text>
- <line_editor label="Escriba aquà el asunto." name="subject_form"/>
- <text name="msg_label">
- Mensaje:
- </text>
- <text_editor name="msg_form">
- Escriba aquà el mensaje.
- </text_editor>
- <text name="fine_print">
- Si su destinatario se registra en SL, usted conseguirá un bono de referido.
- </text>
- <button label="Cancelar" name="cancel_btn"/>
- <button label="Enviar" name="send_btn"/>
- <string name="default_subject">
- Postal desde Second Life.
- </string>
- <string name="default_message">
- ¡Mira esto!
- </string>
- <string name="upload_message">
- "Enviando..."
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="Foto por correo electrónico">
+ <text name="to_label">
+ Correo electrónico del destinatario:
+ </text>
+ <text name="from_label">
+ Su correo electrónico:
+ </text>
+ <text name="name_label">
+ Su nombre:
+ </text>
+ <text name="subject_label">
+ Asunto:
+ </text>
+ <line_editor label="Escriba aquà el asunto." name="subject_form"/>
+ <text name="msg_label">
+ Mensaje:
+ </text>
+ <text_editor name="msg_form">
+ Escriba aquà el mensaje.
+ </text_editor>
+ <text name="fine_print">
+ Si su destinatario se registra en SL, usted conseguirá un bono de referido.
+ </text>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Enviar" name="send_btn"/>
+ <string name="default_subject">
+ Postal desde Second Life.
+ </string>
+ <string name="default_message">
+ ¡Mira esto!
+ </string>
+ <string name="upload_message">
+ "Enviando..."
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml
index b579316890..56e99e2285 100644
--- a/indra/newview/skins/default/xui/es/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/es/floater_preferences.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Preferences" title="Preferencias">
- <button label="OK" label_selected="OK" name="OK"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <button label="Aplicar" label_selected="Aplicar" name="Apply"/>
- <button label="Acerca de" label_selected="Acerca de" name="About..."/>
- <button label="Ayuda" label_selected="Ayuda" name="Help"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Preferences" title="Preferencias">
+ <button label="OK" label_selected="OK" name="OK"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <button label="Aplicar" label_selected="Aplicar" name="Apply"/>
+ <button label="Acerca de" label_selected="Acerca de" name="About..."/>
+ <button label="Ayuda" label_selected="Ayuda" name="Help"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
index 7a9747f331..cea2273089 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_anim">
- <text length="1" name="desc txt" type="string">
- Descripción:
- </text>
- <button label="Ejecutarla en el mundo" label_selected="Parar" name="Anim play btn" tool_tip="Ejecutar esta animación de modo que puedan verla los demás."/>
- <button label="Ejecutarla para usted" label_selected="Parar" name="Anim audition btn" tool_tip="Ejecutar esta animación de modo que sólo la vea usted."/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_anim">
+ <text length="1" name="desc txt" type="string">
+ Descripción:
+ </text>
+ <button label="Ejecutarla en el mundo" label_selected="Parar" name="Anim play btn" tool_tip="Ejecutar esta animación de modo que puedan verla los demás."/>
+ <button label="Ejecutarla para usted" label_selected="Parar" name="Anim audition btn" tool_tip="Ejecutar esta animación de modo que sólo la vea usted."/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
index acc2bec5d2..4513fc6f3c 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="gesture_preview">
- <string name="stop_txt">
- Parar
- </string>
- <string name="preview_txt">
- Vista previa
- </string>
- <string name="none_text">
- -- Ninguno --
- </string>
- <text name="desc_label">
- Descripción:
- </text>
- <text name="trigger_label">
- Palabra clave:
- </text>
- <text name="replace_text" tool_tip="Reemplaza la/s palabra/s clave con estas palabras. Por ejemplo, si cambia la palabra clave 'hola' por 'qué tal', se cambiará en el chat 'Quise decir hola' por 'Quise decir qué tal' en cuanto realice el gesto.">
- Reemplazar por:
- </text>
- <line_editor name="replace_editor" tool_tip="Reemplaza la/s palabra/s clave con estas palabras. Por ejemplo, si cambia la palabra clave 'hola' por 'qué tal', se cambiará en el chat 'Quise decir hola' por 'Quise decir qué tal' en cuanto realice el gesto."/>
- <text name="key_label">
- Atajo de teclado:
- </text>
- <combo_box label="Ninguno" name="modifier_combo"/>
- <combo_box label="Ninguno" name="key_combo"/>
- <text name="library_label">
- Biblioteca:
- </text>
- <text name="steps_label">
- Pasos:
- </text>
- <scroll_list name="library_list">
- Animación
-Sonido
-Chat
-Esperar
- </scroll_list>
- <button label="Añadir >>" name="add_btn"/>
- <button label="Hacia arriba" name="up_btn"/>
- <button label="Hacia abajo" name="down_btn"/>
- <button label="Quitar" name="delete_btn"/>
- <text name="help_label">
- Todos los pasos suceden a la vez,
-a menos que añada pasos de espera.
- </text>
- <radio_group name="animation_trigger_type">
- <radio_item name="start">
- Empezar
- </radio_item>
- <radio_item name="stop">
- Parar
- </radio_item>
- </radio_group>
- <check_box label="hasta que las animaciones estén hechas" name="wait_anim_check"/>
- <check_box label="tiempo en segundos" name="wait_time_check"/>
- <check_box label="Disponible" name="active_check" tool_tip="Los gestos disponibles pueden realizarse escribiendo en el chat su frase clave o pulsando su tecla de acceso rápido. Generalmente, los gestos pasan a no disponibles cuando hay un conflicto de teclas."/>
- <button label="Vista previa" name="preview_btn"/>
- <button label="Guardar" name="save_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="gesture_preview">
+ <string name="stop_txt">
+ Parar
+ </string>
+ <string name="preview_txt">
+ Vista previa
+ </string>
+ <string name="none_text">
+ -- Ninguno --
+ </string>
+ <text name="desc_label">
+ Descripción:
+ </text>
+ <text name="trigger_label">
+ Palabra clave:
+ </text>
+ <text name="replace_text" tool_tip="Reemplaza la/s palabra/s clave con estas palabras. Por ejemplo, si cambia la palabra clave 'hola' por 'qué tal', se cambiará en el chat 'Quise decir hola' por 'Quise decir qué tal' en cuanto realice el gesto.">
+ Reemplazar por:
+ </text>
+ <line_editor name="replace_editor" tool_tip="Reemplaza la/s palabra/s clave con estas palabras. Por ejemplo, si cambia la palabra clave 'hola' por 'qué tal', se cambiará en el chat 'Quise decir hola' por 'Quise decir qué tal' en cuanto realice el gesto."/>
+ <text name="key_label">
+ Atajo de teclado:
+ </text>
+ <combo_box label="Ninguno" name="modifier_combo"/>
+ <combo_box label="Ninguno" name="key_combo"/>
+ <text name="library_label">
+ Biblioteca:
+ </text>
+ <text name="steps_label">
+ Pasos:
+ </text>
+ <scroll_list name="library_list">
+ Animación
+Sonido
+Chat
+Esperar
+ </scroll_list>
+ <button label="Añadir >>" name="add_btn"/>
+ <button label="Hacia arriba" name="up_btn"/>
+ <button label="Hacia abajo" name="down_btn"/>
+ <button label="Quitar" name="delete_btn"/>
+ <text name="help_label">
+ Todos los pasos suceden a la vez,
+a menos que añada pasos de espera.
+ </text>
+ <radio_group name="animation_trigger_type">
+ <radio_item name="start">
+ Empezar
+ </radio_item>
+ <radio_item name="stop">
+ Parar
+ </radio_item>
+ </radio_group>
+ <check_box label="hasta que las animaciones estén hechas" name="wait_anim_check"/>
+ <check_box label="tiempo en segundos" name="wait_time_check"/>
+ <check_box label="Disponible" name="active_check" tool_tip="Los gestos disponibles pueden realizarse escribiendo en el chat su frase clave o pulsando su tecla de acceso rápido. Generalmente, los gestos pasan a no disponibles cuando hay un conflicto de teclas."/>
+ <button label="Vista previa" name="preview_btn"/>
+ <button label="Guardar" name="save_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
index a663b23666..2d13e41924 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview notecard" title="Nota:">
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <text length="1" name="desc txt" type="string">
- Descripción:
- </text>
- <text_editor length="1" name="Notecard Editor" type="string">
- Cargando...
- </text_editor>
- <string name="no_object">
- No se ha podido encontrar el objeto que contiene esta nota.
- </string>
- <string name="not_allowed">
- No está autorizado a ver esta nota.
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview notecard" title="Nota:">
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <text length="1" name="desc txt" type="string">
+ Descripción:
+ </text>
+ <text_editor length="1" name="Notecard Editor" type="string">
+ Cargando...
+ </text_editor>
+ <string name="no_object">
+ No se ha podido encontrar el objeto que contiene esta nota.
+ </string>
+ <string name="not_allowed">
+ No está autorizado a ver esta nota.
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_sound.xml b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
index 9b11bdf123..82c01e1d1b 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_sound">
- <text length="1" name="desc txt" type="string">
- Descripción:
- </text>
- <button label="Tocar en el mundo" label_selected="Tocar en el mundo" name="Sound play btn" tool_tip="Tocar este sonido para que puedan oÃrlo los demás."/>
- <button label="OÃr sólo uno mismo" label_selected="OÃr sólo uno mismo" name="Sound audition btn" tool_tip="Tocar este sonido para que sólo pueda oÃrlo usted."/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_sound">
+ <text length="1" name="desc txt" type="string">
+ Descripción:
+ </text>
+ <button label="Tocar en el mundo" label_selected="Tocar en el mundo" name="Sound play btn" tool_tip="Tocar este sonido para que puedan oÃrlo los demás."/>
+ <button label="OÃr sólo uno mismo" label_selected="OÃr sólo uno mismo" name="Sound audition btn" tool_tip="Tocar este sonido para que sólo pueda oÃrlo usted."/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
index 826562c1c2..2fb66f1fdc 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_texture">
- <text length="1" name="desc txt" type="string">
- Descripción:
- </text>
- <text length="1" name="dimensions" type="string">
- Tamaño: [WIDTH] x [HEIGHT]
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_texture">
+ <text length="1" name="desc txt" type="string">
+ Descripción:
+ </text>
+ <text length="1" name="dimensions" type="string">
+ Tamaño: [WIDTH] x [HEIGHT]
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
index b79a10a863..4e1782995c 100644
--- a/indra/newview/skins/default/xui/es/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
@@ -1,180 +1,180 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_report_abuse" title="Denuncia de Infracción">
- <texture_picker label="" name="screenshot"/>
- <check_box label="Incluir una captura de pantalla" name="screen_check"/>
- <text name="reporter_title">
- Denunciante:
- </text>
- <text name="reporter_field">
- Loremipsum Dolorsitamut
- </text>
- <text name="sim_title">
- Región:
- </text>
- <text name="sim_field">
- Nombre de la región
- </text>
- <text name="pos_title">
- Posición:
- </text>
- <text name="pos_field">
- {128.1, 128.1, 15.4}
- </text>
- <text name="select_object_label">
- Pulse el botón y luego el objeto:
- </text>
- <button label="" label_selected="" name="pick_btn" tool_tip="Señalar objeto - Identificar un objeto como sujeto de esta denuncia"/>
- <text name="object_name_label">
- Nombre:
- </text>
- <text name="object_name">
- Consetetur Sadipscing
- </text>
- <text name="owner_name_label">
- Propietario:
- </text>
- <text name="owner_name">
- Hendrerit Vulputate
- </text>
- <combo_box name="category_combo" tool_tip="CategorÃa -- Elija la categorÃa que describa mejor esta denuncia">
- <combo_item name="Select_category">
- Elegir la categorÃa
- </combo_item>
- <combo_item name="Age__Age_play">
- Edad > Jugar a ser niño
- </combo_item>
- <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
- Edad > Residente adulto en Teen Second Life
- </combo_item>
-
-
-
- <combo_item name="Assault__Combat_sandbox___unsafe_area">
- Ataque > Sandbox de combate / Zona no segura
- </combo_item>
- <combo_item name="Assault__Safe_area">
- Ataque > Zona segura
- </combo_item>
- <combo_item name="Assault__Weapons_testing_sandbox">
- Ataque > Sandbox de prueba de armas
- </combo_item>
- <combo_item name="Commerce__Failure_to_deliver_product_or_service">
- Comercio > Error en la entrega de productos o servicios
- </combo_item>
- <combo_item name="Disclosure__Real_world_information">
- Indiscreción > Información del mundo real
- </combo_item>
- <combo_item name="Disclosure__Remotely_monitoring chat">
- Indiscreción > Monitorizar a distancia el chat
- </combo_item>
- <combo_item name="Disclosure__Second_Life_information_chat_IMs">
- Indiscreción > Información Se Second Life, el chat o los MI
- </combo_item>
- <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
- Perturbando la paz > Abuso de los recursos de la región
- </combo_item>
- <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
- Perturbando la paz > Excesivos objetos con script
- </combo_item>
- <combo_item name="Disturbing_the_peace__Object_littering">
- Perturbando la paz > Objeto basura
- </combo_item>
- <combo_item name="Disturbing_the_peace__Repetitive_spam">
- Perturbando la paz > Spam (mensajes no pedidos) repetitivo
- </combo_item>
- <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
- Perturbando la paz > Publicidad no deseada
- </combo_item>
- <combo_item name="Fraud__L$">
- Fraude > L$
- </combo_item>
- <combo_item name="Fraud__Land">
- Fraude > Terreno
- </combo_item>
- <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
- Fraude > Esquemas piramidales o cadenas de cartas
- </combo_item>
- <combo_item name="Fraud__US$">
- Fraude > US$
- </combo_item>
- <combo_item name="Harassment__Advert_farms___visual_spam">
- Acoso > Anuncios múltiples / Spam visual
- </combo_item>
- <combo_item name="Harassment__Defaming_individuals_or_groups">
- Acoso > Difamación de individuos o grupos
- </combo_item>
- <combo_item name="Harassment__Impeding_movement">
- Acoso > Impedir el movimiento
- </combo_item>
- <combo_item name="Harassment__Sexual_harassment">
- Acoso > Acoso sexual
- </combo_item>
- <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
- Acoso > Incitar a, o pedir, que otros violen las Condiciones del Servicio
- </combo_item>
- <combo_item name="Harassment__Verbal_abuse">
- Acoso > Abuso verbal
- </combo_item>
- <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
- Indecencia > En general, contenido o conducta ofensivos
- </combo_item>
-
-
-
- <combo_item name="Indecency__Inappropriate_avatar_name">
- Indecencia > Nombre inapropiado del avatar
- </combo_item>
-
-
-
- <combo_item name="Intellectual_property_infringement_Content_Removal">
- Infracción de la propiedad intelectual > Eliminación de contenidos
- </combo_item>
- <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
- Infracción de la propiedad intelectual > CopyBot o Exploit (programa malicioso) de permisos
- </combo_item>
- <combo_item name="Intolerance">
- Intolerancia
- </combo_item>
- <combo_item name="Land__Abuse_of_sandbox_resources">
- Terreno > Abuso de los recursos de un sandbox
- </combo_item>
- <combo_item name="Land__Encroachment__Objects_textures">
- Terreno > Invasión > Objetos/Texturas
- </combo_item>
- <combo_item name="Land__Encroachment__Particles">
- Terreno > Invasión > PartÃculas
- </combo_item>
- <combo_item name="Land__Encroachment__Trees_plants">
- Terreno > Invasión > Ãrboles/Plantas
- </combo_item>
- <combo_item name="Wagering_gambling">
- Apuestas/Juego
- </combo_item>
- <combo_item name="Other">
- Otra
- </combo_item>
- </combo_box>
- <text name="abuser_name_title">
- Nombre del infractor:
- </text>
- <button label="Elegir al residente" label_selected="" name="select_abuser" tool_tip="Elegir de una lista el nombre del infractor"/>
- <check_box label="No sé el nombre del infractor" name="omit_abuser_name" tool_tip="Marque esto si no puede aportar el nombre del infractor"/>
- <text name="abuser_name_title2">
- Localización de la infracción:
- </text>
- <text name="sum_title">
- Resumen:
- </text>
- <text name="dscr_title">
- Detalles:
- </text>
- <text name="bug_aviso">
- Por favor, sea muy concreto sobre la fecha, la localización, la naturaleza de la infracción, el aportar textos relevantes del chat o los MI, y, si es posible, seleccione el objeto.
- </text>
- <text name="incomplete_title">
- Nota: las denuncias incompletas no se investigarán.
- </text>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
- <button label="Denunciar la infracción" label_selected="Denunciar la infracción" name="send_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_report_abuse" title="Denuncia de Infracción">
+ <texture_picker label="" name="screenshot"/>
+ <check_box label="Incluir una captura de pantalla" name="screen_check"/>
+ <text name="reporter_title">
+ Denunciante:
+ </text>
+ <text name="reporter_field">
+ Loremipsum Dolorsitamut
+ </text>
+ <text name="sim_title">
+ Región:
+ </text>
+ <text name="sim_field">
+ Nombre de la región
+ </text>
+ <text name="pos_title">
+ Posición:
+ </text>
+ <text name="pos_field">
+ {128.1, 128.1, 15.4}
+ </text>
+ <text name="select_object_label">
+ Pulse el botón y luego el objeto:
+ </text>
+ <button label="" label_selected="" name="pick_btn" tool_tip="Señalar objeto - Identificar un objeto como sujeto de esta denuncia"/>
+ <text name="object_name_label">
+ Nombre:
+ </text>
+ <text name="object_name">
+ Consetetur Sadipscing
+ </text>
+ <text name="owner_name_label">
+ Propietario:
+ </text>
+ <text name="owner_name">
+ Hendrerit Vulputate
+ </text>
+ <combo_box name="category_combo" tool_tip="CategorÃa -- Elija la categorÃa que describa mejor esta denuncia">
+ <combo_item name="Select_category">
+ Elegir la categorÃa
+ </combo_item>
+ <combo_item name="Age__Age_play">
+ Edad > Jugar a ser niño
+ </combo_item>
+ <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+ Edad > Residente adulto en Teen Second Life
+ </combo_item>
+
+
+
+ <combo_item name="Assault__Combat_sandbox___unsafe_area">
+ Ataque > Sandbox de combate / Zona no segura
+ </combo_item>
+ <combo_item name="Assault__Safe_area">
+ Ataque > Zona segura
+ </combo_item>
+ <combo_item name="Assault__Weapons_testing_sandbox">
+ Ataque > Sandbox de prueba de armas
+ </combo_item>
+ <combo_item name="Commerce__Failure_to_deliver_product_or_service">
+ Comercio > Error en la entrega de productos o servicios
+ </combo_item>
+ <combo_item name="Disclosure__Real_world_information">
+ Indiscreción > Información del mundo real
+ </combo_item>
+ <combo_item name="Disclosure__Remotely_monitoring chat">
+ Indiscreción > Monitorizar a distancia el chat
+ </combo_item>
+ <combo_item name="Disclosure__Second_Life_information_chat_IMs">
+ Indiscreción > Información Se Second Life, el chat o los MI
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+ Perturbando la paz > Abuso de los recursos de la región
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+ Perturbando la paz > Excesivos objetos con script
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Object_littering">
+ Perturbando la paz > Objeto basura
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Repetitive_spam">
+ Perturbando la paz > Spam (mensajes no pedidos) repetitivo
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+ Perturbando la paz > Publicidad no deseada
+ </combo_item>
+ <combo_item name="Fraud__L$">
+ Fraude > L$
+ </combo_item>
+ <combo_item name="Fraud__Land">
+ Fraude > Terreno
+ </combo_item>
+ <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+ Fraude > Esquemas piramidales o cadenas de cartas
+ </combo_item>
+ <combo_item name="Fraud__US$">
+ Fraude > US$
+ </combo_item>
+ <combo_item name="Harassment__Advert_farms___visual_spam">
+ Acoso > Anuncios múltiples / Spam visual
+ </combo_item>
+ <combo_item name="Harassment__Defaming_individuals_or_groups">
+ Acoso > Difamación de individuos o grupos
+ </combo_item>
+ <combo_item name="Harassment__Impeding_movement">
+ Acoso > Impedir el movimiento
+ </combo_item>
+ <combo_item name="Harassment__Sexual_harassment">
+ Acoso > Acoso sexual
+ </combo_item>
+ <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+ Acoso > Incitar a, o pedir, que otros violen las Condiciones del Servicio
+ </combo_item>
+ <combo_item name="Harassment__Verbal_abuse">
+ Acoso > Abuso verbal
+ </combo_item>
+ <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+ Indecencia > En general, contenido o conducta ofensivos
+ </combo_item>
+
+
+
+ <combo_item name="Indecency__Inappropriate_avatar_name">
+ Indecencia > Nombre inapropiado del avatar
+ </combo_item>
+
+
+
+ <combo_item name="Intellectual_property_infringement_Content_Removal">
+ Infracción de la propiedad intelectual > Eliminación de contenidos
+ </combo_item>
+ <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+ Infracción de la propiedad intelectual > CopyBot o Exploit (programa malicioso) de permisos
+ </combo_item>
+ <combo_item name="Intolerance">
+ Intolerancia
+ </combo_item>
+ <combo_item name="Land__Abuse_of_sandbox_resources">
+ Terreno > Abuso de los recursos de un sandbox
+ </combo_item>
+ <combo_item name="Land__Encroachment__Objects_textures">
+ Terreno > Invasión > Objetos/Texturas
+ </combo_item>
+ <combo_item name="Land__Encroachment__Particles">
+ Terreno > Invasión > PartÃculas
+ </combo_item>
+ <combo_item name="Land__Encroachment__Trees_plants">
+ Terreno > Invasión > Ãrboles/Plantas
+ </combo_item>
+ <combo_item name="Wagering_gambling">
+ Apuestas/Juego
+ </combo_item>
+ <combo_item name="Other">
+ Otra
+ </combo_item>
+ </combo_box>
+ <text name="abuser_name_title">
+ Nombre del infractor:
+ </text>
+ <button label="Elegir al residente" label_selected="" name="select_abuser" tool_tip="Elegir de una lista el nombre del infractor"/>
+ <check_box label="No sé el nombre del infractor" name="omit_abuser_name" tool_tip="Marque esto si no puede aportar el nombre del infractor"/>
+ <text name="abuser_name_title2">
+ Localización de la infracción:
+ </text>
+ <text name="sum_title">
+ Resumen:
+ </text>
+ <text name="dscr_title">
+ Detalles:
+ </text>
+ <text name="bug_aviso">
+ Por favor, sea muy concreto sobre la fecha, la localización, la naturaleza de la infracción, el aportar textos relevantes del chat o los MI, y, si es posible, seleccione el objeto.
+ </text>
+ <text name="incomplete_title">
+ Nota: las denuncias incompletas no se investigarán.
+ </text>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Denunciar la infracción" label_selected="Denunciar la infracción" name="send_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_debug.xml b/indra/newview/skins/default/xui/es/floater_script_debug.xml
index 301d4837a8..e33ffb7d96 100644
--- a/indra/newview/skins/default/xui/es/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_debug.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="script debug floater" title="Alerta/Error de los scripts">
- <tab_container name="Preview Tabs">
- <floater label="Script" name="all_scripts" title="[Todos los scripts]"/>
- </tab_container>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="script debug floater" title="Alerta/Error de los scripts">
+ <tab_container name="Preview Tabs">
+ <floater label="Script" name="all_scripts" title="[Todos los scripts]"/>
+ </tab_container>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_preview.xml b/indra/newview/skins/default/xui/es/floater_script_preview.xml
index eb1b5440cb..f8d143af9d 100644
--- a/indra/newview/skins/default/xui/es/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_preview.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview lsl text" title="Script: script de rotación">
- <text length="1" name="desc txt" type="string">
- Descripción:
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview lsl text" title="Script: script de rotación">
+ <text length="1" name="desc txt" type="string">
+ Descripción:
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_queue.xml b/indra/newview/skins/default/xui/es/floater_script_queue.xml
index ecfaecc2b9..dcd2bfe5b0 100644
--- a/indra/newview/skins/default/xui/es/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_queue.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="queue" title="Reinicio">
- <button label="Cerrar" label_selected="Cerrar" name="close"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="queue" title="Reinicio">
+ <button label="Cerrar" label_selected="Cerrar" name="close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_search.xml b/indra/newview/skins/default/xui/es/floater_script_search.xml
index 738260b05b..9cabed9e36 100644
--- a/indra/newview/skins/default/xui/es/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_search.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script search" title="Buscar en el script">
- <check_box label="Indiferente mays./mins." name="case_text"/>
- <button label="Buscar" label_selected="Buscar" name="search_btn"/>
- <button label="Reemplazar" label_selected="Reemplazar" name="replace_btn"/>
- <button label="Reemplazar todos" label_selected="Reemplazar todos" name="replace_all_btn"/>
- <text length="1" name="txt" type="string">
- Buscar
- </text>
- <text length="1" name="txt2" type="string">
- Reemplazar
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script search" title="Buscar en el script">
+ <check_box label="Indiferente mays./mins." name="case_text"/>
+ <button label="Buscar" label_selected="Buscar" name="search_btn"/>
+ <button label="Reemplazar" label_selected="Reemplazar" name="replace_btn"/>
+ <button label="Reemplazar todos" label_selected="Reemplazar todos" name="replace_all_btn"/>
+ <text length="1" name="txt" type="string">
+ Buscar
+ </text>
+ <text length="1" name="txt2" type="string">
+ Reemplazar
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml
index 0276ff0d3c..8d47bad6dc 100644
--- a/indra/newview/skins/default/xui/es/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_sell_land.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="sell land" title="Vender el terreno">
- <text name="info_parcel_label">
- Parcela:
- </text>
- <text name="info_parcel">
- NOMBRE DE LA PARCELA
- </text>
- <text name="info_size_label">
- Tamaño:
- </text>
- <text name="info_size">
- [AREA] m²
- </text>
- <text name="info_action">
- Vender esta parcela:
- </text>
- <text name="price_label">
- Marque un precio:
- </text>
- <text name="price_text">
- Elija un precio adecuado para esta parcela.
- </text>
- <text name="price_ld">
- L$
- </text>
- <text name="price_per_m">
- ([PER_METER] L$ por metro cuadrado)
- </text>
- <text name="sell_to_label">
- Vender este terreno a:
- </text>
- <text name="sell_to_text">
- Elija si venderlo a cualquiera o a un comprador concreto.
- </text>
- <combo_box name="sell_to">
- <combo_item name="--selectone--">
- -- seleccione --
- </combo_item>
- <combo_item name="Anyone">
- Cualquiera
- </combo_item>
- <combo_item name="Specificuser:">
- Un usuario concreto:
- </combo_item>
- </combo_box>
- <button label="Seleccionar..." name="sell_to_select_agent"/>
- <text name="sell_objects_label">
- ¿Vender los objetos con el terreno?
- </text>
- <text name="sell_objects_text">
- Los objetos transferibles del propietario del terreno cambiarán de propietario.
- </text>
- <radio_group name="sell_objects">
- <radio_item name="no">
- No, mantener la propiedad de los objetos
- </radio_item>
- <radio_item name="yes">
- SÃ, vender los objetos con el terreno
- </radio_item>
- </radio_group>
- <button label="Mostrar los objetos" name="show_objects"/>
- <text name="nag_message_label">
- RECUERDE: todas las ventas son definitivas.
- </text>
- <button label="Poner el terreno en venta" name="sell_btn"/>
- <button label="Cancelar" name="cancel_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="sell land" title="Vender el terreno">
+ <text name="info_parcel_label">
+ Parcela:
+ </text>
+ <text name="info_parcel">
+ NOMBRE DE LA PARCELA
+ </text>
+ <text name="info_size_label">
+ Tamaño:
+ </text>
+ <text name="info_size">
+ [AREA] m²
+ </text>
+ <text name="info_action">
+ Vender esta parcela:
+ </text>
+ <text name="price_label">
+ Marque un precio:
+ </text>
+ <text name="price_text">
+ Elija un precio adecuado para esta parcela.
+ </text>
+ <text name="price_ld">
+ L$
+ </text>
+ <text name="price_per_m">
+ ([PER_METER] L$ por metro cuadrado)
+ </text>
+ <text name="sell_to_label">
+ Vender este terreno a:
+ </text>
+ <text name="sell_to_text">
+ Elija si venderlo a cualquiera o a un comprador concreto.
+ </text>
+ <combo_box name="sell_to">
+ <combo_box.item name="--selectone--">
+ -- seleccione --
+ </combo_box.item>
+ <combo_box.item name="Anyone">
+ Cualquiera
+ </combo_box.item>
+ <combo_box.item name="Specificuser:">
+ Un usuario concreto:
+ </combo_box.item>
+ </combo_box>
+ <button label="Seleccionar..." name="sell_to_select_agent"/>
+ <text name="sell_objects_label">
+ ¿Vender los objetos con el terreno?
+ </text>
+ <text name="sell_objects_text">
+ Los objetos transferibles del propietario del terreno cambiarán de propietario.
+ </text>
+ <radio_group name="sell_objects">
+ <radio_item name="no">
+ No, mantener la propiedad de los objetos
+ </radio_item>
+ <radio_item name="yes">
+ SÃ, vender los objetos con el terreno
+ </radio_item>
+ </radio_group>
+ <button label="Mostrar los objetos" name="show_objects"/>
+ <text name="nag_message_label">
+ RECUERDE: todas las ventas son definitivas.
+ </text>
+ <button label="Poner el terreno en venta" name="sell_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
index 3387a3d4f2..28fb1478d3 100644
--- a/indra/newview/skins/default/xui/es/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="settings_debug" title="Configuración del depurador">
- <combo_box name="boolean_combo">
- <combo_item name="TRUE">
- TRUE
- </combo_item>
- <combo_item name="FALSE">
- FALSE
- </combo_item>
- </combo_box>
- <color_swatch label="Color" name="color_swatch"/>
- <spinner label="x" name="val_spinner_1"/>
- <spinner label="x" name="val_spinner_2"/>
- <spinner label="x" name="val_spinner_3"/>
- <spinner label="x" name="val_spinner_4"/>
- <button label="Volver a las opciones por defecto" name="default_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="settings_debug" title="Configuración del depurador">
+ <combo_box name="boolean_combo">
+ <combo_box.item name="TRUE">
+ TRUE
+ </combo_box.item>
+ <combo_box.item name="FALSE">
+ FALSE
+ </combo_box.item>
+ </combo_box>
+ <color_swatch label="Color" name="color_swatch"/>
+ <spinner label="x" name="val_spinner_1"/>
+ <spinner label="x" name="val_spinner_2"/>
+ <spinner label="x" name="val_spinner_3"/>
+ <spinner label="x" name="val_spinner_4"/>
+ <button label="Volver a las opciones por defecto" name="default_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml
index 72659c58a2..0461f996f6 100644
--- a/indra/newview/skins/default/xui/es/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml
@@ -1,137 +1,133 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="Vista previa de la foto">
- <text name="type_label">
- Destino de la foto
- </text>
- <radio_group label="Tipo de la foto" name="snapshot_type_radio">
- <radio_item name="postcard">
- Enviar por correo electrónico
- </radio_item>
- <radio_item name="texture">
- Guardarla en su inventario ([AMOUNT] L$)
- </radio_item>
- <radio_item name="local">
- Guardarla en su disco duro
- </radio_item>
- </radio_group>
- <text name="file_size_label">
- Tamaño del archivo: [SIZE] KB
- </text>
- <button label="Actualizar la foto" name="new_snapshot_btn"/>
- <button label="Enviar" name="send_btn"/>
- <button label="Guardar ([AMOUNT] L$)" name="upload_btn"/>
- <flyout_button label="Guardar" name="save_btn" tool_tip="Guardar la imagen en un archivo">
- <flyout_button_item name="save_item">
- Guardar
- </flyout_button_item>
- <flyout_button_item name="saveas_item">
- Guardar como...
- </flyout_button_item>
- </flyout_button>
- <button label="Cancelar" name="discard_btn"/>
- <button label="Más >>" name="more_btn" tool_tip="Opciones avanzadas"/>
- <button label="<< Menos" name="less_btn" tool_tip="Opciones avanzadas"/>
- <text name="type_label2">
- Tamaño
- </text>
- <text name="format_label">
- Formato
- </text>
- <combo_box label="Resolución" name="postcard_size_combo">
- <combo_item name="CurrentWindow">
- Ventana actual
- </combo_item>
- <combo_item name="640x480">
- 640x480
- </combo_item>
- <combo_item name="800x600">
- 800x600
- </combo_item>
- <combo_item name="1024x768">
- 1024x768
- </combo_item>
- <combo_item name="Custom">
- Personalizar
- </combo_item>
- </combo_box>
- <combo_box label="Resolución" name="texture_size_combo">
- <combo_item name="CurrentWindow">
- Ventana actual
- </combo_item>
- <combo_item name="Small(128x128)">
- Pequeño (128x128)
- </combo_item>
- <combo_item name="Medium(256x256)">
- Medio (256x256)
- </combo_item>
- <combo_item name="Large(512x512)">
- Grande (512x512)
- </combo_item>
- <combo_item name="Custom">
- Personalizar
- </combo_item>
- </combo_box>
- <combo_box label="Resolución" name="local_size_combo">
- <combo_item name="CurrentWindow">
- Ventana actual
- </combo_item>
- <combo_item name="320x240">
- 320x240
- </combo_item>
- <combo_item name="640x480">
- 640x480
- </combo_item>
- <combo_item name="800x600">
- 800x600
- </combo_item>
- <combo_item name="1024x768">
- 1024x768
- </combo_item>
- <combo_item name="1280x1024">
- 1280x1024
- </combo_item>
- <combo_item name="1600x1200">
- 1600x1200
- </combo_item>
- <combo_item name="Custom">
- Personalizar
- </combo_item>
- </combo_box>
- <combo_box label="Formato" name="local_format_combo">
- <combo_item name="PNG">
- PNG
- </combo_item>
- <combo_item name="JPEG">
- JPEG
- </combo_item>
- <combo_item name="BMP">
- BMP
- </combo_item>
- </combo_box>
- <spinner label="Ancho" name="snapshot_width"/>
- <spinner label="Alto" name="snapshot_height"/>
- <check_box label="Mantener las proporciones" name="keep_aspect_check"/>
- <slider label="Calidad de la imagen" name="image_quality_slider"/>
- <text name="layer_type_label">
- Captura:
- </text>
- <combo_box label="Capas de la imagen" name="layer_types">
- <combo_item name="Colors">
- Colores
- </combo_item>
- <combo_item name="Depth">
- Profundidad
- </combo_item>
- <combo_item name="ObjectMattes">
- Bandas negras
- </combo_item>
- </combo_box>
- <check_box label="Incluir la interfaz en la foto" name="ui_check"/>
- <check_box label="Incluir los HUD en la foto" name="hud_check"/>
- <check_box label="Mantenerla abierta tras guardarla" name="keep_open_check"/>
- <check_box label="Congelar la toma (vista previa en pantalla completa)" name="freeze_frame_check"/>
- <check_box label="Actualizar automáticamente" name="auto_snapshot_check"/>
- <string name="unknown">
- desconocido
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Snapshot" title="Vista previa de la foto">
+ <text name="type_label">
+ Destino de la foto
+ </text>
+ <radio_group label="Tipo de la foto" name="snapshot_type_radio">
+ <radio_item name="postcard">
+ Enviar por correo electrónico
+ </radio_item>
+ <radio_item name="texture">
+ Guardarla en su inventario ([AMOUNT] L$)
+ </radio_item>
+ <radio_item name="local">
+ Guardarla en su disco duro
+ </radio_item>
+ </radio_group>
+ <text name="file_size_label">
+ Tamaño del archivo: [SIZE] KB
+ </text>
+ <button label="Actualizar la foto" name="new_snapshot_btn"/>
+ <button label="Enviar" name="send_btn"/>
+ <button label="Guardar ([AMOUNT] L$)" name="upload_btn"/>
+ <flyout_button label="Guardar" name="save_btn" tool_tip="Guardar la imagen en un archivo">
+ <flyout_button_item name="save_item" label="Guardar"/>
+ <flyout_button_item name="saveas_item" label="Guardar como..."/>
+ </flyout_button>
+ <button label="Cancelar" name="discard_btn"/>
+ <button label="Más >>" name="more_btn" tool_tip="Opciones avanzadas"/>
+ <button label="<< Menos" name="less_btn" tool_tip="Opciones avanzadas"/>
+ <text name="type_label2">
+ Tamaño
+ </text>
+ <text name="format_label">
+ Formato
+ </text>
+ <combo_box label="Resolución" name="postcard_size_combo">
+ <combo_item name="CurrentWindow">
+ Ventana actual
+ </combo_item>
+ <combo_item name="640x480">
+ 640x480
+ </combo_item>
+ <combo_item name="800x600">
+ 800x600
+ </combo_item>
+ <combo_item name="1024x768">
+ 1024x768
+ </combo_item>
+ <combo_item name="Custom">
+ Personalizar
+ </combo_item>
+ </combo_box>
+ <combo_box label="Resolución" name="texture_size_combo">
+ <combo_item name="CurrentWindow">
+ Ventana actual
+ </combo_item>
+ <combo_item name="Small(128x128)">
+ Pequeño (128x128)
+ </combo_item>
+ <combo_item name="Medium(256x256)">
+ Medio (256x256)
+ </combo_item>
+ <combo_item name="Large(512x512)">
+ Grande (512x512)
+ </combo_item>
+ <combo_item name="Custom">
+ Personalizar
+ </combo_item>
+ </combo_box>
+ <combo_box label="Resolución" name="local_size_combo">
+ <combo_item name="CurrentWindow">
+ Ventana actual
+ </combo_item>
+ <combo_item name="320x240">
+ 320x240
+ </combo_item>
+ <combo_item name="640x480">
+ 640x480
+ </combo_item>
+ <combo_item name="800x600">
+ 800x600
+ </combo_item>
+ <combo_item name="1024x768">
+ 1024x768
+ </combo_item>
+ <combo_item name="1280x1024">
+ 1280x1024
+ </combo_item>
+ <combo_item name="1600x1200">
+ 1600x1200
+ </combo_item>
+ <combo_item name="Custom">
+ Personalizar
+ </combo_item>
+ </combo_box>
+ <combo_box label="Formato" name="local_format_combo">
+ <combo_item name="PNG">
+ PNG
+ </combo_item>
+ <combo_item name="JPEG">
+ JPEG
+ </combo_item>
+ <combo_item name="BMP">
+ BMP
+ </combo_item>
+ </combo_box>
+ <spinner label="Ancho" name="snapshot_width"/>
+ <spinner label="Alto" name="snapshot_height"/>
+ <check_box label="Mantener las proporciones" name="keep_aspect_check"/>
+ <slider label="Calidad de la imagen" name="image_quality_slider"/>
+ <text name="layer_type_label">
+ Captura:
+ </text>
+ <combo_box label="Capas de la imagen" name="layer_types">
+ <combo_item name="Colors">
+ Colores
+ </combo_item>
+ <combo_item name="Depth">
+ Profundidad
+ </combo_item>
+ <combo_item name="ObjectMattes">
+ Bandas negras
+ </combo_item>
+ </combo_box>
+ <check_box label="Incluir la interfaz en la foto" name="ui_check"/>
+ <check_box label="Incluir los HUD en la foto" name="hud_check"/>
+ <check_box label="Mantenerla abierta tras guardarla" name="keep_open_check"/>
+ <check_box label="Congelar la toma (vista previa en pantalla completa)" name="freeze_frame_check"/>
+ <check_box label="Actualizar automáticamente" name="auto_snapshot_check"/>
+ <string name="unknown">
+ desconocido
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_sound_preview.xml b/indra/newview/skins/default/xui/es/floater_sound_preview.xml
index bec618366d..3e92b2423d 100644
--- a/indra/newview/skins/default/xui/es/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_sound_preview.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Name/Description" title="sound.wav">
- <text name="name_label">
- Nombre:
- </text>
- <text name="description_label">
- Descripción:
- </text>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
- <button label="Subir ([AMOUNT] L$)" label_selected="Subir ([AMOUNT] L$)" name="ok_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Name/Description" title="sound.wav">
+ <text name="name_label">
+ Nombre:
+ </text>
+ <text name="description_label">
+ Descripción:
+ </text>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Subir ([AMOUNT] L$)" label_selected="Subir ([AMOUNT] L$)" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_telehub.xml b/indra/newview/skins/default/xui/es/floater_telehub.xml
index f1d7999288..921577751a 100644
--- a/indra/newview/skins/default/xui/es/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/es/floater_telehub.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="telehub" title="Punto de Teleporte">
- <text name="status_text_connected">
- Punto de Teleporte conectado al objeto [OBJECT]
- </text>
- <text name="status_text_not_connected">
- Punto de Teleporte sin conectar.
- </text>
- <text name="help_text_connected">
- Para quitar, pulse Desconectar.
- </text>
- <text name="help_text_not_connected">
- Seleccione el objeto y pulse Conectar el Punto de Teleporte.
- </text>
- <button label="Conectar el Punto de Teleporte" name="connect_btn"/>
- <button label="Desconectar" name="disconnect_btn"/>
- <text name="spawn_points_text">
- Spawn Points (positions, not objects):
- </text>
- <button label="Añadir sucursales" name="add_spawn_point_btn"/>
- <button label="Quitar sucursales" name="remove_spawn_point_btn"/>
- <text name="spawn_point_help">
- Seleccione el objeto y pulse Añadir para especificar la posición.
-Hecho eso, puede mover o borrar el objeto.
-Las posiciones son relativas al centro del Punto de Teleporte.
-Seleccione un Ãtem de la lista para mostrar su posición en el mundo.
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="telehub" title="Punto de Teleporte">
+ <text name="status_text_connected">
+ Punto de Teleporte conectado al objeto [OBJECT]
+ </text>
+ <text name="status_text_not_connected">
+ Punto de Teleporte sin conectar.
+ </text>
+ <text name="help_text_connected">
+ Para quitar, pulse Desconectar.
+ </text>
+ <text name="help_text_not_connected">
+ Seleccione el objeto y pulse Conectar el Punto de Teleporte.
+ </text>
+ <button label="Conectar el Punto de Teleporte" name="connect_btn"/>
+ <button label="Desconectar" name="disconnect_btn"/>
+ <text name="spawn_points_text">
+ Spawn Points (positions, not objects):
+ </text>
+ <button label="Añadir sucursales" name="add_spawn_point_btn"/>
+ <button label="Quitar sucursales" name="remove_spawn_point_btn"/>
+ <text name="spawn_point_help">
+ Seleccione el objeto y pulse Añadir para especificar la posición.
+Hecho eso, puede mover o borrar el objeto.
+Las posiciones son relativas al centro del Punto de Teleporte.
+Seleccione un Ãtem de la lista para mostrar su posición en el mundo.
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index fc6951bfa4..8c3882f0c8 100644
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="texture picker" title="Elegir: Textura">
- <string name="choose_picture">
- Pulse para elegir una imagen
- </string>
- <text length="1" name="Multiple" type="string">
- Múltiple
- </text>
- <text length="1" name="unknown" type="string">
- Dimensiones: [DIMENSIONS]
- </text>
- <button label="Por defecto" label_selected="Por defecto" name="Default"/>
- <button label="Ninguna" label_selected="Ninguna" name="None"/>
- <button label="Blanca" label_selected="Blanca" name="Blank"/>
- <check_box label="Ver las carpetas" name="show_folders_check"/>
- <search_editor label="Escriba aquà para buscar una" name="inventory search editor"/>
- <check_box label="Aplicar ahora mismo" name="apply_immediate_check"/>
- <button label="" label_selected="" name="Pipette"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <button label="Elegir" label_selected="Elegir" name="Select"/>
- <string name="pick title">
- Elegir:
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="texture picker" title="Elegir: Textura">
+ <string name="choose_picture">
+ Pulse para elegir una imagen
+ </string>
+ <text length="1" name="Multiple" type="string">
+ Múltiple
+ </text>
+ <text length="1" name="unknown" type="string">
+ Dimensiones: [DIMENSIONS]
+ </text>
+ <button label="Por defecto" label_selected="Por defecto" name="Default"/>
+ <button label="Ninguna" label_selected="Ninguna" name="None"/>
+ <button label="Blanca" label_selected="Blanca" name="Blank"/>
+ <check_box label="Ver las carpetas" name="show_folders_check"/>
+ <search_editor label="Escriba aquà para buscar una" name="inventory search editor"/>
+ <check_box label="Aplicar ahora mismo" name="apply_immediate_check"/>
+ <button label="" label_selected="" name="Pipette"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <button label="Elegir" label_selected="Elegir" name="Select"/>
+ <string name="pick title">
+ Elegir:
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 5e2fa6da96..0f3a3fd217 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -1,611 +1,611 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
- <button label="" label_selected="" name="button focus" tool_tip="Visión"/>
- <button label="" label_selected="" name="button move" tool_tip="Mover"/>
- <button label="" label_selected="" name="button edit" tool_tip="Editar"/>
- <button label="" label_selected="" name="button create" tool_tip="Crear"/>
- <button label="" label_selected="" name="button land" tool_tip="Terreno"/>
- <check_box label="Zoom" name="radio zoom"/>
- <check_box label="Órbita (Ctrl)" name="radio orbit"/>
- <check_box label="Panorámica (Ctrl-Shift)" name="radio pan"/>
- <check_box label="Mover" name="radio move"/>
- <check_box label="Vertical (Ctrl)" name="radio lift"/>
- <check_box label="Horizontal (Ctrl-Shift)" name="radio spin"/>
- <check_box label="Posición" name="radio position"/>
- <check_box label="Girar (Ctrl)" name="radio rotate"/>
- <check_box label="Estirar (Ctrl-Shift)" name="radio stretch"/>
- <check_box label="Elegir la cara" name="radio select face"/>
- <check_box label="Editar las partes enlazadas" name="checkbox edit linked parts"/>
- <text name="text ruler mode">
- Modo de ajuste:
- </text>
- <combo_box name="combobox grid mode">
- <combo_item name="World">
- Mundo
- </combo_item>
- <combo_item name="Local">
- Local
- </combo_item>
- <combo_item name="Reference">
- Referencia
- </combo_item>
- </combo_box>
- <check_box label="Estirar ambos lados" name="checkbox uniform"/>
- <check_box label="Estirar las texturas" name="checkbox stretch textures"/>
- <check_box label="Usar la cuadrÃcula" name="checkbox snap to grid"/>
- <button label="Opciones..." label_selected="Opciones..." name="Options..."/>
- <text name="text status">
- Arrastrar para mover, arrastrar + Mayús. para copiar
- </text>
- <button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
- <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
- <button label="" label_selected="" name="ToolPyramid" tool_tip="Pirámide"/>
- <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraedro"/>
- <button label="" label_selected="" name="ToolCylinder" tool_tip="Cilindro"/>
- <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Semicilindro"/>
- <button label="" label_selected="" name="ToolCone" tool_tip="Cono"/>
- <button label="" label_selected="" name="ToolHemiCone" tool_tip="Semicono"/>
- <button label="" label_selected="" name="ToolSphere" tool_tip="Esfera"/>
- <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Semiesfera"/>
- <button label="" label_selected="" name="ToolTorus" tool_tip="Toroide"/>
- <button label="" label_selected="" name="ToolTube" tool_tip="Tubo"/>
- <button label="" label_selected="" name="ToolRing" tool_tip="Cono truncado"/>
- <button label="" label_selected="" name="ToolTree" tool_tip="Ãrbol"/>
- <button label="" label_selected="" name="ToolGrass" tool_tip="Hierba"/>
- <check_box label="Mantener esta herramienta" name="checkbox sticky"/>
- <check_box label="Copiar la selección" name="checkbox copy selection"/>
- <check_box label="Copia centrada" name="checkbox copy centers"/>
- <check_box label="Copia girada" name="checkbox copy rotates"/>
- <check_box label="Seleccionar el terreno" name="radio select land"/>
- <check_box label="Nivelar el terreno" name="radio flatten"/>
- <check_box label="Elevar el terreno" name="radio raise"/>
- <check_box label="Bajar el terreno" name="radio lower"/>
- <check_box label="Suavizar el terreno" name="radio smooth"/>
- <check_box label="Escarpar el terreno" name="radio noise"/>
- <check_box label="Restablecer el terreno" name="radio revert"/>
- <combo_box name="combobox brush size">
- <combo_item name="Small">
- Pequeño
- </combo_item>
- <combo_item name="Medium">
- Medio
- </combo_item>
- <combo_item name="Large">
- Grande
- </combo_item>
- </combo_box>
- <text name="Strength:">
- Fuerza:
- </text>
- <button label="Aplicar a lo seleccionado" label_selected="Aplicar a lo seleccionado" name="button apply to selection" tool_tip="Modificar el terreno seleccionado"/>
- <check_box label="Mostrar los propietarios" name="checkbox show owners"/>
- <button label="Más >>" name="button more" tool_tip="Opciones avanzadas"/>
- <button label="<< Menos" name="button less" tool_tip="Opciones avanzadas"/>
- <tab_container name="Object Info Tabs">
- <panel label="General" name="General">
- <text name="Name:">
- Nombre:
- </text>
- <text name="Description:">
- Descripción:
- </text>
- <text name="Creator:">
- Creador:
- </text>
- <text name="Creator Name">
- Thrax Linden
- </text>
- <button label="Perfil..." label_selected="Perfil..." name="button creator profile"/>
- <text name="Owner:">
- Propietario:
- </text>
- <text name="Owner Name">
- Thrax Linden
- </text>
- <button label="Perfil..." label_selected="Perfil..." name="button owner profile"/>
- <text name="Group:">
- Grupo:
- </text>
- <text name="Group Name Proxy">
- Los Linden
- </text>
- <button label="Configurar..." label_selected="Configurar..." name="button set group"/>
- <text name="prim info">
- 1 objeto, 1 prim
- </text>
- <text name="Permissions:">
- Permisos:
- </text>
- <text name="perm_modify">
- Puede modificar este objeto.
- </text>
- <check_box label="Compartir con el grupo" name="checkbox share with group" tool_tip="Permitir a los miembros del grupo mover, modificar, copiar, y borrar."/>
- <string name="text deed continued">
- Transferir...
- </string>
- <string name="text deed">
- Transferir
- </string>
- <button label="Transferir..." label_selected="Transferir..." name="button deed" tool_tip="Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/>
- <check_box label="Permitir a cualquiera que lo mueva" name="checkbox allow everyone move"/>
- <check_box label="Permitir a cualquiera que lo copie" name="checkbox allow everyone copy"/>
- <check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Dejar que la gente vea este objeto en los resultados de la búsqueda"/>
- <check_box label="En venta" name="checkbox for sale"/>
- <text name="Cost">
- Precio: L$
- </text>
- <radio_group name="sale type">
- <radio_item name="Original">
- Original
- </radio_item>
- <radio_item name="Copy">
- Copia
- </radio_item>
- <radio_item name="Contents">
- Contenidos
- </radio_item>
- </radio_group>
- <text name="Next owner can:">
- El próximo propietario puede:
- </text>
- <check_box label="Modificarlo" name="checkbox next owner can modify"/>
- <check_box label="Copiarlo" name="checkbox next owner can copy"/>
- <check_box label="Revenderlo/Darlo" name="checkbox next owner can transfer"/>
- <text name="label click action">
- Al pulsarlo con el botón izquierdo:
- </text>
- <combo_box name="clickaction">
- <combo_item name="Touch/grab(default)">
- Tocar/Agarrar (por defecto)
- </combo_item>
- <combo_item name="Sitonobject">
- Sentarse en el objeto
- </combo_item>
- <combo_item name="Buyobject">
- Comprar el objeto
- </combo_item>
- <combo_item name="Payobject">
- Pagar al objeto
- </combo_item>
- <combo_item name="Open">
- Abrirlo
- </combo_item>
- <combo_item name="Play">
- Ejecutar los media de la parcela
- </combo_item>
- <combo_item name="Opemmedia">
- Abrir los media de la parcela
- </combo_item>
- </combo_box>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O:
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
- <string name="text modify info 1">
- Puede modificar este objeto.
- </string>
- <string name="text modify info 2">
- Puede modificar estos objetos.
- </string>
- <string name="text modify info 3">
- No puede modificar este objeto.
- </string>
- <string name="text modify info 4">
- No puede modificar estos objetos.
- </string>
- <string name="text modify warning">
- Debe seleccionar todo el objeto para definir los permisos.
- </string>
- <string name="Cost Default">
- Precio: L$
- </string>
- <string name="Cost Total">
- Precio total: L$
- </string>
- <string name="Cost Per Unit">
- Precio por: L$
- </string>
- <string name="Cost Mixed">
- Precio variable
- </string>
- <string name="Sale Mixed">
- Venta variable
- </string>
- </panel>
- <panel label="Objeto" name="Object">
- <text name="select_single">
- Seleccione un único prim para editar los parámetros.
- </text>
- <text name="edit_object">
- Modificar los parámetros del objeto:
- </text>
- <check_box label="Bloqueado" name="checkbox locked" tool_tip="Previene que el objeto sea movido o borrado. Suele ser útil mientras se construye, para prevenir que se modifique sin querer."/>
- <check_box label="Material" name="Physical Checkbox Ctrl" tool_tip="Permite que el objeto pueda ser empujado y le afecte la gravedad."/>
- <check_box label="Temporal" name="Temporary Checkbox Ctrl" tool_tip="Hace que el objeto se borre 1 minuto después de su creación."/>
- <check_box label="Inmaterial" name="Phantom Checkbox Ctrl" tool_tip="Hace que el objeto no colisiones con otros objetos o avatares."/>
- <text name="label position">
- Posición (metros)
- </text>
- <spinner label="X" name="Pos X"/>
- <spinner label="Y" name="Pos Y"/>
- <spinner label="Z" name="Pos Z"/>
- <text name="label size">
- Tamaño (metros)
- </text>
- <spinner label="X" name="Scale X"/>
- <spinner label="Y" name="Scale Y"/>
- <spinner label="Z" name="Scale Z"/>
- <text name="label rotation">
- Rotación (grados)
- </text>
- <spinner label="X" name="Rot X"/>
- <spinner label="Y" name="Rot Y"/>
- <spinner label="Z" name="Rot Z"/>
- <text name="label material">
- Material
- </text>
- <combo_box name="material">
- <combo_item name="Stone">
- Piedra
- </combo_item>
- <combo_item name="Metal">
- Metal
- </combo_item>
- <combo_item name="Glass">
- Vidrio
- </combo_item>
- <combo_item name="Wood">
- Madera
- </combo_item>
- <combo_item name="Flesh">
- Carne
- </combo_item>
- <combo_item name="Plastic">
- Plástico
- </combo_item>
- <combo_item name="Rubber">
- Goma
- </combo_item>
- </combo_box>
- <text name="label basetype">
- Tipo de objeto para construir
- </text>
- <combo_box name="comboBaseType">
- <combo_item name="Box">
- Caja
- </combo_item>
- <combo_item name="Cylinder">
- Cilindro
- </combo_item>
- <combo_item name="Prism">
- Prisma
- </combo_item>
- <combo_item name="Sphere">
- Esfera
- </combo_item>
- <combo_item name="Torus">
- Toroide
- </combo_item>
- <combo_item name="Tube">
- Tubo
- </combo_item>
- <combo_item name="Ring">
- Cono truncado
- </combo_item>
- <combo_item name="Sculpted">
- Sculpted
- </combo_item>
- </combo_box>
- <text name="text cut">
- Inicio y Fin del corte
- </text>
- <spinner label="I" name="cut begin"/>
- <spinner label="F" name="cut end"/>
- <text name="text hollow">
- Hueco
- </text>
- <text name="text skew">
- Sesgo
- </text>
- <text name="Hollow Shape">
- Forma del hueco
- </text>
- <combo_box name="hole">
- <combo_item name="Default">
- Por defecto
- </combo_item>
- <combo_item name="Circle">
- CÃrculo
- </combo_item>
- <combo_item name="Square">
- Cuadrado
- </combo_item>
- <combo_item name="Triangle">
- Triángulo
- </combo_item>
- </combo_box>
- <text name="text twist">
- Inicio y Fin de la torsión
- </text>
- <spinner label="I" name="Twist Begin"/>
- <spinner label="F" name="Twist End"/>
- <text name="scale_taper">
- Biselar
- </text>
- <text name="scale_hole">
- Tamaño del hueco
- </text>
- <spinner label="X" name="Taper Scale X"/>
- <spinner label="Y" name="Taper Scale Y"/>
- <text name="text topshear">
- Inclinación superior
- </text>
- <spinner label="X" name="Shear X"/>
- <spinner label="Y" name="Shear Y"/>
- <text name="advanced_cut">
- Inicio y Fin del corte del perfil
- </text>
- <text name="advanced_dimple">
- Horadar: Inicio y Fin
- </text>
- <spinner label="I" name="Path Limit Begin"/>
- <spinner label="F" name="Path Limit End"/>
- <text name="text taper2">
- Biselar
- </text>
- <spinner label="X" name="Taper X"/>
- <spinner label="Y" name="Taper Y"/>
- <text name="text radius delta">
- Radio
- </text>
- <text name="text revolutions">
- Giros
- </text>
- <texture_picker label="Textura para sculpted" name="sculpt texture control" tool_tip="Pulse para elegir una imagen"/>
- <check_box label="Espejo" name="sculpt mirror control" tool_tip="Girar el prim sculpted siguiendo el eje X."/>
- <check_box label="Dentro-Fuera" name="sculpt invert control" tool_tip="Invertir los valores de los prims sculpted, haciendo aparecer fuera lo de dentro."/>
- <text name="label sculpt type">
- Tipo de unión
- </text>
- <combo_box name="sculpt type control">
- <combo_item name="None">
- (ninguna)
- </combo_item>
- <combo_item name="Sphere">
- Esfera
- </combo_item>
- <combo_item name="Torus">
- Toroide
- </combo_item>
- <combo_item name="Plane">
- Plano
- </combo_item>
- <combo_item name="Cylinder">
- Cilindro
- </combo_item>
- </combo_box>
- </panel>
- <panel label="CaracterÃsticas" name="Features">
- <text name="select_single">
- Seleccione un sólo prim para editar las caracterÃsticas.
- </text>
- <text name="edit_object">
- Editar las caracterÃsticas del objeto:
- </text>
- <check_box label="Flexibilidad" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que el objeto flexione en el eje Z. (Sólo del lado del cliente)"/>
- <spinner label="Blandura" name="FlexNumSections"/>
- <spinner label="Gravedad" name="FlexGravity"/>
- <spinner label="Fricción" name="FlexFriction"/>
- <spinner label="Viento" name="FlexWind"/>
- <spinner label="Tirantez" name="FlexTension"/>
- <spinner label="Fuerza en X" name="FlexForceX"/>
- <spinner label="Fuerza en Y" name="FlexForceY"/>
- <spinner label="Fuerza en Z" name="FlexForceZ"/>
- <check_box label="Luz" name="Light Checkbox Ctrl" tool_tip="Hace que el objeto emita luz"/>
- <text name="label color">
- Color
- </text>
- <color_swatch label="" name="colorswatch" tool_tip="Pulse para abrir el selector de color"/>
- <spinner label="Intensidad" name="Light Intensity"/>
- <spinner label="Radio" name="Light Radius"/>
- <spinner label="Atenuación" name="Light Falloff"/>
- </panel>
- <panel label="Textura" name="Texture">
- <texture_picker label="Textura" name="texture control" tool_tip="Pulse para elegir una imagen"/>
- <color_swatch label="Color" name="colorswatch" tool_tip="Pulse para abrir el selector de color"/>
- <text name="color trans">
- Transparencia %
- </text>
- <text name="glow label">
- Resplandor
- </text>
- <check_box label="Brillo al máximo" name="checkbox fullbright"/>
- <text name="tex gen">
- Detallado
- </text>
- <combo_box name="combobox texgen">
- <combo_item name="Default">
- Por defecto
- </combo_item>
- <combo_item name="Planar">
- Plano
- </combo_item>
- </combo_box>
- <text name="label shininess">
- Brillantez
- </text>
- <combo_box name="combobox shininess">
- <combo_item name="None">
- Ninguna
- </combo_item>
- <combo_item name="Low">
- Baja
- </combo_item>
- <combo_item name="Medium">
- Media
- </combo_item>
- <combo_item name="High">
- Alta
- </combo_item>
- </combo_box>
- <text name="label bumpiness">
- Relieve
- </text>
- <combo_box name="combobox bumpiness">
- <combo_item name="None">
- Ninguno
- </combo_item>
- <combo_item name="Brightness">
- Brillo
- </combo_item>
- <combo_item name="Darkness">
- Oscuro
- </combo_item>
- <combo_item name="woodgrain">
- grano de madera
- </combo_item>
- <combo_item name="bark">
- corteza
- </combo_item>
- <combo_item name="bricks">
- ladrillos
- </combo_item>
- <combo_item name="checker">
- cajero
- </combo_item>
- <combo_item name="concrete">
- cemento
- </combo_item>
- <combo_item name="crustytile">
- azulejerÃa
- </combo_item>
- <combo_item name="cutstone">
- piedra cortada
- </combo_item>
- <combo_item name="discs">
- discos
- </combo_item>
- <combo_item name="gravel">
- grava
- </combo_item>
- <combo_item name="petridish">
- placa de Petri
- </combo_item>
- <combo_item name="siding">
- revestimiento
- </combo_item>
- <combo_item name="stonetile">
- baldosa de piedra
- </combo_item>
- <combo_item name="stucco">
- estuco
- </combo_item>
- <combo_item name="suction">
- succión
- </combo_item>
- <combo_item name="weave">
- tejido
- </combo_item>
- </combo_box>
- <text name="tex scale">
- Repeticiones por cara
- </text>
- <spinner label="Horizontal (U)" name="TexScaleU"/>
- <check_box label="Voltear" name="checkbox flip s"/>
- <spinner label="Vertical (V)" name="TexScaleV"/>
- <check_box label="Voltear" name="checkbox flip t"/>
- <text name="tex rotate">
- Rotación (grados)
- </text>
- <string name="string repeats per meter">
- Repeticiones por metro
- </string>
- <string name="string repeats per face">
- Repeticiones por cara
- </string>
- <text name="rpt">
- Repeticiones por metro
- </text>
- <button label="Aplicar" label_selected="Aplicar" name="button apply"/>
- <text name="tex offset">
- Desplazar
- </text>
- <spinner label="Horizontal (U)" name="TexOffsetU"/>
- <spinner label="Vertical (V)" name="TexOffsetV"/>
- <text name="textbox autofix">
- Centrar la textura para los media
-(primero debe subirla)
- </text>
- <button label="Alinear" label_selected="Alinear" name="button align"/>
- </panel>
- <panel label="Contenido" name="Contents">
- <button label="Script nuevo..." label_selected="Script nuevo..." name="button new script"/>
- </panel>
- </tab_container>
- <panel name="land info panel">
- <text name="label_area_price">
- Precio: [PRICE] L$ por [AREA] m²
- </text>
- <text name="label_area">
- Superficie: [AREA] m²
- </text>
- <button label="Comprar terreno..." label_selected="Comprar terreno..." name="button buy land"/>
- <button label="Abandonar el terreno..." label_selected="Abandonar el terreno..." name="button abandon land"/>
- <button label="Subdividir..." label_selected="Subdividir..." name="button subdivide land"/>
- <button label="Unir..." label_selected="Unir..." name="button join land"/>
- <button label="Acerca del terreno..." label_selected="Acerca del terreno..." name="button about land"/>
- </panel>
- <string name="status_rotate">
- Arrastre las bandas de color para girar el objeto
- </string>
- <string name="status_scale">
- Pulse y arrastre para estirar el lado seleccionado
- </string>
- <string name="status_move">
- Arrastrar para mover, arrastrar + Mayús. para copiar
- </string>
- <string name="status_modifyland">
- Mantenga pulsado para modificar el terreno
- </string>
- <string name="status_camera">
- Pulse y arrastre para cambiar el punto de vista
- </string>
- <string name="status_grab">
- Arrastre para mover objetos: Ctrl, verticalmente; Ctrl-Mayús., horizontalmente
- </string>
- <string name="status_place">
- Pulse en el mundo para crear; mayús. y pulsar para seleccionar
- </string>
- <string name="status_selectland">
- Pulse y arrastre para seleccionar el terreno
- </string>
- <string name="grid_screen_text">
- Pantalla
- </string>
- <string name="grid_local_text">
- Local
- </string>
- <string name="grid_world_text">
- Mundo
- </string>
- <string name="grid_reference_text">
- Referencia
- </string>
- <string name="grid_attachment_text">
- Añadido
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="toolbox floater" title="">
+ <button label="" label_selected="" name="button focus" tool_tip="Visión"/>
+ <button label="" label_selected="" name="button move" tool_tip="Mover"/>
+ <button label="" label_selected="" name="button edit" tool_tip="Editar"/>
+ <button label="" label_selected="" name="button create" tool_tip="Crear"/>
+ <button label="" label_selected="" name="button land" tool_tip="Terreno"/>
+ <check_box label="Zoom" name="radio zoom"/>
+ <check_box label="Órbita (Ctrl)" name="radio orbit"/>
+ <check_box label="Panorámica (Ctrl-Shift)" name="radio pan"/>
+ <check_box label="Mover" name="radio move"/>
+ <check_box label="Vertical (Ctrl)" name="radio lift"/>
+ <check_box label="Horizontal (Ctrl-Shift)" name="radio spin"/>
+ <check_box label="Posición" name="radio position"/>
+ <check_box label="Girar (Ctrl)" name="radio rotate"/>
+ <check_box label="Estirar (Ctrl-Shift)" name="radio stretch"/>
+ <check_box label="Elegir la cara" name="radio select face"/>
+ <check_box label="Editar las partes enlazadas" name="checkbox edit linked parts"/>
+ <text name="text ruler mode">
+ Modo de ajuste:
+ </text>
+ <combo_box name="combobox grid mode">
+ <combo_item name="World">
+ Mundo
+ </combo_item>
+ <combo_item name="Local">
+ Local
+ </combo_item>
+ <combo_item name="Reference">
+ Referencia
+ </combo_item>
+ </combo_box>
+ <check_box label="Estirar ambos lados" name="checkbox uniform"/>
+ <check_box label="Estirar las texturas" name="checkbox stretch textures"/>
+ <check_box label="Usar la cuadrÃcula" name="checkbox snap to grid"/>
+ <button label="Opciones..." label_selected="Opciones..." name="Options..."/>
+ <text name="text status">
+ Arrastrar para mover, arrastrar + Mayús. para copiar
+ </text>
+ <button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
+ <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
+ <button label="" label_selected="" name="ToolPyramid" tool_tip="Pirámide"/>
+ <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraedro"/>
+ <button label="" label_selected="" name="ToolCylinder" tool_tip="Cilindro"/>
+ <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Semicilindro"/>
+ <button label="" label_selected="" name="ToolCone" tool_tip="Cono"/>
+ <button label="" label_selected="" name="ToolHemiCone" tool_tip="Semicono"/>
+ <button label="" label_selected="" name="ToolSphere" tool_tip="Esfera"/>
+ <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Semiesfera"/>
+ <button label="" label_selected="" name="ToolTorus" tool_tip="Toroide"/>
+ <button label="" label_selected="" name="ToolTube" tool_tip="Tubo"/>
+ <button label="" label_selected="" name="ToolRing" tool_tip="Cono truncado"/>
+ <button label="" label_selected="" name="ToolTree" tool_tip="Ãrbol"/>
+ <button label="" label_selected="" name="ToolGrass" tool_tip="Hierba"/>
+ <check_box label="Mantener esta herramienta" name="checkbox sticky"/>
+ <check_box label="Copiar la selección" name="checkbox copy selection"/>
+ <check_box label="Copia centrada" name="checkbox copy centers"/>
+ <check_box label="Copia girada" name="checkbox copy rotates"/>
+ <check_box label="Seleccionar el terreno" name="radio select land"/>
+ <check_box label="Nivelar el terreno" name="radio flatten"/>
+ <check_box label="Elevar el terreno" name="radio raise"/>
+ <check_box label="Bajar el terreno" name="radio lower"/>
+ <check_box label="Suavizar el terreno" name="radio smooth"/>
+ <check_box label="Escarpar el terreno" name="radio noise"/>
+ <check_box label="Restablecer el terreno" name="radio revert"/>
+ <combo_box name="combobox brush size">
+ <combo_item name="Small">
+ Pequeño
+ </combo_item>
+ <combo_item name="Medium">
+ Medio
+ </combo_item>
+ <combo_item name="Large">
+ Grande
+ </combo_item>
+ </combo_box>
+ <text name="Strength:">
+ Fuerza:
+ </text>
+ <button label="Aplicar a lo seleccionado" label_selected="Aplicar a lo seleccionado" name="button apply to selection" tool_tip="Modificar el terreno seleccionado"/>
+ <check_box label="Mostrar los propietarios" name="checkbox show owners"/>
+ <button label="Más >>" name="button more" tool_tip="Opciones avanzadas"/>
+ <button label="<< Menos" name="button less" tool_tip="Opciones avanzadas"/>
+ <tab_container name="Object Info Tabs">
+ <panel label="General" name="General">
+ <text name="Name:">
+ Nombre:
+ </text>
+ <text name="Description:">
+ Descripción:
+ </text>
+ <text name="Creator:">
+ Creador:
+ </text>
+ <text name="Creator Name">
+ Thrax Linden
+ </text>
+ <button label="Perfil..." label_selected="Perfil..." name="button creator profile"/>
+ <text name="Owner:">
+ Propietario:
+ </text>
+ <text name="Owner Name">
+ Thrax Linden
+ </text>
+ <button label="Perfil..." label_selected="Perfil..." name="button owner profile"/>
+ <text name="Group:">
+ Grupo:
+ </text>
+ <text name="Group Name Proxy">
+ Los Linden
+ </text>
+ <button label="Configurar..." label_selected="Configurar..." name="button set group"/>
+ <text name="prim info">
+ 1 objeto, 1 prim
+ </text>
+ <text name="Permissions:">
+ Permisos:
+ </text>
+ <text name="perm_modify">
+ Puede modificar este objeto.
+ </text>
+ <check_box label="Compartir con el grupo" name="checkbox share with group" tool_tip="Permitir a los miembros del grupo mover, modificar, copiar, y borrar."/>
+ <string name="text deed continued">
+ Transferir...
+ </string>
+ <string name="text deed">
+ Transferir
+ </string>
+ <button label="Transferir..." label_selected="Transferir..." name="button deed" tool_tip="Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/>
+ <check_box label="Permitir a cualquiera que lo mueva" name="checkbox allow everyone move"/>
+ <check_box label="Permitir a cualquiera que lo copie" name="checkbox allow everyone copy"/>
+ <check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Dejar que la gente vea este objeto en los resultados de la búsqueda"/>
+ <check_box label="En venta" name="checkbox for sale"/>
+ <text name="Cost">
+ Precio: L$
+ </text>
+ <radio_group name="sale type">
+ <radio_item name="Original">
+ Original
+ </radio_item>
+ <radio_item name="Copy">
+ Copia
+ </radio_item>
+ <radio_item name="Contents">
+ Contenidos
+ </radio_item>
+ </radio_group>
+ <text name="Next owner can:">
+ El próximo propietario puede:
+ </text>
+ <check_box label="Modificarlo" name="checkbox next owner can modify"/>
+ <check_box label="Copiarlo" name="checkbox next owner can copy"/>
+ <check_box label="Revenderlo/Darlo" name="checkbox next owner can transfer"/>
+ <text name="label click action">
+ Al pulsarlo con el botón izquierdo:
+ </text>
+ <combo_box name="clickaction">
+ <combo_item name="Touch/grab(default)">
+ Tocar/Agarrar (por defecto)
+ </combo_item>
+ <combo_item name="Sitonobject">
+ Sentarse en el objeto
+ </combo_item>
+ <combo_item name="Buyobject">
+ Comprar el objeto
+ </combo_item>
+ <combo_item name="Payobject">
+ Pagar al objeto
+ </combo_item>
+ <combo_item name="Open">
+ Abrirlo
+ </combo_item>
+ <combo_item name="Play">
+ Ejecutar los media de la parcela
+ </combo_item>
+ <combo_item name="Opemmedia">
+ Abrir los media de la parcela
+ </combo_item>
+ </combo_box>
+ <text name="B:">
+ B:
+ </text>
+ <text name="O:">
+ O:
+ </text>
+ <text name="G:">
+ G:
+ </text>
+ <text name="E:">
+ E:
+ </text>
+ <text name="N:">
+ N:
+ </text>
+ <text name="F:">
+ F:
+ </text>
+ <string name="text modify info 1">
+ Puede modificar este objeto.
+ </string>
+ <string name="text modify info 2">
+ Puede modificar estos objetos.
+ </string>
+ <string name="text modify info 3">
+ No puede modificar este objeto.
+ </string>
+ <string name="text modify info 4">
+ No puede modificar estos objetos.
+ </string>
+ <string name="text modify warning">
+ Debe seleccionar todo el objeto para definir los permisos.
+ </string>
+ <string name="Cost Default">
+ Precio: L$
+ </string>
+ <string name="Cost Total">
+ Precio total: L$
+ </string>
+ <string name="Cost Per Unit">
+ Precio por: L$
+ </string>
+ <string name="Cost Mixed">
+ Precio variable
+ </string>
+ <string name="Sale Mixed">
+ Venta variable
+ </string>
+ </panel>
+ <panel label="Objeto" name="Object">
+ <text name="select_single">
+ Seleccione un único prim para editar los parámetros.
+ </text>
+ <text name="edit_object">
+ Modificar los parámetros del objeto:
+ </text>
+ <check_box label="Bloqueado" name="checkbox locked" tool_tip="Previene que el objeto sea movido o borrado. Suele ser útil mientras se construye, para prevenir que se modifique sin querer."/>
+ <check_box label="Material" name="Physical Checkbox Ctrl" tool_tip="Permite que el objeto pueda ser empujado y le afecte la gravedad."/>
+ <check_box label="Temporal" name="Temporary Checkbox Ctrl" tool_tip="Hace que el objeto se borre 1 minuto después de su creación."/>
+ <check_box label="Inmaterial" name="Phantom Checkbox Ctrl" tool_tip="Hace que el objeto no colisiones con otros objetos o avatares."/>
+ <text name="label position">
+ Posición (metros)
+ </text>
+ <spinner label="X" name="Pos X"/>
+ <spinner label="Y" name="Pos Y"/>
+ <spinner label="Z" name="Pos Z"/>
+ <text name="label size">
+ Tamaño (metros)
+ </text>
+ <spinner label="X" name="Scale X"/>
+ <spinner label="Y" name="Scale Y"/>
+ <spinner label="Z" name="Scale Z"/>
+ <text name="label rotation">
+ Rotación (grados)
+ </text>
+ <spinner label="X" name="Rot X"/>
+ <spinner label="Y" name="Rot Y"/>
+ <spinner label="Z" name="Rot Z"/>
+ <text name="label material">
+ Material
+ </text>
+ <combo_box name="material">
+ <combo_item name="Stone">
+ Piedra
+ </combo_item>
+ <combo_item name="Metal">
+ Metal
+ </combo_item>
+ <combo_item name="Glass">
+ Vidrio
+ </combo_item>
+ <combo_item name="Wood">
+ Madera
+ </combo_item>
+ <combo_item name="Flesh">
+ Carne
+ </combo_item>
+ <combo_item name="Plastic">
+ Plástico
+ </combo_item>
+ <combo_item name="Rubber">
+ Goma
+ </combo_item>
+ </combo_box>
+ <text name="label basetype">
+ Tipo de objeto para construir
+ </text>
+ <combo_box name="comboBaseType">
+ <combo_item name="Box">
+ Caja
+ </combo_item>
+ <combo_item name="Cylinder">
+ Cilindro
+ </combo_item>
+ <combo_item name="Prism">
+ Prisma
+ </combo_item>
+ <combo_item name="Sphere">
+ Esfera
+ </combo_item>
+ <combo_item name="Torus">
+ Toroide
+ </combo_item>
+ <combo_item name="Tube">
+ Tubo
+ </combo_item>
+ <combo_item name="Ring">
+ Cono truncado
+ </combo_item>
+ <combo_item name="Sculpted">
+ Sculpted
+ </combo_item>
+ </combo_box>
+ <text name="text cut">
+ Inicio y Fin del corte
+ </text>
+ <spinner label="I" name="cut begin"/>
+ <spinner label="F" name="cut end"/>
+ <text name="text hollow">
+ Hueco
+ </text>
+ <text name="text skew">
+ Sesgo
+ </text>
+ <text name="Hollow Shape">
+ Forma del hueco
+ </text>
+ <combo_box name="hole">
+ <combo_item name="Default">
+ Por defecto
+ </combo_item>
+ <combo_item name="Circle">
+ CÃrculo
+ </combo_item>
+ <combo_item name="Square">
+ Cuadrado
+ </combo_item>
+ <combo_item name="Triangle">
+ Triángulo
+ </combo_item>
+ </combo_box>
+ <text name="text twist">
+ Inicio y Fin de la torsión
+ </text>
+ <spinner label="I" name="Twist Begin"/>
+ <spinner label="F" name="Twist End"/>
+ <text name="scale_taper">
+ Biselar
+ </text>
+ <text name="scale_hole">
+ Tamaño del hueco
+ </text>
+ <spinner label="X" name="Taper Scale X"/>
+ <spinner label="Y" name="Taper Scale Y"/>
+ <text name="text topshear">
+ Inclinación superior
+ </text>
+ <spinner label="X" name="Shear X"/>
+ <spinner label="Y" name="Shear Y"/>
+ <text name="advanced_cut">
+ Inicio y Fin del corte del perfil
+ </text>
+ <text name="advanced_dimple">
+ Horadar: Inicio y Fin
+ </text>
+ <spinner label="I" name="Path Limit Begin"/>
+ <spinner label="F" name="Path Limit End"/>
+ <text name="text taper2">
+ Biselar
+ </text>
+ <spinner label="X" name="Taper X"/>
+ <spinner label="Y" name="Taper Y"/>
+ <text name="text radius delta">
+ Radio
+ </text>
+ <text name="text revolutions">
+ Giros
+ </text>
+ <texture_picker label="Textura para sculpted" name="sculpt texture control" tool_tip="Pulse para elegir una imagen"/>
+ <check_box label="Espejo" name="sculpt mirror control" tool_tip="Girar el prim sculpted siguiendo el eje X."/>
+ <check_box label="Dentro-Fuera" name="sculpt invert control" tool_tip="Invertir los valores de los prims sculpted, haciendo aparecer fuera lo de dentro."/>
+ <text name="label sculpt type">
+ Tipo de unión
+ </text>
+ <combo_box name="sculpt type control">
+ <combo_item name="None">
+ (ninguna)
+ </combo_item>
+ <combo_item name="Sphere">
+ Esfera
+ </combo_item>
+ <combo_item name="Torus">
+ Toroide
+ </combo_item>
+ <combo_item name="Plane">
+ Plano
+ </combo_item>
+ <combo_item name="Cylinder">
+ Cilindro
+ </combo_item>
+ </combo_box>
+ </panel>
+ <panel label="CaracterÃsticas" name="Features">
+ <text name="select_single">
+ Seleccione un sólo prim para editar las caracterÃsticas.
+ </text>
+ <text name="edit_object">
+ Editar las caracterÃsticas del objeto:
+ </text>
+ <check_box label="Flexibilidad" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que el objeto flexione en el eje Z. (Sólo del lado del cliente)"/>
+ <spinner label="Blandura" name="FlexNumSections"/>
+ <spinner label="Gravedad" name="FlexGravity"/>
+ <spinner label="Fricción" name="FlexFriction"/>
+ <spinner label="Viento" name="FlexWind"/>
+ <spinner label="Tirantez" name="FlexTension"/>
+ <spinner label="Fuerza en X" name="FlexForceX"/>
+ <spinner label="Fuerza en Y" name="FlexForceY"/>
+ <spinner label="Fuerza en Z" name="FlexForceZ"/>
+ <check_box label="Luz" name="Light Checkbox Ctrl" tool_tip="Hace que el objeto emita luz"/>
+ <text name="label color">
+ Color
+ </text>
+ <color_swatch label="" name="colorswatch" tool_tip="Pulse para abrir el selector de color"/>
+ <spinner label="Intensidad" name="Light Intensity"/>
+ <spinner label="Radio" name="Light Radius"/>
+ <spinner label="Atenuación" name="Light Falloff"/>
+ </panel>
+ <panel label="Textura" name="Texture">
+ <texture_picker label="Textura" name="texture control" tool_tip="Pulse para elegir una imagen"/>
+ <color_swatch label="Color" name="colorswatch" tool_tip="Pulse para abrir el selector de color"/>
+ <text name="color trans">
+ Transparencia %
+ </text>
+ <text name="glow label">
+ Resplandor
+ </text>
+ <check_box label="Brillo al máximo" name="checkbox fullbright"/>
+ <text name="tex gen">
+ Detallado
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_item name="Default">
+ Por defecto
+ </combo_item>
+ <combo_item name="Planar">
+ Plano
+ </combo_item>
+ </combo_box>
+ <text name="label shininess">
+ Brillantez
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_item name="None">
+ Ninguna
+ </combo_item>
+ <combo_item name="Low">
+ Baja
+ </combo_item>
+ <combo_item name="Medium">
+ Media
+ </combo_item>
+ <combo_item name="High">
+ Alta
+ </combo_item>
+ </combo_box>
+ <text name="label bumpiness">
+ Relieve
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_item name="None">
+ Ninguno
+ </combo_item>
+ <combo_item name="Brightness">
+ Brillo
+ </combo_item>
+ <combo_item name="Darkness">
+ Oscuro
+ </combo_item>
+ <combo_item name="woodgrain">
+ grano de madera
+ </combo_item>
+ <combo_item name="bark">
+ corteza
+ </combo_item>
+ <combo_item name="bricks">
+ ladrillos
+ </combo_item>
+ <combo_item name="checker">
+ cajero
+ </combo_item>
+ <combo_item name="concrete">
+ cemento
+ </combo_item>
+ <combo_item name="crustytile">
+ azulejerÃa
+ </combo_item>
+ <combo_item name="cutstone">
+ piedra cortada
+ </combo_item>
+ <combo_item name="discs">
+ discos
+ </combo_item>
+ <combo_item name="gravel">
+ grava
+ </combo_item>
+ <combo_item name="petridish">
+ placa de Petri
+ </combo_item>
+ <combo_item name="siding">
+ revestimiento
+ </combo_item>
+ <combo_item name="stonetile">
+ baldosa de piedra
+ </combo_item>
+ <combo_item name="stucco">
+ estuco
+ </combo_item>
+ <combo_item name="suction">
+ succión
+ </combo_item>
+ <combo_item name="weave">
+ tejido
+ </combo_item>
+ </combo_box>
+ <text name="tex scale">
+ Repeticiones por cara
+ </text>
+ <spinner label="Horizontal (U)" name="TexScaleU"/>
+ <check_box label="Voltear" name="checkbox flip s"/>
+ <spinner label="Vertical (V)" name="TexScaleV"/>
+ <check_box label="Voltear" name="checkbox flip t"/>
+ <text name="tex rotate">
+ Rotación (grados)
+ </text>
+ <string name="string repeats per meter">
+ Repeticiones por metro
+ </string>
+ <string name="string repeats per face">
+ Repeticiones por cara
+ </string>
+ <text name="rpt">
+ Repeticiones por metro
+ </text>
+ <button label="Aplicar" label_selected="Aplicar" name="button apply"/>
+ <text name="tex offset">
+ Desplazar
+ </text>
+ <spinner label="Horizontal (U)" name="TexOffsetU"/>
+ <spinner label="Vertical (V)" name="TexOffsetV"/>
+ <text name="textbox autofix">
+ Centrar la textura para los media
+(primero debe subirla)
+ </text>
+ <button label="Alinear" label_selected="Alinear" name="button align"/>
+ </panel>
+ <panel label="Contenido" name="Contents">
+ <button label="Script nuevo..." label_selected="Script nuevo..." name="button new script"/>
+ </panel>
+ </tab_container>
+ <panel name="land info panel">
+ <text name="label_area_price">
+ Precio: [PRICE] L$ por [AREA] m²
+ </text>
+ <text name="label_area">
+ Superficie: [AREA] m²
+ </text>
+ <button label="Comprar terreno..." label_selected="Comprar terreno..." name="button buy land"/>
+ <button label="Abandonar el terreno..." label_selected="Abandonar el terreno..." name="button abandon land"/>
+ <button label="Subdividir..." label_selected="Subdividir..." name="button subdivide land"/>
+ <button label="Unir..." label_selected="Unir..." name="button join land"/>
+ <button label="Acerca del terreno..." label_selected="Acerca del terreno..." name="button about land"/>
+ </panel>
+ <string name="status_rotate">
+ Arrastre las bandas de color para girar el objeto
+ </string>
+ <string name="status_scale">
+ Pulse y arrastre para estirar el lado seleccionado
+ </string>
+ <string name="status_move">
+ Arrastrar para mover, arrastrar + Mayús. para copiar
+ </string>
+ <string name="status_modifyland">
+ Mantenga pulsado para modificar el terreno
+ </string>
+ <string name="status_camera">
+ Pulse y arrastre para cambiar el punto de vista
+ </string>
+ <string name="status_grab">
+ Arrastre para mover objetos: Ctrl, verticalmente; Ctrl-Mayús., horizontalmente
+ </string>
+ <string name="status_place">
+ Pulse en el mundo para crear; mayús. y pulsar para seleccionar
+ </string>
+ <string name="status_selectland">
+ Pulse y arrastre para seleccionar el terreno
+ </string>
+ <string name="grid_screen_text">
+ Pantalla
+ </string>
+ <string name="grid_local_text">
+ Local
+ </string>
+ <string name="grid_world_text">
+ Mundo
+ </string>
+ <string name="grid_reference_text">
+ Referencia
+ </string>
+ <string name="grid_attachment_text">
+ Añadido
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml
index 97660a5e87..ce0c22062b 100644
--- a/indra/newview/skins/default/xui/es/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/es/floater_top_objects.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="top_objects" title="cargando...">
- <text name="title_text">
- Cargando...
- </text>
- <scroll_list name="objects_list">
- <column label="Resultado" name="score"/>
- <column label="Nombre" name="name"/>
- <column label="Propietario" name="owner"/>
- <column label="Posición" name="location"/>
- <column label="Tiempo" name="time"/>
- <column label="Tiempo en Mono" name="mono_time"/>
- </scroll_list>
- <text name="id_text">
- ID del objeto:
- </text>
- <button label="Mostrar la baliza" name="show_beacon_btn"/>
- <text name="obj_name_text">
- Nombre del objeto:
- </text>
- <button label="Filtro" name="filter_object_btn"/>
- <text name="owner_name_text">
- Nombre del propietario:
- </text>
- <button label="Filtro" name="filter_owner_btn"/>
- <button label="Devolver lo seleccionado" name="return_selected_btn"/>
- <button label="Devolver todo" name="return_all_btn"/>
- <button label="Desactivar lo seleccionado" name="disable_selected_btn"/>
- <button label="Desactivar todo" name="disable_all_btn"/>
- <button label="Actualizar" name="refresh_btn"/>
- <string name="top_scripts_title">
- Scripts según su uso
- </string>
- <string name="top_scripts_text">
- [COUNT] scripts con un total de [TIME] ms
- </string>
- <string name="scripts_score_label">
- Tiempo
- </string>
- <string name="scripts_mono_time_label">
- Tiempo en Mono
- </string>
- <string name="top_colliders_title">
- Objetos que colisionan
- </string>
- <string name="top_colliders_text">
- [COUNT] objetos con muchas posibles colisiones
- </string>
- <string name="colliders_score_label">
- Resultado
- </string>
- <string name="none_descriptor">
- No se ha encontrado ninguno.
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="top_objects" title="cargando...">
+ <text name="title_text">
+ Cargando...
+ </text>
+ <scroll_list name="objects_list">
+ <column label="Resultado" name="score"/>
+ <column label="Nombre" name="name"/>
+ <column label="Propietario" name="owner"/>
+ <column label="Posición" name="location"/>
+ <column label="Tiempo" name="time"/>
+ <column label="Tiempo en Mono" name="mono_time"/>
+ </scroll_list>
+ <text name="id_text">
+ ID del objeto:
+ </text>
+ <button label="Mostrar la baliza" name="show_beacon_btn"/>
+ <text name="obj_name_text">
+ Nombre del objeto:
+ </text>
+ <button label="Filtro" name="filter_object_btn"/>
+ <text name="owner_name_text">
+ Nombre del propietario:
+ </text>
+ <button label="Filtro" name="filter_owner_btn"/>
+ <button label="Devolver lo seleccionado" name="return_selected_btn"/>
+ <button label="Devolver todo" name="return_all_btn"/>
+ <button label="Desactivar lo seleccionado" name="disable_selected_btn"/>
+ <button label="Desactivar todo" name="disable_all_btn"/>
+ <button label="Actualizar" name="refresh_btn"/>
+ <string name="top_scripts_title">
+ Scripts según su uso
+ </string>
+ <string name="top_scripts_text">
+ [COUNT] scripts con un total de [TIME] ms
+ </string>
+ <string name="scripts_score_label">
+ Tiempo
+ </string>
+ <string name="scripts_mono_time_label">
+ Tiempo en Mono
+ </string>
+ <string name="top_colliders_title">
+ Objetos que colisionan
+ </string>
+ <string name="top_colliders_text">
+ [COUNT] objetos con muchas posibles colisiones
+ </string>
+ <string name="colliders_score_label">
+ Resultado
+ </string>
+ <string name="none_descriptor">
+ No se ha encontrado ninguno.
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml
index bdd7a802a7..9f2ff615f3 100644
--- a/indra/newview/skins/default/xui/es/floater_tos.xml
+++ b/indra/newview/skins/default/xui/es/floater_tos.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title=" ">
- <button label="Continuar" label_selected="Continuar" name="Continue"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <check_box label="Estoy de acuerdo con las Condiciones del Servicio" name="agree_chk"/>
- <text name="tos_heading">
- Por favor, lea cuidadosamente las siguientes Condiciones del Servicio. Si quiere seguir iniciando sesión en Second Life,
-debe aceptar el acuerdo.
- </text>
- <text_editor name="tos_text">
- TOS_TEXT
- </text_editor>
- <string name="real_url">
- http://secondlife.com/app/tos/
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title=" ">
+ <button label="Continuar" label_selected="Continuar" name="Continue"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <check_box label="Estoy de acuerdo con las Condiciones del Servicio" name="agree_chk"/>
+ <text name="tos_heading">
+ Por favor, lea cuidadosamente las siguientes Condiciones del Servicio. Si quiere seguir iniciando sesión en Second Life,
+debe aceptar el acuerdo.
+ </text>
+ <text_editor name="tos_text">
+ TOS_TEXT
+ </text_editor>
+ <string name="real_url">
+ http://secondlife.com/app/tos/
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
index 4a4fb15aef..34e76abb42 100644
--- a/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title=" ">
- <button label="Guardar" label_selected="Guardar" name="Save"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <text length="1" name="Save item as:" type="string">
- Guardar el Ãtem como:
- </text>
- <line_editor name="name ed">
- Nuevo [DESC]
- </line_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title=" ">
+ <button label="Guardar" label_selected="Guardar" name="Save"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <text length="1" name="Save item as:" type="string">
+ Guardar el Ãtem como:
+ </text>
+ <line_editor name="name ed">
+ Nuevo [DESC]
+ </line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml
index 2dc51d6c2e..cf1af23479 100644
--- a/indra/newview/skins/default/xui/es/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/es/floater_world_map.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="worldmap" title="Mapa del Mundo">
- <tab_container name="maptab">
- <panel label="Objetos" name="objects_mapview"/>
- <panel label="Terreno" name="terrain_mapview"/>
- </tab_container>
- <text name="land_for_sale_label">
- Terreno en venta
- </text>
- <text name="auction_label">
- Subasta
- </text>
- <text name="you_label">
- Usted
- </text>
- <text name="home_label">
- Base
- </text>
- <button label="Ir a la Base" label_selected="Ir a la Base" name="Go Home" tool_tip="Teleportar a su Base"/>
- <text name="person_label">
- Persona
- </text>
- <check_box label=" " name="people_chk"/>
- <text name="infohub_label">
- Punto de Información
- </text>
- <check_box label=" " name="infohub_chk"/>
- <text name="telehub_label">
- Punto de Teleporte
- </text>
- <check_box label=" " name="telehubchk"/>
- <text name="land_for_sale_label2">
- Terreno en venta
- </text>
- <check_box label=" " name="land_for_sale_chk"/>
- <text name="events_label">
- Eventos
- </text>
- <check_box label=" " name="event_chk"/>
-
-
- <check_box name="event_mature_chk"/>
- <combo_box label="Amigos conectados" name="friend combo" tool_tip="Amigo a mostrar en el mapa">
- <combo_item name="none_selected">
- Amigos conectados
- </combo_item>
- </combo_box>
- <combo_box label="Hitos" name="landmark combo" tool_tip="Hito a mostrar en el mapa">
- <combo_item name="none_selected">
- Hitos
- </combo_item>
- </combo_box>
- <line_editor label="Buscar por el nombre de la región" name="location" tool_tip="Escriba el nombre de una región"/>
- <button label="Buscar" name="DoSearch" tool_tip="Buscar una región"/>
- <text name="search_label">
- Resultados de la búsqueda:
- </text>
- <scroll_list name="search_results">
- <column label="" name="icon"/>
- <column label="" name="sim_name"/>
- </scroll_list>
- <text name="location_label">
- Localización:
- </text>
- <spinner name="spin x" tool_tip="Coordenada X de la posición a mostrar en el mapa"/>
- <spinner name="spin y" tool_tip="Coordenada Y de la posición a mostrar en el mapa"/>
- <spinner name="spin z" tool_tip="Coordenada Z de la posición a mostrar en el mapa"/>
- <button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportarse a la localización elegida"/>
- <button label="Mostrar el destino" label_selected="Mostrar el destino" name="Show Destination" tool_tip="Centrar el mapa en la localización elegida"/>
- <button label="Limpiar" label_selected="Limpiar" name="Clear" tool_tip="Parar la búsqueda"/>
- <button label="Mostrar mi posición" label_selected="Mostrar mi posición" name="Show My Location" tool_tip="Centrar el mapa en la posición de su avatar"/>
- <button label="Copiar la SLurl al portapapeles" name="copy_slurl" tool_tip="Copiar la posición actual como una SLurl, para usarla en la web."/>
- <slider label="Zoom" name="zoom slider"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="worldmap" title="Mapa del Mundo">
+ <tab_container name="maptab">
+ <panel label="Objetos" name="objects_mapview"/>
+ <panel label="Terreno" name="terrain_mapview"/>
+ </tab_container>
+ <text name="land_for_sale_label">
+ Terreno en venta
+ </text>
+ <text name="auction_label">
+ Subasta
+ </text>
+ <text name="you_label">
+ Usted
+ </text>
+ <text name="home_label">
+ Base
+ </text>
+ <button label="Ir a la Base" label_selected="Ir a la Base" name="Go Home" tool_tip="Teleportar a su Base"/>
+ <text name="person_label">
+ Persona
+ </text>
+ <check_box label=" " name="people_chk"/>
+ <text name="infohub_label">
+ Punto de Información
+ </text>
+ <check_box label=" " name="infohub_chk"/>
+ <text name="telehub_label">
+ Punto de Teleporte
+ </text>
+ <check_box label=" " name="telehubchk"/>
+ <text name="land_for_sale_label2">
+ Terreno en venta
+ </text>
+ <check_box label=" " name="land_for_sale_chk"/>
+ <text name="events_label">
+ Eventos
+ </text>
+ <check_box label=" " name="event_chk"/>
+
+
+ <check_box name="event_mature_chk"/>
+ <combo_box label="Amigos conectados" name="friend combo" tool_tip="Amigo a mostrar en el mapa">
+ <combo_box.item name="none_selected">
+ Amigos conectados
+ </combo_box.item>
+ </combo_box>
+ <combo_box label="Hitos" name="landmark combo" tool_tip="Hito a mostrar en el mapa">
+ <combo_box.item name="none_selected">
+ Hitos
+ </combo_box.item>
+ </combo_box>
+ <line_editor label="Buscar por el nombre de la región" name="location" tool_tip="Escriba el nombre de una región"/>
+ <button label="Buscar" name="DoSearch" tool_tip="Buscar una región"/>
+ <text name="search_label">
+ Resultados de la búsqueda:
+ </text>
+ <scroll_list name="search_results">
+ <column label="" name="icon"/>
+ <column label="" name="sim_name"/>
+ </scroll_list>
+ <text name="location_label">
+ Localización:
+ </text>
+ <spinner name="spin x" tool_tip="Coordenada X de la posición a mostrar en el mapa"/>
+ <spinner name="spin y" tool_tip="Coordenada Y de la posición a mostrar en el mapa"/>
+ <spinner name="spin z" tool_tip="Coordenada Z de la posición a mostrar en el mapa"/>
+ <button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportarse a la localización elegida"/>
+ <button label="Mostrar el destino" label_selected="Mostrar el destino" name="Show Destination" tool_tip="Centrar el mapa en la localización elegida"/>
+ <button label="Limpiar" label_selected="Limpiar" name="Clear" tool_tip="Parar la búsqueda"/>
+ <button label="Mostrar mi posición" label_selected="Mostrar mi posición" name="Show My Location" tool_tip="Centrar el mapa en la posición de su avatar"/>
+ <button label="Copiar la SLurl al portapapeles" name="copy_slurl" tool_tip="Copiar la posición actual como una SLurl, para usarla en la web."/>
+ <slider label="Zoom" name="zoom slider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index e776bf0b0c..a503429ff9 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Popup">
- <menu_item_call label="Comprar" name="Task Buy"/>
- <menu_item_call label="Abrir" name="Task Open"/>
- <menu_item_call label="Ejecutar" name="Task Play"/>
- <menu_item_call label="Propiedades" name="Task Properties"/>
- <menu_item_call label="Renombrar" name="Task Rename"/>
- <menu_item_call label="Borrar" name="Task Remove"/>
- <menu_item_call label="Vaciar la papelera" name="Empty Trash"/>
- <menu_item_call label="Vaciar Objetos Perdidos" name="Empty Lost And Found"/>
- <menu_item_call label="Carpeta nueva" name="New Folder"/>
- <menu_item_call label="Script nuevo" name="New Script"/>
- <menu_item_call label="Nota nueva" name="New Note"/>
- <menu_item_call label="Gesto nuevo" name="New Gesture"/>
- <menu name="New Clothes">
- <menu_item_call label="Camisa nueva" name="New Shirt"/>
- <menu_item_call label="Pantalones nuevos" name="New Pants"/>
- <menu_item_call label="Zapatos nuevos" name="New Shoes"/>
- <menu_item_call label="Calcetines nuevos" name="New Socks"/>
- <menu_item_call label="Chaqueta nueva" name="New Jacket"/>
- <menu_item_call label="Falda nueva" name="New Skirt"/>
- <menu_item_call label="Guantes nuevos" name="New Gloves"/>
- <menu_item_call label="Camiseta nueva" name="New Undershirt"/>
- <menu_item_call label="Ropa interior nueva" name="New Underpants"/>
- </menu>
- <menu name="New Body Parts">
- <menu_item_call label="Forma nueva" name="New Shape"/>
- <menu_item_call label="Piel nueva" name="New Skin"/>
- <menu_item_call label="Pelo nuevo" name="New Hair"/>
- <menu_item_call label="Ojos nuevos" name="New Eyes"/>
- </menu>
- <menu_item_call label="Teleportar" name="Landmark Open"/>
- <menu_item_call label="Abrir" name="Animation Open"/>
- <menu_item_call label="Abrir" name="Sound Open"/>
- <menu_item_call label="Eliminar el Ãtem" name="Purge Item"/>
- <menu_item_call label="Restaurar el Ãtem" name="Restore Item"/>
- <menu_item_call label="Abrir" name="Open"/>
- <menu_item_call label="Propiedades" name="Properties"/>
- <menu_item_call label="Renombrar" name="Rename"/>
- <menu_item_call label="Copiar la UUID" name="Copy Asset UUID"/>
- <menu_item_call label="Copiar" name="Copy"/>
- <menu_item_call label="Pegar" name="Paste"/>
- <menu_item_call label="Borrar" name="Delete"/>
- <menu_item_call label="Quitarse los Ãtems" name="Take Off Items"/>
- <menu_item_call label="Añadir al vestuario" name="Add To Outfit"/>
- <menu_item_call label="Reemplazar el vestuario" name="Replace Outfit"/>
- <menu_item_call label="Empezar multiconferencia" name="Conference Chat Folder"/>
- <menu_item_call label="Escuchar" name="Sound Play"/>
- <menu_item_call label="Acerca del hito" name="Teleport To Landmark"/>
- <menu_item_call label="Ver en el mundo" name="Animation Play"/>
- <menu_item_call label="Ejecutarla para usted" name="Animation Audition"/>
- <menu_item_call label="Enviar un mensaje instantáneo" name="Send Instant Message"/>
- <menu_item_call label="Ofrecer teleporte..." name="Offer Teleport..."/>
- <menu_item_call label="Empezar multiconferencia" name="Conference Chat"/>
- <menu_item_call label="Activar" name="Activate"/>
- <menu_item_call label="Desactivar" name="Deactivate"/>
- <menu_item_call label="Quitarse" name="Detach From Yourself"/>
- <menu_item_call label="Ponerse" name="Object Wear"/>
- <menu label="Anexar a" name="Attach To"/>
- <menu label="Anexar como HUD" name="Attach To HUD"/>
- <menu_item_call label="Editar" name="Wearable Edit"/>
- <menu_item_call label="Ponerse" name="Wearable Wear"/>
- <menu_item_call label="Quitarse" name="Take Off"/>
- <menu_item_call label="--sin opciones--" name="--no options--"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+ <menu_item_call label="Comprar" name="Task Buy"/>
+ <menu_item_call label="Abrir" name="Task Open"/>
+ <menu_item_call label="Ejecutar" name="Task Play"/>
+ <menu_item_call label="Propiedades" name="Task Properties"/>
+ <menu_item_call label="Renombrar" name="Task Rename"/>
+ <menu_item_call label="Borrar" name="Task Remove"/>
+ <menu_item_call label="Vaciar la papelera" name="Empty Trash"/>
+ <menu_item_call label="Vaciar Objetos Perdidos" name="Empty Lost And Found"/>
+ <menu_item_call label="Carpeta nueva" name="New Folder"/>
+ <menu_item_call label="Script nuevo" name="New Script"/>
+ <menu_item_call label="Nota nueva" name="New Note"/>
+ <menu_item_call label="Gesto nuevo" name="New Gesture"/>
+ <menu name="New Clothes">
+ <menu_item_call label="Camisa nueva" name="New Shirt"/>
+ <menu_item_call label="Pantalones nuevos" name="New Pants"/>
+ <menu_item_call label="Zapatos nuevos" name="New Shoes"/>
+ <menu_item_call label="Calcetines nuevos" name="New Socks"/>
+ <menu_item_call label="Chaqueta nueva" name="New Jacket"/>
+ <menu_item_call label="Falda nueva" name="New Skirt"/>
+ <menu_item_call label="Guantes nuevos" name="New Gloves"/>
+ <menu_item_call label="Camiseta nueva" name="New Undershirt"/>
+ <menu_item_call label="Ropa interior nueva" name="New Underpants"/>
+ </menu>
+ <menu name="New Body Parts">
+ <menu_item_call label="Forma nueva" name="New Shape"/>
+ <menu_item_call label="Piel nueva" name="New Skin"/>
+ <menu_item_call label="Pelo nuevo" name="New Hair"/>
+ <menu_item_call label="Ojos nuevos" name="New Eyes"/>
+ </menu>
+ <menu_item_call label="Teleportar" name="Landmark Open"/>
+ <menu_item_call label="Abrir" name="Animation Open"/>
+ <menu_item_call label="Abrir" name="Sound Open"/>
+ <menu_item_call label="Eliminar el Ãtem" name="Purge Item"/>
+ <menu_item_call label="Restaurar el Ãtem" name="Restore Item"/>
+ <menu_item_call label="Abrir" name="Open"/>
+ <menu_item_call label="Propiedades" name="Properties"/>
+ <menu_item_call label="Renombrar" name="Rename"/>
+ <menu_item_call label="Copiar la UUID" name="Copy Asset UUID"/>
+ <menu_item_call label="Copiar" name="Copy"/>
+ <menu_item_call label="Pegar" name="Paste"/>
+ <menu_item_call label="Borrar" name="Delete"/>
+ <menu_item_call label="Quitarse los Ãtems" name="Take Off Items"/>
+ <menu_item_call label="Añadir al vestuario" name="Add To Outfit"/>
+ <menu_item_call label="Reemplazar el vestuario" name="Replace Outfit"/>
+ <menu_item_call label="Empezar multiconferencia" name="Conference Chat Folder"/>
+ <menu_item_call label="Escuchar" name="Sound Play"/>
+ <menu_item_call label="Acerca del hito" name="Teleport To Landmark"/>
+ <menu_item_call label="Ver en el mundo" name="Animation Play"/>
+ <menu_item_call label="Ejecutarla para usted" name="Animation Audition"/>
+ <menu_item_call label="Enviar un mensaje instantáneo" name="Send Instant Message"/>
+ <menu_item_call label="Ofrecer teleporte..." name="Offer Teleport..."/>
+ <menu_item_call label="Empezar multiconferencia" name="Conference Chat"/>
+ <menu_item_call label="Activar" name="Activate"/>
+ <menu_item_call label="Desactivar" name="Deactivate"/>
+ <menu_item_call label="Quitarse" name="Detach From Yourself"/>
+ <menu_item_call label="Ponerse" name="Object Wear"/>
+ <menu label="Anexar a" name="Attach To"/>
+ <menu label="Anexar como HUD" name="Attach To HUD"/>
+ <menu_item_call label="Editar" name="Wearable Edit"/>
+ <menu_item_call label="Ponerse" name="Wearable Wear"/>
+ <menu_item_call label="Quitarse" name="Take Off"/>
+ <menu_item_call label="--sin opciones--" name="--no options--"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 8e95c158da..1721701c9f 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -1,203 +1,203 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu_bar name="Main Menu">
- <menu label="Archivo" name="File">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
- <menu label="Subir" name="upload">
- <menu_item_call label="Subir imagen ([COST] L$)..." name="Upload Image"/>
- <menu_item_call label="Subir sonido ([COST] L$)..." name="Upload Sound"/>
- <menu_item_call label="Subir animación ([COST] L$)..." name="Upload Animation"/>
- <menu_item_call label="Subida masiva ([COST] L$ por archivo)..." name="Bulk Upload"/>
- </menu>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Cerrar la ventana" name="Close Window"/>
- <menu_item_call label="Cerrar todas las ventanas" name="Close All Windows"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Guardar la textura como..." name="Save Texture As..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Hacer una foto" name="Take Snapshot"/>
- <menu_item_call label="Guardar una foto" name="Snapshot to Disk"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Salir" name="Quit"/>
- </menu>
- <menu label="Editar" name="Edit">
- <menu_item_call label="Deshacer" name="Undo"/>
- <menu_item_call label="Rehacer" name="Redo"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Cortar" name="Cut"/>
- <menu_item_call label="Copiar" name="Copy"/>
- <menu_item_call label="Pegar" name="Paste"/>
- <menu_item_call label="Borrar" name="Delete"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Buscar..." name="Search..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Seleccionar todo" name="Select All"/>
- <menu_item_call label="Deseleccionar" name="Deselect"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Duplicar" name="Duplicate"/>
- <menu_item_separator label="-----------" name="separator5"/>
- <menu label="Anexar el objeto" name="Attach Object"/>
- <menu label="Quitarse el objeto" name="Detach Object"/>
- <menu label="Quitarse ropa" name="Take Off Clothing">
- <menu_item_call label="Camisa" name="Shirt"/>
- <menu_item_call label="Pantalones" name="Pants"/>
- <menu_item_call label="Zapatos" name="Shoes"/>
- <menu_item_call label="Calcetines" name="Socks"/>
- <menu_item_call label="Chaqueta" name="Jacket"/>
- <menu_item_call label="Guantes" name="Gloves"/>
- <menu_item_call label="Camiseta" name="Menu Undershirt"/>
- <menu_item_call label="Ropa interior" name="Menu Underpants"/>
- <menu_item_call label="Falda" name="Skirt"/>
- <menu_item_call label="Toda la ropa" name="All Clothes"/>
- </menu>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu_item_call label="Gestos..." name="Gestures..."/>
- <menu_item_call label="Perfil..." name="Profile..."/>
- <menu_item_call label="Apariencia..." name="Appearance..."/>
- <menu_item_separator label="-----------" name="separator7"/>
- <menu_item_check label="Amigos..." name="Friends..."/>
- <menu_item_call label="Grupos..." name="Groups..."/>
- <menu_item_separator label="-----------" name="separator8"/>
- <menu_item_call label="Preferencias..." name="Preferences..."/>
- </menu>
- <menu label="Ver" name="View">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
- <menu_item_call label="Vista subjetiva" name="Mouselook"/>
- <menu_item_check label="Construir" name="Build"/>
- <menu_item_check label="Flycam del joystick" name="Joystick Flycam"/>
- <menu_item_call label="Volver a la vista por defecto" name="Reset View"/>
- <menu_item_call label="Mirar al último que habló" name="Look at Last Chatter"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_check label="Barra de herramientas" name="Toolbar"/>
- <menu_item_check label="Chat" name="Chat History"/>
- <menu_item_check label="Comunicarse" name="Instant Message"/>
- <menu_item_check label="Inventario" name="Inventory"/>
- <menu_item_check label="Participantes activos" name="Active Speakers"/>
- <menu_item_check label="Lista de ignorados" name="Mute List"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_check label="Controles de la cámara" name="Camera Controls"/>
- <menu_item_check label="Controles del movimiento" name="Movement Controls"/>
- <menu_item_check label="Mapa del mundo" name="World Map"/>
- <menu_item_check label="Minimapa" name="Mini-Map"/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_check label="EstadÃsticas" name="Statistics Bar"/>
- <menu_item_check label="LÃmites de las parcelas" name="Property Lines"/>
- <menu_item_check label="Propietarios del terreno" name="Land Owners"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu label="Información adicional" name="Hover Tips">
- <menu_item_check label="Mostrar información adicional." name="Show Tips"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_check label="Información adicional del terreno" name="Land Tips"/>
- <menu_item_check label="Información adicional en todos los objetos" name="Tips On All Objects"/>
- </menu>
- <menu_item_check label="Realzar las transparencias" name="Highlight Transparent"/>
- <menu_item_check label="Balizas" name="beacons"/>
- <menu_item_check label="Ocultar las partÃculas" name="Hide Particles"/>
- <menu_item_check label="Mostrar los HUD en uso" name="Show HUD Attachments"/>
- <menu_item_separator label="-----------" name="separator5"/>
- <menu_item_call label="Acercar el zoom" name="Zoom In"/>
- <menu_item_call label="Zoom predeterminado" name="Zoom Default"/>
- <menu_item_call label="Alejar el zoom" name="Zoom Out"/>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu_item_call label="Pantalla completa" name="Toggle Fullscreen"/>
- <menu_item_call label="Interfaz en el tamaño predeterminado" name="Set UI Size to Default"/>
- </menu>
- <menu label="Mundo" name="World">
- <menu_item_call label="Chat" name="Chat"/>
- <menu_item_check label="Correr siempre" name="Always Run"/>
- <menu_item_check label="Volar" name="Fly"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Crear aquà un hito" name="Create Landmark Here"/>
- <menu_item_call label="Fijar mi Base aquÃ" name="Set Home to Here"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Teleportar a mi Base" name="Teleport Home"/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Pasar al estado ausente" name="Set Away"/>
- <menu_item_call label="Pasar al estado ocupado" name="Set Busy"/>
- <menu_item_call label="Parar todas las animaciones" name="Stop All Animations"/>
- <menu_item_call label="Recuperar las teclas" name="Release Keys"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Historial de mi cuenta..." name="Account History..."/>
- <menu_item_call label="Administrar mi cuenta..." name="Manage My Account..."/>
- <menu_item_call label="Comprar L$..." name="Buy and Sell L$..."/>
- <menu_item_separator label="-----------" name="separator5"/>
- <menu_item_call label="Mi terreno..." name="My Land..."/>
- <menu_item_call label="Acerca del terreno..." name="About Land..."/>
- <menu_item_call label="Comprar terreno..." name="Buy Land..."/>
- <menu_item_call label="Region/Estado..." name="Region/Estate..."/>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu label="Configuración del entorno" name="Environment Settings">
- <menu_item_call label="Amanecer" name="Sunrise"/>
- <menu_item_call label="MediodÃa" name="Noon"/>
- <menu_item_call label="Atardecer" name="Sunset"/>
- <menu_item_call label="Medianoche" name="Midnight"/>
- <menu_item_call label="Volver a los valores por defecto de la región" name="Revert to Region Default"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Editor del entorno" name="Environment Editor"/>
- </menu>
- </menu>
- <menu label="Herramientas" name="Tools">
- <menu label="Elegir una herramienta" name="Select Tool">
- <menu_item_call label="Visión" name="Focus"/>
- <menu_item_call label="Moverse" name="Move"/>
- <menu_item_call label="Modificar" name="Edit"/>
- <menu_item_call label="Crear" name="Create"/>
- <menu_item_call label="Terreno" name="Land"/>
- </menu>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_check label="Seleccionar sólo mis objetos" name="Select Only My Objects"/>
- <menu_item_check label="Seleccionar sólo objetos movibles" name="Select Only Movable Objects"/>
- <menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding"/>
- <menu_item_check label="Al seleccionar, mostrar los ocultos" name="Show Hidden Selection"/>
- <menu_item_check label="Al seleccionar, mostrar el radio de la luz" name="Show Light Radius for Selection"/>
- <menu_item_check label="Mostrar rayo indicador" name="Show Selection Beam"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_check label="Ajustar a la cuadrÃcula" name="Snap to Grid"/>
- <menu_item_call label="Ajustar a la cuadrÃcula los ejes X e Y" name="Snap Object XY to Grid"/>
- <menu_item_call label="Usar lo seleccionado como cuadrÃcula" name="Use Selection for Grid"/>
- <menu_item_call label="Opciones de la cuadrÃcula..." name="Grid Options..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_check label="Editar las partes enlazadas" name="Edit Linked Parts"/>
- <menu_item_call label="Enlazar" name="Link"/>
- <menu_item_call label="Desenlazar" name="Unlink"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Visión en lo seleccionado" name="Focus on Selection"/>
- <menu_item_call label="Zoom en lo seleccionado" name="Zoom to Selection"/>
- <menu_item_call label="Comprar el objeto" name="Menu Object Take"/>
- <menu_item_call label="Coger una copia" name="Take Copy"/>
- <menu_item_call label="Devolver una copia del objeto a mi inventario" name="Save Object Back to My Inventory"/>
- <menu_item_call label="Devolver una copia del objeto a los contenidos de donde salió" name="Save Object Back to Object Contents"/>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu_item_call label="Ver en una ventana los errores o alertas de los scripts" name="Show Script Warning/Error Window"/>
- <menu label="Recompilar los scripts en lo seleccionado" name="Recompile Scripts in Selection">
- <menu_item_call label="Mono" name="Mono"/>
- <menu_item_call label="LSL" name="LSL"/>
- </menu>
- <menu_item_call label="Reiniciar los scripts en lo seleccionado" name="Reset Scripts in Selection"/>
- <menu_item_call label="Definir los scripts a ejecutar en lo seleccionado" name="Set Scripts to Running in Selection"/>
- <menu_item_call label="Definir los scripts a no ejecutar en lo seleccionado" name="Set Scripts to Not Running in Selection"/>
- </menu>
- <menu label="Ayuda" name="Help">
- <menu_item_call label="Ayuda de Second Life" name="Second Life Help"/>
- <menu_item_call label="Tutorial" name="Tutorial"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Blog oficial..." name="Official Linden Blog..."/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Portal de programación..." name="Scripting Portal..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Denunciar una infracción..." name="Report Abuse..."/>
- <menu_item_call label="Choques, empujones, e impactos..." name="Bumps, Pushes &amp; Hits..."/>
- <menu_item_call label="Medidor del lag" name="Lag Meter"/>
- <menu_item_separator label="-----------" name="separator7"/>
- <menu label="Informes de fallos" name="Bug Reporting">
- <menu_item_call label="Public Issue Tracker..." name="Public Issue Tracker..."/>
- <menu_item_call label="Ayuda del Public Issue Tracker..." name="Publc Issue Tracker Help..."/>
- <menu_item_separator label="-----------" name="separator7"/>
- <menu_item_call label="Informes de fallos - instrucciones..." name="Bug Reporing 101..."/>
- <menu_item_call label="Problemas de seguridad..." name="Security Issues..."/>
- <menu_item_call label="Wiki QA..." name="QA Wiki..."/>
- <menu_item_separator label="-----------" name="separator9"/>
- <menu_item_call label="Informar de un fallo..." name="Report Bug..."/>
- </menu>
- <menu_item_call label="Acerca de Second Life..." name="About Second Life..."/>
- </menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_bar name="Main Menu">
+ <menu label="Archivo" name="File">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu label="Subir" name="upload">
+ <menu_item_call label="Subir imagen ([COST] L$)..." name="Upload Image"/>
+ <menu_item_call label="Subir sonido ([COST] L$)..." name="Upload Sound"/>
+ <menu_item_call label="Subir animación ([COST] L$)..." name="Upload Animation"/>
+ <menu_item_call label="Subida masiva ([COST] L$ por archivo)..." name="Bulk Upload"/>
+ </menu>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Cerrar la ventana" name="Close Window"/>
+ <menu_item_call label="Cerrar todas las ventanas" name="Close All Windows"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Guardar la textura como..." name="Save Texture As..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Hacer una foto" name="Take Snapshot"/>
+ <menu_item_call label="Guardar una foto" name="Snapshot to Disk"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Salir" name="Quit"/>
+ </menu>
+ <menu label="Editar" name="Edit">
+ <menu_item_call label="Deshacer" name="Undo"/>
+ <menu_item_call label="Rehacer" name="Redo"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Cortar" name="Cut"/>
+ <menu_item_call label="Copiar" name="Copy"/>
+ <menu_item_call label="Pegar" name="Paste"/>
+ <menu_item_call label="Borrar" name="Delete"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Buscar..." name="Search..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Seleccionar todo" name="Select All"/>
+ <menu_item_call label="Deseleccionar" name="Deselect"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Duplicar" name="Duplicate"/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu label="Anexar el objeto" name="Attach Object"/>
+ <menu label="Quitarse el objeto" name="Detach Object"/>
+ <menu label="Quitarse ropa" name="Take Off Clothing">
+ <menu_item_call label="Camisa" name="Shirt"/>
+ <menu_item_call label="Pantalones" name="Pants"/>
+ <menu_item_call label="Zapatos" name="Shoes"/>
+ <menu_item_call label="Calcetines" name="Socks"/>
+ <menu_item_call label="Chaqueta" name="Jacket"/>
+ <menu_item_call label="Guantes" name="Gloves"/>
+ <menu_item_call label="Camiseta" name="Menu Undershirt"/>
+ <menu_item_call label="Ropa interior" name="Menu Underpants"/>
+ <menu_item_call label="Falda" name="Skirt"/>
+ <menu_item_call label="Toda la ropa" name="All Clothes"/>
+ </menu>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Gestos..." name="Gestures..."/>
+ <menu_item_call label="Perfil..." name="Profile..."/>
+ <menu_item_call label="Apariencia..." name="Appearance..."/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu_item_check label="Amigos..." name="Friends..."/>
+ <menu_item_call label="Grupos..." name="Groups..."/>
+ <menu_item_separator label="-----------" name="separator8"/>
+ <menu_item_call label="Preferencias..." name="Preferences..."/>
+ </menu>
+ <menu label="Ver" name="View">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu_item_call label="Vista subjetiva" name="Mouselook"/>
+ <menu_item_check label="Construir" name="Build"/>
+ <menu_item_check label="Flycam del joystick" name="Joystick Flycam"/>
+ <menu_item_call label="Volver a la vista por defecto" name="Reset View"/>
+ <menu_item_call label="Mirar al último que habló" name="Look at Last Chatter"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Barra de herramientas" name="Toolbar"/>
+ <menu_item_check label="Chat" name="Chat History"/>
+ <menu_item_check label="Comunicarse" name="Instant Message"/>
+ <menu_item_check label="Inventario" name="Inventory"/>
+ <menu_item_check label="Participantes activos" name="Active Speakers"/>
+ <menu_item_check label="Lista de ignorados" name="Mute List"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_check label="Controles de la cámara" name="Camera Controls"/>
+ <menu_item_check label="Controles del movimiento" name="Movement Controls"/>
+ <menu_item_check label="Mapa del mundo" name="World Map"/>
+ <menu_item_check label="Minimapa" name="Mini-Map"/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_check label="EstadÃsticas" name="Statistics Bar"/>
+ <menu_item_check label="LÃmites de las parcelas" name="Property Lines"/>
+ <menu_item_check label="Propietarios del terreno" name="Land Owners"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu label="Información adicional" name="Hover Tips">
+ <menu_item_check label="Mostrar información adicional." name="Show Tips"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Información adicional del terreno" name="Land Tips"/>
+ <menu_item_check label="Información adicional en todos los objetos" name="Tips On All Objects"/>
+ </menu>
+ <menu_item_check label="Realzar las transparencias" name="Highlight Transparent"/>
+ <menu_item_check label="Balizas" name="beacons"/>
+ <menu_item_check label="Ocultar las partÃculas" name="Hide Particles"/>
+ <menu_item_check label="Mostrar los HUD en uso" name="Show HUD Attachments"/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu_item_call label="Acercar el zoom" name="Zoom In"/>
+ <menu_item_call label="Zoom predeterminado" name="Zoom Default"/>
+ <menu_item_call label="Alejar el zoom" name="Zoom Out"/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Pantalla completa" name="Toggle Fullscreen"/>
+ <menu_item_call label="Interfaz en el tamaño predeterminado" name="Set UI Size to Default"/>
+ </menu>
+ <menu label="Mundo" name="World">
+ <menu_item_call label="Chat" name="Chat"/>
+ <menu_item_check label="Correr siempre" name="Always Run"/>
+ <menu_item_check label="Volar" name="Fly"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Crear aquà un hito" name="Create Landmark Here"/>
+ <menu_item_call label="Fijar mi Base aquÃ" name="Set Home to Here"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Teleportar a mi Base" name="Teleport Home"/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Pasar al estado ausente" name="Set Away"/>
+ <menu_item_call label="Pasar al estado ocupado" name="Set Busy"/>
+ <menu_item_call label="Parar todas las animaciones" name="Stop All Animations"/>
+ <menu_item_call label="Recuperar las teclas" name="Release Keys"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Historial de mi cuenta..." name="Account History..."/>
+ <menu_item_call label="Administrar mi cuenta..." name="Manage My Account..."/>
+ <menu_item_call label="Comprar L$..." name="Buy and Sell L$..."/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu_item_call label="Mi terreno..." name="My Land..."/>
+ <menu_item_call label="Acerca del terreno..." name="About Land..."/>
+ <menu_item_call label="Comprar terreno..." name="Buy Land..."/>
+ <menu_item_call label="Region/Estado..." name="Region/Estate..."/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu label="Configuración del entorno" name="Environment Settings">
+ <menu_item_call label="Amanecer" name="Sunrise"/>
+ <menu_item_call label="MediodÃa" name="Noon"/>
+ <menu_item_call label="Atardecer" name="Sunset"/>
+ <menu_item_call label="Medianoche" name="Midnight"/>
+ <menu_item_call label="Volver a los valores por defecto de la región" name="Revert to Region Default"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Editor del entorno" name="Environment Editor"/>
+ </menu>
+ </menu>
+ <menu label="Herramientas" name="Tools">
+ <menu label="Elegir una herramienta" name="Select Tool">
+ <menu_item_call label="Visión" name="Focus"/>
+ <menu_item_call label="Moverse" name="Move"/>
+ <menu_item_call label="Modificar" name="Edit"/>
+ <menu_item_call label="Crear" name="Create"/>
+ <menu_item_call label="Terreno" name="Land"/>
+ </menu>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Seleccionar sólo mis objetos" name="Select Only My Objects"/>
+ <menu_item_check label="Seleccionar sólo objetos movibles" name="Select Only Movable Objects"/>
+ <menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding"/>
+ <menu_item_check label="Al seleccionar, mostrar los ocultos" name="Show Hidden Selection"/>
+ <menu_item_check label="Al seleccionar, mostrar el radio de la luz" name="Show Light Radius for Selection"/>
+ <menu_item_check label="Mostrar rayo indicador" name="Show Selection Beam"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_check label="Ajustar a la cuadrÃcula" name="Snap to Grid"/>
+ <menu_item_call label="Ajustar a la cuadrÃcula los ejes X e Y" name="Snap Object XY to Grid"/>
+ <menu_item_call label="Usar lo seleccionado como cuadrÃcula" name="Use Selection for Grid"/>
+ <menu_item_call label="Opciones de la cuadrÃcula..." name="Grid Options..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_check label="Editar las partes enlazadas" name="Edit Linked Parts"/>
+ <menu_item_call label="Enlazar" name="Link"/>
+ <menu_item_call label="Desenlazar" name="Unlink"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Visión en lo seleccionado" name="Focus on Selection"/>
+ <menu_item_call label="Zoom en lo seleccionado" name="Zoom to Selection"/>
+ <menu_item_call label="Comprar el objeto" name="Menu Object Take"/>
+ <menu_item_call label="Coger una copia" name="Take Copy"/>
+ <menu_item_call label="Devolver una copia del objeto a mi inventario" name="Save Object Back to My Inventory"/>
+ <menu_item_call label="Devolver una copia del objeto a los contenidos de donde salió" name="Save Object Back to Object Contents"/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Ver en una ventana los errores o alertas de los scripts" name="Show Script Warning/Error Window"/>
+ <menu label="Recompilar los scripts en lo seleccionado" name="Recompile Scripts in Selection">
+ <menu_item_call label="Mono" name="Mono"/>
+ <menu_item_call label="LSL" name="LSL"/>
+ </menu>
+ <menu_item_call label="Reiniciar los scripts en lo seleccionado" name="Reset Scripts in Selection"/>
+ <menu_item_call label="Definir los scripts a ejecutar en lo seleccionado" name="Set Scripts to Running in Selection"/>
+ <menu_item_call label="Definir los scripts a no ejecutar en lo seleccionado" name="Set Scripts to Not Running in Selection"/>
+ </menu>
+ <menu label="Ayuda" name="Help">
+ <menu_item_call label="Ayuda de Second Life" name="Second Life Help"/>
+ <menu_item_call label="Tutorial" name="Tutorial"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Blog oficial..." name="Official Linden Blog..."/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Portal de programación..." name="Scripting Portal..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Denunciar una infracción..." name="Report Abuse..."/>
+ <menu_item_call label="Choques, empujones, e impactos..." name="Bumps, Pushes &amp; Hits..."/>
+ <menu_item_call label="Medidor del lag" name="Lag Meter"/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu label="Informes de fallos" name="Bug Reporting">
+ <menu_item_call label="Public Issue Tracker..." name="Public Issue Tracker..."/>
+ <menu_item_call label="Ayuda del Public Issue Tracker..." name="Publc Issue Tracker Help..."/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu_item_call label="Informes de fallos - instrucciones..." name="Bug Reporing 101..."/>
+ <menu_item_call label="Problemas de seguridad..." name="Security Issues..."/>
+ <menu_item_call label="Wiki QA..." name="QA Wiki..."/>
+ <menu_item_separator label="-----------" name="separator9"/>
+ <menu_item_call label="Informar de un fallo..." name="Report Bug..."/>
+ </menu>
+ <menu_item_call label="Acerca de Second Life..." name="About Second Life..."/>
+ </menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
index 54377ef828..865dad9028 100644
--- a/indra/newview/skins/default/xui/es/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_general.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="General" name="general_tab">
- <string name="help_text">
- La pestaña General contiene información global de este grupo,
-la lista de propietarios y miembros visibles,
-las preferencias generales del grupo, y las opciones de los miembros.
-
-Ponga su ratón sobre las opciones para más información.
- </string>
- <string name="group_info_unchanged">
- La información general del grupo ha cambiado.
- </string>
- <button label="?" label_selected="?" name="help_button"/>
- <line_editor label="Escriba aquà el nombre de su nuevo grupo" name="group_name_editor"/>
- <text name="group_name">
- Escriba aquà el nombre de su nuevo grupo
- </text>
- <text name="prepend_founded_by">
- Creado por
- </text>
- <text name="founder_name">
- (esperando)
- </text>
- <text name="group_charter_label">
- Carta del grupo
- </text>
- <texture_picker label="Emblema del grupo" name="insignia" tool_tip="Pulse para elegir una imagen"/>
- <text_editor name="charter">
- Carta del grupo
- </text_editor>
- <button label="Entrar (0 L$)" label_selected="Entrar (0 L$)" name="join_button"/>
- <button label="Ver en detalle" label_selected="Ver en detalle" name="info_button"/>
- <text name="text_owners_and_visible_members">
- Propietarios y Miembros visibles
- </text>
- <text name="text_owners_are_shown_in_bold">
- (los propietarios aparecen en negrilla)
- </text>
- <name_list name="visible_members">
- <column label="Nombre del miembro" name="name"/>
- <column label="Etiqueta" name="title"/>
- <column label="Última conexión" name="online"/>
- </name_list>
- <text name="text_group_preferences">
- Preferencias del grupo
- </text>
- <panel name="preferences_container">
- <check_box label="Mostrar en la búsqueda" name="show_in_group_list" tool_tip="Dejar que la gente vea este grupo en los resultados de la búsqueda."/>
- <check_box label="Inscripción libre" name="open_enrollement" tool_tip="Definir si se admiten al grupo nuevos miembros sin que sea preciso invitárseles."/>
- <check_box label="Cuota de inscripción en L$" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo."/>
- <spinner name="spin_enrollment_fee" tool_tip="Cuando está marcado 'Cuota de inscripción', los miembros nuevos deben pagar esta cuota para entrar al grupo."/>
-
-
- <panel name="title_container">
- <text name="active_title_label">
- Mi etiqueta activa
- </text>
- <combo_box name="active_title" tool_tip="Define la etiqueta que aparecerá sobre el nombre de su avatar cuando tenga activo este grupo."/>
- </panel>
- <check_box label="Recibir los avisos del grupo" name="receive_notices" tool_tip="Define si quiere recibir avisos de este grupo. Desmarque esto si el grupo le envÃa spam."/>
- <check_box label="Mostrar el grupo en mi perfil" name="list_groups_in_profile" tool_tip="Define si quiere que este grupo aparezca en su perfil."/>
- </panel>
- <string name="incomplete_member_data_str">
- Recuperando los datos de los miembros
- </string>
- <string name="confirm_group_create_str">
- Crear este grupo cuesta 100 L$.
-¿Está plena, absoluta, y TOTALMENTE seguro de que quiere gastarse 100 L$ para crear este grupo?
-Queda avisado de que si, en un plazo de 48 horas, no entra nadie al grupo, éste será disuelto, y el nombre no se podrá usar en el futuro.
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="General" name="general_tab">
+ <string name="help_text">
+ La pestaña General contiene información global de este grupo,
+la lista de propietarios y miembros visibles,
+las preferencias generales del grupo, y las opciones de los miembros.
+
+Ponga su ratón sobre las opciones para más información.
+ </string>
+ <string name="group_info_unchanged">
+ La información general del grupo ha cambiado.
+ </string>
+ <button label="?" label_selected="?" name="help_button"/>
+ <line_editor label="Escriba aquà el nombre de su nuevo grupo" name="group_name_editor"/>
+ <text name="group_name">
+ Escriba aquà el nombre de su nuevo grupo
+ </text>
+ <text name="prepend_founded_by">
+ Creado por
+ </text>
+ <text name="founder_name">
+ (esperando)
+ </text>
+ <text name="group_charter_label">
+ Carta del grupo
+ </text>
+ <texture_picker label="Emblema del grupo" name="insignia" tool_tip="Pulse para elegir una imagen"/>
+ <text_editor name="charter">
+ Carta del grupo
+ </text_editor>
+ <button label="Entrar (0 L$)" label_selected="Entrar (0 L$)" name="join_button"/>
+ <button label="Ver en detalle" label_selected="Ver en detalle" name="info_button"/>
+ <text name="text_owners_and_visible_members">
+ Propietarios y Miembros visibles
+ </text>
+ <text name="text_owners_are_shown_in_bold">
+ (los propietarios aparecen en negrilla)
+ </text>
+ <name_list name="visible_members">
+ <column label="Nombre del miembro" name="name"/>
+ <column label="Etiqueta" name="title"/>
+ <column label="Última conexión" name="online"/>
+ </name_list>
+ <text name="text_group_preferences">
+ Preferencias del grupo
+ </text>
+ <panel name="preferences_container">
+ <check_box label="Mostrar en la búsqueda" name="show_in_group_list" tool_tip="Dejar que la gente vea este grupo en los resultados de la búsqueda."/>
+ <check_box label="Inscripción libre" name="open_enrollement" tool_tip="Definir si se admiten al grupo nuevos miembros sin que sea preciso invitárseles."/>
+ <check_box label="Cuota de inscripción en L$" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo."/>
+ <spinner name="spin_enrollment_fee" tool_tip="Cuando está marcado 'Cuota de inscripción', los miembros nuevos deben pagar esta cuota para entrar al grupo."/>
+
+
+ <panel name="title_container">
+ <text name="active_title_label">
+ Mi etiqueta activa
+ </text>
+ <combo_box name="active_title" tool_tip="Define la etiqueta que aparecerá sobre el nombre de su avatar cuando tenga activo este grupo."/>
+ </panel>
+ <check_box label="Recibir los avisos del grupo" name="receive_notices" tool_tip="Define si quiere recibir avisos de este grupo. Desmarque esto si el grupo le envÃa spam."/>
+ <check_box label="Mostrar el grupo en mi perfil" name="list_groups_in_profile" tool_tip="Define si quiere que este grupo aparezca en su perfil."/>
+ </panel>
+ <string name="incomplete_member_data_str">
+ Recuperando los datos de los miembros
+ </string>
+ <string name="confirm_group_create_str">
+ Crear este grupo cuesta 100 L$.
+¿Está plena, absoluta, y TOTALMENTE seguro de que quiere gastarse 100 L$ para crear este grupo?
+Queda avisado de que si, en un plazo de 48 horas, no entra nadie al grupo, éste será disuelto, y el nombre no se podrá usar en el futuro.
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
index 3bd3fd5c6e..66329c4f2b 100644
--- a/indra/newview/skins/default/xui/es/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Invitar a un miembro" name="invite_panel">
- <text name="help_text">
- Puede seleccionar a varios residentes para
-invitarles a su grupo. Para empezar, pulse
-'Abrir el selector de personas'.
- </text>
- <button label="Abrir el selector de personas" name="add_button" tool_tip=""/>
- <name_list name="invitee_list" tool_tip="Para seleccionar a varios residentes, mantenga pulsada la tecla Ctrl y vaya pulsando sus nombres."/>
- <button label="Eliminar de la lista a los seleccionados" name="remove_button" tool_tip="Elimina los residentes seleccionados de la lista de invitaciones."/>
- <text name="role_text">
- Elegir qué rol asignarles:
- </text>
- <combo_box name="role_name" tool_tip="Elige de la lista de roles cuál asignar a los miembros."/>
- <button label="Enviar las invitaciones" name="ok_button"/>
- <button label="Cancelar" name="cancel_button"/>
- <string name="confirm_invite_owner_str">
- ¿Está seguro de que quiere invitar a un nuevo propietario/s? ¡Esta acción es permanente!
- </string>
- <string name="loading">
- (cargando...)
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Invitar a un miembro" name="invite_panel">
+ <text name="help_text">
+ Puede seleccionar a varios residentes para
+invitarles a su grupo. Para empezar, pulse
+'Abrir el selector de personas'.
+ </text>
+ <button label="Abrir el selector de personas" name="add_button" tool_tip=""/>
+ <name_list name="invitee_list" tool_tip="Para seleccionar a varios residentes, mantenga pulsada la tecla Ctrl y vaya pulsando sus nombres."/>
+ <button label="Eliminar de la lista a los seleccionados" name="remove_button" tool_tip="Elimina los residentes seleccionados de la lista de invitaciones."/>
+ <text name="role_text">
+ Elegir qué rol asignarles:
+ </text>
+ <combo_box name="role_name" tool_tip="Elige de la lista de roles cuál asignar a los miembros."/>
+ <button label="Enviar las invitaciones" name="ok_button"/>
+ <button label="Cancelar" name="cancel_button"/>
+ <string name="confirm_invite_owner_str">
+ ¿Está seguro de que quiere invitar a un nuevo propietario/s? ¡Esta acción es permanente!
+ </string>
+ <string name="loading">
+ (cargando...)
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
index e1ac9e0c33..436a79d429 100644
--- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Terreno y L$" name="land_money_tab">
- <string name="help_text">
- Se listan las parcelas propiedad del grupo, detallando las contribuciones. Aparece una advertencia si el Terreno total en uso es menor que o igual a la Contribución total. Las pestañas 'Planeamiento', 'Detalles' y 'Ventas' aportan información sobre las finanzas del grupo.
- </string>
- <button label="?" name="help_button"/>
- <string name="cant_view_group_land_text">
- No tiene permiso para ver qué terreno posee el grupo.
- </string>
- <string name="cant_view_group_accounting_text">
- No tiene permiso para ver la información de la cuenta del grupo.
- </string>
- <string name="loading_txt">
- Cargando...
- </string>
- <text name="group_land_heading">
- Terreno propiedad del grupo
- </text>
- <scroll_list name="group_parcel_list">
- <column label="Nombre de la parcela" name="name"/>
- <column label="Región" name="location"/>
- <column label="Superficie" name="area"/>
- <column label="" name="hidden"/>
- </scroll_list>
- <button label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="map_button"/>
- <text name="total_contributed_land_label">
- Contribución total:
- </text>
- <text name="total_contributed_land_value">
- [AREA] m²
- </text>
- <text name="total_land_in_use_label">
- Terreno total en uso:
- </text>
- <text name="total_land_in_use_value">
- [AREA] m²
- </text>
- <text name="land_available_label">
- Terreno disponible:
- </text>
- <text name="land_available_value">
- [AREA] m²
- </text>
- <text name="your_contribution_label">
- Su contribución:
- </text>
- <string name="land_contrib_error">
- No se ha podido defininir su contribución de terreno.
- </string>
- <text name="your_contribution_max_value">
- m² ([AMOUNT] máx.)
- </text>
- <text name="group_over_limit_text">
- Los miembros del grupo deben contribuir con más créditos de terreno para mantener el terreno en uso.
- </text>
- <text name="group_money_heading">
- L$ del grupo
- </text>
- <tab_container name="group_money_tab_container">
- <panel label="Detalles" name="group_money_details_tab">
- <text_editor name="group_money_details_text">
- Calculando...
- </text_editor>
- <button label="< Antes" label_selected="< Antes" name="earlier_details_button" tool_tip="Ir hacia atrás en el tiempo"/>
- <button label="Después >" label_selected="Después >" name="later_details_button" tool_tip="Ir hacia adelante en el tiempo"/>
- </panel>
- <panel label="Ventas" name="group_money_sales_tab">
- <text_editor name="group_money_sales_text">
- Calculando...
- </text_editor>
- <button label="< Antes" label_selected="< Antes" name="earlier_sales_button" tool_tip="Ir hacia atrás en el tiempo"/>
- <button label="Después >" label_selected="Después >" name="later_sales_button" tool_tip="Ir hacia adelante en el tiempo"/>
- </panel>
- </tab_container>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terreno y L$" name="land_money_tab">
+ <string name="help_text">
+ Se listan las parcelas propiedad del grupo, detallando las contribuciones. Aparece una advertencia si el Terreno total en uso es menor que o igual a la Contribución total. Las pestañas 'Planeamiento', 'Detalles' y 'Ventas' aportan información sobre las finanzas del grupo.
+ </string>
+ <button label="?" name="help_button"/>
+ <string name="cant_view_group_land_text">
+ No tiene permiso para ver qué terreno posee el grupo.
+ </string>
+ <string name="cant_view_group_accounting_text">
+ No tiene permiso para ver la información de la cuenta del grupo.
+ </string>
+ <string name="loading_txt">
+ Cargando...
+ </string>
+ <text name="group_land_heading">
+ Terreno propiedad del grupo
+ </text>
+ <scroll_list name="group_parcel_list">
+ <column label="Nombre de la parcela" name="name"/>
+ <column label="Región" name="location"/>
+ <column label="Superficie" name="area"/>
+ <column label="" name="hidden"/>
+ </scroll_list>
+ <button label="Mostrar en el mapa" label_selected="Mostrar en el mapa" name="map_button"/>
+ <text name="total_contributed_land_label">
+ Contribución total:
+ </text>
+ <text name="total_contributed_land_value">
+ [AREA] m²
+ </text>
+ <text name="total_land_in_use_label">
+ Terreno total en uso:
+ </text>
+ <text name="total_land_in_use_value">
+ [AREA] m²
+ </text>
+ <text name="land_available_label">
+ Terreno disponible:
+ </text>
+ <text name="land_available_value">
+ [AREA] m²
+ </text>
+ <text name="your_contribution_label">
+ Su contribución:
+ </text>
+ <string name="land_contrib_error">
+ No se ha podido defininir su contribución de terreno.
+ </string>
+ <text name="your_contribution_max_value">
+ m² ([AMOUNT] máx.)
+ </text>
+ <text name="group_over_limit_text">
+ Los miembros del grupo deben contribuir con más créditos de terreno para mantener el terreno en uso.
+ </text>
+ <text name="group_money_heading">
+ L$ del grupo
+ </text>
+ <tab_container name="group_money_tab_container">
+ <panel label="Detalles" name="group_money_details_tab">
+ <text_editor name="group_money_details_text">
+ Calculando...
+ </text_editor>
+ <button label="< Antes" label_selected="< Antes" name="earlier_details_button" tool_tip="Ir hacia atrás en el tiempo"/>
+ <button label="Después >" label_selected="Después >" name="later_details_button" tool_tip="Ir hacia adelante en el tiempo"/>
+ </panel>
+ <panel label="Ventas" name="group_money_sales_tab">
+ <text_editor name="group_money_sales_text">
+ Calculando...
+ </text_editor>
+ <button label="< Antes" label_selected="< Antes" name="earlier_sales_button" tool_tip="Ir hacia atrás en el tiempo"/>
+ <button label="Después >" label_selected="Después >" name="later_sales_button" tool_tip="Ir hacia adelante en el tiempo"/>
+ </panel>
+ </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml
index ac3ffb0f86..8215575362 100644
--- a/indra/newview/skins/default/xui/es/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Avisos" name="notices_tab">
- <text name="help_text">
- Los avisos son una forma rápida de comunicación dentro
-de un grupo, difundiendo un mensaje y,
-si se quiere, añadiéndole un Ãtem. Los avisos sólo
-los reciben los miembros del grupo cuyo rol
-tiene adjudicada tal habilidad. Puede desactivar
-los avisos en la pestaña General
- </text>
- <text name="no_notices_text">
- No hay avisos pasados.
- </text>
- <button label="?" label_selected="?" name="help_button"/>
- <text name="lbl">
- Archivo de avisos del grupo
- </text>
- <text name="lbl2">
- Los avisos se mantienen durante 14 dÃas. Pulse en la lista de abajo el que quiere ver.
-Pulse el botón 'Actualizar' para comprobar si se han recibido avisos nuevos.
-Las listas de avisos tienen un lÃmite de 200 avisos por dÃa.
- </text>
- <scroll_list name="notice_list">
- <column label="Asunto" name="subject"/>
- <column label="De" name="from"/>
- <column label="Fecha" name="date"/>
- </scroll_list>
- <text name="notice_list_none_found">
- No se han encontrado.
- </text>
- <button label="Crear un aviso nuevo" label_selected="Crear un aviso nuevo" name="create_new_notice"/>
- <button label="Actualizar" label_selected="Actualizar la lista" name="refresh_notices"/>
- <panel label="Crear un aviso nuevo" name="panel_create_new_notice">
- <text name="lbl">
- Crear un aviso
- </text>
- <text name="lbl2">
- Para enviar un aviso, debe escribir un asunto. Puede añadir un Ãtem
-al aviso arrastrándolo desde su inventario a este panel.
-Los Ãtems anexados deben ser copiables y transferibles,
-y no se puede enviar una carpeta.
- </text>
- <text name="lbl3">
- Asunto:
- </text>
- <text name="lbl4">
- Mensaje:
- </text>
- <text name="lbl5">
- Anexar:
- </text>
- <button label="Remover lo anexado" label_selected="Remover lo anexado" name="remove_attachment"/>
- <button label="Enviar el aviso" label_selected="Enviar el aviso" name="send_notice"/>
- <panel name="drop_target" tool_tip="Para enviar un Ãtem con el aviso, arrástrelo desde su inventario hasta el cuadro del mensaje. Para poder enviar ese objeto con el aviso, usted debe tener permiso para copiarlo y transferirlo."/>
- </panel>
- <panel label="Ver avisos pasados" name="panel_view_past_notice">
- <text name="lbl">
- Avisos archivados
- </text>
- <text name="lbl2">
- Pulse el botón 'Crear un aviso nuevo' para enviar uno nuevo.
- </text>
- <text name="lbl3">
- Asunto:
- </text>
- <text name="lbl4">
- Mensaje:
- </text>
- <button label="Abrir lo anexado" label_selected="Abrir lo anexado" name="open_attachment"/>
- </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Avisos" name="notices_tab">
+ <text name="help_text">
+ Los avisos son una forma rápida de comunicación dentro
+de un grupo, difundiendo un mensaje y,
+si se quiere, añadiéndole un Ãtem. Los avisos sólo
+los reciben los miembros del grupo cuyo rol
+tiene adjudicada tal habilidad. Puede desactivar
+los avisos en la pestaña General
+ </text>
+ <text name="no_notices_text">
+ No hay avisos pasados.
+ </text>
+ <button label="?" label_selected="?" name="help_button"/>
+ <text name="lbl">
+ Archivo de avisos del grupo
+ </text>
+ <text name="lbl2">
+ Los avisos se mantienen durante 14 dÃas. Pulse en la lista de abajo el que quiere ver.
+Pulse el botón 'Actualizar' para comprobar si se han recibido avisos nuevos.
+Las listas de avisos tienen un lÃmite de 200 avisos por dÃa.
+ </text>
+ <scroll_list name="notice_list">
+ <column label="Asunto" name="subject"/>
+ <column label="De" name="from"/>
+ <column label="Fecha" name="date"/>
+ </scroll_list>
+ <text name="notice_list_none_found">
+ No se han encontrado.
+ </text>
+ <button label="Crear un aviso nuevo" label_selected="Crear un aviso nuevo" name="create_new_notice"/>
+ <button label="Actualizar" label_selected="Actualizar la lista" name="refresh_notices"/>
+ <panel label="Crear un aviso nuevo" name="panel_create_new_notice">
+ <text name="lbl">
+ Crear un aviso
+ </text>
+ <text name="lbl2">
+ Para enviar un aviso, debe escribir un asunto. Puede añadir un Ãtem
+al aviso arrastrándolo desde su inventario a este panel.
+Los Ãtems anexados deben ser copiables y transferibles,
+y no se puede enviar una carpeta.
+ </text>
+ <text name="lbl3">
+ Asunto:
+ </text>
+ <text name="lbl4">
+ Mensaje:
+ </text>
+ <text name="lbl5">
+ Anexar:
+ </text>
+ <button label="Remover lo anexado" label_selected="Remover lo anexado" name="remove_attachment"/>
+ <button label="Enviar el aviso" label_selected="Enviar el aviso" name="send_notice"/>
+ <panel name="drop_target" tool_tip="Para enviar un Ãtem con el aviso, arrástrelo desde su inventario hasta el cuadro del mensaje. Para poder enviar ese objeto con el aviso, usted debe tener permiso para copiarlo y transferirlo."/>
+ </panel>
+ <panel label="Ver avisos pasados" name="panel_view_past_notice">
+ <text name="lbl">
+ Avisos archivados
+ </text>
+ <text name="lbl2">
+ Pulse el botón 'Crear un aviso nuevo' para enviar uno nuevo.
+ </text>
+ <text name="lbl3">
+ Asunto:
+ </text>
+ <text name="lbl4">
+ Mensaje:
+ </text>
+ <button label="Abrir lo anexado" label_selected="Abrir lo anexado" name="open_attachment"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml
index 08620b7778..4c3e40ecc2 100644
--- a/indra/newview/skins/default/xui/es/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml
@@ -1,150 +1,150 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Miembros y Roles" name="roles_tab">
- <string name="default_needs_apply_text">
- En esta pestaña hay cambios sin aplicar.
- </string>
- <string name="want_apply_text">
- ¿Quiere aplicar estos cambios?
- </string>
- <button label="?" name="help_button"/>
- <panel name="members_header">
- <text name="static">
- Miembros y Roles
- </text>
- <text name="static2">
- Los miembros del grupo tienen asignados roles con distintas capacidades. Estas configuraciones son fácilmente personalizables, para facilitar una mayor flexibilidad y organización.
- </text>
- </panel>
- <panel name="roles_header">
- <text name="static">
- Roles
- </text>
- <text name="role_properties_modifiable">
- Elija un rol de los de abajo. Puede modificar su nombre, su descripción, y la etiqueta de los miembros.
- </text>
- <text name="role_properties_not_modifiable">
- Elija un rol de los de abajo para ver sus propiedades, miembros, y qué capacidades tiene asignadas.
- </text>
- <text name="role_actions_modifiable">
- También puede asignar capacidades al rol.
- </text>
- <text name="role_actions_not_modifiable">
- Puede ver, pero no modificar, las capacidades asignadas.
- </text>
- </panel>
- <panel name="actions_header">
- <text name="static">
- Capacidades
- </text>
- <text name="static2">
- Puede ver una descripción de la capacidad, y qué miembros y roles pueden realizarla.
- </text>
- </panel>
- <tab_container name="roles_tab_container">
- <panel label="Miembros" name="members_sub_tab" tool_tip="Miembros">
- <button label="Buscar" name="search_button"/>
- <button label="Verlos todos" name="show_all_button"/>
- <name_list name="member_list">
- <column label="Nombre del miembro" name="name"/>
- <column label="Cuotas donadas" name="donated"/>
- <column label="Última conexión" name="online"/>
- </name_list>
- <button label="Invitar a una nueva persona..." name="member_invite"/>
- <button label="Expulsar del grupo" name="member_eject"/>
- <string name="help_text">
- Puede añadir o quitar los roles asignados a los miembros.
-Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada uno de ellos.
- </string>
- </panel>
- <panel label="Roles" name="roles_sub_tab">
- <button label="Buscar" name="search_button"/>
- <button label="Verlos todos" name="show_all_button"/>
- <scroll_list name="role_list">
- <column label="Nombre del rol" name="name"/>
- <column label="Etiqueta" name="title"/>
- <column label="Miembros" name="members"/>
- </scroll_list>
- <button label="Crear un rol nuevo..." name="role_create"/>
- <button label="Eliminar el rol" name="role_delete"/>
- <string name="help_text">
- Los roles tienen una etiqueta y una serie de capacidades permitidas que los miembros pueden desarrollar. Los miembros pueden tener más de un rol. Un grupo puede tener hasta 10 roles, incluyendo el de Todos y el de Propietarios.
- </string>
- <string name="cant_delete_role">
- Los roles de 'Todos' y 'Propietarios' son especiales, y no pueden eliminarse.
- </string>
- </panel>
- <panel label="Capacidades" name="actions_sub_tab">
- <button label="Buscar" name="search_button"/>
- <button label="Verlos todos" name="show_all_button"/>
- <scroll_list name="action_list" tool_tip="Elija una capacidad para verla más en detalle.">
- <column label="" name="icon"/>
- <column label="" name="action"/>
- </scroll_list>
- <string name="help_text">
- Las capacidades permiten a los miembros que tienen ese rol el hacer tareas especÃficas dentro de este grupo. Hay una gran variedad de capacidades.
- </string>
- </panel>
- </tab_container>
- <panel name="members_footer">
- <text name="static">
- Roles asignados
- </text>
- <text name="static2">
- Capacidades permitidas
- </text>
- <scroll_list name="member_assigned_roles">
- <column label="" name="checkbox"/>
- <column label="" name="role"/>
- </scroll_list>
- <scroll_list name="member_allowed_actions" tool_tip="Para más detalles de cada capacidad permitida, vea la pestaña Capacidades.">
- <column label="" name="icon"/>
- <column label="" name="action"/>
- </scroll_list>
- </panel>
- <panel name="roles_footer">
- <text name="static">
- Nombre
- </text>
- <text name="static2">
- Descripción
- </text>
- <line_editor name="role_name">
- Empleados
- </line_editor>
- <text name="static3">
- Etiqueta
- </text>
- <line_editor name="role_title">
- (esperando)
- </line_editor>
- <text_editor name="role_description">
- (esperando)
- </text_editor>
- <text name="static4">
- Miembros asignados
- </text>
- <text name="static5" tool_tip="Una lista de las capacidades que puede desarrollar el rol seleccionado actualmente.">
- Capacidades asignadas
- </text>
- <check_box label="Los miembros son visibles." name="role_visible_in_list" tool_tip="Establece si los miembros de este rol pueden ser vistos en la pestaña General por personas ajenas al grupo."/>
- <scroll_list name="role_allowed_actions" tool_tip="Para más detalles de cada capacidad permitida, vea la pestaña Capacidades.">
- <column label="" name="icon"/>
- <column label="" name="checkbox"/>
- <column label="" name="action"/>
- </scroll_list>
- </panel>
- <panel name="actions_footer">
- <text name="static">
- Descripción
- </text>
- <text_editor name="action_description">
- Esta capacidad es la de 'Expulsar miembros de este grupo'. Sólo un propietario puede expulsar a otro.
- </text_editor>
- <text name="static2">
- Roles con la capacidad
- </text>
- <text name="static3">
- Miembros con la capacidad
- </text>
- </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Miembros y Roles" name="roles_tab">
+ <string name="default_needs_apply_text">
+ En esta pestaña hay cambios sin aplicar.
+ </string>
+ <string name="want_apply_text">
+ ¿Quiere aplicar estos cambios?
+ </string>
+ <button label="?" name="help_button"/>
+ <panel name="members_header">
+ <text name="static">
+ Miembros y Roles
+ </text>
+ <text name="static2">
+ Los miembros del grupo tienen asignados roles con distintas capacidades. Estas configuraciones son fácilmente personalizables, para facilitar una mayor flexibilidad y organización.
+ </text>
+ </panel>
+ <panel name="roles_header">
+ <text name="static">
+ Roles
+ </text>
+ <text name="role_properties_modifiable">
+ Elija un rol de los de abajo. Puede modificar su nombre, su descripción, y la etiqueta de los miembros.
+ </text>
+ <text name="role_properties_not_modifiable">
+ Elija un rol de los de abajo para ver sus propiedades, miembros, y qué capacidades tiene asignadas.
+ </text>
+ <text name="role_actions_modifiable">
+ También puede asignar capacidades al rol.
+ </text>
+ <text name="role_actions_not_modifiable">
+ Puede ver, pero no modificar, las capacidades asignadas.
+ </text>
+ </panel>
+ <panel name="actions_header">
+ <text name="static">
+ Capacidades
+ </text>
+ <text name="static2">
+ Puede ver una descripción de la capacidad, y qué miembros y roles pueden realizarla.
+ </text>
+ </panel>
+ <tab_container name="roles_tab_container">
+ <panel label="Miembros" name="members_sub_tab" tool_tip="Miembros">
+ <button label="Buscar" name="search_button"/>
+ <button label="Verlos todos" name="show_all_button"/>
+ <name_list name="member_list">
+ <column label="Nombre del miembro" name="name"/>
+ <column label="Cuotas donadas" name="donated"/>
+ <column label="Última conexión" name="online"/>
+ </name_list>
+ <button label="Invitar a una nueva persona..." name="member_invite"/>
+ <button label="Expulsar del grupo" name="member_eject"/>
+ <string name="help_text">
+ Puede añadir o quitar los roles asignados a los miembros.
+Seleccione varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada uno de ellos.
+ </string>
+ </panel>
+ <panel label="Roles" name="roles_sub_tab">
+ <button label="Buscar" name="search_button"/>
+ <button label="Verlos todos" name="show_all_button"/>
+ <scroll_list name="role_list">
+ <column label="Nombre del rol" name="name"/>
+ <column label="Etiqueta" name="title"/>
+ <column label="Miembros" name="members"/>
+ </scroll_list>
+ <button label="Crear un rol nuevo..." name="role_create"/>
+ <button label="Eliminar el rol" name="role_delete"/>
+ <string name="help_text">
+ Los roles tienen una etiqueta y una serie de capacidades permitidas que los miembros pueden desarrollar. Los miembros pueden tener más de un rol. Un grupo puede tener hasta 10 roles, incluyendo el de Todos y el de Propietarios.
+ </string>
+ <string name="cant_delete_role">
+ Los roles de 'Todos' y 'Propietarios' son especiales, y no pueden eliminarse.
+ </string>
+ </panel>
+ <panel label="Capacidades" name="actions_sub_tab">
+ <button label="Buscar" name="search_button"/>
+ <button label="Verlos todos" name="show_all_button"/>
+ <scroll_list name="action_list" tool_tip="Elija una capacidad para verla más en detalle.">
+ <column label="" name="icon"/>
+ <column label="" name="action"/>
+ </scroll_list>
+ <string name="help_text">
+ Las capacidades permiten a los miembros que tienen ese rol el hacer tareas especÃficas dentro de este grupo. Hay una gran variedad de capacidades.
+ </string>
+ </panel>
+ </tab_container>
+ <panel name="members_footer">
+ <text name="static">
+ Roles asignados
+ </text>
+ <text name="static2">
+ Capacidades permitidas
+ </text>
+ <scroll_list name="member_assigned_roles">
+ <column label="" name="checkbox"/>
+ <column label="" name="role"/>
+ </scroll_list>
+ <scroll_list name="member_allowed_actions" tool_tip="Para más detalles de cada capacidad permitida, vea la pestaña Capacidades.">
+ <column label="" name="icon"/>
+ <column label="" name="action"/>
+ </scroll_list>
+ </panel>
+ <panel name="roles_footer">
+ <text name="static">
+ Nombre
+ </text>
+ <text name="static2">
+ Descripción
+ </text>
+ <line_editor name="role_name">
+ Empleados
+ </line_editor>
+ <text name="static3">
+ Etiqueta
+ </text>
+ <line_editor name="role_title">
+ (esperando)
+ </line_editor>
+ <text_editor name="role_description">
+ (esperando)
+ </text_editor>
+ <text name="static4">
+ Miembros asignados
+ </text>
+ <text name="static5" tool_tip="Una lista de las capacidades que puede desarrollar el rol seleccionado actualmente.">
+ Capacidades asignadas
+ </text>
+ <check_box label="Los miembros son visibles." name="role_visible_in_list" tool_tip="Establece si los miembros de este rol pueden ser vistos en la pestaña General por personas ajenas al grupo."/>
+ <scroll_list name="role_allowed_actions" tool_tip="Para más detalles de cada capacidad permitida, vea la pestaña Capacidades.">
+ <column label="" name="icon"/>
+ <column label="" name="checkbox"/>
+ <column label="" name="action"/>
+ </scroll_list>
+ </panel>
+ <panel name="actions_footer">
+ <text name="static">
+ Descripción
+ </text>
+ <text_editor name="action_description">
+ Esta capacidad es la de 'Expulsar miembros de este grupo'. Sólo un propietario puede expulsar a otro.
+ </text_editor>
+ <text name="static2">
+ Roles con la capacidad
+ </text>
+ <text name="static3">
+ Miembros con la capacidad
+ </text>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index c74dd13178..04edcc4faa 100644
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_login">
- <string name="real_url">
- http://secondlife.com/app/login/
- </string>
- <string name="forgot_password_url">
- http://secondlife.com/account/request.php
- </string>
- <text name="first_name_text">
- Nombre:
- </text>
- <text name="last_name_text">
- Apellido:
- </text>
- <text name="password_text">
- Contraseña:
- </text>
- <text name="start_location_text">
- Posición inicial:
- </text>
- <combo_box name="start_location_combo">
- <combo_item name="MyHome">
- Mi Base
- </combo_item>
- <combo_item name="MyLastLocation">
- Mi última posición
- </combo_item>
- <combo_item name="Typeregionname">
- <Escriba el nombre de la Región>
- </combo_item>
- </combo_box>
- <check_box label="Recordar la contraseña" name="remember_check"/>
- <button label="Iniciar sesión" label_selected="Iniciar sesión" name="connect_btn"/>
- <text name="create_new_account_text">
- RegÃstrese para obtener una cuenta
- </text>
- <text name="forgot_password_text">
- ¿Olvidó su nombre o su contraseña?
- </text>
- <text name="channel_text">
- [VERSION]
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_login">
+ <string name="real_url">
+ http://secondlife.com/app/login/
+ </string>
+ <string name="forgot_password_url">
+ http://secondlife.com/account/request.php
+ </string>
+ <text name="first_name_text">
+ Nombre:
+ </text>
+ <text name="last_name_text">
+ Apellido:
+ </text>
+ <text name="password_text">
+ Contraseña:
+ </text>
+ <text name="start_location_text">
+ Posición inicial:
+ </text>
+ <combo_box name="start_location_combo">
+ <combo_item name="MyHome">
+ Mi Base
+ </combo_item>
+ <combo_item name="MyLastLocation">
+ Mi última posición
+ </combo_item>
+ <combo_item name="Typeregionname">
+ <Escriba el nombre de la Región>
+ </combo_item>
+ </combo_box>
+ <check_box label="Recordar la contraseña" name="remember_check"/>
+ <button label="Iniciar sesión" label_selected="Iniciar sesión" name="connect_btn"/>
+ <text name="create_new_account_text">
+ RegÃstrese para obtener una cuenta
+ </text>
+ <text name="forgot_password_text">
+ ¿Olvidó su nombre o su contraseña?
+ </text>
+ <text name="channel_text">
+ [VERSION]
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 36d0265a9c..0e092e58a2 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Chat de texto" name="chat">
- <text length="1" name="text_box" type="string">
- Tamaño de la fuente del chat:
- </text>
- <radio_group name="chat_font_size">
- <radio_item name="radio">
- Pequeño
- </radio_item>
- <radio_item name="radio2">
- Medio
- </radio_item>
- <radio_item name="radio3">
- Grande
- </radio_item>
- </radio_group>
- <text length="1" name="text_box2" type="string">
- Color del chat:
- </text>
- <color_swatch label="Usted" name="user"/>
- <color_swatch label="Otros" name="agent" width="60" left_delta="48"/>
- <color_swatch label="MI" name="im" left_delta="64" width="50"/>
- <color_swatch label="Sistema" name="system"/>
- <color_swatch label="Errores" name="script_error" left_delta="48"/>
- <color_swatch label="Objetos" name="objects"/>
- <color_swatch label="Propietario" name="owner" width="60" left_delta="48"/>
- <color_swatch label="Bocadillo" name="background" left_delta="64" width="50"/>
- <color_swatch label="URL" name="links" />
- <text length="1" name="text_box8" type="string">
- Errores de script:
- </text>
- <check_box label="Ver en el chat los avisos y errores de los scripts" name="script_errors_as_chat"/>
- <text length="1" name="text_box3" type="string">
- Consola del chat:
- </text>
- <spinner label="Quitar el chat tras" name="fade_chat_time" label_width="95" width="145" />
- <text length="1" name="text_box4" type="string" left="297" >
- (s)
- </text>
- <text length="1" name="text_box5" type="string">
- (# lÃneas)
- </text>
- <slider label="Opacidad" name="console_opacity"/>
- <check_box label="Usar el ancho de la pantalla (tras reiniciar)" name="chat_full_width_check"/>
- <text length="1" name="text_box6" type="string">
- Opciones del chat:
- </text>
- <check_box label="Cerrar el chat al pulsar Intro" name="close_chat_on_return_check"/>
- <check_box label="En el chat, las teclas del cursor mueven el avatar" name="arrow_keys_move_avatar_check"/>
- <check_box label="Incluir la hora en el chat" name="show_timestamps_check"/>
- <check_box label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
- <text length="1" name="text_box7" type="string">
- Bocadillos del chat:
- </text>
- <check_box label="Mostrar el chat en bocadillos" name="bubble_text_chat"/>
- <slider label="Opacidad" name="bubble_chat_opacity"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Chat de texto" name="chat">
+ <text length="1" name="text_box" type="string">
+ Tamaño de la fuente del chat:
+ </text>
+ <radio_group name="chat_font_size">
+ <radio_item name="radio">
+ Pequeño
+ </radio_item>
+ <radio_item name="radio2">
+ Medio
+ </radio_item>
+ <radio_item name="radio3">
+ Grande
+ </radio_item>
+ </radio_group>
+ <text length="1" name="text_box2" type="string">
+ Color del chat:
+ </text>
+ <color_swatch label="Usted" name="user"/>
+ <color_swatch label="Otros" name="agent" width="60" left_delta="48"/>
+ <color_swatch label="MI" name="im" left_delta="64" width="50"/>
+ <color_swatch label="Sistema" name="system"/>
+ <color_swatch label="Errores" name="script_error" left_delta="48"/>
+ <color_swatch label="Objetos" name="objects"/>
+ <color_swatch label="Propietario" name="owner" width="60" left_delta="48"/>
+ <color_swatch label="Bocadillo" name="background" left_delta="64" width="50"/>
+ <color_swatch label="URL" name="links" />
+ <text length="1" name="text_box8" type="string">
+ Errores de script:
+ </text>
+ <check_box label="Ver en el chat los avisos y errores de los scripts" name="script_errors_as_chat"/>
+ <text length="1" name="text_box3" type="string">
+ Consola del chat:
+ </text>
+ <spinner label="Quitar el chat tras" name="fade_chat_time" label_width="95" width="145" />
+ <text length="1" name="text_box4" type="string" left="297" >
+ (s)
+ </text>
+ <text length="1" name="text_box5" type="string">
+ (# lÃneas)
+ </text>
+ <slider label="Opacidad" name="console_opacity"/>
+ <check_box label="Usar el ancho de la pantalla (tras reiniciar)" name="chat_full_width_check"/>
+ <text length="1" name="text_box6" type="string">
+ Opciones del chat:
+ </text>
+ <check_box label="Cerrar el chat al pulsar Intro" name="close_chat_on_return_check"/>
+ <check_box label="En el chat, las teclas del cursor mueven el avatar" name="arrow_keys_move_avatar_check"/>
+ <check_box label="Incluir la hora en el chat" name="show_timestamps_check"/>
+ <check_box label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
+ <text length="1" name="text_box7" type="string">
+ Bocadillos del chat:
+ </text>
+ <check_box label="Mostrar el chat en bocadillos" name="bubble_text_chat"/>
+ <slider label="Opacidad" name="bubble_chat_opacity"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 0528c5e9c8..173da17f98 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -1,114 +1,114 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="General" name="general_panel">
- <radio_group name="default_start_location">
- <radio_item name="MyHome" tool_tip="Por defecto, iniciar sesión en mi Base.">
- Mi Base
- </radio_item>
- <radio_item name="MyLastLocation" tool_tip="Por defecto, iniciar sesión en mi última posición.">
- Mi última posición
- </radio_item>
- </radio_group>
- <check_box label="Ver mi posición inicial en la pantalla de inicio de sesión" name="show_location_checkbox"/>
- <combo_box name="fade_out_combobox" width="166">
- <combo_item name="Never">
- Nunca
- </combo_item>
- <combo_item name="Show Temporarily">
- Mostrarlos temporalmente
- </combo_item>
- <combo_item name="Always">
- Siempre
- </combo_item>
- </combo_box>
- <check_box label="Nombres de avatar en pequeño" name="small_avatar_names_checkbox"/>
- <check_box label="No ver mi nombre en mi pantalla" name="show_my_name_checkbox"/>
- <text name="group_titles_textbox">
- Etiquetas de grupo:
- </text>
- <check_box label="Ocultar las etiquetas de grupo" name="show_all_title_checkbox"/>
- <check_box label="Ocultar mi etiqueta de grupo" name="show_my_title_checkbox"/>
- <color_swatch label="" name="effect_color_swatch" tool_tip="Pulse para abrir el selector de color"/>
- <text name="UI Size:">
- Tamaño de la interfaz:
- </text>
- <check_box label="Resolución independiente del tamaño" name="ui_auto_scale"/>
- <spinner label="Ausente tras:" name="afk_timeout_spinner"/>
- <check_box label="Girar el minimapa" name="rotate_mini_map_checkbox"/>
- <check_box label="Avisar cuando gasto o recibo dólares Linden (L$)" name="notify_money_change_checkbox"/>
- <check_box label="Usar los colores del SO" name="use_system_color_picker_checkbox" tool_tip="Usar los colores del propio sistema operativo en vez de los propios de Second Life."/>
- <check_box label="Incluir una ventana de búsqueda en la barra superior" name="show_search_panel" tool_tip="Muestra el panel de búsqueda insertado."/>
- <text length="1" name="start_location_textbox" type="string">
- Posición inicial:
- </text>
- <text length="1" name="show_names_textbox" type="string">
- Mostrar los nombres:
- </text>
- <text length="1" name="effects_color_textbox" type="string">
- Color de mis efectos:
- </text>
- <text length="1" name="seconds_textbox" type="string">
- segundos
- </text>
- <text length="1" name="crash_report_textbox" type="string">
- Informes de caÃdas:
- </text>
- <text length="1" name="language_textbox" type="string">
- Idioma:
- </text>
- <text length="1" name="language_textbox2" type="string" left_delta="313" >
- (Tendrá efecto tras reiniciar)
- </text>
- <string name="region_name_prompt">
- <escriba el nombre de la región>
- </string>
- <combo_box name="crash_behavior_combobox" width="166">
- <combo_item length="1" name="Askbeforesending" type="string">
- Preguntar antes de enviar
- </combo_item>
- <combo_item length="1" name="Alwayssend" type="string">
- Enviar siempre
- </combo_item>
- <combo_item length="1" name="Neversend" type="string">
- No enviar nunca
- </combo_item>
- </combo_box>
- <combo_box name="language_combobox" width="166">
- <combo_item name="System Default Language">
- Predeterminado del sistema
- </combo_item>
- <combo_item length="1" name="English" type="string">
- English (Inglés)
- </combo_item>
- <combo_item name="Danish">
- Dansk (Danés) - Beta
- </combo_item>
- <combo_item length="1" name="Deutsch(German)" type="string">
- Deutsch (Alemán) - Beta
- </combo_item>
- <combo_item name="Spanish" type="string">
- Español - Beta
- </combo_item>
- <combo_item length="1" name="French" type="string">
- Français (Francés) - Beta
- </combo_item>
- <combo_item name="Hungarian">
- Magyar (Húngaro) - Beta
- </combo_item>
- <combo_item name="Polish">
- Polski (Polaco) - Beta
- </combo_item>
- <combo_item name="Portugese">
- Portugués (Portugués) - Beta
- </combo_item>
- <combo_item length="1" name="Chinese" type="string">
- ä¸æ–‡ (简体) (Chino) - Beta
- </combo_item>
- <combo_item length="1" name="(Japanese)" type="string">
- 日本語 (Japonés) - Beta
- </combo_item>
- <combo_item length="1" name="(Korean)" type="string">
- í•œêµì–´ (Coreano) - Beta
- </combo_item>
- </combo_box>
- <check_box label="Compartir el idioma con los objetos" name="language_is_public" tool_tip="Hace que los objetos con script del mundo sepan su idioma preferido."/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="General" name="general_panel">
+ <radio_group name="default_start_location">
+ <radio_item name="MyHome" tool_tip="Por defecto, iniciar sesión en mi Base.">
+ Mi Base
+ </radio_item>
+ <radio_item name="MyLastLocation" tool_tip="Por defecto, iniciar sesión en mi última posición.">
+ Mi última posición
+ </radio_item>
+ </radio_group>
+ <check_box label="Ver mi posición inicial en la pantalla de inicio de sesión" name="show_location_checkbox"/>
+ <combo_box name="fade_out_combobox" width="166">
+ <combo_item name="Never">
+ Nunca
+ </combo_item>
+ <combo_item name="Show Temporarily">
+ Mostrarlos temporalmente
+ </combo_item>
+ <combo_item name="Always">
+ Siempre
+ </combo_item>
+ </combo_box>
+ <check_box label="Nombres de avatar en pequeño" name="small_avatar_names_checkbox"/>
+ <check_box label="No ver mi nombre en mi pantalla" name="show_my_name_checkbox"/>
+ <text name="group_titles_textbox">
+ Etiquetas de grupo:
+ </text>
+ <check_box label="Ocultar las etiquetas de grupo" name="show_all_title_checkbox"/>
+ <check_box label="Ocultar mi etiqueta de grupo" name="show_my_title_checkbox"/>
+ <color_swatch label="" name="effect_color_swatch" tool_tip="Pulse para abrir el selector de color"/>
+ <text name="UI Size:">
+ Tamaño de la interfaz:
+ </text>
+ <check_box label="Resolución independiente del tamaño" name="ui_auto_scale"/>
+ <spinner label="Ausente tras:" name="afk_timeout_spinner"/>
+ <check_box label="Girar el minimapa" name="rotate_mini_map_checkbox"/>
+ <check_box label="Avisar cuando gasto o recibo dólares Linden (L$)" name="notify_money_change_checkbox"/>
+ <check_box label="Usar los colores del SO" name="use_system_color_picker_checkbox" tool_tip="Usar los colores del propio sistema operativo en vez de los propios de Second Life."/>
+ <check_box label="Incluir una ventana de búsqueda en la barra superior" name="show_search_panel" tool_tip="Muestra el panel de búsqueda insertado."/>
+ <text length="1" name="start_location_textbox" type="string">
+ Posición inicial:
+ </text>
+ <text length="1" name="show_names_textbox" type="string">
+ Mostrar los nombres:
+ </text>
+ <text length="1" name="effects_color_textbox" type="string">
+ Color de mis efectos:
+ </text>
+ <text length="1" name="seconds_textbox" type="string">
+ segundos
+ </text>
+ <text length="1" name="crash_report_textbox" type="string">
+ Informes de caÃdas:
+ </text>
+ <text length="1" name="language_textbox" type="string">
+ Idioma:
+ </text>
+ <text length="1" name="language_textbox2" type="string" left_delta="313" >
+ (Tendrá efecto tras reiniciar)
+ </text>
+ <string name="region_name_prompt">
+ <escriba el nombre de la región>
+ </string>
+ <combo_box name="crash_behavior_combobox" width="166">
+ <combo_item length="1" name="Askbeforesending" type="string">
+ Preguntar antes de enviar
+ </combo_item>
+ <combo_item length="1" name="Alwayssend" type="string">
+ Enviar siempre
+ </combo_item>
+ <combo_item length="1" name="Neversend" type="string">
+ No enviar nunca
+ </combo_item>
+ </combo_box>
+ <combo_box name="language_combobox" width="166">
+ <combo_item name="System Default Language">
+ Predeterminado del sistema
+ </combo_item>
+ <combo_item length="1" name="English" type="string">
+ English (Inglés)
+ </combo_item>
+ <combo_item name="Danish">
+ Dansk (Danés) - Beta
+ </combo_item>
+ <combo_item length="1" name="Deutsch(German)" type="string">
+ Deutsch (Alemán) - Beta
+ </combo_item>
+ <combo_item name="Spanish" type="string">
+ Español - Beta
+ </combo_item>
+ <combo_item length="1" name="French" type="string">
+ Français (Francés) - Beta
+ </combo_item>
+ <combo_item name="Hungarian">
+ Magyar (Húngaro) - Beta
+ </combo_item>
+ <combo_item name="Polish">
+ Polski (Polaco) - Beta
+ </combo_item>
+ <combo_item name="Portugese">
+ Portugués (Portugués) - Beta
+ </combo_item>
+ <combo_item length="1" name="Chinese" type="string">
+ ä¸æ–‡ (简体) (Chino) - Beta
+ </combo_item>
+ <combo_item length="1" name="(Japanese)" type="string">
+ 日本語 (Japonés) - Beta
+ </combo_item>
+ <combo_item length="1" name="(Korean)" type="string">
+ í•œêµì–´ (Coreano) - Beta
+ </combo_item>
+ </combo_box>
+ <check_box label="Compartir el idioma con los objetos" name="language_is_public" tool_tip="Hace que los objetos con script del mundo sepan su idioma preferido."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index 9a4f06af96..03eb802117 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -1,176 +1,176 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Gráficos" name="Display panel">
- <button label="?" name="GraphicsPreferencesHelpButton"/>
- <check_box label="Abrir Second Life en una ventana" name="windowed mode"/>
- <text_editor name="FullScreenInfo">
- Si no está marcado, el visor se mostrará en pantalla completa cuando inicie sesión.
- </text_editor>
- <text name="WindowSizeLabel">
- Tamaño de la ventana:
- </text>
- <combo_box name="windowsize combo">
- <combo_item name="640x480">
- 640x480
- </combo_item>
- <combo_item name="800x600">
- 800x600
- </combo_item>
- <combo_item name="720x480">
- 720x480 (NTSC)
- </combo_item>
- <combo_item name="768x576">
- 768x576 (PAL)
- </combo_item>
- <combo_item name="1024x768">
- 1024x768
- </combo_item>
- </combo_box>
- <text name="DisplayResLabel">
- Resolución:
- </text>
- <text name="AspectRatioLabel1" tool_tip="ancho / alto">
- Proporción:
- </text>
- <combo_box name="aspect_ratio" tool_tip="ancho / alto">
- <combo_item length="1" name="4:3(StandardCRT)" type="string">
- 4:3 (Standard CRT)
- </combo_item>
- <combo_item length="1" name="5:4(1280x1024LCD)" type="string">
- 5:4 (1280x1024 LCD)
- </combo_item>
- <combo_item name="8:5(Widescreen)">
- 8:5 (Widescreen)
- </combo_item>
- <combo_item length="1" name="16:9(Widescreen)" type="string">
- 16:9 (Widescreen)
- </combo_item>
- </combo_box>
- <check_box label="Detectar automáticamente la proporción" name="aspect_auto_detect"/>
- <text name="HigherText">
- Calidad y
- </text>
- <text name="QualityText">
- Rendimiento:
- </text>
- <text name="FasterText">
- El más rápido
- </text>
- <text name="ShadersPrefText">
- Bajo
- </text>
- <text name="ShadersPrefText2">
- Medio
- </text>
- <text name="ShadersPrefText3">
- Alto
- </text>
- <text name="ShadersPrefText4">
- Ultra
- </text>
- <text name="HigherText2">
- Más alto
- </text>
- <text name="QualityText2">
- Calidad
- </text>
- <check_box label="Personalizar" name="CustomSettings"/>
- <text name="ShadersText">
- Shaders:
- </text>
- <check_box label="Efecto de relieve y brillo" name="BumpShiny"/>
- <check_box label="Shaders básicos" name="BasicShaders" tool_tip="Desactivando esta opción puede prevenir fallos en algunos controladores de la tarjeta gráfica."/>
- <check_box label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
- <check_box label="Reflejos en el agua" name="Reflections"/>
- <text name="ReflectionDetailText">
- Objetos reflejados:
- </text>
- <radio_group name="ReflectionDetailRadio">
- <radio_item name="0">
- Terreno y árboles
- </radio_item>
- <radio_item name="1">
- Todos los objetos estáticos
- </radio_item>
- <radio_item name="2">
- Todos los avatares y objetos
- </radio_item>
- <radio_item name="3">
- Todo
- </radio_item>
- </radio_group>
- <text name="AvatarRenderingText">
- Renderización del avatar:
- </text>
- <check_box label="Avatares simulados" name="AvatarImpostors"/>
- <check_box label="Renderizado por hardware" name="AvatarVertexProgram"/>
- <check_box label="Ropas del avatar" name="AvatarCloth"/>
- <text name="DrawDistanceMeterText1">
- m
- </text>
- <text name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="Distancia de dibujo:" name="DrawDistance"/>
- <slider label="Núm. máx. de partÃculas:" name="MaxParticleCount"/>
- <slider label="Calidad del procesamiento:" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- Detalle de la malla:
- </text>
- <slider label="Objetos:" name="ObjectMeshDetail"/>
- <slider label="Prims flexibles:" name="FlexibleMeshDetail"/>
- <slider label="Ãrboles:" name="TreeMeshDetail"/>
- <slider label="Avatares:" name="AvatarMeshDetail"/>
- <slider label="Terreno:" name="TerrainMeshDetail"/>
- <slider label="Cielo:" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- Baja
- </text>
- <text name="ObjectMeshDetailText">
- Bajo
- </text>
- <text name="FlexibleMeshDetailText">
- Bajo
- </text>
- <text name="TreeMeshDetailText">
- Bajo
- </text>
- <text name="AvatarMeshDetailText">
- Bajo
- </text>
- <text name="TerrainMeshDetailText">
- Bajo
- </text>
- <text name="SkyMeshDetailText">
- Bajo
- </text>
- <text name="LightingDetailText">
- Detalles de la iluminación:
- </text>
- <radio_group name="LightingDetailRadio">
- <radio_item name="SunMoon">
- Sólo el Sol y la Luna
- </radio_item>
- <radio_item name="LocalLights">
- Puntos de luz cercanos
- </radio_item>
- </radio_group>
- <text name="TerrainDetailText">
- Nivel de detalle del terreno:
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item name="0">
- Bajo
- </radio_item>
- <radio_item name="2">
- Alto
- </radio_item>
- </radio_group>
- <button label="Configuraciones recomendadas" name="Defaults"/>
- <button label="Opciones del hardware" label_selected="Opciones del hardware" name="GraphicsHardwareButton"/>
- <string name="resolution_format">
- [RES_X] x [RES_Y]
- </string>
- <string name="aspect_ratio_text">
- [NUM]:[DEN]
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Gráficos" name="Display panel">
+ <button label="?" name="GraphicsPreferencesHelpButton"/>
+ <check_box label="Abrir Second Life en una ventana" name="windowed mode"/>
+ <text_editor name="FullScreenInfo">
+ Si no está marcado, el visor se mostrará en pantalla completa cuando inicie sesión.
+ </text_editor>
+ <text name="WindowSizeLabel">
+ Tamaño de la ventana:
+ </text>
+ <combo_box name="windowsize combo">
+ <combo_item name="640x480">
+ 640x480
+ </combo_item>
+ <combo_item name="800x600">
+ 800x600
+ </combo_item>
+ <combo_item name="720x480">
+ 720x480 (NTSC)
+ </combo_item>
+ <combo_item name="768x576">
+ 768x576 (PAL)
+ </combo_item>
+ <combo_item name="1024x768">
+ 1024x768
+ </combo_item>
+ </combo_box>
+ <text name="DisplayResLabel">
+ Resolución:
+ </text>
+ <text name="AspectRatioLabel1" tool_tip="ancho / alto">
+ Proporción:
+ </text>
+ <combo_box name="aspect_ratio" tool_tip="ancho / alto">
+ <combo_item length="1" name="4:3(StandardCRT)" type="string">
+ 4:3 (Standard CRT)
+ </combo_item>
+ <combo_item length="1" name="5:4(1280x1024LCD)" type="string">
+ 5:4 (1280x1024 LCD)
+ </combo_item>
+ <combo_item name="8:5(Widescreen)">
+ 8:5 (Widescreen)
+ </combo_item>
+ <combo_item length="1" name="16:9(Widescreen)" type="string">
+ 16:9 (Widescreen)
+ </combo_item>
+ </combo_box>
+ <check_box label="Detectar automáticamente la proporción" name="aspect_auto_detect"/>
+ <text name="HigherText">
+ Calidad y
+ </text>
+ <text name="QualityText">
+ Rendimiento:
+ </text>
+ <text name="FasterText">
+ El más rápido
+ </text>
+ <text name="ShadersPrefText">
+ Bajo
+ </text>
+ <text name="ShadersPrefText2">
+ Medio
+ </text>
+ <text name="ShadersPrefText3">
+ Alto
+ </text>
+ <text name="ShadersPrefText4">
+ Ultra
+ </text>
+ <text name="HigherText2">
+ Más alto
+ </text>
+ <text name="QualityText2">
+ Calidad
+ </text>
+ <check_box label="Personalizar" name="CustomSettings"/>
+ <text name="ShadersText">
+ Shaders:
+ </text>
+ <check_box label="Efecto de relieve y brillo" name="BumpShiny"/>
+ <check_box label="Shaders básicos" name="BasicShaders" tool_tip="Desactivando esta opción puede prevenir fallos en algunos controladores de la tarjeta gráfica."/>
+ <check_box label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
+ <check_box label="Reflejos en el agua" name="Reflections"/>
+ <text name="ReflectionDetailText">
+ Objetos reflejados:
+ </text>
+ <radio_group name="ReflectionDetailRadio">
+ <radio_item name="0">
+ Terreno y árboles
+ </radio_item>
+ <radio_item name="1">
+ Todos los objetos estáticos
+ </radio_item>
+ <radio_item name="2">
+ Todos los avatares y objetos
+ </radio_item>
+ <radio_item name="3">
+ Todo
+ </radio_item>
+ </radio_group>
+ <text name="AvatarRenderingText">
+ Renderización del avatar:
+ </text>
+ <check_box label="Avatares simulados" name="AvatarImpostors"/>
+ <check_box label="Renderizado por hardware" name="AvatarVertexProgram"/>
+ <check_box label="Ropas del avatar" name="AvatarCloth"/>
+ <text name="DrawDistanceMeterText1">
+ m
+ </text>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="Distancia de dibujo:" name="DrawDistance"/>
+ <slider label="Núm. máx. de partÃculas:" name="MaxParticleCount"/>
+ <slider label="Calidad del procesamiento:" name="RenderPostProcess"/>
+ <text name="MeshDetailText">
+ Detalle de la malla:
+ </text>
+ <slider label="Objetos:" name="ObjectMeshDetail"/>
+ <slider label="Prims flexibles:" name="FlexibleMeshDetail"/>
+ <slider label="Ãrboles:" name="TreeMeshDetail"/>
+ <slider label="Avatares:" name="AvatarMeshDetail"/>
+ <slider label="Terreno:" name="TerrainMeshDetail"/>
+ <slider label="Cielo:" name="SkyMeshDetail"/>
+ <text name="PostProcessText">
+ Baja
+ </text>
+ <text name="ObjectMeshDetailText">
+ Bajo
+ </text>
+ <text name="FlexibleMeshDetailText">
+ Bajo
+ </text>
+ <text name="TreeMeshDetailText">
+ Bajo
+ </text>
+ <text name="AvatarMeshDetailText">
+ Bajo
+ </text>
+ <text name="TerrainMeshDetailText">
+ Bajo
+ </text>
+ <text name="SkyMeshDetailText">
+ Bajo
+ </text>
+ <text name="LightingDetailText">
+ Detalles de la iluminación:
+ </text>
+ <radio_group name="LightingDetailRadio">
+ <radio_item name="SunMoon">
+ Sólo el Sol y la Luna
+ </radio_item>
+ <radio_item name="LocalLights">
+ Puntos de luz cercanos
+ </radio_item>
+ </radio_group>
+ <text name="TerrainDetailText">
+ Nivel de detalle del terreno:
+ </text>
+ <radio_group name="TerrainDetailRadio">
+ <radio_item name="0">
+ Bajo
+ </radio_item>
+ <radio_item name="2">
+ Alto
+ </radio_item>
+ </radio_group>
+ <button label="Configuraciones recomendadas" name="Defaults"/>
+ <button label="Opciones del hardware" label_selected="Opciones del hardware" name="GraphicsHardwareButton"/>
+ <string name="resolution_format">
+ [RES_X] x [RES_Y]
+ </string>
+ <string name="aspect_ratio_text">
+ [NUM]:[DEN]
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
index 94e480ca8c..e353f6cdec 100644
--- a/indra/newview/skins/default/xui/es/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Contrato" name="Covenant">
- <text name="covenant_help_text">
- Los cambios que se hagan en la información del contrato se mostrarán en todas las parcelas del estado.
- </text>
- <text name="region_name_lbl">
- Región:
- </text>
- <text name="region_name_text">
- (desconocida)
- </text>
- <text name="estate_name_lbl">
- Estado:
- </text>
- <text name="estate_name_text">
- (desconocido)
- </text>
- <text name="covenent_instructions">
- Para cambiar el contrato de este estado, arrastre y suelte una nota.
- </text>
- <button label="?" name="covenant_help"/>
- <button label="Cambiar" name="reset_covenant"/>
- <text name="estate_owner_lbl">
- Propietario del estado:
- </text>
- <text name="estate_owner_text">
- (desconocido)
- </text>
- <text name="resellable_clause">
- El terreno comprado en esta región se podrá o no revender.
- </text>
- <text name="changeable_clause">
- El terreno comprado en esta región se podrá o no unir o subdividir.
- </text>
- <text_editor name="covenant_editor">
- Cargando...
- </text_editor>
- <text name="can_resell">
- El terreno comprado en esta región se podrá revender.
- </text>
- <text name="can_not_resell">
- El terreno comprado en esta región no se podrá revender.
- </text>
- <text name="can_change">
- El terreno comprado en esta región se podrá unir o subdividir.
- </text>
- <text name="can_not_change">
- El terreno comprado en esta región no se podrá unir ni subdividir.
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Contrato" name="Covenant">
+ <text name="covenant_help_text">
+ Los cambios que se hagan en la información del contrato se mostrarán en todas las parcelas del estado.
+ </text>
+ <text name="region_name_lbl">
+ Región:
+ </text>
+ <text name="region_name_text">
+ (desconocida)
+ </text>
+ <text name="estate_name_lbl">
+ Estado:
+ </text>
+ <text name="estate_name_text">
+ (desconocido)
+ </text>
+ <text name="covenent_instructions">
+ Para cambiar el contrato de este estado, arrastre y suelte una nota.
+ </text>
+ <button label="?" name="covenant_help"/>
+ <button label="Cambiar" name="reset_covenant"/>
+ <text name="estate_owner_lbl">
+ Propietario del estado:
+ </text>
+ <text name="estate_owner_text">
+ (desconocido)
+ </text>
+ <text name="resellable_clause">
+ El terreno comprado en esta región se podrá o no revender.
+ </text>
+ <text name="changeable_clause">
+ El terreno comprado en esta región se podrá o no unir o subdividir.
+ </text>
+ <text_editor name="covenant_editor">
+ Cargando...
+ </text_editor>
+ <text name="can_resell">
+ El terreno comprado en esta región se podrá revender.
+ </text>
+ <text name="can_not_resell">
+ El terreno comprado en esta región no se podrá revender.
+ </text>
+ <text name="can_change">
+ El terreno comprado en esta región se podrá unir o subdividir.
+ </text>
+ <text name="can_not_change">
+ El terreno comprado en esta región no se podrá unir ni subdividir.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml
index a370599e59..a722235243 100644
--- a/indra/newview/skins/default/xui/es/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Depurar" name="Debug">
- <text name="region_text_lbl">
- Región:
- </text>
- <text name="region_text">
- desconocida
- </text>
- <check_box label="Desactivar los scripts" name="disable_scripts_check" tool_tip="Descativar todos los scripts en esta región"/>
- <button label="?" name="disable_scripts_help"/>
- <check_box label="Desactivar las colisiones" name="disable_collisions_check" tool_tip="Desactiva las colisiones (no las de avatares) en esta región"/>
- <button label="?" name="disable_collisions_help"/>
- <check_box label="Desactivar las propiedades fÃsicas" name="disable_physics_check" tool_tip="Desactiva toda la fÃsica en esta región"/>
- <button label="?" name="disable_physics_help"/>
- <button label="Aplicar" name="apply_btn"/>
- <text name="objret_text_lbl">
- Devolver el objeto
- </text>
- <text name="resident_text_lbl">
- Residente:
- </text>
- <line_editor name="target_avatar_name">
- (nadie)
- </line_editor>
- <button label="Elegir..." name="choose_avatar_btn"/>
- <text name="options_text_lbl">
- Opciones:
- </text>
- <check_box label="Devolver sólo los objetos con scripts" name="return_scripts" tool_tip="Devolver sólo los objetos que tengan scripts."/>
- <check_box label="Devolver sólo los objetos que están en terreno de otro" name="return_other_land" tool_tip="Devolver sólo los objetos que están en terreno de otro"/>
- <check_box label="Devolver los objetos de cualquier región de este estado" name="return_estate_wide" tool_tip="Devolver los objetos de todas las regiones que forman este estado"/>
- <button label="Devolver" name="return_btn"/>
- <button label="Listar los objetos que colisionan..." name="top_colliders_btn" tool_tip="Lista de los objetos con más posibles colisiones potenciales"/>
- <button label="?" name="top_colliders_help"/>
- <button label="Listar los scripts según su uso..." name="top_scripts_btn" tool_tip="Lista de los objetos que más tiempo emplean ejecutando scripts"/>
- <button label="?" name="top_scripts_help"/>
- <button label="Reiniciar la región" name="restart_btn" tool_tip="Cuenta atrás de 2 minutos y reiniciar la región"/>
- <button label="?" name="restart_help"/>
- <button label="Retrasar el reinicio" name="cancel_restart_btn" tool_tip="Retrasar una hora el reinicio de la región"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Depurar" name="Debug">
+ <text name="region_text_lbl">
+ Región:
+ </text>
+ <text name="region_text">
+ desconocida
+ </text>
+ <check_box label="Desactivar los scripts" name="disable_scripts_check" tool_tip="Descativar todos los scripts en esta región"/>
+ <button label="?" name="disable_scripts_help"/>
+ <check_box label="Desactivar las colisiones" name="disable_collisions_check" tool_tip="Desactiva las colisiones (no las de avatares) en esta región"/>
+ <button label="?" name="disable_collisions_help"/>
+ <check_box label="Desactivar las propiedades fÃsicas" name="disable_physics_check" tool_tip="Desactiva toda la fÃsica en esta región"/>
+ <button label="?" name="disable_physics_help"/>
+ <button label="Aplicar" name="apply_btn"/>
+ <text name="objret_text_lbl">
+ Devolver el objeto
+ </text>
+ <text name="resident_text_lbl">
+ Residente:
+ </text>
+ <line_editor name="target_avatar_name">
+ (nadie)
+ </line_editor>
+ <button label="Elegir..." name="choose_avatar_btn"/>
+ <text name="options_text_lbl">
+ Opciones:
+ </text>
+ <check_box label="Devolver sólo los objetos con scripts" name="return_scripts" tool_tip="Devolver sólo los objetos que tengan scripts."/>
+ <check_box label="Devolver sólo los objetos que están en terreno de otro" name="return_other_land" tool_tip="Devolver sólo los objetos que están en terreno de otro"/>
+ <check_box label="Devolver los objetos de cualquier región de este estado" name="return_estate_wide" tool_tip="Devolver los objetos de todas las regiones que forman este estado"/>
+ <button label="Devolver" name="return_btn"/>
+ <button label="Listar los objetos que colisionan..." name="top_colliders_btn" tool_tip="Lista de los objetos con más posibles colisiones potenciales"/>
+ <button label="?" name="top_colliders_help"/>
+ <button label="Listar los scripts según su uso..." name="top_scripts_btn" tool_tip="Lista de los objetos que más tiempo emplean ejecutando scripts"/>
+ <button label="?" name="top_scripts_help"/>
+ <button label="Reiniciar la región" name="restart_btn" tool_tip="Cuenta atrás de 2 minutos y reiniciar la región"/>
+ <button label="?" name="restart_help"/>
+ <button label="Retrasar el reinicio" name="cancel_restart_btn" tool_tip="Retrasar una hora el reinicio de la región"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
index 1cffc13175..93155d828d 100644
--- a/indra/newview/skins/default/xui/es/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Estado" name="Estate">
- <text name="estate_help_text">
- Los cambios en las configuraciones de esta pestaña afectarán a todas
-las regiones de este estado.
- </text>
- <text name="estate_text">
- Estado:
- </text>
- <text name="estate_name">
- (desconocido)
- </text>
- <text name="owner_text">
- Propietario:
- </text>
- <text name="estate_owner">
- (desconocido)
- </text>
- <check_box label="Usar el horario global" name="use_global_time_check"/>
- <button label="?" name="use_global_time_help"/>
- <check_box label="Fijar el Sol" name="fixed_sun_check"/>
- <button label="?" name="fixed_sun_help"/>
- <slider label="Fase" name="sun_hour_slider"/>
- <check_box label="Permitir el acceso público" name="externally_visible_check"/>
- <button label="?" name="externally_visible_help"/>
- <text name="Only Allow">
- Impedir el acceso a:
- </text>
- <check_box label="Residentes sin información de pago archivada" name="limit_payment" tool_tip="Impedir el acceso a los residentes no identificados."/>
- <check_box label="Residentes de los que no se ha verificado si son adultos" name="limit_age_verified" tool_tip="Impedir el acceso a residentes que no hayan verificado su edad. Para más información, vea support.secondlife.com"/>
- <check_box label="Permitir el chat de voz" name="voice_chat_check"/>
- <button label="?" name="voice_chat_help"/>
- <check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/>
- <button label="?" name="allow_direct_teleport_help"/>
- <text name="abuse_email_text">
- Dirección de correo electrónico para infracciones:
- </text>
- <string name="email_unsupported">
- CaracterÃstica no disponible
- </string>
- <button label="?" name="abuse_email_address_help"/>
- <button label="Aplicar" name="apply_btn"/>
- <button label="Echar usuarios del estado..." name="kick_user_from_estate_btn"/>
- <button label="Enviar un mensaje al estado..." name="message_estate_btn"/>
- <text name="estate_manager_label">
- Administradores del estado:
- </text>
- <button label="?" name="estate_manager_help"/>
- <button label="Quitar..." name="remove_estate_manager_btn"/>
- <button label="Añadir..." name="add_estate_manager_btn"/>
- <text name="allow_resident_label">
- Residentes autorizados:
- </text>
- <button label="?" name="allow_resident_help"/>
- <button label="Quitar..." name="remove_allowed_avatar_btn"/>
- <button label="Añadir..." name="add_allowed_avatar_btn"/>
- <text name="allow_group_label">
- Grupos autorizados:
- </text>
- <button label="?" name="allow_group_help"/>
- <button label="Quitar..." name="remove_allowed_group_btn"/>
- <button label="Añadir..." name="add_allowed_group_btn"/>
- <text name="ban_resident_label">
- Residentes con el acceso prohibido:
- </text>
- <button label="?" name="ban_resident_help"/>
- <button label="Quitar..." name="remove_banned_avatar_btn"/>
- <button label="Añadir..." name="add_banned_avatar_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Estado" name="Estate">
+ <text name="estate_help_text">
+ Los cambios en las configuraciones de esta pestaña afectarán a todas
+las regiones de este estado.
+ </text>
+ <text name="estate_text">
+ Estado:
+ </text>
+ <text name="estate_name">
+ (desconocido)
+ </text>
+ <text name="owner_text">
+ Propietario:
+ </text>
+ <text name="estate_owner">
+ (desconocido)
+ </text>
+ <check_box label="Usar el horario global" name="use_global_time_check"/>
+ <button label="?" name="use_global_time_help"/>
+ <check_box label="Fijar el Sol" name="fixed_sun_check"/>
+ <button label="?" name="fixed_sun_help"/>
+ <slider label="Fase" name="sun_hour_slider"/>
+ <check_box label="Permitir el acceso público" name="externally_visible_check"/>
+ <button label="?" name="externally_visible_help"/>
+ <text name="Only Allow">
+ Impedir el acceso a:
+ </text>
+ <check_box label="Residentes sin información de pago archivada" name="limit_payment" tool_tip="Impedir el acceso a los residentes no identificados."/>
+ <check_box label="Residentes de los que no se ha verificado si son adultos" name="limit_age_verified" tool_tip="Impedir el acceso a residentes que no hayan verificado su edad. Para más información, vea support.secondlife.com"/>
+ <check_box label="Permitir el chat de voz" name="voice_chat_check"/>
+ <button label="?" name="voice_chat_help"/>
+ <check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/>
+ <button label="?" name="allow_direct_teleport_help"/>
+ <text name="abuse_email_text">
+ Dirección de correo electrónico para infracciones:
+ </text>
+ <string name="email_unsupported">
+ CaracterÃstica no disponible
+ </string>
+ <button label="?" name="abuse_email_address_help"/>
+ <button label="Aplicar" name="apply_btn"/>
+ <button label="Echar usuarios del estado..." name="kick_user_from_estate_btn"/>
+ <button label="Enviar un mensaje al estado..." name="message_estate_btn"/>
+ <text name="estate_manager_label">
+ Administradores del estado:
+ </text>
+ <button label="?" name="estate_manager_help"/>
+ <button label="Quitar..." name="remove_estate_manager_btn"/>
+ <button label="Añadir..." name="add_estate_manager_btn"/>
+ <text name="allow_resident_label">
+ Residentes autorizados:
+ </text>
+ <button label="?" name="allow_resident_help"/>
+ <button label="Quitar..." name="remove_allowed_avatar_btn"/>
+ <button label="Añadir..." name="add_allowed_avatar_btn"/>
+ <text name="allow_group_label">
+ Grupos autorizados:
+ </text>
+ <button label="?" name="allow_group_help"/>
+ <button label="Quitar..." name="remove_allowed_group_btn"/>
+ <button label="Añadir..." name="add_allowed_group_btn"/>
+ <text name="ban_resident_label">
+ Residentes con el acceso prohibido:
+ </text>
+ <button label="?" name="ban_resident_help"/>
+ <button label="Quitar..." name="remove_banned_avatar_btn"/>
+ <button label="Añadir..." name="add_banned_avatar_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
index 95a57dc917..9ff7c97fc7 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Región" name="General">
- <text name="region_text_lbl">
- Región:
- </text>
- <text name="region_text">
- desconocida
- </text>
- <text name="version_channel_text_lbl">
- Versión:
- </text>
- <text name="version_channel_text">
- desconocida
- </text>
- <check_box label="No permitir modificar el terreno" name="block_terraform_check"/>
- <button label="?" name="terraform_help"/>
- <check_box label="Prohibir volar" name="block_fly_check"/>
- <button label="?" name="fly_help"/>
- <check_box label="Permitir el daño" name="allow_damage_check"/>
- <button label="?" name="damage_help"/>
- <check_box label="Impedir los 'empujones'" name="restrict_pushobject"/>
- <button label="?" name="restrict_pushobject_help"/>
- <check_box label="Permitir la reventa del terreno" name="allow_land_resell_check"/>
- <button label="?" name="land_resell_help"/>
- <check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/>
- <button label="?" name="parcel_changes_help"/>
- <check_box label="Bloquear el mostrar el terreno en la búsqueda." name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/>
- <button label="?" name="parcel_search_help"/>
- <spinner label="Nº máximo de avatares" name="agent_limit_spin"/>
- <button label="?" name="agent_limit_help"/>
- <spinner label="Plus de objetos" name="object_bonus_spin"/>
- <button label="?" name="object_bonus_help"/>
- <text label="Calificación" name="access_text">
- Calificación:
- </text>
-
-
-
-
- <button label="?" name="access_help"/>
- <button label="Aplicar" name="apply_btn"/>
- <button label="Teleportar a su Base a un usuario..." name="kick_btn"/>
- <button label="Teleportar a su Base a todos los usuarios..." name="kick_all_btn"/>
- <button label="Enviar un mensaje a toda la región..." name="im_btn"/>
- <button label="Administrar el Punto de Teleporte..." name="manage_telehub_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Región" name="General">
+ <text name="region_text_lbl">
+ Región:
+ </text>
+ <text name="region_text">
+ desconocida
+ </text>
+ <text name="version_channel_text_lbl">
+ Versión:
+ </text>
+ <text name="version_channel_text">
+ desconocida
+ </text>
+ <check_box label="No permitir modificar el terreno" name="block_terraform_check"/>
+ <button label="?" name="terraform_help"/>
+ <check_box label="Prohibir volar" name="block_fly_check"/>
+ <button label="?" name="fly_help"/>
+ <check_box label="Permitir el daño" name="allow_damage_check"/>
+ <button label="?" name="damage_help"/>
+ <check_box label="Impedir los 'empujones'" name="restrict_pushobject"/>
+ <button label="?" name="restrict_pushobject_help"/>
+ <check_box label="Permitir la reventa del terreno" name="allow_land_resell_check"/>
+ <button label="?" name="land_resell_help"/>
+ <check_box label="Permitir unir/dividir el terreno" name="allow_parcel_changes_check"/>
+ <button label="?" name="parcel_changes_help"/>
+ <check_box label="Bloquear el mostrar el terreno en la búsqueda." name="block_parcel_search_check" tool_tip="Permitir que la gente vea esta región y sus parcelas en los resultados de la búsqueda."/>
+ <button label="?" name="parcel_search_help"/>
+ <spinner label="Nº máximo de avatares" name="agent_limit_spin"/>
+ <button label="?" name="agent_limit_help"/>
+ <spinner label="Plus de objetos" name="object_bonus_spin"/>
+ <button label="?" name="object_bonus_help"/>
+ <text label="Calificación" name="access_text">
+ Calificación:
+ </text>
+
+
+
+
+ <button label="?" name="access_help"/>
+ <button label="Aplicar" name="apply_btn"/>
+ <button label="Teleportar a su Base a un usuario..." name="kick_btn"/>
+ <button label="Teleportar a su Base a todos los usuarios..." name="kick_all_btn"/>
+ <button label="Enviar un mensaje a toda la región..." name="im_btn"/>
+ <button label="Administrar el Punto de Teleporte..." name="manage_telehub_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index 48a5f7837d..df333c0c5e 100644
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Terreno" name="Terrain">
- <text name="region_text_lbl">
- Región:
- </text>
- <text name="region_text">
- desconocida
- </text>
- <spinner label="Nivel del agua" name="water_height_spin"/>
- <button label="?" name="water_height_help"/>
- <spinner label="LÃmite de elevación del terreno" name="terrain_raise_spin"/>
- <button label="?" name="terrain_raise_help"/>
- <spinner label="LÃmite de bajada del terreno" name="terrain_lower_spin"/>
- <button label="?" name="terrain_lower_help"/>
- <check_box label="Usar el Sol del estado" name="use_estate_sun_check"/>
- <button label="?" name="use_estate_sun_help"/>
- <check_box label="Fijar el Sol" name="fixed_sun_check"/>
- <button label="?" name="fixed_sun_help"/>
- <slider label="Fase" name="sun_hour_slider"/>
- <button label="Aplicar" name="apply_btn"/>
- <button label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
- <button label="?" name="download_raw_help"/>
- <button label="Subir un RAW para el terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
- <button label="?" name="upload_raw_help"/>
- <button label="Predeterminar este terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los lÃmites de elevación/bajada"/>
- <button label="?" name="bake_terrain_help"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terreno" name="Terrain">
+ <text name="region_text_lbl">
+ Región:
+ </text>
+ <text name="region_text">
+ desconocida
+ </text>
+ <spinner label="Nivel del agua" name="water_height_spin"/>
+ <button label="?" name="water_height_help"/>
+ <spinner label="LÃmite de elevación del terreno" name="terrain_raise_spin"/>
+ <button label="?" name="terrain_raise_help"/>
+ <spinner label="LÃmite de bajada del terreno" name="terrain_lower_spin"/>
+ <button label="?" name="terrain_lower_help"/>
+ <check_box label="Usar el Sol del estado" name="use_estate_sun_check"/>
+ <button label="?" name="use_estate_sun_help"/>
+ <check_box label="Fijar el Sol" name="fixed_sun_check"/>
+ <button label="?" name="fixed_sun_help"/>
+ <slider label="Fase" name="sun_hour_slider"/>
+ <button label="Aplicar" name="apply_btn"/>
+ <button label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
+ <button label="?" name="download_raw_help"/>
+ <button label="Subir un RAW para el terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para los propietarios del estado, no para los administradores"/>
+ <button label="?" name="upload_raw_help"/>
+ <button label="Predeterminar este terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los lÃmites de elevación/bajada"/>
+ <button label="?" name="bake_terrain_help"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml
index 94dbdad8f5..d7f42ac41c 100644
--- a/indra/newview/skins/default/xui/es/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Texturas del terreno" name="Textures">
- <text name="region_text_lbl">
- Región:
- </text>
- <text name="region_text">
- desconocida
- </text>
- <text name="detail_texture_text">
- Texturas del terreno (se requieren archivos .tga de 512x512 y 24 bites)
- </text>
- <text name="height_text_lbl">
- 1 (Baja)
- </text>
- <text name="height_text_lbl2">
- 2
- </text>
- <text name="height_text_lbl3">
- 3
- </text>
- <text name="height_text_lbl4">
- 4 (Alta)
- </text>
- <text name="height_text_lbl5">
- Rangos de la elevación de la textura
- </text>
- <text name="height_text_lbl6">
- Suroeste
- </text>
- <text name="height_text_lbl7">
- Noroeste
- </text>
- <text name="height_text_lbl8">
- Sureste
- </text>
- <text name="height_text_lbl9">
- Noreste
- </text>
- <spinner label="Baja" name="height_start_spin_0"/>
- <spinner label="Baja" name="height_start_spin_1"/>
- <spinner label="Baja" name="height_start_spin_2"/>
- <spinner label="Baja" name="height_start_spin_3"/>
- <spinner label="Alta" name="height_range_spin_0"/>
- <spinner label="Alta" name="height_range_spin_1"/>
- <spinner label="Alta" name="height_range_spin_2"/>
- <spinner label="Alta" name="height_range_spin_3"/>
- <text name="height_text_lbl10">
- Estos valores representan la gama de mezclas para las texturas superiores.
- </text>
- <text name="height_text_lbl11">
- Midiendo en metros, el valor BAJA es la altura MÃXIMA de la textura #1,
- </text>
- <text name="height_text_lbl12">
- y el valor ALTA es la altura MÃNIMA de la textura #4.
- </text>
- <button label="Aplicar" name="apply_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Texturas del terreno" name="Textures">
+ <text name="region_text_lbl">
+ Región:
+ </text>
+ <text name="region_text">
+ desconocida
+ </text>
+ <text name="detail_texture_text">
+ Texturas del terreno (se requieren archivos .tga de 512x512 y 24 bites)
+ </text>
+ <text name="height_text_lbl">
+ 1 (Baja)
+ </text>
+ <text name="height_text_lbl2">
+ 2
+ </text>
+ <text name="height_text_lbl3">
+ 3
+ </text>
+ <text name="height_text_lbl4">
+ 4 (Alta)
+ </text>
+ <text name="height_text_lbl5">
+ Rangos de la elevación de la textura
+ </text>
+ <text name="height_text_lbl6">
+ Suroeste
+ </text>
+ <text name="height_text_lbl7">
+ Noroeste
+ </text>
+ <text name="height_text_lbl8">
+ Sureste
+ </text>
+ <text name="height_text_lbl9">
+ Noreste
+ </text>
+ <spinner label="Baja" name="height_start_spin_0"/>
+ <spinner label="Baja" name="height_start_spin_1"/>
+ <spinner label="Baja" name="height_start_spin_2"/>
+ <spinner label="Baja" name="height_start_spin_3"/>
+ <spinner label="Alta" name="height_range_spin_0"/>
+ <spinner label="Alta" name="height_range_spin_1"/>
+ <spinner label="Alta" name="height_range_spin_2"/>
+ <spinner label="Alta" name="height_range_spin_3"/>
+ <text name="height_text_lbl10">
+ Estos valores representan la gama de mezclas para las texturas superiores.
+ </text>
+ <text name="height_text_lbl11">
+ Midiendo en metros, el valor BAJA es la altura MÃXIMA de la textura #1,
+ </text>
+ <text name="height_text_lbl12">
+ y el valor ALTA es la altura MÃNIMA de la textura #4.
+ </text>
+ <button label="Aplicar" name="apply_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
index 80ed489ba7..f6feab274f 100644
--- a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="LLScrollingPanelParam">
- <text length="1" name="Loading..." type="string">
- Cargando...
- </text>
- <text length="1" name="Loading...2" type="string">
- Cargando...
- </text>
- <slider label="[DESC]" name="param slider"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="LLScrollingPanelParam">
+ <text length="1" name="Loading..." type="string">
+ Cargando...
+ </text>
+ <text length="1" name="Loading...2" type="string">
+ Cargando...
+ </text>
+ <slider label="[DESC]" name="param slider"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
index d48f2d9427..add7db2f9a 100644
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="status">
- <text length="1" name="ParcelNameText" tool_tip="Nombre de la parcela en la que está. Pulse Acerca del terreno." type="string">
- el nombre de la parcela va aquÃ
- </text>
- <text length="1" name="BalanceText" tool_tip="Saldo de su cuenta" type="string">
- Cargando...
- </text>
- <button label="" label_selected="" name="buycurrency" tool_tip="Comprar dinero"/>
- <text length="12" name="TimeText" tool_tip="Hora actual (costa oeste EE.UU.)" type="string">
- 12:00 AM
- </text>
- <string name="StatBarDaysOfWeek">
- Domingo:Lunes:Martes:Miércoles:Jueves:Viernes:Sábado
- </string>
- <string name="StatBarMonthsOfYear">
- Enero:Febrero:Marzo:Abril:Mayo:Junio:Julio:Agosto:Septiembre:Octubre:Noviembre:Diciembre
- </string>
- <button label="" label_selected="" name="scriptout" tool_tip="Errores y alertas de los scripts"/>
- <button label="" label_selected="" name="health" tool_tip="Vida"/>
- <text length="1" name="HealthText" tool_tip="Vida" type="string">
- 100%
- </text>
- <button label="" label_selected="" name="no_fly" tool_tip="Prohibido volar"/>
- <button label="" label_selected="" name="no_build" tool_tip="No se permite Construir/Renderizar"/>
- <button label="" label_selected="" name="no_scripts" tool_tip="No se permiten los scripts"/>
- <button label="" label_selected="" name="restrictpush" tool_tip="Sin 'empujones'"/>
- <button label="" label_selected="" name="status_no_voice" tool_tip="Aquà no está disponible la voz"/>
- <button label="" label_selected="" name="buyland" tool_tip="Comprar esta parcela"/>
- <line_editor label="Buscar" name="search_editor" tool_tip="Buscar en Second Life"/>
- <button label="" label_selected="" name="search_btn" tool_tip="Buscar en Second Life"/>
- <string name="packet_loss_tooltip">
- Pérdida de paquetes
- </string>
- <string name="bandwidth_tooltip">
- Ancho de banda
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="status">
+ <text length="1" name="ParcelNameText" tool_tip="Nombre de la parcela en la que está. Pulse Acerca del terreno." type="string">
+ el nombre de la parcela va aquÃ
+ </text>
+ <text length="1" name="BalanceText" tool_tip="Saldo de su cuenta" type="string">
+ Cargando...
+ </text>
+ <button label="" label_selected="" name="buycurrency" tool_tip="Comprar dinero"/>
+ <text length="12" name="TimeText" tool_tip="Hora actual (costa oeste EE.UU.)" type="string">
+ 12:00 AM
+ </text>
+ <string name="StatBarDaysOfWeek">
+ Domingo:Lunes:Martes:Miércoles:Jueves:Viernes:Sábado
+ </string>
+ <string name="StatBarMonthsOfYear">
+ Enero:Febrero:Marzo:Abril:Mayo:Junio:Julio:Agosto:Septiembre:Octubre:Noviembre:Diciembre
+ </string>
+ <button label="" label_selected="" name="scriptout" tool_tip="Errores y alertas de los scripts"/>
+ <button label="" label_selected="" name="health" tool_tip="Vida"/>
+ <text length="1" name="HealthText" tool_tip="Vida" type="string">
+ 100%
+ </text>
+ <button label="" label_selected="" name="no_fly" tool_tip="Prohibido volar"/>
+ <button label="" label_selected="" name="no_build" tool_tip="No se permite Construir/Renderizar"/>
+ <button label="" label_selected="" name="no_scripts" tool_tip="No se permiten los scripts"/>
+ <button label="" label_selected="" name="restrictpush" tool_tip="Sin 'empujones'"/>
+ <button label="" label_selected="" name="status_no_voice" tool_tip="Aquà no está disponible la voz"/>
+ <button label="" label_selected="" name="buyland" tool_tip="Comprar esta parcela"/>
+ <line_editor label="Buscar" name="search_editor" tool_tip="Buscar en Second Life"/>
+ <button label="" label_selected="" name="search_btn" tool_tip="Buscar en Second Life"/>
+ <string name="packet_loss_tooltip">
+ Pérdida de paquetes
+ </string>
+ <string name="bandwidth_tooltip">
+ Ancho de banda
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/xui_version.xml b/indra/newview/skins/default/xui/es/xui_version.xml
index ee2a0be745..0e777751d3 100644
--- a/indra/newview/skins/default/xui/es/xui_version.xml
+++ b/indra/newview/skins/default/xui/es/xui_version.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xui_version>
- 1.0
-</xui_version>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xui_version>
+ 1.0
+</xui_version>
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index 22bc6e5fdc..1565e7cd68 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="A propos de Second Life">
- <text_editor name="credits_editor">
- Second Life existe grâce aux efforts de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les et de nombreuses autres personnes.
-
- Tous nos remerciements aux résidents suivants pour avoir testé cette version (la meilleure qui soit jusqu'à présent) : afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
-
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
- expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
- FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
- GL Copyright (C) 1999-2004 Brian Paul.
- Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
- jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
- jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
- ogg/vorbis Copyright (C) 2001, Xiphophorus
- OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
- SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
- SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly et Mark Adler.
-
- Tous droits réservés. Voir licenses.txt pour plus de détails.
-
- Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
- Je m'en sors avec un peu d'aide de mes amis. --Richard Starkey
- </text_editor>
- <string name="you_are_at">
- Votre position : [POSITION]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="A propos de Second Life">
+ <text_editor name="credits_editor">
+ Second Life existe grâce aux efforts de Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les et de nombreuses autres personnes.
+
+ Tous nos remerciements aux résidents suivants pour avoir testé cette version (la meilleure qui soit jusqu'à présent) : afon shepherd, Aimee Trescothick, Alexandrea Fride, Alissa Sabre, Amber DeCuir, Asuka Neely, Auron Forcella, Blue Revolution, Bocan Undercroft, Boroondas Gupte, Brandon Shinobu, Bri Gufler, Buckaroo Mu, Celierra Darling, Christos Atlantis, Coder Kas, Cummere Mayo, dakota schwade, Dirk Talamasca, Dizzy Banjo, Drew Dwi, Duckling Kwak, Ellla McMahon, Erikah Jameson, Erinyse Planer, Eyana Yohkoh, Ezian Ecksol, Faron Karu, Fenoe Lowey, Fox Hwasung, Francisca Biedermann, Gally Young, Gellan Glenelg, Geneko Nemeth, Glenn Rotaru, Hagar Qinan, Harleen Gretzky, Holger Gilruth, hotrodjohnny gears, IAm Zabelin, Inigo Catteneo, Iustinian Tomsen, Jacek Antonell, James Benedek, Jim Kupferberg, Joeseph Albanese, JPT62089 Agnon, Kardargo Adamczyk, Kirstenlee Cinquetti, Latif Khalifa, lea Parnall, Lex Neva, Lillith Anatine, Lilly Zenovka, Lim Catteneo, Lindal Kidd, Mark Rosenbaum, MasterJ Chaplin, McCabe Maxsted, Melvin Starbrook, Meni Kaiousei, Mero Collas, Minakothegothicgeisha Kamachi, Moon Metty, neofilo aabye, Neutron Chesnokov, Nomad Ingwer, norritt Xi, Opensource Obscure, Oracle Weatherwax, Ourasi Ferraris, Pabl0 Roffo, Peyton Aleixandre, Phli Foxchase, Psi Merlin, r2d2 Wunderlich, Regi Yifu, Saijanai Kuhn, Sandor Balczo, Sarkan Dreamscape, Scree Raymaker, Sedona Mills, Selena Beale, Sheet Spotter, Shibari Twine, Silver Key, Simon Kline, SLB Wirefly, Stacy Wombat, Sugarcult Dagger, Tayra Dagostino, Tetsuryu Vlodovic, ThaBiGGDoGG Richez, Timo Gufler, tx Oh, wayfinder wishbringer, Wizzytoe McCullough, Wundur Primbee, Yann Dufaux, Yuu Nakamichi, Aminom Marvin, Andred Qinan, arminasx saiman, caroline apollo, Iskar Ariantho, Jenika Connolly, Maghnus Balogh, Nefertiti Nefarious, RodneyLee Jessop
+
+ 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+ APR Copyright (C) 2000-2004 The Apache Software Foundation
+ cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+ expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+ FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+ GL Copyright (C) 1999-2004 Brian Paul.
+ Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+ jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+ jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+ ogg/vorbis Copyright (C) 2001, Xiphophorus
+ OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+ SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+ SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+ zlib Copyright (C) 1995-2002 Jean-loup Gailly et Mark Adler.
+
+ Tous droits réservés. Voir licenses.txt pour plus de détails.
+
+ Codage Audio du chat vocal : Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+
+
+ Je m'en sors avec un peu d'aide de mes amis. --Richard Starkey
+ </text_editor>
+ <string name="you_are_at">
+ Votre position : [POSITION]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 7949f02914..8212db046f 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -1,440 +1,440 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterland" title="À propos du terrain">
- <tab_container name="landtab">
- <panel label="Général" name="land_general_panel">
- <text length="1" name="Name:" type="string">
- Nom :
- </text>
- <line_editor name="Name"/>
- <text length="1" name="Description:" type="string">
- Description :
- </text>
- <text_editor name="Description"/>
- <text length="1" name="Owner:" type="string">
- Propriétaire :
- </text>
- <text length="1" name="OwnerText" type="string">
- Leyla Linden
- </text>
- <button label="Profil..." label_selected="Profil..." name="Profile..."/>
- <text length="1" name="Group:" type="string">
- Groupe :
- </text>
- <text name="GroupText"/>
- <button label="Définir..." label_selected="Définir..." name="Set..."/>
- <check_box label="Autoriser la cession au groupe" name="check deed" tool_tip="Un officier peut céder ce terrain au groupe. Il viendra alors s'ajouter au patrimoine du groupe."/>
- <button label="Céder..." label_selected="Céder..." name="Deed..." tool_tip="Vous ne pouvez céder le terrain que si vous avez un rôle d'officier dans le groupe sélectionné."/>
- <check_box label="Le propriétaire contribue en cédant du terrain" name="check contrib" tool_tip="Lorsqu'un terrain est cédé au groupe, l'ancien propriétaire fait également un don de terrain suffisant."/>
- <text length="1" name="For Sale:" type="string">
- À vendre :
- </text>
- <text length="1" name="Not for sale." type="string">
- Pas à vendre
- </text>
- <text length="1" name="For Sale: Price L$[PRICE]." type="string">
- Prix : [PRICE] L$ ([PRICE_PER_SQM] L$/m²).
- </text>
- <text name="SalePending"/>
- <button label="Vendre le terrain..." label_selected="Vendre le terrain..." name="Sell Land..."/>
- <text length="1" name="For sale to" type="string">
- À vendre à : [BUYER]
- </text>
- <text length="1" name="Sell with landowners objects in parcel." type="string">
- Objets inclus dans la vente.
- </text>
- <text length="1" name="Selling with no objects in parcel." type="string">
- Objets non inclus dans la vente.
- </text>
- <button label="Annuler la vente du terrain" label_selected="Annuler la vente du terrain" name="Cancel Land Sale" width="165" left="275"/>
- <text length="1" name="Claimed:" type="string">
- Acquis :
- </text>
- <text length="1" name="DateClaimText" type="string">
- Tue Aug 15 13:47:25 2006
- </text>
- <text length="1" name="PriceLabel" type="string">
- Surface :
- </text>
- <text length="1" name="PriceText" type="string">
- 4048 m²
- </text>
- <text length="1" name="Traffic:" type="string">
- Trafic :
- </text>
- <text length="1" name="DwellText" type="string">
- 0
- </text>
- <button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="Buy Land..." width="125" left="130"/>
- <button label="Acheter pour le groupe..." label_selected="Acheter pour le groupe..." name="Buy For Group..."/>
- <button label="Acheter un pass..." label_selected="Acheter un pass..." name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125" left="130"/>
- <button label="Abandonner le terrain..." label_selected="Abandonner le terrain..." name="Abandon Land..."/>
- <button label="Redemander le terrain..." label_selected="Redemander le terrain…" name="Reclaim Land..."/>
- <button label="Vente Linden..." label_selected="Vente Linden..." name="Linden Sale..." tool_tip="Le terrain doit être la propriété d'un résident, avoir un contenu défini et ne pas être aux enchères."/>
- <string name="new users only">
- Nouveaux utilisateurs uniquement
- </string>
- <string name="anyone">
- Tout le monde
- </string>
- <string name="area_text">
- Surface
- </string>
- <string name="area_size_text">
- [AREA] m²
- </string>
- <string name="auction_id_text">
- Code de l'enchère : [ID]
- </string>
- <string name="need_tier_to_modify">
- Pour modifier ce terrain, vous devez approuver votre achat.
- </string>
- <string name="group_owned_text">
- (propriété du groupe)
- </string>
- <string name="profile_text">
- Profil...
- </string>
- <string name="info_text">
- Infos...
- </string>
- <string name="public_text">
- (public)
- </string>
- <string name="none_text">
- (aucun)
- </string>
- <string name="sale_pending_text">
- (vente en cours)
- </string>
- <string name="no_selection_text">
- Aucune parcelle sélectionnée.
-Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre parcelle pour en afficher les détails.
- </string>
- </panel>
- <panel label="Règlement" name="land_covenant_panel">
- <text length="1" name="covenant_timestamp_text" type="string">
- Last Modified Wed Dec 31 16:00:00 1969
- </text>
- <text length="1" name="region_name_lbl" type="string">
- Région :
- </text>
- <text length="1" name="region_name_text" type="string">
- leyla
- </text>
- <text length="1" name="estate_name_lbl" type="string">
- Domaine :
- </text>
- <text length="1" name="estate_name_text" type="string">
- continent
- </text>
- <text length="1" name="estate_owner_lbl" type="string">
- Propriétaire :
- </text>
- <text length="1" name="estate_owner_text" type="string">
- (aucun)
- </text>
- <text length="1" name="resellable_clause" type="string">
- Le terrain acheté dans cette région ne peut être revendu.
- </text>
- <text length="1" name="changeable_clause" type="string">
- Le terrain acheté dans cette région ne peut être revendu/divisé.
- </text>
- <text_editor length="1" name="covenant_editor" type="string">
- Il n'y a aucun règlement pour ce domaine.
- </text_editor>
- <string name="can_resell">
- Le terrain acheté dans cette région peut être revendu.
- </string>
- <string name="can_not_resell">
- Le terrain acheté dans cette région ne peut pas être revendu.
- </string>
- <string name="can_change">
- Le terrain acheté dans cette région peut être fusionné ou divisé.
- </string>
- <string name="can_not_change">
- Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
- </string>
- </panel>
- <panel label="Objets" name="land_objects_panel">
- <text name="parcel_object_bonus">
- Facteur Bonus Objets : [BONUS]
- </text>
- <text length="1" name="Simulator primitive usage:" type="string">
- Prims utilisées sur la parcelle :
- </text>
- <text name="objects_available" left="214" width="230">
- [COUNT] sur [MAX] ([AVAILABLE] disponibles)
- </text>
- <string name="objects_available_text">
- [COUNT] sur [MAX] ([AVAILABLE] disponibles)
- </string>
- <string name="objects_deleted_text">
- [COUNT] sur [MAX] ([DELETED] seront supprimés)
- </string>
- <text length="1" name="Primitives parcel supports:" type="string" width="200">
- Prims max. sur la parcelle :
- </text>
- <text length="1" name="object_contrib_text" type="string" left="214" width="152">
- [COUNT]
- </text>
- <text length="1" name="Primitives on parcel:" type="string">
- Prims sur la parcelle :
- </text>
- <text length="1" name="total_objects_text" type="string" left="214" width="48">
- [COUNT]
- </text>
- <text length="1" name="Owned by parcel owner:" type="string" left="14" width="180">
- Appartenant au propriétaire :
- </text>
- <text length="1" name="owner_objects_text" type="string" left="214" width="48">
- [COUNT]
- </text>
- <button label="Afficher" label_selected="Afficher" name="ShowOwner" right="-135" width="60"/>
- <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOwner..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
- <text length="1" name="Set to group:" type="string" left="14" width="180">
- Donnés au groupe :
- </text>
- <text length="1" name="group_objects_text" type="string" left="214" width="48">
- [COUNT]
- </text>
- <button label="Afficher" label_selected="Afficher" name="ShowGroup" width="60" right="-135"/>
- <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnGroup..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
- <text length="1" name="Owned by others:" type="string" left="14" width="128">
- Appartenant à d'autres :
- </text>
- <text length="1" name="other_objects_text" type="string" left="214" width="48">
- [COUNT]
- </text>
- <button label="Afficher" label_selected="Afficher" name="ShowOther" right="-135" width="60"/>
- <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOther..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
- <text length="1" name="Selected / sat upon:" type="string" left="14" width="193">
- Sélectionnés/où quelqu'un est assis :
- </text>
- <text length="1" name="selected_objects_text" type="string" left="214" width="48">
- [COUNT]
- </text>
- <text name="Autoreturn" width="412" left="4">
- Renvoi automatique des objets d'autres résidents (minutes, 0 pour désactiver) :
- </text>
- <line_editor name="clean other time" right="-6" width="36" />
- <text length="1" name="Object Owners:" type="string">
- Propriétaires :
- </text>
- <button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh List"/>
- <button label="Renvoyer les objets..." label_selected="Renvoyer les objets..." name="Return objects..."/>
- <name_list label="Plus récents" name="owner list">
- <column label="Type" name="type"/>
- <column name="online_status"/>
- <column label="Nom" name="name"/>
- <column label="Nombre" name="count"/>
- <column label="Plus récents" name="mostrecent"/>
- </name_list>
- </panel>
- <panel label="Options" name="land_options_panel">
- <text length="1" name="allow_label" type="string">
- Autoriser les autres résidents à  :
- </text>
- <check_box label="Modifier le terrain" name="edit land check" tool_tip="Si cette option est cochée, n'importe qui peut terraformer votre terrain. Il vaut mieux ne pas cocher cette option pour toujours pouvoir modifer votre propre terrain."/>
- <check_box label="Créer des repères" name="check landmark"/>
- <check_box label="Voler" name="check fly" tool_tip="Si cette option est cochée, les résidents peuvent voler sur votre terrain. Si elle n'est pas cochée, ils ne pourront voler que lorsqu'ils arrivent et passent au dessus de votre terrain."/>
- <text name="allow_label2" left="152">
- Créer des objets :
- </text>
- <check_box label="Tous les résidents" name="edit objects check" left="285"/>
- <check_box label="Groupe" name="edit group objects check" left="395"/>
- <text name="allow_label3" left="152" width="134">
- Laisser entrer des objets :
- </text>
- <check_box label="Tous les résidents" name="all object entry check" left="285"/>
- <check_box label="Groupe" name="group object entry check" left="395"/>
- <text name="allow_label4" left="152">
- Exécuter des scripts :
- </text>
- <check_box label="Tous les résidents" name="check other scripts" left="285"/>
- <check_box label="Groupe" name="check group scripts" left="395"/>
- <text length="1" name="land_options_label" type="string">
- Options du terrain :
- </text>
- <check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n'y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
- <check_box label="Pas de bousculades" left="14" bottom="-140"
- name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
- <check_box label="Afficher dans la recherche (30 L$/semaine) sous" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche" bottom="-160"/>
- <combo_box name="land category" left="286" width="146" bottom="-160">
- <combo_item name="AnyCategory">
- Toutes catégories
- </combo_item>
- <combo_item name="LindenLocation">
- Appartenant aux Lindens
- </combo_item>
-
-
- <combo_item name="Arts&Culture">
- Art et Culture
- </combo_item>
- <combo_item name="Business">
- Affaires
- </combo_item>
- <combo_item name="Educational">
- Éducation
- </combo_item>
- <combo_item name="Gaming">
- Jeux
- </combo_item>
- <combo_item name="Hangout">
- Favoris
- </combo_item>
- <combo_item name="NewcomerFriendly">
- Accueil pour les nouveaux
- </combo_item>
- <combo_item name="Parks&Nature">
- Parcs et Nature
- </combo_item>
- <combo_item name="Residential">
- Résidentiel
- </combo_item>
- <combo_item name="Shopping">
- Shopping
- </combo_item>
- <combo_item name="Other">
- Autre
- </combo_item>
- </combo_box>
- <button label="?" label_selected="?" name="?" left="436" bottom="-160"/>
- <check_box name="MatureCheck" bottom="-180"/>
- <text length="1" name="Snapshot:" type="string" bottom="-200">
- Photo :
- </text>
- <texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image" bottom="-319"/>
- <text name="landing_point" bottom="-323">
- Lieu d'arrivée : [LANDING]
- </text>
- <string name="landing_point_none">
- (aucun)
- </string>
- <button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d'arrivée des visiteurs. Définit l'emplacement de votre avatar sur ce terrain." bottom="-323"/>
- <button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Libérer le lieu d'arrivée." bottom="-323"/>
- <text length="1" name="Teleport Routing: " type="string" bottom="-343">
- Règles de téléportation :
- </text>
- <combo_box name="landing type" tool_tip="Vous permet de paramétrer les téléportations sur votre terrain." left="140" width="140" bottom="-343">
- <combo_item length="1" name="Blocked" type="string">
- Bloqué
- </combo_item>
- <combo_item length="1" name="LandingPoint" type="string">
- Lieu d'arrivée fixe
- </combo_item>
- <combo_item length="1" name="Anywhere" type="string">
- Lieu d'arrivée libre
- </combo_item>
- </combo_box>
- <string name="push_restrict_text">
- Pas de bousculades
- </string>
- <string name="push_restrict_region_text">
- Pas de bousculades (les règles de la région priment)
- </string>
- </panel>
- <panel label="Médias" name="land_media_panel">
- <text name="with media:" width="85">
- Type de média :
- </text>
- <combo_box name="media type" tool_tip="Indiquez s'il s'agit de l'URL d'un film, d'une page web ou autre" left="97"/>
- <text name="mime_type"/>
- <text name="at URL:" width="85">
- URL du média :
- </text>
- <line_editor name="media_url" left="97"/>
- <button label="Définir..." label_selected="Définir..." name="set_media_url"/>
- <text name="Description:">
- Description :
- </text>
- <line_editor name="url_description" tool_tip="Texte affiché à côté du bouton Jouer/Charger" left="97"/>
- <text length="1" name="Media texture:" type="string">
- Remplacer
-la texture :
- </text>
- <texture_picker label="" name="media texture" tool_tip="Cliquez pour sélectionner une image" left="97"/>
- <text name="replace_texture_help">
- (Les objets avec cette texture affichent le film ou
-la page web quand vous cliquez sur la flèche Jouer.)
- </text>
- <text name="Options:">
- Options
-média :
- </text>
- <check_box left="97" label="Échelle automatique" name="media_auto_scale" tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l'échelle. La qualité visuelle sera peut-être amoindrie mais vous n'aurez à faire aucune autre mise à l'échelle ou alignement."/>
- <check_box label="Média en boucle" name="media_loop" tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera."/>
- <check_box left="97" label="Masquer l'URL du média" name="hide_media_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l'URL du média. Cette option n'est pas disponible pour les fichiers HTML."/>
- <check_box label="Masquer l'URL de la musique" name="hide_music_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l'URL de la musique."/>
- <text name="media_size" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." width="105" left="102">
- Taille du média :
- </text>
- <spinner name="media_size_width" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." left_delta="89"/>
- <spinner name="media_size_height" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."/>
- <text name="pixels">
- pixels
- </text>
- <text name="MusicURL:" bottom_delta="-28">
- URL de la
-musique :
- </text>
- <line_editor name="music_url" left="97" bottom_delta="-12"/>
- <text name="Sound:">
- Son :
- </text>
- <check_box label="Limiter le son ambiant à cette parcelle" name="check sound local" left="97" />
- <text name="Voice settings:">
- Voix :
- </text>
- <radio_group name="parcel_voice_channel" left="97" width="310">
- <radio_item name="Estate">
- Utiliser le canal du domaine
- </radio_item>
- <radio_item name="Private">
- Utiliser un canal privé
- </radio_item>
- <radio_item name="Disabled">
- Désactiver les canaux audios
- </radio_item>
- </radio_group>
- </panel>
- <panel label="Accès" name="land_access_panel">
- <text length="1" name="Limit access to this parcel to:" type="string">
- Accès à cette parcelle
- </text>
- <check_box label="Autoriser l'accès public" name="public_access"/>
- <text name="Only Allow">
- Bloquer l'accès aux résidents :
- </text>
- <check_box label="Qui n'ont pas fourni leurs informations de paiement à Linden Lab" name="limit_payment" tool_tip="Aux résidents non identifés"/>
- <check_box label="Dont l'âge n'a pas été vérifié" name="limit_age_verified" tool_tip="Aux résidents dont l'âge n'a pas été vérifié. Pour plus d'infos, consultez la page support.secondlife.com."/>
- <string name="estate_override">
- Au moins une de ces options est définie au niveau du domaine.
- </string>
- <check_box label="Autoriser l'accès au groupe : [GROUP]" name="GroupCheck" tool_tip="Définir le groupe à l'onglet Général."/>
- <check_box label="Vendre des pass à  :" name="PassCheck" tool_tip="Autoriser un accès temporaire à cette parcelle"/>
- <combo_box name="pass_combo">
- <combo_item name="Anyone">
- Tout le monde
- </combo_item>
- <combo_item name="Group">
- Groupe
- </combo_item>
- </combo_box>
- <spinner label="Prix en L$Â :" name="PriceSpin"/>
- <spinner label="Durée en heures :" name="HoursSpin"/>
- <text label="Toujours autoriser" name="AllowedText">
- Résidents autorisés
- </text>
- <name_list name="AccessList" tool_tip="([LISTED] listés, [MAX] max)"/>
- <button label="Ajouter..." label_selected="Ajouter..." name="add_allowed"/>
- <button label="Supprimer" label_selected="Supprimer" name="remove_allowed"/>
- <text label="Bannir" name="BanCheck">
- Résidents bannis
- </text>
- <name_list name="BannedList" tool_tip="([LISTED] listés, [MAX] max)"/>
- <button label="Ajouter..." label_selected="Ajouter..." name="add_banned"/>
- <button label="Supprimer" label_selected="Supprimer" name="remove_banned"/>
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterland" title="À propos du terrain">
+ <tab_container name="landtab">
+ <panel label="Général" name="land_general_panel">
+ <text length="1" name="Name:" type="string">
+ Nom :
+ </text>
+ <line_editor name="Name"/>
+ <text length="1" name="Description:" type="string">
+ Description :
+ </text>
+ <text_editor name="Description"/>
+ <text length="1" name="Owner:" type="string">
+ Propriétaire :
+ </text>
+ <text length="1" name="OwnerText" type="string">
+ Leyla Linden
+ </text>
+ <button label="Profil..." label_selected="Profil..." name="Profile..."/>
+ <text length="1" name="Group:" type="string">
+ Groupe :
+ </text>
+ <text name="GroupText"/>
+ <button label="Définir..." label_selected="Définir..." name="Set..."/>
+ <check_box label="Autoriser la cession au groupe" name="check deed" tool_tip="Un officier peut céder ce terrain au groupe. Il viendra alors s'ajouter au patrimoine du groupe."/>
+ <button label="Céder..." label_selected="Céder..." name="Deed..." tool_tip="Vous ne pouvez céder le terrain que si vous avez un rôle d'officier dans le groupe sélectionné."/>
+ <check_box label="Le propriétaire contribue en cédant du terrain" name="check contrib" tool_tip="Lorsqu'un terrain est cédé au groupe, l'ancien propriétaire fait également un don de terrain suffisant."/>
+ <text length="1" name="For Sale:" type="string">
+ À vendre :
+ </text>
+ <text length="1" name="Not for sale." type="string">
+ Pas à vendre
+ </text>
+ <text length="1" name="For Sale: Price L$[PRICE]." type="string">
+ Prix : [PRICE] L$ ([PRICE_PER_SQM] L$/m²).
+ </text>
+ <text name="SalePending"/>
+ <button label="Vendre le terrain..." label_selected="Vendre le terrain..." name="Sell Land..."/>
+ <text length="1" name="For sale to" type="string">
+ À vendre à : [BUYER]
+ </text>
+ <text length="1" name="Sell with landowners objects in parcel." type="string">
+ Objets inclus dans la vente.
+ </text>
+ <text length="1" name="Selling with no objects in parcel." type="string">
+ Objets non inclus dans la vente.
+ </text>
+ <button label="Annuler la vente du terrain" label_selected="Annuler la vente du terrain" name="Cancel Land Sale" width="165" left="275"/>
+ <text length="1" name="Claimed:" type="string">
+ Acquis :
+ </text>
+ <text length="1" name="DateClaimText" type="string">
+ Tue Aug 15 13:47:25 2006
+ </text>
+ <text length="1" name="PriceLabel" type="string">
+ Surface :
+ </text>
+ <text length="1" name="PriceText" type="string">
+ 4048 m²
+ </text>
+ <text length="1" name="Traffic:" type="string">
+ Trafic :
+ </text>
+ <text length="1" name="DwellText" type="string">
+ 0
+ </text>
+ <button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="Buy Land..." width="125" left="130"/>
+ <button label="Acheter pour le groupe..." label_selected="Acheter pour le groupe..." name="Buy For Group..."/>
+ <button label="Acheter un pass..." label_selected="Acheter un pass..." name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125" left="130"/>
+ <button label="Abandonner le terrain..." label_selected="Abandonner le terrain..." name="Abandon Land..."/>
+ <button label="Redemander le terrain..." label_selected="Redemander le terrain…" name="Reclaim Land..."/>
+ <button label="Vente Linden..." label_selected="Vente Linden..." name="Linden Sale..." tool_tip="Le terrain doit être la propriété d'un résident, avoir un contenu défini et ne pas être aux enchères."/>
+ <string name="new users only">
+ Nouveaux utilisateurs uniquement
+ </string>
+ <string name="anyone">
+ Tout le monde
+ </string>
+ <string name="area_text">
+ Surface
+ </string>
+ <string name="area_size_text">
+ [AREA] m²
+ </string>
+ <string name="auction_id_text">
+ Code de l'enchère : [ID]
+ </string>
+ <string name="need_tier_to_modify">
+ Pour modifier ce terrain, vous devez approuver votre achat.
+ </string>
+ <string name="group_owned_text">
+ (propriété du groupe)
+ </string>
+ <string name="profile_text">
+ Profil...
+ </string>
+ <string name="info_text">
+ Infos...
+ </string>
+ <string name="public_text">
+ (public)
+ </string>
+ <string name="none_text">
+ (aucun)
+ </string>
+ <string name="sale_pending_text">
+ (vente en cours)
+ </string>
+ <string name="no_selection_text">
+ Aucune parcelle sélectionnée.
+Allez dans le menu Monde > À propos du terrain ou sélectionnez une autre parcelle pour en afficher les détails.
+ </string>
+ </panel>
+ <panel label="Règlement" name="land_covenant_panel">
+ <text length="1" name="covenant_timestamp_text" type="string">
+ Last Modified Wed Dec 31 16:00:00 1969
+ </text>
+ <text length="1" name="region_name_lbl" type="string">
+ Région :
+ </text>
+ <text length="1" name="region_name_text" type="string">
+ leyla
+ </text>
+ <text length="1" name="estate_name_lbl" type="string">
+ Domaine :
+ </text>
+ <text length="1" name="estate_name_text" type="string">
+ continent
+ </text>
+ <text length="1" name="estate_owner_lbl" type="string">
+ Propriétaire :
+ </text>
+ <text length="1" name="estate_owner_text" type="string">
+ (aucun)
+ </text>
+ <text length="1" name="resellable_clause" type="string">
+ Le terrain acheté dans cette région ne peut être revendu.
+ </text>
+ <text length="1" name="changeable_clause" type="string">
+ Le terrain acheté dans cette région ne peut être revendu/divisé.
+ </text>
+ <text_editor length="1" name="covenant_editor" type="string">
+ Il n'y a aucun règlement pour ce domaine.
+ </text_editor>
+ <string name="can_resell">
+ Le terrain acheté dans cette région peut être revendu.
+ </string>
+ <string name="can_not_resell">
+ Le terrain acheté dans cette région ne peut pas être revendu.
+ </string>
+ <string name="can_change">
+ Le terrain acheté dans cette région peut être fusionné ou divisé.
+ </string>
+ <string name="can_not_change">
+ Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
+ </string>
+ </panel>
+ <panel label="Objets" name="land_objects_panel">
+ <text name="parcel_object_bonus">
+ Facteur Bonus Objets : [BONUS]
+ </text>
+ <text length="1" name="Simulator primitive usage:" type="string">
+ Prims utilisées sur la parcelle :
+ </text>
+ <text name="objects_available" left="214" width="230">
+ [COUNT] sur [MAX] ([AVAILABLE] disponibles)
+ </text>
+ <string name="objects_available_text">
+ [COUNT] sur [MAX] ([AVAILABLE] disponibles)
+ </string>
+ <string name="objects_deleted_text">
+ [COUNT] sur [MAX] ([DELETED] seront supprimés)
+ </string>
+ <text length="1" name="Primitives parcel supports:" type="string" width="200">
+ Prims max. sur la parcelle :
+ </text>
+ <text length="1" name="object_contrib_text" type="string" left="214" width="152">
+ [COUNT]
+ </text>
+ <text length="1" name="Primitives on parcel:" type="string">
+ Prims sur la parcelle :
+ </text>
+ <text length="1" name="total_objects_text" type="string" left="214" width="48">
+ [COUNT]
+ </text>
+ <text length="1" name="Owned by parcel owner:" type="string" left="14" width="180">
+ Appartenant au propriétaire :
+ </text>
+ <text length="1" name="owner_objects_text" type="string" left="214" width="48">
+ [COUNT]
+ </text>
+ <button label="Afficher" label_selected="Afficher" name="ShowOwner" right="-135" width="60"/>
+ <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOwner..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+ <text length="1" name="Set to group:" type="string" left="14" width="180">
+ Donnés au groupe :
+ </text>
+ <text length="1" name="group_objects_text" type="string" left="214" width="48">
+ [COUNT]
+ </text>
+ <button label="Afficher" label_selected="Afficher" name="ShowGroup" width="60" right="-135"/>
+ <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnGroup..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+ <text length="1" name="Owned by others:" type="string" left="14" width="128">
+ Appartenant à d'autres :
+ </text>
+ <text length="1" name="other_objects_text" type="string" left="214" width="48">
+ [COUNT]
+ </text>
+ <button label="Afficher" label_selected="Afficher" name="ShowOther" right="-135" width="60"/>
+ <button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOther..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+ <text length="1" name="Selected / sat upon:" type="string" left="14" width="193">
+ Sélectionnés/où quelqu'un est assis :
+ </text>
+ <text length="1" name="selected_objects_text" type="string" left="214" width="48">
+ [COUNT]
+ </text>
+ <text name="Autoreturn" width="412" left="4">
+ Renvoi automatique des objets d'autres résidents (minutes, 0 pour désactiver) :
+ </text>
+ <line_editor name="clean other time" right="-6" width="36" />
+ <text length="1" name="Object Owners:" type="string">
+ Propriétaires :
+ </text>
+ <button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh List"/>
+ <button label="Renvoyer les objets..." label_selected="Renvoyer les objets..." name="Return objects..."/>
+ <name_list label="Plus récents" name="owner list">
+ <column label="Type" name="type"/>
+ <column name="online_status"/>
+ <column label="Nom" name="name"/>
+ <column label="Nombre" name="count"/>
+ <column label="Plus récents" name="mostrecent"/>
+ </name_list>
+ </panel>
+ <panel label="Options" name="land_options_panel">
+ <text length="1" name="allow_label" type="string">
+ Autoriser les autres résidents à  :
+ </text>
+ <check_box label="Modifier le terrain" name="edit land check" tool_tip="Si cette option est cochée, n'importe qui peut terraformer votre terrain. Il vaut mieux ne pas cocher cette option pour toujours pouvoir modifer votre propre terrain."/>
+ <check_box label="Créer des repères" name="check landmark"/>
+ <check_box label="Voler" name="check fly" tool_tip="Si cette option est cochée, les résidents peuvent voler sur votre terrain. Si elle n'est pas cochée, ils ne pourront voler que lorsqu'ils arrivent et passent au dessus de votre terrain."/>
+ <text name="allow_label2" left="152">
+ Créer des objets :
+ </text>
+ <check_box label="Tous les résidents" name="edit objects check" left="285"/>
+ <check_box label="Groupe" name="edit group objects check" left="395"/>
+ <text name="allow_label3" left="152" width="134">
+ Laisser entrer des objets :
+ </text>
+ <check_box label="Tous les résidents" name="all object entry check" left="285"/>
+ <check_box label="Groupe" name="group object entry check" left="395"/>
+ <text name="allow_label4" left="152">
+ Exécuter des scripts :
+ </text>
+ <check_box label="Tous les résidents" name="check other scripts" left="285"/>
+ <check_box label="Groupe" name="check group scripts" left="395"/>
+ <text length="1" name="land_options_label" type="string">
+ Options du terrain :
+ </text>
+ <check_box label="Sécurisé (pas de dégâts)" name="check safe" tool_tip="Si cette option est cochée, le terrain est sécurisé et il n'y pas de risques de dommages causés par des combats. Si elle est décochée, des dommages causés par les combats peuvent avoir lieu."/>
+ <check_box label="Pas de bousculades" left="14" bottom="-140"
+ name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain."/>
+ <check_box label="Afficher dans la recherche (30 L$/semaine) sous" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche" bottom="-160"/>
+ <combo_box name="land category" left="286" width="146" bottom="-160">
+ <combo_item name="AnyCategory">
+ Toutes catégories
+ </combo_item>
+ <combo_item name="LindenLocation">
+ Appartenant aux Lindens
+ </combo_item>
+
+
+ <combo_item name="Arts&Culture">
+ Art et Culture
+ </combo_item>
+ <combo_item name="Business">
+ Affaires
+ </combo_item>
+ <combo_item name="Educational">
+ Éducation
+ </combo_item>
+ <combo_item name="Gaming">
+ Jeux
+ </combo_item>
+ <combo_item name="Hangout">
+ Favoris
+ </combo_item>
+ <combo_item name="NewcomerFriendly">
+ Accueil pour les nouveaux
+ </combo_item>
+ <combo_item name="Parks&Nature">
+ Parcs et Nature
+ </combo_item>
+ <combo_item name="Residential">
+ Résidentiel
+ </combo_item>
+ <combo_item name="Shopping">
+ Shopping
+ </combo_item>
+ <combo_item name="Other">
+ Autre
+ </combo_item>
+ </combo_box>
+ <button label="?" label_selected="?" name="?" left="436" bottom="-160"/>
+ <check_box name="MatureCheck" bottom="-180"/>
+ <text length="1" name="Snapshot:" type="string" bottom="-200">
+ Photo :
+ </text>
+ <texture_picker label="" name="snapshot_ctrl" tool_tip="Cliquez pour sélectionner une image" bottom="-319"/>
+ <text name="landing_point" bottom="-323">
+ Lieu d'arrivée : [LANDING]
+ </text>
+ <string name="landing_point_none">
+ (aucun)
+ </string>
+ <button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d'arrivée des visiteurs. Définit l'emplacement de votre avatar sur ce terrain." bottom="-323"/>
+ <button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Libérer le lieu d'arrivée." bottom="-323"/>
+ <text length="1" name="Teleport Routing: " type="string" bottom="-343">
+ Règles de téléportation :
+ </text>
+ <combo_box name="landing type" tool_tip="Vous permet de paramétrer les téléportations sur votre terrain." left="140" width="140" bottom="-343">
+ <combo_item length="1" name="Blocked" type="string">
+ Bloqué
+ </combo_item>
+ <combo_item length="1" name="LandingPoint" type="string">
+ Lieu d'arrivée fixe
+ </combo_item>
+ <combo_item length="1" name="Anywhere" type="string">
+ Lieu d'arrivée libre
+ </combo_item>
+ </combo_box>
+ <string name="push_restrict_text">
+ Pas de bousculades
+ </string>
+ <string name="push_restrict_region_text">
+ Pas de bousculades (les règles de la région priment)
+ </string>
+ </panel>
+ <panel label="Médias" name="land_media_panel">
+ <text name="with media:" width="85">
+ Type de média :
+ </text>
+ <combo_box name="media type" tool_tip="Indiquez s'il s'agit de l'URL d'un film, d'une page web ou autre" left="97"/>
+ <text name="mime_type"/>
+ <text name="at URL:" width="85">
+ URL du média :
+ </text>
+ <line_editor name="media_url" left="97"/>
+ <button label="Définir..." label_selected="Définir..." name="set_media_url"/>
+ <text name="Description:">
+ Description :
+ </text>
+ <line_editor name="url_description" tool_tip="Texte affiché à côté du bouton Jouer/Charger" left="97"/>
+ <text length="1" name="Media texture:" type="string">
+ Remplacer
+la texture :
+ </text>
+ <texture_picker label="" name="media texture" tool_tip="Cliquez pour sélectionner une image" left="97"/>
+ <text name="replace_texture_help">
+ (Les objets avec cette texture affichent le film ou
+la page web quand vous cliquez sur la flèche Jouer.)
+ </text>
+ <text name="Options:">
+ Options
+média :
+ </text>
+ <check_box left="97" label="Échelle automatique" name="media_auto_scale" tool_tip="Si vous sélectionnez cette option, le contenu de cette parcelle sera automatiquement mis à l'échelle. La qualité visuelle sera peut-être amoindrie mais vous n'aurez à faire aucune autre mise à l'échelle ou alignement."/>
+ <check_box label="Média en boucle" name="media_loop" tool_tip="Jouer le média en boucle. Lorsque le média aura fini de jouer, il recommencera."/>
+ <check_box left="97" label="Masquer l'URL du média" name="hide_media_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l'URL du média. Cette option n'est pas disponible pour les fichiers HTML."/>
+ <check_box label="Masquer l'URL de la musique" name="hide_music_url" tool_tip="Si vous cochez cette option, les personnes non autorisées à accéder aux infos de cette parcelle ne verront pas l'URL de la musique."/>
+ <text name="media_size" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." width="105" left="102">
+ Taille du média :
+ </text>
+ <spinner name="media_size_width" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." left_delta="89"/>
+ <spinner name="media_size_height" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut."/>
+ <text name="pixels">
+ pixels
+ </text>
+ <text name="MusicURL:" bottom_delta="-28">
+ URL de la
+musique :
+ </text>
+ <line_editor name="music_url" left="97" bottom_delta="-12"/>
+ <text name="Sound:">
+ Son :
+ </text>
+ <check_box label="Limiter le son ambiant à cette parcelle" name="check sound local" left="97" />
+ <text name="Voice settings:">
+ Voix :
+ </text>
+ <radio_group name="parcel_voice_channel" left="97" width="310">
+ <radio_item name="Estate">
+ Utiliser le canal du domaine
+ </radio_item>
+ <radio_item name="Private">
+ Utiliser un canal privé
+ </radio_item>
+ <radio_item name="Disabled">
+ Désactiver les canaux audios
+ </radio_item>
+ </radio_group>
+ </panel>
+ <panel label="Accès" name="land_access_panel">
+ <text length="1" name="Limit access to this parcel to:" type="string">
+ Accès à cette parcelle
+ </text>
+ <check_box label="Autoriser l'accès public" name="public_access"/>
+ <text name="Only Allow">
+ Bloquer l'accès aux résidents :
+ </text>
+ <check_box label="Qui n'ont pas fourni leurs informations de paiement à Linden Lab" name="limit_payment" tool_tip="Aux résidents non identifés"/>
+ <check_box label="Dont l'âge n'a pas été vérifié" name="limit_age_verified" tool_tip="Aux résidents dont l'âge n'a pas été vérifié. Pour plus d'infos, consultez la page support.secondlife.com."/>
+ <string name="estate_override">
+ Au moins une de ces options est définie au niveau du domaine.
+ </string>
+ <check_box label="Autoriser l'accès au groupe : [GROUP]" name="GroupCheck" tool_tip="Définir le groupe à l'onglet Général."/>
+ <check_box label="Vendre des pass à  :" name="PassCheck" tool_tip="Autoriser un accès temporaire à cette parcelle"/>
+ <combo_box name="pass_combo">
+ <combo_item name="Anyone">
+ Tout le monde
+ </combo_item>
+ <combo_item name="Group">
+ Groupe
+ </combo_item>
+ </combo_box>
+ <spinner label="Prix en L$Â :" name="PriceSpin"/>
+ <spinner label="Durée en heures :" name="HoursSpin"/>
+ <text label="Toujours autoriser" name="AllowedText">
+ Résidents autorisés
+ </text>
+ <name_list name="AccessList" tool_tip="([LISTED] listés, [MAX] max)"/>
+ <button label="Ajouter..." label_selected="Ajouter..." name="add_allowed"/>
+ <button label="Supprimer" label_selected="Supprimer" name="remove_allowed"/>
+ <text label="Bannir" name="BanCheck">
+ Résidents bannis
+ </text>
+ <name_list name="BannedList" tool_tip="([LISTED] listés, [MAX] max)"/>
+ <button label="Ajouter..." label_selected="Ajouter..." name="add_banned"/>
+ <button label="Supprimer" label_selected="Supprimer" name="remove_banned"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
index 4af68a6cf4..a1c3ef35b3 100644
--- a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
@@ -1,165 +1,165 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
- <text name="name_label">
- Nom :
- </text>
- <text name="description_label">
- Description :
- </text>
- <spinner label="Priorité" name="priority" tool_tip="Contrôle quelles animations peuvent êtres écrasées par cette animation."/>
- <text name="preview_label" width="110">
- Prévisualiser pendant
- </text>
- <combo_box label="" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales." left_delta="116" width="124">
- <combo_item name="Standing">
- Debout
- </combo_item>
- <combo_item name="Walking">
- En train de marcher
- </combo_item>
- <combo_item name="Sitting">
- Assis
- </combo_item>
- <combo_item name="Flying">
- En train de voler
- </combo_item>
- </combo_box>
- <check_box left="6" label="Boucle" name="loop_check" tool_tip="Joue cette animation en boucle."/>
- <spinner left="76" label_width="55" width="105" label="Début (%)" name="loop_in_point" tool_tip="Définit le moment de l'animation où la boucle repart."/>
- <spinner left="195" label="Fin (%)" name="loop_out_point" tool_tip="Définit le moment de l'animation où la boucle finit."/>
- <text name="hand_label" width="110">
- Mouvement de main
- </text>
- <combo_box label="" name="hand_pose_combo" tool_tip="Contrôle le mouvement des mains au cours de l'animation" left_delta="116" width="124">
- <combo_item name="Spread">
- Doigts écartés
- </combo_item>
- <combo_item name="Relaxed">
- Détendues
- </combo_item>
- <combo_item name="PointBoth">
- Pointer (les deux)
- </combo_item>
- <combo_item name="Fist">
- Poing
- </combo_item>
- <combo_item name="RelaxedLeft">
- Détendue (gauche)
- </combo_item>
- <combo_item name="PointLeft">
- Pointer (gauche)
- </combo_item>
- <combo_item name="FistLeft">
- Poing (gauche)
- </combo_item>
- <combo_item name="RelaxedRight">
- Détendue (droite)
- </combo_item>
- <combo_item name="PointRight">
- Pointer (droite)
- </combo_item>
- <combo_item name="FistRight">
- Poing (droite)
- </combo_item>
- <combo_item name="SaluteRight">
- Saluer (droite)
- </combo_item>
- <combo_item name="Typing">
- Taper
- </combo_item>
- <combo_item name="PeaceRight">
- Paix (main droite)
- </combo_item>
- </combo_box>
- <text name="emote_label">
- Expression
- </text>
- <combo_box label="" name="emote_combo" tool_tip="Contrôle l'expression du visage au cours de l'animation." left_delta="116" width="124">
- <combo_item name="[None]">
- [None]
- </combo_item>
- <combo_item name="Aaaaah">
- Aaaaah
- </combo_item>
- <combo_item name="Afraid">
- Effrayé
- </combo_item>
- <combo_item name="Angry">
- En colère
- </combo_item>
- <combo_item name="BigSmile">
- Grand sourire
- </combo_item>
- <combo_item name="Bored">
- Ennui
- </combo_item>
- <combo_item name="Cry">
- Pleurer
- </combo_item>
- <combo_item name="Disdain">
- Mépris
- </combo_item>
- <combo_item name="Embarrassed">
- Gêne
- </combo_item>
- <combo_item name="Frown">
- Froncer les sourcils
- </combo_item>
- <combo_item name="Kiss">
- Embrasser
- </combo_item>
- <combo_item name="Laugh">
- Rire
- </combo_item>
- <combo_item name="Plllppt">
- Plllppt
- </combo_item>
- <combo_item name="Repulsed">
- Dégoût
- </combo_item>
- <combo_item name="Sad">
- Triste
- </combo_item>
- <combo_item name="Shrug">
- Hausser les épaules
- </combo_item>
- <combo_item name="Smile">
- Sourire
- </combo_item>
- <combo_item name="Surprise">
- Surprise
- </combo_item>
- <combo_item name="Wink">
- Clin d'Å“il
- </combo_item>
- <combo_item name="Worry">
- Soucis
- </combo_item>
- </combo_box>
- <spinner label_width="65" label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) pendant laquelle l'animation s'intègre au mouvement."/>
- <spinner label_width="65" left="160" width="125" label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) pendant laquelle l'animation disparaît du mouvement."/>
- <button label="" name="play_btn" tool_tip="Jouer/Arrêter votre animation." bottom_delta="-48"/>
- <button label="" name="stop_btn" tool_tip="Arrêter le playback"/>
- <slider label="" name="playback_slider"/>
- <text name="bad_animation_text">
- Impossible de lire le fichier d'animation.
-
-Nous recommandons les fichiers BVH extraits de
-Poser 4.
- </text>
- <button label="Annuler" name="cancel_btn"/>
- <button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
- <string name="failed_to_initialize">
- Echec de l'initialisation du mouvement
- </string>
- <string name="anim_too_long">
- Le fichier d'animation fait [LENGTH] secondes.
-
-La longueur maximale est de [MAX_LENGTH] secondes.
- </string>
- <string name="failed_file_read">
- Impossible de lire le fichier d'animation.
-
-[STATUS]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Animation Preview" title="">
+ <text name="name_label">
+ Nom :
+ </text>
+ <text name="description_label">
+ Description :
+ </text>
+ <spinner label="Priorité" name="priority" tool_tip="Contrôle quelles animations peuvent êtres écrasées par cette animation."/>
+ <text name="preview_label" width="110">
+ Prévisualiser pendant
+ </text>
+ <combo_box label="" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales." left_delta="116" width="124">
+ <combo_box.item name="Standing">
+ Debout
+ </combo_box.item>
+ <combo_box.item name="Walking">
+ En train de marcher
+ </combo_box.item>
+ <combo_box.item name="Sitting">
+ Assis
+ </combo_box.item>
+ <combo_box.item name="Flying">
+ En train de voler
+ </combo_box.item>
+ </combo_box>
+ <check_box left="6" label="Boucle" name="loop_check" tool_tip="Joue cette animation en boucle."/>
+ <spinner left="76" label_width="55" width="105" label="Début (%)" name="loop_in_point" tool_tip="Définit le moment de l'animation où la boucle repart."/>
+ <spinner left="195" label="Fin (%)" name="loop_out_point" tool_tip="Définit le moment de l'animation où la boucle finit."/>
+ <text name="hand_label" width="110">
+ Mouvement de main
+ </text>
+ <combo_box label="" name="hand_pose_combo" tool_tip="Contrôle le mouvement des mains au cours de l'animation" left_delta="116" width="124">
+ <combo_box.item name="Spread">
+ Doigts écartés
+ </combo_box.item>
+ <combo_box.item name="Relaxed">
+ Détendues
+ </combo_box.item>
+ <combo_box.item name="PointBoth">
+ Pointer (les deux)
+ </combo_box.item>
+ <combo_box.item name="Fist">
+ Poing
+ </combo_box.item>
+ <combo_box.item name="RelaxedLeft">
+ Détendue (gauche)
+ </combo_box.item>
+ <combo_box.item name="PointLeft">
+ Pointer (gauche)
+ </combo_box.item>
+ <combo_box.item name="FistLeft">
+ Poing (gauche)
+ </combo_box.item>
+ <combo_box.item name="RelaxedRight">
+ Détendue (droite)
+ </combo_box.item>
+ <combo_box.item name="PointRight">
+ Pointer (droite)
+ </combo_box.item>
+ <combo_box.item name="FistRight">
+ Poing (droite)
+ </combo_box.item>
+ <combo_box.item name="SaluteRight">
+ Saluer (droite)
+ </combo_box.item>
+ <combo_box.item name="Typing">
+ Taper
+ </combo_box.item>
+ <combo_box.item name="PeaceRight">
+ Paix (main droite)
+ </combo_box.item>
+ </combo_box>
+ <text name="emote_label">
+ Expression
+ </text>
+ <combo_box label="" name="emote_combo" tool_tip="Contrôle l'expression du visage au cours de l'animation." left_delta="116" width="124">
+ <combo_box.item name="[None]">
+ [None]
+ </combo_box.item>
+ <combo_box.item name="Aaaaah">
+ Aaaaah
+ </combo_box.item>
+ <combo_box.item name="Afraid">
+ Effrayé
+ </combo_box.item>
+ <combo_box.item name="Angry">
+ En colère
+ </combo_box.item>
+ <combo_box.item name="BigSmile">
+ Grand sourire
+ </combo_box.item>
+ <combo_box.item name="Bored">
+ Ennui
+ </combo_box.item>
+ <combo_box.item name="Cry">
+ Pleurer
+ </combo_box.item>
+ <combo_box.item name="Disdain">
+ Mépris
+ </combo_box.item>
+ <combo_box.item name="Embarrassed">
+ Gêne
+ </combo_box.item>
+ <combo_box.item name="Frown">
+ Froncer les sourcils
+ </combo_box.item>
+ <combo_box.item name="Kiss">
+ Embrasser
+ </combo_box.item>
+ <combo_box.item name="Laugh">
+ Rire
+ </combo_box.item>
+ <combo_box.item name="Plllppt">
+ Plllppt
+ </combo_box.item>
+ <combo_box.item name="Repulsed">
+ Dégoût
+ </combo_box.item>
+ <combo_box.item name="Sad">
+ Triste
+ </combo_box.item>
+ <combo_box.item name="Shrug">
+ Hausser les épaules
+ </combo_box.item>
+ <combo_box.item name="Smile">
+ Sourire
+ </combo_box.item>
+ <combo_box.item name="Surprise">
+ Surprise
+ </combo_box.item>
+ <combo_box.item name="Wink">
+ Clin d'Å“il
+ </combo_box.item>
+ <combo_box.item name="Worry">
+ Soucis
+ </combo_box.item>
+ </combo_box>
+ <spinner label_width="65" label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) pendant laquelle l'animation s'intègre au mouvement."/>
+ <spinner label_width="65" left="160" width="125" label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) pendant laquelle l'animation disparaît du mouvement."/>
+ <button label="" name="play_btn" tool_tip="Jouer/Arrêter votre animation." bottom_delta="-48"/>
+ <button label="" name="stop_btn" tool_tip="Arrêter le playback"/>
+ <slider label="" name="playback_slider"/>
+ <text name="bad_animation_text">
+ Impossible de lire le fichier d'animation.
+
+Nous recommandons les fichiers BVH extraits de
+Poser 4.
+ </text>
+ <button label="Annuler" name="cancel_btn"/>
+ <button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
+ <string name="failed_to_initialize">
+ Echec de l'initialisation du mouvement
+ </string>
+ <string name="anim_too_long">
+ Le fichier d'animation fait [LENGTH] secondes.
+
+La longueur maximale est de [MAX_LENGTH] secondes.
+ </string>
+ <string name="failed_file_read">
+ Impossible de lire le fichier d'animation.
+
+[STATUS]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_auction.xml b/indra/newview/skins/default/xui/fr/floater_auction.xml
index 75a8e2f1f3..90e70c6094 100644
--- a/indra/newview/skins/default/xui/fr/floater_auction.xml
+++ b/indra/newview/skins/default/xui/fr/floater_auction.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_auction" title="Commencer la vente de terrain Linden">
- <check_box label="Inclure le marquage de sélection jaune" name="fence_check" />
- <combo_box name="saletype_combo">
- <combo_item name="Auction">
- Enchères
- </combo_item>
- <combo_item name="FirstLand">
- Premier terrain
- </combo_item>
- </combo_box>
- <button label="Capture d'écran" label_selected="Capture d'écran"
- name="snapshot_btn" width="110" />
- <button label="OK" label_selected="OK" name="ok_btn" left_delta="114"/>
- <text name="already for sale">
- Vous ne pouvez pas mettre aux enchères des parcelles déjà en vente.
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_auction" title="Commencer la vente de terrain Linden">
+ <check_box label="Inclure le marquage de sélection jaune" name="fence_check" />
+ <combo_box name="saletype_combo">
+ <combo_box.item name="Auction">
+ Enchères
+ </combo_box.item>
+ <combo_box.item name="FirstLand">
+ Premier terrain
+ </combo_box.item>
+ </combo_box>
+ <button label="Capture d'écran" label_selected="Capture d'écran"
+ name="snapshot_btn" width="110" />
+ <button label="OK" label_selected="OK" name="ok_btn" left_delta="114"/>
+ <text name="already for sale">
+ Vous ne pouvez pas mettre aux enchères des parcelles déjà en vente.
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
index d98cb5aad3..82d715d941 100644
--- a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatarpicker" title="Choisir le résident">
- <text name="Type part of the person's name:">
- Entrez les premières lettres du nom de la personne :
- </text>
- <text name="instruct_search_resident_name">
- Saisissez une partie du nom du résident :
- </text>
- <button label="Chercher" label_selected="Chercher" name="Find"/>
- <text name="Or select a calling card:">
- Ou sélectionnez une carte de visite :
- </text>
- <text name="Or select their calling card:">
- Ou sélectionnez une carte de visite :
- </text>
- <button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
- <button label="Fermer" label_selected="Fermer" name="Close"/>
- <text name="NotFound">
- '[TEXT]' introuvable
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarpicker" title="Choisir le résident">
+ <text name="Type part of the person's name:">
+ Entrez les premières lettres du nom de la personne :
+ </text>
+ <text name="instruct_search_resident_name">
+ Saisissez une partie du nom du résident :
+ </text>
+ <button label="Chercher" label_selected="Chercher" name="Find"/>
+ <text name="Or select a calling card:">
+ Ou sélectionnez une carte de visite :
+ </text>
+ <text name="Or select their calling card:">
+ Ou sélectionnez une carte de visite :
+ </text>
+ <button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
+ <button label="Fermer" label_selected="Fermer" name="Close"/>
+ <text name="NotFound">
+ '[TEXT]' introuvable
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
index 63f5ae8573..929bc31d9c 100644
--- a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="avatar_texture_debug" title="Textures de l'avatar">
- <text name="">
- Baked Textures
- </text>
- <text name="">
- Composite Textures
- </text>
- <text name="baked_label">
- Textures fixées
- </text>
- <text name="composite_label">
- Textures composées
- </text>
- <texture_picker label="Tête" name="baked_head" />
- <texture_picker label="Maquillage" name="head_bodypaint" />
- <texture_picker label="Cheveux" name="hair" />
- <button label="Vider" label_selected="Vider" name="Dump" />
- <texture_picker label="Yeux" name="baked_eyes" />
- <texture_picker label="Å’il" name="eye_texture" />
- <texture_picker label="Haut du corps" name="baked_upper_body" />
- <texture_picker label="Tatouage haut du corps" name="upper_bodypaint" />
- <texture_picker label="Tricot" name="undershirt" />
- <texture_picker label="Gants" name="gloves" />
- <texture_picker label="Chemise" name="shirt" />
- <texture_picker label="Veste (en haut)" name="upper_jacket" />
- <texture_picker label="
-Bas du corps
-" name="baked_lower_body" />
- <texture_picker label="Tatouage bas du corps" name="lower_bodypaint" />
- <texture_picker label="Sous-vêtements" name="underpants" />
- <texture_picker label="Chaussettes" name="socks" />
- <texture_picker label="Chaussures" name="shoes" />
- <texture_picker label="Pantalon" name="pants" />
- <texture_picker label="Veste" name="jacket" />
- <texture_picker label="Jupe" name="baked_skirt" />
- <texture_picker label="Jupe" name="skirt_texture" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="avatar_texture_debug" title="Textures de l'avatar">
+ <text name="">
+ Baked Textures
+ </text>
+ <text name="">
+ Composite Textures
+ </text>
+ <text name="baked_label">
+ Textures fixées
+ </text>
+ <text name="composite_label">
+ Textures composées
+ </text>
+ <texture_picker label="Tête" name="baked_head" />
+ <texture_picker label="Maquillage" name="head_bodypaint" />
+ <texture_picker label="Cheveux" name="hair" />
+ <button label="Vider" label_selected="Vider" name="Dump" />
+ <texture_picker label="Yeux" name="baked_eyes" />
+ <texture_picker label="Å’il" name="eye_texture" />
+ <texture_picker label="Haut du corps" name="baked_upper_body" />
+ <texture_picker label="Tatouage haut du corps" name="upper_bodypaint" />
+ <texture_picker label="Tricot" name="undershirt" />
+ <texture_picker label="Gants" name="gloves" />
+ <texture_picker label="Chemise" name="shirt" />
+ <texture_picker label="Veste (en haut)" name="upper_jacket" />
+ <texture_picker label="
+Bas du corps
+" name="baked_lower_body" />
+ <texture_picker label="Tatouage bas du corps" name="lower_bodypaint" />
+ <texture_picker label="Sous-vêtements" name="underpants" />
+ <texture_picker label="Chaussettes" name="socks" />
+ <texture_picker label="Chaussures" name="shoes" />
+ <texture_picker label="Pantalon" name="pants" />
+ <texture_picker label="Veste" name="jacket" />
+ <texture_picker label="Jupe" name="baked_skirt" />
+ <texture_picker label="Jupe" name="skirt_texture" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_beacons.xml b/indra/newview/skins/default/xui/fr/floater_beacons.xml
index 06bcdee28c..76e05a26ec 100644
--- a/indra/newview/skins/default/xui/fr/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/fr/floater_beacons.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="Balises">
- <panel name="beacons_panel">
- <check_box label="Objets scriptés avec Toucher uniquement" name="touch_only"/>
- <check_box label="Objets scriptés" name="scripted"/>
- <check_box label="Objets physiques" name="physical"/>
- <check_box label="Sources sonores" name="sounds"/>
- <check_box label="Sources des particules" name="particles"/>
- <check_box label="Montrer les surbrillances" name="highlights"/>
- <check_box label="Montrer les balises" name="beacons"/>
- <text name="beacon_width_label">
- Largeur de la balise :
- </text>
- </panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Balises">
+ <panel name="beacons_panel">
+ <check_box label="Objets scriptés avec Toucher uniquement" name="touch_only"/>
+ <check_box label="Objets scriptés" name="scripted"/>
+ <check_box label="Objets physiques" name="physical"/>
+ <check_box label="Sources sonores" name="sounds"/>
+ <check_box label="Sources des particules" name="particles"/>
+ <check_box label="Montrer les surbrillances" name="highlights"/>
+ <check_box label="Montrer les balises" name="beacons"/>
+ <text name="beacon_width_label">
+ Largeur de la balise :
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_build_options.xml b/indra/newview/skins/default/xui/fr/floater_build_options.xml
index 0906059e34..3451c2de4c 100644
--- a/indra/newview/skins/default/xui/fr/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_build_options.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="build options floater" title="Options de la grille">
- <spinner label="Unité (mètres)" name="GridResolution" />
- <spinner label="Mesures (mètres)" name="GridDrawSize" />
- <check_box label="Activer la fixation des sous-unités" name="GridSubUnit" />
- <check_box label="Afficher les sections transversales" name="GridCrossSection" />
- <slider label="Opacité de la grille" name="GridOpacity" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="build options floater" title="Options de la grille">
+ <spinner label="Unité (mètres)" name="GridResolution" />
+ <spinner label="Mesures (mètres)" name="GridDrawSize" />
+ <check_box label="Activer la fixation des sous-unités" name="GridSubUnit" />
+ <check_box label="Afficher les sections transversales" name="GridCrossSection" />
+ <slider label="Opacité de la grille" name="GridOpacity" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_bumps.xml b/indra/newview/skins/default/xui/fr/floater_bumps.xml
index f9f3bc89f8..e12c7ed17d 100644
--- a/indra/newview/skins/default/xui/fr/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bumps.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_bumps" title="Collisions, coups et bousculades">
- <text name="none_detected">
- Aucun détecté
- </text>
- <text name="bump">
- [TIME] [FIRST] [LAST] est entré en collision avec vous
- </text>
- <text name="llpushobject">
- [TIME] [FIRST] [LAST] vous a bousculé avec un script
- </text>
- <text name="selected_object_collide">
- [TIME] [FIRST] [LAST] vous a donné un coup avec un objet
- </text>
- <text name="scripted_object_collide">
- [TIME] [FIRST] [LAST] vous a donné un coup avec un objet scripté
- </text>
- <text name="physical_object_collide">
- [TIME] [FIRST] [LAST] vous a donné un coup avec un objet physique
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_bumps" title="Collisions, coups et bousculades">
+ <text name="none_detected">
+ Aucun détecté
+ </text>
+ <text name="bump">
+ [TIME] [FIRST] [LAST] est entré en collision avec vous
+ </text>
+ <text name="llpushobject">
+ [TIME] [FIRST] [LAST] vous a bousculé avec un script
+ </text>
+ <text name="selected_object_collide">
+ [TIME] [FIRST] [LAST] vous a donné un coup avec un objet
+ </text>
+ <text name="scripted_object_collide">
+ [TIME] [FIRST] [LAST] vous a donné un coup avec un objet scripté
+ </text>
+ <text name="physical_object_collide">
+ [TIME] [FIRST] [LAST] vous a donné un coup avec un objet physique
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
index a305c305bf..3d55a1ef70 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_contents" title="Acheter des contenus">
- <text name="contains_text">
- [NAME] contient :
- </text>
- <text name="buy_text">
- Acheter [AMOUNT] L$ Ã [NAME] ?
- </text>
- <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
- <button label="Acheter" label_selected="Acheter" name="buy_btn"/>
- <check_box label="Porter maintenant" name="wear_check"/>
- <string name="no_copy_text">
- (pas de copie)
- </string>
- <string name="no_modify_text">
- (pas de modification)
- </string>
- <string name="no_transfer_text">
- (pas de transfert)
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_buy_contents" title="Acheter des contenus">
+ <text name="contains_text">
+ [NAME] contient :
+ </text>
+ <text name="buy_text">
+ Acheter [AMOUNT] L$ Ã [NAME] ?
+ </text>
+ <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+ <button label="Acheter" label_selected="Acheter" name="buy_btn"/>
+ <check_box label="Porter maintenant" name="wear_check"/>
+ <string name="no_copy_text">
+ (pas de copie)
+ </string>
+ <string name="no_modify_text">
+ (pas de modification)
+ </string>
+ <string name="no_transfer_text">
+ (pas de transfert)
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
index 3268a428f5..9ae924c28a 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy currency" title="Acheter des L$">
- <text left="5" name="info_buying">
- Achat de L$Â :
- </text>
- <text left="5" name="info_cannot_buy" right="-5">
- Impossible d'acheter maintenant :
- </text>
- <text left="5" name="info_need_more" right="-5">
- Vous avez besoin de plus de devises:
- </text>
- <text name="error_message">
- Quelque chose ne va pas.
- </text>
- <button label="Aller sur le site" name="error_web"/>
- <text name="contacting">
- En train de contacter le Lindex...
- </text>
- <text name="buy_action_unknown" right="-5">
- Acheter des L$ sur le marché du LindeX
- </text>
- <text name="buy_action">
- [NAME] L$ [PRICE]
- </text>
- <text name="currency_action">
- Acheter des L$
- </text>
- <line_editor name="currency_amt">
- 1234
- </line_editor>
- <text name="currency_est" width="138">
- pour environ [USD] US$
- </text>
- <text name="getting_data" width="138">
- Obtention des données...
- </text>
- <text name="balance_label">
- Actuellement, vous avez
- </text>
- <text name="balance_amount">
- [AMT] L$
- </text>
- <text name="buying_label">
- Vous achetez
- </text>
- <text name="buying_amount">
- [AMT] L$
- </text>
- <text name="total_label">
- Votre solde sera de
- </text>
- <text name="total_amount">
- [AMT] L$
- </text>
- <text name="purchase_warning_repurchase">
- En confirmant cette transaction, vous achetez uniquement les devises.
-Vous devrez recommencer cette opération.
- </text>
- <text name="purchase_warning_notenough">
- Vous n'achetez pas assez de devises.
-Veuillez saisir un montant plus élevé.
- </text>
- <button label="Acheter" name="buy_btn"/>
- <button label="Annuler" name="cancel_btn"/>
- <string name="buy_currency">
- Acheter [LINDENS] L$ pour environ [USD] US$
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy currency" title="Acheter des L$">
+ <text left="5" name="info_buying">
+ Achat de L$Â :
+ </text>
+ <text left="5" name="info_cannot_buy" right="-5">
+ Impossible d'acheter maintenant :
+ </text>
+ <text left="5" name="info_need_more" right="-5">
+ Vous avez besoin de plus de devises:
+ </text>
+ <text name="error_message">
+ Quelque chose ne va pas.
+ </text>
+ <button label="Aller sur le site" name="error_web"/>
+ <text name="contacting">
+ En train de contacter le Lindex...
+ </text>
+ <text name="buy_action_unknown" right="-5">
+ Acheter des L$ sur le marché du LindeX
+ </text>
+ <text name="buy_action">
+ [NAME] L$ [PRICE]
+ </text>
+ <text name="currency_action">
+ Acheter des L$
+ </text>
+ <line_editor name="currency_amt">
+ 1234
+ </line_editor>
+ <text name="currency_est" width="138">
+ pour environ [USD] US$
+ </text>
+ <text name="getting_data" width="138">
+ Obtention des données...
+ </text>
+ <text name="balance_label">
+ Actuellement, vous avez
+ </text>
+ <text name="balance_amount">
+ [AMT] L$
+ </text>
+ <text name="buying_label">
+ Vous achetez
+ </text>
+ <text name="buying_amount">
+ [AMT] L$
+ </text>
+ <text name="total_label">
+ Votre solde sera de
+ </text>
+ <text name="total_amount">
+ [AMT] L$
+ </text>
+ <text name="purchase_warning_repurchase">
+ En confirmant cette transaction, vous achetez uniquement les devises.
+Vous devrez recommencer cette opération.
+ </text>
+ <text name="purchase_warning_notenough">
+ Vous n'achetez pas assez de devises.
+Veuillez saisir un montant plus élevé.
+ </text>
+ <button label="Acheter" name="buy_btn"/>
+ <button label="Annuler" name="cancel_btn"/>
+ <string name="buy_currency">
+ Acheter [LINDENS] L$ pour environ [USD] US$
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index 6a4ee3aef3..935df46f14 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
@@ -1,236 +1,236 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy land" title="Acheter le terrain">
- <text name="region_name_label">
- Région :
- </text>
- <text name="region_name_text">
- (inconnue)
- </text>
- <text name="estate_name_label">
- Domaine :
- </text>
- <text name="estate_name_text">
- (inconnu)
- </text>
- <text name="estate_owner_label">
- Propriétaire :
- </text>
- <text name="estate_owner_text">
- (inconnu)
- </text>
- <text name="resellable_changeable_label">
- Terrain acheté dans cette région :
- </text>
- <text name="resellable_clause">
- Le terrain acheté dans cette région peut être revendu ou pas.
- </text>
- <text name="changeable_clause">
- peut être fusionné/divisé ou pas.
- </text>
- <text name="covenant_text">
- Vous devez accepter le règlement du domaine :
- </text>
- <text_editor name="covenant_editor">
- Chargement...
- </text_editor>
- <check_box label="J'accepte le règlement ci-dessus." name="agree_covenant"/>
- <text name="info_parcel_label">
- Parcelle :
- </text>
- <text name="info_parcel">
- Scotopteryx 138,204
- </text>
- <text name="info_size_label">
- Taille :
- </text>
- <text name="info_size">
- 1024 m²
- </text>
- <text name="info_price_label">
- Prix :
- </text>
- <text name="info_price">
- 1500 L$
- (1,1 L$/m²)
- vendu avec objets
- </text>
- <text name="info_action" width="275">
- Si vous achetez ce terrain :
- </text>
- <text name="error_message">
- Quelque chose ne va pas.
- </text>
- <button label="Aller sur le site" name="error_web"/>
- <text name="account_action">
- Vous passerez à un compte Premium.
- </text>
- <text name="account_reason">
- Seuls les membres Premium peuvent posséder du terrain.
- </text>
- <combo_box name="account_level">
- <combo_item name="US$9.95/month,billedmonthly">
- 9,95 US$/mois, facturation mensuelle
- </combo_item>
- <combo_item name="US$7.50/month,billedquarterly">
- 7,50 US$/mois, facturation trimestrielle
- </combo_item>
- <combo_item name="US$6.00/month,billedannually">
- 6,00 US$/mois, facturation annuelle
- </combo_item>
- </combo_box>
- <text name="land_use_action" right="430" width="210">
- Augmentez vos frais d'occupation de terrain à 40 US$/mois.
- </text>
- <text name="land_use_reason">
- Vous possédez un terrain de 1,309 mètres carrés.
-Cette parcelle fait 512 mètres carrés.
- </text>
- <text name="purchase_action">
- Payez au résident X 4 000 L$ pour le terrain
- </text>
- <text name="currency_reason">
- Vous avez 2 100 L$.
- </text>
- <text name="currency_action">
- Acheter des L$
- </text>
- <line_editor name="currency_amt">
- 1000
- </line_editor>
- <text name="currency_est">
- pour environ [AMOUNT2] US$
- </text>
- <text name="currency_balance">
- Vous avez 2 100 L$.
- </text>
- <check_box label="Supprimer [AMOUNT] mètres carrés de votre contribution au groupe." name="remove_contribution"/>
- <button label="Acheter" name="buy_btn"/>
- <button label="Annuler" name="cancel_btn"/>
- <string name="can_resell">
- Peut être revendu.
- </string>
- <string name="can_not_resell">
- Ne peut pas être revendu.
- </string>
- <string name="can_change">
- Peut être fusionné ou divisé.
- </string>
- <string name="can_not_change">
- Ne peut pas être fusionné ou divisé.
- </string>
- <string name="cant_buy_for_group">
- Vous n'avez pas la permission d'acheter de terrain pour votre groupe.
- </string>
- <string name="no_land_selected">
- Aucun terrain sélectionné.
- </string>
- <string name="multiple_parcels_selected">
- Vous avez sélectionné plusieurs parcelles.
-Sélectionnez une zone plus petite.
- </string>
- <string name="no_permission">
- Vous n'avez pas la permission d'acheter de terrain pour votre groupe.
- </string>
- <string name="parcel_not_for_sale">
- La parcelle sélectionnée n'est pas à vendre.
- </string>
- <string name="group_already_owns">
- La parcelle appartient déjà au groupe.
- </string>
- <string name="you_already_own">
- La parcelle vous appartient déjà .
- </string>
- <string name="set_to_sell_to_other">
- La parcelle sélectionnée doit déjà être vendue à quelqu'un d'autre.
- </string>
- <string name="no_public_land">
- Il n'y a pas de terrain public dans cette zone.
- </string>
- <string name="not_owned_by_you">
- Le terrain sélectionné appartient à quelqu'un d'autre.
-Sélectionnez une zone plus petite.
- </string>
- <string name="processing">
- Achat en cours de traitement...
-
-(Veuillez patienter quelques instants.)
- </string>
- <string name="fetching_error">
- Une erreur s'est produite pendant le traitement de l'achat du terrain.
- </string>
- <string name="buying_will">
- Si vous achetez ce terrain :
- </string>
- <string name="buying_for_group">
- Achat de terrain pour le groupe :
- </string>
- <string name="cannot_buy_now">
- Impossible d'acheter maintenant :
- </string>
- <string name="not_for_sale">
- Pas à vendre :
- </string>
- <string name="none_needed">
- aucun besoin
- </string>
- <string name="must_upgrade">
- Pour posséder du terrain, vous devez avoir un niveau de compte supérieur.
- </string>
- <string name="cant_own_land">
- Avec votre compte, vous pouvez posséder du terrain.
- </string>
- <string name="land_holdings">
- Vous possédez un terrain de [BUYER] m².
- </string>
- <string name="pay_to_for_land">
- Payez [AMOUNT] L$ Ã [SELLER] pour ce terrain
- </string>
- <string name="buy_for_US">
- Acheter [AMOUNT] L$ pour environ [AMOUNT2] US$,
- </string>
- <string name="parcel_meters">
- Cette parcelle fait [AMOUNT] m².
- </string>
- <string name="premium_land">
- Ce terrain est premium et les frais associés sont ceux d'un terrain de [AMOUNT] m².
- </string>
- <string name="discounted_land">
- Ce terrain est en solde et les frais associés sont ceux d'un terrain de [AMOUNT] m².
- </string>
- <string name="meters_supports_object">
- [AMOUNT] m²
-peuvent contenir [AMOUNT2] prims
- </string>
- <string name="sold_with_objects">
- vendu avec objets
- </string>
- <string name="sold_without_objects">
- objets non inclus
- </string>
- <string name="info_price_string">
- [PRICE] L$
-([PRICE_PER_SQM] L$/m²)
-[SOLD_WITH_OBJECTS]
- </string>
- <string name="insufficient_land_credits">
- Ce groupe, [GROUP], aura besoin de suffisamment de crédit pour payer les frais d'occupation de terrain avant que l'achat de cette parcelle ne soit finalisé.
- </string>
- <string name="have_enough_lindens">
- Vous avez [AMOUNT]L$, ce qui est suffisant pour acheter ce terrain.
- </string>
- <string name="not_enough_lindens">
- Vous n'avez que [AMOUNT] L$ et vous avez besoin de [AMOUNT2] L$ de plus.
- </string>
- <string name="balance_left">
- Après cet achat, il vous restera [AMOUNT] L$.
- </string>
- <string name="balance_needed">
- Pour avoir les moyens d'acquérir ce terrain, vous devez acheter au moins [AMOUNT] L$.
- </string>
- <string name="no_parcel_selected">
- (aucune parcelle sélectionnée)
- </string>
- <string name="buy_currency">
- Acheter [LINDENS] L$ pour environ [USD] US$
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy land" title="Acheter le terrain">
+ <text name="region_name_label">
+ Région :
+ </text>
+ <text name="region_name_text">
+ (inconnue)
+ </text>
+ <text name="estate_name_label">
+ Domaine :
+ </text>
+ <text name="estate_name_text">
+ (inconnu)
+ </text>
+ <text name="estate_owner_label">
+ Propriétaire :
+ </text>
+ <text name="estate_owner_text">
+ (inconnu)
+ </text>
+ <text name="resellable_changeable_label">
+ Terrain acheté dans cette région :
+ </text>
+ <text name="resellable_clause">
+ Le terrain acheté dans cette région peut être revendu ou pas.
+ </text>
+ <text name="changeable_clause">
+ peut être fusionné/divisé ou pas.
+ </text>
+ <text name="covenant_text">
+ Vous devez accepter le règlement du domaine :
+ </text>
+ <text_editor name="covenant_editor">
+ Chargement...
+ </text_editor>
+ <check_box label="J'accepte le règlement ci-dessus." name="agree_covenant"/>
+ <text name="info_parcel_label">
+ Parcelle :
+ </text>
+ <text name="info_parcel">
+ Scotopteryx 138,204
+ </text>
+ <text name="info_size_label">
+ Taille :
+ </text>
+ <text name="info_size">
+ 1024 m²
+ </text>
+ <text name="info_price_label">
+ Prix :
+ </text>
+ <text name="info_price">
+ 1500 L$
+ (1,1 L$/m²)
+ vendu avec objets
+ </text>
+ <text name="info_action" width="275">
+ Si vous achetez ce terrain :
+ </text>
+ <text name="error_message">
+ Quelque chose ne va pas.
+ </text>
+ <button label="Aller sur le site" name="error_web"/>
+ <text name="account_action">
+ Vous passerez à un compte Premium.
+ </text>
+ <text name="account_reason">
+ Seuls les membres Premium peuvent posséder du terrain.
+ </text>
+ <combo_box name="account_level">
+ <combo_item name="US$9.95/month,billedmonthly">
+ 9,95 US$/mois, facturation mensuelle
+ </combo_item>
+ <combo_item name="US$7.50/month,billedquarterly">
+ 7,50 US$/mois, facturation trimestrielle
+ </combo_item>
+ <combo_item name="US$6.00/month,billedannually">
+ 6,00 US$/mois, facturation annuelle
+ </combo_item>
+ </combo_box>
+ <text name="land_use_action" right="430" width="210">
+ Augmentez vos frais d'occupation de terrain à 40 US$/mois.
+ </text>
+ <text name="land_use_reason">
+ Vous possédez un terrain de 1,309 mètres carrés.
+Cette parcelle fait 512 mètres carrés.
+ </text>
+ <text name="purchase_action">
+ Payez au résident X 4 000 L$ pour le terrain
+ </text>
+ <text name="currency_reason">
+ Vous avez 2 100 L$.
+ </text>
+ <text name="currency_action">
+ Acheter des L$
+ </text>
+ <line_editor name="currency_amt">
+ 1000
+ </line_editor>
+ <text name="currency_est">
+ pour environ [AMOUNT2] US$
+ </text>
+ <text name="currency_balance">
+ Vous avez 2 100 L$.
+ </text>
+ <check_box label="Supprimer [AMOUNT] mètres carrés de votre contribution au groupe." name="remove_contribution"/>
+ <button label="Acheter" name="buy_btn"/>
+ <button label="Annuler" name="cancel_btn"/>
+ <string name="can_resell">
+ Peut être revendu.
+ </string>
+ <string name="can_not_resell">
+ Ne peut pas être revendu.
+ </string>
+ <string name="can_change">
+ Peut être fusionné ou divisé.
+ </string>
+ <string name="can_not_change">
+ Ne peut pas être fusionné ou divisé.
+ </string>
+ <string name="cant_buy_for_group">
+ Vous n'avez pas la permission d'acheter de terrain pour votre groupe.
+ </string>
+ <string name="no_land_selected">
+ Aucun terrain sélectionné.
+ </string>
+ <string name="multiple_parcels_selected">
+ Vous avez sélectionné plusieurs parcelles.
+Sélectionnez une zone plus petite.
+ </string>
+ <string name="no_permission">
+ Vous n'avez pas la permission d'acheter de terrain pour votre groupe.
+ </string>
+ <string name="parcel_not_for_sale">
+ La parcelle sélectionnée n'est pas à vendre.
+ </string>
+ <string name="group_already_owns">
+ La parcelle appartient déjà au groupe.
+ </string>
+ <string name="you_already_own">
+ La parcelle vous appartient déjà .
+ </string>
+ <string name="set_to_sell_to_other">
+ La parcelle sélectionnée doit déjà être vendue à quelqu'un d'autre.
+ </string>
+ <string name="no_public_land">
+ Il n'y a pas de terrain public dans cette zone.
+ </string>
+ <string name="not_owned_by_you">
+ Le terrain sélectionné appartient à quelqu'un d'autre.
+Sélectionnez une zone plus petite.
+ </string>
+ <string name="processing">
+ Achat en cours de traitement...
+
+(Veuillez patienter quelques instants.)
+ </string>
+ <string name="fetching_error">
+ Une erreur s'est produite pendant le traitement de l'achat du terrain.
+ </string>
+ <string name="buying_will">
+ Si vous achetez ce terrain :
+ </string>
+ <string name="buying_for_group">
+ Achat de terrain pour le groupe :
+ </string>
+ <string name="cannot_buy_now">
+ Impossible d'acheter maintenant :
+ </string>
+ <string name="not_for_sale">
+ Pas à vendre :
+ </string>
+ <string name="none_needed">
+ aucun besoin
+ </string>
+ <string name="must_upgrade">
+ Pour posséder du terrain, vous devez avoir un niveau de compte supérieur.
+ </string>
+ <string name="cant_own_land">
+ Avec votre compte, vous pouvez posséder du terrain.
+ </string>
+ <string name="land_holdings">
+ Vous possédez un terrain de [BUYER] m².
+ </string>
+ <string name="pay_to_for_land">
+ Payez [AMOUNT] L$ Ã [SELLER] pour ce terrain
+ </string>
+ <string name="buy_for_US">
+ Acheter [AMOUNT] L$ pour environ [AMOUNT2] US$,
+ </string>
+ <string name="parcel_meters">
+ Cette parcelle fait [AMOUNT] m².
+ </string>
+ <string name="premium_land">
+ Ce terrain est premium et les frais associés sont ceux d'un terrain de [AMOUNT] m².
+ </string>
+ <string name="discounted_land">
+ Ce terrain est en solde et les frais associés sont ceux d'un terrain de [AMOUNT] m².
+ </string>
+ <string name="meters_supports_object">
+ [AMOUNT] m²
+peuvent contenir [AMOUNT2] prims
+ </string>
+ <string name="sold_with_objects">
+ vendu avec objets
+ </string>
+ <string name="sold_without_objects">
+ objets non inclus
+ </string>
+ <string name="info_price_string">
+ [PRICE] L$
+([PRICE_PER_SQM] L$/m²)
+[SOLD_WITH_OBJECTS]
+ </string>
+ <string name="insufficient_land_credits">
+ Ce groupe, [GROUP], aura besoin de suffisamment de crédit pour payer les frais d'occupation de terrain avant que l'achat de cette parcelle ne soit finalisé.
+ </string>
+ <string name="have_enough_lindens">
+ Vous avez [AMOUNT]L$, ce qui est suffisant pour acheter ce terrain.
+ </string>
+ <string name="not_enough_lindens">
+ Vous n'avez que [AMOUNT] L$ et vous avez besoin de [AMOUNT2] L$ de plus.
+ </string>
+ <string name="balance_left">
+ Après cet achat, il vous restera [AMOUNT] L$.
+ </string>
+ <string name="balance_needed">
+ Pour avoir les moyens d'acquérir ce terrain, vous devez acheter au moins [AMOUNT] L$.
+ </string>
+ <string name="no_parcel_selected">
+ (aucune parcelle sélectionnée)
+ </string>
+ <string name="buy_currency">
+ Acheter [LINDENS] L$ pour environ [USD] US$
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_object.xml b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
index 2bbbbc97b4..9e0ce25b97 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="Acheter une copie de l'objet">
- <text name="contents_text">
- et ses contenus :
- </text>
- <text name="buy_text">
- Acheter pour [AMOUNT] L$ Ã [NAME] ?
- </text>
- <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
- <button label="Acheter" label_selected="Acheter" name="buy_btn"/>
- <string name="title_buy_text">
- Acheter
- </string>
- <string name="title_buy_copy_text">
- Acheter une copie
- </string>
- <string name="no_copy_text">
- (pas de copie)
- </string>
- <string name="no_modify_text">
- (pas de modification)
- </string>
- <string name="no_transfer_text">
- (pas de transfert)
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="contents" title="Acheter une copie de l'objet">
+ <text name="contents_text">
+ et ses contenus :
+ </text>
+ <text name="buy_text">
+ Acheter pour [AMOUNT] L$ Ã [NAME] ?
+ </text>
+ <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+ <button label="Acheter" label_selected="Acheter" name="buy_btn"/>
+ <string name="title_buy_text">
+ Acheter
+ </string>
+ <string name="title_buy_copy_text">
+ Acheter une copie
+ </string>
+ <string name="no_copy_text">
+ (pas de copie)
+ </string>
+ <string name="no_modify_text">
+ (pas de modification)
+ </string>
+ <string name="no_transfer_text">
+ (pas de transfert)
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
index 26c78d167d..9f280b7265 100644
--- a/indra/newview/skins/default/xui/fr/floater_camera.xml
+++ b/indra/newview/skins/default/xui/fr/floater_camera.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater">
- <string name="rotate_tooltip">
- Faire tourner la caméra autour du point central
- </string>
- <string name="zoom_tooltip">
- Zoomer en direction du point central
- </string>
- <string name="move_tooltip">
- Déplacer la caméra vers le haut et le bas, la gauche et la droite
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater">
+ <string name="rotate_tooltip">
+ Faire tourner la caméra autour du point central
+ </string>
+ <string name="zoom_tooltip">
+ Zoomer en direction du point central
+ </string>
+ <string name="move_tooltip">
+ Déplacer la caméra vers le haut et le bas, la gauche et la droite
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_choose_group.xml b/indra/newview/skins/default/xui/fr/floater_choose_group.xml
index bedc51cd10..ade440f296 100644
--- a/indra/newview/skins/default/xui/fr/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/fr/floater_choose_group.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="Groupes">
- <text name="groupdesc">
- Choisissez un groupe :
- </text>
- <button label="OK" label_selected="OK" name="OK" />
- <button label="Annuler" label_selected="Annuler" name="Cancel" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="groups" title="Groupes">
+ <text name="groupdesc">
+ Choisissez un groupe :
+ </text>
+ <button label="OK" label_selected="OK" name="OK" />
+ <button label="Annuler" label_selected="Annuler" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
index f6c210c4ce..adab86dac0 100644
--- a/indra/newview/skins/default/xui/fr/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="ColorPicker" title="Choix de texture et de couleur">
- <text name="r_val_text">
- Rouge :
- </text>
- <text name="g_val_text">
- Vert :
- </text>
- <text name="b_val_text">
- Bleu :
- </text>
- <text name="h_val_text">
- Teinte :
- </text>
- <text name="s_val_text">
- Sat :
- </text>
- <text name="l_val_text">
- Lum :
- </text>
- <check_box label="Application auto" left="4" name="apply_immediate" width="108"/>
- <button label="" label_selected="" left_delta="138" name="color_pipette"/>
- <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
- <button label="Sélectionner" label_selected="Sélectionner" name="select_btn"/>
- <text left="8" name="Current color:">
- Couleur actuelle :
- </text>
- <text left="8" name="(Drag below to save.)" width="114">
- (Faire glisser dessous
-pour enregistrer.)
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ColorPicker" title="Choix de texture et de couleur">
+ <text name="r_val_text">
+ Rouge :
+ </text>
+ <text name="g_val_text">
+ Vert :
+ </text>
+ <text name="b_val_text">
+ Bleu :
+ </text>
+ <text name="h_val_text">
+ Teinte :
+ </text>
+ <text name="s_val_text">
+ Sat :
+ </text>
+ <text name="l_val_text">
+ Lum :
+ </text>
+ <check_box label="Application auto" left="4" name="apply_immediate" width="108"/>
+ <button label="" label_selected="" left_delta="138" name="color_pipette"/>
+ <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+ <button label="Sélectionner" label_selected="Sélectionner" name="select_btn"/>
+ <text left="8" name="Current color:">
+ Couleur actuelle :
+ </text>
+ <text left="8" name="(Drag below to save.)" width="114">
+ (Faire glisser dessous
+pour enregistrer.)
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_critical.xml b/indra/newview/skins/default/xui/fr/floater_critical.xml
index de7cfe0487..6d30d97048 100644
--- a/indra/newview/skins/default/xui/fr/floater_critical.xml
+++ b/indra/newview/skins/default/xui/fr/floater_critical.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title=" ">
- <button label="Continuer" label_selected="Continuer" name="Continue" />
- <button label="Annuler" label_selected="Annuler" name="Cancel" />
- <text name="tos_heading">
- Veuillez lire le message suivant avec attention.
- </text>
- <text_editor name="tos_text">
- TOS_TEXT
- </text_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title=" ">
+ <button label="Continuer" label_selected="Continuer" name="Continue" />
+ <button label="Annuler" label_selected="Annuler" name="Cancel" />
+ <text name="tos_heading">
+ Veuillez lire le message suivant avec attention.
+ </text>
+ <text_editor name="tos_text">
+ TOS_TEXT
+ </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_customize.xml b/indra/newview/skins/default/xui/fr/floater_customize.xml
index a5c0857a07..e718907709 100644
--- a/indra/newview/skins/default/xui/fr/floater_customize.xml
+++ b/indra/newview/skins/default/xui/fr/floater_customize.xml
@@ -1,449 +1,449 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="Apparence" width="563">
- <tab_container name="customize tab container" tab_min_width="165" width="561">
- <panel label="Parties du corps"/>
- <panel label="Parties du corps" name="body_parts_placeholder"/>
- <panel label="Silhouette" left="169" name="Shape" width="389">
- <button label="Créer une silhouette" label_selected="Créer une silhouette" name="Create New" width="140"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <button label="Corps" label_selected="Corps" name="Body"/>
- <button label="Tête" label_selected="Tête" name="Head"/>
- <button label="Yeux" label_selected="Yeux" name="Eyes"/>
- <button label="Oreilles" label_selected="Oreilles" name="Ears"/>
- <button label="Nez" label_selected="Nez" name="Nose"/>
- <button label="Bouche" label_selected="Bouche" name="Mouth"/>
- <button label="Menton" label_selected="Menton" name="Chin"/>
- <button label="Torse" label_selected="Torse" name="Torso"/>
- <button label="Jambes" label_selected="Jambes" name="Legs"/>
- <button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portée
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de silhouette, faites-en glisser une à partir de votre
-inventaire jusqu'à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
-une nouvelle et de la porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <radio_group name="sex radio">
- <radio_item length="1" name="radio" type="string">
- Femme
- </radio_item>
- <radio_item length="1" name="radio2" type="string">
- Homme
- </radio_item>
- </radio_group>
- </panel>
- <panel label="Peau" name="Skin">
- <button label="Créer une peau" label_selected="Créer une peau" name="Create New"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <button label="Couleur" label_selected="Couleur" name="Skin Color" width="84"/>
- <button label="Détails visage" label_selected="Détails visage" name="Face Detail" width="84"/>
- <button label="Maquillage" label_selected="Maquillage" name="Makeup" width="84"/>
- <button label="Détails corps" label_selected="Détails corps" name="Body Detail" width="84"/>
- <button label="Aléatoire" label_selected="Aléatoire" name="Randomize" width="84"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portée
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de peau, faites-en glisser une à partir de votre inventaire.
-Vous pouvez aussi en créer une nouvelle et la porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <texture_picker label="Tatouages tête" name="Head Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
- <texture_picker label="Tatouages haut" name="Upper Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
- <texture_picker label="Tatouages bas" name="Lower Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
- </panel>
- <panel label="Cheveux" name="Hair">
- <button label="Créer des cheveux" label_selected="Créer des cheveux" name="Create New"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <button label="Couleur" label_selected="Couleur" name="Color"/>
- <button label="Style" label_selected="Style" name="Style"/>
- <button label="Sourcils" label_selected="Sourcils" name="Eyebrows"/>
- <button label="Pilosité" label_selected="Pilosité" name="Facial"/>
- <button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portés
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de chevelure, faites-en glisser une de votre inventaire
-jusqu'à votre avatar. Vous pouvez aussi en créer une
-nouvelle et la porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <texture_picker label="Texture" name="Texture" tool_tip="Cliquez pour sélectionner une image"/>
- </panel>
- <panel label="Yeux" name="Eyes">
- <button label="Créer des yeux" label_selected="Créer des yeux" name="Create New"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portés
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer vos yeux, faites-les glisser de votre inventaire
-jusqu'à votre avatar. Vous pouvez aussi en créer de nouveaux et les porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <texture_picker label="Iris" name="Iris" tool_tip="Cliquez pour sélectionner une image"/>
- </panel>
- <panel label="Vêtements"/>
- <panel label="Habits" name="clothes_placeholder"/>
- <panel label="Chemise" name="Shirt">
- <button label="Créer une chemise" label_selected="Créer une chemise" name="Create New"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portée
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de chemise, faites-en glisser une de votre inventaire
-jusqu'à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- </panel>
- <panel label="Pantalon" name="Pants">
- <button label="Créer un pantalon" label_selected="Créer un pantalon" name="Create New"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non porté
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de pantalon, faites-en glisser un de votre inventaire
-jusqu'à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- </panel>
- <panel label="Chaussures" name="Shoes">
- <button label="Créer des chaussures" label_selected="Créer des chaussures" name="Create New" width="140"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portées
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de chaussures, faites-en glisser une paire de votre
-inventaire jusqu'à votre avatar. Vous pouvez aussi en créer une
-nouvelle paire et la porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- </panel>
- <panel label="Chaussettes" name="Socks">
- <button label="Créer des chaussettes" label_selected="Créer des chaussettes" name="Create New" width="140"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portées
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de chaussettes, faites-en glisser une paire de votre
-inventaire jusqu'à votre avatar. Vous pouvez aussi en créer une
-nouvelle paire et la porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- </panel>
- <panel label="Veste" name="Jacket">
- <button label="Créer une veste" label_selected="Créer une veste" name="Create New"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portée
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de veste, faites-en glisser une de votre inventaire
-jusqu'à votre avatar. Vous pouvez aussi en créer une
-nouvelle et la porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="81"/>
- <texture_picker label="Tissu (dessus)" name="Upper Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
- <texture_picker label="Tissu (dessous)" name="Lower Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
- </panel>
- <panel label="Gants" name="Gloves">
- <button label="Créer des gants" label_selected="Créer des gants" name="Create New"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portés
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de gants, faites-en glisser une paire à partir de votre
-inventaire. Vous pouvez aussi en créer une nouvelle paire
-et la porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- </panel>
- <panel label="Sous-vêtements (homme)" name="Undershirt">
- <button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New" width="166"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portés
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de sous-vêtement, faites-en glisser une paire à partir de
-votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- </panel>
- <panel label="Sous-vêtements (femme)" name="Underpants">
- <button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New" width="166"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portés
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de sous-vêtement, faites-en glisser une paire à partir de
-votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- </panel>
- <panel label="Jupe" name="Skirt">
- <button label="Créer une jupe" label_selected="Créer une jupe" name="Create New"/>
- <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
- <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
- <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
- <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: impossible de modifier
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: en cours de chargement...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: non portée
- </text>
- <text length="1" name="path" type="string">
- Emplacement : [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Pour changer de jupe, faites-en glisser une à partir de votre inventaire.
-Vous pouvez aussi en créer une nouvelle et la porter.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Vous n'avez pas la permission de modifier cet objet.
- </text>
- <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
- <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
- </panel>
- </tab_container>
- <scroll_container left="266" name="panel_container"/>
- <button label="Créer un ensemble" label_selected="Créer un ensemble" name="Make Outfit" right="-252" width="115"/>
- <button label="Tout enregistrer" label_selected="Tout enregistrer" name="Save All" right="-131" width="115"/>
- <button label="Fermer" label_selected="Fermer" name="Close" width="115"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater customize" title="Apparence" width="563">
+ <tab_container name="customize tab container" tab_min_width="165" width="561">
+ <panel label="Parties du corps"/>
+ <panel label="Parties du corps" name="body_parts_placeholder"/>
+ <panel label="Silhouette" left="169" name="Shape" width="389">
+ <button label="Créer une silhouette" label_selected="Créer une silhouette" name="Create New" width="140"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <button label="Corps" label_selected="Corps" name="Body"/>
+ <button label="Tête" label_selected="Tête" name="Head"/>
+ <button label="Yeux" label_selected="Yeux" name="Eyes"/>
+ <button label="Oreilles" label_selected="Oreilles" name="Ears"/>
+ <button label="Nez" label_selected="Nez" name="Nose"/>
+ <button label="Bouche" label_selected="Bouche" name="Mouth"/>
+ <button label="Menton" label_selected="Menton" name="Chin"/>
+ <button label="Torse" label_selected="Torse" name="Torso"/>
+ <button label="Jambes" label_selected="Jambes" name="Legs"/>
+ <button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portée
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de silhouette, faites-en glisser une à partir de votre
+inventaire jusqu'à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
+une nouvelle et de la porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <radio_group name="sex radio">
+ <radio_item length="1" name="radio" type="string">
+ Femme
+ </radio_item>
+ <radio_item length="1" name="radio2" type="string">
+ Homme
+ </radio_item>
+ </radio_group>
+ </panel>
+ <panel label="Peau" name="Skin">
+ <button label="Créer une peau" label_selected="Créer une peau" name="Create New"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <button label="Couleur" label_selected="Couleur" name="Skin Color" width="84"/>
+ <button label="Détails visage" label_selected="Détails visage" name="Face Detail" width="84"/>
+ <button label="Maquillage" label_selected="Maquillage" name="Makeup" width="84"/>
+ <button label="Détails corps" label_selected="Détails corps" name="Body Detail" width="84"/>
+ <button label="Aléatoire" label_selected="Aléatoire" name="Randomize" width="84"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portée
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de peau, faites-en glisser une à partir de votre inventaire.
+Vous pouvez aussi en créer une nouvelle et la porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <texture_picker label="Tatouages tête" name="Head Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
+ <texture_picker label="Tatouages haut" name="Upper Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
+ <texture_picker label="Tatouages bas" name="Lower Tattoos" tool_tip="Cliquez pour sélectionner une image" width="78"/>
+ </panel>
+ <panel label="Cheveux" name="Hair">
+ <button label="Créer des cheveux" label_selected="Créer des cheveux" name="Create New"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <button label="Couleur" label_selected="Couleur" name="Color"/>
+ <button label="Style" label_selected="Style" name="Style"/>
+ <button label="Sourcils" label_selected="Sourcils" name="Eyebrows"/>
+ <button label="Pilosité" label_selected="Pilosité" name="Facial"/>
+ <button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portés
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de chevelure, faites-en glisser une de votre inventaire
+jusqu'à votre avatar. Vous pouvez aussi en créer une
+nouvelle et la porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <texture_picker label="Texture" name="Texture" tool_tip="Cliquez pour sélectionner une image"/>
+ </panel>
+ <panel label="Yeux" name="Eyes">
+ <button label="Créer des yeux" label_selected="Créer des yeux" name="Create New"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <button label="Aléatoire" label_selected="Aléatoire" name="Randomize"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portés
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer vos yeux, faites-les glisser de votre inventaire
+jusqu'à votre avatar. Vous pouvez aussi en créer de nouveaux et les porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <texture_picker label="Iris" name="Iris" tool_tip="Cliquez pour sélectionner une image"/>
+ </panel>
+ <panel label="Vêtements"/>
+ <panel label="Habits" name="clothes_placeholder"/>
+ <panel label="Chemise" name="Shirt">
+ <button label="Créer une chemise" label_selected="Créer une chemise" name="Create New"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portée
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de chemise, faites-en glisser une de votre inventaire
+jusqu'à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+ <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
+ </panel>
+ <panel label="Pantalon" name="Pants">
+ <button label="Créer un pantalon" label_selected="Créer un pantalon" name="Create New"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non porté
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de pantalon, faites-en glisser un de votre inventaire
+jusqu'à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+ <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
+ </panel>
+ <panel label="Chaussures" name="Shoes">
+ <button label="Créer des chaussures" label_selected="Créer des chaussures" name="Create New" width="140"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portées
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de chaussures, faites-en glisser une paire de votre
+inventaire jusqu'à votre avatar. Vous pouvez aussi en créer une
+nouvelle paire et la porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+ <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
+ </panel>
+ <panel label="Chaussettes" name="Socks">
+ <button label="Créer des chaussettes" label_selected="Créer des chaussettes" name="Create New" width="140"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portées
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de chaussettes, faites-en glisser une paire de votre
+inventaire jusqu'à votre avatar. Vous pouvez aussi en créer une
+nouvelle paire et la porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+ <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
+ </panel>
+ <panel label="Veste" name="Jacket">
+ <button label="Créer une veste" label_selected="Créer une veste" name="Create New"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portée
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de veste, faites-en glisser une de votre inventaire
+jusqu'à votre avatar. Vous pouvez aussi en créer une
+nouvelle et la porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="81"/>
+ <texture_picker label="Tissu (dessus)" name="Upper Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
+ <texture_picker label="Tissu (dessous)" name="Lower Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/>
+ </panel>
+ <panel label="Gants" name="Gloves">
+ <button label="Créer des gants" label_selected="Créer des gants" name="Create New"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portés
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de gants, faites-en glisser une paire à partir de votre
+inventaire. Vous pouvez aussi en créer une nouvelle paire
+et la porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+ <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
+ </panel>
+ <panel label="Sous-vêtements (homme)" name="Undershirt">
+ <button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New" width="166"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portés
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de sous-vêtement, faites-en glisser une paire à partir de
+votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+ <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
+ </panel>
+ <panel label="Sous-vêtements (femme)" name="Underpants">
+ <button label="Créer des sous-vêtements" label_selected="Créer des sous-vêtements" name="Create New" width="166"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portés
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de sous-vêtement, faites-en glisser une paire à partir de
+votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+ <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
+ </panel>
+ <panel label="Jupe" name="Skirt">
+ <button label="Créer une jupe" label_selected="Créer une jupe" name="Create New"/>
+ <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/>
+ <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/>
+ <button label="Enregistrer sous" label_selected="Enregistrer sous" left="188" name="Save As" width="105"/>
+ <button label="Rétablir" label_selected="Rétablir" left="299" name="Revert" width="82"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: impossible de modifier
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: en cours de chargement...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: non portée
+ </text>
+ <text length="1" name="path" type="string">
+ Emplacement : [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Pour changer de jupe, faites-en glisser une à partir de votre inventaire.
+Vous pouvez aussi en créer une nouvelle et la porter.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Vous n'avez pas la permission de modifier cet objet.
+ </text>
+ <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" width="74"/>
+ <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/>
+ </panel>
+ </tab_container>
+ <scroll_container left="266" name="panel_container"/>
+ <button label="Créer un ensemble" label_selected="Créer un ensemble" name="Make Outfit" right="-252" width="115"/>
+ <button label="Tout enregistrer" label_selected="Tout enregistrer" name="Save All" right="-131" width="115"/>
+ <button label="Fermer" label_selected="Fermer" name="Close" width="115"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
index f664e6925e..1103539898 100644
--- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Day Cycle Floater" title="Editeur du cycle du jour">
- <tab_container name="Day Cycle Tabs">
- <panel label="Cycle du jour" name="Day Cycle">
- <button label="?" name="WLDayCycleHelp" />
- <text name="WL12am">
- Minuit
- </text>
- <text name="WL3am">
- 3h
- </text>
- <text name="WL6am">
- 6h
- </text>
- <text name="WL9amHash">
- 9h
- </text>
- <text name="WL12pmHash">
- Midi
- </text>
- <text name="WL3pm">
- 15h
- </text>
- <text name="WL6pm">
- 18h
- </text>
- <text name="WL9pm">
- 21h
- </text>
- <text name="WL12am2">
- Minuit
- </text>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey" width="89" bottom="-45" />
- <button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey" width="89" bottom="-70" />
- <text name="WLCurKeyFrameText">
- Réglages des images-clés :
- </text>
- <text name="WLCurKeyTimeText">
- Heure de la clé :
- </text>
- <spinner label="Heure" name="WLCurKeyHour" />
- <spinner label="Min" name="WLCurKeyMin" />
- <text name="WLCurKeyTimeText2">
- Préréglages clés :
- </text>
- <combo_box label="Préréglage" name="WLKeyPresets" />
- <text name="DayCycleText">
- Snap :
- </text>
- <combo_box label="5 min" name="WLSnapOptions" />
- <text name="DayCycleText2">
- Durée du cycle :
- </text>
- <spinner label="Heure" name="WLLengthOfDayHour" />
- <spinner label="Min" name="WLLengthOfDayMin" />
- <spinner label="S" name="WLLengthOfDaySec" label_width="10" width="50" left_delta="75"/>
- <text name="DayCycleText3">
- Prévisualiser :
- </text>
- <button label="Jouer" label_selected="Jouer" name="WLAnimSky" />
- <button label="Stop !" label_selected="Stop" name="WLStopAnimSky" />
- <button label="Utiliser heure domaine" label_selected="Aller heure domaine"
- name="WLUseLindenTime" />
- <button label="Enregistrer jour test" label_selected="Enregistrer jour test"
- name="WLSaveDayCycle" />
- <button label="Charger jour test" label_selected="Charger jour test"
- name="WLLoadDayCycle" />
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Day Cycle Floater" title="Editeur du cycle du jour">
+ <tab_container name="Day Cycle Tabs">
+ <panel label="Cycle du jour" name="Day Cycle">
+ <button label="?" name="WLDayCycleHelp" />
+ <text name="WL12am">
+ Minuit
+ </text>
+ <text name="WL3am">
+ 3h
+ </text>
+ <text name="WL6am">
+ 6h
+ </text>
+ <text name="WL9amHash">
+ 9h
+ </text>
+ <text name="WL12pmHash">
+ Midi
+ </text>
+ <text name="WL3pm">
+ 15h
+ </text>
+ <text name="WL6pm">
+ 18h
+ </text>
+ <text name="WL9pm">
+ 21h
+ </text>
+ <text name="WL12am2">
+ Minuit
+ </text>
+ <text name="WL12amHash">
+ |
+ </text>
+ <text name="WL3amHash">
+ I
+ </text>
+ <text name="WL6amHash">
+ |
+ </text>
+ <text name="WL9amHash2">
+ I
+ </text>
+ <text name="WL12pmHash2">
+ |
+ </text>
+ <text name="WL3pmHash">
+ I
+ </text>
+ <text name="WL6pmHash">
+ |
+ </text>
+ <text name="WL9pmHash">
+ I
+ </text>
+ <text name="WL12amHash2">
+ |
+ </text>
+ <button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey" width="89" bottom="-45" />
+ <button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey" width="89" bottom="-70" />
+ <text name="WLCurKeyFrameText">
+ Réglages des images-clés :
+ </text>
+ <text name="WLCurKeyTimeText">
+ Heure de la clé :
+ </text>
+ <spinner label="Heure" name="WLCurKeyHour" />
+ <spinner label="Min" name="WLCurKeyMin" />
+ <text name="WLCurKeyTimeText2">
+ Préréglages clés :
+ </text>
+ <combo_box label="Préréglage" name="WLKeyPresets" />
+ <text name="DayCycleText">
+ Snap :
+ </text>
+ <combo_box label="5 min" name="WLSnapOptions" />
+ <text name="DayCycleText2">
+ Durée du cycle :
+ </text>
+ <spinner label="Heure" name="WLLengthOfDayHour" />
+ <spinner label="Min" name="WLLengthOfDayMin" />
+ <spinner label="S" name="WLLengthOfDaySec" label_width="10" width="50" left_delta="75"/>
+ <text name="DayCycleText3">
+ Prévisualiser :
+ </text>
+ <button label="Jouer" label_selected="Jouer" name="WLAnimSky" />
+ <button label="Stop !" label_selected="Stop" name="WLStopAnimSky" />
+ <button label="Utiliser heure domaine" label_selected="Aller heure domaine"
+ name="WLUseLindenTime" />
+ <button label="Enregistrer jour test" label_selected="Enregistrer jour test"
+ name="WLSaveDayCycle" />
+ <button label="Charger jour test" label_selected="Charger jour test"
+ name="WLLoadDayCycle" />
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_device_settings.xml b/indra/newview/skins/default/xui/fr/floater_device_settings.xml
index 0bd21a4dc6..656f1c4fba 100644
--- a/indra/newview/skins/default/xui/fr/floater_device_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_device_settings.xml
@@ -1,3 +1,3 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_device_settings"
- title="Paramètres du matériel utilisé pour le chat vocal" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_device_settings"
+ title="Paramètres du matériel utilisé pour le chat vocal" />
diff --git a/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
index 3d46559285..1d14142dd3 100644
--- a/indra/newview/skins/default/xui/fr/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="Éditeur d'environnement">
- <text bottom="-45" name="EnvTimeText">
- Heure de la
-journée
- </text>
- <text bottom_delta="-36" name="EnvTimeText2">
- Midi
- </text>
- <text name="EnvCloudText">
- Couverture
-nuageuse
- </text>
- <text bottom="-45" name="EnvWaterColorText">
- Couleur de
-l'eau
- </text>
- <color_swatch name="EnvWaterColor" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
- <text name="EnvWaterFogText">
- Brouillard
-dans l'eau
- </text>
- <button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="145"/>
- <button label="Ciel avancé" name="EnvAdvancedSkyButton" width="145" left="162" />
- <button label="Eau avancée" name="EnvAdvancedWaterButton" width="145" left="316"/>
- <button label="?" name="EnvSettingsHelpButton"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="Éditeur d'environnement">
+ <text bottom="-45" name="EnvTimeText">
+ Heure de la
+journée
+ </text>
+ <text bottom_delta="-36" name="EnvTimeText2">
+ Midi
+ </text>
+ <text name="EnvCloudText">
+ Couverture
+nuageuse
+ </text>
+ <text bottom="-45" name="EnvWaterColorText">
+ Couleur de
+l'eau
+ </text>
+ <color_swatch name="EnvWaterColor" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
+ <text name="EnvWaterFogText">
+ Brouillard
+dans l'eau
+ </text>
+ <button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="145"/>
+ <button label="Ciel avancé" name="EnvAdvancedSkyButton" width="145" left="162" />
+ <button label="Eau avancée" name="EnvAdvancedWaterButton" width="145" left="316"/>
+ <button label="?" name="EnvSettingsHelpButton"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_font_test.xml b/indra/newview/skins/default/xui/fr/floater_font_test.xml
index b469e08c81..fce3615725 100644
--- a/indra/newview/skins/default/xui/fr/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/fr/floater_font_test.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
- height="800" min_height="175" min_width="154" name="contents"
- title="Font Test" width="500">
-
-<text name="linea" font="OverrideTest" follows="left|top|right" bottom_delta="-20" left="16" height="16">
-OverrideTest, should be timesbd, from default/xui/fr
-</text>
-
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+ height="800" min_height="175" min_width="154" name="contents"
+ title="Font Test" width="500">
+
+<text name="linea" font="OverrideTest" follows="left|top|right" bottom_delta="-20" left="16" height="16">
+OverrideTest, should be timesbd, from default/xui/fr
+</text>
+
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml
index d45d3e76f2..4411fee480 100644
--- a/indra/newview/skins/default/xui/fr/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_gesture.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gestures" title="Gestes utilisés">
- <text name="help_label">
- Double-cliquez sur un geste pour jouer les animations
-et les sons.
- </text>
- <scroll_list bottom_delta="-385" height="360" name="gesture_list">
- <column label="Déclencheur" name="trigger" width="85" />
- <column label="Touche" name="shortcut" />
- <column label="" name="key" />
- <column label="Nom" name="name" width="145"/>
- </scroll_list>
- <button label="Nouveau" name="new_gesture_btn" />
- <button label="Inventaire" name="inventory_btn" />
- <button label="Modifier" name="edit_btn" />
- <button label="Jouer" name="play_btn" />
- <button label="Stop" name="stop_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gestures" title="Gestes utilisés">
+ <text name="help_label">
+ Double-cliquez sur un geste pour jouer les animations
+et les sons.
+ </text>
+ <scroll_list bottom_delta="-385" height="360" name="gesture_list">
+ <column label="Déclencheur" name="trigger" width="85" />
+ <column label="Touche" name="shortcut" />
+ <column label="" name="key" />
+ <column label="Nom" name="name" width="145"/>
+ </scroll_list>
+ <button label="Nouveau" name="new_gesture_btn" />
+ <button label="Inventaire" name="inventory_btn" />
+ <button label="Modifier" name="edit_btn" />
+ <button label="Jouer" name="play_btn" />
+ <button label="Stop" name="stop_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
index 1700b8d94b..ab8b061cd3 100644
--- a/indra/newview/skins/default/xui/fr/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
@@ -1,111 +1,111 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="godtools floater" title="Outils divins">
- <tab_container name="GodTools Tabs">
- <panel label="Grille" name="grid">
- <button label="Éjecter tous" label_selected="Éjecter tous" name="Kick all users" width="175" />
- <button label="Vider le cache cartographique de la région" label_selected="Vider le cache cartographique de la région" name="Flush This Region's Map Visibility Caches" width="285"/>
- </panel>
- <panel label="Région" name="region">
- <text name="Sim Name:" width="70">
- Nom du sim :
- </text>
- <line_editor left="85" name="region name" width="198" />
- <check_box label="Initiation" name="check prelude" tool_tip="Définir cette région comme zone d'initiation."/>
- <check_box label="Soleil fixe" name="check fixed sun" tool_tip="Définir la position du soleil (comme dans Région et Domaine > Terrain.)"/>
- <check_box label="Réinitialiser le domicile à la téléportation" name="check reset home" tool_tip="Lorsqu'un résident se téléporte à l'extérieur, réinitialise son domicile à la position de sa destination." height="32"/>
- <check_box label="Visible" name="check visible" tool_tip="Cochez pour rendre la région visible aux non-admins." bottom_delta="-32"/>
- <check_box label="Dégâts" name="check damage" tool_tip="Cochez pour activer les dégâts dans cette région."/>
- <check_box label="Bloquer le suivi de trafic" name="block dwell" tool_tip="Cochez pour que la région ne comptabilise pas le trafic."/>
- <check_box label="Bloquer le terraformage" name="block terraform" tool_tip="Cochez pour empêcher les personnes de terraformer leur terrain"/>
- <check_box label="Bac à sable" name="is sandbox" tool_tip="Basculer cette région en bac à sable."/>
- <button label="Figer le terrain" label_selected="Figer le terrain" name="Bake Terrain" tool_tip="Enregistrer le terrain actuel comme terrain par défaut." width="118" />
- <button label="Rétablir le terrain" label_selected="Rétablir le terrain" name="Revert Terrain" tool_tip="Remplacer le terrain actuel avec le terrain par défaut." width="118" />
- <button label="Échanger le terrain" label_selected="Échanger le terrain" name="Swap Terrain" tool_tip="Échangez le terrain actuel avec le terrain par défaut." width="118" />
- <text name="estate id">
- ID du domaine :
- </text>
- <text name="parent id">
- ID parent :
- </text>
- <line_editor name="parentestate" tool_tip="Il s'agit du domaine parent de cette région"/>
- <text name="Grid Pos: ">
- Position sur la grille :
- </text>
- <line_editor name="gridposx" tool_tip="Position x de cette région sur la grille" left_delta="120" width="35"/>
- <line_editor name="gridposy" tool_tip="Position y de cette région sur la grille" left_delta="40" width="35" />
- <text name="Redirect to Grid: ">
- Rediriger vers la grille :
- </text>
- <line_editor left_delta="120" name="redirectx" width="35" />
- <line_editor left_delta="40" name="redirecty" width="35" />
- <spinner left="320" name="billable factor" width="70" />
- <text name="billable factor text" font="SansSerifSmall" left_delta="-120" width="120">
- Facteur de facturation :
- </text>
- <spinner left="320" name="land cost" width="70" />
- <text name="land cost text" left_delta="-120">
- L$ par m² :
- </text>
- <button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh" tool_tip="Cliquez ici pour rafraîchir les informations ci-dessus."/>
- <button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus."/>
- <button label="Sélectionner une région" label_selected="Sélectionner une région" name="Select Region" tool_tip="Sélectionnez une région entière à l'aide de l'outil Terrain." width="140" left="136"/>
- <button label="Sauvegarde automatique" label_selected="Sauvegarde automatique" name="Autosave now" tool_tip="Sauvegarde automatique au format gzip." width="140" left="136"/>
- </panel>
- <panel label="Objets" name="objects">
- <text name="Sim Name:" width="70">
- Nom du sim :
- </text>
- <text name="region name" left_delta="75">
- Welsh
- </text>
- <check_box label="Désactiver les scripts" name="disable scripts" tool_tip="Cochez pour désactiver tous les scripts dans cette région"/>
- <check_box label="Désactiver les collisions" name="disable collisions" tool_tip="Cochez pour désactiver les collisions entre non-avatars dans cette région"/>
- <check_box label="Désactiver les propriétés physiques" name="disable physics" tool_tip="Cochez pour désactiver toutes les propriétés physiques dans cette région"/>
- <button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus." bottom="-85"/>
- <button label="Définir la cible" label_selected="Définir la cible" name="Set Target" tool_tip="Définir l'avatar cible pour la suppression de l'objet."/>
- <text name="target_avatar_name">
- (aucune cible)
- </text>
- <button label="Supprimer tous les objets scriptés de la cible sur les terrains des autres" label_selected="Supprimer tous les objets scriptés de la cible sur les terrains des autres" name="Delete Target's Scripted Objects On Others Land" tool_tip="Supprimer tous les objets scriptés appartenant à la cible sur les terrains ne lui appartenant pas. Les objets non reproductibles seront renvoyés."/>
- <button label="Supprimer les objets scriptés de la cible sur *tous* les terrains" label_selected="Supprimer les objets scriptés de la cible sur *tous* les terrains" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Supprimer les objets scriptés appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés."/>
- <button label="Supprimer *tous* les objets de la cible" label_selected="Supprimer *tous* les objets de la cible" name="Delete *ALL* Of Target's Objects" tool_tip="Supprimer tous les objets appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés."/>
- <button width="300" label="Afficher les objets souvent responsables de collision" label_selected="Afficher les objets souvent responsables de collision" name="Get Top Colliders" tool_tip="Dresse une liste des objets avec les callbacks les plus fréquents. "/>
- <button width="300" label="Afficher les scripts fréquemment utilisés" label_selected="Afficher les scripts fréquemment utilisés" name="Get Top Scripts" tool_tip="Dresse une liste des objets qui passent le plus de temps à exécuter des scripts."/>
- <button width="300" label="Résumé des scripts" label_selected="Résumé des scripts" name="Scripts digest" tool_tip="Dresse une liste des scripts et de leurs occurrences."/>
- </panel>
- <panel label="Requête" name="request">
- <text name="Destination:">
- Destination :
- </text>
- <combo_box name="destination">
- <combo_item name="Selection">
- Sélection
- </combo_item>
- <combo_item name="AgentRegion">
- Région de l'avatar
- </combo_item>
- </combo_box>
- <text name="Request:">
- Requête :
- </text>
- <combo_box name="request">
- <combo_item name="colliders<steps>">
- Objets responsables de collisions : étapes
- </combo_item>
- <combo_item name="scripts<count>,<optionalpattern>">
- Nombre de scripts et schéma optionnel
- </combo_item>
- <combo_item name="objects<pattern>">
- Schéma des objets
- </combo_item>
- <combo_item name="rez<asset_id>">
- rezzer <asset_id>
- </combo_item>
- </combo_box>
- <text name="Parameter:">
- Paramètre :
- </text>
- <button label="Effectuer la requête" label_selected="Effectuer la requête" name="Make Request" width="140"/>
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="godtools floater" title="Outils divins">
+ <tab_container name="GodTools Tabs">
+ <panel label="Grille" name="grid">
+ <button label="Éjecter tous" label_selected="Éjecter tous" name="Kick all users" width="175" />
+ <button label="Vider le cache cartographique de la région" label_selected="Vider le cache cartographique de la région" name="Flush This Region's Map Visibility Caches" width="285"/>
+ </panel>
+ <panel label="Région" name="region">
+ <text name="Sim Name:" width="70">
+ Nom du sim :
+ </text>
+ <line_editor left="85" name="region name" width="198" />
+ <check_box label="Initiation" name="check prelude" tool_tip="Définir cette région comme zone d'initiation."/>
+ <check_box label="Soleil fixe" name="check fixed sun" tool_tip="Définir la position du soleil (comme dans Région et Domaine > Terrain.)"/>
+ <check_box label="Réinitialiser le domicile à la téléportation" name="check reset home" tool_tip="Lorsqu'un résident se téléporte à l'extérieur, réinitialise son domicile à la position de sa destination." height="32"/>
+ <check_box label="Visible" name="check visible" tool_tip="Cochez pour rendre la région visible aux non-admins." bottom_delta="-32"/>
+ <check_box label="Dégâts" name="check damage" tool_tip="Cochez pour activer les dégâts dans cette région."/>
+ <check_box label="Bloquer le suivi de trafic" name="block dwell" tool_tip="Cochez pour que la région ne comptabilise pas le trafic."/>
+ <check_box label="Bloquer le terraformage" name="block terraform" tool_tip="Cochez pour empêcher les personnes de terraformer leur terrain"/>
+ <check_box label="Bac à sable" name="is sandbox" tool_tip="Basculer cette région en bac à sable."/>
+ <button label="Figer le terrain" label_selected="Figer le terrain" name="Bake Terrain" tool_tip="Enregistrer le terrain actuel comme terrain par défaut." width="118" />
+ <button label="Rétablir le terrain" label_selected="Rétablir le terrain" name="Revert Terrain" tool_tip="Remplacer le terrain actuel avec le terrain par défaut." width="118" />
+ <button label="Échanger le terrain" label_selected="Échanger le terrain" name="Swap Terrain" tool_tip="Échangez le terrain actuel avec le terrain par défaut." width="118" />
+ <text name="estate id">
+ ID du domaine :
+ </text>
+ <text name="parent id">
+ ID parent :
+ </text>
+ <line_editor name="parentestate" tool_tip="Il s'agit du domaine parent de cette région"/>
+ <text name="Grid Pos: ">
+ Position sur la grille :
+ </text>
+ <line_editor name="gridposx" tool_tip="Position x de cette région sur la grille" left_delta="120" width="35"/>
+ <line_editor name="gridposy" tool_tip="Position y de cette région sur la grille" left_delta="40" width="35" />
+ <text name="Redirect to Grid: ">
+ Rediriger vers la grille :
+ </text>
+ <line_editor left_delta="120" name="redirectx" width="35" />
+ <line_editor left_delta="40" name="redirecty" width="35" />
+ <spinner left="320" name="billable factor" width="70" />
+ <text name="billable factor text" font="SansSerifSmall" left_delta="-120" width="120">
+ Facteur de facturation :
+ </text>
+ <spinner left="320" name="land cost" width="70" />
+ <text name="land cost text" left_delta="-120">
+ L$ par m² :
+ </text>
+ <button label="Rafraîchir" label_selected="Rafraîchir" name="Refresh" tool_tip="Cliquez ici pour rafraîchir les informations ci-dessus."/>
+ <button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus."/>
+ <button label="Sélectionner une région" label_selected="Sélectionner une région" name="Select Region" tool_tip="Sélectionnez une région entière à l'aide de l'outil Terrain." width="140" left="136"/>
+ <button label="Sauvegarde automatique" label_selected="Sauvegarde automatique" name="Autosave now" tool_tip="Sauvegarde automatique au format gzip." width="140" left="136"/>
+ </panel>
+ <panel label="Objets" name="objects">
+ <text name="Sim Name:" width="70">
+ Nom du sim :
+ </text>
+ <text name="region name" left_delta="75">
+ Welsh
+ </text>
+ <check_box label="Désactiver les scripts" name="disable scripts" tool_tip="Cochez pour désactiver tous les scripts dans cette région"/>
+ <check_box label="Désactiver les collisions" name="disable collisions" tool_tip="Cochez pour désactiver les collisions entre non-avatars dans cette région"/>
+ <check_box label="Désactiver les propriétés physiques" name="disable physics" tool_tip="Cochez pour désactiver toutes les propriétés physiques dans cette région"/>
+ <button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Cliquez ici pour appliquer les modifications effectuées ci-dessus." bottom="-85"/>
+ <button label="Définir la cible" label_selected="Définir la cible" name="Set Target" tool_tip="Définir l'avatar cible pour la suppression de l'objet."/>
+ <text name="target_avatar_name">
+ (aucune cible)
+ </text>
+ <button label="Supprimer tous les objets scriptés de la cible sur les terrains des autres" label_selected="Supprimer tous les objets scriptés de la cible sur les terrains des autres" name="Delete Target's Scripted Objects On Others Land" tool_tip="Supprimer tous les objets scriptés appartenant à la cible sur les terrains ne lui appartenant pas. Les objets non reproductibles seront renvoyés."/>
+ <button label="Supprimer les objets scriptés de la cible sur *tous* les terrains" label_selected="Supprimer les objets scriptés de la cible sur *tous* les terrains" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Supprimer les objets scriptés appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés."/>
+ <button label="Supprimer *tous* les objets de la cible" label_selected="Supprimer *tous* les objets de la cible" name="Delete *ALL* Of Target's Objects" tool_tip="Supprimer tous les objets appartenant à la cible dans cette région. Les objets non reproductibles seront renvoyés."/>
+ <button width="300" label="Afficher les objets souvent responsables de collision" label_selected="Afficher les objets souvent responsables de collision" name="Get Top Colliders" tool_tip="Dresse une liste des objets avec les callbacks les plus fréquents. "/>
+ <button width="300" label="Afficher les scripts fréquemment utilisés" label_selected="Afficher les scripts fréquemment utilisés" name="Get Top Scripts" tool_tip="Dresse une liste des objets qui passent le plus de temps à exécuter des scripts."/>
+ <button width="300" label="Résumé des scripts" label_selected="Résumé des scripts" name="Scripts digest" tool_tip="Dresse une liste des scripts et de leurs occurrences."/>
+ </panel>
+ <panel label="Requête" name="request">
+ <text name="Destination:">
+ Destination :
+ </text>
+ <combo_box name="destination">
+ <combo_box.item name="Selection">
+ Sélection
+ </combo_box.item>
+ <combo_box.item name="AgentRegion">
+ Région de l'avatar
+ </combo_box.item>
+ </combo_box>
+ <text name="Request:">
+ Requête :
+ </text>
+ <combo_box name="request">
+ <combo_box.item name="colliders<steps>">
+ Objets responsables de collisions : étapes
+ </combo_box.item>
+ <combo_box.item name="scripts<count>,<optionalpattern>">
+ Nombre de scripts et schéma optionnel
+ </combo_box.item>
+ <combo_box.item name="objects<pattern>">
+ Schéma des objets
+ </combo_box.item>
+ <combo_box.item name="rez<asset_id>">
+ rezzer <asset_id>
+ </combo_box.item>
+ </combo_box>
+ <text name="Parameter:">
+ Paramètre :
+ </text>
+ <button label="Effectuer la requête" label_selected="Effectuer la requête" name="Make Request" width="140"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
index 461bd8dae4..eb632bc9a8 100644
--- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="Configuration du matériel">
- <text name="Filtering:">
- Filtres :
- </text>
- <check_box label="Filtre anisotrope (plus lent si activé)" name="ani"/>
- <text name="Antialiasing:">
- Anti-aliasing :
- </text>
- <combo_box label="Anti-aliasing" name="fsaa" width="84">
- <combo_item name="FSAADisabled">
- Désactivé
- </combo_item>
- <combo_item name="2x">
- 2x
- </combo_item>
- <combo_item name="4x">
- 4x
- </combo_item>
- <combo_item name="8x">
- 8x
- </combo_item>
- <combo_item name="16x">
- 16x
- </combo_item>
- </combo_box>
- <spinner label="Gamma :" name="gamma"/>
- <text left="217" name="(brightness, lower is brighter)">
- (0 = défaut, valeur faible = plus lumineux)
- </text>
- <text name="Enable VBO:">
- Activer le VBOÂ :
- </text>
- <check_box label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu'ils sont activés."/>
- <slider label="Mémoire vidéo (Mo) :" name="GrapicsCardTextureMemory" tool_tip="Total de la mémoire alloué aux textures. Mémoire de la carte vidéo par défaut. En réduisant cette valeur, vous pouvez accroître la performance mais les textures risquent de devenir floues."/>
- <spinner label="Indice du brouillard :" name="fog"/>
- <button label="OK" label_selected="OK" name="OK"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Hardware Settings Floater" title="Configuration du matériel">
+ <text name="Filtering:">
+ Filtres :
+ </text>
+ <check_box label="Filtre anisotrope (plus lent si activé)" name="ani"/>
+ <text name="Antialiasing:">
+ Anti-aliasing :
+ </text>
+ <combo_box label="Anti-aliasing" name="fsaa" width="84">
+ <combo_box.item name="FSAADisabled">
+ Désactivé
+ </combo_box.item>
+ <combo_box.item name="2x">
+ 2x
+ </combo_box.item>
+ <combo_box.item name="4x">
+ 4x
+ </combo_box.item>
+ <combo_box.item name="8x">
+ 8x
+ </combo_box.item>
+ <combo_box.item name="16x">
+ 16x
+ </combo_box.item>
+ </combo_box>
+ <spinner label="Gamma :" name="gamma"/>
+ <text left="217" name="(brightness, lower is brighter)">
+ (0 = défaut, valeur faible = plus lumineux)
+ </text>
+ <text name="Enable VBO:">
+ Activer le VBOÂ :
+ </text>
+ <check_box label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu'ils sont activés."/>
+ <slider label="Mémoire vidéo (Mo) :" name="GrapicsCardTextureMemory" tool_tip="Total de la mémoire alloué aux textures. Mémoire de la carte vidéo par défaut. En réduisant cette valeur, vous pouvez accroître la performance mais les textures risquent de devenir floues."/>
+ <spinner label="Indice du brouillard :" name="fog"/>
+ <button label="OK" label_selected="OK" name="OK"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_hud.xml b/indra/newview/skins/default/xui/fr/floater_hud.xml
index a8ce59f234..55c8b57ae2 100644
--- a/indra/newview/skins/default/xui/fr/floater_hud.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hud.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_hud" title="Didacticiel" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_hud" title="Didacticiel" />
diff --git a/indra/newview/skins/default/xui/fr/floater_im.xml b/indra/newview/skins/default/xui/fr/floater_im.xml
index 8f347c0708..0c9ea2c913 100644
--- a/indra/newview/skins/default/xui/fr/floater_im.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="im_floater" title="Message instantané">
- <text name="only_user_message">
- Vous êtes le seul participant à cette session.
- </text>
- <text name="offline_message">
- [FIRST] [LAST] est déconnecté(e).
- </text>
- <string name="invite_message">
- Pour accepter ce chat vocal/vous connecter, cliquez sur le bouton [BUTTON NAME].
- </string>
- <string name="muted_message">
- Vous ignorez ce résident. Si vous lui envoyez un message, il ne sera plus ignoré.
- </string>
- <string name="generic_request_error">
- Erreur lors de la requête, veuillez réessayer ultérieurement.
- </string>
- <string name="insufficient_perms_error">
- Vous n'avez pas les permissions requises.
- </string>
- <string name="session_does_not_exist_error">
- La session a expiré
- </string>
- <string name="no_ability_error">
- Vous n'avez pas ce pouvoir.
- </string>
- <string name="not_a_mod_error">
- Vous n'êtes pas modérateur de session.
- </string>
- <string name="muted_error">
- Un modérateur de groupe a désactivé votre chat écrit.
- </string>
- <string name="add_session_event">
- Impossible d'ajouter des participants à la session de chat avec [RECIPIENT].
- </string>
- <string name="message_session_event">
- Impossible d'envoyer votre message à la session de chat avec [RECIPIENT].
- </string>
- <string name="removed_from_group">
- Vous avez été supprimé du groupe.
- </string>
- <string name="close_on_no_ability">
- Vous ne pouvez plus participer à la session de chat.
- </string>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="im_floater" title="Message instantané">
+ <text name="only_user_message">
+ Vous êtes le seul participant à cette session.
+ </text>
+ <text name="offline_message">
+ [FIRST] [LAST] est déconnecté(e).
+ </text>
+ <string name="invite_message">
+ Pour accepter ce chat vocal/vous connecter, cliquez sur le bouton [BUTTON NAME].
+ </string>
+ <string name="muted_message">
+ Vous ignorez ce résident. Si vous lui envoyez un message, il ne sera plus ignoré.
+ </string>
+ <string name="generic_request_error">
+ Erreur lors de la requête, veuillez réessayer ultérieurement.
+ </string>
+ <string name="insufficient_perms_error">
+ Vous n'avez pas les permissions requises.
+ </string>
+ <string name="session_does_not_exist_error">
+ La session a expiré
+ </string>
+ <string name="no_ability_error">
+ Vous n'avez pas ce pouvoir.
+ </string>
+ <string name="not_a_mod_error">
+ Vous n'êtes pas modérateur de session.
+ </string>
+ <string name="muted_error">
+ Un modérateur de groupe a désactivé votre chat écrit.
+ </string>
+ <string name="add_session_event">
+ Impossible d'ajouter des participants à la session de chat avec [RECIPIENT].
+ </string>
+ <string name="message_session_event">
+ Impossible d'envoyer votre message à la session de chat avec [RECIPIENT].
+ </string>
+ <string name="removed_from_group">
+ Vous avez été supprimé du groupe.
+ </string>
+ <string name="close_on_no_ability">
+ Vous ne pouvez plus participer à la session de chat.
+ </string>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
index 2477fb684f..3af7dc9113 100644
--- a/indra/newview/skins/default/xui/fr/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Image Preview" title="">
- <text name="name_label">
- Nom :
- </text>
- <text name="description_label">
- Description :
- </text>
- <text name="preview_label">
- Prévisualiser comme :
- </text>
- <combo_box label="Habits" name="clothing_type_combo" left="126" >
- <combo_item name="Image">
- Image
- </combo_item>
- <combo_item name="Hair">
- Cheveux
- </combo_item>
- <combo_item name="FemaleHead">
- Tête de femme
- </combo_item>
- <combo_item name="FemaleUpperBody">
- Corps de femme (haut)
- </combo_item>
- <combo_item name="FemaleLowerBody">
- Corps de femme (bas)
- </combo_item>
- <combo_item name="MaleHead">
- Tête d'homme
- </combo_item>
- <combo_item name="MaleUpperBody">
- Corps d'homme (haut)
- </combo_item>
- <combo_item name="MaleLowerBody">
- Corps d'homme (bas)
- </combo_item>
- <combo_item name="Skirt">
- Jupe
- </combo_item>
- <combo_item name="SculptedPrim">
- Sculptie
- </combo_item>
- </combo_box>
- <text name="bad_image_text">
- Impossible de lire l'image.
-
-Sauvegardez en Targa 24 bit (.tga).
- </text>
- <check_box label="Utiliser une compression sans perte" name="lossless_check"/>
- <button label="Annuler" name="cancel_btn"/>
- <button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Image Preview" title="">
+ <text name="name_label">
+ Nom :
+ </text>
+ <text name="description_label">
+ Description :
+ </text>
+ <text name="preview_label">
+ Prévisualiser comme :
+ </text>
+ <combo_box label="Habits" name="clothing_type_combo" left="126" >
+ <combo_box.item name="Image">
+ Image
+ </combo_box.item>
+ <combo_box.item name="Hair">
+ Cheveux
+ </combo_box.item>
+ <combo_box.item name="FemaleHead">
+ Tête de femme
+ </combo_box.item>
+ <combo_box.item name="FemaleUpperBody">
+ Corps de femme (haut)
+ </combo_box.item>
+ <combo_box.item name="FemaleLowerBody">
+ Corps de femme (bas)
+ </combo_box.item>
+ <combo_box.item name="MaleHead">
+ Tête d'homme
+ </combo_box.item>
+ <combo_box.item name="MaleUpperBody">
+ Corps d'homme (haut)
+ </combo_box.item>
+ <combo_box.item name="MaleLowerBody">
+ Corps d'homme (bas)
+ </combo_box.item>
+ <combo_box.item name="Skirt">
+ Jupe
+ </combo_box.item>
+ <combo_box.item name="SculptedPrim">
+ Sculptie
+ </combo_box.item>
+ </combo_box>
+ <text name="bad_image_text">
+ Impossible de lire l'image.
+
+Sauvegardez en Targa 24 bit (.tga).
+ </text>
+ <check_box label="Utiliser une compression sans perte" name="lossless_check"/>
+ <button label="Annuler" name="cancel_btn"/>
+ <button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inspect.xml b/indra/newview/skins/default/xui/fr/floater_inspect.xml
index ac5f79c321..f140c66de0 100644
--- a/indra/newview/skins/default/xui/fr/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inspect.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="Inspecter les objets">
- <scroll_list name="object_list"
- tool_tip="Sélectionner un objet de la liste pour le mettre en surbrillance dans le Monde.">
- <column label="Nom" name="object_name" />
- <column label="Propriétaire" name="owner_name" />
- <column label="Créateur" name="creator_name" />
- <column label="Date de création" name="creation_date" />
- </scroll_list>
- <button label="Voir le profil du propriétaire..." name="button owner" width="172"
- tool_tip="Voir le profil du propriétaire de l'objet en surbrillance" />
- <button label="Voir le profil du créateur..." name="button creator" left="192" width="172"
- tool_tip="Voir le profil du créateur de l'objet en surbrillance" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="inspect" title="Inspecter les objets">
+ <scroll_list name="object_list"
+ tool_tip="Sélectionner un objet de la liste pour le mettre en surbrillance dans le Monde.">
+ <column label="Nom" name="object_name" />
+ <column label="Propriétaire" name="owner_name" />
+ <column label="Créateur" name="creator_name" />
+ <column label="Date de création" name="creation_date" />
+ </scroll_list>
+ <button label="Voir le profil du propriétaire..." name="button owner" width="172"
+ tool_tip="Voir le profil du propriétaire de l'objet en surbrillance" />
+ <button label="Voir le profil du créateur..." name="button creator" left="192" width="172"
+ tool_tip="Voir le profil du créateur de l'objet en surbrillance" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory.xml b/indra/newview/skins/default/xui/fr/floater_inventory.xml
index ba545ec631..071c0ae133 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="Inventaire">
- <search_editor label="Saisissez votre recherche ici" name="inventory search editor"/>
- <tab_container name="inventory filter tabs">
- <inventory_panel label="Tous les objets" name="All Items"/>
- <inventory_panel label="Objets récents" name="Recent Items"/>
- </tab_container>
- <menu_bar name="Inventory Menu">
- <menu label="Fichier" name="File">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
- <menu_item_call label="Ouvrir" name="Open"/>
- <menu_item_call label="Nouvelle fenêtre" name="New Window"/>
- <menu_item_call label="Afficher les filtres" name="Show Filters"/>
- <menu_item_call label="Réinitialiser les filtres" name="Reset Current"/>
- <menu_item_call label="Fermer tous les dossiers" name="Close All Folders"/>
- <menu_item_call label="Vider la corbeille" name="Empty Trash"/>
- </menu>
- <menu label="Créer" name="Create">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
- <menu_item_call label="Nouveau dossier" name="New Folder"/>
- <menu_item_call label="Nouveau script" name="New Script"/>
- <menu_item_call label="Nouvelle note" name="New Note"/>
- <menu_item_call label="Nouveau geste" name="New Gesture"/>
- <menu name="New Clothes">
- <menu_item_call label="Nouvelle chemise" name="New Shirt"/>
- <menu_item_call label="Nouveau pantalon" name="New Pants"/>
- <menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
- <menu_item_call label="Nouvelles chaussettes" name="New Socks"/>
- <menu_item_call label="Nouvelle veste" name="New Jacket"/>
- <menu_item_call label="Nouvelle jupe" name="New Skirt"/>
- <menu_item_call label="Nouveaux gants" name="New Gloves"/>
- <menu_item_call label="Nouveau tricot" name="New Undershirt"/>
- <menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
- </menu>
- <menu name="New Body Parts">
- <menu_item_call label="Nouvelle silhouette" name="New Shape"/>
- <menu_item_call label="Nouvelle peau" name="New Skin"/>
- <menu_item_call label="Nouveaux cheveux" name="New Hair"/>
- <menu_item_call label="Nouveaux yeux" name="New Eyes"/>
- </menu>
- </menu>
- <menu label="Trier" name="Sort">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
- <menu_item_check label="Par nom" name="By Name"/>
- <menu_item_check label="Par date" name="By Date"/>
- <menu_item_check label="Trier les dossiers par nom" name="Folders Always By Name"/>
- <menu_item_check label="Dossiers système en premier" name="System Folders To Top"/>
- </menu>
- <menu label="Filters" name="Filters">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
- <menu_item_check label="Modifier actuel" name="Modify Current"/>
- <menu_item_call label="Réinitialiser actuel" name="Reset Current"/>
- </menu>
- </menu_bar>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory" title="Inventaire">
+ <search_editor label="Saisissez votre recherche ici" name="inventory search editor"/>
+ <tab_container name="inventory filter tabs">
+ <inventory_panel label="Tous les objets" name="All Items"/>
+ <inventory_panel label="Objets récents" name="Recent Items"/>
+ </tab_container>
+ <menu_bar name="Inventory Menu">
+ <menu label="Fichier" name="File">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu_item_call label="Ouvrir" name="Open"/>
+ <menu_item_call label="Nouvelle fenêtre" name="New Window"/>
+ <menu_item_call label="Afficher les filtres" name="Show Filters"/>
+ <menu_item_call label="Réinitialiser les filtres" name="Reset Current"/>
+ <menu_item_call label="Fermer tous les dossiers" name="Close All Folders"/>
+ <menu_item_call label="Vider la corbeille" name="Empty Trash"/>
+ </menu>
+ <menu label="Créer" name="Create">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu_item_call label="Nouveau dossier" name="New Folder"/>
+ <menu_item_call label="Nouveau script" name="New Script"/>
+ <menu_item_call label="Nouvelle note" name="New Note"/>
+ <menu_item_call label="Nouveau geste" name="New Gesture"/>
+ <menu name="New Clothes">
+ <menu_item_call label="Nouvelle chemise" name="New Shirt"/>
+ <menu_item_call label="Nouveau pantalon" name="New Pants"/>
+ <menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
+ <menu_item_call label="Nouvelles chaussettes" name="New Socks"/>
+ <menu_item_call label="Nouvelle veste" name="New Jacket"/>
+ <menu_item_call label="Nouvelle jupe" name="New Skirt"/>
+ <menu_item_call label="Nouveaux gants" name="New Gloves"/>
+ <menu_item_call label="Nouveau tricot" name="New Undershirt"/>
+ <menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
+ </menu>
+ <menu name="New Body Parts">
+ <menu_item_call label="Nouvelle silhouette" name="New Shape"/>
+ <menu_item_call label="Nouvelle peau" name="New Skin"/>
+ <menu_item_call label="Nouveaux cheveux" name="New Hair"/>
+ <menu_item_call label="Nouveaux yeux" name="New Eyes"/>
+ </menu>
+ </menu>
+ <menu label="Trier" name="Sort">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu_item_check label="Par nom" name="By Name"/>
+ <menu_item_check label="Par date" name="By Date"/>
+ <menu_item_check label="Trier les dossiers par nom" name="Folders Always By Name"/>
+ <menu_item_check label="Dossiers système en premier" name="System Folders To Top"/>
+ </menu>
+ <menu label="Filters" name="Filters">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu_item_check label="Modifier actuel" name="Modify Current"/>
+ <menu_item_call label="Réinitialiser actuel" name="Reset Current"/>
+ </menu>
+ </menu_bar>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
index 823546e5df..92dbc36a03 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="Propriétés de l'objet de l'inventaire">
- <text name="LabelItemNameTitle">
- Nom :
- </text>
- <text name="LabelItemDescTitle">
- Description :
- </text>
- <text name="LabelCreatorTitle">
- Créateur :
- </text>
- <text name="LabelCreatorName">
- Nicole Linden
- </text>
- <button label="Profil..." label_selected="" name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- Propriétaire :
- </text>
- <text name="LabelOwnerName">
- Thrax Linden
- </text>
- <button label="Profil..." label_selected="" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- Acquis :
- </text>
- <text name="LabelAcquiredDate">
- Wed May 24 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- Vous pouvez :
- </text>
- <check_box label="Modifier" name="CheckOwnerModify"/>
- <check_box label="Copier" name="CheckOwnerCopy"/>
- <check_box label="Revendre/Donner" name="CheckOwnerTransfer"/>
- <text name="BaseMaskDebug">
- BÂ :
- </text>
- <text name="OwnerMaskDebug">
- OÂ :
- </text>
- <text name="GroupMaskDebug">
- G :
- </text>
- <text name="EveryoneMaskDebug">
- EÂ :
- </text>
- <text name="NextMaskDebug">
- NÂ :
- </text>
- <check_box label="Partager avec le groupe" name="CheckShareWithGroup"/>
- <check_box label="Autoriser tout le monde à copier" name="CheckEveryoneCopy"/>
- <text name="NextOwnerLabel" width="192">
- Le prochain propriétaire pourra :
- </text>
- <check_box label="Modifier" name="CheckNextOwnerModify"/>
- <check_box label="Copier" name="CheckNextOwnerCopy"/>
- <check_box label="Revendre/Donner" name="CheckNextOwnerTransfer"/>
- <text name="SaleLabel">
- Marquer l'objet :
- </text>
- <check_box label="À vendre" name="CheckPurchase"/>
- <radio_group name="RadioSaleType">
- <radio_item name="radio">
- Original
- </radio_item>
- <radio_item name="radio2">
- Copie
- </radio_item>
- </radio_group>
- <text name="TextPrice">
- Prix : L$
- </text>
- <string name="unknown">
- (inconnu)
- </string>
- <string name="public">
- (public)
- </string>
- <string name="you_can">
- Vous pouvez :
- </string>
- <string name="owner_can">
- Le propriétaire peut :
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="item properties" title="Propriétés de l'objet de l'inventaire">
+ <text name="LabelItemNameTitle">
+ Nom :
+ </text>
+ <text name="LabelItemDescTitle">
+ Description :
+ </text>
+ <text name="LabelCreatorTitle">
+ Créateur :
+ </text>
+ <text name="LabelCreatorName">
+ Nicole Linden
+ </text>
+ <button label="Profil..." label_selected="" name="BtnCreator"/>
+ <text name="LabelOwnerTitle">
+ Propriétaire :
+ </text>
+ <text name="LabelOwnerName">
+ Thrax Linden
+ </text>
+ <button label="Profil..." label_selected="" name="BtnOwner"/>
+ <text name="LabelAcquiredTitle">
+ Acquis :
+ </text>
+ <text name="LabelAcquiredDate">
+ Wed May 24 12:50:46 2006
+ </text>
+ <text name="OwnerLabel">
+ Vous pouvez :
+ </text>
+ <check_box label="Modifier" name="CheckOwnerModify"/>
+ <check_box label="Copier" name="CheckOwnerCopy"/>
+ <check_box label="Revendre/Donner" name="CheckOwnerTransfer"/>
+ <text name="BaseMaskDebug">
+ BÂ :
+ </text>
+ <text name="OwnerMaskDebug">
+ OÂ :
+ </text>
+ <text name="GroupMaskDebug">
+ G :
+ </text>
+ <text name="EveryoneMaskDebug">
+ EÂ :
+ </text>
+ <text name="NextMaskDebug">
+ NÂ :
+ </text>
+ <check_box label="Partager avec le groupe" name="CheckShareWithGroup"/>
+ <check_box label="Autoriser tout le monde à copier" name="CheckEveryoneCopy"/>
+ <text name="NextOwnerLabel" width="192">
+ Le prochain propriétaire pourra :
+ </text>
+ <check_box label="Modifier" name="CheckNextOwnerModify"/>
+ <check_box label="Copier" name="CheckNextOwnerCopy"/>
+ <check_box label="Revendre/Donner" name="CheckNextOwnerTransfer"/>
+ <text name="SaleLabel">
+ Marquer l'objet :
+ </text>
+ <check_box label="À vendre" name="CheckPurchase"/>
+ <radio_group name="RadioSaleType">
+ <radio_item name="radio">
+ Original
+ </radio_item>
+ <radio_item name="radio2">
+ Copie
+ </radio_item>
+ </radio_group>
+ <text name="TextPrice">
+ Prix : L$
+ </text>
+ <string name="unknown">
+ (inconnu)
+ </string>
+ <string name="public">
+ (public)
+ </string>
+ <string name="you_can">
+ Vous pouvez :
+ </string>
+ <string name="owner_can">
+ Le propriétaire peut :
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index 99bc0a2410..090f5f6bc9 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory Finder" title="inventory_recent_items">
- <check_box label="Animations" name="check_animation"/>
- <check_box label="Cartes de visite" name="check_calling_card"/>
- <check_box label="Habits" name="check_clothing"/>
- <check_box label="Gestes" name="check_gesture"/>
- <check_box label="Repères" name="check_landmark"/>
- <check_box label="Notes" name="check_notecard"/>
- <check_box label="Objets" name="check_object"/>
- <check_box label="Scripts" name="check_script"/>
- <check_box label="Sons" name="check_sound"/>
- <check_box label="Textures" name="check_texture"/>
- <check_box label="Photos" name="check_snapshot"/>
- <button label="Tout" label_selected="Tout" name="All" width="70"/>
- <button label="Aucun" label_selected="Aucun" name="None" width="70" bottom="-260" left="83"/>
- <check_box label="Toujours montrer les dossiers" name="check_show_empty" bottom="-284"/>
- <check_box label="Depuis la déconnexion" name="check_since_logoff" bottom="-318"/>
- <text length="1" name="- OR -" type="string">
- Ou il y a...
- </text>
- <spinner label="Heures" name="spin_hours_ago"/>
- <spinner label="Jours" name="spin_days_ago"/>
- <button label="Fermer" label_selected="Fermer" name="Close"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory Finder" title="inventory_recent_items">
+ <check_box label="Animations" name="check_animation"/>
+ <check_box label="Cartes de visite" name="check_calling_card"/>
+ <check_box label="Habits" name="check_clothing"/>
+ <check_box label="Gestes" name="check_gesture"/>
+ <check_box label="Repères" name="check_landmark"/>
+ <check_box label="Notes" name="check_notecard"/>
+ <check_box label="Objets" name="check_object"/>
+ <check_box label="Scripts" name="check_script"/>
+ <check_box label="Sons" name="check_sound"/>
+ <check_box label="Textures" name="check_texture"/>
+ <check_box label="Photos" name="check_snapshot"/>
+ <button label="Tout" label_selected="Tout" name="All" width="70"/>
+ <button label="Aucun" label_selected="Aucun" name="None" width="70" bottom="-260" left="83"/>
+ <check_box label="Toujours montrer les dossiers" name="check_show_empty" bottom="-284"/>
+ <check_box label="Depuis la déconnexion" name="check_since_logoff" bottom="-318"/>
+ <text length="1" name="- OR -" type="string">
+ Ou il y a...
+ </text>
+ <spinner label="Heures" name="spin_hours_ago"/>
+ <spinner label="Jours" name="spin_days_ago"/>
+ <button label="Fermer" label_selected="Fermer" name="Close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_joystick.xml b/indra/newview/skins/default/xui/fr/floater_joystick.xml
index 49810f8ec9..be336c827e 100644
--- a/indra/newview/skins/default/xui/fr/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/fr/floater_joystick.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Joystick" title="Configuration du joystick">
- <check_box name="enable_joystick">
- Activer :
- </check_box>
- <spinner label="Mapping axe des X " name="JoystickAxis1"/>
- <spinner label="Mapping axe des Y" name="JoystickAxis2"/>
- <spinner label="Mapping axe des Z" name="JoystickAxis0"/>
- <spinner label="Mapping du tangage" label_width="111" left="8" name="JoystickAxis4" width="152"/>
- <spinner label="Mapping du lacet" name="JoystickAxis5"/>
- <spinner label="Mapping du roulis" name="JoystickAxis3"/>
- <spinner label="Mapping du zoom" name="JoystickAxis6"/>
- <check_box label="Zoom direct" name="ZoomDirect"/>
- <check_box label="Curseur 3D" name="Cursor3D"/>
- <check_box label="Niveau automatique" name="AutoLeveling"/>
- <text name="Control Modes:">
- Modes de contrôle :
- </text>
- <check_box name="JoystickAvatarEnabled">
- Avatar
- </check_box>
- <check_box name="JoystickBuildEnabled">
- Build
- </check_box>
- <check_box name="JoystickFlycamEnabled">
- Flycam
- </check_box>
- <text name="XScale">
- Échelle des X
- </text>
- <text name="YScale">
- Échelle des Y
- </text>
- <text name="ZScale">
- Échelle des Z
- </text>
- <text left="9" name="PitchScale" width="104">
- Échelle du tangage
- </text>
- <text name="YawScale">
- Échelle du lacet
- </text>
- <text name="RollScale">
- Échelle du roulis
- </text>
- <text name="XDeadZone">
- Zone neutre X
- </text>
- <text name="YDeadZone">
- Zone neutre Y
- </text>
- <text name="ZDeadZone">
- Zone neutre Z
- </text>
- <text left="4" name="PitchDeadZone" width="110">
- Zone neutre Tangage
- </text>
- <text name="YawDeadZone">
- Zone neutre lacet
- </text>
- <text name="RollDeadZone">
- Zone neutre roulis
- </text>
- <text name="Feathering">
- Feathering
- </text>
- <text name="ZoomScale2">
- Échelle du zoom
- </text>
- <text left="6" name="ZoomDeadZone" width="110">
- Zone neutre du zoom
- </text>
- <button label="Options par défaut du joystick" name="SpaceNavigatorDefaults"/>
- <button label="OK" label_selected="OK" name="ok_btn"/>
- <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
- <string name="JoystickMonitor">
- Contrôle du joystick
- </string>
- <string name="Axis">
- Axe [NUM]
- </string>
- <string name="NoDevice">
- aucun joystick détecté
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Joystick" title="Configuration du joystick">
+ <check_box name="enable_joystick">
+ Activer :
+ </check_box>
+ <spinner label="Mapping axe des X " name="JoystickAxis1"/>
+ <spinner label="Mapping axe des Y" name="JoystickAxis2"/>
+ <spinner label="Mapping axe des Z" name="JoystickAxis0"/>
+ <spinner label="Mapping du tangage" label_width="111" left="8" name="JoystickAxis4" width="152"/>
+ <spinner label="Mapping du lacet" name="JoystickAxis5"/>
+ <spinner label="Mapping du roulis" name="JoystickAxis3"/>
+ <spinner label="Mapping du zoom" name="JoystickAxis6"/>
+ <check_box label="Zoom direct" name="ZoomDirect"/>
+ <check_box label="Curseur 3D" name="Cursor3D"/>
+ <check_box label="Niveau automatique" name="AutoLeveling"/>
+ <text name="Control Modes:">
+ Modes de contrôle :
+ </text>
+ <check_box name="JoystickAvatarEnabled">
+ Avatar
+ </check_box>
+ <check_box name="JoystickBuildEnabled">
+ Build
+ </check_box>
+ <check_box name="JoystickFlycamEnabled">
+ Flycam
+ </check_box>
+ <text name="XScale">
+ Échelle des X
+ </text>
+ <text name="YScale">
+ Échelle des Y
+ </text>
+ <text name="ZScale">
+ Échelle des Z
+ </text>
+ <text left="9" name="PitchScale" width="104">
+ Échelle du tangage
+ </text>
+ <text name="YawScale">
+ Échelle du lacet
+ </text>
+ <text name="RollScale">
+ Échelle du roulis
+ </text>
+ <text name="XDeadZone">
+ Zone neutre X
+ </text>
+ <text name="YDeadZone">
+ Zone neutre Y
+ </text>
+ <text name="ZDeadZone">
+ Zone neutre Z
+ </text>
+ <text left="4" name="PitchDeadZone" width="110">
+ Zone neutre Tangage
+ </text>
+ <text name="YawDeadZone">
+ Zone neutre lacet
+ </text>
+ <text name="RollDeadZone">
+ Zone neutre roulis
+ </text>
+ <text name="Feathering">
+ Feathering
+ </text>
+ <text name="ZoomScale2">
+ Échelle du zoom
+ </text>
+ <text left="6" name="ZoomDeadZone" width="110">
+ Zone neutre du zoom
+ </text>
+ <button label="Options par défaut du joystick" name="SpaceNavigatorDefaults"/>
+ <button label="OK" label_selected="OK" name="ok_btn"/>
+ <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+ <string name="JoystickMonitor">
+ Contrôle du joystick
+ </string>
+ <string name="Axis">
+ Axe [NUM]
+ </string>
+ <string name="NoDevice">
+ aucun joystick détecté
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
index da51b1b426..54069c9c49 100644
--- a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="Mesure du lag">
- <button name="client_lagmeter" tool_tip="Statut du lag client"/>
- <text name="client">
- Client :
- </text>
- <text name="client_text">
- Normal
- </text>
- <button name="network_lagmeter" tool_tip="Statut du lag réseau"/>
- <text name="network">
- Réseau :
- </text>
- <text name="network_text">
- Normal
- </text>
- <button name="server_lagmeter" tool_tip="Statut du lag serveur"/>
- <text name="server">
- Serveur :
- </text>
- <text name="server_text">
- Normal
- </text>
- <button label="?" name="server_help"/>
- <button label=">>" name="minimize"/>
- <string name="max_title_msg">
- Mesure du lag
- </string>
- <string name="max_width_px">
- 360
- </string>
- <string name="min_title_msg">
- Lag
- </string>
- <string name="min_width_px">
- 90
- </string>
- <string name="client_text_msg">
- Client
- </string>
- <string name="client_frame_rate_critical_fps">
- 10
- </string>
- <string name="client_frame_rate_warning_fps">
- 15
- </string>
- <string name="client_frame_time_window_bg_msg">
- Normal, fenêtre en arrière-plan
- </string>
- <string name="client_frame_time_critical_msg">
- Taux de défilement client ci-dessous [CLIENT_FRAME_RATE_CRITICAL]
- </string>
- <string name="client_frame_time_warning_msg">
- Taux de défilement client entre [CLIENT_FRAME_RATE_CRITICAL] et [CLIENT_FRAME_RATE_WARNING]
- </string>
- <string name="client_frame_time_normal_msg">
- Normal
- </string>
- <string name="client_draw_distance_cause_msg">
- Cause possible : la limite d'affichage est trop élevée
- </string>
- <string name="client_texture_loading_cause_msg">
- Cause possible : images en cours de chargement
- </string>
- <string name="client_texture_memory_cause_msg">
- Cause possible : trop d'images en mémoire
- </string>
- <string name="client_complex_objects_cause_msg">
- Cause possible : trop d'objets complexes dans la scène
- </string>
- <string name="network_text_msg">
- Réseau
- </string>
- <string name="network_packet_loss_critical_pct">
- 10
- </string>
- <string name="network_packet_loss_warning_pct">
- 5
- </string>
- <string name="network_packet_loss_critical_msg">
- La connexion perd plus de [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
- </string>
- <string name="network_packet_loss_warning_msg">
- La connexion perd entre [NETWORK_PACKET_LOSS_WARNING] % et [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
- </string>
- <string name="network_performance_normal_msg">
- Normal
- </string>
- <string name="network_ping_critical_ms">
- 600
- </string>
- <string name="network_ping_warning_ms">
- 300
- </string>
- <string name="network_ping_critical_msg">
- Temps de connexion ping supérieur à [NETWORK_PING_CRITICAL] ms
- </string>
- <string name="network_ping_warning_msg">
- Temps de connexion ping entre [NETWORK_PING_WARNING] et [NETWORK_PING_CRITICAL] ms
- </string>
- <string name="network_packet_loss_cause_msg">
- Mauvaise connexion possible ou réglage de la bande passante trop élevé.
- </string>
- <string name="network_ping_cause_msg">
- Mauvaise connexion possible ou app. de partage des fichiers
- </string>
- <string name="server_text_msg">
- Serveur
- </string>
- <string name="server_frame_rate_critical_fps">
- 20
- </string>
- <string name="server_frame_rate_warning_fps">
- 30
- </string>
- <string name="server_single_process_max_time_ms">
- 20
- </string>
- <string name="server_frame_time_critical_msg">
- Taux de défilement du simulateur au dessous de [SERVER_FRAME_RATE_CRITICAL]
- </string>
- <string name="server_frame_time_warning_msg">
- Taux de défilement du simulateur entre [SERVER_FRAME_RATE_CRITICAL] et [SERVER_FRAME_RATE_WARNING]
- </string>
- <string name="server_frame_time_normal_msg">
- Normal
- </string>
- <string name="server_physics_cause_msg">
- Cause possible : trop d'objets physiques
- </string>
- <string name="server_scripts_cause_msg">
- Cause possible : trop d'objets scriptés
- </string>
- <string name="server_net_cause_msg">
- Cause possible : trop de trafic réseau
- </string>
- <string name="server_agent_cause_msg">
- Cause possible : trop de personnes en mouvement dans la région
- </string>
- <string name="server_images_cause_msg">
- Cause possible : trop de calculs d'images
- </string>
- <string name="server_generic_cause_msg">
- Cause possible : charge simulateur trop lourde
- </string>
- <string name="smaller_label">
- >>
- </string>
- <string name="bigger_label">
- <<
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_lagmeter" title="Mesure du lag">
+ <button name="client_lagmeter" tool_tip="Statut du lag client"/>
+ <text name="client">
+ Client :
+ </text>
+ <text name="client_text">
+ Normal
+ </text>
+ <button name="network_lagmeter" tool_tip="Statut du lag réseau"/>
+ <text name="network">
+ Réseau :
+ </text>
+ <text name="network_text">
+ Normal
+ </text>
+ <button name="server_lagmeter" tool_tip="Statut du lag serveur"/>
+ <text name="server">
+ Serveur :
+ </text>
+ <text name="server_text">
+ Normal
+ </text>
+ <button label="?" name="server_help"/>
+ <button label=">>" name="minimize"/>
+ <string name="max_title_msg">
+ Mesure du lag
+ </string>
+ <string name="max_width_px">
+ 360
+ </string>
+ <string name="min_title_msg">
+ Lag
+ </string>
+ <string name="min_width_px">
+ 90
+ </string>
+ <string name="client_text_msg">
+ Client
+ </string>
+ <string name="client_frame_rate_critical_fps">
+ 10
+ </string>
+ <string name="client_frame_rate_warning_fps">
+ 15
+ </string>
+ <string name="client_frame_time_window_bg_msg">
+ Normal, fenêtre en arrière-plan
+ </string>
+ <string name="client_frame_time_critical_msg">
+ Taux de défilement client ci-dessous [CLIENT_FRAME_RATE_CRITICAL]
+ </string>
+ <string name="client_frame_time_warning_msg">
+ Taux de défilement client entre [CLIENT_FRAME_RATE_CRITICAL] et [CLIENT_FRAME_RATE_WARNING]
+ </string>
+ <string name="client_frame_time_normal_msg">
+ Normal
+ </string>
+ <string name="client_draw_distance_cause_msg">
+ Cause possible : la limite d'affichage est trop élevée
+ </string>
+ <string name="client_texture_loading_cause_msg">
+ Cause possible : images en cours de chargement
+ </string>
+ <string name="client_texture_memory_cause_msg">
+ Cause possible : trop d'images en mémoire
+ </string>
+ <string name="client_complex_objects_cause_msg">
+ Cause possible : trop d'objets complexes dans la scène
+ </string>
+ <string name="network_text_msg">
+ Réseau
+ </string>
+ <string name="network_packet_loss_critical_pct">
+ 10
+ </string>
+ <string name="network_packet_loss_warning_pct">
+ 5
+ </string>
+ <string name="network_packet_loss_critical_msg">
+ La connexion perd plus de [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
+ </string>
+ <string name="network_packet_loss_warning_msg">
+ La connexion perd entre [NETWORK_PACKET_LOSS_WARNING] % et [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
+ </string>
+ <string name="network_performance_normal_msg">
+ Normal
+ </string>
+ <string name="network_ping_critical_ms">
+ 600
+ </string>
+ <string name="network_ping_warning_ms">
+ 300
+ </string>
+ <string name="network_ping_critical_msg">
+ Temps de connexion ping supérieur à [NETWORK_PING_CRITICAL] ms
+ </string>
+ <string name="network_ping_warning_msg">
+ Temps de connexion ping entre [NETWORK_PING_WARNING] et [NETWORK_PING_CRITICAL] ms
+ </string>
+ <string name="network_packet_loss_cause_msg">
+ Mauvaise connexion possible ou réglage de la bande passante trop élevé.
+ </string>
+ <string name="network_ping_cause_msg">
+ Mauvaise connexion possible ou app. de partage des fichiers
+ </string>
+ <string name="server_text_msg">
+ Serveur
+ </string>
+ <string name="server_frame_rate_critical_fps">
+ 20
+ </string>
+ <string name="server_frame_rate_warning_fps">
+ 30
+ </string>
+ <string name="server_single_process_max_time_ms">
+ 20
+ </string>
+ <string name="server_frame_time_critical_msg">
+ Taux de défilement du simulateur au dessous de [SERVER_FRAME_RATE_CRITICAL]
+ </string>
+ <string name="server_frame_time_warning_msg">
+ Taux de défilement du simulateur entre [SERVER_FRAME_RATE_CRITICAL] et [SERVER_FRAME_RATE_WARNING]
+ </string>
+ <string name="server_frame_time_normal_msg">
+ Normal
+ </string>
+ <string name="server_physics_cause_msg">
+ Cause possible : trop d'objets physiques
+ </string>
+ <string name="server_scripts_cause_msg">
+ Cause possible : trop d'objets scriptés
+ </string>
+ <string name="server_net_cause_msg">
+ Cause possible : trop de trafic réseau
+ </string>
+ <string name="server_agent_cause_msg">
+ Cause possible : trop de personnes en mouvement dans la région
+ </string>
+ <string name="server_images_cause_msg">
+ Cause possible : trop de calculs d'images
+ </string>
+ <string name="server_generic_cause_msg">
+ Cause possible : charge simulateur trop lourde
+ </string>
+ <string name="smaller_label">
+ >>
+ </string>
+ <string name="bigger_label">
+ <<
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
index a8121d77c6..4a63abf4e1 100644
--- a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="land holdings floater" title="Mes terrains">
- <scroll_list name="parcel list">
- <column label="Nom" name="name" />
- <column label="Emplacement" name="location" />
- <column label="Surface" name="area" />
- <column label="" name="hidden" />
- </scroll_list>
- <button label="Téléporter" label_selected="Téléporter" name="Teleport"
- tool_tip="Téléportez-vous au milieu de ce terrain." />
- <button label="Voir sur la carte" label_selected="Voir sur la carte" name="Show on Map"
- tool_tip="Affichez ce terrain sur la carte du monde." />
- <text name="contrib_label">
- Vos contributions :
- </text>
- <scroll_list name="grant list">
- <column label="Groupe" name="group" />
- <column label="Surface" name="area" />
- </scroll_list>
- <text name="allowed_label">
- Surface de terrain autorisée avec votre compte :
- </text>
- <text name="allowed_text">
- [AREA] m²
- </text>
- <text name="current_label">
- Surface occupée actuellement :
- </text>
- <text name="current_text">
- [AREA] m²
- </text>
- <text name="available_label">
- Disponible à l'achat :
- </text>
- <text name="available_text">
- [AREA] m²
- </text>
- <string name="area_string">
- [AREA] m²
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="land holdings floater" title="Mes terrains">
+ <scroll_list name="parcel list">
+ <column label="Nom" name="name" />
+ <column label="Emplacement" name="location" />
+ <column label="Surface" name="area" />
+ <column label="" name="hidden" />
+ </scroll_list>
+ <button label="Téléporter" label_selected="Téléporter" name="Teleport"
+ tool_tip="Téléportez-vous au milieu de ce terrain." />
+ <button label="Voir sur la carte" label_selected="Voir sur la carte" name="Show on Map"
+ tool_tip="Affichez ce terrain sur la carte du monde." />
+ <text name="contrib_label">
+ Vos contributions :
+ </text>
+ <scroll_list name="grant list">
+ <column label="Groupe" name="group" />
+ <column label="Surface" name="area" />
+ </scroll_list>
+ <text name="allowed_label">
+ Surface de terrain autorisée avec votre compte :
+ </text>
+ <text name="allowed_text">
+ [AREA] m²
+ </text>
+ <text name="current_label">
+ Surface occupée actuellement :
+ </text>
+ <text name="current_text">
+ [AREA] m²
+ </text>
+ <text name="available_label">
+ Disponible à l'achat :
+ </text>
+ <text name="available_text">
+ [AREA] m²
+ </text>
+ <string name="area_string">
+ [AREA] m²
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
index 18f3a5d1d1..2ca6a85ea4 100644
--- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script ed float" title="Script : Nouveau script">
- <button label="Redéfinir" label_selected="Redéfinir" name="Reset" width="100" left="390"/>
- <check_box label="Exécution en cours" name="running" left="4"/>
- <check_box label="Mono" name="mono" left="130"/>
- <string name="not_allowed">
- Vous n'êtes pas autorisé à afficher ce script.
- </string>
- <string name="script_running">
- Exécution en cours
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="Script : Nouveau script">
+ <button label="Redéfinir" label_selected="Redéfinir" name="Reset" width="100" left="390"/>
+ <check_box label="Exécution en cours" name="running" left="4"/>
+ <check_box label="Mono" name="mono" left="130"/>
+ <string name="not_allowed">
+ Vous n'êtes pas autorisé à afficher ce script.
+ </string>
+ <string name="script_running">
+ Exécution en cours
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
index ea39098a41..5dc0fa76a3 100644
--- a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script ed float" title="Wiki LSL">
- <check_box label="Suivre le curseur" name="lock_check" />
- <combo_box label="Verrouiller" name="history_combo" left_delta="120" width="70"/>
- <button label="Précédente" name="back_btn" left_delta="75"/>
- <button label="Suivante" name="fwd_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="Wiki LSL">
+ <check_box label="Suivre le curseur" name="lock_check" />
+ <combo_box label="Verrouiller" name="history_combo" left_delta="120" width="70"/>
+ <button label="Précédente" name="back_btn" left_delta="75"/>
+ <button label="Suivante" name="fwd_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
index d8da196f12..e75b45c43a 100644
--- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="Navigateur">
- <layout_stack name="stack1">
- <layout_panel name="nav_controls">
- <button label="Précédente" name="back" width="75"/>
- <button label="Suivante" left_delta="75" name="forward" width="70"/>
- <button label="Rafraîchir" left_delta="75" name="reload"/>
- <combo_box left_delta="75" name="address" width="510"/>
- <button label="OK" left_delta="515" name="go"/>
- </layout_panel>
- <layout_panel name="parcel_owner_controls">
- <button label="Envoyer l'URL sur la parcelle" name="assign"/>
- </layout_panel>
- <layout_panel name="external_controls">
- <button label="Ouvrir dans mon navigateur web" name="open_browser" width="196"/>
- <check_box label="Toujours ouvrir dans mon navigateur web" left_delta="201" name="open_always"/>
- <button label="Fermer" name="close"/>
- </layout_panel>
- </layout_stack>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="Navigateur">
+ <layout_stack name="stack1">
+ <layout_panel name="nav_controls">
+ <button label="Précédente" name="back" width="75"/>
+ <button label="Suivante" left_delta="75" name="forward" width="70"/>
+ <button label="Rafraîchir" left_delta="75" name="reload"/>
+ <combo_box left_delta="75" name="address" width="510"/>
+ <button label="OK" left_delta="515" name="go"/>
+ </layout_panel>
+ <layout_panel name="parcel_owner_controls">
+ <button label="Envoyer l'URL sur la parcelle" name="assign"/>
+ </layout_panel>
+ <layout_panel name="external_controls">
+ <button label="Ouvrir dans mon navigateur web" name="open_browser" width="196"/>
+ <check_box label="Toujours ouvrir dans mon navigateur web" left_delta="201" name="open_always"/>
+ <button label="Fermer" name="close"/>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
index 4b4a879cab..a22d0a2934 100644
--- a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="MemLeak" title="Simulation fuite mémoire">
- <spinner label="Vitesse de la fuite (octets) :" name="leak_speed" />
- <spinner label="Max mémoire perdue (Mo) :" name="max_leak" />
- <text name="total_leaked_label">
- Mémoire perdue actuelle : [SIZE] Ko
- </text>
- <text name="note_label_1">
- [NOTE1]
- </text>
- <text name="note_label_2">
- [NOTE2]
- </text>
- <button label="Commencer" name="start_btn" />
- <button label="Stop" name="stop_btn" />
- <button label="Libérer" name="release_btn" />
- <button label="Fermer" name="close_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="MemLeak" title="Simulation fuite mémoire">
+ <spinner label="Vitesse de la fuite (octets) :" name="leak_speed" />
+ <spinner label="Max mémoire perdue (Mo) :" name="max_leak" />
+ <text name="total_leaked_label">
+ Mémoire perdue actuelle : [SIZE] Ko
+ </text>
+ <text name="note_label_1">
+ [NOTE1]
+ </text>
+ <text name="note_label_2">
+ [NOTE2]
+ </text>
+ <button label="Commencer" name="start_btn" />
+ <button label="Stop" name="stop_btn" />
+ <button label="Libérer" name="release_btn" />
+ <button label="Fermer" name="close_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml
index 7da1b46680..55ea8700a6 100644
--- a/indra/newview/skins/default/xui/fr/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
- <button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche"/>
- <button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite"/>
- <button label="" label_selected="" name="move up btn" tool_tip="Sauter ou voler vers le haut"/>
- <button label="" label_selected="" name="move down btn" tool_tip="S'accroupir ou voler vers le bas"/>
- <button label="Voler" label_selected="Voler" name="fly btn" tool_tip="Démarrer/arrêter le vol"/>
- <joystick_slide name="slide left btn" tool_tip="Se déplacer vers la gauche"/>
- <joystick_slide name="slide right btn" tool_tip="Se déplacer vers la droite"/>
- <joystick_turn name="forward btn" tool_tip="Se déplacer vers l'avant"/>
- <joystick_turn name="backward btn" tool_tip="Se déplacer vers l'arrière"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="move floater" title="">
+ <button label="" label_selected="" name="turn left btn" tool_tip="Tourner à gauche"/>
+ <button label="" label_selected="" name="turn right btn" tool_tip="Tourner à droite"/>
+ <button label="" label_selected="" name="move up btn" tool_tip="Sauter ou voler vers le haut"/>
+ <button label="" label_selected="" name="move down btn" tool_tip="S'accroupir ou voler vers le bas"/>
+ <button label="Voler" label_selected="Voler" name="fly btn" tool_tip="Démarrer/arrêter le vol"/>
+ <joystick_slide name="slide left btn" tool_tip="Se déplacer vers la gauche"/>
+ <joystick_slide name="slide right btn" tool_tip="Se déplacer vers la droite"/>
+ <joystick_turn name="forward btn" tool_tip="Se déplacer vers l'avant"/>
+ <joystick_turn name="backward btn" tool_tip="Se déplacer vers l'arrière"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_mute_object.xml b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
index 61f40e8010..23d351f32d 100644
--- a/indra/newview/skins/default/xui/fr/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="mute by name" title="Ignorer les objets par nom">
- <text name="message">
- Cette fonction ne marche que pour les chats et les IM,
-pas les sons. Saisissez le nom exact de l'objet.
- </text>
- <line_editor name="object_name">
- Nom de l'objet
- </line_editor>
- <button label="OK" name="OK"/>
- <button label="Annuler" name="Cancel"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="mute by name" title="Ignorer les objets par nom">
+ <text name="message">
+ Cette fonction ne marche que pour les chats et les IM,
+pas les sons. Saisissez le nom exact de l'objet.
+ </text>
+ <line_editor name="object_name">
+ Nom de l'objet
+ </line_editor>
+ <button label="OK" name="OK"/>
+ <button label="Annuler" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_my_friends.xml b/indra/newview/skins/default/xui/fr/floater_my_friends.xml
index 552afee4c3..911647d8be 100644
--- a/indra/newview/skins/default/xui/fr/floater_my_friends.xml
+++ b/indra/newview/skins/default/xui/fr/floater_my_friends.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_my_friends" title="Contacts">
- <tab_container name="friends_and_groups">
- <panel label="Amis" name="friends_panel" />
- <panel label="Groupes" name="groups_panel" />
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_my_friends" title="Contacts">
+ <tab_container name="friends_and_groups">
+ <panel label="Amis" name="friends_panel" />
+ <panel label="Groupes" name="groups_panel" />
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_openobject.xml b/indra/newview/skins/default/xui/fr/floater_openobject.xml
index 5d8f0bed46..36c712e8a3 100644
--- a/indra/newview/skins/default/xui/fr/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/fr/floater_openobject.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="objectcontents" title="Contenu des objets">
- <text type="string" length="1" name="object_name">
- [DESC]:
- </text>
- <button label="Copier vers l'inventaire" label_selected="Copier vers l'inventaire" name="copy_to_inventory_button" width="132" />
- <button label="Copier et porter" label_selected="Copier et porter" name="copy_and_wear_button" left="152"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="objectcontents" title="Contenu des objets">
+ <text type="string" length="1" name="object_name">
+ [DESC]:
+ </text>
+ <button label="Copier vers l'inventaire" label_selected="Copier vers l'inventaire" name="copy_to_inventory_button" width="132" />
+ <button label="Copier et porter" label_selected="Copier et porter" name="copy_and_wear_button" left="152"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml
index 08251de71b..c5b689e2dd 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay.xml
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
- <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
- <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
- <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
- <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
- <button label="Payer" label_selected="Payer" name="pay btn"/>
- <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
- <text length="1" name="payee_label" type="string" left="5">
- Payer :
- </text>
- <text length="1" name="payee_name" type="string">
- [FIRST] [LAST]
- </text>
- <text length="1" name="fastpay text" type="string" width="100" halign="left">
- Paiement rapide :
- </text>
- <text left="4" length="1" name="amount text" type="string">
- Montant :
- </text>
- <line_editor left="60" name="amount" width="55"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Give Money" title="">
+ <button label="1 L$" label_selected="1 L$" name="fastpay 1"/>
+ <button label="5 L$" label_selected="5 L$" name="fastpay 5"/>
+ <button label="10 L$" label_selected="10 L$" name="fastpay 10"/>
+ <button label="20 L$" label_selected="20 L$" name="fastpay 20"/>
+ <button label="Payer" label_selected="Payer" name="pay btn"/>
+ <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+ <text length="1" name="payee_label" type="string" left="5">
+ Payer :
+ </text>
+ <text length="1" name="payee_name" type="string">
+ [FIRST] [LAST]
+ </text>
+ <text length="1" name="fastpay text" type="string" width="100" halign="left">
+ Paiement rapide :
+ </text>
+ <text left="4" length="1" name="amount text" type="string">
+ Montant :
+ </text>
+ <line_editor left="60" name="amount" width="55"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index 53599554fb..3dc0af75e8 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
- <text length="1" name="payee_group" type="string" width="95">
- Payer le groupe :
- </text>
- <text length="1" name="payee_resident" type="string" width="100" halign="left" >
- Payer le résident :
- </text>
- <text length="1" name="payee_name" type="string" left="105">
- [FIRST] [LAST]
- </text>
- <text length="1" name="object_name_label" type="string" left="25">
- Via un objet :
- </text>
- <text length="1" name="object_name_text" type="string" left="105">
- ...
- </text>
- <text length="1" name="fastpay text" type="string" width="95">
- Paiement rapide :
- </text>
- <text length="1" name="amount text" type="string" left="5" halign="left">
- Montant :
- </text>
- <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="105" />
- <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="190"/>
- <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="105" />
- <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="190"/>
- <button label="Payer" label_selected="Payer" name="pay btn"/>
- <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
- <line_editor left="65" name="amount" width="50" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Give Money" title="">
+ <text length="1" name="payee_group" type="string" width="95">
+ Payer le groupe :
+ </text>
+ <text length="1" name="payee_resident" type="string" width="100" halign="left" >
+ Payer le résident :
+ </text>
+ <text length="1" name="payee_name" type="string" left="105">
+ [FIRST] [LAST]
+ </text>
+ <text length="1" name="object_name_label" type="string" left="25">
+ Via un objet :
+ </text>
+ <text length="1" name="object_name_text" type="string" left="105">
+ ...
+ </text>
+ <text length="1" name="fastpay text" type="string" width="95">
+ Paiement rapide :
+ </text>
+ <text length="1" name="amount text" type="string" left="5" halign="left">
+ Montant :
+ </text>
+ <button label="1 L$" label_selected="1 L$" name="fastpay 1" left="105" />
+ <button label="5 L$" label_selected="5 L$" name="fastpay 5" left="190"/>
+ <button label="10 L$" label_selected="10 L$" name="fastpay 10" left="105" />
+ <button label="20 L$" label_selected="20 L$" name="fastpay 20" left="190"/>
+ <button label="Payer" label_selected="Payer" name="pay btn"/>
+ <button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+ <line_editor left="65" name="amount" width="50" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_post_process.xml b/indra/newview/skins/default/xui/fr/floater_post_process.xml
index 74c19dc299..52afb340a6 100644
--- a/indra/newview/skins/default/xui/fr/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/fr/floater_post_process.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Post-Process Floater" title="Paramètres post-traitement">
- <tab_container name="Post-Process Tabs">
- <panel label="Filtre couleur" name="wmiColorFilterPanel">
- <check_box label="Activer" name="wmiColorFilterToggle" />
- <text name="wmiColorFilterBrightnessText">
- Luminosité
- </text>
- <text name="wmiColorFilterSaturationText">
- Saturation
- </text>
- <text name="wmiColorFilterContrastText">
- Contraste
- </text>
- <text name="wmiColorFilterBaseText">
- Couleur de base du contraste
- </text>
- <slider label="R" name="wmiColorFilterBaseR" />
- <slider label="V" name="wmiColorFilterBaseG" />
- <slider label="B" name="wmiColorFilterBaseB" />
- <slider label="I" name="wmiColorFilterBaseI" />
- </panel>
- <panel label="Vision de nuit" name="wmiNightVisionPanel">
- <check_box label="Activer" name="wmiNightVisionToggle" />
- <text name="wmiNightVisionBrightMultText">
- Multiple d'amplificateur de lumière
- </text>
- <text name="wmiNightVisionNoiseSizeText">
- Taille du bruit
- </text>
- <text name="wmiNightVisionNoiseStrengthText">
- Force du bruit
- </text>
- </panel>
- <panel label="Éclat" name="wmiBloomPanel">
- <check_box label="Activer" name="wmiBloomToggle" />
- <text name="wmiBloomExtractText">
- Extraction de la luminosité
- </text>
- <text name="wmiBloomSizeText">
- Taille de l'éclat
- </text>
- <text name="wmiBloomStrengthText">
- Force de l'éclat
- </text>
- </panel>
- <panel label="Extras" name="Extras">
- <button label="Charger effet" label_selected="Charger effet" name="PPLoadEffect" />
- <button label="Enregistrer effet" label_selected="Enregistrer effet"
- name="PPSaveEffect" />
- <line_editor label="Nom de l'effet" name="PPEffectNameEditor" />
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Post-Process Floater" title="Paramètres post-traitement">
+ <tab_container name="Post-Process Tabs">
+ <panel label="Filtre couleur" name="wmiColorFilterPanel">
+ <check_box label="Activer" name="wmiColorFilterToggle" />
+ <text name="wmiColorFilterBrightnessText">
+ Luminosité
+ </text>
+ <text name="wmiColorFilterSaturationText">
+ Saturation
+ </text>
+ <text name="wmiColorFilterContrastText">
+ Contraste
+ </text>
+ <text name="wmiColorFilterBaseText">
+ Couleur de base du contraste
+ </text>
+ <slider label="R" name="wmiColorFilterBaseR" />
+ <slider label="V" name="wmiColorFilterBaseG" />
+ <slider label="B" name="wmiColorFilterBaseB" />
+ <slider label="I" name="wmiColorFilterBaseI" />
+ </panel>
+ <panel label="Vision de nuit" name="wmiNightVisionPanel">
+ <check_box label="Activer" name="wmiNightVisionToggle" />
+ <text name="wmiNightVisionBrightMultText">
+ Multiple d'amplificateur de lumière
+ </text>
+ <text name="wmiNightVisionNoiseSizeText">
+ Taille du bruit
+ </text>
+ <text name="wmiNightVisionNoiseStrengthText">
+ Force du bruit
+ </text>
+ </panel>
+ <panel label="Éclat" name="wmiBloomPanel">
+ <check_box label="Activer" name="wmiBloomToggle" />
+ <text name="wmiBloomExtractText">
+ Extraction de la luminosité
+ </text>
+ <text name="wmiBloomSizeText">
+ Taille de l'éclat
+ </text>
+ <text name="wmiBloomStrengthText">
+ Force de l'éclat
+ </text>
+ </panel>
+ <panel label="Extras" name="Extras">
+ <button label="Charger effet" label_selected="Charger effet" name="PPLoadEffect" />
+ <button label="Enregistrer effet" label_selected="Enregistrer effet"
+ name="PPSaveEffect" />
+ <line_editor label="Nom de l'effet" name="PPEffectNameEditor" />
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_postcard.xml b/indra/newview/skins/default/xui/fr/floater_postcard.xml
index a17f1f64c1..38eb0ced4a 100644
--- a/indra/newview/skins/default/xui/fr/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_postcard.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="Envoyer la photo par e-mail">
- <text name="to_label" width="135">
- E-mail du destinataire :
- </text>
- <line_editor name="to_form" left="143" width="127" />
- <text name="from_label">
- Votre e-mail :
- </text>
- <line_editor name="from_form" left="143" width="127" />
- <text name="name_label">
- Votre nom :
- </text>
- <line_editor name="name_form" left="143" width="127" />
- <text name="subject_label">
- Sujet :
- </text>
- <line_editor name="subject_form" left="143" width="127" />
- <line_editor label="Saisissez votre sujet ici." name="subject_form" />
- <text name="msg_label">
- Message :
- </text>
- <check_box label="Publier sur le web" name="allow_publish_check"
- tool_tip="Publiez cette carte postale sur le web." />
- <check_box label="Contenu adulte" name="mature_check"
- tool_tip="Cette carte postale est à caractère adulte." />
- <button label="?" name="publish_help_btn" />
- <text_editor name="msg_form">
- Saisissez votre message ici.
- </text_editor>
- <text name="fine_print">
- Si le destinataire s'inscrit sur Second Life, vous recevrez un bonus.
- </text>
- <button label="Annuler" name="cancel_btn" />
- <button label="Envoyer" name="send_btn" />
- <string name="default_subject">
- Carte postale de Second Life.
- </string>
- <string name="default_message">
- Ouvrez-moi !
- </string>
- <string name="upload_message">
- Envoi en cours...
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Postcard" title="Envoyer la photo par e-mail">
+ <text name="to_label" width="135">
+ E-mail du destinataire :
+ </text>
+ <line_editor name="to_form" left="143" width="127" />
+ <text name="from_label">
+ Votre e-mail :
+ </text>
+ <line_editor name="from_form" left="143" width="127" />
+ <text name="name_label">
+ Votre nom :
+ </text>
+ <line_editor name="name_form" left="143" width="127" />
+ <text name="subject_label">
+ Sujet :
+ </text>
+ <line_editor name="subject_form" left="143" width="127" />
+ <line_editor label="Saisissez votre sujet ici." name="subject_form" />
+ <text name="msg_label">
+ Message :
+ </text>
+ <check_box label="Publier sur le web" name="allow_publish_check"
+ tool_tip="Publiez cette carte postale sur le web." />
+ <check_box label="Contenu adulte" name="mature_check"
+ tool_tip="Cette carte postale est à caractère adulte." />
+ <button label="?" name="publish_help_btn" />
+ <text_editor name="msg_form">
+ Saisissez votre message ici.
+ </text_editor>
+ <text name="fine_print">
+ Si le destinataire s'inscrit sur Second Life, vous recevrez un bonus.
+ </text>
+ <button label="Annuler" name="cancel_btn" />
+ <button label="Envoyer" name="send_btn" />
+ <string name="default_subject">
+ Carte postale de Second Life.
+ </string>
+ <string name="default_message">
+ Ouvrez-moi !
+ </string>
+ <string name="upload_message">
+ Envoi en cours...
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml
index cb1e245ee4..9dab4d642c 100644
--- a/indra/newview/skins/default/xui/fr/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preferences.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Preferences" title="Préférences" min_width="330" width="626">
- <button label="À propos" label_selected="À propos" name="About..." />
- <button label="OK" label_selected="OK" name="OK" />
- <button label="Annuler" label_selected="Annuler" name="Cancel" />
- <button label="Appliquer" label_selected="Appliquer" name="Apply" />
- <button label="Aide" label_selected="Aide" name="Help" />
- <tab_container name="pref core" tab_width="126" width="626" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Preferences" title="Préférences" min_width="330" width="626">
+ <button label="À propos" label_selected="À propos" name="About..." />
+ <button label="OK" label_selected="OK" name="OK" />
+ <button label="Annuler" label_selected="Annuler" name="Cancel" />
+ <button label="Appliquer" label_selected="Appliquer" name="Apply" />
+ <button label="Aide" label_selected="Aide" name="Help" />
+ <tab_container name="pref core" tab_width="126" width="626" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
index bdb1e9eda5..0ee4ea1df6 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_anim">
- <text type="string" length="1" name="desc txt">
- Description :
- </text>
- <button label="Jouer dans le Monde" label_selected="Stop" name="Anim play btn"
- tool_tip="Jouer cette animation et partagez-la avec d'autres." width="131" left="20"/>
- <button label="Jouer localement" label_selected="Stop" name="Anim audition btn"
- tool_tip="Jouer cette animation et soyez le seul à la voir." width="125" left="162"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_anim">
+ <text type="string" length="1" name="desc txt">
+ Description :
+ </text>
+ <button label="Jouer dans le Monde" label_selected="Stop" name="Anim play btn"
+ tool_tip="Jouer cette animation et partagez-la avec d'autres." width="131" left="20"/>
+ <button label="Jouer localement" label_selected="Stop" name="Anim audition btn"
+ tool_tip="Jouer cette animation et soyez le seul à la voir." width="125" left="162"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_classified.xml b/indra/newview/skins/default/xui/fr/floater_preview_classified.xml
index 8322f3932d..1b6f26150d 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_classified.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="classified_preview" title="Informations sur la petite annonce" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="classified_preview" title="Informations sur la petite annonce" />
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_event.xml b/indra/newview/skins/default/xui/fr/floater_preview_event.xml
index ed929c78e4..e7fc2aa8dd 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_event.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_event.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="event_preview" title="Informations sur l'événement" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="event_preview" title="Informations sur l'événement" />
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index 6c373030ad..5322993b0b 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gesture_preview">
- <string name="stop_txt">
- Stop
- </string>
- <string name="preview_txt">
- Prévisualiser
- </string>
- <string name="none_text">
- -- Aucune --
- </string>
- <text name="desc_label">
- Description :
- </text>
- <text name="trigger_label">
- Déclencheur :
- </text>
- <text name="replace_text"
- tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste.">
- Remplacer par :
- </text>
- <line_editor left="310" name="replace_editor"
- tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste"
- width="120" />
- <text name="key_label">
- Raccourci :
- </text>
- <combo_box label="Aucun" name="modifier_combo" width="55" />
- <combo_box label="Aucun" name="key_combo" width="55" />
- <text name="library_label">
- Bibliothèque :
- </text>
- <text name="steps_label">
- Étapes :
- </text>
- <scroll_list name="library_list">
- Animation
-Son
-Chat
-Attendre
- </scroll_list>
- <button label="Ajouter >>" name="add_btn" />
- <button label="Monter" name="up_btn" />
- <button label="Descendre" name="down_btn" />
- <button label="Supprimer" name="delete_btn" />
- <text name="help_label">
- Toutes les étapes ont lieu
-simultanément, sauf si vous
-ajoutez des pauses.
- </text>
- <radio_group name="animation_trigger_type">
- <radio_item name="start">
- Commencer
- </radio_item>
- <radio_item name="stop">
- Stop
- </radio_item>
- </radio_group>
- <check_box label="jusqu'Ã la fin des animations" name="wait_anim_check" />
- <check_box label="temps en secondes" name="wait_time_check" />
- <check_box label="Actifs" name="active_check"
- tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leur raccourci dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu'il y a un conflit entre les raccourcis." />
- <button label="Prévisualiser" name="preview_btn" width="86" />
- <button label="Enregistrer" name="save_btn" width="86" left_delta="96"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gesture_preview">
+ <string name="stop_txt">
+ Stop
+ </string>
+ <string name="preview_txt">
+ Prévisualiser
+ </string>
+ <string name="none_text">
+ -- Aucune --
+ </string>
+ <text name="desc_label">
+ Description :
+ </text>
+ <text name="trigger_label">
+ Déclencheur :
+ </text>
+ <text name="replace_text"
+ tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste.">
+ Remplacer par :
+ </text>
+ <line_editor left="310" name="replace_editor"
+ tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste"
+ width="120" />
+ <text name="key_label">
+ Raccourci :
+ </text>
+ <combo_box label="Aucun" name="modifier_combo" width="55" />
+ <combo_box label="Aucun" name="key_combo" width="55" />
+ <text name="library_label">
+ Bibliothèque :
+ </text>
+ <text name="steps_label">
+ Étapes :
+ </text>
+ <scroll_list name="library_list">
+ Animation
+Son
+Chat
+Attendre
+ </scroll_list>
+ <button label="Ajouter >>" name="add_btn" />
+ <button label="Monter" name="up_btn" />
+ <button label="Descendre" name="down_btn" />
+ <button label="Supprimer" name="delete_btn" />
+ <text name="help_label">
+ Toutes les étapes ont lieu
+simultanément, sauf si vous
+ajoutez des pauses.
+ </text>
+ <radio_group name="animation_trigger_type">
+ <radio_item name="start">
+ Commencer
+ </radio_item>
+ <radio_item name="stop">
+ Stop
+ </radio_item>
+ </radio_group>
+ <check_box label="jusqu'Ã la fin des animations" name="wait_anim_check" />
+ <check_box label="temps en secondes" name="wait_time_check" />
+ <check_box label="Actifs" name="active_check"
+ tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leur raccourci dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu'il y a un conflit entre les raccourcis." />
+ <button label="Prévisualiser" name="preview_btn" width="86" />
+ <button label="Enregistrer" name="save_btn" width="86" left_delta="96"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
index 0de77b30cb..5e7d7b86ad 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview notecard" title="Remarque :">
- <button label="Enregistrer" label_selected="Enregistrer" name="Save" />
- <text type="string" length="1" name="desc txt">
- Description :
- </text>
- <text_editor type="string" length="1" name="Notecard Editor">
- Chargement...
- </text_editor>
- <string name="no_object">
- Impossible de trouver l'objet contenant cette note.
- </string>
- <string name="not_allowed">
- Vous n'êtes pas autorisé à afficher cette note.
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview notecard" title="Remarque :">
+ <button label="Enregistrer" label_selected="Enregistrer" name="Save" />
+ <text type="string" length="1" name="desc txt">
+ Description :
+ </text>
+ <text_editor type="string" length="1" name="Notecard Editor">
+ Chargement...
+ </text_editor>
+ <string name="no_object">
+ Impossible de trouver l'objet contenant cette note.
+ </string>
+ <string name="not_allowed">
+ Vous n'êtes pas autorisé à afficher cette note.
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
index 030ef7951e..e55ca1a583 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_sound">
- <text type="string" length="1" name="desc txt">
- Description :
- </text>
- <button label="Jouer dans le Monde" label_selected="Jouer dans le Monde"
- name="Sound play btn"
- tool_tip="Jouer ce son et partagez-le avec d'autres." width="131" left_delta="-142"/>
- <button label="Jouer localement" label_selected="Jouer localement"
- name="Sound audition btn"
- tool_tip="Jouer ce son et soyez le seul à l'entendre." width="125" left="162"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_sound">
+ <text type="string" length="1" name="desc txt">
+ Description :
+ </text>
+ <button label="Jouer dans le Monde" label_selected="Jouer dans le Monde"
+ name="Sound play btn"
+ tool_tip="Jouer ce son et partagez-le avec d'autres." width="131" left_delta="-142"/>
+ <button label="Jouer localement" label_selected="Jouer localement"
+ name="Sound audition btn"
+ tool_tip="Jouer ce son et soyez le seul à l'entendre." width="125" left="162"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
index 08f5eefa45..245847809e 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_texture">
- <text type="string" length="1" name="desc txt">
- Description :
- </text>
- <text type="string" length="1" name="dimensions">
- Dimensions : [WIDTH] x [HEIGHT]
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_texture">
+ <text type="string" length="1" name="desc txt">
+ Description :
+ </text>
+ <text type="string" length="1" name="dimensions">
+ Dimensions : [WIDTH] x [HEIGHT]
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_region_info.xml b/indra/newview/skins/default/xui/fr/floater_region_info.xml
index be36b41f27..d69f212b86 100644
--- a/indra/newview/skins/default/xui/fr/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/fr/floater_region_info.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="regioninfo" title="Région et domaine"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="regioninfo" title="Région et domaine"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index 0ce671db32..3946219458 100644
--- a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
@@ -1,183 +1,183 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_report_abuse" title="Signaler une infraction">
- <texture_picker label="" name="screenshot"/>
- <check_box label="Inclure une capture d'écran" name="screen_check"/>
- <text name="reporter_title" width="60">
- Déposant :
- </text>
- <text name="reporter_field">
- Loremipsum Dolorsitamut
- </text>
- <text name="sim_title">
- Région :
- </text>
- <text name="sim_field">
- Nom de la région
- </text>
- <text name="pos_title">
- Position :
- </text>
- <text name="pos_field">
- {128.1, 128.1, 15.4}
- </text>
- <text name="select_object_label">
- Cliquez sur le bouton puis l'objet :
- </text>
- <button label="" label_selected="" name="pick_btn" tool_tip="Le sélecteur d'objet vous permet d'identifier un objet comme sujet du rapport."/>
- <text name="object_name_label">
- Nom :
- </text>
- <text left_delta="70" name="object_name" width="105">
- Consetetur Sadipscing
- </text>
- <text name="owner_name_label" width="66">
- Propriétaire :
- </text>
- <text left_delta="70" name="owner_name" width="105">
- Hendrerit Vulputate
- </text>
- <combo_box name="category_combo" tool_tip="Choisissez la catégorie qui décrit le mieux ce rapport">
- <combo_item name="Select_category">
- Sélectionnez une catégorie
- </combo_item>
- <combo_item name="Age__Age_play">
- Âge > « Age play »
- </combo_item>
- <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
- Âge > Résident adulte sur Second Life pour adolescents
- </combo_item>
-
-
-
- <combo_item name="Assault__Combat_sandbox___unsafe_area">
- Assaut > Bac à sable utilisé pour des combats/zone non sécurisée
- </combo_item>
- <combo_item name="Assault__Safe_area">
- Assaut > Zone sécurisée
- </combo_item>
- <combo_item name="Assault__Weapons_testing_sandbox">
- Assaut > Bac à sable pour tests d'armes à feu
- </combo_item>
- <combo_item name="Commerce__Failure_to_deliver_product_or_service">
- Commerce > Incapacité à fournir un produit ou service
- </combo_item>
- <combo_item name="Disclosure__Real_world_information">
- Divulgation > Informations sur la vie réelle
- </combo_item>
- <combo_item name="Disclosure__Remotely_monitoring chat">
- Divulgation > Écoute d'un chat à distance
- </combo_item>
- <combo_item name="Disclosure__Second_Life_information_chat_IMs">
- Divulgation > Informations sur Second Life/chat/IM
- </combo_item>
- <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
- Trouble de la paix > Utilisation inadéquate des ressources de la région
- </combo_item>
- <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
- Trouble de la paix > Nombre d'objets scriptés excessif
- </combo_item>
- <combo_item name="Disturbing_the_peace__Object_littering">
- Trouble de la paix > Abandon d'objets
- </combo_item>
- <combo_item name="Disturbing_the_peace__Repetitive_spam">
- Trouble de la paix > Spam à répétition
- </combo_item>
- <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
- Trouble de la paix > Spam à caractère commercial
- </combo_item>
- <combo_item name="Fraud__L$">
- Fraude > L$
- </combo_item>
- <combo_item name="Fraud__Land">
- Fraude > Terrain
- </combo_item>
- <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
- Fraude > Vente pyramidale ou lettre-chaîne
- </combo_item>
- <combo_item name="Fraud__US$">
- Fraude > US$
- </combo_item>
- <combo_item name="Harassment__Advert_farms___visual_spam">
- Harcèlement > Spam visuel
- </combo_item>
- <combo_item name="Harassment__Defaming_individuals_or_groups">
- Harcèlement > Diffamation envers des individus ou des groupes
- </combo_item>
- <combo_item name="Harassment__Impeding_movement">
- Harcèlement > Immobilisation
- </combo_item>
- <combo_item name="Harassment__Sexual_harassment">
- Harcèlement > Harcèlement sexuel
- </combo_item>
- <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
- Harcèlement > Incitation à enfreindre les Conditions d'utilisation
- </combo_item>
- <combo_item name="Harassment__Verbal_abuse">
- Harcèlement > Abus verbal
- </combo_item>
- <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
- Indécence > Contenu ou comportement offensifs
- </combo_item>
-
-
-
- <combo_item name="Indecency__Inappropriate_avatar_name">
- Indécence > Nom d'avatar inapproprié
- </combo_item>
-
-
-
- <combo_item name="Intellectual_property_infringement_Content_Removal">
- Violation de droits de propriété intellectuelle > Suppression de contenu
- </combo_item>
- <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
- Violation de droits de propriété intellectuelle > CopyBot ou exploitation abusive des permissions
- </combo_item>
- <combo_item name="Intolerance">
- Intolérance
- </combo_item>
- <combo_item name="Land__Abuse_of_sandbox_resources">
- Terrain > Utilisation abusive des ressources du bac à sable
- </combo_item>
- <combo_item name="Land__Encroachment__Objects_textures">
- Terrain > Empiètement > Objets/textures
- </combo_item>
- <combo_item name="Land__Encroachment__Particles">
- Terrain > Empiètement > Particules
- </combo_item>
- <combo_item name="Land__Encroachment__Trees_plants">
- Terrain > Empiètement > Arbres/plantes
- </combo_item>
- <combo_item name="Wagering_gambling">
- Paris/jeux d'argent
- </combo_item>
- <combo_item name="Other">
- Autre
- </combo_item>
- </combo_box>
- <text name="abuser_name_title">
- Nom du contrevenant :
- </text>
- <button label="Choisir le résident" label_selected="" name="select_abuser" tool_tip="Sélectionnez le nom du résident dans une liste"/>
- <check_box label="Ne connaît pas le nom du contrevenant" name="omit_abuser_name" tool_tip="Cochez cette case si vous ne connaissez pas le nom du contrevenant"/>
- <text name="abuser_name_title2">
- Indiquez où l'infraction a eu lieu :
- </text>
- <text name="sum_title">
- Récapitulatif :
- </text>
- <text name="dscr_title">
- Détails :
- </text>
- <text name="bug_aviso">
- Indiquez la date, le lieu, la nature de l'infraction, ainsi que
-tout chat ou IM relatif à l'infraction, en étant aussi précis
-que possible. Pensez à indiquer un objet si possible.
- </text>
- <text bottom_delta="-16" name="incomplete_title">
- Remarque : les rapports incomplets ne feront pas l'objet d'une
-enquête.
- </text>
- <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
- <button label="Signaler une infraction" label_selected="Signaler une infraction" name="send_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_report_abuse" title="Signaler une infraction">
+ <texture_picker label="" name="screenshot"/>
+ <check_box label="Inclure une capture d'écran" name="screen_check"/>
+ <text name="reporter_title" width="60">
+ Déposant :
+ </text>
+ <text name="reporter_field">
+ Loremipsum Dolorsitamut
+ </text>
+ <text name="sim_title">
+ Région :
+ </text>
+ <text name="sim_field">
+ Nom de la région
+ </text>
+ <text name="pos_title">
+ Position :
+ </text>
+ <text name="pos_field">
+ {128.1, 128.1, 15.4}
+ </text>
+ <text name="select_object_label">
+ Cliquez sur le bouton puis l'objet :
+ </text>
+ <button label="" label_selected="" name="pick_btn" tool_tip="Le sélecteur d'objet vous permet d'identifier un objet comme sujet du rapport."/>
+ <text name="object_name_label">
+ Nom :
+ </text>
+ <text left_delta="70" name="object_name" width="105">
+ Consetetur Sadipscing
+ </text>
+ <text name="owner_name_label" width="66">
+ Propriétaire :
+ </text>
+ <text left_delta="70" name="owner_name" width="105">
+ Hendrerit Vulputate
+ </text>
+ <combo_box name="category_combo" tool_tip="Choisissez la catégorie qui décrit le mieux ce rapport">
+ <combo_item name="Select_category">
+ Sélectionnez une catégorie
+ </combo_item>
+ <combo_item name="Age__Age_play">
+ Âge > « Age play »
+ </combo_item>
+ <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+ Âge > Résident adulte sur Second Life pour adolescents
+ </combo_item>
+
+
+
+ <combo_item name="Assault__Combat_sandbox___unsafe_area">
+ Assaut > Bac à sable utilisé pour des combats/zone non sécurisée
+ </combo_item>
+ <combo_item name="Assault__Safe_area">
+ Assaut > Zone sécurisée
+ </combo_item>
+ <combo_item name="Assault__Weapons_testing_sandbox">
+ Assaut > Bac à sable pour tests d'armes à feu
+ </combo_item>
+ <combo_item name="Commerce__Failure_to_deliver_product_or_service">
+ Commerce > Incapacité à fournir un produit ou service
+ </combo_item>
+ <combo_item name="Disclosure__Real_world_information">
+ Divulgation > Informations sur la vie réelle
+ </combo_item>
+ <combo_item name="Disclosure__Remotely_monitoring chat">
+ Divulgation > Écoute d'un chat à distance
+ </combo_item>
+ <combo_item name="Disclosure__Second_Life_information_chat_IMs">
+ Divulgation > Informations sur Second Life/chat/IM
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+ Trouble de la paix > Utilisation inadéquate des ressources de la région
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+ Trouble de la paix > Nombre d'objets scriptés excessif
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Object_littering">
+ Trouble de la paix > Abandon d'objets
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Repetitive_spam">
+ Trouble de la paix > Spam à répétition
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+ Trouble de la paix > Spam à caractère commercial
+ </combo_item>
+ <combo_item name="Fraud__L$">
+ Fraude > L$
+ </combo_item>
+ <combo_item name="Fraud__Land">
+ Fraude > Terrain
+ </combo_item>
+ <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+ Fraude > Vente pyramidale ou lettre-chaîne
+ </combo_item>
+ <combo_item name="Fraud__US$">
+ Fraude > US$
+ </combo_item>
+ <combo_item name="Harassment__Advert_farms___visual_spam">
+ Harcèlement > Spam visuel
+ </combo_item>
+ <combo_item name="Harassment__Defaming_individuals_or_groups">
+ Harcèlement > Diffamation envers des individus ou des groupes
+ </combo_item>
+ <combo_item name="Harassment__Impeding_movement">
+ Harcèlement > Immobilisation
+ </combo_item>
+ <combo_item name="Harassment__Sexual_harassment">
+ Harcèlement > Harcèlement sexuel
+ </combo_item>
+ <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+ Harcèlement > Incitation à enfreindre les Conditions d'utilisation
+ </combo_item>
+ <combo_item name="Harassment__Verbal_abuse">
+ Harcèlement > Abus verbal
+ </combo_item>
+ <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+ Indécence > Contenu ou comportement offensifs
+ </combo_item>
+
+
+
+ <combo_item name="Indecency__Inappropriate_avatar_name">
+ Indécence > Nom d'avatar inapproprié
+ </combo_item>
+
+
+
+ <combo_item name="Intellectual_property_infringement_Content_Removal">
+ Violation de droits de propriété intellectuelle > Suppression de contenu
+ </combo_item>
+ <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+ Violation de droits de propriété intellectuelle > CopyBot ou exploitation abusive des permissions
+ </combo_item>
+ <combo_item name="Intolerance">
+ Intolérance
+ </combo_item>
+ <combo_item name="Land__Abuse_of_sandbox_resources">
+ Terrain > Utilisation abusive des ressources du bac à sable
+ </combo_item>
+ <combo_item name="Land__Encroachment__Objects_textures">
+ Terrain > Empiètement > Objets/textures
+ </combo_item>
+ <combo_item name="Land__Encroachment__Particles">
+ Terrain > Empiètement > Particules
+ </combo_item>
+ <combo_item name="Land__Encroachment__Trees_plants">
+ Terrain > Empiètement > Arbres/plantes
+ </combo_item>
+ <combo_item name="Wagering_gambling">
+ Paris/jeux d'argent
+ </combo_item>
+ <combo_item name="Other">
+ Autre
+ </combo_item>
+ </combo_box>
+ <text name="abuser_name_title">
+ Nom du contrevenant :
+ </text>
+ <button label="Choisir le résident" label_selected="" name="select_abuser" tool_tip="Sélectionnez le nom du résident dans une liste"/>
+ <check_box label="Ne connaît pas le nom du contrevenant" name="omit_abuser_name" tool_tip="Cochez cette case si vous ne connaissez pas le nom du contrevenant"/>
+ <text name="abuser_name_title2">
+ Indiquez où l'infraction a eu lieu :
+ </text>
+ <text name="sum_title">
+ Récapitulatif :
+ </text>
+ <text name="dscr_title">
+ Détails :
+ </text>
+ <text name="bug_aviso">
+ Indiquez la date, le lieu, la nature de l'infraction, ainsi que
+tout chat ou IM relatif à l'infraction, en étant aussi précis
+que possible. Pensez à indiquer un objet si possible.
+ </text>
+ <text bottom_delta="-16" name="incomplete_title">
+ Remarque : les rapports incomplets ne feront pas l'objet d'une
+enquête.
+ </text>
+ <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+ <button label="Signaler une infraction" label_selected="Signaler une infraction" name="send_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug.xml b/indra/newview/skins/default/xui/fr/floater_script_debug.xml
index 3381e510e8..3664222fd2 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_debug.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="script debug floater" title="Erreurs/alertes de scripts">
- <tab_container name="Preview Tabs">
- <floater label="Script" name="all_scripts" title="[All scripts]" />
- </tab_container>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="script debug floater" title="Erreurs/alertes de scripts">
+ <tab_container name="Preview Tabs">
+ <floater label="Script" name="all_scripts" title="[All scripts]" />
+ </tab_container>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_preview.xml b/indra/newview/skins/default/xui/fr/floater_script_preview.xml
index ff5d46c794..4b77d6b4cd 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_preview.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview lsl text" title="Script : Script de rotation">
- <text type="string" length="1" name="desc txt">
- Description :
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview lsl text" title="Script : Script de rotation">
+ <text type="string" length="1" name="desc txt">
+ Description :
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_queue.xml b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
index d93fd92a76..55487f75db 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="queue" title="Réinitialiser progression">
- <button label="Fermer" label_selected="Fermer" name="close" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="queue" title="Réinitialiser progression">
+ <button label="Fermer" label_selected="Fermer" name="close" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_search.xml b/indra/newview/skins/default/xui/fr/floater_script_search.xml
index abc1e79f4b..1c20c9c34b 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_search.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script search" title="Recherche de scripts" width="320">
- <check_box label="Non sensible à la casse" name="case_text" left="75"/>
- <button label="Rechercher" label_selected="Rechercher" name="search_btn" width="96"/>
- <button label="Remplacer" label_selected="Remplacer" name="replace_btn" left="111" width="96"/>
- <button label="Tout remplacer" label_selected="Tout remplacer" name="replace_all_btn" left="212" width="96"/>
- <text type="string" length="1" name="txt" width="65">
- Rechercher
- </text>
- <text type="string" length="1" name="txt2" width="65">
- Remplacer
- </text>
- <line_editor left="75" name="search_text" width="240" />
- <line_editor left="75" name="replace_text" width="240" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script search" title="Recherche de scripts" width="320">
+ <check_box label="Non sensible à la casse" name="case_text" left="75"/>
+ <button label="Rechercher" label_selected="Rechercher" name="search_btn" width="96"/>
+ <button label="Remplacer" label_selected="Remplacer" name="replace_btn" left="111" width="96"/>
+ <button label="Tout remplacer" label_selected="Tout remplacer" name="replace_all_btn" left="212" width="96"/>
+ <text type="string" length="1" name="txt" width="65">
+ Rechercher
+ </text>
+ <text type="string" length="1" name="txt2" width="65">
+ Remplacer
+ </text>
+ <line_editor left="75" name="search_text" width="240" />
+ <line_editor left="75" name="replace_text" width="240" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_select_key.xml b/indra/newview/skins/default/xui/fr/floater_select_key.xml
index fc8fae4bbe..0dc47df72b 100644
--- a/indra/newview/skins/default/xui/fr/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/fr/floater_select_key.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container">
- <button label="Annuler" label_selected="Annuler" name="Cancel" />
- <text name="Save item as:">
- Appuyer sur une touche pour choisir
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container">
+ <button label="Annuler" label_selected="Annuler" name="Cancel" />
+ <text name="Save item as:">
+ Appuyer sur une touche pour choisir
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
index f14a5e4ea6..6c5044da5a 100644
--- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="sell land" title="Vendre terrain">
- <text name="info_parcel_label" width="48">
- Parcelle :
- </text>
- <text name="info_parcel" left="66">
- PARCEL NAME
- </text>
- <text name="info_size_label">
- Taille :
- </text>
- <text name="info_size" left="66">
- [AREA] m²
- </text>
- <text name="info_action" bottom_delta="-60">
- Pour vendre cette
-parcelle :
- </text>
- <icon bottom_delta="-86" name="step_price" />
- <text name="price_label">
- Votre prix de vente :
- </text>
- <text name="price_text">
- Fixez un prix convenable pour ce terrain.
- </text>
- <text name="price_ld">
- L$
- </text>
- <text name="price_per_m">
- ([PER_METER] L$ par mètre carré)
- </text>
- <text name="sell_to_label">
- Vos acheteurs :
- </text>
- <text name="sell_to_text">
- Vendez votre terrain à n'importe qui ou uniquement à un acheteur
-spécifique.
- </text>
- <combo_box name="sell_to" bottom_delta="-32">
- <combo_item name="--selectone--">
- -- Sélectionnez --
- </combo_item>
- <combo_item name="Anyone">
- N'importe qui
- </combo_item>
- <combo_item name="Specificuser:">
- Acheteur spécifique :
- </combo_item>
- </combo_box>
- <button label="Sélectionner..." name="sell_to_select_agent" width="100"/>
- <text name="sell_objects_label">
- Vendez-vous des objets avec ce terrain ?
- </text>
- <text name="sell_objects_text">
- Les objets transférables se trouvant sur la parcelle changeront
-de propriétaire.
- </text>
- <radio_group name="sell_objects" right="430" bottom_delta="-54">
- <radio_item name="no">
- Non, rester le propriétaire des objets
- </radio_item>
- <radio_item name="yes">
- Oui, vendre les objets avec le terrain
- </radio_item>
- </radio_group>
- <button label="Afficher les objets" name="show_objects" right="420" width="120"/>
- <text name="nag_message_label" bottom_delta="-30">
- Rappel : Toute vente est définitive.
- </text>
- <button label="Mettre le terrain en vente" name="sell_btn" width="165"/>
- <button label="Annuler" name="cancel_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="sell land" title="Vendre terrain">
+ <text name="info_parcel_label" width="48">
+ Parcelle :
+ </text>
+ <text name="info_parcel" left="66">
+ PARCEL NAME
+ </text>
+ <text name="info_size_label">
+ Taille :
+ </text>
+ <text name="info_size" left="66">
+ [AREA] m²
+ </text>
+ <text name="info_action" bottom_delta="-60">
+ Pour vendre cette
+parcelle :
+ </text>
+ <icon bottom_delta="-86" name="step_price" />
+ <text name="price_label">
+ Votre prix de vente :
+ </text>
+ <text name="price_text">
+ Fixez un prix convenable pour ce terrain.
+ </text>
+ <text name="price_ld">
+ L$
+ </text>
+ <text name="price_per_m">
+ ([PER_METER] L$ par mètre carré)
+ </text>
+ <text name="sell_to_label">
+ Vos acheteurs :
+ </text>
+ <text name="sell_to_text">
+ Vendez votre terrain à n'importe qui ou uniquement à un acheteur
+spécifique.
+ </text>
+ <combo_box name="sell_to" bottom_delta="-32">
+ <combo_box.item name="--selectone--">
+ -- Sélectionnez --
+ </combo_box.item>
+ <combo_box.item name="Anyone">
+ N'importe qui
+ </combo_box.item>
+ <combo_box.item name="Specificuser:">
+ Acheteur spécifique :
+ </combo_box.item>
+ </combo_box>
+ <button label="Sélectionner..." name="sell_to_select_agent" width="100"/>
+ <text name="sell_objects_label">
+ Vendez-vous des objets avec ce terrain ?
+ </text>
+ <text name="sell_objects_text">
+ Les objets transférables se trouvant sur la parcelle changeront
+de propriétaire.
+ </text>
+ <radio_group name="sell_objects" right="430" bottom_delta="-54">
+ <radio_item name="no">
+ Non, rester le propriétaire des objets
+ </radio_item>
+ <radio_item name="yes">
+ Oui, vendre les objets avec le terrain
+ </radio_item>
+ </radio_group>
+ <button label="Afficher les objets" name="show_objects" right="420" width="120"/>
+ <text name="nag_message_label" bottom_delta="-30">
+ Rappel : Toute vente est définitive.
+ </text>
+ <button label="Mettre le terrain en vente" name="sell_btn" width="165"/>
+ <button label="Annuler" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
index 8d6249bf52..18cf2d7e55 100644
--- a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="settings_debug" title="Paramétrages du mode Debug">
- <combo_box name="boolean_combo">
- <combo_item name="TRUE">
- TRUE
- </combo_item>
- <combo_item name="FALSE">
- FALSE
- </combo_item>
- </combo_box>
- <color_swatch label="Couleur" name="color_swatch" width="43" />
- <spinner label="x" name="val_spinner_1" />
- <spinner label="x" name="val_spinner_2" />
- <spinner label="x" name="val_spinner_3" />
- <spinner label="x" name="val_spinner_4" />
- <button label="Paramètres par défaut" name="default_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="settings_debug" title="Paramétrages du mode Debug">
+ <combo_box name="boolean_combo">
+ <combo_box.item name="TRUE">
+ TRUE
+ </combo_box.item>
+ <combo_box.item name="FALSE">
+ FALSE
+ </combo_box.item>
+ </combo_box>
+ <color_swatch label="Couleur" name="color_swatch" width="43" />
+ <spinner label="x" name="val_spinner_1" />
+ <spinner label="x" name="val_spinner_2" />
+ <spinner label="x" name="val_spinner_3" />
+ <spinner label="x" name="val_spinner_4" />
+ <button label="Paramètres par défaut" name="default_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index a0978a9ab0..63ed77c8b5 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="Prévisualiser la photo" width="247">
- <text name="type_label">
- Destination de la photo
- </text>
- <radio_group label="Type de photo" name="snapshot_type_radio" width="228">
- <radio_item name="postcard">
- Envoyer par e-mail
- </radio_item>
- <radio_item name="texture">
- Enregistrer dans votre inventaire ([AMOUNT] L$)
- </radio_item>
- <radio_item name="local">
- Enregistrer sur votre disque dur
- </radio_item>
- </radio_group>
- <button label="Plus >>" name="more_btn" tool_tip="Options avancées"/>
- <button label="<< Moins" name="less_btn" tool_tip="Options avancées"/>
- <text name="type_label2">
- Taille
- </text>
- <text name="format_label">
- Format
- </text>
- <combo_box label="Résolution" name="postcard_size_combo">
- <combo_item name="640x480">
- 640 x 480
- </combo_item>
- <combo_item name="800x600">
- 800 x 600
- </combo_item>
- <combo_item name="1024x768">
- 1024 x 768
- </combo_item>
- <combo_item name="CurrentWindow">
- Fenêtre actuelle
- </combo_item>
- <combo_item name="Custom">
- Personnaliser
- </combo_item>
- </combo_box>
- <combo_box label="Résolution" name="texture_size_combo">
- <combo_item name="CurrentWindow">
- Fenêtre actuelle
- </combo_item>
- <combo_item name="Small(128x128)">
- Petite (128 x 128)
- </combo_item>
- <combo_item name="Medium(256x256)">
- Moyenne (256 x 256)
- </combo_item>
- <combo_item name="Large(512x512)">
- Grande (512 x 512)
- </combo_item>
- <combo_item name="Custom">
- Personnaliser
- </combo_item>
- </combo_box>
- <combo_box label="Résolution" name="local_size_combo">
- <combo_item name="CurrentWindow">
- Fenêtre actuelle
- </combo_item>
- <combo_item name="320x240">
- 320 x 240
- </combo_item>
- <combo_item name="640x480">
- 640 x 480
- </combo_item>
- <combo_item name="800x600">
- 800 x 600
- </combo_item>
- <combo_item name="1024x768">
- 1024 x 768
- </combo_item>
- <combo_item name="1280x1024">
- 1280 x 1024
- </combo_item>
- <combo_item name="1600x1200">
- 1600 x 1200
- </combo_item>
- <combo_item name="Custom">
- Personnaliser
- </combo_item>
- </combo_box>
- <combo_box label="Format" name="local_format_combo">
- <combo_item name="PNG">
- PNG
- </combo_item>
- <combo_item name="JPEG">
- JPEG
- </combo_item>
- <combo_item name="BMP">
- BMP
- </combo_item>
- </combo_box>
- <spinner label="Largeur" label_width="41" name="snapshot_width" width="101"/>
- <spinner label="Hauteur" label_width="41" left="121" name="snapshot_height" width="101"/>
- <slider label="Qualité de l'image" name="image_quality_slider"/>
- <text name="layer_type_label">
- Capturer :
- </text>
- <combo_box label="Couches de l'image" name="layer_types">
- <combo_item name="Colors">
- Couleurs
- </combo_item>
- <combo_item name="Depth">
- Profondeur
- </combo_item>
- <combo_item name="ObjectMattes">
- Matte des objets
- </combo_item>
- </combo_box>
- <text name="file_size_label">
- Taille du fichier : [SIZE] Ko
- </text>
- <check_box label="Voir l'interface sur la photo" name="ui_check"/>
- <check_box label="Voir les éléments HUD sur la photo" name="hud_check"/>
- <check_box label="Garder ouvert après enregistrement" name="keep_open_check"/>
- <check_box label="Imposer les proportions" name="keep_aspect_check"/>
- <check_box label="Prévisualisation plein écran (geler l'écran)" name="freeze_frame_check"/>
- <button label="Rafraîchir" name="new_snapshot_btn"/>
- <check_box label="Rafraîchissement automatique" name="auto_snapshot_check"/>
- <button label="Enregistrer ([AMOUNT] L$)" name="upload_btn" width="118"/>
- <button label="Envoyer" name="send_btn" width="118"/>
- <flyout_button label="Enregistrer" name="save_btn" tool_tip="Enregistrer l'image dans un fichier" width="118">
- <flyout_button_item name="save_item">
- Enregistrer
- </flyout_button_item>
- <flyout_button_item name="saveas_item">
- Enregistrer sous...
- </flyout_button_item>
- </flyout_button>
- <button label="Annuler" name="discard_btn" left="133" width="72" />
- <string name="unknown">
- inconnu
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Snapshot" title="Prévisualiser la photo" width="247">
+ <text name="type_label">
+ Destination de la photo
+ </text>
+ <radio_group label="Type de photo" name="snapshot_type_radio" width="228">
+ <radio_item name="postcard">
+ Envoyer par e-mail
+ </radio_item>
+ <radio_item name="texture">
+ Enregistrer dans votre inventaire ([AMOUNT] L$)
+ </radio_item>
+ <radio_item name="local">
+ Enregistrer sur votre disque dur
+ </radio_item>
+ </radio_group>
+ <button label="Plus >>" name="more_btn" tool_tip="Options avancées"/>
+ <button label="<< Moins" name="less_btn" tool_tip="Options avancées"/>
+ <text name="type_label2">
+ Taille
+ </text>
+ <text name="format_label">
+ Format
+ </text>
+ <combo_box label="Résolution" name="postcard_size_combo">
+ <combo_box.item name="640x480">
+ 640 x 480
+ </combo_box.item>
+ <combo_box.item name="800x600">
+ 800 x 600
+ </combo_box.item>
+ <combo_box.item name="1024x768">
+ 1024 x 768
+ </combo_box.item>
+ <combo_box.item name="CurrentWindow">
+ Fenêtre actuelle
+ </combo_box.item>
+ <combo_box.item name="Custom">
+ Personnaliser
+ </combo_box.item>
+ </combo_box>
+ <combo_box label="Résolution" name="texture_size_combo">
+ <combo_box.item name="CurrentWindow">
+ Fenêtre actuelle
+ </combo_box.item>
+ <combo_box.item name="Small(128x128)">
+ Petite (128 x 128)
+ </combo_box.item>
+ <combo_box.item name="Medium(256x256)">
+ Moyenne (256 x 256)
+ </combo_box.item>
+ <combo_box.item name="Large(512x512)">
+ Grande (512 x 512)
+ </combo_box.item>
+ <combo_box.item name="Custom">
+ Personnaliser
+ </combo_box.item>
+ </combo_box>
+ <combo_box label="Résolution" name="local_size_combo">
+ <combo_box.item name="CurrentWindow">
+ Fenêtre actuelle
+ </combo_box.item>
+ <combo_box.item name="320x240">
+ 320 x 240
+ </combo_box.item>
+ <combo_box.item name="640x480">
+ 640 x 480
+ </combo_box.item>
+ <combo_box.item name="800x600">
+ 800 x 600
+ </combo_box.item>
+ <combo_box.item name="1024x768">
+ 1024 x 768
+ </combo_box.item>
+ <combo_box.item name="1280x1024">
+ 1280 x 1024
+ </combo_box.item>
+ <combo_box.item name="1600x1200">
+ 1600 x 1200
+ </combo_box.item>
+ <combo_box.item name="Custom">
+ Personnaliser
+ </combo_box.item>
+ </combo_box>
+ <combo_box label="Format" name="local_format_combo">
+ <combo_box.item name="PNG">
+ PNG
+ </combo_box.item>
+ <combo_box.item name="JPEG">
+ JPEG
+ </combo_box.item>
+ <combo_box.item name="BMP">
+ BMP
+ </combo_box.item>
+ </combo_box>
+ <spinner label="Largeur" label_width="41" name="snapshot_width" width="101"/>
+ <spinner label="Hauteur" label_width="41" left="121" name="snapshot_height" width="101"/>
+ <slider label="Qualité de l'image" name="image_quality_slider"/>
+ <text name="layer_type_label">
+ Capturer :
+ </text>
+ <combo_box label="Couches de l'image" name="layer_types">
+ <combo_box.item name="Colors">
+ Couleurs
+ </combo_box.item>
+ <combo_box.item name="Depth">
+ Profondeur
+ </combo_box.item>
+ <combo_box.item name="ObjectMattes">
+ Matte des objets
+ </combo_box.item>
+ </combo_box>
+ <text name="file_size_label">
+ Taille du fichier : [SIZE] Ko
+ </text>
+ <check_box label="Voir l'interface sur la photo" name="ui_check"/>
+ <check_box label="Voir les éléments HUD sur la photo" name="hud_check"/>
+ <check_box label="Garder ouvert après enregistrement" name="keep_open_check"/>
+ <check_box label="Imposer les proportions" name="keep_aspect_check"/>
+ <check_box label="Prévisualisation plein écran (geler l'écran)" name="freeze_frame_check"/>
+ <button label="Rafraîchir" name="new_snapshot_btn"/>
+ <check_box label="Rafraîchissement automatique" name="auto_snapshot_check"/>
+ <button label="Enregistrer ([AMOUNT] L$)" name="upload_btn" width="118"/>
+ <button label="Envoyer" name="send_btn" width="118"/>
+ <flyout_button label="Enregistrer" name="save_btn" tool_tip="Enregistrer l'image dans un fichier" width="118">
+ <flyout_button.item name="save_item">
+ Enregistrer
+ </flyout_button.item>
+ <flyout_button.item name="saveas_item">
+ Enregistrer sous...
+ </flyout_button.item>
+ </flyout_button>
+ <button label="Annuler" name="discard_btn" left="133" width="72" />
+ <string name="unknown">
+ inconnu
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
index 0b4731f0da..eb2383b1bc 100644
--- a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Name/Description" title="sound.wav">
- <text name="name_label">
- Nom :
- </text>
- <text name="description_label">
- Description :
- </text>
- <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
- <button label="Importer ([AMOUNT] L$)" label_selected="Charger ([AMOUNT] L$)" name="ok_btn"/>
- <text name="text">
- Débit (kbps) :
- </text>
- <radio_group name="bitrate">
- <radio_item name="32">
- 32
- </radio_item>
- <radio_item name="64">
- 64
- </radio_item>
- <radio_item name="96">
- 96
- </radio_item>
- <radio_item name="128">
- 128
- </radio_item>
- </radio_group>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Name/Description" title="sound.wav">
+ <text name="name_label">
+ Nom :
+ </text>
+ <text name="description_label">
+ Description :
+ </text>
+ <button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+ <button label="Importer ([AMOUNT] L$)" label_selected="Charger ([AMOUNT] L$)" name="ok_btn"/>
+ <text name="text">
+ Débit (kbps) :
+ </text>
+ <radio_group name="bitrate">
+ <radio_item name="32">
+ 32
+ </radio_item>
+ <radio_item name="64">
+ 64
+ </radio_item>
+ <radio_item name="96">
+ 96
+ </radio_item>
+ <radio_item name="128">
+ 128
+ </radio_item>
+ </radio_group>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_telehub.xml b/indra/newview/skins/default/xui/fr/floater_telehub.xml
index 59d41fdaf3..e6201785bd 100644
--- a/indra/newview/skins/default/xui/fr/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/fr/floater_telehub.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="telehub" title="Téléhub" min_height="310" height="310" >
- <text name="status_text_connected">
- Téléhub connecté à l'objet [OBJECT]
- </text>
- <text name="status_text_not_connected">
- Aucun téléhub connecté.
- </text>
- <text name="help_text_connected">
- Pour supprimer, cliquez sur Déconnecter.
- </text>
- <text name="help_text_not_connected" height="38" bottom_delta="-18">
- Sélectionner l'objet et cliquez sur Connecter
-le téléhub.
- </text>
- <button label="Connecter le téléhub" name="connect_btn" width="122"/>
- <button label="Déconnecter" name="disconnect_btn" left="142" width="98"/>
- <text name="spawn_points_text" width="230">
- Points d'apparition (positions, pas objets) :
- </text>
- <button label="Ajouter point" name="add_spawn_point_btn" />
- <button label="Supprimer point" name="remove_spawn_point_btn" />
- <text name="spawn_point_help">
- Sélectionnez l'objet et cliquez sur Ajouter pour
-indiquer la position. Vous pourrez ensuite
-déplacer ou supprimer l'objet.
-Les positions sont relatives au centre du téléhub.
-Sélectionnez l'élément dans la liste pour afficher
-sa position dans le Monde.
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="telehub" title="Téléhub" min_height="310" height="310" >
+ <text name="status_text_connected">
+ Téléhub connecté à l'objet [OBJECT]
+ </text>
+ <text name="status_text_not_connected">
+ Aucun téléhub connecté.
+ </text>
+ <text name="help_text_connected">
+ Pour supprimer, cliquez sur Déconnecter.
+ </text>
+ <text name="help_text_not_connected" height="38" bottom_delta="-18">
+ Sélectionner l'objet et cliquez sur Connecter
+le téléhub.
+ </text>
+ <button label="Connecter le téléhub" name="connect_btn" width="122"/>
+ <button label="Déconnecter" name="disconnect_btn" left="142" width="98"/>
+ <text name="spawn_points_text" width="230">
+ Points d'apparition (positions, pas objets) :
+ </text>
+ <button label="Ajouter point" name="add_spawn_point_btn" />
+ <button label="Supprimer point" name="remove_spawn_point_btn" />
+ <text name="spawn_point_help">
+ Sélectionnez l'objet et cliquez sur Ajouter pour
+indiquer la position. Vous pourrez ensuite
+déplacer ou supprimer l'objet.
+Les positions sont relatives au centre du téléhub.
+Sélectionnez l'élément dans la liste pour afficher
+sa position dans le Monde.
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index 1a8e57e604..2a234a37c5 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="texture picker" title="Texture">
- <string name="choose_picture">
- Cliquez pour sélectionner une image
- </string>
- <text length="1" name="Multiple" type="string">
- Multiple
- </text>
- <text length="1" name="unknown" type="string">
- Dimensions : [DIMENSIONS]
- </text>
- <button label="Défaut" label_selected="Défaut" name="Default" width="60" />
- <button label="Aucune" label_selected="Aucune" name="None" width="60" left="68" />
- <button label="Vierge" label_selected="Vierge" name="Blank" width="60" />
- <check_box label="Afficher les dossiers" name="show_folders_check"/>
- <search_editor label="Saisissez votre recherche ici" name="inventory search editor"/>
- <check_box label="Appliquer immédiatement" name="apply_immediate_check" />
- <button label="" label_selected="" name="Pipette" bottom="-240" />
- <button label="Annuler" label_selected="Annuler" name="Cancel"/>
- <button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
- <string name="pick title">
- Choisir :
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="texture picker" title="Texture">
+ <string name="choose_picture">
+ Cliquez pour sélectionner une image
+ </string>
+ <text length="1" name="Multiple" type="string">
+ Multiple
+ </text>
+ <text length="1" name="unknown" type="string">
+ Dimensions : [DIMENSIONS]
+ </text>
+ <button label="Défaut" label_selected="Défaut" name="Default" width="60" />
+ <button label="Aucune" label_selected="Aucune" name="None" width="60" left="68" />
+ <button label="Vierge" label_selected="Vierge" name="Blank" width="60" />
+ <check_box label="Afficher les dossiers" name="show_folders_check"/>
+ <search_editor label="Saisissez votre recherche ici" name="inventory search editor"/>
+ <check_box label="Appliquer immédiatement" name="apply_immediate_check" />
+ <button label="" label_selected="" name="Pipette" bottom="-240" />
+ <button label="Annuler" label_selected="Annuler" name="Cancel"/>
+ <button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
+ <string name="pick title">
+ Choisir :
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 2eb95124ba..fed4a789ce 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -1,624 +1,624 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
- <button label="" label_selected="" name="button focus" tool_tip="Mise au point"/>
- <button label="" label_selected="" name="button move" tool_tip="Déplacer"/>
- <button label="" label_selected="" name="button edit" tool_tip="Modifier"/>
- <button label="" label_selected="" name="button create" tool_tip="Créer"/>
- <button label="" label_selected="" name="button land" tool_tip="Terrain"/>
- <check_box label="Zoom" name="radio zoom"/>
- <check_box label="Orbite (Ctrl)" name="radio orbit"/>
- <check_box label="Panoramique (Ctrl-Maj)" name="radio pan"/>
- <check_box label="Déplacer" name="radio move"/>
- <check_box label="Orbite (Ctrl)" name="radio lift"/>
- <check_box label="Faire tourner (Ctrl-Maj)" name="radio spin"/>
- <check_box label="Positionner" name="radio position"/>
- <check_box label="Pivoter (Ctrl)" name="radio rotate"/>
- <check_box label="Étirer (Ctrl-Maj)" name="radio stretch"/>
- <check_box label="Sélectionner une face" name="radio select face"/>
- <check_box label="Modifier les parties liées" name="checkbox edit linked parts"/>
- <text name="text ruler mode">
- Axe :
- </text>
- <combo_box name="combobox grid mode">
- <combo_item name="World">
- Monde
- </combo_item>
- <combo_item name="Local">
- Local
- </combo_item>
- <combo_item name="Reference">
- Référence
- </combo_item>
- </combo_box>
- <check_box label="Étirer les deux côtés" name="checkbox uniform"/>
- <check_box label="Étirer les textures" name="checkbox stretch textures"/>
- <check_box label="Utiliser la grille" name="checkbox snap to grid"/>
- <button label="Options..." label_selected="Options..." name="Options..."/>
- <text name="text status">
- Faîtes glisser pour déplacer, Maj-faire glisser pour
- copier.
- </text>
- <button label="" label_selected="" name="ToolCube" tool_tip="Cube"/>
- <button label="" label_selected="" name="ToolPrism" tool_tip="Prisme"/>
- <button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/>
- <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tétraèdre"/>
- <button label="" label_selected="" name="ToolCylinder" tool_tip="Cylindre"/>
- <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Demi-cylindre"/>
- <button label="" label_selected="" name="ToolCone" tool_tip="Cône"/>
- <button label="" label_selected="" name="ToolHemiCone" tool_tip="Demi-cône"/>
- <button label="" label_selected="" name="ToolSphere" tool_tip="Sphère"/>
- <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Demi-sphère"/>
- <button label="" label_selected="" name="ToolTorus" tool_tip="Tore"/>
- <button label="" label_selected="" name="ToolTube" tool_tip="Tube"/>
- <button label="" label_selected="" name="ToolRing" tool_tip="Anneau"/>
- <button label="" label_selected="" name="ToolTree" tool_tip="Arbre"/>
- <button label="" label_selected="" name="ToolGrass" tool_tip="Herbe"/>
- <check_box label="Maintenir l'outil sélectionné" name="checkbox sticky"/>
- <check_box label="Copier la sélection" name="checkbox copy selection"/>
- <check_box label="Centrer" name="checkbox copy centers"/>
- <check_box label="Pivoter" name="checkbox copy rotates"/>
- <check_box label="Sélectionner le terrain" name="radio select land"/>
- <check_box label="Aplatir" name="radio flatten"/>
- <check_box label="Élever" name="radio raise"/>
- <check_box label="Abaisser" name="radio lower"/>
- <check_box label="Lisser" name="radio smooth"/>
- <check_box label="Bosseler" name="radio noise"/>
- <check_box label="Annuler modification" name="radio revert"/>
- <button label="Appliquer" label_selected="Appliquer" name="button apply to selection" tool_tip="Modifier le terrain sélectionné"/>
- <text name="Bulldozer:">
- Bulldozer :
- </text>
- <text name="Dozer Size:">
- Taille
- </text>
- <text name="Strength:">
- Force
- </text>
- <text name="obj_count">
- Objets sélectionnés : [COUNT]
- </text>
- <text name="prim_count">
- Prims : [COUNT]
- </text>
- <tab_container name="Object Info Tabs">
- <panel label="Général" name="General">
- <text name="Name:">
- Nom :
- </text>
- <text name="Description:">
- Description :
- </text>
- <text name="Creator:">
- Créateur :
- </text>
- <text name="Creator Name">
- Thrax Linden
- </text>
- <button label="Profil..." label_selected="Profil..." name="button creator profile"/>
- <text name="Owner:">
- Propriétaire :
- </text>
- <text name="Owner Name">
- Thrax Linden
- </text>
- <button label="Profil..." label_selected="Profil..." name="button owner profile"/>
- <text name="Group:">
- Groupe :
- </text>
- <text name="Group Name Proxy">
- Les Lindens
- </text>
- <button label="Définir..." label_selected="Définir..." name="button set group"/>
- <text name="Permissions:">
- Autorisations :
- </text>
- <text name="perm_modify">
- Vous pouvez modifier cet objet.
- </text>
- <check_box label="Partager avec le groupe" name="checkbox share with group" tool_tip="Autoriser les membres du groupe à déplacer, copier et supprimer."/>
- <string name="text deed continued">
- Transférer...
- </string>
- <string name="text deed">
- Transférer
- </string>
- <button label="Céder..." label_selected="Céder..." name="button deed" tool_tip="Les objets partagés par un groupe peuvent être cédés par un officier."/>
- <check_box label="Autoriser tout le monde à déplacer" name="checkbox allow everyone move"/>
- <check_box label="Autoriser tout le monde à copier" name="checkbox allow everyone copy"/>
- <check_box label="Afficher dans la recherche" name="search_check" tool_tip="Afficher l'objet dans les résultats de recherche"/>
- <check_box label="À vendre" name="checkbox for sale"/>
- <text name="Cost">
- Prix : L$
- </text>
- <radio_group name="sale type">
- <radio_item name="Original">
- Original
- </radio_item>
- <radio_item name="Copy">
- Copie
- </radio_item>
- <radio_item name="Contents">
- Contenus
- </radio_item>
- </radio_group>
- <text name="Next owner can:">
- Le prochain propriétaire pourra :
- </text>
- <check_box label="Modifier" name="checkbox next owner can modify"/>
- <check_box label="Copier" left_delta="66" name="checkbox next owner can copy"/>
- <check_box label="Revendre/Donner" name="checkbox next owner can transfer"/>
- <text name="label click action">
- Action du clic-gauche :
- </text>
- <combo_box name="clickaction" width="178">
- <combo_item name="Touch/grab(default)">
- Toucher/attraper (défaut)
- </combo_item>
- <combo_item name="Sitonobject">
- S'asseoir sur l'objet
- </combo_item>
- <combo_item name="Buyobject">
- Acheter l'objet
- </combo_item>
- <combo_item name="Payobject">
- Payer l'objet
- </combo_item>
- <combo_item name="Open">
- Ouvrir
- </combo_item>
- <combo_item name="Play">
- Jouer le média de la parcelle
- </combo_item>
- <combo_item name="Opemmedia">
- Ouvrir le média de la parcelle
- </combo_item>
- </combo_box>
- <text name="B:">
- BÂ :
- </text>
- <text name="O:">
- OÂ :
- </text>
- <text name="G:">
- G :
- </text>
- <text name="E:">
- EÂ :
- </text>
- <text name="N:">
- NÂ :
- </text>
- <text name="F:">
- FÂ :
- </text>
- <string name="text modify info 1">
- Vous pouvez modifier cet objet.
- </string>
- <string name="text modify info 2">
- Vous pouvez modifier ces objets.
- </string>
- <string name="text modify info 3">
- Vous ne pouvez pas modifier cet objet.
- </string>
- <string name="text modify info 4">
- Vous ne pouvez pas modifier ces objets.
- </string>
- <string name="text modify warning">
- Sélectionnez l'objet en entier.
- </string>
- <string name="Cost Default">
- Prix : L$
- </string>
- <string name="Cost Total">
- Prix total : L$
- </string>
- <string name="Cost Per Unit">
- Prix par : L$
- </string>
- <string name="Cost Mixed">
- Prix mixte
- </string>
- <string name="Sale Mixed">
- Vente mixte
- </string>
- </panel>
- <panel label="Objet" name="Object">
- <text name="select_single">
- Sélectionnez un prim pour modifier les paramètres.
- </text>
- <text name="edit_object">
- Modifier les paramètres de l'objet :
- </text>
- <check_box label="Verrouillé" name="checkbox locked" tool_tip="Empêche l'objet d'être déplacé ou supprimé. Utile pendant la construction pour éviter les modifications involontaires."/>
- <check_box label="Physique" name="Physical Checkbox Ctrl" tool_tip="Permet à l'objet d'être poussé et affecté par la gravité"/>
- <check_box label="Temporaire" name="Temporary Checkbox Ctrl" tool_tip="L'objet est supprimé 1 mn après sa création."/>
- <check_box label="Fantôme" name="Phantom Checkbox Ctrl" tool_tip="Permet à l'objet de ne pas entrer en collision avec d'autres objets ou avatars."/>
- <text name="label position">
- Position (mètres)
- </text>
- <spinner label="X" name="Pos X"/>
- <spinner label="Y" name="Pos Y"/>
- <spinner label="Z" name="Pos Z"/>
- <text name="label size">
- Taille (mètres)
- </text>
- <spinner label="X" name="Scale X"/>
- <spinner label="Y" name="Scale Y"/>
- <spinner label="Z" name="Scale Z"/>
- <text name="label rotation">
- Rotation (degrés)
- </text>
- <spinner label="X" name="Rot X"/>
- <spinner label="Y" name="Rot Y"/>
- <spinner label="Z" name="Rot Z"/>
- <text name="label material">
- Matériau
- </text>
- <combo_box name="material">
- <combo_item name="Stone">
- Pierre
- </combo_item>
- <combo_item name="Metal">
- Métal
- </combo_item>
- <combo_item name="Glass">
- Verre
- </combo_item>
- <combo_item name="Wood">
- Bois
- </combo_item>
- <combo_item name="Flesh">
- Chair
- </combo_item>
- <combo_item name="Plastic">
- Plastique
- </combo_item>
- <combo_item name="Rubber">
- Caoutchouc
- </combo_item>
- </combo_box>
- <text name="label basetype">
- Type de construction
- </text>
- <combo_box name="comboBaseType">
- <combo_item name="Box">
- Boîte
- </combo_item>
- <combo_item name="Cylinder">
- Cylindre
- </combo_item>
- <combo_item name="Prism">
- Prisme
- </combo_item>
- <combo_item name="Sphere">
- Sphère
- </combo_item>
- <combo_item name="Torus">
- Tore
- </combo_item>
- <combo_item name="Tube">
- Tube
- </combo_item>
- <combo_item name="Ring">
- Anneau
- </combo_item>
- <combo_item name="Sculpted">
- Sculptie
- </combo_item>
- </combo_box>
- <text name="text cut">
- Début et fin de découpe du tracé
- </text>
- <spinner label="D" name="cut begin"/>
- <spinner label="F" name="cut end"/>
- <text name="text hollow">
- Creux
- </text>
- <text name="text skew">
- Biais
- </text>
- <text name="Hollow Shape">
- Forme du creux
- </text>
- <combo_box name="hole">
- <combo_item name="Default">
- Défaut
- </combo_item>
- <combo_item name="Circle">
- Cercle
- </combo_item>
- <combo_item name="Square">
- Carré
- </combo_item>
- <combo_item name="Triangle">
- Triangle
- </combo_item>
- </combo_box>
- <text name="text twist">
- Début et fin de vrille
- </text>
- <spinner label="D" name="Twist Begin"/>
- <spinner label="F" name="Twist End"/>
- <text name="scale_taper">
- Biseautage
- </text>
- <text name="scale_hole">
- Taille du trou
- </text>
- <spinner label="X" name="Taper Scale X"/>
- <spinner label="Y" name="Taper Scale Y"/>
- <text name="text topshear">
- Inclinaison
- </text>
- <spinner label="X" name="Shear X"/>
- <spinner label="Y" name="Shear Y"/>
- <text name="advanced_cut">
- Début et fin de découpe du profilé
- </text>
- <text name="advanced_dimple">
- Début et fin du creux
- </text>
- <text name="advanced_slice">
- Début et fin de la tranche
- </text>
- <spinner label="D" name="Path Limit Begin"/>
- <spinner label="F" name="Path Limit End"/>
- <text name="text taper2">
- Biseautage
- </text>
- <spinner label="X" name="Taper X"/>
- <spinner label="Y" name="Taper Y"/>
- <text name="text radius delta">
- Rayon
- </text>
- <text name="text revolutions">
- Révolutions
- </text>
- <texture_picker label="Texture du sculptie" name="sculpt texture control" tool_tip="Cliquez pour sélectionner une image"/>
- <check_box label="Mirroir" name="sculpt mirror control" tool_tip="Retourne le sculptie le long de l'axe des X."/>
- <check_box label="A l'envers" name="sculpt invert control" tool_tip="Inverse les valeurs normales d'un sculptie et le fait apparaître à l'envers."/>
- <text name="label sculpt type">
- Type de raccord
- </text>
- <combo_box name="sculpt type control">
- <combo_item name="None">
- (aucun)
- </combo_item>
- <combo_item name="Sphere">
- Sphère
- </combo_item>
- <combo_item name="Torus">
- Tore
- </combo_item>
- <combo_item name="Plane">
- Plan
- </combo_item>
- <combo_item name="Cylinder">
- Cylindre
- </combo_item>
- </combo_box>
- </panel>
- <panel label="Attributs" name="Features">
- <text name="select_single">
- Sélectionnez un prim pour modifier les attributs.
- </text>
- <text name="edit_object">
- Modifier les attributs de l'objet :
- </text>
- <check_box label="Flexibilité" name="Flexible1D Checkbox Ctrl" tool_tip="Donne à l'objet de la souplesse sur l'axe des Z (côté client uniquement)."/>
- <spinner label="Souplesse" name="FlexNumSections"/>
- <spinner label="Gravité" name="FlexGravity"/>
- <spinner label="Élasticité" name="FlexFriction"/>
- <spinner label="Vent" name="FlexWind"/>
- <spinner label="Tension" name="FlexTension"/>
- <spinner label="Force X" name="FlexForceX"/>
- <spinner label="Force Y" name="FlexForceY"/>
- <spinner label="Force Z" name="FlexForceZ"/>
- <check_box label="Lumière" name="Light Checkbox Ctrl" tool_tip="Permet aux objets d'émettre de la lumière"/>
- <text name="label color">
- Couleur
- </text>
- <color_swatch label="" name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
- <spinner label="Intensité" name="Light Intensity"/>
- <spinner label="Portée" name="Light Radius"/>
- <spinner label="Atténuation" name="Light Falloff"/>
- </panel>
- <panel label="Texture" name="Texture">
- <texture_picker label="Texture" name="texture control" tool_tip="Cliquez pour sélectionner une image"/>
- <color_swatch label="Couleur" name="colorswatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
- <text name="color trans" width="88">
- Transparence
- </text>
- <text name="glow label">
- Rayonnement
- </text>
- <check_box label="Lumineux" name="checkbox fullbright"/>
- <text name="tex gen">
- Application
- </text>
- <combo_box name="combobox texgen">
- <combo_item name="Default">
- Défaut
- </combo_item>
- <combo_item name="Planar">
- Planar
- </combo_item>
- </combo_box>
- <text name="label shininess">
- Brillance
- </text>
- <combo_box name="combobox shininess">
- <combo_item name="None">
- Aucune
- </combo_item>
- <combo_item name="Low">
- Faible
- </combo_item>
- <combo_item name="Medium">
- Moyenne
- </combo_item>
- <combo_item name="High">
- Élevée
- </combo_item>
- </combo_box>
- <text name="label bumpiness">
- Relief
- </text>
- <combo_box name="combobox bumpiness">
- <combo_item name="None">
- Aucun
- </combo_item>
- <combo_item name="Brightness">
- Luminosité
- </combo_item>
- <combo_item name="Darkness">
- Obscurité
- </combo_item>
- <combo_item name="woodgrain">
- Aggloméré
- </combo_item>
- <combo_item name="bark">
- Écorce
- </combo_item>
- <combo_item name="bricks">
- Briques
- </combo_item>
- <combo_item name="checker">
- Damier
- </combo_item>
- <combo_item name="concrete">
- Béton
- </combo_item>
- <combo_item name="crustytile">
- Carrelage
- </combo_item>
- <combo_item name="cutstone">
- Pierre de taille
- </combo_item>
- <combo_item name="discs">
- Disques
- </combo_item>
- <combo_item name="gravel">
- Gravier
- </combo_item>
- <combo_item name="petridish">
- Boîte de Petri
- </combo_item>
- <combo_item name="siding">
- Lattes
- </combo_item>
- <combo_item name="stonetile">
- Carreaux
- </combo_item>
- <combo_item name="stucco">
- Stuc
- </combo_item>
- <combo_item name="suction">
- Ventouses
- </combo_item>
- <combo_item name="weave">
- Tissage
- </combo_item>
- </combo_box>
- <text name="tex scale">
- Répétitions par face
- </text>
- <spinner label="Horizontal (U)" name="TexScaleU"/>
- <check_box label="Inverser" name="checkbox flip s"/>
- <spinner label="Vertical (V)" name="TexScaleV"/>
- <check_box label="Inverser" name="checkbox flip t"/>
- <text name="tex rotate">
- Rotation (degrés)
- </text>
- <spinner left="122" name="TexRot" width="58"/>
- <string name="string repeats per meter">
- Répétitions au mètre
- </string>
- <string name="string repeats per face">
- Répétitions par face
- </string>
- <text name="rpt" width="160">
- Répétitions au mètre
- </text>
- <spinner left="122" name="rptctrl" width="58"/>
- <button label="Appliquer" label_selected="Appliquer" left_delta="68" name="button apply" width="75"/>
- <text name="tex offset">
- Décalage
- </text>
- <spinner label="Horizontal (U)" name="TexOffsetU"/>
- <spinner label="Vertical (V)" name="TexOffsetV"/>
- <text name="textbox autofix">
- Ajuster la texture du média
-(chargement préalable)
- </text>
- <button label="Ajuster" label_selected="Ajuster" left="150" name="button align"/>
- </panel>
- <panel label="Contenu" name="Contents">
- <button label="Nouveau script" label_selected="Nouveau script..." name="button new script"/>
- <button label="Permissions..." name="button permissions"/>
- </panel>
- </tab_container>
- <panel name="land info panel">
- <text name="label_parcel_info">
- Informations sur la parcelle
- </text>
- <text name="label_area_price">
- Prix : [PRICE] L$ pour [AREA] m².
- </text>
- <text name="label_area">
- Surface : [AREA] m²
- </text>
- <button label="À propos du terrain..." label_selected="À propos du terrain..." name="button about land" width="132"/>
- <check_box label="Afficher les propriétaires" name="checkbox show owners" tool_tip="Colorie les parcelles en fonction de leur propriétaire"/>
- <button label="?" label_selected="?" name="button show owners help"/>
- <text name="label_parcel_modify">
- Modifier la parcelle
- </text>
- <button label="Diviser..." label_selected="Diviser..." name="button subdivide land" width="132"/>
- <button label="Fusionner..." label_selected="Fusionner..." name="button join land" width="132"/>
- <text name="label_parcel_trans">
- Transactions
- </text>
- <button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="button buy land" width="132"/>
- <button label="Abandonner le terrain..." label_selected="Abandonner le terrain..." name="button abandon land" width="132"/>
- </panel>
- <string name="status_rotate">
- Pour faire tourner l'objet, faîtes glisser les bandes de couleur.
- </string>
- <string name="status_scale">
- Pour étirer le côté sélectionné, cliquez et faites glisser
- </string>
- <string name="status_move">
- Faîtes glisser pour déplacer, Maj-faire glisser pour copier.
- </string>
- <string name="status_modifyland">
- Cliquez et maintenez pour modifier le terrain
- </string>
- <string name="status_camera">
- Cliquez et faites glisser pour changer l'affichage
- </string>
- <string name="status_grab">
- Faîtes glisser pour déplacer, appuyez sur Ctrl pour soulever, Crtl-Maj pour pivoter
- </string>
- <string name="status_place">
- Cliquez dans le monde pour construire
- </string>
- <string name="status_selectland">
- Cliquez et faites glisser pour sélectionner le terrain
- </string>
- <string name="grid_screen_text">
- Écran
- </string>
- <string name="grid_local_text">
- Local
- </string>
- <string name="grid_world_text">
- Monde
- </string>
- <string name="grid_reference_text">
- Référence
- </string>
- <string name="grid_attachment_text">
- Pièce-jointe
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="toolbox floater" title="">
+ <button label="" label_selected="" name="button focus" tool_tip="Mise au point"/>
+ <button label="" label_selected="" name="button move" tool_tip="Déplacer"/>
+ <button label="" label_selected="" name="button edit" tool_tip="Modifier"/>
+ <button label="" label_selected="" name="button create" tool_tip="Créer"/>
+ <button label="" label_selected="" name="button land" tool_tip="Terrain"/>
+ <check_box label="Zoom" name="radio zoom"/>
+ <check_box label="Orbite (Ctrl)" name="radio orbit"/>
+ <check_box label="Panoramique (Ctrl-Maj)" name="radio pan"/>
+ <check_box label="Déplacer" name="radio move"/>
+ <check_box label="Orbite (Ctrl)" name="radio lift"/>
+ <check_box label="Faire tourner (Ctrl-Maj)" name="radio spin"/>
+ <check_box label="Positionner" name="radio position"/>
+ <check_box label="Pivoter (Ctrl)" name="radio rotate"/>
+ <check_box label="Étirer (Ctrl-Maj)" name="radio stretch"/>
+ <check_box label="Sélectionner une face" name="radio select face"/>
+ <check_box label="Modifier les parties liées" name="checkbox edit linked parts"/>
+ <text name="text ruler mode">
+ Axe :
+ </text>
+ <combo_box name="combobox grid mode">
+ <combo_item name="World">
+ Monde
+ </combo_item>
+ <combo_item name="Local">
+ Local
+ </combo_item>
+ <combo_item name="Reference">
+ Référence
+ </combo_item>
+ </combo_box>
+ <check_box label="Étirer les deux côtés" name="checkbox uniform"/>
+ <check_box label="Étirer les textures" name="checkbox stretch textures"/>
+ <check_box label="Utiliser la grille" name="checkbox snap to grid"/>
+ <button label="Options..." label_selected="Options..." name="Options..."/>
+ <text name="text status">
+ Faîtes glisser pour déplacer, Maj-faire glisser pour
+ copier.
+ </text>
+ <button label="" label_selected="" name="ToolCube" tool_tip="Cube"/>
+ <button label="" label_selected="" name="ToolPrism" tool_tip="Prisme"/>
+ <button label="" label_selected="" name="ToolPyramid" tool_tip="Pyramide"/>
+ <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tétraèdre"/>
+ <button label="" label_selected="" name="ToolCylinder" tool_tip="Cylindre"/>
+ <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Demi-cylindre"/>
+ <button label="" label_selected="" name="ToolCone" tool_tip="Cône"/>
+ <button label="" label_selected="" name="ToolHemiCone" tool_tip="Demi-cône"/>
+ <button label="" label_selected="" name="ToolSphere" tool_tip="Sphère"/>
+ <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Demi-sphère"/>
+ <button label="" label_selected="" name="ToolTorus" tool_tip="Tore"/>
+ <button label="" label_selected="" name="ToolTube" tool_tip="Tube"/>
+ <button label="" label_selected="" name="ToolRing" tool_tip="Anneau"/>
+ <button label="" label_selected="" name="ToolTree" tool_tip="Arbre"/>
+ <button label="" label_selected="" name="ToolGrass" tool_tip="Herbe"/>
+ <check_box label="Maintenir l'outil sélectionné" name="checkbox sticky"/>
+ <check_box label="Copier la sélection" name="checkbox copy selection"/>
+ <check_box label="Centrer" name="checkbox copy centers"/>
+ <check_box label="Pivoter" name="checkbox copy rotates"/>
+ <check_box label="Sélectionner le terrain" name="radio select land"/>
+ <check_box label="Aplatir" name="radio flatten"/>
+ <check_box label="Élever" name="radio raise"/>
+ <check_box label="Abaisser" name="radio lower"/>
+ <check_box label="Lisser" name="radio smooth"/>
+ <check_box label="Bosseler" name="radio noise"/>
+ <check_box label="Annuler modification" name="radio revert"/>
+ <button label="Appliquer" label_selected="Appliquer" name="button apply to selection" tool_tip="Modifier le terrain sélectionné"/>
+ <text name="Bulldozer:">
+ Bulldozer :
+ </text>
+ <text name="Dozer Size:">
+ Taille
+ </text>
+ <text name="Strength:">
+ Force
+ </text>
+ <text name="obj_count">
+ Objets sélectionnés : [COUNT]
+ </text>
+ <text name="prim_count">
+ Prims : [COUNT]
+ </text>
+ <tab_container name="Object Info Tabs">
+ <panel label="Général" name="General">
+ <text name="Name:">
+ Nom :
+ </text>
+ <text name="Description:">
+ Description :
+ </text>
+ <text name="Creator:">
+ Créateur :
+ </text>
+ <text name="Creator Name">
+ Thrax Linden
+ </text>
+ <button label="Profil..." label_selected="Profil..." name="button creator profile"/>
+ <text name="Owner:">
+ Propriétaire :
+ </text>
+ <text name="Owner Name">
+ Thrax Linden
+ </text>
+ <button label="Profil..." label_selected="Profil..." name="button owner profile"/>
+ <text name="Group:">
+ Groupe :
+ </text>
+ <text name="Group Name Proxy">
+ Les Lindens
+ </text>
+ <button label="Définir..." label_selected="Définir..." name="button set group"/>
+ <text name="Permissions:">
+ Autorisations :
+ </text>
+ <text name="perm_modify">
+ Vous pouvez modifier cet objet.
+ </text>
+ <check_box label="Partager avec le groupe" name="checkbox share with group" tool_tip="Autoriser les membres du groupe à déplacer, copier et supprimer."/>
+ <string name="text deed continued">
+ Transférer...
+ </string>
+ <string name="text deed">
+ Transférer
+ </string>
+ <button label="Céder..." label_selected="Céder..." name="button deed" tool_tip="Les objets partagés par un groupe peuvent être cédés par un officier."/>
+ <check_box label="Autoriser tout le monde à déplacer" name="checkbox allow everyone move"/>
+ <check_box label="Autoriser tout le monde à copier" name="checkbox allow everyone copy"/>
+ <check_box label="Afficher dans la recherche" name="search_check" tool_tip="Afficher l'objet dans les résultats de recherche"/>
+ <check_box label="À vendre" name="checkbox for sale"/>
+ <text name="Cost">
+ Prix : L$
+ </text>
+ <radio_group name="sale type">
+ <radio_item name="Original">
+ Original
+ </radio_item>
+ <radio_item name="Copy">
+ Copie
+ </radio_item>
+ <radio_item name="Contents">
+ Contenus
+ </radio_item>
+ </radio_group>
+ <text name="Next owner can:">
+ Le prochain propriétaire pourra :
+ </text>
+ <check_box label="Modifier" name="checkbox next owner can modify"/>
+ <check_box label="Copier" left_delta="66" name="checkbox next owner can copy"/>
+ <check_box label="Revendre/Donner" name="checkbox next owner can transfer"/>
+ <text name="label click action">
+ Action du clic-gauche :
+ </text>
+ <combo_box name="clickaction" width="178">
+ <combo_item name="Touch/grab(default)">
+ Toucher/attraper (défaut)
+ </combo_item>
+ <combo_item name="Sitonobject">
+ S'asseoir sur l'objet
+ </combo_item>
+ <combo_item name="Buyobject">
+ Acheter l'objet
+ </combo_item>
+ <combo_item name="Payobject">
+ Payer l'objet
+ </combo_item>
+ <combo_item name="Open">
+ Ouvrir
+ </combo_item>
+ <combo_item name="Play">
+ Jouer le média de la parcelle
+ </combo_item>
+ <combo_item name="Opemmedia">
+ Ouvrir le média de la parcelle
+ </combo_item>
+ </combo_box>
+ <text name="B:">
+ BÂ :
+ </text>
+ <text name="O:">
+ OÂ :
+ </text>
+ <text name="G:">
+ G :
+ </text>
+ <text name="E:">
+ EÂ :
+ </text>
+ <text name="N:">
+ NÂ :
+ </text>
+ <text name="F:">
+ FÂ :
+ </text>
+ <string name="text modify info 1">
+ Vous pouvez modifier cet objet.
+ </string>
+ <string name="text modify info 2">
+ Vous pouvez modifier ces objets.
+ </string>
+ <string name="text modify info 3">
+ Vous ne pouvez pas modifier cet objet.
+ </string>
+ <string name="text modify info 4">
+ Vous ne pouvez pas modifier ces objets.
+ </string>
+ <string name="text modify warning">
+ Sélectionnez l'objet en entier.
+ </string>
+ <string name="Cost Default">
+ Prix : L$
+ </string>
+ <string name="Cost Total">
+ Prix total : L$
+ </string>
+ <string name="Cost Per Unit">
+ Prix par : L$
+ </string>
+ <string name="Cost Mixed">
+ Prix mixte
+ </string>
+ <string name="Sale Mixed">
+ Vente mixte
+ </string>
+ </panel>
+ <panel label="Objet" name="Object">
+ <text name="select_single">
+ Sélectionnez un prim pour modifier les paramètres.
+ </text>
+ <text name="edit_object">
+ Modifier les paramètres de l'objet :
+ </text>
+ <check_box label="Verrouillé" name="checkbox locked" tool_tip="Empêche l'objet d'être déplacé ou supprimé. Utile pendant la construction pour éviter les modifications involontaires."/>
+ <check_box label="Physique" name="Physical Checkbox Ctrl" tool_tip="Permet à l'objet d'être poussé et affecté par la gravité"/>
+ <check_box label="Temporaire" name="Temporary Checkbox Ctrl" tool_tip="L'objet est supprimé 1 mn après sa création."/>
+ <check_box label="Fantôme" name="Phantom Checkbox Ctrl" tool_tip="Permet à l'objet de ne pas entrer en collision avec d'autres objets ou avatars."/>
+ <text name="label position">
+ Position (mètres)
+ </text>
+ <spinner label="X" name="Pos X"/>
+ <spinner label="Y" name="Pos Y"/>
+ <spinner label="Z" name="Pos Z"/>
+ <text name="label size">
+ Taille (mètres)
+ </text>
+ <spinner label="X" name="Scale X"/>
+ <spinner label="Y" name="Scale Y"/>
+ <spinner label="Z" name="Scale Z"/>
+ <text name="label rotation">
+ Rotation (degrés)
+ </text>
+ <spinner label="X" name="Rot X"/>
+ <spinner label="Y" name="Rot Y"/>
+ <spinner label="Z" name="Rot Z"/>
+ <text name="label material">
+ Matériau
+ </text>
+ <combo_box name="material">
+ <combo_item name="Stone">
+ Pierre
+ </combo_item>
+ <combo_item name="Metal">
+ Métal
+ </combo_item>
+ <combo_item name="Glass">
+ Verre
+ </combo_item>
+ <combo_item name="Wood">
+ Bois
+ </combo_item>
+ <combo_item name="Flesh">
+ Chair
+ </combo_item>
+ <combo_item name="Plastic">
+ Plastique
+ </combo_item>
+ <combo_item name="Rubber">
+ Caoutchouc
+ </combo_item>
+ </combo_box>
+ <text name="label basetype">
+ Type de construction
+ </text>
+ <combo_box name="comboBaseType">
+ <combo_item name="Box">
+ Boîte
+ </combo_item>
+ <combo_item name="Cylinder">
+ Cylindre
+ </combo_item>
+ <combo_item name="Prism">
+ Prisme
+ </combo_item>
+ <combo_item name="Sphere">
+ Sphère
+ </combo_item>
+ <combo_item name="Torus">
+ Tore
+ </combo_item>
+ <combo_item name="Tube">
+ Tube
+ </combo_item>
+ <combo_item name="Ring">
+ Anneau
+ </combo_item>
+ <combo_item name="Sculpted">
+ Sculptie
+ </combo_item>
+ </combo_box>
+ <text name="text cut">
+ Début et fin de découpe du tracé
+ </text>
+ <spinner label="D" name="cut begin"/>
+ <spinner label="F" name="cut end"/>
+ <text name="text hollow">
+ Creux
+ </text>
+ <text name="text skew">
+ Biais
+ </text>
+ <text name="Hollow Shape">
+ Forme du creux
+ </text>
+ <combo_box name="hole">
+ <combo_item name="Default">
+ Défaut
+ </combo_item>
+ <combo_item name="Circle">
+ Cercle
+ </combo_item>
+ <combo_item name="Square">
+ Carré
+ </combo_item>
+ <combo_item name="Triangle">
+ Triangle
+ </combo_item>
+ </combo_box>
+ <text name="text twist">
+ Début et fin de vrille
+ </text>
+ <spinner label="D" name="Twist Begin"/>
+ <spinner label="F" name="Twist End"/>
+ <text name="scale_taper">
+ Biseautage
+ </text>
+ <text name="scale_hole">
+ Taille du trou
+ </text>
+ <spinner label="X" name="Taper Scale X"/>
+ <spinner label="Y" name="Taper Scale Y"/>
+ <text name="text topshear">
+ Inclinaison
+ </text>
+ <spinner label="X" name="Shear X"/>
+ <spinner label="Y" name="Shear Y"/>
+ <text name="advanced_cut">
+ Début et fin de découpe du profilé
+ </text>
+ <text name="advanced_dimple">
+ Début et fin du creux
+ </text>
+ <text name="advanced_slice">
+ Début et fin de la tranche
+ </text>
+ <spinner label="D" name="Path Limit Begin"/>
+ <spinner label="F" name="Path Limit End"/>
+ <text name="text taper2">
+ Biseautage
+ </text>
+ <spinner label="X" name="Taper X"/>
+ <spinner label="Y" name="Taper Y"/>
+ <text name="text radius delta">
+ Rayon
+ </text>
+ <text name="text revolutions">
+ Révolutions
+ </text>
+ <texture_picker label="Texture du sculptie" name="sculpt texture control" tool_tip="Cliquez pour sélectionner une image"/>
+ <check_box label="Mirroir" name="sculpt mirror control" tool_tip="Retourne le sculptie le long de l'axe des X."/>
+ <check_box label="A l'envers" name="sculpt invert control" tool_tip="Inverse les valeurs normales d'un sculptie et le fait apparaître à l'envers."/>
+ <text name="label sculpt type">
+ Type de raccord
+ </text>
+ <combo_box name="sculpt type control">
+ <combo_item name="None">
+ (aucun)
+ </combo_item>
+ <combo_item name="Sphere">
+ Sphère
+ </combo_item>
+ <combo_item name="Torus">
+ Tore
+ </combo_item>
+ <combo_item name="Plane">
+ Plan
+ </combo_item>
+ <combo_item name="Cylinder">
+ Cylindre
+ </combo_item>
+ </combo_box>
+ </panel>
+ <panel label="Attributs" name="Features">
+ <text name="select_single">
+ Sélectionnez un prim pour modifier les attributs.
+ </text>
+ <text name="edit_object">
+ Modifier les attributs de l'objet :
+ </text>
+ <check_box label="Flexibilité" name="Flexible1D Checkbox Ctrl" tool_tip="Donne à l'objet de la souplesse sur l'axe des Z (côté client uniquement)."/>
+ <spinner label="Souplesse" name="FlexNumSections"/>
+ <spinner label="Gravité" name="FlexGravity"/>
+ <spinner label="Élasticité" name="FlexFriction"/>
+ <spinner label="Vent" name="FlexWind"/>
+ <spinner label="Tension" name="FlexTension"/>
+ <spinner label="Force X" name="FlexForceX"/>
+ <spinner label="Force Y" name="FlexForceY"/>
+ <spinner label="Force Z" name="FlexForceZ"/>
+ <check_box label="Lumière" name="Light Checkbox Ctrl" tool_tip="Permet aux objets d'émettre de la lumière"/>
+ <text name="label color">
+ Couleur
+ </text>
+ <color_swatch label="" name="colorswatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+ <spinner label="Intensité" name="Light Intensity"/>
+ <spinner label="Portée" name="Light Radius"/>
+ <spinner label="Atténuation" name="Light Falloff"/>
+ </panel>
+ <panel label="Texture" name="Texture">
+ <texture_picker label="Texture" name="texture control" tool_tip="Cliquez pour sélectionner une image"/>
+ <color_swatch label="Couleur" name="colorswatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
+ <text name="color trans" width="88">
+ Transparence
+ </text>
+ <text name="glow label">
+ Rayonnement
+ </text>
+ <check_box label="Lumineux" name="checkbox fullbright"/>
+ <text name="tex gen">
+ Application
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_item name="Default">
+ Défaut
+ </combo_item>
+ <combo_item name="Planar">
+ Planar
+ </combo_item>
+ </combo_box>
+ <text name="label shininess">
+ Brillance
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_item name="None">
+ Aucune
+ </combo_item>
+ <combo_item name="Low">
+ Faible
+ </combo_item>
+ <combo_item name="Medium">
+ Moyenne
+ </combo_item>
+ <combo_item name="High">
+ Élevée
+ </combo_item>
+ </combo_box>
+ <text name="label bumpiness">
+ Relief
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_item name="None">
+ Aucun
+ </combo_item>
+ <combo_item name="Brightness">
+ Luminosité
+ </combo_item>
+ <combo_item name="Darkness">
+ Obscurité
+ </combo_item>
+ <combo_item name="woodgrain">
+ Aggloméré
+ </combo_item>
+ <combo_item name="bark">
+ Écorce
+ </combo_item>
+ <combo_item name="bricks">
+ Briques
+ </combo_item>
+ <combo_item name="checker">
+ Damier
+ </combo_item>
+ <combo_item name="concrete">
+ Béton
+ </combo_item>
+ <combo_item name="crustytile">
+ Carrelage
+ </combo_item>
+ <combo_item name="cutstone">
+ Pierre de taille
+ </combo_item>
+ <combo_item name="discs">
+ Disques
+ </combo_item>
+ <combo_item name="gravel">
+ Gravier
+ </combo_item>
+ <combo_item name="petridish">
+ Boîte de Petri
+ </combo_item>
+ <combo_item name="siding">
+ Lattes
+ </combo_item>
+ <combo_item name="stonetile">
+ Carreaux
+ </combo_item>
+ <combo_item name="stucco">
+ Stuc
+ </combo_item>
+ <combo_item name="suction">
+ Ventouses
+ </combo_item>
+ <combo_item name="weave">
+ Tissage
+ </combo_item>
+ </combo_box>
+ <text name="tex scale">
+ Répétitions par face
+ </text>
+ <spinner label="Horizontal (U)" name="TexScaleU"/>
+ <check_box label="Inverser" name="checkbox flip s"/>
+ <spinner label="Vertical (V)" name="TexScaleV"/>
+ <check_box label="Inverser" name="checkbox flip t"/>
+ <text name="tex rotate">
+ Rotation (degrés)
+ </text>
+ <spinner left="122" name="TexRot" width="58"/>
+ <string name="string repeats per meter">
+ Répétitions au mètre
+ </string>
+ <string name="string repeats per face">
+ Répétitions par face
+ </string>
+ <text name="rpt" width="160">
+ Répétitions au mètre
+ </text>
+ <spinner left="122" name="rptctrl" width="58"/>
+ <button label="Appliquer" label_selected="Appliquer" left_delta="68" name="button apply" width="75"/>
+ <text name="tex offset">
+ Décalage
+ </text>
+ <spinner label="Horizontal (U)" name="TexOffsetU"/>
+ <spinner label="Vertical (V)" name="TexOffsetV"/>
+ <text name="textbox autofix">
+ Ajuster la texture du média
+(chargement préalable)
+ </text>
+ <button label="Ajuster" label_selected="Ajuster" left="150" name="button align"/>
+ </panel>
+ <panel label="Contenu" name="Contents">
+ <button label="Nouveau script" label_selected="Nouveau script..." name="button new script"/>
+ <button label="Permissions..." name="button permissions"/>
+ </panel>
+ </tab_container>
+ <panel name="land info panel">
+ <text name="label_parcel_info">
+ Informations sur la parcelle
+ </text>
+ <text name="label_area_price">
+ Prix : [PRICE] L$ pour [AREA] m².
+ </text>
+ <text name="label_area">
+ Surface : [AREA] m²
+ </text>
+ <button label="À propos du terrain..." label_selected="À propos du terrain..." name="button about land" width="132"/>
+ <check_box label="Afficher les propriétaires" name="checkbox show owners" tool_tip="Colorie les parcelles en fonction de leur propriétaire"/>
+ <button label="?" label_selected="?" name="button show owners help"/>
+ <text name="label_parcel_modify">
+ Modifier la parcelle
+ </text>
+ <button label="Diviser..." label_selected="Diviser..." name="button subdivide land" width="132"/>
+ <button label="Fusionner..." label_selected="Fusionner..." name="button join land" width="132"/>
+ <text name="label_parcel_trans">
+ Transactions
+ </text>
+ <button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="button buy land" width="132"/>
+ <button label="Abandonner le terrain..." label_selected="Abandonner le terrain..." name="button abandon land" width="132"/>
+ </panel>
+ <string name="status_rotate">
+ Pour faire tourner l'objet, faîtes glisser les bandes de couleur.
+ </string>
+ <string name="status_scale">
+ Pour étirer le côté sélectionné, cliquez et faites glisser
+ </string>
+ <string name="status_move">
+ Faîtes glisser pour déplacer, Maj-faire glisser pour copier.
+ </string>
+ <string name="status_modifyland">
+ Cliquez et maintenez pour modifier le terrain
+ </string>
+ <string name="status_camera">
+ Cliquez et faites glisser pour changer l'affichage
+ </string>
+ <string name="status_grab">
+ Faîtes glisser pour déplacer, appuyez sur Ctrl pour soulever, Crtl-Maj pour pivoter
+ </string>
+ <string name="status_place">
+ Cliquez dans le monde pour construire
+ </string>
+ <string name="status_selectland">
+ Cliquez et faites glisser pour sélectionner le terrain
+ </string>
+ <string name="grid_screen_text">
+ Écran
+ </string>
+ <string name="grid_local_text">
+ Local
+ </string>
+ <string name="grid_world_text">
+ Monde
+ </string>
+ <string name="grid_reference_text">
+ Référence
+ </string>
+ <string name="grid_attachment_text">
+ Pièce-jointe
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
index 0aa21d313e..3be281b6c2 100644
--- a/indra/newview/skins/default/xui/fr/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="top_objects" title="en cours de chargement...">
- <text name="title_text">
- Chargement...
- </text>
- <scroll_list name="objects_list">
- <column label="Score" name="score"/>
- <column label="Nom" name="name"/>
- <column label="Propriétaire" name="owner"/>
- <column label="Lieu" name="location"/>
- <column label="Heure" name="time"/>
- <column label="Heure Mono" name="mono_time"/>
- </scroll_list>
- <text name="id_text">
- ID de l'objet :
- </text>
- <button label="Afficher balise" name="show_beacon_btn"/>
- <text name="obj_name_text">
- Nom :
- </text>
- <button label="Filtre" name="filter_object_btn"/>
- <text name="owner_name_text">
- Nom :
- </text>
- <button label="Filtre" name="filter_owner_btn"/>
- <button label="Renvoyer" name="return_selected_btn"/>
- <button label="Renvoyer tous" name="return_all_btn"/>
- <button label="Désactiver" name="disable_selected_btn"/>
- <button label="Désactiver tous" name="disable_all_btn"/>
- <button label="Rafraîchir" name="refresh_btn"/>
- <string name="top_scripts_title">
- Scripts principaux
- </string>
- <string name="top_scripts_text">
- [COUNT] scripts prenant un total de [TIME] ms
- </string>
- <string name="scripts_score_label">
- Heure
- </string>
- <string name="scripts_mono_time_label">
- Heure Mono
- </string>
- <string name="top_colliders_title">
- Objets souvent responsables de collision
- </string>
- <string name="top_colliders_text">
- [COUNT] objets souvent responsables de collisions
- </string>
- <string name="colliders_score_label">
- Score
- </string>
- <string name="none_descriptor">
- Aucun résultat.
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="top_objects" title="en cours de chargement...">
+ <text name="title_text">
+ Chargement...
+ </text>
+ <scroll_list name="objects_list">
+ <column label="Score" name="score"/>
+ <column label="Nom" name="name"/>
+ <column label="Propriétaire" name="owner"/>
+ <column label="Lieu" name="location"/>
+ <column label="Heure" name="time"/>
+ <column label="Heure Mono" name="mono_time"/>
+ </scroll_list>
+ <text name="id_text">
+ ID de l'objet :
+ </text>
+ <button label="Afficher balise" name="show_beacon_btn"/>
+ <text name="obj_name_text">
+ Nom :
+ </text>
+ <button label="Filtre" name="filter_object_btn"/>
+ <text name="owner_name_text">
+ Nom :
+ </text>
+ <button label="Filtre" name="filter_owner_btn"/>
+ <button label="Renvoyer" name="return_selected_btn"/>
+ <button label="Renvoyer tous" name="return_all_btn"/>
+ <button label="Désactiver" name="disable_selected_btn"/>
+ <button label="Désactiver tous" name="disable_all_btn"/>
+ <button label="Rafraîchir" name="refresh_btn"/>
+ <string name="top_scripts_title">
+ Scripts principaux
+ </string>
+ <string name="top_scripts_text">
+ [COUNT] scripts prenant un total de [TIME] ms
+ </string>
+ <string name="scripts_score_label">
+ Heure
+ </string>
+ <string name="scripts_mono_time_label">
+ Heure Mono
+ </string>
+ <string name="top_colliders_title">
+ Objets souvent responsables de collision
+ </string>
+ <string name="top_colliders_text">
+ [COUNT] objets souvent responsables de collisions
+ </string>
+ <string name="colliders_score_label">
+ Score
+ </string>
+ <string name="none_descriptor">
+ Aucun résultat.
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_tos.xml b/indra/newview/skins/default/xui/fr/floater_tos.xml
index 83e0a2aab4..b77838d92c 100644
--- a/indra/newview/skins/default/xui/fr/floater_tos.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tos.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title=" ">
- <button label="Continuer" label_selected="Continuer" name="Continue" />
- <button label="Annuler" label_selected="Annuler" name="Cancel" />
- <radio_group name="tos_agreement">
- <radio_item name="radio_disagree">
- Je n'accepte pas les Conditions Générales d'Utilisation
- </radio_item>
- <radio_item name="radio_agree">
- J'accepte les Conditions Générales d'Utilisation
- </radio_item>
- </radio_group>
- <text name="tos_title">
- Acceptation des Conditions Générales d'Utilisation
- </text>
- <check_box label="J'accepte les Conditions d'utilisation" name="agree_chk" />
- <text name="tos_heading">
- Veuillez lire attentivement les Conditions d'utilisation suivantes. Pour continuer à utiliser
-Second Life, vous devez accepter ces conditions.
- </text>
- <text_editor name="tos_text">
- TOS_TEXT
- </text_editor>
- <text name="real_url">
- http://secondlife.com/app/tos/
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title=" ">
+ <button label="Continuer" label_selected="Continuer" name="Continue" />
+ <button label="Annuler" label_selected="Annuler" name="Cancel" />
+ <radio_group name="tos_agreement">
+ <radio_item name="radio_disagree">
+ Je n'accepte pas les Conditions Générales d'Utilisation
+ </radio_item>
+ <radio_item name="radio_agree">
+ J'accepte les Conditions Générales d'Utilisation
+ </radio_item>
+ </radio_group>
+ <text name="tos_title">
+ Acceptation des Conditions Générales d'Utilisation
+ </text>
+ <check_box label="J'accepte les Conditions d'utilisation" name="agree_chk" />
+ <text name="tos_heading">
+ Veuillez lire attentivement les Conditions d'utilisation suivantes. Pour continuer à utiliser
+Second Life, vous devez accepter ces conditions.
+ </text>
+ <text_editor name="tos_text">
+ TOS_TEXT
+ </text_editor>
+ <text name="real_url">
+ http://secondlife.com/app/tos/
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_url_entry.xml b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
index fce1f483cf..6a90731691 100644
--- a/indra/newview/skins/default/xui/fr/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="url_entry">
- <text name="media_label">
- URL du média :
- </text>
- <combo_box left="100" name="media_entry" width="360" />
- <button label="OK" name="ok_btn" />
- <button label="Annuler" name="cancel_btn" />
- <button label="Effacer" name="clear_btn" />
- <text name="loading_label">
- Chargement...
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="url_entry">
+ <text name="media_label">
+ URL du média :
+ </text>
+ <combo_box left="100" name="media_entry" width="360" />
+ <button label="OK" name="ok_btn" />
+ <button label="Annuler" name="cancel_btn" />
+ <button label="Effacer" name="clear_btn" />
+ <text name="loading_label">
+ Chargement...
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml
index 9c4d7ad653..9b77c2450d 100644
--- a/indra/newview/skins/default/xui/fr/floater_water.xml
+++ b/indra/newview/skins/default/xui/fr/floater_water.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Water Floater" title="Éditeur d'eau avancé">
- <text name="KeyFramePresetsText">
- Préréglages eau :
- </text>
- <button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset" />
- <button label="Enregistrer" label_selected="Enregistrer" name="WaterSavePreset" width="75" left_delta="75"/>
- <button label="Supprimer" label_selected="Supprimer" name="WaterDeletePreset" left_delta="80"/>
- <tab_container name="Water Tabs">
- <panel label="Paramètres" name="Settings">
- <text name="BHText">
- Couleur du brouillard
-dans l'eau
- </text>
- <button label="?" name="WaterFogColorHelp" />
- <color_swatch name="WaterFogColor" left="75" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
- <text name="WaterFogDensText">
- Densité du brouillard
- </text>
- <button label="?" name="WaterFogDensityHelp" />
- <text name="WaterUnderWaterFogModText">
- Brouillard sous-marin
- </text>
- <button label="?" name="WaterUnderWaterFogModHelp" />
- <text name="BDensText">
- Échelle des vaguelettes
- </text>
- <button label="?" name="WaterNormalScaleHelp" />
- <text name="BHText2">
- 1
- </text>
- <text name="BHText3">
- 2
- </text>
- <text name="BHText4">
- 3
- </text>
- <text name="HDText">
- Échelle Fresnel
- </text>
- <button label="?" name="WaterFresnelScaleHelp" />
- <text name="FresnelOffsetText">
- Décalage Fresnel
- </text>
- <button label="?" name="WaterFresnelOffsetHelp" />
- <text name="DensMultText">
- Réfraction au dessus
- </text>
- <button label="?" name="WaterScaleAboveHelp" />
- <text name="WaterScaleBelowText">
- Réfraction en dessous
- </text>
- <button label="?" name="WaterScaleBelowHelp" />
- <text name="MaxAltText">
- Multiplicateur de flou
- </text>
- <button label="?" name="WaterBlurMultiplierHelp" />
- </panel>
- <panel label="Image" name="Waves">
- <text name="BHText">
- Direction grande vague
- </text>
- <button label="?" name="WaterWave1Help" />
- <text name="WaterWave1DirXText">
- X
- </text>
- <text name="WaterWave1DirYText">
- Y
- </text>
- <text name="BHText2">
- Direction petite vague
- </text>
- <button label="?" name="WaterWave2Help" />
- <text name="WaterWave2DirXText">
- X
- </text>
- <text name="WaterWave2DirYText">
- Y
- </text>
- <text name="BHText3">
- Normal Map
- </text>
- <button label="?" name="WaterNormalMapHelp" />
- </panel>
- </tab_container>
- <string name="WLDefaultWaterNames">
- Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Water Floater" title="Éditeur d'eau avancé">
+ <text name="KeyFramePresetsText">
+ Préréglages eau :
+ </text>
+ <button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset" />
+ <button label="Enregistrer" label_selected="Enregistrer" name="WaterSavePreset" width="75" left_delta="75"/>
+ <button label="Supprimer" label_selected="Supprimer" name="WaterDeletePreset" left_delta="80"/>
+ <tab_container name="Water Tabs">
+ <panel label="Paramètres" name="Settings">
+ <text name="BHText">
+ Couleur du brouillard
+dans l'eau
+ </text>
+ <button label="?" name="WaterFogColorHelp" />
+ <color_swatch name="WaterFogColor" left="75" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
+ <text name="WaterFogDensText">
+ Densité du brouillard
+ </text>
+ <button label="?" name="WaterFogDensityHelp" />
+ <text name="WaterUnderWaterFogModText">
+ Brouillard sous-marin
+ </text>
+ <button label="?" name="WaterUnderWaterFogModHelp" />
+ <text name="BDensText">
+ Échelle des vaguelettes
+ </text>
+ <button label="?" name="WaterNormalScaleHelp" />
+ <text name="BHText2">
+ 1
+ </text>
+ <text name="BHText3">
+ 2
+ </text>
+ <text name="BHText4">
+ 3
+ </text>
+ <text name="HDText">
+ Échelle Fresnel
+ </text>
+ <button label="?" name="WaterFresnelScaleHelp" />
+ <text name="FresnelOffsetText">
+ Décalage Fresnel
+ </text>
+ <button label="?" name="WaterFresnelOffsetHelp" />
+ <text name="DensMultText">
+ Réfraction au dessus
+ </text>
+ <button label="?" name="WaterScaleAboveHelp" />
+ <text name="WaterScaleBelowText">
+ Réfraction en dessous
+ </text>
+ <button label="?" name="WaterScaleBelowHelp" />
+ <text name="MaxAltText">
+ Multiplicateur de flou
+ </text>
+ <button label="?" name="WaterBlurMultiplierHelp" />
+ </panel>
+ <panel label="Image" name="Waves">
+ <text name="BHText">
+ Direction grande vague
+ </text>
+ <button label="?" name="WaterWave1Help" />
+ <text name="WaterWave1DirXText">
+ X
+ </text>
+ <text name="WaterWave1DirYText">
+ Y
+ </text>
+ <text name="BHText2">
+ Direction petite vague
+ </text>
+ <button label="?" name="WaterWave2Help" />
+ <text name="WaterWave2DirXText">
+ X
+ </text>
+ <text name="WaterWave2DirYText">
+ Y
+ </text>
+ <text name="BHText3">
+ Normal Map
+ </text>
+ <button label="?" name="WaterNormalMapHelp" />
+ </panel>
+ </tab_container>
+ <string name="WLDefaultWaterNames">
+ Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml
index 8c279d8724..a5bc87d951 100644
--- a/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container">
- <button label="Enregistrer" label_selected="Enregistrer" name="Save" />
- <button label="Annuler" label_selected="Annuler" name="Cancel" />
- <text type="string" length="1" name="Save item as:">
- Enregistrer l'objet sous :
- </text>
- <line_editor name="name ed">
- Nouveau [DESC]
- </line_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container">
+ <button label="Enregistrer" label_selected="Enregistrer" name="Save" />
+ <button label="Annuler" label_selected="Annuler" name="Cancel" />
+ <text type="string" length="1" name="Save item as:">
+ Enregistrer l'objet sous :
+ </text>
+ <line_editor name="name ed">
+ Nouveau [DESC]
+ </line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
index 1aa6cd5a45..d1a62dc6bc 100644
--- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
@@ -1,190 +1,190 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="WindLight floater" title="Éditeur de ciel avancé" width="706">
- <text name="KeyFramePresetsText">
- Préréglages ciel :
- </text>
- <button label="Nouveau" label_selected="Nouveau" name="WLNewPreset" />
- <button label="Enregistrer" label_selected="Enregistrer" name="WLSavePreset" width="75" left_delta="75"/>
- <button label="Supprimer" label_selected="Supprimer" name="WLDeletePreset" left_delta="80"/>
- <button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour"
- name="WLDayCycleMenuButton" width="150" left_delta="95" />
- <tab_container name="WindLight Tabs" width="706">
- <panel label="Atmosphère" name="Atmosphere">
- <text name="BHText">
- Bleu de l'horizon
- </text>
- <button label="?" name="WLBlueHorizonHelp" />
- <text name="BHText2">
- R
- </text>
- <text name="BHText3">
- V
- </text>
- <text name="BHText4">
- B
- </text>
- <text name="BHText5">
- I
- </text>
- <text name="BDensText">
- Quantité de brume
- </text>
- <button label="?" name="WLHazeHorizonHelp" />
- <text name="BDensText2">
- Densité du bleu
- </text>
- <button label="?" name="WLBlueDensityHelp" />
- <text name="BHText6">
- R
- </text>
- <text name="BHText7">
- V
- </text>
- <text name="BHText8">
- B
- </text>
- <text name="BHText9">
- I
- </text>
- <text name="HDText">
- Densité de la brume
- </text>
- <button label="?" name="WLHazeDensityHelp" />
- <text name="DensMultText">
- Multiplicateur de densité
- </text>
- <button label="?" name="WLDensityMultHelp" />
- <text name="WLDistanceMultText">
- Multiplicateur de distance
- </text>
- <button label="?" name="WLDistanceMultHelp" />
- <text name="MaxAltText">
- Altitude maximum
- </text>
- <button label="?" name="WLMaxAltitudeHelp" />
- </panel>
- <panel label="Éclairage" name="Lighting">
- <text name="SLCText">
- Couleur soleil/lune
- </text>
- <button label="?" name="WLSunlightColorHelp" />
- <text name="BHText">
- R
- </text>
- <text name="BHText2">
- V
- </text>
- <text name="BHText3">
- B
- </text>
- <text name="BHText4">
- I
- </text>
- <text name="TODText">
- Position soleil/lune
- </text>
- <button label="?" name="WLTimeOfDayHelp" />
- <text name="WLAmbientText">
- Éclairage ambiant
- </text>
- <button label="?" name="WLAmbientHelp" />
- <text name="BHText5">
- R
- </text>
- <text name="BHText6">
- V
- </text>
- <text name="BHText7">
- B
- </text>
- <text name="BHText8">
- I
- </text>
- <text name="WLEastAngleText">
- Angle du levant
- </text>
- <button label="?" name="WLEastAngleHelp" />
- <text name="SunGlowText">
- Rayonnement du soleil
- </text>
- <button label="?" name="WLSunGlowHelp" />
- <slider label="Netteté " name="WLGlowB" />
- <slider label="Taille " name="WLGlowR" />
- <text name="SceneGammaText">
- Gamma de la scène
- </text>
- <button label="?" name="WLSceneGammaHelp" />
- <text name="WLStarText">
- Éclat des étoiles
- </text>
- <button label="?" name="WLStarBrightnessHelp" />
- </panel>
- <panel label="Nuages" name="Clouds">
- <text name="WLCloudColorText">
- Couleur des nuages
- </text>
- <button label="?" name="WLCloudColorHelp" />
- <text name="BHText">
- R
- </text>
- <text name="BHText2">
- V
- </text>
- <text name="BHText3">
- B
- </text>
- <text name="BHText4">
- I
- </text>
- <text name="WLCloudColorText2">
- Nuages XY/densité
- </text>
- <button label="?" name="WLCloudDensityHelp" />
- <text name="BHText5">
- X
- </text>
- <text name="BHText6">
- Y
- </text>
- <text name="BHText7">
- D
- </text>
- <text name="WLCloudCoverageText">
- Couverture nuageuse
- </text>
- <button label="?" name="WLCloudCoverageHelp" left="407"/>
- <text name="WLCloudScaleText">
- Altitude des nuages
- </text>
- <button label="?" name="WLCloudScaleHelp" left="407"/>
- <text name="WLCloudDetailText">
- Détails nuages (XY/densité)
- </text>
- <button label="?" name="WLCloudDetailHelp" left="407" bottom_delta="-2" />
- <text name="BHText8">
- X
- </text>
- <text name="BHText9">
- Y
- </text>
- <text name="BHText10">
- D
- </text>
- <text name="WLCloudScrollXText">
- Direction et vitesse X
- </text>
- <button label="?" name="WLCloudScrollXHelp" />
- <check_box label="Verrouiller" name="WLCloudLockX" />
- <text name="WLCloudScrollYText">
- Direction et vitesse Y
- </text>
- <button label="?" name="WLCloudScrollYHelp" />
- <check_box label="Verrouiller" name="WLCloudLockY" />
- <check_box label="Nuages classiques" name="DrawClassicClouds" />
- <button label="?" name="WLClassicCloudsHelp" />
- </panel>
- </tab_container>
- <string name="WLDefaultSkyNames">
- A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="WindLight floater" title="Éditeur de ciel avancé" width="706">
+ <text name="KeyFramePresetsText">
+ Préréglages ciel :
+ </text>
+ <button label="Nouveau" label_selected="Nouveau" name="WLNewPreset" />
+ <button label="Enregistrer" label_selected="Enregistrer" name="WLSavePreset" width="75" left_delta="75"/>
+ <button label="Supprimer" label_selected="Supprimer" name="WLDeletePreset" left_delta="80"/>
+ <button label="Éditeur du cycle du jour" label_selected="Éditeur du cycle du jour"
+ name="WLDayCycleMenuButton" width="150" left_delta="95" />
+ <tab_container name="WindLight Tabs" width="706">
+ <panel label="Atmosphère" name="Atmosphere">
+ <text name="BHText">
+ Bleu de l'horizon
+ </text>
+ <button label="?" name="WLBlueHorizonHelp" />
+ <text name="BHText2">
+ R
+ </text>
+ <text name="BHText3">
+ V
+ </text>
+ <text name="BHText4">
+ B
+ </text>
+ <text name="BHText5">
+ I
+ </text>
+ <text name="BDensText">
+ Quantité de brume
+ </text>
+ <button label="?" name="WLHazeHorizonHelp" />
+ <text name="BDensText2">
+ Densité du bleu
+ </text>
+ <button label="?" name="WLBlueDensityHelp" />
+ <text name="BHText6">
+ R
+ </text>
+ <text name="BHText7">
+ V
+ </text>
+ <text name="BHText8">
+ B
+ </text>
+ <text name="BHText9">
+ I
+ </text>
+ <text name="HDText">
+ Densité de la brume
+ </text>
+ <button label="?" name="WLHazeDensityHelp" />
+ <text name="DensMultText">
+ Multiplicateur de densité
+ </text>
+ <button label="?" name="WLDensityMultHelp" />
+ <text name="WLDistanceMultText">
+ Multiplicateur de distance
+ </text>
+ <button label="?" name="WLDistanceMultHelp" />
+ <text name="MaxAltText">
+ Altitude maximum
+ </text>
+ <button label="?" name="WLMaxAltitudeHelp" />
+ </panel>
+ <panel label="Éclairage" name="Lighting">
+ <text name="SLCText">
+ Couleur soleil/lune
+ </text>
+ <button label="?" name="WLSunlightColorHelp" />
+ <text name="BHText">
+ R
+ </text>
+ <text name="BHText2">
+ V
+ </text>
+ <text name="BHText3">
+ B
+ </text>
+ <text name="BHText4">
+ I
+ </text>
+ <text name="TODText">
+ Position soleil/lune
+ </text>
+ <button label="?" name="WLTimeOfDayHelp" />
+ <text name="WLAmbientText">
+ Éclairage ambiant
+ </text>
+ <button label="?" name="WLAmbientHelp" />
+ <text name="BHText5">
+ R
+ </text>
+ <text name="BHText6">
+ V
+ </text>
+ <text name="BHText7">
+ B
+ </text>
+ <text name="BHText8">
+ I
+ </text>
+ <text name="WLEastAngleText">
+ Angle du levant
+ </text>
+ <button label="?" name="WLEastAngleHelp" />
+ <text name="SunGlowText">
+ Rayonnement du soleil
+ </text>
+ <button label="?" name="WLSunGlowHelp" />
+ <slider label="Netteté " name="WLGlowB" />
+ <slider label="Taille " name="WLGlowR" />
+ <text name="SceneGammaText">
+ Gamma de la scène
+ </text>
+ <button label="?" name="WLSceneGammaHelp" />
+ <text name="WLStarText">
+ Éclat des étoiles
+ </text>
+ <button label="?" name="WLStarBrightnessHelp" />
+ </panel>
+ <panel label="Nuages" name="Clouds">
+ <text name="WLCloudColorText">
+ Couleur des nuages
+ </text>
+ <button label="?" name="WLCloudColorHelp" />
+ <text name="BHText">
+ R
+ </text>
+ <text name="BHText2">
+ V
+ </text>
+ <text name="BHText3">
+ B
+ </text>
+ <text name="BHText4">
+ I
+ </text>
+ <text name="WLCloudColorText2">
+ Nuages XY/densité
+ </text>
+ <button label="?" name="WLCloudDensityHelp" />
+ <text name="BHText5">
+ X
+ </text>
+ <text name="BHText6">
+ Y
+ </text>
+ <text name="BHText7">
+ D
+ </text>
+ <text name="WLCloudCoverageText">
+ Couverture nuageuse
+ </text>
+ <button label="?" name="WLCloudCoverageHelp" left="407"/>
+ <text name="WLCloudScaleText">
+ Altitude des nuages
+ </text>
+ <button label="?" name="WLCloudScaleHelp" left="407"/>
+ <text name="WLCloudDetailText">
+ Détails nuages (XY/densité)
+ </text>
+ <button label="?" name="WLCloudDetailHelp" left="407" bottom_delta="-2" />
+ <text name="BHText8">
+ X
+ </text>
+ <text name="BHText9">
+ Y
+ </text>
+ <text name="BHText10">
+ D
+ </text>
+ <text name="WLCloudScrollXText">
+ Direction et vitesse X
+ </text>
+ <button label="?" name="WLCloudScrollXHelp" />
+ <check_box label="Verrouiller" name="WLCloudLockX" />
+ <text name="WLCloudScrollYText">
+ Direction et vitesse Y
+ </text>
+ <button label="?" name="WLCloudScrollYHelp" />
+ <check_box label="Verrouiller" name="WLCloudLockY" />
+ <check_box label="Nuages classiques" name="DrawClassicClouds" />
+ <button label="?" name="WLClassicCloudsHelp" />
+ </panel>
+ </tab_container>
+ <string name="WLDefaultSkyNames">
+ A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml
index d7eaba3d04..b04390bc13 100644
--- a/indra/newview/skins/default/xui/fr/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="worldmap" title="Carte du monde">
- <tab_container name="maptab" width="955">
- <panel label="Objets" name="objects_mapview" width="953"/>
- <panel label="Terrain" name="terrain_mapview" width="953"/>
- </tab_container>
- <icon left="973" name="square"/>
- <text name="land_for_sale_label">
- Terrain à vendre
- </text>
- <icon left="1113" name="square2"/>
- <text name="auction_label">
- Terrain aux enchères
- </text>
- <icon left="973" name="self"/>
- <text name="you_label">
- Vous
- </text>
- <icon left="1033" name="home"/>
- <text name="home_label">
- Domicile
- </text>
- <button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Vous téléporte à votre domicile"/>
- <text name="classifieds_label">
- Petites annonces
- </text>
- <icon left="977" name="person"/>
- <text name="person_label">
- Résident
- </text>
- <check_box label=" " left_delta="60" name="people_chk"/>
- <icon left="973" name="infohub"/>
- <text name="infohub_label">
- Infohub
- </text>
- <check_box label=" " left_delta="60" name="infohub_chk"/>
- <icon left="973" name="telehub"/>
- <text name="telehub_label">
- Téléhub
- </text>
- <check_box label=" " left_delta="60" name="telehubchk"/>
- <icon left="1113" name="landforsale"/>
- <text name="land_for_sale_label2">
- Terrain à vendre
- </text>
- <check_box label=" " name="land_for_sale_chk"/>
- <icon left="1113" name="event"/>
- <text name="events_label">
- Événements
- </text>
- <check_box label=" " name="event_chk"/>
- <icon left="1113" name="events_mature_icon"/>
-
- <check_box name="event_mature_chk"/>
- <icon left="973" name="avatar_icon"/>
- <combo_box label="Amis connectés" name="friend combo" tool_tip="Ami à afficher sur la carte" width="232">
- <combo_item name="none_selected">
- Amis connectés
- </combo_item>
- </combo_box>
- <icon left="973" name="landmark_icon"/>
- <combo_box label="Repères" name="landmark combo" tool_tip="Repère à afficher sur la carte" width="232">
- <combo_item name="none_selected">
- Repères
- </combo_item>
- </combo_box>
- <icon left="973" name="location_icon"/>
- <line_editor label="Rechercher par nom de région" name="location" tool_tip="Saisissez le nom d'une région" width="155"/>
- <button label="Rechercher" label_selected=">" left_delta="160" name="DoSearch" tool_tip="Recherchez sur la carte" width="75"/>
- <text left="973" name="search_label">
- Résultats de la recherche :
- </text>
- <scroll_list left="973" name="search_results" width="252">
- <column label="" name="icon"/>
- <column label="" name="sim_name"/>
- </scroll_list>
- <text left="973" name="location_label">
- Emplacement :
- </text>
- <spinner left="993" name="spin x" tool_tip="Coordonnées des X du lieu à afficher sur la carte"/>
- <spinner left="993" name="spin y" tool_tip="Coordonnées des Y du lieu à afficher sur la carte"/>
- <spinner left="993" name="spin z" tool_tip="Coordonnées des Z du lieu à afficher sur la carte"/>
- <button label="Téléporter" label_selected="Téléporter" left="-270" name="Teleport" tool_tip="Téléporter à l'endroit sélectionné"/>
- <button label="Afficher la destination" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l'endroit sélectionné" width="165"/>
- <button label="Effacer" label_selected="Effacer" left="-270" name="Clear" tool_tip="Arrêter de suivre"/>
- <button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l'emplacement de votre avatar" width="165"/>
- <button label="Copier la SLURL dans le presse-papier" left="-270" name="copy_slurl" tool_tip="Copier l'emplacement actuel comme SLURL pour l'utiliser sur le Web." width="262"/>
- <slider label="Zoom" left="-270" name="zoom slider"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="worldmap" title="Carte du monde">
+ <tab_container name="maptab" width="955">
+ <panel label="Objets" name="objects_mapview" width="953"/>
+ <panel label="Terrain" name="terrain_mapview" width="953"/>
+ </tab_container>
+ <icon left="973" name="square"/>
+ <text name="land_for_sale_label">
+ Terrain à vendre
+ </text>
+ <icon left="1113" name="square2"/>
+ <text name="auction_label">
+ Terrain aux enchères
+ </text>
+ <icon left="973" name="self"/>
+ <text name="you_label">
+ Vous
+ </text>
+ <icon left="1033" name="home"/>
+ <text name="home_label">
+ Domicile
+ </text>
+ <button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Vous téléporte à votre domicile"/>
+ <text name="classifieds_label">
+ Petites annonces
+ </text>
+ <icon left="977" name="person"/>
+ <text name="person_label">
+ Résident
+ </text>
+ <check_box label=" " left_delta="60" name="people_chk"/>
+ <icon left="973" name="infohub"/>
+ <text name="infohub_label">
+ Infohub
+ </text>
+ <check_box label=" " left_delta="60" name="infohub_chk"/>
+ <icon left="973" name="telehub"/>
+ <text name="telehub_label">
+ Téléhub
+ </text>
+ <check_box label=" " left_delta="60" name="telehubchk"/>
+ <icon left="1113" name="landforsale"/>
+ <text name="land_for_sale_label2">
+ Terrain à vendre
+ </text>
+ <check_box label=" " name="land_for_sale_chk"/>
+ <icon left="1113" name="event"/>
+ <text name="events_label">
+ Événements
+ </text>
+ <check_box label=" " name="event_chk"/>
+ <icon left="1113" name="events_mature_icon"/>
+
+ <check_box name="event_mature_chk"/>
+ <icon left="973" name="avatar_icon"/>
+ <combo_box label="Amis connectés" name="friend combo" tool_tip="Ami à afficher sur la carte" width="232">
+ <combo_box.item name="none_selected">
+ Amis connectés
+ </combo_box.item>
+ </combo_box>
+ <icon left="973" name="landmark_icon"/>
+ <combo_box label="Repères" name="landmark combo" tool_tip="Repère à afficher sur la carte" width="232">
+ <combo_box.item name="none_selected">
+ Repères
+ </combo_box.item>
+ </combo_box>
+ <icon left="973" name="location_icon"/>
+ <line_editor label="Rechercher par nom de région" name="location" tool_tip="Saisissez le nom d'une région" width="155"/>
+ <button label="Rechercher" label_selected=">" left_delta="160" name="DoSearch" tool_tip="Recherchez sur la carte" width="75"/>
+ <text left="973" name="search_label">
+ Résultats de la recherche :
+ </text>
+ <scroll_list left="973" name="search_results" width="252">
+ <column label="" name="icon"/>
+ <column label="" name="sim_name"/>
+ </scroll_list>
+ <text left="973" name="location_label">
+ Emplacement :
+ </text>
+ <spinner left="993" name="spin x" tool_tip="Coordonnées des X du lieu à afficher sur la carte"/>
+ <spinner left="993" name="spin y" tool_tip="Coordonnées des Y du lieu à afficher sur la carte"/>
+ <spinner left="993" name="spin z" tool_tip="Coordonnées des Z du lieu à afficher sur la carte"/>
+ <button label="Téléporter" label_selected="Téléporter" left="-270" name="Teleport" tool_tip="Téléporter à l'endroit sélectionné"/>
+ <button label="Afficher la destination" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l'endroit sélectionné" width="165"/>
+ <button label="Effacer" label_selected="Effacer" left="-270" name="Clear" tool_tip="Arrêter de suivre"/>
+ <button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l'emplacement de votre avatar" width="165"/>
+ <button label="Copier la SLURL dans le presse-papier" left="-270" name="copy_slurl" tool_tip="Copier l'emplacement actuel comme SLURL pour l'utiliser sur le Web." width="262"/>
+ <slider label="Zoom" left="-270" name="zoom slider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/fonts.xml b/indra/newview/skins/default/xui/fr/fonts.xml
index 021372d6f2..cccb45b973 100644
--- a/indra/newview/skins/default/xui/fr/fonts.xml
+++ b/indra/newview/skins/default/xui/fr/fonts.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<fonts>
-
- <font name="OverrideTest"
- comment="Name of font to test overriding">
- <file>timesbd.ttf</file>
- </font>
-
-</fonts>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<fonts>
+
+ <font name="OverrideTest"
+ comment="Name of font to test overriding">
+ <file>timesbd.ttf</file>
+ </font>
+
+</fonts>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index 787e4c83db..ce347afe89 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Popup">
- <menu_item_call label="Acheter" name="Task Buy"/>
- <menu_item_call label="Ouvrir" name="Task Open"/>
- <menu_item_call label="Jouer" name="Task Play"/>
- <menu_item_call label="Propriétés" name="Task Properties"/>
- <menu_item_call label="Renommer" name="Task Rename"/>
- <menu_item_call label="Supprimer" name="Task Remove"/>
- <menu_item_call label="Vider la corbeille" name="Empty Trash"/>
- <menu_item_call label="Vider les objets trouvés" name="Empty Lost And Found"/>
- <menu_item_call label="Nouveau dossier" name="New Folder"/>
- <menu_item_call label="Nouveau script" name="New Script"/>
- <menu_item_call label="Nouvelle note" name="New Note"/>
- <menu_item_call label="Nouveau geste" name="New Gesture"/>
- <menu name="New Clothes">
- <menu_item_call label="Nouvelle chemise" name="New Shirt"/>
- <menu_item_call label="Nouveau pantalon" name="New Pants"/>
- <menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
- <menu_item_call label="Nouvelles chaussettes" name="New Socks"/>
- <menu_item_call label="Nouvelle veste" name="New Jacket"/>
- <menu_item_call label="Nouvelle jupe" name="New Skirt"/>
- <menu_item_call label="Nouveaux gants" name="New Gloves"/>
- <menu_item_call label="Nouveau tricot" name="New Undershirt"/>
- <menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
- </menu>
- <menu name="New Body Parts">
- <menu_item_call label="Nouvelle silhouette" name="New Shape"/>
- <menu_item_call label="Nouvelle peau" name="New Skin"/>
- <menu_item_call label="Nouveaux cheveux" name="New Hair"/>
- <menu_item_call label="Nouveaux yeux" name="New Eyes"/>
- </menu>
- <menu_item_call label="Téléporter" name="Landmark Open"/>
- <menu_item_call label="Ouvrir" name="Animation Open"/>
- <menu_item_call label="Ouvrir" name="Sound Open"/>
- <menu_item_call label="Purger l'objet" name="Purge Item"/>
- <menu_item_call label="Restaurer l'objet" name="Restore Item"/>
- <menu_item_call label="Ouvrir" name="Open"/>
- <menu_item_call label="Propriétés" name="Properties"/>
- <menu_item_call label="Renommer" name="Rename"/>
- <menu_item_call label="Copier l'UUID (identifiant universel unique)" name="Copy Asset UUID"/>
- <menu_item_call label="Copier" name="Copy"/>
- <menu_item_call label="Coller" name="Paste"/>
- <menu_item_call label="Supprimer" name="Delete"/>
- <menu_item_call label="Enlever les objets" name="Take Off Items"/>
- <menu_item_call label="Ajouter à l'ensemble" name="Add To Outfit"/>
- <menu_item_call label="Remplacer l'ensemble" name="Replace Outfit"/>
- <menu_item_call label="Démarrer le chat conférence" name="Conference Chat Folder"/>
- <menu_item_call label="Jouer" name="Sound Play"/>
- <menu_item_call label="Au sujet du repère" name="Teleport To Landmark"/>
- <menu_item_call label="Jouer dans le Monde" name="Animation Play"/>
- <menu_item_call label="Jouer localement" name="Animation Audition"/>
- <menu_item_call label="Envoyer un message instantané" name="Send Instant Message"/>
- <menu_item_call label="Offrir de téléporter..." name="Offer Teleport..."/>
- <menu_item_call label="Démarrer le chat conférence" name="Conference Chat"/>
- <menu_item_call label="Activer" name="Activate"/>
- <menu_item_call label="Désactiver" name="Deactivate"/>
- <menu_item_call label="Détacher de vous" name="Detach From Yourself"/>
- <menu_item_call label="Remettre dans le dernier emplacement" name="Restore to Last Position"/>
- <menu_item_call label="Porter" name="Object Wear"/>
- <menu label="Attacher à " name="Attach To"/>
- <menu label="Attacher au HUD " name="Attach To HUD"/>
- <menu_item_call label="Éditer" name="Wearable Edit"/>
- <menu_item_call label="Porter" name="Wearable Wear"/>
- <menu_item_call label="Enlever" name="Take Off"/>
- <menu_item_call label="--aucune option--" name="--no options--"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+ <menu_item_call label="Acheter" name="Task Buy"/>
+ <menu_item_call label="Ouvrir" name="Task Open"/>
+ <menu_item_call label="Jouer" name="Task Play"/>
+ <menu_item_call label="Propriétés" name="Task Properties"/>
+ <menu_item_call label="Renommer" name="Task Rename"/>
+ <menu_item_call label="Supprimer" name="Task Remove"/>
+ <menu_item_call label="Vider la corbeille" name="Empty Trash"/>
+ <menu_item_call label="Vider les objets trouvés" name="Empty Lost And Found"/>
+ <menu_item_call label="Nouveau dossier" name="New Folder"/>
+ <menu_item_call label="Nouveau script" name="New Script"/>
+ <menu_item_call label="Nouvelle note" name="New Note"/>
+ <menu_item_call label="Nouveau geste" name="New Gesture"/>
+ <menu name="New Clothes">
+ <menu_item_call label="Nouvelle chemise" name="New Shirt"/>
+ <menu_item_call label="Nouveau pantalon" name="New Pants"/>
+ <menu_item_call label="Nouvelles chaussures" name="New Shoes"/>
+ <menu_item_call label="Nouvelles chaussettes" name="New Socks"/>
+ <menu_item_call label="Nouvelle veste" name="New Jacket"/>
+ <menu_item_call label="Nouvelle jupe" name="New Skirt"/>
+ <menu_item_call label="Nouveaux gants" name="New Gloves"/>
+ <menu_item_call label="Nouveau tricot" name="New Undershirt"/>
+ <menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
+ </menu>
+ <menu name="New Body Parts">
+ <menu_item_call label="Nouvelle silhouette" name="New Shape"/>
+ <menu_item_call label="Nouvelle peau" name="New Skin"/>
+ <menu_item_call label="Nouveaux cheveux" name="New Hair"/>
+ <menu_item_call label="Nouveaux yeux" name="New Eyes"/>
+ </menu>
+ <menu_item_call label="Téléporter" name="Landmark Open"/>
+ <menu_item_call label="Ouvrir" name="Animation Open"/>
+ <menu_item_call label="Ouvrir" name="Sound Open"/>
+ <menu_item_call label="Purger l'objet" name="Purge Item"/>
+ <menu_item_call label="Restaurer l'objet" name="Restore Item"/>
+ <menu_item_call label="Ouvrir" name="Open"/>
+ <menu_item_call label="Propriétés" name="Properties"/>
+ <menu_item_call label="Renommer" name="Rename"/>
+ <menu_item_call label="Copier l'UUID (identifiant universel unique)" name="Copy Asset UUID"/>
+ <menu_item_call label="Copier" name="Copy"/>
+ <menu_item_call label="Coller" name="Paste"/>
+ <menu_item_call label="Supprimer" name="Delete"/>
+ <menu_item_call label="Enlever les objets" name="Take Off Items"/>
+ <menu_item_call label="Ajouter à l'ensemble" name="Add To Outfit"/>
+ <menu_item_call label="Remplacer l'ensemble" name="Replace Outfit"/>
+ <menu_item_call label="Démarrer le chat conférence" name="Conference Chat Folder"/>
+ <menu_item_call label="Jouer" name="Sound Play"/>
+ <menu_item_call label="Au sujet du repère" name="Teleport To Landmark"/>
+ <menu_item_call label="Jouer dans le Monde" name="Animation Play"/>
+ <menu_item_call label="Jouer localement" name="Animation Audition"/>
+ <menu_item_call label="Envoyer un message instantané" name="Send Instant Message"/>
+ <menu_item_call label="Offrir de téléporter..." name="Offer Teleport..."/>
+ <menu_item_call label="Démarrer le chat conférence" name="Conference Chat"/>
+ <menu_item_call label="Activer" name="Activate"/>
+ <menu_item_call label="Désactiver" name="Deactivate"/>
+ <menu_item_call label="Détacher de vous" name="Detach From Yourself"/>
+ <menu_item_call label="Remettre dans le dernier emplacement" name="Restore to Last Position"/>
+ <menu_item_call label="Porter" name="Object Wear"/>
+ <menu label="Attacher à " name="Attach To"/>
+ <menu label="Attacher au HUD " name="Attach To HUD"/>
+ <menu_item_call label="Éditer" name="Wearable Edit"/>
+ <menu_item_call label="Porter" name="Wearable Wear"/>
+ <menu_item_call label="Enlever" name="Take Off"/>
+ <menu_item_call label="--aucune option--" name="--no options--"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index 523042f104..3b904b6802 100644
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar name="Login Menu">
- <menu label="Fichier" name="File">
- <menu_item_call label="Quitter" name="Quit" />
- </menu>
- <menu label="Édition" name="Edit">
- <menu_item_call label="Préférences..." name="Preferences..." />
- </menu>
- <menu label="Aide" name="Help">
- <menu_item_call label="Aide Second Life" name="Second Life Help" />
- <menu_item_call label="À propos de Second Life..." name="About Second Life..." />
- </menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar name="Login Menu">
+ <menu label="Fichier" name="File">
+ <menu_item_call label="Quitter" name="Quit" />
+ </menu>
+ <menu label="Édition" name="Edit">
+ <menu_item_call label="Préférences..." name="Preferences..." />
+ </menu>
+ <menu label="Aide" name="Help">
+ <menu_item_call label="Aide Second Life" name="Second Life Help" />
+ <menu_item_call label="À propos de Second Life..." name="About Second Life..." />
+ </menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/fr/menu_slurl.xml b/indra/newview/skins/default/xui/fr/menu_slurl.xml
index 296b1ae001..ebd042a38a 100644
--- a/indra/newview/skins/default/xui/fr/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/fr/menu_slurl.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="Popup">
- <menu_item_call label="À propos de l'URL" name="about_url" />
- <menu_item_call label="Téléporter vers l'URL" name="teleport_to_url" />
- <menu_item_call label="Voir sur la carte" name="show_on_map" />
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="Popup">
+ <menu_item_call label="À propos de l'URL" name="about_url" />
+ <menu_item_call label="Téléporter vers l'URL" name="teleport_to_url" />
+ <menu_item_call label="Voir sur la carte" name="show_on_map" />
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 381a41d503..f0a4541e6b 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -1,211 +1,211 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu_bar name="Main Menu">
- <menu label="Fichier" name="File">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
- <menu label="Importer" name="upload">
- <menu_item_call label="Image ([COST] L$)..." name="Upload Image"/>
- <menu_item_call label="Son ([COST] L$)..." name="Upload Sound"/>
- <menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
- <menu_item_call label="Lot ([COST] L$ par fichier)..." name="Bulk Upload"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Définir les permissions par défaut..." name="perm prefs"/>
- </menu>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Fermer la fenêtre" name="Close Window"/>
- <menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Enregistrer la texture sous..." name="Save Texture As..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Prendre une photo" name="Take Snapshot"/>
- <menu_item_call label="Enregistrer la photo sur le disque" name="Snapshot to Disk" shortcut="control|shift|X"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Quitter" name="Quit"/>
- </menu>
- <menu label="Édition" name="Edit">
- <menu_item_call label="Annuler" name="Undo"/>
- <menu_item_call label="Recommencer" name="Redo"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Couper" name="Cut"/>
- <menu_item_call label="Copier" name="Copy"/>
- <menu_item_call label="Coller" name="Paste"/>
- <menu_item_call label="Supprimer" name="Delete"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Rechercher..." name="Search..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Tout sélectionner" name="Select All"/>
- <menu_item_call label="Désélectionner" name="Deselect"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Dupliquer" name="Duplicate"/>
- <menu_item_separator label="-----------" name="separator5"/>
- <menu label="Attacher l'objet" name="Attach Object"/>
- <menu label="Détacher l'objet" name="Detach Object"/>
- <menu label="Enlever mes habits" name="Take Off Clothing">
- <menu_item_call label="Chemise" name="Shirt"/>
- <menu_item_call label="Pantalon" name="Pants"/>
- <menu_item_call label="Chaussures" name="Shoes"/>
- <menu_item_call label="Chaussettes" name="Socks"/>
- <menu_item_call label="Veste" name="Jacket"/>
- <menu_item_call label="Gants" name="Gloves"/>
- <menu_item_call label="Tricot" name="Menu Undershirt"/>
- <menu_item_call label="Sous-vêtements" name="Menu Underpants"/>
- <menu_item_call label="Jupe" name="Skirt"/>
- <menu_item_call label="Tous les habits" name="All Clothes"/>
- </menu>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu_item_call label="Gestes..." name="Gestures..."/>
- <menu_item_call label="Profil..." name="Profile..."/>
- <menu_item_call label="Apparence..." name="Appearance..."/>
- <menu_item_separator label="-----------" name="separator7"/>
- <menu_item_check label="Amis..." name="Friends..."/>
- <menu_item_call label="Groupes..." name="Groups..."/>
- <menu_item_separator label="-----------" name="separator8"/>
- <menu_item_call label="Préférences..." name="Preferences..."/>
- </menu>
- <menu label="Affichage" name="View">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
- <menu_item_call label="Vue subjective" name="Mouselook"/>
- <menu_item_check label="Construire" name="Build"/>
- <menu_item_check label="Vue au joystick" name="Joystick Flycam"/>
- <menu_item_call label="Réinitialiser l'affichage" name="Reset View"/>
- <menu_item_call label="Regarder le dernier intervenant" name="Look at Last Chatter" shortcut="alt|V"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_check label="Barre d'outils" name="Toolbar"/>
- <menu_item_check label="Chat local" name="Chat History"/>
- <menu_item_check label="Communiquer" name="Instant Message"/>
- <menu_item_check label="Inventaire" name="Inventory"/>
- <menu_item_check label="Intervenants actifs" name="Active Speakers"/>
- <menu_item_check label="Liste des ignorés" name="Mute List"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_check label="Contrôles de la caméra" name="Camera Controls"/>
- <menu_item_check label="Contrôle des déplacements" name="Movement Controls"/>
- <menu_item_check label="Carte du monde" name="World Map"/>
- <menu_item_check label="Mini-carte" name="Mini-Map"/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_check label="Statistiques" name="Statistics Bar"/>
- <menu_item_check label="Limites des parcelles" name="Property Lines"/>
- <menu_item_check label="Propriétaires fonciers" name="Land Owners"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu label="Infobulles" name="Hover Tips">
- <menu_item_check label="Affichez les infobulles" name="Show Tips"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_check label="Infobulles des terrains" name="Land Tips"/>
- <menu_item_check label="Infobulles de tous les objets" name="Tips On All Objects"/>
- </menu>
- <menu_item_check label="Voir les objets invisibles" name="Highlight Transparent"/>
- <menu_item_check label="Balises" name="beacons"/>
- <menu_item_check label="Masquer les particules" name="Hide Particles"/>
- <menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments"/>
- <menu_item_separator label="-----------" name="separator5"/>
- <menu_item_call label="Zoomer" name="Zoom In"/>
- <menu_item_call label="Zoom par défaut" name="Zoom Default"/>
- <menu_item_call label="Zoomer en arrière" name="Zoom Out"/>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu_item_call label="Activer/Quitter le plein écran" name="Toggle Fullscreen"/>
- <menu_item_call label="Taille de l'interface par défaut" name="Set UI Size to Default"/>
- </menu>
- <menu label="Monde" name="World">
- <menu_item_call label="Chat" name="Chat"/>
- <menu_item_check label="Toujours courir" name="Always Run"/>
- <menu_item_check label="Voler" name="Fly" shortcut="F"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Créer un repère ici" name="Create Landmark Here"/>
- <menu_item_call label="Définir comme domicile" name="Set Home to Here"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Me téléporter chez moi" name="Teleport Home"/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Me mettre absent(e)" name="Set Away"/>
- <menu_item_call label="Me mettre occupé(e)" name="Set Busy"/>
- <menu_item_call label="Arrêter d'animer mon avatar" name="Stop Animating My Avatar"/>
- <menu_item_call label="Reprendre le contrôle" name="Release Keys"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Historique de mon compte..." name="Account History...">
- <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=fr"/>
- </menu_item_call>
- <menu_item_call label="Gérer mon compte..." name="Manage My Account...">
- <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/>
- </menu_item_call>
- <menu_item_call label="Acheter des L$..." name="Buy and Sell L$..."/>
- <menu_item_separator label="-----------" name="separator5"/>
- <menu_item_call label="Mes terrains..." name="My Land..."/>
- <menu_item_call label="À propos du terrain..." name="About Land..."/>
- <menu_item_call label="Acheter le terrain..." name="Buy Land..."/>
- <menu_item_call label="Région et domaine..." name="Region/Estate..."/>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu label="Environnement" name="Environment Settings">
- <menu_item_call label="Aube" name="Sunrise"/>
- <menu_item_call label="Milieu de journée" name="Noon"/>
- <menu_item_call label="Coucher de soleil" name="Sunset"/>
- <menu_item_call label="Minuit" name="Midnight"/>
- <menu_item_call label="Revenir aux options par défaut" name="Revert to Region Default"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Éditeur d'environnement" name="Environment Editor"/>
- </menu>
- </menu>
- <menu label="Outils" name="Tools">
- <menu label="Sélectionner un outil" name="Select Tool">
- <menu_item_call label="Mise au point" name="Focus"/>
- <menu_item_call label="Déplacer" name="Move"/>
- <menu_item_call label="Éditer" name="Edit"/>
- <menu_item_call label="Créer" name="Create"/>
- <menu_item_call label="Terrain" name="Land"/>
- </menu>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects"/>
- <menu_item_check label="Sélectionner les objets déplaçables uniquement" name="Select Only Movable Objects"/>
- <menu_item_check label="Sélectionner en entourant" name="Select By Surrounding"/>
- <menu_item_check label="Afficher les parties cachées de la sélection" name="Show Hidden Selection"/>
- <menu_item_check label="Afficher la sphère de lumière de la sélection" name="Show Light Radius for Selection"/>
- <menu_item_check label="Afficher le faisceau de sélection" name="Show Selection Beam"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_check label="Aligner sur la grille" name="Snap to Grid"/>
- <menu_item_call label="Aligner sur les axes XY de la grille" name="Snap Object XY to Grid"/>
- <menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid"/>
- <menu_item_call label="Options de la grille..." name="Grid Options..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_check label="Modifier les parties liées" name="Edit Linked Parts"/>
- <menu_item_call label="Lier" name="Link"/>
- <menu_item_call label="Délier" name="Unlink"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Mise au point sur la sélection" name="Focus on Selection"/>
- <menu_item_call label="Zoom sur la sélection" name="Zoom to Selection"/>
- <menu_item_call label="Acheter l'objet" name="Menu Object Take"/>
- <menu_item_call label="Prendre une copie" name="Take Copy"/>
- <menu_item_call label="Remplacer l'objet dans mon inventaire" name="Save Object Back to My Inventory"/>
- <menu_item_call label="Remplacer l'objet dans le contenu de l'objet" name="Save Object Back to Object Contents"/>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu_item_call label="Afficher la fenêtre d'alertes/erreurs de script" name="Show Script Warning/Error Window"/>
- <menu label="Recompiler les scripts dans la sélection" name="Recompile Scripts in Selection">
- <menu_item_call label="Mono" name="Mono"/>
- <menu_item_call label="LSL" name="LSL"/>
- </menu>
- <menu_item_call label="Réinitialiser les scripts dans la sélection" name="Reset Scripts in Selection"/>
- <menu_item_call label="Activer les scripts dans la sélection" name="Set Scripts to Running in Selection"/>
- <menu_item_call label="Désactiver les scripts dans la sélection" name="Set Scripts to Not Running in Selection"/>
- </menu>
- <menu label="Aide" name="Help">
- <menu_item_call label="Aide Second Life" name="Second Life Help"/>
- <menu_item_call label="Didacticiel" name="Tutorial"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Blog officiel..." name="Official Linden Blog..."/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Aide sur le LSL..." name="Scripting Portal..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Signaler une infraction..." name="Report Abuse..."/>
- <menu_item_call label="Collisions, coups et bousculades…" name="Bumps, Pushes &amp; Hits..."/>
- <menu_item_call label="Mesure du lag" name="Lag Meter"/>
- <menu_item_separator label="-----------" name="separator7"/>
- <menu label="Signaler des bugs" name="Bug Reporting">
- <menu_item_call label="Ouvrir un JIRA..." name="Public Issue Tracker..."/>
- <menu_item_call label="Comment utiliser JIRA ?" name="Publc Issue Tracker Help..."/>
- <menu_item_separator label="-----------" name="separator7"/>
- <menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101..."/>
- <menu_item_call label="Comment signaler un problème de sécurité ?" name="Security Issues...">
- <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/fr"/>
- </menu_item_call>
- <menu_item_call label="Wiki Assurance Qualité…" name="QA Wiki..."/>
- <menu_item_separator label="-----------" name="separator9"/>
- <menu_item_call label="Signaler un bug..." name="Report Bug..."/>
- </menu>
- <menu_item_call label="À propos de Second Life..." name="About Second Life..."/>
- </menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_bar name="Main Menu">
+ <menu label="Fichier" name="File">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu label="Importer" name="upload">
+ <menu_item_call label="Image ([COST] L$)..." name="Upload Image"/>
+ <menu_item_call label="Son ([COST] L$)..." name="Upload Sound"/>
+ <menu_item_call label="Animation ([COST] L$)..." name="Upload Animation"/>
+ <menu_item_call label="Lot ([COST] L$ par fichier)..." name="Bulk Upload"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Définir les permissions par défaut..." name="perm prefs"/>
+ </menu>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Fermer la fenêtre" name="Close Window"/>
+ <menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Enregistrer la texture sous..." name="Save Texture As..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Prendre une photo" name="Take Snapshot"/>
+ <menu_item_call label="Enregistrer la photo sur le disque" name="Snapshot to Disk" shortcut="control|shift|X"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Quitter" name="Quit"/>
+ </menu>
+ <menu label="Édition" name="Edit">
+ <menu_item_call label="Annuler" name="Undo"/>
+ <menu_item_call label="Recommencer" name="Redo"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Couper" name="Cut"/>
+ <menu_item_call label="Copier" name="Copy"/>
+ <menu_item_call label="Coller" name="Paste"/>
+ <menu_item_call label="Supprimer" name="Delete"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Rechercher..." name="Search..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Tout sélectionner" name="Select All"/>
+ <menu_item_call label="Désélectionner" name="Deselect"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Dupliquer" name="Duplicate"/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu label="Attacher l'objet" name="Attach Object"/>
+ <menu label="Détacher l'objet" name="Detach Object"/>
+ <menu label="Enlever mes habits" name="Take Off Clothing">
+ <menu_item_call label="Chemise" name="Shirt"/>
+ <menu_item_call label="Pantalon" name="Pants"/>
+ <menu_item_call label="Chaussures" name="Shoes"/>
+ <menu_item_call label="Chaussettes" name="Socks"/>
+ <menu_item_call label="Veste" name="Jacket"/>
+ <menu_item_call label="Gants" name="Gloves"/>
+ <menu_item_call label="Tricot" name="Menu Undershirt"/>
+ <menu_item_call label="Sous-vêtements" name="Menu Underpants"/>
+ <menu_item_call label="Jupe" name="Skirt"/>
+ <menu_item_call label="Tous les habits" name="All Clothes"/>
+ </menu>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Gestes..." name="Gestures..."/>
+ <menu_item_call label="Profil..." name="Profile..."/>
+ <menu_item_call label="Apparence..." name="Appearance..."/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu_item_check label="Amis..." name="Friends..."/>
+ <menu_item_call label="Groupes..." name="Groups..."/>
+ <menu_item_separator label="-----------" name="separator8"/>
+ <menu_item_call label="Préférences..." name="Preferences..."/>
+ </menu>
+ <menu label="Affichage" name="View">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu_item_call label="Vue subjective" name="Mouselook"/>
+ <menu_item_check label="Construire" name="Build"/>
+ <menu_item_check label="Vue au joystick" name="Joystick Flycam"/>
+ <menu_item_call label="Réinitialiser l'affichage" name="Reset View"/>
+ <menu_item_call label="Regarder le dernier intervenant" name="Look at Last Chatter" shortcut="alt|V"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Barre d'outils" name="Toolbar"/>
+ <menu_item_check label="Chat local" name="Chat History"/>
+ <menu_item_check label="Communiquer" name="Instant Message"/>
+ <menu_item_check label="Inventaire" name="Inventory"/>
+ <menu_item_check label="Intervenants actifs" name="Active Speakers"/>
+ <menu_item_check label="Liste des ignorés" name="Mute List"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_check label="Contrôles de la caméra" name="Camera Controls"/>
+ <menu_item_check label="Contrôle des déplacements" name="Movement Controls"/>
+ <menu_item_check label="Carte du monde" name="World Map"/>
+ <menu_item_check label="Mini-carte" name="Mini-Map"/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_check label="Statistiques" name="Statistics Bar"/>
+ <menu_item_check label="Limites des parcelles" name="Property Lines"/>
+ <menu_item_check label="Propriétaires fonciers" name="Land Owners"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu label="Infobulles" name="Hover Tips">
+ <menu_item_check label="Affichez les infobulles" name="Show Tips"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Infobulles des terrains" name="Land Tips"/>
+ <menu_item_check label="Infobulles de tous les objets" name="Tips On All Objects"/>
+ </menu>
+ <menu_item_check label="Voir les objets invisibles" name="Highlight Transparent"/>
+ <menu_item_check label="Balises" name="beacons"/>
+ <menu_item_check label="Masquer les particules" name="Hide Particles"/>
+ <menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments"/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu_item_call label="Zoomer" name="Zoom In"/>
+ <menu_item_call label="Zoom par défaut" name="Zoom Default"/>
+ <menu_item_call label="Zoomer en arrière" name="Zoom Out"/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Activer/Quitter le plein écran" name="Toggle Fullscreen"/>
+ <menu_item_call label="Taille de l'interface par défaut" name="Set UI Size to Default"/>
+ </menu>
+ <menu label="Monde" name="World">
+ <menu_item_call label="Chat" name="Chat"/>
+ <menu_item_check label="Toujours courir" name="Always Run"/>
+ <menu_item_check label="Voler" name="Fly" shortcut="F"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Créer un repère ici" name="Create Landmark Here"/>
+ <menu_item_call label="Définir comme domicile" name="Set Home to Here"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Me téléporter chez moi" name="Teleport Home"/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Me mettre absent(e)" name="Set Away"/>
+ <menu_item_call label="Me mettre occupé(e)" name="Set Busy"/>
+ <menu_item_call label="Arrêter d'animer mon avatar" name="Stop Animating My Avatar"/>
+ <menu_item_call label="Reprendre le contrôle" name="Release Keys"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Historique de mon compte..." name="Account History...">
+ <on_click name="AccountHistory_url" userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php?lang=fr"/>
+ </menu_item_call>
+ <menu_item_call label="Gérer mon compte..." name="Manage My Account...">
+ <on_click name="ManageMyAccount_url" userdata="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=fr"/>
+ </menu_item_call>
+ <menu_item_call label="Acheter des L$..." name="Buy and Sell L$..."/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu_item_call label="Mes terrains..." name="My Land..."/>
+ <menu_item_call label="À propos du terrain..." name="About Land..."/>
+ <menu_item_call label="Acheter le terrain..." name="Buy Land..."/>
+ <menu_item_call label="Région et domaine..." name="Region/Estate..."/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu label="Environnement" name="Environment Settings">
+ <menu_item_call label="Aube" name="Sunrise"/>
+ <menu_item_call label="Milieu de journée" name="Noon"/>
+ <menu_item_call label="Coucher de soleil" name="Sunset"/>
+ <menu_item_call label="Minuit" name="Midnight"/>
+ <menu_item_call label="Revenir aux options par défaut" name="Revert to Region Default"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Éditeur d'environnement" name="Environment Editor"/>
+ </menu>
+ </menu>
+ <menu label="Outils" name="Tools">
+ <menu label="Sélectionner un outil" name="Select Tool">
+ <menu_item_call label="Mise au point" name="Focus"/>
+ <menu_item_call label="Déplacer" name="Move"/>
+ <menu_item_call label="Éditer" name="Edit"/>
+ <menu_item_call label="Créer" name="Create"/>
+ <menu_item_call label="Terrain" name="Land"/>
+ </menu>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects"/>
+ <menu_item_check label="Sélectionner les objets déplaçables uniquement" name="Select Only Movable Objects"/>
+ <menu_item_check label="Sélectionner en entourant" name="Select By Surrounding"/>
+ <menu_item_check label="Afficher les parties cachées de la sélection" name="Show Hidden Selection"/>
+ <menu_item_check label="Afficher la sphère de lumière de la sélection" name="Show Light Radius for Selection"/>
+ <menu_item_check label="Afficher le faisceau de sélection" name="Show Selection Beam"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_check label="Aligner sur la grille" name="Snap to Grid"/>
+ <menu_item_call label="Aligner sur les axes XY de la grille" name="Snap Object XY to Grid"/>
+ <menu_item_call label="Utiliser la sélection pour la grille" name="Use Selection for Grid"/>
+ <menu_item_call label="Options de la grille..." name="Grid Options..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_check label="Modifier les parties liées" name="Edit Linked Parts"/>
+ <menu_item_call label="Lier" name="Link"/>
+ <menu_item_call label="Délier" name="Unlink"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Mise au point sur la sélection" name="Focus on Selection"/>
+ <menu_item_call label="Zoom sur la sélection" name="Zoom to Selection"/>
+ <menu_item_call label="Acheter l'objet" name="Menu Object Take"/>
+ <menu_item_call label="Prendre une copie" name="Take Copy"/>
+ <menu_item_call label="Remplacer l'objet dans mon inventaire" name="Save Object Back to My Inventory"/>
+ <menu_item_call label="Remplacer l'objet dans le contenu de l'objet" name="Save Object Back to Object Contents"/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Afficher la fenêtre d'alertes/erreurs de script" name="Show Script Warning/Error Window"/>
+ <menu label="Recompiler les scripts dans la sélection" name="Recompile Scripts in Selection">
+ <menu_item_call label="Mono" name="Mono"/>
+ <menu_item_call label="LSL" name="LSL"/>
+ </menu>
+ <menu_item_call label="Réinitialiser les scripts dans la sélection" name="Reset Scripts in Selection"/>
+ <menu_item_call label="Activer les scripts dans la sélection" name="Set Scripts to Running in Selection"/>
+ <menu_item_call label="Désactiver les scripts dans la sélection" name="Set Scripts to Not Running in Selection"/>
+ </menu>
+ <menu label="Aide" name="Help">
+ <menu_item_call label="Aide Second Life" name="Second Life Help"/>
+ <menu_item_call label="Didacticiel" name="Tutorial"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Blog officiel..." name="Official Linden Blog..."/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Aide sur le LSL..." name="Scripting Portal..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Signaler une infraction..." name="Report Abuse..."/>
+ <menu_item_call label="Collisions, coups et bousculades…" name="Bumps, Pushes &amp; Hits..."/>
+ <menu_item_call label="Mesure du lag" name="Lag Meter"/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu label="Signaler des bugs" name="Bug Reporting">
+ <menu_item_call label="Ouvrir un JIRA..." name="Public Issue Tracker..."/>
+ <menu_item_call label="Comment utiliser JIRA ?" name="Publc Issue Tracker Help..."/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101..."/>
+ <menu_item_call label="Comment signaler un problème de sécurité ?" name="Security Issues...">
+ <on_click name="SecurityIssues_url" userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues/fr"/>
+ </menu_item_call>
+ <menu_item_call label="Wiki Assurance Qualité…" name="QA Wiki..."/>
+ <menu_item_separator label="-----------" name="separator9"/>
+ <menu_item_call label="Signaler un bug..." name="Report Bug..."/>
+ </menu>
+ <menu_item_call label="À propos de Second Life..." name="About Second Life..."/>
+ </menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/fr/mime_types.xml b/indra/newview/skins/default/xui/fr/mime_types.xml
index 5b8b7ca2fb..322887fb76 100644
--- a/indra/newview/skins/default/xui/fr/mime_types.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types.xml
@@ -1,230 +1,230 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<mimetypes name="default">
- <widgetset name="web">
- <label name="web_label">
- Contenu web
- </label>
- <tooltip name="web_tooltip">
- Cette parcelle propose du contenu multimédia
- </tooltip>
- <playtip name="web_playtip">
- Afficher le contenu web
- </playtip>
- </widgetset>
- <widgetset name="movie">
- <label name="movie_label">
- Film
- </label>
- <tooltip name="movie_tooltip">
- Vous pouvez jouer un film ici
- </tooltip>
- <playtip name="movie_playtip">
- Jouer le film
- </playtip>
- </widgetset>
- <widgetset name="none">
- <label name="none_label">
- Aucun contenu
- </label>
- <tooltip name="none_tooltip">
- Aucun média ici
- </tooltip>
- </widgetset>
- <widgetset name="image">
- <label name="image_label">
- Image
- </label>
- <tooltip name="image_tooltip">
- Cette parcelle contient une image
- </tooltip>
- <playtip name="image_playtip">
- Afficher l'image qui se trouve ici
- </playtip>
- </widgetset>
- <widgetset name="audio">
- <label name="audio_label">
- Audio
- </label>
- <tooltip name="audio_tooltip">
- Cette parcelle propose du contenu audio
- </tooltip>
- <playtip name="audio_playtip">
- Jouer le contenu audio qui se trouve ici
- </playtip>
- </widgetset>
- <scheme name="rtsp">
- <label name="rtsp_label">
- Flux en temps réel
- </label>
- </scheme>
- <mimetype name="blank">
- <label name="blank_label">
- - Aucun -
- </label>
- </mimetype>
- <mimetype name="none/none">
- <label name="none/none_label">
- - Aucun -
- </label>
- </mimetype>
- <mimetype name="audio/*">
- <label name="audio2_label">
- Audio
- </label>
- </mimetype>
- <mimetype name="video/*">
- <label name="video2_label">
- Vidéo
- </label>
- </mimetype>
- <mimetype name="image/*">
- <label name="image2_label">
- Image
- </label>
- </mimetype>
- <mimetype name="video/vnd.secondlife.qt.legacy">
- <label name="vnd.secondlife.qt.legacy_label">
- Film (Quicktime)
- </label>
- </mimetype>
- <mimetype name="application/javascript">
- <label name="application/javascript_label">
- Javascript
- </label>
- </mimetype>
- <mimetype name="application/ogg">
- <label name="application/ogg_label">
- Audio/Vidéo Ogg
- </label>
- </mimetype>
- <mimetype name="application/pdf">
- <label name="application/pdf_label">
- Document PDF
- </label>
- </mimetype>
- <mimetype name="application/postscript">
- <label name="application/postscript_label">
- Document Postscript
- </label>
- </mimetype>
- <mimetype name="application/rtf">
- <label name="application/rtf_label">
- Format RTF
- </label>
- </mimetype>
- <mimetype name="application/smil">
- <label name="application/smil_label">
- SMIL (Synchronized Multimedia Integration Language)
- </label>
- </mimetype>
- <mimetype name="application/xhtml+xml">
- <label name="application/xhtml+xml_label">
- Page web (XHTML)
- </label>
- </mimetype>
- <mimetype name="application/x-director">
- <label name="application/x-director_label">
- Macromedia Director
- </label>
- </mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- </mimetype>
- <mimetype name="audio/mid">
- <label name="audio/mid_label">
- Audio (MIDI)
- </label>
- </mimetype>
- <mimetype name="audio/mpeg">
- <label name="audio/mpeg_label">
- Audio (MP3)
- </label>
- </mimetype>
- <mimetype name="audio/x-aiff">
- <label name="audio/x-aiff_label">
- Audio (AIFF)
- </label>
- </mimetype>
- <mimetype name="audio/x-wav">
- <label name="audio/x-wav_label">
- Audio (WAV)
- </label>
- </mimetype>
- <mimetype name="image/bmp">
- <label name="image/bmp_label">
- Image (BMP)
- </label>
- </mimetype>
- <mimetype name="image/gif">
- <label name="image/gif_label">
- Image (GIF)
- </label>
- </mimetype>
- <mimetype name="image/jpeg">
- <label name="image/jpeg_label">
- Image (JPEG)
- </label>
- </mimetype>
- <mimetype name="image/png">
- <label name="image/png_label">
- Image (PNG)
- </label>
- </mimetype>
- <mimetype name="image/svg+xml">
- <label name="image/svg+xml_label">
- Image (SVG)
- </label>
- </mimetype>
- <mimetype name="image/tiff">
- <label name="image/tiff_label">
- Image (TIFF)
- </label>
- </mimetype>
- <mimetype name="text/html">
- <label name="text/html_label">
- Page web
- </label>
- </mimetype>
- <mimetype name="text/plain">
- <label name="text/plain_label">
- Texte
- </label>
- </mimetype>
- <mimetype name="text/xml">
- <label name="text/xml_label">
- XML
- </label>
- </mimetype>
- <mimetype name="video/mpeg">
- <label name="video/mpeg_label">
- Film (MPEG)
- </label>
- </mimetype>
- <mimetype name="video/mp4">
- <label name="video/mp4_label">
- Film (MP4)
- </label>
- </mimetype>
- <mimetype name="video/quicktime">
- <label name="video/quicktime_label">
- Film (Quicktime)
- </label>
- </mimetype>
- <mimetype name="video/x-ms-asf">
- <label name="video/x-ms-asf_label">
- Film (Windows Media ASF)
- </label>
- </mimetype>
- <mimetype name="video/x-ms-wmv">
- <label name="video/x-ms-wmv_label">
- Film (Windows Media WMV)
- </label>
- </mimetype>
- <mimetype name="video/x-msvideo">
- <label name="video/x-msvideo_label">
- Film (AVI)
- </label>
- </mimetype>
-</mimetypes>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<mimetypes name="default">
+ <widgetset name="web">
+ <label name="web_label">
+ Contenu web
+ </label>
+ <tooltip name="web_tooltip">
+ Cette parcelle propose du contenu multimédia
+ </tooltip>
+ <playtip name="web_playtip">
+ Afficher le contenu web
+ </playtip>
+ </widgetset>
+ <widgetset name="movie">
+ <label name="movie_label">
+ Film
+ </label>
+ <tooltip name="movie_tooltip">
+ Vous pouvez jouer un film ici
+ </tooltip>
+ <playtip name="movie_playtip">
+ Jouer le film
+ </playtip>
+ </widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Aucun contenu
+ </label>
+ <tooltip name="none_tooltip">
+ Aucun média ici
+ </tooltip>
+ </widgetset>
+ <widgetset name="image">
+ <label name="image_label">
+ Image
+ </label>
+ <tooltip name="image_tooltip">
+ Cette parcelle contient une image
+ </tooltip>
+ <playtip name="image_playtip">
+ Afficher l'image qui se trouve ici
+ </playtip>
+ </widgetset>
+ <widgetset name="audio">
+ <label name="audio_label">
+ Audio
+ </label>
+ <tooltip name="audio_tooltip">
+ Cette parcelle propose du contenu audio
+ </tooltip>
+ <playtip name="audio_playtip">
+ Jouer le contenu audio qui se trouve ici
+ </playtip>
+ </widgetset>
+ <scheme name="rtsp">
+ <label name="rtsp_label">
+ Flux en temps réel
+ </label>
+ </scheme>
+ <mimetype name="blank">
+ <label name="blank_label">
+ - Aucun -
+ </label>
+ </mimetype>
+ <mimetype name="none/none">
+ <label name="none/none_label">
+ - Aucun -
+ </label>
+ </mimetype>
+ <mimetype name="audio/*">
+ <label name="audio2_label">
+ Audio
+ </label>
+ </mimetype>
+ <mimetype name="video/*">
+ <label name="video2_label">
+ Vidéo
+ </label>
+ </mimetype>
+ <mimetype name="image/*">
+ <label name="image2_label">
+ Image
+ </label>
+ </mimetype>
+ <mimetype name="video/vnd.secondlife.qt.legacy">
+ <label name="vnd.secondlife.qt.legacy_label">
+ Film (Quicktime)
+ </label>
+ </mimetype>
+ <mimetype name="application/javascript">
+ <label name="application/javascript_label">
+ Javascript
+ </label>
+ </mimetype>
+ <mimetype name="application/ogg">
+ <label name="application/ogg_label">
+ Audio/Vidéo Ogg
+ </label>
+ </mimetype>
+ <mimetype name="application/pdf">
+ <label name="application/pdf_label">
+ Document PDF
+ </label>
+ </mimetype>
+ <mimetype name="application/postscript">
+ <label name="application/postscript_label">
+ Document Postscript
+ </label>
+ </mimetype>
+ <mimetype name="application/rtf">
+ <label name="application/rtf_label">
+ Format RTF
+ </label>
+ </mimetype>
+ <mimetype name="application/smil">
+ <label name="application/smil_label">
+ SMIL (Synchronized Multimedia Integration Language)
+ </label>
+ </mimetype>
+ <mimetype name="application/xhtml+xml">
+ <label name="application/xhtml+xml_label">
+ Page web (XHTML)
+ </label>
+ </mimetype>
+ <mimetype name="application/x-director">
+ <label name="application/x-director_label">
+ Macromedia Director
+ </label>
+ </mimetype>
+ <mimetype name="application/x-shockwave-flash">
+ <label name="application/x-shockwave-flash_label">
+ Flash
+ </label>
+ </mimetype>
+ <mimetype name="audio/mid">
+ <label name="audio/mid_label">
+ Audio (MIDI)
+ </label>
+ </mimetype>
+ <mimetype name="audio/mpeg">
+ <label name="audio/mpeg_label">
+ Audio (MP3)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-aiff">
+ <label name="audio/x-aiff_label">
+ Audio (AIFF)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-wav">
+ <label name="audio/x-wav_label">
+ Audio (WAV)
+ </label>
+ </mimetype>
+ <mimetype name="image/bmp">
+ <label name="image/bmp_label">
+ Image (BMP)
+ </label>
+ </mimetype>
+ <mimetype name="image/gif">
+ <label name="image/gif_label">
+ Image (GIF)
+ </label>
+ </mimetype>
+ <mimetype name="image/jpeg">
+ <label name="image/jpeg_label">
+ Image (JPEG)
+ </label>
+ </mimetype>
+ <mimetype name="image/png">
+ <label name="image/png_label">
+ Image (PNG)
+ </label>
+ </mimetype>
+ <mimetype name="image/svg+xml">
+ <label name="image/svg+xml_label">
+ Image (SVG)
+ </label>
+ </mimetype>
+ <mimetype name="image/tiff">
+ <label name="image/tiff_label">
+ Image (TIFF)
+ </label>
+ </mimetype>
+ <mimetype name="text/html">
+ <label name="text/html_label">
+ Page web
+ </label>
+ </mimetype>
+ <mimetype name="text/plain">
+ <label name="text/plain_label">
+ Texte
+ </label>
+ </mimetype>
+ <mimetype name="text/xml">
+ <label name="text/xml_label">
+ XML
+ </label>
+ </mimetype>
+ <mimetype name="video/mpeg">
+ <label name="video/mpeg_label">
+ Film (MPEG)
+ </label>
+ </mimetype>
+ <mimetype name="video/mp4">
+ <label name="video/mp4_label">
+ Film (MP4)
+ </label>
+ </mimetype>
+ <mimetype name="video/quicktime">
+ <label name="video/quicktime_label">
+ Film (Quicktime)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-asf">
+ <label name="video/x-ms-asf_label">
+ Film (Windows Media ASF)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-wmv">
+ <label name="video/x-ms-wmv_label">
+ Film (Windows Media WMV)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-msvideo">
+ <label name="video/x-msvideo_label">
+ Film (AVI)
+ </label>
+ </mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/fr/panel_audio_device.xml b/indra/newview/skins/default/xui/fr/panel_audio_device.xml
index 7ca53b7c0d..a9540d8346 100644
--- a/indra/newview/skins/default/xui/fr/panel_audio_device.xml
+++ b/indra/newview/skins/default/xui/fr/panel_audio_device.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="device_settings">
- <text name="Audio Devices">
- Matériel audio
- </text>
- <text name="Input device (microphone):">
- Périphérique d'entrée (micro) :
- </text>
- <text name="Output device (speakers):">
- Périphérique de sortie (haut-parleurs) :
- </text>
- <text name="Input level:">
- Volume d'entrée
- </text>
- <text_editor name="voice_intro_text1">
- Pour que les autres résidents vous entendent plus ou moins fort, utilisez le curseur. Pour tester le volume, parlez dans le micro.
- </text_editor>
- <volume_slider name="mic_volume_slider" tool_tip="Réglez le volume avec ce curseur."/>
- <text name="wait_text">
- Veuillez patienter
- </text>
- <string name="default_text">
- Défaut
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="device_settings">
+ <text name="Audio Devices">
+ Matériel audio
+ </text>
+ <text name="Input device (microphone):">
+ Périphérique d'entrée (micro) :
+ </text>
+ <text name="Output device (speakers):">
+ Périphérique de sortie (haut-parleurs) :
+ </text>
+ <text name="Input level:">
+ Volume d'entrée
+ </text>
+ <text_editor name="voice_intro_text1">
+ Pour que les autres résidents vous entendent plus ou moins fort, utilisez le curseur. Pour tester le volume, parlez dans le micro.
+ </text_editor>
+ <volume_slider name="mic_volume_slider" tool_tip="Réglez le volume avec ce curseur."/>
+ <text name="wait_text">
+ Veuillez patienter
+ </text>
+ <string name="default_text">
+ Défaut
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_friends.xml b/indra/newview/skins/default/xui/fr/panel_friends.xml
index e43305b89e..fa0d08bb97 100644
--- a/indra/newview/skins/default/xui/fr/panel_friends.xml
+++ b/indra/newview/skins/default/xui/fr/panel_friends.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="friends">
- <string name="Multiple">
- Amis multiples...
- </string>
- <scroll_list name="friend_list" tool_tip="Pour sélectionner plusieurs amis, cliquez en maintenant la touche Maj ou Ctrl appuyée">
- <column name="icon_online_status" tool_tip="Statut en ligne"/>
- <column label="Nom" name="friend_name" tool_tip="Nom"/>
- <column name="icon_visible_online" tool_tip="Vos amis voient si vous êtes connecté(e)"/>
- <column name="icon_visible_map" tool_tip="Vos amis peuvent vous situer sur la carte"/>
- <column name="icon_edit_mine" tool_tip="Vos amis peuvent modifier, supprimer ou prendre vos objets"/>
- <column name="icon_edit_theirs" tool_tip="Vous pouvez modifier les objets de cet ami"/>
- </scroll_list>
- <button label="IM/Appel" name="im_btn" tool_tip="Ouvrez une session de messagerie instantanée"/>
- <button label="Profil" name="profile_btn" tool_tip="Affichez une photo, vos groupes et autres infos"/>
- <button label="Téléporter..." name="offer_teleport_btn" tool_tip="Proposez à cet ami d'être téléporté là où vous êtes"/>
- <button label="Payer..." name="pay_btn" tool_tip="Donnez des L$ Ã cet ami"/>
- <button label="Supprimer..." name="remove_btn" tool_tip="Supprimez cette personne de votre liste d'amis"/>
- <button label="Ajouter..." name="add_btn" tool_tip="Demandez à un résident de devenir votre ami"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="friends">
+ <string name="Multiple">
+ Amis multiples...
+ </string>
+ <scroll_list name="friend_list" tool_tip="Pour sélectionner plusieurs amis, cliquez en maintenant la touche Maj ou Ctrl appuyée">
+ <column name="icon_online_status" tool_tip="Statut en ligne"/>
+ <column label="Nom" name="friend_name" tool_tip="Nom"/>
+ <column name="icon_visible_online" tool_tip="Vos amis voient si vous êtes connecté(e)"/>
+ <column name="icon_visible_map" tool_tip="Vos amis peuvent vous situer sur la carte"/>
+ <column name="icon_edit_mine" tool_tip="Vos amis peuvent modifier, supprimer ou prendre vos objets"/>
+ <column name="icon_edit_theirs" tool_tip="Vous pouvez modifier les objets de cet ami"/>
+ </scroll_list>
+ <button label="IM/Appel" name="im_btn" tool_tip="Ouvrez une session de messagerie instantanée"/>
+ <button label="Profil" name="profile_btn" tool_tip="Affichez une photo, vos groupes et autres infos"/>
+ <button label="Téléporter..." name="offer_teleport_btn" tool_tip="Proposez à cet ami d'être téléporté là où vous êtes"/>
+ <button label="Payer..." name="pay_btn" tool_tip="Donnez des L$ Ã cet ami"/>
+ <button label="Supprimer..." name="remove_btn" tool_tip="Supprimez cette personne de votre liste d'amis"/>
+ <button label="Ajouter..." name="add_btn" tool_tip="Demandez à un résident de devenir votre ami"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml
index f8eecf13a2..7c7efdc1f1 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Général" name="general_tab">
- <text name="help_text">
- L'onglet Général contient les infos générales et les préférences du groupe ainsi que la liste des propriétaires et des membres visibles.
-
- </text>
- <string name="group_info_unchanged">
- Le profil du groupe a changé.
- </string>
- <button label="?" label_selected="?" name="help_button"/>
- <line_editor label="Saisissez le nom du groupe ici" name="group_name_editor">
- Saisissez le nom du groupe ici
- </line_editor>
- <text name="group_name">
- Saisissez le nom du groupe ici
- </text>
- <text name="prepend_founded_by">
- Fondé par </text>
- <text name="founder_name" left_delta="54">
- (en attente)
- </text>
- <text name="group_charter_label">
- Charte du groupe
- </text>
- <texture_picker label="Logo du groupe" name="insignia" tool_tip="Cliquez pour sélectionner une image"/>
- <text_editor name="charter">
- Indiquez ici la charte de votre groupe
- </text_editor>
- <button label="Rejoindre (0L$)" label_selected="Rejoindre (0L$)" name="join_button"/>
- <button label="Affichage détaillé" label_selected="Affichage détaillé" name="info_button"/>
- <text>
- Propriétaires et membres visibles
- </text>
- <text>
- (Propriétaires affichés en gras)
- </text>
- <text name="text_owners_and_visible_members">
- Propriétaires et membres visibles
- </text>
- <text name="text_owners_are_shown_in_bold">
- (Les propriétaires apparaissent en gras)
- </text>
- <name_list name="visible_members">
- <column label="Nom du membre" name="name" relwidth="0.40"/>
- <column label="Titre" name="title" relwidth="0.25"/>
- <column label="Dernière connexion" name="online" relwidth="0.35"/>
- </name_list>
- <text name="text_group_preferences">
- Préférences
- </text>
- <text name="incomplete_member_data_str">
- Extraction des données du résident en cours
- </text>
- <text name="confirm_group_create_str">
- La création de ce groupe coûte 100 L$.
-Êtes-vous vraiment certain de vouloir dépenser 100 L$ pour créer ce groupe ?
-Sachez que si personne ne rejoint ce groupe sous 48h, il sera démantelé et ne pourra plus être utilisé.
- </text>
- <text>
- Préférences
- </text>
- <panel name="preferences_container">
- <check_box label="Afficher dans la recherche" name="show_in_group_list" tool_tip="Afficher ce groupe dans les résultats de recherche."/>
- <check_box label="Publier sur le web" name="publish_on_web" tool_tip="Cochez pour publier les informations de ce groupe sur le web."/>
- <check_box label="Inscription libre" name="open_enrollement" tool_tip="Indique si une invitation est nécessaire pour devenir membre de ce groupe."/>
- <check_box label="Frais d'inscription : L$" name="check_enrollment_fee" tool_tip="Indique s'il y a des frais d'inscription pour devenir membre."/>
- <spinner name="spin_enrollment_fee" tool_tip="Si la case Frais d'inscription est cochée, cela signifie qu'il faut payer des frais pour devenir membre."/>
- <check_box name="mature" />
- <combo_box name="group_mature_check" width="195">
- </combo_box>
- <panel name="title_container">
- <text name="active_title_label">
- Mon titre actuel
- </text>
- <combo_box name="active_title" tool_tip="Définit le titre qui apparaît près du nom de votre avatar lorsque ce groupe est actif."/>
- </panel>
- <check_box label="Recevoir les notices" name="receive_notices" tool_tip="Cochez si vous souhaitez recevoir les notices envoyées au groupe. Décochez si ce groupe vous envoie des spams."/>
- <check_box label="Afficher dans mon profil" name="list_groups_in_profile" tool_tip="Indique si vous voulez que ce groupe apparaisse dans votre profil"/>
- </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Général" name="general_tab">
+ <text name="help_text">
+ L'onglet Général contient les infos générales et les préférences du groupe ainsi que la liste des propriétaires et des membres visibles.
+
+ </text>
+ <string name="group_info_unchanged">
+ Le profil du groupe a changé.
+ </string>
+ <button label="?" label_selected="?" name="help_button"/>
+ <line_editor label="Saisissez le nom du groupe ici" name="group_name_editor">
+ Saisissez le nom du groupe ici
+ </line_editor>
+ <text name="group_name">
+ Saisissez le nom du groupe ici
+ </text>
+ <text name="prepend_founded_by">
+ Fondé par </text>
+ <text name="founder_name" left_delta="54">
+ (en attente)
+ </text>
+ <text name="group_charter_label">
+ Charte du groupe
+ </text>
+ <texture_picker label="Logo du groupe" name="insignia" tool_tip="Cliquez pour sélectionner une image"/>
+ <text_editor name="charter">
+ Indiquez ici la charte de votre groupe
+ </text_editor>
+ <button label="Rejoindre (0L$)" label_selected="Rejoindre (0L$)" name="join_button"/>
+ <button label="Affichage détaillé" label_selected="Affichage détaillé" name="info_button"/>
+ <text>
+ Propriétaires et membres visibles
+ </text>
+ <text>
+ (Propriétaires affichés en gras)
+ </text>
+ <text name="text_owners_and_visible_members">
+ Propriétaires et membres visibles
+ </text>
+ <text name="text_owners_are_shown_in_bold">
+ (Les propriétaires apparaissent en gras)
+ </text>
+ <name_list name="visible_members">
+ <column label="Nom du membre" name="name" relwidth="0.40"/>
+ <column label="Titre" name="title" relwidth="0.25"/>
+ <column label="Dernière connexion" name="online" relwidth="0.35"/>
+ </name_list>
+ <text name="text_group_preferences">
+ Préférences
+ </text>
+ <text name="incomplete_member_data_str">
+ Extraction des données du résident en cours
+ </text>
+ <text name="confirm_group_create_str">
+ La création de ce groupe coûte 100 L$.
+Êtes-vous vraiment certain de vouloir dépenser 100 L$ pour créer ce groupe ?
+Sachez que si personne ne rejoint ce groupe sous 48h, il sera démantelé et ne pourra plus être utilisé.
+ </text>
+ <text>
+ Préférences
+ </text>
+ <panel name="preferences_container">
+ <check_box label="Afficher dans la recherche" name="show_in_group_list" tool_tip="Afficher ce groupe dans les résultats de recherche."/>
+ <check_box label="Publier sur le web" name="publish_on_web" tool_tip="Cochez pour publier les informations de ce groupe sur le web."/>
+ <check_box label="Inscription libre" name="open_enrollement" tool_tip="Indique si une invitation est nécessaire pour devenir membre de ce groupe."/>
+ <check_box label="Frais d'inscription : L$" name="check_enrollment_fee" tool_tip="Indique s'il y a des frais d'inscription pour devenir membre."/>
+ <spinner name="spin_enrollment_fee" tool_tip="Si la case Frais d'inscription est cochée, cela signifie qu'il faut payer des frais pour devenir membre."/>
+ <check_box name="mature" />
+ <combo_box name="group_mature_check" width="195">
+ </combo_box>
+ <panel name="title_container">
+ <text name="active_title_label">
+ Mon titre actuel
+ </text>
+ <combo_box name="active_title" tool_tip="Définit le titre qui apparaît près du nom de votre avatar lorsque ce groupe est actif."/>
+ </panel>
+ <check_box label="Recevoir les notices" name="receive_notices" tool_tip="Cochez si vous souhaitez recevoir les notices envoyées au groupe. Décochez si ce groupe vous envoie des spams."/>
+ <check_box label="Afficher dans mon profil" name="list_groups_in_profile" tool_tip="Indique si vous voulez que ce groupe apparaisse dans votre profil"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
index f770b4b137..4cb0b88672 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Inviter un résident" name="invite_panel">
- <text name="help_text">
- Vous pouvez inviter plusieurs résidents
-Ã la fois. Cliquez d'abord sur
-Choisir un résident.
- </text>
- <button label="Choisir un résident" name="add_button" tool_tip=""/>
- <name_list name="invitee_list" tool_tip="Pour sélectionner plusieurs noms, maintenez la touche Ctrl enfoncée en cliquant sur le nom des résidents."/>
- <button label="Supprimer de la liste" name="remove_button" tool_tip="Supprime les résidents sélectionnés de la liste des invités."/>
- <text>
- Assignez-leur un rôle :
- </text>
- <text name="role_text">
- Assignez-leur un rôle :
- </text>
- <combo_box name="role_name" tool_tip="Choisissez des rôles à assigner aux membres dans la liste."/>
- <button label="Envoyer les invitations" name="ok_button"/>
- <button label="Annuler" name="cancel_button"/>
- <string name="confirm_invite_owner_str">
- Etes-vous certain de vouloir inviter un/de nouveau(x) propriétaire(s) ? Ce choix est permanent !
- </string>
- <string name="loading">
- (en cours de chargement...)
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Inviter un résident" name="invite_panel">
+ <text name="help_text">
+ Vous pouvez inviter plusieurs résidents
+Ã la fois. Cliquez d'abord sur
+Choisir un résident.
+ </text>
+ <button label="Choisir un résident" name="add_button" tool_tip=""/>
+ <name_list name="invitee_list" tool_tip="Pour sélectionner plusieurs noms, maintenez la touche Ctrl enfoncée en cliquant sur le nom des résidents."/>
+ <button label="Supprimer de la liste" name="remove_button" tool_tip="Supprime les résidents sélectionnés de la liste des invités."/>
+ <text>
+ Assignez-leur un rôle :
+ </text>
+ <text name="role_text">
+ Assignez-leur un rôle :
+ </text>
+ <combo_box name="role_name" tool_tip="Choisissez des rôles à assigner aux membres dans la liste."/>
+ <button label="Envoyer les invitations" name="ok_button"/>
+ <button label="Annuler" name="cancel_button"/>
+ <string name="confirm_invite_owner_str">
+ Etes-vous certain de vouloir inviter un/de nouveau(x) propriétaire(s) ? Ce choix est permanent !
+ </string>
+ <string name="loading">
+ (en cours de chargement...)
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
index 8d057dbda2..7fd900acaa 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Terrain et L$" name="land_money_tab">
- <text name="help_text">
- Les parcelles appartenant au groupe sont indiquées avec le détails des contributions. Un avertissement apparaît si la surface utilisée par le groupe est supérieure ou égale au total des contributions. Les onglets Planification, Détails et Ventes correspondent aux finances du groupe.
- </text>
- <button label="?" name="help_button"/>
- <text name="cant_view_group_land_text">
- Vous n'avez pas la permission de voir quel terrain possède ce groupe.
- </text>
- <text name="cant_view_group_accounting_text">
- Vous n'avez pas la permission d'accéder aux informations
-financières de ce groupe.
- </text>
- <string name="loading_txt">
- Chargement...
- </string>
- <text name="group_land_heading">
- Terrain du groupe
- </text>
- <scroll_list name="group_parcel_list">
- <column label="Nom de la parcelle" name="name"/>
- <column label="Région" name="location"/>
- <column label="Surface" name="area"/>
- <column label="" name="hidden"/>
- </scroll_list>
- <button label="Voir sur la carte" label_selected="Voir sur la carte" name="map_button"/>
- <text name="total_contributed_land_label">
- Total des contributions :
- </text>
- <text name="total_contributed_land_value">
- [AREA] m²
- </text>
- <text name="total_land_in_use_label">
- Superficie déjà utilisée :
- </text>
- <text name="total_land_in_use_value">
- [AREA] m²
- </text>
- <text name="land_available_label">
- Superficie disponible :
- </text>
- <text name="land_available_value">
- [AREA] m²
- </text>
- <text name="your_contribution_label">
- Votre contribution :
- </text>
- <text name="your_contribution_max_value_append">
- mètres carrés
- </text>
- <string name="land_contrib_error">
- Impossible de définir votre don de terre.
- </string>
- <text name="your_contribution_max_value">
- m² ([AMOUNT] max.)
- </text>
- <text name="group_over_limit_text">
- Une contribution supplémentaire du groupe est requise pour prendre en
-charge le terrain utilisé.
- </text>
- <text name="group_money_heading">
- Finances
- </text>
- <tab_container name="group_money_tab_container">
- <panel label="Planification" name="group_money_planning_tab">
- <text_editor name="group_money_planning_text">
- Calcul en cours...
- </text_editor>
- </panel>
- <panel label="Détails" name="group_money_details_tab">
- <text_editor name="group_money_details_text">
- Calcul en cours...
- </text_editor>
- <button label="< Plus tôt" label_selected="< Plus tôt" name="earlier_details_button" tool_tip="Reculer dans le temps"/>
- <button label="Plus tard >" label_selected="Plus tard >" name="later_details_button" tool_tip="Avancer dans le temps"/>
- </panel>
- <panel label="Ventes" name="group_money_sales_tab">
- <text_editor name="group_money_sales_text">
- Calcul en cours...
- </text_editor>
- <button label="< Plus tôt" label_selected="< Plus tôt" name="earlier_sales_button" tool_tip="Reculer dans le temps"/>
- <button label="Plus tard >" label_selected="Plus tard >" name="later_sales_button" tool_tip="Avancer dans le temps"/>
- </panel>
- </tab_container>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terrain et L$" name="land_money_tab">
+ <text name="help_text">
+ Les parcelles appartenant au groupe sont indiquées avec le détails des contributions. Un avertissement apparaît si la surface utilisée par le groupe est supérieure ou égale au total des contributions. Les onglets Planification, Détails et Ventes correspondent aux finances du groupe.
+ </text>
+ <button label="?" name="help_button"/>
+ <text name="cant_view_group_land_text">
+ Vous n'avez pas la permission de voir quel terrain possède ce groupe.
+ </text>
+ <text name="cant_view_group_accounting_text">
+ Vous n'avez pas la permission d'accéder aux informations
+financières de ce groupe.
+ </text>
+ <string name="loading_txt">
+ Chargement...
+ </string>
+ <text name="group_land_heading">
+ Terrain du groupe
+ </text>
+ <scroll_list name="group_parcel_list">
+ <column label="Nom de la parcelle" name="name"/>
+ <column label="Région" name="location"/>
+ <column label="Surface" name="area"/>
+ <column label="" name="hidden"/>
+ </scroll_list>
+ <button label="Voir sur la carte" label_selected="Voir sur la carte" name="map_button"/>
+ <text name="total_contributed_land_label">
+ Total des contributions :
+ </text>
+ <text name="total_contributed_land_value">
+ [AREA] m²
+ </text>
+ <text name="total_land_in_use_label">
+ Superficie déjà utilisée :
+ </text>
+ <text name="total_land_in_use_value">
+ [AREA] m²
+ </text>
+ <text name="land_available_label">
+ Superficie disponible :
+ </text>
+ <text name="land_available_value">
+ [AREA] m²
+ </text>
+ <text name="your_contribution_label">
+ Votre contribution :
+ </text>
+ <text name="your_contribution_max_value_append">
+ mètres carrés
+ </text>
+ <string name="land_contrib_error">
+ Impossible de définir votre don de terre.
+ </string>
+ <text name="your_contribution_max_value">
+ m² ([AMOUNT] max.)
+ </text>
+ <text name="group_over_limit_text">
+ Une contribution supplémentaire du groupe est requise pour prendre en
+charge le terrain utilisé.
+ </text>
+ <text name="group_money_heading">
+ Finances
+ </text>
+ <tab_container name="group_money_tab_container">
+ <panel label="Planification" name="group_money_planning_tab">
+ <text_editor name="group_money_planning_text">
+ Calcul en cours...
+ </text_editor>
+ </panel>
+ <panel label="Détails" name="group_money_details_tab">
+ <text_editor name="group_money_details_text">
+ Calcul en cours...
+ </text_editor>
+ <button label="< Plus tôt" label_selected="< Plus tôt" name="earlier_details_button" tool_tip="Reculer dans le temps"/>
+ <button label="Plus tard >" label_selected="Plus tard >" name="later_details_button" tool_tip="Avancer dans le temps"/>
+ </panel>
+ <panel label="Ventes" name="group_money_sales_tab">
+ <text_editor name="group_money_sales_text">
+ Calcul en cours...
+ </text_editor>
+ <button label="< Plus tôt" label_selected="< Plus tôt" name="earlier_sales_button" tool_tip="Reculer dans le temps"/>
+ <button label="Plus tard >" label_selected="Plus tard >" name="later_sales_button" tool_tip="Avancer dans le temps"/>
+ </panel>
+ </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
index d89c4313b5..d824ae5461 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Notices" name="notices_tab">
- <text name="help_text">
- Les notices vous permettent d'envoyer des messages et pièces-jointes aux membres du groupe autorisés à les recevoir. Vous pouvez désactiver la réception des notices à l'onglet Général.
- </text>
- <text name="no_notices_text">
- Aucune notice
- </text>
- <button label="?" label_selected="?" name="help_button"/>
- <text name="lbl">
- Anciennes notices du groupe
- </text>
- <text name="lbl2">
- Double-cliquez sur une notice pour l'afficher. Les notices sont conservées
-pendant 14 jours et chaque groupe a une limite quotidienne de 200 notices.
- </text>
- <scroll_list name="notice_list">
- <column label="" name="icon"/>
- <column label="Sujet" name="subject"/>
- <column label="De" name="from"/>
- <column label="Date" name="date"/>
- </scroll_list>
- <text name="notice_list_none_found">
- Aucun résultat.
- </text>
- <button label="Créer une notice" label_selected="Créer une notice" name="create_new_notice"/>
- <button label="Rafraîchir" label_selected="Rafraîchir la liste" name="refresh_notices"/>
- <panel label="Créer une notice" name="panel_create_new_notice">
- <text name="lbl">
- Créer une notice
- </text>
- <text name="lbl2">
- Pour envoyer une notice, saisissez un sujet. Pour joindre
-une pièce-jointe à cette notice, faites-la glisser depuis votre
-inventaire vers cette fenêtre. Les pièces-jointes doivent être
-copiables et transférables. Il n'est pas possible d'envoyer de
-dossiers.
- </text>
- <text bottom_delta="-79" name="lbl3" left="20">
- Sujet :
- </text>
- <line_editor name="create_subject" width="331" left_delta="61"/>
- <text name="lbl4" left="20">
- Message :
- </text>
- <text_editor name="create_message" bottom_delta="-90" height="104" left_delta="61" width="330"/>
- <text name="lbl5" width="68">
- Pièce-jointe :
- </text>
- <line_editor name="create_inventory_name" width="190" left_delta="74"/>
- <button label="Supprimer pièce-jointe" label_selected="Supprimer pièce-jointe" left="274" name="remove_attachment" width="140"/>
- <button label="Envoyer la notice" label_selected="Envoyer la notice" left="274" name="send_notice" width="140"/>
- <panel name="drop_target2" tool_tip="Pour joindre un objet de l'inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l'objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
- <panel name="drop_target" tool_tip="Pour joindre un objet de l'inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l'objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
- </panel>
- <panel label="Voir ancienne notice" name="panel_view_past_notice">
- <text name="lbl">
- Détails
- </text>
- <text name="lbl2">
- Pour envoyer une nouvelle notice, cliquez sur Créer une notice ci-dessus.
- </text>
- <text name="lbl3">
- Sujet :
- </text>
- <text name="lbl4">
- Message :
- </text>
- <button label="Ouvrir pièce-jointe" label_selected="Ouvrir pièce-jointe" name="open_attachment" width="118"/>
- <line_editor left="128" name="view_inventory_name" width="256"/>
- </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Notices" name="notices_tab">
+ <text name="help_text">
+ Les notices vous permettent d'envoyer des messages et pièces-jointes aux membres du groupe autorisés à les recevoir. Vous pouvez désactiver la réception des notices à l'onglet Général.
+ </text>
+ <text name="no_notices_text">
+ Aucune notice
+ </text>
+ <button label="?" label_selected="?" name="help_button"/>
+ <text name="lbl">
+ Anciennes notices du groupe
+ </text>
+ <text name="lbl2">
+ Double-cliquez sur une notice pour l'afficher. Les notices sont conservées
+pendant 14 jours et chaque groupe a une limite quotidienne de 200 notices.
+ </text>
+ <scroll_list name="notice_list">
+ <column label="" name="icon"/>
+ <column label="Sujet" name="subject"/>
+ <column label="De" name="from"/>
+ <column label="Date" name="date"/>
+ </scroll_list>
+ <text name="notice_list_none_found">
+ Aucun résultat.
+ </text>
+ <button label="Créer une notice" label_selected="Créer une notice" name="create_new_notice"/>
+ <button label="Rafraîchir" label_selected="Rafraîchir la liste" name="refresh_notices"/>
+ <panel label="Créer une notice" name="panel_create_new_notice">
+ <text name="lbl">
+ Créer une notice
+ </text>
+ <text name="lbl2">
+ Pour envoyer une notice, saisissez un sujet. Pour joindre
+une pièce-jointe à cette notice, faites-la glisser depuis votre
+inventaire vers cette fenêtre. Les pièces-jointes doivent être
+copiables et transférables. Il n'est pas possible d'envoyer de
+dossiers.
+ </text>
+ <text bottom_delta="-79" name="lbl3" left="20">
+ Sujet :
+ </text>
+ <line_editor name="create_subject" width="331" left_delta="61"/>
+ <text name="lbl4" left="20">
+ Message :
+ </text>
+ <text_editor name="create_message" bottom_delta="-90" height="104" left_delta="61" width="330"/>
+ <text name="lbl5" width="68">
+ Pièce-jointe :
+ </text>
+ <line_editor name="create_inventory_name" width="190" left_delta="74"/>
+ <button label="Supprimer pièce-jointe" label_selected="Supprimer pièce-jointe" left="274" name="remove_attachment" width="140"/>
+ <button label="Envoyer la notice" label_selected="Envoyer la notice" left="274" name="send_notice" width="140"/>
+ <panel name="drop_target2" tool_tip="Pour joindre un objet de l'inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l'objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
+ <panel name="drop_target" tool_tip="Pour joindre un objet de l'inventaire à la notice, faites-le glisser dans la boîte de message. Pour envoyer l'objet avec la notice, vous devez avoir la permission de le copier et de le transférer."/>
+ </panel>
+ <panel label="Voir ancienne notice" name="panel_view_past_notice">
+ <text name="lbl">
+ Détails
+ </text>
+ <text name="lbl2">
+ Pour envoyer une nouvelle notice, cliquez sur Créer une notice ci-dessus.
+ </text>
+ <text name="lbl3">
+ Sujet :
+ </text>
+ <text name="lbl4">
+ Message :
+ </text>
+ <button label="Ouvrir pièce-jointe" label_selected="Ouvrir pièce-jointe" name="open_attachment" width="118"/>
+ <line_editor left="128" name="view_inventory_name" width="256"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
index 53608f61a2..008402db32 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
@@ -1,160 +1,160 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Membres et rôles" name="roles_tab">
- <text name="default_needs_apply_text">
- Certains changements n'ont pas été appliqués sur ce sous-onglet.
- </text>
- <text name="want_apply_text">
- Voulez-vous enregistrer les modifications ?
- </text>
- <text name="cant_delete_role">
- Les Rôles Tout le monde et Propriétaires sont spéciaux et ne peuvent être supprimés.
- </text>
- <button label="?" name="help_button"/>
- <panel name="members_header">
- <text name="static">
- Membres
- </text>
- <text name="static2">
- Les rôles de chaque membre peuvent être personnalisés, ce qui permet une
-meilleure organisation du groupe.
- </text>
- </panel>
- <panel name="roles_header">
- <text name="static">
- Rôles
- </text>
- <text name="role_properties_modifiable">
- Sélectionnez un rôle ci-dessous. Vous pouvez modifier le nom, la
-description et le titre du membre.
- </text>
- <text name="role_properties_not_modifiable">
- Sélectionnez un rôle ci-dessous pour en connaître les propriétés, les
-membres et les pouvoirs.
- </text>
- <text bottom_delta="-28" name="role_actions_modifiable">
- Vous pouvez aussi assigner des pouvoirs au rôle.
- </text>
- <text name="role_actions_not_modifiable">
- Vous pouvez afficher mais non modifier les pouvoirs assignés.
- </text>
- </panel>
- <panel name="actions_header">
- <text name="static">
- Pouvoirs
- </text>
- <text name="static2">
- Vous pouvez afficher la description du pouvoir et voir à quels rôles ou Ã
-quels membres ces pouvoirs sont assignés.
- </text>
- </panel>
- <tab_container height="164" name="roles_tab_container">
- <panel height="148" label="Membres" name="members_sub_tab" tool_tip="Membres">
- <line_editor bottom="127" name="search_text"/>
- <button label="Rechercher" name="search_button" width="75"/>
- <button label="Afficher tout" left_delta="80" name="show_all_button"/>
- <name_list bottom_delta="-105" height="104" name="member_list">
- <column label="Nom du membre" name="name"/>
- <column label="Surface donnée" name="donated" width="116"/>
- <column label="Dernière connexion" name="online" width="136"/>
- </name_list>
- <button label="Inviter un membre..." name="member_invite" width="165"/>
- <button label="Expulser un membre" name="member_eject"/>
- <text name="help_text">
- Vous pouvez ajouter ou supprimer les rôles assignés aux membres.
-Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la touche Ctrl enfoncée.
- </text>
- </panel>
- <panel height="148" label="Rôles" name="roles_sub_tab">
- <line_editor bottom="127" name="search_text"/>
- <button label="Rechercher" name="search_button" width="75"/>
- <button label="Afficher tout" left_delta="80" name="show_all_button"/>
- <scroll_list bottom_delta="-104" height="104" name="role_list">
- <column label="Nom du rôle" name="name"/>
- <column label="Titre" name="title"/>
- <column label="Membres" name="members"/>
- </scroll_list>
- <button label="Créer un rôle..." name="role_create"/>
- <button label="Supprimer le rôle" name="role_delete"/>
- <text name="help_text">
- Chaque rôle possède un titre et des pouvoirs. Un membre peut avoir plusieurs rôles mais il ne peut y avoir que 10 rôles dans un groupe, Visiteur et Propriétaire inclus.
- </text>
- <string name="cant_delete_role">
- Les rôles Tous et Propriétaires sont spéciaux et ne peuvent pas être supprimés.
- </string>
- </panel>
- <panel height="148" label="Pouvoirs" name="actions_sub_tab">
- <line_editor bottom="127" name="search_text"/>
- <button label="Rechercher" name="search_button" width="75"/>
- <button label="Afficher tout" left_delta="80" name="show_all_button"/>
- <scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Sélectionnez un pouvoir pour en afficher les détails.">
- <column label="" name="icon"/>
- <column label="" name="action"/>
- </scroll_list>
- <text name="help_text">
- Les pouvoirs déterminent les facultés de chaque membre dans le groupe.
- </text>
- </panel>
- </tab_container>
- <panel name="members_footer">
- <text name="static">
- Rôles assignés
- </text>
- <text name="static2">
- Pouvoirs attribués
- </text>
- <scroll_list name="member_assigned_roles">
- <column label="" name="checkbox"/>
- <column label="" name="role"/>
- </scroll_list>
- <scroll_list name="member_allowed_actions" tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l'onglet Pouvoirs.">
- <column label="" name="icon"/>
- <column label="" name="action"/>
- </scroll_list>
- </panel>
- <panel name="roles_footer">
- <text name="static">
- Nom
- </text>
- <text name="static2">
- Description
- </text>
- <line_editor name="role_name">
- Employés
- </line_editor>
- <text name="static3">
- Titre
- </text>
- <line_editor name="role_title">
- (en attente)
- </line_editor>
- <text_editor name="role_description">
- (en attente)
- </text_editor>
- <text name="static4">
- Membres assignés
- </text>
- <text name="static5" tool_tip="Une liste des pouvoirs auquel le rôle sélectionné a accès.">
- Pouvoirs attribués
- </text>
- <check_box label="Membres visibles" name="role_visible_in_list" tool_tip="Définit si les membres de ce rôle sont visibles à partir de l'onglet Général aux personnes en dehors du groupe."/>
- <scroll_list name="role_allowed_actions" tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l'onglet Pouvoirs.">
- <column label="" name="icon"/>
- <column label="" name="checkbox"/>
- <column label="" name="action"/>
- </scroll_list>
- </panel>
- <panel name="actions_footer">
- <text name="static">
- Description
- </text>
- <text_editor name="action_description">
- Ce pouvoir permet d'expulser des membres du groupe. Seul un propriétaire peut expulser un autre propriétaire.
- </text_editor>
- <text name="static2">
- Rôles avec ce pouvoir
- </text>
- <text name="static3">
- Membres avec ce pouvoir
- </text>
- </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Membres et rôles" name="roles_tab">
+ <text name="default_needs_apply_text">
+ Certains changements n'ont pas été appliqués sur ce sous-onglet.
+ </text>
+ <text name="want_apply_text">
+ Voulez-vous enregistrer les modifications ?
+ </text>
+ <text name="cant_delete_role">
+ Les Rôles Tout le monde et Propriétaires sont spéciaux et ne peuvent être supprimés.
+ </text>
+ <button label="?" name="help_button"/>
+ <panel name="members_header">
+ <text name="static">
+ Membres
+ </text>
+ <text name="static2">
+ Les rôles de chaque membre peuvent être personnalisés, ce qui permet une
+meilleure organisation du groupe.
+ </text>
+ </panel>
+ <panel name="roles_header">
+ <text name="static">
+ Rôles
+ </text>
+ <text name="role_properties_modifiable">
+ Sélectionnez un rôle ci-dessous. Vous pouvez modifier le nom, la
+description et le titre du membre.
+ </text>
+ <text name="role_properties_not_modifiable">
+ Sélectionnez un rôle ci-dessous pour en connaître les propriétés, les
+membres et les pouvoirs.
+ </text>
+ <text bottom_delta="-28" name="role_actions_modifiable">
+ Vous pouvez aussi assigner des pouvoirs au rôle.
+ </text>
+ <text name="role_actions_not_modifiable">
+ Vous pouvez afficher mais non modifier les pouvoirs assignés.
+ </text>
+ </panel>
+ <panel name="actions_header">
+ <text name="static">
+ Pouvoirs
+ </text>
+ <text name="static2">
+ Vous pouvez afficher la description du pouvoir et voir à quels rôles ou Ã
+quels membres ces pouvoirs sont assignés.
+ </text>
+ </panel>
+ <tab_container height="164" name="roles_tab_container">
+ <panel height="148" label="Membres" name="members_sub_tab" tool_tip="Membres">
+ <line_editor bottom="127" name="search_text"/>
+ <button label="Rechercher" name="search_button" width="75"/>
+ <button label="Afficher tout" left_delta="80" name="show_all_button"/>
+ <name_list bottom_delta="-105" height="104" name="member_list">
+ <column label="Nom du membre" name="name"/>
+ <column label="Surface donnée" name="donated" width="116"/>
+ <column label="Dernière connexion" name="online" width="136"/>
+ </name_list>
+ <button label="Inviter un membre..." name="member_invite" width="165"/>
+ <button label="Expulser un membre" name="member_eject"/>
+ <text name="help_text">
+ Vous pouvez ajouter ou supprimer les rôles assignés aux membres.
+Pour sélectionner plusieurs membres, cliquez sur leurs noms en maintenant la touche Ctrl enfoncée.
+ </text>
+ </panel>
+ <panel height="148" label="Rôles" name="roles_sub_tab">
+ <line_editor bottom="127" name="search_text"/>
+ <button label="Rechercher" name="search_button" width="75"/>
+ <button label="Afficher tout" left_delta="80" name="show_all_button"/>
+ <scroll_list bottom_delta="-104" height="104" name="role_list">
+ <column label="Nom du rôle" name="name"/>
+ <column label="Titre" name="title"/>
+ <column label="Membres" name="members"/>
+ </scroll_list>
+ <button label="Créer un rôle..." name="role_create"/>
+ <button label="Supprimer le rôle" name="role_delete"/>
+ <text name="help_text">
+ Chaque rôle possède un titre et des pouvoirs. Un membre peut avoir plusieurs rôles mais il ne peut y avoir que 10 rôles dans un groupe, Visiteur et Propriétaire inclus.
+ </text>
+ <string name="cant_delete_role">
+ Les rôles Tous et Propriétaires sont spéciaux et ne peuvent pas être supprimés.
+ </string>
+ </panel>
+ <panel height="148" label="Pouvoirs" name="actions_sub_tab">
+ <line_editor bottom="127" name="search_text"/>
+ <button label="Rechercher" name="search_button" width="75"/>
+ <button label="Afficher tout" left_delta="80" name="show_all_button"/>
+ <scroll_list bottom_delta="-120" height="118" name="action_list" tool_tip="Sélectionnez un pouvoir pour en afficher les détails.">
+ <column label="" name="icon"/>
+ <column label="" name="action"/>
+ </scroll_list>
+ <text name="help_text">
+ Les pouvoirs déterminent les facultés de chaque membre dans le groupe.
+ </text>
+ </panel>
+ </tab_container>
+ <panel name="members_footer">
+ <text name="static">
+ Rôles assignés
+ </text>
+ <text name="static2">
+ Pouvoirs attribués
+ </text>
+ <scroll_list name="member_assigned_roles">
+ <column label="" name="checkbox"/>
+ <column label="" name="role"/>
+ </scroll_list>
+ <scroll_list name="member_allowed_actions" tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l'onglet Pouvoirs.">
+ <column label="" name="icon"/>
+ <column label="" name="action"/>
+ </scroll_list>
+ </panel>
+ <panel name="roles_footer">
+ <text name="static">
+ Nom
+ </text>
+ <text name="static2">
+ Description
+ </text>
+ <line_editor name="role_name">
+ Employés
+ </line_editor>
+ <text name="static3">
+ Titre
+ </text>
+ <line_editor name="role_title">
+ (en attente)
+ </line_editor>
+ <text_editor name="role_description">
+ (en attente)
+ </text_editor>
+ <text name="static4">
+ Membres assignés
+ </text>
+ <text name="static5" tool_tip="Une liste des pouvoirs auquel le rôle sélectionné a accès.">
+ Pouvoirs attribués
+ </text>
+ <check_box label="Membres visibles" name="role_visible_in_list" tool_tip="Définit si les membres de ce rôle sont visibles à partir de l'onglet Général aux personnes en dehors du groupe."/>
+ <scroll_list name="role_allowed_actions" tool_tip="Pour avoir des détails sur chacun des pouvoirs attribués, allez à l'onglet Pouvoirs.">
+ <column label="" name="icon"/>
+ <column label="" name="checkbox"/>
+ <column label="" name="action"/>
+ </scroll_list>
+ </panel>
+ <panel name="actions_footer">
+ <text name="static">
+ Description
+ </text>
+ <text_editor name="action_description">
+ Ce pouvoir permet d'expulser des membres du groupe. Seul un propriétaire peut expulser un autre propriétaire.
+ </text_editor>
+ <text name="static2">
+ Rôles avec ce pouvoir
+ </text>
+ <text name="static3">
+ Membres avec ce pouvoir
+ </text>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_groups.xml b/indra/newview/skins/default/xui/fr/panel_groups.xml
index c64ce9e3cc..98320656fb 100644
--- a/indra/newview/skins/default/xui/fr/panel_groups.xml
+++ b/indra/newview/skins/default/xui/fr/panel_groups.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="groups">
- <scroll_list bottom="50" name="group list"/>
- <text bottom="16" height="32" name="groupdesc" width="268">
- Le groupe actif est en gras.
- </text>
- <text bottom="3" name="groupcount">
- Vous appartenez à [COUNT] groupes ([MAX] max).
- </text>
- <button label="IM/Appel" name="IM" tool_tip="Ouvrir une session de messagerie instantanée"/>
- <button label="Infos" name="Info"/>
- <button label="Activer" name="Activate"/>
- <button label="Quitter" name="Leave"/>
- <button label="Créer..." name="Create"/>
- <button label="Rechercher..." name="Search..."/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="groups">
+ <scroll_list bottom="50" name="group list"/>
+ <text bottom="16" height="32" name="groupdesc" width="268">
+ Le groupe actif est en gras.
+ </text>
+ <text bottom="3" name="groupcount">
+ Vous appartenez à [COUNT] groupes ([MAX] max).
+ </text>
+ <button label="IM/Appel" name="IM" tool_tip="Ouvrir une session de messagerie instantanée"/>
+ <button label="Infos" name="Info"/>
+ <button label="Activer" name="Activate"/>
+ <button label="Quitter" name="Leave"/>
+ <button label="Créer..." name="Create"/>
+ <button label="Rechercher..." name="Search..."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index 6174682a48..821aec65b2 100644
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_login">
- <string name="forgot_password_url">
- http://secondlife.com/account/request.php
- </string>
- <text name="first_name_text">
- Prénom :
- </text>
- <text name="last_name_text">
- Nom :
- </text>
- <text name="password_text">
- Mot de passe :
- </text>
- <text name="start_location_text">
- Lieu de départ :
- </text>
- <combo_box name="start_location_combo">
- <combo_item name="MyHome">
- Domicile
- </combo_item>
- <combo_item name="MyLastLocation">
- Dernier emplacement
- </combo_item>
- <combo_item name="<Typeregionname>">
- <Choisir région>
- </combo_item>
- <combo_item name="Typeregionname">
- <Nom de la région>
- </combo_item>
- </combo_box>
- <check_box label="Mémoriser" name="remember_check"/>
- <text name="full_screen_text">
- Le plein écran sera activé après identification.
- </text>
- <button label="Nouveau Compte..." label_selected="Nouveau Compte..." name="new_account_btn"/>
- <button label="Me connecter" label_selected="Me connecter" name="connect_btn"/>
- <button label="Préférences..." label_selected="Préférences..." name="preferences_btn"/>
- <button label="Quitter" label_selected="Quitter" name="quit_btn"/>
- <text name="version_text">
- 1.23.4 (5)
- </text>
- <text name="create_new_account_text">
- Créer un compte
- </text>
- <text name="forgot_password_text">
- Nom ou mot de passe oublié ?
- </text>
- <text name="channel_text">
- [VERSION]
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_login">
+ <string name="forgot_password_url">
+ http://secondlife.com/account/request.php
+ </string>
+ <text name="first_name_text">
+ Prénom :
+ </text>
+ <text name="last_name_text">
+ Nom :
+ </text>
+ <text name="password_text">
+ Mot de passe :
+ </text>
+ <text name="start_location_text">
+ Lieu de départ :
+ </text>
+ <combo_box name="start_location_combo">
+ <combo_box.item name="MyHome">
+ Domicile
+ </combo_box.item>
+ <combo_box.item name="MyLastLocation">
+ Dernier emplacement
+ </combo_box.item>
+ <combo_box.item name="<Typeregionname>">
+ <Choisir région>
+ </combo_box.item>
+ <combo_box.item name="Typeregionname">
+ <Nom de la région>
+ </combo_box.item>
+ </combo_box>
+ <check_box label="Mémoriser" name="remember_check"/>
+ <text name="full_screen_text">
+ Le plein écran sera activé après identification.
+ </text>
+ <button label="Nouveau Compte..." label_selected="Nouveau Compte..." name="new_account_btn"/>
+ <button label="Me connecter" label_selected="Me connecter" name="connect_btn"/>
+ <button label="Préférences..." label_selected="Préférences..." name="preferences_btn"/>
+ <button label="Quitter" label_selected="Quitter" name="quit_btn"/>
+ <text name="version_text">
+ 1.23.4 (5)
+ </text>
+ <text name="create_new_account_text">
+ Créer un compte
+ </text>
+ <text name="forgot_password_text">
+ Nom ou mot de passe oublié ?
+ </text>
+ <text name="channel_text">
+ [VERSION]
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index d89a47dba0..d29ec67272 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Chat écrit" name="chat">
- <text length="1" name="text_box" type="string">
- Taille de la police
-du chat :
- </text>
- <radio_group name="chat_font_size">
- <radio_item length="1" name="radio" type="string">
- Petite
- </radio_item>
- <radio_item length="1" name="radio2" type="string">
- Moyenne
- </radio_item>
- <radio_item length="1" name="radio3" type="string">
- Grande
- </radio_item>
- </radio_group>
- <text length="1" name="text_box2" type="string">
- Couleur du chat :
- </text>
- <color_swatch label="Vous" name="user"/>
- <color_swatch label="Avatars" name="agent" width="60"/>
- <color_swatch label="IM" left_delta="64" name="im"/>
- <color_swatch label="Système" name="system"/>
- <color_swatch label="Erreurs" name="script_error"/>
- <color_swatch label="Objets" name="objects"/>
- <color_swatch label="Propriétaire" name="owner" width="60"/>
- <color_swatch label="Bulle" left_delta="64" name="background"/>
- <color_swatch label="URL" name="links"/>
- <text length="1" name="text_box3" type="string">
- Console du chat :
- </text>
- <spinner label="Effacer le texte après" label_width="112" name="fade_chat_time" width="162"/>
- <text left="313" length="1" name="text_box4" type="string">
- s
- </text>
- <spinner left="335" name="max_chat_count"/>
- <text left="397" length="1" name="text_box5" type="string" width="74">
- lignes
- </text>
- <slider label="Opacité" name="console_opacity"/>
- <text length="1" name="text_box6" type="string">
- Options du chat :
- </text>
- <check_box label="Utiliser la largeur de l'écran (redémarrage requis)" name="chat_full_width_check"/>
- <check_box label="Fermer le chat après avoir appuyé sur Entrée" name="close_chat_on_return_check"/>
- <check_box label="Faire bouger l'avatar avec les touches de direction" name="arrow_keys_move_avatar_check"/>
- <check_box label="Afficher les heures dans le chat" name="show_timestamps_check"/>
- <check_box label="Jouer l'animation clavier quand vous écrivez" name="play_typing_animation"/>
- <text length="1" name="text_box7" type="string">
- Bulles de chat  :
- </text>
- <check_box label="Afficher les bulles de chat" name="bubble_text_chat"/>
- <slider label="Opacité" name="bubble_chat_opacity"/>
- <text length="1" name="text_box8" type="string">
- Erreurs de script :
- </text>
- <check_box label="Afficher les erreurs dans le chat" name="script_errors_as_chat"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Chat écrit" name="chat">
+ <text length="1" name="text_box" type="string">
+ Taille de la police
+du chat :
+ </text>
+ <radio_group name="chat_font_size">
+ <radio_item length="1" name="radio" type="string">
+ Petite
+ </radio_item>
+ <radio_item length="1" name="radio2" type="string">
+ Moyenne
+ </radio_item>
+ <radio_item length="1" name="radio3" type="string">
+ Grande
+ </radio_item>
+ </radio_group>
+ <text length="1" name="text_box2" type="string">
+ Couleur du chat :
+ </text>
+ <color_swatch label="Vous" name="user"/>
+ <color_swatch label="Avatars" name="agent" width="60"/>
+ <color_swatch label="IM" left_delta="64" name="im"/>
+ <color_swatch label="Système" name="system"/>
+ <color_swatch label="Erreurs" name="script_error"/>
+ <color_swatch label="Objets" name="objects"/>
+ <color_swatch label="Propriétaire" name="owner" width="60"/>
+ <color_swatch label="Bulle" left_delta="64" name="background"/>
+ <color_swatch label="URL" name="links"/>
+ <text length="1" name="text_box3" type="string">
+ Console du chat :
+ </text>
+ <spinner label="Effacer le texte après" label_width="112" name="fade_chat_time" width="162"/>
+ <text left="313" length="1" name="text_box4" type="string">
+ s
+ </text>
+ <spinner left="335" name="max_chat_count"/>
+ <text left="397" length="1" name="text_box5" type="string" width="74">
+ lignes
+ </text>
+ <slider label="Opacité" name="console_opacity"/>
+ <text length="1" name="text_box6" type="string">
+ Options du chat :
+ </text>
+ <check_box label="Utiliser la largeur de l'écran (redémarrage requis)" name="chat_full_width_check"/>
+ <check_box label="Fermer le chat après avoir appuyé sur Entrée" name="close_chat_on_return_check"/>
+ <check_box label="Faire bouger l'avatar avec les touches de direction" name="arrow_keys_move_avatar_check"/>
+ <check_box label="Afficher les heures dans le chat" name="show_timestamps_check"/>
+ <check_box label="Jouer l'animation clavier quand vous écrivez" name="play_typing_animation"/>
+ <text length="1" name="text_box7" type="string">
+ Bulles de chat  :
+ </text>
+ <check_box label="Afficher les bulles de chat" name="bubble_text_chat"/>
+ <slider label="Opacité" name="bubble_chat_opacity"/>
+ <text length="1" name="text_box8" type="string">
+ Erreurs de script :
+ </text>
+ <check_box label="Afficher les erreurs dans le chat" name="script_errors_as_chat"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 1713086ed1..dbb471093e 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -1,119 +1,119 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Général" name="general_panel">
- <radio_group name="default_start_location" width="166">
- <radio_item name="MyHome" tool_tip="Par défaut, choisir mon domicile comme lieu de départ.">
- Domicile
- </radio_item>
- <radio_item name="MyLastLocation" tool_tip="Par défaut, choisir mon dernier emplacement comme lieu de départ.">
- Dernier emplacement
- </radio_item>
- </radio_group>
- <check_box label="Afficher le lieu de départ sur l'écran de connexion" name="show_location_checkbox"/>
- <combo_box name="fade_out_combobox" width="166">
- <combo_item name="Never">
- Jamais
- </combo_item>
- <combo_item name="Show Temporarily">
- Afficher temporairement
- </combo_item>
- <combo_item name="Always">
- Toujours
- </combo_item>
- </combo_box>
- <check_box label="Nom des avatars en petit" name="small_avatar_names_checkbox"/>
- <check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox"/>
- <text name="group_titles_textbox">
- Titres de groupe :
- </text>
- <check_box label="Masquer tous les titres de groupe" name="show_all_title_checkbox"/>
- <check_box label="Masquer mon titre de groupe" name="show_my_title_checkbox"/>
- <color_swatch label="" name="effect_color_swatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
- <text name="UI Size:">
- Taille de l'interface :
- </text>
- <slider name="ui_scale_slider"/>
- <check_box label="Utiliser une échelle indépendante de la résolution" name="ui_auto_scale"/>
- <spinner label="Absent(e) après :" name="afk_timeout_spinner"/>
- <check_box label="M'avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
- <text length="1" name="start_location_textbox" type="string">
- Lieu de départ :
- </text>
- <text length="1" name="show_names_textbox" type="string">
- Afficher les noms :
- </text>
- <text bottom="-174" length="1" name="effects_color_textbox" type="string">
- Couleur du faisceau
-de sélection :
- </text>
- <text length="1" name="seconds_textbox" type="string">
- secondes
- </text>
- <text length="1" name="crash_report_textbox" type="string">
- Rapports de crash :
- </text>
- <text length="1" name="language_textbox" type="string">
- Langue :
- </text>
- <text left_delta="313" length="1" name="language_textbox2" type="string">
- (redémarrage requis)
- </text>
- <string name="region_name_prompt">
- <Saisissez le nom de la région>
- </string>
- <combo_box name="crash_behavior_combobox" width="166">
- <combo_item length="1" name="Askbeforesending" type="string">
- Demander avant d'envoyer
- </combo_item>
- <combo_item length="1" name="Alwayssend" type="string">
- Toujours envoyer
- </combo_item>
- <combo_item length="1" name="Neversend" type="string">
- Ne jamais envoyer
- </combo_item>
- </combo_box>
- <combo_box name="language_combobox" width="166">
- <combo_item name="System Default Language">
- Choix par défaut
- </combo_item>
- <combo_item length="1" name="English" type="string">
- English (Anglais)
- </combo_item>
- <combo_item length="1" name="Danish" type="string">
- Dansk (Danois) - Bêta
- </combo_item>
- <combo_item length="1" name="Deutsch(German)" type="string">
- Deutsch (Allemand) - Bêta
- </combo_item>
- <combo_item name="Spanish">
- Español (Espagnol) - Bêta
- </combo_item>
- <combo_item name="French">
- Français - Bêta
- </combo_item>
- <combo_item name="Hungarian">
- Magyar (Hongrois) - Bêta
- </combo_item>
- <combo_item name="Polish">
- Polski (Polonais) - Bêta
- </combo_item>
- <combo_item name="Portugese">
- Portugués (Portugais) - Bêta
- </combo_item>
- <combo_item name="Russian">
- РуÑÑкий (Russe) - Bêta
- </combo_item>
- <combo_item name="Ukrainian">
- УкраїнÑька (Ukrainien) - Bêta
- </combo_item>
- <combo_item length="1" name="Chinese" type="string">
- ä¸æ–‡ (简体) (Chinois) - Bêta
- </combo_item>
- <combo_item length="1" name="(Japanese)" type="string">
- 日本語 (Japonais) - Bêta
- </combo_item>
- <combo_item length="1" name="(Korean)" type="string">
- í•œêµì–´ (Coréen) - Bêta
- </combo_item>
- </combo_box>
- <check_box label="Partager la langue avec les objets" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Général" name="general_panel">
+ <radio_group name="default_start_location" width="166">
+ <radio_item name="MyHome" tool_tip="Par défaut, choisir mon domicile comme lieu de départ.">
+ Domicile
+ </radio_item>
+ <radio_item name="MyLastLocation" tool_tip="Par défaut, choisir mon dernier emplacement comme lieu de départ.">
+ Dernier emplacement
+ </radio_item>
+ </radio_group>
+ <check_box label="Afficher le lieu de départ sur l'écran de connexion" name="show_location_checkbox"/>
+ <combo_box name="fade_out_combobox" width="166">
+ <combo_item name="Never">
+ Jamais
+ </combo_item>
+ <combo_item name="Show Temporarily">
+ Afficher temporairement
+ </combo_item>
+ <combo_item name="Always">
+ Toujours
+ </combo_item>
+ </combo_box>
+ <check_box label="Nom des avatars en petit" name="small_avatar_names_checkbox"/>
+ <check_box label="Masquer mon nom sur mon écran" name="show_my_name_checkbox"/>
+ <text name="group_titles_textbox">
+ Titres de groupe :
+ </text>
+ <check_box label="Masquer tous les titres de groupe" name="show_all_title_checkbox"/>
+ <check_box label="Masquer mon titre de groupe" name="show_my_title_checkbox"/>
+ <color_swatch label="" name="effect_color_swatch" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
+ <text name="UI Size:">
+ Taille de l'interface :
+ </text>
+ <slider name="ui_scale_slider"/>
+ <check_box label="Utiliser une échelle indépendante de la résolution" name="ui_auto_scale"/>
+ <spinner label="Absent(e) après :" name="afk_timeout_spinner"/>
+ <check_box label="M'avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
+ <text length="1" name="start_location_textbox" type="string">
+ Lieu de départ :
+ </text>
+ <text length="1" name="show_names_textbox" type="string">
+ Afficher les noms :
+ </text>
+ <text bottom="-174" length="1" name="effects_color_textbox" type="string">
+ Couleur du faisceau
+de sélection :
+ </text>
+ <text length="1" name="seconds_textbox" type="string">
+ secondes
+ </text>
+ <text length="1" name="crash_report_textbox" type="string">
+ Rapports de crash :
+ </text>
+ <text length="1" name="language_textbox" type="string">
+ Langue :
+ </text>
+ <text left_delta="313" length="1" name="language_textbox2" type="string">
+ (redémarrage requis)
+ </text>
+ <string name="region_name_prompt">
+ <Saisissez le nom de la région>
+ </string>
+ <combo_box name="crash_behavior_combobox" width="166">
+ <combo_item length="1" name="Askbeforesending" type="string">
+ Demander avant d'envoyer
+ </combo_item>
+ <combo_item length="1" name="Alwayssend" type="string">
+ Toujours envoyer
+ </combo_item>
+ <combo_item length="1" name="Neversend" type="string">
+ Ne jamais envoyer
+ </combo_item>
+ </combo_box>
+ <combo_box name="language_combobox" width="166">
+ <combo_item name="System Default Language">
+ Choix par défaut
+ </combo_item>
+ <combo_item length="1" name="English" type="string">
+ English (Anglais)
+ </combo_item>
+ <combo_item length="1" name="Danish" type="string">
+ Dansk (Danois) - Bêta
+ </combo_item>
+ <combo_item length="1" name="Deutsch(German)" type="string">
+ Deutsch (Allemand) - Bêta
+ </combo_item>
+ <combo_item name="Spanish">
+ Español (Espagnol) - Bêta
+ </combo_item>
+ <combo_item name="French">
+ Français - Bêta
+ </combo_item>
+ <combo_item name="Hungarian">
+ Magyar (Hongrois) - Bêta
+ </combo_item>
+ <combo_item name="Polish">
+ Polski (Polonais) - Bêta
+ </combo_item>
+ <combo_item name="Portugese">
+ Portugués (Portugais) - Bêta
+ </combo_item>
+ <combo_item name="Russian">
+ РуÑÑкий (Russe) - Bêta
+ </combo_item>
+ <combo_item name="Ukrainian">
+ УкраїнÑька (Ukrainien) - Bêta
+ </combo_item>
+ <combo_item length="1" name="Chinese" type="string">
+ ä¸æ–‡ (简体) (Chinois) - Bêta
+ </combo_item>
+ <combo_item length="1" name="(Japanese)" type="string">
+ 日本語 (Japonais) - Bêta
+ </combo_item>
+ <combo_item length="1" name="(Korean)" type="string">
+ í•œêµì–´ (Coréen) - Bêta
+ </combo_item>
+ </combo_box>
+ <check_box label="Partager la langue avec les objets" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index 0892db463e..aaf6591f2e 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -1,195 +1,195 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Graphiques" name="Display panel">
- <button label="?" name="GraphicsPreferencesHelpButton"/>
- <text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460">
- Décochez cette option pour passer en mode plein écran.
- </text_editor>
- <text name="WindowSizeLabel">
- Taille de la fenêtre :
- </text>
- <combo_box name="windowsize combo">
- <combo_item name="640x480">
- 640 x 480
- </combo_item>
- <combo_item name="800x600">
- 800 x 600
- </combo_item>
- <combo_item name="720x480">
- 720 x 480 (NTSC)
- </combo_item>
- <combo_item name="768x576">
- 768 x 576 (PAL)
- </combo_item>
- <combo_item name="1024x768">
- 1024 x 768
- </combo_item>
- </combo_box>
- <text name="DisplayResLabel" width="165">
- Résolution de l'affichage :
- </text>
- <text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
- Rapport hauteur/largeur :
- </text>
- <combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
- <combo_item length="1" name="4:3(StandardCRT)" type="string">
- 4:3 (Standard CRT)
- </combo_item>
- <combo_item length="1" name="5:4(1280x1024LCD)" type="string">
- 5:4 (1280 x 1024 LCD)
- </combo_item>
- <combo_item name="8:5(Widescreen)">
- 8:5 (écran large)
- </combo_item>
- <combo_item length="1" name="16:9(Widescreen)" type="string">
- 16:9 (plein écran)
- </combo_item>
- </combo_box>
- <text length="1" name="text" type="string">
- Résolution d'affichage :
- </text>
- <text length="1" name="Fullscreen Aspect Ratio:" type="string">
- Format de plein écran :
- </text>
- <text length="1" name="(width / height)" type="string">
- (largeur / hauteur)
- </text>
- <text length="1" name="UI Size:" type="string">
- Taille de l'IU :
- </text>
- <text length="1" name="(meters, lower is faster)" type="string">
- (mètres, moins = plus rapide)
- </text>
- <text length="1" name="text2" type="string">
- Options d'affichage :
- </text>
- <check_box label="Lancer Second Life en mode fenêtré" name="windowed mode"/>
- <check_box label="Auto-détection du ratio" left="350" name="aspect_auto_detect"/>
- <check_box label="Utiliser échelle de résolution indépendante" name="ui_auto_scale"/>
- <check_box label="Montrer l'avatar en vue subjective" name="avfp"/>
- <spinner label="Distance d'affichage :" name="draw_distance"/>
- <text name="HigherText">
- Qualité et
- </text>
- <text name="QualityText">
- Performance :
- </text>
- <text left="105" name="FasterText">
- Plus rapide
- </text>
- <text name="ShadersPrefText">
- Faible
- </text>
- <text name="ShadersPrefText2">
- Moyen
- </text>
- <text name="ShadersPrefText3">
- Élevé
- </text>
- <text name="ShadersPrefText4">
- Ultra
- </text>
- <text bottom="-86" left="325" name="HigherText2">
- Plus élevée
- </text>
- <text name="QualityText2" visible="false"/>
- <check_box label="Personnaliser" left="395" name="CustomSettings"/>
- <text name="ShadersText">
- Effets :
- </text>
- <check_box label="Placage de relief et brillance" name="BumpShiny"/>
- <check_box label="Effets de base" name="BasicShaders" tool_tip="Désactiver cette option peut empêcher certains drivers de cartes graphiques de planter."/>
- <check_box label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
- <check_box label="Reflets de l'eau" name="Reflections"/>
- <text name="ReflectionDetailText">
- Objets reflétés :
- </text>
- <radio_group name="ReflectionDetailRadio">
- <radio_item name="0">
- Terrain et Arbres
- </radio_item>
- <radio_item name="1">
- Objets statiques
- </radio_item>
- <radio_item name="2">
- Objets et avatars
- </radio_item>
- <radio_item name="3">
- Tout
- </radio_item>
- </radio_group>
- <text name="AvatarRenderingText">
- Rendu de l'avatar :
- </text>
- <check_box label="Avatars éloignés en 2D" name="AvatarImpostors"/>
- <check_box label="Accélération du rendu" name="AvatarVertexProgram"/>
- <check_box label="Mouvement des habits" name="AvatarCloth"/>
- <text name="DrawDistanceMeterText1">
- m
- </text>
- <text name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="Limite d'affichage :" name="DrawDistance"/>
- <slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
- <slider label="Qualité post-traitement :" name="RenderPostProcess"/>
- <text name="MeshDetailText">
- Détails des rendus :
- </text>
- <slider label=" Objets :" name="ObjectMeshDetail"/>
- <slider label=" Flexiprims :" name="FlexibleMeshDetail"/>
- <slider label=" Arbres :" name="TreeMeshDetail"/>
- <slider label=" Avatars :" name="AvatarMeshDetail"/>
- <slider label=" Relief :" name="TerrainMeshDetail"/>
- <slider label=" Ciel :" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- Faible
- </text>
- <text name="ObjectMeshDetailText">
- Faible
- </text>
- <text name="FlexibleMeshDetailText">
- Faible
- </text>
- <text name="TreeMeshDetailText">
- Faible
- </text>
- <text name="AvatarMeshDetailText">
- Faible
- </text>
- <text name="TerrainMeshDetailText">
- Faible
- </text>
- <text name="SkyMeshDetailText">
- Faible
- </text>
- <text name="LightingDetailText">
- Sources lumineuses :
- </text>
- <radio_group name="LightingDetailRadio">
- <radio_item name="SunMoon">
- Soleil et lune uniquement
- </radio_item>
- <radio_item name="LocalLights">
- Lumières à proximité
- </radio_item>
- </radio_group>
- <text left="380" name="TerrainDetailText">
- Rendu du terrain :
- </text>
- <radio_group name="TerrainDetailRadio">
- <radio_item name="0">
- Faible
- </radio_item>
- <radio_item name="2">
- Élevé
- </radio_item>
- </radio_group>
- <button label="Paramètres recommandés" name="Defaults"/>
- <button label="Configuration du matériel" label_selected="Configuration du matériel" name="GraphicsHardwareButton"/>
- <text name="resolution_format">
- [RES_X] x [RES_Y]
- </text>
- <text name="aspect_ratio_text">
- [NUM]:[DEN]
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Graphiques" name="Display panel">
+ <button label="?" name="GraphicsPreferencesHelpButton"/>
+ <text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460">
+ Décochez cette option pour passer en mode plein écran.
+ </text_editor>
+ <text name="WindowSizeLabel">
+ Taille de la fenêtre :
+ </text>
+ <combo_box name="windowsize combo">
+ <combo_box.item name="640x480">
+ 640 x 480
+ </combo_box.item>
+ <combo_box.item name="800x600">
+ 800 x 600
+ </combo_box.item>
+ <combo_box.item name="720x480">
+ 720 x 480 (NTSC)
+ </combo_box.item>
+ <combo_box.item name="768x576">
+ 768 x 576 (PAL)
+ </combo_box.item>
+ <combo_box.item name="1024x768">
+ 1024 x 768
+ </combo_box.item>
+ </combo_box>
+ <text name="DisplayResLabel" width="165">
+ Résolution de l'affichage :
+ </text>
+ <text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
+ Rapport hauteur/largeur :
+ </text>
+ <combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
+ <combo_box.item length="1" name="4:3(StandardCRT)" type="string">
+ 4:3 (Standard CRT)
+ </combo_box.item>
+ <combo_box.item length="1" name="5:4(1280x1024LCD)" type="string">
+ 5:4 (1280 x 1024 LCD)
+ </combo_box.item>
+ <combo_box.item name="8:5(Widescreen)">
+ 8:5 (écran large)
+ </combo_box.item>
+ <combo_box.item length="1" name="16:9(Widescreen)" type="string">
+ 16:9 (plein écran)
+ </combo_box.item>
+ </combo_box>
+ <text length="1" name="text" type="string">
+ Résolution d'affichage :
+ </text>
+ <text length="1" name="Fullscreen Aspect Ratio:" type="string">
+ Format de plein écran :
+ </text>
+ <text length="1" name="(width / height)" type="string">
+ (largeur / hauteur)
+ </text>
+ <text length="1" name="UI Size:" type="string">
+ Taille de l'IU :
+ </text>
+ <text length="1" name="(meters, lower is faster)" type="string">
+ (mètres, moins = plus rapide)
+ </text>
+ <text length="1" name="text2" type="string">
+ Options d'affichage :
+ </text>
+ <check_box label="Lancer Second Life en mode fenêtré" name="windowed mode"/>
+ <check_box label="Auto-détection du ratio" left="350" name="aspect_auto_detect"/>
+ <check_box label="Utiliser échelle de résolution indépendante" name="ui_auto_scale"/>
+ <check_box label="Montrer l'avatar en vue subjective" name="avfp"/>
+ <spinner label="Distance d'affichage :" name="draw_distance"/>
+ <text name="HigherText">
+ Qualité et
+ </text>
+ <text name="QualityText">
+ Performance :
+ </text>
+ <text left="105" name="FasterText">
+ Plus rapide
+ </text>
+ <text name="ShadersPrefText">
+ Faible
+ </text>
+ <text name="ShadersPrefText2">
+ Moyen
+ </text>
+ <text name="ShadersPrefText3">
+ Élevé
+ </text>
+ <text name="ShadersPrefText4">
+ Ultra
+ </text>
+ <text bottom="-86" left="325" name="HigherText2">
+ Plus élevée
+ </text>
+ <text name="QualityText2" visible="false"/>
+ <check_box label="Personnaliser" left="395" name="CustomSettings"/>
+ <text name="ShadersText">
+ Effets :
+ </text>
+ <check_box label="Placage de relief et brillance" name="BumpShiny"/>
+ <check_box label="Effets de base" name="BasicShaders" tool_tip="Désactiver cette option peut empêcher certains drivers de cartes graphiques de planter."/>
+ <check_box label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
+ <check_box label="Reflets de l'eau" name="Reflections"/>
+ <text name="ReflectionDetailText">
+ Objets reflétés :
+ </text>
+ <radio_group name="ReflectionDetailRadio">
+ <radio_item name="0">
+ Terrain et Arbres
+ </radio_item>
+ <radio_item name="1">
+ Objets statiques
+ </radio_item>
+ <radio_item name="2">
+ Objets et avatars
+ </radio_item>
+ <radio_item name="3">
+ Tout
+ </radio_item>
+ </radio_group>
+ <text name="AvatarRenderingText">
+ Rendu de l'avatar :
+ </text>
+ <check_box label="Avatars éloignés en 2D" name="AvatarImpostors"/>
+ <check_box label="Accélération du rendu" name="AvatarVertexProgram"/>
+ <check_box label="Mouvement des habits" name="AvatarCloth"/>
+ <text name="DrawDistanceMeterText1">
+ m
+ </text>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="Limite d'affichage :" name="DrawDistance"/>
+ <slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
+ <slider label="Qualité post-traitement :" name="RenderPostProcess"/>
+ <text name="MeshDetailText">
+ Détails des rendus :
+ </text>
+ <slider label=" Objets :" name="ObjectMeshDetail"/>
+ <slider label=" Flexiprims :" name="FlexibleMeshDetail"/>
+ <slider label=" Arbres :" name="TreeMeshDetail"/>
+ <slider label=" Avatars :" name="AvatarMeshDetail"/>
+ <slider label=" Relief :" name="TerrainMeshDetail"/>
+ <slider label=" Ciel :" name="SkyMeshDetail"/>
+ <text name="PostProcessText">
+ Faible
+ </text>
+ <text name="ObjectMeshDetailText">
+ Faible
+ </text>
+ <text name="FlexibleMeshDetailText">
+ Faible
+ </text>
+ <text name="TreeMeshDetailText">
+ Faible
+ </text>
+ <text name="AvatarMeshDetailText">
+ Faible
+ </text>
+ <text name="TerrainMeshDetailText">
+ Faible
+ </text>
+ <text name="SkyMeshDetailText">
+ Faible
+ </text>
+ <text name="LightingDetailText">
+ Sources lumineuses :
+ </text>
+ <radio_group name="LightingDetailRadio">
+ <radio_item name="SunMoon">
+ Soleil et lune uniquement
+ </radio_item>
+ <radio_item name="LocalLights">
+ Lumières à proximité
+ </radio_item>
+ </radio_group>
+ <text left="380" name="TerrainDetailText">
+ Rendu du terrain :
+ </text>
+ <radio_group name="TerrainDetailRadio">
+ <radio_item name="0">
+ Faible
+ </radio_item>
+ <radio_item name="2">
+ Élevé
+ </radio_item>
+ </radio_group>
+ <button label="Paramètres recommandés" name="Defaults"/>
+ <button label="Configuration du matériel" label_selected="Configuration du matériel" name="GraphicsHardwareButton"/>
+ <text name="resolution_format">
+ [RES_X] x [RES_Y]
+ </text>
+ <text name="aspect_ratio_text">
+ [NUM]:[DEN]
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
index 37a129811e..557e88267d 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Règlement" name="Covenant">
- <text name="covenant_help_text" bottom="-25">
- Les changements apportés au règlement apparaîtront sur toutes les
-parcelles du domaine.
- </text>
- <text name="region_name_lbl" bottom_delta="-31">
- Région :
- </text>
- <text name="region_name_text">
- (inconnue)
- </text>
- <text name="estate_name_lbl" bottom_delta="-19">
- Domaine :
- </text>
- <text name="estate_name_text">
- (inconnu)
- </text>
- <text name="covenent_instructions">
- Pour modifier le règlement de ce domaine, glissez-déposez une note.
- </text>
- <button label="?" name="covenant_help" />
- <button label="Redéfinir" name="reset_covenant" />
- <text name="estate_owner_lbl" bottom_delta="-19">
- Propriétaire :
- </text>
- <text name="estate_owner_text">
- (inconnu)
- </text>
- <text name="resellable_clause">
- Le terrain acheté dans cette région peut être revendu ou pas.
- </text>
- <text name="changeable_clause">
- Le terrain acheté dans cette région peut être fusionné/divisé ou pas.
- </text>
- <text_editor name="covenant_editor">
- Chargement...
- </text_editor>
- <text name="can_resell">
- Le terrain acheté dans cette région peut être revendu.
- </text>
- <text name="can_not_resell">
- Le terrain acheté dans cette région ne peut pas être revendu.
- </text>
- <text name="can_change">
- Le terrain acheté dans cette région peut être fusionné ou divisé.
- </text>
- <text name="can_not_change">
- Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Règlement" name="Covenant">
+ <text name="covenant_help_text" bottom="-25">
+ Les changements apportés au règlement apparaîtront sur toutes les
+parcelles du domaine.
+ </text>
+ <text name="region_name_lbl" bottom_delta="-31">
+ Région :
+ </text>
+ <text name="region_name_text">
+ (inconnue)
+ </text>
+ <text name="estate_name_lbl" bottom_delta="-19">
+ Domaine :
+ </text>
+ <text name="estate_name_text">
+ (inconnu)
+ </text>
+ <text name="covenent_instructions">
+ Pour modifier le règlement de ce domaine, glissez-déposez une note.
+ </text>
+ <button label="?" name="covenant_help" />
+ <button label="Redéfinir" name="reset_covenant" />
+ <text name="estate_owner_lbl" bottom_delta="-19">
+ Propriétaire :
+ </text>
+ <text name="estate_owner_text">
+ (inconnu)
+ </text>
+ <text name="resellable_clause">
+ Le terrain acheté dans cette région peut être revendu ou pas.
+ </text>
+ <text name="changeable_clause">
+ Le terrain acheté dans cette région peut être fusionné/divisé ou pas.
+ </text>
+ <text_editor name="covenant_editor">
+ Chargement...
+ </text_editor>
+ <text name="can_resell">
+ Le terrain acheté dans cette région peut être revendu.
+ </text>
+ <text name="can_not_resell">
+ Le terrain acheté dans cette région ne peut pas être revendu.
+ </text>
+ <text name="can_change">
+ Le terrain acheté dans cette région peut être fusionné ou divisé.
+ </text>
+ <text name="can_not_change">
+ Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index 07a4d5d012..92f44fa0e2 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Débugger" name="Debug">
- <text name="region_text_lbl">
- Région :
- </text>
- <text name="region_text">
- (inconnue)
- </text>
- <check_box label="Désactiver les scripts" name="disable_scripts_check" tool_tip="Désactiver tous les scripts dans cette région"/>
- <button label="?" name="disable_scripts_help"/>
- <check_box label="Désactiver les collisions" name="disable_collisions_check" tool_tip="Désactiver les collisions entre non-avatars dans cette région"/>
- <button label="?" name="disable_collisions_help"/>
- <check_box label="Désactiver les propriétés physiques" name="disable_physics_check" tool_tip="Désactiver toutes les propriétés physiques dans cette région"/>
- <button label="?" name="disable_physics_help"/>
- <button label="Appliquer" name="apply_btn" bottom_delta="-38"/>
- <text name="objret_text_lbl" bottom_delta="-42">
- Renvoi de l'objet
- </text>
- <text name="resident_text_lbl">
- Résident :
- </text>
- <line_editor name="target_avatar_name">
- (aucun)
- </line_editor>
- <button label="Choisir..." name="choose_avatar_btn"/>
- <text name="options_text_lbl">
- Options :
- </text>
- <check_box label="Ne renvoyer que les objets avec des scripts" name="return_scripts" tool_tip="Ne renvoyer que les objets avec des scripts."/>
- <check_box label="Ne renvoyer que les objets sur le terrain de quelqu'un d'autre" name="return_other_land" tool_tip="Ne renvoyer que les objets se trouvant sur le terrain de quelqu'un d'autre"/>
- <check_box label="Renvoyer les objets dans toutes les régions de ce domaine" name="return_estate_wide" tool_tip="Renvoyer les objets dans toutes les régions qui constituent ce domaine"/>
- <button label="Renvoyer" name="return_btn"/>
- <button label="Afficher les objets souvent responsables de collision..." name="top_colliders_btn" tool_tip="Liste des objets avec le plus de collisions potentielles" width="320"/>
- <button label="?" name="top_colliders_help" left="337"/>
- <button label="Afficher les objets exécutant le plus de scripts..." name="top_scripts_btn" tool_tip="Liste des objets qui passent le plus de temps à exécuter des scripts" width="320"/>
- <button label="?" name="top_scripts_help" left="337"/>
- <button label="Redémarrer la région" name="restart_btn" tool_tip="Redémarrer la région au bout de 2 minutes" width="160"/>
- <button label="?" name="restart_help" left="177" />
- <button label="Retarder le redémarrage" name="cancel_restart_btn" tool_tip="Retarder le redémarrage de la région d'une heure" width="160"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Débugger" name="Debug">
+ <text name="region_text_lbl">
+ Région :
+ </text>
+ <text name="region_text">
+ (inconnue)
+ </text>
+ <check_box label="Désactiver les scripts" name="disable_scripts_check" tool_tip="Désactiver tous les scripts dans cette région"/>
+ <button label="?" name="disable_scripts_help"/>
+ <check_box label="Désactiver les collisions" name="disable_collisions_check" tool_tip="Désactiver les collisions entre non-avatars dans cette région"/>
+ <button label="?" name="disable_collisions_help"/>
+ <check_box label="Désactiver les propriétés physiques" name="disable_physics_check" tool_tip="Désactiver toutes les propriétés physiques dans cette région"/>
+ <button label="?" name="disable_physics_help"/>
+ <button label="Appliquer" name="apply_btn" bottom_delta="-38"/>
+ <text name="objret_text_lbl" bottom_delta="-42">
+ Renvoi de l'objet
+ </text>
+ <text name="resident_text_lbl">
+ Résident :
+ </text>
+ <line_editor name="target_avatar_name">
+ (aucun)
+ </line_editor>
+ <button label="Choisir..." name="choose_avatar_btn"/>
+ <text name="options_text_lbl">
+ Options :
+ </text>
+ <check_box label="Ne renvoyer que les objets avec des scripts" name="return_scripts" tool_tip="Ne renvoyer que les objets avec des scripts."/>
+ <check_box label="Ne renvoyer que les objets sur le terrain de quelqu'un d'autre" name="return_other_land" tool_tip="Ne renvoyer que les objets se trouvant sur le terrain de quelqu'un d'autre"/>
+ <check_box label="Renvoyer les objets dans toutes les régions de ce domaine" name="return_estate_wide" tool_tip="Renvoyer les objets dans toutes les régions qui constituent ce domaine"/>
+ <button label="Renvoyer" name="return_btn"/>
+ <button label="Afficher les objets souvent responsables de collision..." name="top_colliders_btn" tool_tip="Liste des objets avec le plus de collisions potentielles" width="320"/>
+ <button label="?" name="top_colliders_help" left="337"/>
+ <button label="Afficher les objets exécutant le plus de scripts..." name="top_scripts_btn" tool_tip="Liste des objets qui passent le plus de temps à exécuter des scripts" width="320"/>
+ <button label="?" name="top_scripts_help" left="337"/>
+ <button label="Redémarrer la région" name="restart_btn" tool_tip="Redémarrer la région au bout de 2 minutes" width="160"/>
+ <button label="?" name="restart_help" left="177" />
+ <button label="Retarder le redémarrage" name="cancel_restart_btn" tool_tip="Retarder le redémarrage de la région d'une heure" width="160"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index 475339dd92..425f273790 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Domaine" name="Estate">
- <text name="estate_help_text" bottom="-34">
- Les changements apportés aux paramètres
-de cet onglet auront des répercussions sur
-toutes les régions du domaine.
- </text>
- <text name="estate_text" bottom_delta="-34">
- Domaine :
- </text>
- <text name="estate_name">
- (inconnu)
- </text>
- <text name="owner_text">
- Propriétaire :
- </text>
- <text name="estate_owner">
- (inconnu)
- </text>
- <text name="Only Allow">
- Limiter l'accès aux résidents qui :
- </text>
- <check_box label="Ont enregistré leurs infos de paiement" name="limit_payment" tool_tip="Bannir les résidents non identifés."/>
- <check_box label="Ont fait vérifier leur âge" name="limit_age_verified" tool_tip="Bannir les résidents dont l'âge n'a pas été vérifié. Pour plus d'infos, consultez la page support.secondlife.com."/>
- <check_box label="Autoriser les chats vocaux" name="voice_chat_check"/>
- <button label="?" name="voice_chat_help"/>
- <text name="abuse_email_text">
- E-mail où signaler l'infraction :
- </text>
- <string name="email_unsupported">
- Non pris en charge
- </string>
- <button label="?" name="abuse_email_address_help"/>
- <text name="estate_manager_label">
- Gérants du domaine :
- </text>
- <button label="?" name="estate_manager_help"/>
- <button label="Ajouter..." name="add_estate_manager_btn"/>
- <button label="Supprimer..." name="remove_estate_manager_btn"/>
- <check_box label="Utiliser le temps universel" name="use_global_time_check"/>
- <button label="?" name="use_global_time_help"/>
- <check_box label="Soleil fixe" name="fixed_sun_check"/>
- <button label="?" name="fixed_sun_help"/>
- <slider label="Phase" name="sun_hour_slider"/>
- <check_box label="Autoriser l'accès public" name="externally_visible_check"/>
- <button label="?" name="externally_visible_help"/>
- <check_box label="Vue sur le continent" name="mainland_visible_check"/>
- <button label="?" name="mainland_visible_help"/>
- <check_box label="Autoriser la téléportation directe" name="allow_direct_teleport"/>
- <button label="?" name="allow_direct_teleport_help"/>
- <text name="region_text_lbl">
- Refuser l'accès selon les infos de paiement :
- </text>
- <check_box label="Refuser sans infos de paiement enregistrées" name="deny_anonymous"/>
- <check_box label="Refuser avec infos de paiement enregistrées" name="deny_identified"/>
- <check_box label="Refuser avec infos de paiement utilisées" name="deny_transacted"/>
- <button label="Appliquer" name="apply_btn"/>
- <text name="allow_resident_label">
- Résidents autorisés :
- </text>
- <button label="?" name="allow_resident_help"/>
- <button label="Ajouter..." name="add_allowed_avatar_btn"/>
- <button label="Supprimer..." name="remove_allowed_avatar_btn"/>
- <text name="allow_group_label">
- Groupes autorisés :
- </text>
- <button label="?" name="allow_group_help"/>
- <button label="Ajouter..." name="add_allowed_group_btn"/>
- <button label="Supprimer..." name="remove_allowed_group_btn"/>
- <text name="ban_resident_label">
- Résidents bannis :
- </text>
- <button label="?" name="ban_resident_help"/>
- <button label="Ajouter..." name="add_banned_avatar_btn"/>
- <button label="Supprimer..." name="remove_banned_avatar_btn"/>
- <button label="Envoyer un message au domaine..." name="message_estate_btn"/>
- <button label="Éjecter le résident du domaine..." name="kick_user_from_estate_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Domaine" name="Estate">
+ <text name="estate_help_text" bottom="-34">
+ Les changements apportés aux paramètres
+de cet onglet auront des répercussions sur
+toutes les régions du domaine.
+ </text>
+ <text name="estate_text" bottom_delta="-34">
+ Domaine :
+ </text>
+ <text name="estate_name">
+ (inconnu)
+ </text>
+ <text name="owner_text">
+ Propriétaire :
+ </text>
+ <text name="estate_owner">
+ (inconnu)
+ </text>
+ <text name="Only Allow">
+ Limiter l'accès aux résidents qui :
+ </text>
+ <check_box label="Ont enregistré leurs infos de paiement" name="limit_payment" tool_tip="Bannir les résidents non identifés."/>
+ <check_box label="Ont fait vérifier leur âge" name="limit_age_verified" tool_tip="Bannir les résidents dont l'âge n'a pas été vérifié. Pour plus d'infos, consultez la page support.secondlife.com."/>
+ <check_box label="Autoriser les chats vocaux" name="voice_chat_check"/>
+ <button label="?" name="voice_chat_help"/>
+ <text name="abuse_email_text">
+ E-mail où signaler l'infraction :
+ </text>
+ <string name="email_unsupported">
+ Non pris en charge
+ </string>
+ <button label="?" name="abuse_email_address_help"/>
+ <text name="estate_manager_label">
+ Gérants du domaine :
+ </text>
+ <button label="?" name="estate_manager_help"/>
+ <button label="Ajouter..." name="add_estate_manager_btn"/>
+ <button label="Supprimer..." name="remove_estate_manager_btn"/>
+ <check_box label="Utiliser le temps universel" name="use_global_time_check"/>
+ <button label="?" name="use_global_time_help"/>
+ <check_box label="Soleil fixe" name="fixed_sun_check"/>
+ <button label="?" name="fixed_sun_help"/>
+ <slider label="Phase" name="sun_hour_slider"/>
+ <check_box label="Autoriser l'accès public" name="externally_visible_check"/>
+ <button label="?" name="externally_visible_help"/>
+ <check_box label="Vue sur le continent" name="mainland_visible_check"/>
+ <button label="?" name="mainland_visible_help"/>
+ <check_box label="Autoriser la téléportation directe" name="allow_direct_teleport"/>
+ <button label="?" name="allow_direct_teleport_help"/>
+ <text name="region_text_lbl">
+ Refuser l'accès selon les infos de paiement :
+ </text>
+ <check_box label="Refuser sans infos de paiement enregistrées" name="deny_anonymous"/>
+ <check_box label="Refuser avec infos de paiement enregistrées" name="deny_identified"/>
+ <check_box label="Refuser avec infos de paiement utilisées" name="deny_transacted"/>
+ <button label="Appliquer" name="apply_btn"/>
+ <text name="allow_resident_label">
+ Résidents autorisés :
+ </text>
+ <button label="?" name="allow_resident_help"/>
+ <button label="Ajouter..." name="add_allowed_avatar_btn"/>
+ <button label="Supprimer..." name="remove_allowed_avatar_btn"/>
+ <text name="allow_group_label">
+ Groupes autorisés :
+ </text>
+ <button label="?" name="allow_group_help"/>
+ <button label="Ajouter..." name="add_allowed_group_btn"/>
+ <button label="Supprimer..." name="remove_allowed_group_btn"/>
+ <text name="ban_resident_label">
+ Résidents bannis :
+ </text>
+ <button label="?" name="ban_resident_help"/>
+ <button label="Ajouter..." name="add_banned_avatar_btn"/>
+ <button label="Supprimer..." name="remove_banned_avatar_btn"/>
+ <button label="Envoyer un message au domaine..." name="message_estate_btn"/>
+ <button label="Éjecter le résident du domaine..." name="kick_user_from_estate_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml
index ef07290b3f..7f272ab431 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Région" name="General">
- <text name="region_text_lbl">
- Région :
- </text>
- <text name="region_text">
- (inconnue)
- </text>
- <text name="version_channel_text_lbl">
- Version :
- </text>
- <text name="version_channel_text">
- (inconnu)
- </text>
- <check_box label="Bloquer le terraformage" name="block_terraform_check"/>
- <button label="?" name="terraform_help"/>
- <check_box label="Interdire le vol" name="block_fly_check"/>
- <button label="?" name="fly_help"/>
- <check_box label="Autoriser les dégâts" name="allow_damage_check"/>
- <button label="?" name="damage_help"/>
- <check_box label="Interdire les bousculades" name="restrict_pushobject"/>
- <button label="?" name="restrict_pushobject_help"/>
- <check_box label="Autoriser la revente" name="allow_land_resell_check"/>
- <button label="?" name="land_resell_help"/>
- <check_box label="Autoriser la fusion/division" name="allow_parcel_changes_check"/>
- <button label="?" name="parcel_changes_help"/>
- <check_box label="Ne pas afficher dans la recherche" name="block_parcel_search_check" tool_tip="Afficher cette région et ses parcelles dans les résultats de recherche"/>
- <button label="?" name="parcel_search_help"/>
- <spinner label="Nombre limite d'avatars" name="agent_limit_spin" label_width="127" width="190"/>
- <button label="?" name="agent_limit_help"/>
- <spinner label="Bonus objet" name="object_bonus_spin" label_width="127" width="190"/>
- <button label="?" name="object_bonus_help"/>
- <text label="Maturité" name="access_text">
- Maturité :
- </text>
-
-
-
- <button label="?" name="access_help"/>
- <button label="Appliquer" name="apply_btn"/>
- <button label="Téléporter un résident chez lui..." name="kick_btn"/>
- <button label="Téléporter tous les résidents chez eux..." name="kick_all_btn"/>
- <button label="Envoyer un message à la région..." name="im_btn"/>
- <button label="Gérer le Téléhub..." name="manage_telehub_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Région" name="General">
+ <text name="region_text_lbl">
+ Région :
+ </text>
+ <text name="region_text">
+ (inconnue)
+ </text>
+ <text name="version_channel_text_lbl">
+ Version :
+ </text>
+ <text name="version_channel_text">
+ (inconnu)
+ </text>
+ <check_box label="Bloquer le terraformage" name="block_terraform_check"/>
+ <button label="?" name="terraform_help"/>
+ <check_box label="Interdire le vol" name="block_fly_check"/>
+ <button label="?" name="fly_help"/>
+ <check_box label="Autoriser les dégâts" name="allow_damage_check"/>
+ <button label="?" name="damage_help"/>
+ <check_box label="Interdire les bousculades" name="restrict_pushobject"/>
+ <button label="?" name="restrict_pushobject_help"/>
+ <check_box label="Autoriser la revente" name="allow_land_resell_check"/>
+ <button label="?" name="land_resell_help"/>
+ <check_box label="Autoriser la fusion/division" name="allow_parcel_changes_check"/>
+ <button label="?" name="parcel_changes_help"/>
+ <check_box label="Ne pas afficher dans la recherche" name="block_parcel_search_check" tool_tip="Afficher cette région et ses parcelles dans les résultats de recherche"/>
+ <button label="?" name="parcel_search_help"/>
+ <spinner label="Nombre limite d'avatars" name="agent_limit_spin" label_width="127" width="190"/>
+ <button label="?" name="agent_limit_help"/>
+ <spinner label="Bonus objet" name="object_bonus_spin" label_width="127" width="190"/>
+ <button label="?" name="object_bonus_help"/>
+ <text label="Maturité" name="access_text">
+ Maturité :
+ </text>
+
+
+
+ <button label="?" name="access_help"/>
+ <button label="Appliquer" name="apply_btn"/>
+ <button label="Téléporter un résident chez lui..." name="kick_btn"/>
+ <button label="Téléporter tous les résidents chez eux..." name="kick_all_btn"/>
+ <button label="Envoyer un message à la région..." name="im_btn"/>
+ <button label="Gérer le Téléhub..." name="manage_telehub_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index 96c1530e64..4d7652eb6f 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Terrain" name="Terrain">
- <text name="region_text_lbl">
- Région :
- </text>
- <text name="region_text">
- (inconnue)
- </text>
- <spinner label="Niveau de l'eau" name="water_height_spin"/>
- <button label="?" name="water_height_help"/>
- <spinner label="Limite d'élévation du terrain" name="terrain_raise_spin"/>
- <button label="?" name="terrain_raise_help"/>
- <spinner label="Limite d'abaissement du terrain" name="terrain_lower_spin" bottom_delta="-34"/>
- <button label="?" name="terrain_lower_help"/>
- <check_box label="Utiliser le soleil du domaine" name="use_estate_sun_check"/>
- <button label="?" name="use_estate_sun_help"/>
- <check_box label="Soleil fixe" name="fixed_sun_check"/>
- <button label="?" name="fixed_sun_help"/>
- <slider label="Phase" name="sun_hour_slider"/>
- <button label="Appliquer" name="apply_btn"/>
- <button label="Télécharger le terrain au format RAW..." name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
- <button label="?" name="download_raw_help" left="246" />
- <button label="Charger le terrain au format RAW..." name="upload_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
- <button label="?" name="upload_raw_help" left="246" />
- <button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d'élévation/abaissement"/>
- <button label="?" name="bake_terrain_help"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terrain" name="Terrain">
+ <text name="region_text_lbl">
+ Région :
+ </text>
+ <text name="region_text">
+ (inconnue)
+ </text>
+ <spinner label="Niveau de l'eau" name="water_height_spin"/>
+ <button label="?" name="water_height_help"/>
+ <spinner label="Limite d'élévation du terrain" name="terrain_raise_spin"/>
+ <button label="?" name="terrain_raise_help"/>
+ <spinner label="Limite d'abaissement du terrain" name="terrain_lower_spin" bottom_delta="-34"/>
+ <button label="?" name="terrain_lower_help"/>
+ <check_box label="Utiliser le soleil du domaine" name="use_estate_sun_check"/>
+ <button label="?" name="use_estate_sun_help"/>
+ <check_box label="Soleil fixe" name="fixed_sun_check"/>
+ <button label="?" name="fixed_sun_help"/>
+ <slider label="Phase" name="sun_hour_slider"/>
+ <button label="Appliquer" name="apply_btn"/>
+ <button label="Télécharger le terrain au format RAW..." name="download_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+ <button label="?" name="download_raw_help" left="246" />
+ <button label="Charger le terrain au format RAW..." name="upload_raw_btn" tool_tip="Réservé aux propriétaires de domaine, pas aux gérants" width="230"/>
+ <button label="?" name="upload_raw_help" left="246" />
+ <button label="Figer le terrain" name="bake_terrain_btn" tool_tip="Définir le terrain actuel comme point central pour les limites d'élévation/abaissement"/>
+ <button label="?" name="bake_terrain_help"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_texture.xml b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
index 2ad403fda2..d312646788 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Textures du sol" name="Textures">
- <text name="region_text_lbl">
- Région :
- </text>
- <text name="region_text">
- (inconnue)
- </text>
- <text name="base_texture_text">
- Textures de base (fichiers 128x128, 24 bit .tga)
- </text>
- <text name="height_text_lbl">
- 1 (faible)
- </text>
- <text name="height_text_lbl2">
- 2
- </text>
- <text name="height_text_lbl3">
- 3
- </text>
- <text name="height_text_lbl4">
- 4 (élevé)
- </text>
- <text name="detail_texture_text">
- Textures du terrain (fichiers.tga 512 x 512, 24 bit requis)
- </text>
- <text name="height_text_lbl5">
- Limites d'élévation de texture
- </text>
- <text name="height_text_lbl6">
- Sud-ouest
- </text>
- <text name="height_text_lbl7">
- Nord-ouest
- </text>
- <text name="height_text_lbl8">
- Sud-est
- </text>
- <text name="height_text_lbl9">
- Nord-est
- </text>
- <text name="height_text_lbl10">
- Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
- </text>
- <text name="height_text_lbl11">
- En mètres, la valeur Bas correspond à la hauteur maximum de la texture n°1
- </text>
- <text name="height_text_lbl12">
- et la valeur Haut correspond à la hauteur minimum de la texture n°4.
- </text>
- <text name="height_text_lbl13">
- Nord-est
- </text>
- <spinner label="Bas" name="height_start_spin_0" />
- <spinner label="Bas" name="height_start_spin_1" />
- <spinner label="Bas" name="height_start_spin_2" />
- <spinner label="Bas" name="height_start_spin_3" />
- <spinner label="Haut" name="height_range_spin_0" />
- <spinner label="Haut" name="height_range_spin_1" />
- <spinner label="Haut" name="height_range_spin_2" />
- <spinner label="Haut" name="height_range_spin_3" />
- <text name="height_text_lbl14">
- Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
- </text>
- <text name="height_text_lbl15">
- En mètres, la valeur BASSE correspond à la hauteur MAXIMUM de la Texture #1,
- </text>
- <text name="height_text_lbl16">
- et la valeur HAUTE correspond à la hauteur MINIMUM de la Texture #4.
- </text>
- <button label="Appliquer" name="apply_btn" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Textures du sol" name="Textures">
+ <text name="region_text_lbl">
+ Région :
+ </text>
+ <text name="region_text">
+ (inconnue)
+ </text>
+ <text name="base_texture_text">
+ Textures de base (fichiers 128x128, 24 bit .tga)
+ </text>
+ <text name="height_text_lbl">
+ 1 (faible)
+ </text>
+ <text name="height_text_lbl2">
+ 2
+ </text>
+ <text name="height_text_lbl3">
+ 3
+ </text>
+ <text name="height_text_lbl4">
+ 4 (élevé)
+ </text>
+ <text name="detail_texture_text">
+ Textures du terrain (fichiers.tga 512 x 512, 24 bit requis)
+ </text>
+ <text name="height_text_lbl5">
+ Limites d'élévation de texture
+ </text>
+ <text name="height_text_lbl6">
+ Sud-ouest
+ </text>
+ <text name="height_text_lbl7">
+ Nord-ouest
+ </text>
+ <text name="height_text_lbl8">
+ Sud-est
+ </text>
+ <text name="height_text_lbl9">
+ Nord-est
+ </text>
+ <text name="height_text_lbl10">
+ Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
+ </text>
+ <text name="height_text_lbl11">
+ En mètres, la valeur Bas correspond à la hauteur maximum de la texture n°1
+ </text>
+ <text name="height_text_lbl12">
+ et la valeur Haut correspond à la hauteur minimum de la texture n°4.
+ </text>
+ <text name="height_text_lbl13">
+ Nord-est
+ </text>
+ <spinner label="Bas" name="height_start_spin_0" />
+ <spinner label="Bas" name="height_start_spin_1" />
+ <spinner label="Bas" name="height_start_spin_2" />
+ <spinner label="Bas" name="height_start_spin_3" />
+ <spinner label="Haut" name="height_range_spin_0" />
+ <spinner label="Haut" name="height_range_spin_1" />
+ <spinner label="Haut" name="height_range_spin_2" />
+ <spinner label="Haut" name="height_range_spin_3" />
+ <text name="height_text_lbl14">
+ Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
+ </text>
+ <text name="height_text_lbl15">
+ En mètres, la valeur BASSE correspond à la hauteur MAXIMUM de la Texture #1,
+ </text>
+ <text name="height_text_lbl16">
+ et la valeur HAUTE correspond à la hauteur MINIMUM de la Texture #4.
+ </text>
+ <button label="Appliquer" name="apply_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
index 722295f6c3..a6ec93bef5 100644
--- a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="LLScrollingPanelParam">
- <text type="string" length="1" name="Loading...">
- Chargement...
- </text>
- <text type="string" length="1" name="Loading...2">
- Chargement...
- </text>
- <button label="" label_selected="" name="less" />
- <button label="" label_selected="" name="more" />
- <slider label="[DESC]" name="param slider" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="LLScrollingPanelParam">
+ <text type="string" length="1" name="Loading...">
+ Chargement...
+ </text>
+ <text type="string" length="1" name="Loading...2">
+ Chargement...
+ </text>
+ <button label="" label_selected="" name="less" />
+ <button label="" label_selected="" name="more" />
+ <slider label="[DESC]" name="param slider" />
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index 3ddfe31cac..2e4c694efa 100644
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="status">
- <text length="1" name="ParcelNameText" tool_tip="Nom de la parcelle de terrain sur laquelle vous vous trouvez. Cliquez pour ouvrir la section À propos du terrain." type="string">
- Saisissez le nom de la parcelle ici
- </text>
- <text length="1" name="BalanceText" tool_tip="Solde du compte" type="string">
- Chargement...
- </text>
- <button label="" label_selected="" name="buycurrency" tool_tip="Acheter des devises"/>
- <text length="12" name="TimeText" tool_tip="Heure actuelle (Californie)" type="string">
- midi
- </text>
- <string name="StatBarDaysOfWeek">
- Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
- </string>
- <string name="StatBarMonthsOfYear">
- January:February:March:April:May:June:July:August:September:October:November:December
- </string>
- <button label="" label_selected="" name="scriptout" tool_tip="Alertes et erreurs de scripts"/>
- <button label="" label_selected="" name="health" tool_tip="Santé"/>
- <text length="1" name="HealthText" tool_tip="Santé" type="string">
- 100 %
- </text>
- <button label="" label_selected="" name="fly" tool_tip="Vol interdit"/>
- <button label="" label_selected="" name="build" tool_tip="Construction interdite"/>
- <button label="" label_selected="" name="scripts" tool_tip="Scripts interdits"/>
- <button name="no_fly" tool_tip="Interdiction de voler"/>
- <button name="no_build" tool_tip="Interdiction de construire/rezzer"/>
- <button name="no_scripts" tool_tip="Interdiction d'utiliser des scripts"/>
- <button label="" label_selected="" name="restrictpush" tool_tip="Pas de bousculades"/>
- <button name="status_no_voice" tool_tip="Voix non disponible ici"/>
- <button label="" label_selected="" name="buyland" tool_tip="Acheter cette parcelle"/>
- <line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life"/>
- <button name="search_btn" tool_tip="Rechercher dans Second Life"/>
- <text name="packet_loss_tooltip">
- Perte de paquets
- </text>
- <text name="bandwidth_tooltip">
- Bande passante
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="status">
+ <text length="1" name="ParcelNameText" tool_tip="Nom de la parcelle de terrain sur laquelle vous vous trouvez. Cliquez pour ouvrir la section À propos du terrain." type="string">
+ Saisissez le nom de la parcelle ici
+ </text>
+ <text length="1" name="BalanceText" tool_tip="Solde du compte" type="string">
+ Chargement...
+ </text>
+ <button label="" label_selected="" name="buycurrency" tool_tip="Acheter des devises"/>
+ <text length="12" name="TimeText" tool_tip="Heure actuelle (Californie)" type="string">
+ midi
+ </text>
+ <string name="StatBarDaysOfWeek">
+ Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
+ </string>
+ <string name="StatBarMonthsOfYear">
+ January:February:March:April:May:June:July:August:September:October:November:December
+ </string>
+ <button label="" label_selected="" name="scriptout" tool_tip="Alertes et erreurs de scripts"/>
+ <button label="" label_selected="" name="health" tool_tip="Santé"/>
+ <text length="1" name="HealthText" tool_tip="Santé" type="string">
+ 100 %
+ </text>
+ <button label="" label_selected="" name="fly" tool_tip="Vol interdit"/>
+ <button label="" label_selected="" name="build" tool_tip="Construction interdite"/>
+ <button label="" label_selected="" name="scripts" tool_tip="Scripts interdits"/>
+ <button name="no_fly" tool_tip="Interdiction de voler"/>
+ <button name="no_build" tool_tip="Interdiction de construire/rezzer"/>
+ <button name="no_scripts" tool_tip="Interdiction d'utiliser des scripts"/>
+ <button label="" label_selected="" name="restrictpush" tool_tip="Pas de bousculades"/>
+ <button name="status_no_voice" tool_tip="Voix non disponible ici"/>
+ <button label="" label_selected="" name="buyland" tool_tip="Acheter cette parcelle"/>
+ <line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life"/>
+ <button name="search_btn" tool_tip="Rechercher dans Second Life"/>
+ <text name="packet_loss_tooltip">
+ Perte de paquets
+ </text>
+ <text name="bandwidth_tooltip">
+ Bande passante
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml
index 5ba025f351..4dd1288e18 100644
--- a/indra/newview/skins/default/xui/fr/role_actions.xml
+++ b/indra/newview/skins/default/xui/fr/role_actions.xml
@@ -1,201 +1,201 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<role_actions>
- <action_set
- description="Ces pouvoirs permettent d'ajouter et de supprimer des membres du groupe et permettent aux nouveaux membres de rejoindre le groupe sans recevoir d'invitation."
- name="Membership">
- <action description="Inviter des membres dans ce groupe"
- longdescription="Invitez des membres à rejoindre ce groupe en utilisant le bouton Inviter un nouveau membre à partir de l'onglet Membres et rôles > Membres."
- name="member invite" value="1" />
- <action description="Expulser des membres du groupe"
- longdescription="Expulsez des membres de ce groupe en utilisant le bouton Expulser un membre à partir de l'onglet Membres et rôles > Membres. Un propriétaire ne peut pas être expulsé. Un membre peut être expulsé d'un groupe uniquement s'il a le rôle Tous (Everyone). Si vous n'êtes pas propriétaire, vous devez d'abord retirer les rôles d'un membre avant de pouvoir l'expulser."
- name="member eject" value="2" />
- <action
- description="Gérer l'inscription et les frais d'inscription"
- longdescription="Choisissez l'inscription libre pour permettre aux nouveaux membres de rejoindre le groupe sans invitation et modifiez les frais d'inscription à l'onglet Général."
- name="member options" value="3" />
- </action_set>
- <action_set
- description="Ces pouvoirs permettent d'ajouter, de supprimer et de modifier les rôles dans le groupe et d'y assigner des membres et des pouvoirs."
- name="Roles">
- <action description="Créer des rôles"
- longdescription="Créez de nouveaux rôles à l'onglet Membres et rôles > Rôles."
- name="role create" value="4" />
- <action description="Supprimer des rôles"
- longdescription="Supprimez des rôles à l'onglet Membres et rôles > Rôles."
- name="role delete" value="5" />
- <action description="Modifier les noms, les titres et les descriptions des rôles"
- longdescription="Modifiez les noms, titres et descriptions des rôles à l'onglet Membres et rôles > Rôles."
- name="role properties" value="6" />
- <action description="Attribuer des rôles limités"
- longdescription="Affectez des membres à certains rôles à l'onglet Membres et rôles > Membres. Un membre ne peut attribuer que des rôles auxquels il est lui-même affecté."
- name="role assign member limited" value="7" />
- <action description="Attribuer tous les rôles"
- longdescription="Affectez des membres à tous types de rôles à l'onglet Membres et rôles > Membres > Rôles assignés. Attention : ce pouvoir peut conférer des rôles très importants, proches de ceux d'un propriétaire. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer."
- name="role assign member" value="8" />
- <action description="Destituer des membres de leurs rôles"
- longdescription="Destituez des membres de leurs rôles à partir du menu Rôles attribués à l'onglet Membres et rôles > Membres. Les propriétaires ne peuvent pas être destitués."
- name="role remove member" value="9" />
- <action description="Modifier les pouvoirs d'un rôle"
- longdescription="Attribuez et retirez les pouvoirs d'un rôle à partir du menu Pouvoirs attribués à l'onglet Membres et rôles > Rôles > Pouvoirs attribués. Attention : ce pouvoir peut donner des rôles très importants, proches de ceux d'un propriétaire. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer."
- name="role change actions" value="10" />
- </action_set>
- <action_set
- description="Ces pouvoirs permettent de modifier le profil public du groupe, sa charte et son logo."
- name="Group Identity">
- <action
- description="Modifier le profil public du groupe"
- longdescription="Modifiez la charte, le logo, l'affichage dans la recherche et la liste des membres visibles à l'onglet Général."
- name="group change identity" value="11" />
- </action_set>
- <action_set
- description="Ces pouvoirs permettent de transférer, modifier et vendre du terrain appartenant au groupe. Pour accéder au menu À propos du terrain, cliquez sur le nom de la parcelle en haut de l'écran ou cliquez à droite sur le sol."
- name="Parcel Management">
- <action description="Transférer et acheter des parcelles pour le groupe"
- longdescription="Transférez et achetez des parcelles pour le groupe à partir du menu À propos du terrain > Général."
- name="land deed" value="12" />
- <action description="Abandonner le terrain"
- longdescription="Abandonnez des parcelles du groupe à Linden Lab. Attention : ce pouvoir autorise l'abandon d'un terrain appartenant au groupe. Ce terrain sera alors définitivement perdu. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer."
- name="land release" value="13" />
- <action description="Vendre du terrain"
- longdescription="Vendez des parcelles du groupe. Attention : ce pouvoir autorise la vente d'un terrain appartenant au groupe. Ce terrain sera alors définitivement perdu. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer."
- name="land set sale info" value="14" />
- <action description="Diviser et fusionner des parcelles"
- longdescription="Divisez et fusionnez des parcelles. Pour cela, cliquez à droite sur le sol, sélectionnez Modifier le terrain, et faites glisser votre souris sur l'endroit que vous souhaitez modifier. Pour diviser le terrain, sélectionnez un endroit puis cliquez sur Diviser... Pour fusionner des parcelles, sélectionnez au moins deux parcelles adjacentes et cliquez sur Fusionner."
- name="land divide join" value="15" />
- </action_set>
- <action_set
- description="Ces pouvoirs permettent de modifier le nom de la parcelle, son référencement dans la recherche et le lieu de téléportation."
- name="Parcel Identity">
- <action
- description="Afficher dans la recherche et définir une catégorie"
- longdescription="Choisissez de faire apparaître la parcelle dans la recherche et définissez sa catégorie à partir du menu À propos du terrain > Options."
- name="land find places" value="17" />
- <action
- description="Modifier le nom, la description et le référencement du terrain dans la recherche"
- longdescription="Modifiez le nom, la description de la parcelle et son référencement dans la recherche à partir du menu À propos du terrain > Options."
- name="land change identity" value="18" />
- <action
- description="Définir le lieu d'arrivée et le routage des téléportations"
- longdescription="Définissez le lieu d'arrivée des téléportations et le routage à partir du menu À propos du terrain > Options."
- name="land set landing point" value="19" />
- </action_set>
- <action_set
- description="Ces pouvoirs permettent de définir les options de la parcelle concernant la musique, les médias, la création d'objets et le relief."
- name="Parcel Settings">
- <action description="Modifier la musique et les médias"
- longdescription="Changez la musique et les médias à partir du menu À propos du terrain > Médias."
- name="land change media" value="20" />
- <action description="Changer l'option Modifier le terrain"
- longdescription="Changez l'option Modifier le terrain à partir du menu À propos du terrain > Options. Attention : ce pouvoir permet de terraformer votre terrain et de placer ou déplacer des plantes Linden. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer. "
- name="land edit" value="21" />
- <action
- description="Changer diverses options du terrain"
- longdescription="Changez diverses options de la parcelle à partir du menu À propos du terrain > Options. Vous pouvez permettre aux autres résidents de voler, créer des objets, modifier le terrain, lancer des scripts, créer des repères etc."
- name="land options" value="22" />
- </action_set>
- <action_set
- description="Ces pouvoirs permettent aux membres d'outrepasser les restrictions sur les parcelles du groupe."
- name="Parcel Powers">
- <action description="Toujours autoriser Modifier le terrain"
- longdescription="Vous pouvez modifier le relief d'une parcelle du groupe, même si l'option est désactivée à partir du menu À propos du terrain > Options."
- name="land allow edit land" value="23" />
- <action description="Toujours autoriser à voler"
- longdescription="Vous pouvez voler sur une parcelle du groupe, même si l'option est désactivée à partir du menu À propos du terrain > Options."
- name="land allow fly" value="24" />
- <action description="Toujours autoriser à créer des objets"
- longdescription="Vous pouvez créer des objets sur une parcelle du groupe, même si l'option est désactivée à partir du menu À propos du terrain > Options."
- name="land allow create" value="25" />
- <action description="Toujours autoriser à créer des repères"
- longdescription="Vous pouvez créer un repère sur une parcelle du groupe, même si l'option est désactivée à partir du menu À propos du terrain > Options."
- name="land allow landmark" value="26" />
- <action description="Autoriser à définir un domicile sur le terrain du groupe"
- longdescription="Vous pouvez définir votre domicile sur une parcelle du groupe à partir du menu Monde > Définir comme domicile."
- name="land allow set home" value="28" />
- </action_set>
- <action_set
- description="Ces pouvoirs permettent d'autoriser ou d'interdire l'accès à des parcelles du groupe et de geler ou d'expulser des résidents."
- name="Parcel Access">
- <action description="Gérer la liste d'accès à la parcelle"
- longdescription="Gérez la liste des résidents autorisés sur la parcelle à partir du menu À propos du terrain > Accès."
- name="land manage allowed" value="29" />
- <action description="Gérer la liste noire de cette parcelle"
- longdescription="Gérez la liste des résidents interdits sur la parcelle à partir du menu À propos du terrain > Interdire."
- name="land manage banned" value="30" />
- <action description="Vendre des pass"
- longdescription="Choisissez le prix et la durée des pass pour accéder à la parcelle à partir du menu À propos du terrain > Accès."
- name="land manage passes" value="31" />
- <action description="Expulser et geler des résidents"
- longdescription="Vous pouvez expulser ou geler un résident indésirable en cliquant-droit sur lui, menu radial > Plus."
- name="land admin" value="32" />
- </action_set>
- <action_set
- description="Ces pouvoirs permettent de renvoyer des objets du groupe et de placer ou déplacer des plantes Linden pour aménager le paysage. Utilisez ce pouvoir avec précaution car les objets renvoyés le sont définitivement."
- name="Parcel Content">
- <action description="Renvoyer les objets transférés au groupe"
- longdescription="Vous pouvez renvoyer des objets appartenant au groupe à partir du menu À propos du terrain > Objets."
- name="land return group owned" value="48" />
- <action description="Renvoyer les objets attribués au groupe"
- longdescription="Renvoyez les objets attribués au groupe et sur des parcelles du groupe à partir du menu À propos du terrain > Objets."
- name="land return group set" value="33" />
- <action description="Renvoyer des objets n'appartenant pas au groupe"
- longdescription="Renvoyez les objets n'appartenant pas au groupe et sur des parcelles du groupe à partir du menu À propos du terrain > Objets."
- name="land return non group" value="34" />
- <action description="Aménager le paysage avec des plantes Linden"
- longdescription="Placez et déplacez des arbres, plantes et herbes Linden. Vous les trouverez dans le dossier Objets de la bibliothèque de votre inventaire mais aussi à partir du menu Construire."
- name="land gardening" value="35" />
- </action_set>
- <action_set
- description="Ces pouvoirs permettent de transférer, modifier et vendre des objets du groupe. Ces changements se font à partir du menu Construire > Modifier > Général."
- name="Object Management">
- <action description="Transférer des objets au groupe"
- longdescription="Transférez des objets au groupe à partir du menu Construire > Modifier > Général."
- name="object deed" value="36" />
- <action
- description="Manipuler les objets du groupe"
- longdescription="Déplacez, copiez et modifiez les objets du groupe à partir du menu Construire > Modifier > Général."
- name="object manipulate" value="38" />
- <action description="Vendre des objets du groupe"
- longdescription="Mettez en vente des objets du groupe à partir du menu Construire > Modifier > Général."
- name="object set sale" value="39" />
- </action_set>
- <action_set
- description="Ce pouvoir définit les contributions aux frais du groupe, la réception des dividendes et l'accès aux finances du groupe."
- name="Accounting">
- <action description="Contribuer aux frais du groupe et recevoir des dividendes"
- longdescription="Contribuez aux frais du groupe et recevez des dividendes en cas de bénéfices. Vous recevrez une partie des ventes de terrains et objets appartenant au groupe et contribuerez aux frais divers (mise en vente des terrains etc.)"
- name="accounting accountable" value="40" />
- </action_set>
- <action_set
- description="Envoyez, recevez et consultez les notices du groupe."
- name="Notices">
- <action description="Envoyer des notices"
- longdescription="Envoyez des notices à l'onglet Notices."
- name="notices send" value="42" />
- <action description="Recevoir et consulter les notices"
- longdescription="Recevez des notices et consulter d'anciennes notices à l'onglet Notices."
- name="notices receive" value="43" />
- </action_set>
- <action_set
- description="Ces pouvoirs permettent de créer de nouvelles propositions, de voter et de consulter l'historique des votes."
- name="Proposals">
- <action description="Créer des propositions"
- longdescription="Ces pouvoirs permettent de créer des propositions et de les soumettre au vote, à partir du menu Profil du groupe > Propositions."
- name="proposal start" value="44" />
- <action description="Voter les propositions"
- longdescription="Votez les propositions à partir du menu Profil du groupe > Propositions."
- name="proposal vote" value="45" />
- </action_set>
- <action_set
- description="Ces pouvoirs vous permettent de gérer l'accès aux sessions de chat écrit ou vocal du groupe."
- name="Chat">
- <action description="Participer aux chats"
- longdescription="Participez aux chats du groupe."
- name="join group chat" />
- <action description="Participer au chat vocal"
- longdescription="Participez au chat vocal du groupe. Remarque : vous devez au préalable avoir le pouvoir de participer aux chats."
- name="join voice chat" />
- <action description="Modérer les chats"
- longdescription="Contrôlez l'accès et la participation aux chats de groupe écrits et vocaux."
- name="moderate group chat" />
- </action_set>
-</role_actions>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<role_actions>
+ <action_set
+ description="Ces pouvoirs permettent d'ajouter et de supprimer des membres du groupe et permettent aux nouveaux membres de rejoindre le groupe sans recevoir d'invitation."
+ name="Membership">
+ <action description="Inviter des membres dans ce groupe"
+ longdescription="Invitez des membres à rejoindre ce groupe en utilisant le bouton Inviter un nouveau membre à partir de l'onglet Membres et rôles > Membres."
+ name="member invite" value="1" />
+ <action description="Expulser des membres du groupe"
+ longdescription="Expulsez des membres de ce groupe en utilisant le bouton Expulser un membre à partir de l'onglet Membres et rôles > Membres. Un propriétaire ne peut pas être expulsé. Un membre peut être expulsé d'un groupe uniquement s'il a le rôle Tous (Everyone). Si vous n'êtes pas propriétaire, vous devez d'abord retirer les rôles d'un membre avant de pouvoir l'expulser."
+ name="member eject" value="2" />
+ <action
+ description="Gérer l'inscription et les frais d'inscription"
+ longdescription="Choisissez l'inscription libre pour permettre aux nouveaux membres de rejoindre le groupe sans invitation et modifiez les frais d'inscription à l'onglet Général."
+ name="member options" value="3" />
+ </action_set>
+ <action_set
+ description="Ces pouvoirs permettent d'ajouter, de supprimer et de modifier les rôles dans le groupe et d'y assigner des membres et des pouvoirs."
+ name="Roles">
+ <action description="Créer des rôles"
+ longdescription="Créez de nouveaux rôles à l'onglet Membres et rôles > Rôles."
+ name="role create" value="4" />
+ <action description="Supprimer des rôles"
+ longdescription="Supprimez des rôles à l'onglet Membres et rôles > Rôles."
+ name="role delete" value="5" />
+ <action description="Modifier les noms, les titres et les descriptions des rôles"
+ longdescription="Modifiez les noms, titres et descriptions des rôles à l'onglet Membres et rôles > Rôles."
+ name="role properties" value="6" />
+ <action description="Attribuer des rôles limités"
+ longdescription="Affectez des membres à certains rôles à l'onglet Membres et rôles > Membres. Un membre ne peut attribuer que des rôles auxquels il est lui-même affecté."
+ name="role assign member limited" value="7" />
+ <action description="Attribuer tous les rôles"
+ longdescription="Affectez des membres à tous types de rôles à l'onglet Membres et rôles > Membres > Rôles assignés. Attention : ce pouvoir peut conférer des rôles très importants, proches de ceux d'un propriétaire. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer."
+ name="role assign member" value="8" />
+ <action description="Destituer des membres de leurs rôles"
+ longdescription="Destituez des membres de leurs rôles à partir du menu Rôles attribués à l'onglet Membres et rôles > Membres. Les propriétaires ne peuvent pas être destitués."
+ name="role remove member" value="9" />
+ <action description="Modifier les pouvoirs d'un rôle"
+ longdescription="Attribuez et retirez les pouvoirs d'un rôle à partir du menu Pouvoirs attribués à l'onglet Membres et rôles > Rôles > Pouvoirs attribués. Attention : ce pouvoir peut donner des rôles très importants, proches de ceux d'un propriétaire. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer."
+ name="role change actions" value="10" />
+ </action_set>
+ <action_set
+ description="Ces pouvoirs permettent de modifier le profil public du groupe, sa charte et son logo."
+ name="Group Identity">
+ <action
+ description="Modifier le profil public du groupe"
+ longdescription="Modifiez la charte, le logo, l'affichage dans la recherche et la liste des membres visibles à l'onglet Général."
+ name="group change identity" value="11" />
+ </action_set>
+ <action_set
+ description="Ces pouvoirs permettent de transférer, modifier et vendre du terrain appartenant au groupe. Pour accéder au menu À propos du terrain, cliquez sur le nom de la parcelle en haut de l'écran ou cliquez à droite sur le sol."
+ name="Parcel Management">
+ <action description="Transférer et acheter des parcelles pour le groupe"
+ longdescription="Transférez et achetez des parcelles pour le groupe à partir du menu À propos du terrain > Général."
+ name="land deed" value="12" />
+ <action description="Abandonner le terrain"
+ longdescription="Abandonnez des parcelles du groupe à Linden Lab. Attention : ce pouvoir autorise l'abandon d'un terrain appartenant au groupe. Ce terrain sera alors définitivement perdu. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer."
+ name="land release" value="13" />
+ <action description="Vendre du terrain"
+ longdescription="Vendez des parcelles du groupe. Attention : ce pouvoir autorise la vente d'un terrain appartenant au groupe. Ce terrain sera alors définitivement perdu. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer."
+ name="land set sale info" value="14" />
+ <action description="Diviser et fusionner des parcelles"
+ longdescription="Divisez et fusionnez des parcelles. Pour cela, cliquez à droite sur le sol, sélectionnez Modifier le terrain, et faites glisser votre souris sur l'endroit que vous souhaitez modifier. Pour diviser le terrain, sélectionnez un endroit puis cliquez sur Diviser... Pour fusionner des parcelles, sélectionnez au moins deux parcelles adjacentes et cliquez sur Fusionner."
+ name="land divide join" value="15" />
+ </action_set>
+ <action_set
+ description="Ces pouvoirs permettent de modifier le nom de la parcelle, son référencement dans la recherche et le lieu de téléportation."
+ name="Parcel Identity">
+ <action
+ description="Afficher dans la recherche et définir une catégorie"
+ longdescription="Choisissez de faire apparaître la parcelle dans la recherche et définissez sa catégorie à partir du menu À propos du terrain > Options."
+ name="land find places" value="17" />
+ <action
+ description="Modifier le nom, la description et le référencement du terrain dans la recherche"
+ longdescription="Modifiez le nom, la description de la parcelle et son référencement dans la recherche à partir du menu À propos du terrain > Options."
+ name="land change identity" value="18" />
+ <action
+ description="Définir le lieu d'arrivée et le routage des téléportations"
+ longdescription="Définissez le lieu d'arrivée des téléportations et le routage à partir du menu À propos du terrain > Options."
+ name="land set landing point" value="19" />
+ </action_set>
+ <action_set
+ description="Ces pouvoirs permettent de définir les options de la parcelle concernant la musique, les médias, la création d'objets et le relief."
+ name="Parcel Settings">
+ <action description="Modifier la musique et les médias"
+ longdescription="Changez la musique et les médias à partir du menu À propos du terrain > Médias."
+ name="land change media" value="20" />
+ <action description="Changer l'option Modifier le terrain"
+ longdescription="Changez l'option Modifier le terrain à partir du menu À propos du terrain > Options. Attention : ce pouvoir permet de terraformer votre terrain et de placer ou déplacer des plantes Linden. Assurez-vous de bien comprendre ce pouvoir avant de l'attribuer. "
+ name="land edit" value="21" />
+ <action
+ description="Changer diverses options du terrain"
+ longdescription="Changez diverses options de la parcelle à partir du menu À propos du terrain > Options. Vous pouvez permettre aux autres résidents de voler, créer des objets, modifier le terrain, lancer des scripts, créer des repères etc."
+ name="land options" value="22" />
+ </action_set>
+ <action_set
+ description="Ces pouvoirs permettent aux membres d'outrepasser les restrictions sur les parcelles du groupe."
+ name="Parcel Powers">
+ <action description="Toujours autoriser Modifier le terrain"
+ longdescription="Vous pouvez modifier le relief d'une parcelle du groupe, même si l'option est désactivée à partir du menu À propos du terrain > Options."
+ name="land allow edit land" value="23" />
+ <action description="Toujours autoriser à voler"
+ longdescription="Vous pouvez voler sur une parcelle du groupe, même si l'option est désactivée à partir du menu À propos du terrain > Options."
+ name="land allow fly" value="24" />
+ <action description="Toujours autoriser à créer des objets"
+ longdescription="Vous pouvez créer des objets sur une parcelle du groupe, même si l'option est désactivée à partir du menu À propos du terrain > Options."
+ name="land allow create" value="25" />
+ <action description="Toujours autoriser à créer des repères"
+ longdescription="Vous pouvez créer un repère sur une parcelle du groupe, même si l'option est désactivée à partir du menu À propos du terrain > Options."
+ name="land allow landmark" value="26" />
+ <action description="Autoriser à définir un domicile sur le terrain du groupe"
+ longdescription="Vous pouvez définir votre domicile sur une parcelle du groupe à partir du menu Monde > Définir comme domicile."
+ name="land allow set home" value="28" />
+ </action_set>
+ <action_set
+ description="Ces pouvoirs permettent d'autoriser ou d'interdire l'accès à des parcelles du groupe et de geler ou d'expulser des résidents."
+ name="Parcel Access">
+ <action description="Gérer la liste d'accès à la parcelle"
+ longdescription="Gérez la liste des résidents autorisés sur la parcelle à partir du menu À propos du terrain > Accès."
+ name="land manage allowed" value="29" />
+ <action description="Gérer la liste noire de cette parcelle"
+ longdescription="Gérez la liste des résidents interdits sur la parcelle à partir du menu À propos du terrain > Interdire."
+ name="land manage banned" value="30" />
+ <action description="Vendre des pass"
+ longdescription="Choisissez le prix et la durée des pass pour accéder à la parcelle à partir du menu À propos du terrain > Accès."
+ name="land manage passes" value="31" />
+ <action description="Expulser et geler des résidents"
+ longdescription="Vous pouvez expulser ou geler un résident indésirable en cliquant-droit sur lui, menu radial > Plus."
+ name="land admin" value="32" />
+ </action_set>
+ <action_set
+ description="Ces pouvoirs permettent de renvoyer des objets du groupe et de placer ou déplacer des plantes Linden pour aménager le paysage. Utilisez ce pouvoir avec précaution car les objets renvoyés le sont définitivement."
+ name="Parcel Content">
+ <action description="Renvoyer les objets transférés au groupe"
+ longdescription="Vous pouvez renvoyer des objets appartenant au groupe à partir du menu À propos du terrain > Objets."
+ name="land return group owned" value="48" />
+ <action description="Renvoyer les objets attribués au groupe"
+ longdescription="Renvoyez les objets attribués au groupe et sur des parcelles du groupe à partir du menu À propos du terrain > Objets."
+ name="land return group set" value="33" />
+ <action description="Renvoyer des objets n'appartenant pas au groupe"
+ longdescription="Renvoyez les objets n'appartenant pas au groupe et sur des parcelles du groupe à partir du menu À propos du terrain > Objets."
+ name="land return non group" value="34" />
+ <action description="Aménager le paysage avec des plantes Linden"
+ longdescription="Placez et déplacez des arbres, plantes et herbes Linden. Vous les trouverez dans le dossier Objets de la bibliothèque de votre inventaire mais aussi à partir du menu Construire."
+ name="land gardening" value="35" />
+ </action_set>
+ <action_set
+ description="Ces pouvoirs permettent de transférer, modifier et vendre des objets du groupe. Ces changements se font à partir du menu Construire > Modifier > Général."
+ name="Object Management">
+ <action description="Transférer des objets au groupe"
+ longdescription="Transférez des objets au groupe à partir du menu Construire > Modifier > Général."
+ name="object deed" value="36" />
+ <action
+ description="Manipuler les objets du groupe"
+ longdescription="Déplacez, copiez et modifiez les objets du groupe à partir du menu Construire > Modifier > Général."
+ name="object manipulate" value="38" />
+ <action description="Vendre des objets du groupe"
+ longdescription="Mettez en vente des objets du groupe à partir du menu Construire > Modifier > Général."
+ name="object set sale" value="39" />
+ </action_set>
+ <action_set
+ description="Ce pouvoir définit les contributions aux frais du groupe, la réception des dividendes et l'accès aux finances du groupe."
+ name="Accounting">
+ <action description="Contribuer aux frais du groupe et recevoir des dividendes"
+ longdescription="Contribuez aux frais du groupe et recevez des dividendes en cas de bénéfices. Vous recevrez une partie des ventes de terrains et objets appartenant au groupe et contribuerez aux frais divers (mise en vente des terrains etc.)"
+ name="accounting accountable" value="40" />
+ </action_set>
+ <action_set
+ description="Envoyez, recevez et consultez les notices du groupe."
+ name="Notices">
+ <action description="Envoyer des notices"
+ longdescription="Envoyez des notices à l'onglet Notices."
+ name="notices send" value="42" />
+ <action description="Recevoir et consulter les notices"
+ longdescription="Recevez des notices et consulter d'anciennes notices à l'onglet Notices."
+ name="notices receive" value="43" />
+ </action_set>
+ <action_set
+ description="Ces pouvoirs permettent de créer de nouvelles propositions, de voter et de consulter l'historique des votes."
+ name="Proposals">
+ <action description="Créer des propositions"
+ longdescription="Ces pouvoirs permettent de créer des propositions et de les soumettre au vote, à partir du menu Profil du groupe > Propositions."
+ name="proposal start" value="44" />
+ <action description="Voter les propositions"
+ longdescription="Votez les propositions à partir du menu Profil du groupe > Propositions."
+ name="proposal vote" value="45" />
+ </action_set>
+ <action_set
+ description="Ces pouvoirs vous permettent de gérer l'accès aux sessions de chat écrit ou vocal du groupe."
+ name="Chat">
+ <action description="Participer aux chats"
+ longdescription="Participez aux chats du groupe."
+ name="join group chat" />
+ <action description="Participer au chat vocal"
+ longdescription="Participez au chat vocal du groupe. Remarque : vous devez au préalable avoir le pouvoir de participer aux chats."
+ name="join voice chat" />
+ <action description="Modérer les chats"
+ longdescription="Contrôlez l'accès et la participation aux chats de groupe écrits et vocaux."
+ name="moderate group chat" />
+ </action_set>
+</role_actions>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 142c87047b..b0efe4f510 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1,466 +1,466 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- This file contains strings that used to be hardcoded in the source.
- It is only for those strings which don't belong in a floater.
- For example, the strings used in avatar chat bubbles, and strings
- that are returned from one component and may appear in many places-->
-<strings>
- <string name="LoginInProgress">
- La connexion à [APP_NAME] apparaît peut-être comme étant gelée. Veuillez patienter.
- </string>
- <string name="LoginAuthenticating">
- Authentification en cours
- </string>
- <string name="LoginMaintenance">
- Maintenance du compte en cours…
- </string>
- <string name="LoginAttempt">
- La tentative de connexion précédente a échoué. Connexion, esssai [NUMBER]
- </string>
- <string name="LoginPrecaching">
- Monde en cours de chargement…
- </string>
- <string name="LoginInitializingBrowser">
- Navigateur Web incorporé en cours d'initialisation…
- </string>
- <string name="LoginInitializingMultimedia">
- Multimédia en cours d'initialisation…
- </string>
- <string name="LoginVerifyingCache">
- Fichiers du cache en cours de vérification (peut prendre 60-90 s)...
- </string>
- <string name="LoginProcessingResponse">
- Réponse en cours de traitement…
- </string>
- <string name="LoginInitializingWorld">
- Monde en cours d'initialisation…
- </string>
- <string name="LoginDecodingImages">
- Décodage des images en cours...
- </string>
- <string name="LoginInitializingQuicktime">
- Quicktime en cours d'initialisation
- </string>
- <string name="LoginQuicktimeNotFound">
- Quicktime introuvable, impossible de procéder à l'initialisation.
- </string>
- <string name="LoginQuicktimeOK">
- Initialisation de Quicktime réussie.
- </string>
- <string name="LoginWaitingForRegionHandshake">
- Liaison avec la région en cours de création...
- </string>
- <string name="LoginConnectingToRegion">
- Connexion avec la région en cours...
- </string>
- <string name="LoginDownloadingClothing">
- Habits en cours de téléchargement...
- </string>
- <string name="AgentLostConnection">
- Il y a peut-être des problèmes techniques dans cette region. Veuillez vérifier votre connexion Internet.
- </string>
- <string name="TooltipPerson">
- Personne
- </string>
- <string name="TooltipNoName">
- (pas de nom)
- </string>
- <string name="TooltipOwner">
- Propriétaire :
- </string>
- <string name="TooltipPublic">
- Public
- </string>
- <string name="TooltipIsGroup">
- (Groupe)
- </string>
- <string name="TooltipFlagScript">
- Script
- </string>
- <string name="TooltipFlagPhysics">
- Propriétés physique
- </string>
- <string name="TooltipFlagTouch">
- Toucher
- </string>
- <string name="TooltipFlagL$">
- L$
- </string>
- <string name="TooltipFlagDropInventory">
- Laisser tomber l'inventaire
- </string>
- <string name="TooltipFlagPhantom">
- Fantôme
- </string>
- <string name="TooltipFlagTemporary">
- Temporaire
- </string>
- <string name="TooltipFlagRightClickMenu">
- (cliquez à droite pour le menu)
- </string>
- <string name="TooltipFreeToCopy">
- Copie autorisée
- </string>
- <string name="TooltipForSaleL$">
- À vendre : [AMOUNT] L$
- </string>
- <string name="TooltipForSaleMsg">
- À vendre : [MESSAGE]
- </string>
- <string name="TooltipFlagGroupBuild">
- Contruction de groupe
- </string>
- <string name="TooltipFlagNoBuild">
- Pas de construction
- </string>
- <string name="TooltipFlagNoEdit">
- Contruction de groupe
- </string>
- <string name="TooltipFlagNotSafe">
- Non sécurisé
- </string>
- <string name="TooltipFlagNoFly">
- Interdiction de voler
- </string>
- <string name="TooltipFlagGroupScripts">
- Scripts de groupe
- </string>
- <string name="TooltipFlagNoScripts">
- Pas de scripts
- </string>
- <string name="TooltipLand">
- Terrain :
- </string>
- <string name="TooltipMustSingleDrop">
- Impossible de faire glisser plus d'un objet ici
- </string>
- <string name="RetrievingData">
- En cours d'extraction...
- </string>
- <string name="ReleaseNotes">
- Notes de version
- </string>
- <string name="LoadingData">
- Chargement..
- </string>
- <string name="AvatarNameNobody">
- (personne)
- </string>
- <string name="AvatarNameWaiting">
- (en attente)
- </string>
- <string name="AvatarNameHippos">
- (hippos)
- </string>
- <string name="GroupNameNone">
- (aucun)
- </string>
- <string name="AssetErrorNone">
- Aucune erreur
- </string>
- <string name="AssetErrorRequestFailed">
- Requête de l'actif : échec
- </string>
- <string name="AssetErrorNonexistentFile">
- Requête de l'actif : fichier inexistant
- </string>
- <string name="AssetErrorNotInDatabase">
- Requête de l'actif : actif introuvable dans la base de données
- </string>
- <string name="AssetErrorEOF">
- Fin du ficher
- </string>
- <string name="AssetErrorCannotOpenFile">
- Impossible d'ouvrir le fichier
- </string>
- <string name="AssetErrorFileNotFound">
- Fichier introuvable
- </string>
- <string name="AssetErrorTCPTimeout">
- Délai d'attente du transfert du fichier dépassé
- </string>
- <string name="AssetErrorCircuitGone">
- Disparition du circuit
- </string>
- <string name="AssetErrorPriceMismatch">
- Il y a une différence de prix entre le client et le serveur
- </string>
- <string name="AssetErrorUnknownStatus">
- Statut inconnu
- </string>
- <string name="AvatarEditingApparance">
- (Apparence en cours de modification)
- </string>
- <string name="AvatarAway">
- Absent
- </string>
- <string name="AvatarBusy">
- Occupé
- </string>
- <string name="AvatarMuted">
- Ignoré
- </string>
- <string name="anim_express_afraid">
- Effrayé
- </string>
- <string name="anim_express_anger">
- En colère
- </string>
- <string name="anim_away">
- Absent
- </string>
- <string name="anim_backflip">
- Salto arrière
- </string>
- <string name="anim_express_laugh">
- Rire en se tenant le ventre
- </string>
- <string name="anim_express_toothsmile">
- Grand sourire
- </string>
- <string name="anim_blowkiss">
- Envoyer un baiser
- </string>
- <string name="anim_express_bored">
- Bailler d'ennui
- </string>
- <string name="anim_bow">
- S'incliner
- </string>
- <string name="anim_clap">
- Applaudir
- </string>
- <string name="anim_courtbow">
- Révérence de cour
- </string>
- <string name="anim_express_cry">
- Pleurer
- </string>
- <string name="anim_dance1">
- Danse 1
- </string>
- <string name="anim_dance2">
- Danse 2
- </string>
- <string name="anim_dance3">
- Danse 3
- </string>
- <string name="anim_dance4">
- Danse 4
- </string>
- <string name="anim_dance5">
- Danse 5
- </string>
- <string name="anim_dance6">
- Danse 6
- </string>
- <string name="anim_dance7">
- Danse 7
- </string>
- <string name="anim_dance8">
- Danse 8
- </string>
- <string name="anim_express_disdain">
- Mépris
- </string>
- <string name="anim_drink">
- Boire
- </string>
- <string name="anim_express_embarrased">
- Gêne
- </string>
- <string name="anim_angry_fingerwag">
- Désapprobation
- </string>
- <string name="anim_fist_pump">
- Victoire
- </string>
- <string name="anim_yoga_float">
- Yoga
- </string>
- <string name="anim_express_frown">
- Froncer les sourcils
- </string>
- <string name="anim_impatient">
- Impatient
- </string>
- <string name="anim_jumpforjoy">
- Sauter de joie
- </string>
- <string name="anim_kissmybutt">
- Va te faire voir !
- </string>
- <string name="anim_express_kiss">
- Baiser
- </string>
- <string name="anim_laugh_short">
- Rire
- </string>
- <string name="anim_musclebeach">
- Montrer ses muscles
- </string>
- <string name="anim_no_unhappy">
- Non (mécontent)
- </string>
- <string name="anim_no_head">
- Non
- </string>
- <string name="anim_nyanya">
- Na na na na nère
- </string>
- <string name="anim_punch_onetwo">
- Gauche-droite
- </string>
- <string name="anim_express_open_mouth">
- Bouche ouverte
- </string>
- <string name="anim_peace">
- Paix
- </string>
- <string name="anim_point_you">
- Montrer quelqu'un du doigt
- </string>
- <string name="anim_point_me">
- Se montrer du doigt
- </string>
- <string name="anim_punch_l">
- Gauche
- </string>
- <string name="anim_punch_r">
- Droite
- </string>
- <string name="anim_rps_countdown">
- Compter (pierre-papier-ciseaux)
- </string>
- <string name="anim_rps_paper">
- Papier (pierre-papier-ciseaux)
- </string>
- <string name="anim_rps_rock">
- Pierre (pierre-papier-ciseaux)
- </string>
- <string name="anim_rps_scissors">
- Ciseaux (pierre-papier-ciseaux)
- </string>
- <string name="anim_express_repulsed">
- Dégoût
- </string>
- <string name="anim_kick_roundhouse_r">
- Coup de pied circulaire
- </string>
- <string name="anim_express_sad">
- Triste
- </string>
- <string name="anim_salute">
- Salut
- </string>
- <string name="anim_shout">
- Crier
- </string>
- <string name="anim_express_shrug">
- Hausser les épaules
- </string>
- <string name="anim_express_smile">
- Sourire
- </string>
- <string name="anim_smoke_idle">
- Fumer, immobile
- </string>
- <string name="anim_smoke_inhale">
- Fumer, prendre une bouffée
- </string>
- <string name="anim_smoke_throw_down">
- Fumer, jeter son mégot
- </string>
- <string name="anim_express_surprise">
- Surprise
- </string>
- <string name="anim_sword_strike_r">
- Coup d'épée
- </string>
- <string name="anim_angry_tantrum">
- Caprice
- </string>
- <string name="anim_express_tongue_out">
- Tirer la langue
- </string>
- <string name="anim_hello">
- Faire signe
- </string>
- <string name="anim_whisper">
- Chuchoter
- </string>
- <string name="anim_whistle">
- Siffler
- </string>
- <string name="anim_express_wink">
- Clin d'Å“il
- </string>
- <string name="anim_wink_hollywood">
- Clin d'Å“il (Hollywood)
- </string>
- <string name="anim_express_worry">
- Soucis
- </string>
- <string name="anim_yes_happy">
- Oui (Joie)
- </string>
- <string name="anim_yes_head">
- Oui
- </string>
- <string name="texture_loading">
- Chargement...
- </string>
- <string name="worldmap_offline">
- Hors ligne
- </string>
- <string name="whisper">
- chuchote :
- </string>
- <string name="shout">
- crie :
- </string>
- <string name="all_files">
- Tous fichiers
- </string>
- <string name="sound_files">
- Sons
- </string>
- <string name="animation_files">
- Animations
- </string>
- <string name="image_files">
- Images
- </string>
- <string name="save_file_verb">
- Enregistrer
- </string>
- <string name="load_file_verb">
- Charger
- </string>
- <string name="targa_image_files">
- Images Targa
- </string>
- <string name="bitmap_image_files">
- Images Bitmap
- </string>
- <string name="avi_movie_file">
- Fichier de film AVI
- </string>
- <string name="xaf_animation_file">
- Fichier d'animation XAF
- </string>
- <string name="xml_file">
- Fichier XML
- </string>
- <string name="dot_raw_file">
- Fichier RAW
- </string>
- <string name="compressed_image_files">
- Images compressées
- </string>
- <string name="load_files">
- Charger des fichiers
- </string>
- <string name="choose_the_directory">
- Choisir le répertoire
- </string>
-</strings>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This file contains strings that used to be hardcoded in the source.
+ It is only for those strings which don't belong in a floater.
+ For example, the strings used in avatar chat bubbles, and strings
+ that are returned from one component and may appear in many places-->
+<strings>
+ <string name="LoginInProgress">
+ La connexion à [APP_NAME] apparaît peut-être comme étant gelée. Veuillez patienter.
+ </string>
+ <string name="LoginAuthenticating">
+ Authentification en cours
+ </string>
+ <string name="LoginMaintenance">
+ Maintenance du compte en cours…
+ </string>
+ <string name="LoginAttempt">
+ La tentative de connexion précédente a échoué. Connexion, esssai [NUMBER]
+ </string>
+ <string name="LoginPrecaching">
+ Monde en cours de chargement…
+ </string>
+ <string name="LoginInitializingBrowser">
+ Navigateur Web incorporé en cours d'initialisation…
+ </string>
+ <string name="LoginInitializingMultimedia">
+ Multimédia en cours d'initialisation…
+ </string>
+ <string name="LoginVerifyingCache">
+ Fichiers du cache en cours de vérification (peut prendre 60-90 s)...
+ </string>
+ <string name="LoginProcessingResponse">
+ Réponse en cours de traitement…
+ </string>
+ <string name="LoginInitializingWorld">
+ Monde en cours d'initialisation…
+ </string>
+ <string name="LoginDecodingImages">
+ Décodage des images en cours...
+ </string>
+ <string name="LoginInitializingQuicktime">
+ Quicktime en cours d'initialisation
+ </string>
+ <string name="LoginQuicktimeNotFound">
+ Quicktime introuvable, impossible de procéder à l'initialisation.
+ </string>
+ <string name="LoginQuicktimeOK">
+ Initialisation de Quicktime réussie.
+ </string>
+ <string name="LoginWaitingForRegionHandshake">
+ Liaison avec la région en cours de création...
+ </string>
+ <string name="LoginConnectingToRegion">
+ Connexion avec la région en cours...
+ </string>
+ <string name="LoginDownloadingClothing">
+ Habits en cours de téléchargement...
+ </string>
+ <string name="AgentLostConnection">
+ Il y a peut-être des problèmes techniques dans cette region. Veuillez vérifier votre connexion Internet.
+ </string>
+ <string name="TooltipPerson">
+ Personne
+ </string>
+ <string name="TooltipNoName">
+ (pas de nom)
+ </string>
+ <string name="TooltipOwner">
+ Propriétaire :
+ </string>
+ <string name="TooltipPublic">
+ Public
+ </string>
+ <string name="TooltipIsGroup">
+ (Groupe)
+ </string>
+ <string name="TooltipFlagScript">
+ Script
+ </string>
+ <string name="TooltipFlagPhysics">
+ Propriétés physique
+ </string>
+ <string name="TooltipFlagTouch">
+ Toucher
+ </string>
+ <string name="TooltipFlagL$">
+ L$
+ </string>
+ <string name="TooltipFlagDropInventory">
+ Laisser tomber l'inventaire
+ </string>
+ <string name="TooltipFlagPhantom">
+ Fantôme
+ </string>
+ <string name="TooltipFlagTemporary">
+ Temporaire
+ </string>
+ <string name="TooltipFlagRightClickMenu">
+ (cliquez à droite pour le menu)
+ </string>
+ <string name="TooltipFreeToCopy">
+ Copie autorisée
+ </string>
+ <string name="TooltipForSaleL$">
+ À vendre : [AMOUNT] L$
+ </string>
+ <string name="TooltipForSaleMsg">
+ À vendre : [MESSAGE]
+ </string>
+ <string name="TooltipFlagGroupBuild">
+ Contruction de groupe
+ </string>
+ <string name="TooltipFlagNoBuild">
+ Pas de construction
+ </string>
+ <string name="TooltipFlagNoEdit">
+ Contruction de groupe
+ </string>
+ <string name="TooltipFlagNotSafe">
+ Non sécurisé
+ </string>
+ <string name="TooltipFlagNoFly">
+ Interdiction de voler
+ </string>
+ <string name="TooltipFlagGroupScripts">
+ Scripts de groupe
+ </string>
+ <string name="TooltipFlagNoScripts">
+ Pas de scripts
+ </string>
+ <string name="TooltipLand">
+ Terrain :
+ </string>
+ <string name="TooltipMustSingleDrop">
+ Impossible de faire glisser plus d'un objet ici
+ </string>
+ <string name="RetrievingData">
+ En cours d'extraction...
+ </string>
+ <string name="ReleaseNotes">
+ Notes de version
+ </string>
+ <string name="LoadingData">
+ Chargement..
+ </string>
+ <string name="AvatarNameNobody">
+ (personne)
+ </string>
+ <string name="AvatarNameWaiting">
+ (en attente)
+ </string>
+ <string name="AvatarNameHippos">
+ (hippos)
+ </string>
+ <string name="GroupNameNone">
+ (aucun)
+ </string>
+ <string name="AssetErrorNone">
+ Aucune erreur
+ </string>
+ <string name="AssetErrorRequestFailed">
+ Requête de l'actif : échec
+ </string>
+ <string name="AssetErrorNonexistentFile">
+ Requête de l'actif : fichier inexistant
+ </string>
+ <string name="AssetErrorNotInDatabase">
+ Requête de l'actif : actif introuvable dans la base de données
+ </string>
+ <string name="AssetErrorEOF">
+ Fin du ficher
+ </string>
+ <string name="AssetErrorCannotOpenFile">
+ Impossible d'ouvrir le fichier
+ </string>
+ <string name="AssetErrorFileNotFound">
+ Fichier introuvable
+ </string>
+ <string name="AssetErrorTCPTimeout">
+ Délai d'attente du transfert du fichier dépassé
+ </string>
+ <string name="AssetErrorCircuitGone">
+ Disparition du circuit
+ </string>
+ <string name="AssetErrorPriceMismatch">
+ Il y a une différence de prix entre le client et le serveur
+ </string>
+ <string name="AssetErrorUnknownStatus">
+ Statut inconnu
+ </string>
+ <string name="AvatarEditingApparance">
+ (Apparence en cours de modification)
+ </string>
+ <string name="AvatarAway">
+ Absent
+ </string>
+ <string name="AvatarBusy">
+ Occupé
+ </string>
+ <string name="AvatarMuted">
+ Ignoré
+ </string>
+ <string name="anim_express_afraid">
+ Effrayé
+ </string>
+ <string name="anim_express_anger">
+ En colère
+ </string>
+ <string name="anim_away">
+ Absent
+ </string>
+ <string name="anim_backflip">
+ Salto arrière
+ </string>
+ <string name="anim_express_laugh">
+ Rire en se tenant le ventre
+ </string>
+ <string name="anim_express_toothsmile">
+ Grand sourire
+ </string>
+ <string name="anim_blowkiss">
+ Envoyer un baiser
+ </string>
+ <string name="anim_express_bored">
+ Bailler d'ennui
+ </string>
+ <string name="anim_bow">
+ S'incliner
+ </string>
+ <string name="anim_clap">
+ Applaudir
+ </string>
+ <string name="anim_courtbow">
+ Révérence de cour
+ </string>
+ <string name="anim_express_cry">
+ Pleurer
+ </string>
+ <string name="anim_dance1">
+ Danse 1
+ </string>
+ <string name="anim_dance2">
+ Danse 2
+ </string>
+ <string name="anim_dance3">
+ Danse 3
+ </string>
+ <string name="anim_dance4">
+ Danse 4
+ </string>
+ <string name="anim_dance5">
+ Danse 5
+ </string>
+ <string name="anim_dance6">
+ Danse 6
+ </string>
+ <string name="anim_dance7">
+ Danse 7
+ </string>
+ <string name="anim_dance8">
+ Danse 8
+ </string>
+ <string name="anim_express_disdain">
+ Mépris
+ </string>
+ <string name="anim_drink">
+ Boire
+ </string>
+ <string name="anim_express_embarrased">
+ Gêne
+ </string>
+ <string name="anim_angry_fingerwag">
+ Désapprobation
+ </string>
+ <string name="anim_fist_pump">
+ Victoire
+ </string>
+ <string name="anim_yoga_float">
+ Yoga
+ </string>
+ <string name="anim_express_frown">
+ Froncer les sourcils
+ </string>
+ <string name="anim_impatient">
+ Impatient
+ </string>
+ <string name="anim_jumpforjoy">
+ Sauter de joie
+ </string>
+ <string name="anim_kissmybutt">
+ Va te faire voir !
+ </string>
+ <string name="anim_express_kiss">
+ Baiser
+ </string>
+ <string name="anim_laugh_short">
+ Rire
+ </string>
+ <string name="anim_musclebeach">
+ Montrer ses muscles
+ </string>
+ <string name="anim_no_unhappy">
+ Non (mécontent)
+ </string>
+ <string name="anim_no_head">
+ Non
+ </string>
+ <string name="anim_nyanya">
+ Na na na na nère
+ </string>
+ <string name="anim_punch_onetwo">
+ Gauche-droite
+ </string>
+ <string name="anim_express_open_mouth">
+ Bouche ouverte
+ </string>
+ <string name="anim_peace">
+ Paix
+ </string>
+ <string name="anim_point_you">
+ Montrer quelqu'un du doigt
+ </string>
+ <string name="anim_point_me">
+ Se montrer du doigt
+ </string>
+ <string name="anim_punch_l">
+ Gauche
+ </string>
+ <string name="anim_punch_r">
+ Droite
+ </string>
+ <string name="anim_rps_countdown">
+ Compter (pierre-papier-ciseaux)
+ </string>
+ <string name="anim_rps_paper">
+ Papier (pierre-papier-ciseaux)
+ </string>
+ <string name="anim_rps_rock">
+ Pierre (pierre-papier-ciseaux)
+ </string>
+ <string name="anim_rps_scissors">
+ Ciseaux (pierre-papier-ciseaux)
+ </string>
+ <string name="anim_express_repulsed">
+ Dégoût
+ </string>
+ <string name="anim_kick_roundhouse_r">
+ Coup de pied circulaire
+ </string>
+ <string name="anim_express_sad">
+ Triste
+ </string>
+ <string name="anim_salute">
+ Salut
+ </string>
+ <string name="anim_shout">
+ Crier
+ </string>
+ <string name="anim_express_shrug">
+ Hausser les épaules
+ </string>
+ <string name="anim_express_smile">
+ Sourire
+ </string>
+ <string name="anim_smoke_idle">
+ Fumer, immobile
+ </string>
+ <string name="anim_smoke_inhale">
+ Fumer, prendre une bouffée
+ </string>
+ <string name="anim_smoke_throw_down">
+ Fumer, jeter son mégot
+ </string>
+ <string name="anim_express_surprise">
+ Surprise
+ </string>
+ <string name="anim_sword_strike_r">
+ Coup d'épée
+ </string>
+ <string name="anim_angry_tantrum">
+ Caprice
+ </string>
+ <string name="anim_express_tongue_out">
+ Tirer la langue
+ </string>
+ <string name="anim_hello">
+ Faire signe
+ </string>
+ <string name="anim_whisper">
+ Chuchoter
+ </string>
+ <string name="anim_whistle">
+ Siffler
+ </string>
+ <string name="anim_express_wink">
+ Clin d'Å“il
+ </string>
+ <string name="anim_wink_hollywood">
+ Clin d'Å“il (Hollywood)
+ </string>
+ <string name="anim_express_worry">
+ Soucis
+ </string>
+ <string name="anim_yes_happy">
+ Oui (Joie)
+ </string>
+ <string name="anim_yes_head">
+ Oui
+ </string>
+ <string name="texture_loading">
+ Chargement...
+ </string>
+ <string name="worldmap_offline">
+ Hors ligne
+ </string>
+ <string name="whisper">
+ chuchote :
+ </string>
+ <string name="shout">
+ crie :
+ </string>
+ <string name="all_files">
+ Tous fichiers
+ </string>
+ <string name="sound_files">
+ Sons
+ </string>
+ <string name="animation_files">
+ Animations
+ </string>
+ <string name="image_files">
+ Images
+ </string>
+ <string name="save_file_verb">
+ Enregistrer
+ </string>
+ <string name="load_file_verb">
+ Charger
+ </string>
+ <string name="targa_image_files">
+ Images Targa
+ </string>
+ <string name="bitmap_image_files">
+ Images Bitmap
+ </string>
+ <string name="avi_movie_file">
+ Fichier de film AVI
+ </string>
+ <string name="xaf_animation_file">
+ Fichier d'animation XAF
+ </string>
+ <string name="xml_file">
+ Fichier XML
+ </string>
+ <string name="dot_raw_file">
+ Fichier RAW
+ </string>
+ <string name="compressed_image_files">
+ Images compressées
+ </string>
+ <string name="load_files">
+ Charger des fichiers
+ </string>
+ <string name="choose_the_directory">
+ Choisir le répertoire
+ </string>
+</strings>
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml
index 9ce079fff8..91455297ad 100644
--- a/indra/newview/skins/default/xui/fr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/fr/teleport_strings.xml
@@ -1,90 +1,90 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<teleport_messages name="">
- <message_set name="errors">
- <message name="invalid_tport">
- Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être
-vous reconnecter avant de pouvoir être téléporté. Si vous continuez
-à recevoir ce message, veuillez consulter notre FAQ technique à  la page suivante :
-www.secondlife.com/support
- </message>
- <message name="invalid_region_handoff">
- Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être
-vous reconnecter avant de pouvoir être téléporté. Si vous continuez
-à recevoir ce message, veuillez consulter notre FAQ technique à  la page suivante :
-www.secondlife.com/support.
- </message>
- <message name="blocked_tport">
- Désolé, la téléportation est bloquée actuellement. Veuillez réessayer dans un moment.
-Si vous ne parvenez toujours pas à être téléporté, déconnectez-vous puis reconnectez-vous
-pour résoudre le problème.
- </message>
- <message name="nolandmark_tport">
- Désolé, le système n'a pas réussi à localiser la destination de votre repère.
- </message>
- <message name="timeout_tport">
- Désolé, la connexion vers votre lieu de téléportation n'a pas abouti.
-Veuillez réessayer dans un moment.
- </message>
- <message name="noaccess_tport">
- Désolé, vous n'avez pas accès à cette destination.
- </message>
- <message name="missing_attach_tport">
- Vos pieces-jointes ne sont pas encore arrivées. Attendez quelques
-secondes de plus ou déconnectez-vous puis reconnectez-vous avant d'essayer
-de vous téléporter.
- </message>
- <message name="too_many_uploads_tport">
- Le trafic vers cette région est bouché en ce moment. Votre téléportation
-ne pourra pas avoir lieu immédiatement. Veuillez réessayer
-dans quelques minutes ou bien aller dans une zone moins fréquentée.
- </message>
- <message name="expired_tport">
- Désolé, votre demande de téléportation n'a pas abouti
-assez rapidement. Veuillez réessayer dans quelques minutes.
- </message>
- <message name="expired_region_handoff">
- Désolé, votre demande pour passer dans une autre région n'a pas abouti
-assez rapidement. Veuillez réessayer dans quelques minutes.
- </message>
- <message name="no_host">
- Impossible de trouver la destination de la téléportation. Il est possible que cette destination soit
-temporairement indisponible ou qu'elle n'existe plus. Veuillez réessayer
-dans quelques minutes.
- </message>
- <message name="no_inventory_host">
- L'inventaire est temporairement indisponible.
- </message>
- </message_set>
- <message_set name="progress">
- <message name="sending_dest">
- Envoi vers la destination en cours.
- </message>
- <message name="redirecting">
- Redirection vers un emplacement différent en cours.
- </message>
- <message name="relaying">
- Relai vers la destination en cours.
- </message>
- <message name="sending_home">
- Requête de la demande d'envoi vers votre domicile en cours.
- </message>
- <message name="sending_landmark">
- Requête de la demande d'envoi vers le repère en cours.
- </message>
- <message name="completing">
- Téléportation sur le point d'aboutir.
- </message>
- <message name="resolving">
- Destination en cours de résolution.
- </message>
- <message name="contacting">
- Contact avec la nouvelle région en cours.
- </message>
- <message name="arriving">
- Vous arrivez...
- </message>
- <message name="requesting">
- Demande de téléportation en cours...
- </message>
- </message_set>
-</teleport_messages>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<teleport_messages name="">
+ <message_set name="errors">
+ <message name="invalid_tport">
+ Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être
+vous reconnecter avant de pouvoir être téléporté. Si vous continuez
+à recevoir ce message, veuillez consulter notre FAQ technique à  la page suivante :
+www.secondlife.com/support
+ </message>
+ <message name="invalid_region_handoff">
+ Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être
+vous reconnecter avant de pouvoir être téléporté. Si vous continuez
+à recevoir ce message, veuillez consulter notre FAQ technique à  la page suivante :
+www.secondlife.com/support.
+ </message>
+ <message name="blocked_tport">
+ Désolé, la téléportation est bloquée actuellement. Veuillez réessayer dans un moment.
+Si vous ne parvenez toujours pas à être téléporté, déconnectez-vous puis reconnectez-vous
+pour résoudre le problème.
+ </message>
+ <message name="nolandmark_tport">
+ Désolé, le système n'a pas réussi à localiser la destination de votre repère.
+ </message>
+ <message name="timeout_tport">
+ Désolé, la connexion vers votre lieu de téléportation n'a pas abouti.
+Veuillez réessayer dans un moment.
+ </message>
+ <message name="noaccess_tport">
+ Désolé, vous n'avez pas accès à cette destination.
+ </message>
+ <message name="missing_attach_tport">
+ Vos pieces-jointes ne sont pas encore arrivées. Attendez quelques
+secondes de plus ou déconnectez-vous puis reconnectez-vous avant d'essayer
+de vous téléporter.
+ </message>
+ <message name="too_many_uploads_tport">
+ Le trafic vers cette région est bouché en ce moment. Votre téléportation
+ne pourra pas avoir lieu immédiatement. Veuillez réessayer
+dans quelques minutes ou bien aller dans une zone moins fréquentée.
+ </message>
+ <message name="expired_tport">
+ Désolé, votre demande de téléportation n'a pas abouti
+assez rapidement. Veuillez réessayer dans quelques minutes.
+ </message>
+ <message name="expired_region_handoff">
+ Désolé, votre demande pour passer dans une autre région n'a pas abouti
+assez rapidement. Veuillez réessayer dans quelques minutes.
+ </message>
+ <message name="no_host">
+ Impossible de trouver la destination de la téléportation. Il est possible que cette destination soit
+temporairement indisponible ou qu'elle n'existe plus. Veuillez réessayer
+dans quelques minutes.
+ </message>
+ <message name="no_inventory_host">
+ L'inventaire est temporairement indisponible.
+ </message>
+ </message_set>
+ <message_set name="progress">
+ <message name="sending_dest">
+ Envoi vers la destination en cours.
+ </message>
+ <message name="redirecting">
+ Redirection vers un emplacement différent en cours.
+ </message>
+ <message name="relaying">
+ Relai vers la destination en cours.
+ </message>
+ <message name="sending_home">
+ Requête de la demande d'envoi vers votre domicile en cours.
+ </message>
+ <message name="sending_landmark">
+ Requête de la demande d'envoi vers le repère en cours.
+ </message>
+ <message name="completing">
+ Téléportation sur le point d'aboutir.
+ </message>
+ <message name="resolving">
+ Destination en cours de résolution.
+ </message>
+ <message name="contacting">
+ Contact avec la nouvelle région en cours.
+ </message>
+ <message name="arriving">
+ Vous arrivez...
+ </message>
+ <message name="requesting">
+ Demande de téléportation en cours...
+ </message>
+ </message_set>
+</teleport_messages>
diff --git a/indra/newview/skins/default/xui/fr/xui_version.xml b/indra/newview/skins/default/xui/fr/xui_version.xml
index ee2a0be745..0e777751d3 100644
--- a/indra/newview/skins/default/xui/fr/xui_version.xml
+++ b/indra/newview/skins/default/xui/fr/xui_version.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xui_version>
- 1.0
-</xui_version>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xui_version>
+ 1.0
+</xui_version>
diff --git a/indra/newview/skins/default/xui/it/floater_snapshot.xml b/indra/newview/skins/default/xui/it/floater_snapshot.xml
index 8febc6d898..7729d84fa6 100644
--- a/indra/newview/skins/default/xui/it/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/it/floater_snapshot.xml
@@ -21,12 +21,8 @@
<button label="Invia" name="send_btn"/>
<button label="Salva ([AMOUNT] L$)" name="upload_btn"/>
<flyout_button label="Salva" name="save_btn" tool_tip="Salva l'immagine come file">
- <flyout_button_item name="save_item">
- Salva
- </flyout_button_item>
- <flyout_button_item name="saveas_item">
- Salva come...
- </flyout_button_item>
+ <flyout_button_item name="save_item" label="Salva"/>
+ <flyout_button_item name="saveas_item" label="Salva come..."/>
</flyout_button>
<button label="Annulla" name="discard_btn"/>
<button label="Espandi >>" name="more_btn" tool_tip="Opzioni avanzate"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
index 27a07e633b..4673f908c4 100644
--- a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
@@ -13,18 +13,18 @@
</text>
<combo_box label="" name="preview_base_anim"
tool_tip="ã‚¢ãƒã‚¿ãƒ¼ãŒæ™®é€šã®è¡Œå‹•ã‚’ã™ã‚‹ã¨ãã®ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã®å‹•ãをテストã™ã‚‹ãŸã‚ã«ã“れを使ã„ã¾ã™ã€‚">
- <combo_item name="Standing">
+ <combo_box.item name="Standing">
ç«‹ã¤
- </combo_item>
- <combo_item name="Walking">
+ </combo_box.item>
+ <combo_box.item name="Walking">
æ©ã
- </combo_item>
- <combo_item name="Sitting">
+ </combo_box.item>
+ <combo_box.item name="Sitting">
座る
- </combo_item>
- <combo_item name="Flying">
+ </combo_box.item>
+ <combo_box.item name="Flying">
飛行
- </combo_item>
+ </combo_box.item>
</combo_box>
<pad height="7" />
<check_box label="ループ" name="loop_check"
@@ -38,111 +38,111 @@
</text>
<combo_box label="" name="hand_pose_combo"
tool_tip="アニメーションã®æ‰‹ã®å‹•ãをコントãƒãƒ¼ãƒ«ã—ã¾ã™ã€‚">
- <combo_item name="Spread">
+ <combo_box.item name="Spread">
広ãŒã‚‹
- </combo_item>
- <combo_item name="Relaxed">
+ </combo_box.item>
+ <combo_box.item name="Relaxed">
リラックス
- </combo_item>
- <combo_item name="PointBoth">
+ </combo_box.item>
+ <combo_box.item name="PointBoth">
両方を指ã™
- </combo_item>
- <combo_item name="Fist">
+ </combo_box.item>
+ <combo_box.item name="Fist">
拳
- </combo_item>
- <combo_item name="RelaxedLeft">
+ </combo_box.item>
+ <combo_box.item name="RelaxedLeft">
リラックス左
- </combo_item>
- <combo_item name="PointLeft">
+ </combo_box.item>
+ <combo_box.item name="PointLeft">
左を指ã™
- </combo_item>
- <combo_item name="FistLeft">
+ </combo_box.item>
+ <combo_box.item name="FistLeft">
拳左
- </combo_item>
- <combo_item name="RelaxedRight">
+ </combo_box.item>
+ <combo_box.item name="RelaxedRight">
リラックスå³
- </combo_item>
- <combo_item name="PointRight">
+ </combo_box.item>
+ <combo_box.item name="PointRight">
å³ã‚’指ã™
- </combo_item>
- <combo_item name="FistRight">
+ </combo_box.item>
+ <combo_box.item name="FistRight">
拳å³
- </combo_item>
- <combo_item name="SaluteRight">
+ </combo_box.item>
+ <combo_box.item name="SaluteRight">
敬礼å³
- </combo_item>
- <combo_item name="Typing">
+ </combo_box.item>
+ <combo_box.item name="Typing">
入力ã™ã‚‹
- </combo_item>
- <combo_item name="PeaceRight">
+ </combo_box.item>
+ <combo_box.item name="PeaceRight">
ピース・サインå³
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="emote_label">
表ç¾
</text>
<combo_box label="" name="emote_combo"
tool_tip="アニメーションã®é¡”を表情をコントãƒãƒ¼ãƒ«ã—ã¾ã™ã€‚">
- <combo_item name="[None]">
+ <combo_box.item name="[None]">
[None]
- </combo_item>
- <combo_item name="Aaaaah">
+ </combo_box.item>
+ <combo_box.item name="Aaaaah">
アーーーーー
- </combo_item>
- <combo_item name="Afraid">
+ </combo_box.item>
+ <combo_box.item name="Afraid">
怖れ
- </combo_item>
- <combo_item name="Angry">
+ </combo_box.item>
+ <combo_box.item name="Angry">
怒り
- </combo_item>
- <combo_item name="BigSmile">
+ </combo_box.item>
+ <combo_box.item name="BigSmile">
満é¢ã®ç¬‘ã¿
- </combo_item>
- <combo_item name="Bored">
+ </combo_box.item>
+ <combo_box.item name="Bored">
退屈
- </combo_item>
- <combo_item name="Cry">
+ </combo_box.item>
+ <combo_box.item name="Cry">
æ³£ã
- </combo_item>
- <combo_item name="Disdain">
+ </combo_box.item>
+ <combo_box.item name="Disdain">
侮蔑
- </combo_item>
- <combo_item name="Embarrassed">
+ </combo_box.item>
+ <combo_box.item name="Embarrassed">
困惑
- </combo_item>
- <combo_item name="Frown">
+ </combo_box.item>
+ <combo_box.item name="Frown">
ã—ã‹ã‚ã£é¢
- </combo_item>
- <combo_item name="Kiss">
+ </combo_box.item>
+ <combo_box.item name="Kiss">
ã‚ス
- </combo_item>
- <combo_item name="Laugh">
+ </combo_box.item>
+ <combo_box.item name="Laugh">
笑ã†
- </combo_item>
- <combo_item name="Plllppt">
+ </combo_box.item>
+ <combo_box.item name="Plllppt">
Plllppt
- </combo_item>
- <combo_item name="Repulsed">
+ </combo_box.item>
+ <combo_box.item name="Repulsed">
嫌悪感
- </combo_item>
- <combo_item name="Sad">
+ </combo_box.item>
+ <combo_box.item name="Sad">
悲ã—ã„
- </combo_item>
- <combo_item name="Shrug">
+ </combo_box.item>
+ <combo_box.item name="Shrug">
è‚©ã‚’ã™ãã‚ã‚‹
- </combo_item>
- <combo_item name="Smile">
+ </combo_box.item>
+ <combo_box.item name="Smile">
笑ã¿
- </combo_item>
- <combo_item name="Surprise">
+ </combo_box.item>
+ <combo_box.item name="Surprise">
é©šã
- </combo_item>
- <combo_item name="Wink">
+ </combo_box.item>
+ <combo_box.item name="Wink">
ウィンク
- </combo_item>
- <combo_item name="Worry">
+ </combo_box.item>
+ <combo_box.item name="Worry">
心é…
- </combo_item>
+ </combo_box.item>
</combo_box>
<spinner label="ﾌｪｰｽﾞｲï¾(秒)" name="ease_in_time"
tool_tip="アニメーションã®ãƒ–レンド・イン時間（秒）" />
diff --git a/indra/newview/skins/default/xui/ja/floater_beacons.xml b/indra/newview/skins/default/xui/ja/floater_beacons.xml
index 49c87588b4..2065656732 100644
--- a/indra/newview/skins/default/xui/ja/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/ja/floater_beacons.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="ビーコン（標è˜ï¼‰">
- <panel name="beacons_panel">
- <check_box label="ﾀｯï¾ï½µï¾ï¾˜ï½°ã®ï½½ï½¸ï¾˜ï¾Œï¾Ÿï¾„ã‚’å«ã‚€ï½µï¾Œï¾žï½¼ï¾žï½ªï½¸ï¾„" name="touch_only"/>
- <check_box label="スクリプト・オブジェクト" name="scripted"/>
- <check_box label="物ç†çš„オブジェクト" name="physical"/>
- <check_box label="音æº" name="sounds"/>
- <check_box label="パーティクルæº" name="particles"/>
- <check_box label="ãƒã‚¤ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°" name="highlights"/>
- <check_box label="ビーコン(標è˜)ã®ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°" name="beacons"/>
- <text name="beacon_width_label">
- ビーコン(標è˜)ã®å¹…
- </text>
- </panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="ビーコン（標è˜ï¼‰">
+ <panel name="beacons_panel">
+ <check_box label="ﾀｯï¾ï½µï¾ï¾˜ï½°ã®ï½½ï½¸ï¾˜ï¾Œï¾Ÿï¾„ã‚’å«ã‚€ï½µï¾Œï¾žï½¼ï¾žï½ªï½¸ï¾„" name="touch_only"/>
+ <check_box label="スクリプト・オブジェクト" name="scripted"/>
+ <check_box label="物ç†çš„オブジェクト" name="physical"/>
+ <check_box label="音æº" name="sounds"/>
+ <check_box label="パーティクルæº" name="particles"/>
+ <check_box label="ãƒã‚¤ãƒ©ã‚¤ãƒˆã®ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°" name="highlights"/>
+ <check_box label="ビーコン(標è˜)ã®ãƒ¬ãƒ³ãƒ€ãƒªãƒ³ã‚°" name="beacons"/>
+ <text name="beacon_width_label">
+ ビーコン(標è˜)ã®å¹…
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_buy_land.xml b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
index 0a47e0e970..4c3637d6a1 100644
--- a/indra/newview/skins/default/xui/ja/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_buy_land.xml
@@ -68,15 +68,15 @@
土地をä¿æœ‰ã§ãã‚‹ã®ã¯ãƒ—レミアム・メンãƒãƒ¼ã ã‘ã§ã™
</text>
<combo_box name="account_level">
- <combo_item name="US$9.95/month,billedmonthly">
+ <combo_box.item name="US$9.95/month,billedmonthly">
月é¡9.95米ドルã€æœˆæ‰•ã„
- </combo_item>
- <combo_item name="US$7.50/month,billedquarterly">
+ </combo_box.item>
+ <combo_box.item name="US$7.50/month,billedquarterly">
月é¡7.50米ドルã€å¹´4回払ã„
- </combo_item>
- <combo_item name="US$6.00/month,billedannually">
+ </combo_box.item>
+ <combo_box.item name="US$6.00/month,billedannually">
月é¡6.00米ドルã€å¹´æ‰•ã„
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="land_use_action">
毎月ã®åœŸåœ°ä½¿ç”¨æ–™ã‚’US$40ã«å¼•ã上ã’ã¾ã™
diff --git a/indra/newview/skins/default/xui/ja/floater_camera.xml b/indra/newview/skins/default/xui/ja/floater_camera.xml
index e5a491b28b..46e7b1990d 100644
--- a/indra/newview/skins/default/xui/ja/floater_camera.xml
+++ b/indra/newview/skins/default/xui/ja/floater_camera.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater">
- <string name="rotate_tooltip">
- フォーカスをä¸å¿ƒã«ã‚«ãƒ¡ãƒ©ã‚’回転
- </string>
- <string name="zoom_tooltip">
- フォーカスã«å‘ã‘ã¦ã‚«ãƒ¡ãƒ©ã‚’ズーãƒ
- </string>
- <string name="move_tooltip">
- カメラを上下左å³ã«ç§»å‹•
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater">
+ <string name="rotate_tooltip">
+ フォーカスをä¸å¿ƒã«ã‚«ãƒ¡ãƒ©ã‚’回転
+ </string>
+ <string name="zoom_tooltip">
+ フォーカスã«å‘ã‘ã¦ã‚«ãƒ¡ãƒ©ã‚’ズーãƒ
+ </string>
+ <string name="move_tooltip">
+ カメラを上下左å³ã«ç§»å‹•
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
index 1b0c89a1fb..2d8b54cdd5 100644
--- a/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_day_cycle_options.xml
@@ -1,97 +1,97 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Day Cycle Floater" title="デイ・サイクル編集">
- <tab_container name="Day Cycle Tabs">
- <panel label="デイ・サイクル" name="Day Cycle">
- <button label="?" name="WLDayCycleHelp" />
- <text name="WL12am">
- 深夜 12時
- </text>
- <text name="WL3am">
- åˆå‰ 3時
- </text>
- <text name="WL6am">
- åˆå‰ 6時
- </text>
- <text name="WL9amHash">
- åˆå‰ 9時
- </text>
- <text name="WL12pmHash">
- æ£åˆ 12時
- </text>
- <text name="WL3pm">
- åˆå¾Œ 3時
- </text>
- <text name="WL6pm">
- åˆå¾Œ 6時
- </text>
- <text name="WL9pm">
- åˆå¾Œ 9時
- </text>
- <text name="WL12am2">
- 深夜 12時
- </text>
- <text name="WL12amHash">
- |
- </text>
- <text name="WL3amHash">
- I
- </text>
- <text name="WL6amHash">
- |
- </text>
- <text name="WL9amHash2">
- I
- </text>
- <text name="WL12pmHash2">
- |
- </text>
- <text name="WL3pmHash">
- I
- </text>
- <text name="WL6pmHash">
- |
- </text>
- <text name="WL9pmHash">
- I
- </text>
- <text name="WL12amHash2">
- |
- </text>
- <button label="ã‚ーã®è¿½åŠ " label_selected="ã‚ーã®è¿½åŠ " name="WLAddKey" />
- <button label="ã‚ーã®å‰Šé™¤" label_selected="ã‚ーã®å‰Šé™¤" name="WLDeleteKey" />
- <text name="WLCurKeyFrameText">
- ã‚ーフレームã®è¨å®šï¼š
- </text>
- <text name="WLCurKeyTimeText">
- ã‚ー・タイム：
- </text>
- <spinner label="時間" name="WLCurKeyHour" />
- <spinner label="分" name="WLCurKeyMin" />
- <text name="WLCurKeyTimeText2">
- ã‚ーã®äº‹å‰è¨å®šï¼š
- </text>
- <combo_box label="事å‰è¨å®š" name="WLKeyPresets" />
- <text name="DayCycleText">
- スナップ：
- </text>
- <combo_box label="5 分" name="WLSnapOptions" />
- <text name="DayCycleText2">
- サイクルã®é•·ã•ï¼š
- </text>
- <spinner label="時間" name="WLLengthOfDayHour" />
- <spinner label="分" name="WLLengthOfDayMin" />
- <spinner label="秒" name="WLLengthOfDaySec" />
- <text name="DayCycleText3">
- プレビュー：
- </text>
- <button label="å†ç”Ÿ" label_selected="å†ç”Ÿ" name="WLAnimSky" />
- <button label="åœæ¢!" label_selected="åœæ¢" name="WLStopAnimSky" />
- <button label="ä¸å‹•ç”£ã®æ™‚刻を使用"
- label_selected="ä¸å‹•ç”£ã®æ™‚刻ã«å¤‰æ›´" name="WLUseLindenTime" />
- <button label="デイ・テストをä¿å˜"
- label_selected="デイ・テストをä¿å˜" name="WLSaveDayCycle" />
- <button label="デイ・テストをãƒãƒ¼ãƒ‰"
- label_selected="デイ・テストをãƒãƒ¼ãƒ‰" name="WLLoadDayCycle" />
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Day Cycle Floater" title="デイ・サイクル編集">
+ <tab_container name="Day Cycle Tabs">
+ <panel label="デイ・サイクル" name="Day Cycle">
+ <button label="?" name="WLDayCycleHelp" />
+ <text name="WL12am">
+ 深夜 12時
+ </text>
+ <text name="WL3am">
+ åˆå‰ 3時
+ </text>
+ <text name="WL6am">
+ åˆå‰ 6時
+ </text>
+ <text name="WL9amHash">
+ åˆå‰ 9時
+ </text>
+ <text name="WL12pmHash">
+ æ£åˆ 12時
+ </text>
+ <text name="WL3pm">
+ åˆå¾Œ 3時
+ </text>
+ <text name="WL6pm">
+ åˆå¾Œ 6時
+ </text>
+ <text name="WL9pm">
+ åˆå¾Œ 9時
+ </text>
+ <text name="WL12am2">
+ 深夜 12時
+ </text>
+ <text name="WL12amHash">
+ |
+ </text>
+ <text name="WL3amHash">
+ I
+ </text>
+ <text name="WL6amHash">
+ |
+ </text>
+ <text name="WL9amHash2">
+ I
+ </text>
+ <text name="WL12pmHash2">
+ |
+ </text>
+ <text name="WL3pmHash">
+ I
+ </text>
+ <text name="WL6pmHash">
+ |
+ </text>
+ <text name="WL9pmHash">
+ I
+ </text>
+ <text name="WL12amHash2">
+ |
+ </text>
+ <button label="ã‚ーã®è¿½åŠ " label_selected="ã‚ーã®è¿½åŠ " name="WLAddKey" />
+ <button label="ã‚ーã®å‰Šé™¤" label_selected="ã‚ーã®å‰Šé™¤" name="WLDeleteKey" />
+ <text name="WLCurKeyFrameText">
+ ã‚ーフレームã®è¨å®šï¼š
+ </text>
+ <text name="WLCurKeyTimeText">
+ ã‚ー・タイム：
+ </text>
+ <spinner label="時間" name="WLCurKeyHour" />
+ <spinner label="分" name="WLCurKeyMin" />
+ <text name="WLCurKeyTimeText2">
+ ã‚ーã®äº‹å‰è¨å®šï¼š
+ </text>
+ <combo_box label="事å‰è¨å®š" name="WLKeyPresets" />
+ <text name="DayCycleText">
+ スナップ：
+ </text>
+ <combo_box label="5 分" name="WLSnapOptions" />
+ <text name="DayCycleText2">
+ サイクルã®é•·ã•ï¼š
+ </text>
+ <spinner label="時間" name="WLLengthOfDayHour" />
+ <spinner label="分" name="WLLengthOfDayMin" />
+ <spinner label="秒" name="WLLengthOfDaySec" />
+ <text name="DayCycleText3">
+ プレビュー：
+ </text>
+ <button label="å†ç”Ÿ" label_selected="å†ç”Ÿ" name="WLAnimSky" />
+ <button label="åœæ¢!" label_selected="åœæ¢" name="WLStopAnimSky" />
+ <button label="ä¸å‹•ç”£ã®æ™‚刻を使用"
+ label_selected="ä¸å‹•ç”£ã®æ™‚刻ã«å¤‰æ›´" name="WLUseLindenTime" />
+ <button label="デイ・テストをä¿å˜"
+ label_selected="デイ・テストをä¿å˜" name="WLSaveDayCycle" />
+ <button label="デイ・テストをãƒãƒ¼ãƒ‰"
+ label_selected="デイ・テストをãƒãƒ¼ãƒ‰" name="WLLoadDayCycle" />
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_device_settings.xml b/indra/newview/skins/default/xui/ja/floater_device_settings.xml
index b9a0332f45..5c258df9fd 100644
--- a/indra/newview/skins/default/xui/ja/floater_device_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_device_settings.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="floater_device_settings" title="ボイスãƒãƒ£ãƒƒãƒˆæ©Ÿå™¨ã®è¨å®š" />
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_env_settings.xml b/indra/newview/skins/default/xui/ja/floater_env_settings.xml
index 4c19de1db7..48c22323f8 100644
--- a/indra/newview/skins/default/xui/ja/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_env_settings.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Environment Editor Floater" title="環境編集">
- <text name="EnvTimeText">
- 時刻
- </text>
- <text name="EnvTimeText2">
- æ£åˆ 12:00
- </text>
- <text name="EnvCloudText">
- 雲ã®é‡
- </text>
- <text name="EnvWaterColorText">
- æ°´ã®è‰²
- </text>
- <color_swatch name="EnvWaterColor"
- tool_tip="カラー・ピッカーをクリックã—ã¦é–‹ã" />
- <text name="EnvWaterFogText">
- æ°´ä¸ç…§åº¦
- </text>
- <button label="ä¸å‹•ç”£ã®æ™‚刻を使用" name="EnvUseEstateTimeButton" />
- <button label="空ã®é«˜åº¦ãªè¨å®š" name="EnvAdvancedSkyButton" />
- <button label="æ°´ã®é«˜åº¦ãªè¨å®š" name="EnvAdvancedWaterButton" />
- <button label="?" name="EnvSettingsHelpButton" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Environment Editor Floater" title="環境編集">
+ <text name="EnvTimeText">
+ 時刻
+ </text>
+ <text name="EnvTimeText2">
+ æ£åˆ 12:00
+ </text>
+ <text name="EnvCloudText">
+ 雲ã®é‡
+ </text>
+ <text name="EnvWaterColorText">
+ æ°´ã®è‰²
+ </text>
+ <color_swatch name="EnvWaterColor"
+ tool_tip="カラー・ピッカーをクリックã—ã¦é–‹ã" />
+ <text name="EnvWaterFogText">
+ æ°´ä¸ç…§åº¦
+ </text>
+ <button label="ä¸å‹•ç”£ã®æ™‚刻を使用" name="EnvUseEstateTimeButton" />
+ <button label="空ã®é«˜åº¦ãªè¨å®š" name="EnvAdvancedSkyButton" />
+ <button label="æ°´ã®é«˜åº¦ãªè¨å®š" name="EnvAdvancedWaterButton" />
+ <button label="?" name="EnvSettingsHelpButton" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
index 7524356bfc..8d77542dc0 100644
--- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
@@ -122,29 +122,29 @@
目的地：
</text>
<combo_box name="destination">
- <combo_item name="Selection">
+ <combo_box.item name="Selection">
é¸æŠž
- </combo_item>
- <combo_item name="AgentRegion">
+ </combo_box.item>
+ <combo_box.item name="AgentRegion">
エージェント地域
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="Request:">
è¦æ±‚：
</text>
<combo_box name="request">
- <combo_item name="colliders<steps>">
+ <combo_box.item name="colliders<steps>">
コライダー＜ステップ＞
- </combo_item>
- <combo_item name="scripts<count>,<optionalpattern>">
+ </combo_box.item>
+ <combo_box.item name="scripts<count>,<optionalpattern>">
スクリプト＜回数＞ã€ï¼œã‚ªãƒ—ション・パターン＞
- </combo_item>
- <combo_item name="objects<pattern>">
+ </combo_box.item>
+ <combo_box.item name="objects<pattern>">
オブジェクト＜パターン＞
- </combo_item>
- <combo_item name="rez<asset_id>">
+ </combo_box.item>
+ <combo_box.item name="rez<asset_id>">
rez <asset_id>
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="Parameter:">
パラメーター：
diff --git a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
index 7413141e56..f2ff28d5f1 100644
--- a/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hardware_settings.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Hardware Settings Floater" title="ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢è¨å®š">
- <text name="Filtering:">
- フィルタリング：
- </text>
- <check_box
- label="異方的フィルタリング（有効ã«ã™ã‚‹ã¨é€Ÿåº¦ãŒä½Žä¸‹ã—ã¾ã™ï¼‰"
- name="ani" />
- <text name="Antialiasing:">
- アンãƒã‚¨ã‚¤ãƒªã‚¢ã‚·ãƒ³ã‚°:
- </text>
- <combo_box label="アンãƒã‚¨ã‚¤ãƒªã‚¢ã‚·ãƒ³ã‚°" name="fsaa">
- <combo_item name="FSAADisabled">
- 無効
- </combo_item>
- <combo_item name="2x">
- 2x
- </combo_item>
- <combo_item name="4x">
- 4x
- </combo_item>
- <combo_item name="8x">
- 8x
- </combo_item>
- <combo_item name="16x">
- 16x
- </combo_item>
- </combo_box>
- <spinner label="ガンマ：" name="gamma" />
- <text name="(brightness, lower is brighter)">
- （è¼åº¦ï¼šä½Žã„ï¼é«˜è¼åº¦ã€0ï¼ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ï¼‰
- </text>
- <text name="Enable VBO:">
- VBO を有効化：
- </text>
- <check_box label="OpenGL Vertex Buffer Objectsを有効化" name="vbo"
- tool_tip="最新ã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã§ã“ã®è¨å®šã‚’有効ã«ã™ã‚‹ã¨ã€ãƒ‘フォーマンスãŒå‘上ã—ã¾ã™ã€‚ ã—ã‹ã—ã€æ—§åž‹ã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã§ã¯ VBO ã®å®Ÿè£…ãŒè²§å¼±ãªå ´åˆãŒå¤šãã€ã“ã®è¨å®šã‚’有効ã«ã™ã‚‹ã“ã¨ã§ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã«ã¤ãªãŒã‚‹ãŠãã‚ŒãŒã‚ã‚Šã¾ã™ã€‚" />
- <slider label="テクスãƒãƒ£ï¾’ﾓﾘ(MB)：" name="GrapicsCardTextureMemory"
- tool_tip="テクスãƒãƒ£ãƒ¼ã«å‰²ã‚Šå½“ã¦ã‚‹ãƒ¡ãƒ¢ãƒªã®åˆè¨ˆã€‚ ビデオ・カード・メモリをデフォルトã«ã—ã¾ã™ã€‚ ã“ã®æ•°å€¤ã‚’減らã™ã¨ã€ãƒ‘フォーマンスãŒæ”¹å–„ã•ã‚Œã¾ã™ãŒã€ãƒ†ã‚¯ã‚¹ãƒãƒ£ãƒ¼ãŒã¼ã‚„ã‘ãŸæ„Ÿã˜ã«ãªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚" />
- <spinner label="フォグã®è·é›¢æ¯”率：" name="fog" />
- <button label="OK" label_selected="OK" name="OK" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Hardware Settings Floater" title="ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢è¨å®š">
+ <text name="Filtering:">
+ フィルタリング：
+ </text>
+ <check_box
+ label="異方的フィルタリング（有効ã«ã™ã‚‹ã¨é€Ÿåº¦ãŒä½Žä¸‹ã—ã¾ã™ï¼‰"
+ name="ani" />
+ <text name="Antialiasing:">
+ アンãƒã‚¨ã‚¤ãƒªã‚¢ã‚·ãƒ³ã‚°:
+ </text>
+ <combo_box label="アンãƒã‚¨ã‚¤ãƒªã‚¢ã‚·ãƒ³ã‚°" name="fsaa">
+ <combo_box.item name="FSAADisabled">
+ 無効
+ </combo_box.item>
+ <combo_box.item name="2x">
+ 2x
+ </combo_box.item>
+ <combo_box.item name="4x">
+ 4x
+ </combo_box.item>
+ <combo_box.item name="8x">
+ 8x
+ </combo_box.item>
+ <combo_box.item name="16x">
+ 16x
+ </combo_box.item>
+ </combo_box>
+ <spinner label="ガンマ：" name="gamma" />
+ <text name="(brightness, lower is brighter)">
+ （è¼åº¦ï¼šä½Žã„ï¼é«˜è¼åº¦ã€0ï¼ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ï¼‰
+ </text>
+ <text name="Enable VBO:">
+ VBO を有効化：
+ </text>
+ <check_box label="OpenGL Vertex Buffer Objectsを有効化" name="vbo"
+ tool_tip="最新ã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã§ã“ã®è¨å®šã‚’有効ã«ã™ã‚‹ã¨ã€ãƒ‘フォーマンスãŒå‘上ã—ã¾ã™ã€‚ ã—ã‹ã—ã€æ—§åž‹ã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã§ã¯ VBO ã®å®Ÿè£…ãŒè²§å¼±ãªå ´åˆãŒå¤šãã€ã“ã®è¨å®šã‚’有効ã«ã™ã‚‹ã“ã¨ã§ã‚¯ãƒ©ãƒƒã‚·ãƒ¥ã«ã¤ãªãŒã‚‹ãŠãã‚ŒãŒã‚ã‚Šã¾ã™ã€‚" />
+ <slider label="テクスãƒãƒ£ï¾’ﾓﾘ(MB)：" name="GrapicsCardTextureMemory"
+ tool_tip="テクスãƒãƒ£ãƒ¼ã«å‰²ã‚Šå½“ã¦ã‚‹ãƒ¡ãƒ¢ãƒªã®åˆè¨ˆã€‚ ビデオ・カード・メモリをデフォルトã«ã—ã¾ã™ã€‚ ã“ã®æ•°å€¤ã‚’減らã™ã¨ã€ãƒ‘フォーマンスãŒæ”¹å–„ã•ã‚Œã¾ã™ãŒã€ãƒ†ã‚¯ã‚¹ãƒãƒ£ãƒ¼ãŒã¼ã‚„ã‘ãŸæ„Ÿã˜ã«ãªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚" />
+ <spinner label="フォグã®è·é›¢æ¯”率：" name="fog" />
+ <button label="OK" label_selected="OK" name="OK" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_hud.xml b/indra/newview/skins/default/xui/ja/floater_hud.xml
index 4b4137b3bf..a1970ebbd5 100644
--- a/indra/newview/skins/default/xui/ja/floater_hud.xml
+++ b/indra/newview/skins/default/xui/ja/floater_hud.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_hud" title="ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_hud" title="ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«" />
diff --git a/indra/newview/skins/default/xui/ja/floater_image_preview.xml b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
index be8e5c6416..3244a2f395 100644
--- a/indra/newview/skins/default/xui/ja/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_image_preview.xml
@@ -10,36 +10,36 @@
ｲﾒｰｼﾞã®ï¾Œï¾Ÿï¾šï¾‹ï¾žï½ï½°ï¼š
</text>
<combo_box label="æœã®ç¨®é¡ž" name="clothing_type_combo">
- <combo_item name="Image">
+ <combo_box.item name="Image">
ç”»åƒ
- </combo_item>
- <combo_item name="Hair">
+ </combo_box.item>
+ <combo_box.item name="Hair">
髪
- </combo_item>
- <combo_item name="FemaleHead">
+ </combo_box.item>
+ <combo_box.item name="FemaleHead">
女性ã®é
- </combo_item>
- <combo_item name="FemaleUpperBody">
+ </combo_box.item>
+ <combo_box.item name="FemaleUpperBody">
女性ã®ä¸ŠåŠèº«
- </combo_item>
- <combo_item name="FemaleLowerBody">
+ </combo_box.item>
+ <combo_box.item name="FemaleLowerBody">
女性ã®ä¸‹åŠèº«
- </combo_item>
- <combo_item name="MaleHead">
+ </combo_box.item>
+ <combo_box.item name="MaleHead">
男性ã®é
- </combo_item>
- <combo_item name="MaleUpperBody">
+ </combo_box.item>
+ <combo_box.item name="MaleUpperBody">
男性ã®ä¸ŠåŠèº«
- </combo_item>
- <combo_item name="MaleLowerBody">
+ </combo_box.item>
+ <combo_box.item name="MaleLowerBody">
男性ã®ä¸‹åŠèº«
- </combo_item>
- <combo_item name="Skirt">
+ </combo_box.item>
+ <combo_box.item name="Skirt">
スカート
- </combo_item>
- <combo_item name="SculptedPrim">
+ </combo_box.item>
+ <combo_box.item name="SculptedPrim">
変形ã•ã‚ŒãŸãƒ—リãƒ
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="bad_image_text">
イメージをèªã¿å–ã‚Œã¾ã›ã‚“。
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index c831201d93..3ada48ef8e 100644
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="オブジェクト検査" min_width="450" >
- <scroll_list name="object_list"
- tool_tip="ã“ã®ãƒªã‚¹ãƒˆã‹ã‚‰ã‚ªãƒ–ジェクトをé¸æŠžã—ã€ã“ã®ä¸–ç•Œã§å¼·èª¿è¡¨ç¤ºã—ã¾ã™ã€‚">
- <column label="ｵﾌﾞｼﾞｪｸﾄå" name="object_name" />
- <column label="所有者å" name="owner_name" />
- <column label="制作者å" name="creator_name" />
- <column label="作æˆæ—¥" name="creation_date" />
- </scroll_list>
- <button label="所有者ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’表示..." name="button owner"
- tool_tip="é¸æŠžã•ã‚ŒãŸã‚ªãƒ–ジェクトã®æ‰€æœ‰è€…ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’見る" />
- <button label="制作者ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’表示..." name="button creator"
- tool_tip="é¸æŠžã•ã‚ŒãŸã‚ªãƒ–ジェクトã®åˆ¶ä½œè€…ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’見る" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="inspect" title="オブジェクト検査" min_width="450" >
+ <scroll_list name="object_list"
+ tool_tip="ã“ã®ãƒªã‚¹ãƒˆã‹ã‚‰ã‚ªãƒ–ジェクトをé¸æŠžã—ã€ã“ã®ä¸–ç•Œã§å¼·èª¿è¡¨ç¤ºã—ã¾ã™ã€‚">
+ <column label="ｵﾌﾞｼﾞｪｸﾄå" name="object_name" />
+ <column label="所有者å" name="owner_name" />
+ <column label="制作者å" name="creator_name" />
+ <column label="作æˆæ—¥" name="creation_date" />
+ </scroll_list>
+ <button label="所有者ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’表示..." name="button owner"
+ tool_tip="é¸æŠžã•ã‚ŒãŸã‚ªãƒ–ジェクトã®æ‰€æœ‰è€…ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’見る" />
+ <button label="制作者ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’表示..." name="button creator"
+ tool_tip="é¸æŠžã•ã‚ŒãŸã‚ªãƒ–ジェクトã®åˆ¶ä½œè€…ã®ãƒ—ãƒãƒ•ã‚£ãƒ¼ãƒ«ã‚’見る" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
index a5ab9da127..5029a781f6 100644
--- a/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml
@@ -1,125 +1,125 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Joystick" title="ジョイスティックã®è¨å®š">
- <check_box name="enable_joystick" width="120">
- ジョイスティックを使ã†ï¼š
- </check_box>
- <text left="180" name="joystick_type" width="320"/>
- <spinner label="X軸マッピング" name="JoystickAxis1"/>
- <spinner label="Y軸マッピング" name="JoystickAxis2"/>
- <spinner label="Z軸マッピング" name="JoystickAxis0"/>
- <spinner label="ピッãƒãƒ»ãƒžãƒƒãƒ”ング" label_width="110" left="10" name="JoystickAxis4" width="150"/>
- <spinner label="ヨー・マッピング" name="JoystickAxis5"/>
- <spinner label="ãƒãƒ¼ãƒ«ãƒ»ãƒžãƒƒãƒ”ング" label_width="110" left="350" name="JoystickAxis3" width="150"/>
- <spinner label="ズーム・マッピング" label_width="110" left="10" name="JoystickAxis6" width="150"/>
- <check_box label="直接ズーム" name="ZoomDirect"/>
- <check_box label="3Dカーソル" name="Cursor3D"/>
- <check_box label="自動レベル" name="AutoLeveling"/>
- <text name="Control Modes:">
- 制御モード：
- </text>
- <check_box left="131" name="JoystickAvatarEnabled">
- ã‚¢ãƒã‚¿ãƒ¼
- </check_box>
- <check_box left="201" name="JoystickBuildEnabled">
- é€ ã‚‹
- </check_box>
- <check_box left="271" name="JoystickFlycamEnabled">
- フライ・カメラ
- </check_box>
- <text left="5" name="XScale" width="120">
- Xスケール
- </text>
- <spinner left="135" name="AvatarAxisScale1" width="50"/>
- <spinner left="205" name="BuildAxisScale1" width="50"/>
- <spinner left="275" name="FlycamAxisScale1" width="50"/>
- <text left="5" name="YScale" width="120">
- Yスケール
- </text>
- <spinner left="135" name="AvatarAxisScale2" width="50"/>
- <spinner left="205" name="BuildAxisScale2" width="50"/>
- <spinner left="275" name="FlycamAxisScale2" width="50"/>
- <text left="5" name="ZScale" width="120">
- Zスケール
- </text>
- <spinner left="135" name="AvatarAxisScale0" width="50"/>
- <spinner left="205" name="BuildAxisScale0" width="50"/>
- <spinner left="275" name="FlycamAxisScale0" width="50"/>
- <text left="5" name="PitchScale" width="120">
- ピッãƒãƒ»ã‚¹ã‚±ãƒ¼ãƒ«
- </text>
- <spinner left="135" name="AvatarAxisScale4" width="50"/>
- <spinner left="205" name="BuildAxisScale4" width="50"/>
- <spinner left="275" name="FlycamAxisScale4" width="50"/>
- <text left="5" name="YawScale" width="120">
- ヨー・スケール
- </text>
- <spinner left="135" name="AvatarAxisScale5" width="50"/>
- <spinner left="205" name="BuildAxisScale5" width="50"/>
- <spinner left="275" name="FlycamAxisScale5" width="50"/>
- <text left="5" name="RollScale" width="120">
- ãƒãƒ¼ãƒ«ãƒ»ã‚¹ã‚±ãƒ¼ãƒ«
- </text>
- <spinner left="205" name="BuildAxisScale3" width="50"/>
- <spinner left="275" name="FlycamAxisScale3" width="50"/>
- <text left="5" name="XDeadZone" width="120">
- Xデッド・ゾーン
- </text>
- <spinner left="135" name="AvatarAxisDeadZone1" width="50"/>
- <spinner left="205" name="BuildAxisDeadZone1" width="50"/>
- <spinner left="275" name="FlycamAxisDeadZone1" width="50"/>
- <text left="5" name="YDeadZone" width="120">
- Yデッド・ゾーン
- </text>
- <spinner left="135" name="AvatarAxisDeadZone2" width="50"/>
- <spinner left="205" name="BuildAxisDeadZone2" width="50"/>
- <spinner left="275" name="FlycamAxisDeadZone2" width="50"/>
- <text left="5" name="ZDeadZone" width="120">
- Zデッド・ゾーン
- </text>
- <spinner left="135" name="AvatarAxisDeadZone0" width="50"/>
- <spinner left="205" name="BuildAxisDeadZone0" width="50"/>
- <spinner left="275" name="FlycamAxisDeadZone0" width="50"/>
- <text left="0" name="PitchDeadZone" width="135">
- ピッãƒãƒ»ãƒ‡ãƒƒãƒ‰ãƒ»ã‚¾ãƒ¼ãƒ³
- </text>
- <spinner left="135" name="AvatarAxisDeadZone4" width="50"/>
- <spinner left="205" name="BuildAxisDeadZone4" width="50"/>
- <spinner left="275" name="FlycamAxisDeadZone4" width="50"/>
- <text left="5" name="YawDeadZone" width="120">
- ヨー・デッド・ゾーン
- </text>
- <spinner left="135" name="AvatarAxisDeadZone5" width="50"/>
- <spinner left="205" name="BuildAxisDeadZone5" width="50"/>
- <spinner left="275" name="FlycamAxisDeadZone5" width="50"/>
- <text left="0" name="RollDeadZone" width="135">
- ãƒãƒ¼ãƒ«ãƒ»ãƒ‡ãƒƒãƒ‰ãƒ»ã‚¾ãƒ¼ãƒ³
- </text>
- <spinner left="205" name="BuildAxisDeadZone3" width="50"/>
- <spinner left="275" name="FlycamAxisDeadZone3" width="50"/>
- <text name="Feathering">
- 羽毛
- </text>
- <slider label="" left="126" name="AvatarFeathering" width="67"/>
- <slider label="" left="196" name="BuildFeathering" width="67"/>
- <slider label="" left="266" name="FlycamFeathering" width="67"/>
- <text left="0" name="ZoomScale2" width="140">
- ズーム・スケール
- </text>
- <spinner label="" left="275" name="FlycamAxisScale6" width="50"/>
- <text left="0" name="ZoomDeadZone" width="140">
- ズーム・デッド・ゾーン
- </text>
- <spinner label="" left="275" name="FlycamAxisDeadZone6" width="50"/>
- <button label="SpaceNavigatorã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè¨å®š" left="330" name="SpaceNavigatorDefaults" width="210"/>
- <button label="OK" label_selected="OK" name="ok_btn"/>
- <button label="å–り消ã—" label_selected="å–り消ã—" name="cancel_btn"/>
- <string name="JoystickMonitor">
- ジョイスティック・モニター
- </string>
- <string name="Axis">
- 軸 [NUM]
- </string>
- <string name="NoDevice">
- デãƒã‚¤ã‚¹ã¯æ¤œå‡ºã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Joystick" title="ジョイスティックã®è¨å®š">
+ <check_box name="enable_joystick" width="120">
+ ジョイスティックを使ã†ï¼š
+ </check_box>
+ <text left="180" name="joystick_type" width="320"/>
+ <spinner label="X軸マッピング" name="JoystickAxis1"/>
+ <spinner label="Y軸マッピング" name="JoystickAxis2"/>
+ <spinner label="Z軸マッピング" name="JoystickAxis0"/>
+ <spinner label="ピッãƒãƒ»ãƒžãƒƒãƒ”ング" label_width="110" left="10" name="JoystickAxis4" width="150"/>
+ <spinner label="ヨー・マッピング" name="JoystickAxis5"/>
+ <spinner label="ãƒãƒ¼ãƒ«ãƒ»ãƒžãƒƒãƒ”ング" label_width="110" left="350" name="JoystickAxis3" width="150"/>
+ <spinner label="ズーム・マッピング" label_width="110" left="10" name="JoystickAxis6" width="150"/>
+ <check_box label="直接ズーム" name="ZoomDirect"/>
+ <check_box label="3Dカーソル" name="Cursor3D"/>
+ <check_box label="自動レベル" name="AutoLeveling"/>
+ <text name="Control Modes:">
+ 制御モード：
+ </text>
+ <check_box left="131" name="JoystickAvatarEnabled">
+ ã‚¢ãƒã‚¿ãƒ¼
+ </check_box>
+ <check_box left="201" name="JoystickBuildEnabled">
+ é€ ã‚‹
+ </check_box>
+ <check_box left="271" name="JoystickFlycamEnabled">
+ フライ・カメラ
+ </check_box>
+ <text left="5" name="XScale" width="120">
+ Xスケール
+ </text>
+ <spinner left="135" name="AvatarAxisScale1" width="50"/>
+ <spinner left="205" name="BuildAxisScale1" width="50"/>
+ <spinner left="275" name="FlycamAxisScale1" width="50"/>
+ <text left="5" name="YScale" width="120">
+ Yスケール
+ </text>
+ <spinner left="135" name="AvatarAxisScale2" width="50"/>
+ <spinner left="205" name="BuildAxisScale2" width="50"/>
+ <spinner left="275" name="FlycamAxisScale2" width="50"/>
+ <text left="5" name="ZScale" width="120">
+ Zスケール
+ </text>
+ <spinner left="135" name="AvatarAxisScale0" width="50"/>
+ <spinner left="205" name="BuildAxisScale0" width="50"/>
+ <spinner left="275" name="FlycamAxisScale0" width="50"/>
+ <text left="5" name="PitchScale" width="120">
+ ピッãƒãƒ»ã‚¹ã‚±ãƒ¼ãƒ«
+ </text>
+ <spinner left="135" name="AvatarAxisScale4" width="50"/>
+ <spinner left="205" name="BuildAxisScale4" width="50"/>
+ <spinner left="275" name="FlycamAxisScale4" width="50"/>
+ <text left="5" name="YawScale" width="120">
+ ヨー・スケール
+ </text>
+ <spinner left="135" name="AvatarAxisScale5" width="50"/>
+ <spinner left="205" name="BuildAxisScale5" width="50"/>
+ <spinner left="275" name="FlycamAxisScale5" width="50"/>
+ <text left="5" name="RollScale" width="120">
+ ãƒãƒ¼ãƒ«ãƒ»ã‚¹ã‚±ãƒ¼ãƒ«
+ </text>
+ <spinner left="205" name="BuildAxisScale3" width="50"/>
+ <spinner left="275" name="FlycamAxisScale3" width="50"/>
+ <text left="5" name="XDeadZone" width="120">
+ Xデッド・ゾーン
+ </text>
+ <spinner left="135" name="AvatarAxisDeadZone1" width="50"/>
+ <spinner left="205" name="BuildAxisDeadZone1" width="50"/>
+ <spinner left="275" name="FlycamAxisDeadZone1" width="50"/>
+ <text left="5" name="YDeadZone" width="120">
+ Yデッド・ゾーン
+ </text>
+ <spinner left="135" name="AvatarAxisDeadZone2" width="50"/>
+ <spinner left="205" name="BuildAxisDeadZone2" width="50"/>
+ <spinner left="275" name="FlycamAxisDeadZone2" width="50"/>
+ <text left="5" name="ZDeadZone" width="120">
+ Zデッド・ゾーン
+ </text>
+ <spinner left="135" name="AvatarAxisDeadZone0" width="50"/>
+ <spinner left="205" name="BuildAxisDeadZone0" width="50"/>
+ <spinner left="275" name="FlycamAxisDeadZone0" width="50"/>
+ <text left="0" name="PitchDeadZone" width="135">
+ ピッãƒãƒ»ãƒ‡ãƒƒãƒ‰ãƒ»ã‚¾ãƒ¼ãƒ³
+ </text>
+ <spinner left="135" name="AvatarAxisDeadZone4" width="50"/>
+ <spinner left="205" name="BuildAxisDeadZone4" width="50"/>
+ <spinner left="275" name="FlycamAxisDeadZone4" width="50"/>
+ <text left="5" name="YawDeadZone" width="120">
+ ヨー・デッド・ゾーン
+ </text>
+ <spinner left="135" name="AvatarAxisDeadZone5" width="50"/>
+ <spinner left="205" name="BuildAxisDeadZone5" width="50"/>
+ <spinner left="275" name="FlycamAxisDeadZone5" width="50"/>
+ <text left="0" name="RollDeadZone" width="135">
+ ãƒãƒ¼ãƒ«ãƒ»ãƒ‡ãƒƒãƒ‰ãƒ»ã‚¾ãƒ¼ãƒ³
+ </text>
+ <spinner left="205" name="BuildAxisDeadZone3" width="50"/>
+ <spinner left="275" name="FlycamAxisDeadZone3" width="50"/>
+ <text name="Feathering">
+ 羽毛
+ </text>
+ <slider label="" left="126" name="AvatarFeathering" width="67"/>
+ <slider label="" left="196" name="BuildFeathering" width="67"/>
+ <slider label="" left="266" name="FlycamFeathering" width="67"/>
+ <text left="0" name="ZoomScale2" width="140">
+ ズーム・スケール
+ </text>
+ <spinner label="" left="275" name="FlycamAxisScale6" width="50"/>
+ <text left="0" name="ZoomDeadZone" width="140">
+ ズーム・デッド・ゾーン
+ </text>
+ <spinner label="" left="275" name="FlycamAxisDeadZone6" width="50"/>
+ <button label="SpaceNavigatorã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè¨å®š" left="330" name="SpaceNavigatorDefaults" width="210"/>
+ <button label="OK" label_selected="OK" name="ok_btn"/>
+ <button label="å–り消ã—" label_selected="å–り消ã—" name="cancel_btn"/>
+ <string name="JoystickMonitor">
+ ジョイスティック・モニター
+ </string>
+ <string name="Axis">
+ 軸 [NUM]
+ </string>
+ <string name="NoDevice">
+ デãƒã‚¤ã‚¹ã¯æ¤œå‡ºã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
index fbd7a6d93e..e25771ea72 100644
--- a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_lagmeter" title="ラグ メーター">
- <button name="client_lagmeter" tool_tip="クライアント ラグ ステータス" />
- <text name="client">
- クライアント:
- </text>
- <text name="client_text">
- ノーマル
- </text>
- <button name="network_lagmeter" tool_tip="ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ラグ ステータス" />
- <text name="network">
- ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯:
- </text>
- <text name="network_text">
- ノーマル
- </text>
- <button name="server_lagmeter" tool_tip="サーãƒãƒ¼ ラグ ステータス" />
- <text name="server">
- サーãƒãƒ¼:
- </text>
- <text name="server_text">
- ノーマル
- </text>
- <button label="?" name="server_help" />
- <button label=">>Â " name="minimize" />
- <text name="max_title_msg">
- ラグ メーター
- </text>
- <text name="max_width_px">
- 350
- </text>
- <text name="min_title_msg">
- ラグ
- </text>
- <text name="min_width_px">
- 90
- </text>
- <text name="client_text_msg">
- クライアント
- </text>
- <text name="client_frame_rate_critical_fps">
- 10
- </text>
- <text name="client_frame_rate_warning_fps">
- 15
- </text>
- <text name="client_frame_time_window_bg_msg">
- ノーマルã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯èƒŒæ™¯ã«
- </text>
- <text name="client_frame_time_critical_msg">
- クライアント フレームレート ＜ [CLIENT_FRAME_RATE_CRITICAL]
- </text>
- <text name="client_frame_time_warning_msg">
- クライアント フレームレート: [CLIENT_FRAME_RATE_CRITICAL] ～ [CLIENT_FRAME_RATE_WARNING]
- </text>
- <text name="client_frame_time_normal_msg">
- ノーマル
- </text>
- <text name="client_draw_distance_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : æç”»è·é›¢ã®è¨å®šãŒå¤§ãã™ãŽã‚‹
- </text>
- <text name="client_texture_loading_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ç”»åƒã®ãƒãƒ¼ãƒ‰ä¸
- </text>
- <text name="client_texture_memory_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : メモリ内ã®ç”»åƒæ•°ãŒå¤šã™ãŽã‚‹
- </text>
- <text name="client_complex_objects_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ç”»é¢ã«å«ã¾ã‚Œã‚‹è¤‡é›‘ãªã‚ªãƒ–ジェクトãŒå¤šã™ãŽã‚‹
- </text>
- <text name="network_text_msg">
- ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯
- </text>
- <text name="network_packet_loss_critical_pct">
- 10
- </text>
- <text name="network_packet_loss_warning_pct">
- 5
- </text>
- <text name="network_packet_loss_critical_msg">
- 接続ã§ãƒ‰ãƒãƒƒãƒ—ã•ã‚Œã‚‹ãƒ‘ケットã®å‰²åˆ: ＞ [NETWORK_PACKET_LOSS_CRITICAL]
- </text>
- <text name="network_packet_loss_warning_msg">
- 接続ã§ãƒ‰ãƒãƒƒãƒ—ã•ã‚Œã‚‹ãƒ‘ケットã®å‰²åˆ:[NETWORK_PACKET_LOSS_WARNING] ～ [NETWORK_PACKET_LOSS_CRITICAL]
- </text>
- <text name="network_performance_normal_msg">
- ノーマル
- </text>
- <text name="network_ping_critical_ms">
- 600
- </text>
- <text name="network_ping_warning_ms">
- 300
- </text>
- <text name="network_ping_critical_msg">
- 接続㮠ping 時間: ＞ [NETWORK_PING_CRITICAL] ミリ秒
- </text>
- <text name="network_ping_warning_msg">
- 接続㮠ping 時間: [NETWORK_PING_WARNING] ～ [NETWORK_PING_CRITICAL] ミリ秒
- </text>
- <text name="network_packet_loss_cause_msg">
- 接続ä¸è‰¯ã«ãªã£ã¦ã„ã‚‹ã‹ã€å¸¯åŸŸå¹…è¨å®šãŒé«˜ã™ãŽã¾ã™ã€‚
- </text>
- <text name="network_ping_cause_msg">
- 接続ä¸è‰¯ã«ãªã£ã¦ã„ã‚‹ã‹ã€ãƒ•ã‚¡ã‚¤ãƒ«å…±æœ‰ã‚¢ãƒ—リケーションã«å•é¡ŒãŒã‚ã‚Šã¾ã™ã€‚
- </text>
- <text name="server_text_msg">
- サーãƒãƒ¼
- </text>
- <text name="server_frame_rate_critical_fps">
- 20
- </text>
- <text name="server_frame_rate_warning_fps">
- 30
- </text>
- <text name="server_single_process_max_time_ms">
- 20
- </text>
- <text name="server_frame_time_critical_msg">
- シミュレーターã®ãƒ•ãƒ¬ãƒ¼ãƒ レート: ＜ [SERVER_FRAME_RATE_CRITICAL]
- </text>
- <text name="server_frame_time_warning_msg">
- シミュレーターã®ãƒ•ãƒ¬ãƒ¼ãƒ レート: [SERVER_FRAME_RATE_CRITICAL] ～ [SERVER_FRAME_RATE_WARNING]
- </text>
- <text name="server_frame_time_normal_msg">
- ノーマル
- </text>
- <text name="server_physics_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : 物ç†çš„オブジェクトãŒå¤šã™ãŽã‚‹
- </text>
- <text name="server_scripts_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : スクリプトをå«ã‚€ã‚ªãƒ–ジェクトãŒå¤šã™ãŽã‚‹
- </text>
- <text name="server_net_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ トラフィックéŽå¤§
- </text>
- <text name="server_agent_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : 地域内ã«ã¦å‹•ã„ã¦ã„ã‚‹ã‚¢ãƒã‚¿ãƒ¼ãŒå¤šã™ãŽã‚‹
- </text>
- <text name="server_images_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ç”»åƒè¨ˆç®—ãŒå¤šã™ãŽã‚‹
- </text>
- <text name="server_generic_cause_msg">
- 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : シミュレーターã®éŽè² è·
- </text>
- <text name="smaller_label">
- >>Â
- </text>
- <text name="bigger_label">
- <<Â
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_lagmeter" title="ラグ メーター">
+ <button name="client_lagmeter" tool_tip="クライアント ラグ ステータス" />
+ <text name="client">
+ クライアント:
+ </text>
+ <text name="client_text">
+ ノーマル
+ </text>
+ <button name="network_lagmeter" tool_tip="ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ラグ ステータス" />
+ <text name="network">
+ ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯:
+ </text>
+ <text name="network_text">
+ ノーマル
+ </text>
+ <button name="server_lagmeter" tool_tip="サーãƒãƒ¼ ラグ ステータス" />
+ <text name="server">
+ サーãƒãƒ¼:
+ </text>
+ <text name="server_text">
+ ノーマル
+ </text>
+ <button label="?" name="server_help" />
+ <button label=">>Â " name="minimize" />
+ <text name="max_title_msg">
+ ラグ メーター
+ </text>
+ <text name="max_width_px">
+ 350
+ </text>
+ <text name="min_title_msg">
+ ラグ
+ </text>
+ <text name="min_width_px">
+ 90
+ </text>
+ <text name="client_text_msg">
+ クライアント
+ </text>
+ <text name="client_frame_rate_critical_fps">
+ 10
+ </text>
+ <text name="client_frame_rate_warning_fps">
+ 15
+ </text>
+ <text name="client_frame_time_window_bg_msg">
+ ノーマルã€ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã¯èƒŒæ™¯ã«
+ </text>
+ <text name="client_frame_time_critical_msg">
+ クライアント フレームレート ＜ [CLIENT_FRAME_RATE_CRITICAL]
+ </text>
+ <text name="client_frame_time_warning_msg">
+ クライアント フレームレート: [CLIENT_FRAME_RATE_CRITICAL] ～ [CLIENT_FRAME_RATE_WARNING]
+ </text>
+ <text name="client_frame_time_normal_msg">
+ ノーマル
+ </text>
+ <text name="client_draw_distance_cause_msg">
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : æç”»è·é›¢ã®è¨å®šãŒå¤§ãã™ãŽã‚‹
+ </text>
+ <text name="client_texture_loading_cause_msg">
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ç”»åƒã®ãƒãƒ¼ãƒ‰ä¸
+ </text>
+ <text name="client_texture_memory_cause_msg">
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : メモリ内ã®ç”»åƒæ•°ãŒå¤šã™ãŽã‚‹
+ </text>
+ <text name="client_complex_objects_cause_msg">
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ç”»é¢ã«å«ã¾ã‚Œã‚‹è¤‡é›‘ãªã‚ªãƒ–ジェクトãŒå¤šã™ãŽã‚‹
+ </text>
+ <text name="network_text_msg">
+ ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯
+ </text>
+ <text name="network_packet_loss_critical_pct">
+ 10
+ </text>
+ <text name="network_packet_loss_warning_pct">
+ 5
+ </text>
+ <text name="network_packet_loss_critical_msg">
+ 接続ã§ãƒ‰ãƒãƒƒãƒ—ã•ã‚Œã‚‹ãƒ‘ケットã®å‰²åˆ: ＞ [NETWORK_PACKET_LOSS_CRITICAL]
+ </text>
+ <text name="network_packet_loss_warning_msg">
+ 接続ã§ãƒ‰ãƒãƒƒãƒ—ã•ã‚Œã‚‹ãƒ‘ケットã®å‰²åˆ:[NETWORK_PACKET_LOSS_WARNING] ～ [NETWORK_PACKET_LOSS_CRITICAL]
+ </text>
+ <text name="network_performance_normal_msg">
+ ノーマル
+ </text>
+ <text name="network_ping_critical_ms">
+ 600
+ </text>
+ <text name="network_ping_warning_ms">
+ 300
+ </text>
+ <text name="network_ping_critical_msg">
+ 接続㮠ping 時間: ＞ [NETWORK_PING_CRITICAL] ミリ秒
+ </text>
+ <text name="network_ping_warning_msg">
+ 接続㮠ping 時間: [NETWORK_PING_WARNING] ～ [NETWORK_PING_CRITICAL] ミリ秒
+ </text>
+ <text name="network_packet_loss_cause_msg">
+ 接続ä¸è‰¯ã«ãªã£ã¦ã„ã‚‹ã‹ã€å¸¯åŸŸå¹…è¨å®šãŒé«˜ã™ãŽã¾ã™ã€‚
+ </text>
+ <text name="network_ping_cause_msg">
+ 接続ä¸è‰¯ã«ãªã£ã¦ã„ã‚‹ã‹ã€ãƒ•ã‚¡ã‚¤ãƒ«å…±æœ‰ã‚¢ãƒ—リケーションã«å•é¡ŒãŒã‚ã‚Šã¾ã™ã€‚
+ </text>
+ <text name="server_text_msg">
+ サーãƒãƒ¼
+ </text>
+ <text name="server_frame_rate_critical_fps">
+ 20
+ </text>
+ <text name="server_frame_rate_warning_fps">
+ 30
+ </text>
+ <text name="server_single_process_max_time_ms">
+ 20
+ </text>
+ <text name="server_frame_time_critical_msg">
+ シミュレーターã®ãƒ•ãƒ¬ãƒ¼ãƒ レート: ＜ [SERVER_FRAME_RATE_CRITICAL]
+ </text>
+ <text name="server_frame_time_warning_msg">
+ シミュレーターã®ãƒ•ãƒ¬ãƒ¼ãƒ レート: [SERVER_FRAME_RATE_CRITICAL] ～ [SERVER_FRAME_RATE_WARNING]
+ </text>
+ <text name="server_frame_time_normal_msg">
+ ノーマル
+ </text>
+ <text name="server_physics_cause_msg">
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : 物ç†çš„オブジェクトãŒå¤šã™ãŽã‚‹
+ </text>
+ <text name="server_scripts_cause_msg">
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : スクリプトをå«ã‚€ã‚ªãƒ–ジェクトãŒå¤šã™ãŽã‚‹
+ </text>
+ <text name="server_net_cause_msg">
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ トラフィックéŽå¤§
+ </text>
+ <text name="server_agent_cause_msg">
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : 地域内ã«ã¦å‹•ã„ã¦ã„ã‚‹ã‚¢ãƒã‚¿ãƒ¼ãŒå¤šã™ãŽã‚‹
+ </text>
+ <text name="server_images_cause_msg">
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : ç”»åƒè¨ˆç®—ãŒå¤šã™ãŽã‚‹
+ </text>
+ <text name="server_generic_cause_msg">
+ 考ãˆã‚‰ã‚Œã‚‹åŽŸå› : シミュレーターã®éŽè² è·
+ </text>
+ <text name="smaller_label">
+ >>Â
+ </text>
+ <text name="bigger_label">
+ <<Â
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
index dbfce5d07c..55eba966dc 100644
--- a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script ed float" title="LSL Wiki">
- <check_box label="カーソルを追ã†" name="lock_check" />
- <combo_box label="ãƒãƒƒã‚¯" name="history_combo" />
- <button label="戻る" name="back_btn" />
- <button label="進む" name="fwd_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="LSL Wiki">
+ <check_box label="カーソルを追ã†" name="lock_check" />
+ <combo_box label="ãƒãƒƒã‚¯" name="history_combo" />
+ <button label="戻る" name="back_btn" />
+ <button label="進む" name="fwd_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_media_browser.xml b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
index ff9702a99d..6877cc7f53 100644
--- a/indra/newview/skins/default/xui/ja/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/ja/floater_media_browser.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_about" title="メディア・ブラウザ">
- <layout_stack name="stack1">
- <layout_panel name="nav_controls">
- <button label="戻る" name="back" />
- <button label="進む" name="forward" />
- <button label="æ›´æ–°" name="reload" />
- <button label="閲覧" name="go" />
- </layout_panel>
- <layout_panel name="parcel_owner_controls">
- <button label="ç¾åœ¨ã® URL を区画ã«é€ä¿¡" name="assign" />
- </layout_panel>
- <layout_panel name="external_controls">
- <button label="外部ウェブ・ブラウザã§é–‹ã" name="open_browser" />
- <check_box label="常ã«å¤–部ã®ã‚¦ã‚§ãƒ–・ブラウザã§é–‹ã" name="open_always" />
- <button label="é–‰ã˜ã‚‹" name="close" />
- </layout_panel>
- </layout_stack>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="メディア・ブラウザ">
+ <layout_stack name="stack1">
+ <layout_panel name="nav_controls">
+ <button label="戻る" name="back" />
+ <button label="進む" name="forward" />
+ <button label="æ›´æ–°" name="reload" />
+ <button label="閲覧" name="go" />
+ </layout_panel>
+ <layout_panel name="parcel_owner_controls">
+ <button label="ç¾åœ¨ã® URL を区画ã«é€ä¿¡" name="assign" />
+ </layout_panel>
+ <layout_panel name="external_controls">
+ <button label="外部ウェブ・ブラウザã§é–‹ã" name="open_browser" />
+ <check_box label="常ã«å¤–部ã®ã‚¦ã‚§ãƒ–・ブラウザã§é–‹ã" name="open_always" />
+ <button label="é–‰ã˜ã‚‹" name="close" />
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
index 8cf2e00a9a..4d6b6ca70a 100644
--- a/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mem_leaking.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="MemLeak" title="メモリ・リーク・シミュレーション">
- <spinner label="リークスピード(1フレームã”ã¨ã®ãƒã‚¤ãƒˆæ•°)："
- name="leak_speed" label_width="244" />
- <spinner label="リークã—ãŸæœ€å¤§ãƒ¡ãƒ¢ãƒªæ•°(MB)：" name="max_leak" label_width="244" />
- <text name="total_leaked_label">
- ç¾åœ¨ã®ãƒªãƒ¼ã‚¯ãƒ¡ãƒ¢ãƒªã‚µã‚¤ã‚ºï¼š [SIZE] KB
- </text>
- <text name="note_label_1">
- [NOTE1]
- </text>
- <text name="note_label_2">
- [NOTE2]
- </text>
- <button label="開始" name="start_btn" />
- <button label="åœæ¢" name="stop_btn" />
- <button label="解放" name="release_btn" />
- <button label="é–‰ã˜ã‚‹" name="close_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="MemLeak" title="メモリ・リーク・シミュレーション">
+ <spinner label="リークスピード(1フレームã”ã¨ã®ãƒã‚¤ãƒˆæ•°)："
+ name="leak_speed" label_width="244" />
+ <spinner label="リークã—ãŸæœ€å¤§ãƒ¡ãƒ¢ãƒªæ•°(MB)：" name="max_leak" label_width="244" />
+ <text name="total_leaked_label">
+ ç¾åœ¨ã®ãƒªãƒ¼ã‚¯ãƒ¡ãƒ¢ãƒªã‚µã‚¤ã‚ºï¼š [SIZE] KB
+ </text>
+ <text name="note_label_1">
+ [NOTE1]
+ </text>
+ <text name="note_label_2">
+ [NOTE2]
+ </text>
+ <button label="開始" name="start_btn" />
+ <button label="åœæ¢" name="stop_btn" />
+ <button label="解放" name="release_btn" />
+ <button label="é–‰ã˜ã‚‹" name="close_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_mute_object.xml b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
index c32d68405c..072bb4a576 100644
--- a/indra/newview/skins/default/xui/ja/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/ja/floater_mute_object.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute by name" title="オブジェクトåã§ç„¡è¦–ã™ã‚‹">
- <text name="message">
- ﾃｷｽﾄã®ã¿ã«å½±éŸ¿ã—ã€ï½»ï½³ï¾ï¾„ﾞ(環境音ãªã©)ã«ã¯å½±éŸ¿ã—ã¾ã›ã‚“。
-æ£ç¢ºãªã‚ªãƒ–ジェクトåを入力ã—ã¦ãã ã•ã„。
- </text>
- <line_editor name="object_name">
- オブジェクトå
- </line_editor>
- <button label="OK" name="OK" />
- <button label="ｷｬï¾ï½¾ï¾™" name="Cancel" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="mute by name" title="オブジェクトåã§ç„¡è¦–ã™ã‚‹">
+ <text name="message">
+ ﾃｷｽﾄã®ã¿ã«å½±éŸ¿ã—ã€ï½»ï½³ï¾ï¾„ﾞ(環境音ãªã©)ã«ã¯å½±éŸ¿ã—ã¾ã›ã‚“。
+æ£ç¢ºãªã‚ªãƒ–ジェクトåを入力ã—ã¦ãã ã•ã„。
+ </text>
+ <line_editor name="object_name">
+ オブジェクトå
+ </line_editor>
+ <button label="OK" name="OK" />
+ <button label="ｷｬï¾ï½¾ï¾™" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_my_friends.xml b/indra/newview/skins/default/xui/ja/floater_my_friends.xml
index e28029ba1f..10e55f0655 100644
--- a/indra/newview/skins/default/xui/ja/floater_my_friends.xml
+++ b/indra/newview/skins/default/xui/ja/floater_my_friends.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_my_friends" title="連絡先" min_width="500">
- <tab_container name="friends_and_groups">
- <panel label="フレンド" name="friends_panel" />
- <panel label="グループ" name="groups_panel" />
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_my_friends" title="連絡先" min_width="500">
+ <tab_container name="friends_and_groups">
+ <panel label="フレンド" name="friends_panel" />
+ <panel label="グループ" name="groups_panel" />
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml
index 0ada3d128a..7c4d9c78ee 100644
--- a/indra/newview/skins/default/xui/ja/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/ja/floater_post_process.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Post-Process Floater" title="ãƒã‚¹ãƒˆãƒ—ãƒã‚»ã‚¹è¨å®š">
- <tab_container name="Post-Process Tabs">
- <panel label="カラー・フィルター" name="wmiColorFilterPanel">
- <check_box label="有効" name="wmiColorFilterToggle" />
- <text name="wmiColorFilterBrightnessText">
- 明るã•
- </text>
- <text name="wmiColorFilterSaturationText">
- 彩度
- </text>
- <text name="wmiColorFilterContrastText">
- コントラスト
- </text>
- <text name="wmiColorFilterBaseText">
- コントラストã®åŸºæœ¬è‰²
- </text>
- <slider label="R" name="wmiColorFilterBaseR" />
- <slider label="G" name="wmiColorFilterBaseG" />
- <slider label="B" name="wmiColorFilterBaseB" />
- <slider label="I" name="wmiColorFilterBaseI" />
- </panel>
- <panel label="ナイトビジョン" name="wmiNightVisionPanel">
- <check_box label="有効" name="wmiNightVisionToggle" />
- <text name="wmiNightVisionBrightMultText">
- å…‰ã®å¢—幅（マルãƒï¼‰
- </text>
- <text name="wmiNightVisionNoiseSizeText">
- ノイズ・サイズ
- </text>
- <text name="wmiNightVisionNoiseStrengthText">
- ノイズ強度
- </text>
- </panel>
- <panel label="ブルーム" name="wmiBloomPanel">
- <check_box label="有効" name="wmiBloomToggle" />
- <text name="wmiBloomExtractText">
- 明度ã®æŠ½å‡º
- </text>
- <text name="wmiBloomSizeText">
- ブルーム・サイズ
- </text>
- <text name="wmiBloomStrengthText">
- ブルーム強度
- </text>
- </panel>
- <panel label="ãã®ä»–" name="Extras">
- <button label="効果èªã¿è¾¼ã¿" label_selected="効果èªã¿è¾¼ã¿"
- name="PPLoadEffect" />
- <button label="効果ä¿å˜" label_selected="効果ä¿å˜" name="PPSaveEffect" />
- <line_editor label="効果å" name="PPEffectNameEditor" />
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Post-Process Floater" title="ãƒã‚¹ãƒˆãƒ—ãƒã‚»ã‚¹è¨å®š">
+ <tab_container name="Post-Process Tabs">
+ <panel label="カラー・フィルター" name="wmiColorFilterPanel">
+ <check_box label="有効" name="wmiColorFilterToggle" />
+ <text name="wmiColorFilterBrightnessText">
+ 明るã•
+ </text>
+ <text name="wmiColorFilterSaturationText">
+ 彩度
+ </text>
+ <text name="wmiColorFilterContrastText">
+ コントラスト
+ </text>
+ <text name="wmiColorFilterBaseText">
+ コントラストã®åŸºæœ¬è‰²
+ </text>
+ <slider label="R" name="wmiColorFilterBaseR" />
+ <slider label="G" name="wmiColorFilterBaseG" />
+ <slider label="B" name="wmiColorFilterBaseB" />
+ <slider label="I" name="wmiColorFilterBaseI" />
+ </panel>
+ <panel label="ナイトビジョン" name="wmiNightVisionPanel">
+ <check_box label="有効" name="wmiNightVisionToggle" />
+ <text name="wmiNightVisionBrightMultText">
+ å…‰ã®å¢—幅（マルãƒï¼‰
+ </text>
+ <text name="wmiNightVisionNoiseSizeText">
+ ノイズ・サイズ
+ </text>
+ <text name="wmiNightVisionNoiseStrengthText">
+ ノイズ強度
+ </text>
+ </panel>
+ <panel label="ブルーム" name="wmiBloomPanel">
+ <check_box label="有効" name="wmiBloomToggle" />
+ <text name="wmiBloomExtractText">
+ 明度ã®æŠ½å‡º
+ </text>
+ <text name="wmiBloomSizeText">
+ ブルーム・サイズ
+ </text>
+ <text name="wmiBloomStrengthText">
+ ブルーム強度
+ </text>
+ </panel>
+ <panel label="ãã®ä»–" name="Extras">
+ <button label="効果èªã¿è¾¼ã¿" label_selected="効果èªã¿è¾¼ã¿"
+ name="PPLoadEffect" />
+ <button label="効果ä¿å˜" label_selected="効果ä¿å˜" name="PPSaveEffect" />
+ <line_editor label="効果å" name="PPEffectNameEditor" />
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_classified.xml b/indra/newview/skins/default/xui/ja/floater_preview_classified.xml
index a58d131fa3..f0770b2ed5 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_classified.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="classified_preview" title="ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šæƒ…å ±" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="classified_preview" title="ã‚¯ãƒ©ã‚·ãƒ•ã‚¡ã‚¤ãƒ‰åºƒå‘Šæƒ…å ±" />
diff --git a/indra/newview/skins/default/xui/ja/floater_preview_event.xml b/indra/newview/skins/default/xui/ja/floater_preview_event.xml
index 7f49c27b2b..9ecabfabb0 100644
--- a/indra/newview/skins/default/xui/ja/floater_preview_event.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preview_event.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="event_preview" title="ã‚¤ãƒ™ãƒ³ãƒˆæƒ…å ±" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="event_preview" title="ã‚¤ãƒ™ãƒ³ãƒˆæƒ…å ±" />
diff --git a/indra/newview/skins/default/xui/ja/floater_region_info.xml b/indra/newview/skins/default/xui/ja/floater_region_info.xml
index 78fab8b26a..7ac7facce5 100644
--- a/indra/newview/skins/default/xui/ja/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/ja/floater_region_info.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="regioninfo" title="地域/ä¸å‹•ç”£" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="regioninfo" title="地域/ä¸å‹•ç”£" />
diff --git a/indra/newview/skins/default/xui/ja/floater_select_key.xml b/indra/newview/skins/default/xui/ja/floater_select_key.xml
index 496faddbbb..09c98add47 100644
--- a/indra/newview/skins/default/xui/ja/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/ja/floater_select_key.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container">
- <button label="ã‚ャンセル" label_selected="ã‚ャンセル" name="Cancel" />
- <text name="Save item as:">
- ã‚ーを押ã—ã¦é¸æŠž
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container">
+ <button label="ã‚ャンセル" label_selected="ã‚ャンセル" name="Cancel" />
+ <text name="Save item as:">
+ ã‚ーを押ã—ã¦é¸æŠž
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_sell_land.xml b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
index 1db0e2ad0e..3ca55621ac 100644
--- a/indra/newview/skins/default/xui/ja/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_sell_land.xml
@@ -34,15 +34,15 @@
誰ã«ã§ã‚‚販売ã™ã‚‹ã‹ã€ç‰¹å®šã®äººã«ã®ã¿è²©å£²ã™ã‚‹ã‹ã‚’é¸æŠžã—ã¦ãã ã•ã„
</text>
<combo_box name="sell_to">
- <combo_item name="--selectone--">
+ <combo_box.item name="--selectone--">
ï¼ï¼1ã¤é¸æŠžï¼ï¼
- </combo_item>
- <combo_item name="Anyone">
+ </combo_box.item>
+ <combo_box.item name="Anyone">
誰ã§ã‚‚
- </combo_item>
- <combo_item name="Specificuser:">
+ </combo_box.item>
+ <combo_box.item name="Specificuser:">
特定ユーザー：
- </combo_item>
+ </combo_box.item>
</combo_box>
<button label="é¸æŠž..." name="sell_to_select_agent" />
<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
index 1de3763f79..46d949ad81 100644
--- a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater name="settings_debug" title="デãƒãƒƒã‚°è¨å®š">
<combo_box name="boolean_combo">
- <combo_item name="TRUE">
+ <combo_box.item name="TRUE">
æ£
- </combo_item>
- <combo_item name="FALSE">
+ </combo_box.item>
+ <combo_box.item name="FALSE">
誤
- </combo_item>
+ </combo_box.item>
</combo_box>
<color_swatch label="色" name="color_swatch" />
<spinner label="x" name="val_spinner_1" />
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index 7937de117c..91bc489d3b 100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -21,12 +21,12 @@
<button label="é€ä¿¡" name="send_btn"/>
<button label="ä¿å˜ï¼ˆL$[AMOUNT]）" name="upload_btn"/>
<flyout_button label="ä¿å˜" name="save_btn" tool_tip="ç”»åƒã‚’ファイルã«ä¿å˜">
- <flyout_button_item name="save_item">
- ä¿å˜
- </flyout_button_item>
- <flyout_button_item name="saveas_item">
- åå‰ã‚’付ã‘ã¦ä¿å˜
- </flyout_button_item>
+ <flyout_button.item name="save_item">
+ ä¿å˜
+ </flyout_button.item>
+ <flyout_button.item name="saveas_item">
+ åå‰ã‚’付ã‘ã¦ä¿å˜
+ </flyout_button.item>
</flyout_button>
<button label="ã‚ャンセル" name="discard_btn"/>
<button label="全表示 >>" name="more_btn" tool_tip="高度ãªã‚ªãƒ—ション"/>
@@ -38,75 +38,75 @@
å½¢å¼
</text>
<combo_box label="解åƒåº¦" name="postcard_size_combo">
- <combo_item name="CurrentWindow">
+ <combo_box.item name="CurrentWindow">
ç¾åœ¨ã®ï½³ï½¨ï¾ï¾„ﾞｳ
- </combo_item>
- <combo_item name="640x480">
+ </combo_box.item>
+ <combo_box.item name="640x480">
640x480
- </combo_item>
- <combo_item name="800x600">
+ </combo_box.item>
+ <combo_box.item name="800x600">
800x600
- </combo_item>
- <combo_item name="1024x768">
+ </combo_box.item>
+ <combo_box.item name="1024x768">
1024x768
- </combo_item>
- <combo_item name="Custom">
+ </combo_box.item>
+ <combo_box.item name="Custom">
カスタãƒ
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="解åƒåº¦" name="texture_size_combo">
- <combo_item name="CurrentWindow">
+ <combo_box.item name="CurrentWindow">
ç¾åœ¨ã®ï½³ï½¨ï¾ï¾„ﾞｳ
- </combo_item>
- <combo_item name="Small(128x128)">
+ </combo_box.item>
+ <combo_box.item name="Small(128x128)">
å°ï¼ˆ128x128）
- </combo_item>
- <combo_item name="Medium(256x256)">
+ </combo_box.item>
+ <combo_box.item name="Medium(256x256)">
ä¸ï¼ˆ256x256）
- </combo_item>
- <combo_item name="Large(512x512)">
+ </combo_box.item>
+ <combo_box.item name="Large(512x512)">
大（512x512）
- </combo_item>
- <combo_item name="Custom">
+ </combo_box.item>
+ <combo_box.item name="Custom">
カスタãƒ
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="解åƒåº¦" name="local_size_combo">
- <combo_item name="CurrentWindow">
+ <combo_box.item name="CurrentWindow">
ç¾åœ¨ã®ï½³ï½¨ï¾ï¾„ﾞｳ
- </combo_item>
- <combo_item name="320x240">
+ </combo_box.item>
+ <combo_box.item name="320x240">
320x240
- </combo_item>
- <combo_item name="640x480">
+ </combo_box.item>
+ <combo_box.item name="640x480">
640x480
- </combo_item>
- <combo_item name="800x600">
+ </combo_box.item>
+ <combo_box.item name="800x600">
800x600
- </combo_item>
- <combo_item name="1024x768">
+ </combo_box.item>
+ <combo_box.item name="1024x768">
1024x768
- </combo_item>
- <combo_item name="1280x1024">
+ </combo_box.item>
+ <combo_box.item name="1280x1024">
1280x1024
- </combo_item>
- <combo_item name="1600x1200">
+ </combo_box.item>
+ <combo_box.item name="1600x1200">
1600x1200
- </combo_item>
- <combo_item name="Custom">
+ </combo_box.item>
+ <combo_box.item name="Custom">
カスタãƒ
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="å½¢å¼" name="local_format_combo">
- <combo_item name="PNG">
+ <combo_box.item name="PNG">
PNG
- </combo_item>
- <combo_item name="JPEG">
+ </combo_box.item>
+ <combo_box.item name="JPEG">
JPEG
- </combo_item>
- <combo_item name="BMP">
+ </combo_box.item>
+ <combo_box.item name="BMP">
BMP
- </combo_item>
+ </combo_box.item>
</combo_box>
<spinner label="å¹…" name="snapshot_width" label_width="25" width="90"/>
<spinner label="高ã•" name="snapshot_height" label_width="30" left="115" width="90"/>
@@ -116,15 +116,15 @@
ｷｬﾌﾟï¾ï½¬ï¼š
</text>
<combo_box label="ç”»åƒãƒ¬ã‚¤ãƒ¤ãƒ¼" name="layer_types">
- <combo_item name="Colors">
+ <combo_box.item name="Colors">
色
- </combo_item>
- <combo_item name="Depth">
+ </combo_box.item>
+ <combo_box.item name="Depth">
æ·±ã•
- </combo_item>
- <combo_item name="ObjectMattes">
+ </combo_box.item>
+ <combo_box.item name="ObjectMattes">
オグジェクトã®ã¤ã‚„消ã—
- </combo_item>
+ </combo_box.item>
</combo_box>
<check_box label="インタフェースを表示" name="ui_check"/>
<check_box label="HUD オブジェクトを表示" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index 9b0f2dbf11..9d3ca20c7c 100644
--- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="url_entry">
- <text name="media_label">
- メディア URL：
- </text>
- <combo_box left="100" name="media_entry" width="360" />
- <button label="OK" name="ok_btn" width="78"/>
- <button label="ã‚ャンセル" name="cancel_btn" width="80"/>
- <button label="クリア" name="clear_btn" />
- <text name="loading_label">
- ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="url_entry">
+ <text name="media_label">
+ メディア URL：
+ </text>
+ <combo_box left="100" name="media_entry" width="360" />
+ <button label="OK" name="ok_btn" width="78"/>
+ <button label="ã‚ャンセル" name="cancel_btn" width="80"/>
+ <button label="クリア" name="clear_btn" />
+ <text name="loading_label">
+ ãƒãƒ¼ãƒ‰ä¸ï¼Žï¼Žï¼Ž
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_water.xml b/indra/newview/skins/default/xui/ja/floater_water.xml
index 91094e2d7f..054b003197 100644
--- a/indra/newview/skins/default/xui/ja/floater_water.xml
+++ b/indra/newview/skins/default/xui/ja/floater_water.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Water Floater" title="æ°´ã®é«˜åº¦ãªç·¨é›†">
- <text name="KeyFramePresetsText">
- æ°´ã®äº‹å‰è¨å®šï¼š
- </text>
- <button label="æ–°è¦" label_selected="æ–°è¦" name="WaterNewPreset" />
- <button label="ä¿å˜" label_selected="ä¿å˜" name="WaterSavePreset" />
- <button label="削除" label_selected="削除" name="WaterDeletePreset" />
- <tab_container name="Water Tabs">
- <panel label="è¨å®š" name="Settings">
- <text name="BHText">
- æ°´ä¸ã®ãƒ•ã‚©ã‚°åŠ¹æžœã®è‰²
- </text>
- <button label="?" name="WaterFogColorHelp" />
- <color_swatch name="WaterFogColor"
- tool_tip="カラー・ピッカーをクリックã—ã¦é–‹ã" />
- <text name="WaterFogDensText">
- æ°´ä¸ã®é€æ˜Žåº¦æŒ‡æ•°
- </text>
- <button label="?" name="WaterFogDensityHelp" />
- <text name="WaterUnderWaterFogModText">
- æ°´ä¸ã®ãƒ•ã‚©ã‚°åŠ¹æžœåŠ 減
- </text>
- <button label="?" name="WaterUnderWaterFogModHelp" />
- <text name="BDensText">
- ã•ã–æ³¢ã®å射スケール
- </text>
- <button label="?" name="WaterNormalScaleHelp" />
- <text name="BHText2">
- 1
- </text>
- <text name="BHText3">
- 2
- </text>
- <text name="BHText4">
- 3
- </text>
- <text name="HDText">
- フレãƒãƒ«ãƒ»ã‚¹ã‚±ãƒ¼ãƒ«
- </text>
- <button label="?" name="WaterFresnelScaleHelp" />
- <text name="FresnelOffsetText">
- フレãƒãƒ«ãƒ»ã‚ªãƒ•ã‚»ãƒƒãƒˆ
- </text>
- <button label="?" name="WaterFresnelOffsetHelp" />
- <text name="DensMultText">
- æ°´é¢ã®å±ˆæŠ˜ã‚¹ã‚±ãƒ¼ãƒ«
- </text>
- <button label="?" name="WaterScaleAboveHelp" />
- <text name="WaterScaleBelowText">
- æ°´ä¸ã®å±ˆæŠ˜ã‚¹ã‚±ãƒ¼ãƒ«
- </text>
- <button label="?" name="WaterScaleBelowHelp" />
- <text name="MaxAltText">
- ä¸é€æ˜Žåº¦ã®å¢—å¹…
- </text>
- <button label="?" name="WaterBlurMultiplierHelp" />
- </panel>
- <panel label="ç”»åƒ" name="Waves">
- <text name="BHText">
- 大波ã®æ–¹å‘
- </text>
- <button label="?" name="WaterWave1Help" />
- <text name="WaterWave1DirXText">
- X
- </text>
- <text name="WaterWave1DirYText">
- Y
- </text>
- <text name="BHText2">
- å°æ³¢ã®æ–¹å‘
- </text>
- <button label="?" name="WaterWave2Help" />
- <text name="WaterWave2DirXText">
- X
- </text>
- <text name="WaterWave2DirYText">
- Y
- </text>
- <text name="BHText3">
- ノーマル・マップ
- </text>
- <button label="?" name="WaterNormalMapHelp" />
- </panel>
- </tab_container>
- <string name="WLDefaultWaterNames">
- Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Water Floater" title="æ°´ã®é«˜åº¦ãªç·¨é›†">
+ <text name="KeyFramePresetsText">
+ æ°´ã®äº‹å‰è¨å®šï¼š
+ </text>
+ <button label="æ–°è¦" label_selected="æ–°è¦" name="WaterNewPreset" />
+ <button label="ä¿å˜" label_selected="ä¿å˜" name="WaterSavePreset" />
+ <button label="削除" label_selected="削除" name="WaterDeletePreset" />
+ <tab_container name="Water Tabs">
+ <panel label="è¨å®š" name="Settings">
+ <text name="BHText">
+ æ°´ä¸ã®ãƒ•ã‚©ã‚°åŠ¹æžœã®è‰²
+ </text>
+ <button label="?" name="WaterFogColorHelp" />
+ <color_swatch name="WaterFogColor"
+ tool_tip="カラー・ピッカーをクリックã—ã¦é–‹ã" />
+ <text name="WaterFogDensText">
+ æ°´ä¸ã®é€æ˜Žåº¦æŒ‡æ•°
+ </text>
+ <button label="?" name="WaterFogDensityHelp" />
+ <text name="WaterUnderWaterFogModText">
+ æ°´ä¸ã®ãƒ•ã‚©ã‚°åŠ¹æžœåŠ 減
+ </text>
+ <button label="?" name="WaterUnderWaterFogModHelp" />
+ <text name="BDensText">
+ ã•ã–æ³¢ã®å射スケール
+ </text>
+ <button label="?" name="WaterNormalScaleHelp" />
+ <text name="BHText2">
+ 1
+ </text>
+ <text name="BHText3">
+ 2
+ </text>
+ <text name="BHText4">
+ 3
+ </text>
+ <text name="HDText">
+ フレãƒãƒ«ãƒ»ã‚¹ã‚±ãƒ¼ãƒ«
+ </text>
+ <button label="?" name="WaterFresnelScaleHelp" />
+ <text name="FresnelOffsetText">
+ フレãƒãƒ«ãƒ»ã‚ªãƒ•ã‚»ãƒƒãƒˆ
+ </text>
+ <button label="?" name="WaterFresnelOffsetHelp" />
+ <text name="DensMultText">
+ æ°´é¢ã®å±ˆæŠ˜ã‚¹ã‚±ãƒ¼ãƒ«
+ </text>
+ <button label="?" name="WaterScaleAboveHelp" />
+ <text name="WaterScaleBelowText">
+ æ°´ä¸ã®å±ˆæŠ˜ã‚¹ã‚±ãƒ¼ãƒ«
+ </text>
+ <button label="?" name="WaterScaleBelowHelp" />
+ <text name="MaxAltText">
+ ä¸é€æ˜Žåº¦ã®å¢—å¹…
+ </text>
+ <button label="?" name="WaterBlurMultiplierHelp" />
+ </panel>
+ <panel label="ç”»åƒ" name="Waves">
+ <text name="BHText">
+ 大波ã®æ–¹å‘
+ </text>
+ <button label="?" name="WaterWave1Help" />
+ <text name="WaterWave1DirXText">
+ X
+ </text>
+ <text name="WaterWave1DirYText">
+ Y
+ </text>
+ <text name="BHText2">
+ å°æ³¢ã®æ–¹å‘
+ </text>
+ <button label="?" name="WaterWave2Help" />
+ <text name="WaterWave2DirXText">
+ X
+ </text>
+ <text name="WaterWave2DirYText">
+ Y
+ </text>
+ <text name="BHText3">
+ ノーマル・マップ
+ </text>
+ <button label="?" name="WaterNormalMapHelp" />
+ </panel>
+ </tab_container>
+ <string name="WLDefaultWaterNames">
+ Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml b/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
index 63e68f9188..fa70de054f 100644
--- a/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/ja/floater_windlight_options.xml
@@ -1,190 +1,190 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="WindLight floater" title="空ã®é«˜åº¦ãªç·¨é›†">
- <text name="KeyFramePresetsText">
- 空ã®äº‹å‰è¨å®šï¼š
- </text>
- <button label="æ–°è¦" label_selected="æ–°è¦" name="WLNewPreset" />
- <button label="ä¿å˜" label_selected="ä¿å˜" name="WLSavePreset" />
- <button label="削除" label_selected="削除" name="WLDeletePreset" />
- <button label="デイサイクル編集"
- label_selected="デイサイクル編集" name="WLDayCycleMenuButton" />
- <tab_container name="WindLight Tabs">
- <panel label="大気" name="Atmosphere">
- <text name="BHText">
- 空ã®é…色
- </text>
- <button label="?" name="WLBlueHorizonHelp" />
- <text name="BHText2">
- R
- </text>
- <text name="BHText3">
- G
- </text>
- <text name="BHText4">
- B
- </text>
- <text name="BHText5">
- I
- </text>
- <text name="BDensText">
- 空ã¨é 景ã®éœ²å…‰
- </text>
- <button label="?" name="WLHazeHorizonHelp" />
- <text name="BDensText2">
- 空ã®é…色ã¨æ¿ƒåº¦
- </text>
- <button label="?" name="WLBlueDensityHelp" />
- <text name="BHText6">
- R
- </text>
- <text name="BHText7">
- G
- </text>
- <text name="BHText8">
- B
- </text>
- <text name="BHText9">
- I
- </text>
- <text name="HDText">
- 大気ã®ä¸é€æ˜Žåº¦
- </text>
- <button label="?" name="WLHazeDensityHelp" />
- <text name="DensMultText">
- 大気ã®ä¸é€æ˜Žåº¦ã®å¢—å¹…
- </text>
- <button label="?" name="WLDensityMultHelp" />
- <text name="WLDistanceMultText">
- 視界ã®å¢—å¹…
- </text>
- <button label="?" name="WLDistanceMultHelp" />
- <text name="MaxAltText">
- 最大高度
- </text>
- <button label="?" name="WLMaxAltitudeHelp" />
- </panel>
- <panel label="ライティング" name="Lighting">
- <text name="SLCText">
- 太陽/月ã®è‰²
- </text>
- <button label="?" name="WLSunlightColorHelp" />
- <text name="BHText">
- R
- </text>
- <text name="BHText2">
- G
- </text>
- <text name="BHText3">
- B
- </text>
- <text name="BHText4">
- I
- </text>
- <text name="TODText">
- 太陽/月ã®ä½ç½®
- </text>
- <button label="?" name="WLTimeOfDayHelp" />
- <text name="WLAmbientText">
- アンビエント
- </text>
- <button label="?" name="WLAmbientHelp" />
- <text name="BHText5">
- R
- </text>
- <text name="BHText6">
- G
- </text>
- <text name="BHText7">
- B
- </text>
- <text name="BHText8">
- I
- </text>
- <text name="WLEastAngleText">
- æ±ã®è§’度
- </text>
- <button label="?" name="WLEastAngleHelp" />
- <text name="SunGlowText">
- 太陽ã®è¼ã
- </text>
- <button label="?" name="WLSunGlowHelp" />
- <slider label="フォーカス " name="WLGlowB" />
- <slider label="サイズ " name="WLGlowR" />
- <text name="SceneGammaText">
- 風景ガンマ
- </text>
- <button label="?" name="WLSceneGammaHelp" />
- <text name="WLStarText">
- 星ã®è¼ã
- </text>
- <button label="?" name="WLStarBrightnessHelp" />
- </panel>
- <panel label="雲" name="Clouds">
- <text name="WLCloudColorText">
- 雲ã®è‰²
- </text>
- <button label="?" name="WLCloudColorHelp" />
- <text name="BHText">
- R
- </text>
- <text name="BHText2">
- G
- </text>
- <text name="BHText3">
- B
- </text>
- <text name="BHText4">
- I
- </text>
- <text name="WLCloudColorText2">
- 雲㮠XY/密度
- </text>
- <button label="?" name="WLCloudDensityHelp" />
- <text name="BHText5">
- X
- </text>
- <text name="BHText6">
- Y
- </text>
- <text name="BHText7">
- D
- </text>
- <text name="WLCloudCoverageText">
- 雲ã®é‡
- </text>
- <button label="?" name="WLCloudCoverageHelp" />
- <text name="WLCloudScaleText">
- 雲ã®ã‚¹ã‚±ãƒ¼ãƒ«
- </text>
- <button label="?" name="WLCloudScaleHelp" />
- <text name="WLCloudDetailText">
- 雲ã®è©³ç´° (XY/密度)
- </text>
- <button label="?" name="WLCloudDetailHelp" />
- <text name="BHText8">
- X
- </text>
- <text name="BHText9">
- Y
- </text>
- <text name="BHText10">
- D
- </text>
- <text name="WLCloudScrollXText">
- 雲ã®ç§»å‹•é€Ÿåº¦ (X æ–¹å‘)
- </text>
- <button label="?" name="WLCloudScrollXHelp" />
- <check_box label="ãƒãƒƒã‚¯" name="WLCloudLockX" />
- <text name="WLCloudScrollYText">
- 雲ã®ç§»å‹•é€Ÿåº¦ (Y æ–¹å‘)
- </text>
- <button label="?" name="WLCloudScrollYHelp" />
- <check_box label="ãƒãƒƒã‚¯" name="WLCloudLockY" />
- <check_box label="従æ¥ã®é›²ã‚’æç”»" name="DrawClassicClouds" />
- <button label="?" name="WLClassicCloudsHelp" />
- </panel>
- </tab_container>
- <string name="WLDefaultSkyNames">
- A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="WindLight floater" title="空ã®é«˜åº¦ãªç·¨é›†">
+ <text name="KeyFramePresetsText">
+ 空ã®äº‹å‰è¨å®šï¼š
+ </text>
+ <button label="æ–°è¦" label_selected="æ–°è¦" name="WLNewPreset" />
+ <button label="ä¿å˜" label_selected="ä¿å˜" name="WLSavePreset" />
+ <button label="削除" label_selected="削除" name="WLDeletePreset" />
+ <button label="デイサイクル編集"
+ label_selected="デイサイクル編集" name="WLDayCycleMenuButton" />
+ <tab_container name="WindLight Tabs">
+ <panel label="大気" name="Atmosphere">
+ <text name="BHText">
+ 空ã®é…色
+ </text>
+ <button label="?" name="WLBlueHorizonHelp" />
+ <text name="BHText2">
+ R
+ </text>
+ <text name="BHText3">
+ G
+ </text>
+ <text name="BHText4">
+ B
+ </text>
+ <text name="BHText5">
+ I
+ </text>
+ <text name="BDensText">
+ 空ã¨é 景ã®éœ²å…‰
+ </text>
+ <button label="?" name="WLHazeHorizonHelp" />
+ <text name="BDensText2">
+ 空ã®é…色ã¨æ¿ƒåº¦
+ </text>
+ <button label="?" name="WLBlueDensityHelp" />
+ <text name="BHText6">
+ R
+ </text>
+ <text name="BHText7">
+ G
+ </text>
+ <text name="BHText8">
+ B
+ </text>
+ <text name="BHText9">
+ I
+ </text>
+ <text name="HDText">
+ 大気ã®ä¸é€æ˜Žåº¦
+ </text>
+ <button label="?" name="WLHazeDensityHelp" />
+ <text name="DensMultText">
+ 大気ã®ä¸é€æ˜Žåº¦ã®å¢—å¹…
+ </text>
+ <button label="?" name="WLDensityMultHelp" />
+ <text name="WLDistanceMultText">
+ 視界ã®å¢—å¹…
+ </text>
+ <button label="?" name="WLDistanceMultHelp" />
+ <text name="MaxAltText">
+ 最大高度
+ </text>
+ <button label="?" name="WLMaxAltitudeHelp" />
+ </panel>
+ <panel label="ライティング" name="Lighting">
+ <text name="SLCText">
+ 太陽/月ã®è‰²
+ </text>
+ <button label="?" name="WLSunlightColorHelp" />
+ <text name="BHText">
+ R
+ </text>
+ <text name="BHText2">
+ G
+ </text>
+ <text name="BHText3">
+ B
+ </text>
+ <text name="BHText4">
+ I
+ </text>
+ <text name="TODText">
+ 太陽/月ã®ä½ç½®
+ </text>
+ <button label="?" name="WLTimeOfDayHelp" />
+ <text name="WLAmbientText">
+ アンビエント
+ </text>
+ <button label="?" name="WLAmbientHelp" />
+ <text name="BHText5">
+ R
+ </text>
+ <text name="BHText6">
+ G
+ </text>
+ <text name="BHText7">
+ B
+ </text>
+ <text name="BHText8">
+ I
+ </text>
+ <text name="WLEastAngleText">
+ æ±ã®è§’度
+ </text>
+ <button label="?" name="WLEastAngleHelp" />
+ <text name="SunGlowText">
+ 太陽ã®è¼ã
+ </text>
+ <button label="?" name="WLSunGlowHelp" />
+ <slider label="フォーカス " name="WLGlowB" />
+ <slider label="サイズ " name="WLGlowR" />
+ <text name="SceneGammaText">
+ 風景ガンマ
+ </text>
+ <button label="?" name="WLSceneGammaHelp" />
+ <text name="WLStarText">
+ 星ã®è¼ã
+ </text>
+ <button label="?" name="WLStarBrightnessHelp" />
+ </panel>
+ <panel label="雲" name="Clouds">
+ <text name="WLCloudColorText">
+ 雲ã®è‰²
+ </text>
+ <button label="?" name="WLCloudColorHelp" />
+ <text name="BHText">
+ R
+ </text>
+ <text name="BHText2">
+ G
+ </text>
+ <text name="BHText3">
+ B
+ </text>
+ <text name="BHText4">
+ I
+ </text>
+ <text name="WLCloudColorText2">
+ 雲㮠XY/密度
+ </text>
+ <button label="?" name="WLCloudDensityHelp" />
+ <text name="BHText5">
+ X
+ </text>
+ <text name="BHText6">
+ Y
+ </text>
+ <text name="BHText7">
+ D
+ </text>
+ <text name="WLCloudCoverageText">
+ 雲ã®é‡
+ </text>
+ <button label="?" name="WLCloudCoverageHelp" />
+ <text name="WLCloudScaleText">
+ 雲ã®ã‚¹ã‚±ãƒ¼ãƒ«
+ </text>
+ <button label="?" name="WLCloudScaleHelp" />
+ <text name="WLCloudDetailText">
+ 雲ã®è©³ç´° (XY/密度)
+ </text>
+ <button label="?" name="WLCloudDetailHelp" />
+ <text name="BHText8">
+ X
+ </text>
+ <text name="BHText9">
+ Y
+ </text>
+ <text name="BHText10">
+ D
+ </text>
+ <text name="WLCloudScrollXText">
+ 雲ã®ç§»å‹•é€Ÿåº¦ (X æ–¹å‘)
+ </text>
+ <button label="?" name="WLCloudScrollXHelp" />
+ <check_box label="ãƒãƒƒã‚¯" name="WLCloudLockX" />
+ <text name="WLCloudScrollYText">
+ 雲ã®ç§»å‹•é€Ÿåº¦ (Y æ–¹å‘)
+ </text>
+ <button label="?" name="WLCloudScrollYHelp" />
+ <check_box label="ãƒãƒƒã‚¯" name="WLCloudLockY" />
+ <check_box label="従æ¥ã®é›²ã‚’æç”»" name="DrawClassicClouds" />
+ <button label="?" name="WLClassicCloudsHelp" />
+ </panel>
+ </tab_container>
+ <string name="WLDefaultSkyNames">
+ A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor's Delight:Sheer Sensuality
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_world_map.xml b/indra/newview/skins/default/xui/ja/floater_world_map.xml
index 026247f752..0038f995b4 100644
--- a/indra/newview/skins/default/xui/ja/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/ja/floater_world_map.xml
@@ -50,15 +50,15 @@
<check_box label="" name="event_mature_chk" />
<combo_box label="オンラインã®ãƒ•ãƒ¬ãƒ³ãƒ‰" name="friend combo"
tool_tip="Friend to Show on Map">
- <combo_item name="none_selected">
+ <combo_box.item name="none_selected">
オンラインã®ãƒ•ãƒ¬ãƒ³ãƒ‰
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="ランドマーク" name="landmark combo"
tool_tip="Landmark to Show on Map">
- <combo_item name="none_selected">
+ <combo_box.item name="none_selected">
ランドマーク
- </combo_item>
+ </combo_box.item>
</combo_box>
<line_editor label="地域åã§æ¤œç´¢" name="location"
tool_tip="地域åを入力ã—ã¦ãã ã•ã„。" />
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index ecad945e76..1ebc9d1c88 100644
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar name="Login Menu">
- <menu label="ファイル" name="File">
- <menu_item_call label="終了" name="Quit" />
- </menu>
- <menu label="編集" name="Edit">
- <menu_item_call label="環境è¨å®š..." name="Preferences..." />
- </menu>
- <menu label="ヘルプ" name="Help">
- <menu_item_call label="セカンドライフヘルプ" name="Second Life Help" />
- <menu_item_call label="Second Lifeã«ã¤ã„ã¦..." name="About Second Life..." />
- </menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar name="Login Menu">
+ <menu label="ファイル" name="File">
+ <menu_item_call label="終了" name="Quit" />
+ </menu>
+ <menu label="編集" name="Edit">
+ <menu_item_call label="環境è¨å®š..." name="Preferences..." />
+ </menu>
+ <menu label="ヘルプ" name="Help">
+ <menu_item_call label="セカンドライフヘルプ" name="Second Life Help" />
+ <menu_item_call label="Second Lifeã«ã¤ã„ã¦..." name="About Second Life..." />
+ </menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml
index 5007773c89..6d15563382 100644
--- a/indra/newview/skins/default/xui/ja/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="Popup">
- <menu_item_call label="URLã«ã¤ã„ã¦" name="about_url" />
- <menu_item_call label="URLã¸ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã™ã‚‹" name="teleport_to_url" />
- <menu_item_call label="地図上ã«è¡¨ç¤º" name="show_on_map" />
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="Popup">
+ <menu_item_call label="URLã«ã¤ã„ã¦" name="about_url" />
+ <menu_item_call label="URLã¸ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã™ã‚‹" name="teleport_to_url" />
+ <menu_item_call label="地図上ã«è¡¨ç¤º" name="show_on_map" />
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/mime_types.xml b/indra/newview/skins/default/xui/ja/mime_types.xml
index 3d5f43a805..2f945b2010 100644
--- a/indra/newview/skins/default/xui/ja/mime_types.xml
+++ b/indra/newview/skins/default/xui/ja/mime_types.xml
@@ -1,230 +1,230 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<mimetypes name="default">
- <widgetset name="web">
- <label name="web_label">
- ウェブ・コンテンツ
- </label>
- <tooltip name="web_tooltip">
- ã“ã“ã«ã‚¦ã‚§ãƒ–・コンテンツãŒã‚ã‚Šã¾ã™ã€‚
- </tooltip>
- <playtip name="web_playtip">
- ウェブ・コンテンツを表示
- </playtip>
- </widgetset>
- <widgetset name="movie">
- <label name="movie_label">
- ムービー
- </label>
- <tooltip name="movie_tooltip">
- ã“ã“ã«ã¯ãƒ ービーãŒã‚ã‚Šã¾ã™
- </tooltip>
- <playtip name="movie_playtip">
- ムービーå†ç”Ÿ
- </playtip>
- </widgetset>
- <widgetset name="none">
- <label name="none_label">
- コンテンツãªã—
- </label>
- <tooltip name="none_tooltip">
- メディアãªã—
- </tooltip>
- </widgetset>
- <widgetset name="image">
- <label name="image_label">
- ç”»åƒ
- </label>
- <tooltip name="image_tooltip">
- ã“ã“ã«ã¯ç”»åƒãŒã‚ã‚Šã¾ã™
- </tooltip>
- <playtip name="image_playtip">
- ã“ã“ã®ç”»åƒã‚’表示
- </playtip>
- </widgetset>
- <widgetset name="audio">
- <label name="audio_label">
- オーディオ
- </label>
- <tooltip name="audio_tooltip">
- ã“ã“ã§ã¯ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªãŒèžã‘ã¾ã™
- </tooltip>
- <playtip name="audio_playtip">
- ã“ã“ã®ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã‚’å†ç”Ÿã™ã‚‹
- </playtip>
- </widgetset>
- <scheme name="rtsp">
- <label name="rtsp_label">
- リアルタイム・ストリーミング
- </label>
- </scheme>
- <mimetype name="blank">
- <label name="blank_label">
- -- ãªã— --
- </label>
- </mimetype>
- <mimetype name="none/none">
- <label name="none/none_label">
- -- ãªã— --
- </label>
- </mimetype>
- <mimetype name="audio/*">
- <label name="audio2_label">
- オーディオ
- </label>
- </mimetype>
- <mimetype name="video/*">
- <label name="video2_label">
- ビデオ
- </label>
- </mimetype>
- <mimetype name="image/*">
- <label name="image2_label">
- ç”»åƒ
- </label>
- </mimetype>
- <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
- <label name="vnd.secondlife.qt.legacy_label">
- ムービー (QuickTime)
- </label>
- </mimetype>
- <mimetype name="application/javascript">
- <label name="application/javascript_label">
- Javascript
- </label>
- </mimetype>
- <mimetype name="application/ogg">
- <label name="application/ogg_label">
- Oggオーディオ/ビデオ
- </label>
- </mimetype>
- <mimetype name="application/pdf">
- <label name="application/pdf_label">
- PDFドã‚ュメント
- </label>
- </mimetype>
- <mimetype name="application/postscript">
- <label name="application/postscript_label">
- Postscriptドã‚ュメント
- </label>
- </mimetype>
- <mimetype name="application/rtf">
- <label name="application/rtf_label">
- リッãƒãƒ»ãƒ†ã‚スト (RTF)
- </label>
- </mimetype>
- <mimetype name="application/smil">
- <label name="application/smil_label">
- åŒæœŸãƒžãƒ«ãƒãƒ¡ãƒ‡ã‚£ã‚¢çµ±åˆè¨€èªž(SMIL)
- </label>
- </mimetype>
- <mimetype name="application/xhtml+xml">
- <label name="application/xhtml+xml_label">
- ウェブ・ページ (XHTML)
- </label>
- </mimetype>
- <mimetype name="application/x-director">
- <label name="application/x-director_label">
- Macromedia Director
- </label>
- </mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- </mimetype>
- <mimetype name="audio/mid">
- <label name="audio/mid_label">
- オーディオ (MIDI)
- </label>
- </mimetype>
- <mimetype name="audio/mpeg">
- <label name="audio/mpeg_label">
- オーディオ (MP3)
- </label>
- </mimetype>
- <mimetype name="audio/x-aiff">
- <label name="audio/x-aiff_label">
- オーディオ (AIFF)
- </label>
- </mimetype>
- <mimetype name="audio/x-wav">
- <label name="audio/x-wav_label">
- オーディオ (WAV)
- </label>
- </mimetype>
- <mimetype menu="1" name="image/bmp">
- <label name="image/bmp_label">
- ç”»åƒ (BMP)
- </label>
- </mimetype>
- <mimetype menu="1" name="image/gif">
- <label name="image/gif_label">
- ç”»åƒ (GIF)
- </label>
- </mimetype>
- <mimetype menu="1" name="image/jpeg">
- <label name="image/jpeg_label">
- ç”»åƒ (JPEG)
- </label>
- </mimetype>
- <mimetype menu="1" name="image/png">
- <label name="image/png_label">
- ç”»åƒ (PNG)
- </label>
- </mimetype>
- <mimetype name="image/svg+xml">
- <label name="image/svg+xml_label">
- ç”»åƒ (SVG)
- </label>
- </mimetype>
- <mimetype menu="1" name="image/tiff">
- <label name="image/tiff_label">
- ç”»åƒ (TIFF)
- </label>
- </mimetype>
- <mimetype menu="1" name="text/html">
- <label name="text/html_label">
- ウェブ・ページ
- </label>
- </mimetype>
- <mimetype menu="1" name="text/plain">
- <label name="text/plain_label">
- テã‚スト
- </label>
- </mimetype>
- <mimetype name="text/xml">
- <label name="text/xml_label">
- XML
- </label>
- </mimetype>
- <mimetype menu="1" name="video/mpeg">
- <label name="video/mpeg_label">
- ムービー (MPEG)
- </label>
- </mimetype>
- <mimetype name="video/mp4">
- <label name="video/mp4_label">
- ムービー (MP4)
- </label>
- </mimetype>
- <mimetype menu="1" name="video/quicktime">
- <label name="video/quicktime_label">
- ムービー (QuickTime)
- </label>
- </mimetype>
- <mimetype name="video/x-ms-asf">
- <label name="video/x-ms-asf_label">
- ムービー (Windows Media ASF)
- </label>
- </mimetype>
- <mimetype name="video/x-ms-wmv">
- <label name="video/x-ms-wmv_label">
- ムービー (Windows Media WMV)
- </label>
- </mimetype>
- <mimetype menu="1" name="video/x-msvideo">
- <label name="video/x-msvideo_label">
- ムービー (AVI)
- </label>
- </mimetype>
-</mimetypes>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+ <widgetset name="web">
+ <label name="web_label">
+ ウェブ・コンテンツ
+ </label>
+ <tooltip name="web_tooltip">
+ ã“ã“ã«ã‚¦ã‚§ãƒ–・コンテンツãŒã‚ã‚Šã¾ã™ã€‚
+ </tooltip>
+ <playtip name="web_playtip">
+ ウェブ・コンテンツを表示
+ </playtip>
+ </widgetset>
+ <widgetset name="movie">
+ <label name="movie_label">
+ ムービー
+ </label>
+ <tooltip name="movie_tooltip">
+ ã“ã“ã«ã¯ãƒ ービーãŒã‚ã‚Šã¾ã™
+ </tooltip>
+ <playtip name="movie_playtip">
+ ムービーå†ç”Ÿ
+ </playtip>
+ </widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ コンテンツãªã—
+ </label>
+ <tooltip name="none_tooltip">
+ メディアãªã—
+ </tooltip>
+ </widgetset>
+ <widgetset name="image">
+ <label name="image_label">
+ ç”»åƒ
+ </label>
+ <tooltip name="image_tooltip">
+ ã“ã“ã«ã¯ç”»åƒãŒã‚ã‚Šã¾ã™
+ </tooltip>
+ <playtip name="image_playtip">
+ ã“ã“ã®ç”»åƒã‚’表示
+ </playtip>
+ </widgetset>
+ <widgetset name="audio">
+ <label name="audio_label">
+ オーディオ
+ </label>
+ <tooltip name="audio_tooltip">
+ ã“ã“ã§ã¯ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªãŒèžã‘ã¾ã™
+ </tooltip>
+ <playtip name="audio_playtip">
+ ã“ã“ã®ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªã‚’å†ç”Ÿã™ã‚‹
+ </playtip>
+ </widgetset>
+ <scheme name="rtsp">
+ <label name="rtsp_label">
+ リアルタイム・ストリーミング
+ </label>
+ </scheme>
+ <mimetype name="blank">
+ <label name="blank_label">
+ -- ãªã— --
+ </label>
+ </mimetype>
+ <mimetype name="none/none">
+ <label name="none/none_label">
+ -- ãªã— --
+ </label>
+ </mimetype>
+ <mimetype name="audio/*">
+ <label name="audio2_label">
+ オーディオ
+ </label>
+ </mimetype>
+ <mimetype name="video/*">
+ <label name="video2_label">
+ ビデオ
+ </label>
+ </mimetype>
+ <mimetype name="image/*">
+ <label name="image2_label">
+ ç”»åƒ
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+ <label name="vnd.secondlife.qt.legacy_label">
+ ムービー (QuickTime)
+ </label>
+ </mimetype>
+ <mimetype name="application/javascript">
+ <label name="application/javascript_label">
+ Javascript
+ </label>
+ </mimetype>
+ <mimetype name="application/ogg">
+ <label name="application/ogg_label">
+ Oggオーディオ/ビデオ
+ </label>
+ </mimetype>
+ <mimetype name="application/pdf">
+ <label name="application/pdf_label">
+ PDFドã‚ュメント
+ </label>
+ </mimetype>
+ <mimetype name="application/postscript">
+ <label name="application/postscript_label">
+ Postscriptドã‚ュメント
+ </label>
+ </mimetype>
+ <mimetype name="application/rtf">
+ <label name="application/rtf_label">
+ リッãƒãƒ»ãƒ†ã‚スト (RTF)
+ </label>
+ </mimetype>
+ <mimetype name="application/smil">
+ <label name="application/smil_label">
+ åŒæœŸãƒžãƒ«ãƒãƒ¡ãƒ‡ã‚£ã‚¢çµ±åˆè¨€èªž(SMIL)
+ </label>
+ </mimetype>
+ <mimetype name="application/xhtml+xml">
+ <label name="application/xhtml+xml_label">
+ ウェブ・ページ (XHTML)
+ </label>
+ </mimetype>
+ <mimetype name="application/x-director">
+ <label name="application/x-director_label">
+ Macromedia Director
+ </label>
+ </mimetype>
+ <mimetype name="application/x-shockwave-flash">
+ <label name="application/x-shockwave-flash_label">
+ Flash
+ </label>
+ </mimetype>
+ <mimetype name="audio/mid">
+ <label name="audio/mid_label">
+ オーディオ (MIDI)
+ </label>
+ </mimetype>
+ <mimetype name="audio/mpeg">
+ <label name="audio/mpeg_label">
+ オーディオ (MP3)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-aiff">
+ <label name="audio/x-aiff_label">
+ オーディオ (AIFF)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-wav">
+ <label name="audio/x-wav_label">
+ オーディオ (WAV)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/bmp">
+ <label name="image/bmp_label">
+ ç”»åƒ (BMP)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/gif">
+ <label name="image/gif_label">
+ ç”»åƒ (GIF)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/jpeg">
+ <label name="image/jpeg_label">
+ ç”»åƒ (JPEG)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/png">
+ <label name="image/png_label">
+ ç”»åƒ (PNG)
+ </label>
+ </mimetype>
+ <mimetype name="image/svg+xml">
+ <label name="image/svg+xml_label">
+ ç”»åƒ (SVG)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="image/tiff">
+ <label name="image/tiff_label">
+ ç”»åƒ (TIFF)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="text/html">
+ <label name="text/html_label">
+ ウェブ・ページ
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="text/plain">
+ <label name="text/plain_label">
+ テã‚スト
+ </label>
+ </mimetype>
+ <mimetype name="text/xml">
+ <label name="text/xml_label">
+ XML
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="video/mpeg">
+ <label name="video/mpeg_label">
+ ムービー (MPEG)
+ </label>
+ </mimetype>
+ <mimetype name="video/mp4">
+ <label name="video/mp4_label">
+ ムービー (MP4)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="video/quicktime">
+ <label name="video/quicktime_label">
+ ムービー (QuickTime)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-asf">
+ <label name="video/x-ms-asf_label">
+ ムービー (Windows Media ASF)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-wmv">
+ <label name="video/x-ms-wmv_label">
+ ムービー (Windows Media WMV)
+ </label>
+ </mimetype>
+ <mimetype menu="1" name="video/x-msvideo">
+ <label name="video/x-msvideo_label">
+ ムービー (AVI)
+ </label>
+ </mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/ja/panel_audio_device.xml b/indra/newview/skins/default/xui/ja/panel_audio_device.xml
index 7bd1bce15d..2352c60989 100644
--- a/indra/newview/skins/default/xui/ja/panel_audio_device.xml
+++ b/indra/newview/skins/default/xui/ja/panel_audio_device.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="device_settings">
- <text name="Audio Devices">
- オーディオ機器
- </text>
- <text name="Output device (speakers):">
- 出力機器 (スピーカー):
- </text>
- <text name="Input device (microphone):">
- 入力機器(マイクãƒãƒ•ã‚©ãƒ³)：
- </text>
- <text name="Input level:">
- 入力レベル
- </text>
- <text_editor name="voice_intro_text1">
- スライダを調節ã—ã¦ã€ä»–ã®ä½äººã«èžã“ãˆã‚‹ã‚ãªãŸã®éŸ³é‡ã‚’制御ã—ã¾ã™ã€‚マイクãƒãƒ•ã‚©ãƒ³ã«å‘ã‹ã£ã¦è©±ã™ã ã‘ã§ã€å…¥åŠ›ãƒ¬ãƒ™ãƒ«ã‚’テストã§ãã¾ã™ã€‚
- </text_editor>
- <volume_slider name="mic_volume_slider"
- tool_tip="ã“ã®ã‚¹ãƒ©ã‚¤ãƒ€ãƒ¼ã‚’使用ã—ã¦ã€ãƒœãƒªãƒ¥ãƒ¼ãƒ を変ãˆã¦ãã ã•ã„。" />
- <text name="wait_text">
- ãŠå¾…ã¡ãã ã•ã„
- </text>
- <text name="default_text">
- デフォルト
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="device_settings">
+ <text name="Audio Devices">
+ オーディオ機器
+ </text>
+ <text name="Output device (speakers):">
+ 出力機器 (スピーカー):
+ </text>
+ <text name="Input device (microphone):">
+ 入力機器(マイクãƒãƒ•ã‚©ãƒ³)：
+ </text>
+ <text name="Input level:">
+ 入力レベル
+ </text>
+ <text_editor name="voice_intro_text1">
+ スライダを調節ã—ã¦ã€ä»–ã®ä½äººã«èžã“ãˆã‚‹ã‚ãªãŸã®éŸ³é‡ã‚’制御ã—ã¾ã™ã€‚マイクãƒãƒ•ã‚©ãƒ³ã«å‘ã‹ã£ã¦è©±ã™ã ã‘ã§ã€å…¥åŠ›ãƒ¬ãƒ™ãƒ«ã‚’テストã§ãã¾ã™ã€‚
+ </text_editor>
+ <volume_slider name="mic_volume_slider"
+ tool_tip="ã“ã®ã‚¹ãƒ©ã‚¤ãƒ€ãƒ¼ã‚’使用ã—ã¦ã€ãƒœãƒªãƒ¥ãƒ¼ãƒ を変ãˆã¦ãã ã•ã„。" />
+ <text name="wait_text">
+ ãŠå¾…ã¡ãã ã•ã„
+ </text>
+ <text name="default_text">
+ デフォルト
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_friends.xml b/indra/newview/skins/default/xui/ja/panel_friends.xml
index 404380cea4..d4cf678d70 100644
--- a/indra/newview/skins/default/xui/ja/panel_friends.xml
+++ b/indra/newview/skins/default/xui/ja/panel_friends.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="friends">
- <string name="Multiple">
- 複数ã®ãƒ•ãƒ¬ãƒ³ãƒ‰...
- </string>
- <scroll_list name="friend_list"
- tool_tip="複数ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚’é¸æŠžã™ã‚‹ã«ã¯ã€Shiftã‚ーã¾ãŸã¯Ctrlã‚ーを押ã—ãªãŒã‚‰åå‰ã‚’クリックã—ã¾ã™ã€‚">
- <column name="icon_online_status" tool_tip="オンライン・ステータス" />
- <column label="åå‰" name="friend_name" tool_tip="åå‰" />
- <column name="icon_visible_online"
- tool_tip="フレンドã¯ã€ã‚ãªãŸãŒã‚ªãƒ³ãƒ©ã‚¤ãƒ³ã‹ã©ã†ã‹ç¢ºèªã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" />
- <column name="icon_visible_map"
- tool_tip="フレンドã¯ã€åœ°å›³ã§ã‚ãªãŸã®å±…å ´æ‰€ã‚’è¦‹ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" />
- <column name="icon_edit_mine"
- tool_tip="フレンドã¯ã€ã‚ªãƒ–ジェクトを編集ã€å‰Šé™¤ã€ã¾ãŸã¯å–å¾—ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" />
- <column name="icon_edit_theirs"
- tool_tip="ã‚ãªãŸã¯ã€ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã®ã‚ªãƒ–ジェクトを編集ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" />
- </scroll_list>
- <panel name="rights_container">
- <text name="friend_name_label" right="-10">
- フレンドをé¸æŠžã—ã¦æ¨©åˆ©ã‚’変更...
- </text>
- <check_box label="オンライン・ステータスã®ç¢ºèªã‚’許å¯ã™ã‚‹"
- name="online_status_cb"
- tool_tip="コーリングカードã‚ã‚‹ã„ã¯ãƒ•ãƒ¬ãƒ³ãƒ‰ãƒªã‚¹ãƒˆã§ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ãŒã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ…‹ã‚’確èªã§ãるよã†è¨å®š" />
- <check_box label="世界地図上ã§ã‚ãªãŸã®å±…å ´æ‰€ã‚’æ¤œç´¢å¯èƒ½ã«ã™ã‚‹"
- name="map_status_cb"
- tool_tip="ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ãŒåœ°å›³ã§ç§ã®ä½ç½®ã‚’発見ã§ãるよã†ã«è¨å®š" />
- <check_box label="オブジェクトã®ä¿®æ£ã‚’許å¯ã™ã‚‹" name="modify_status_cb"
- tool_tip="ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ãŒã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã‚’æ”¹é€ ã§ãる許å¯ã‚’与ãˆã‚‹" />
- <text name="process_rights_label">
- 権利変更をプãƒã‚»ã‚¹ä¸...
- </text>
- </panel>
- <pad left="-95" />
- <button label="IM/コール" name="im_btn"
- tool_tip="インスタントメッセージ・セッションを開ã"
- width="90" />
- <button label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="profile_btn"
- tool_tip="写真ã€ã‚°ãƒ«ãƒ¼ãƒ—ã€ãŠã‚ˆã³ãã®ä»–ã®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚"
- width="90" />
- <button label="テレãƒãƒ¼ãƒˆ..." name="offer_teleport_btn"
- tool_tip="ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã«ã€ã‚ãªãŸã®ç¾åœ¨ã®ãƒã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã¾ã§ã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’申ã—出ã¾ã™ã€‚"
- width="90" />
- <button label="支払ã†..." name="pay_btn"
- tool_tip="リンデンドル (L$) ã‚’ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã«ã‚ã’ã‚‹"
- width="90" />
- <button label="削除..." name="remove_btn"
- tool_tip="ã“ã®äººç‰©ã‚’フレンドリストã‹ã‚‰å¤–ã—ã¾ã™ã€‚"
- width="90" />
- <button label="è¿½åŠ ..." name="add_btn"
- tool_tip="ä½äººã«ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚·ãƒƒãƒ—を申請ã—ã¾ã™ã€‚" width="90" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="friends">
+ <string name="Multiple">
+ 複数ã®ãƒ•ãƒ¬ãƒ³ãƒ‰...
+ </string>
+ <scroll_list name="friend_list"
+ tool_tip="複数ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚’é¸æŠžã™ã‚‹ã«ã¯ã€Shiftã‚ーã¾ãŸã¯Ctrlã‚ーを押ã—ãªãŒã‚‰åå‰ã‚’クリックã—ã¾ã™ã€‚">
+ <column name="icon_online_status" tool_tip="オンライン・ステータス" />
+ <column label="åå‰" name="friend_name" tool_tip="åå‰" />
+ <column name="icon_visible_online"
+ tool_tip="フレンドã¯ã€ã‚ãªãŸãŒã‚ªãƒ³ãƒ©ã‚¤ãƒ³ã‹ã©ã†ã‹ç¢ºèªã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" />
+ <column name="icon_visible_map"
+ tool_tip="フレンドã¯ã€åœ°å›³ã§ã‚ãªãŸã®å±…å ´æ‰€ã‚’è¦‹ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" />
+ <column name="icon_edit_mine"
+ tool_tip="フレンドã¯ã€ã‚ªãƒ–ジェクトを編集ã€å‰Šé™¤ã€ã¾ãŸã¯å–å¾—ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" />
+ <column name="icon_edit_theirs"
+ tool_tip="ã‚ãªãŸã¯ã€ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã®ã‚ªãƒ–ジェクトを編集ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" />
+ </scroll_list>
+ <panel name="rights_container">
+ <text name="friend_name_label" right="-10">
+ フレンドをé¸æŠžã—ã¦æ¨©åˆ©ã‚’変更...
+ </text>
+ <check_box label="オンライン・ステータスã®ç¢ºèªã‚’許å¯ã™ã‚‹"
+ name="online_status_cb"
+ tool_tip="コーリングカードã‚ã‚‹ã„ã¯ãƒ•ãƒ¬ãƒ³ãƒ‰ãƒªã‚¹ãƒˆã§ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ãŒã‚ªãƒ³ãƒ©ã‚¤ãƒ³çŠ¶æ…‹ã‚’確èªã§ãるよã†è¨å®š" />
+ <check_box label="世界地図上ã§ã‚ãªãŸã®å±…å ´æ‰€ã‚’æ¤œç´¢å¯èƒ½ã«ã™ã‚‹"
+ name="map_status_cb"
+ tool_tip="ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ãŒåœ°å›³ã§ç§ã®ä½ç½®ã‚’発見ã§ãるよã†ã«è¨å®š" />
+ <check_box label="オブジェクトã®ä¿®æ£ã‚’許å¯ã™ã‚‹" name="modify_status_cb"
+ tool_tip="ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ãŒã‚ªãƒ–ã‚¸ã‚§ã‚¯ãƒˆã‚’æ”¹é€ ã§ãる許å¯ã‚’与ãˆã‚‹" />
+ <text name="process_rights_label">
+ 権利変更をプãƒã‚»ã‚¹ä¸...
+ </text>
+ </panel>
+ <pad left="-95" />
+ <button label="IM/コール" name="im_btn"
+ tool_tip="インスタントメッセージ・セッションを開ã"
+ width="90" />
+ <button label="プãƒãƒ•ã‚£ãƒ¼ãƒ«" name="profile_btn"
+ tool_tip="写真ã€ã‚°ãƒ«ãƒ¼ãƒ—ã€ãŠã‚ˆã³ãã®ä»–ã®æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚"
+ width="90" />
+ <button label="テレãƒãƒ¼ãƒˆ..." name="offer_teleport_btn"
+ tool_tip="ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã«ã€ã‚ãªãŸã®ç¾åœ¨ã®ãƒã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã¾ã§ã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’申ã—出ã¾ã™ã€‚"
+ width="90" />
+ <button label="支払ã†..." name="pay_btn"
+ tool_tip="リンデンドル (L$) ã‚’ã“ã®ãƒ•ãƒ¬ãƒ³ãƒ‰ã«ã‚ã’ã‚‹"
+ width="90" />
+ <button label="削除..." name="remove_btn"
+ tool_tip="ã“ã®äººç‰©ã‚’フレンドリストã‹ã‚‰å¤–ã—ã¾ã™ã€‚"
+ width="90" />
+ <button label="è¿½åŠ ..." name="add_btn"
+ tool_tip="ä½äººã«ãƒ•ãƒ¬ãƒ³ãƒ‰ã‚·ãƒƒãƒ—を申請ã—ã¾ã™ã€‚" width="90" />
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_groups.xml b/indra/newview/skins/default/xui/ja/panel_groups.xml
index ca334b461b..785fd868ab 100644
--- a/indra/newview/skins/default/xui/ja/panel_groups.xml
+++ b/indra/newview/skins/default/xui/ja/panel_groups.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="groups">
- <text name="groupdesc">
- ｱｸﾃｨﾌﾞãªï½¸ï¾žï¾™ï½°ï¾Œï¾Ÿåã¯å¤ªå—ã§è¡¨ç¤ºã•ã‚Œã¦ã„ã¾ã™
- </text>
- <text name="groupcount">
- ã‚ãªãŸã¯[COUNT] ｸﾞﾙｰﾌﾟã«æ‰€å±žã—ã¦ã„ã¾ã™ (最大[MAX])
- </text>
- <button label="IM/コール" name="IM"
- tool_tip="インスタントメッセージ・セッションを開ã" />
- <button label="æƒ…å ±" name="Info" />
- <button label="アクティブ" name="Activate" />
- <button label="抜ã‘ã‚‹" name="Leave" />
- <button label="作æˆ..." name="Create" />
- <button label="検索..." name="Search..." />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="groups">
+ <text name="groupdesc">
+ ｱｸﾃｨﾌﾞãªï½¸ï¾žï¾™ï½°ï¾Œï¾Ÿåã¯å¤ªå—ã§è¡¨ç¤ºã•ã‚Œã¦ã„ã¾ã™
+ </text>
+ <text name="groupcount">
+ ã‚ãªãŸã¯[COUNT] ｸﾞﾙｰﾌﾟã«æ‰€å±žã—ã¦ã„ã¾ã™ (最大[MAX])
+ </text>
+ <button label="IM/コール" name="IM"
+ tool_tip="インスタントメッセージ・セッションを開ã" />
+ <button label="æƒ…å ±" name="Info" />
+ <button label="アクティブ" name="Activate" />
+ <button label="抜ã‘ã‚‹" name="Leave" />
+ <button label="作æˆ..." name="Create" />
+ <button label="検索..." name="Search..." />
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_login.xml b/indra/newview/skins/default/xui/ja/panel_login.xml
index c93aeacc95..d42d0ddbdf 100644
--- a/indra/newview/skins/default/xui/ja/panel_login.xml
+++ b/indra/newview/skins/default/xui/ja/panel_login.xml
@@ -15,15 +15,15 @@
ãƒã‚°ã‚¤ãƒ³ä½ç½®ï¼š
</text>
<combo_box name="start_location_combo" left_delta="92" width="172">
- <combo_item name="MyHome">
+ <combo_box.item name="MyHome">
自宅（ホーム）
- </combo_item>
- <combo_item name="MyLastLocation">
+ </combo_box.item>
+ <combo_box.item name="MyLastLocation">
最後ã«ãƒã‚°ã‚¢ã‚¦ãƒˆã—ãŸå ´æ‰€
- </combo_item>
- <combo_item name="Typeregionname">
+ </combo_box.item>
+ <combo_box.item name="Typeregionname">
< 地域ã®åå‰å…¥åŠ› >
- </combo_item>
+ </combo_box.item>
</combo_box>
<check_box label="パスワードを記憶" name="remember_check" left_delta="180"/>
<text name="full_screen_text">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 167bc2a1ce..7a7cf8cb3a 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -21,21 +21,21 @@
ウィンドウ・サイズ：
</text>
<combo_box name="windowsize combo">
- <combo_item name="640x480">
+ <combo_box.item name="640x480">
640x480
- </combo_item>
- <combo_item name="800x600">
+ </combo_box.item>
+ <combo_box.item name="800x600">
800x600
- </combo_item>
- <combo_item name="720x480">
+ </combo_box.item>
+ <combo_box.item name="720x480">
720x480 (NTSC)
- </combo_item>
- <combo_item name="768x576">
+ </combo_box.item>
+ <combo_box.item name="768x576">
768x576 (PAL)
- </combo_item>
- <combo_item name="1024x768">
+ </combo_box.item>
+ <combo_box.item name="1024x768">
1024x768
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="DisplayResLabel">
表示解åƒåº¦ï¼š
@@ -44,18 +44,18 @@
縦横比：
</text>
<combo_box name="aspect_ratio" tool_tip="（幅/高ã•ï¼‰">
- <combo_item type="string" length="1" name="4:3(StandardCRT)">
+ <combo_box.item type="string" length="1" name="4:3(StandardCRT)">
4：3（標準CRT）
- </combo_item>
- <combo_item type="string" length="1" name="5:4(1280x1024LCD)">
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="5:4(1280x1024LCD)">
5：4（1280x1024 LCD）
- </combo_item>
- <combo_item name="8:5(Widescreen)">
+ </combo_box.item>
+ <combo_box.item name="8:5(Widescreen)">
8：5（ワイドスクリï¼ãƒ³ï¼‰
- </combo_item>
- <combo_item type="string" length="1" name="16:9(Widescreen)">
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="16:9(Widescreen)">
16：9（ワイドスクリï¼ãƒ³ï¼‰
- </combo_item>
+ </combo_box.item>
</combo_box>
<check_box label="自動検出率" name="aspect_auto_detect" />
<text type="string" length="1" name="UI Size:">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 36dfa07e13..5243cc76b9 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1,466 +1,466 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- This file contains strings that used to be hardcoded in the source.
- It is only for those strings which don't belong in a floater.
- For example, the strings used in avatar chat bubbles, and strings
- that are returned from one component and may appear in many places-->
-<strings>
- <string name="LoginInProgress">
- ãƒã‚°ã‚¤ãƒ³ä¸ã§ã™ã€‚[APP_NAME]ã®è¡¨ç¤ºãŒãƒ•ãƒªãƒ¼ã‚ºã™ã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。
- </string>
- <string name="LoginAuthenticating">
- èªè¨¼ã—ã¦ã„ã¾ã™...
- </string>
- <string name="LoginMaintenance">
- アカウント・メンテナンスを実行ã—ã¦ã„ã¾ã™...
- </string>
- <string name="LoginAttempt">
- å‰å›žã®ãƒã‚°ã‚¤ãƒ³ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ ãƒã‚°ã‚¤ãƒ³ä¸ã§ã™([NUMBER]回目)
- </string>
- <string name="LoginPrecaching">
- ワールドをãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™...
- </string>
- <string name="LoginInitializingBrowser">
- 埋ã‚è¾¼ã¿WebブラウザをåˆæœŸåŒ–ã—ã¦ã„ã¾ã™...
- </string>
- <string name="LoginInitializingMultimedia">
- マルãƒãƒ¡ãƒ‡ã‚£ã‚¢ã‚’åˆæœŸåŒ–ã—ã¦ã„ã¾ã™...
- </string>
- <string name="LoginVerifyingCache">
- ã‚ャッシュ・ファイルを検証ã—ã¦ã„ã¾ã™(所è¦æ™‚é–“ã¯60～90秒)...
- </string>
- <string name="LoginProcessingResponse">
- å¿œç”を処ç†ã—ã¦ã„ã¾ã™...
- </string>
- <string name="LoginInitializingWorld">
- ワールドをåˆæœŸåŒ–ã—ã¦ã„ã¾ã™...
- </string>
- <string name="LoginDecodingImages">
- ç”»åƒã‚’デコードã—ã¦ã„ã¾ã™...
- </string>
- <string name="LoginInitializingQuicktime">
- QuickTimeã‚’åˆæœŸåŒ–ã—ã¦ã„ã¾ã™...
- </string>
- <string name="LoginQuicktimeNotFound">
- QuickTimeãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸã€‚
- </string>
- <string name="LoginQuicktimeOK">
- QuickTimeãŒæ£å¸¸ã«åˆæœŸåŒ–ã•ã‚Œã¾ã—ãŸã€‚
- </string>
- <string name="LoginWaitingForRegionHandshake">
- 地域ã®ãƒãƒ³ãƒ‰ã‚·ã‚§ã‚¤ã‚¯ã‚’å¾…ã£ã¦ã„ã¾ã™...
- </string>
- <string name="LoginConnectingToRegion">
- 地域ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™...
- </string>
- <string name="LoginDownloadingClothing">
- æœã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™...
- </string>
- <string name="AgentLostConnection">
- ã“ã®åœ°åŸŸã«ã¯ã€å•é¡ŒãŒç™ºç”Ÿã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ インターãƒãƒƒãƒˆæŽ¥ç¶šã‚’確èªã—ã¦ãã ã•ã„。
- </string>
- <string name="TooltipPerson">
- 人
- </string>
- <string name="TooltipNoName">
- (åå‰ãªã—)
- </string>
- <string name="TooltipOwner">
- オーナー:
- </string>
- <string name="TooltipPublic">
- 公共
- </string>
- <string name="TooltipIsGroup">
- (グループ)
- </string>
- <string name="TooltipFlagScript">
- スクリプト
- </string>
- <string name="TooltipFlagPhysics">
- 物ç†ä½œç”¨
- </string>
- <string name="TooltipFlagTouch">
- 触る
- </string>
- <string name="TooltipFlagL$">
- L$
- </string>
- <string name="TooltipFlagDropInventory">
- æŒã¡ç‰©ã‚’ドãƒãƒƒãƒ—ã™ã‚‹
- </string>
- <string name="TooltipFlagPhantom">
- ファントãƒ
- </string>
- <string name="TooltipFlagTemporary">
- 一時的
- </string>
- <string name="TooltipFlagRightClickMenu">
- (å³ã‚¯ãƒªãƒƒã‚¯ã§ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’表示)
- </string>
- <string name="TooltipFreeToCopy">
- コピーå¯èƒ½
- </string>
- <string name="TooltipForSaleL$">
- 売り出ã—ä¸:L$[AMOUNT]
- </string>
- <string name="TooltipForSaleMsg">
- 売り出ã—ä¸: [MESSAGE]
- </string>
- <string name="TooltipFlagGroupBuild">
- グループ作æˆ
- </string>
- <string name="TooltipFlagNoBuild">
- 作æˆç¦æ¢
- </string>
- <string name="TooltipFlagNoEdit">
- グループ作æˆ
- </string>
- <string name="TooltipFlagNotSafe">
- å±é™º
- </string>
- <string name="TooltipFlagNoFly">
- 飛行ç¦æ¢
- </string>
- <string name="TooltipFlagGroupScripts">
- グループ・スクリプト
- </string>
- <string name="TooltipFlagNoScripts">
- スクリプトãªã—
- </string>
- <string name="TooltipLand">
- 土地:
- </string>
- <string name="TooltipMustSingleDrop">
- 1ã¤ã®ã‚¢ã‚¤ãƒ†ãƒ ã®ã¿ã‚’ã“ã“ã«ãƒ‰ãƒ©ãƒƒã‚°ã§ãã¾ã™
- </string>
- <string name="RetrievingData">
- 検索ä¸...
- </string>
- <string name="ReleaseNotes">
- リリースノート
- </string>
- <string name="LoadingData">
- ãƒãƒ¼ãƒ‰ä¸...
- </string>
- <string name="AvatarNameNobody">
- (無人)
- </string>
- <string name="AvatarNameWaiting">
- (å¾…æ©Ÿä¸)
- </string>
- <string name="AvatarNameHippos">
- (ã‚«ãƒ)
- </string>
- <string name="GroupNameNone">
- (ãªã—)
- </string>
- <string name="AssetErrorNone">
- エラーãªã—
- </string>
- <string name="AssetErrorRequestFailed">
- 資産ã®è¦æ±‚: 失敗
- </string>
- <string name="AssetErrorNonexistentFile">
- 資産ã®è¦æ±‚: å˜åœ¨ã—ãªã„ファイル
- </string>
- <string name="AssetErrorNotInDatabase">
- 資産ã®è¦æ±‚: データベースã§ã¯è¦‹ã¤ã‹ã‚‰ãªã„資産
- </string>
- <string name="AssetErrorEOF">
- ファイルã®çµ‚ã‚ã‚Š
- </string>
- <string name="AssetErrorCannotOpenFile">
- ファイルを開ãã“ã¨ãŒã§ãã¾ã›ã‚“
- </string>
- <string name="AssetErrorFileNotFound">
- ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“
- </string>
- <string name="AssetErrorTCPTimeout">
- ファイル転é€ã‚¿ã‚¤ãƒ アウトã§ã™
- </string>
- <string name="AssetErrorCircuitGone">
- 接続ãŒè§£é™¤ã•ã‚Œã¾ã—ãŸ
- </string>
- <string name="AssetErrorPriceMismatch">
- ビューワã¨ã‚µãƒ¼ãƒãƒ¼ã®ä¾¡æ ¼ãŒä¸€è‡´ã—ã¦ã„ã¾ã›ã‚“
- </string>
- <string name="AssetErrorUnknownStatus">
- ステータスãŒä¸æ˜Žã§ã™
- </string>
- <string name="AvatarEditingApparance">
- (容姿ã®ç·¨é›†)
- </string>
- <string name="AvatarAway">
- 退å¸ä¸
- </string>
- <string name="AvatarBusy">
- å–ã‚Šè¾¼ã¿ä¸
- </string>
- <string name="AvatarMuted">
- ミュート
- </string>
- <string name="anim_express_afraid">
- 怖れ
- </string>
- <string name="anim_express_anger">
- 怒り
- </string>
- <string name="anim_away">
- 退å¸ä¸
- </string>
- <string name="anim_backflip">
- 後ã‚宙返り
- </string>
- <string name="anim_express_laugh">
- 大笑ã„
- </string>
- <string name="anim_express_toothsmile">
- 満é¢ã®ç¬‘é¡”
- </string>
- <string name="anim_blowkiss">
- 投ã’ã‚ッス
- </string>
- <string name="anim_express_bored">
- 退屈
- </string>
- <string name="anim_bow">
- ãŠã˜ãŽ
- </string>
- <string name="anim_clap">
- æ‹æ‰‹
- </string>
- <string name="anim_courtbow">
- æ·±ã„ãŠã˜ãŽ
- </string>
- <string name="anim_express_cry">
- æ³£ã
- </string>
- <string name="anim_dance1">
- ダンス1
- </string>
- <string name="anim_dance2">
- ダンス2
- </string>
- <string name="anim_dance3">
- ダンス3
- </string>
- <string name="anim_dance4">
- ダンス4
- </string>
- <string name="anim_dance5">
- ダンス5
- </string>
- <string name="anim_dance6">
- ダンス6
- </string>
- <string name="anim_dance7">
- ダンス7
- </string>
- <string name="anim_dance8">
- ダンス8
- </string>
- <string name="anim_express_disdain">
- 侮蔑
- </string>
- <string name="anim_drink">
- é…”ã£ã±ã‚‰ã†
- </string>
- <string name="anim_express_embarrased">
- 困惑
- </string>
- <string name="anim_angry_fingerwag">
- 指を振る
- </string>
- <string name="anim_fist_pump">
- ガッツãƒãƒ¼ã‚º
- </string>
- <string name="anim_yoga_float">
- ヨガ浮éŠ
- </string>
- <string name="anim_express_frown">
- ã—ã‹ã‚ã£é¢
- </string>
- <string name="anim_impatient">
- ã„らã„らã™ã‚‹
- </string>
- <string name="anim_jumpforjoy">
- 飛ã³ä¸ŠãŒã£ã¦å–œã¶
- </string>
- <string name="anim_kissmybutt">
- 挑発ãƒãƒ¼ã‚º
- </string>
- <string name="anim_express_kiss">
- ã‚ス
- </string>
- <string name="anim_laugh_short">
- 笑ã†
- </string>
- <string name="anim_musclebeach">
- 力ã“ã¶ã‚’見ã›ã‚‹
- </string>
- <string name="anim_no_unhappy">
- ä¸æº€ã’ã«å¦å®šã™ã‚‹
- </string>
- <string name="anim_no_head">
- å¦å®šã™ã‚‹
- </string>
- <string name="anim_nyanya">
- 冷やã‹ã™
- </string>
- <string name="anim_punch_onetwo">
- ワンツー・パンãƒ
- </string>
- <string name="anim_express_open_mouth">
- å£ã‚’é–‹ã‘ã¦é©šã
- </string>
- <string name="anim_peace">
- ピース・サイン
- </string>
- <string name="anim_point_you">
- 他人を指差ã™
- </string>
- <string name="anim_point_me">
- 自分を指差ã™
- </string>
- <string name="anim_punch_l">
- 左パンãƒ
- </string>
- <string name="anim_punch_r">
- å³ãƒ‘ンãƒ
- </string>
- <string name="anim_rps_countdown">
- ã˜ã‚ƒã‚“ã‘ã‚“ãƒãƒ¼ã‚º
- </string>
- <string name="anim_rps_paper">
- パー
- </string>
- <string name="anim_rps_rock">
- グー
- </string>
- <string name="anim_rps_scissors">
- ãƒãƒ§ã‚
- </string>
- <string name="anim_express_repulsed">
- 嫌悪感
- </string>
- <string name="anim_kick_roundhouse_r">
- ã¾ã‚ã—è¹´ã‚Š
- </string>
- <string name="anim_express_sad">
- 悲ã—ã‚€
- </string>
- <string name="anim_salute">
- 敬礼ã™ã‚‹
- </string>
- <string name="anim_shout">
- å«ã¶
- </string>
- <string name="anim_express_shrug">
- è‚©ã‚’ã™ãã‚ã‚‹
- </string>
- <string name="anim_express_smile">
- 微笑む
- </string>
- <string name="anim_smoke_idle">
- ãŸã°ã“ã‚’ãゆらã™
- </string>
- <string name="anim_smoke_inhale">
- ãŸã°ã“ã‚’å¸ã†
- </string>
- <string name="anim_smoke_throw_down">
- ãŸã°ã“ã‚’æ¨ã¦ã‚‹
- </string>
- <string name="anim_express_surprise">
- é©šã
- </string>
- <string name="anim_sword_strike_r">
- 剣ã§æ–¬ã‚Šã¤ã‘ã‚‹
- </string>
- <string name="anim_angry_tantrum">
- ã˜ã ã‚“ã ã‚’è¸ã‚€
- </string>
- <string name="anim_express_tongue_out">
- 舌を出ã™
- </string>
- <string name="anim_hello">
- 手を振る
- </string>
- <string name="anim_whisper">
- å°å£°ã§è©±ã™
- </string>
- <string name="anim_whistle">
- å£ç¬›ã‚’å¹ã
- </string>
- <string name="anim_express_wink">
- ウィンク
- </string>
- <string name="anim_wink_hollywood">
- ウィンク(ãƒãƒªã‚¦ãƒƒãƒ‰)
- </string>
- <string name="anim_express_worry">
- 心é…ã™ã‚‹
- </string>
- <string name="anim_yes_happy">
- 笑顔ã§é ·ã
- </string>
- <string name="anim_yes_head">
- é ·ã
- </string>
- <string name="texture_loading">
- ãƒãƒ¼ãƒ‰ä¸...
- </string>
- <string name="worldmap_offline">
- オフライン
- </string>
- <string name="whisper">
- ã®ã•ã•ã‚„ã:
- </string>
- <string name="shout">
- ã®å«ã³:
- </string>
- <string name="all_files">
- å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«
- </string>
- <string name="sound_files">
- サウンド
- </string>
- <string name="animation_files">
- アニメーション
- </string>
- <string name="image_files">
- ç”»åƒ
- </string>
- <string name="save_file_verb">
- ä¿å˜
- </string>
- <string name="load_file_verb">
- ãƒãƒ¼ãƒ‰
- </string>
- <string name="targa_image_files">
- Targaç”»åƒ
- </string>
- <string name="bitmap_image_files">
- ビットマップ画åƒ
- </string>
- <string name="avi_movie_file">
- AVIムービーファイル
- </string>
- <string name="xaf_animation_file">
- XAFアニメーションファイル
- </string>
- <string name="xml_file">
- XMLファイル
- </string>
- <string name="dot_raw_file">
- RAWファイル
- </string>
- <string name="compressed_image_files">
- 圧縮画åƒ
- </string>
- <string name="load_files">
- ファイルã®ãƒãƒ¼ãƒ‰
- </string>
- <string name="choose_the_directory">
- å‚ç…§
- </string>
-</strings>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This file contains strings that used to be hardcoded in the source.
+ It is only for those strings which don't belong in a floater.
+ For example, the strings used in avatar chat bubbles, and strings
+ that are returned from one component and may appear in many places-->
+<strings>
+ <string name="LoginInProgress">
+ ãƒã‚°ã‚¤ãƒ³ä¸ã§ã™ã€‚[APP_NAME]ã®è¡¨ç¤ºãŒãƒ•ãƒªãƒ¼ã‚ºã™ã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„。
+ </string>
+ <string name="LoginAuthenticating">
+ èªè¨¼ã—ã¦ã„ã¾ã™...
+ </string>
+ <string name="LoginMaintenance">
+ アカウント・メンテナンスを実行ã—ã¦ã„ã¾ã™...
+ </string>
+ <string name="LoginAttempt">
+ å‰å›žã®ãƒã‚°ã‚¤ãƒ³ã«å¤±æ•—ã—ã¾ã—ãŸã€‚ ãƒã‚°ã‚¤ãƒ³ä¸ã§ã™([NUMBER]回目)
+ </string>
+ <string name="LoginPrecaching">
+ ワールドをãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™...
+ </string>
+ <string name="LoginInitializingBrowser">
+ 埋ã‚è¾¼ã¿WebブラウザをåˆæœŸåŒ–ã—ã¦ã„ã¾ã™...
+ </string>
+ <string name="LoginInitializingMultimedia">
+ マルãƒãƒ¡ãƒ‡ã‚£ã‚¢ã‚’åˆæœŸåŒ–ã—ã¦ã„ã¾ã™...
+ </string>
+ <string name="LoginVerifyingCache">
+ ã‚ャッシュ・ファイルを検証ã—ã¦ã„ã¾ã™(所è¦æ™‚é–“ã¯60～90秒)...
+ </string>
+ <string name="LoginProcessingResponse">
+ å¿œç”を処ç†ã—ã¦ã„ã¾ã™...
+ </string>
+ <string name="LoginInitializingWorld">
+ ワールドをåˆæœŸåŒ–ã—ã¦ã„ã¾ã™...
+ </string>
+ <string name="LoginDecodingImages">
+ ç”»åƒã‚’デコードã—ã¦ã„ã¾ã™...
+ </string>
+ <string name="LoginInitializingQuicktime">
+ QuickTimeã‚’åˆæœŸåŒ–ã—ã¦ã„ã¾ã™...
+ </string>
+ <string name="LoginQuicktimeNotFound">
+ QuickTimeãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“。åˆæœŸåŒ–ã«å¤±æ•—ã—ã¾ã—ãŸã€‚
+ </string>
+ <string name="LoginQuicktimeOK">
+ QuickTimeãŒæ£å¸¸ã«åˆæœŸåŒ–ã•ã‚Œã¾ã—ãŸã€‚
+ </string>
+ <string name="LoginWaitingForRegionHandshake">
+ 地域ã®ãƒãƒ³ãƒ‰ã‚·ã‚§ã‚¤ã‚¯ã‚’å¾…ã£ã¦ã„ã¾ã™...
+ </string>
+ <string name="LoginConnectingToRegion">
+ 地域ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™...
+ </string>
+ <string name="LoginDownloadingClothing">
+ æœã‚’ダウンãƒãƒ¼ãƒ‰ã—ã¦ã„ã¾ã™...
+ </string>
+ <string name="AgentLostConnection">
+ ã“ã®åœ°åŸŸã«ã¯ã€å•é¡ŒãŒç™ºç”Ÿã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ インターãƒãƒƒãƒˆæŽ¥ç¶šã‚’確èªã—ã¦ãã ã•ã„。
+ </string>
+ <string name="TooltipPerson">
+ 人
+ </string>
+ <string name="TooltipNoName">
+ (åå‰ãªã—)
+ </string>
+ <string name="TooltipOwner">
+ オーナー:
+ </string>
+ <string name="TooltipPublic">
+ 公共
+ </string>
+ <string name="TooltipIsGroup">
+ (グループ)
+ </string>
+ <string name="TooltipFlagScript">
+ スクリプト
+ </string>
+ <string name="TooltipFlagPhysics">
+ 物ç†ä½œç”¨
+ </string>
+ <string name="TooltipFlagTouch">
+ 触る
+ </string>
+ <string name="TooltipFlagL$">
+ L$
+ </string>
+ <string name="TooltipFlagDropInventory">
+ æŒã¡ç‰©ã‚’ドãƒãƒƒãƒ—ã™ã‚‹
+ </string>
+ <string name="TooltipFlagPhantom">
+ ファントãƒ
+ </string>
+ <string name="TooltipFlagTemporary">
+ 一時的
+ </string>
+ <string name="TooltipFlagRightClickMenu">
+ (å³ã‚¯ãƒªãƒƒã‚¯ã§ãƒ¡ãƒ‹ãƒ¥ãƒ¼ã‚’表示)
+ </string>
+ <string name="TooltipFreeToCopy">
+ コピーå¯èƒ½
+ </string>
+ <string name="TooltipForSaleL$">
+ 売り出ã—ä¸:L$[AMOUNT]
+ </string>
+ <string name="TooltipForSaleMsg">
+ 売り出ã—ä¸: [MESSAGE]
+ </string>
+ <string name="TooltipFlagGroupBuild">
+ グループ作æˆ
+ </string>
+ <string name="TooltipFlagNoBuild">
+ 作æˆç¦æ¢
+ </string>
+ <string name="TooltipFlagNoEdit">
+ グループ作æˆ
+ </string>
+ <string name="TooltipFlagNotSafe">
+ å±é™º
+ </string>
+ <string name="TooltipFlagNoFly">
+ 飛行ç¦æ¢
+ </string>
+ <string name="TooltipFlagGroupScripts">
+ グループ・スクリプト
+ </string>
+ <string name="TooltipFlagNoScripts">
+ スクリプトãªã—
+ </string>
+ <string name="TooltipLand">
+ 土地:
+ </string>
+ <string name="TooltipMustSingleDrop">
+ 1ã¤ã®ã‚¢ã‚¤ãƒ†ãƒ ã®ã¿ã‚’ã“ã“ã«ãƒ‰ãƒ©ãƒƒã‚°ã§ãã¾ã™
+ </string>
+ <string name="RetrievingData">
+ 検索ä¸...
+ </string>
+ <string name="ReleaseNotes">
+ リリースノート
+ </string>
+ <string name="LoadingData">
+ ãƒãƒ¼ãƒ‰ä¸...
+ </string>
+ <string name="AvatarNameNobody">
+ (無人)
+ </string>
+ <string name="AvatarNameWaiting">
+ (å¾…æ©Ÿä¸)
+ </string>
+ <string name="AvatarNameHippos">
+ (ã‚«ãƒ)
+ </string>
+ <string name="GroupNameNone">
+ (ãªã—)
+ </string>
+ <string name="AssetErrorNone">
+ エラーãªã—
+ </string>
+ <string name="AssetErrorRequestFailed">
+ 資産ã®è¦æ±‚: 失敗
+ </string>
+ <string name="AssetErrorNonexistentFile">
+ 資産ã®è¦æ±‚: å˜åœ¨ã—ãªã„ファイル
+ </string>
+ <string name="AssetErrorNotInDatabase">
+ 資産ã®è¦æ±‚: データベースã§ã¯è¦‹ã¤ã‹ã‚‰ãªã„資産
+ </string>
+ <string name="AssetErrorEOF">
+ ファイルã®çµ‚ã‚ã‚Š
+ </string>
+ <string name="AssetErrorCannotOpenFile">
+ ファイルを開ãã“ã¨ãŒã§ãã¾ã›ã‚“
+ </string>
+ <string name="AssetErrorFileNotFound">
+ ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“
+ </string>
+ <string name="AssetErrorTCPTimeout">
+ ファイル転é€ã‚¿ã‚¤ãƒ アウトã§ã™
+ </string>
+ <string name="AssetErrorCircuitGone">
+ 接続ãŒè§£é™¤ã•ã‚Œã¾ã—ãŸ
+ </string>
+ <string name="AssetErrorPriceMismatch">
+ ビューワã¨ã‚µãƒ¼ãƒãƒ¼ã®ä¾¡æ ¼ãŒä¸€è‡´ã—ã¦ã„ã¾ã›ã‚“
+ </string>
+ <string name="AssetErrorUnknownStatus">
+ ステータスãŒä¸æ˜Žã§ã™
+ </string>
+ <string name="AvatarEditingApparance">
+ (容姿ã®ç·¨é›†)
+ </string>
+ <string name="AvatarAway">
+ 退å¸ä¸
+ </string>
+ <string name="AvatarBusy">
+ å–ã‚Šè¾¼ã¿ä¸
+ </string>
+ <string name="AvatarMuted">
+ ミュート
+ </string>
+ <string name="anim_express_afraid">
+ 怖れ
+ </string>
+ <string name="anim_express_anger">
+ 怒り
+ </string>
+ <string name="anim_away">
+ 退å¸ä¸
+ </string>
+ <string name="anim_backflip">
+ 後ã‚宙返り
+ </string>
+ <string name="anim_express_laugh">
+ 大笑ã„
+ </string>
+ <string name="anim_express_toothsmile">
+ 満é¢ã®ç¬‘é¡”
+ </string>
+ <string name="anim_blowkiss">
+ 投ã’ã‚ッス
+ </string>
+ <string name="anim_express_bored">
+ 退屈
+ </string>
+ <string name="anim_bow">
+ ãŠã˜ãŽ
+ </string>
+ <string name="anim_clap">
+ æ‹æ‰‹
+ </string>
+ <string name="anim_courtbow">
+ æ·±ã„ãŠã˜ãŽ
+ </string>
+ <string name="anim_express_cry">
+ æ³£ã
+ </string>
+ <string name="anim_dance1">
+ ダンス1
+ </string>
+ <string name="anim_dance2">
+ ダンス2
+ </string>
+ <string name="anim_dance3">
+ ダンス3
+ </string>
+ <string name="anim_dance4">
+ ダンス4
+ </string>
+ <string name="anim_dance5">
+ ダンス5
+ </string>
+ <string name="anim_dance6">
+ ダンス6
+ </string>
+ <string name="anim_dance7">
+ ダンス7
+ </string>
+ <string name="anim_dance8">
+ ダンス8
+ </string>
+ <string name="anim_express_disdain">
+ 侮蔑
+ </string>
+ <string name="anim_drink">
+ é…”ã£ã±ã‚‰ã†
+ </string>
+ <string name="anim_express_embarrased">
+ 困惑
+ </string>
+ <string name="anim_angry_fingerwag">
+ 指を振る
+ </string>
+ <string name="anim_fist_pump">
+ ガッツãƒãƒ¼ã‚º
+ </string>
+ <string name="anim_yoga_float">
+ ヨガ浮éŠ
+ </string>
+ <string name="anim_express_frown">
+ ã—ã‹ã‚ã£é¢
+ </string>
+ <string name="anim_impatient">
+ ã„らã„らã™ã‚‹
+ </string>
+ <string name="anim_jumpforjoy">
+ 飛ã³ä¸ŠãŒã£ã¦å–œã¶
+ </string>
+ <string name="anim_kissmybutt">
+ 挑発ãƒãƒ¼ã‚º
+ </string>
+ <string name="anim_express_kiss">
+ ã‚ス
+ </string>
+ <string name="anim_laugh_short">
+ 笑ã†
+ </string>
+ <string name="anim_musclebeach">
+ 力ã“ã¶ã‚’見ã›ã‚‹
+ </string>
+ <string name="anim_no_unhappy">
+ ä¸æº€ã’ã«å¦å®šã™ã‚‹
+ </string>
+ <string name="anim_no_head">
+ å¦å®šã™ã‚‹
+ </string>
+ <string name="anim_nyanya">
+ 冷やã‹ã™
+ </string>
+ <string name="anim_punch_onetwo">
+ ワンツー・パンãƒ
+ </string>
+ <string name="anim_express_open_mouth">
+ å£ã‚’é–‹ã‘ã¦é©šã
+ </string>
+ <string name="anim_peace">
+ ピース・サイン
+ </string>
+ <string name="anim_point_you">
+ 他人を指差ã™
+ </string>
+ <string name="anim_point_me">
+ 自分を指差ã™
+ </string>
+ <string name="anim_punch_l">
+ 左パンãƒ
+ </string>
+ <string name="anim_punch_r">
+ å³ãƒ‘ンãƒ
+ </string>
+ <string name="anim_rps_countdown">
+ ã˜ã‚ƒã‚“ã‘ã‚“ãƒãƒ¼ã‚º
+ </string>
+ <string name="anim_rps_paper">
+ パー
+ </string>
+ <string name="anim_rps_rock">
+ グー
+ </string>
+ <string name="anim_rps_scissors">
+ ãƒãƒ§ã‚
+ </string>
+ <string name="anim_express_repulsed">
+ 嫌悪感
+ </string>
+ <string name="anim_kick_roundhouse_r">
+ ã¾ã‚ã—è¹´ã‚Š
+ </string>
+ <string name="anim_express_sad">
+ 悲ã—ã‚€
+ </string>
+ <string name="anim_salute">
+ 敬礼ã™ã‚‹
+ </string>
+ <string name="anim_shout">
+ å«ã¶
+ </string>
+ <string name="anim_express_shrug">
+ è‚©ã‚’ã™ãã‚ã‚‹
+ </string>
+ <string name="anim_express_smile">
+ 微笑む
+ </string>
+ <string name="anim_smoke_idle">
+ ãŸã°ã“ã‚’ãゆらã™
+ </string>
+ <string name="anim_smoke_inhale">
+ ãŸã°ã“ã‚’å¸ã†
+ </string>
+ <string name="anim_smoke_throw_down">
+ ãŸã°ã“ã‚’æ¨ã¦ã‚‹
+ </string>
+ <string name="anim_express_surprise">
+ é©šã
+ </string>
+ <string name="anim_sword_strike_r">
+ 剣ã§æ–¬ã‚Šã¤ã‘ã‚‹
+ </string>
+ <string name="anim_angry_tantrum">
+ ã˜ã ã‚“ã ã‚’è¸ã‚€
+ </string>
+ <string name="anim_express_tongue_out">
+ 舌を出ã™
+ </string>
+ <string name="anim_hello">
+ 手を振る
+ </string>
+ <string name="anim_whisper">
+ å°å£°ã§è©±ã™
+ </string>
+ <string name="anim_whistle">
+ å£ç¬›ã‚’å¹ã
+ </string>
+ <string name="anim_express_wink">
+ ウィンク
+ </string>
+ <string name="anim_wink_hollywood">
+ ウィンク(ãƒãƒªã‚¦ãƒƒãƒ‰)
+ </string>
+ <string name="anim_express_worry">
+ 心é…ã™ã‚‹
+ </string>
+ <string name="anim_yes_happy">
+ 笑顔ã§é ·ã
+ </string>
+ <string name="anim_yes_head">
+ é ·ã
+ </string>
+ <string name="texture_loading">
+ ãƒãƒ¼ãƒ‰ä¸...
+ </string>
+ <string name="worldmap_offline">
+ オフライン
+ </string>
+ <string name="whisper">
+ ã®ã•ã•ã‚„ã:
+ </string>
+ <string name="shout">
+ ã®å«ã³:
+ </string>
+ <string name="all_files">
+ å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«
+ </string>
+ <string name="sound_files">
+ サウンド
+ </string>
+ <string name="animation_files">
+ アニメーション
+ </string>
+ <string name="image_files">
+ ç”»åƒ
+ </string>
+ <string name="save_file_verb">
+ ä¿å˜
+ </string>
+ <string name="load_file_verb">
+ ãƒãƒ¼ãƒ‰
+ </string>
+ <string name="targa_image_files">
+ Targaç”»åƒ
+ </string>
+ <string name="bitmap_image_files">
+ ビットマップ画åƒ
+ </string>
+ <string name="avi_movie_file">
+ AVIムービーファイル
+ </string>
+ <string name="xaf_animation_file">
+ XAFアニメーションファイル
+ </string>
+ <string name="xml_file">
+ XMLファイル
+ </string>
+ <string name="dot_raw_file">
+ RAWファイル
+ </string>
+ <string name="compressed_image_files">
+ 圧縮画åƒ
+ </string>
+ <string name="load_files">
+ ファイルã®ãƒãƒ¼ãƒ‰
+ </string>
+ <string name="choose_the_directory">
+ å‚ç…§
+ </string>
+</strings>
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 288c44bf8a..9e6b4bd26e 100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -1,87 +1,87 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<teleport_messages name="">
- <message_set name="errors">
- <message name="invalid_tport">
- テレãƒãƒ¼ãƒˆãƒ»ãƒªã‚¯ã‚¨ã‚¹ãƒˆã®å‡¦ç†ä¸ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚テレãƒãƒ¼ãƒˆã™ã‚‹ã«ã¯ã€
-å†åº¦ãƒã‚°ã‚¤ãƒ³ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒ
-引ã続ã表示ã•ã‚Œã‚‹å ´åˆã¯ã€æŠ€è¡“サãƒãƒ¼ãƒˆFAQ（www.secondlife.com/support）
-ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
- </message>
- <message name="invalid_region_handoff">
- 地域間ã®ç§»å‹•ã®å‡¦ç†ä¸ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚地域間を
-移動ã™ã‚‹ã«ã¯ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒ
-引ã続ã表示ã•ã‚Œã‚‹å ´åˆã¯ã€æŠ€è¡“サãƒãƒ¼ãƒˆFAQ（www.secondlife.com/support）
-ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
- </message>
- <message name="blocked_tport">
- 申ã—訳ã”ã–ã„ã¾ã›ã‚“。テレãƒãƒ¼ãƒˆã¯ç¾åœ¨ã€ãƒ–ãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ã‚‚ã†å°‘ã—後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
-ã‚„ã‚Šç›´ã—ã¦ã‚‚テレãƒãƒ¼ãƒˆã§ããªã„å ´åˆã¯ã€ã„ã£ãŸã‚“ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦
-å•é¡Œã‚’解決ã—ã¦ãã ã•ã„。
- </message>
- <message name="nolandmark_tport">
- 残念ãªãŒã‚‰ã€ã‚·ã‚¹ãƒ†ãƒ ã¯ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ç›®çš„地を探ã›ã¾ã›ã‚“ã§ã—ãŸã€‚
- </message>
- <message name="timeout_tport">
- 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆæŽ¥ç¶šã‚’完了ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚
-ã‚‚ã†å°‘ã—後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
- </message>
- <message name="noaccess_tport">
- 残念ãªãŒã‚‰ã€ãã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆç›®çš„地ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ãŒã‚ã‚Šã¾ã›ã‚“。
- </message>
- <message name="missing_attach_tport">
- 添付物ã¯ã€ã¾ã 到ç€ã—ã¦ã„ã¾ã›ã‚“。ã‚ã¨æ•°ç§’é–“ãŠå¾…ã¡ã„ãŸã ãã‹ã€ã„ã£ãŸã‚“ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ã‹ã‚‰ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’ã‚„ã‚Šç›´ã—ã¦ã ã•ã„。
- </message>
- <message name="too_many_uploads_tport">
- ã“ã®åœ°åŸŸã®è³‡ç”£ã‚ューãŒç¾åœ¨è¾¼ã¿åˆã£ã¦ã„ã‚‹ãŸã‚ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ»
-リクエストを時間通りã«å‡¦ç†ã™ã‚‹ã“ã¨ãŒé›£ã—ã„状æ³ã§ã™ã€‚数分後ã«ã‚„ã‚Šç›´ã™ã‹ã€
-ã¾ãŸã¯æ··é›‘ã—ã¦ã„ãªã„ä»–ã®åœ°åŸŸã‚’ãŠè©¦ã—ãã ã•ã„。
- </message>
- <message name="expired_tport">
- 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ»ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’時間ã©ãŠã‚Šã«
-完了ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
- </message>
- <message name="expired_region_handoff">
- 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯åœ°åŸŸé–“ã®ç§»å‹•ã‚’時間ã©ãŠã‚Šã«å®Œäº†ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚
-数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
- </message>
- <message name="no_host">
- テレãƒãƒ¼ãƒˆç›®çš„地を見ã¤ã‘られã¾ã›ã‚“。目的地ãŒä¸€æ™‚çš„ã«åˆ©ç”¨ã§ããªã„
-状態ã‹ã€ã¾ãŸã¯ã™ã§ã«æ¶ˆæ»…ã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
- </message>
- <message name="no_inventory_host">
- æŒã¡ç‰©ã‚·ã‚¹ãƒ†ãƒ ã¯ç¾åœ¨åˆ©ç”¨ã§ãã¾ã›ã‚“。
- </message>
- </message_set>
- <message_set name="progress">
- <message name="sending_dest">
- 目的地ã«é€ä¿¡ã—ã¦ã„ã¾ã™ã€‚
- </message>
- <message name="redirecting">
- 別ã®ç›®çš„地ã«å†æ¡ˆå†…ã—ã¦ã„ã¾ã™ã€‚
- </message>
- <message name="relaying">
- 目的地ã«ä¸ç¶™ã—ã¦ã„ã¾ã™ã€‚
- </message>
- <message name="sending_home">
- ホームä½ç½®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ä¿¡ã—ã¦ã„ã¾ã™ã€‚
- </message>
- <message name="sending_landmark">
- ランドマークä½ç½®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ä¿¡ã—ã¦ã„ã¾ã™ã€‚
- </message>
- <message name="completing">
- テレãƒãƒ¼ãƒˆã‚’完了ã—ã¦ã„ã¾ã™ã€‚
- </message>
- <message name="resolving">
- 目的地を解決ã—ã¦ã„ã¾ã™ã€‚
- </message>
- <message name="contacting">
- æ–°ã—ã„地域ã«ã‚³ãƒ³ã‚¿ã‚¯ãƒˆã—ã¦ã„ã¾ã™ã€‚
- </message>
- <message name="arriving">
- 到ç€...
- </message>
- <message name="requesting">
- テレãƒãƒ¼ãƒˆã‚’リクエスト...
- </message>
- </message_set>
-</teleport_messages>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<teleport_messages name="">
+ <message_set name="errors">
+ <message name="invalid_tport">
+ テレãƒãƒ¼ãƒˆãƒ»ãƒªã‚¯ã‚¨ã‚¹ãƒˆã®å‡¦ç†ä¸ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚テレãƒãƒ¼ãƒˆã™ã‚‹ã«ã¯ã€
+å†åº¦ãƒã‚°ã‚¤ãƒ³ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒ
+引ã続ã表示ã•ã‚Œã‚‹å ´åˆã¯ã€æŠ€è¡“サãƒãƒ¼ãƒˆFAQ（www.secondlife.com/support）
+ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+ </message>
+ <message name="invalid_region_handoff">
+ 地域間ã®ç§»å‹•ã®å‡¦ç†ä¸ã«å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚地域間を
+移動ã™ã‚‹ã«ã¯ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒ
+引ã続ã表示ã•ã‚Œã‚‹å ´åˆã¯ã€æŠ€è¡“サãƒãƒ¼ãƒˆFAQ（www.secondlife.com/support）
+ã‚’å‚ç…§ã—ã¦ãã ã•ã„。
+ </message>
+ <message name="blocked_tport">
+ 申ã—訳ã”ã–ã„ã¾ã›ã‚“。テレãƒãƒ¼ãƒˆã¯ç¾åœ¨ã€ãƒ–ãƒãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™ã€‚ã‚‚ã†å°‘ã—後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
+ã‚„ã‚Šç›´ã—ã¦ã‚‚テレãƒãƒ¼ãƒˆã§ããªã„å ´åˆã¯ã€ã„ã£ãŸã‚“ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦
+å•é¡Œã‚’解決ã—ã¦ãã ã•ã„。
+ </message>
+ <message name="nolandmark_tport">
+ 残念ãªãŒã‚‰ã€ã‚·ã‚¹ãƒ†ãƒ ã¯ãƒ©ãƒ³ãƒ‰ãƒžãƒ¼ã‚¯ç›®çš„地を探ã›ã¾ã›ã‚“ã§ã—ãŸã€‚
+ </message>
+ <message name="timeout_tport">
+ 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆæŽ¥ç¶šã‚’完了ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚
+ã‚‚ã†å°‘ã—後ã§ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
+ </message>
+ <message name="noaccess_tport">
+ 残念ãªãŒã‚‰ã€ãã®ãƒ†ãƒ¬ãƒãƒ¼ãƒˆç›®çš„地ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ãŒã‚ã‚Šã¾ã›ã‚“。
+ </message>
+ <message name="missing_attach_tport">
+ 添付物ã¯ã€ã¾ã 到ç€ã—ã¦ã„ã¾ã›ã‚“。ã‚ã¨æ•°ç§’é–“ãŠå¾…ã¡ã„ãŸã ãã‹ã€ã„ã£ãŸã‚“ãƒã‚°ã‚¢ã‚¦ãƒˆã—ã€å†åº¦ãƒã‚°ã‚¤ãƒ³ã—ã¦ã‹ã‚‰ãƒ†ãƒ¬ãƒãƒ¼ãƒˆã‚’ã‚„ã‚Šç›´ã—ã¦ã ã•ã„。
+ </message>
+ <message name="too_many_uploads_tport">
+ ã“ã®åœ°åŸŸã®è³‡ç”£ã‚ューãŒç¾åœ¨è¾¼ã¿åˆã£ã¦ã„ã‚‹ãŸã‚ã€ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ»
+リクエストを時間通りã«å‡¦ç†ã™ã‚‹ã“ã¨ãŒé›£ã—ã„状æ³ã§ã™ã€‚数分後ã«ã‚„ã‚Šç›´ã™ã‹ã€
+ã¾ãŸã¯æ··é›‘ã—ã¦ã„ãªã„ä»–ã®åœ°åŸŸã‚’ãŠè©¦ã—ãã ã•ã„。
+ </message>
+ <message name="expired_tport">
+ 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯ãƒ†ãƒ¬ãƒãƒ¼ãƒˆãƒ»ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’時間ã©ãŠã‚Šã«
+完了ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
+ </message>
+ <message name="expired_region_handoff">
+ 申ã—訳ã”ã–ã„ã¾ã›ã‚“。システムã¯åœ°åŸŸé–“ã®ç§»å‹•ã‚’時間ã©ãŠã‚Šã«å®Œäº†ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚
+数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
+ </message>
+ <message name="no_host">
+ テレãƒãƒ¼ãƒˆç›®çš„地を見ã¤ã‘られã¾ã›ã‚“。目的地ãŒä¸€æ™‚çš„ã«åˆ©ç”¨ã§ããªã„
+状態ã‹ã€ã¾ãŸã¯ã™ã§ã«æ¶ˆæ»…ã—ã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚数分後ã«ã‚„ã‚Šç›´ã—ã¦ãã ã•ã„。
+ </message>
+ <message name="no_inventory_host">
+ æŒã¡ç‰©ã‚·ã‚¹ãƒ†ãƒ ã¯ç¾åœ¨åˆ©ç”¨ã§ãã¾ã›ã‚“。
+ </message>
+ </message_set>
+ <message_set name="progress">
+ <message name="sending_dest">
+ 目的地ã«é€ä¿¡ã—ã¦ã„ã¾ã™ã€‚
+ </message>
+ <message name="redirecting">
+ 別ã®ç›®çš„地ã«å†æ¡ˆå†…ã—ã¦ã„ã¾ã™ã€‚
+ </message>
+ <message name="relaying">
+ 目的地ã«ä¸ç¶™ã—ã¦ã„ã¾ã™ã€‚
+ </message>
+ <message name="sending_home">
+ ホームä½ç½®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ä¿¡ã—ã¦ã„ã¾ã™ã€‚
+ </message>
+ <message name="sending_landmark">
+ ランドマークä½ç½®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’é€ä¿¡ã—ã¦ã„ã¾ã™ã€‚
+ </message>
+ <message name="completing">
+ テレãƒãƒ¼ãƒˆã‚’完了ã—ã¦ã„ã¾ã™ã€‚
+ </message>
+ <message name="resolving">
+ 目的地を解決ã—ã¦ã„ã¾ã™ã€‚
+ </message>
+ <message name="contacting">
+ æ–°ã—ã„地域ã«ã‚³ãƒ³ã‚¿ã‚¯ãƒˆã—ã¦ã„ã¾ã™ã€‚
+ </message>
+ <message name="arriving">
+ 到ç€...
+ </message>
+ <message name="requesting">
+ テレãƒãƒ¼ãƒˆã‚’リクエスト...
+ </message>
+ </message_set>
+</teleport_messages>
diff --git a/indra/newview/skins/default/xui/nl/floater_snapshot.xml b/indra/newview/skins/default/xui/nl/floater_snapshot.xml
index 810ceda46c..e4279bffc4 100644
--- a/indra/newview/skins/default/xui/nl/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/nl/floater_snapshot.xml
@@ -21,12 +21,8 @@
<button label="Verzenden" name="send_btn"/>
<button label="Opslaan (L$[AMOUNT])" name="upload_btn"/>
<flyout_button label="Opslaan" name="save_btn" tool_tip="Afbeelding in een bestand opslaan">
- <flyout_button_item name="save_item">
- Opslaan
- </flyout_button_item>
- <flyout_button_item name="saveas_item">
- Opslaan als...
- </flyout_button_item>
+ <flyout_button_item name="save_item" label="Opslaan"/>
+ <flyout_button_item name="saveas_item" label="Opslaan als..."/>
</flyout_button>
<button label="Annuleren" name="discard_btn"/>
<button label="Meer >>" name="more_btn" tool_tip="Geavanceerde opties"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
index d1300a0e3c..7151f67203 100755
--- a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml
@@ -18,129 +18,129 @@
</text>
<combo_box label="" name="hand_pose_combo"
tool_tip="Kontroluje co robi ręka podczas animacji">
- <combo_item name="Spread">
+ <combo_box.item name="Spread">
RozciÄ…gaj
- </combo_item>
- <combo_item name="Relaxed">
+ </combo_box.item>
+ <combo_box.item name="Relaxed">
Odpocznij
- </combo_item>
- <combo_item name="PointBoth">
+ </combo_box.item>
+ <combo_box.item name="PointBoth">
Wskazuj
- </combo_item>
- <combo_item name="Fist">
+ </combo_box.item>
+ <combo_box.item name="Fist">
Pięść
- </combo_item>
- <combo_item name="RelaxedLeft">
+ </combo_box.item>
+ <combo_box.item name="RelaxedLeft">
Lewa-Odpocznij
- </combo_item>
- <combo_item name="PointLeft">
+ </combo_box.item>
+ <combo_box.item name="PointLeft">
Wskazuj LewÄ…
- </combo_item>
- <combo_item name="FistLeft">
+ </combo_box.item>
+ <combo_box.item name="FistLeft">
Zaciśnij Lewą
- </combo_item>
- <combo_item name="RelaxedRight">
+ </combo_box.item>
+ <combo_box.item name="RelaxedRight">
Prawa-Odpocznj
- </combo_item>
- <combo_item name="PointRight">
+ </combo_box.item>
+ <combo_box.item name="PointRight">
Wskazuj PrawÄ…
- </combo_item>
- <combo_item name="FistRight">
+ </combo_box.item>
+ <combo_box.item name="FistRight">
Zaciśnij Prawą
- </combo_item>
- <combo_item name="SaluteRight">
+ </combo_box.item>
+ <combo_box.item name="SaluteRight">
Salutuj PrawÄ…
- </combo_item>
- <combo_item name="Typing">
+ </combo_box.item>
+ <combo_box.item name="Typing">
Pisz
- </combo_item>
- <combo_item name="PeaceRight">
+ </combo_box.item>
+ <combo_box.item name="PeaceRight">
Prawa-Pokój
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="emote_label">
Ekspresja
</text>
<combo_box label="" name="emote_combo"
tool_tip="Kontroluj co wykonuje twarz w czasie animacji">
- <combo_item name="[None]">
+ <combo_box.item name="[None]">
[Żadne]
- </combo_item>
- <combo_item name="Aaaaah">
+ </combo_box.item>
+ <combo_box.item name="Aaaaah">
Aaaaah
- </combo_item>
- <combo_item name="Afraid">
+ </combo_box.item>
+ <combo_box.item name="Afraid">
Obawa
- </combo_item>
- <combo_item name="Angry">
+ </combo_box.item>
+ <combo_box.item name="Angry">
Zlość
- </combo_item>
- <combo_item name="BigSmile">
+ </combo_box.item>
+ <combo_box.item name="BigSmile">
Duży Uśmiech
- </combo_item>
- <combo_item name="Bored">
+ </combo_box.item>
+ <combo_box.item name="Bored">
Znudzenie
- </combo_item>
- <combo_item name="Cry">
+ </combo_box.item>
+ <combo_box.item name="Cry">
Placz
- </combo_item>
- <combo_item name="Disdain">
+ </combo_box.item>
+ <combo_box.item name="Disdain">
Wzgarda
- </combo_item>
- <combo_item name="Embarrassed">
+ </combo_box.item>
+ <combo_box.item name="Embarrassed">
Zakłopotanie
- </combo_item>
- <combo_item name="Frown">
+ </combo_box.item>
+ <combo_box.item name="Frown">
Marszczenie Brwi
- </combo_item>
- <combo_item name="Kiss">
+ </combo_box.item>
+ <combo_box.item name="Kiss">
Pocałunek
- </combo_item>
- <combo_item name="Laugh">
+ </combo_box.item>
+ <combo_box.item name="Laugh">
Åšmiech
- </combo_item>
- <combo_item name="Plllppt">
+ </combo_box.item>
+ <combo_box.item name="Plllppt">
Plllppt
- </combo_item>
- <combo_item name="Repulsed">
+ </combo_box.item>
+ <combo_box.item name="Repulsed">
Odrzucenie
- </combo_item>
- <combo_item name="Sad">
+ </combo_box.item>
+ <combo_box.item name="Sad">
Smutek
- </combo_item>
- <combo_item name="Shrug">
+ </combo_box.item>
+ <combo_box.item name="Shrug">
Wzruszanie Ramionami
- </combo_item>
- <combo_item name="Smile">
+ </combo_box.item>
+ <combo_box.item name="Smile">
Uśmiech
- </combo_item>
- <combo_item name="Surprise">
+ </combo_box.item>
+ <combo_box.item name="Surprise">
Niespodzianka
- </combo_item>
- <combo_item name="Wink">
+ </combo_box.item>
+ <combo_box.item name="Wink">
Mrugnięcie
- </combo_item>
- <combo_item name="Worry">
+ </combo_box.item>
+ <combo_box.item name="Worry">
Zmartwienie
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="preview_label">
PrzeglÄ…daj kiedy
</text>
<combo_box label="" name="preview_base_anim"
tool_tip="Przetestuj zachowanie animacji kiedy awatar wykonuje normalne czynności">
- <combo_item name="Standing">
+ <combo_box.item name="Standing">
Stanie
- </combo_item>
- <combo_item name="Walking">
+ </combo_box.item>
+ <combo_box.item name="Walking">
Chodzenie
- </combo_item>
- <combo_item name="Sitting">
+ </combo_box.item>
+ <combo_box.item name="Sitting">
Siedzenie
- </combo_item>
- <combo_item name="Flying">
+ </combo_box.item>
+ <combo_box.item name="Flying">
Latanie
- </combo_item>
+ </combo_box.item>
</combo_box>
<spinner label="Złagodzić w (sekund)" name="ease_in_time"
tool_tip="Ilość Czasu (w sekundach), w których animacje mieszają się" />
diff --git a/indra/newview/skins/default/xui/pl/floater_beacons.xml b/indra/newview/skins/default/xui/pl/floater_beacons.xml
index ac408f2591..9f614470da 100644
--- a/indra/newview/skins/default/xui/pl/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/pl/floater_beacons.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="Emitery">
- <panel name="beacons_panel">
- <check_box label="Obiekty Dotykalne" name="touch_only"/>
- <check_box label="Obiekty Skryptowane" name="scripted"/>
- <check_box label="Obiekty Fizyczne" name="physical"/>
- <check_box label="Źródła Dźwięku" name="sounds"/>
- <check_box label="Źródła Cząsteczek" name="particles"/>
- <check_box label="Podkreśl Emitery" name="highlights"/>
- <check_box label="Pokaż Emitery" name="beacons"/>
- <text name="beacon_width_label">
- Szerokość Emiterów:
- </text>
- </panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Emitery">
+ <panel name="beacons_panel">
+ <check_box label="Obiekty Dotykalne" name="touch_only"/>
+ <check_box label="Obiekty Skryptowane" name="scripted"/>
+ <check_box label="Obiekty Fizyczne" name="physical"/>
+ <check_box label="Źródła Dźwięku" name="sounds"/>
+ <check_box label="Źródła Cząsteczek" name="particles"/>
+ <check_box label="Podkreśl Emitery" name="highlights"/>
+ <check_box label="Pokaż Emitery" name="beacons"/>
+ <text name="beacon_width_label">
+ Szerokość Emiterów:
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
index 0af12e0c6d..0225c4bca5 100755
--- a/indra/newview/skins/default/xui/pl/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml
@@ -66,15 +66,15 @@
Tylko członkowie z kontem Premium mogą mieć Posiadłosci.
</text>
<combo_box name="account_level">
- <combo_item name="US$9.95/month,billedmonthly">
+ <combo_box.item name="US$9.95/month,billedmonthly">
9.95US$/miesiąc, płatne miesięcznie
- </combo_item>
- <combo_item name="US$7.50/month,billedquarterly">
+ </combo_box.item>
+ <combo_box.item name="US$7.50/month,billedquarterly">
7.50US$/miesiąc, płatne kwartalnie
- </combo_item>
- <combo_item name="US$6.00/month,billedannually">
+ </combo_box.item>
+ <combo_box.item name="US$6.00/month,billedannually">
6.00US$/miesiąc, płatne rocznie
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="land_use_action">
Zwiększ opłatę za używanie Posiadłości do 40US$/miesiąc.
diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
index 92de69eb5e..ff997c72cc 100755
--- a/indra/newview/skins/default/xui/pl/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml
@@ -79,29 +79,29 @@
Cel:
</text>
<combo_box name="destination">
- <combo_item name="Selection">
+ <combo_box.item name="Selection">
Selekcja
- </combo_item>
- <combo_item name="AgentRegion">
+ </combo_box.item>
+ <combo_box.item name="AgentRegion">
Agent Regionu
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="Request:">
RzÄ…danie:
</text>
<combo_box name="request">
- <combo_item name="colliders<steps>">
+ <combo_box.item name="colliders<steps>">
kolidery <kroki>
- </combo_item>
- <combo_item name="scripts<count>,<optionalpattern>">
+ </combo_box.item>
+ <combo_box.item name="scripts<count>,<optionalpattern>">
skrypty <policz>,<opcjonalnie powtórzenie>
- </combo_item>
- <combo_item name="objects<pattern>">
+ </combo_box.item>
+ <combo_box.item name="objects<pattern>">
obiekty <powtórzenia>
- </combo_item>
- <combo_item name="rez<asset_id>">
+ </combo_box.item>
+ <combo_box.item name="rez<asset_id>">
rez <asset_id>
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="Parameter:">
Parameter:
diff --git a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
index 010537d555..e76ad56660 100755
--- a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml
@@ -8,21 +8,21 @@
Antialiasing:
</text>
<combo_box label="Antialiasing" name="fsaa" width="84">
- <combo_item name="FSAADisabled">
+ <combo_box.item name="FSAADisabled">
Wyłączone
- </combo_item>
- <combo_item name="2x">
+ </combo_box.item>
+ <combo_box.item name="2x">
2x
- </combo_item>
- <combo_item name="4x">
+ </combo_box.item>
+ <combo_box.item name="4x">
4x
- </combo_item>
- <combo_item name="8x">
+ </combo_box.item>
+ <combo_box.item name="8x">
8x
- </combo_item>
- <combo_item name="16x">
+ </combo_box.item>
+ <combo_box.item name="16x">
16x
- </combo_item>
+ </combo_box.item>
</combo_box>
<spinner label="Gamma:" name="gamma" />
<text type="string" length="1" name="(brightness, lower is brighter)">
diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
index 9772dc7808..b0fe49deef 100755
--- a/indra/newview/skins/default/xui/pl/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/pl/floater_image_preview.xml
@@ -10,36 +10,36 @@
Wyświetl obraz jako:
</text>
<combo_box label="Rodzaj Ubrania" name="clothing_type_combo">
- <combo_item name="Image">
+ <combo_box.item name="Image">
Obraz
- </combo_item>
- <combo_item name="Hair">
+ </combo_box.item>
+ <combo_box.item name="Hair">
WÅ‚osy
- </combo_item>
- <combo_item name="FemaleHead">
+ </combo_box.item>
+ <combo_box.item name="FemaleHead">
Damska GÅ‚owa
- </combo_item>
- <combo_item name="FemaleUpperBody">
+ </combo_box.item>
+ <combo_box.item name="FemaleUpperBody">
Damska Górna Część Ciała
- </combo_item>
- <combo_item name="FemaleLowerBody">
+ </combo_box.item>
+ <combo_box.item name="FemaleLowerBody">
Damska Górna Część Ciała
- </combo_item>
- <combo_item name="MaleHead">
+ </combo_box.item>
+ <combo_box.item name="MaleHead">
Męska Głowa
- </combo_item>
- <combo_item name="MaleUpperBody">
+ </combo_box.item>
+ <combo_box.item name="MaleUpperBody">
Męska Górna Część Ciała
- </combo_item>
- <combo_item name="MaleLowerBody">
+ </combo_box.item>
+ <combo_box.item name="MaleLowerBody">
Męska Dolna Część Ciała
- </combo_item>
- <combo_item name="Skirt">
+ </combo_box.item>
+ <combo_box.item name="Skirt">
Spódnica
- </combo_item>
- <combo_item name="SculptedPrim">
+ </combo_box.item>
+ <combo_box.item name="SculptedPrim">
Sculpt
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="bad_image_text">
Nie można wczytać obrazu.
diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
index 94500d0295..2d42ac3368 100755
--- a/indra/newview/skins/default/xui/pl/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml
@@ -34,15 +34,15 @@
Wybierz sprzedaż dla kogokolwiek albo dla wybranego kupca.
</text>
<combo_box name="sell_to">
- <combo_item name="--selectone--">
+ <combo_box.item name="--selectone--">
-- wybierz --
- </combo_item>
- <combo_item name="Anyone">
+ </combo_box.item>
+ <combo_box.item name="Anyone">
Ktokolwiek
- </combo_item>
- <combo_item name="Specificuser:">
+ </combo_box.item>
+ <combo_box.item name="Specificuser:">
Wybrany kupiec:
- </combo_item>
+ </combo_box.item>
</combo_box>
<button label="Wybierz..." name="sell_to_select_agent" />
<text name="sell_objects_label">
diff --git a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
index 496f8af2db..8c3f9cc056 100755
--- a/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/pl/floater_settings_debug.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="settings_debug" title="Ustawienia Usuwania Błędów">
<combo_box name="boolean_combo">
- <combo_item name="TRUE">
+ <combo_box.item name="TRUE">
PRAWDA
- </combo_item>
- <combo_item name="FALSE">
+ </combo_box.item>
+ <combo_box.item name="FALSE">
NIEPRAWDA
- </combo_item>
+ </combo_box.item>
</combo_box>
<color_swatch label="Kolor" name="color_swatch"/>
<spinner label="x" name="val_spinner_1"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
index 9c011b9a64..e707bc797a 100755
--- a/indra/newview/skins/default/xui/pl/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pl/floater_snapshot.xml
@@ -21,12 +21,12 @@
<button label="Wyślij" name="send_btn"/>
<button label="Załaduj (L$[AMOUNT])" name="upload_btn"/>
<flyout_button label="Zapisz" name="save_btn" tool_tip="Zapisz zdjęcie na dysk">
- <flyout_button_item name="save_item">
- Zapisz
- </flyout_button_item>
- <flyout_button_item name="saveas_item">
- Zapisz Jako...
- </flyout_button_item>
+ <flyout_button.item name="save_item">
+ Zapisz
+ </flyout_button.item>
+ <flyout_button.item name="saveas_item">
+ Zapisz Jako...
+ </flyout_button.item>
</flyout_button>
<button label="Anuluj" name="discard_btn"/>
<button label="Więcej >>" name="more_btn" tool_tip="Ustawienia Zaawansowane"/>
@@ -38,75 +38,75 @@
Format
</text>
<combo_box label="Rozdzielczość" name="postcard_size_combo">
- <combo_item name="CurrentWindow">
+ <combo_box.item name="CurrentWindow">
Obecne Okno
- </combo_item>
- <combo_item name="640x480">
+ </combo_box.item>
+ <combo_box.item name="640x480">
640x480
- </combo_item>
- <combo_item name="800x600">
+ </combo_box.item>
+ <combo_box.item name="800x600">
800x600
- </combo_item>
- <combo_item name="1024x768">
+ </combo_box.item>
+ <combo_box.item name="1024x768">
1024x768
- </combo_item>
- <combo_item name="Custom">
+ </combo_box.item>
+ <combo_box.item name="Custom">
Wybierz
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="Rozdzielczość" name="texture_size_combo">
- <combo_item name="CurrentWindow">
+ <combo_box.item name="CurrentWindow">
Obecne Okno
- </combo_item>
- <combo_item name="Small(128x128)">
+ </combo_box.item>
+ <combo_box.item name="Small(128x128)">
Mały (128x128)
- </combo_item>
- <combo_item name="Medium(256x256)">
+ </combo_box.item>
+ <combo_box.item name="Medium(256x256)">
Åšredni (256x256)
- </combo_item>
- <combo_item name="Large(512x512)">
+ </combo_box.item>
+ <combo_box.item name="Large(512x512)">
Duży (512x512)
- </combo_item>
- <combo_item name="Custom">
+ </combo_box.item>
+ <combo_box.item name="Custom">
Wybierz
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="Rozdzielczość" name="local_size_combo">
- <combo_item name="CurrentWindow">
+ <combo_box.item name="CurrentWindow">
Obecne Okno
- </combo_item>
- <combo_item name="320x240">
+ </combo_box.item>
+ <combo_box.item name="320x240">
320x240
- </combo_item>
- <combo_item name="640x480">
+ </combo_box.item>
+ <combo_box.item name="640x480">
640x480
- </combo_item>
- <combo_item name="800x600">
+ </combo_box.item>
+ <combo_box.item name="800x600">
800x600
- </combo_item>
- <combo_item name="1024x768">
+ </combo_box.item>
+ <combo_box.item name="1024x768">
1024x768
- </combo_item>
- <combo_item name="1280x1024">
+ </combo_box.item>
+ <combo_box.item name="1280x1024">
1280x1024
- </combo_item>
- <combo_item name="1600x1200">
+ </combo_box.item>
+ <combo_box.item name="1600x1200">
1600x1200
- </combo_item>
- <combo_item name="Custom">
+ </combo_box.item>
+ <combo_box.item name="Custom">
Wybierz
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="Format" name="local_format_combo">
- <combo_item name="PNG">
+ <combo_box.item name="PNG">
PNG
- </combo_item>
- <combo_item name="JPEG">
+ </combo_box.item>
+ <combo_box.item name="JPEG">
JPEG
- </combo_item>
- <combo_item name="BMP">
+ </combo_box.item>
+ <combo_box.item name="BMP">
BMP
- </combo_item>
+ </combo_box.item>
</combo_box>
<spinner label="Szer." name="snapshot_width"/>
<spinner label="Wys." name="snapshot_height"/>
@@ -116,15 +116,15 @@
Zapisz:
</text>
<combo_box label="Warstwy Obrazu" name="layer_types">
- <combo_item name="Colors">
+ <combo_box.item name="Colors">
Kolory
- </combo_item>
- <combo_item name="Depth">
+ </combo_box.item>
+ <combo_box.item name="Depth">
Głębokość
- </combo_item>
- <combo_item name="ObjectMattes">
+ </combo_box.item>
+ <combo_box.item name="ObjectMattes">
Obiekty Åšlepe
- </combo_item>
+ </combo_box.item>
</combo_box>
<check_box label="Pokaż interfejs na zdjęciu" name="ui_check"/>
<check_box label="Pokaż obiekty HUD na zdjęciu" name="hud_check"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml
index a677a2558a..2555186a12 100755
--- a/indra/newview/skins/default/xui/pl/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pl/floater_tools.xml
@@ -7,33 +7,39 @@
<button label="" label_selected="" name="button create" tool_tip="Stwórz"/>
<button label="" label_selected="" name="button land" tool_tip="Teren"/>
<!-- Focus panel -->
- <check_box label="Zbliżenie" name="radio zoom"/>
- <volume_slider name="slider zoom"/>
- <check_box label="Obracanie (Ctrl)" name="radio orbit"/>
- <check_box label="Przesunięcie (Ctrl-Shift)" name="radio pan"/>
+ <volume_slider name="slider zoom"/>
+ <radio_group name="focus_radio_group">
+ <radio_item label="Zbliżenie" name="radio zoom"/>
+ <radio_item label="Obracanie (Ctrl)" name="radio orbit"/>
+ <radio_item label="Przesunięcie (Ctrl-Shift)" name="radio pan"/>
+ </radio_group>
<!-- Move panel -->
- <check_box label="Przesuń" name="radio move"/>
- <check_box label="PodnieÅ› (Ctrl)" name="radio lift"/>
- <check_box label="Obróć (Ctrl-Shift)" name="radio spin"/>
+ <radio_group name="move_radio_group">
+ <radio_item label="Przesuń" name="radio move"/>
+ <radio_item label="PodnieÅ› (Ctrl)" name="radio lift"/>
+ <radio_item label="Obróć (Ctrl-Shift)" name="radio spin"/>
+ </radio_group>
<!-- Edit panel -->
- <check_box label="Pozycja" name="radio position"/>
- <check_box label="Obróć (Ctrl)" name="radio rotate"/>
- <check_box label="RozciÄ…gnij (Ctrl-Shift)" name="radio stretch"/>
- <check_box label="Wybierz TeksturÄ™" name="radio select face"/>
+ <radio_group name="edit_radio_group">
+ <radio_item label="Pozycja" name="radio position"/>
+ <radio_item label="Obróć (Ctrl)" name="radio rotate"/>
+ <radio_item label="RozciÄ…gnij (Ctrl-Shift)" name="radio stretch"/>
+ <radio_item label="Wybierz TeksturÄ™" name="radio select face"/>
+ </radio_group>
<check_box label="Edytuj Połączone Części" name="checkbox edit linked parts"/>
<text name="text ruler mode">
Linijka:
</text>
<combo_box name="combobox grid mode">
- <combo_item name="World">
+ <combo_box.item name="World">
Åšwiat
- </combo_item>
- <combo_item name="Local">
+ </combo_box.item>
+ <combo_box.item name="Local">
Lokalna
- </combo_item>
- <combo_item name="Reference">
+ </combo_box.item>
+ <combo_box.item name="Reference">
Względna
- </combo_item>
+ </combo_box.item>
</combo_box>
<check_box label="RozciÄ…gnij 2 Strony" name="checkbox uniform"/>
<check_box label="RozciÄ…gnij TeksturÄ™" name="checkbox stretch textures"/>
@@ -64,23 +70,25 @@
<check_box label="Kopia Åšrodka" name="checkbox copy centers"/>
<check_box label="Kopia Obrotu" name="checkbox copy rotates"/>
<!-- Land panel -->
- <check_box label="Zaznaczanie" name="radio select land"/>
- <check_box label="Niwelowanie" name="radio flatten"/>
- <check_box label="Podnoszenie" name="radio raise"/>
- <check_box label="Obniżanie" name="radio lower"/>
- <check_box label="Wygładzanie" name="radio smooth"/>
- <check_box label="Fałdowanie terenu" name="radio noise"/>
- <check_box label="Cofnięcie modyfikacji" name="radio revert"/>
+ <radio_group name="land_radio_group">
+ <radio_item label="Zaznaczanie" name="radio select land"/>
+ <radio_item label="Niwelowanie" name="radio flatten"/>
+ <radio_item label="Podnoszenie" name="radio raise"/>
+ <radio_item label="Obniżanie" name="radio lower"/>
+ <radio_item label="Wygładzanie" name="radio smooth"/>
+ <radio_item label="Fałdowanie terenu" name="radio noise"/>
+ <radio_item label="Cofnięcie modyfikacji" name="radio revert"/>
+ </radio_group>
<combo_box name="combobox brush size">
- <combo_item name="Small">
+ <combo_box.item name="Small">
Małe
- </combo_item>
- <combo_item name="Medium">
+ </combo_box.item>
+ <combo_box.item name="Medium">
Åšrednie
- </combo_item>
- <combo_item name="Large">
+ </combo_box.item>
+ <combo_box.item name="Large">
Duże
- </combo_item>
+ </combo_box.item>
</combo_box>
<volume_slider name="slider force"/>
<text length="1" name="Strength:" type="string">
@@ -168,27 +176,27 @@
Lewe Kliknięcie:
</text>
<combo_box name="clickaction">
- <combo_item name="Touch/grab(default)">
+ <combo_box.item name="Touch/grab(default)">
Dotknij (domyślne)
- </combo_item>
- <combo_item name="Sitonobject">
+ </combo_box.item>
+ <combo_box.item name="Sitonobject">
Usiądź na Obiekcie
- </combo_item>
- <combo_item name="Buyobject">
+ </combo_box.item>
+ <combo_box.item name="Buyobject">
Kup Obiekt
- </combo_item>
- <combo_item name="Payobject">
+ </combo_box.item>
+ <combo_box.item name="Payobject">
Zapłać Obiektowi
- </combo_item>
- <combo_item name="Open">
+ </combo_box.item>
+ <combo_box.item name="Open">
Otwórz
- </combo_item>
- <combo_item name="Play">
+ </combo_box.item>
+ <combo_box.item name="Play">
Odtwarzaj Media
- </combo_item>
- <combo_item name="Opemmedia">
+ </combo_box.item>
+ <combo_box.item name="Opemmedia">
Otwrórz Media
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="B:">
B:
@@ -273,56 +281,56 @@
Materiał
</text>
<combo_box name="material">
- <combo_item name="Stone">
+ <combo_box.item name="Stone">
Kamień
- </combo_item>
- <combo_item name="Metal">
+ </combo_box.item>
+ <combo_box.item name="Metal">
Metal
- </combo_item>
- <combo_item name="Glass">
+ </combo_box.item>
+ <combo_box.item name="Glass">
Szkło
- </combo_item>
- <combo_item name="Wood">
+ </combo_box.item>
+ <combo_box.item name="Wood">
Drewno
- </combo_item>
- <combo_item name="Flesh">
+ </combo_box.item>
+ <combo_box.item name="Flesh">
Ciało
- </combo_item>
- <combo_item name="Plastic">
+ </combo_box.item>
+ <combo_box.item name="Plastic">
Plastik
- </combo_item>
- <combo_item name="Rubber">
+ </combo_box.item>
+ <combo_box.item name="Rubber">
Guma
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="label basetype">
Rodzaj Bloku Budowalnego
</text>
<combo_box name="comboBaseType">
- <combo_item name="Box">
+ <combo_box.item name="Box">
Klocek
- </combo_item>
- <combo_item name="Cylinder">
+ </combo_box.item>
+ <combo_box.item name="Cylinder">
Walec
- </combo_item>
- <combo_item name="Prism">
+ </combo_box.item>
+ <combo_box.item name="Prism">
Graniastosłup
- </combo_item>
- <combo_item name="Sphere">
+ </combo_box.item>
+ <combo_box.item name="Sphere">
Kula
- </combo_item>
- <combo_item name="Torus">
+ </combo_box.item>
+ <combo_box.item name="Torus">
Torus
- </combo_item>
- <combo_item name="Tube">
+ </combo_box.item>
+ <combo_box.item name="Tube">
Rura
- </combo_item>
- <combo_item name="Ring">
+ </combo_box.item>
+ <combo_box.item name="Ring">
Pierścień
- </combo_item>
- <combo_item name="Sculpted">
+ </combo_box.item>
+ <combo_box.item name="Sculpted">
Skulpty
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="text cut">
Wykrój
@@ -341,18 +349,18 @@
Kształt Wydrążenia
</text>
<combo_box name="hole">
- <combo_item name="Default">
+ <combo_box.item name="Default">
Domyślny
- </combo_item>
- <combo_item name="Circle">
+ </combo_box.item>
+ <combo_box.item name="Circle">
Koło
- </combo_item>
- <combo_item name="Square">
+ </combo_box.item>
+ <combo_box.item name="Square">
Kwadrat
- </combo_item>
- <combo_item name="Triangle">
+ </combo_box.item>
+ <combo_box.item name="Triangle">
Trójkąt
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="text twist">
Skręcenie
@@ -400,21 +408,21 @@
Typ Ścięgna
</text>
<combo_box name="sculpt type control">
- <combo_item name="None">
+ <combo_box.item name="None">
(żadne)
- </combo_item>
- <combo_item name="Sphere">
+ </combo_box.item>
+ <combo_box.item name="Sphere">
Kula
- </combo_item>
- <combo_item name="Torus">
+ </combo_box.item>
+ <combo_box.item name="Torus">
Torus
- </combo_item>
- <combo_item name="Plane">
+ </combo_box.item>
+ <combo_box.item name="Plane">
PÅ‚aczyzna
- </combo_item>
- <combo_item name="Cylinder">
+ </combo_box.item>
+ <combo_box.item name="Cylinder">
Walec
- </combo_item>
+ </combo_box.item>
</combo_box>
</panel>
<!-- Features sub-tab -->
@@ -460,88 +468,88 @@
Mapowanie
</text>
<combo_box name="combobox texgen">
- <combo_item name="Default">
+ <combo_box.item name="Default">
Domyślne
- </combo_item>
- <combo_item name="Planar">
+ </combo_box.item>
+ <combo_box.item name="Planar">
Planarne
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="label shininess">
Połysk
</text>
<combo_box name="combobox shininess">
- <combo_item name="None">
+ <combo_box.item name="None">
Żadny
- </combo_item>
- <combo_item name="Low">
+ </combo_box.item>
+ <combo_box.item name="Low">
Niski
- </combo_item>
- <combo_item name="Medium">
+ </combo_box.item>
+ <combo_box.item name="Medium">
Åšredni
- </combo_item>
- <combo_item name="High">
+ </combo_box.item>
+ <combo_box.item name="High">
Wysoki
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="label bumpiness">
Powierzchnia
</text>
<combo_box name="combobox bumpiness">
- <combo_item name="None">
+ <combo_box.item name="None">
Żadna
- </combo_item>
- <combo_item name="Brightness">
+ </combo_box.item>
+ <combo_box.item name="Brightness">
Najjaśniejsza
- </combo_item>
- <combo_item name="Darkness">
+ </combo_box.item>
+ <combo_box.item name="Darkness">
Najciemniejsza
- </combo_item>
- <combo_item name="woodgrain">
+ </combo_box.item>
+ <combo_box.item name="woodgrain">
Drewniano-ziarnista
- </combo_item>
- <combo_item name="bark">
+ </combo_box.item>
+ <combo_box.item name="bark">
Kory Drzewa
- </combo_item>
- <combo_item name="bricks">
+ </combo_box.item>
+ <combo_box.item name="bricks">
Cegieł
- </combo_item>
- <combo_item name="checker">
+ </combo_box.item>
+ <combo_box.item name="checker">
Planszy Szachowej
- </combo_item>
- <combo_item name="concrete">
+ </combo_box.item>
+ <combo_box.item name="concrete">
Betonu
- </combo_item>
- <combo_item name="crustytile">
+ </combo_box.item>
+ <combo_box.item name="crustytile">
PÅ‚ytki/Kafelki
- </combo_item>
- <combo_item name="cutstone">
+ </combo_box.item>
+ <combo_box.item name="cutstone">
Kamienia
- </combo_item>
- <combo_item name="discs">
+ </combo_box.item>
+ <combo_box.item name="discs">
Dysku CD
- </combo_item>
- <combo_item name="gravel">
+ </combo_box.item>
+ <combo_box.item name="gravel">
Żwiru
- </combo_item>
- <combo_item name="petridish">
+ </combo_box.item>
+ <combo_box.item name="petridish">
Skamieliny
- </combo_item>
- <combo_item name="siding">
+ </combo_box.item>
+ <combo_box.item name="siding">
Sidingu
- </combo_item>
- <combo_item name="stonetile">
+ </combo_box.item>
+ <combo_box.item name="stonetile">
PÅ‚ytki Kamiennej
- </combo_item>
- <combo_item name="stucco">
+ </combo_box.item>
+ <combo_box.item name="stucco">
Stucco
- </combo_item>
- <combo_item name="suction">
+ </combo_box.item>
+ <combo_box.item name="suction">
Suction
- </combo_item>
- <combo_item name="weave">
+ </combo_box.item>
+ <combo_box.item name="weave">
Fali
- </combo_item>
+ </combo_box.item>
</combo_box>
<text name="tex scale">
Ilość powtórzeń
diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml
index 31f3477aeb..f4f5792494 100755
--- a/indra/newview/skins/default/xui/pl/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml
@@ -41,15 +41,15 @@
<check_box label="" name="event_mature_chk" />
<combo_box label="Dostępni Znajomi" name="friend combo" tool_tip="Znajomi na mapie">
- <combo_item name="none_selected">
+ <combo_box.item name="none_selected">
Dostępni Znajomi
- </combo_item>
+ </combo_box.item>
</combo_box>
<combo_box label="Zapisane Miejsca" name="landmark combo"
tool_tip="Zapisane miejsca na mapie">
- <combo_item name="none_selected">
+ <combo_box.item name="none_selected">
Zapisane Miejsca
- </combo_item>
+ </combo_box.item>
</combo_box>
<line_editor label="Szukaj po nazwie regionu" name="location"
tool_tip="Wpisz nazwÄ™ regionu" />
diff --git a/indra/newview/skins/default/xui/pl/panel_login.xml b/indra/newview/skins/default/xui/pl/panel_login.xml
index 08a768d44f..13fcaa25ab 100755
--- a/indra/newview/skins/default/xui/pl/panel_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_login.xml
@@ -18,16 +18,16 @@
<text name="start_location_text">
Miejsce Startu:
</text>
- <combo_box name="start_location_combo">
- <combo_item name="MyHome">
+ <combo_box name="start_location_combo">
+ <combo_box.item name="MyHome">
Mój Start
- </combo_item>
- <combo_item name="MyLastLocation">
+ </combo_box.item>
+ <combo_box.item name="MyLastLocation">
Ostatnie Miejsce
- </combo_item>
- <combo_item name="Typeregionname">
+ </combo_box.item>
+ <combo_box.item name="Typeregionname">
<Wpisz Region>
- </combo_item>
+ </combo_box.item>
</combo_box>
<check_box label="Zapamiętaj Hasło" name="remember_check" />
<button label="Połącz" label_selected="Połącz" name="connect_btn" />
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
index 34b77c8e31..f120af9aaf 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
@@ -10,15 +10,9 @@
</radio_group>
<check_box label="Pokaż Miejsce Startu na Ekranie Logowania" name="show_location_checkbox"/>
<combo_box name="fade_out_combobox">
- <combo_item name="Never">
- Nigdy
- </combo_item>
- <combo_item name="Show Temporarily">
- Tymczasowo
- </combo_item>
- <combo_item name="Always">
- Zawsze
- </combo_item>
+ <combo_box.item name="Never" label="Nigdy" />
+ <combo_box.item name="Show Temporarily" label="Tymczasowo" />
+ <combo_box.item name="Always" label="Zawsze" />
</combo_box>
<check_box label="Używaj Małych Imion Awatarów" name="small_avatar_names_checkbox"/>
<check_box label="Nie Wyświetlaj Mojego Imienia" name="show_my_name_checkbox"/>
@@ -63,47 +57,21 @@
<Wpisz Region>
</string>
<combo_box name="crash_behavior_combobox">
- <combo_item length="1" name="Askbeforesending" type="string">
- Pytaj przed wysłaniem
- </combo_item>
- <combo_item length="1" name="Alwayssend" type="string">
- Zawsze wysyłaj
- </combo_item>
- <combo_item length="1" name="Neversend" type="string">
- Nigdy nie wysyłaj
- </combo_item>
+ <combo_box.item length="1" name="Askbeforesending" type="string" label="Pytaj przed wysłaniem" />
+ <combo_box.item length="1" name="Alwayssend" type="string" label="Zawsze wysyłaj" />
+ <combo_box.item length="1" name="Neversend" type="string" label="Nigdy nie wysyłaj" />
</combo_box>
<combo_box name="language_combobox">
- <combo_item length="1" name="System Default Language" type="string">
- Domyślny
- </combo_item>
- <combo_item length="1" name="English" type="string">
- English (Angielski)
- </combo_item>
- <combo_item length="1" name="Chinese" type="string">
- ä¸æ–‡ (简体) (ChiÅ„ski) - Beta
- </combo_item>
- <combo_item length="1" name="Deutsch(German)" type="string">
- Deutsch (Niemiecki) - Beta
- </combo_item>
- <combo_item length="1" name="French" type="string">
- Français (Francuski) - Beta
- </combo_item>
- <combo_item length="1" name="(Japanese)" type="string">
- 日本語 (Japoński) - Beta
- </combo_item>
- <combo_item length="1" name="(Korean)" type="string">
- í•œêµì–´ (KoreaÅ„ski) - Beta
- </combo_item>
- <combo_item length="1" name="Polish" type="string">
- Polski - Beta
- </combo_item>
- <combo_item length="1" name="Portugese" type="string">
- Portugués (Portugalski) - Beta
- </combo_item>
- <combo_item length="1" name="Spanish" type="string">
- Español (Hiszpański) - Beta
- </combo_item>
+ <combo_box.item length="1" name="System Default Language" type="string" label="Domyślny" />
+ <combo_box.item length="1" name="English" type="string" label="English (Angielski)" />
+ <combo_box.item length="1" name="Chinese" type="string" label="ä¸æ–‡ (简体) (ChiÅ„ski) - Beta" />
+ <combo_box.item length="1" name="Deutsch(German)" type="string" label="Deutsch (Niemiecki) - Beta" />
+ <combo_box.item length="1" name="French" type="string" label="Français (Francuski) - Beta" />
+ <combo_box.item length="1" name="(Japanese)" type="string" label="日本語 (Japoński) - Beta" />
+ <combo_box.item length="1" name="(Korean)" type="string" label="í•œêµì–´ (KoreaÅ„ski) - Beta" />
+ <combo_box.item length="1" name="Polish" type="string" label="Polski - Beta" />
+ <combo_box.item length="1" name="Portugese" type="string" label="Portugués (Portugalski) - Beta" />
+ <combo_box.item length="1" name="Spanish" type="string" label="Español (Hiszpański) - Beta" />
</combo_box>
<check_box label="Język znany publicznie" name="language_is_public" tool_tip="Pozwala obiektom w świecie poznać Twój wybór język."/>
</panel>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
index 406fede4a9..ee63a12bd1 100755
--- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml
@@ -9,21 +9,21 @@
Wymiary Okna:
</text>
<combo_box name="windowsize combo">
- <combo_item type="string" length="1" name="640x480">
+ <combo_box.item type="string" length="1" name="640x480">
640x480
- </combo_item>
- <combo_item type="string" length="1" name="800x600">
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="800x600">
800x600
- </combo_item>
- <combo_item type="string" length="1" name="720x480">
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="720x480">
720x480 (NTSC)
- </combo_item>
- <combo_item type="string" length="1" name="768x576">
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="768x576">
768x576 (PAL)
- </combo_item>
- <combo_item type="string" length="1" name="1024x768">
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="1024x768">
1024x768
- </combo_item>
+ </combo_box.item>
</combo_box>
<text type="string" length="1" name="DisplayResLabel">
Rozdzielczość:
@@ -32,18 +32,18 @@
Proporcje:
</text>
<combo_box name="aspect_ratio" tool_tip="width / height">
- <combo_item type="string" length="1" name="4:3(StandardCRT)">
+ <combo_box.item type="string" length="1" name="4:3(StandardCRT)">
4:3 (Standardowy CRT)
- </combo_item>
- <combo_item type="string" length="1" name="5:4(1280x1024LCD)">
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="5:4(1280x1024LCD)">
5:4 (1280x1024 LCD)
- </combo_item>
- <combo_item type="string" length="1" name="8:5(Widescreen)">
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="8:5(Widescreen)">
8:5 (Panoramiczny)
- </combo_item>
- <combo_item type="string" length="1" name="16:9(Widescreen)">
+ </combo_box.item>
+ <combo_box.item type="string" length="1" name="16:9(Widescreen)">
16:9 (Panoramiczny)
- </combo_item>
+ </combo_box.item>
</combo_box>
<check_box label="Detekcja proporcji" name="aspect_auto_detect" />
<text type="string" length="1" name="HigherText">
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index fa0e34815d..fe0e03a9ad 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_about" title="Sobre o Second Life">
- <text_editor name="credits_editor">
- Second Life é oferecido a você por Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les e muitos outros.
-
- Obrigado aos seguintes residentes por ajudar a garantir para que esta versão seja ainda melhor: (in progress)
-
- 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
- APR Copyright (C) 2000-2004 The Apache Software Foundation
- cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
- DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
- expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
- FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
- GL Copyright (C) 1999-2004 Brian Paul.
- Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
- jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
- jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
- ogg/vorbis Copyright (C) 2001, Xiphophorus
- OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
- SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
- SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
- zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
- google-perftools Copyright (c) 2005, Google Inc.
-
- Todos os direitos reservados. Veja licenças.txt para detalhes.
-
- Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
- Eu tive uma pequena ajuda de meus amigos. --Richard Starkey
- </text_editor>
- <string name="you_are_at">
- Você está em [POSITION]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_about" title="Sobre o Second Life">
+ <text_editor name="credits_editor">
+ Second Life é oferecido a você por Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les e muitos outros.
+
+ Obrigado aos seguintes residentes por ajudar a garantir para que esta versão seja ainda melhor: (in progress)
+
+ 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+ APR Copyright (C) 2000-2004 The Apache Software Foundation
+ cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+ DBus/dbus-glib Copyright (C) 2002, 2003 CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+ expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+ FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+ GL Copyright (C) 1999-2004 Brian Paul.
+ Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+ jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+ jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+ ogg/vorbis Copyright (C) 2001, Xiphophorus
+ OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+ SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+ SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+ zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+ google-perftools Copyright (c) 2005, Google Inc.
+
+ Todos os direitos reservados. Veja licenças.txt para detalhes.
+
+ Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+
+
+ Eu tive uma pequena ajuda de meus amigos. --Richard Starkey
+ </text_editor>
+ <string name="you_are_at">
+ Você está em [POSITION]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index 604b143130..3a715aa01f 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -1,432 +1,432 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterland" title="Sobre o Terreno">
- <tab_container name="landtab">
- <panel label="Geral" name="land_general_panel">
- <text length="1" name="Name:" type="string">
- Nome:
- </text>
- <text length="1" name="Description:" type="string">
- Descrição:
- </text>
- <text length="1" name="Owner:" type="string">
- Proprietário:
- </text>
- <text length="1" name="OwnerText" type="string">
- Leyla Linden
- </text>
- <button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
- <text length="1" name="Group:" type="string">
- Grupo:
- </text>
- <button label="Ajustar..." label_selected="Ajustar..." name="Set..."/>
- <check_box label="Permitir posse para o grupo" name="check deed" tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha"/>
- <button label="Passar..." label_selected="Passar..." name="Deed..." tool_tip="Você só pode delegar esta terra se você for um gerente selecionado pelo grupo."/>
- <check_box label="Proprietário faz contribuição com delegação" name="check contrib" tool_tip="Quando a terra é delegada ao grupo, o proprietário anterior contribui alocando terra suficiente para mantê-la."/>
- <text length="1" name="For Sale:" type="string">
- À Venda:
- </text>
- <text length="1" name="Not for sale." type="string">
- Não está à Venda.
- </text>
- <text length="1" name="For Sale: Price L$[PRICE]." type="string">
- Preço: L$[PRICE].
- </text>
- <button label="Vender Terra..." label_selected="Vender Terra..." name="Sell Land..."/>
- <text length="1" name="For sale to" type="string">
- À venda para: [BUYER]
- </text>
- <text length="1" name="Sell with landowners objects in parcel." type="string">
- À venda (Objetos incluÃdos).
- </text>
- <text length="1" name="Selling with no objects in parcel." type="string">
- À venda (Objetos não IncluÃdos).
- </text>
- <button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno" left="275" name="Cancel Land Sale" width="165"/>
- <text length="1" name="Claimed:" type="string">
- Reclamado:
- </text>
- <text length="1" name="DateClaimText" type="string">
- Ter Ago 15 13:47:25 2006
- </text>
- <text length="1" name="PriceLabel" type="string">
- Ãrea:
- </text>
- <text length="1" name="PriceText" type="string">
- 4048 m².
- </text>
- <text length="1" name="Traffic:" type="string">
- Tráfego:
- </text>
- <text length="1" name="DwellText" type="string">
- 0
- </text>
- <button label="Comprar Terra..." label_selected="Comprar Terra..." left="130" name="Buy Land..." width="125"/>
- <button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..." name="Buy For Group..."/>
- <button label="Comprar Passe..." label_selected="Comprar Passe..." left="130" name="Buy Pass..." tool_tip="Um passe concede a você acesso temporário a esta terra." width="125"/>
- <button label="Abandonar Terra.." label_selected="Abandonar Terra.." name="Abandon Land..."/>
- <button label="Reclamar Terra..." label_selected="Reclamar Terra..." name="Reclaim Land..."/>
- <button label="Venda Linden..." label_selected="Venda Linden..." name="Linden Sale..." tool_tip="A terra precisa ser possuÃda, estar com o conteúdo configurado e não estar pronta para leilão."/>
- <string name="new users only">
- Somente novos usuários
- </string>
- <string name="anyone">
- Qualquer um
- </string>
- <string name="area_text">
- Ãrea
- </string>
- <string name="area_size_text">
- [AREA] m².
- </string>
- <string name="auction_id_text">
- ID do Leilão: [ID]
- </string>
- <string name="need_tier_to_modify">
- Você deve ter sua compra aprovada para modificar este terreno.
- </string>
- <string name="group_owned_text">
- (PossuÃdo pelo Grupo)
- </string>
- <string name="profile_text">
- Perfil...
- </string>
- <string name="info_text">
- Informação...
- </string>
- <string name="public_text">
- (público)
- </string>
- <string name="none_text">
- (nenhum)
- </string>
- <string name="sale_pending_text">
- (Venda Pendente)
- </string>
- <string name="no_selection_text">
- Nenhum lote selecionado.
-Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar seus detalhes.
- </string>
- </panel>
- <panel label="Corretor" name="land_covenant_panel">
- <text length="1" name="covenant_timestamp_text" type="string">
- Última Alteração: Qua, Dez 31 16:00:00 1969
- </text>
- <text length="1" name="region_name_lbl" type="string">
- Região:
- </text>
- <text length="1" name="region_name_text" type="string">
- leyla
- </text>
- <text length="1" name="estate_name_lbl" type="string">
- Propriedade:
- </text>
- <text length="1" name="estate_name_text" type="string">
- mainland
- </text>
- <text length="1" name="estate_owner_lbl" type="string">
- Dono da Propriedade:
- </text>
- <text length="1" name="estate_owner_text" type="string">
- (nenhum)
- </text>
- <text length="1" name="resellable_clause" type="string">
- Terra comprada nesta região não pode ser revendida.
- </text>
- <text length="1" name="changeable_clause" type="string">
- Terra comrpada nesta região não poderá ser compartilhada ou sub-dividida.
- </text>
- <text_editor length="1" name="covenant_editor" type="string">
- Não há corretor para esta Propriedade.
- </text_editor>
- <string name="can_resell">
- Terra comprada nesta região pode ser revendida.
- </string>
- <string name="can_not_resell">
- Terra comprada nesta região não pode ser revendida.
- </string>
- <string name="can_change">
- Terra comprada nesta região pode ser compartilhada ou sub-dividida.
- </string>
- <string name="can_not_change">
- Terra comprada nesta região não pode ser compartilhada ou sub-dividida.
- </string>
- </panel>
- <panel label="Objetos" name="land_objects_panel">
- <text name="parcel_object_bonus">
- Fator de Bonus para Objetos na Região: [BONUS]
- </text>
- <text length="1" name="Simulator primitive usage:" type="string">
- Uso do simulador de primitivas:
- </text>
- <text left="214" name="objects_available" width="230">
- [COUNT] de [MAX] ([AVAILABLE] disponÃveis)
- </text>
- <string name="objects_available_text">
- [COUNT] de [MAX] ([AVAILABLE] disponÃveis)
- </string>
- <string name="objects_deleted_text">
- [COUNT] de [MAX] ([DELETED] serão deletados)
- </string>
- <text length="1" name="Primitives parcel supports:" type="string" width="200">
- Primitivas suportadas pelo lote:
- </text>
- <text left="214" length="1" name="object_contrib_text" type="string" width="152">
- [COUNT]
- </text>
- <text length="1" name="Primitives on parcel:" type="string">
- Primitivas no Lote:
- </text>
- <text left="214" length="1" name="total_objects_text" type="string" width="48">
- [COUNT]
- </text>
- <text left="14" length="1" name="Owned by parcel owner:" type="string" width="180">
- Pertencentes ao dono do lote:
- </text>
- <text left="214" length="1" name="owner_objects_text" type="string" width="48">
- [COUNT]
- </text>
- <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/>
- <button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/>
- <text left="14" length="1" name="Set to group:" type="string" width="180">
- Configurados ao grupo:
- </text>
- <text left="214" length="1" name="group_objects_text" type="string" width="48">
- [COUNT]
- </text>
- <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/>
- <button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." right="-10" tool_tip="Retornar os objetos para seus donos." width="119"/>
- <text left="14" length="1" name="Owned by others:" type="string" width="128">
- Propriedade de Outros:
- </text>
- <text left="214" length="1" name="other_objects_text" type="string" width="48">
- [COUNT]
- </text>
- <button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/>
- <button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/>
- <text left="14" length="1" name="Selected / sat upon:" type="string" width="193">
- Selecionado/Sentado:
- </text>
- <text left="214" length="1" name="selected_objects_text" type="string" width="48">
- [COUNT]
- </text>
- <text left="4" length="1" name="Autoreturn" type="string" width="412">
- Auto-retornar objetos dos outros residentes (minutos,0 para desligado):
- </text>
- <line_editor name="clean other time" right="-6" width="36"/>
- <text length="1" name="Object Owners:" type="string">
- Donos dos Objetos:
- </text>
- <button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh List"/>
- <button label="Retornar objetos..." label_selected="Retornar objetos..." name="Return objects..."/>
- <name_list name="owner list">
- <column label="Tipo" name="type"/>
- <column label="Nome" name="name"/>
- <column label="Contar" name="count"/>
- <column label="Mais recente" name="mostrecent"/>
- </name_list>
- </panel>
- <panel label="Opções" name="land_options_panel">
- <text length="1" name="allow_label" type="string">
- Permitir outros residentes a:
- </text>
- <check_box label="Editar Terreno" name="edit land check" tool_tip="Se ativado, qualquer um pode modificar a forma da sua terra. É melhor deixar esta opção desativada, uma vez que você sempre pode editar seu próprio terreno."/>
- <check_box label="Criar Landmarks" name="check landmark"/>
- <check_box label="Voar" name="check fly" tool_tip="Se ativado, os Residentes podem voar na sua terra. Se desativado, eles podem voar apenas para dentro e por cima de sua terra."/>
- <text length="1" name="allow_label2" type="string">
- Criar Objetos:
- </text>
- <check_box label="Residentes" name="edit objects check"/>
- <check_box label="Grupo" name="edit group objects check"/>
- <text length="1" name="allow_label3" type="string">
- Entrada do Objeto:
- </text>
- <check_box label="Residentes" name="all object entry check"/>
- <check_box label="Grupo" name="group object entry check"/>
- <text length="1" name="allow_label4" type="string">
- Executar Scripts:
- </text>
- <check_box label="Residentes" name="check other scripts"/>
- <check_box label="Grupo" name="check group scripts"/>
- <text length="1" name="land_options_label" type="string">
- Opções de Terra:
- </text>
- <check_box label="Salvo (sem dano)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, desabilitando combate com danos. Se não ativado, o combate com danos é habilitado."/>
- <check_box label="Sem Empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. A ativação dessa opção pode ser útil para prevenir comportamentos desordeiros na sua terra."/>
- <check_box label="Mostra o Lugar na Busca (L$30/semana) sob" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/>
- <combo_box left="276" name="land category" width="146">
- <combo_item name="AnyCategory">
- Qualquer Categoria
- </combo_item>
- <combo_item name="LindenLocation">
- Locação Linden
- </combo_item>
-
- <combo_item name="Arts&Culture">
- Artes e Cultura
- </combo_item>
- <combo_item name="Business">
- Negócios
- </combo_item>
- <combo_item name="Educational">
- Educacional
- </combo_item>
- <combo_item name="Gaming">
- Jogo
- </combo_item>
- <combo_item name="Hangout">
- Lazer
- </combo_item>
- <combo_item name="NewcomerFriendly">
- Amigável para novatos
- </combo_item>
- <combo_item name="Parks&Nature">
- Parques e Natureza
- </combo_item>
- <combo_item name="Residential">
- Residencial
- </combo_item>
- <combo_item name="Shopping">
- Compras
- </combo_item>
- <combo_item name="Other">
- Outros
- </combo_item>
- </combo_box>
- <button label="?" label_selected="?" left="426" name="?"/>
- <check_box name="MatureCheck" />
- <text length="1" name="Snapshot:" type="string">
- Foto:
- </text>
- <texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem"/>
- <text name="landing_point">
- Ponto de Aterrissagem: [LANDING]
- </text>
- <string name="landing_point_none">
- (nenhum)
- </string>
- <button label="Definir" label_selected="Definir" name="Set" tool_tip="Define o ponto de aterrissagem aonde o visitante chega. Define para o ponto em que seu avatar se encontra neste lote."/>
- <button label="Limpar" label_selected="Limpar" name="Clear" tool_tip="Limpar o ponto de aterrissagem."/>
- <text length="1" name="Teleport Routing: " type="string">
- Rota de Tele-transporte:
- </text>
- <combo_box left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote." width="140">
- <combo_item length="1" name="Blocked" type="string">
- Bloqueado
- </combo_item>
- <combo_item length="1" name="LandingPoint" type="string">
- Ponto de Aterrissagem
- </combo_item>
- <combo_item length="1" name="Anywhere" type="string">
- Qualquer lugar
- </combo_item>
- </combo_box>
- <string name="push_restrict_text">
- Sem Empurrar
- </string>
- <string name="push_restrict_region_text">
- Sem Empurrar (Imposição na Região)
- </string>
- </panel>
- <panel label="MÃdia" name="land_media_panel">
- <text name="with media:" width="85">
- Tipo de MÃdia:
- </text>
- <combo_box left="97" name="media type" tool_tip="Especificar se a URL é um filme, uma página web ou outra mÃdia"/>
- <text name="at URL:" width="85">
- URL da MÃdia:
- </text>
- <line_editor left="97" name="media_url"/>
- <button label="Definir..." label_selected="Definir..." name="set_media_url"/>
- <text name="Description:">
- Descrição:
- </text>
- <line_editor left="97" name="url_description" tool_tip="Texto mostrado ao lado do botão reproduzir/carregar"/>
- <text length="1" name="Media texture:" type="string">
- Substituir
-Textura:
- </text>
- <texture_picker label="" left="97" name="media texture" tool_tip="Clique para escolher uma imagem"/>
- <text name="replace_texture_help">
- (Objetos usando esta textura, mostrarão o filme ou
-a página web depois que você clicar na seta de
-reproduzir.)
- </text>
- <text name="Options:">
- Opções de
-MÃdia:
- </text>
- <check_box label="Escala automática" left="97" name="media_auto_scale" tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. A mÃdia pode se tornar lenta e com baixa qualidade visual mas nenhum outro ajuste de textura ou alinhamento será necessário."/>
- <check_box label="MÃdia em Repetição" name="media_loop" tool_tip="Executar a mÃdia repetidamente. Quando a mÃdia terminar a execução, ela reiniciará do começo."/>
- <check_box label="Esconder a URL da MÃdia" left="97" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mÃdia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do lote. Notar que isto não está disponÃvel para tipos HTML."/>
- <check_box label="Esconder a URL de Música" name="hide_music_url" tool_tip="Ativando esta opção, a URL de música se esconderá para visualizadores não autorizados a ver esta informação do lote"/>
- <text left="102" name="media_size" tool_tip="Tamanho para desenhar a mÃdia Web, deixar 0 como padrão." width="115">
- Tamanho da mÃdia:
- </text>
- <spinner left_delta="99" name="media_size_width" tool_tip="Tamanho para desenhar a mÃdia Web, deixar 0 como padrão."/>
- <spinner name="media_size_height" tool_tip="Tamanho para desenhar a mÃdia Web, deixar 0 como padrão."/>
- <text name="pixels">
- pixels
- </text>
- <text name="MusicURL:">
- URL da Música:
- </text>
- <line_editor left="97" name="music_url"/>
- <text name="Sound:">
- Som:
- </text>
- <check_box label="Restringir som espacial a este lote" left="97" name="check sound local"/>
- <text name="Voice settings:">
- Voz:
- </text>
- <radio_group left="97" name="parcel_voice_channel" width="310">
- <radio_item name="Estate">
- Usar o canal espacial da Propriedade
- </radio_item>
- <radio_item name="Private">
- Usar um canal especial privado
- </radio_item>
- <radio_item name="Disabled">
- Desabilitar áudio espacial neste lote
- </radio_item>
- </radio_group>
- </panel>
- <panel label="Acesso" name="land_access_panel">
- <text length="1" name="Limit access to this parcel to:" type="string">
- Acesso a Este Lote
- </text>
- <check_box label="Permitir Acesso Público" name="public_access"/>
- <text name="Only Allow">
- Bloquear Acesso por:
- </text>
- <check_box label="Residentes que não forneceram informações de pagamento para a Linden Lab" name="limit_payment" tool_tip="Banir residentes não identificados."/>
- <check_box label="Residentes que não tiveram a idade de adulto confirmada" name="limit_age_verified" tool_tip="Banir residentes que não tiveram sua idade verificada. Veja support.secondlife.com para maiores informações."/>
- <string name="estate_override">
- Uma ou mais destas opções está definida no nÃvel de propriedade.
- </string>
- <check_box label="Permitir Acesso do Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
- <check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
- <combo_box name="pass_combo">
- <combo_item name="Anyone">
- Qualquer um
- </combo_item>
- <combo_item name="Group">
- Grupo
- </combo_item>
- </combo_box>
- <spinner label="Preço em L$:" name="PriceSpin"/>
- <spinner label="Horas de Acesso:" name="HoursSpin"/>
- <text label="Permitir Sempre" name="AllowedText">
- Residentes Permitidos
- </text>
- <name_list name="AccessList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
- <button label="Adicionar..." label_selected="Adicionar..." name="add_allowed"/>
- <button label="Remover" label_selected="Remover" name="remove_allowed"/>
- <text label="Banir" name="BanCheck">
- Residentes Banidos
- </text>
- <name_list name="BannedList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
- <button label="Adicionar..." label_selected="Adicionar..." name="add_banned"/>
- <button label="Remover" label_selected="Remover" name="remove_banned"/>
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterland" title="Sobre o Terreno">
+ <tab_container name="landtab">
+ <panel label="Geral" name="land_general_panel">
+ <text length="1" name="Name:" type="string">
+ Nome:
+ </text>
+ <text length="1" name="Description:" type="string">
+ Descrição:
+ </text>
+ <text length="1" name="Owner:" type="string">
+ Proprietário:
+ </text>
+ <text length="1" name="OwnerText" type="string">
+ Leyla Linden
+ </text>
+ <button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
+ <text length="1" name="Group:" type="string">
+ Grupo:
+ </text>
+ <button label="Ajustar..." label_selected="Ajustar..." name="Set..."/>
+ <check_box label="Permitir posse para o grupo" name="check deed" tool_tip="O gerente do grupo pode acionar essa terra ao grupo, então esta será mantida pelo gestor da ilha"/>
+ <button label="Passar..." label_selected="Passar..." name="Deed..." tool_tip="Você só pode delegar esta terra se você for um gerente selecionado pelo grupo."/>
+ <check_box label="Proprietário faz contribuição com delegação" name="check contrib" tool_tip="Quando a terra é delegada ao grupo, o proprietário anterior contribui alocando terra suficiente para mantê-la."/>
+ <text length="1" name="For Sale:" type="string">
+ À Venda:
+ </text>
+ <text length="1" name="Not for sale." type="string">
+ Não está à Venda.
+ </text>
+ <text length="1" name="For Sale: Price L$[PRICE]." type="string">
+ Preço: L$[PRICE].
+ </text>
+ <button label="Vender Terra..." label_selected="Vender Terra..." name="Sell Land..."/>
+ <text length="1" name="For sale to" type="string">
+ À venda para: [BUYER]
+ </text>
+ <text length="1" name="Sell with landowners objects in parcel." type="string">
+ À venda (Objetos incluÃdos).
+ </text>
+ <text length="1" name="Selling with no objects in parcel." type="string">
+ À venda (Objetos não IncluÃdos).
+ </text>
+ <button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno" left="275" name="Cancel Land Sale" width="165"/>
+ <text length="1" name="Claimed:" type="string">
+ Reclamado:
+ </text>
+ <text length="1" name="DateClaimText" type="string">
+ Ter Ago 15 13:47:25 2006
+ </text>
+ <text length="1" name="PriceLabel" type="string">
+ Ãrea:
+ </text>
+ <text length="1" name="PriceText" type="string">
+ 4048 m².
+ </text>
+ <text length="1" name="Traffic:" type="string">
+ Tráfego:
+ </text>
+ <text length="1" name="DwellText" type="string">
+ 0
+ </text>
+ <button label="Comprar Terra..." label_selected="Comprar Terra..." left="130" name="Buy Land..." width="125"/>
+ <button label="Comprar para o Grupo..." label_selected="Comprar para o Grupo..." name="Buy For Group..."/>
+ <button label="Comprar Passe..." label_selected="Comprar Passe..." left="130" name="Buy Pass..." tool_tip="Um passe concede a você acesso temporário a esta terra." width="125"/>
+ <button label="Abandonar Terra.." label_selected="Abandonar Terra.." name="Abandon Land..."/>
+ <button label="Reclamar Terra..." label_selected="Reclamar Terra..." name="Reclaim Land..."/>
+ <button label="Venda Linden..." label_selected="Venda Linden..." name="Linden Sale..." tool_tip="A terra precisa ser possuÃda, estar com o conteúdo configurado e não estar pronta para leilão."/>
+ <string name="new users only">
+ Somente novos usuários
+ </string>
+ <string name="anyone">
+ Qualquer um
+ </string>
+ <string name="area_text">
+ Ãrea
+ </string>
+ <string name="area_size_text">
+ [AREA] m².
+ </string>
+ <string name="auction_id_text">
+ ID do Leilão: [ID]
+ </string>
+ <string name="need_tier_to_modify">
+ Você deve ter sua compra aprovada para modificar este terreno.
+ </string>
+ <string name="group_owned_text">
+ (PossuÃdo pelo Grupo)
+ </string>
+ <string name="profile_text">
+ Perfil...
+ </string>
+ <string name="info_text">
+ Informação...
+ </string>
+ <string name="public_text">
+ (público)
+ </string>
+ <string name="none_text">
+ (nenhum)
+ </string>
+ <string name="sale_pending_text">
+ (Venda Pendente)
+ </string>
+ <string name="no_selection_text">
+ Nenhum lote selecionado.
+Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar seus detalhes.
+ </string>
+ </panel>
+ <panel label="Corretor" name="land_covenant_panel">
+ <text length="1" name="covenant_timestamp_text" type="string">
+ Última Alteração: Qua, Dez 31 16:00:00 1969
+ </text>
+ <text length="1" name="region_name_lbl" type="string">
+ Região:
+ </text>
+ <text length="1" name="region_name_text" type="string">
+ leyla
+ </text>
+ <text length="1" name="estate_name_lbl" type="string">
+ Propriedade:
+ </text>
+ <text length="1" name="estate_name_text" type="string">
+ mainland
+ </text>
+ <text length="1" name="estate_owner_lbl" type="string">
+ Dono da Propriedade:
+ </text>
+ <text length="1" name="estate_owner_text" type="string">
+ (nenhum)
+ </text>
+ <text length="1" name="resellable_clause" type="string">
+ Terra comprada nesta região não pode ser revendida.
+ </text>
+ <text length="1" name="changeable_clause" type="string">
+ Terra comrpada nesta região não poderá ser compartilhada ou sub-dividida.
+ </text>
+ <text_editor length="1" name="covenant_editor" type="string">
+ Não há corretor para esta Propriedade.
+ </text_editor>
+ <string name="can_resell">
+ Terra comprada nesta região pode ser revendida.
+ </string>
+ <string name="can_not_resell">
+ Terra comprada nesta região não pode ser revendida.
+ </string>
+ <string name="can_change">
+ Terra comprada nesta região pode ser compartilhada ou sub-dividida.
+ </string>
+ <string name="can_not_change">
+ Terra comprada nesta região não pode ser compartilhada ou sub-dividida.
+ </string>
+ </panel>
+ <panel label="Objetos" name="land_objects_panel">
+ <text name="parcel_object_bonus">
+ Fator de Bonus para Objetos na Região: [BONUS]
+ </text>
+ <text length="1" name="Simulator primitive usage:" type="string">
+ Uso do simulador de primitivas:
+ </text>
+ <text left="214" name="objects_available" width="230">
+ [COUNT] de [MAX] ([AVAILABLE] disponÃveis)
+ </text>
+ <string name="objects_available_text">
+ [COUNT] de [MAX] ([AVAILABLE] disponÃveis)
+ </string>
+ <string name="objects_deleted_text">
+ [COUNT] de [MAX] ([DELETED] serão deletados)
+ </string>
+ <text length="1" name="Primitives parcel supports:" type="string" width="200">
+ Primitivas suportadas pelo lote:
+ </text>
+ <text left="214" length="1" name="object_contrib_text" type="string" width="152">
+ [COUNT]
+ </text>
+ <text length="1" name="Primitives on parcel:" type="string">
+ Primitivas no Lote:
+ </text>
+ <text left="214" length="1" name="total_objects_text" type="string" width="48">
+ [COUNT]
+ </text>
+ <text left="14" length="1" name="Owned by parcel owner:" type="string" width="180">
+ Pertencentes ao dono do lote:
+ </text>
+ <text left="214" length="1" name="owner_objects_text" type="string" width="48">
+ [COUNT]
+ </text>
+ <button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-135" width="60"/>
+ <button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/>
+ <text left="14" length="1" name="Set to group:" type="string" width="180">
+ Configurados ao grupo:
+ </text>
+ <text left="214" length="1" name="group_objects_text" type="string" width="48">
+ [COUNT]
+ </text>
+ <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/>
+ <button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." right="-10" tool_tip="Retornar os objetos para seus donos." width="119"/>
+ <text left="14" length="1" name="Owned by others:" type="string" width="128">
+ Propriedade de Outros:
+ </text>
+ <text left="214" length="1" name="other_objects_text" type="string" width="48">
+ [COUNT]
+ </text>
+ <button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-135" width="60"/>
+ <button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." right="-10" tool_tip="Retornar os objetos aos seus donos." width="119"/>
+ <text left="14" length="1" name="Selected / sat upon:" type="string" width="193">
+ Selecionado/Sentado:
+ </text>
+ <text left="214" length="1" name="selected_objects_text" type="string" width="48">
+ [COUNT]
+ </text>
+ <text left="4" length="1" name="Autoreturn" type="string" width="412">
+ Auto-retornar objetos dos outros residentes (minutos,0 para desligado):
+ </text>
+ <line_editor name="clean other time" right="-6" width="36"/>
+ <text length="1" name="Object Owners:" type="string">
+ Donos dos Objetos:
+ </text>
+ <button label="Atualizar Lista" label_selected="Atualizar Lista" name="Refresh List"/>
+ <button label="Retornar objetos..." label_selected="Retornar objetos..." name="Return objects..."/>
+ <name_list name="owner list">
+ <column label="Tipo" name="type"/>
+ <column label="Nome" name="name"/>
+ <column label="Contar" name="count"/>
+ <column label="Mais recente" name="mostrecent"/>
+ </name_list>
+ </panel>
+ <panel label="Opções" name="land_options_panel">
+ <text length="1" name="allow_label" type="string">
+ Permitir outros residentes a:
+ </text>
+ <check_box label="Editar Terreno" name="edit land check" tool_tip="Se ativado, qualquer um pode modificar a forma da sua terra. É melhor deixar esta opção desativada, uma vez que você sempre pode editar seu próprio terreno."/>
+ <check_box label="Criar Landmarks" name="check landmark"/>
+ <check_box label="Voar" name="check fly" tool_tip="Se ativado, os Residentes podem voar na sua terra. Se desativado, eles podem voar apenas para dentro e por cima de sua terra."/>
+ <text length="1" name="allow_label2" type="string">
+ Criar Objetos:
+ </text>
+ <check_box label="Residentes" name="edit objects check"/>
+ <check_box label="Grupo" name="edit group objects check"/>
+ <text length="1" name="allow_label3" type="string">
+ Entrada do Objeto:
+ </text>
+ <check_box label="Residentes" name="all object entry check"/>
+ <check_box label="Grupo" name="group object entry check"/>
+ <text length="1" name="allow_label4" type="string">
+ Executar Scripts:
+ </text>
+ <check_box label="Residentes" name="check other scripts"/>
+ <check_box label="Grupo" name="check group scripts"/>
+ <text length="1" name="land_options_label" type="string">
+ Opções de Terra:
+ </text>
+ <check_box label="Salvo (sem dano)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, desabilitando combate com danos. Se não ativado, o combate com danos é habilitado."/>
+ <check_box label="Sem Empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. A ativação dessa opção pode ser útil para prevenir comportamentos desordeiros na sua terra."/>
+ <check_box label="Mostra o Lugar na Busca (L$30/semana) sob" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/>
+ <combo_box left="276" name="land category" width="146">
+ <combo_item name="AnyCategory">
+ Qualquer Categoria
+ </combo_item>
+ <combo_item name="LindenLocation">
+ Locação Linden
+ </combo_item>
+
+ <combo_item name="Arts&Culture">
+ Artes e Cultura
+ </combo_item>
+ <combo_item name="Business">
+ Negócios
+ </combo_item>
+ <combo_item name="Educational">
+ Educacional
+ </combo_item>
+ <combo_item name="Gaming">
+ Jogo
+ </combo_item>
+ <combo_item name="Hangout">
+ Lazer
+ </combo_item>
+ <combo_item name="NewcomerFriendly">
+ Amigável para novatos
+ </combo_item>
+ <combo_item name="Parks&Nature">
+ Parques e Natureza
+ </combo_item>
+ <combo_item name="Residential">
+ Residencial
+ </combo_item>
+ <combo_item name="Shopping">
+ Compras
+ </combo_item>
+ <combo_item name="Other">
+ Outros
+ </combo_item>
+ </combo_box>
+ <button label="?" label_selected="?" left="426" name="?"/>
+ <check_box name="MatureCheck" />
+ <text length="1" name="Snapshot:" type="string">
+ Foto:
+ </text>
+ <texture_picker label="" name="snapshot_ctrl" tool_tip="Clique para escolher uma imagem"/>
+ <text name="landing_point">
+ Ponto de Aterrissagem: [LANDING]
+ </text>
+ <string name="landing_point_none">
+ (nenhum)
+ </string>
+ <button label="Definir" label_selected="Definir" name="Set" tool_tip="Define o ponto de aterrissagem aonde o visitante chega. Define para o ponto em que seu avatar se encontra neste lote."/>
+ <button label="Limpar" label_selected="Limpar" name="Clear" tool_tip="Limpar o ponto de aterrissagem."/>
+ <text length="1" name="Teleport Routing: " type="string">
+ Rota de Tele-transporte:
+ </text>
+ <combo_box left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote." width="140">
+ <combo_item length="1" name="Blocked" type="string">
+ Bloqueado
+ </combo_item>
+ <combo_item length="1" name="LandingPoint" type="string">
+ Ponto de Aterrissagem
+ </combo_item>
+ <combo_item length="1" name="Anywhere" type="string">
+ Qualquer lugar
+ </combo_item>
+ </combo_box>
+ <string name="push_restrict_text">
+ Sem Empurrar
+ </string>
+ <string name="push_restrict_region_text">
+ Sem Empurrar (Imposição na Região)
+ </string>
+ </panel>
+ <panel label="MÃdia" name="land_media_panel">
+ <text name="with media:" width="85">
+ Tipo de MÃdia:
+ </text>
+ <combo_box left="97" name="media type" tool_tip="Especificar se a URL é um filme, uma página web ou outra mÃdia"/>
+ <text name="at URL:" width="85">
+ URL da MÃdia:
+ </text>
+ <line_editor left="97" name="media_url"/>
+ <button label="Definir..." label_selected="Definir..." name="set_media_url"/>
+ <text name="Description:">
+ Descrição:
+ </text>
+ <line_editor left="97" name="url_description" tool_tip="Texto mostrado ao lado do botão reproduzir/carregar"/>
+ <text length="1" name="Media texture:" type="string">
+ Substituir
+Textura:
+ </text>
+ <texture_picker label="" left="97" name="media texture" tool_tip="Clique para escolher uma imagem"/>
+ <text name="replace_texture_help">
+ (Objetos usando esta textura, mostrarão o filme ou
+a página web depois que você clicar na seta de
+reproduzir.)
+ </text>
+ <text name="Options:">
+ Opções de
+MÃdia:
+ </text>
+ <check_box label="Escala automática" left="97" name="media_auto_scale" tool_tip="Marcando esta opção o conteúdo se ajustará ao lote automaticamente. A mÃdia pode se tornar lenta e com baixa qualidade visual mas nenhum outro ajuste de textura ou alinhamento será necessário."/>
+ <check_box label="MÃdia em Repetição" name="media_loop" tool_tip="Executar a mÃdia repetidamente. Quando a mÃdia terminar a execução, ela reiniciará do começo."/>
+ <check_box label="Esconder a URL da MÃdia" left="97" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mÃdia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do lote. Notar que isto não está disponÃvel para tipos HTML."/>
+ <check_box label="Esconder a URL de Música" name="hide_music_url" tool_tip="Ativando esta opção, a URL de música se esconderá para visualizadores não autorizados a ver esta informação do lote"/>
+ <text left="102" name="media_size" tool_tip="Tamanho para desenhar a mÃdia Web, deixar 0 como padrão." width="115">
+ Tamanho da mÃdia:
+ </text>
+ <spinner left_delta="99" name="media_size_width" tool_tip="Tamanho para desenhar a mÃdia Web, deixar 0 como padrão."/>
+ <spinner name="media_size_height" tool_tip="Tamanho para desenhar a mÃdia Web, deixar 0 como padrão."/>
+ <text name="pixels">
+ pixels
+ </text>
+ <text name="MusicURL:">
+ URL da Música:
+ </text>
+ <line_editor left="97" name="music_url"/>
+ <text name="Sound:">
+ Som:
+ </text>
+ <check_box label="Restringir som espacial a este lote" left="97" name="check sound local"/>
+ <text name="Voice settings:">
+ Voz:
+ </text>
+ <radio_group left="97" name="parcel_voice_channel" width="310">
+ <radio_item name="Estate">
+ Usar o canal espacial da Propriedade
+ </radio_item>
+ <radio_item name="Private">
+ Usar um canal especial privado
+ </radio_item>
+ <radio_item name="Disabled">
+ Desabilitar áudio espacial neste lote
+ </radio_item>
+ </radio_group>
+ </panel>
+ <panel label="Acesso" name="land_access_panel">
+ <text length="1" name="Limit access to this parcel to:" type="string">
+ Acesso a Este Lote
+ </text>
+ <check_box label="Permitir Acesso Público" name="public_access"/>
+ <text name="Only Allow">
+ Bloquear Acesso por:
+ </text>
+ <check_box label="Residentes que não forneceram informações de pagamento para a Linden Lab" name="limit_payment" tool_tip="Banir residentes não identificados."/>
+ <check_box label="Residentes que não tiveram a idade de adulto confirmada" name="limit_age_verified" tool_tip="Banir residentes que não tiveram sua idade verificada. Veja support.secondlife.com para maiores informações."/>
+ <string name="estate_override">
+ Uma ou mais destas opções está definida no nÃvel de propriedade.
+ </string>
+ <check_box label="Permitir Acesso do Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
+ <check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
+ <combo_box name="pass_combo">
+ <combo_item name="Anyone">
+ Qualquer um
+ </combo_item>
+ <combo_item name="Group">
+ Grupo
+ </combo_item>
+ </combo_box>
+ <spinner label="Preço em L$:" name="PriceSpin"/>
+ <spinner label="Horas de Acesso:" name="HoursSpin"/>
+ <text label="Permitir Sempre" name="AllowedText">
+ Residentes Permitidos
+ </text>
+ <name_list name="AccessList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
+ <button label="Adicionar..." label_selected="Adicionar..." name="add_allowed"/>
+ <button label="Remover" label_selected="Remover" name="remove_allowed"/>
+ <text label="Banir" name="BanCheck">
+ Residentes Banidos
+ </text>
+ <name_list name="BannedList" tool_tip="([LISTED] listados, [MAX] máximo)"/>
+ <button label="Adicionar..." label_selected="Adicionar..." name="add_banned"/>
+ <button label="Remover" label_selected="Remover" name="remove_banned"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
index 989e5f9093..405a6f28a4 100644
--- a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
@@ -1,161 +1,161 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
- <text name="name_label">
- Nome:
- </text>
- <text name="description_label">
- Descrição:
- </text>
- <spinner label="Prioridade" name="priority" tool_tip="Controla quais animações podem se sobrepor a esta animação."/>
- <check_box label="Loop" name="loop_check" tool_tip="Executa a animação repetidamente."/>
- <spinner label="Dentro(%)" name="loop_in_point" tool_tip="Ajusta o ponto da animação onde a repetição começa."/>
- <spinner label="Fora(%)" name="loop_out_point" tool_tip="Ajusta o ponto da animação onde a repetição termina."/>
- <text name="hand_label">
- Pose de Mão
- </text>
- <combo_box label="" name="hand_pose_combo" tool_tip="Controla o que as mãos fazem durante a animação">
- <combo_item name="Spread">
- Espreguiçar
- </combo_item>
- <combo_item name="Relaxed">
- Relaxado
- </combo_item>
- <combo_item name="PointBoth">
- Apontar Ambos
- </combo_item>
- <combo_item name="Fist">
- Punho
- </combo_item>
- <combo_item name="RelaxedLeft">
- Relaxado para Esquerda
- </combo_item>
- <combo_item name="PointLeft">
- Apontar à Esquerda
- </combo_item>
- <combo_item name="FistLeft">
- Punho Esquerdo
- </combo_item>
- <combo_item name="RelaxedRight">
- Relaxado para Direita
- </combo_item>
- <combo_item name="PointRight">
- Apontar à Direita
- </combo_item>
- <combo_item name="FistRight">
- Punho Direito
- </combo_item>
- <combo_item name="SaluteRight">
- Saudar à Direita
- </combo_item>
- <combo_item name="Typing">
- Digitando
- </combo_item>
- <combo_item name="PeaceRight">
- PacÃfico à Direita
- </combo_item>
- </combo_box>
- <text name="emote_label">
- Expressão
- </text>
- <combo_box label="" name="emote_combo" tool_tip="Controla o que a face faz durante a animação.">
- <combo_item name="[None]">
- [None]
- </combo_item>
- <combo_item name="Aaaaah">
- Aaaaah
- </combo_item>
- <combo_item name="Afraid">
- Temeroso
- </combo_item>
- <combo_item name="Angry">
- Raivoso
- </combo_item>
- <combo_item name="BigSmile">
- Sorrisão
- </combo_item>
- <combo_item name="Bored">
- Entediado
- </combo_item>
- <combo_item name="Cry">
- Chorar
- </combo_item>
- <combo_item name="Disdain">
- Desprezar
- </combo_item>
- <combo_item name="Embarrassed">
- Envergonhado
- </combo_item>
- <combo_item name="Frown">
- Franzir a testa
- </combo_item>
- <combo_item name="Kiss">
- Beijar
- </combo_item>
- <combo_item name="Laugh">
- Rir
- </combo_item>
- <combo_item name="Plllppt">
- Plllppt
- </combo_item>
- <combo_item name="Repulsed">
- Enojado
- </combo_item>
- <combo_item name="Sad">
- Triste
- </combo_item>
- <combo_item name="Shrug">
- Indiferença
- </combo_item>
- <combo_item name="Smile">
- Sorriso
- </combo_item>
- <combo_item name="Surprise">
- Surpreso
- </combo_item>
- <combo_item name="Wink">
- Piscar
- </combo_item>
- <combo_item name="Worry">
- Preocupado
- </combo_item>
- </combo_box>
- <text name="preview_label">
- Prever enquanto
- </text>
- <combo_box label="" name="preview_base_anim" tool_tip="Use isto para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
- <combo_item name="Standing">
- Parado
- </combo_item>
- <combo_item name="Walking">
- Andando
- </combo_item>
- <combo_item name="Sitting">
- Sentando
- </combo_item>
- <combo_item name="Flying">
- Voando
- </combo_item>
- </combo_box>
- <spinner label="Facilitar a entrada (sec)" name="ease_in_time" tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem."/>
- <spinner label="Facilitar a saÃda (sec)" name="ease_out_time" tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem."/>
- <button label="" name="play_btn" tool_tip="Executa/pausa sua animação."/>
- <button label="" name="stop_btn" tool_tip="Interrompe a execução da animação."/>
- <text name="bad_animation_text">
- Incapaz de ler o arquivo de animação. Nós recomendamos exportar arquivos BVH do Poser 4.
- </text>
- <button label="Cancelar" name="cancel_btn"/>
- <button label="Carregar (L$[AMOUNT])" name="ok_btn"/>
- <string name="failed_to_initialize">
- Não foi possÃvel iniciar o movimento
- </string>
- <string name="anim_too_long">
- O arquivo de animação tem [LENGTH] segundos de duração.
-
-A duração máxima de animação permitida é de [MAX_LENGTH] segundos.
- </string>
- <string name="failed_file_read">
- Não foi possÃvel ler o arquivo de animação.
-
-[STATUS]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Animation Preview" title="">
+ <text name="name_label">
+ Nome:
+ </text>
+ <text name="description_label">
+ Descrição:
+ </text>
+ <spinner label="Prioridade" name="priority" tool_tip="Controla quais animações podem se sobrepor a esta animação."/>
+ <check_box label="Loop" name="loop_check" tool_tip="Executa a animação repetidamente."/>
+ <spinner label="Dentro(%)" name="loop_in_point" tool_tip="Ajusta o ponto da animação onde a repetição começa."/>
+ <spinner label="Fora(%)" name="loop_out_point" tool_tip="Ajusta o ponto da animação onde a repetição termina."/>
+ <text name="hand_label">
+ Pose de Mão
+ </text>
+ <combo_box label="" name="hand_pose_combo" tool_tip="Controla o que as mãos fazem durante a animação">
+ <combo_box.item name="Spread">
+ Espreguiçar
+ </combo_box.item>
+ <combo_box.item name="Relaxed">
+ Relaxado
+ </combo_box.item>
+ <combo_box.item name="PointBoth">
+ Apontar Ambos
+ </combo_box.item>
+ <combo_box.item name="Fist">
+ Punho
+ </combo_box.item>
+ <combo_box.item name="RelaxedLeft">
+ Relaxado para Esquerda
+ </combo_box.item>
+ <combo_box.item name="PointLeft">
+ Apontar à Esquerda
+ </combo_box.item>
+ <combo_box.item name="FistLeft">
+ Punho Esquerdo
+ </combo_box.item>
+ <combo_box.item name="RelaxedRight">
+ Relaxado para Direita
+ </combo_box.item>
+ <combo_box.item name="PointRight">
+ Apontar à Direita
+ </combo_box.item>
+ <combo_box.item name="FistRight">
+ Punho Direito
+ </combo_box.item>
+ <combo_box.item name="SaluteRight">
+ Saudar à Direita
+ </combo_box.item>
+ <combo_box.item name="Typing">
+ Digitando
+ </combo_box.item>
+ <combo_box.item name="PeaceRight">
+ PacÃfico à Direita
+ </combo_box.item>
+ </combo_box>
+ <text name="emote_label">
+ Expressão
+ </text>
+ <combo_box label="" name="emote_combo" tool_tip="Controla o que a face faz durante a animação.">
+ <combo_box.item name="[None]">
+ [None]
+ </combo_box.item>
+ <combo_box.item name="Aaaaah">
+ Aaaaah
+ </combo_box.item>
+ <combo_box.item name="Afraid">
+ Temeroso
+ </combo_box.item>
+ <combo_box.item name="Angry">
+ Raivoso
+ </combo_box.item>
+ <combo_box.item name="BigSmile">
+ Sorrisão
+ </combo_box.item>
+ <combo_box.item name="Bored">
+ Entediado
+ </combo_box.item>
+ <combo_box.item name="Cry">
+ Chorar
+ </combo_box.item>
+ <combo_box.item name="Disdain">
+ Desprezar
+ </combo_box.item>
+ <combo_box.item name="Embarrassed">
+ Envergonhado
+ </combo_box.item>
+ <combo_box.item name="Frown">
+ Franzir a testa
+ </combo_box.item>
+ <combo_box.item name="Kiss">
+ Beijar
+ </combo_box.item>
+ <combo_box.item name="Laugh">
+ Rir
+ </combo_box.item>
+ <combo_box.item name="Plllppt">
+ Plllppt
+ </combo_box.item>
+ <combo_box.item name="Repulsed">
+ Enojado
+ </combo_box.item>
+ <combo_box.item name="Sad">
+ Triste
+ </combo_box.item>
+ <combo_box.item name="Shrug">
+ Indiferença
+ </combo_box.item>
+ <combo_box.item name="Smile">
+ Sorriso
+ </combo_box.item>
+ <combo_box.item name="Surprise">
+ Surpreso
+ </combo_box.item>
+ <combo_box.item name="Wink">
+ Piscar
+ </combo_box.item>
+ <combo_box.item name="Worry">
+ Preocupado
+ </combo_box.item>
+ </combo_box>
+ <text name="preview_label">
+ Prever enquanto
+ </text>
+ <combo_box label="" name="preview_base_anim" tool_tip="Use isto para testar o comportamento de sua animação enquanto seu avatar executa ações comuns.">
+ <combo_box.item name="Standing">
+ Parado
+ </combo_box.item>
+ <combo_box.item name="Walking">
+ Andando
+ </combo_box.item>
+ <combo_box.item name="Sitting">
+ Sentando
+ </combo_box.item>
+ <combo_box.item name="Flying">
+ Voando
+ </combo_box.item>
+ </combo_box>
+ <spinner label="Facilitar a entrada (sec)" name="ease_in_time" tool_tip="Quantidade de tempo (em segundos) para que as animações se mesclem."/>
+ <spinner label="Facilitar a saÃda (sec)" name="ease_out_time" tool_tip="Quantidade de tempo (em segundos) para que a animações se mesclem."/>
+ <button label="" name="play_btn" tool_tip="Executa/pausa sua animação."/>
+ <button label="" name="stop_btn" tool_tip="Interrompe a execução da animação."/>
+ <text name="bad_animation_text">
+ Incapaz de ler o arquivo de animação. Nós recomendamos exportar arquivos BVH do Poser 4.
+ </text>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Carregar (L$[AMOUNT])" name="ok_btn"/>
+ <string name="failed_to_initialize">
+ Não foi possÃvel iniciar o movimento
+ </string>
+ <string name="anim_too_long">
+ O arquivo de animação tem [LENGTH] segundos de duração.
+
+A duração máxima de animação permitida é de [MAX_LENGTH] segundos.
+ </string>
+ <string name="failed_file_read">
+ Não foi possÃvel ler o arquivo de animação.
+
+[STATUS]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_auction.xml b/indra/newview/skins/default/xui/pt/floater_auction.xml
index 9a90e3955c..48e0b92400 100644
--- a/indra/newview/skins/default/xui/pt/floater_auction.xml
+++ b/indra/newview/skins/default/xui/pt/floater_auction.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_auction" title="Iniciar a venda de terrenos da Linden">
- <check_box label="Incluir marcador de seleção amarelo" name="fence_check"/>
- <button label="Foto" label_selected="Foto" name="snapshot_btn"/>
- <button label="OK" label_selected="OK" name="ok_btn"/>
- <text name="already for sale">
- Você não pode leiloar terrenos que já estão configurados para venda.
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_auction" title="Iniciar a venda de terrenos da Linden">
+ <check_box label="Incluir marcador de seleção amarelo" name="fence_check"/>
+ <button label="Foto" label_selected="Foto" name="snapshot_btn"/>
+ <button label="OK" label_selected="OK" name="ok_btn"/>
+ <text name="already for sale">
+ Você não pode leiloar terrenos que já estão configurados para venda.
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
index 97f8e23a46..23b0b86675 100644
--- a/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatarpicker" title="Escolha o Residente">
- <text name="instruct_search_resident_name">
- Digite parte do nome do residente:
- </text>
- <button label="Encontrar" label_selected="Encontrar" name="Find"/>
- <text name="Or select their calling card:">
- Ou selecione um cartão de visita:
- </text>
- <button label="Fechar" label_selected="Fechar" name="Close"/>
- <button label="Selecionar" label_selected="Selecionar" name="Select"/>
- <string name="NotFound">
- '[TEXT]' não encontrado
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarpicker" title="Escolha o Residente">
+ <text name="instruct_search_resident_name">
+ Digite parte do nome do residente:
+ </text>
+ <button label="Encontrar" label_selected="Encontrar" name="Find"/>
+ <text name="Or select their calling card:">
+ Ou selecione um cartão de visita:
+ </text>
+ <button label="Fechar" label_selected="Fechar" name="Close"/>
+ <button label="Selecionar" label_selected="Selecionar" name="Select"/>
+ <string name="NotFound">
+ '[TEXT]' não encontrado
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
index 94b0719053..db0023d748 100644
--- a/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/pt/floater_avatar_textures.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatar_texture_debug" title="Texturas do Avatar">
- <text name="baked_label">
- Texturas sobrepostas
- </text>
- <text name="composite_label">
- Texturas compostas
- </text>
- <texture_picker label="Cabeça" name="baked_head"/>
- <texture_picker label="Maquiagem" name="head_bodypaint"/>
- <texture_picker label="Cabelo" name="hair"/>
- <button label="Tombar" label_selected="Tombar" name="Dump"/>
- <texture_picker label="Olhos" name="baked_eyes"/>
- <texture_picker label="Olho" name="eye_texture"/>
- <texture_picker label="Parte de cima" name="baked_upper_body"/>
- <texture_picker label="Tatuagem para partes de cima" name="upper_bodypaint"/>
- <texture_picker label="Camiseta" name="undershirt"/>
- <texture_picker label="Luvas" name="gloves"/>
- <texture_picker label="Camisa" name="shirt"/>
- <texture_picker label="Jaqueta" name="upper_jacket"/>
- <texture_picker label="Parte de baixo" name="baked_lower_body"/>
- <texture_picker label="Tatuagem para partes de baixo" name="lower_bodypaint"/>
- <texture_picker label="Roupas de baixo" name="underpants"/>
- <texture_picker label="Meias" name="socks"/>
- <texture_picker label="Calçados" name="shoes"/>
- <texture_picker label="Calças" name="pants"/>
- <texture_picker label="Jaqueta" name="jacket"/>
- <texture_picker label="Saia" name="baked_skirt"/>
- <texture_picker label="Saia" name="skirt_texture"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatar_texture_debug" title="Texturas do Avatar">
+ <text name="baked_label">
+ Texturas sobrepostas
+ </text>
+ <text name="composite_label">
+ Texturas compostas
+ </text>
+ <texture_picker label="Cabeça" name="baked_head"/>
+ <texture_picker label="Maquiagem" name="head_bodypaint"/>
+ <texture_picker label="Cabelo" name="hair"/>
+ <button label="Tombar" label_selected="Tombar" name="Dump"/>
+ <texture_picker label="Olhos" name="baked_eyes"/>
+ <texture_picker label="Olho" name="eye_texture"/>
+ <texture_picker label="Parte de cima" name="baked_upper_body"/>
+ <texture_picker label="Tatuagem para partes de cima" name="upper_bodypaint"/>
+ <texture_picker label="Camiseta" name="undershirt"/>
+ <texture_picker label="Luvas" name="gloves"/>
+ <texture_picker label="Camisa" name="shirt"/>
+ <texture_picker label="Jaqueta" name="upper_jacket"/>
+ <texture_picker label="Parte de baixo" name="baked_lower_body"/>
+ <texture_picker label="Tatuagem para partes de baixo" name="lower_bodypaint"/>
+ <texture_picker label="Roupas de baixo" name="underpants"/>
+ <texture_picker label="Meias" name="socks"/>
+ <texture_picker label="Calçados" name="shoes"/>
+ <texture_picker label="Calças" name="pants"/>
+ <texture_picker label="Jaqueta" name="jacket"/>
+ <texture_picker label="Saia" name="baked_skirt"/>
+ <texture_picker label="Saia" name="skirt_texture"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_beacons.xml b/indra/newview/skins/default/xui/pt/floater_beacons.xml
index e41bdc6635..edd1e08094 100644
--- a/indra/newview/skins/default/xui/pt/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/pt/floater_beacons.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="Balizas">
- <panel name="beacons_panel">
- <check_box label="Objetos programados com toque apenas" name="touch_only"/>
- <check_box label="Objetos programados" name="scripted"/>
- <check_box label="Objetos fÃsicos" name="physical"/>
- <check_box label="Fontes de Som" name="sounds"/>
- <check_box label="Fontes de PartÃculas" name="particles"/>
- <check_box label="Renderização de Highlights" name="highlights"/>
- <check_box label="Renderização de Balizas" name="beacons"/>
- <text name="beacon_width_label">
- Largura da Baliza
- </text>
- </panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Balizas">
+ <panel name="beacons_panel">
+ <check_box label="Objetos programados com toque apenas" name="touch_only"/>
+ <check_box label="Objetos programados" name="scripted"/>
+ <check_box label="Objetos fÃsicos" name="physical"/>
+ <check_box label="Fontes de Som" name="sounds"/>
+ <check_box label="Fontes de PartÃculas" name="particles"/>
+ <check_box label="Renderização de Highlights" name="highlights"/>
+ <check_box label="Renderização de Balizas" name="beacons"/>
+ <text name="beacon_width_label">
+ Largura da Baliza
+ </text>
+ </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_build_options.xml b/indra/newview/skins/default/xui/pt/floater_build_options.xml
index c52ccad450..4dfebc3abd 100644
--- a/indra/newview/skins/default/xui/pt/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_build_options.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="build options floater" title="Opções de grade">
- <spinner label="Uni. Grade (metros)" name="GridResolution"/>
- <spinner label="Ext. da Grade (metros)" name="GridDrawSize"/>
- <check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit"/>
- <check_box label="Mostrar as seções de cruzamento" name="GridCrossSection"/>
- <slider label="Opacidade da grade" name="GridOpacity"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="build options floater" title="Opções de grade">
+ <spinner label="Uni. Grade (metros)" name="GridResolution"/>
+ <spinner label="Ext. da Grade (metros)" name="GridDrawSize"/>
+ <check_box label="Habilitar ajuste de sub-grade" name="GridSubUnit"/>
+ <check_box label="Mostrar as seções de cruzamento" name="GridCrossSection"/>
+ <slider label="Opacidade da grade" name="GridOpacity"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_bumps.xml b/indra/newview/skins/default/xui/pt/floater_bumps.xml
index ec00abe415..0bc2546275 100644
--- a/indra/newview/skins/default/xui/pt/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/pt/floater_bumps.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_bumps" title="Colisões, impulsos e batidas">
- <text name="none_detected">
- Nada detectado
- </text>
- <text name="bump">
- [TIME] [FIRST] [LAST] conflitou com você
- </text>
- <text name="llpushobject">
- [TIME] [FIRST] [LAST] empurrou você com um script
- </text>
- <text name="selected_object_collide">
- [TIME] [FIRST] [LAST] o atingiu com um objeto
- </text>
- <text name="scripted_object_collide">
- [TIME] [FIRST] [LAST] o atingiu com um objeto programado
- </text>
- <text name="physical_object_collide">
- [TIME] [FIRST] [LAST] o atingiu com um objeto fÃsico
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_bumps" title="Colisões, impulsos e batidas">
+ <text name="none_detected">
+ Nada detectado
+ </text>
+ <text name="bump">
+ [TIME] [FIRST] [LAST] conflitou com você
+ </text>
+ <text name="llpushobject">
+ [TIME] [FIRST] [LAST] empurrou você com um script
+ </text>
+ <text name="selected_object_collide">
+ [TIME] [FIRST] [LAST] o atingiu com um objeto
+ </text>
+ <text name="scripted_object_collide">
+ [TIME] [FIRST] [LAST] o atingiu com um objeto programado
+ </text>
+ <text name="physical_object_collide">
+ [TIME] [FIRST] [LAST] o atingiu com um objeto fÃsico
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
index 78b098b1f6..0c1fb77a08 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_contents.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_contents" title="Comprar conteúdo">
- <text name="contains_text">
- [NAME] contém:
- </text>
- <text name="buy_text">
- Comprar por L$[AMOUNT] de(a) [NAME]?
- </text>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
- <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
- <check_box label="Vestir roupa agora" name="wear_check"/>
- <string name="no_copy_text">
- (sem copiar)
- </string>
- <string name="no_modify_text">
- (sem modificar)
- </string>
- <string name="no_transfer_text">
- (sem transferir)
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_buy_contents" title="Comprar conteúdo">
+ <text name="contains_text">
+ [NAME] contém:
+ </text>
+ <text name="buy_text">
+ Comprar por L$[AMOUNT] de(a) [NAME]?
+ </text>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+ <check_box label="Vestir roupa agora" name="wear_check"/>
+ <string name="no_copy_text">
+ (sem copiar)
+ </string>
+ <string name="no_modify_text">
+ (sem modificar)
+ </string>
+ <string name="no_transfer_text">
+ (sem transferir)
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
index 53093a8c6e..ce2fe93705 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_currency.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy currency" title="Comprar Dinheiro">
- <text name="info_buying">
- Comprando Dinheiro:
- </text>
- <text name="info_cannot_buy">
- Não pode comprar agora:
- </text>
- <text name="info_need_more">
- Você precisa de mais dinheiro:
- </text>
- <text name="error_message">
- Algo não está certo.
- </text>
- <button label="Ir para o website" name="error_web"/>
- <text name="contacting">
- Contatando LindeX...
- </text>
- <text name="buy_action_unknown">
- Comprar L$ no câmbio atual da LindeX
- </text>
- <text name="buy_action">
- [NAME] L$ [PRICE]
- </text>
- <text name="currency_action">
- Comprar L$
- </text>
- <line_editor name="currency_amt">
- 1234
- </line_editor>
- <text name="currency_est">
- por aproxim. US$ [USD]
- </text>
- <text name="getting_data">
- Obtendo dados...
- </text>
- <text name="balance_label">
- Você tem atualmente
- </text>
- <text name="balance_amount">
- L$ [AMT]
- </text>
- <text name="buying_label">
- Você está comprando
- </text>
- <text name="buying_amount">
- L$ [AMT]
- </text>
- <text name="total_label">
- Seu saldo será
- </text>
- <text name="total_amount">
- L$ [AMT]
- </text>
- <text name="purchase_warning_repurchase">
- Confirmando esta compra só compra a moeda.
-Você precisará tentar novamente a operação.
- </text>
- <text name="purchase_warning_notenough">
- Você não está comprando moeda suficiente.
-Aumente a quantidade de compra.
- </text>
- <button label="Fechar" name="cancel_btn"/>
- <button label="Adquirir" name="buy_btn"/>
- <string name="buy_currency">
- Comprar L$ [LINDENS] por aproximadamente US$ [USD]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy currency" title="Comprar Dinheiro">
+ <text name="info_buying">
+ Comprando Dinheiro:
+ </text>
+ <text name="info_cannot_buy">
+ Não pode comprar agora:
+ </text>
+ <text name="info_need_more">
+ Você precisa de mais dinheiro:
+ </text>
+ <text name="error_message">
+ Algo não está certo.
+ </text>
+ <button label="Ir para o website" name="error_web"/>
+ <text name="contacting">
+ Contatando LindeX...
+ </text>
+ <text name="buy_action_unknown">
+ Comprar L$ no câmbio atual da LindeX
+ </text>
+ <text name="buy_action">
+ [NAME] L$ [PRICE]
+ </text>
+ <text name="currency_action">
+ Comprar L$
+ </text>
+ <line_editor name="currency_amt">
+ 1234
+ </line_editor>
+ <text name="currency_est">
+ por aproxim. US$ [USD]
+ </text>
+ <text name="getting_data">
+ Obtendo dados...
+ </text>
+ <text name="balance_label">
+ Você tem atualmente
+ </text>
+ <text name="balance_amount">
+ L$ [AMT]
+ </text>
+ <text name="buying_label">
+ Você está comprando
+ </text>
+ <text name="buying_amount">
+ L$ [AMT]
+ </text>
+ <text name="total_label">
+ Seu saldo será
+ </text>
+ <text name="total_amount">
+ L$ [AMT]
+ </text>
+ <text name="purchase_warning_repurchase">
+ Confirmando esta compra só compra a moeda.
+Você precisará tentar novamente a operação.
+ </text>
+ <text name="purchase_warning_notenough">
+ Você não está comprando moeda suficiente.
+Aumente a quantidade de compra.
+ </text>
+ <button label="Fechar" name="cancel_btn"/>
+ <button label="Adquirir" name="buy_btn"/>
+ <string name="buy_currency">
+ Comprar L$ [LINDENS] por aproximadamente US$ [USD]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_land.xml b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
index 11033f5870..e9711dc364 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_land.xml
@@ -1,225 +1,225 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy land" title="Comprar terra">
- <text name="region_name_label">
- Região:
- </text>
- <text name="region_name_text">
- (desconhecido)
- </text>
- <text name="estate_name_label">
- Propriedade:
- </text>
- <text name="estate_name_text">
- (desconhecido)
- </text>
- <text name="estate_owner_label">
- Dono da propriedade:
- </text>
- <text name="estate_owner_text">
- (desconhecido)
- </text>
- <text name="resellable_changeable_label">
- Adquiriu um terreno nesta região:
- </text>
- <text name="resellable_clause">
- Terra adquirida nesta região pode, ou não, ser revendida.
- </text>
- <text name="changeable_clause">
- pode, ou não, ser unido ou subdividido.
- </text>
- <text name="covenant_text">
- Você deve concordar com o Corretor da Propriedade:
- </text>
- <text_editor name="covenant_editor">
- Carregando...
- </text_editor>
- <check_box label="Eu concordo com as definições do Corretor feitas acima." name="agree_covenant"/>
- <text name="info_parcel_label">
- Lote:
- </text>
- <text name="info_parcel">
- Scotopteryx 138,204
- </text>
- <text name="info_size_label">
- Tamanho:
- </text>
- <text name="info_size">
- 1024 m²
- </text>
- <text name="info_price_label">
- Preço:
- </text>
- <text name="info_price">
- L$ 1500, objetos inclusos
- </text>
- <text name="info_action">
- Comprar este lote irá:
- </text>
- <text name="error_message">
- Algo ainda não está correto.
- </text>
- <button label="Ir para a página da web" name="error_web"/>
- <text name="account_action">
- Evoluir sua conta para membro Premium
- </text>
- <text name="account_reason">
- Somente membros Premium podem possuir terra.
- </text>
- <combo_box name="account_level">
- <combo_item name="US$9.95/month,billedmonthly">
- US$9.95/mês, debitado mensalmente
- </combo_item>
- <combo_item name="US$7.50/month,billedquarterly">
- US$7.50/mês, debitado trimestralmente
- </combo_item>
- <combo_item name="US$6.00/month,billedannually">
- US$6.00/mês, debitado anualmente
- </combo_item>
- </combo_box>
- <text name="land_use_action">
- Aumente sua taxa de locação de terra para US$ 40/mês.
- </text>
- <text name="land_use_reason">
- Você possui 1.309 metros quadrados de terra.
-Este lote tem 512 metros quadrados de terra.
- </text>
- <text name="purchase_action">
- Pagar ao Residente Joe L$4000 pela terra
- </text>
- <text name="currency_reason">
- Você tem L$2,100.
- </text>
- <text name="currency_action">
- Compre L$ adicionais
- </text>
- <line_editor name="currency_amt">
- 1000
- </line_editor>
- <text name="currency_est">
- por aproxim. US$ [AMOUNT2]
- </text>
- <text name="currency_balance">
- Você tem L$2,100.
- </text>
- <check_box label="Remover [AMOUNT] m² de contribuição do grupo." name="remove_contribution"/>
- <button label="Adquirir" name="buy_btn"/>
- <button label="Cancelar" name="cancel_btn"/>
- <string name="can_resell">
- Pode ser revendida.
- </string>
- <string name="can_not_resell">
- Não pode ser revendida.
- </string>
- <string name="can_change">
- Pode ser unida ou subdivida.
- </string>
- <string name="can_not_change">
- Não pode ser unida ou subdividida.
- </string>
- <string name="cant_buy_for_group">
- Você não tem permissão para comprar terra para seu grupo ativo.
- </string>
- <string name="no_land_selected">
- Nenhuma terra selecionada.
- </string>
- <string name="multiple_parcels_selected">
- Múltiplos e diferentes lotes selecionados. Tente selecionar uma área menor.
- </string>
- <string name="no_permission">
- Você não tem permissão para comprar uma terra para seu grupo ativo.
- </string>
- <string name="parcel_not_for_sale">
- O lote selecionado não está a venda.
- </string>
- <string name="group_already_owns">
- O grupo já possui o lote.
- </string>
- <string name="you_already_own">
- Você já possui o lote.
- </string>
- <string name="set_to_sell_to_other">
- O lote selecionado está configurado para ser vendido para outro grupo.
- </string>
- <string name="no_public_land">
- A área selecionada não tem terras públicas.
- </string>
- <string name="not_owned_by_you">
- Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor.
- </string>
- <string name="processing">
- Processando sua compra...
-
-(Isso pode levar um minuto.)
- </string>
- <string name="fetching_error">
- Houve um erro ao buscar informações sobre compra de terras.
- </string>
- <string name="buying_will">
- Comprar esta terra irá:
- </string>
- <string name="buying_for_group">
- Comprar terra para o grupo:
- </string>
- <string name="cannot_buy_now">
- Não foi possÃvel comprar agora:
- </string>
- <string name="not_for_sale">
- Não disponÃvel para venda:
- </string>
- <string name="none_needed">
- nada necessário
- </string>
- <string name="must_upgrade">
- Sua conta deve ser evoluÃda para adquirir um lote.
- </string>
- <string name="cant_own_land">
- Sua conta pode possuir uma terra.
- </string>
- <string name="land_holdings">
- Você possui [BUYER] m² de terra.
- </string>
- <string name="pay_to_for_land">
- Pagar L$ [AMOUNT] para [SELLER] por esta terra
- </string>
- <string name="buy_for_US">
- Comprar L$ [AMOUNT] por aproximadamente US$ [AMOUNT2] ,
- </string>
- <string name="parcel_meters">
- Este lote tem [AMOUNT] m².
- </string>
- <string name="premium_land">
- Esta terra é Premium, e irá cobrar como [AMOUNT] m².
- </string>
- <string name="discounted_land">
- Este lote é promocional, e irá cobrar como [AMOUNT] m².
- </string>
- <string name="meters_supports_object">
- [AMOUNT] m²
-suporta [AMOUNT2] objetos
- </string>
- <string name="sold_with_objects">
- vendido com objetos
- </string>
- <string name="insufficient_land_credits">
- O grupo [GROUP] precisará de fundos suficientes de terras
-contribuÃdas para cobrir este lote antes da aquisição se completar.
- </string>
- <string name="have_enough_lindens">
- Você tem L$ [AMOUNT], suficiente para comprar este lote.
- </string>
- <string name="not_enough_lindens">
- Você tem somente L$ [AMOUNT], e precisa de mais L$ [AMOUNT2].
- </string>
- <string name="balance_left">
- Após a compra, restará L$ [AMOUNT].
- </string>
- <string name="balance_needed">
- Você precisa comprar pelo menos L$ [AMOUNT] para ter recursos para este lote.
- </string>
- <string name="no_parcel_selected">
- (nenhum lote selecionado)
- </string>
- <string name="buy_currency">
- Comprar L$ [LINDENS] por aproxim. US$ [USD]
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy land" title="Comprar terra">
+ <text name="region_name_label">
+ Região:
+ </text>
+ <text name="region_name_text">
+ (desconhecido)
+ </text>
+ <text name="estate_name_label">
+ Propriedade:
+ </text>
+ <text name="estate_name_text">
+ (desconhecido)
+ </text>
+ <text name="estate_owner_label">
+ Dono da propriedade:
+ </text>
+ <text name="estate_owner_text">
+ (desconhecido)
+ </text>
+ <text name="resellable_changeable_label">
+ Adquiriu um terreno nesta região:
+ </text>
+ <text name="resellable_clause">
+ Terra adquirida nesta região pode, ou não, ser revendida.
+ </text>
+ <text name="changeable_clause">
+ pode, ou não, ser unido ou subdividido.
+ </text>
+ <text name="covenant_text">
+ Você deve concordar com o Corretor da Propriedade:
+ </text>
+ <text_editor name="covenant_editor">
+ Carregando...
+ </text_editor>
+ <check_box label="Eu concordo com as definições do Corretor feitas acima." name="agree_covenant"/>
+ <text name="info_parcel_label">
+ Lote:
+ </text>
+ <text name="info_parcel">
+ Scotopteryx 138,204
+ </text>
+ <text name="info_size_label">
+ Tamanho:
+ </text>
+ <text name="info_size">
+ 1024 m²
+ </text>
+ <text name="info_price_label">
+ Preço:
+ </text>
+ <text name="info_price">
+ L$ 1500, objetos inclusos
+ </text>
+ <text name="info_action">
+ Comprar este lote irá:
+ </text>
+ <text name="error_message">
+ Algo ainda não está correto.
+ </text>
+ <button label="Ir para a página da web" name="error_web"/>
+ <text name="account_action">
+ Evoluir sua conta para membro Premium
+ </text>
+ <text name="account_reason">
+ Somente membros Premium podem possuir terra.
+ </text>
+ <combo_box name="account_level">
+ <combo_box.item name="US$9.95/month,billedmonthly">
+ US$9.95/mês, debitado mensalmente
+ </combo_box.item>
+ <combo_box.item name="US$7.50/month,billedquarterly">
+ US$7.50/mês, debitado trimestralmente
+ </combo_box.item>
+ <combo_box.item name="US$6.00/month,billedannually">
+ US$6.00/mês, debitado anualmente
+ </combo_box.item>
+ </combo_box>
+ <text name="land_use_action">
+ Aumente sua taxa de locação de terra para US$ 40/mês.
+ </text>
+ <text name="land_use_reason">
+ Você possui 1.309 metros quadrados de terra.
+Este lote tem 512 metros quadrados de terra.
+ </text>
+ <text name="purchase_action">
+ Pagar ao Residente Joe L$4000 pela terra
+ </text>
+ <text name="currency_reason">
+ Você tem L$2,100.
+ </text>
+ <text name="currency_action">
+ Compre L$ adicionais
+ </text>
+ <line_editor name="currency_amt">
+ 1000
+ </line_editor>
+ <text name="currency_est">
+ por aproxim. US$ [AMOUNT2]
+ </text>
+ <text name="currency_balance">
+ Você tem L$2,100.
+ </text>
+ <check_box label="Remover [AMOUNT] m² de contribuição do grupo." name="remove_contribution"/>
+ <button label="Adquirir" name="buy_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <string name="can_resell">
+ Pode ser revendida.
+ </string>
+ <string name="can_not_resell">
+ Não pode ser revendida.
+ </string>
+ <string name="can_change">
+ Pode ser unida ou subdivida.
+ </string>
+ <string name="can_not_change">
+ Não pode ser unida ou subdividida.
+ </string>
+ <string name="cant_buy_for_group">
+ Você não tem permissão para comprar terra para seu grupo ativo.
+ </string>
+ <string name="no_land_selected">
+ Nenhuma terra selecionada.
+ </string>
+ <string name="multiple_parcels_selected">
+ Múltiplos e diferentes lotes selecionados. Tente selecionar uma área menor.
+ </string>
+ <string name="no_permission">
+ Você não tem permissão para comprar uma terra para seu grupo ativo.
+ </string>
+ <string name="parcel_not_for_sale">
+ O lote selecionado não está a venda.
+ </string>
+ <string name="group_already_owns">
+ O grupo já possui o lote.
+ </string>
+ <string name="you_already_own">
+ Você já possui o lote.
+ </string>
+ <string name="set_to_sell_to_other">
+ O lote selecionado está configurado para ser vendido para outro grupo.
+ </string>
+ <string name="no_public_land">
+ A área selecionada não tem terras públicas.
+ </string>
+ <string name="not_owned_by_you">
+ Está selecionada uma terra pertencente a outro usuário. Tente selecionar uma área menor.
+ </string>
+ <string name="processing">
+ Processando sua compra...
+
+(Isso pode levar um minuto.)
+ </string>
+ <string name="fetching_error">
+ Houve um erro ao buscar informações sobre compra de terras.
+ </string>
+ <string name="buying_will">
+ Comprar esta terra irá:
+ </string>
+ <string name="buying_for_group">
+ Comprar terra para o grupo:
+ </string>
+ <string name="cannot_buy_now">
+ Não foi possÃvel comprar agora:
+ </string>
+ <string name="not_for_sale">
+ Não disponÃvel para venda:
+ </string>
+ <string name="none_needed">
+ nada necessário
+ </string>
+ <string name="must_upgrade">
+ Sua conta deve ser evoluÃda para adquirir um lote.
+ </string>
+ <string name="cant_own_land">
+ Sua conta pode possuir uma terra.
+ </string>
+ <string name="land_holdings">
+ Você possui [BUYER] m² de terra.
+ </string>
+ <string name="pay_to_for_land">
+ Pagar L$ [AMOUNT] para [SELLER] por esta terra
+ </string>
+ <string name="buy_for_US">
+ Comprar L$ [AMOUNT] por aproximadamente US$ [AMOUNT2] ,
+ </string>
+ <string name="parcel_meters">
+ Este lote tem [AMOUNT] m².
+ </string>
+ <string name="premium_land">
+ Esta terra é Premium, e irá cobrar como [AMOUNT] m².
+ </string>
+ <string name="discounted_land">
+ Este lote é promocional, e irá cobrar como [AMOUNT] m².
+ </string>
+ <string name="meters_supports_object">
+ [AMOUNT] m²
+suporta [AMOUNT2] objetos
+ </string>
+ <string name="sold_with_objects">
+ vendido com objetos
+ </string>
+ <string name="insufficient_land_credits">
+ O grupo [GROUP] precisará de fundos suficientes de terras
+contribuÃdas para cobrir este lote antes da aquisição se completar.
+ </string>
+ <string name="have_enough_lindens">
+ Você tem L$ [AMOUNT], suficiente para comprar este lote.
+ </string>
+ <string name="not_enough_lindens">
+ Você tem somente L$ [AMOUNT], e precisa de mais L$ [AMOUNT2].
+ </string>
+ <string name="balance_left">
+ Após a compra, restará L$ [AMOUNT].
+ </string>
+ <string name="balance_needed">
+ Você precisa comprar pelo menos L$ [AMOUNT] para ter recursos para este lote.
+ </string>
+ <string name="no_parcel_selected">
+ (nenhum lote selecionado)
+ </string>
+ <string name="buy_currency">
+ Comprar L$ [LINDENS] por aproxim. US$ [USD]
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_buy_object.xml b/indra/newview/skins/default/xui/pt/floater_buy_object.xml
index b79a5111dd..b8e1085471 100644
--- a/indra/newview/skins/default/xui/pt/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_buy_object.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="Comprar cópia do objeto">
- <text name="contents_text">
- e seus conteúdos:
- </text>
- <text name="buy_text">
- Comprar por L$[AMOUNT] de(a) [NAME]?
- </text>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
- <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
- <string name="title_buy_text">
- Comprar
- </string>
- <string name="title_buy_copy_text">
- Comprar uma cópia de
- </string>
- <string name="no_copy_text">
- (sem copiar)
- </string>
- <string name="no_modify_text">
- (sem modificar)
- </string>
- <string name="no_transfer_text">
- (sem transferir)
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="contents" title="Comprar cópia do objeto">
+ <text name="contents_text">
+ e seus conteúdos:
+ </text>
+ <text name="buy_text">
+ Comprar por L$[AMOUNT] de(a) [NAME]?
+ </text>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+ <string name="title_buy_text">
+ Comprar
+ </string>
+ <string name="title_buy_copy_text">
+ Comprar uma cópia de
+ </string>
+ <string name="no_copy_text">
+ (sem copiar)
+ </string>
+ <string name="no_modify_text">
+ (sem modificar)
+ </string>
+ <string name="no_transfer_text">
+ (sem transferir)
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_camera.xml b/indra/newview/skins/default/xui/pt/floater_camera.xml
index 435ba6294f..4dc6997606 100644
--- a/indra/newview/skins/default/xui/pt/floater_camera.xml
+++ b/indra/newview/skins/default/xui/pt/floater_camera.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
- <string name="rotate_tooltip">
- Girar a Câmera ao redor do Foco
- </string>
- <string name="zoom_tooltip">
- Aproximar a Câmera in direção ao Foco
- </string>
- <string name="move_tooltip">
- Mover a Câmera Para Cima e Para Baixo, Para a Esquerda e Para a Direita
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="move floater" title="">
+ <string name="rotate_tooltip">
+ Girar a Câmera ao redor do Foco
+ </string>
+ <string name="zoom_tooltip">
+ Aproximar a Câmera in direção ao Foco
+ </string>
+ <string name="move_tooltip">
+ Mover a Câmera Para Cima e Para Baixo, Para a Esquerda e Para a Direita
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_choose_group.xml b/indra/newview/skins/default/xui/pt/floater_choose_group.xml
index e52bb3d6ef..449d578716 100644
--- a/indra/newview/skins/default/xui/pt/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/pt/floater_choose_group.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="Grupos">
- <text name="groupdesc">
- Escolha um grupo:
- </text>
- <button label="OK" label_selected="OK" name="OK" />
- <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="groups" title="Grupos">
+ <text name="groupdesc">
+ Escolha um grupo:
+ </text>
+ <button label="OK" label_selected="OK" name="OK" />
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_color_picker.xml b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
index 77e3171573..475280b013 100644
--- a/indra/newview/skins/default/xui/pt/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/pt/floater_color_picker.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="ColorPicker" title="Seletor de Cor">
- <text name="r_val_text">
- Vermelho:
- </text>
- <text name="g_val_text">
- Verde:
- </text>
- <text name="b_val_text">
- Azul:
- </text>
- <text name="h_val_text">
- Matiz:
- </text>
- <text name="s_val_text">
- Sat:
- </text>
- <text name="l_val_text">
- Lum:
- </text>
- <check_box label="Aplicar imediatamente" name="apply_immediate"/>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
- <button label="Selecionar" label_selected="Selecionar" name="select_btn"/>
- <text name="Current color:">
- Cor atual:
- </text>
- <text name="(Drag below to save.)">
- (Arraste abaixo para salvar.)
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ColorPicker" title="Seletor de Cor">
+ <text name="r_val_text">
+ Vermelho:
+ </text>
+ <text name="g_val_text">
+ Verde:
+ </text>
+ <text name="b_val_text">
+ Azul:
+ </text>
+ <text name="h_val_text">
+ Matiz:
+ </text>
+ <text name="s_val_text">
+ Sat:
+ </text>
+ <text name="l_val_text">
+ Lum:
+ </text>
+ <check_box label="Aplicar imediatamente" name="apply_immediate"/>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Selecionar" label_selected="Selecionar" name="select_btn"/>
+ <text name="Current color:">
+ Cor atual:
+ </text>
+ <text name="(Drag below to save.)">
+ (Arraste abaixo para salvar.)
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_critical.xml b/indra/newview/skins/default/xui/pt/floater_critical.xml
index f8d403502f..5d7fe0142b 100644
--- a/indra/newview/skins/default/xui/pt/floater_critical.xml
+++ b/indra/newview/skins/default/xui/pt/floater_critical.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title=" ">
- <button label="Continuar" label_selected="Continuar" name="Continue"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <text name="tos_heading">
- Por favor, leia a mensagem a seguir cuidadosamente.
- </text>
- <text_editor name="tos_text">
- TOS_TEXT
- </text_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title=" ">
+ <button label="Continuar" label_selected="Continuar" name="Continue"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <text name="tos_heading">
+ Por favor, leia a mensagem a seguir cuidadosamente.
+ </text>
+ <text_editor name="tos_text">
+ TOS_TEXT
+ </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_customize.xml b/indra/newview/skins/default/xui/pt/floater_customize.xml
index 1be051049f..267612bb9d 100644
--- a/indra/newview/skins/default/xui/pt/floater_customize.xml
+++ b/indra/newview/skins/default/xui/pt/floater_customize.xml
@@ -1,451 +1,451 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="Aparência" width="513">
- <tab_container name="customize tab container" tab_min_width="115" width="511">
- <panel label="Partes de corpo" name="body_parts_placeholder"/>
- <panel label="Forma" name="Shape">
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- <button label="Corpo" label_selected="Corpo" name="Body"/>
- <button label="Cabeça" label_selected="Cabeça" name="Head"/>
- <button label="Olhos" label_selected="Olhos" name="Eyes"/>
- <button label="Orelhas" label_selected="Orelhas" name="Ears"/>
- <button label="Nariz" label_selected="Nariz" name="Nose"/>
- <button label="Boca" label_selected="Boca" name="Mouth"/>
- <button label="Queixo" label_selected="Queixo" name="Chin"/>
- <button label="Tórax" label_selected="Tórax" name="Torso"/>
- <button label="Pernas" label_selected="Pernas" name="Legs"/>
- <radio_group name="sex radio">
- <radio_item length="1" name="radio" type="string">
- Feminino
- </radio_item>
- <radio_item length="1" name="radio2" type="string">
- Masculino
- </radio_item>
- </radio_group>
- <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Coloque uma nova forma arrastando uma do seu inventário
-para seu avatar. Alternativamente, você pode criar uma nova de um esboço e usá-la.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- <button label="Criar Nova Forma" label_selected="Criar Nova Forma" name="Create New"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- </panel>
- <panel label="Pele" name="Skin">
- <button label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color"/>
- <button label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail"/>
- <button label="Maquiagem" label_selected="Maquiagem" name="Makeup"/>
- <button label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando..
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido
- </text>
- <text length="1" name="path" type="string">
- Localizada em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Coloque uma nova pele arrastando uma de seu inventário para seu avatar.
-Alternativamente, você pode criar uma nova forma a partir de um esboço e usá-la.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- <texture_picker label="Tatuagens para a cabeça" name="Head Tattoos" tool_tip="Clique para escolher um desenho"/>
- <texture_picker label="Tattoos Superiores" name="Upper Tattoos" tool_tip="Clique para escolher um desenho"/>
- <texture_picker label="Tattoos Inferiores" name="Lower Tattoos" tool_tip="Clique para escolher um desenho"/>
- <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
- <button label="Criar Nova Pele" label_selected="Criar Nova Pele" name="Create New"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Cabelo" name="Hair">
- <button label="Cor" label_selected="Cor" name="Color"/>
- <button label="Estilo" label_selected="Estilo" name="Style"/>
- <button label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows"/>
- <button label="Rosto" label_selected="Rosto" name="Facial"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Ponha um novo cabelo em seu avatar arrastando um do seu inventário.
-Alternativamente, você pode criar um novo modelo a partir de um esboço e
-usá-lo.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não ter permissão para modificar essa vestimenta.
- </text>
- <texture_picker label="Texture" name="Texture" tool_tip="Clique para escolher uma imagem"/>
- <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
- <button label="Criar Novo Cabelo" label_selected="Criar Novo Cabelo" name="Create New"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Olhos" name="Eyes">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Para colocar novos olhos, arraste um do seu inventário para seu avatar.
-Alternativamente, você pode criar um novo modelo de um esboço e
-usá-lo.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não tem permissão para alterar esta vestimenta.
- </text>
- <texture_picker label="Ãris" name="Iris" tool_tip="Clique para escolher uma imagem"/>
- <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
- <button label="Criar Novos Olhos" label_selected="Criar Novos Olhos" name="Create New"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Roupas" name="clothes_placeholder"/>
- <panel label="Camisa" name="Shirt">
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
- <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Para por uma nova camisa em seu avatar, arraste uma do seu
-inventário para seu avatar. Alternativamente, você pode criar um
-novo modelo a partir de um esboço e usá-lo.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não ter permissão para modificar esta vestimenta.
- </text>
- </panel>
- <panel label="Calças" name="Pants">
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas."/>
- <button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestindo
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Para por uma nova calça em seu avatar, basta arrastar uma outra do seu
-inventário. Alternativamente, você pode criar um novo modelo a partir
-de um esboço e usá-lo.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- </panel>
- <panel label="Sapatos" name="Shoes">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Para por novos sapatos em seu avatar, basta arrastar um novo do seu
-inventário. Alternativamente, você pode criar um novo modelo a partir
-de um esboço e usá-lo.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
- <button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New" width="166"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Meias" name="Socks">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido.
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Para por novas meias em seu avatar, basta arrastar uma nova do seu
-inventário. Alternativamente, você pode criar novas meias a partir de um esboço e usá-las.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não tem permissão para modificar essa vestimenta.
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
- <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Jaqueta" name="Jacket">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: Não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Para por uma nova jaqueta em seu avatar, basta arrastar um novo modelo
-do seu inventário. Alternativamente, você pode criar um novo modelo a
-partir de um esboço e usá-lo.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- <texture_picker label="Tecido Superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
- <texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
- <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Luvas" name="Gloves">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando....
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Para colocar uma nova jaqueta em seu avatar, basta arrastar um novo modelo
-do seu inventário. Alternativamente, você pode criar uma novo modelo a
-partir de um esboço e usá-lo.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não tem permissão para modificar essa vestimenta.
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
- <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Camiseta" name="Undershirt">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Para por uma nova Camiseta em seu avatar, basta arrastar um novo
-modelo de seu inventário. Alternativamente, você pode criar um
-novo modelo a partir de um esboço e usá-lo.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não ter permissão para modificar essa vestimenta.
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
- <button label="Criar Nova Camiseta" label_selected="Criar Nova Roupa de Baixo" name="Create New"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Roupas de Baixo" name="Underpants">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Para por novas roupas de baixo em seu avatar, basta arrastar um novo
-modelo do seu inventário. Alternativamente, você pode criar um novo
-modelo a partir de um esboço e usá-lo.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não tem permissão para modificar essa vestimenta.
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
- <button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="176"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- <panel label="Saia" name="Skirt">
- <text length="1" name="title" type="string">
- [DESC]
- </text>
- <text length="1" name="title_no_modify" type="string">
- [DESC]: não foi possÃvel modificar
- </text>
- <text length="1" name="title_loading" type="string">
- [DESC]: carregando...
- </text>
- <text length="1" name="title_not_worn" type="string">
- [DESC]: não vestido
- </text>
- <text length="1" name="path" type="string">
- Localizado em [PATH]
- </text>
- <text length="1" name="not worn instructions" type="string">
- Para por uma nova saia em seu avatar, basta arrastar um novo modelo
-do seu inventário. Alternativamente, você pode criar um novo modelo a
-partir de um esboço e usá-lo.
- </text>
- <text length="1" name="no modify instructions" type="string">
- Você não tem permissão para modificar esta vestimenta.
- </text>
- <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Click to open Color Picker"/>
- <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/>
- <button label="Remover" label_selected="Remover" name="Take Off"/>
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
- <button label="Reverter" label_selected="Reverter" name="Revert"/>
- </panel>
- </tab_container>
- <scroll_container left="216" name="panel_container"/>
- <button label="Fechar" label_selected="Fechar" name="Close"/>
- <button label="Salvar Tudo" label_selected="Salvar Tudo" name="Save All"/>
- <button label="Criar Visual" label_selected="Criar Visual" name="Make Outfit"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater customize" title="Aparência" width="513">
+ <tab_container name="customize tab container" tab_min_width="115" width="511">
+ <panel label="Partes de corpo" name="body_parts_placeholder"/>
+ <panel label="Forma" name="Shape">
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ <button label="Corpo" label_selected="Corpo" name="Body"/>
+ <button label="Cabeça" label_selected="Cabeça" name="Head"/>
+ <button label="Olhos" label_selected="Olhos" name="Eyes"/>
+ <button label="Orelhas" label_selected="Orelhas" name="Ears"/>
+ <button label="Nariz" label_selected="Nariz" name="Nose"/>
+ <button label="Boca" label_selected="Boca" name="Mouth"/>
+ <button label="Queixo" label_selected="Queixo" name="Chin"/>
+ <button label="Tórax" label_selected="Tórax" name="Torso"/>
+ <button label="Pernas" label_selected="Pernas" name="Legs"/>
+ <radio_group name="sex radio">
+ <radio_item length="1" name="radio" type="string">
+ Feminino
+ </radio_item>
+ <radio_item length="1" name="radio2" type="string">
+ Masculino
+ </radio_item>
+ </radio_group>
+ <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Coloque uma nova forma arrastando uma do seu inventário
+para seu avatar. Alternativamente, você pode criar uma nova de um esboço e usá-la.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não tem permissão para modificar esta vestimenta.
+ </text>
+ <button label="Criar Nova Forma" label_selected="Criar Nova Forma" name="Create New"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ </panel>
+ <panel label="Pele" name="Skin">
+ <button label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color"/>
+ <button label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail"/>
+ <button label="Maquiagem" label_selected="Maquiagem" name="Makeup"/>
+ <button label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando..
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido
+ </text>
+ <text length="1" name="path" type="string">
+ Localizada em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Coloque uma nova pele arrastando uma de seu inventário para seu avatar.
+Alternativamente, você pode criar uma nova forma a partir de um esboço e usá-la.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não tem permissão para modificar esta vestimenta.
+ </text>
+ <texture_picker label="Tatuagens para a cabeça" name="Head Tattoos" tool_tip="Clique para escolher um desenho"/>
+ <texture_picker label="Tattoos Superiores" name="Upper Tattoos" tool_tip="Clique para escolher um desenho"/>
+ <texture_picker label="Tattoos Inferiores" name="Lower Tattoos" tool_tip="Clique para escolher um desenho"/>
+ <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+ <button label="Criar Nova Pele" label_selected="Criar Nova Pele" name="Create New"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ </panel>
+ <panel label="Cabelo" name="Hair">
+ <button label="Cor" label_selected="Cor" name="Color"/>
+ <button label="Estilo" label_selected="Estilo" name="Style"/>
+ <button label="Sombrancelhas" label_selected="Sombrancelhas" name="Eyebrows"/>
+ <button label="Rosto" label_selected="Rosto" name="Facial"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Ponha um novo cabelo em seu avatar arrastando um do seu inventário.
+Alternativamente, você pode criar um novo modelo a partir de um esboço e
+usá-lo.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não ter permissão para modificar essa vestimenta.
+ </text>
+ <texture_picker label="Texture" name="Texture" tool_tip="Clique para escolher uma imagem"/>
+ <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+ <button label="Criar Novo Cabelo" label_selected="Criar Novo Cabelo" name="Create New"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ </panel>
+ <panel label="Olhos" name="Eyes">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Para colocar novos olhos, arraste um do seu inventário para seu avatar.
+Alternativamente, você pode criar um novo modelo de um esboço e
+usá-lo.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não tem permissão para alterar esta vestimenta.
+ </text>
+ <texture_picker label="Ãris" name="Iris" tool_tip="Clique para escolher uma imagem"/>
+ <button label="Aleatório" label_selected="Aleatório" name="Randomize"/>
+ <button label="Criar Novos Olhos" label_selected="Criar Novos Olhos" name="Create New"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ </panel>
+ <panel label="Roupas" name="clothes_placeholder"/>
+ <panel label="Camisa" name="Shirt">
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+ <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Para por uma nova camisa em seu avatar, arraste uma do seu
+inventário para seu avatar. Alternativamente, você pode criar um
+novo modelo a partir de um esboço e usá-lo.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não ter permissão para modificar esta vestimenta.
+ </text>
+ </panel>
+ <panel label="Calças" name="Pants">
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas."/>
+ <button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestindo
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Para por uma nova calça em seu avatar, basta arrastar uma outra do seu
+inventário. Alternativamente, você pode criar um novo modelo a partir
+de um esboço e usá-lo.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não tem permissão para modificar esta vestimenta.
+ </text>
+ </panel>
+ <panel label="Sapatos" name="Shoes">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Para por novos sapatos em seu avatar, basta arrastar um novo do seu
+inventário. Alternativamente, você pode criar um novo modelo a partir
+de um esboço e usá-lo.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não tem permissão para modificar esta vestimenta.
+ </text>
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+ <button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New" width="166"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ </panel>
+ <panel label="Meias" name="Socks">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido.
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Para por novas meias em seu avatar, basta arrastar uma nova do seu
+inventário. Alternativamente, você pode criar novas meias a partir de um esboço e usá-las.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não tem permissão para modificar essa vestimenta.
+ </text>
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+ <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ </panel>
+ <panel label="Jaqueta" name="Jacket">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: Não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Para por uma nova jaqueta em seu avatar, basta arrastar um novo modelo
+do seu inventário. Alternativamente, você pode criar um novo modelo a
+partir de um esboço e usá-lo.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não tem permissão para modificar esta vestimenta.
+ </text>
+ <texture_picker label="Tecido Superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
+ <texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem." width="84"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+ <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ </panel>
+ <panel label="Luvas" name="Gloves">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando....
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Para colocar uma nova jaqueta em seu avatar, basta arrastar um novo modelo
+do seu inventário. Alternativamente, você pode criar uma novo modelo a
+partir de um esboço e usá-lo.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não tem permissão para modificar essa vestimenta.
+ </text>
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
+ <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ </panel>
+ <panel label="Camiseta" name="Undershirt">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Para por uma nova Camiseta em seu avatar, basta arrastar um novo
+modelo de seu inventário. Alternativamente, você pode criar um
+novo modelo a partir de um esboço e usá-lo.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não ter permissão para modificar essa vestimenta.
+ </text>
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para abrir o conta-gotas"/>
+ <button label="Criar Nova Camiseta" label_selected="Criar Nova Roupa de Baixo" name="Create New"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ </panel>
+ <panel label="Roupas de Baixo" name="Underpants">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Para por novas roupas de baixo em seu avatar, basta arrastar um novo
+modelo do seu inventário. Alternativamente, você pode criar um novo
+modelo a partir de um esboço e usá-lo.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não tem permissão para modificar essa vestimenta.
+ </text>
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Clique para pegar o conta-gotas"/>
+ <button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="176"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ </panel>
+ <panel label="Saia" name="Skirt">
+ <text length="1" name="title" type="string">
+ [DESC]
+ </text>
+ <text length="1" name="title_no_modify" type="string">
+ [DESC]: não foi possÃvel modificar
+ </text>
+ <text length="1" name="title_loading" type="string">
+ [DESC]: carregando...
+ </text>
+ <text length="1" name="title_not_worn" type="string">
+ [DESC]: não vestido
+ </text>
+ <text length="1" name="path" type="string">
+ Localizado em [PATH]
+ </text>
+ <text length="1" name="not worn instructions" type="string">
+ Para por uma nova saia em seu avatar, basta arrastar um novo modelo
+do seu inventário. Alternativamente, você pode criar um novo modelo a
+partir de um esboço e usá-lo.
+ </text>
+ <text length="1" name="no modify instructions" type="string">
+ Você não tem permissão para modificar esta vestimenta.
+ </text>
+ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Click to open Color Picker"/>
+ <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/>
+ <button label="Remover" label_selected="Remover" name="Take Off"/>
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Salvar Como" label_selected="Salvar Como" name="Save As"/>
+ <button label="Reverter" label_selected="Reverter" name="Revert"/>
+ </panel>
+ </tab_container>
+ <scroll_container left="216" name="panel_container"/>
+ <button label="Fechar" label_selected="Fechar" name="Close"/>
+ <button label="Salvar Tudo" label_selected="Salvar Tudo" name="Save All"/>
+ <button label="Criar Visual" label_selected="Criar Visual" name="Make Outfit"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
index bc9960a53d..5049b87a56 100644
--- a/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_day_cycle_options.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Day Cycle Floater" title="Editor de ciclo de dia">
- <tab_container name="Day Cycle Tabs">
- <panel label="Ciclo do dia" name="Day Cycle">
- <button label="?" name="WLDayCycleHelp"/>
- <text name="WL12am">
- 12:00 meia-noite
- </text>
- <text name="WL3am">
- 3:00 da manhã
- </text>
- <text name="WL6am">
- 6:00 da manhã
- </text>
- <text name="WL9amHash">
- 9:00 da manhã
- </text>
- <text name="WL12pmHash">
- 12:00 meio dia
- </text>
- <text name="WL3pm">
- 3:00 da tarde
- </text>
- <text name="WL6pm">
- 6:00 da tarde
- </text>
- <text name="WL9pm">
- 9:00 da noite
- </text>
- <text name="WL12am2">
- 12:00 meia noite
- </text>
- <button label="Add Key" label_selected="Adicionar chave" name="WLAddKey"/>
- <button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
- <text name="WLCurKeyFrameText">
- Configurações de Quadro-chave:
- </text>
- <text name="WLCurKeyTimeText">
- Tempo-chave:
- </text>
- <spinner label="Hora" name="WLCurKeyHour"/>
- <spinner label="Minutos" name="WLCurKeyMin"/>
- <text name="WLCurKeyTimeText2">
- Ajuste-chave:
- </text>
- <combo_box label="Ajuste" name="WLKeyPresets"/>
- <text name="DayCycleText">
- Grudar:
- </text>
- <combo_box label="5 minutos" name="WLSnapOptions"/>
- <text name="DayCycleText2">
- Duração do Ciclo:
- </text>
- <spinner label="Hora" name="WLLengthOfDayHour"/>
- <spinner label="Minuto" name="WLLengthOfDayMin"/>
- <spinner label="Segundo" name="WLLengthOfDaySec"/>
- <text name="DayCycleText3">
- Prévia:
- </text>
- <button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>
- <button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>
- <button label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/>
- <button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>
- <button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Day Cycle Floater" title="Editor de ciclo de dia">
+ <tab_container name="Day Cycle Tabs">
+ <panel label="Ciclo do dia" name="Day Cycle">
+ <button label="?" name="WLDayCycleHelp"/>
+ <text name="WL12am">
+ 12:00 meia-noite
+ </text>
+ <text name="WL3am">
+ 3:00 da manhã
+ </text>
+ <text name="WL6am">
+ 6:00 da manhã
+ </text>
+ <text name="WL9amHash">
+ 9:00 da manhã
+ </text>
+ <text name="WL12pmHash">
+ 12:00 meio dia
+ </text>
+ <text name="WL3pm">
+ 3:00 da tarde
+ </text>
+ <text name="WL6pm">
+ 6:00 da tarde
+ </text>
+ <text name="WL9pm">
+ 9:00 da noite
+ </text>
+ <text name="WL12am2">
+ 12:00 meia noite
+ </text>
+ <button label="Add Key" label_selected="Adicionar chave" name="WLAddKey"/>
+ <button label="Apagar chave" label_selected="Apagar chave" name="WLDeleteKey"/>
+ <text name="WLCurKeyFrameText">
+ Configurações de Quadro-chave:
+ </text>
+ <text name="WLCurKeyTimeText">
+ Tempo-chave:
+ </text>
+ <spinner label="Hora" name="WLCurKeyHour"/>
+ <spinner label="Minutos" name="WLCurKeyMin"/>
+ <text name="WLCurKeyTimeText2">
+ Ajuste-chave:
+ </text>
+ <combo_box label="Ajuste" name="WLKeyPresets"/>
+ <text name="DayCycleText">
+ Grudar:
+ </text>
+ <combo_box label="5 minutos" name="WLSnapOptions"/>
+ <text name="DayCycleText2">
+ Duração do Ciclo:
+ </text>
+ <spinner label="Hora" name="WLLengthOfDayHour"/>
+ <spinner label="Minuto" name="WLLengthOfDayMin"/>
+ <spinner label="Segundo" name="WLLengthOfDaySec"/>
+ <text name="DayCycleText3">
+ Prévia:
+ </text>
+ <button label="Tocar" label_selected="Tocar" name="WLAnimSky"/>
+ <button label="Pare!" label_selected="Pare" name="WLStopAnimSky"/>
+ <button label="Usar o horário da Propriedade" label_selected="Ir para o horário da Propriedade" name="WLUseLindenTime"/>
+ <button label="Salvar o Dia teste" label_selected="Salvar o Dia teste" name="WLSaveDayCycle"/>
+ <button label="Carregar o Dia teste" label_selected="Carregar o Dia teste" name="WLLoadDayCycle"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_env_settings.xml b/indra/newview/skins/default/xui/pt/floater_env_settings.xml
index afefae71e6..b1c85a32b7 100644
--- a/indra/newview/skins/default/xui/pt/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_env_settings.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="Editor do Ambiente">
- <text name="EnvTimeText">
- Hora do Dia
- </text>
- <text name="EnvTimeText2">
- 12:00 PM
- </text>
- <text name="EnvCloudText">
- Cobertura de Nuvens
- </text>
- <text name="EnvWaterColorText">
- Cor da água
- </text>
- <color_swatch label="" name="EnvWaterColor" tool_tip="Clique para abrir o Editor de cores"/>
- <text name="EnvWaterFogText">
- Névoa da água
- </text>
- <button label="Usar hora da propriedade" name="EnvUseEstateTimeButton"/>
- <button label="Céu Avançado" name="EnvAdvancedSkyButton"/>
- <button label="Ãgua Avançada" name="EnvAdvancedWaterButton"/>
- <button label="?" name="EnvSettingsHelpButton"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="Editor do Ambiente">
+ <text name="EnvTimeText">
+ Hora do Dia
+ </text>
+ <text name="EnvTimeText2">
+ 12:00 PM
+ </text>
+ <text name="EnvCloudText">
+ Cobertura de Nuvens
+ </text>
+ <text name="EnvWaterColorText">
+ Cor da água
+ </text>
+ <color_swatch label="" name="EnvWaterColor" tool_tip="Clique para abrir o Editor de cores"/>
+ <text name="EnvWaterFogText">
+ Névoa da água
+ </text>
+ <button label="Usar hora da propriedade" name="EnvUseEstateTimeButton"/>
+ <button label="Céu Avançado" name="EnvAdvancedSkyButton"/>
+ <button label="Ãgua Avançada" name="EnvAdvancedWaterButton"/>
+ <button label="?" name="EnvSettingsHelpButton"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_gesture.xml b/indra/newview/skins/default/xui/pt/floater_gesture.xml
index 1fac88f7da..ac50f32dd1 100644
--- a/indra/newview/skins/default/xui/pt/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_gesture.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="gestures" title="Gestos Ativos">
- <text name="help_label">
- Clicar duas vezes no gesto para executar animações e sons.
- </text>
- <scroll_list name="gesture_list">
- <column label="Acionar" name="trigger"/>
- <column label="Chave" name="shortcut"/>
- <column label="Nome" name="name"/>
- </scroll_list>
- <button label="Novo" name="new_gesture_btn"/>
- <button label="Editar" name="edit_btn"/>
- <button label="Executar" name="play_btn"/>
- <button label="Parar" name="stop_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="gestures" title="Gestos Ativos">
+ <text name="help_label">
+ Clicar duas vezes no gesto para executar animações e sons.
+ </text>
+ <scroll_list name="gesture_list">
+ <column label="Acionar" name="trigger"/>
+ <column label="Chave" name="shortcut"/>
+ <column label="Nome" name="name"/>
+ </scroll_list>
+ <button label="Novo" name="new_gesture_btn"/>
+ <button label="Editar" name="edit_btn"/>
+ <button label="Executar" name="play_btn"/>
+ <button label="Parar" name="stop_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_god_tools.xml b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
index 9b94ec6908..27dad15215 100644
--- a/indra/newview/skins/default/xui/pt/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_god_tools.xml
@@ -1,106 +1,106 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="godtools floater" title="Ferramentas de Deus">
- <tab_container name="GodTools Tabs">
- <panel label="Grade" name="grid">
- <button label="Desconectar todos os usuários" label_selected="Desconectar todos os usuários" name="Kick all users"/>
- <button label="Limpar os cachês de visibilidade do mapa da região." label_selected="Limpar os cachês de visibilidade do mapa da região." name="Flush This Region's Map Visibility Caches"/>
- </panel>
- <panel label="Região" name="region">
- <text name="Sim Name:">
- Nome do Simulador:
- </text>
- <check_box label="Prelúdio" name="check prelude" tool_tip="Ajustar para tornar esta região um prelúdio."/>
- <check_box label="Fixar Sol" name="check fixed sun" tool_tip="Fixa a posição do sol (como em Região/Estados) > Terreno."/>
- <check_box label="Redefinir Home no teletransporte" name="check reset home" tool_tip="Quando um residente se teletransporta, redefine sua home para a posição de destino."/>
- <check_box label="VisÃvel" name="check visible" tool_tip="Ajustar para fazer essa região visÃvel para os não-deuses"/>
- <check_box label="Dano" name="check damage" tool_tip="Ajustar para permitir dano nesta região"/>
- <check_box label="Bloquear ratreamento do Tráfego" name="block dwell" tool_tip="Configure isto para fazer a região não computar o tráfego."/>
- <check_box label="Bloquear Terraform" name="block terraform" tool_tip="Ajustar para desabilitar as pessoas a terraplanarem seus terrenos"/>
- <check_box label="Sandbox" name="is sandbox" tool_tip="Alterar se esta região for uma sandbox."/>
- <button label="Nivelar o terreno" label_selected="Nivelar o Terreno" name="Bake Terrain" tool_tip="Salva o terreno atual como padrão."/>
- <button label="Reverter Terreno" label_selected="Reverter Terreno" name="Revert Terrain" tool_tip="Substituir o terreno atual pelo padrão."/>
- <button label="Trocar Terreno" label_selected="Trocar Terreno" name="Swap Terrain" tool_tip="Trocar o terreno atual pelo padrão."/>
- <text name="estate id">
- ID da Propriedade:
- </text>
- <text name="parent id">
- ID do Pai:
- </text>
- <line_editor name="parentestate" tool_tip="Esta é a propriedade pai para esta região"/>
- <text name="Grid Pos: ">
- Posição da Grade:
- </text>
- <line_editor name="gridposx" tool_tip="Esta é a posição x da grade para esta região"/>
- <line_editor name="gridposy" tool_tip="Esta é a posição y da grade para esta região"/>
- <text name="Redirect to Grid: ">
- Redirecionar para a Grade:
- </text>
- <text name="billable factor text">
- Fator cobrança:
- </text>
- <text name="land cost text">
- L$ por metros quadrados
- </text>
- <button label="Atualizar" label_selected="Atualizar" name="Refresh" tool_tip="Clique aqui para atualizar a informação acima."/>
- <button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Clique aqui para aplicar qualquer mudança acima"/>
- <button label="Selecionar Região" label_selected="Selecionar Região" name="Select Region" tool_tip="Selecionar toda a região com a ferramenta de terreno"/>
- <button label="Autosalvar Agora" label_selected="Autosalvar Agora" name="Autosave now" tool_tip="Salvar estado compactado para o diretório de gravação automática."/>
- </panel>
- <panel label="Objetos" name="objects">
- <text name="Sim Name:">
- Sim Nome:
- </text>
- <text name="region name">
- Welsh
- </text>
- <check_box label="Desativar Scripts" name="disable scripts" tool_tip="Ajustar para desativar todos os scripts da região"/>
- <check_box label="Desativar Colisões" name="disable collisions" tool_tip="Ajustar para desativar colisões de não-agentes nessa região"/>
- <check_box label="Desativar FÃsica" name="disable physics" tool_tip="Ajustar para desativar toda a fÃsica nessa região"/>
- <button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Clique aqui para aplicar todas as alterações acima."/>
- <button label="Ajustar Alvo" label_selected="Ajustar Alvo" name="Set Target" tool_tip="Configura o avatar alvo para deleção de objetos."/>
- <text name="target_avatar_name">
- (sem alvo)
- </text>
- <button label="Apagar objetos programados do alvo em outras terras" label_selected="Apagar objetos programados do alvo em outras terras" name="Delete Target's Scripted Objects On Others Land" tool_tip="Apagar todos os objetos programados possuÃdos pelo alvo nas terras fora do domÃnio do alvo. Objetos (sem cópia) irão retornar."/>
- <button label="Apagar objetos programados do Alvo em qualquer terreno" label_selected="Apagar objetos programados do Alvo em qualquer terreno" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Apagar todos os objetos programados do alvo nesta região. Objetos (sem cópia) irão retornar."/>
- <button label="Apagar *TODOS* os objetos do alvo" label_selected="Apagar *TODOS* os objetos do alvo" name="Delete *ALL* Of Target's Objects" tool_tip="Apagar todos os objetos possuÃdos pelo alvo nesta região. Objetos (sem cópia) objetos irão retornar."/>
- <button label="Pegar os maiores colidentes" label_selected="Pegar os maiores colidentes" name="Get Top Colliders" tool_tip="Pega a lista de objetos que estão experimentando as chamadas mais freqüentes."/>
- <button label="Pegar os scripts principais" label_selected="Pegar os scripts principais" name="Get Top Scripts" tool_tip="Pegar a lista de objetos programados com a maior duração em tempo de execução."/>
- <button label="Informações de Scripts" label_selected="Informações de Scripts" name="Scripts digest" tool_tip="Pega uma lista de todos os scripts e o número de ocorrências de cada um."/>
- </panel>
- <panel label="Requisição" name="request">
- <text name="Destination:">
- Destino:
- </text>
- <combo_box name="destination">
- <combo_item name="Selection">
- Seleção
- </combo_item>
- <combo_item name="AgentRegion">
- Região do Agente
- </combo_item>
- </combo_box>
- <text name="Request:">
- Requisição:
- </text>
- <combo_box name="request">
- <combo_item name="colliders<steps>">
- Passos de Colisão
- </combo_item>
- <combo_item name="scripts<count>,<optionalpattern>">
- Contagem de scripts, padrão opcional
- </combo_item>
- <combo_item name="objects<pattern>">
- Padrão de Objetos
- </combo_item>
- <combo_item name="rez<asset_id>">
- rez <asset_id>
- </combo_item>
- </combo_box>
- <text name="Parameter:">
- Parametro:
- </text>
- <button label="Fazer Requisição" label_selected="Fazer Requisição" name="Make Request"/>
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="godtools floater" title="Ferramentas de Deus">
+ <tab_container name="GodTools Tabs">
+ <panel label="Grade" name="grid">
+ <button label="Desconectar todos os usuários" label_selected="Desconectar todos os usuários" name="Kick all users"/>
+ <button label="Limpar os cachês de visibilidade do mapa da região." label_selected="Limpar os cachês de visibilidade do mapa da região." name="Flush This Region's Map Visibility Caches"/>
+ </panel>
+ <panel label="Região" name="region">
+ <text name="Sim Name:">
+ Nome do Simulador:
+ </text>
+ <check_box label="Prelúdio" name="check prelude" tool_tip="Ajustar para tornar esta região um prelúdio."/>
+ <check_box label="Fixar Sol" name="check fixed sun" tool_tip="Fixa a posição do sol (como em Região/Estados) > Terreno."/>
+ <check_box label="Redefinir Home no teletransporte" name="check reset home" tool_tip="Quando um residente se teletransporta, redefine sua home para a posição de destino."/>
+ <check_box label="VisÃvel" name="check visible" tool_tip="Ajustar para fazer essa região visÃvel para os não-deuses"/>
+ <check_box label="Dano" name="check damage" tool_tip="Ajustar para permitir dano nesta região"/>
+ <check_box label="Bloquear ratreamento do Tráfego" name="block dwell" tool_tip="Configure isto para fazer a região não computar o tráfego."/>
+ <check_box label="Bloquear Terraform" name="block terraform" tool_tip="Ajustar para desabilitar as pessoas a terraplanarem seus terrenos"/>
+ <check_box label="Sandbox" name="is sandbox" tool_tip="Alterar se esta região for uma sandbox."/>
+ <button label="Nivelar o terreno" label_selected="Nivelar o Terreno" name="Bake Terrain" tool_tip="Salva o terreno atual como padrão."/>
+ <button label="Reverter Terreno" label_selected="Reverter Terreno" name="Revert Terrain" tool_tip="Substituir o terreno atual pelo padrão."/>
+ <button label="Trocar Terreno" label_selected="Trocar Terreno" name="Swap Terrain" tool_tip="Trocar o terreno atual pelo padrão."/>
+ <text name="estate id">
+ ID da Propriedade:
+ </text>
+ <text name="parent id">
+ ID do Pai:
+ </text>
+ <line_editor name="parentestate" tool_tip="Esta é a propriedade pai para esta região"/>
+ <text name="Grid Pos: ">
+ Posição da Grade:
+ </text>
+ <line_editor name="gridposx" tool_tip="Esta é a posição x da grade para esta região"/>
+ <line_editor name="gridposy" tool_tip="Esta é a posição y da grade para esta região"/>
+ <text name="Redirect to Grid: ">
+ Redirecionar para a Grade:
+ </text>
+ <text name="billable factor text">
+ Fator cobrança:
+ </text>
+ <text name="land cost text">
+ L$ por metros quadrados
+ </text>
+ <button label="Atualizar" label_selected="Atualizar" name="Refresh" tool_tip="Clique aqui para atualizar a informação acima."/>
+ <button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Clique aqui para aplicar qualquer mudança acima"/>
+ <button label="Selecionar Região" label_selected="Selecionar Região" name="Select Region" tool_tip="Selecionar toda a região com a ferramenta de terreno"/>
+ <button label="Autosalvar Agora" label_selected="Autosalvar Agora" name="Autosave now" tool_tip="Salvar estado compactado para o diretório de gravação automática."/>
+ </panel>
+ <panel label="Objetos" name="objects">
+ <text name="Sim Name:">
+ Sim Nome:
+ </text>
+ <text name="region name">
+ Welsh
+ </text>
+ <check_box label="Desativar Scripts" name="disable scripts" tool_tip="Ajustar para desativar todos os scripts da região"/>
+ <check_box label="Desativar Colisões" name="disable collisions" tool_tip="Ajustar para desativar colisões de não-agentes nessa região"/>
+ <check_box label="Desativar FÃsica" name="disable physics" tool_tip="Ajustar para desativar toda a fÃsica nessa região"/>
+ <button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Clique aqui para aplicar todas as alterações acima."/>
+ <button label="Ajustar Alvo" label_selected="Ajustar Alvo" name="Set Target" tool_tip="Configura o avatar alvo para deleção de objetos."/>
+ <text name="target_avatar_name">
+ (sem alvo)
+ </text>
+ <button label="Apagar objetos programados do alvo em outras terras" label_selected="Apagar objetos programados do alvo em outras terras" name="Delete Target's Scripted Objects On Others Land" tool_tip="Apagar todos os objetos programados possuÃdos pelo alvo nas terras fora do domÃnio do alvo. Objetos (sem cópia) irão retornar."/>
+ <button label="Apagar objetos programados do Alvo em qualquer terreno" label_selected="Apagar objetos programados do Alvo em qualquer terreno" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Apagar todos os objetos programados do alvo nesta região. Objetos (sem cópia) irão retornar."/>
+ <button label="Apagar *TODOS* os objetos do alvo" label_selected="Apagar *TODOS* os objetos do alvo" name="Delete *ALL* Of Target's Objects" tool_tip="Apagar todos os objetos possuÃdos pelo alvo nesta região. Objetos (sem cópia) objetos irão retornar."/>
+ <button label="Pegar os maiores colidentes" label_selected="Pegar os maiores colidentes" name="Get Top Colliders" tool_tip="Pega a lista de objetos que estão experimentando as chamadas mais freqüentes."/>
+ <button label="Pegar os scripts principais" label_selected="Pegar os scripts principais" name="Get Top Scripts" tool_tip="Pegar a lista de objetos programados com a maior duração em tempo de execução."/>
+ <button label="Informações de Scripts" label_selected="Informações de Scripts" name="Scripts digest" tool_tip="Pega uma lista de todos os scripts e o número de ocorrências de cada um."/>
+ </panel>
+ <panel label="Requisição" name="request">
+ <text name="Destination:">
+ Destino:
+ </text>
+ <combo_box name="destination">
+ <combo_box.item name="Selection">
+ Seleção
+ </combo_box.item>
+ <combo_box.item name="AgentRegion">
+ Região do Agente
+ </combo_box.item>
+ </combo_box>
+ <text name="Request:">
+ Requisição:
+ </text>
+ <combo_box name="request">
+ <combo_box.item name="colliders<steps>">
+ Passos de Colisão
+ </combo_box.item>
+ <combo_box.item name="scripts<count>,<optionalpattern>">
+ Contagem de scripts, padrão opcional
+ </combo_box.item>
+ <combo_box.item name="objects<pattern>">
+ Padrão de Objetos
+ </combo_box.item>
+ <combo_box.item name="rez<asset_id>">
+ rez <asset_id>
+ </combo_box.item>
+ </combo_box>
+ <text name="Parameter:">
+ Parametro:
+ </text>
+ <button label="Fazer Requisição" label_selected="Fazer Requisição" name="Make Request"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
index c395144d4a..10ed0339a3 100644
--- a/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_hardware_settings.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Hardware Settings Floater" title="Ajustes de Hardware">
- <text name="Filtering:">
- Filtragem:
- </text>
- <check_box label="Filtragem Anisotrópica (mais lento quando habilitada)" name="ani"/>
- <text name="Antialiasing:">
- Suavização:
- </text>
- <combo_box label="Suavização" name="fsaa" width="94">
- <combo_item name="FSAADisabled">
- Desabilitado
- </combo_item>
- <combo_item name="2x">
- 2x
- </combo_item>
- <combo_item name="4x">
- 4x
- </combo_item>
- <combo_item name="8x">
- 8x
- </combo_item>
- <combo_item name="16x">
- 16x
- </combo_item>
- </combo_box>
- <spinner label="Gama:" name="gamma"/>
- <text name="(brightness, lower is brighter)">
- (brilho, quanto menor, mais brilho, 0=usar padrão)
- </text>
- <text name="Enable VBO:">
- Habilitar VBO:
- </text>
- <check_box label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/>
- <slider label="Memória de Textura (MB):" name="GrapicsCardTextureMemory" tool_tip="Quantidade de memória a se reservar para texturas. Usa por padrão, a Memória da Placa de VÃdeo. Sua redução pode aumentar a performance mas pode também deixar as texturas borradas."/>
- <spinner label="Relação de Distância de Nevoeiro:" name="fog"/>
- <button label="OK" label_selected="OK" name="OK"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Hardware Settings Floater" title="Ajustes de Hardware">
+ <text name="Filtering:">
+ Filtragem:
+ </text>
+ <check_box label="Filtragem Anisotrópica (mais lento quando habilitada)" name="ani"/>
+ <text name="Antialiasing:">
+ Suavização:
+ </text>
+ <combo_box label="Suavização" name="fsaa" width="94">
+ <combo_item name="FSAADisabled">
+ Desabilitado
+ </combo_item>
+ <combo_item name="2x">
+ 2x
+ </combo_item>
+ <combo_item name="4x">
+ 4x
+ </combo_item>
+ <combo_item name="8x">
+ 8x
+ </combo_item>
+ <combo_item name="16x">
+ 16x
+ </combo_item>
+ </combo_box>
+ <spinner label="Gama:" name="gamma"/>
+ <text name="(brightness, lower is brighter)">
+ (brilho, quanto menor, mais brilho, 0=usar padrão)
+ </text>
+ <text name="Enable VBO:">
+ Habilitar VBO:
+ </text>
+ <check_box label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/>
+ <slider label="Memória de Textura (MB):" name="GrapicsCardTextureMemory" tool_tip="Quantidade de memória a se reservar para texturas. Usa por padrão, a Memória da Placa de VÃdeo. Sua redução pode aumentar a performance mas pode também deixar as texturas borradas."/>
+ <spinner label="Relação de Distância de Nevoeiro:" name="fog"/>
+ <button label="OK" label_selected="OK" name="OK"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_hud.xml b/indra/newview/skins/default/xui/pt/floater_hud.xml
index c75867956b..d31bcedf05 100644
--- a/indra/newview/skins/default/xui/pt/floater_hud.xml
+++ b/indra/newview/skins/default/xui/pt/floater_hud.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_hud" title="Tutorial"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_hud" title="Tutorial"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_im.xml b/indra/newview/skins/default/xui/pt/floater_im.xml
index 3df47cf4cf..75c3409339 100644
--- a/indra/newview/skins/default/xui/pt/floater_im.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im.xml
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="im_floater" title="Mensagem Instantânea">
- <string name="only_user_message">
- Você é o único usuário desta sessão.
- </string>
- <string name="offline_message">
- [FIRST] [LAST] está offline.
- </string>
- <string name="invite_message">
- Clique no botão [BUTTON NAME] para aceitar/ conectar a este bate-papo em voz.
- </string>
- <string name="muted_message">
- Você emudeceu este residente. Enviar uma mensagem vai automaticamente reativá-lo novamente.
- </string>
- <string name="generic_request_error">
- Erro na requisição, por favor, tente novamente.
- </string>
- <string name="insufficient_perms_error">
- Você não tem permissões suficientes.
- </string>
- <string name="session_does_not_exist_error">
- A sessão deixou de existir
- </string>
- <string name="no_ability_error">
- Você não possui esta habilidade.
- </string>
- <string name="not_a_mod_error">
- Você não é um moderador de sessão.
- </string>
- <string name="muted_error">
- Um moderador do grupo desabilitou seu bate-papo em texto.
- </string>
- <string name="add_session_event">
- Não foi possÃvel adicionar usuários na sessão de bate-papo com [RECIPIENT].
- </string>
- <string name="message_session_event">
- Não foi possÃvel enviar sua mensagem na sessão de bate- papo com [RECIPIENT].
- </string>
- <string name="removed_from_group">
- Você foi removido do grupo.
- </string>
- <string name="close_on_no_ability">
- Você não possui mais a habilidade de estar na sessão de bate-papo.
- </string>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="im_floater" title="Mensagem Instantânea">
+ <string name="only_user_message">
+ Você é o único usuário desta sessão.
+ </string>
+ <string name="offline_message">
+ [FIRST] [LAST] está offline.
+ </string>
+ <string name="invite_message">
+ Clique no botão [BUTTON NAME] para aceitar/ conectar a este bate-papo em voz.
+ </string>
+ <string name="muted_message">
+ Você emudeceu este residente. Enviar uma mensagem vai automaticamente reativá-lo novamente.
+ </string>
+ <string name="generic_request_error">
+ Erro na requisição, por favor, tente novamente.
+ </string>
+ <string name="insufficient_perms_error">
+ Você não tem permissões suficientes.
+ </string>
+ <string name="session_does_not_exist_error">
+ A sessão deixou de existir
+ </string>
+ <string name="no_ability_error">
+ Você não possui esta habilidade.
+ </string>
+ <string name="not_a_mod_error">
+ Você não é um moderador de sessão.
+ </string>
+ <string name="muted_error">
+ Um moderador do grupo desabilitou seu bate-papo em texto.
+ </string>
+ <string name="add_session_event">
+ Não foi possÃvel adicionar usuários na sessão de bate-papo com [RECIPIENT].
+ </string>
+ <string name="message_session_event">
+ Não foi possÃvel enviar sua mensagem na sessão de bate- papo com [RECIPIENT].
+ </string>
+ <string name="removed_from_group">
+ Você foi removido do grupo.
+ </string>
+ <string name="close_on_no_ability">
+ Você não possui mais a habilidade de estar na sessão de bate-papo.
+ </string>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_image_preview.xml b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
index 53f224a8a8..f1192e860b 100644
--- a/indra/newview/skins/default/xui/pt/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_image_preview.xml
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Image Preview" title="">
- <text name="name_label">
- Nome:
- </text>
- <text name="description_label">
- Descrição:
- </text>
- <text name="preview_label">
- Prévia da Imagem como:
- </text>
- <combo_box label="Tipo de Roupas" name="clothing_type_combo">
- <combo_item name="Image">
- Imagem
- </combo_item>
- <combo_item name="Hair">
- Cabelo
- </combo_item>
- <combo_item name="FemaleHead">
- Cabeça Feminina
- </combo_item>
- <combo_item name="FemaleUpperBody">
- Parte Superior do Corpo Feminino
- </combo_item>
- <combo_item name="FemaleLowerBody">
- Parte Inferior do Corpo Feminino
- </combo_item>
- <combo_item name="MaleHead">
- Cabeça Masculina
- </combo_item>
- <combo_item name="MaleUpperBody">
- Parte Superior do Corpo Masculino
- </combo_item>
- <combo_item name="MaleLowerBody">
- Parte Inferiro do Corpo Masculino
- </combo_item>
- <combo_item name="Skirt">
- Saia
- </combo_item>
- <combo_item name="SculptedPrim">
- Primitiva Esculpida
- </combo_item>
- </combo_box>
- <text name="bad_image_text">
- Incapaz de ler a imagem.
-
-Tente salvar a imagem como 24 bit Targa (.tga).
- </text>
- <check_box label="Usar compressão com menor perda" name="lossless_check"/>
- <button label="Cancelar" name="cancel_btn"/>
- <button label="Upload (L$[AMOUNT])" name="ok_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Image Preview" title="">
+ <text name="name_label">
+ Nome:
+ </text>
+ <text name="description_label">
+ Descrição:
+ </text>
+ <text name="preview_label">
+ Prévia da Imagem como:
+ </text>
+ <combo_box label="Tipo de Roupas" name="clothing_type_combo">
+ <combo_box.item name="Image">
+ Imagem
+ </combo_box.item>
+ <combo_box.item name="Hair">
+ Cabelo
+ </combo_box.item>
+ <combo_box.item name="FemaleHead">
+ Cabeça Feminina
+ </combo_box.item>
+ <combo_box.item name="FemaleUpperBody">
+ Parte Superior do Corpo Feminino
+ </combo_box.item>
+ <combo_box.item name="FemaleLowerBody">
+ Parte Inferior do Corpo Feminino
+ </combo_box.item>
+ <combo_box.item name="MaleHead">
+ Cabeça Masculina
+ </combo_box.item>
+ <combo_box.item name="MaleUpperBody">
+ Parte Superior do Corpo Masculino
+ </combo_box.item>
+ <combo_box.item name="MaleLowerBody">
+ Parte Inferiro do Corpo Masculino
+ </combo_box.item>
+ <combo_box.item name="Skirt">
+ Saia
+ </combo_box.item>
+ <combo_box.item name="SculptedPrim">
+ Primitiva Esculpida
+ </combo_box.item>
+ </combo_box>
+ <text name="bad_image_text">
+ Incapaz de ler a imagem.
+
+Tente salvar a imagem como 24 bit Targa (.tga).
+ </text>
+ <check_box label="Usar compressão com menor perda" name="lossless_check"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Upload (L$[AMOUNT])" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inspect.xml b/indra/newview/skins/default/xui/pt/floater_inspect.xml
index a37c8d7c5d..f3d4b0f33f 100644
--- a/indra/newview/skins/default/xui/pt/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inspect.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="inspect" title="Inspecionar Objeto">
- <scroll_list name="object_list" tool_tip="Selecione um objeto nesta lista para destacá-lo in-world">
- <column label="Nome do Objeto" name="object_name"/>
- <column label="Nome do Proprietário" name="owner_name"/>
- <column label="Nome do Criador" name="creator_name"/>
- <column label="Data de Criação" name="creation_date"/>
- </scroll_list>
- <button label="Ver Perfil do Proprietário..." label_selected="" name="button owner" tool_tip="Veja o perfil do proprietário do objeto destacado"/>
- <button label="Ver perfil do criador..." label_selected="" name="button creator" tool_tip="Veja o perfil do criador original do objeto destacado"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="inspect" title="Inspecionar Objeto">
+ <scroll_list name="object_list" tool_tip="Selecione um objeto nesta lista para destacá-lo in-world">
+ <column label="Nome do Objeto" name="object_name"/>
+ <column label="Nome do Proprietário" name="owner_name"/>
+ <column label="Nome do Criador" name="creator_name"/>
+ <column label="Data de Criação" name="creation_date"/>
+ </scroll_list>
+ <button label="Ver Perfil do Proprietário..." label_selected="" name="button owner" tool_tip="Veja o perfil do proprietário do objeto destacado"/>
+ <button label="Ver perfil do criador..." label_selected="" name="button creator" tool_tip="Veja o perfil do criador original do objeto destacado"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory.xml b/indra/newview/skins/default/xui/pt/floater_inventory.xml
index b2ae813e6f..8a06fefe3c 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory.xml
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="Inventário">
- <search_editor label="Escreva aqui para busca" name="inventory search editor"/>
- <tab_container name="inventory filter tabs">
- <inventory_panel label="Todos os Itens" name="All Items"/>
- <inventory_panel label="Itens Recentes" name="Recent Items"/>
- </tab_container>
- <menu_bar name="Inventory Menu">
- <menu label="Arquivo" name="File">
- <menu_item_call label="Abrir" name="Open"/>
- <menu_item_call label="Nova Janela" name="New Window"/>
- <menu_item_call label="Mostrar Filtros" name="Show Filters"/>
- <menu_item_call label="Redefinir Filtros" name="Reset Current"/>
- <menu_item_call label="Fechar Todas as Pastas" name="Close All Folders"/>
- <menu_item_call label="Limpar Lixeira" name="Empty Trash"/>
- </menu>
- <menu label="Criar" name="Create">
- <menu_item_call label="Nova Pasta" name="New Folder"/>
- <menu_item_call label="Novo Script" name="New Script"/>
- <menu_item_call label="Nova Nota" name="New Note"/>
- <menu_item_call label="Novo Gesto" name="New Gesture"/>
- <menu label="Nova Roupa" name="New Clothes">
- <menu_item_call label="Nova Camisa" name="New Shirt"/>
- <menu_item_call label="Nova Calça" name="New Pants"/>
- <menu_item_call label="Novos Sapatos" name="New Shoes"/>
- <menu_item_call label="Novas Meias" name="New Socks"/>
- <menu_item_call label="Nova Jaqueta" name="New Jacket"/>
- <menu_item_call label="Nova Saia" name="New Skirt"/>
- <menu_item_call label="Novas Luvas" name="New Gloves"/>
- <menu_item_call label="Nova Anágua" name="New Undershirt"/>
- <menu_item_call label="Novas Roupas de Baixo" name="New Underpants"/>
- </menu>
- <menu label="Parte do corpo" name="New Body Parts">
- <menu_item_call label="Nova Forma" name="New Shape"/>
- <menu_item_call label="Nova Pele" name="New Skin"/>
- <menu_item_call label="Novo Cabelo" name="New Hair"/>
- <menu_item_call label="Novos Olhos" name="New Eyes"/>
- </menu>
- </menu>
- <menu label="Ordenar" name="Sort">
- <menu_item_check label="Por Nome" name="By Name"/>
- <menu_item_check label="Por Data" name="By Date"/>
- <menu_item_check label="Pastas Sempre por Nome" name="Folders Always By Name"/>
- <menu_item_check label="Pastas do sistema primeiro" name="System Folders To Top"/>
- </menu>
- </menu_bar>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory" title="Inventário">
+ <search_editor label="Escreva aqui para busca" name="inventory search editor"/>
+ <tab_container name="inventory filter tabs">
+ <inventory_panel label="Todos os Itens" name="All Items"/>
+ <inventory_panel label="Itens Recentes" name="Recent Items"/>
+ </tab_container>
+ <menu_bar name="Inventory Menu">
+ <menu label="Arquivo" name="File">
+ <menu_item_call label="Abrir" name="Open"/>
+ <menu_item_call label="Nova Janela" name="New Window"/>
+ <menu_item_call label="Mostrar Filtros" name="Show Filters"/>
+ <menu_item_call label="Redefinir Filtros" name="Reset Current"/>
+ <menu_item_call label="Fechar Todas as Pastas" name="Close All Folders"/>
+ <menu_item_call label="Limpar Lixeira" name="Empty Trash"/>
+ </menu>
+ <menu label="Criar" name="Create">
+ <menu_item_call label="Nova Pasta" name="New Folder"/>
+ <menu_item_call label="Novo Script" name="New Script"/>
+ <menu_item_call label="Nova Nota" name="New Note"/>
+ <menu_item_call label="Novo Gesto" name="New Gesture"/>
+ <menu label="Nova Roupa" name="New Clothes">
+ <menu_item_call label="Nova Camisa" name="New Shirt"/>
+ <menu_item_call label="Nova Calça" name="New Pants"/>
+ <menu_item_call label="Novos Sapatos" name="New Shoes"/>
+ <menu_item_call label="Novas Meias" name="New Socks"/>
+ <menu_item_call label="Nova Jaqueta" name="New Jacket"/>
+ <menu_item_call label="Nova Saia" name="New Skirt"/>
+ <menu_item_call label="Novas Luvas" name="New Gloves"/>
+ <menu_item_call label="Nova Anágua" name="New Undershirt"/>
+ <menu_item_call label="Novas Roupas de Baixo" name="New Underpants"/>
+ </menu>
+ <menu label="Parte do corpo" name="New Body Parts">
+ <menu_item_call label="Nova Forma" name="New Shape"/>
+ <menu_item_call label="Nova Pele" name="New Skin"/>
+ <menu_item_call label="Novo Cabelo" name="New Hair"/>
+ <menu_item_call label="Novos Olhos" name="New Eyes"/>
+ </menu>
+ </menu>
+ <menu label="Ordenar" name="Sort">
+ <menu_item_check label="Por Nome" name="By Name"/>
+ <menu_item_check label="Por Data" name="By Date"/>
+ <menu_item_check label="Pastas Sempre por Nome" name="Folders Always By Name"/>
+ <menu_item_check label="Pastas do sistema primeiro" name="System Folders To Top"/>
+ </menu>
+ </menu_bar>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
index 4c24ef5d1b..3711a4c871 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_item_properties.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="item properties" title="Propriedades do Item de Inventário">
- <text name="LabelItemNameTitle">
- Nome:
- </text>
- <text name="LabelItemDescTitle">
- Descrição:
- </text>
- <text name="LabelCreatorTitle">
- Criador:
- </text>
- <text name="LabelCreatorName">
- Nicole Linden
- </text>
- <button label="Perfil..." label_selected="" name="BtnCreator"/>
- <text name="LabelOwnerTitle">
- Dono:
- </text>
- <text name="LabelOwnerName">
- Thrax Linden
- </text>
- <button label="Perfil..." label_selected="" name="BtnOwner"/>
- <text name="LabelAcquiredTitle">
- Adquirido:
- </text>
- <text name="LabelAcquiredDate">
- Qua Mai 24 12:50:46 2006
- </text>
- <text name="OwnerLabel">
- Você pode:
- </text>
- <check_box label="Modificar" name="CheckOwnerModify"/>
- <check_box label="Copiar" name="CheckOwnerCopy"/>
- <check_box label="Revender/Doar" name="CheckOwnerTransfer"/>
- <text name="BaseMaskDebug">
- B:
- </text>
- <text name="OwnerMaskDebug">
- O:
- </text>
- <text name="GroupMaskDebug">
- G:
- </text>
- <text name="EveryoneMaskDebug">
- E:
- </text>
- <text name="NextMaskDebug">
- N:
- </text>
- <check_box label="Compartilhar com o grupo" name="CheckShareWithGroup"/>
- <check_box label="Permitir qualquer um copiar" name="CheckEveryoneCopy"/>
- <text name="NextOwnerLabel">
- Próximo dono pode:
- </text>
- <check_box label="Modificar" name="CheckNextOwnerModify"/>
- <check_box label="Copiar" name="CheckNextOwnerCopy"/>
- <check_box label="Revender/Doar" name="CheckNextOwnerTransfer"/>
- <text name="SaleLabel">
- Marcar Item:
- </text>
- <check_box label="À venda" name="CheckPurchase"/>
- <radio_group name="RadioSaleType">
- <radio_item name="radio">
- Original
- </radio_item>
- <radio_item name="radio2">
- Cópia
- </radio_item>
- </radio_group>
- <text name="TextPrice">
- Price: L$
- </text>
- <string name="unknown">
- (desconhecido)
- </string>
- <string name="public">
- (público)
- </string>
- <string name="you_can">
- Você pode:
- </string>
- <string name="owner_can">
- Proprietário pode :
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="item properties" title="Propriedades do Item de Inventário">
+ <text name="LabelItemNameTitle">
+ Nome:
+ </text>
+ <text name="LabelItemDescTitle">
+ Descrição:
+ </text>
+ <text name="LabelCreatorTitle">
+ Criador:
+ </text>
+ <text name="LabelCreatorName">
+ Nicole Linden
+ </text>
+ <button label="Perfil..." label_selected="" name="BtnCreator"/>
+ <text name="LabelOwnerTitle">
+ Dono:
+ </text>
+ <text name="LabelOwnerName">
+ Thrax Linden
+ </text>
+ <button label="Perfil..." label_selected="" name="BtnOwner"/>
+ <text name="LabelAcquiredTitle">
+ Adquirido:
+ </text>
+ <text name="LabelAcquiredDate">
+ Qua Mai 24 12:50:46 2006
+ </text>
+ <text name="OwnerLabel">
+ Você pode:
+ </text>
+ <check_box label="Modificar" name="CheckOwnerModify"/>
+ <check_box label="Copiar" name="CheckOwnerCopy"/>
+ <check_box label="Revender/Doar" name="CheckOwnerTransfer"/>
+ <text name="BaseMaskDebug">
+ B:
+ </text>
+ <text name="OwnerMaskDebug">
+ O:
+ </text>
+ <text name="GroupMaskDebug">
+ G:
+ </text>
+ <text name="EveryoneMaskDebug">
+ E:
+ </text>
+ <text name="NextMaskDebug">
+ N:
+ </text>
+ <check_box label="Compartilhar com o grupo" name="CheckShareWithGroup"/>
+ <check_box label="Permitir qualquer um copiar" name="CheckEveryoneCopy"/>
+ <text name="NextOwnerLabel">
+ Próximo dono pode:
+ </text>
+ <check_box label="Modificar" name="CheckNextOwnerModify"/>
+ <check_box label="Copiar" name="CheckNextOwnerCopy"/>
+ <check_box label="Revender/Doar" name="CheckNextOwnerTransfer"/>
+ <text name="SaleLabel">
+ Marcar Item:
+ </text>
+ <check_box label="À venda" name="CheckPurchase"/>
+ <radio_group name="RadioSaleType">
+ <radio_item name="radio">
+ Original
+ </radio_item>
+ <radio_item name="radio2">
+ Cópia
+ </radio_item>
+ </radio_group>
+ <text name="TextPrice">
+ Price: L$
+ </text>
+ <string name="unknown">
+ (desconhecido)
+ </string>
+ <string name="public">
+ (público)
+ </string>
+ <string name="you_can">
+ Você pode:
+ </string>
+ <string name="owner_can">
+ Proprietário pode :
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
index d2340de471..634e236650 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory Finder" title="itens_de_inventário_recentes">
- <check_box label="Animação" name="check_animation"/>
- <check_box label="Cartões de chamadas" name="check_calling_card"/>
- <check_box label="Roupas" name="check_clothing"/>
- <check_box label="Gestos" name="check_gesture"/>
- <check_box label="Landmarks" name="check_landmark"/>
- <check_box label="Anotações" name="check_notecard"/>
- <check_box label="Objetos" name="check_object"/>
- <check_box label="Scripts" name="check_script"/>
- <check_box label="Sons" name="check_sound"/>
- <check_box label="Texturas" name="check_texture"/>
- <check_box label="Fotos" name="check_snapshot"/>
- <button label="Tudo" label_selected="Tudo" name="All"/>
- <button label="Nenhum" label_selected="Nenhum" name="None"/>
- <check_box label="Sempre mostrar as pastas" name="check_show_empty"/>
- <check_box label="Desde o Logoff" name="check_since_logoff"/>
- <text length="1" name="- OR -" type="string">
- - OU -
- </text>
- <spinner label="Horas Atrás" name="spin_hours_ago"/>
- <spinner label="Dias Atrás" name="spin_days_ago"/>
- <button label="Fechar" label_selected="Fechar" name="Close"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory Finder" title="itens_de_inventário_recentes">
+ <check_box label="Animação" name="check_animation"/>
+ <check_box label="Cartões de chamadas" name="check_calling_card"/>
+ <check_box label="Roupas" name="check_clothing"/>
+ <check_box label="Gestos" name="check_gesture"/>
+ <check_box label="Landmarks" name="check_landmark"/>
+ <check_box label="Anotações" name="check_notecard"/>
+ <check_box label="Objetos" name="check_object"/>
+ <check_box label="Scripts" name="check_script"/>
+ <check_box label="Sons" name="check_sound"/>
+ <check_box label="Texturas" name="check_texture"/>
+ <check_box label="Fotos" name="check_snapshot"/>
+ <button label="Tudo" label_selected="Tudo" name="All"/>
+ <button label="Nenhum" label_selected="Nenhum" name="None"/>
+ <check_box label="Sempre mostrar as pastas" name="check_show_empty"/>
+ <check_box label="Desde o Logoff" name="check_since_logoff"/>
+ <text length="1" name="- OR -" type="string">
+ - OU -
+ </text>
+ <spinner label="Horas Atrás" name="spin_hours_ago"/>
+ <spinner label="Dias Atrás" name="spin_days_ago"/>
+ <button label="Fechar" label_selected="Fechar" name="Close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_joystick.xml b/indra/newview/skins/default/xui/pt/floater_joystick.xml
index eee08c1ade..90faa6bd05 100644
--- a/indra/newview/skins/default/xui/pt/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/pt/floater_joystick.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Joystick" title="Configuração do Joystick">
- <check_box name="enable_joystick">
- Habilitar Joystick:
- </check_box>
- <spinner label="Mapeamento do eixo X" name="JoystickAxis1"/>
- <spinner label="Mapeamento do eixo Y" name="JoystickAxis2"/>
- <spinner label="Mapeamento do Eixo Z" name="JoystickAxis0"/>
- <spinner label="Mapeamento da Elevação" name="JoystickAxis4"/>
- <spinner label="Mapeamento da Guinada" name="JoystickAxis5"/>
- <spinner label="Mapeamento da Rolagem" name="JoystickAxis3"/>
- <spinner label="Mapeamento do Zoom" name="JoystickAxis6"/>
- <check_box label="Zoom Direto" name="ZoomDirect"/>
- <check_box label="Cursor 3D" name="Cursor3D"/>
- <check_box label="NÃvel Automático" name="AutoLeveling"/>
- <text name="Control Modes:">
- Modos de Controle:
- </text>
- <check_box name="JoystickAvatarEnabled">
- Avatar
- </check_box>
- <check_box name="JoystickBuildEnabled">
- Construir
- </check_box>
- <check_box name="JoystickFlycamEnabled">
- Camera aérea
- </check_box>
- <text name="XScale">
- Escala X
- </text>
- <text name="YScale">
- Escala Y
- </text>
- <text name="ZScale">
- Escala Z
- </text>
- <text name="PitchScale">
- Escala de Elevação
- </text>
- <text name="YawScale">
- Escala da Guinada
- </text>
- <text name="RollScale">
- Escala de Rolagem
- </text>
- <text name="XDeadZone">
- Zona Morta X
- </text>
- <text name="YDeadZone">
- Zona Morta Y
- </text>
- <text name="ZDeadZone">
- Zona Morta Z
- </text>
- <text name="PitchDeadZone">
- Zona Morta da Elevação
- </text>
- <text name="YawDeadZone">
- Zona Morta da Guinada
- </text>
- <text name="RollDeadZone">
- Zona Morta de Rolagem
- </text>
- <text name="Feathering">
- Alisar
- </text>
- <text name="ZoomScale2">
- Escala de Zoom
- </text>
- <text name="ZoomDeadZone">
- Zona Morta de Zoom
- </text>
- <button label="Padrões do Navegador Espacial" name="SpaceNavigatorDefaults"/>
- <string name="JoystickMonitor">
- Monitor do Joystick
- </string>
- <string name="Axis">
- Eixo [NUM]
- </string>
- <string name="NoDevice">
- nenhum dispositivo detectado
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Joystick" title="Configuração do Joystick">
+ <check_box name="enable_joystick">
+ Habilitar Joystick:
+ </check_box>
+ <spinner label="Mapeamento do eixo X" name="JoystickAxis1"/>
+ <spinner label="Mapeamento do eixo Y" name="JoystickAxis2"/>
+ <spinner label="Mapeamento do Eixo Z" name="JoystickAxis0"/>
+ <spinner label="Mapeamento da Elevação" name="JoystickAxis4"/>
+ <spinner label="Mapeamento da Guinada" name="JoystickAxis5"/>
+ <spinner label="Mapeamento da Rolagem" name="JoystickAxis3"/>
+ <spinner label="Mapeamento do Zoom" name="JoystickAxis6"/>
+ <check_box label="Zoom Direto" name="ZoomDirect"/>
+ <check_box label="Cursor 3D" name="Cursor3D"/>
+ <check_box label="NÃvel Automático" name="AutoLeveling"/>
+ <text name="Control Modes:">
+ Modos de Controle:
+ </text>
+ <check_box name="JoystickAvatarEnabled">
+ Avatar
+ </check_box>
+ <check_box name="JoystickBuildEnabled">
+ Construir
+ </check_box>
+ <check_box name="JoystickFlycamEnabled">
+ Camera aérea
+ </check_box>
+ <text name="XScale">
+ Escala X
+ </text>
+ <text name="YScale">
+ Escala Y
+ </text>
+ <text name="ZScale">
+ Escala Z
+ </text>
+ <text name="PitchScale">
+ Escala de Elevação
+ </text>
+ <text name="YawScale">
+ Escala da Guinada
+ </text>
+ <text name="RollScale">
+ Escala de Rolagem
+ </text>
+ <text name="XDeadZone">
+ Zona Morta X
+ </text>
+ <text name="YDeadZone">
+ Zona Morta Y
+ </text>
+ <text name="ZDeadZone">
+ Zona Morta Z
+ </text>
+ <text name="PitchDeadZone">
+ Zona Morta da Elevação
+ </text>
+ <text name="YawDeadZone">
+ Zona Morta da Guinada
+ </text>
+ <text name="RollDeadZone">
+ Zona Morta de Rolagem
+ </text>
+ <text name="Feathering">
+ Alisar
+ </text>
+ <text name="ZoomScale2">
+ Escala de Zoom
+ </text>
+ <text name="ZoomDeadZone">
+ Zona Morta de Zoom
+ </text>
+ <button label="Padrões do Navegador Espacial" name="SpaceNavigatorDefaults"/>
+ <string name="JoystickMonitor">
+ Monitor do Joystick
+ </string>
+ <string name="Axis">
+ Eixo [NUM]
+ </string>
+ <string name="NoDevice">
+ nenhum dispositivo detectado
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
index 901e58efce..9dbad7099e 100644
--- a/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/pt/floater_lagmeter.xml
@@ -1,152 +1,152 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_lagmeter" title="Medidor de Atraso">
- <button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/>
- <text name="client">
- Cliente:
- </text>
- <text name="client_text">
- Normal
- </text>
- <button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/>
- <text name="network">
- Rede:
- </text>
- <text name="network_text">
- Normal
- </text>
- <button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/>
- <text name="server">
- Servidor:
- </text>
- <text name="server_text">
- Normal
- </text>
- <button label="?" name="server_help"/>
- <button label=">>" name="minimize"/>
- <string name="max_title_msg">
- Medidor de Atraso
- </string>
- <string name="max_width_px">
- 360
- </string>
- <string name="min_title_msg">
- Atraso
- </string>
- <string name="min_width_px">
- 90
- </string>
- <string name="client_text_msg">
- Cliente
- </string>
- <string name="client_frame_rate_critical_fps">
- 10
- </string>
- <string name="client_frame_rate_warning_fps">
- 15
- </string>
- <string name="client_frame_time_window_bg_msg">
- Normal, janela por baixo
- </string>
- <string name="client_frame_time_critical_msg">
- Taxa de quadros do Cliente abaixo de [CLIENT_FRAME_RATE_CRITICAL]
- </string>
- <string name="client_frame_time_warning_msg">
- Taxa de quadros do Cliente entre [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
- </string>
- <string name="client_frame_time_normal_msg">
- Normal
- </string>
- <string name="client_draw_distance_cause_msg">
- Causa possÃvel: Distância de desenho ajustada muito alta
- </string>
- <string name="client_texture_loading_cause_msg">
- Causa possÃvel: Carregamento de Imagens
- </string>
- <string name="client_texture_memory_cause_msg">
- Causa possÃvel: Muitas imagens na memória
- </string>
- <string name="client_complex_objects_cause_msg">
- Causa possÃvel: Muitos objetos complexos na cena
- </string>
- <string name="network_text_msg">
- Rede
- </string>
- <string name="network_packet_loss_critical_pct">
- 10
- </string>
- <string name="network_packet_loss_warning_pct">
- 5
- </string>
- <string name="network_packet_loss_critical_msg">
- Conexão está caindo para cerca de [NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
- </string>
- <string name="network_packet_loss_warning_msg">
- Conexão está caindo [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
- </string>
- <string name="network_performance_normal_msg">
- Normal
- </string>
- <string name="network_ping_critical_ms">
- 600
- </string>
- <string name="network_ping_warning_ms">
- 300
- </string>
- <string name="network_ping_critical_msg">
- Tempo de conexão de ping é cerca de [NETWORK_PING_CRITICAL] ms
- </string>
- <string name="network_ping_warning_msg">
- Tempo de conexão de ping é [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
- </string>
- <string name="network_packet_loss_cause_msg">
- PossÃvel conexão ruim ou 'Largura de Banda' escolhida muito alta.
- </string>
- <string name="network_ping_cause_msg">
- PossÃvel conexão ruim ou aplicativos compartilhando arquivos.
- </string>
- <string name="server_text_msg">
- Servidor
- </string>
- <string name="server_frame_rate_critical_fps">
- 20
- </string>
- <string name="server_frame_rate_warning_fps">
- 30
- </string>
- <string name="server_single_process_max_time_ms">
- 20
- </string>
- <string name="server_frame_time_critical_msg">
- Taxa de quadros do simulador abaixo de [SERVER_FRAME_RATE_CRITICAL]
- </string>
- <string name="server_frame_time_warning_msg">
- Taxa de quadros do simulador entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
- </string>
- <string name="server_frame_time_normal_msg">
- Normal
- </string>
- <string name="server_physics_cause_msg">
- Causa possÃvel: Muitos objetos fÃsicos
- </string>
- <string name="server_scripts_cause_msg">
- Causa possÃvel: Muitos objetos com scripts
- </string>
- <string name="server_net_cause_msg">
- Causa possÃvel: Muito tráfego na rede
- </string>
- <string name="server_agent_cause_msg">
- Causa possÃvel: Muitas pessoas se movendo na região
- </string>
- <string name="server_images_cause_msg">
- Causa possÃvel: Muitos cálculos de imagem
- </string>
- <string name="server_generic_cause_msg">
- Causa possÃvel: Carga no simulador muito pesada
- </string>
- <string name="smaller_label">
- >>
- </string>
- <string name="bigger_label">
- <<
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_lagmeter" title="Medidor de Atraso">
+ <button label="" label_selected="" name="client_lagmeter" tool_tip="Status de atraso no Cliente"/>
+ <text name="client">
+ Cliente:
+ </text>
+ <text name="client_text">
+ Normal
+ </text>
+ <button label="" label_selected="" name="network_lagmeter" tool_tip="Status de atraso na rede"/>
+ <text name="network">
+ Rede:
+ </text>
+ <text name="network_text">
+ Normal
+ </text>
+ <button label="" label_selected="" name="server_lagmeter" tool_tip="Status de atraso no servidor"/>
+ <text name="server">
+ Servidor:
+ </text>
+ <text name="server_text">
+ Normal
+ </text>
+ <button label="?" name="server_help"/>
+ <button label=">>" name="minimize"/>
+ <string name="max_title_msg">
+ Medidor de Atraso
+ </string>
+ <string name="max_width_px">
+ 360
+ </string>
+ <string name="min_title_msg">
+ Atraso
+ </string>
+ <string name="min_width_px">
+ 90
+ </string>
+ <string name="client_text_msg">
+ Cliente
+ </string>
+ <string name="client_frame_rate_critical_fps">
+ 10
+ </string>
+ <string name="client_frame_rate_warning_fps">
+ 15
+ </string>
+ <string name="client_frame_time_window_bg_msg">
+ Normal, janela por baixo
+ </string>
+ <string name="client_frame_time_critical_msg">
+ Taxa de quadros do Cliente abaixo de [CLIENT_FRAME_RATE_CRITICAL]
+ </string>
+ <string name="client_frame_time_warning_msg">
+ Taxa de quadros do Cliente entre [CLIENT_FRAME_RATE_CRITICAL] e [CLIENT_FRAME_RATE_WARNING]
+ </string>
+ <string name="client_frame_time_normal_msg">
+ Normal
+ </string>
+ <string name="client_draw_distance_cause_msg">
+ Causa possÃvel: Distância de desenho ajustada muito alta
+ </string>
+ <string name="client_texture_loading_cause_msg">
+ Causa possÃvel: Carregamento de Imagens
+ </string>
+ <string name="client_texture_memory_cause_msg">
+ Causa possÃvel: Muitas imagens na memória
+ </string>
+ <string name="client_complex_objects_cause_msg">
+ Causa possÃvel: Muitos objetos complexos na cena
+ </string>
+ <string name="network_text_msg">
+ Rede
+ </string>
+ <string name="network_packet_loss_critical_pct">
+ 10
+ </string>
+ <string name="network_packet_loss_warning_pct">
+ 5
+ </string>
+ <string name="network_packet_loss_critical_msg">
+ Conexão está caindo para cerca de [NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
+ </string>
+ <string name="network_packet_loss_warning_msg">
+ Conexão está caindo [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de pacotes
+ </string>
+ <string name="network_performance_normal_msg">
+ Normal
+ </string>
+ <string name="network_ping_critical_ms">
+ 600
+ </string>
+ <string name="network_ping_warning_ms">
+ 300
+ </string>
+ <string name="network_ping_critical_msg">
+ Tempo de conexão de ping é cerca de [NETWORK_PING_CRITICAL] ms
+ </string>
+ <string name="network_ping_warning_msg">
+ Tempo de conexão de ping é [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+ </string>
+ <string name="network_packet_loss_cause_msg">
+ PossÃvel conexão ruim ou 'Largura de Banda' escolhida muito alta.
+ </string>
+ <string name="network_ping_cause_msg">
+ PossÃvel conexão ruim ou aplicativos compartilhando arquivos.
+ </string>
+ <string name="server_text_msg">
+ Servidor
+ </string>
+ <string name="server_frame_rate_critical_fps">
+ 20
+ </string>
+ <string name="server_frame_rate_warning_fps">
+ 30
+ </string>
+ <string name="server_single_process_max_time_ms">
+ 20
+ </string>
+ <string name="server_frame_time_critical_msg">
+ Taxa de quadros do simulador abaixo de [SERVER_FRAME_RATE_CRITICAL]
+ </string>
+ <string name="server_frame_time_warning_msg">
+ Taxa de quadros do simulador entre [SERVER_FRAME_RATE_CRITICAL] e [SERVER_FRAME_RATE_WARNING]
+ </string>
+ <string name="server_frame_time_normal_msg">
+ Normal
+ </string>
+ <string name="server_physics_cause_msg">
+ Causa possÃvel: Muitos objetos fÃsicos
+ </string>
+ <string name="server_scripts_cause_msg">
+ Causa possÃvel: Muitos objetos com scripts
+ </string>
+ <string name="server_net_cause_msg">
+ Causa possÃvel: Muito tráfego na rede
+ </string>
+ <string name="server_agent_cause_msg">
+ Causa possÃvel: Muitas pessoas se movendo na região
+ </string>
+ <string name="server_images_cause_msg">
+ Causa possÃvel: Muitos cálculos de imagem
+ </string>
+ <string name="server_generic_cause_msg">
+ Causa possÃvel: Carga no simulador muito pesada
+ </string>
+ <string name="smaller_label">
+ >>
+ </string>
+ <string name="bigger_label">
+ <<
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
index 0a880b3ec2..848ab2ed2a 100644
--- a/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/pt/floater_land_holdings.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="land holdings floater" title="Meu terreno">
- <scroll_list name="parcel list">
- <column label="Nome" name="name"/>
- <column label="Localização" name="location"/>
- <column label="Ãrea" name="area"/>
- </scroll_list>
- <button label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para o centro do terreno."/>
- <button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" tool_tip="Mostrar esse terreno no mapa do mundo."/>
- <text name="contrib_label">
- Contribuições para os seus grupos:
- </text>
- <scroll_list name="grant list">
- <column label="Grupo" name="group"/>
- <column label="Ãrea" name="area"/>
- </scroll_list>
- <text name="allowed_label">
- Propriedades de terreno permitidas com o plano de pagamento atual:
- </text>
- <text name="allowed_text">
- [AREA] m²
- </text>
- <text name="current_label">
- Propriedades de terrenos atuais:
- </text>
- <text name="current_text">
- [AREA] m²
- </text>
- <text name="available_label">
- DisponÃvel para compra de terras:
- </text>
- <text name="available_text">
- [AREA] m²
- </text>
- <string name="area_string">
- [AREA] m²
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="land holdings floater" title="Meu terreno">
+ <scroll_list name="parcel list">
+ <column label="Nome" name="name"/>
+ <column label="Localização" name="location"/>
+ <column label="Ãrea" name="area"/>
+ </scroll_list>
+ <button label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para o centro do terreno."/>
+ <button label="Mostrar no mapa" label_selected="Mostrar no mapa" name="Show on Map" tool_tip="Mostrar esse terreno no mapa do mundo."/>
+ <text name="contrib_label">
+ Contribuições para os seus grupos:
+ </text>
+ <scroll_list name="grant list">
+ <column label="Grupo" name="group"/>
+ <column label="Ãrea" name="area"/>
+ </scroll_list>
+ <text name="allowed_label">
+ Propriedades de terreno permitidas com o plano de pagamento atual:
+ </text>
+ <text name="allowed_text">
+ [AREA] m²
+ </text>
+ <text name="current_label">
+ Propriedades de terrenos atuais:
+ </text>
+ <text name="current_text">
+ [AREA] m²
+ </text>
+ <text name="available_label">
+ DisponÃvel para compra de terras:
+ </text>
+ <text name="available_text">
+ [AREA] m²
+ </text>
+ <string name="area_string">
+ [AREA] m²
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
index 5bf9b6ffdb..af45fa5873 100644
--- a/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/pt/floater_live_lsleditor.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="Script: Novo Script">
- <button label="Resetar" label_selected="Resetar" name="Reset"/>
- <check_box label="Correndo" name="running"/>
- <check_box label="Mono" name="mono"/>
- <string name="not_allowed">
- Você não tem permissão para visualizar este script.
- </string>
- <string name="script_running">
- Executando
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script ed float" title="Script: Novo Script">
+ <button label="Resetar" label_selected="Resetar" name="Reset"/>
+ <check_box label="Correndo" name="running"/>
+ <check_box label="Mono" name="mono"/>
+ <string name="not_allowed">
+ Você não tem permissão para visualizar este script.
+ </string>
+ <string name="script_running">
+ Executando
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
index b13af3b21b..e7e4a22937 100644
--- a/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/pt/floater_lsl_guide.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script ed float" title="LSL Wiki">
- <check_box label="Seguir o Cursor" name="lock_check" />
- <combo_box label="Bloquear" name="history_combo" />
- <button label="Anterior" name="back_btn" />
- <button label="Posterior" name="fwd_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="LSL Wiki">
+ <check_box label="Seguir o Cursor" name="lock_check" />
+ <combo_box label="Bloquear" name="history_combo" />
+ <button label="Anterior" name="back_btn" />
+ <button label="Posterior" name="fwd_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_media_browser.xml b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
index dcdb2b9e09..cfaec5b410 100644
--- a/indra/newview/skins/default/xui/pt/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/pt/floater_media_browser.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater min_width="477" name="floater_about" title="Navegador de MÃdia" width="570">
- <layout_stack name="stack1" width="550">
- <layout_panel name="nav_controls">
- <button label="Para trás" name="back" width="75"/>
- <button label="Para a frente" left_delta="75" name="forward" width="90"/>
- <button label="Recarregar" left_delta="95" name="reload" width="76"/>
- <combo_box left_delta="80" name="address" width="500"/>
- <button label="Ir" left_delta="505" name="go" width="35"/>
- </layout_panel>
- <layout_panel name="parcel_owner_controls">
- <button label="Enviar a URL atual para o terreno" name="assign"/>
- </layout_panel>
- <layout_panel name="external_controls">
- <button label="Abrir no meu Navegador de Web" name="open_browser" width="196"/>
- <check_box label="Sempre abrir no meu Navegador de Web" left_delta="201" name="open_always"/>
- <button label="Fechar" name="close"/>
- </layout_panel>
- </layout_stack>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater min_width="477" name="floater_about" title="Navegador de MÃdia" width="570">
+ <layout_stack name="stack1" width="550">
+ <layout_panel name="nav_controls">
+ <button label="Para trás" name="back" width="75"/>
+ <button label="Para a frente" left_delta="75" name="forward" width="90"/>
+ <button label="Recarregar" left_delta="95" name="reload" width="76"/>
+ <combo_box left_delta="80" name="address" width="500"/>
+ <button label="Ir" left_delta="505" name="go" width="35"/>
+ </layout_panel>
+ <layout_panel name="parcel_owner_controls">
+ <button label="Enviar a URL atual para o terreno" name="assign"/>
+ </layout_panel>
+ <layout_panel name="external_controls">
+ <button label="Abrir no meu Navegador de Web" name="open_browser" width="196"/>
+ <check_box label="Sempre abrir no meu Navegador de Web" left_delta="201" name="open_always"/>
+ <button label="Fechar" name="close"/>
+ </layout_panel>
+ </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
index 83f47fd679..374592f0e2 100644
--- a/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/pt/floater_mem_leaking.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="MemLeak" title="Simulação de Perda de Memória">
- <spinner label="Velocidade da Perda (bytes por quadro):" name="leak_speed"/>
- <spinner label="Máximo de Memória Perdida (MB):" name="max_leak"/>
- <text name="total_leaked_label">
- Memória perdida atualmente: [SIZE] KB
- </text>
- <button label="Iniciar" name="start_btn"/>
- <button label="Parar" name="stop_btn"/>
- <button label="Liberar" name="release_btn"/>
- <button label="Fechar" name="close_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="MemLeak" title="Simulação de Perda de Memória">
+ <spinner label="Velocidade da Perda (bytes por quadro):" name="leak_speed"/>
+ <spinner label="Máximo de Memória Perdida (MB):" name="max_leak"/>
+ <text name="total_leaked_label">
+ Memória perdida atualmente: [SIZE] KB
+ </text>
+ <button label="Iniciar" name="start_btn"/>
+ <button label="Parar" name="stop_btn"/>
+ <button label="Liberar" name="release_btn"/>
+ <button label="Fechar" name="close_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_moveview.xml b/indra/newview/skins/default/xui/pt/floater_moveview.xml
index 46be67395d..fde1c16454 100644
--- a/indra/newview/skins/default/xui/pt/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_moveview.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="move floater" title="">
- <button label="" label_selected="" name="turn left btn" tool_tip="Virar à esquerda"/>
- <button label="" label_selected="" name="turn right btn" tool_tip="Virar à direita"/>
- <button label="" label_selected="" name="move up btn" tool_tip="Pular ou Voar"/>
- <button label="" label_selected="" name="move down btn" tool_tip="Agaixar ou pousar"/>
- <joystick_slide name="slide left btn" tool_tip="Mover para a esquerda"/>
- <joystick_slide name="slide right btn" tool_tip="Mover para a direita"/>
- <joystick_turn name="forward btn" tool_tip="Mover para a frente."/>
- <joystick_turn name="backward btn" tool_tip="Mover para trás"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="move floater" title="">
+ <button label="" label_selected="" name="turn left btn" tool_tip="Virar à esquerda"/>
+ <button label="" label_selected="" name="turn right btn" tool_tip="Virar à direita"/>
+ <button label="" label_selected="" name="move up btn" tool_tip="Pular ou Voar"/>
+ <button label="" label_selected="" name="move down btn" tool_tip="Agaixar ou pousar"/>
+ <joystick_slide name="slide left btn" tool_tip="Mover para a esquerda"/>
+ <joystick_slide name="slide right btn" tool_tip="Mover para a direita"/>
+ <joystick_turn name="forward btn" tool_tip="Mover para a frente."/>
+ <joystick_turn name="backward btn" tool_tip="Mover para trás"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_mute_object.xml b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
index 506d518868..32dd62c96b 100644
--- a/indra/newview/skins/default/xui/pt/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_mute_object.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="mute by name" title="Emudecer objeto pelo nome">
- <text name="message">
- Emudecer pelo nome afeta apenas conversa de objeto e MI, não sons. Você deve digitar o nome exato do objeto.
- </text>
- <line_editor name="object_name">
- Nome do objeto
- </line_editor>
- <button label="Ok" name="OK"/>
- <button label="Cancelar" name="Cancel"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="mute by name" title="Emudecer objeto pelo nome">
+ <text name="message">
+ Emudecer pelo nome afeta apenas conversa de objeto e MI, não sons. Você deve digitar o nome exato do objeto.
+ </text>
+ <line_editor name="object_name">
+ Nome do objeto
+ </line_editor>
+ <button label="Ok" name="OK"/>
+ <button label="Cancelar" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_openobject.xml b/indra/newview/skins/default/xui/pt/floater_openobject.xml
index 6a9a566644..78fe3398be 100644
--- a/indra/newview/skins/default/xui/pt/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/pt/floater_openobject.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="objectcontents" title="Conteúdo do objeto">
- <text length="1" name="object_name" type="string">
- [DESC]:
- </text>
- <button label="Copiar para Inventário" label_selected="Copiar para Inventário" name="copy_to_inventory_button" width="132"/>
- <button label="Copiar e Vestir" label_selected="Copiar e Vestir" left="152" name="copy_and_wear_button"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="objectcontents" title="Conteúdo do objeto">
+ <text length="1" name="object_name" type="string">
+ [DESC]:
+ </text>
+ <button label="Copiar para Inventário" label_selected="Copiar para Inventário" name="copy_to_inventory_button" width="132"/>
+ <button label="Copiar e Vestir" label_selected="Copiar e Vestir" left="152" name="copy_and_wear_button"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pay.xml b/indra/newview/skins/default/xui/pt/floater_pay.xml
index dda7015a07..6b094d07f6 100644
--- a/indra/newview/skins/default/xui/pt/floater_pay.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pay.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
- <button label="L$1" label_selected="L$1" name="fastpay 1" left="112" />
- <button label="L$5" label_selected="L$5" name="fastpay 5" />
- <button label="L$10" label_selected="L$10" name="fastpay 10" left="112" />
- <button label="L$20" label_selected="L$20" name="fastpay 20" />
- <button label="Pagar" label_selected="Pagar" name="pay btn" />
- <button label="Cancelar" label_selected="Cancelar" name="cancel btn" />
- <text type="string" length="1" name="payee_label" width="110" left="5">
- Pagar residente:
- </text>
- <text type="string" length="1" name="payee_name" left="110">
- [FIRST] [LAST]
- </text>
- <text type="string" length="1" name="fastpay text" width="120" halign="left">
- Pagamento rápido:
- </text>
- <text type="string" length="1" name="amount text" left="4" >
- Quantia:
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Give Money" title="">
+ <button label="L$1" label_selected="L$1" name="fastpay 1" left="112" />
+ <button label="L$5" label_selected="L$5" name="fastpay 5" />
+ <button label="L$10" label_selected="L$10" name="fastpay 10" left="112" />
+ <button label="L$20" label_selected="L$20" name="fastpay 20" />
+ <button label="Pagar" label_selected="Pagar" name="pay btn" />
+ <button label="Cancelar" label_selected="Cancelar" name="cancel btn" />
+ <text type="string" length="1" name="payee_label" width="110" left="5">
+ Pagar residente:
+ </text>
+ <text type="string" length="1" name="payee_name" left="110">
+ [FIRST] [LAST]
+ </text>
+ <text type="string" length="1" name="fastpay text" width="120" halign="left">
+ Pagamento rápido:
+ </text>
+ <text type="string" length="1" name="amount text" left="4" >
+ Quantia:
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pay_object.xml b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
index 824e1aebdd..ad76cf805c 100644
--- a/indra/newview/skins/default/xui/pt/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pay_object.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="">
- <text type="string" length="1" name="payee_group" width="100" halign="left">
- Pagar Grupo:
- </text>
- <text type="string" length="1" name="payee_resident" width="120" halign="left" >
- Pagar residente:
- </text>
- <text type="string" length="1" name="payee_name" left="105">
- [FIRST] [LAST]
- </text>
- <text type="string" length="1" name="object_name_label" left="5" width="95" halign="left">
- Via objeto:
- </text>
- <text type="string" length="1" name="object_name_text" left="105" >
- ...
- </text>
- <text type="string" length="1" name="fastpay text" width="115" halign="left">
- Pagamento Rápido:
- </text>
- <text type="string" length="1" name="amount text" left="5" halign="left">
- Quantia:
- </text>
- <button label="L$1" label_selected="L$1" name="fastpay 1" left="125" width="70"/>
- <button label="L$5" label_selected="L$5" name="fastpay 5" left="200" width="70"/>
- <button label="L$10" label_selected="L$10" name="fastpay 10" left="125" width="70"/>
- <button label="L$20" label_selected="L$20" name="fastpay 20" left="200" width="70"/>
- <button label="Pagar" label_selected="Pagar" name="pay btn" />
- <button label="Cancelar" label_selected="Cancelar" name="cancel btn" />
- <line_editor left="60" name="amount" width="50" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Give Money" title="">
+ <text type="string" length="1" name="payee_group" width="100" halign="left">
+ Pagar Grupo:
+ </text>
+ <text type="string" length="1" name="payee_resident" width="120" halign="left" >
+ Pagar residente:
+ </text>
+ <text type="string" length="1" name="payee_name" left="105">
+ [FIRST] [LAST]
+ </text>
+ <text type="string" length="1" name="object_name_label" left="5" width="95" halign="left">
+ Via objeto:
+ </text>
+ <text type="string" length="1" name="object_name_text" left="105" >
+ ...
+ </text>
+ <text type="string" length="1" name="fastpay text" width="115" halign="left">
+ Pagamento Rápido:
+ </text>
+ <text type="string" length="1" name="amount text" left="5" halign="left">
+ Quantia:
+ </text>
+ <button label="L$1" label_selected="L$1" name="fastpay 1" left="125" width="70"/>
+ <button label="L$5" label_selected="L$5" name="fastpay 5" left="200" width="70"/>
+ <button label="L$10" label_selected="L$10" name="fastpay 10" left="125" width="70"/>
+ <button label="L$20" label_selected="L$20" name="fastpay 20" left="200" width="70"/>
+ <button label="Pagar" label_selected="Pagar" name="pay btn" />
+ <button label="Cancelar" label_selected="Cancelar" name="cancel btn" />
+ <line_editor left="60" name="amount" width="50" />
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_postcard.xml b/indra/newview/skins/default/xui/pt/floater_postcard.xml
index 190d7c70b9..fe90cb3165 100644
--- a/indra/newview/skins/default/xui/pt/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_postcard.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="Foto por email">
- <text name="to_label" width="135">
- Email do Destinatário:
- </text>
- <line_editor name="to_form" left="143" width="127" />
- <text name="from_label">
- Seu Email:
- </text>
- <line_editor name="from_form" left="143" width="127" />
- <text name="name_label">
- Seu nome:
- </text>
- <line_editor name="name_form" left="143" width="127" />
- <text name="subject_label">
- Assunto:
- </text>
- <line_editor name="subject_form" left="143" width="127" />
- <line_editor label="Digite seu assunto aqui." name="subject_form"/>
- <text name="msg_label">
- Mensagem:
- </text>
- <text_editor name="msg_form">
- Digite sua mensagem aqui.
- </text_editor>
- <text name="fine_print">
- Se seu indicado entrar no SL, você receberá um bônus pela indicação.
- </text>
- <button label="Cancelar" name="cancel_btn"/>
- <button label="Enviar" name="send_btn"/>
- <string name="default_subject">
- Cartão postal do Second Life.
- </string>
- <string name="default_message">
- Dá uma olhada nisto!
- </string>
- <string name="upload_message">
- "Enviando..."
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Postcard" title="Foto por email">
+ <text name="to_label" width="135">
+ Email do Destinatário:
+ </text>
+ <line_editor name="to_form" left="143" width="127" />
+ <text name="from_label">
+ Seu Email:
+ </text>
+ <line_editor name="from_form" left="143" width="127" />
+ <text name="name_label">
+ Seu nome:
+ </text>
+ <line_editor name="name_form" left="143" width="127" />
+ <text name="subject_label">
+ Assunto:
+ </text>
+ <line_editor name="subject_form" left="143" width="127" />
+ <line_editor label="Digite seu assunto aqui." name="subject_form"/>
+ <text name="msg_label">
+ Mensagem:
+ </text>
+ <text_editor name="msg_form">
+ Digite sua mensagem aqui.
+ </text_editor>
+ <text name="fine_print">
+ Se seu indicado entrar no SL, você receberá um bônus pela indicação.
+ </text>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Enviar" name="send_btn"/>
+ <string name="default_subject">
+ Cartão postal do Second Life.
+ </string>
+ <string name="default_message">
+ Dá uma olhada nisto!
+ </string>
+ <string name="upload_message">
+ "Enviando..."
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml
index 716256f135..eb28e99713 100644
--- a/indra/newview/skins/default/xui/pt/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preferences.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Preferences" title="Preferências">
- <button label="OK" label_selected="OK" name="OK"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <button label="Aplicar" label_selected="Aplicar" name="Apply"/>
- <button label="Sobre" label_selected="Sobre" name="About..."/>
- <button label="Ajuda" label_selected="Ajuda" name="Help"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Preferences" title="Preferências">
+ <button label="OK" label_selected="OK" name="OK"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <button label="Aplicar" label_selected="Aplicar" name="Apply"/>
+ <button label="Sobre" label_selected="Sobre" name="About..."/>
+ <button label="Ajuda" label_selected="Ajuda" name="Help"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
index 2ec69ff9ea..f9b590b8c2 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_animation.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_anim">
- <text length="1" name="desc txt" type="string">
- Descrição:
- </text>
- <button label="Executar in World" label_selected="Parar" left="20" name="Anim play btn" tool_tip="Executar esta animação para que outros vejam." width="131"/>
- <button label="Executar localmente" label_selected="Parar" left="162" name="Anim audition btn" tool_tip="Executar esta animação somente para você ver." width="125"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_anim">
+ <text length="1" name="desc txt" type="string">
+ Descrição:
+ </text>
+ <button label="Executar in World" label_selected="Parar" left="20" name="Anim play btn" tool_tip="Executar esta animação para que outros vejam." width="131"/>
+ <button label="Executar localmente" label_selected="Parar" left="162" name="Anim audition btn" tool_tip="Executar esta animação somente para você ver." width="125"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_classified.xml b/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
index 2addac112a..4c583c28fb 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_classified.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="classified_preview" title="Informação do Anúncio Classificado"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="classified_preview" title="Informação do Anúncio Classificado"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_event.xml b/indra/newview/skins/default/xui/pt/floater_preview_event.xml
index 86b804195d..3c8ebcf95a 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_event.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_event.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="event_preview" title="Informação do Evento"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="event_preview" title="Informação do Evento"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
index 74cb84d5f6..416d65fde4 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_gesture.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="gesture_preview">
- <string name="stop_txt">
- Parar
- </string>
- <string name="preview_txt">
- Prévia
- </string>
- <string name="none_text">
- -- Nenhum --
- </string>
- <text name="desc_label">
- Descrição:
- </text>
- <text name="trigger_label">
- Gatilho:
- </text>
- <text name="replace_text" tool_tip="Substituir a(s) palavra(s) de gatilho por estas palavras. Por exemplo, o gatilho 'oi' substituÃdo por 'olá', mudará a conversa de 'Eu digo oi' para 'Eu digo olá' e também executando o gesto!">
- Substituir por:
- </text>
- <line_editor name="replace_editor" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras.Por exemplo, o gatilho 'oi' substituÃdo por 'olá', mudará a conversa de 'Eu digo oi' para 'Eu digo olá' e também executando o gesto!"/>
- <text name="key_label">
- Tecla de Atalho:
- </text>
- <combo_box label="Nenhum" name="modifier_combo"/>
- <combo_box label="Nenhum" name="key_combo"/>
- <text name="library_label">
- Biblioteca:
- </text>
- <text name="steps_label">
- Passos:
- </text>
- <scroll_list name="library_list">
- Animação
-Som
-Bate Papo
-Esperar
- </scroll_list>
- <button label="Incluir" name="add_btn"/>
- <button label="Mover Para Cima" name="up_btn"/>
- <button label="Mover Para Baixo" name="down_btn"/>
- <button label="Remover" name="delete_btn"/>
- <text name="help_label">
- Todos os passos acontecem simultaneamente, a menos que você inclua passos de espera.
- </text>
- <radio_group name="animation_trigger_type">
- <radio_item name="start">
- Iniciar
- </radio_item>
- <radio_item name="stop">
- Parar
- </radio_item>
- </radio_group>
- <check_box label="até que as animações estejam concluÃdas" name="wait_anim_check"/>
- <check_box label="tempo em segundos" name="wait_time_check"/>
- <check_box label="Ativar" name="active_check" tool_tip="Gestos ativos podem ser gatilhados escrevendo suas frases de gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/>
- <button label="Prévia" name="preview_btn"/>
- <button label="Salvar" name="save_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="gesture_preview">
+ <string name="stop_txt">
+ Parar
+ </string>
+ <string name="preview_txt">
+ Prévia
+ </string>
+ <string name="none_text">
+ -- Nenhum --
+ </string>
+ <text name="desc_label">
+ Descrição:
+ </text>
+ <text name="trigger_label">
+ Gatilho:
+ </text>
+ <text name="replace_text" tool_tip="Substituir a(s) palavra(s) de gatilho por estas palavras. Por exemplo, o gatilho 'oi' substituÃdo por 'olá', mudará a conversa de 'Eu digo oi' para 'Eu digo olá' e também executando o gesto!">
+ Substituir por:
+ </text>
+ <line_editor name="replace_editor" tool_tip="Substituir a(s) palavra(s) gatilho por estas palavras.Por exemplo, o gatilho 'oi' substituÃdo por 'olá', mudará a conversa de 'Eu digo oi' para 'Eu digo olá' e também executando o gesto!"/>
+ <text name="key_label">
+ Tecla de Atalho:
+ </text>
+ <combo_box label="Nenhum" name="modifier_combo"/>
+ <combo_box label="Nenhum" name="key_combo"/>
+ <text name="library_label">
+ Biblioteca:
+ </text>
+ <text name="steps_label">
+ Passos:
+ </text>
+ <scroll_list name="library_list">
+ Animação
+Som
+Bate Papo
+Esperar
+ </scroll_list>
+ <button label="Incluir" name="add_btn"/>
+ <button label="Mover Para Cima" name="up_btn"/>
+ <button label="Mover Para Baixo" name="down_btn"/>
+ <button label="Remover" name="delete_btn"/>
+ <text name="help_label">
+ Todos os passos acontecem simultaneamente, a menos que você inclua passos de espera.
+ </text>
+ <radio_group name="animation_trigger_type">
+ <radio_item name="start">
+ Iniciar
+ </radio_item>
+ <radio_item name="stop">
+ Parar
+ </radio_item>
+ </radio_group>
+ <check_box label="até que as animações estejam concluÃdas" name="wait_anim_check"/>
+ <check_box label="tempo em segundos" name="wait_time_check"/>
+ <check_box label="Ativar" name="active_check" tool_tip="Gestos ativos podem ser gatilhados escrevendo suas frases de gatilho no chat ou através de suas teclas de atalho. Gestos normalmente ficam inativos quando existe um conflito nas teclas de atalho."/>
+ <button label="Prévia" name="preview_btn"/>
+ <button label="Salvar" name="save_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
index 9f48b6ee1f..e7d3144292 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_notecard.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview notecard" title="Nota:">
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <text length="1" name="desc txt" type="string">
- Descrição:
- </text>
- <text_editor length="1" name="Notecard Editor" type="string">
- Carregando...
- </text_editor>
- <string name="no_object">
- Não foi possÃvel encontrar o objeto que contém esta nota.
- </string>
- <string name="not_allowed">
- Você não tem permissão de visualizar esta nota.
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview notecard" title="Nota:">
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <text length="1" name="desc txt" type="string">
+ Descrição:
+ </text>
+ <text_editor length="1" name="Notecard Editor" type="string">
+ Carregando...
+ </text_editor>
+ <string name="no_object">
+ Não foi possÃvel encontrar o objeto que contém esta nota.
+ </string>
+ <string name="not_allowed">
+ Você não tem permissão de visualizar esta nota.
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
index 448cea6294..b61508480d 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_sound.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_sound">
- <text length="1" name="desc txt" type="string">
- Descrição:
- </text>
- <button label="Executar in-World" label_selected="Executar in-World" name="Sound play btn" tool_tip="Executar este som para que todos possam ouvi-lo."/>
- <button label="Executar Localmente" label_selected="Executar Localmente" name="Sound audition btn" tool_tip="Executar este som somente para você ouvir."/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="preview_sound">
+ <text length="1" name="desc txt" type="string">
+ Descrição:
+ </text>
+ <button label="Executar in-World" label_selected="Executar in-World" name="Sound play btn" tool_tip="Executar este som para que todos possam ouvi-lo."/>
+ <button label="Executar Localmente" label_selected="Executar Localmente" name="Sound audition btn" tool_tip="Executar este som somente para você ouvir."/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
index 64b2b82d30..43f8497cbd 100644
--- a/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/pt/floater_preview_texture.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_texture">
- <text type="string" length="1" name="desc txt">
- Descrição:
- </text>
- <text type="string" length="1" name="dimensions">
- Dimensões: [WIDTH] x [HEIGHT]
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_texture">
+ <text type="string" length="1" name="desc txt">
+ Descrição:
+ </text>
+ <text type="string" length="1" name="dimensions">
+ Dimensões: [WIDTH] x [HEIGHT]
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_region_info.xml b/indra/newview/skins/default/xui/pt/floater_region_info.xml
index b16b1a4de8..fe228ab405 100644
--- a/indra/newview/skins/default/xui/pt/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/pt/floater_region_info.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="regioninfo" title="Região/Propriedade"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="regioninfo" title="Região/Propriedade"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
index f6599b05db..9fc694fb6a 100644
--- a/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/pt/floater_report_abuse.xml
@@ -1,181 +1,181 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_report_abuse" title="Reportar abuso">
- <check_box label="Incluir cópia da tela" name="screen_check"/>
- <text name="reporter_title">
- Denunciador:
- </text>
- <text name="reporter_field">
- Loremipsum Dolorsitamut
- </text>
- <text name="sim_title">
- Região:
- </text>
- <text name="sim_field">
- Nome da Região
- </text>
- <text name="pos_title">
- Posição:
- </text>
- <text name="pos_field">
- {128.1, 128.1, 15.4}
- </text>
- <text name="select_object_label">
- Clique no botão e em seguida no objeto:
- </text>
- <button label="" label_selected="" name="pick_btn" tool_tip="Object Picker - Identifica um objeto como o assunto deste report"/>
- <text name="object_name_label">
- Nome:
- </text>
- <text name="object_name">
- Consetetur Sadipscing
- </text>
- <text name="owner_name_label">
- Proprietário:
- </text>
- <text name="owner_name">
- Hendrerit Vulputate
- </text>
- <combo_box name="category_combo" tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
- <combo_item name="Select_category">
- Selecionar categoria
- </combo_item>
- <combo_item name="Age__Age_play">
- Idade > Idade no jogo
- </combo_item>
- <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
- Idade > Residente adulto no Second Life Jovem
- </combo_item>
-
-
-
- <combo_item name="Assault__Combat_sandbox___unsafe_area">
- Assalto > Sandbox de combate / área não segura
- </combo_item>
- <combo_item name="Assault__Safe_area">
- Assalto > Ãrea segura
- </combo_item>
- <combo_item name="Assault__Weapons_testing_sandbox">
- Assalto > Testando armas em sandbox
- </combo_item>
- <combo_item name="Commerce__Failure_to_deliver_product_or_service">
- Comércio > Falha em enviar produto ou serviço
- </combo_item>
- <combo_item name="Disclosure__Real_world_information">
- Revelar > Informação do mundo real
- </combo_item>
- <combo_item name="Disclosure__Remotely_monitoring chat">
- Revelar > Conversa monitorada remotamente
- </combo_item>
- <combo_item name="Disclosure__Second_Life_information_chat_IMs">
- Revelar > Informação do Second Life/conversa/MIs
- </combo_item>
- <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
- Distúrbio da paz > Uso injusto dos recursos da região
- </combo_item>
- <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
- Distúrbio da paz > Objetos com excesso de scripts
- </combo_item>
- <combo_item name="Disturbing_the_peace__Object_littering">
- Distúrbio da paz > Objeto despejando lixo
- </combo_item>
- <combo_item name="Disturbing_the_peace__Repetitive_spam">
- Distúrbio da paz > Spam repetitivo
- </combo_item>
- <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
- Distúrbio da paz > Spam de anúncio indesejado
- </combo_item>
- <combo_item name="Fraud__L$">
- Fraude > L$
- </combo_item>
- <combo_item name="Fraud__Land">
- Fraude > Terra
- </combo_item>
- <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
- Fraude > Esquema de pirâmide ou cartas encadeadas
- </combo_item>
- <combo_item name="Fraud__US$">
- Fraude > R$
- </combo_item>
- <combo_item name="Harassment__Advert_farms___visual_spam">
- Perturbação > Fazendas de Anúncios / spam visual
- </combo_item>
- <combo_item name="Harassment__Defaming_individuals_or_groups">
- Perturbação > Difamação de indivÃduos ou grupos
- </combo_item>
- <combo_item name="Harassment__Impeding_movement">
- Perturbação > Impedindo movimentos
- </combo_item>
- <combo_item name="Harassment__Sexual_harassment">
- Perturbação > Perturbação sexual
- </combo_item>
- <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
- Perturbação > Solicitando/incitando outros a violarem o ToS
- </combo_item>
- <combo_item name="Harassment__Verbal_abuse">
- Perturbação > Abuso verbal
- </combo_item>
- <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
- Indecência > Conteúdo ou conduta amplamente ofensivos
- </combo_item>
-
-
-
- <combo_item name="Indecency__Inappropriate_avatar_name">
- Indecência > Nome de avatar inapropriado
- </combo_item>
-
-
-
- <combo_item name="Intellectual_property_infringement_Content_Removal">
- Violação de propriedade intelectual > Remoção de Conteúdo
- </combo_item>
- <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
- Violação de Propriedade intelectual > Cópia Ilegal ou Aproveitar-se de Permissões
- </combo_item>
- <combo_item name="Intolerance">
- Intolerância
- </combo_item>
- <combo_item name="Land__Abuse_of_sandbox_resources">
- Terra > Abuso dos recursos da sandbox
- </combo_item>
- <combo_item name="Land__Encroachment__Objects_textures">
- Terra > Invasão > Objetos/texturas
- </combo_item>
- <combo_item name="Land__Encroachment__Particles">
- Terra > Invasão > PartÃculas
- </combo_item>
- <combo_item name="Land__Encroachment__Trees_plants">
- Terra > Violação > Ãrvores/plantas
- </combo_item>
- <combo_item name="Wagering_gambling">
- Apostas/jogos de azar
- </combo_item>
- <combo_item name="Other">
- Outro
- </combo_item>
- </combo_box>
- <text name="abuser_name_title">
- Nome do Denunciado:
- </text>
- <button label="Escolher Residente" label_selected="" name="select_abuser" tool_tip="Selecione o nome do Denunciado numa lista"/>
- <check_box label="Não sei o nome do denunciado" name="omit_abuser_name" tool_tip="Marque aqui se você não consegue fornecer o nome do denunciado"/>
- <text name="abuser_name_title2">
- Local do Abuso:
- </text>
- <text name="sum_title">
- Resumo:
- </text>
- <text name="dscr_title">
- Detalhes:
- </text>
- <text name="bug_aviso">
- Por favor, seja especÃfico(a) sobre data, localidade,
-natureza do abuso, texto relevante de conversa/MI e selecione o objeto,
-se possÃvel.
- </text>
- <text name="incomplete_title">
- Nota: Relatos incompletos não serão investigados.
- </text>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
- <button label="Reportar Abuso" label_selected="Reportar Abuso" name="send_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_report_abuse" title="Reportar abuso">
+ <check_box label="Incluir cópia da tela" name="screen_check"/>
+ <text name="reporter_title">
+ Denunciador:
+ </text>
+ <text name="reporter_field">
+ Loremipsum Dolorsitamut
+ </text>
+ <text name="sim_title">
+ Região:
+ </text>
+ <text name="sim_field">
+ Nome da Região
+ </text>
+ <text name="pos_title">
+ Posição:
+ </text>
+ <text name="pos_field">
+ {128.1, 128.1, 15.4}
+ </text>
+ <text name="select_object_label">
+ Clique no botão e em seguida no objeto:
+ </text>
+ <button label="" label_selected="" name="pick_btn" tool_tip="Object Picker - Identifica um objeto como o assunto deste report"/>
+ <text name="object_name_label">
+ Nome:
+ </text>
+ <text name="object_name">
+ Consetetur Sadipscing
+ </text>
+ <text name="owner_name_label">
+ Proprietário:
+ </text>
+ <text name="owner_name">
+ Hendrerit Vulputate
+ </text>
+ <combo_box name="category_combo" tool_tip="Categoria -- Selecione a categoria que melhor descreve este report">
+ <combo_item name="Select_category">
+ Selecionar categoria
+ </combo_item>
+ <combo_item name="Age__Age_play">
+ Idade > Idade no jogo
+ </combo_item>
+ <combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+ Idade > Residente adulto no Second Life Jovem
+ </combo_item>
+
+
+
+ <combo_item name="Assault__Combat_sandbox___unsafe_area">
+ Assalto > Sandbox de combate / área não segura
+ </combo_item>
+ <combo_item name="Assault__Safe_area">
+ Assalto > Ãrea segura
+ </combo_item>
+ <combo_item name="Assault__Weapons_testing_sandbox">
+ Assalto > Testando armas em sandbox
+ </combo_item>
+ <combo_item name="Commerce__Failure_to_deliver_product_or_service">
+ Comércio > Falha em enviar produto ou serviço
+ </combo_item>
+ <combo_item name="Disclosure__Real_world_information">
+ Revelar > Informação do mundo real
+ </combo_item>
+ <combo_item name="Disclosure__Remotely_monitoring chat">
+ Revelar > Conversa monitorada remotamente
+ </combo_item>
+ <combo_item name="Disclosure__Second_Life_information_chat_IMs">
+ Revelar > Informação do Second Life/conversa/MIs
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+ Distúrbio da paz > Uso injusto dos recursos da região
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+ Distúrbio da paz > Objetos com excesso de scripts
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Object_littering">
+ Distúrbio da paz > Objeto despejando lixo
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Repetitive_spam">
+ Distúrbio da paz > Spam repetitivo
+ </combo_item>
+ <combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+ Distúrbio da paz > Spam de anúncio indesejado
+ </combo_item>
+ <combo_item name="Fraud__L$">
+ Fraude > L$
+ </combo_item>
+ <combo_item name="Fraud__Land">
+ Fraude > Terra
+ </combo_item>
+ <combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+ Fraude > Esquema de pirâmide ou cartas encadeadas
+ </combo_item>
+ <combo_item name="Fraud__US$">
+ Fraude > R$
+ </combo_item>
+ <combo_item name="Harassment__Advert_farms___visual_spam">
+ Perturbação > Fazendas de Anúncios / spam visual
+ </combo_item>
+ <combo_item name="Harassment__Defaming_individuals_or_groups">
+ Perturbação > Difamação de indivÃduos ou grupos
+ </combo_item>
+ <combo_item name="Harassment__Impeding_movement">
+ Perturbação > Impedindo movimentos
+ </combo_item>
+ <combo_item name="Harassment__Sexual_harassment">
+ Perturbação > Perturbação sexual
+ </combo_item>
+ <combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+ Perturbação > Solicitando/incitando outros a violarem o ToS
+ </combo_item>
+ <combo_item name="Harassment__Verbal_abuse">
+ Perturbação > Abuso verbal
+ </combo_item>
+ <combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+ Indecência > Conteúdo ou conduta amplamente ofensivos
+ </combo_item>
+
+
+
+ <combo_item name="Indecency__Inappropriate_avatar_name">
+ Indecência > Nome de avatar inapropriado
+ </combo_item>
+
+
+
+ <combo_item name="Intellectual_property_infringement_Content_Removal">
+ Violação de propriedade intelectual > Remoção de Conteúdo
+ </combo_item>
+ <combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+ Violação de Propriedade intelectual > Cópia Ilegal ou Aproveitar-se de Permissões
+ </combo_item>
+ <combo_item name="Intolerance">
+ Intolerância
+ </combo_item>
+ <combo_item name="Land__Abuse_of_sandbox_resources">
+ Terra > Abuso dos recursos da sandbox
+ </combo_item>
+ <combo_item name="Land__Encroachment__Objects_textures">
+ Terra > Invasão > Objetos/texturas
+ </combo_item>
+ <combo_item name="Land__Encroachment__Particles">
+ Terra > Invasão > PartÃculas
+ </combo_item>
+ <combo_item name="Land__Encroachment__Trees_plants">
+ Terra > Violação > Ãrvores/plantas
+ </combo_item>
+ <combo_item name="Wagering_gambling">
+ Apostas/jogos de azar
+ </combo_item>
+ <combo_item name="Other">
+ Outro
+ </combo_item>
+ </combo_box>
+ <text name="abuser_name_title">
+ Nome do Denunciado:
+ </text>
+ <button label="Escolher Residente" label_selected="" name="select_abuser" tool_tip="Selecione o nome do Denunciado numa lista"/>
+ <check_box label="Não sei o nome do denunciado" name="omit_abuser_name" tool_tip="Marque aqui se você não consegue fornecer o nome do denunciado"/>
+ <text name="abuser_name_title2">
+ Local do Abuso:
+ </text>
+ <text name="sum_title">
+ Resumo:
+ </text>
+ <text name="dscr_title">
+ Detalhes:
+ </text>
+ <text name="bug_aviso">
+ Por favor, seja especÃfico(a) sobre data, localidade,
+natureza do abuso, texto relevante de conversa/MI e selecione o objeto,
+se possÃvel.
+ </text>
+ <text name="incomplete_title">
+ Nota: Relatos incompletos não serão investigados.
+ </text>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Reportar Abuso" label_selected="Reportar Abuso" name="send_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_debug.xml b/indra/newview/skins/default/xui/pt/floater_script_debug.xml
index 87a3310bff..48c73b93a3 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_debug.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="script debug floater" title="Aviso de script/erro">
- <tab_container name="Preview Tabs">
- <floater label="Script" name="all_scripts" title="[Todos os scripts]"/>
- </tab_container>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="script debug floater" title="Aviso de script/erro">
+ <tab_container name="Preview Tabs">
+ <floater label="Script" name="all_scripts" title="[Todos os scripts]"/>
+ </tab_container>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_preview.xml b/indra/newview/skins/default/xui/pt/floater_script_preview.xml
index 68405a62ae..d014e040a2 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_preview.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview lsl text" title="Script: Rotation Script">
- <text type="string" length="1" name="desc txt">
- Descrição:
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview lsl text" title="Script: Rotation Script">
+ <text type="string" length="1" name="desc txt">
+ Descrição:
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_queue.xml b/indra/newview/skins/default/xui/pt/floater_script_queue.xml
index 2a1d860cb7..7b35226bdb 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_queue.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="queue" title="Resetar Progresso">
- <button label="Fechar" label_selected="Fechar" name="close"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="queue" title="Resetar Progresso">
+ <button label="Fechar" label_selected="Fechar" name="close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_script_search.xml b/indra/newview/skins/default/xui/pt/floater_script_search.xml
index 293f5223c5..aaf1ea4339 100644
--- a/indra/newview/skins/default/xui/pt/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/pt/floater_script_search.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script search" title="Busca de Script">
- <check_box label="Não diferenciar Maiúsculas de Minúsculas" name="case_text"/>
- <button label="Buscar" label_selected="Buscar" name="search_btn"/>
- <button label="Substituir" label_selected="Substituir" name="replace_btn"/>
- <button label="Substituir Tudo" label_selected="Substituir Tudo" name="replace_all_btn"/>
- <text length="1" name="txt" type="string">
- Buscar
- </text>
- <text length="1" name="txt2" type="string">
- Substituir
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="script search" title="Busca de Script">
+ <check_box label="Não diferenciar Maiúsculas de Minúsculas" name="case_text"/>
+ <button label="Buscar" label_selected="Buscar" name="search_btn"/>
+ <button label="Substituir" label_selected="Substituir" name="replace_btn"/>
+ <button label="Substituir Tudo" label_selected="Substituir Tudo" name="replace_all_btn"/>
+ <text length="1" name="txt" type="string">
+ Buscar
+ </text>
+ <text length="1" name="txt2" type="string">
+ Substituir
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_sell_land.xml b/indra/newview/skins/default/xui/pt/floater_sell_land.xml
index 7dccf87180..c3461b7d52 100644
--- a/indra/newview/skins/default/xui/pt/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_sell_land.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="sell land" title="Vender terreno">
- <text name="info_parcel_label">
- Lote:
- </text>
- <text name="info_parcel">
- Nome do Lote
- </text>
- <text name="info_size_label">
- Tamanho:
- </text>
- <text name="info_size">
- [AREA] m².
- </text>
- <text name="info_action">
- Para vender este lote:
- </text>
- <text name="price_label">
- Defina um preço:
- </text>
- <text name="price_text">
- Escolha um preço apropriado para esta terra.
- </text>
- <text name="price_ld">
- L$
- </text>
- <text name="price_per_m">
- (L$[PER_METER] por m²)
- </text>
- <text name="sell_to_label">
- Vender esta terra para:
- </text>
- <text name="sell_to_text">
- Escolha se venderá para qualquer um ou para um comprador em particular.
- </text>
- <combo_box name="sell_to">
- <combo_item name="--selectone--">
- -- Selecione um --
- </combo_item>
- <combo_item name="Anyone">
- Qualquer um
- </combo_item>
- <combo_item name="Specificuser:">
- Usuário EspecÃfico:
- </combo_item>
- </combo_box>
- <button label="Selecione..." name="sell_to_select_agent"/>
- <text name="sell_objects_label">
- Vender os objetos com a terra?
- </text>
- <text name="sell_objects_text">
- Os objetos tranferÃveis do proprietário do terreno que estão neste lote irão mudar de propriedade.
- </text>
- <radio_group name="sell_objects">
- <radio_item name="no">
- Não, manter a propriedade sobre os objetos
- </radio_item>
- <radio_item name="yes">
- Sim, vender objetos com a terra
- </radio_item>
- </radio_group>
- <button label="Mostrar Objetos" name="show_objects"/>
- <text name="nag_message_label">
- LEMBRE-SE: Todas as vendas são finais.
- </text>
- <button label="Definir Terra para Venda" name="sell_btn"/>
- <button label="Cancelar" name="cancel_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="sell land" title="Vender terreno">
+ <text name="info_parcel_label">
+ Lote:
+ </text>
+ <text name="info_parcel">
+ Nome do Lote
+ </text>
+ <text name="info_size_label">
+ Tamanho:
+ </text>
+ <text name="info_size">
+ [AREA] m².
+ </text>
+ <text name="info_action">
+ Para vender este lote:
+ </text>
+ <text name="price_label">
+ Defina um preço:
+ </text>
+ <text name="price_text">
+ Escolha um preço apropriado para esta terra.
+ </text>
+ <text name="price_ld">
+ L$
+ </text>
+ <text name="price_per_m">
+ (L$[PER_METER] por m²)
+ </text>
+ <text name="sell_to_label">
+ Vender esta terra para:
+ </text>
+ <text name="sell_to_text">
+ Escolha se venderá para qualquer um ou para um comprador em particular.
+ </text>
+ <combo_box name="sell_to">
+ <combo_box.item name="--selectone--">
+ -- Selecione um --
+ </combo_box.item>
+ <combo_box.item name="Anyone">
+ Qualquer um
+ </combo_box.item>
+ <combo_box.item name="Specificuser:">
+ Usuário EspecÃfico:
+ </combo_box.item>
+ </combo_box>
+ <button label="Selecione..." name="sell_to_select_agent"/>
+ <text name="sell_objects_label">
+ Vender os objetos com a terra?
+ </text>
+ <text name="sell_objects_text">
+ Os objetos tranferÃveis do proprietário do terreno que estão neste lote irão mudar de propriedade.
+ </text>
+ <radio_group name="sell_objects">
+ <radio_item name="no">
+ Não, manter a propriedade sobre os objetos
+ </radio_item>
+ <radio_item name="yes">
+ Sim, vender objetos com a terra
+ </radio_item>
+ </radio_group>
+ <button label="Mostrar Objetos" name="show_objects"/>
+ <text name="nag_message_label">
+ LEMBRE-SE: Todas as vendas são finais.
+ </text>
+ <button label="Definir Terra para Venda" name="sell_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
index e67fca10c9..e0c189568a 100644
--- a/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/pt/floater_settings_debug.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="settings_debug" title="Configurações de Debug">
- <combo_box name="boolean_combo">
- <combo_item name="TRUE">
- VERDADEIRO
- </combo_item>
- <combo_item name="FALSE">
- FALSO
- </combo_item>
- </combo_box>
- <color_swatch label="Cor" name="color_swatch"/>
- <spinner label="x" name="val_spinner_1"/>
- <spinner label="x" name="val_spinner_2"/>
- <spinner label="x" name="val_spinner_3"/>
- <spinner label="x" name="val_spinner_4"/>
- <button label="Restaurar padrão" name="default_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="settings_debug" title="Configurações de Debug">
+ <combo_box name="boolean_combo">
+ <combo_box.item name="TRUE">
+ VERDADEIRO
+ </combo_box.item>
+ <combo_box.item name="FALSE">
+ FALSO
+ </combo_box.item>
+ </combo_box>
+ <color_swatch label="Cor" name="color_swatch"/>
+ <spinner label="x" name="val_spinner_1"/>
+ <spinner label="x" name="val_spinner_2"/>
+ <spinner label="x" name="val_spinner_3"/>
+ <spinner label="x" name="val_spinner_4"/>
+ <button label="Restaurar padrão" name="default_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
index 89307fc88d..067a4a71f3 100644
--- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml
@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Snapshot" title="Prévia da foto">
- <text name="type_label">
- Destino da foto
- </text>
- <radio_group label="Tipo de Foto" name="snapshot_type_radio">
- <radio_item name="postcard">
- Enviar por email
- </radio_item>
- <radio_item name="texture">
- Salvar no seu inventário (L$[AMOUNT])
- </radio_item>
- <radio_item name="local">
- Salvar no seu disco rÃgido
- </radio_item>
- </radio_group>
- <text name="file_size_label">
- Tamanho do arquivo: [SIZE] KB
- </text>
- <button label="Atualizar a foto" name="new_snapshot_btn"/>
- <button label="Enviar" name="send_btn"/>
- <button label="Salvar (L$[AMOUNT])" name="upload_btn"/>
- <flyout_button label="Salvar" name="save_btn" tool_tip="Salvar imagem em um arquivo">
- <flyout_button_item name="save_item">
- Salvar
- </flyout_button_item>
- <flyout_button_item name="saveas_item">
- Salvar como...
- </flyout_button_item>
- </flyout_button>
- <button label="Cancelar" name="discard_btn"/>
- <button label="Mais >" name="more_btn" tool_tip="Opções Avançadas"/>
- <button label="< Menos" name="less_btn" tool_tip="Opções Avançadas"/>
- <text name="type_label2">
- Tamanho
- </text>
- <text name="format_label">
- Formato
- </text>
- <combo_box label="Resolução" name="postcard_size_combo">
- <combo_item name="CurrentWindow">
- Janela Atual
- </combo_item>
- <combo_item name="640x480">
- 640x480
- </combo_item>
- <combo_item name="800x600">
- 800x600
- </combo_item>
- <combo_item name="1024x768">
- 1024x768
- </combo_item>
- <combo_item name="Custom">
- Customizado
- </combo_item>
- </combo_box>
- <combo_box label="Resolução" name="texture_size_combo">
- <combo_item name="CurrentWindow">
- Janela Atual
- </combo_item>
- <combo_item name="Small(128x128)">
- Pequeno (128x128)
- </combo_item>
- <combo_item name="Medium(256x256)">
- Médio (256x256)
- </combo_item>
- <combo_item name="Large(512x512)">
- Grande (512x512)
- </combo_item>
- <combo_item name="Custom">
- Customizado
- </combo_item>
- </combo_box>
- <combo_box label="Resolução" name="local_size_combo">
- <combo_item name="CurrentWindow">
- Janela Atual
- </combo_item>
- <combo_item name="320x240">
- 320x240
- </combo_item>
- <combo_item name="640x480">
- 640x480
- </combo_item>
- <combo_item name="800x600">
- 800x600
- </combo_item>
- <combo_item name="1024x768">
- 1024x768
- </combo_item>
- <combo_item name="1280x1024">
- 1280x1024
- </combo_item>
- <combo_item name="1600x1200">
- 1600x1200
- </combo_item>
- <combo_item name="Custom">
- Customizado
- </combo_item>
- </combo_box>
- <combo_box label="Formato" name="local_format_combo">
- <combo_item name="PNG">
- PNG
- </combo_item>
- <combo_item name="JPEG">
- JPEG
- </combo_item>
- <combo_item name="BMP">
- BMP
- </combo_item>
- </combo_box>
- <spinner label="Largura" name="snapshot_width"/>
- <spinner label="Altura" name="snapshot_height"/>
- <check_box label="Restringir proporções" name="keep_aspect_check"/>
- <slider label="Qualidade da Imagem" name="image_quality_slider"/>
- <text name="layer_type_label">
- Capturar:
- </text>
- <combo_box label="Camadas da Imagem" name="layer_types">
- <combo_item name="Colors">
- Cores
- </combo_item>
- <combo_item name="Depth">
- Formato
- </combo_item>
- <combo_item name="ObjectMattes">
- Decoração do Objeto
- </combo_item>
- </combo_box>
- <check_box label="Mostrar interface na Foto" name="ui_check"/>
- <check_box label="Mostrar Objetos HUD na Foto" name="hud_check"/>
- <check_box label="Manter aberto após salvar" name="keep_open_check"/>
- <check_box label="Quadro Congelado (prévia da tela inteira)" name="freeze_frame_check"/>
- <check_box label="Auto-atualizar" name="auto_snapshot_check"/>
- <string name="unknown">
- desconhecido
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Snapshot" title="Prévia da foto">
+ <text name="type_label">
+ Destino da foto
+ </text>
+ <radio_group label="Tipo de Foto" name="snapshot_type_radio">
+ <radio_item name="postcard">
+ Enviar por email
+ </radio_item>
+ <radio_item name="texture">
+ Salvar no seu inventário (L$[AMOUNT])
+ </radio_item>
+ <radio_item name="local">
+ Salvar no seu disco rÃgido
+ </radio_item>
+ </radio_group>
+ <text name="file_size_label">
+ Tamanho do arquivo: [SIZE] KB
+ </text>
+ <button label="Atualizar a foto" name="new_snapshot_btn"/>
+ <button label="Enviar" name="send_btn"/>
+ <button label="Salvar (L$[AMOUNT])" name="upload_btn"/>
+ <flyout_button label="Salvar" name="save_btn" tool_tip="Salvar imagem em um arquivo">
+ <flyout_button.item name="save_item">
+ Salvar
+ </flyout_button.item>
+ <flyout_button.item name="saveas_item">
+ Salvar como...
+ </flyout_button.item>
+ </flyout_button>
+ <button label="Cancelar" name="discard_btn"/>
+ <button label="Mais >" name="more_btn" tool_tip="Opções Avançadas"/>
+ <button label="< Menos" name="less_btn" tool_tip="Opções Avançadas"/>
+ <text name="type_label2">
+ Tamanho
+ </text>
+ <text name="format_label">
+ Formato
+ </text>
+ <combo_box label="Resolução" name="postcard_size_combo">
+ <combo_box.item name="CurrentWindow">
+ Janela Atual
+ </combo_box.item>
+ <combo_box.item name="640x480">
+ 640x480
+ </combo_box.item>
+ <combo_box.item name="800x600">
+ 800x600
+ </combo_box.item>
+ <combo_box.item name="1024x768">
+ 1024x768
+ </combo_box.item>
+ <combo_box.item name="Custom">
+ Customizado
+ </combo_box.item>
+ </combo_box>
+ <combo_box label="Resolução" name="texture_size_combo">
+ <combo_box.item name="CurrentWindow">
+ Janela Atual
+ </combo_box.item>
+ <combo_box.item name="Small(128x128)">
+ Pequeno (128x128)
+ </combo_box.item>
+ <combo_box.item name="Medium(256x256)">
+ Médio (256x256)
+ </combo_box.item>
+ <combo_box.item name="Large(512x512)">
+ Grande (512x512)
+ </combo_box.item>
+ <combo_box.item name="Custom">
+ Customizado
+ </combo_box.item>
+ </combo_box>
+ <combo_box label="Resolução" name="local_size_combo">
+ <combo_box.item name="CurrentWindow">
+ Janela Atual
+ </combo_box.item>
+ <combo_box.item name="320x240">
+ 320x240
+ </combo_box.item>
+ <combo_box.item name="640x480">
+ 640x480
+ </combo_box.item>
+ <combo_box.item name="800x600">
+ 800x600
+ </combo_box.item>
+ <combo_box.item name="1024x768">
+ 1024x768
+ </combo_box.item>
+ <combo_box.item name="1280x1024">
+ 1280x1024
+ </combo_box.item>
+ <combo_box.item name="1600x1200">
+ 1600x1200
+ </combo_box.item>
+ <combo_box.item name="Custom">
+ Customizado
+ </combo_box.item>
+ </combo_box>
+ <combo_box label="Formato" name="local_format_combo">
+ <combo_box.item name="PNG">
+ PNG
+ </combo_box.item>
+ <combo_box.item name="JPEG">
+ JPEG
+ </combo_box.item>
+ <combo_box.item name="BMP">
+ BMP
+ </combo_box.item>
+ </combo_box>
+ <spinner label="Largura" name="snapshot_width"/>
+ <spinner label="Altura" name="snapshot_height"/>
+ <check_box label="Restringir proporções" name="keep_aspect_check"/>
+ <slider label="Qualidade da Imagem" name="image_quality_slider"/>
+ <text name="layer_type_label">
+ Capturar:
+ </text>
+ <combo_box label="Camadas da Imagem" name="layer_types">
+ <combo_box.item name="Colors">
+ Cores
+ </combo_box.item>
+ <combo_box.item name="Depth">
+ Formato
+ </combo_box.item>
+ <combo_box.item name="ObjectMattes">
+ Decoração do Objeto
+ </combo_box.item>
+ </combo_box>
+ <check_box label="Mostrar interface na Foto" name="ui_check"/>
+ <check_box label="Mostrar Objetos HUD na Foto" name="hud_check"/>
+ <check_box label="Manter aberto após salvar" name="keep_open_check"/>
+ <check_box label="Quadro Congelado (prévia da tela inteira)" name="freeze_frame_check"/>
+ <check_box label="Auto-atualizar" name="auto_snapshot_check"/>
+ <string name="unknown">
+ desconhecido
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml
index 933b33a2f7..34a8b6e9ef 100644
--- a/indra/newview/skins/default/xui/pt/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_sound_preview.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Name/Description" title="sound.wav">
- <text name="name_label">
- Nome:
- </text>
- <text name="description_label">
- Descrição:
- </text>
- <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
- <button label="Upload (L$[AMOUNT])" label_selected="Upload (L$[AMOUNT])" name="ok_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Name/Description" title="sound.wav">
+ <text name="name_label">
+ Nome:
+ </text>
+ <text name="description_label">
+ Descrição:
+ </text>
+ <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+ <button label="Upload (L$[AMOUNT])" label_selected="Upload (L$[AMOUNT])" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_telehub.xml b/indra/newview/skins/default/xui/pt/floater_telehub.xml
index e042918cc3..f2634be852 100644
--- a/indra/newview/skins/default/xui/pt/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/pt/floater_telehub.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="telehub" title="Telehub">
- <text name="status_text_connected">
- Telehub conectado ao objeto [OBJECT]
- </text>
- <text name="status_text_not_connected">
- Sem telehub conectado.
- </text>
- <text name="help_text_connected">
- Para remover, clique em Desconectar.
- </text>
- <text name="help_text_not_connected">
- Selecione um objeto e clique em Conectar Telehub.
- </text>
- <button label="Conectar Telehub" name="connect_btn"/>
- <button label="Desconectar" name="disconnect_btn"/>
- <text name="spawn_points_text">
- Pontos de Nascimento (posições, não objetos):
- </text>
- <button label="Adicionar Nascimento" name="add_spawn_point_btn"/>
- <button label="Remover Nascimento" name="remove_spawn_point_btn"/>
- <text name="spawn_point_help">
- Selecione um objeto e clique Adicionar para especificar
-a posição. Em seguida, você pode mover ou apagar o objeto.
-As posições são relativas ao centro do telehub.
-Selecione um item na lista para mostrar a posição in-world.
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="telehub" title="Telehub">
+ <text name="status_text_connected">
+ Telehub conectado ao objeto [OBJECT]
+ </text>
+ <text name="status_text_not_connected">
+ Sem telehub conectado.
+ </text>
+ <text name="help_text_connected">
+ Para remover, clique em Desconectar.
+ </text>
+ <text name="help_text_not_connected">
+ Selecione um objeto e clique em Conectar Telehub.
+ </text>
+ <button label="Conectar Telehub" name="connect_btn"/>
+ <button label="Desconectar" name="disconnect_btn"/>
+ <text name="spawn_points_text">
+ Pontos de Nascimento (posições, não objetos):
+ </text>
+ <button label="Adicionar Nascimento" name="add_spawn_point_btn"/>
+ <button label="Remover Nascimento" name="remove_spawn_point_btn"/>
+ <text name="spawn_point_help">
+ Selecione um objeto e clique Adicionar para especificar
+a posição. Em seguida, você pode mover ou apagar o objeto.
+As posições são relativas ao centro do telehub.
+Selecione um item na lista para mostrar a posição in-world.
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index 46cff82067..3fd0d6103e 100644
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="texture picker" title="Pegar: Textura">
- <string name="choose_picture">
- Clique para escolher uma imagem
- </string>
- <text length="1" name="Multiple" type="string">
- Multiplo
- </text>
- <text length="1" name="unknown" type="string">
- Dimensões: [DIMENSIONS]
- </text>
- <button label="Padrão" label_selected="Padrão" name="Default"/>
- <button label="Nenhum" label_selected="Nenhum" name="None"/>
- <button label="Branco" label_selected="Branco" name="Blank"/>
- <check_box label="Mostrar Pastas" name="show_folders_check"/>
- <search_editor label="Clique aqui para buscar" name="inventory search editor"/>
- <check_box label="Aplicar Imediatamente" name="apply_immediate_check"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <button label="Selecionar" label_selected="Selecionar" name="Select"/>
- <string name="pick title">
- Pegar:
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="texture picker" title="Pegar: Textura">
+ <string name="choose_picture">
+ Clique para escolher uma imagem
+ </string>
+ <text length="1" name="Multiple" type="string">
+ Multiplo
+ </text>
+ <text length="1" name="unknown" type="string">
+ Dimensões: [DIMENSIONS]
+ </text>
+ <button label="Padrão" label_selected="Padrão" name="Default"/>
+ <button label="Nenhum" label_selected="Nenhum" name="None"/>
+ <button label="Branco" label_selected="Branco" name="Blank"/>
+ <check_box label="Mostrar Pastas" name="show_folders_check"/>
+ <search_editor label="Clique aqui para buscar" name="inventory search editor"/>
+ <check_box label="Aplicar Imediatamente" name="apply_immediate_check"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <button label="Selecionar" label_selected="Selecionar" name="Select"/>
+ <string name="pick title">
+ Pegar:
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index fd71ee49d1..838c7965ea 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -1,610 +1,610 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="">
- <button label="" label_selected="" name="button focus" tool_tip="Foco"/>
- <button label="" label_selected="" name="button move" tool_tip="Mover"/>
- <button label="" label_selected="" name="button edit" tool_tip="Editar"/>
- <button label="" label_selected="" name="button create" tool_tip="Criar"/>
- <button label="" label_selected="" name="button land" tool_tip="Terra"/>
- <check_box label="Zoom" name="radio zoom"/>
- <check_box label="Órbita (Ctrl)" name="radio orbit"/>
- <check_box label="Pan (Ctrl-Shift)" name="radio pan"/>
- <check_box label="Mover" name="radio move"/>
- <check_box label="Suspender (Ctrl)" name="radio lift"/>
- <check_box label="Girar (Ctrl-Shift)" name="radio spin"/>
- <check_box label="Posição" name="radio position"/>
- <check_box label="Rotacionar (Ctrl)" name="radio rotate"/>
- <check_box label="Esticar (Ctrl-Shift)" name="radio stretch"/>
- <check_box label="Selecionar Textura" name="radio select face"/>
- <check_box label="Editar partes unidas" name="checkbox edit linked parts"/>
- <text name="text ruler mode">
- Modo da régua:
- </text>
- <combo_box name="combobox grid mode">
- <combo_item name="World">
- Mundo
- </combo_item>
- <combo_item name="Local">
- Local
- </combo_item>
- <combo_item name="Reference">
- Referência
- </combo_item>
- </combo_box>
- <check_box label="Esticar ambos os lados" name="checkbox uniform"/>
- <check_box label="Esticar Texturas" name="checkbox stretch textures"/>
- <check_box label="Usar Grade" name="checkbox snap to grid"/>
- <button label="Opções..." label_selected="Opções..." name="Options..."/>
- <text name="text status">
- Arraste para mover, shift+Arrastar para Copiar
- </text>
- <button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
- <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
- <button label="" label_selected="" name="ToolPyramid" tool_tip="Pirâmide"/>
- <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraedro"/>
- <button label="" label_selected="" name="ToolCylinder" tool_tip="Cilindro"/>
- <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Semi-cilindro"/>
- <button label="" label_selected="" name="ToolCone" tool_tip="Cone"/>
- <button label="" label_selected="" name="ToolHemiCone" tool_tip="Semi-cone"/>
- <button label="" label_selected="" name="ToolSphere" tool_tip="Esfera"/>
- <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Semi-esfera"/>
- <button label="" label_selected="" name="ToolTorus" tool_tip="Toróide"/>
- <button label="" label_selected="" name="ToolTube" tool_tip="Tubo"/>
- <button label="" label_selected="" name="ToolRing" tool_tip="Anel"/>
- <button label="" label_selected="" name="ToolTree" tool_tip="Ãrvore"/>
- <button label="" label_selected="" name="ToolGrass" tool_tip="Grama"/>
- <check_box label="Manter ferramenta selecionada" name="checkbox sticky"/>
- <check_box label="Copiar Seleção" name="checkbox copy selection"/>
- <check_box label="Copiar Centro" name="checkbox copy centers"/>
- <check_box label="Rotacionar Cópia" name="checkbox copy rotates"/>
- <check_box label="Selecionar Terra" name="radio select land"/>
- <check_box label="Aplainar Terra" name="radio flatten"/>
- <check_box label="Elevar Terra" name="radio raise"/>
- <check_box label="Baixar Terra" name="radio lower"/>
- <check_box label="Suavizar Terra" name="radio smooth"/>
- <check_box label="Terreno RÃgido" name="radio noise"/>
- <check_box label="Reverter Terra" name="radio revert"/>
- <combo_box name="combobox brush size">
- <combo_item name="Small">
- Pequeno
- </combo_item>
- <combo_item name="Medium">
- Médio
- </combo_item>
- <combo_item name="Large">
- Grande
- </combo_item>
- </combo_box>
- <text name="Strength:">
- Força:
- </text>
- <button label="Aplicar no selecionado" label_selected="Aplicar no selecionado" name="button apply to selection" tool_tip="Modificar Terra Selecionada"/>
- <check_box label="Mostrar Proprietários" name="checkbox show owners"/>
- <button label="Mais >>" name="button more" tool_tip="Opções Avançadas"/>
- <button label="<< Menos" name="button less" tool_tip="Opções Avançadas"/>
- <tab_container name="Object Info Tabs">
- <panel label="Comum" name="General">
- <text name="Name:">
- Nome:
- </text>
- <text name="Description:">
- Descrição:
- </text>
- <text name="Creator:">
- Criador:
- </text>
- <text name="Creator Name">
- Thrax Linden
- </text>
- <button label="Perfil..." label_selected="Perfil..." name="button creator profile"/>
- <text name="Owner:">
- Proprietário:
- </text>
- <text name="Owner Name">
- Thrax Linden
- </text>
- <button label="Perfil..." label_selected="Perfil..." name="button owner profile"/>
- <text name="Group:">
- Grupo:
- </text>
- <text name="Group Name Proxy">
- Os Lindens
- </text>
- <button label="Definir..." label_selected="Definir..." name="button set group"/>
- <text name="prim info">
- 1 Objeto, 1 Primitiva
- </text>
- <text name="Permissions:">
- Permissões:
- </text>
- <text name="perm_modify">
- Você pode modificar este objeto.
- </text>
- <check_box label="Compartilhar com o Grupo" name="checkbox share with group" tool_tip="Permitir que o membros do grupo movam, modifiquem, copiem e apaguem"/>
- <string name="text deed continued">
- Doar...
- </string>
- <string name="text deed">
- Doar
- </string>
- <button label="Doar..." label_selected="Doar..." name="button deed" tool_tip="Objetos compartilhados do Grupo pode ser doados pelo gerente do grupo."/>
- <check_box label="Permitir que qualquer um mova" name="checkbox allow everyone move"/>
- <check_box label="Permitir que qualquer um copie" name="checkbox allow everyone copy"/>
- <check_box label="Mostrar na busca" name="search_check" tool_tip="Permitir que as pessoas vejam este objeto nos resultados de busca"/>
- <check_box label="À Venda" name="checkbox for sale"/>
- <text name="Cost">
- Preço: L$
- </text>
- <radio_group name="sale type">
- <radio_item name="Original">
- Original
- </radio_item>
- <radio_item name="Copy">
- Cópia
- </radio_item>
- <radio_item name="Contents">
- Conteúdo
- </radio_item>
- </radio_group>
- <text name="Next owner can:">
- Próximo Proprietário pode:
- </text>
- <check_box label="Modificar" name="checkbox next owner can modify"/>
- <check_box label="Copiar" name="checkbox next owner can copy"/>
- <check_box label="Revender/Dar" name="checkbox next owner can transfer"/>
- <text name="label click action">
- Quando clicado com o botão esquerdo:
- </text>
- <combo_box name="clickaction">
- <combo_item name="Touch/grab(default)">
- Tocar/Pegar (padrão)
- </combo_item>
- <combo_item name="Sitonobject">
- Sentar no objeto
- </combo_item>
- <combo_item name="Buyobject">
- Comprar objeto
- </combo_item>
- <combo_item name="Payobject">
- Pagar Objeto
- </combo_item>
- <combo_item name="Open">
- Abrir
- </combo_item>
- <combo_item name="Play">
- Executar a mÃdia do lote
- </combo_item>
- <combo_item name="Opemmedia">
- Abrir a mÃdia do lote
- </combo_item>
- </combo_box>
- <text name="B:">
- B:
- </text>
- <text name="O:">
- O;
- </text>
- <text name="G:">
- G:
- </text>
- <text name="E:">
- E:
- </text>
- <text name="N:">
- N:
- </text>
- <text name="F:">
- F:
- </text>
- <string name="text modify info 1">
- Você pode modificar este objeto.
- </string>
- <string name="text modify info 2">
- Você pode modificar estes objetos.
- </string>
- <string name="text modify info 3">
- Você não pode modificar este objeto.
- </string>
- <string name="text modify info 4">
- Você não pode modificar estes objetos.
- </string>
- <string name="text modify warning">
- Você precisa selecionar o objeto todo para ajustar as permissões.
- </string>
- <string name="Cost Default">
- Preço: L$
- </string>
- <string name="Cost Total">
- Preço Total: L$
- </string>
- <string name="Cost Per Unit">
- Preço Por: L$
- </string>
- <string name="Cost Mixed">
- Preço Misturado
- </string>
- <string name="Sale Mixed">
- Venda Misturada
- </string>
- </panel>
- <panel label="Objeto" name="Object">
- <text name="select_single">
- Selecione apenas uma primitiva para editar os parâmetros.
- </text>
- <text name="edit_object">
- Editar os parâmetros do Objeto:
- </text>
- <check_box label="Travado" name="checkbox locked" tool_tip="Previne que o objeto seja movido ou apagado. Muito útil para evitar edições não intencionais durante a construção."/>
- <check_box label="FÃsica" name="Physical Checkbox Ctrl" tool_tip="Permite que os objetos sejam empurrados e sofram efeito da gravidade"/>
- <check_box label="Temporário" name="Temporary Checkbox Ctrl" tool_tip="Faz com que o objeto seja apagado 1 minuto após ser criado."/>
- <check_box label="Fantasma" name="Phantom Checkbox Ctrl" tool_tip="Faz com que o objeto não colida com outros objetos ou avatares"/>
- <text name="label position">
- Posição (metros)
- </text>
- <spinner label="X" name="Pos X"/>
- <spinner label="Y" name="Pos Y"/>
- <spinner label="Z" name="Pos Z"/>
- <text name="label size">
- Tamanho (metros)
- </text>
- <spinner label="X" name="Scale X"/>
- <spinner label="Y" name="Scale Y"/>
- <spinner label="Z" name="Scale Z"/>
- <text name="label rotation">
- Rotação (graus)
- </text>
- <spinner label="X" name="Rot X"/>
- <spinner label="Y" name="Rot Y"/>
- <spinner label="Z" name="Rot Z"/>
- <text name="label material">
- Material
- </text>
- <combo_box name="material">
- <combo_item name="Stone">
- Pedra
- </combo_item>
- <combo_item name="Metal">
- Metal
- </combo_item>
- <combo_item name="Glass">
- Vidro
- </combo_item>
- <combo_item name="Wood">
- Madeira
- </combo_item>
- <combo_item name="Flesh">
- Carne
- </combo_item>
- <combo_item name="Plastic">
- Plástico
- </combo_item>
- <combo_item name="Rubber">
- Couro
- </combo_item>
- </combo_box>
- <text name="label basetype">
- Forma básica
- </text>
- <combo_box name="comboBaseType">
- <combo_item name="Box">
- Caixa
- </combo_item>
- <combo_item name="Cylinder">
- Cilindro
- </combo_item>
- <combo_item name="Prism">
- Prisma
- </combo_item>
- <combo_item name="Sphere">
- Esfera
- </combo_item>
- <combo_item name="Torus">
- Toróide
- </combo_item>
- <combo_item name="Tube">
- Tubo
- </combo_item>
- <combo_item name="Ring">
- Anel
- </combo_item>
- <combo_item name="Sculpted">
- Esculpida
- </combo_item>
- </combo_box>
- <text name="text cut">
- Recorte inicial e final
- </text>
- <spinner label="B" name="cut begin"/>
- <spinner label="E" name="cut end"/>
- <text name="text hollow">
- Vazio
- </text>
- <text name="text skew">
- Torcer
- </text>
- <text name="Hollow Shape">
- Forma Vazia
- </text>
- <combo_box name="hole">
- <combo_item name="Default">
- Padrão
- </combo_item>
- <combo_item name="Circle">
- Circulo
- </combo_item>
- <combo_item name="Square">
- Quadrado
- </combo_item>
- <combo_item name="Triangle">
- Triâgulo
- </combo_item>
- </combo_box>
- <text name="text twist">
- Torcer no InÃcio e final
- </text>
- <spinner label="B" name="Twist Begin"/>
- <spinner label="E" name="Twist End"/>
- <text name="scale_taper">
- Afinar
- </text>
- <text name="scale_hole">
- Tamanho do Buraco
- </text>
- <spinner label="X" name="Taper Scale X"/>
- <spinner label="Y" name="Taper Scale Y"/>
- <text name="text topshear">
- Inclinar
- </text>
- <spinner label="X" name="Shear X"/>
- <spinner label="Y" name="Shear Y"/>
- <text name="advanced_cut">
- Perfil Recortado no InÃcio e Final
- </text>
- <text name="advanced_dimple">
- Cova InÃcio e Final
- </text>
- <spinner label="B" name="Path Limit Begin"/>
- <spinner label="E" name="Path Limit End"/>
- <text name="text taper2">
- Afinar
- </text>
- <spinner label="X" name="Taper X"/>
- <spinner label="Y" name="Taper Y"/>
- <text name="text radius delta">
- Raio
- </text>
- <text name="text revolutions">
- Revoluções
- </text>
- <texture_picker label="Texture de Escultura" name="sculpt texture control" tool_tip="Click to choose a picture"/>
- <check_box label="Espelho" name="sculpt mirror control" tool_tip="Inverter a primitiva esculpida ao longo do eixo X."/>
- <check_box label="De dentro para fora" name="sculpt invert control" tool_tip="Inverte as normais das primitivas esculpidas, fazendo-as parecer de dentro para fora."/>
- <text name="label sculpt type">
- Tipo costura
- </text>
- <combo_box name="sculpt type control">
- <combo_item name="None">
- (nenhum)
- </combo_item>
- <combo_item name="Sphere">
- Esfera
- </combo_item>
- <combo_item name="Torus">
- Toróide
- </combo_item>
- <combo_item name="Plane">
- Plano
- </combo_item>
- <combo_item name="Cylinder">
- Cilindro
- </combo_item>
- </combo_box>
- </panel>
- <panel label="Recursos" name="Features">
- <text name="select_single">
- Selecione apenas uma primitiva para editar suas caracterÃsticas.
- </text>
- <text name="edit_object">
- Editar caracterÃsticas do Objeto:
- </text>
- <check_box label="FlexÃbilidade" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que o objeto flexione no eixo Z. (Somente no lado do Cliente)"/>
- <spinner label="Suavidade" name="FlexNumSections"/>
- <spinner label="Gravidade" name="FlexGravity"/>
- <spinner label="Arrastar" name="FlexFriction"/>
- <spinner label="Vento" name="FlexWind"/>
- <spinner label="Tensão" name="FlexTension"/>
- <spinner label="Força X" name="FlexForceX"/>
- <spinner label="Força Y" name="FlexForceY"/>
- <spinner label="Força Z" name="FlexForceZ"/>
- <check_box label="Luz" name="Light Checkbox Ctrl" tool_tip="Faz com que o objeto emita luz"/>
- <text name="label color">
- Cor
- </text>
- <color_swatch label="" name="colorswatch" tool_tip="Clique para abrir o Seletor de Cores"/>
- <spinner label="Intensidade" name="Light Intensity"/>
- <spinner label="Raio" name="Light Radius"/>
- <spinner label="Queda" name="Light Falloff"/>
- </panel>
- <panel label="Textura" name="Texture">
- <texture_picker label="Textura" name="texture control" tool_tip="Clique para escolher uma imagem"/>
- <color_swatch label="Cor" name="colorswatch" tool_tip="Clique para abrir o Seletor de Cores"/>
- <text name="color trans">
- Transparência %
- </text>
- <text name="glow label">
- Brilho
- </text>
- <check_box label="Claridade" name="checkbox fullbright"/>
- <text name="tex gen">
- Mapeamento
- </text>
- <combo_box name="combobox texgen">
- <combo_item name="Default">
- Padrão
- </combo_item>
- <combo_item name="Planar">
- Planar
- </combo_item>
- </combo_box>
- <text name="label shininess">
- Brilho
- </text>
- <combo_box name="combobox shininess">
- <combo_item name="None">
- Nenhum
- </combo_item>
- <combo_item name="Low">
- Baixo
- </combo_item>
- <combo_item name="Medium">
- Médio
- </combo_item>
- <combo_item name="High">
- Alto
- </combo_item>
- </combo_box>
- <text name="label bumpiness">
- Ondulação
- </text>
- <combo_box name="combobox bumpiness">
- <combo_item name="None">
- Nenhum
- </combo_item>
- <combo_item name="Brightness">
- Claridade
- </combo_item>
- <combo_item name="Darkness">
- Escuridão
- </combo_item>
- <combo_item name="woodgrain">
- Granulação
- </combo_item>
- <combo_item name="bark">
- casca
- </combo_item>
- <combo_item name="bricks">
- Tijolos
- </combo_item>
- <combo_item name="checker">
- Caixa
- </combo_item>
- <combo_item name="concrete">
- Concreto
- </combo_item>
- <combo_item name="crustytile">
- Encaroçado
- </combo_item>
- <combo_item name="cutstone">
- Pedra Cortante
- </combo_item>
- <combo_item name="discs">
- Discos
- </combo_item>
- <combo_item name="gravel">
- Cascalho
- </combo_item>
- <combo_item name="petridish">
- Pedrisco
- </combo_item>
- <combo_item name="siding">
- Revestimento
- </combo_item>
- <combo_item name="stonetile">
- empedrado
- </combo_item>
- <combo_item name="stucco">
- Grafiato
- </combo_item>
- <combo_item name="suction">
- Sulcos
- </combo_item>
- <combo_item name="weave">
- weave
- </combo_item>
- </combo_box>
- <text name="tex scale">
- Repetir por Face
- </text>
- <spinner label="Horizontal (U)" name="TexScaleU"/>
- <check_box label="Flip" name="checkbox flip s"/>
- <spinner label="Vertical (V)" name="TexScaleV"/>
- <check_box label="Flip" name="checkbox flip t"/>
- <text name="tex rotate">
- Rotação (graus)
- </text>
- <string name="string repeats per meter">
- Repetir por Metro
- </string>
- <string name="string repeats per face">
- Repetir por Face
- </string>
- <text name="rpt">
- Repetir por Metro
- </text>
- <button label="Aplicar" label_selected="Aplicar" name="button apply"/>
- <text name="tex offset">
- Deslocamento
- </text>
- <spinner label="Horizontal (U)" name="TexOffsetU"/>
- <spinner label="Vertical (V)" name="TexOffsetV"/>
- <text name="textbox autofix">
- Alinhar Texturas
- </text>
- <button label="Alinhar" label_selected="Alinhar" name="button align"/>
- </panel>
- <panel label="Conteúdo" name="Contents">
- <button label="Novo Script..." label_selected="Novo Script..." name="button new script"/>
- </panel>
- </tab_container>
- <panel name="land info panel">
- <text name="label_area_price">
- Preço: L$[PRICE] por [AREA] m².
- </text>
- <text name="label_area">
- Ãrea: [AREA] m².
- </text>
- <button label="Comprar Terra..." label_selected="Comprar Terra.." name="button buy land"/>
- <button label="Abandonar Terra..." label_selected="Abandonar Terra..." name="button abandon land"/>
- <button label="Sub-Dividir..." label_selected="Sub-Dividir..." name="button subdivide land"/>
- <button label="Unir..." label_selected="Unir..." name="button join land"/>
- <button label="Sobre a Terra..." label_selected="Sobre a Terra..." name="button about land"/>
- </panel>
- <string name="status_rotate">
- Arrastar as bandas coloridas para girar o objeto
- </string>
- <string name="status_scale">
- Clicar e arrastar para esticar o lado selecionado
- </string>
- <string name="status_move">
- Arrastar para mover, Shift-arrastar para copiar
- </string>
- <string name="status_modifyland">
- Clicar e reter para modificar a terra
- </string>
- <string name="status_camera">
- Clicar e arrastar para mudar a vista
- </string>
- <string name="status_grab">
- Arrastar para mover objetos, Ctrl para levantar, Ctrl-Shift para girar
- </string>
- <string name="status_place">
- Clicar no mundo para criar, shift-clicar para selecionar
- </string>
- <string name="status_selectland">
- Clicar e arrastar para selecionar a terra
- </string>
- <string name="grid_screen_text">
- Tela
- </string>
- <string name="grid_local_text">
- Local
- </string>
- <string name="grid_world_text">
- Mundo
- </string>
- <string name="grid_reference_text">
- Referência
- </string>
- <string name="grid_attachment_text">
- Anexo
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="toolbox floater" title="">
+ <button label="" label_selected="" name="button focus" tool_tip="Foco"/>
+ <button label="" label_selected="" name="button move" tool_tip="Mover"/>
+ <button label="" label_selected="" name="button edit" tool_tip="Editar"/>
+ <button label="" label_selected="" name="button create" tool_tip="Criar"/>
+ <button label="" label_selected="" name="button land" tool_tip="Terra"/>
+ <check_box label="Zoom" name="radio zoom"/>
+ <check_box label="Órbita (Ctrl)" name="radio orbit"/>
+ <check_box label="Pan (Ctrl-Shift)" name="radio pan"/>
+ <check_box label="Mover" name="radio move"/>
+ <check_box label="Suspender (Ctrl)" name="radio lift"/>
+ <check_box label="Girar (Ctrl-Shift)" name="radio spin"/>
+ <check_box label="Posição" name="radio position"/>
+ <check_box label="Rotacionar (Ctrl)" name="radio rotate"/>
+ <check_box label="Esticar (Ctrl-Shift)" name="radio stretch"/>
+ <check_box label="Selecionar Textura" name="radio select face"/>
+ <check_box label="Editar partes unidas" name="checkbox edit linked parts"/>
+ <text name="text ruler mode">
+ Modo da régua:
+ </text>
+ <combo_box name="combobox grid mode">
+ <combo_item name="World">
+ Mundo
+ </combo_item>
+ <combo_item name="Local">
+ Local
+ </combo_item>
+ <combo_item name="Reference">
+ Referência
+ </combo_item>
+ </combo_box>
+ <check_box label="Esticar ambos os lados" name="checkbox uniform"/>
+ <check_box label="Esticar Texturas" name="checkbox stretch textures"/>
+ <check_box label="Usar Grade" name="checkbox snap to grid"/>
+ <button label="Opções..." label_selected="Opções..." name="Options..."/>
+ <text name="text status">
+ Arraste para mover, shift+Arrastar para Copiar
+ </text>
+ <button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/>
+ <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/>
+ <button label="" label_selected="" name="ToolPyramid" tool_tip="Pirâmide"/>
+ <button label="" label_selected="" name="ToolTetrahedron" tool_tip="Tetraedro"/>
+ <button label="" label_selected="" name="ToolCylinder" tool_tip="Cilindro"/>
+ <button label="" label_selected="" name="ToolHemiCylinder" tool_tip="Semi-cilindro"/>
+ <button label="" label_selected="" name="ToolCone" tool_tip="Cone"/>
+ <button label="" label_selected="" name="ToolHemiCone" tool_tip="Semi-cone"/>
+ <button label="" label_selected="" name="ToolSphere" tool_tip="Esfera"/>
+ <button label="" label_selected="" name="ToolHemiSphere" tool_tip="Semi-esfera"/>
+ <button label="" label_selected="" name="ToolTorus" tool_tip="Toróide"/>
+ <button label="" label_selected="" name="ToolTube" tool_tip="Tubo"/>
+ <button label="" label_selected="" name="ToolRing" tool_tip="Anel"/>
+ <button label="" label_selected="" name="ToolTree" tool_tip="Ãrvore"/>
+ <button label="" label_selected="" name="ToolGrass" tool_tip="Grama"/>
+ <check_box label="Manter ferramenta selecionada" name="checkbox sticky"/>
+ <check_box label="Copiar Seleção" name="checkbox copy selection"/>
+ <check_box label="Copiar Centro" name="checkbox copy centers"/>
+ <check_box label="Rotacionar Cópia" name="checkbox copy rotates"/>
+ <check_box label="Selecionar Terra" name="radio select land"/>
+ <check_box label="Aplainar Terra" name="radio flatten"/>
+ <check_box label="Elevar Terra" name="radio raise"/>
+ <check_box label="Baixar Terra" name="radio lower"/>
+ <check_box label="Suavizar Terra" name="radio smooth"/>
+ <check_box label="Terreno RÃgido" name="radio noise"/>
+ <check_box label="Reverter Terra" name="radio revert"/>
+ <combo_box name="combobox brush size">
+ <combo_item name="Small">
+ Pequeno
+ </combo_item>
+ <combo_item name="Medium">
+ Médio
+ </combo_item>
+ <combo_item name="Large">
+ Grande
+ </combo_item>
+ </combo_box>
+ <text name="Strength:">
+ Força:
+ </text>
+ <button label="Aplicar no selecionado" label_selected="Aplicar no selecionado" name="button apply to selection" tool_tip="Modificar Terra Selecionada"/>
+ <check_box label="Mostrar Proprietários" name="checkbox show owners"/>
+ <button label="Mais >>" name="button more" tool_tip="Opções Avançadas"/>
+ <button label="<< Menos" name="button less" tool_tip="Opções Avançadas"/>
+ <tab_container name="Object Info Tabs">
+ <panel label="Comum" name="General">
+ <text name="Name:">
+ Nome:
+ </text>
+ <text name="Description:">
+ Descrição:
+ </text>
+ <text name="Creator:">
+ Criador:
+ </text>
+ <text name="Creator Name">
+ Thrax Linden
+ </text>
+ <button label="Perfil..." label_selected="Perfil..." name="button creator profile"/>
+ <text name="Owner:">
+ Proprietário:
+ </text>
+ <text name="Owner Name">
+ Thrax Linden
+ </text>
+ <button label="Perfil..." label_selected="Perfil..." name="button owner profile"/>
+ <text name="Group:">
+ Grupo:
+ </text>
+ <text name="Group Name Proxy">
+ Os Lindens
+ </text>
+ <button label="Definir..." label_selected="Definir..." name="button set group"/>
+ <text name="prim info">
+ 1 Objeto, 1 Primitiva
+ </text>
+ <text name="Permissions:">
+ Permissões:
+ </text>
+ <text name="perm_modify">
+ Você pode modificar este objeto.
+ </text>
+ <check_box label="Compartilhar com o Grupo" name="checkbox share with group" tool_tip="Permitir que o membros do grupo movam, modifiquem, copiem e apaguem"/>
+ <string name="text deed continued">
+ Doar...
+ </string>
+ <string name="text deed">
+ Doar
+ </string>
+ <button label="Doar..." label_selected="Doar..." name="button deed" tool_tip="Objetos compartilhados do Grupo pode ser doados pelo gerente do grupo."/>
+ <check_box label="Permitir que qualquer um mova" name="checkbox allow everyone move"/>
+ <check_box label="Permitir que qualquer um copie" name="checkbox allow everyone copy"/>
+ <check_box label="Mostrar na busca" name="search_check" tool_tip="Permitir que as pessoas vejam este objeto nos resultados de busca"/>
+ <check_box label="À Venda" name="checkbox for sale"/>
+ <text name="Cost">
+ Preço: L$
+ </text>
+ <radio_group name="sale type">
+ <radio_item name="Original">
+ Original
+ </radio_item>
+ <radio_item name="Copy">
+ Cópia
+ </radio_item>
+ <radio_item name="Contents">
+ Conteúdo
+ </radio_item>
+ </radio_group>
+ <text name="Next owner can:">
+ Próximo Proprietário pode:
+ </text>
+ <check_box label="Modificar" name="checkbox next owner can modify"/>
+ <check_box label="Copiar" name="checkbox next owner can copy"/>
+ <check_box label="Revender/Dar" name="checkbox next owner can transfer"/>
+ <text name="label click action">
+ Quando clicado com o botão esquerdo:
+ </text>
+ <combo_box name="clickaction">
+ <combo_item name="Touch/grab(default)">
+ Tocar/Pegar (padrão)
+ </combo_item>
+ <combo_item name="Sitonobject">
+ Sentar no objeto
+ </combo_item>
+ <combo_item name="Buyobject">
+ Comprar objeto
+ </combo_item>
+ <combo_item name="Payobject">
+ Pagar Objeto
+ </combo_item>
+ <combo_item name="Open">
+ Abrir
+ </combo_item>
+ <combo_item name="Play">
+ Executar a mÃdia do lote
+ </combo_item>
+ <combo_item name="Opemmedia">
+ Abrir a mÃdia do lote
+ </combo_item>
+ </combo_box>
+ <text name="B:">
+ B:
+ </text>
+ <text name="O:">
+ O;
+ </text>
+ <text name="G:">
+ G:
+ </text>
+ <text name="E:">
+ E:
+ </text>
+ <text name="N:">
+ N:
+ </text>
+ <text name="F:">
+ F:
+ </text>
+ <string name="text modify info 1">
+ Você pode modificar este objeto.
+ </string>
+ <string name="text modify info 2">
+ Você pode modificar estes objetos.
+ </string>
+ <string name="text modify info 3">
+ Você não pode modificar este objeto.
+ </string>
+ <string name="text modify info 4">
+ Você não pode modificar estes objetos.
+ </string>
+ <string name="text modify warning">
+ Você precisa selecionar o objeto todo para ajustar as permissões.
+ </string>
+ <string name="Cost Default">
+ Preço: L$
+ </string>
+ <string name="Cost Total">
+ Preço Total: L$
+ </string>
+ <string name="Cost Per Unit">
+ Preço Por: L$
+ </string>
+ <string name="Cost Mixed">
+ Preço Misturado
+ </string>
+ <string name="Sale Mixed">
+ Venda Misturada
+ </string>
+ </panel>
+ <panel label="Objeto" name="Object">
+ <text name="select_single">
+ Selecione apenas uma primitiva para editar os parâmetros.
+ </text>
+ <text name="edit_object">
+ Editar os parâmetros do Objeto:
+ </text>
+ <check_box label="Travado" name="checkbox locked" tool_tip="Previne que o objeto seja movido ou apagado. Muito útil para evitar edições não intencionais durante a construção."/>
+ <check_box label="FÃsica" name="Physical Checkbox Ctrl" tool_tip="Permite que os objetos sejam empurrados e sofram efeito da gravidade"/>
+ <check_box label="Temporário" name="Temporary Checkbox Ctrl" tool_tip="Faz com que o objeto seja apagado 1 minuto após ser criado."/>
+ <check_box label="Fantasma" name="Phantom Checkbox Ctrl" tool_tip="Faz com que o objeto não colida com outros objetos ou avatares"/>
+ <text name="label position">
+ Posição (metros)
+ </text>
+ <spinner label="X" name="Pos X"/>
+ <spinner label="Y" name="Pos Y"/>
+ <spinner label="Z" name="Pos Z"/>
+ <text name="label size">
+ Tamanho (metros)
+ </text>
+ <spinner label="X" name="Scale X"/>
+ <spinner label="Y" name="Scale Y"/>
+ <spinner label="Z" name="Scale Z"/>
+ <text name="label rotation">
+ Rotação (graus)
+ </text>
+ <spinner label="X" name="Rot X"/>
+ <spinner label="Y" name="Rot Y"/>
+ <spinner label="Z" name="Rot Z"/>
+ <text name="label material">
+ Material
+ </text>
+ <combo_box name="material">
+ <combo_item name="Stone">
+ Pedra
+ </combo_item>
+ <combo_item name="Metal">
+ Metal
+ </combo_item>
+ <combo_item name="Glass">
+ Vidro
+ </combo_item>
+ <combo_item name="Wood">
+ Madeira
+ </combo_item>
+ <combo_item name="Flesh">
+ Carne
+ </combo_item>
+ <combo_item name="Plastic">
+ Plástico
+ </combo_item>
+ <combo_item name="Rubber">
+ Couro
+ </combo_item>
+ </combo_box>
+ <text name="label basetype">
+ Forma básica
+ </text>
+ <combo_box name="comboBaseType">
+ <combo_item name="Box">
+ Caixa
+ </combo_item>
+ <combo_item name="Cylinder">
+ Cilindro
+ </combo_item>
+ <combo_item name="Prism">
+ Prisma
+ </combo_item>
+ <combo_item name="Sphere">
+ Esfera
+ </combo_item>
+ <combo_item name="Torus">
+ Toróide
+ </combo_item>
+ <combo_item name="Tube">
+ Tubo
+ </combo_item>
+ <combo_item name="Ring">
+ Anel
+ </combo_item>
+ <combo_item name="Sculpted">
+ Esculpida
+ </combo_item>
+ </combo_box>
+ <text name="text cut">
+ Recorte inicial e final
+ </text>
+ <spinner label="B" name="cut begin"/>
+ <spinner label="E" name="cut end"/>
+ <text name="text hollow">
+ Vazio
+ </text>
+ <text name="text skew">
+ Torcer
+ </text>
+ <text name="Hollow Shape">
+ Forma Vazia
+ </text>
+ <combo_box name="hole">
+ <combo_item name="Default">
+ Padrão
+ </combo_item>
+ <combo_item name="Circle">
+ Circulo
+ </combo_item>
+ <combo_item name="Square">
+ Quadrado
+ </combo_item>
+ <combo_item name="Triangle">
+ Triâgulo
+ </combo_item>
+ </combo_box>
+ <text name="text twist">
+ Torcer no InÃcio e final
+ </text>
+ <spinner label="B" name="Twist Begin"/>
+ <spinner label="E" name="Twist End"/>
+ <text name="scale_taper">
+ Afinar
+ </text>
+ <text name="scale_hole">
+ Tamanho do Buraco
+ </text>
+ <spinner label="X" name="Taper Scale X"/>
+ <spinner label="Y" name="Taper Scale Y"/>
+ <text name="text topshear">
+ Inclinar
+ </text>
+ <spinner label="X" name="Shear X"/>
+ <spinner label="Y" name="Shear Y"/>
+ <text name="advanced_cut">
+ Perfil Recortado no InÃcio e Final
+ </text>
+ <text name="advanced_dimple">
+ Cova InÃcio e Final
+ </text>
+ <spinner label="B" name="Path Limit Begin"/>
+ <spinner label="E" name="Path Limit End"/>
+ <text name="text taper2">
+ Afinar
+ </text>
+ <spinner label="X" name="Taper X"/>
+ <spinner label="Y" name="Taper Y"/>
+ <text name="text radius delta">
+ Raio
+ </text>
+ <text name="text revolutions">
+ Revoluções
+ </text>
+ <texture_picker label="Texture de Escultura" name="sculpt texture control" tool_tip="Click to choose a picture"/>
+ <check_box label="Espelho" name="sculpt mirror control" tool_tip="Inverter a primitiva esculpida ao longo do eixo X."/>
+ <check_box label="De dentro para fora" name="sculpt invert control" tool_tip="Inverte as normais das primitivas esculpidas, fazendo-as parecer de dentro para fora."/>
+ <text name="label sculpt type">
+ Tipo costura
+ </text>
+ <combo_box name="sculpt type control">
+ <combo_item name="None">
+ (nenhum)
+ </combo_item>
+ <combo_item name="Sphere">
+ Esfera
+ </combo_item>
+ <combo_item name="Torus">
+ Toróide
+ </combo_item>
+ <combo_item name="Plane">
+ Plano
+ </combo_item>
+ <combo_item name="Cylinder">
+ Cilindro
+ </combo_item>
+ </combo_box>
+ </panel>
+ <panel label="Recursos" name="Features">
+ <text name="select_single">
+ Selecione apenas uma primitiva para editar suas caracterÃsticas.
+ </text>
+ <text name="edit_object">
+ Editar caracterÃsticas do Objeto:
+ </text>
+ <check_box label="FlexÃbilidade" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que o objeto flexione no eixo Z. (Somente no lado do Cliente)"/>
+ <spinner label="Suavidade" name="FlexNumSections"/>
+ <spinner label="Gravidade" name="FlexGravity"/>
+ <spinner label="Arrastar" name="FlexFriction"/>
+ <spinner label="Vento" name="FlexWind"/>
+ <spinner label="Tensão" name="FlexTension"/>
+ <spinner label="Força X" name="FlexForceX"/>
+ <spinner label="Força Y" name="FlexForceY"/>
+ <spinner label="Força Z" name="FlexForceZ"/>
+ <check_box label="Luz" name="Light Checkbox Ctrl" tool_tip="Faz com que o objeto emita luz"/>
+ <text name="label color">
+ Cor
+ </text>
+ <color_swatch label="" name="colorswatch" tool_tip="Clique para abrir o Seletor de Cores"/>
+ <spinner label="Intensidade" name="Light Intensity"/>
+ <spinner label="Raio" name="Light Radius"/>
+ <spinner label="Queda" name="Light Falloff"/>
+ </panel>
+ <panel label="Textura" name="Texture">
+ <texture_picker label="Textura" name="texture control" tool_tip="Clique para escolher uma imagem"/>
+ <color_swatch label="Cor" name="colorswatch" tool_tip="Clique para abrir o Seletor de Cores"/>
+ <text name="color trans">
+ Transparência %
+ </text>
+ <text name="glow label">
+ Brilho
+ </text>
+ <check_box label="Claridade" name="checkbox fullbright"/>
+ <text name="tex gen">
+ Mapeamento
+ </text>
+ <combo_box name="combobox texgen">
+ <combo_item name="Default">
+ Padrão
+ </combo_item>
+ <combo_item name="Planar">
+ Planar
+ </combo_item>
+ </combo_box>
+ <text name="label shininess">
+ Brilho
+ </text>
+ <combo_box name="combobox shininess">
+ <combo_item name="None">
+ Nenhum
+ </combo_item>
+ <combo_item name="Low">
+ Baixo
+ </combo_item>
+ <combo_item name="Medium">
+ Médio
+ </combo_item>
+ <combo_item name="High">
+ Alto
+ </combo_item>
+ </combo_box>
+ <text name="label bumpiness">
+ Ondulação
+ </text>
+ <combo_box name="combobox bumpiness">
+ <combo_item name="None">
+ Nenhum
+ </combo_item>
+ <combo_item name="Brightness">
+ Claridade
+ </combo_item>
+ <combo_item name="Darkness">
+ Escuridão
+ </combo_item>
+ <combo_item name="woodgrain">
+ Granulação
+ </combo_item>
+ <combo_item name="bark">
+ casca
+ </combo_item>
+ <combo_item name="bricks">
+ Tijolos
+ </combo_item>
+ <combo_item name="checker">
+ Caixa
+ </combo_item>
+ <combo_item name="concrete">
+ Concreto
+ </combo_item>
+ <combo_item name="crustytile">
+ Encaroçado
+ </combo_item>
+ <combo_item name="cutstone">
+ Pedra Cortante
+ </combo_item>
+ <combo_item name="discs">
+ Discos
+ </combo_item>
+ <combo_item name="gravel">
+ Cascalho
+ </combo_item>
+ <combo_item name="petridish">
+ Pedrisco
+ </combo_item>
+ <combo_item name="siding">
+ Revestimento
+ </combo_item>
+ <combo_item name="stonetile">
+ empedrado
+ </combo_item>
+ <combo_item name="stucco">
+ Grafiato
+ </combo_item>
+ <combo_item name="suction">
+ Sulcos
+ </combo_item>
+ <combo_item name="weave">
+ weave
+ </combo_item>
+ </combo_box>
+ <text name="tex scale">
+ Repetir por Face
+ </text>
+ <spinner label="Horizontal (U)" name="TexScaleU"/>
+ <check_box label="Flip" name="checkbox flip s"/>
+ <spinner label="Vertical (V)" name="TexScaleV"/>
+ <check_box label="Flip" name="checkbox flip t"/>
+ <text name="tex rotate">
+ Rotação (graus)
+ </text>
+ <string name="string repeats per meter">
+ Repetir por Metro
+ </string>
+ <string name="string repeats per face">
+ Repetir por Face
+ </string>
+ <text name="rpt">
+ Repetir por Metro
+ </text>
+ <button label="Aplicar" label_selected="Aplicar" name="button apply"/>
+ <text name="tex offset">
+ Deslocamento
+ </text>
+ <spinner label="Horizontal (U)" name="TexOffsetU"/>
+ <spinner label="Vertical (V)" name="TexOffsetV"/>
+ <text name="textbox autofix">
+ Alinhar Texturas
+ </text>
+ <button label="Alinhar" label_selected="Alinhar" name="button align"/>
+ </panel>
+ <panel label="Conteúdo" name="Contents">
+ <button label="Novo Script..." label_selected="Novo Script..." name="button new script"/>
+ </panel>
+ </tab_container>
+ <panel name="land info panel">
+ <text name="label_area_price">
+ Preço: L$[PRICE] por [AREA] m².
+ </text>
+ <text name="label_area">
+ Ãrea: [AREA] m².
+ </text>
+ <button label="Comprar Terra..." label_selected="Comprar Terra.." name="button buy land"/>
+ <button label="Abandonar Terra..." label_selected="Abandonar Terra..." name="button abandon land"/>
+ <button label="Sub-Dividir..." label_selected="Sub-Dividir..." name="button subdivide land"/>
+ <button label="Unir..." label_selected="Unir..." name="button join land"/>
+ <button label="Sobre a Terra..." label_selected="Sobre a Terra..." name="button about land"/>
+ </panel>
+ <string name="status_rotate">
+ Arrastar as bandas coloridas para girar o objeto
+ </string>
+ <string name="status_scale">
+ Clicar e arrastar para esticar o lado selecionado
+ </string>
+ <string name="status_move">
+ Arrastar para mover, Shift-arrastar para copiar
+ </string>
+ <string name="status_modifyland">
+ Clicar e reter para modificar a terra
+ </string>
+ <string name="status_camera">
+ Clicar e arrastar para mudar a vista
+ </string>
+ <string name="status_grab">
+ Arrastar para mover objetos, Ctrl para levantar, Ctrl-Shift para girar
+ </string>
+ <string name="status_place">
+ Clicar no mundo para criar, shift-clicar para selecionar
+ </string>
+ <string name="status_selectland">
+ Clicar e arrastar para selecionar a terra
+ </string>
+ <string name="grid_screen_text">
+ Tela
+ </string>
+ <string name="grid_local_text">
+ Local
+ </string>
+ <string name="grid_world_text">
+ Mundo
+ </string>
+ <string name="grid_reference_text">
+ Referência
+ </string>
+ <string name="grid_attachment_text">
+ Anexo
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index 1cbe42eb09..694100297d 100644
--- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="top_objects" title="Carregando...">
- <text name="title_text">
- Carregando...
- </text>
- <scroll_list name="objects_list">
- <column label="Placar" name="score"/>
- <column label="Nome" name="name"/>
- <column label="Proprietário" name="owner"/>
- <column label="Local" name="location"/>
- <column label="Tempo" name="time"/>
- <column label="Hora Mono" name="mono_time"/>
- </scroll_list>
- <text name="id_text">
- ID do Objeto:
- </text>
- <button label="Mostrar Avisos" name="show_beacon_btn"/>
- <text name="obj_name_text">
- Nome do Objeto:
- </text>
- <button label="Filtro" name="filter_object_btn"/>
- <text name="owner_name_text">
- Nome do Proprietário:
- </text>
- <button label="Filtro" name="filter_owner_btn"/>
- <button label="Retornar Selecionado" name="return_selected_btn"/>
- <button label="Retornar Tudo" name="return_all_btn"/>
- <button label="Desabilitar Selecionado" name="disable_selected_btn"/>
- <button label="Desabilitar Tudo" name="disable_all_btn"/>
- <button label="Atualizar" name="refresh_btn"/>
- <string name="top_scripts_title">
- Principais Scripts
- </string>
- <string name="top_scripts_text">
- [COUNT] scripts tomando um total de [TIME] ms
- </string>
- <string name="scripts_score_label">
- Tempo
- </string>
- <string name="scripts_mono_time_label">
- Hora Mono
- </string>
- <string name="top_colliders_title">
- Principais Colidentes
- </string>
- <string name="top_colliders_text">
- [COUNT] objetos principais experimentando muitas potenciais colisões
- </string>
- <string name="colliders_score_label">
- Placar
- </string>
- <string name="none_descriptor">
- Nenhum encontrado.
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="top_objects" title="Carregando...">
+ <text name="title_text">
+ Carregando...
+ </text>
+ <scroll_list name="objects_list">
+ <column label="Placar" name="score"/>
+ <column label="Nome" name="name"/>
+ <column label="Proprietário" name="owner"/>
+ <column label="Local" name="location"/>
+ <column label="Tempo" name="time"/>
+ <column label="Hora Mono" name="mono_time"/>
+ </scroll_list>
+ <text name="id_text">
+ ID do Objeto:
+ </text>
+ <button label="Mostrar Avisos" name="show_beacon_btn"/>
+ <text name="obj_name_text">
+ Nome do Objeto:
+ </text>
+ <button label="Filtro" name="filter_object_btn"/>
+ <text name="owner_name_text">
+ Nome do Proprietário:
+ </text>
+ <button label="Filtro" name="filter_owner_btn"/>
+ <button label="Retornar Selecionado" name="return_selected_btn"/>
+ <button label="Retornar Tudo" name="return_all_btn"/>
+ <button label="Desabilitar Selecionado" name="disable_selected_btn"/>
+ <button label="Desabilitar Tudo" name="disable_all_btn"/>
+ <button label="Atualizar" name="refresh_btn"/>
+ <string name="top_scripts_title">
+ Principais Scripts
+ </string>
+ <string name="top_scripts_text">
+ [COUNT] scripts tomando um total de [TIME] ms
+ </string>
+ <string name="scripts_score_label">
+ Tempo
+ </string>
+ <string name="scripts_mono_time_label">
+ Hora Mono
+ </string>
+ <string name="top_colliders_title">
+ Principais Colidentes
+ </string>
+ <string name="top_colliders_text">
+ [COUNT] objetos principais experimentando muitas potenciais colisões
+ </string>
+ <string name="colliders_score_label">
+ Placar
+ </string>
+ <string name="none_descriptor">
+ Nenhum encontrado.
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml
index 91c31ccce6..5da34d2de7 100644
--- a/indra/newview/skins/default/xui/pt/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tos.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title=" ">
- <button label="Continuar" label_selected="Continuar" name="Continue"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <check_box label="Eu concordo com os Termos do Serviço" name="agree_chk"/>
- <text name="tos_heading">
- Por favor, leia os seguintes Termos de Serviço cuidadosamente. Para continuar acessando o Second Life, você precisa aceitar o acordo.
- </text>
- <text_editor name="tos_text">
- TOS_TEXT
- </text_editor>
- <string name="real_url">
- http://secondlife.com/app/tos/
- </string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title=" ">
+ <button label="Continuar" label_selected="Continuar" name="Continue"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <check_box label="Eu concordo com os Termos do Serviço" name="agree_chk"/>
+ <text name="tos_heading">
+ Por favor, leia os seguintes Termos de Serviço cuidadosamente. Para continuar acessando o Second Life, você precisa aceitar o acordo.
+ </text>
+ <text_editor name="tos_text">
+ TOS_TEXT
+ </text_editor>
+ <string name="real_url">
+ http://secondlife.com/app/tos/
+ </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_url_entry.xml b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
index 276a51ebee..a4ae5e2e3d 100644
--- a/indra/newview/skins/default/xui/pt/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/pt/floater_url_entry.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="url_entry" title="">
- <text name="media_label">
- URL da MÃdia:
- </text>
- <button label="OK" name="ok_btn"/>
- <button label="Cancelar" name="cancel_btn"/>
- <button label="Limpar" name="clear_btn"/>
- <text name="loading_label">
- Carregando..
- </text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="url_entry" title="">
+ <text name="media_label">
+ URL da MÃdia:
+ </text>
+ <button label="OK" name="ok_btn"/>
+ <button label="Cancelar" name="cancel_btn"/>
+ <button label="Limpar" name="clear_btn"/>
+ <text name="loading_label">
+ Carregando..
+ </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_water.xml b/indra/newview/skins/default/xui/pt/floater_water.xml
index d6f261f872..007eb3f6ba 100644
--- a/indra/newview/skins/default/xui/pt/floater_water.xml
+++ b/indra/newview/skins/default/xui/pt/floater_water.xml
@@ -1,85 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="Editor de Ãgua Avançado">
- <text name="KeyFramePresetsText">
- Pré-configurações da Ãgua:
- </text>
- <button label="Novo" label_selected="Novo" name="WaterNewPreset"/>
- <button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/>
- <button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/>
- <tab_container name="Water Tabs">
- <panel label="Configurações" name="Settings">
- <text name="BHText">
- Cor da névoa da Ãgua
- </text>
- <button label="?" name="WaterFogColorHelp"/>
- <color_swatch label="" name="WaterFogColor" tool_tip="Clique para abrir o Capturador de Cor"/>
- <text name="WaterFogDensText">
- Expoente da Densidade de névoa
- </text>
- <button label="?" name="WaterFogDensityHelp"/>
- <text name="WaterUnderWaterFogModText">
- Modificador da névoa Subaquática
- </text>
- <button label="?" name="WaterUnderWaterFogModHelp"/>
- <text name="BDensText">
- Escala da Marola de Reflexão
- </text>
- <button label="?" name="WaterNormalScaleHelp"/>
- <text name="BHText2">
- 1
- </text>
- <text name="BHText3">
- 2
- </text>
- <text name="BHText4">
- 3
- </text>
- <text name="HDText">
- Escala de Fresnel
- </text>
- <button label="?" name="WaterFresnelScaleHelp"/>
- <text name="FresnelOffsetText">
- Deslocamento de Fresnel
- </text>
- <button label="?" name="WaterFresnelOffsetHelp"/>
- <text name="DensMultText">
- Refratar a Escala para Cima
- </text>
- <button label="?" name="WaterScaleAboveHelp"/>
- <text name="WaterScaleBelowText">
- Refratar a Escala para Baixo
- </text>
- <button label="?" name="WaterScaleBelowHelp"/>
- <text name="MaxAltText">
- Multiplicador de Difusão
- </text>
- <button label="?" name="WaterBlurMultiplierHelp"/>
- </panel>
- <panel label="Imagem" name="Waves">
- <text name="BHText">
- Direção da Onda Maior
- </text>
- <button label="?" name="WaterWave1Help"/>
- <text name="WaterWave1DirXText">
- X
- </text>
- <text name="WaterWave1DirYText">
- Y
- </text>
- <text name="BHText2">
- Direção da Onda Pequena
- </text>
- <button label="?" name="WaterWave2Help"/>
- <text name="WaterWave2DirXText">
- X
- </text>
- <text name="WaterWave2DirYText">
- Y
- </text>
- <text name="BHText3">
- Mapa Normal
- </text>
- <button label="?" name="WaterNormalMapHelp"/>
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Water Floater" title="Editor de Ãgua Avançado">
+ <text name="KeyFramePresetsText">
+ Pré-configurações da Ãgua:
+ </text>
+ <button label="Novo" label_selected="Novo" name="WaterNewPreset"/>
+ <button label="Salvar" label_selected="Salvar" name="WaterSavePreset"/>
+ <button label="Deletar" label_selected="Deletar" name="WaterDeletePreset"/>
+ <tab_container name="Water Tabs">
+ <panel label="Configurações" name="Settings">
+ <text name="BHText">
+ Cor da névoa da Ãgua
+ </text>
+ <button label="?" name="WaterFogColorHelp"/>
+ <color_swatch label="" name="WaterFogColor" tool_tip="Clique para abrir o Capturador de Cor"/>
+ <text name="WaterFogDensText">
+ Expoente da Densidade de névoa
+ </text>
+ <button label="?" name="WaterFogDensityHelp"/>
+ <text name="WaterUnderWaterFogModText">
+ Modificador da névoa Subaquática
+ </text>
+ <button label="?" name="WaterUnderWaterFogModHelp"/>
+ <text name="BDensText">
+ Escala da Marola de Reflexão
+ </text>
+ <button label="?" name="WaterNormalScaleHelp"/>
+ <text name="BHText2">
+ 1
+ </text>
+ <text name="BHText3">
+ 2
+ </text>
+ <text name="BHText4">
+ 3
+ </text>
+ <text name="HDText">
+ Escala de Fresnel
+ </text>
+ <button label="?" name="WaterFresnelScaleHelp"/>
+ <text name="FresnelOffsetText">
+ Deslocamento de Fresnel
+ </text>
+ <button label="?" name="WaterFresnelOffsetHelp"/>
+ <text name="DensMultText">
+ Refratar a Escala para Cima
+ </text>
+ <button label="?" name="WaterScaleAboveHelp"/>
+ <text name="WaterScaleBelowText">
+ Refratar a Escala para Baixo
+ </text>
+ <button label="?" name="WaterScaleBelowHelp"/>
+ <text name="MaxAltText">
+ Multiplicador de Difusão
+ </text>
+ <button label="?" name="WaterBlurMultiplierHelp"/>
+ </panel>
+ <panel label="Imagem" name="Waves">
+ <text name="BHText">
+ Direção da Onda Maior
+ </text>
+ <button label="?" name="WaterWave1Help"/>
+ <text name="WaterWave1DirXText">
+ X
+ </text>
+ <text name="WaterWave1DirYText">
+ Y
+ </text>
+ <text name="BHText2">
+ Direção da Onda Pequena
+ </text>
+ <button label="?" name="WaterWave2Help"/>
+ <text name="WaterWave2DirXText">
+ X
+ </text>
+ <text name="WaterWave2DirYText">
+ Y
+ </text>
+ <text name="BHText3">
+ Mapa Normal
+ </text>
+ <button label="?" name="WaterNormalMapHelp"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
index f3adc82465..3f08b4b992 100644
--- a/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="modal container" title=" ">
- <button label="Salvar" label_selected="Salvar" name="Save"/>
- <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
- <text length="1" name="Save item as:" type="string">
- Salvar item como:
- </text>
- <line_editor name="name ed">
- Novo [DESC]
- </line_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container" title=" ">
+ <button label="Salvar" label_selected="Salvar" name="Save"/>
+ <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+ <text length="1" name="Save item as:" type="string">
+ Salvar item como:
+ </text>
+ <line_editor name="name ed">
+ Novo [DESC]
+ </line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
index ff22a87200..f86775c770 100644
--- a/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/pt/floater_windlight_options.xml
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="Editor de Céu Avançado">
- <text name="KeyFramePresetsText">
- Pré-definições de Céu:
- </text>
- <button label="Novo" label_selected="Novo" name="WLNewPreset"/>
- <button label="Salvar" label_selected="Salvar" name="WLSavePreset"/>
- <button label="Deletar" label_selected="Deletar" name="WLDeletePreset"/>
- <button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton" width="150" left_delta="95" />
- <tab_container name="WindLight Tabs">
- <panel label="Atmosfera" name="Atmosphere">
- <text name="BHText">
- Horizonte Azul
- </text>
- <button label="?" name="WLBlueHorizonHelp"/>
- <text name="BHText2">
- R
- </text>
- <text name="BHText3">
- G
- </text>
- <text name="BHText4">
- B
- </text>
- <text name="BHText5">
- I
- </text>
- <text name="BDensText">
- Horizonte da Neblina
- </text>
- <button label="?" name="WLHazeHorizonHelp"/>
- <text name="BDensText2">
- Densidade de Azul
- </text>
- <button label="?" name="WLBlueDensityHelp"/>
- <text name="BHText6">
- R
- </text>
- <text name="BHText7">
- G
- </text>
- <text name="BHText8">
- B
- </text>
- <text name="BHText9">
- I
- </text>
- <text name="HDText">
- Densidade da Neblina
- </text>
- <button label="?" name="WLHazeDensityHelp"/>
- <text name="DensMultText">
- Multiplicador de Densidade
- </text>
- <button label="?" name="WLDensityMultHelp"/>
- <text name="WLDistanceMultText">
- Multiplicador de Distância
- </text>
- <button label="?" name="WLDistanceMultHelp"/>
- <text name="MaxAltText">
- Altitude Máxima
- </text>
- <button label="?" name="WLMaxAltitudeHelp"/>
- </panel>
- <panel label="Iluminação" name="Lighting">
- <text name="SLCText">
- Cor do Sol/Lua
- </text>
- <button label="?" name="WLSunlightColorHelp"/>
- <text name="BHText">
- R
- </text>
- <text name="BHText2">
- G
- </text>
- <text name="BHText3">
- B
- </text>
- <text name="BHText4">
- I
- </text>
- <text name="TODText">
- Posição do Sol/Lua
- </text>
- <button label="?" name="WLTimeOfDayHelp"/>
- <text name="WLAmbientText">
- Ambiente
- </text>
- <button label="?" name="WLAmbientHelp"/>
- <text name="BHText5">
- R
- </text>
- <text name="BHText6">
- G
- </text>
- <text name="BHText7">
- B
- </text>
- <text name="BHText8">
- I
- </text>
- <text name="WLEastAngleText">
- Ângulo Leste
- </text>
- <button label="?" name="WLEastAngleHelp"/>
- <text name="SunGlowText">
- Brilho do Sol
- </text>
- <button label="?" name="WLSunGlowHelp"/>
- <slider label="Foco" name="WLGlowB"/>
- <slider label="Tamanho" name="WLGlowR"/>
- <text name="SceneGammaText">
- Gamma da Cena
- </text>
- <button label="?" name="WLSceneGammaHelp"/>
- <text name="WLStarText">
- Brilho da Estrela
- </text>
- <button label="?" name="WLStarBrightnessHelp"/>
- </panel>
- <panel label="Nuvens" name="Clouds">
- <text name="WLCloudColorText">
- Cor da Nuvem
- </text>
- <button label="?" name="WLCloudColorHelp"/>
- <text name="BHText">
- R
- </text>
- <text name="BHText2">
- G
- </text>
- <text name="BHText3">
- B
- </text>
- <text name="BHText4">
- I
- </text>
- <text name="WLCloudColorText2">
- Densidade/ XY da Nuvem
- </text>
- <button label="?" name="WLCloudDensityHelp"/>
- <text name="BHText5">
- X
- </text>
- <text name="BHText6">
- Y
- </text>
- <text name="BHText7">
- D
- </text>
- <text name="WLCloudCoverageText">
- Cobertura da Nuvem
- </text>
- <button label="?" name="WLCloudCoverageHelp"/>
- <text name="WLCloudScaleText">
- Escala da Nuvem
- </text>
- <button label="?" name="WLCloudScaleHelp"/>
- <text name="WLCloudDetailText">
- Detalhe da Nuvem (XY/Densidade)
- </text>
- <button label="?" name="WLCloudDetailHelp"/>
- <text name="BHText8">
- X
- </text>
- <text name="BHText9">
- Y
- </text>
- <text name="BHText10">
- D
- </text>
- <text name="WLCloudScrollXText">
- Rolagem X da Nuvem
- </text>
- <button label="?" name="WLCloudScrollXHelp"/>
- <check_box label="Travar" name="WLCloudLockX"/>
- <text name="WLCloudScrollYText">
- Rolagem Y da Nuvem
- </text>
- <button label="?" name="WLCloudScrollYHelp"/>
- <check_box label="Travar" name="WLCloudLockY"/>
- <check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/>
- <button label="?" name="WLClassicCloudsHelp"/>
- </panel>
- </tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="WindLight floater" title="Editor de Céu Avançado">
+ <text name="KeyFramePresetsText">
+ Pré-definições de Céu:
+ </text>
+ <button label="Novo" label_selected="Novo" name="WLNewPreset"/>
+ <button label="Salvar" label_selected="Salvar" name="WLSavePreset"/>
+ <button label="Deletar" label_selected="Deletar" name="WLDeletePreset"/>
+ <button label="Editor de Ciclos do Dia" label_selected="Editor de Ciclos do Dia" name="WLDayCycleMenuButton" width="150" left_delta="95" />
+ <tab_container name="WindLight Tabs">
+ <panel label="Atmosfera" name="Atmosphere">
+ <text name="BHText">
+ Horizonte Azul
+ </text>
+ <button label="?" name="WLBlueHorizonHelp"/>
+ <text name="BHText2">
+ R
+ </text>
+ <text name="BHText3">
+ G
+ </text>
+ <text name="BHText4">
+ B
+ </text>
+ <text name="BHText5">
+ I
+ </text>
+ <text name="BDensText">
+ Horizonte da Neblina
+ </text>
+ <button label="?" name="WLHazeHorizonHelp"/>
+ <text name="BDensText2">
+ Densidade de Azul
+ </text>
+ <button label="?" name="WLBlueDensityHelp"/>
+ <text name="BHText6">
+ R
+ </text>
+ <text name="BHText7">
+ G
+ </text>
+ <text name="BHText8">
+ B
+ </text>
+ <text name="BHText9">
+ I
+ </text>
+ <text name="HDText">
+ Densidade da Neblina
+ </text>
+ <button label="?" name="WLHazeDensityHelp"/>
+ <text name="DensMultText">
+ Multiplicador de Densidade
+ </text>
+ <button label="?" name="WLDensityMultHelp"/>
+ <text name="WLDistanceMultText">
+ Multiplicador de Distância
+ </text>
+ <button label="?" name="WLDistanceMultHelp"/>
+ <text name="MaxAltText">
+ Altitude Máxima
+ </text>
+ <button label="?" name="WLMaxAltitudeHelp"/>
+ </panel>
+ <panel label="Iluminação" name="Lighting">
+ <text name="SLCText">
+ Cor do Sol/Lua
+ </text>
+ <button label="?" name="WLSunlightColorHelp"/>
+ <text name="BHText">
+ R
+ </text>
+ <text name="BHText2">
+ G
+ </text>
+ <text name="BHText3">
+ B
+ </text>
+ <text name="BHText4">
+ I
+ </text>
+ <text name="TODText">
+ Posição do Sol/Lua
+ </text>
+ <button label="?" name="WLTimeOfDayHelp"/>
+ <text name="WLAmbientText">
+ Ambiente
+ </text>
+ <button label="?" name="WLAmbientHelp"/>
+ <text name="BHText5">
+ R
+ </text>
+ <text name="BHText6">
+ G
+ </text>
+ <text name="BHText7">
+ B
+ </text>
+ <text name="BHText8">
+ I
+ </text>
+ <text name="WLEastAngleText">
+ Ângulo Leste
+ </text>
+ <button label="?" name="WLEastAngleHelp"/>
+ <text name="SunGlowText">
+ Brilho do Sol
+ </text>
+ <button label="?" name="WLSunGlowHelp"/>
+ <slider label="Foco" name="WLGlowB"/>
+ <slider label="Tamanho" name="WLGlowR"/>
+ <text name="SceneGammaText">
+ Gamma da Cena
+ </text>
+ <button label="?" name="WLSceneGammaHelp"/>
+ <text name="WLStarText">
+ Brilho da Estrela
+ </text>
+ <button label="?" name="WLStarBrightnessHelp"/>
+ </panel>
+ <panel label="Nuvens" name="Clouds">
+ <text name="WLCloudColorText">
+ Cor da Nuvem
+ </text>
+ <button label="?" name="WLCloudColorHelp"/>
+ <text name="BHText">
+ R
+ </text>
+ <text name="BHText2">
+ G
+ </text>
+ <text name="BHText3">
+ B
+ </text>
+ <text name="BHText4">
+ I
+ </text>
+ <text name="WLCloudColorText2">
+ Densidade/ XY da Nuvem
+ </text>
+ <button label="?" name="WLCloudDensityHelp"/>
+ <text name="BHText5">
+ X
+ </text>
+ <text name="BHText6">
+ Y
+ </text>
+ <text name="BHText7">
+ D
+ </text>
+ <text name="WLCloudCoverageText">
+ Cobertura da Nuvem
+ </text>
+ <button label="?" name="WLCloudCoverageHelp"/>
+ <text name="WLCloudScaleText">
+ Escala da Nuvem
+ </text>
+ <button label="?" name="WLCloudScaleHelp"/>
+ <text name="WLCloudDetailText">
+ Detalhe da Nuvem (XY/Densidade)
+ </text>
+ <button label="?" name="WLCloudDetailHelp"/>
+ <text name="BHText8">
+ X
+ </text>
+ <text name="BHText9">
+ Y
+ </text>
+ <text name="BHText10">
+ D
+ </text>
+ <text name="WLCloudScrollXText">
+ Rolagem X da Nuvem
+ </text>
+ <button label="?" name="WLCloudScrollXHelp"/>
+ <check_box label="Travar" name="WLCloudLockX"/>
+ <text name="WLCloudScrollYText">
+ Rolagem Y da Nuvem
+ </text>
+ <button label="?" name="WLCloudScrollYHelp"/>
+ <check_box label="Travar" name="WLCloudLockY"/>
+ <check_box label="Desenhar Nuvens Clássicas" name="DrawClassicClouds"/>
+ <button label="?" name="WLClassicCloudsHelp"/>
+ </panel>
+ </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_world_map.xml b/indra/newview/skins/default/xui/pt/floater_world_map.xml
index 4b7371d688..24de146387 100644
--- a/indra/newview/skins/default/xui/pt/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/pt/floater_world_map.xml
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="worldmap" title="Mapa Mundi">
- <tab_container name="maptab">
- <panel label="Objetos" name="objects_mapview"/>
- <panel label="Terreno" name="terrain_mapview"/>
- </tab_container>
- <text name="land_for_sale_label">
- Terra à venda
- </text>
- <text name="auction_label">
- Leilão
- </text>
- <text name="you_label">
- Você
- </text>
- <text name="home_label">
- Casa
- </text>
- <button label="Ir para Casa" label_selected="Ir para casa" name="Go Home" tool_tip="Teletransportar para sua Casa"/>
- <text name="person_label">
- Pessoa
- </text>
- <text name="infohub_label">
- Infohub
- </text>
- <text name="telehub_label">
- Telehub
- </text>
- <text name="land_for_sale_label2">
- Terra à Venda
- </text>
- <text name="events_label">
- Eventos
- </text>
-
- <combo_box label="Amigos Conectados" name="friend combo" tool_tip="Amigos para mostrar no Mapa">
- <combo_item name="none_selected">
- Amigos Conectados
- </combo_item>
- </combo_box>
- <combo_box label="Landmarks" name="landmark combo" tool_tip="Landmark para mostrar no Mapa">
- <combo_item name="none_selected">
- Landmarks
- </combo_item>
- </combo_box>
- <line_editor label="Procurar por nome de região" name="location" tool_tip="Digite o nome de uma Região"/>
- <button label="Procurar" name="DoSearch" tool_tip="Procurar por região"/>
- <text name="search_label">
- Resultados da Procura:
- </text>
- <text name="location_label">
- Localização:
- </text>
- <spinner name="spin x" tool_tip="Coordenada X da posição mostrada no mapa"/>
- <spinner name="spin y" tool_tip="Coordenada Y da posição mostrada no mapa"/>
- <spinner name="spin z" tool_tip="Coordenada Z da posição mostrada no Mapa"/>
- <button label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para a posição selecionada"/>
- <button label="Mostrar Destino" label_selected="Mostrar Destino" name="Show Destination" tool_tip="Centralizar mapa na posição selecionada"/>
- <button label="Limpar" label_selected="Limpar" name="Clear" tool_tip="Parar de percorrer"/>
- <button label="Mostra minha localização" label_selected="Mostra minha localização" name="Show My Location" tool_tip="Centraliza o mapa na posição do seu Avatar"/>
- <button label="Copiar SLURL para área de transferência" name="copy_slurl" tool_tip="Copia a posição atual como SLURL para ser usada na Web"/>
- <slider label="Zoom" name="zoom slider"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="worldmap" title="Mapa Mundi">
+ <tab_container name="maptab">
+ <panel label="Objetos" name="objects_mapview"/>
+ <panel label="Terreno" name="terrain_mapview"/>
+ </tab_container>
+ <text name="land_for_sale_label">
+ Terra à venda
+ </text>
+ <text name="auction_label">
+ Leilão
+ </text>
+ <text name="you_label">
+ Você
+ </text>
+ <text name="home_label">
+ Casa
+ </text>
+ <button label="Ir para Casa" label_selected="Ir para casa" name="Go Home" tool_tip="Teletransportar para sua Casa"/>
+ <text name="person_label">
+ Pessoa
+ </text>
+ <text name="infohub_label">
+ Infohub
+ </text>
+ <text name="telehub_label">
+ Telehub
+ </text>
+ <text name="land_for_sale_label2">
+ Terra à Venda
+ </text>
+ <text name="events_label">
+ Eventos
+ </text>
+
+ <combo_box label="Amigos Conectados" name="friend combo" tool_tip="Amigos para mostrar no Mapa">
+ <combo_box.item name="none_selected">
+ Amigos Conectados
+ </combo_box.item>
+ </combo_box>
+ <combo_box label="Landmarks" name="landmark combo" tool_tip="Landmark para mostrar no Mapa">
+ <combo_box.item name="none_selected">
+ Landmarks
+ </combo_box.item>
+ </combo_box>
+ <line_editor label="Procurar por nome de região" name="location" tool_tip="Digite o nome de uma Região"/>
+ <button label="Procurar" name="DoSearch" tool_tip="Procurar por região"/>
+ <text name="search_label">
+ Resultados da Procura:
+ </text>
+ <text name="location_label">
+ Localização:
+ </text>
+ <spinner name="spin x" tool_tip="Coordenada X da posição mostrada no mapa"/>
+ <spinner name="spin y" tool_tip="Coordenada Y da posição mostrada no mapa"/>
+ <spinner name="spin z" tool_tip="Coordenada Z da posição mostrada no Mapa"/>
+ <button label="Teletransporte" label_selected="Teletransporte" name="Teleport" tool_tip="Teletransportar para a posição selecionada"/>
+ <button label="Mostrar Destino" label_selected="Mostrar Destino" name="Show Destination" tool_tip="Centralizar mapa na posição selecionada"/>
+ <button label="Limpar" label_selected="Limpar" name="Clear" tool_tip="Parar de percorrer"/>
+ <button label="Mostra minha localização" label_selected="Mostra minha localização" name="Show My Location" tool_tip="Centraliza o mapa na posição do seu Avatar"/>
+ <button label="Copiar SLURL para área de transferência" name="copy_slurl" tool_tip="Copia a posição atual como SLURL para ser usada na Web"/>
+ <slider label="Zoom" name="zoom slider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml
index e9913e5a11..4fdafac015 100644
--- a/indra/newview/skins/default/xui/pt/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Popup">
- <menu_item_call label="Comprar" name="Task Buy"/>
- <menu_item_call label="Abrir" name="Task Open"/>
- <menu_item_call label="Executar" name="Task Play"/>
- <menu_item_call label="Propriedades" name="Task Properties"/>
- <menu_item_call label="Renomear" name="Task Rename"/>
- <menu_item_call label="Apagar" name="Task Remove"/>
- <menu_item_call label="Limpar Lixeira" name="Empty Trash"/>
- <menu_item_call label="Limpar Achados e perdidos" name="Empty Lost And Found"/>
- <menu_item_call label="Nova Pasta" name="New Folder"/>
- <menu_item_call label="Novo Script" name="New Script"/>
- <menu_item_call label="Nova Nota" name="New Note"/>
- <menu_item_call label="Novo Gesto" name="New Gesture"/>
- <menu label="Nova Roupa" name="New Clothes">
- <menu_item_call label="Nova Camisa" name="New Shirt"/>
- <menu_item_call label="Nova Calça" name="New Pants"/>
- <menu_item_call label="Novos Calçados" name="New Shoes"/>
- <menu_item_call label="Novas Meias" name="New Socks"/>
- <menu_item_call label="Nova Jaqueta" name="New Jacket"/>
- <menu_item_call label="Nova Saia" name="New Skirt"/>
- <menu_item_call label="Novas Luvas" name="New Gloves"/>
- <menu_item_call label="Nova Anágua" name="New Undershirt"/>
- <menu_item_call label="Nova roupa de baixo" name="New Underpants"/>
- </menu>
- <menu label="Parte do corpo" name="New Body Parts">
- <menu_item_call label="Nova forma" name="New Shape"/>
- <menu_item_call label="Nova pele" name="New Skin"/>
- <menu_item_call label="Novo cabelo" name="New Hair"/>
- <menu_item_call label="Novos olhos" name="New Eyes"/>
- </menu>
- <menu_item_call label="Teletransporte" name="Landmark Open"/>
- <menu_item_call label="Abrir" name="Animation Open"/>
- <menu_item_call label="Abrir" name="Sound Open"/>
- <menu_item_call label="Remover item" name="Purge Item"/>
- <menu_item_call label="Restaurar item" name="Restore Item"/>
- <menu_item_call label="Abrir" name="Open"/>
- <menu_item_call label="Propriedades" name="Properties"/>
- <menu_item_call label="Renomear" name="Rename"/>
- <menu_item_call label="Copy Asset UUID" name="Copy Asset UUID"/>
- <menu_item_call label="Copiar" name="Copy"/>
- <menu_item_call label="Colar" name="Paste"/>
- <menu_item_call label="Apagar" name="Delete"/>
- <menu_item_call label="Adicionar ao equipamento" name="Add To Outfit"/>
- <menu_item_call label="Substituir equipamento" name="Replace Outfit"/>
- <menu_item_call label="Remover os itens" name="Take Off Items"/>
- <menu_item_call label="Iniciar conversa em conferência" name="Conference Chat Folder"/>
- <menu_item_call label="Executar" name="Sound Play"/>
- <menu_item_call label="Sobre as Landmarks" name="Teleport To Landmark"/>
- <menu_item_call label="Executar in World" name="Animation Play"/>
- <menu_item_call label="Executar localmente" name="Animation Audition"/>
- <menu_item_call label="Mandar Mensagem Instantânea" name="Send Instant Message"/>
- <menu_item_call label="Oferecer teletransporte..." name="Offer Teleport..."/>
- <menu_item_call label="Iniciar conversa em conferência" name="Conference Chat"/>
- <menu_item_call label="Ativar" name="Activate"/>
- <menu_item_call label="Desativar" name="Deactivate"/>
- <menu_item_call label="Retirar de você" name="Detach From Yourself"/>
- <menu_item_call label="Vestir" name="Object Wear"/>
- <menu label="Anexar a" name="Attach To"/>
- <menu label="Anexar ao HUD" name="Attach To HUD"/>
- <menu_item_call label="Vestir" name="Wearable Wear"/>
- <menu_item_call label="Editar" name="Wearable Edit"/>
- <menu_item_call label="Retirar" name="Take Off"/>
- <menu_item_call label="--Sem opções--" name="--no options--"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+ <menu_item_call label="Comprar" name="Task Buy"/>
+ <menu_item_call label="Abrir" name="Task Open"/>
+ <menu_item_call label="Executar" name="Task Play"/>
+ <menu_item_call label="Propriedades" name="Task Properties"/>
+ <menu_item_call label="Renomear" name="Task Rename"/>
+ <menu_item_call label="Apagar" name="Task Remove"/>
+ <menu_item_call label="Limpar Lixeira" name="Empty Trash"/>
+ <menu_item_call label="Limpar Achados e perdidos" name="Empty Lost And Found"/>
+ <menu_item_call label="Nova Pasta" name="New Folder"/>
+ <menu_item_call label="Novo Script" name="New Script"/>
+ <menu_item_call label="Nova Nota" name="New Note"/>
+ <menu_item_call label="Novo Gesto" name="New Gesture"/>
+ <menu label="Nova Roupa" name="New Clothes">
+ <menu_item_call label="Nova Camisa" name="New Shirt"/>
+ <menu_item_call label="Nova Calça" name="New Pants"/>
+ <menu_item_call label="Novos Calçados" name="New Shoes"/>
+ <menu_item_call label="Novas Meias" name="New Socks"/>
+ <menu_item_call label="Nova Jaqueta" name="New Jacket"/>
+ <menu_item_call label="Nova Saia" name="New Skirt"/>
+ <menu_item_call label="Novas Luvas" name="New Gloves"/>
+ <menu_item_call label="Nova Anágua" name="New Undershirt"/>
+ <menu_item_call label="Nova roupa de baixo" name="New Underpants"/>
+ </menu>
+ <menu label="Parte do corpo" name="New Body Parts">
+ <menu_item_call label="Nova forma" name="New Shape"/>
+ <menu_item_call label="Nova pele" name="New Skin"/>
+ <menu_item_call label="Novo cabelo" name="New Hair"/>
+ <menu_item_call label="Novos olhos" name="New Eyes"/>
+ </menu>
+ <menu_item_call label="Teletransporte" name="Landmark Open"/>
+ <menu_item_call label="Abrir" name="Animation Open"/>
+ <menu_item_call label="Abrir" name="Sound Open"/>
+ <menu_item_call label="Remover item" name="Purge Item"/>
+ <menu_item_call label="Restaurar item" name="Restore Item"/>
+ <menu_item_call label="Abrir" name="Open"/>
+ <menu_item_call label="Propriedades" name="Properties"/>
+ <menu_item_call label="Renomear" name="Rename"/>
+ <menu_item_call label="Copy Asset UUID" name="Copy Asset UUID"/>
+ <menu_item_call label="Copiar" name="Copy"/>
+ <menu_item_call label="Colar" name="Paste"/>
+ <menu_item_call label="Apagar" name="Delete"/>
+ <menu_item_call label="Adicionar ao equipamento" name="Add To Outfit"/>
+ <menu_item_call label="Substituir equipamento" name="Replace Outfit"/>
+ <menu_item_call label="Remover os itens" name="Take Off Items"/>
+ <menu_item_call label="Iniciar conversa em conferência" name="Conference Chat Folder"/>
+ <menu_item_call label="Executar" name="Sound Play"/>
+ <menu_item_call label="Sobre as Landmarks" name="Teleport To Landmark"/>
+ <menu_item_call label="Executar in World" name="Animation Play"/>
+ <menu_item_call label="Executar localmente" name="Animation Audition"/>
+ <menu_item_call label="Mandar Mensagem Instantânea" name="Send Instant Message"/>
+ <menu_item_call label="Oferecer teletransporte..." name="Offer Teleport..."/>
+ <menu_item_call label="Iniciar conversa em conferência" name="Conference Chat"/>
+ <menu_item_call label="Ativar" name="Activate"/>
+ <menu_item_call label="Desativar" name="Deactivate"/>
+ <menu_item_call label="Retirar de você" name="Detach From Yourself"/>
+ <menu_item_call label="Vestir" name="Object Wear"/>
+ <menu label="Anexar a" name="Attach To"/>
+ <menu label="Anexar ao HUD" name="Attach To HUD"/>
+ <menu_item_call label="Vestir" name="Wearable Wear"/>
+ <menu_item_call label="Editar" name="Wearable Edit"/>
+ <menu_item_call label="Retirar" name="Take Off"/>
+ <menu_item_call label="--Sem opções--" name="--no options--"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index 3aeb7483a8..f60946fcce 100644
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu_bar name="Login Menu">
- <menu label="Arquivo" name="File">
- <menu_item_call label="Sair" name="Quit"/>
- </menu>
- <menu label="Editar" name="Edit">
- <menu_item_call label="Preferências..." name="Preferences..."/>
- </menu>
- <menu label="Ajuda" name="Help">
- <menu_item_call label="Ajuda do Second Life" name="Second Life Help"/>
- <menu_item_call label="Sobre o Second Life..." name="About Second Life..."/>
- </menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_bar name="Login Menu">
+ <menu label="Arquivo" name="File">
+ <menu_item_call label="Sair" name="Quit"/>
+ </menu>
+ <menu label="Editar" name="Edit">
+ <menu_item_call label="Preferências..." name="Preferences..."/>
+ </menu>
+ <menu label="Ajuda" name="Help">
+ <menu_item_call label="Ajuda do Second Life" name="Second Life Help"/>
+ <menu_item_call label="Sobre o Second Life..." name="About Second Life..."/>
+ </menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/pt/menu_slurl.xml b/indra/newview/skins/default/xui/pt/menu_slurl.xml
index e18e776975..67a4b51b61 100644
--- a/indra/newview/skins/default/xui/pt/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/pt/menu_slurl.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="Popup">
- <menu_item_call label="Sobre a URL" name="about_url"/>
- <menu_item_call label="Teletransporte para a URL" name="teleport_to_url"/>
- <menu_item_call label="Mostrar no Mapa" name="show_on_map"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="Popup">
+ <menu_item_call label="Sobre a URL" name="about_url"/>
+ <menu_item_call label="Teletransporte para a URL" name="teleport_to_url"/>
+ <menu_item_call label="Mostrar no Mapa" name="show_on_map"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 229a616f7a..bc4508ecc6 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -1,203 +1,203 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu_bar name="Main Menu">
- <menu label="Arquivo" name="File">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
- <menu label="Upload" name="upload">
- <menu_item_call label="Upload de imagem (L$[COST])..." name="Upload Image"/>
- <menu_item_call label="Upload de som(L$[COST])..." name="Upload Sound"/>
- <menu_item_call label="Upload de animação (L$[COST])..." name="Upload Animation"/>
- <menu_item_call label="Upload de Arquivo (L$[COST] por arquivo)..." name="Bulk Upload"/>
- </menu>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Fechar janela" name="Close Window"/>
- <menu_item_call label="Fechar todas as janelas" name="Close All Windows"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Salvar textura como..." name="Save Texture As..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Tirar Foto" name="Take Snapshot"/>
- <menu_item_call label="Salvar Foto no disco" name="Snapshot to Disk"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Sair" name="Quit"/>
- </menu>
- <menu label="Editar" name="Edit">
- <menu_item_call label="Voltar" name="Undo"/>
- <menu_item_call label="Avançar" name="Redo"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Cortar" name="Cut"/>
- <menu_item_call label="Copiar" name="Copy"/>
- <menu_item_call label="Colar" name="Paste"/>
- <menu_item_call label="Apagar" name="Delete"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Procurar..." name="Search..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Selecionar todos" name="Select All"/>
- <menu_item_call label="Retirar seleção" name="Deselect"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Duplicar" name="Duplicate"/>
- <menu_item_separator label="-----------" name="separator5"/>
- <menu label="Anexar objeto" name="Attach Object"/>
- <menu label="Desanexar objeto" name="Detach Object"/>
- <menu label="Tirar a roupa" name="Take Off Clothing">
- <menu_item_call label="Camiseta" name="Shirt"/>
- <menu_item_call label="Calças" name="Pants"/>
- <menu_item_call label="Sapatos" name="Shoes"/>
- <menu_item_call label="Meias" name="Socks"/>
- <menu_item_call label="Blusa" name="Jacket"/>
- <menu_item_call label="Luvas" name="Gloves"/>
- <menu_item_call label="Anágua" name="Menu Undershirt"/>
- <menu_item_call label="Roupa de baixo" name="Menu Underpants"/>
- <menu_item_call label="saia" name="Skirt"/>
- <menu_item_call label="Toda a roupa" name="All Clothes"/>
- </menu>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu_item_call label="Gestos..." name="Gestures..."/>
- <menu_item_call label="Perfil..." name="Profile..."/>
- <menu_item_call label="Aparência..." name="Appearance..."/>
- <menu_item_separator label="-----------" name="separator7"/>
- <menu_item_check label="Amigos..." name="Friends..."/>
- <menu_item_call label="Grupos..." name="Groups..."/>
- <menu_item_separator label="-----------" name="separator8"/>
- <menu_item_call label="Preferências..." name="Preferences..."/>
- </menu>
- <menu label="Exibir" name="View">
- <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
- <menu_item_call label="Visão do mouse" name="Mouselook"/>
- <menu_item_check label="Construir" name="Build"/>
- <menu_item_check label="Câmera voadora pelo joystick" name="Joystick Flycam"/>
- <menu_item_call label="Resetar visão" name="Reset View"/>
- <menu_item_call label="Olhar para o último movimento" name="Look at Last Chatter"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_check label="Barra de ferramentas" name="Toolbar"/>
- <menu_item_check label="Conversa local" name="Chat History"/>
- <menu_item_check label="Comunicar" name="Instant Message"/>
- <menu_item_check label="Inventário" name="Inventory"/>
- <menu_item_check label="Falantes Ativos" name="Active Speakers"/>
- <menu_item_check label="Lista de pessoas que não podem falar com você" name="Mute List"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_check label="Controles de câmera" name="Camera Controls"/>
- <menu_item_check label="Controles de movimento" name="Movement Controls"/>
- <menu_item_check label="Mapa do mundo" name="World Map"/>
- <menu_item_check label="Mini-Mapa" name="Mini-Map"/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_check label="Barra de estatÃsticas" name="Statistics Bar"/>
- <menu_item_check label="Linhas de propriedades" name="Property Lines"/>
- <menu_item_check label="Donos de terrenos" name="Land Owners"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu label="Dicas" name="Hover Tips">
- <menu_item_check label="Mostrar dicas" name="Show Tips"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_check label="Dicas de terreno" name="Land Tips"/>
- <menu_item_check label="Dicas de todos os objetos" name="Tips On All Objects"/>
- </menu>
- <menu_item_check label="Luz para transparência" name="Highlight Transparent"/>
- <menu_item_check label="Balizas" name="beacons"/>
- <menu_item_check label="Esconder partÃculas" name="Hide Particles"/>
- <menu_item_check label="Mostrar anexo em HUD" name="Show HUD Attachments"/>
- <menu_item_separator label="-----------" name="separator5"/>
- <menu_item_call label="Mais zoom" name="Zoom In"/>
- <menu_item_call label="Zoom padrão" name="Zoom Default"/>
- <menu_item_call label="Menos zoom" name="Zoom Out"/>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu_item_call label="Tela cheia" name="Toggle Fullscreen"/>
- <menu_item_call label="Ajustar o tamanho da UI ao padrão" name="Set UI Size to Default"/>
- </menu>
- <menu label="Mundo" name="World">
- <menu_item_call label="Conversa" name="Chat"/>
- <menu_item_check label="Sempre Correr" name="Always Run"/>
- <menu_item_check label="Voar" name="Fly"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Criar Landmark aqui" name="Create Landmark Here"/>
- <menu_item_call label="Marcar como casa" name="Set Home to Here"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Teletransportar para casa" name="Teleport Home"/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Deixar ausente" name="Set Away"/>
- <menu_item_call label="Deixar Ocupado" name="Set Busy"/>
- <menu_item_call label="Parar todas as animações" name="Stop All Animations"/>
- <menu_item_call label="Liberar teclas" name="Release Keys"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Histórico de conta..." name="Account History..."/>
- <menu_item_call label="Gerenciar minha conta..." name="Manage My Account..."/>
- <menu_item_call label="Comprar L$..." name="Buy and Sell L$..."/>
- <menu_item_separator label="-----------" name="separator5"/>
- <menu_item_call label="Meu terreno..." name="My Land..."/>
- <menu_item_call label="Sobre o terreno..." name="About Land..."/>
- <menu_item_call label="Comprar terreno..." name="Buy Land..."/>
- <menu_item_call label="Região/Propriedade..." name="Region/Estate..."/>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu label="Configurações de ambiente" name="Environment Settings">
- <menu_item_call label="Amanhecer" name="Sunrise"/>
- <menu_item_call label="Meio-dia" name="Noon"/>
- <menu_item_call label="Pôr-do-Sol" name="Sunset"/>
- <menu_item_call label="Meia-noite" name="Midnight"/>
- <menu_item_call label="Reverter ao padrão da região" name="Revert to Region Default"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Editor de ambiente" name="Environment Editor"/>
- </menu>
- </menu>
- <menu label="Ferramentas" name="Tools">
- <menu label="Selecionar ferramenta" name="Select Tool">
- <menu_item_call label="Foco" name="Focus"/>
- <menu_item_call label="Mover" name="Move"/>
- <menu_item_call label="Editar" name="Edit"/>
- <menu_item_call label="Criar" name="Create"/>
- <menu_item_call label="Terreno" name="Land"/>
- </menu>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_check label="Selecionar apenas meus objetos" name="Select Only My Objects"/>
- <menu_item_check label="Selecionar apenas objetos móveis" name="Select Only Movable Objects"/>
- <menu_item_check label="Selecionar objetos pela vizinhança" name="Select By Surrounding"/>
- <menu_item_check label="Mostrar seleções escondidas" name="Show Hidden Selection"/>
- <menu_item_check label="Mostrar luz radiante para seleção" name="Show Light Radius for Selection"/>
- <menu_item_check label="Mostrar seleções de feixes" name="Show Selection Beam"/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_check label="Alinhar à grade" name="Snap to Grid"/>
- <menu_item_call label="Alinhar xy do objeto à grade" name="Snap Object XY to Grid"/>
- <menu_item_call label="Usar seleção na grade" name="Use Selection for Grid"/>
- <menu_item_call label="Opções de grade..." name="Grid Options..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_check label="Editar partes unidas" name="Edit Linked Parts"/>
- <menu_item_call label="Unir" name="Link"/>
- <menu_item_call label="Desunir" name="Unlink"/>
- <menu_item_separator label="-----------" name="separator4"/>
- <menu_item_call label="Foco na seleção" name="Focus on Selection"/>
- <menu_item_call label="Zoom na Seleção" name="Zoom to Selection"/>
- <menu_item_call label="Comprar objetos" name="Menu Object Take"/>
- <menu_item_call label="Pegar cópia" name="Take Copy"/>
- <menu_item_call label="Salvar objeto de volta ao meu inventário" name="Save Object Back to My Inventory"/>
- <menu_item_call label="Salvar objeto de volta aos conteúdos do objeto" name="Save Object Back to Object Contents"/>
- <menu_item_separator label="-----------" name="separator6"/>
- <menu_item_call label="Mostrar scripts defeituosos/Erros de janela" name="Show Script Warning/Error Window"/>
- <menu label="Recompilar os scripts na seleção" name="Recompile Scripts in Selection">
- <menu_item_call label="Mono" name="Mono"/>
- <menu_item_call label="LSL" name="LSL"/>
- </menu>
- <menu_item_call label="Resetar scripts selecionados" name="Reset Scripts in Selection"/>
- <menu_item_call label="Ajustar scripts para rodar na seleção" name="Set Scripts to Running in Selection"/>
- <menu_item_call label="Ajustar scripts para não rodar na seleção" name="Set Scripts to Not Running in Selection"/>
- </menu>
- <menu label="Ajuda" name="Help">
- <menu_item_call label="Ajuda Second Life" name="Second Life Help"/>
- <menu_item_call label="Tutorial" name="Tutorial"/>
- <menu_item_separator label="-----------" name="separator"/>
- <menu_item_call label="Blog oficial da Linden..." name="Official Linden Blog..."/>
- <menu_item_separator label="-----------" name="separator2"/>
- <menu_item_call label="Portal de Scripts..." name="Scripting Portal..."/>
- <menu_item_separator label="-----------" name="separator3"/>
- <menu_item_call label="Reportar Abuso..." name="Report Abuse..."/>
- <menu_item_call label="Colisões, impulsos e batidas..." name="Bumps, Pushes &amp; Hits..."/>
- <menu_item_call label="Medidor de Lag" name="Lag Meter"/>
- <menu_item_separator label="-----------" name="separator7"/>
- <menu label="Reportando Bug" name="Bug Reporting">
- <menu_item_call label="Rastreador público de problemas..." name="Public Issue Tracker..."/>
- <menu_item_call label="Ajuda do rastreador público de problemas..." name="Publc Issue Tracker Help..."/>
- <menu_item_separator label="-----------" name="separator7"/>
- <menu_item_call label="Reportando Bug 101..." name="Bug Reporing 101..."/>
- <menu_item_call label="Questões de Segurança..." name="Security Issues..."/>
- <menu_item_call label="Wiki de QA ..." name="QA Wiki..."/>
- <menu_item_separator label="-----------" name="separator9"/>
- <menu_item_call label="Reportar Bug..." name="Report Bug..."/>
- </menu>
- <menu_item_call label="Sobre Second Life..." name="About Second Life..."/>
- </menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu_bar name="Main Menu">
+ <menu label="Arquivo" name="File">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu label="Upload" name="upload">
+ <menu_item_call label="Upload de imagem (L$[COST])..." name="Upload Image"/>
+ <menu_item_call label="Upload de som(L$[COST])..." name="Upload Sound"/>
+ <menu_item_call label="Upload de animação (L$[COST])..." name="Upload Animation"/>
+ <menu_item_call label="Upload de Arquivo (L$[COST] por arquivo)..." name="Bulk Upload"/>
+ </menu>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Fechar janela" name="Close Window"/>
+ <menu_item_call label="Fechar todas as janelas" name="Close All Windows"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Salvar textura como..." name="Save Texture As..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Tirar Foto" name="Take Snapshot"/>
+ <menu_item_call label="Salvar Foto no disco" name="Snapshot to Disk"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Sair" name="Quit"/>
+ </menu>
+ <menu label="Editar" name="Edit">
+ <menu_item_call label="Voltar" name="Undo"/>
+ <menu_item_call label="Avançar" name="Redo"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Cortar" name="Cut"/>
+ <menu_item_call label="Copiar" name="Copy"/>
+ <menu_item_call label="Colar" name="Paste"/>
+ <menu_item_call label="Apagar" name="Delete"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Procurar..." name="Search..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Selecionar todos" name="Select All"/>
+ <menu_item_call label="Retirar seleção" name="Deselect"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Duplicar" name="Duplicate"/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu label="Anexar objeto" name="Attach Object"/>
+ <menu label="Desanexar objeto" name="Detach Object"/>
+ <menu label="Tirar a roupa" name="Take Off Clothing">
+ <menu_item_call label="Camiseta" name="Shirt"/>
+ <menu_item_call label="Calças" name="Pants"/>
+ <menu_item_call label="Sapatos" name="Shoes"/>
+ <menu_item_call label="Meias" name="Socks"/>
+ <menu_item_call label="Blusa" name="Jacket"/>
+ <menu_item_call label="Luvas" name="Gloves"/>
+ <menu_item_call label="Anágua" name="Menu Undershirt"/>
+ <menu_item_call label="Roupa de baixo" name="Menu Underpants"/>
+ <menu_item_call label="saia" name="Skirt"/>
+ <menu_item_call label="Toda a roupa" name="All Clothes"/>
+ </menu>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Gestos..." name="Gestures..."/>
+ <menu_item_call label="Perfil..." name="Profile..."/>
+ <menu_item_call label="Aparência..." name="Appearance..."/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu_item_check label="Amigos..." name="Friends..."/>
+ <menu_item_call label="Grupos..." name="Groups..."/>
+ <menu_item_separator label="-----------" name="separator8"/>
+ <menu_item_call label="Preferências..." name="Preferences..."/>
+ </menu>
+ <menu label="Exibir" name="View">
+ <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
+ <menu_item_call label="Visão do mouse" name="Mouselook"/>
+ <menu_item_check label="Construir" name="Build"/>
+ <menu_item_check label="Câmera voadora pelo joystick" name="Joystick Flycam"/>
+ <menu_item_call label="Resetar visão" name="Reset View"/>
+ <menu_item_call label="Olhar para o último movimento" name="Look at Last Chatter"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Barra de ferramentas" name="Toolbar"/>
+ <menu_item_check label="Conversa local" name="Chat History"/>
+ <menu_item_check label="Comunicar" name="Instant Message"/>
+ <menu_item_check label="Inventário" name="Inventory"/>
+ <menu_item_check label="Falantes Ativos" name="Active Speakers"/>
+ <menu_item_check label="Lista de pessoas que não podem falar com você" name="Mute List"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_check label="Controles de câmera" name="Camera Controls"/>
+ <menu_item_check label="Controles de movimento" name="Movement Controls"/>
+ <menu_item_check label="Mapa do mundo" name="World Map"/>
+ <menu_item_check label="Mini-Mapa" name="Mini-Map"/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_check label="Barra de estatÃsticas" name="Statistics Bar"/>
+ <menu_item_check label="Linhas de propriedades" name="Property Lines"/>
+ <menu_item_check label="Donos de terrenos" name="Land Owners"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu label="Dicas" name="Hover Tips">
+ <menu_item_check label="Mostrar dicas" name="Show Tips"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Dicas de terreno" name="Land Tips"/>
+ <menu_item_check label="Dicas de todos os objetos" name="Tips On All Objects"/>
+ </menu>
+ <menu_item_check label="Luz para transparência" name="Highlight Transparent"/>
+ <menu_item_check label="Balizas" name="beacons"/>
+ <menu_item_check label="Esconder partÃculas" name="Hide Particles"/>
+ <menu_item_check label="Mostrar anexo em HUD" name="Show HUD Attachments"/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu_item_call label="Mais zoom" name="Zoom In"/>
+ <menu_item_call label="Zoom padrão" name="Zoom Default"/>
+ <menu_item_call label="Menos zoom" name="Zoom Out"/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Tela cheia" name="Toggle Fullscreen"/>
+ <menu_item_call label="Ajustar o tamanho da UI ao padrão" name="Set UI Size to Default"/>
+ </menu>
+ <menu label="Mundo" name="World">
+ <menu_item_call label="Conversa" name="Chat"/>
+ <menu_item_check label="Sempre Correr" name="Always Run"/>
+ <menu_item_check label="Voar" name="Fly"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Criar Landmark aqui" name="Create Landmark Here"/>
+ <menu_item_call label="Marcar como casa" name="Set Home to Here"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Teletransportar para casa" name="Teleport Home"/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Deixar ausente" name="Set Away"/>
+ <menu_item_call label="Deixar Ocupado" name="Set Busy"/>
+ <menu_item_call label="Parar todas as animações" name="Stop All Animations"/>
+ <menu_item_call label="Liberar teclas" name="Release Keys"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Histórico de conta..." name="Account History..."/>
+ <menu_item_call label="Gerenciar minha conta..." name="Manage My Account..."/>
+ <menu_item_call label="Comprar L$..." name="Buy and Sell L$..."/>
+ <menu_item_separator label="-----------" name="separator5"/>
+ <menu_item_call label="Meu terreno..." name="My Land..."/>
+ <menu_item_call label="Sobre o terreno..." name="About Land..."/>
+ <menu_item_call label="Comprar terreno..." name="Buy Land..."/>
+ <menu_item_call label="Região/Propriedade..." name="Region/Estate..."/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu label="Configurações de ambiente" name="Environment Settings">
+ <menu_item_call label="Amanhecer" name="Sunrise"/>
+ <menu_item_call label="Meio-dia" name="Noon"/>
+ <menu_item_call label="Pôr-do-Sol" name="Sunset"/>
+ <menu_item_call label="Meia-noite" name="Midnight"/>
+ <menu_item_call label="Reverter ao padrão da região" name="Revert to Region Default"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Editor de ambiente" name="Environment Editor"/>
+ </menu>
+ </menu>
+ <menu label="Ferramentas" name="Tools">
+ <menu label="Selecionar ferramenta" name="Select Tool">
+ <menu_item_call label="Foco" name="Focus"/>
+ <menu_item_call label="Mover" name="Move"/>
+ <menu_item_call label="Editar" name="Edit"/>
+ <menu_item_call label="Criar" name="Create"/>
+ <menu_item_call label="Terreno" name="Land"/>
+ </menu>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_check label="Selecionar apenas meus objetos" name="Select Only My Objects"/>
+ <menu_item_check label="Selecionar apenas objetos móveis" name="Select Only Movable Objects"/>
+ <menu_item_check label="Selecionar objetos pela vizinhança" name="Select By Surrounding"/>
+ <menu_item_check label="Mostrar seleções escondidas" name="Show Hidden Selection"/>
+ <menu_item_check label="Mostrar luz radiante para seleção" name="Show Light Radius for Selection"/>
+ <menu_item_check label="Mostrar seleções de feixes" name="Show Selection Beam"/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_check label="Alinhar à grade" name="Snap to Grid"/>
+ <menu_item_call label="Alinhar xy do objeto à grade" name="Snap Object XY to Grid"/>
+ <menu_item_call label="Usar seleção na grade" name="Use Selection for Grid"/>
+ <menu_item_call label="Opções de grade..." name="Grid Options..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_check label="Editar partes unidas" name="Edit Linked Parts"/>
+ <menu_item_call label="Unir" name="Link"/>
+ <menu_item_call label="Desunir" name="Unlink"/>
+ <menu_item_separator label="-----------" name="separator4"/>
+ <menu_item_call label="Foco na seleção" name="Focus on Selection"/>
+ <menu_item_call label="Zoom na Seleção" name="Zoom to Selection"/>
+ <menu_item_call label="Comprar objetos" name="Menu Object Take"/>
+ <menu_item_call label="Pegar cópia" name="Take Copy"/>
+ <menu_item_call label="Salvar objeto de volta ao meu inventário" name="Save Object Back to My Inventory"/>
+ <menu_item_call label="Salvar objeto de volta aos conteúdos do objeto" name="Save Object Back to Object Contents"/>
+ <menu_item_separator label="-----------" name="separator6"/>
+ <menu_item_call label="Mostrar scripts defeituosos/Erros de janela" name="Show Script Warning/Error Window"/>
+ <menu label="Recompilar os scripts na seleção" name="Recompile Scripts in Selection">
+ <menu_item_call label="Mono" name="Mono"/>
+ <menu_item_call label="LSL" name="LSL"/>
+ </menu>
+ <menu_item_call label="Resetar scripts selecionados" name="Reset Scripts in Selection"/>
+ <menu_item_call label="Ajustar scripts para rodar na seleção" name="Set Scripts to Running in Selection"/>
+ <menu_item_call label="Ajustar scripts para não rodar na seleção" name="Set Scripts to Not Running in Selection"/>
+ </menu>
+ <menu label="Ajuda" name="Help">
+ <menu_item_call label="Ajuda Second Life" name="Second Life Help"/>
+ <menu_item_call label="Tutorial" name="Tutorial"/>
+ <menu_item_separator label="-----------" name="separator"/>
+ <menu_item_call label="Blog oficial da Linden..." name="Official Linden Blog..."/>
+ <menu_item_separator label="-----------" name="separator2"/>
+ <menu_item_call label="Portal de Scripts..." name="Scripting Portal..."/>
+ <menu_item_separator label="-----------" name="separator3"/>
+ <menu_item_call label="Reportar Abuso..." name="Report Abuse..."/>
+ <menu_item_call label="Colisões, impulsos e batidas..." name="Bumps, Pushes &amp; Hits..."/>
+ <menu_item_call label="Medidor de Lag" name="Lag Meter"/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu label="Reportando Bug" name="Bug Reporting">
+ <menu_item_call label="Rastreador público de problemas..." name="Public Issue Tracker..."/>
+ <menu_item_call label="Ajuda do rastreador público de problemas..." name="Publc Issue Tracker Help..."/>
+ <menu_item_separator label="-----------" name="separator7"/>
+ <menu_item_call label="Reportando Bug 101..." name="Bug Reporing 101..."/>
+ <menu_item_call label="Questões de Segurança..." name="Security Issues..."/>
+ <menu_item_call label="Wiki de QA ..." name="QA Wiki..."/>
+ <menu_item_separator label="-----------" name="separator9"/>
+ <menu_item_call label="Reportar Bug..." name="Report Bug..."/>
+ </menu>
+ <menu_item_call label="Sobre Second Life..." name="About Second Life..."/>
+ </menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/pt/mime_types.xml b/indra/newview/skins/default/xui/pt/mime_types.xml
index 7b6225e0f6..f9c0496eea 100644
--- a/indra/newview/skins/default/xui/pt/mime_types.xml
+++ b/indra/newview/skins/default/xui/pt/mime_types.xml
@@ -1,230 +1,230 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<mimetypes name="default">
- <widgetset name="web">
- <label name="web_label">
- Conteúdo da Web
- </label>
- <tooltip name="web_tooltip">
- Esta região possui Conteúdo da Web disponÃvel.
- </tooltip>
- <playtip name="web_playtip">
- Exibir Conteúdo da Web
- </playtip>
- </widgetset>
- <widgetset name="movie">
- <label name="movie_label">
- Filme
- </label>
- <tooltip name="movie_tooltip">
- Há um filme disponÃvel para se assistir aqui
- </tooltip>
- <playtip name="movie_playtip">
- Iniciar filme
- </playtip>
- </widgetset>
- <widgetset name="none">
- <label name="none_label">
- Sem conteúdo disponÃvel
- </label>
- <tooltip name="none_tooltip">
- Não há mÃdia disponÃvel aqui.
- </tooltip>
- </widgetset>
- <widgetset name="image">
- <label name="image_label">
- Imagem
- </label>
- <tooltip name="image_tooltip">
- Há uma imagem neste local
- </tooltip>
- <playtip name="image_playtip">
- Ver a imagem disponÃvel deste local.
- </playtip>
- </widgetset>
- <widgetset name="audio">
- <label name="audio_label">
- Ãudio
- </label>
- <tooltip name="audio_tooltip">
- Há um áudio neste local
- </tooltip>
- <playtip name="audio_playtip">
- Iniciar áudio disponÃvel neste local
- </playtip>
- </widgetset>
- <scheme name="rtsp">
- <label name="rtsp_label">
- Transmissão em tempo real
- </label>
- </scheme>
- <mimetype name="blank">
- <label name="blank_label">
- - Nenhum -
- </label>
- </mimetype>
- <mimetype name="none/none">
- <label name="none/none_label">
- - Nenhum -
- </label>
- </mimetype>
- <mimetype name="audio/*">
- <label name="audio2_label">
- Ãudio
- </label>
- </mimetype>
- <mimetype name="video/*">
- <label name="video2_label">
- VÃdeo
- </label>
- </mimetype>
- <mimetype name="image/*">
- <label name="image2_label">
- Imagem
- </label>
- </mimetype>
- <mimetype name="video/vnd.secondlife.qt.legacy">
- <label name="vnd.secondlife.qt.legacy_label">
- Filme (QuickTime)
- </label>
- </mimetype>
- <mimetype name="application/javascript">
- <label name="application/javascript_label">
- Javascript
- </label>
- </mimetype>
- <mimetype name="application/ogg">
- <label name="application/ogg_label">
- Ãudio/VÃdeo Ogg
- </label>
- </mimetype>
- <mimetype name="application/pdf">
- <label name="application/pdf_label">
- Documento PDF
- </label>
- </mimetype>
- <mimetype name="application/postscript">
- <label name="application/postscript_label">
- Documento Postscript
- </label>
- </mimetype>
- <mimetype name="application/rtf">
- <label name="application/rtf_label">
- Rich Text (RTF)
- </label>
- </mimetype>
- <mimetype name="application/smil">
- <label name="application/smil_label">
- Synchronized Multimedia Integration Language (SMIL)
- </label>
- </mimetype>
- <mimetype name="application/xhtml+xml">
- <label name="application/xhtml+xml_label">
- Página Web (XHTML)
- </label>
- </mimetype>
- <mimetype name="application/x-director">
- <label name="application/x-director_label">
- Macromedia Director
- </label>
- </mimetype>
- <mimetype name="application/x-shockwave-flash">
- <label name="application/x-shockwave-flash_label">
- Flash
- </label>
- </mimetype>
- <mimetype name="audio/mid">
- <label name="audio/mid_label">
- Ãudio (MIDI)
- </label>
- </mimetype>
- <mimetype name="audio/mpeg">
- <label name="audio/mpeg_label">
- Ãudio (MP3)
- </label>
- </mimetype>
- <mimetype name="audio/x-aiff">
- <label name="audio/x-aiff_label">
- Ãudio (AIFF)
- </label>
- </mimetype>
- <mimetype name="audio/x-wav">
- <label name="audio/x-wav_label">
- Ãudio (WAV)
- </label>
- </mimetype>
- <mimetype name="image/bmp">
- <label name="image/bmp_label">
- Imagem (BMP)
- </label>
- </mimetype>
- <mimetype name="image/gif">
- <label name="image/gif_label">
- Imagem (GIF)
- </label>
- </mimetype>
- <mimetype name="image/jpeg">
- <label name="image/jpeg_label">
- Imagem (JPEG)
- </label>
- </mimetype>
- <mimetype name="image/png">
- <label name="image/png_label">
- Imagem (PNG)
- </label>
- </mimetype>
- <mimetype name="image/svg+xml">
- <label name="image/svg+xml_label">
- Imagem (SVG)
- </label>
- </mimetype>
- <mimetype name="image/tiff">
- <label name="image/tiff_label">
- Imagem (TIFF)
- </label>
- </mimetype>
- <mimetype name="text/html">
- <label name="text/html_label">
- Página Web
- </label>
- </mimetype>
- <mimetype name="text/plain">
- <label name="text/plain_label">
- Texto
- </label>
- </mimetype>
- <mimetype name="text/xml">
- <label name="text/xml_label">
- XML
- </label>
- </mimetype>
- <mimetype name="video/mpeg">
- <label name="video/mpeg_label">
- Filme (MPEG)
- </label>
- </mimetype>
- <mimetype name="video/mp4">
- <label name="video/mp4_label">
- Filme (MP4)
- </label>
- </mimetype>
- <mimetype name="video/quicktime">
- <label name="video/quicktime_label">
- Filme (QuickTime)
- </label>
- </mimetype>
- <mimetype name="video/x-ms-asf">
- <label name="video/x-ms-asf_label">
- Filme (Windows Media ASF)
- </label>
- </mimetype>
- <mimetype name="video/x-ms-wmv">
- <label name="video/x-ms-wmv_label">
- Filme (Windows Media WMV)
- </label>
- </mimetype>
- <mimetype name="video/x-msvideo">
- <label name="video/x-msvideo_label">
- Filme (AVI)
- </label>
- </mimetype>
-</mimetypes>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<mimetypes name="default">
+ <widgetset name="web">
+ <label name="web_label">
+ Conteúdo da Web
+ </label>
+ <tooltip name="web_tooltip">
+ Esta região possui Conteúdo da Web disponÃvel.
+ </tooltip>
+ <playtip name="web_playtip">
+ Exibir Conteúdo da Web
+ </playtip>
+ </widgetset>
+ <widgetset name="movie">
+ <label name="movie_label">
+ Filme
+ </label>
+ <tooltip name="movie_tooltip">
+ Há um filme disponÃvel para se assistir aqui
+ </tooltip>
+ <playtip name="movie_playtip">
+ Iniciar filme
+ </playtip>
+ </widgetset>
+ <widgetset name="none">
+ <label name="none_label">
+ Sem conteúdo disponÃvel
+ </label>
+ <tooltip name="none_tooltip">
+ Não há mÃdia disponÃvel aqui.
+ </tooltip>
+ </widgetset>
+ <widgetset name="image">
+ <label name="image_label">
+ Imagem
+ </label>
+ <tooltip name="image_tooltip">
+ Há uma imagem neste local
+ </tooltip>
+ <playtip name="image_playtip">
+ Ver a imagem disponÃvel deste local.
+ </playtip>
+ </widgetset>
+ <widgetset name="audio">
+ <label name="audio_label">
+ Ãudio
+ </label>
+ <tooltip name="audio_tooltip">
+ Há um áudio neste local
+ </tooltip>
+ <playtip name="audio_playtip">
+ Iniciar áudio disponÃvel neste local
+ </playtip>
+ </widgetset>
+ <scheme name="rtsp">
+ <label name="rtsp_label">
+ Transmissão em tempo real
+ </label>
+ </scheme>
+ <mimetype name="blank">
+ <label name="blank_label">
+ - Nenhum -
+ </label>
+ </mimetype>
+ <mimetype name="none/none">
+ <label name="none/none_label">
+ - Nenhum -
+ </label>
+ </mimetype>
+ <mimetype name="audio/*">
+ <label name="audio2_label">
+ Ãudio
+ </label>
+ </mimetype>
+ <mimetype name="video/*">
+ <label name="video2_label">
+ VÃdeo
+ </label>
+ </mimetype>
+ <mimetype name="image/*">
+ <label name="image2_label">
+ Imagem
+ </label>
+ </mimetype>
+ <mimetype name="video/vnd.secondlife.qt.legacy">
+ <label name="vnd.secondlife.qt.legacy_label">
+ Filme (QuickTime)
+ </label>
+ </mimetype>
+ <mimetype name="application/javascript">
+ <label name="application/javascript_label">
+ Javascript
+ </label>
+ </mimetype>
+ <mimetype name="application/ogg">
+ <label name="application/ogg_label">
+ Ãudio/VÃdeo Ogg
+ </label>
+ </mimetype>
+ <mimetype name="application/pdf">
+ <label name="application/pdf_label">
+ Documento PDF
+ </label>
+ </mimetype>
+ <mimetype name="application/postscript">
+ <label name="application/postscript_label">
+ Documento Postscript
+ </label>
+ </mimetype>
+ <mimetype name="application/rtf">
+ <label name="application/rtf_label">
+ Rich Text (RTF)
+ </label>
+ </mimetype>
+ <mimetype name="application/smil">
+ <label name="application/smil_label">
+ Synchronized Multimedia Integration Language (SMIL)
+ </label>
+ </mimetype>
+ <mimetype name="application/xhtml+xml">
+ <label name="application/xhtml+xml_label">
+ Página Web (XHTML)
+ </label>
+ </mimetype>
+ <mimetype name="application/x-director">
+ <label name="application/x-director_label">
+ Macromedia Director
+ </label>
+ </mimetype>
+ <mimetype name="application/x-shockwave-flash">
+ <label name="application/x-shockwave-flash_label">
+ Flash
+ </label>
+ </mimetype>
+ <mimetype name="audio/mid">
+ <label name="audio/mid_label">
+ Ãudio (MIDI)
+ </label>
+ </mimetype>
+ <mimetype name="audio/mpeg">
+ <label name="audio/mpeg_label">
+ Ãudio (MP3)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-aiff">
+ <label name="audio/x-aiff_label">
+ Ãudio (AIFF)
+ </label>
+ </mimetype>
+ <mimetype name="audio/x-wav">
+ <label name="audio/x-wav_label">
+ Ãudio (WAV)
+ </label>
+ </mimetype>
+ <mimetype name="image/bmp">
+ <label name="image/bmp_label">
+ Imagem (BMP)
+ </label>
+ </mimetype>
+ <mimetype name="image/gif">
+ <label name="image/gif_label">
+ Imagem (GIF)
+ </label>
+ </mimetype>
+ <mimetype name="image/jpeg">
+ <label name="image/jpeg_label">
+ Imagem (JPEG)
+ </label>
+ </mimetype>
+ <mimetype name="image/png">
+ <label name="image/png_label">
+ Imagem (PNG)
+ </label>
+ </mimetype>
+ <mimetype name="image/svg+xml">
+ <label name="image/svg+xml_label">
+ Imagem (SVG)
+ </label>
+ </mimetype>
+ <mimetype name="image/tiff">
+ <label name="image/tiff_label">
+ Imagem (TIFF)
+ </label>
+ </mimetype>
+ <mimetype name="text/html">
+ <label name="text/html_label">
+ Página Web
+ </label>
+ </mimetype>
+ <mimetype name="text/plain">
+ <label name="text/plain_label">
+ Texto
+ </label>
+ </mimetype>
+ <mimetype name="text/xml">
+ <label name="text/xml_label">
+ XML
+ </label>
+ </mimetype>
+ <mimetype name="video/mpeg">
+ <label name="video/mpeg_label">
+ Filme (MPEG)
+ </label>
+ </mimetype>
+ <mimetype name="video/mp4">
+ <label name="video/mp4_label">
+ Filme (MP4)
+ </label>
+ </mimetype>
+ <mimetype name="video/quicktime">
+ <label name="video/quicktime_label">
+ Filme (QuickTime)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-asf">
+ <label name="video/x-ms-asf_label">
+ Filme (Windows Media ASF)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-ms-wmv">
+ <label name="video/x-ms-wmv_label">
+ Filme (Windows Media WMV)
+ </label>
+ </mimetype>
+ <mimetype name="video/x-msvideo">
+ <label name="video/x-msvideo_label">
+ Filme (AVI)
+ </label>
+ </mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/pt/panel_audio_device.xml b/indra/newview/skins/default/xui/pt/panel_audio_device.xml
index ab72334f0a..967dc27070 100644
--- a/indra/newview/skins/default/xui/pt/panel_audio_device.xml
+++ b/indra/newview/skins/default/xui/pt/panel_audio_device.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="device_settings">
- <text name="Audio Devices">
- Dispositivos de Ãudio
- </text>
- <text name="Input device (microphone):">
- Dispositivo de entrada (microfone):
- </text>
- <text name="Output device (speakers):">
- Dispositivo de saÃda (falantes):
- </text>
- <text name="Input level:">
- NÃvel de Entrada
- </text>
- <text_editor name="voice_intro_text1">
- Ajuste a barra para controlar o volume de som para os outros residentes. Para testar o nÃvel de entrada, basta falar em seu microfone.
- </text_editor>
- <volume_slider name="mic_volume_slider" tool_tip="Altere o volume usando este controle gradual"/>
- <text name="wait_text">
- Por Favor aguarde
- </text>
- <string name="default_text">
- Padrão
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="device_settings">
+ <text name="Audio Devices">
+ Dispositivos de Ãudio
+ </text>
+ <text name="Input device (microphone):">
+ Dispositivo de entrada (microfone):
+ </text>
+ <text name="Output device (speakers):">
+ Dispositivo de saÃda (falantes):
+ </text>
+ <text name="Input level:">
+ NÃvel de Entrada
+ </text>
+ <text_editor name="voice_intro_text1">
+ Ajuste a barra para controlar o volume de som para os outros residentes. Para testar o nÃvel de entrada, basta falar em seu microfone.
+ </text_editor>
+ <volume_slider name="mic_volume_slider" tool_tip="Altere o volume usando este controle gradual"/>
+ <text name="wait_text">
+ Por Favor aguarde
+ </text>
+ <string name="default_text">
+ Padrão
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_friends.xml b/indra/newview/skins/default/xui/pt/panel_friends.xml
index 18aaaf5c70..afd7b79eaa 100644
--- a/indra/newview/skins/default/xui/pt/panel_friends.xml
+++ b/indra/newview/skins/default/xui/pt/panel_friends.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="friends">
- <string name="Multiple">
- Múltiplos amigos...
- </string>
- <scroll_list name="friend_list" tool_tip="Aperte shift ou control enquanto clica para selecionar múltiplos amigos">
- <column name="icon_online_status" tool_tip="Status Online"/>
- <column label="Nome" name="friend_name" tool_tip="Nome"/>
- <column name="icon_visible_online" tool_tip="Amigo pode ver quando você está online"/>
- <column name="icon_visible_map" tool_tip="Amigo pode localizá-lo no mapa"/>
- <column name="icon_edit_mine" tool_tip="Amigo pode editar, apagar ou pegar seus objetos"/>
- <column name="icon_edit_theirs" tool_tip="Você pode editar os objetos deste amigo"/>
- </scroll_list>
- <button label="MI/Chamar" name="im_btn" tool_tip="Abrir sessão de Mensagem Instantânea"/>
- <button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e outras informações"/>
- <button label="Teletransporte..." name="offer_teleport_btn" tool_tip="Oferecer a este amigo o teletransporte para sua localização atual"/>
- <button label="Pagar..." name="pay_btn" tool_tip="Dar Linden dólares (L$) a este amigo"/>
- <button label="Remover..." name="remove_btn" tool_tip="Remover esta pessoa de sua lista de amigos"/>
- <button label="Adicionar..." name="add_btn" tool_tip="Oferecer amizade a um residente"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="friends">
+ <string name="Multiple">
+ Múltiplos amigos...
+ </string>
+ <scroll_list name="friend_list" tool_tip="Aperte shift ou control enquanto clica para selecionar múltiplos amigos">
+ <column name="icon_online_status" tool_tip="Status Online"/>
+ <column label="Nome" name="friend_name" tool_tip="Nome"/>
+ <column name="icon_visible_online" tool_tip="Amigo pode ver quando você está online"/>
+ <column name="icon_visible_map" tool_tip="Amigo pode localizá-lo no mapa"/>
+ <column name="icon_edit_mine" tool_tip="Amigo pode editar, apagar ou pegar seus objetos"/>
+ <column name="icon_edit_theirs" tool_tip="Você pode editar os objetos deste amigo"/>
+ </scroll_list>
+ <button label="MI/Chamar" name="im_btn" tool_tip="Abrir sessão de Mensagem Instantânea"/>
+ <button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e outras informações"/>
+ <button label="Teletransporte..." name="offer_teleport_btn" tool_tip="Oferecer a este amigo o teletransporte para sua localização atual"/>
+ <button label="Pagar..." name="pay_btn" tool_tip="Dar Linden dólares (L$) a este amigo"/>
+ <button label="Remover..." name="remove_btn" tool_tip="Remover esta pessoa de sua lista de amigos"/>
+ <button label="Adicionar..." name="add_btn" tool_tip="Oferecer amizade a um residente"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml
index 193c5ac7d6..9eba44ba61 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Geral" name="general_tab">
- <string name="help_text">
- A aba Geral contém informações gerais sobre este grupo, a lista dos donos e membros visÃveis, preferências gerais do grupo e opções dos membros. Passe o mouse sobre as opções para mais ajuda.
- </string>
- <string name="group_info_unchanged">
- Informações gerais do grupo foram modificadas
- </string>
- <button label="?" label_selected="?" name="help_button"/>
- <line_editor label="Digite o nome do seu novo grupo aqui" name="group_name_editor"/>
- <text name="group_name">
- Digite o nome do seu novo grupo aqui
- </text>
- <text name="prepend_founded_by">
- Fundado por:
- </text>
- <text name="founder_name">
- (espera)
- </text>
- <text name="group_charter_label">
- Declaração do Grupo
- </text>
- <texture_picker label="InsÃgnia do Grupo" name="insignia" tool_tip="Clique para escolher uma imagem"/>
- <text_editor name="charter">
- Declaração do grupo
- </text_editor>
- <button label="Unir (L$0)" label_selected="Unir (L$0)" name="join_button"/>
- <button label="Vista detalhada" label_selected="Vista detalhada" name="info_button"/>
- <text name="text_owners_and_visible_members">
- Proprietários & Membros visÃveis
- </text>
- <text name="text_owners_are_shown_in_bold">
- (Proprietários são mostrados em negrito )
- </text>
- <name_list name="visible_members">
- <column label="Nome do membro" name="name"/>
- <column label="TÃtulo" name="title"/>
- <column label="Último login" name="online"/>
- </name_list>
- <text name="text_group_preferences">
- Preferências do Grupo
- </text>
- <panel name="preferences_container">
- <check_box label="Mostre na busca" name="show_in_group_list" tool_tip="Deixe as pessoas verem este grupo nos resultados de busca."/>
- <check_box label="Adesão aberta" name="open_enrollement" tool_tip="Definir se este grupo permite que novos membros entrem sem serem convidados"/>
- <check_box label="Taxa de adesão: L$" name="check_enrollment_fee" tool_tip="Define se é necessária uma taxa de adesão para se unir ao grupo."/>
- <spinner name="spin_enrollment_fee" tool_tip="Os novos membros devem pagar esta taxa para se unir ao grupo quando a Taxa de Adesão está marcada."/>
-
- <panel name="title_container">
- <text name="active_title_label">
- Meu tÃtulo ativo
- </text>
- <combo_box name="active_title" tool_tip="Define o tÃtulo que aparece em seu avatar quando o grupo estiver ativo."/>
- </panel>
- <check_box label="Receber notÃcias do grupo" name="receive_notices" tool_tip="Define se Você deseja receber notÃcias deste grupo. Desmarque esta caixa se o grupo está lhe fazendo spam."/>
- <check_box label="Listar grupo no meu perfil" name="list_groups_in_profile" tool_tip="Define se você deseja listar este grupo no seu Perfil"/>
- </panel>
- <string name="incomplete_member_data_str">
- Recuperando dados do membro
- </string>
- <string name="confirm_group_create_str">
- Criar este grupo irá custar L$100.
-Você está realmente, realmente, REALMENTE seguro que deseja gastar L$100 para criar este grupo?
-Esteja consciente de que se ninguém mais se juntar a este grupo dentro de 48 horas, este será dissolvido e o nome não estará disponÃvel para uso futuro.
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Geral" name="general_tab">
+ <string name="help_text">
+ A aba Geral contém informações gerais sobre este grupo, a lista dos donos e membros visÃveis, preferências gerais do grupo e opções dos membros. Passe o mouse sobre as opções para mais ajuda.
+ </string>
+ <string name="group_info_unchanged">
+ Informações gerais do grupo foram modificadas
+ </string>
+ <button label="?" label_selected="?" name="help_button"/>
+ <line_editor label="Digite o nome do seu novo grupo aqui" name="group_name_editor"/>
+ <text name="group_name">
+ Digite o nome do seu novo grupo aqui
+ </text>
+ <text name="prepend_founded_by">
+ Fundado por:
+ </text>
+ <text name="founder_name">
+ (espera)
+ </text>
+ <text name="group_charter_label">
+ Declaração do Grupo
+ </text>
+ <texture_picker label="InsÃgnia do Grupo" name="insignia" tool_tip="Clique para escolher uma imagem"/>
+ <text_editor name="charter">
+ Declaração do grupo
+ </text_editor>
+ <button label="Unir (L$0)" label_selected="Unir (L$0)" name="join_button"/>
+ <button label="Vista detalhada" label_selected="Vista detalhada" name="info_button"/>
+ <text name="text_owners_and_visible_members">
+ Proprietários & Membros visÃveis
+ </text>
+ <text name="text_owners_are_shown_in_bold">
+ (Proprietários são mostrados em negrito )
+ </text>
+ <name_list name="visible_members">
+ <column label="Nome do membro" name="name"/>
+ <column label="TÃtulo" name="title"/>
+ <column label="Último login" name="online"/>
+ </name_list>
+ <text name="text_group_preferences">
+ Preferências do Grupo
+ </text>
+ <panel name="preferences_container">
+ <check_box label="Mostre na busca" name="show_in_group_list" tool_tip="Deixe as pessoas verem este grupo nos resultados de busca."/>
+ <check_box label="Adesão aberta" name="open_enrollement" tool_tip="Definir se este grupo permite que novos membros entrem sem serem convidados"/>
+ <check_box label="Taxa de adesão: L$" name="check_enrollment_fee" tool_tip="Define se é necessária uma taxa de adesão para se unir ao grupo."/>
+ <spinner name="spin_enrollment_fee" tool_tip="Os novos membros devem pagar esta taxa para se unir ao grupo quando a Taxa de Adesão está marcada."/>
+
+ <panel name="title_container">
+ <text name="active_title_label">
+ Meu tÃtulo ativo
+ </text>
+ <combo_box name="active_title" tool_tip="Define o tÃtulo que aparece em seu avatar quando o grupo estiver ativo."/>
+ </panel>
+ <check_box label="Receber notÃcias do grupo" name="receive_notices" tool_tip="Define se Você deseja receber notÃcias deste grupo. Desmarque esta caixa se o grupo está lhe fazendo spam."/>
+ <check_box label="Listar grupo no meu perfil" name="list_groups_in_profile" tool_tip="Define se você deseja listar este grupo no seu Perfil"/>
+ </panel>
+ <string name="incomplete_member_data_str">
+ Recuperando dados do membro
+ </string>
+ <string name="confirm_group_create_str">
+ Criar este grupo irá custar L$100.
+Você está realmente, realmente, REALMENTE seguro que deseja gastar L$100 para criar este grupo?
+Esteja consciente de que se ninguém mais se juntar a este grupo dentro de 48 horas, este será dissolvido e o nome não estará disponÃvel para uso futuro.
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index 5ee59c4772..f34fa1c60e 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Convidar um membro" name="invite_panel">
- <text name="help_text">
- Você pode selecionar múltiplos residentes
-para convidar ao seu grupo. Clique
-'Abra o Selecionador de Pessoas' para iniciar.
- </text>
- <button label="Abrir selecionador de pessoas" name="add_button" tool_tip=""/>
- <name_list name="invitee_list" tool_tip="Mantenha apertada a tecla Control e clique nos nomes dos residentes para uma seleção múltipla."/>
- <button label="Remove Selected from List" name="remove_button" tool_tip="Remove os residentes selecionados acima da lista de convite."/>
- <text name="role_text">
- Escolha que Função atribuir a eles:
- </text>
- <combo_box name="role_name" tool_tip="Escolha a partir da lista de Funções autorizadas a você para inclusão de membros."/>
- <button label="Mandar convites" name="ok_button"/>
- <button label="Cancelar" name="cancel_button"/>
- <string name="confirm_invite_owner_str">
- Você tem certeza de que deseja convidar novo(s) proprietário(s)? Esta ação é permanente!
- </string>
- <string name="loading">
- (carregando...)
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Convidar um membro" name="invite_panel">
+ <text name="help_text">
+ Você pode selecionar múltiplos residentes
+para convidar ao seu grupo. Clique
+'Abra o Selecionador de Pessoas' para iniciar.
+ </text>
+ <button label="Abrir selecionador de pessoas" name="add_button" tool_tip=""/>
+ <name_list name="invitee_list" tool_tip="Mantenha apertada a tecla Control e clique nos nomes dos residentes para uma seleção múltipla."/>
+ <button label="Remove Selected from List" name="remove_button" tool_tip="Remove os residentes selecionados acima da lista de convite."/>
+ <text name="role_text">
+ Escolha que Função atribuir a eles:
+ </text>
+ <combo_box name="role_name" tool_tip="Escolha a partir da lista de Funções autorizadas a você para inclusão de membros."/>
+ <button label="Mandar convites" name="ok_button"/>
+ <button label="Cancelar" name="cancel_button"/>
+ <string name="confirm_invite_owner_str">
+ Você tem certeza de que deseja convidar novo(s) proprietário(s)? Esta ação é permanente!
+ </string>
+ <string name="loading">
+ (carregando...)
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
index b1d080c0f7..59a8f8f46d 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_land_money.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Terra & L$" name="land_money_tab">
- <string name="help_text">
- Lotes pertencentes ao grupo são listados com detalhes de contribuição. Um aviso aparece até que o total de Terras em Uso seja menor ou igual ao Total de Contribuições. As abas de Planejamento, Detalhes e Vendas fornecem informações sobre as finanças do grupo.
- </string>
- <button label="?" name="help_button"/>
- <string name="cant_view_group_land_text">
- Você não tem permissão para ver as terras pertencentes ao grupo.
- </string>
- <string name="cant_view_group_accounting_text">
- Você não tem permissão para ver as informações sobre as contas do grupo.
- </string>
- <string name="loading_txt">
- Carregando...
- </string>
- <text name="group_land_heading">
- Terra percentente ao grupo
- </text>
- <scroll_list name="group_parcel_list">
- <column label="Nome do Lote" name="name"/>
- <column label="Região" name="location"/>
- <column label="Ãrea" name="area"/>
- </scroll_list>
- <button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button"/>
- <text name="total_contributed_land_label">
- Contribuição Total:
- </text>
- <text name="total_contributed_land_value">
- [AREA] m²
- </text>
- <text name="total_land_in_use_label">
- Total de Terra em Uso:
- </text>
- <text name="total_land_in_use_value">
- [AREA] m²
- </text>
- <text name="land_available_label">
- Terra DisponÃvel:
- </text>
- <text name="land_available_value">
- [AREA] m²
- </text>
- <text name="your_contribution_label">
- Sua Contribuição:
- </text>
- <string name="land_contrib_error">
- Não é possÃvel definir sua contribuição para o terreno.
- </string>
- <text name="your_contribution_max_value">
- m² ([AMOUNT] máxima)
- </text>
- <text name="group_over_limit_text">
- Membros do grupo precisam contribuir com mais créditos de Terra para garantir a terra em uso.
- </text>
- <text name="group_money_heading">
- Grupo L$
- </text>
- <tab_container name="group_money_tab_container">
- <panel label="Detalhes" name="group_money_details_tab">
- <text_editor name="group_money_details_text">
- Computando...
- </text_editor>
- <button label="< Cedo" label_selected="< Cedo" name="earlier_details_button" tool_tip="Voltar no Tempo"/>
- <button label="Tarde >" label_selected="Tarde >" name="later_details_button" tool_tip="Adiantar o Tempo"/>
- </panel>
- <panel label="Vendas" name="group_money_sales_tab">
- <text_editor name="group_money_sales_text">
- Computando...
- </text_editor>
- <button label="< Mais Cedo" label_selected="< Mais Cedo" name="earlier_sales_button" tool_tip="Voltar no Tempo"/>
- <button label="Mais Tarde >" label_selected="Mais Tarde >" name="later_sales_button" tool_tip="Adiantar o Tempo"/>
- </panel>
- </tab_container>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terra & L$" name="land_money_tab">
+ <string name="help_text">
+ Lotes pertencentes ao grupo são listados com detalhes de contribuição. Um aviso aparece até que o total de Terras em Uso seja menor ou igual ao Total de Contribuições. As abas de Planejamento, Detalhes e Vendas fornecem informações sobre as finanças do grupo.
+ </string>
+ <button label="?" name="help_button"/>
+ <string name="cant_view_group_land_text">
+ Você não tem permissão para ver as terras pertencentes ao grupo.
+ </string>
+ <string name="cant_view_group_accounting_text">
+ Você não tem permissão para ver as informações sobre as contas do grupo.
+ </string>
+ <string name="loading_txt">
+ Carregando...
+ </string>
+ <text name="group_land_heading">
+ Terra percentente ao grupo
+ </text>
+ <scroll_list name="group_parcel_list">
+ <column label="Nome do Lote" name="name"/>
+ <column label="Região" name="location"/>
+ <column label="Ãrea" name="area"/>
+ </scroll_list>
+ <button label="Mostrar no Mapa" label_selected="Mostrar no Mapa" name="map_button"/>
+ <text name="total_contributed_land_label">
+ Contribuição Total:
+ </text>
+ <text name="total_contributed_land_value">
+ [AREA] m²
+ </text>
+ <text name="total_land_in_use_label">
+ Total de Terra em Uso:
+ </text>
+ <text name="total_land_in_use_value">
+ [AREA] m²
+ </text>
+ <text name="land_available_label">
+ Terra DisponÃvel:
+ </text>
+ <text name="land_available_value">
+ [AREA] m²
+ </text>
+ <text name="your_contribution_label">
+ Sua Contribuição:
+ </text>
+ <string name="land_contrib_error">
+ Não é possÃvel definir sua contribuição para o terreno.
+ </string>
+ <text name="your_contribution_max_value">
+ m² ([AMOUNT] máxima)
+ </text>
+ <text name="group_over_limit_text">
+ Membros do grupo precisam contribuir com mais créditos de Terra para garantir a terra em uso.
+ </text>
+ <text name="group_money_heading">
+ Grupo L$
+ </text>
+ <tab_container name="group_money_tab_container">
+ <panel label="Detalhes" name="group_money_details_tab">
+ <text_editor name="group_money_details_text">
+ Computando...
+ </text_editor>
+ <button label="< Cedo" label_selected="< Cedo" name="earlier_details_button" tool_tip="Voltar no Tempo"/>
+ <button label="Tarde >" label_selected="Tarde >" name="later_details_button" tool_tip="Adiantar o Tempo"/>
+ </panel>
+ <panel label="Vendas" name="group_money_sales_tab">
+ <text_editor name="group_money_sales_text">
+ Computando...
+ </text_editor>
+ <button label="< Mais Cedo" label_selected="< Mais Cedo" name="earlier_sales_button" tool_tip="Voltar no Tempo"/>
+ <button label="Mais Tarde >" label_selected="Mais Tarde >" name="later_sales_button" tool_tip="Adiantar o Tempo"/>
+ </panel>
+ </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
index 79ca749798..1285a24ace 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="NotÃcias" name="notices_tab">
- <text name="help_text">
- As notÃcias são uma maneira rápida de
-comunicar-se através de um grupo transmitindo uma mensagem e
-entregando um item anexo, opcionalmente. As notÃcias vão apenas a membros
-do grupo que têm a função habilitada para receber notÃcias. Você pode desligar
-NotÃcias na aba Geral.
- </text>
- <text name="no_notices_text">
- Não existem notÃcias anteriores.
- </text>
- <button label="?" label_selected="?" name="help_button"/>
- <text name="lbl">
- Arquivo de notÃcias do grupo
- </text>
- <text name="lbl2">
- As notÃcias são mantidas por 14 dias. Clique na notÃcia abaixo que você deseja ver.
-Clique no botão “Atualizar†para verificar se novas notÃcias foram recebidas.
-Listas de aviso estão limitadas a 200 por grupo, diariamente.
- </text>
- <scroll_list name="notice_list">
- <column label="Assunto" name="subject"/>
- <column label="Para" name="from"/>
- <column label="Data" name="date"/>
- </scroll_list>
- <text name="notice_list_none_found">
- Nenhum encontrado.
- </text>
- <button label="Criar nova notÃcia" label_selected="Criar nova notÃcia" name="create_new_notice"/>
- <button label="Atualizar" label_selected="Atualizar Lista" name="refresh_notices"/>
- <panel label="Criar nova notÃcia" name="panel_create_new_notice">
- <text name="lbl">
- Criar uma notÃcia
- </text>
- <text name="lbl2">
- Você deve colocar um assunto para enviar uma notÃcia. Você pode
-adicionar um item simples à notÃcia, arrastando-o do seu
-Inventário para o painel. Itens anexados devem ser copiáveis
-e transferÃveis e você não pode mandar uma pasta.
- </text>
- <text name="lbl3">
- Assunto:
- </text>
- <text name="lbl4">
- Mensagem:
- </text>
- <text name="lbl5">
- Anexo:
- </text>
- <button label="Remover o anexo" label_selected="Remover o anexo" name="remove_attachment"/>
- <button label="Enviar notÃcia" label_selected="Enviar notÃcia" name="send_notice"/>
- <panel name="drop_target" tool_tip="Arraste um item do inventário para dentro da caixa de mensagem para enviá-lo com a notÃcia. Você deve ter permissão para copiar e transferir o objeto, para enviá-lo com a notÃcia."/>
- </panel>
- <panel label="Visualizar NotÃcia Anterior" name="panel_view_past_notice">
- <text name="lbl">
- NotÃcia arquivada
- </text>
- <text name="lbl2">
- Para enviar uma notÃcia nova, clique no botão 'Criar Nova NotÃcia' acima.
- </text>
- <text name="lbl3">
- Asunto:
- </text>
- <text name="lbl4">
- Mensagem:
- </text>
- <button label="Abrir o anexo" label_selected="Abrir o anexo" name="open_attachment"/>
- </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="NotÃcias" name="notices_tab">
+ <text name="help_text">
+ As notÃcias são uma maneira rápida de
+comunicar-se através de um grupo transmitindo uma mensagem e
+entregando um item anexo, opcionalmente. As notÃcias vão apenas a membros
+do grupo que têm a função habilitada para receber notÃcias. Você pode desligar
+NotÃcias na aba Geral.
+ </text>
+ <text name="no_notices_text">
+ Não existem notÃcias anteriores.
+ </text>
+ <button label="?" label_selected="?" name="help_button"/>
+ <text name="lbl">
+ Arquivo de notÃcias do grupo
+ </text>
+ <text name="lbl2">
+ As notÃcias são mantidas por 14 dias. Clique na notÃcia abaixo que você deseja ver.
+Clique no botão “Atualizar†para verificar se novas notÃcias foram recebidas.
+Listas de aviso estão limitadas a 200 por grupo, diariamente.
+ </text>
+ <scroll_list name="notice_list">
+ <column label="Assunto" name="subject"/>
+ <column label="Para" name="from"/>
+ <column label="Data" name="date"/>
+ </scroll_list>
+ <text name="notice_list_none_found">
+ Nenhum encontrado.
+ </text>
+ <button label="Criar nova notÃcia" label_selected="Criar nova notÃcia" name="create_new_notice"/>
+ <button label="Atualizar" label_selected="Atualizar Lista" name="refresh_notices"/>
+ <panel label="Criar nova notÃcia" name="panel_create_new_notice">
+ <text name="lbl">
+ Criar uma notÃcia
+ </text>
+ <text name="lbl2">
+ Você deve colocar um assunto para enviar uma notÃcia. Você pode
+adicionar um item simples à notÃcia, arrastando-o do seu
+Inventário para o painel. Itens anexados devem ser copiáveis
+e transferÃveis e você não pode mandar uma pasta.
+ </text>
+ <text name="lbl3">
+ Assunto:
+ </text>
+ <text name="lbl4">
+ Mensagem:
+ </text>
+ <text name="lbl5">
+ Anexo:
+ </text>
+ <button label="Remover o anexo" label_selected="Remover o anexo" name="remove_attachment"/>
+ <button label="Enviar notÃcia" label_selected="Enviar notÃcia" name="send_notice"/>
+ <panel name="drop_target" tool_tip="Arraste um item do inventário para dentro da caixa de mensagem para enviá-lo com a notÃcia. Você deve ter permissão para copiar e transferir o objeto, para enviá-lo com a notÃcia."/>
+ </panel>
+ <panel label="Visualizar NotÃcia Anterior" name="panel_view_past_notice">
+ <text name="lbl">
+ NotÃcia arquivada
+ </text>
+ <text name="lbl2">
+ Para enviar uma notÃcia nova, clique no botão 'Criar Nova NotÃcia' acima.
+ </text>
+ <text name="lbl3">
+ Asunto:
+ </text>
+ <text name="lbl4">
+ Mensagem:
+ </text>
+ <button label="Abrir o anexo" label_selected="Abrir o anexo" name="open_attachment"/>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_roles.xml b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
index 1e414201c5..5371355e9b 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_roles.xml
@@ -1,139 +1,139 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Membros e Funções" name="roles_tab">
- <string name="default_needs_apply_text">
- Existem alterações não aplicadas na sub-aba atual.
- </string>
- <string name="want_apply_text">
- Você quer submeter essas alterações?
- </string>
- <button label="?" name="help_button"/>
- <panel name="members_header">
- <text name="static">
- Membros e Funções
- </text>
- <text name="static2">
- São atribuÃdas funções com habilidades aos membros do grupo.
-Estes ajustes podem ser facilmente customizados para uma flexibilidade e organização maiores.
- </text>
- </panel>
- <panel name="roles_header">
- <text name="static">
- Funções
- </text>
- <text name="role_properties_modifiable">
- Selecionar uma função abaixo. Você pode modificar o nome, a descrição e o tÃtulo do membro.
- </text>
- <text name="role_properties_not_modifiable">
- Selecione uma função abaixo para ver suas propriedades, membros e habilidades permitidas.
- </text>
- <text name="role_actions_modifiable">
- Você também pode atribuir habilidades à função.
- </text>
- <text name="role_actions_not_modifiable">
- Você pode ver, mas não pode alterar habilidades atribuÃdas.
- </text>
- </panel>
- <panel name="actions_header">
- <text name="static">
- Habilidades
- </text>
- <text name="static2">
- Você pode ver a descrição de uma habilidade e quais funções e membros podem executar essa habilidade.
- </text>
- </panel>
- <tab_container name="roles_tab_container">
- <panel label="Membros" name="members_sub_tab" tool_tip="Membros">
- <button label="Pesquisar" name="search_button"/>
- <button label="Mostrar todos" name="show_all_button"/>
- <name_list name="member_list">
- <column label="Nome do membro" name="name"/>
- <column label="Tarifa doada" name="donated"/>
- <column label="Último login" name="online"/>
- </name_list>
- <button label="Convidar nova pessoa..." name="member_invite"/>
- <button label="Ejetar do Grupo" name="member_eject"/>
- <string name="help_text">
- Você pode adicionar ou remover as funções designadas aos membros. Selecione vários membros, segurando a tecla Ctrl e clicando em seus nomes.
- </string>
- </panel>
- <panel label="Funções" name="roles_sub_tab">
- <button label="Busca" name="search_button"/>
- <button label="Mostrar todos" name="show_all_button"/>
- <scroll_list name="role_list">
- <column label="Nome da função" name="name"/>
- <column label="TÃtulo" name="title"/>
- <column label="Membro" name="members"/>
- </scroll_list>
- <button label="Criar nova função..." name="role_create"/>
- <button label="Apagar função" name="role_delete"/>
- <string name="help_text">
- As funções têm um tÃtulo e uma lista de habilidades
-permitidas que os membros podem executar. Os membros poderão ter um ou mais funções.
- Um grupo poderá ter até 10 funções, incluÃndo as funções dos membros e do dono do grupo.
- </string>
- <string name="cant_delete_role">
- As funções 'todos' e 'donos' são especiais e não podem ser deletadas.
- </string>
- </panel>
- <panel label="Habilidades" name="actions_sub_tab">
- <button label="Busca" name="search_button"/>
- <button label="Mostrar todos" name="show_all_button"/>
- <scroll_list name="action_list" tool_tip="Selecione uma habilidade para ver mais detalhes."/>
- <string name="help_text">
- As habilidades permitem que os membros nas funções façam coisas especÃficas dentro do grupo.
-Há uma grande variedade de habilidades.
- </string>
- </panel>
- </tab_container>
- <panel name="members_footer">
- <text name="static">
- Funções atribuÃdas
- </text>
- <text name="static2">
- Habilidades permitidas
- </text>
- <scroll_list name="member_allowed_actions" tool_tip="Para detalhes de cada habilidade permitida, veja a aba Habilidades."/>
- </panel>
- <panel name="roles_footer">
- <text name="static">
- Nome
- </text>
- <text name="static2">
- Descrição
- </text>
- <line_editor name="role_name">
- Empregados
- </line_editor>
- <text name="static3">
- TÃtulo
- </text>
- <line_editor name="role_title">
- (esperando)
- </line_editor>
- <text_editor name="role_description">
- (esperando)
- </text_editor>
- <text name="static4">
- Membros atribuÃdos
- </text>
- <text name="static5" tool_tip="Uma lista de habilidades que a função selecionada atualmente pode executar.">
- Habilidades permitidas
- </text>
- <check_box label="Membros estão visÃveis" name="role_visible_in_list" tool_tip="Selecione se os membros desta função estarão visÃveis na aba Diversos, para as pessoas de fora do grupo."/>
- <scroll_list name="role_allowed_actions" tool_tip="Para ver detalhes de cada habilidade permitida, veja a aba correspondente."/>
- </panel>
- <panel name="actions_footer">
- <text name="static">
- Descrição
- </text>
- <text_editor name="action_description">
- Essa habilidade permite tirar alguem do grupo. Somente o dono do grupo poderá retirar outro dono do grupo.
- </text_editor>
- <text name="static2">
- Funções com habilidades
- </text>
- <text name="static3">
- Membros com habilidades
- </text>
- </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Membros e Funções" name="roles_tab">
+ <string name="default_needs_apply_text">
+ Existem alterações não aplicadas na sub-aba atual.
+ </string>
+ <string name="want_apply_text">
+ Você quer submeter essas alterações?
+ </string>
+ <button label="?" name="help_button"/>
+ <panel name="members_header">
+ <text name="static">
+ Membros e Funções
+ </text>
+ <text name="static2">
+ São atribuÃdas funções com habilidades aos membros do grupo.
+Estes ajustes podem ser facilmente customizados para uma flexibilidade e organização maiores.
+ </text>
+ </panel>
+ <panel name="roles_header">
+ <text name="static">
+ Funções
+ </text>
+ <text name="role_properties_modifiable">
+ Selecionar uma função abaixo. Você pode modificar o nome, a descrição e o tÃtulo do membro.
+ </text>
+ <text name="role_properties_not_modifiable">
+ Selecione uma função abaixo para ver suas propriedades, membros e habilidades permitidas.
+ </text>
+ <text name="role_actions_modifiable">
+ Você também pode atribuir habilidades à função.
+ </text>
+ <text name="role_actions_not_modifiable">
+ Você pode ver, mas não pode alterar habilidades atribuÃdas.
+ </text>
+ </panel>
+ <panel name="actions_header">
+ <text name="static">
+ Habilidades
+ </text>
+ <text name="static2">
+ Você pode ver a descrição de uma habilidade e quais funções e membros podem executar essa habilidade.
+ </text>
+ </panel>
+ <tab_container name="roles_tab_container">
+ <panel label="Membros" name="members_sub_tab" tool_tip="Membros">
+ <button label="Pesquisar" name="search_button"/>
+ <button label="Mostrar todos" name="show_all_button"/>
+ <name_list name="member_list">
+ <column label="Nome do membro" name="name"/>
+ <column label="Tarifa doada" name="donated"/>
+ <column label="Último login" name="online"/>
+ </name_list>
+ <button label="Convidar nova pessoa..." name="member_invite"/>
+ <button label="Ejetar do Grupo" name="member_eject"/>
+ <string name="help_text">
+ Você pode adicionar ou remover as funções designadas aos membros. Selecione vários membros, segurando a tecla Ctrl e clicando em seus nomes.
+ </string>
+ </panel>
+ <panel label="Funções" name="roles_sub_tab">
+ <button label="Busca" name="search_button"/>
+ <button label="Mostrar todos" name="show_all_button"/>
+ <scroll_list name="role_list">
+ <column label="Nome da função" name="name"/>
+ <column label="TÃtulo" name="title"/>
+ <column label="Membro" name="members"/>
+ </scroll_list>
+ <button label="Criar nova função..." name="role_create"/>
+ <button label="Apagar função" name="role_delete"/>
+ <string name="help_text">
+ As funções têm um tÃtulo e uma lista de habilidades
+permitidas que os membros podem executar. Os membros poderão ter um ou mais funções.
+ Um grupo poderá ter até 10 funções, incluÃndo as funções dos membros e do dono do grupo.
+ </string>
+ <string name="cant_delete_role">
+ As funções 'todos' e 'donos' são especiais e não podem ser deletadas.
+ </string>
+ </panel>
+ <panel label="Habilidades" name="actions_sub_tab">
+ <button label="Busca" name="search_button"/>
+ <button label="Mostrar todos" name="show_all_button"/>
+ <scroll_list name="action_list" tool_tip="Selecione uma habilidade para ver mais detalhes."/>
+ <string name="help_text">
+ As habilidades permitem que os membros nas funções façam coisas especÃficas dentro do grupo.
+Há uma grande variedade de habilidades.
+ </string>
+ </panel>
+ </tab_container>
+ <panel name="members_footer">
+ <text name="static">
+ Funções atribuÃdas
+ </text>
+ <text name="static2">
+ Habilidades permitidas
+ </text>
+ <scroll_list name="member_allowed_actions" tool_tip="Para detalhes de cada habilidade permitida, veja a aba Habilidades."/>
+ </panel>
+ <panel name="roles_footer">
+ <text name="static">
+ Nome
+ </text>
+ <text name="static2">
+ Descrição
+ </text>
+ <line_editor name="role_name">
+ Empregados
+ </line_editor>
+ <text name="static3">
+ TÃtulo
+ </text>
+ <line_editor name="role_title">
+ (esperando)
+ </line_editor>
+ <text_editor name="role_description">
+ (esperando)
+ </text_editor>
+ <text name="static4">
+ Membros atribuÃdos
+ </text>
+ <text name="static5" tool_tip="Uma lista de habilidades que a função selecionada atualmente pode executar.">
+ Habilidades permitidas
+ </text>
+ <check_box label="Membros estão visÃveis" name="role_visible_in_list" tool_tip="Selecione se os membros desta função estarão visÃveis na aba Diversos, para as pessoas de fora do grupo."/>
+ <scroll_list name="role_allowed_actions" tool_tip="Para ver detalhes de cada habilidade permitida, veja a aba correspondente."/>
+ </panel>
+ <panel name="actions_footer">
+ <text name="static">
+ Descrição
+ </text>
+ <text_editor name="action_description">
+ Essa habilidade permite tirar alguem do grupo. Somente o dono do grupo poderá retirar outro dono do grupo.
+ </text_editor>
+ <text name="static2">
+ Funções com habilidades
+ </text>
+ <text name="static3">
+ Membros com habilidades
+ </text>
+ </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_login.xml b/indra/newview/skins/default/xui/pt/panel_login.xml
index 8dc8867e0f..5446875654 100644
--- a/indra/newview/skins/default/xui/pt/panel_login.xml
+++ b/indra/newview/skins/default/xui/pt/panel_login.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_login">
- <text name="first_name_text">
- Primeiro nome:
- </text>
- <text name="last_name_text">
- Sobrenome:
- </text>
- <text name="password_text">
- Senha:
- </text>
- <text name="start_location_text">
- Localização inicial:
- </text>
- <combo_box name="start_location_combo">
- <combo_item name="MyHome">
- Minha casa
- </combo_item>
- <combo_item name="MyLastLocation">
- Minha última localização
- </combo_item>
- <combo_item name="Typeregionname">
- < Digite o nome da região;
- </combo_item>
- </combo_box>
- <check_box label="Lembrar senha" name="remember_check"/>
- <button label="Entrar" label_selected="Entrar" name="connect_btn"/>
- <text name="create_new_account_text">
- Registrar-se para uma conta
- </text>
- <text name="forgot_password_text">
- Esqueceu seu nome de usuário ou senha?
- </text>
- <text name="channel_text">
- [VERSION]
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_login">
+ <text name="first_name_text">
+ Primeiro nome:
+ </text>
+ <text name="last_name_text">
+ Sobrenome:
+ </text>
+ <text name="password_text">
+ Senha:
+ </text>
+ <text name="start_location_text">
+ Localização inicial:
+ </text>
+ <combo_box name="start_location_combo">
+ <combo_box.item name="MyHome">
+ Minha casa
+ </combo_box.item>
+ <combo_box.item name="MyLastLocation">
+ Minha última localização
+ </combo_box.item>
+ <combo_box.item name="Typeregionname">
+ < Digite o nome da região;
+ </combo_box.item>
+ </combo_box>
+ <check_box label="Lembrar senha" name="remember_check"/>
+ <button label="Entrar" label_selected="Entrar" name="connect_btn"/>
+ <text name="create_new_account_text">
+ Registrar-se para uma conta
+ </text>
+ <text name="forgot_password_text">
+ Esqueceu seu nome de usuário ou senha?
+ </text>
+ <text name="channel_text">
+ [VERSION]
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index 4bc81b31cb..8ae635bbae 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Chat" name="chat">
- <text length="1" name="text_box" type="string">
- Tamanho da Fonte
-do Chat:
- </text>
- <radio_group name="chat_font_size">
- <radio_item name="radio">
- Pequeno
- </radio_item>
- <radio_item name="radio2">
- Médio
- </radio_item>
- <radio_item name="radio3">
- Grande
- </radio_item>
- </radio_group>
- <text length="1" name="text_box2" type="string">
- Cor do Chat:
- </text>
- <color_swatch label="Você" name="user"/>
- <color_swatch label="Outros" name="agent"/>
- <color_swatch label="MI" name="im"/>
- <color_swatch label="Sistema" name="system"/>
- <color_swatch label="Erros" name="script_error"/>
- <color_swatch label="Objetos" name="objects"/>
- <color_swatch label="Dono" name="owner"/>
- <color_swatch label="Bolha" name="background"/>
- <color_swatch label="URLs" name="links"/>
- <text length="1" name="text_box8" type="string">
- Erros de Script:
- </text>
- <check_box label="Mostrar Erros de Script e avisos como chat comum" name="script_errors_as_chat"/>
- <text length="1" name="text_box3" type="string">
- Console do Chat:
- </text>
- <spinner label="Ocultar Chat depois" label_width="112" name="fade_chat_time" width="162"/>
- <text left="310" length="1" name="text_box4" type="string">
- (segundos)
- </text>
- <spinner left="373" name="max_chat_count"/>
- <text left="435" length="1" name="text_box5" type="string" width="94">
- (# linhas)
- </text>
- <slider label="Opacidade" name="console_opacity"/>
- <check_box label="Use a largura total da tela (Precisa reiniciar)" name="chat_full_width_check"/>
- <text length="1" name="text_box6" type="string">
- Opções do Chat:
- </text>
- <check_box label="Feche a barra de conversa após pressionar retornar" name="close_chat_on_return_check"/>
- <check_box label="Teclas de Setas sempre movem o avatar durante a conversa" name="arrow_keys_move_avatar_check"/>
- <check_box label="Mostrar a hora na conversa local" name="show_timestamps_check"/>
- <check_box label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
- <text length="1" name="text_box7" type="string">
- Chat com bolha:
- </text>
- <check_box label="Mostrar bolhas do chat" name="bubble_text_chat"/>
- <slider label="Opacidade" name="bubble_chat_opacity"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Chat" name="chat">
+ <text length="1" name="text_box" type="string">
+ Tamanho da Fonte
+do Chat:
+ </text>
+ <radio_group name="chat_font_size">
+ <radio_item name="radio">
+ Pequeno
+ </radio_item>
+ <radio_item name="radio2">
+ Médio
+ </radio_item>
+ <radio_item name="radio3">
+ Grande
+ </radio_item>
+ </radio_group>
+ <text length="1" name="text_box2" type="string">
+ Cor do Chat:
+ </text>
+ <color_swatch label="Você" name="user"/>
+ <color_swatch label="Outros" name="agent"/>
+ <color_swatch label="MI" name="im"/>
+ <color_swatch label="Sistema" name="system"/>
+ <color_swatch label="Erros" name="script_error"/>
+ <color_swatch label="Objetos" name="objects"/>
+ <color_swatch label="Dono" name="owner"/>
+ <color_swatch label="Bolha" name="background"/>
+ <color_swatch label="URLs" name="links"/>
+ <text length="1" name="text_box8" type="string">
+ Erros de Script:
+ </text>
+ <check_box label="Mostrar Erros de Script e avisos como chat comum" name="script_errors_as_chat"/>
+ <text length="1" name="text_box3" type="string">
+ Console do Chat:
+ </text>
+ <spinner label="Ocultar Chat depois" label_width="112" name="fade_chat_time" width="162"/>
+ <text left="310" length="1" name="text_box4" type="string">
+ (segundos)
+ </text>
+ <spinner left="373" name="max_chat_count"/>
+ <text left="435" length="1" name="text_box5" type="string" width="94">
+ (# linhas)
+ </text>
+ <slider label="Opacidade" name="console_opacity"/>
+ <check_box label="Use a largura total da tela (Precisa reiniciar)" name="chat_full_width_check"/>
+ <text length="1" name="text_box6" type="string">
+ Opções do Chat:
+ </text>
+ <check_box label="Feche a barra de conversa após pressionar retornar" name="close_chat_on_return_check"/>
+ <check_box label="Teclas de Setas sempre movem o avatar durante a conversa" name="arrow_keys_move_avatar_check"/>
+ <check_box label="Mostrar a hora na conversa local" name="show_timestamps_check"/>
+ <check_box label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
+ <text length="1" name="text_box7" type="string">
+ Chat com bolha:
+ </text>
+ <check_box label="Mostrar bolhas do chat" name="bubble_text_chat"/>
+ <slider label="Opacidade" name="bubble_chat_opacity"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index 886706ce2d..28361d8ddf 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -1,114 +1,114 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Geral" name="general_panel">
- <radio_group name="default_start_location">
- <radio_item name="MyHome" tool_tip="Como padrão, registrar na minha casa.">
- Minha Casa
- </radio_item>
- <radio_item name="MyLastLocation" tool_tip="Por padrão, registrar na minha última localidade.">
- Minha Última Localidade
- </radio_item>
- </radio_group>
- <check_box label="Mostrar Posição Inicial na Tela de Login" name="show_location_checkbox"/>
- <combo_box name="fade_out_combobox" width="166">
- <combo_item name="Never">
- Nunca
- </combo_item>
- <combo_item name="Show Temporarily">
- Mostrar Temporariamente
- </combo_item>
- <combo_item name="Always">
- Sempre
- </combo_item>
- </combo_box>
- <check_box label="Avatar com Nomes Pequenos" name="small_avatar_names_checkbox"/>
- <check_box label="Ocultar meu Nome na minha Tela" name="show_my_name_checkbox"/>
- <text name="group_titles_textbox">
- TÃtulos dos Grupos:
- </text>
- <check_box label="Ocultar todos os TÃtulos de Grupos" name="show_all_title_checkbox"/>
- <check_box label="Ocultar meu TÃtulo no Grupo" name="show_my_title_checkbox"/>
- <color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir o seletor de cores"/>
- <text name="UI Size:">
- Tamanho da UI:
- </text>
- <check_box label="Usar escala independente da resolução" name="ui_auto_scale"/>
- <spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner"/>
- <check_box label="Rotacionar Mini-Mapa" name="rotate_mini_map_checkbox"/>
- <check_box label="Avisar quando receber ou gastar Linden dollars (L$)" name="notify_money_change_checkbox"/>
- <check_box label="Usar a paleta de cores padrão do sistema" name="use_system_color_picker_checkbox" tool_tip="Usar a paleta de cores padrão do sistema ao invés de uma feita dentro de Second Life."/>
- <check_box label="Mostrar o painel de busca na barra sobreposta" name="show_search_panel" tool_tip="Mostrar o painel de busca embutido."/>
- <text length="1" name="start_location_textbox" type="string">
- Posição Inicial:
- </text>
- <text length="1" name="show_names_textbox" type="string">
- Mostrar Nomes:
- </text>
- <text length="1" name="effects_color_textbox" type="string">
- Cores para Meus Efeitos:
- </text>
- <text length="1" name="seconds_textbox" type="string">
- segundos
- </text>
- <text length="1" name="crash_report_textbox" type="string">
- Relatórios de Falhas:
- </text>
- <text name="language_textbox">
- Linguagem:
- </text>
- <text left_delta="313" length="1" name="language_textbox2" type="string">
- (Precisa de reinÃcio para efetivar)
- </text>
- <string name="region_name_prompt">
- Digite o nome da Região
- </string>
- <combo_box name="crash_behavior_combobox" width="166">
- <combo_item length="1" name="Askbeforesending" type="string">
- Perguntar antes de enviar
- </combo_item>
- <combo_item length="1" name="Alwayssend" type="string">
- Sempre enviar
- </combo_item>
- <combo_item length="1" name="Neversend" type="string">
- Nunca Enviar
- </combo_item>
- </combo_box>
- <combo_box name="language_combobox" width="166">
- <combo_item name="System Default Language">
- Padrão do Sistema
- </combo_item>
- <combo_item name="English">
- English (Inglês)
- </combo_item>
- <combo_item name="Danish">
- Dansk (Dinamarquês) - Beta
- </combo_item>
- <combo_item name="Deutsch(German)">
- Deutsch (Alemão) - Beta
- </combo_item>
- <combo_item name="Spanish">
- Español (Espanhol) - Beta
- </combo_item>
- <combo_item name="French">
- Français (Francês) - Beta
- </combo_item>
- <combo_item name="Hungarian">
- Magyar (Húngaro) - Beta
- </combo_item>
- <combo_item name="Polish">
- Polski (Polonês) - Beta
- </combo_item>
- <combo_item name="Portugese">
- Português - Beta
- </combo_item>
- <combo_item name="Chinese">
- ä¸æ–‡ (简体) (Chinês) - Beta
- </combo_item>
- <combo_item name="(Japanese)">
- 日本語 (Japonês) - Beta
- </combo_item>
- <combo_item name="(Korean)">
- í•œêµì–´ (Coreano) - Beta
- </combo_item>
- </combo_box>
- <check_box label="Compartilhar a linguagem com objetos" name="language_is_public" tool_tip="Isto permite que os objetos no mundo conheçam sua linguagem preferida."/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Geral" name="general_panel">
+ <radio_group name="default_start_location">
+ <radio_item name="MyHome" tool_tip="Como padrão, registrar na minha casa.">
+ Minha Casa
+ </radio_item>
+ <radio_item name="MyLastLocation" tool_tip="Por padrão, registrar na minha última localidade.">
+ Minha Última Localidade
+ </radio_item>
+ </radio_group>
+ <check_box label="Mostrar Posição Inicial na Tela de Login" name="show_location_checkbox"/>
+ <combo_box name="fade_out_combobox" width="166">
+ <combo_item name="Never">
+ Nunca
+ </combo_item>
+ <combo_item name="Show Temporarily">
+ Mostrar Temporariamente
+ </combo_item>
+ <combo_item name="Always">
+ Sempre
+ </combo_item>
+ </combo_box>
+ <check_box label="Avatar com Nomes Pequenos" name="small_avatar_names_checkbox"/>
+ <check_box label="Ocultar meu Nome na minha Tela" name="show_my_name_checkbox"/>
+ <text name="group_titles_textbox">
+ TÃtulos dos Grupos:
+ </text>
+ <check_box label="Ocultar todos os TÃtulos de Grupos" name="show_all_title_checkbox"/>
+ <check_box label="Ocultar meu TÃtulo no Grupo" name="show_my_title_checkbox"/>
+ <color_swatch label="" name="effect_color_swatch" tool_tip="Clique para abrir o seletor de cores"/>
+ <text name="UI Size:">
+ Tamanho da UI:
+ </text>
+ <check_box label="Usar escala independente da resolução" name="ui_auto_scale"/>
+ <spinner label="Tempo para ficar Ausente:" name="afk_timeout_spinner"/>
+ <check_box label="Rotacionar Mini-Mapa" name="rotate_mini_map_checkbox"/>
+ <check_box label="Avisar quando receber ou gastar Linden dollars (L$)" name="notify_money_change_checkbox"/>
+ <check_box label="Usar a paleta de cores padrão do sistema" name="use_system_color_picker_checkbox" tool_tip="Usar a paleta de cores padrão do sistema ao invés de uma feita dentro de Second Life."/>
+ <check_box label="Mostrar o painel de busca na barra sobreposta" name="show_search_panel" tool_tip="Mostrar o painel de busca embutido."/>
+ <text length="1" name="start_location_textbox" type="string">
+ Posição Inicial:
+ </text>
+ <text length="1" name="show_names_textbox" type="string">
+ Mostrar Nomes:
+ </text>
+ <text length="1" name="effects_color_textbox" type="string">
+ Cores para Meus Efeitos:
+ </text>
+ <text length="1" name="seconds_textbox" type="string">
+ segundos
+ </text>
+ <text length="1" name="crash_report_textbox" type="string">
+ Relatórios de Falhas:
+ </text>
+ <text name="language_textbox">
+ Linguagem:
+ </text>
+ <text left_delta="313" length="1" name="language_textbox2" type="string">
+ (Precisa de reinÃcio para efetivar)
+ </text>
+ <string name="region_name_prompt">
+ Digite o nome da Região
+ </string>
+ <combo_box name="crash_behavior_combobox" width="166">
+ <combo_item length="1" name="Askbeforesending" type="string">
+ Perguntar antes de enviar
+ </combo_item>
+ <combo_item length="1" name="Alwayssend" type="string">
+ Sempre enviar
+ </combo_item>
+ <combo_item length="1" name="Neversend" type="string">
+ Nunca Enviar
+ </combo_item>
+ </combo_box>
+ <combo_box name="language_combobox" width="166">
+ <combo_item name="System Default Language">
+ Padrão do Sistema
+ </combo_item>
+ <combo_item name="English">
+ English (Inglês)
+ </combo_item>
+ <combo_item name="Danish">
+ Dansk (Dinamarquês) - Beta
+ </combo_item>
+ <combo_item name="Deutsch(German)">
+ Deutsch (Alemão) - Beta
+ </combo_item>
+ <combo_item name="Spanish">
+ Español (Espanhol) - Beta
+ </combo_item>
+ <combo_item name="French">
+ Français (Francês) - Beta
+ </combo_item>
+ <combo_item name="Hungarian">
+ Magyar (Húngaro) - Beta
+ </combo_item>
+ <combo_item name="Polish">
+ Polski (Polonês) - Beta
+ </combo_item>
+ <combo_item name="Portugese">
+ Português - Beta
+ </combo_item>
+ <combo_item name="Chinese">
+ ä¸æ–‡ (简体) (Chinês) - Beta
+ </combo_item>
+ <combo_item name="(Japanese)">
+ 日本語 (Japonês) - Beta
+ </combo_item>
+ <combo_item name="(Korean)">
+ í•œêµì–´ (Coreano) - Beta
+ </combo_item>
+ </combo_box>
+ <check_box label="Compartilhar a linguagem com objetos" name="language_is_public" tool_tip="Isto permite que os objetos no mundo conheçam sua linguagem preferida."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index fa80310c2b..5833956986 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -1,177 +1,177 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Gráficos" name="Display panel">
- <button label="?" name="GraphicsPreferencesHelpButton"/>
- <check_box label="Execute Second Life em uma janela" name="windowed mode"/>
- <text_editor bottom="-56" height="40" name="FullScreenInfo" width="480">
- Se desmarcado, o visualizador irá exibir em tela inteira quando fizer o acesso.
- </text_editor>
- <text name="WindowSizeLabel">
- Tamanho da Janela:
- </text>
- <combo_box name="windowsize combo">
- <combo_item name="640x480">
- 640x480
- </combo_item>
- <combo_item name="800x600">
- 800x600
- </combo_item>
- <combo_item name="720x480">
- 720x480 (NTSC)
- </combo_item>
- <combo_item name="768x576">
- 768x576 (PAL)
- </combo_item>
- <combo_item name="1024x768">
- 1024x768
- </combo_item>
- </combo_box>
- <text name="DisplayResLabel">
- Resolução de Display:
- </text>
- <text name="AspectRatioLabel1" tool_tip="largura / altura">
- Relação de Aspecto:
- </text>
- <combo_box name="aspect_ratio" tool_tip="largura / altura">
- <combo_item length="1" name="4:3(StandardCRT)" type="string">
- 4:3 (CRT Padrão)
- </combo_item>
- <combo_item length="1" name="5:4(1280x1024LCD)" type="string">
- 5:4 (1280x1024 LCD)
- </combo_item>
- <combo_item name="8:5(Widescreen)">
- 8:5 (tela ampla)
- </combo_item>
- <combo_item length="1" name="16:9(Widescreen)" type="string">
- 16:9 (tela ampla)
- </combo_item>
- </combo_box>
- <check_box label="Auto-detectar a relação" name="aspect_auto_detect"/>
- <text name="HigherText">
- Qualidade e
- </text>
- <text name="QualityText">
- Performance:
- </text>
- <text name="FasterText">
- Mais
-rápido
- </text>
- <text name="ShadersPrefText">
- Baixo
- </text>
- <text name="ShadersPrefText2">
- Meio
- </text>
- <text name="ShadersPrefText3">
- Alto
- </text>
- <text name="ShadersPrefText4">
- Ultra
- </text>
- <text name="HigherText2">
- Mais alto
- </text>
- <text name="QualityText2">
- Qualidade
- </text>
- <check_box label="Padrão" left="395" name="CustomSettings"/>
- <text name="ShadersText">
- Sombreadores:
- </text>
- <check_box label="Bump de Mapeamento e Brilho" name="BumpShiny"/>
- <check_box label="Sombreadores básicos" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vÃdeo a travem."/>
- <check_box label="Sombreadores Atmosféricos" name="WindLightUseAtmosShaders"/>
- <check_box label="Reflexos de Ãgua" name="Reflections"/>
- <text name="ReflectionDetailText">
- Detalhes de Reflexão:
- </text>
- <radio_group name="ReflectionDetailRadio">
- <radio_item name="0">
- Terreno e Ãrvores
- </radio_item>
- <radio_item name="1">
- Todos os objetos estáticos
- </radio_item>
- <radio_item name="2">
- Todos os avatares e Objetos
- </radio_item>
- <radio_item name="3">
- Tudo
- </radio_item>
- </radio_group>
- <text name="AvatarRenderingText">
- Renderização de Avatar:
- </text>
- <check_box label="Atributos do Avatar" name="AvatarImpostors"/>
- <check_box label="Melhoria de Hardware" name="AvatarVertexProgram"/>
- <check_box label="Vestimenta do Avatar" name="AvatarCloth"/>
- <text name="DrawDistanceMeterText1">
- m
- </text>
- <text name="DrawDistanceMeterText2">
- m
- </text>
- <slider label="Distancia de desenho:" label_width="146" name="DrawDistance" width="255"/>
- <slider label="Contador máx. de partÃculas:" label_width="146" name="MaxParticleCount" width="262"/>
- <slider label="Qualidade de Pós-processamento:" label_width="146" name="RenderPostProcess" width="223"/>
- <text name="MeshDetailText">
- Detalhes de Malha:
- </text>
- <slider label="Objetos:" name="ObjectMeshDetail"/>
- <slider label="Primitivas Flexiveis:" name="FlexibleMeshDetail"/>
- <slider label="Ãrvores:" name="TreeMeshDetail"/>
- <slider label="Avatares:" name="AvatarMeshDetail"/>
- <slider label="Terreno:" name="TerrainMeshDetail"/>
- <slider label="Céu:" name="SkyMeshDetail"/>
- <text name="PostProcessText">
- Baixo
- </text>
- <text name="ObjectMeshDetailText">
- Baixo
- </text>
- <text name="FlexibleMeshDetailText">
- Baixo
- </text>
- <text name="TreeMeshDetailText">
- Baixo
- </text>
- <text name="AvatarMeshDetailText">
- Baixo
- </text>
- <text name="TerrainMeshDetailText">
- Baixo
- </text>
- <text name="SkyMeshDetailText">
- Baixo
- </text>
- <text name="LightingDetailText">
- Detalhes de Iluminação:
- </text>
- <radio_group name="LightingDetailRadio">
- <radio_item name="SunMoon">
- Sol e Lua apenas
- </radio_item>
- <radio_item name="LocalLights">
- Luzes locais nas proximidades
- </radio_item>
- </radio_group>
- <text name="TerrainDetailText">
- Detalhe do Terreno:
- </text>
- <radio_group left_delta="45" name="TerrainDetailRadio" width="276">
- <radio_item name="0">
- Baixo
- </radio_item>
- <radio_item name="2">
- Alto
- </radio_item>
- </radio_group>
- <button label="Configurações Recomendadas" name="Defaults"/>
- <button label="Opções de Hardware" label_selected="Opções de Hardware" name="GraphicsHardwareButton"/>
- <string name="resolution_format">
- [RES_X] x [RES_Y]
- </string>
- <string name="aspect_ratio_text">
- [NUM]:[DEN]
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Gráficos" name="Display panel">
+ <button label="?" name="GraphicsPreferencesHelpButton"/>
+ <check_box label="Execute Second Life em uma janela" name="windowed mode"/>
+ <text_editor bottom="-56" height="40" name="FullScreenInfo" width="480">
+ Se desmarcado, o visualizador irá exibir em tela inteira quando fizer o acesso.
+ </text_editor>
+ <text name="WindowSizeLabel">
+ Tamanho da Janela:
+ </text>
+ <combo_box name="windowsize combo">
+ <combo_box.item name="640x480">
+ 640x480
+ </combo_box.item>
+ <combo_box.item name="800x600">
+ 800x600
+ </combo_box.item>
+ <combo_box.item name="720x480">
+ 720x480 (NTSC)
+ </combo_box.item>
+ <combo_box.item name="768x576">
+ 768x576 (PAL)
+ </combo_box.item>
+ <combo_box.item name="1024x768">
+ 1024x768
+ </combo_box.item>
+ </combo_box>
+ <text name="DisplayResLabel">
+ Resolução de Display:
+ </text>
+ <text name="AspectRatioLabel1" tool_tip="largura / altura">
+ Relação de Aspecto:
+ </text>
+ <combo_box name="aspect_ratio" tool_tip="largura / altura">
+ <combo_box.item length="1" name="4:3(StandardCRT)" type="string">
+ 4:3 (CRT Padrão)
+ </combo_box.item>
+ <combo_box.item length="1" name="5:4(1280x1024LCD)" type="string">
+ 5:4 (1280x1024 LCD)
+ </combo_box.item>
+ <combo_box.item name="8:5(Widescreen)">
+ 8:5 (tela ampla)
+ </combo_box.item>
+ <combo_box.item length="1" name="16:9(Widescreen)" type="string">
+ 16:9 (tela ampla)
+ </combo_box.item>
+ </combo_box>
+ <check_box label="Auto-detectar a relação" name="aspect_auto_detect"/>
+ <text name="HigherText">
+ Qualidade e
+ </text>
+ <text name="QualityText">
+ Performance:
+ </text>
+ <text name="FasterText">
+ Mais
+rápido
+ </text>
+ <text name="ShadersPrefText">
+ Baixo
+ </text>
+ <text name="ShadersPrefText2">
+ Meio
+ </text>
+ <text name="ShadersPrefText3">
+ Alto
+ </text>
+ <text name="ShadersPrefText4">
+ Ultra
+ </text>
+ <text name="HigherText2">
+ Mais alto
+ </text>
+ <text name="QualityText2">
+ Qualidade
+ </text>
+ <check_box label="Padrão" left="395" name="CustomSettings"/>
+ <text name="ShadersText">
+ Sombreadores:
+ </text>
+ <check_box label="Bump de Mapeamento e Brilho" name="BumpShiny"/>
+ <check_box label="Sombreadores básicos" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vÃdeo a travem."/>
+ <check_box label="Sombreadores Atmosféricos" name="WindLightUseAtmosShaders"/>
+ <check_box label="Reflexos de Ãgua" name="Reflections"/>
+ <text name="ReflectionDetailText">
+ Detalhes de Reflexão:
+ </text>
+ <radio_group name="ReflectionDetailRadio">
+ <radio_item name="0">
+ Terreno e Ãrvores
+ </radio_item>
+ <radio_item name="1">
+ Todos os objetos estáticos
+ </radio_item>
+ <radio_item name="2">
+ Todos os avatares e Objetos
+ </radio_item>
+ <radio_item name="3">
+ Tudo
+ </radio_item>
+ </radio_group>
+ <text name="AvatarRenderingText">
+ Renderização de Avatar:
+ </text>
+ <check_box label="Atributos do Avatar" name="AvatarImpostors"/>
+ <check_box label="Melhoria de Hardware" name="AvatarVertexProgram"/>
+ <check_box label="Vestimenta do Avatar" name="AvatarCloth"/>
+ <text name="DrawDistanceMeterText1">
+ m
+ </text>
+ <text name="DrawDistanceMeterText2">
+ m
+ </text>
+ <slider label="Distancia de desenho:" label_width="146" name="DrawDistance" width="255"/>
+ <slider label="Contador máx. de partÃculas:" label_width="146" name="MaxParticleCount" width="262"/>
+ <slider label="Qualidade de Pós-processamento:" label_width="146" name="RenderPostProcess" width="223"/>
+ <text name="MeshDetailText">
+ Detalhes de Malha:
+ </text>
+ <slider label="Objetos:" name="ObjectMeshDetail"/>
+ <slider label="Primitivas Flexiveis:" name="FlexibleMeshDetail"/>
+ <slider label="Ãrvores:" name="TreeMeshDetail"/>
+ <slider label="Avatares:" name="AvatarMeshDetail"/>
+ <slider label="Terreno:" name="TerrainMeshDetail"/>
+ <slider label="Céu:" name="SkyMeshDetail"/>
+ <text name="PostProcessText">
+ Baixo
+ </text>
+ <text name="ObjectMeshDetailText">
+ Baixo
+ </text>
+ <text name="FlexibleMeshDetailText">
+ Baixo
+ </text>
+ <text name="TreeMeshDetailText">
+ Baixo
+ </text>
+ <text name="AvatarMeshDetailText">
+ Baixo
+ </text>
+ <text name="TerrainMeshDetailText">
+ Baixo
+ </text>
+ <text name="SkyMeshDetailText">
+ Baixo
+ </text>
+ <text name="LightingDetailText">
+ Detalhes de Iluminação:
+ </text>
+ <radio_group name="LightingDetailRadio">
+ <radio_item name="SunMoon">
+ Sol e Lua apenas
+ </radio_item>
+ <radio_item name="LocalLights">
+ Luzes locais nas proximidades
+ </radio_item>
+ </radio_group>
+ <text name="TerrainDetailText">
+ Detalhe do Terreno:
+ </text>
+ <radio_group left_delta="45" name="TerrainDetailRadio" width="276">
+ <radio_item name="0">
+ Baixo
+ </radio_item>
+ <radio_item name="2">
+ Alto
+ </radio_item>
+ </radio_group>
+ <button label="Configurações Recomendadas" name="Defaults"/>
+ <button label="Opções de Hardware" label_selected="Opções de Hardware" name="GraphicsHardwareButton"/>
+ <string name="resolution_format">
+ [RES_X] x [RES_Y]
+ </string>
+ <string name="aspect_ratio_text">
+ [NUM]:[DEN]
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
index 3ebf80ca68..f70e975bd4 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_covenant.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Corretagem" name="Covenant">
- <text bottom="-25" name="covenant_help_text">
- As mudanças nas informações de corretagem serão mostradas em todos os lotes da propriedade.
- </text>
- <text bottom_delta="-31" name="region_name_lbl">
- Região:
- </text>
- <text name="region_name_text">
- (desconhecido)
- </text>
- <text bottom_delta="-19" name="estate_name_lbl">
- Propriedade:
- </text>
- <text name="estate_name_text">
- (desconhecido)
- </text>
- <text name="covenent_instructions">
- Arraste e solte um notecard para alterar a corretagem desta propriedade.
- </text>
- <button label="?" name="covenant_help"/>
- <button label="Resetar" name="reset_covenant"/>
- <text bottom_delta="-19" name="estate_owner_lbl">
- Dono da propriedade:
- </text>
- <text name="estate_owner_text">
- (desconhecido)
- </text>
- <text name="resellable_clause">
- Terras compradas nesta região podem ou não, ser revendidas.
- </text>
- <text name="changeable_clause">
- Terras compradas nesta região podem ou não, ser unidas ou subdivididas.
- </text>
- <text_editor name="covenant_editor">
- Carregando...
- </text_editor>
- <text name="can_resell">
- Terras compradas na região poderão ser revendidas.
- </text>
- <text name="can_not_resell">
- Terras compradas na região não poderão ser revendidas.
- </text>
- <text name="can_change">
- O terreno comprado nesta região pode ser compartilhado ou subdividido.
- </text>
- <text name="can_not_change">
- O terreno comprado nesta região não pode ser compartilhado ou subdividido.
- </text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Corretagem" name="Covenant">
+ <text bottom="-25" name="covenant_help_text">
+ As mudanças nas informações de corretagem serão mostradas em todos os lotes da propriedade.
+ </text>
+ <text bottom_delta="-31" name="region_name_lbl">
+ Região:
+ </text>
+ <text name="region_name_text">
+ (desconhecido)
+ </text>
+ <text bottom_delta="-19" name="estate_name_lbl">
+ Propriedade:
+ </text>
+ <text name="estate_name_text">
+ (desconhecido)
+ </text>
+ <text name="covenent_instructions">
+ Arraste e solte um notecard para alterar a corretagem desta propriedade.
+ </text>
+ <button label="?" name="covenant_help"/>
+ <button label="Resetar" name="reset_covenant"/>
+ <text bottom_delta="-19" name="estate_owner_lbl">
+ Dono da propriedade:
+ </text>
+ <text name="estate_owner_text">
+ (desconhecido)
+ </text>
+ <text name="resellable_clause">
+ Terras compradas nesta região podem ou não, ser revendidas.
+ </text>
+ <text name="changeable_clause">
+ Terras compradas nesta região podem ou não, ser unidas ou subdivididas.
+ </text>
+ <text_editor name="covenant_editor">
+ Carregando...
+ </text_editor>
+ <text name="can_resell">
+ Terras compradas na região poderão ser revendidas.
+ </text>
+ <text name="can_not_resell">
+ Terras compradas na região não poderão ser revendidas.
+ </text>
+ <text name="can_change">
+ O terreno comprado nesta região pode ser compartilhado ou subdividido.
+ </text>
+ <text name="can_not_change">
+ O terreno comprado nesta região não pode ser compartilhado ou subdividido.
+ </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
index 8673f7af84..93c5d27648 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Debug" name="Debug">
- <text name="region_text_lbl">
- Região:
- </text>
- <text name="region_text">
- desconhecido
- </text>
- <check_box label="Desabilitar Scripts" name="disable_scripts_check" tool_tip="Desabilitar todos os scripts nesta região"/>
- <button label="?" name="disable_scripts_help"/>
- <check_box label="Desabilitar colisões" name="disable_collisions_check" tool_tip="Desabilitar colisões de não-avatares nessa região"/>
- <button label="?" name="disable_collisions_help"/>
- <check_box label="Desabilitar fÃsica" name="disable_physics_check" tool_tip="Desabilitar toda a fÃsÃca nesta região"/>
- <button label="?" name="disable_physics_help"/>
- <button label="Aplicar" name="apply_btn"/>
- <text name="objret_text_lbl">
- Retornar objeto
- </text>
- <text name="resident_text_lbl">
- Residente:
- </text>
- <line_editor name="target_avatar_name">
- (nenhum)
- </line_editor>
- <button label="Escolher..." name="choose_avatar_btn"/>
- <text name="options_text_lbl">
- Opções:
- </text>
- <check_box label="Retornar apenas aqueles objetos que contenham scripts" name="return_scripts" tool_tip="Retornar apenas objetos que contenham scripts."/>
- <check_box label="Retornar apenas aqueles objetos na terra de alguém" name="return_other_land" tool_tip="Retornar apenas objetos que estejam na terra pertencente a alguém"/>
- <check_box label="Retornar objetos em cada região desta propriedade" name="return_estate_wide" tool_tip="Retornar objetos em todas as regiões que constituem esta propriedade"/>
- <button label="Retornar" name="return_btn"/>
- <button label="Pegar os principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as mais potenciais colisões"/>
- <button label="?" name="top_colliders_help"/>
- <button label="Pegar Principais Scripts..." name="top_scripts_btn" tool_tip="Lista de objetos gastando mais tempo rodando scripts"/>
- <button label="?" name="top_scripts_help"/>
- <button label="Reiniciar a Região" name="restart_btn" tool_tip="Dar 2 minutos de contagem regressiva e reiniciar a região"/>
- <button label="?" name="restart_help"/>
- <button label="Atrasar o Reinicio" name="cancel_restart_btn" tool_tip="Atrasar o reinicio da região por uma hora"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Debug" name="Debug">
+ <text name="region_text_lbl">
+ Região:
+ </text>
+ <text name="region_text">
+ desconhecido
+ </text>
+ <check_box label="Desabilitar Scripts" name="disable_scripts_check" tool_tip="Desabilitar todos os scripts nesta região"/>
+ <button label="?" name="disable_scripts_help"/>
+ <check_box label="Desabilitar colisões" name="disable_collisions_check" tool_tip="Desabilitar colisões de não-avatares nessa região"/>
+ <button label="?" name="disable_collisions_help"/>
+ <check_box label="Desabilitar fÃsica" name="disable_physics_check" tool_tip="Desabilitar toda a fÃsÃca nesta região"/>
+ <button label="?" name="disable_physics_help"/>
+ <button label="Aplicar" name="apply_btn"/>
+ <text name="objret_text_lbl">
+ Retornar objeto
+ </text>
+ <text name="resident_text_lbl">
+ Residente:
+ </text>
+ <line_editor name="target_avatar_name">
+ (nenhum)
+ </line_editor>
+ <button label="Escolher..." name="choose_avatar_btn"/>
+ <text name="options_text_lbl">
+ Opções:
+ </text>
+ <check_box label="Retornar apenas aqueles objetos que contenham scripts" name="return_scripts" tool_tip="Retornar apenas objetos que contenham scripts."/>
+ <check_box label="Retornar apenas aqueles objetos na terra de alguém" name="return_other_land" tool_tip="Retornar apenas objetos que estejam na terra pertencente a alguém"/>
+ <check_box label="Retornar objetos em cada região desta propriedade" name="return_estate_wide" tool_tip="Retornar objetos em todas as regiões que constituem esta propriedade"/>
+ <button label="Retornar" name="return_btn"/>
+ <button label="Pegar os principais colidentes..." name="top_colliders_btn" tool_tip="Lista dos objetos que experimentam as mais potenciais colisões"/>
+ <button label="?" name="top_colliders_help"/>
+ <button label="Pegar Principais Scripts..." name="top_scripts_btn" tool_tip="Lista de objetos gastando mais tempo rodando scripts"/>
+ <button label="?" name="top_scripts_help"/>
+ <button label="Reiniciar a Região" name="restart_btn" tool_tip="Dar 2 minutos de contagem regressiva e reiniciar a região"/>
+ <button label="?" name="restart_help"/>
+ <button label="Atrasar o Reinicio" name="cancel_restart_btn" tool_tip="Atrasar o reinicio da região por uma hora"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index 554405b91a..c236b95ca1 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Propriedade" name="Estate">
- <text name="estate_help_text">
- Mudanças nas definições nesta guia irão afetar
-todas as regiões desta propriedade.
- </text>
- <text name="estate_text">
- Propriedade:
- </text>
- <text name="estate_name">
- (desconhecido)
- </text>
- <text name="owner_text">
- Proprietário:
- </text>
- <text name="estate_owner">
- (desconhecido)
- </text>
- <check_box label="Usar Tempo global" name="use_global_time_check"/>
- <button label="?" name="use_global_time_help"/>
- <check_box label="Sol fixo" name="fixed_sun_check"/>
- <button label="?" name="fixed_sun_help"/>
- <slider label="Fase" name="sun_hour_slider"/>
- <check_box label="Permitir acesso público" name="externally_visible_check"/>
- <button label="?" name="externally_visible_help"/>
- <text name="Only Allow">
- Acesso restrito a:
- </text>
- <check_box label="Residentes com informações de pagamento em arquivo" name="limit_payment" tool_tip="Banir residentes não identificados."/>
- <check_box label="Adultos com idade verificada" name="limit_age_verified" tool_tip="Banir residentes que não tenham confirmado a sua idade. Ver support.secondlife.com para mais informações."/>
- <check_box label="Permitir conversa de voz" name="voice_chat_check"/>
- <button label="?" name="voice_chat_help"/>
- <check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport"/>
- <button label="?" name="allow_direct_teleport_help"/>
- <text name="abuse_email_text">
- Endereço de email de Abuso:
- </text>
- <string name="email_unsupported">
- Funcionalidade não suportada
- </string>
- <button label="?" name="abuse_email_address_help"/>
- <button label="Aplicar" name="apply_btn"/>
- <button label="Chutar usuário da propriedade..." name="kick_user_from_estate_btn"/>
- <button label="Enviar mensagem à Propriedade" name="message_estate_btn"/>
- <text name="estate_manager_label">
- Gerentes da propriedade:
- </text>
- <button label="?" name="estate_manager_help"/>
- <button label="Remover..." name="remove_estate_manager_btn"/>
- <button label="Adicionar..." name="add_estate_manager_btn"/>
- <text name="allow_resident_label">
- Residentes permitidos:
- </text>
- <button label="?" name="allow_resident_help"/>
- <button label="Remover..." name="remove_allowed_avatar_btn"/>
- <button label="Adicionar..." name="add_allowed_avatar_btn"/>
- <text name="allow_group_label">
- Grupos permitidos:
- </text>
- <button label="?" name="allow_group_help"/>
- <button label="Remover..." name="remove_allowed_group_btn"/>
- <button label="Adicionar..." name="add_allowed_group_btn"/>
- <text name="ban_resident_label">
- Residentes banidos:
- </text>
- <button label="?" name="ban_resident_help"/>
- <button label="Remover..." name="remove_banned_avatar_btn"/>
- <button label="Adicionar..." name="add_banned_avatar_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Propriedade" name="Estate">
+ <text name="estate_help_text">
+ Mudanças nas definições nesta guia irão afetar
+todas as regiões desta propriedade.
+ </text>
+ <text name="estate_text">
+ Propriedade:
+ </text>
+ <text name="estate_name">
+ (desconhecido)
+ </text>
+ <text name="owner_text">
+ Proprietário:
+ </text>
+ <text name="estate_owner">
+ (desconhecido)
+ </text>
+ <check_box label="Usar Tempo global" name="use_global_time_check"/>
+ <button label="?" name="use_global_time_help"/>
+ <check_box label="Sol fixo" name="fixed_sun_check"/>
+ <button label="?" name="fixed_sun_help"/>
+ <slider label="Fase" name="sun_hour_slider"/>
+ <check_box label="Permitir acesso público" name="externally_visible_check"/>
+ <button label="?" name="externally_visible_help"/>
+ <text name="Only Allow">
+ Acesso restrito a:
+ </text>
+ <check_box label="Residentes com informações de pagamento em arquivo" name="limit_payment" tool_tip="Banir residentes não identificados."/>
+ <check_box label="Adultos com idade verificada" name="limit_age_verified" tool_tip="Banir residentes que não tenham confirmado a sua idade. Ver support.secondlife.com para mais informações."/>
+ <check_box label="Permitir conversa de voz" name="voice_chat_check"/>
+ <button label="?" name="voice_chat_help"/>
+ <check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport"/>
+ <button label="?" name="allow_direct_teleport_help"/>
+ <text name="abuse_email_text">
+ Endereço de email de Abuso:
+ </text>
+ <string name="email_unsupported">
+ Funcionalidade não suportada
+ </string>
+ <button label="?" name="abuse_email_address_help"/>
+ <button label="Aplicar" name="apply_btn"/>
+ <button label="Chutar usuário da propriedade..." name="kick_user_from_estate_btn"/>
+ <button label="Enviar mensagem à Propriedade" name="message_estate_btn"/>
+ <text name="estate_manager_label">
+ Gerentes da propriedade:
+ </text>
+ <button label="?" name="estate_manager_help"/>
+ <button label="Remover..." name="remove_estate_manager_btn"/>
+ <button label="Adicionar..." name="add_estate_manager_btn"/>
+ <text name="allow_resident_label">
+ Residentes permitidos:
+ </text>
+ <button label="?" name="allow_resident_help"/>
+ <button label="Remover..." name="remove_allowed_avatar_btn"/>
+ <button label="Adicionar..." name="add_allowed_avatar_btn"/>
+ <text name="allow_group_label">
+ Grupos permitidos:
+ </text>
+ <button label="?" name="allow_group_help"/>
+ <button label="Remover..." name="remove_allowed_group_btn"/>
+ <button label="Adicionar..." name="add_allowed_group_btn"/>
+ <text name="ban_resident_label">
+ Residentes banidos:
+ </text>
+ <button label="?" name="ban_resident_help"/>
+ <button label="Remover..." name="remove_banned_avatar_btn"/>
+ <button label="Adicionar..." name="add_banned_avatar_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_general.xml b/indra/newview/skins/default/xui/pt/panel_region_general.xml
index c971f82827..c04a5f001e 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_general.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Região" name="General">
- <text name="region_text_lbl">
- Região:
- </text>
- <text name="region_text">
- desconhecido
- </text>
- <text name="version_channel_text_lbl">
- Versão:
- </text>
- <text name="version_channel_text">
- desconhecido
- </text>
- <check_box label="Bloquear Terraform" name="block_terraform_check"/>
- <button label="?" name="terraform_help"/>
- <check_box label="Bloquear Vôo" name="block_fly_check"/>
- <button label="?" name="fly_help"/>
- <check_box label="Permitir Dano" name="allow_damage_check"/>
- <button label="?" name="damage_help"/>
- <check_box label="Restringir Empurrar" name="restrict_pushobject"/>
- <button label="?" name="restrict_pushobject_help"/>
- <check_box label="Permitir Revenda de Terra" name="allow_land_resell_check"/>
- <button label="?" name="land_resell_help"/>
- <check_box label="Permitir Unir/Dividir Terra" name="allow_parcel_changes_check"/>
- <button label="?" name="parcel_changes_help"/>
- <check_box label="Bloquear Mostrar Terra na Busca" name="block_parcel_search_check" tool_tip="Permitir que as pessoas vejam esta região e seus lotes nos resultados de busca"/>
- <button label="?" name="parcel_search_help"/>
- <spinner label="Limit do Agente" name="agent_limit_spin"/>
- <button label="?" name="agent_limit_help"/>
- <spinner label="Objeto Bonus" name="object_bonus_spin"/>
- <button label="?" name="object_bonus_help"/>
- <text label="Maturidade" name="access_text">
- Maturidade:
- </text>
-
-
- <button label="?" name="access_help"/>
- <button label="Aplicar" name="apply_btn"/>
- <button label="Teletransportar um usuário para Casa..." name="kick_btn"/>
- <button label="Teletransportar Todos os Usuários..." name="kick_all_btn"/>
- <button label="Enviar Mensagem para a Região..." name="im_btn"/>
- <button label="Gerenciar Telehub..." name="manage_telehub_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Região" name="General">
+ <text name="region_text_lbl">
+ Região:
+ </text>
+ <text name="region_text">
+ desconhecido
+ </text>
+ <text name="version_channel_text_lbl">
+ Versão:
+ </text>
+ <text name="version_channel_text">
+ desconhecido
+ </text>
+ <check_box label="Bloquear Terraform" name="block_terraform_check"/>
+ <button label="?" name="terraform_help"/>
+ <check_box label="Bloquear Vôo" name="block_fly_check"/>
+ <button label="?" name="fly_help"/>
+ <check_box label="Permitir Dano" name="allow_damage_check"/>
+ <button label="?" name="damage_help"/>
+ <check_box label="Restringir Empurrar" name="restrict_pushobject"/>
+ <button label="?" name="restrict_pushobject_help"/>
+ <check_box label="Permitir Revenda de Terra" name="allow_land_resell_check"/>
+ <button label="?" name="land_resell_help"/>
+ <check_box label="Permitir Unir/Dividir Terra" name="allow_parcel_changes_check"/>
+ <button label="?" name="parcel_changes_help"/>
+ <check_box label="Bloquear Mostrar Terra na Busca" name="block_parcel_search_check" tool_tip="Permitir que as pessoas vejam esta região e seus lotes nos resultados de busca"/>
+ <button label="?" name="parcel_search_help"/>
+ <spinner label="Limit do Agente" name="agent_limit_spin"/>
+ <button label="?" name="agent_limit_help"/>
+ <spinner label="Objeto Bonus" name="object_bonus_spin"/>
+ <button label="?" name="object_bonus_help"/>
+ <text label="Maturidade" name="access_text">
+ Maturidade:
+ </text>
+
+
+ <button label="?" name="access_help"/>
+ <button label="Aplicar" name="apply_btn"/>
+ <button label="Teletransportar um usuário para Casa..." name="kick_btn"/>
+ <button label="Teletransportar Todos os Usuários..." name="kick_all_btn"/>
+ <button label="Enviar Mensagem para a Região..." name="im_btn"/>
+ <button label="Gerenciar Telehub..." name="manage_telehub_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
index ecdd808c4e..9b8fc48fb9 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_terrain.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Terreno" name="Terrain">
- <text name="region_text_lbl">
- Região:
- </text>
- <text name="region_text">
- nenhum
- </text>
- <spinner label="Altura da água" name="water_height_spin"/>
- <button label="?" name="water_height_help"/>
- <spinner label="Limite do aumento do terreno" name="terrain_raise_spin"/>
- <button label="?" name="terrain_raise_help"/>
- <spinner label="Limite mais baixo do terreno" name="terrain_lower_spin"/>
- <button label="?" name="terrain_lower_help"/>
- <check_box label="Usar o sol da propriedade" name="use_estate_sun_check"/>
- <button label="?" name="use_estate_sun_help"/>
- <check_box label="Sol fixo" name="fixed_sun_check"/>
- <button label="?" name="fixed_sun_help"/>
- <slider label="Fase" name="sun_hour_slider"/>
- <button label="Aplicar" name="apply_btn"/>
- <button label="Download de terreno RAW ..." name="download_raw_btn" tool_tip="Não disponÃvel aos gerentes, somente aos proprietários."/>
- <button label="?" name="download_raw_help"/>
- <button label="Upload de terreno RAW..." name="upload_raw_btn" tool_tip="Não disponÃvel aos gerentes, somente aos proprietários."/>
- <button label="?" name="upload_raw_help"/>
- <button label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo"/>
- <button label="?" name="bake_terrain_help"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terreno" name="Terrain">
+ <text name="region_text_lbl">
+ Região:
+ </text>
+ <text name="region_text">
+ nenhum
+ </text>
+ <spinner label="Altura da água" name="water_height_spin"/>
+ <button label="?" name="water_height_help"/>
+ <spinner label="Limite do aumento do terreno" name="terrain_raise_spin"/>
+ <button label="?" name="terrain_raise_help"/>
+ <spinner label="Limite mais baixo do terreno" name="terrain_lower_spin"/>
+ <button label="?" name="terrain_lower_help"/>
+ <check_box label="Usar o sol da propriedade" name="use_estate_sun_check"/>
+ <button label="?" name="use_estate_sun_help"/>
+ <check_box label="Sol fixo" name="fixed_sun_check"/>
+ <button label="?" name="fixed_sun_help"/>
+ <slider label="Fase" name="sun_hour_slider"/>
+ <button label="Aplicar" name="apply_btn"/>
+ <button label="Download de terreno RAW ..." name="download_raw_btn" tool_tip="Não disponÃvel aos gerentes, somente aos proprietários."/>
+ <button label="?" name="download_raw_help"/>
+ <button label="Upload de terreno RAW..." name="upload_raw_btn" tool_tip="Não disponÃvel aos gerentes, somente aos proprietários."/>
+ <button label="?" name="upload_raw_help"/>
+ <button label="Nivelar o terreno" name="bake_terrain_btn" tool_tip="Ajustar terreno atual como o ponto médio para os limites de aumento/decréscimo"/>
+ <button label="?" name="bake_terrain_help"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_texture.xml b/indra/newview/skins/default/xui/pt/panel_region_texture.xml
index 29de27d54c..8d7bdfe97b 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_texture.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Texturas de Chão" name="Textures">
- <text name="region_text_lbl">
- Região:
- </text>
- <text name="region_text">
- desconhecido
- </text>
- <text name="detail_texture_text">
- Texturas de Terreno (requer 512x512, arquivos 24 bit .tga )
- </text>
- <text name="height_text_lbl">
- 1 (baixo)
- </text>
- <text name="height_text_lbl2">
- 2
- </text>
- <text name="height_text_lbl3">
- 3
- </text>
- <text name="height_text_lbl4">
- 4 (alto)
- </text>
- <text name="height_text_lbl5">
- Escalas de Elevação de Terreno
- </text>
- <text name="height_text_lbl6">
- Sudeste
- </text>
- <text name="height_text_lbl7">
- Noroeste
- </text>
- <text name="height_text_lbl8">
- Sudoeste
- </text>
- <text name="height_text_lbl9">
- Noroeste
- </text>
- <spinner label="Baixo" name="height_start_spin_0" />
- <spinner label="Baixo" name="height_start_spin_1" />
- <spinner label="Baixo" name="height_start_spin_2" />
- <spinner label="Baixo" name="height_start_spin_3" />
- <spinner label="Alto" name="height_range_spin_0" />
- <spinner label="Alto" name="height_range_spin_1" />
- <spinner label="Alto" name="height_range_spin_2" />
- <spinner label="Alto" name="height_range_spin_3" />
- <text name="height_text_lbl10">
- Estes valores respresentam o tipo de escala para as texturas acima.
- </text>
- <text name="height_text_lbl11">
- Medido em metros, o valor Baixo é a altura máxima da Textura #1,
- </text>
- <text name="height_text_lbl12">
- e o valor Alto é a altura MÃnima da Textura #4.
- </text>
- <button label="Aplicar" name="apply_btn" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Texturas de Chão" name="Textures">
+ <text name="region_text_lbl">
+ Região:
+ </text>
+ <text name="region_text">
+ desconhecido
+ </text>
+ <text name="detail_texture_text">
+ Texturas de Terreno (requer 512x512, arquivos 24 bit .tga )
+ </text>
+ <text name="height_text_lbl">
+ 1 (baixo)
+ </text>
+ <text name="height_text_lbl2">
+ 2
+ </text>
+ <text name="height_text_lbl3">
+ 3
+ </text>
+ <text name="height_text_lbl4">
+ 4 (alto)
+ </text>
+ <text name="height_text_lbl5">
+ Escalas de Elevação de Terreno
+ </text>
+ <text name="height_text_lbl6">
+ Sudeste
+ </text>
+ <text name="height_text_lbl7">
+ Noroeste
+ </text>
+ <text name="height_text_lbl8">
+ Sudoeste
+ </text>
+ <text name="height_text_lbl9">
+ Noroeste
+ </text>
+ <spinner label="Baixo" name="height_start_spin_0" />
+ <spinner label="Baixo" name="height_start_spin_1" />
+ <spinner label="Baixo" name="height_start_spin_2" />
+ <spinner label="Baixo" name="height_start_spin_3" />
+ <spinner label="Alto" name="height_range_spin_0" />
+ <spinner label="Alto" name="height_range_spin_1" />
+ <spinner label="Alto" name="height_range_spin_2" />
+ <spinner label="Alto" name="height_range_spin_3" />
+ <text name="height_text_lbl10">
+ Estes valores respresentam o tipo de escala para as texturas acima.
+ </text>
+ <text name="height_text_lbl11">
+ Medido em metros, o valor Baixo é a altura máxima da Textura #1,
+ </text>
+ <text name="height_text_lbl12">
+ e o valor Alto é a altura MÃnima da Textura #4.
+ </text>
+ <button label="Aplicar" name="apply_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml b/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
index 7029dd202b..d5b67884c9 100644
--- a/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/pt/panel_scrolling_param.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="LLScrollingPanelParam">
- <text length="1" name="Loading..." type="string">
- Carregando...
- </text>
- <text length="1" name="Loading...2" type="string">
- Carregando...
- </text>
- <slider label="[DESC]" name="param slider"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="LLScrollingPanelParam">
+ <text length="1" name="Loading..." type="string">
+ Carregando...
+ </text>
+ <text length="1" name="Loading...2" type="string">
+ Carregando...
+ </text>
+ <slider label="[DESC]" name="param slider"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_status_bar.xml b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
index 1b88913a4e..2a5108b4cb 100644
--- a/indra/newview/skins/default/xui/pt/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/pt/panel_status_bar.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="status">
- <text length="1" name="ParcelNameText" tool_tip="Nome do pedaço de terra em que você está. Clique Sobre a Terra para informações." type="string">
- Nome do pedaço de terra vai aqui
- </text>
- <text length="1" name="BalanceText" tool_tip="Saldo" type="string">
- Carregando...
- </text>
- <button label="" label_selected="" name="buycurrency" tool_tip="Comprar dinheiro"/>
- <text length="12" name="TimeText" tool_tip="Hora atual (do PacÃfico)" type="string">
- 12:00 AM
- </text>
- <string name="StatBarDaysOfWeek">
- Domingo:Segunda-feira:Terça-feira:Quarta-feira:Quinta-feira:Sexta-feira:Sábado
- </string>
- <string name="StatBarMonthsOfYear">
- Janeiro:Fevereiro:Março:Abril:Maio:Junho:Julho:Agosto:Setembro:Outubro:Novembro:Dezembro
- </string>
- <button label="" label_selected="" name="scriptout" tool_tip="Erros e avisos do Script"/>
- <button label="" label_selected="" name="health" tool_tip="Saúde"/>
- <text length="1" name="HealthText" tool_tip="Saúde" type="string">
- 100%
- </text>
- <button label="" label_selected="" name="no_fly" tool_tip="Não é permitido Voar"/>
- <button label="" label_selected="" name="no_build" tool_tip="Construir/Rezzar não permitido"/>
- <button label="" label_selected="" name="no_scripts" tool_tip="Scripts não permitidos"/>
- <button label="" label_selected="" name="restrictpush" tool_tip="Não Empurrar"/>
- <button label="" label_selected="" name="status_no_voice" tool_tip="Voz não disponÃvel aqui"/>
- <button label="" label_selected="" name="buyland" tool_tip="Comprar este lote"/>
- <line_editor label="Buscar" name="search_editor" tool_tip="Buscar no Second Life"/>
- <button label="" label_selected="" name="search_btn" tool_tip="Buscar no Second Life"/>
- <string name="packet_loss_tooltip">
- Perda de pacote
- </string>
- <string name="bandwidth_tooltip">
- Banda
- </string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="status">
+ <text length="1" name="ParcelNameText" tool_tip="Nome do pedaço de terra em que você está. Clique Sobre a Terra para informações." type="string">
+ Nome do pedaço de terra vai aqui
+ </text>
+ <text length="1" name="BalanceText" tool_tip="Saldo" type="string">
+ Carregando...
+ </text>
+ <button label="" label_selected="" name="buycurrency" tool_tip="Comprar dinheiro"/>
+ <text length="12" name="TimeText" tool_tip="Hora atual (do PacÃfico)" type="string">
+ 12:00 AM
+ </text>
+ <string name="StatBarDaysOfWeek">
+ Domingo:Segunda-feira:Terça-feira:Quarta-feira:Quinta-feira:Sexta-feira:Sábado
+ </string>
+ <string name="StatBarMonthsOfYear">
+ Janeiro:Fevereiro:Março:Abril:Maio:Junho:Julho:Agosto:Setembro:Outubro:Novembro:Dezembro
+ </string>
+ <button label="" label_selected="" name="scriptout" tool_tip="Erros e avisos do Script"/>
+ <button label="" label_selected="" name="health" tool_tip="Saúde"/>
+ <text length="1" name="HealthText" tool_tip="Saúde" type="string">
+ 100%
+ </text>
+ <button label="" label_selected="" name="no_fly" tool_tip="Não é permitido Voar"/>
+ <button label="" label_selected="" name="no_build" tool_tip="Construir/Rezzar não permitido"/>
+ <button label="" label_selected="" name="no_scripts" tool_tip="Scripts não permitidos"/>
+ <button label="" label_selected="" name="restrictpush" tool_tip="Não Empurrar"/>
+ <button label="" label_selected="" name="status_no_voice" tool_tip="Voz não disponÃvel aqui"/>
+ <button label="" label_selected="" name="buyland" tool_tip="Comprar este lote"/>
+ <line_editor label="Buscar" name="search_editor" tool_tip="Buscar no Second Life"/>
+ <button label="" label_selected="" name="search_btn" tool_tip="Buscar no Second Life"/>
+ <string name="packet_loss_tooltip">
+ Perda de pacote
+ </string>
+ <string name="bandwidth_tooltip">
+ Banda
+ </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml
index 91ca2a4091..8d192d4002 100644
--- a/indra/newview/skins/default/xui/pt/role_actions.xml
+++ b/indra/newview/skins/default/xui/pt/role_actions.xml
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<role_actions>
- <action_set
- description="Esta habilidades incluem poderes de adicionar ou remover membros do grupo e permitir que novos membros se juntem sem um convite."
- name="Membership">
- <action description="Convidar pessoas para este grupo"
- longdescription="Convide pessoas para este grupo usando o botão 'Convidar nova pessoa...' em Membros & aba Funções > sub-aba Membros."
- name="member invite" />
- <action description="Expulsar membros deste grupo"
- longdescription="Expulse membros deste grupo usando o botão 'Expulsar do grupo' em Membros & aba Funções > sub-aba Membros. Um proprietário pode expulsar qualquer um, exceto outro proprietário. Se você não é um proprietário, um membro pode expulsá-lo do grupo se, e somente se, ele apenas tiver a função de todos e não outras funções. Para remover membros de funções, você precisa ter a habilidade 'Remover membros de funções'."
- name="member eject" />
- <action
- description="Ativar/desativar 'Abrir registro' e mudar 'Taxa de assinatura'"
- longdescription="Ative/desative 'Abrir registro' para permitir que novos membros se unam sem um convite, e mude a 'Taxa de registro' na seção Preferência de grupo da aba Geral."
- name="member options" />
- </action_set>
- <action_set
- description="Estas habilidades incluem poderes de adicionar, remover e mudar funções do grupo; adicionar e remover membros em funções e designar habilidades a funções."
- name="Roles">
- <action description="Criar novas funções"
- longdescription="Crie novas funções em Membros & aba Funções > sub-aba Funções."
- name="role create" />
- <action description="Apagar funções"
- longdescription="Apague funções em Membros & aba Funções > sub-aba Funções."
- name="role delete" />
- <action description="Mudar nomes de função, tÃtulos e descrições"
- longdescription="Mude o nome de funções, tÃtulos e descrições na parte inferior de Membros & aba Funções > sub-aba Funções após selecionar uma função."
- name="role properties" />
- <action description="Designar membros para a função do designador"
- longdescription="Designe membros a funções na seção de funções designadas de Membros & aba Funções > sub-aba Membros. Um membro com este poder pode somente adicionar membros para a função que o designador já possui."
- name="role assign member limited" />
- <action description="Designar membros para qualquer função"
- longdescription="Designe membros a qualquer função na seção de funções designadas de Membros & aba Funções > sub-aba Membros. *AVISO* Quaisquer membros em uma função com esta habilidade podem designar a si próprios--e quaisquer outros membros não proprietários--para funções que têm mais poderes do que as atuais, elevando-os a poderes próximos ao do proprietário. Certifique-se de saber o que está fazendo antes de designar esta habilidade."
- name="role assign member" />
- <action description="Remover membros das funções"
- longdescription="Remova membros de funções na seção de funções designadas de Membros & aba Funções > sub-aba Membros. Proprietários não podem ser removidos."
- name="role remove member" />
- <action description="Determinar e remover habilidades em funções"
- longdescription="Designe e remova habilidades em funções na seção habilidades pertmitidas de Membros & aba Funções > sub-aba Funções. *AVISO* Quaisquer membros em uma função com esta habilidade podem desginar a si próprios--e quaisquer outros membros não proprietários--todas as habilidades, elevando-os a poderes próximos ao do proprietário. Certifique-se de saber o que está fazendo antes de designar esta habilidade."
- name="role change actions" />
- </action_set>
- <action_set
- description="Estas habilidade incluem poderes para modificar esta identidade de grupo, como mudar a visibilidade pública, apresentação e insÃgnia."
- name="Group Identity">
- <action
- description="Mudar apresentação, insÃgnia, 'Publicar na web', e quais membros estão publicamente visÃveis em Informações do Grupo."
- longdescription="Mude a apresentação, insÃgnia, 'Publicar na web' e quais membros estão publicamente visÃveis em Informações do grupo. É feito na aba Geral."
- name="group change identity" />
- </action_set>
- <action_set
- description="Estas habilidades incluem poderes para transferir, modificar e vender terrenos do grupo. Vá pra a janela Sobre o terreno, clique com o botão direito no terreno e selecione 'Sobre o terreno...' ou clique na informação da parcela na barra do menu."
- name="Parcel Management">
- <action description="Transferir e comprar terreno para o grupo"
- longdescription="Transfere e compre terreno para o grupo. É feito em Sobre o terreno > aba Geral."
- name="land deed" />
- <action description="Abandonar terreno para Governador Linden"
- longdescription="Abandone terreno para Governador Linden. *AVISO* Qualquer membro em uma função com esta habilidade pode abandonar o terreno pertencente ao grupo em Sobre o terreno > aba Geral, revertendo à posse Linden sem uma venda! Certifique-se de saber o que está fazendo antes de designar esta habilidade."
- name="land release" />
- <action description="Definir terreno para informação de venda"
- longdescription="Defina informações de venda para terreno. *AVISO* Qualquer membro em uma função com esta habilidade pode vender terrenos pertencentes ao grupo em Sobre o terreno > aba Geral como quiser! Certifique-se de sabe o que está fazendo antes de designar esta habilidade."
- name="land set sale info" />
- <action description="Subdividir e unir parcelas"
- longdescription="Subdivide and join parcels. This is done by right-clicking the ground, 'Edit Terrain', and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click 'Subdivide...'. To join, select two or more contiguous parcels and click 'Join...'. "
- name="land divide join" />
- </action_set>
- <action_set
- description="Estas habilidades incluem poderes para mudar o nome da parcelas e configurações de publicação, visibilidade da busca de diretório e ponto de aterrissagem & opções de rota de TP."
- name="Parcel Identity">
- <action
- description="Ativar/desativar 'Exibir em locais de encontro' e definir categoria"
- longdescription="Ativar/desativar 'Exibir em locais de encontro' e configurar uma categoria de parcela em Sobre o terreno > aba Opções."
- name="land find places" />
- <action
- description="Mudar nome da parcela, descrição, e configurações 'Publicar na web'"
- longdescription="Mude o nome da parcela, descrição e configurações de 'Publicar na web'. É feito em Sobre o terreno > aba Opções."
- name="land change identity" />
- <action description="Definir ponto de aterrissagem e rota de teletransporte"
- longdescription="Em uma parcela pertencente ao grupo, membros em uma função com esta habilidade podem definir um ponto de aterrissagem para especificar onde os teletransportes chegam e também definir a rota do teletransporte para um maior controle. É feito em Sobre o terreno > aba Opções."
- name="land set landing point" />
- </action_set>
- <action_set
- description="Estas habilidade incluem poderes que afetam opções de parcela, como 'Criar objetos', 'Editar terreno' e música & configurações de mÃdia."
- name="Parcel Settings">
- <action description="Mudar música & configurações de mÃdia"
- longdescription="Mude streaming de música e configurações de vÃdeo em Sobre o terreno > aba MÃdia."
- name="land change media" />
- <action description="Ativar/desativar 'Editar terreno'"
- longdescription="Ative/desative 'Editar terreno'. *AVISO* Sobre o terreno > aba Opções > Editar terreno permite a qualquer um alterar as formas de seu terreno, substituir e mover plantas Linden. Certifique-se de saber o que está fazendo antes de desginar esta habilidade. A edição de terreno é ativada/desativada em Sobre o terreno > aba Opções."
- name="land edit" />
- <action
- description="Ativar/desativar variados Sobre o Terreno > Opções de configuração"
- longdescription="Ative/desative 'Seguro (sem dano)', 'Voar', e permita a outros residentes: 'Criar objetos', 'Editar terreno', 'Criar pontos de referência', e 'Executar scripts' em um terreno pertencente ao grupo em Sobre o terreno > aba Opções."
- name="land options" />
- </action_set>
- <action_set
- description="Estas habilidades incluem poderes que permitem a membros ultrapassar restrições em parcelas pertencentes ao grupo."
- name="Parcel Powers">
- <action description="Sempre permitir 'Editar terreno'"
- longdescription="Membros em uma função com esta habilidade podem editar terreno em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções."
- name="land allow edit land" />
- <action description="Sempre permitir 'Voar'"
- longdescription="Membros em uma função com esta habilidade podem voar sobre uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções."
- name="land allow fly" />
- <action description="Sempre permitir 'Criar objetos'"
- longdescription="Membros em uma função com esta habilidade podem criar objetos em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções."
- name="land allow create" />
- <action description="Sempre permitir 'Criar ponto de referência'"
- longdescription="Membros em uma função com esta habilidade podem colocar um ponto de referência uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções."
- name="land allow landmark" />
- <action description="Permitir 'Colocar casa aqui' no terreno do grupo"
- longdescription="Membros em uma função com esta habilidade podem usar o menu Mundo > Definir lar aqui em uma parcela do grupo (definir terreno ou transferir para este grupo)."
- name="land allow set home" />
- </action_set>
- <action_set
- description="Estas habilidades incluem poderes de permitir ou restringir acesso a parcelas pertencentes ao grupo, incluindo congelar e expulsar residentes."
- name="Parcel Access">
- <action description="Gerenciar listas de acesso à parcela"
- longdescription="Gerencie a lista de acesso à parcela em Sobre o terreno > aba Acesso."
- name="land manage allowed" />
- <action description="Gerenciar lista de banidos da parcela"
- longdescription="Gerencie a lista de banidos da parcela em Sobre o terreno > aba Banido."
- name="land manage banned" />
- <action description="Mudar configurações de parcela 'Vender passes...'"
- longdescription="Mude configurações de 'Vender passes...' em Sobre o terreno > aba Acesso."
- name="land manage passes" />
- <action description="Expulsar e congelar residentes nas parcelas"
- longdescription="Membros em uma função com esta habilidade podem lidar com um residente indesejado em uma parcela pertencente ao grupo clicando com o botão direitos sobre ele, Mais > e selecionado 'Expulsar...' ou 'Congelar...'."
- name="land admin" />
- </action_set>
- <action_set
- description="Estas habilidades incluem poderes de permitir a membros retornar objetos e colocar e mover plantas Linden. Útil para que membros organizem a paisagem, porém deve ser usado com cuidado, devido a não ser possÃvel desfazer a mudança dos objetos."
- name="Parcel Content">
- <action description="Retornar objetos que pertencem ao grupo"
- longdescription="Retorne objetos em parcelas pertencentes ao grupo que pertencem ao grupo em Sobre o terreno > aba Objetos."
- name="land return group owned" />
- <action description="Retornar objetos definidos para o grupo"
- longdescription="Retorne objetos em parcelas pertencentes ao grupo que em Sobre o terrreno > aba Objetos."
- name="land return group set" />
- <action description="Retornar objetos que não pertencem ao grupo"
- longdescription="Retorne objetos nas parcelas pertencentes a um grupo que estão sem grupo em em Sobre o terreno > aba Objetos."
- name="land return non group" />
- <action description="Ajardinar usando plantas Linden"
- longdescription="A habilidade de ajardinar permite colocar e mover árvores Linden, plantas e gramas. Estes itens podem ser encontrando na Biblioteca de seu inventário > pasta Objetos ou podem ser criados através do botão Construir."
- name="land gardening" />
- </action_set>
- <action_set
- description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools > General Tab. Right-click an object and Edit to see its settings. "
- name="Object Management">
- <action description="Transferir objetos para o grupo"
- longdescription="Transfere objetos para o grupo em Editar ferramentas > aba Geral."
- name="object deed" />
- <action description="Manipular (mover, copiar, modificar) objetos do grupo"
- longdescription="Manipule (mover,copiar, modificar) objetos pertencentes ao grupo em Editar Ferramentas > aba Geral."
- name="object manipulate" />
- <action description="Definir objetos pertencentes ao grupo para venda"
- longdescription="Defina objetos pertencentes ao grupo para venda em Editar Ferramentas > aba Geral."
- name="object set sale" />
- </action_set>
- <action_set
- description="Estas habilidades incluem poderes que requerem que membros paguem dÃvidas e recebam dividendos do grupo, e restringem acesso ao histórico de conta do grupo."
- name="Accounting">
- <action description="Pagar débitos e receber dividendos do grupo"
- longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
- name="accounting accountable" />
- </action_set>
- <action_set
- description="Estas habilidade incluem poderes de permitir enviar, receber e ver avisos de grupo."
- name="Notices">
- <action description="Enviar aviso"
- longdescription="Membros em uma função com esta habiliade podem enviar avisos em Informações de grupo > aba Avisos."
- name="notices send" />
- <action description="Receber novos avisos e ver os anteriores"
- longdescription="Membros em uma função com esta habilidade podem receber os novos avisos e ver os anteriores em Informações de grupo > aba Avisos."
- name="notices receive" />
- </action_set>
- <action_set
- description="Estas habilidades incluem poderes de permitir a membros definir e votar em propostas e ver histórico de votação."
- name="Proposals">
- <action description="Criar proposta"
- longdescription="Membros em uma função com esta habilidade podem criar proposta para serem votadas em Informações de grupo > aba Propostas."
- name="proposal start" />
- <action description="Votar em propostas"
- longdescription="Membros em uma função com esta habilidade podem votar em propostas em Informações de grupo > aba Propostas."
- name="proposal vote" />
- </action_set>
-</role_actions>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<role_actions>
+ <action_set
+ description="Esta habilidades incluem poderes de adicionar ou remover membros do grupo e permitir que novos membros se juntem sem um convite."
+ name="Membership">
+ <action description="Convidar pessoas para este grupo"
+ longdescription="Convide pessoas para este grupo usando o botão 'Convidar nova pessoa...' em Membros & aba Funções > sub-aba Membros."
+ name="member invite" />
+ <action description="Expulsar membros deste grupo"
+ longdescription="Expulse membros deste grupo usando o botão 'Expulsar do grupo' em Membros & aba Funções > sub-aba Membros. Um proprietário pode expulsar qualquer um, exceto outro proprietário. Se você não é um proprietário, um membro pode expulsá-lo do grupo se, e somente se, ele apenas tiver a função de todos e não outras funções. Para remover membros de funções, você precisa ter a habilidade 'Remover membros de funções'."
+ name="member eject" />
+ <action
+ description="Ativar/desativar 'Abrir registro' e mudar 'Taxa de assinatura'"
+ longdescription="Ative/desative 'Abrir registro' para permitir que novos membros se unam sem um convite, e mude a 'Taxa de registro' na seção Preferência de grupo da aba Geral."
+ name="member options" />
+ </action_set>
+ <action_set
+ description="Estas habilidades incluem poderes de adicionar, remover e mudar funções do grupo; adicionar e remover membros em funções e designar habilidades a funções."
+ name="Roles">
+ <action description="Criar novas funções"
+ longdescription="Crie novas funções em Membros & aba Funções > sub-aba Funções."
+ name="role create" />
+ <action description="Apagar funções"
+ longdescription="Apague funções em Membros & aba Funções > sub-aba Funções."
+ name="role delete" />
+ <action description="Mudar nomes de função, tÃtulos e descrições"
+ longdescription="Mude o nome de funções, tÃtulos e descrições na parte inferior de Membros & aba Funções > sub-aba Funções após selecionar uma função."
+ name="role properties" />
+ <action description="Designar membros para a função do designador"
+ longdescription="Designe membros a funções na seção de funções designadas de Membros & aba Funções > sub-aba Membros. Um membro com este poder pode somente adicionar membros para a função que o designador já possui."
+ name="role assign member limited" />
+ <action description="Designar membros para qualquer função"
+ longdescription="Designe membros a qualquer função na seção de funções designadas de Membros & aba Funções > sub-aba Membros. *AVISO* Quaisquer membros em uma função com esta habilidade podem designar a si próprios--e quaisquer outros membros não proprietários--para funções que têm mais poderes do que as atuais, elevando-os a poderes próximos ao do proprietário. Certifique-se de saber o que está fazendo antes de designar esta habilidade."
+ name="role assign member" />
+ <action description="Remover membros das funções"
+ longdescription="Remova membros de funções na seção de funções designadas de Membros & aba Funções > sub-aba Membros. Proprietários não podem ser removidos."
+ name="role remove member" />
+ <action description="Determinar e remover habilidades em funções"
+ longdescription="Designe e remova habilidades em funções na seção habilidades pertmitidas de Membros & aba Funções > sub-aba Funções. *AVISO* Quaisquer membros em uma função com esta habilidade podem desginar a si próprios--e quaisquer outros membros não proprietários--todas as habilidades, elevando-os a poderes próximos ao do proprietário. Certifique-se de saber o que está fazendo antes de designar esta habilidade."
+ name="role change actions" />
+ </action_set>
+ <action_set
+ description="Estas habilidade incluem poderes para modificar esta identidade de grupo, como mudar a visibilidade pública, apresentação e insÃgnia."
+ name="Group Identity">
+ <action
+ description="Mudar apresentação, insÃgnia, 'Publicar na web', e quais membros estão publicamente visÃveis em Informações do Grupo."
+ longdescription="Mude a apresentação, insÃgnia, 'Publicar na web' e quais membros estão publicamente visÃveis em Informações do grupo. É feito na aba Geral."
+ name="group change identity" />
+ </action_set>
+ <action_set
+ description="Estas habilidades incluem poderes para transferir, modificar e vender terrenos do grupo. Vá pra a janela Sobre o terreno, clique com o botão direito no terreno e selecione 'Sobre o terreno...' ou clique na informação da parcela na barra do menu."
+ name="Parcel Management">
+ <action description="Transferir e comprar terreno para o grupo"
+ longdescription="Transfere e compre terreno para o grupo. É feito em Sobre o terreno > aba Geral."
+ name="land deed" />
+ <action description="Abandonar terreno para Governador Linden"
+ longdescription="Abandone terreno para Governador Linden. *AVISO* Qualquer membro em uma função com esta habilidade pode abandonar o terreno pertencente ao grupo em Sobre o terreno > aba Geral, revertendo à posse Linden sem uma venda! Certifique-se de saber o que está fazendo antes de designar esta habilidade."
+ name="land release" />
+ <action description="Definir terreno para informação de venda"
+ longdescription="Defina informações de venda para terreno. *AVISO* Qualquer membro em uma função com esta habilidade pode vender terrenos pertencentes ao grupo em Sobre o terreno > aba Geral como quiser! Certifique-se de sabe o que está fazendo antes de designar esta habilidade."
+ name="land set sale info" />
+ <action description="Subdividir e unir parcelas"
+ longdescription="Subdivide and join parcels. This is done by right-clicking the ground, 'Edit Terrain', and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click 'Subdivide...'. To join, select two or more contiguous parcels and click 'Join...'. "
+ name="land divide join" />
+ </action_set>
+ <action_set
+ description="Estas habilidades incluem poderes para mudar o nome da parcelas e configurações de publicação, visibilidade da busca de diretório e ponto de aterrissagem & opções de rota de TP."
+ name="Parcel Identity">
+ <action
+ description="Ativar/desativar 'Exibir em locais de encontro' e definir categoria"
+ longdescription="Ativar/desativar 'Exibir em locais de encontro' e configurar uma categoria de parcela em Sobre o terreno > aba Opções."
+ name="land find places" />
+ <action
+ description="Mudar nome da parcela, descrição, e configurações 'Publicar na web'"
+ longdescription="Mude o nome da parcela, descrição e configurações de 'Publicar na web'. É feito em Sobre o terreno > aba Opções."
+ name="land change identity" />
+ <action description="Definir ponto de aterrissagem e rota de teletransporte"
+ longdescription="Em uma parcela pertencente ao grupo, membros em uma função com esta habilidade podem definir um ponto de aterrissagem para especificar onde os teletransportes chegam e também definir a rota do teletransporte para um maior controle. É feito em Sobre o terreno > aba Opções."
+ name="land set landing point" />
+ </action_set>
+ <action_set
+ description="Estas habilidade incluem poderes que afetam opções de parcela, como 'Criar objetos', 'Editar terreno' e música & configurações de mÃdia."
+ name="Parcel Settings">
+ <action description="Mudar música & configurações de mÃdia"
+ longdescription="Mude streaming de música e configurações de vÃdeo em Sobre o terreno > aba MÃdia."
+ name="land change media" />
+ <action description="Ativar/desativar 'Editar terreno'"
+ longdescription="Ative/desative 'Editar terreno'. *AVISO* Sobre o terreno > aba Opções > Editar terreno permite a qualquer um alterar as formas de seu terreno, substituir e mover plantas Linden. Certifique-se de saber o que está fazendo antes de desginar esta habilidade. A edição de terreno é ativada/desativada em Sobre o terreno > aba Opções."
+ name="land edit" />
+ <action
+ description="Ativar/desativar variados Sobre o Terreno > Opções de configuração"
+ longdescription="Ative/desative 'Seguro (sem dano)', 'Voar', e permita a outros residentes: 'Criar objetos', 'Editar terreno', 'Criar pontos de referência', e 'Executar scripts' em um terreno pertencente ao grupo em Sobre o terreno > aba Opções."
+ name="land options" />
+ </action_set>
+ <action_set
+ description="Estas habilidades incluem poderes que permitem a membros ultrapassar restrições em parcelas pertencentes ao grupo."
+ name="Parcel Powers">
+ <action description="Sempre permitir 'Editar terreno'"
+ longdescription="Membros em uma função com esta habilidade podem editar terreno em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções."
+ name="land allow edit land" />
+ <action description="Sempre permitir 'Voar'"
+ longdescription="Membros em uma função com esta habilidade podem voar sobre uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções."
+ name="land allow fly" />
+ <action description="Sempre permitir 'Criar objetos'"
+ longdescription="Membros em uma função com esta habilidade podem criar objetos em uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções."
+ name="land allow create" />
+ <action description="Sempre permitir 'Criar ponto de referência'"
+ longdescription="Membros em uma função com esta habilidade podem colocar um ponto de referência uma parcela pertencente ao grupo, mesmo se estiver desativada em Sobre o terreno > aba Opções."
+ name="land allow landmark" />
+ <action description="Permitir 'Colocar casa aqui' no terreno do grupo"
+ longdescription="Membros em uma função com esta habilidade podem usar o menu Mundo > Definir lar aqui em uma parcela do grupo (definir terreno ou transferir para este grupo)."
+ name="land allow set home" />
+ </action_set>
+ <action_set
+ description="Estas habilidades incluem poderes de permitir ou restringir acesso a parcelas pertencentes ao grupo, incluindo congelar e expulsar residentes."
+ name="Parcel Access">
+ <action description="Gerenciar listas de acesso à parcela"
+ longdescription="Gerencie a lista de acesso à parcela em Sobre o terreno > aba Acesso."
+ name="land manage allowed" />
+ <action description="Gerenciar lista de banidos da parcela"
+ longdescription="Gerencie a lista de banidos da parcela em Sobre o terreno > aba Banido."
+ name="land manage banned" />
+ <action description="Mudar configurações de parcela 'Vender passes...'"
+ longdescription="Mude configurações de 'Vender passes...' em Sobre o terreno > aba Acesso."
+ name="land manage passes" />
+ <action description="Expulsar e congelar residentes nas parcelas"
+ longdescription="Membros em uma função com esta habilidade podem lidar com um residente indesejado em uma parcela pertencente ao grupo clicando com o botão direitos sobre ele, Mais > e selecionado 'Expulsar...' ou 'Congelar...'."
+ name="land admin" />
+ </action_set>
+ <action_set
+ description="Estas habilidades incluem poderes de permitir a membros retornar objetos e colocar e mover plantas Linden. Útil para que membros organizem a paisagem, porém deve ser usado com cuidado, devido a não ser possÃvel desfazer a mudança dos objetos."
+ name="Parcel Content">
+ <action description="Retornar objetos que pertencem ao grupo"
+ longdescription="Retorne objetos em parcelas pertencentes ao grupo que pertencem ao grupo em Sobre o terreno > aba Objetos."
+ name="land return group owned" />
+ <action description="Retornar objetos definidos para o grupo"
+ longdescription="Retorne objetos em parcelas pertencentes ao grupo que em Sobre o terrreno > aba Objetos."
+ name="land return group set" />
+ <action description="Retornar objetos que não pertencem ao grupo"
+ longdescription="Retorne objetos nas parcelas pertencentes a um grupo que estão sem grupo em em Sobre o terreno > aba Objetos."
+ name="land return non group" />
+ <action description="Ajardinar usando plantas Linden"
+ longdescription="A habilidade de ajardinar permite colocar e mover árvores Linden, plantas e gramas. Estes itens podem ser encontrando na Biblioteca de seu inventário > pasta Objetos ou podem ser criados através do botão Construir."
+ name="land gardening" />
+ </action_set>
+ <action_set
+ description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools > General Tab. Right-click an object and Edit to see its settings. "
+ name="Object Management">
+ <action description="Transferir objetos para o grupo"
+ longdescription="Transfere objetos para o grupo em Editar ferramentas > aba Geral."
+ name="object deed" />
+ <action description="Manipular (mover, copiar, modificar) objetos do grupo"
+ longdescription="Manipule (mover,copiar, modificar) objetos pertencentes ao grupo em Editar Ferramentas > aba Geral."
+ name="object manipulate" />
+ <action description="Definir objetos pertencentes ao grupo para venda"
+ longdescription="Defina objetos pertencentes ao grupo para venda em Editar Ferramentas > aba Geral."
+ name="object set sale" />
+ </action_set>
+ <action_set
+ description="Estas habilidades incluem poderes que requerem que membros paguem dÃvidas e recebam dividendos do grupo, e restringem acesso ao histórico de conta do grupo."
+ name="Accounting">
+ <action description="Pagar débitos e receber dividendos do grupo"
+ longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
+ name="accounting accountable" />
+ </action_set>
+ <action_set
+ description="Estas habilidade incluem poderes de permitir enviar, receber e ver avisos de grupo."
+ name="Notices">
+ <action description="Enviar aviso"
+ longdescription="Membros em uma função com esta habiliade podem enviar avisos em Informações de grupo > aba Avisos."
+ name="notices send" />
+ <action description="Receber novos avisos e ver os anteriores"
+ longdescription="Membros em uma função com esta habilidade podem receber os novos avisos e ver os anteriores em Informações de grupo > aba Avisos."
+ name="notices receive" />
+ </action_set>
+ <action_set
+ description="Estas habilidades incluem poderes de permitir a membros definir e votar em propostas e ver histórico de votação."
+ name="Proposals">
+ <action description="Criar proposta"
+ longdescription="Membros em uma função com esta habilidade podem criar proposta para serem votadas em Informações de grupo > aba Propostas."
+ name="proposal start" />
+ <action description="Votar em propostas"
+ longdescription="Membros em uma função com esta habilidade podem votar em propostas em Informações de grupo > aba Propostas."
+ name="proposal vote" />
+ </action_set>
+</role_actions>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 1995382697..d54b562e59 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -1,421 +1,421 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- This file contains strings that used to be hardcoded in the source.
- It is only for those strings which don't belong in a floater.
- For example, the strings used in avatar chat bubbles, and strings
- that are returned from one component and may appear in many places-->
-<strings>
- <string name="LoginInProgress">
- Fazendo Login. [APP_NAME] pode parecer congelado. Por favor, aguarde.
- </string>
- <string name="LoginAuthenticating">
- Autenticando
- </string>
- <string name="LoginMaintenance">
- Executando manutenção da conta...
- </string>
- <string name="LoginAttempt">
- Falha na tentativa anterior de login. Fazendo Login, tentativa [NUMBER]
- </string>
- <string name="LoginPrecaching">
- Carregando mundo...
- </string>
- <string name="LoginInitializingBrowser">
- Inicializando navegador embutido...
- </string>
- <string name="LoginInitializingMultimedia">
- Inicializando multimÃdia...
- </string>
- <string name="LoginVerifyingCache">
- Verificando arquivos no cache (pode levar 60-90 segundos)...
- </string>
- <string name="LoginProcessingResponse">
- Processando Resposta...
- </string>
- <string name="LoginInitializingWorld">
- Inicializando Mundo...
- </string>
- <string name="LoginDecodingImages">
- Decodificando imagens...
- </string>
- <string name="LoginInitializingQuicktime">
- Inicializando o QuickTime...
- </string>
- <string name="LoginQuicktimeNotFound">
- O QuickTime não foi encontrado - incapaz de inicializar.
- </string>
- <string name="LoginQuicktimeOK">
- O QuickTime foi inicializado com sucesso.
- </string>
- <string name="LoginWaitingForRegionHandshake">
- Aguardando o handshake com a região...
- </string>
- <string name="LoginConnectingToRegion">
- Conectando à região...
- </string>
- <string name="LoginDownloadingClothing">
- Baixando roupas...
- </string>
- <string name="LoginFailedNoNetwork">
- Erro de Rede: Não foi possÃvel estabelecer uma conexão. Por favor, verifique sua conexão de rede.
- </string>
- <string name="AgentLostConnection">
- Esta região pode estar passando por problemas. Por favor, verifique sua conexão com a internet.
- </string>
- <string name="TooltipPerson">
- Pessoa
- </string>
- <string name="TooltipNoName">
- (sem nome)
- </string>
- <string name="TooltipOwner">
- Proprietário:
- </string>
- <string name="TooltipPublic">
- Público
- </string>
- <string name="TooltipIsGroup">
- (Grupo)
- </string>
- <string name="TooltipFlagScript">
- Script
- </string>
- <string name="TooltipFlagPhysics">
- FÃsica
- </string>
- <string name="TooltipFlagTouch">
- Toque
- </string>
- <string name="TooltipFlagL$">
- L$
- </string>
- <string name="TooltipFlagDropInventory">
- Dar Inventário
- </string>
- <string name="TooltipFlagPhantom">
- Imaterial
- </string>
- <string name="TooltipFlagTemporary">
- Temporário
- </string>
- <string name="TooltipFlagRightClickMenu">
- (Clique com o botão direito para acessar o menu)
- </string>
- <string name="TooltipFreeToCopy">
- Cópia Permitida
- </string>
- <string name="TooltipForSaleL$">
- À venda: L$[AMOUNT]
- </string>
- <string name="TooltipForSaleMsg">
- À venda: [MESSAGE]
- </string>
- <string name="TooltipFlagGroupBuild">
- ConstruÃdo por Grupo
- </string>
- <string name="TooltipFlagNoBuild">
- Não é Permitido Construir
- </string>
- <string name="TooltipFlagNoEdit">
- ConstruÃdo por Grupo
- </string>
- <string name="TooltipFlagNotSafe">
- Não é Seguro
- </string>
- <string name="TooltipFlagNoFly">
- Não é Permitido Voar
- </string>
- <string name="TooltipFlagGroupScripts">
- Scripts de Grupo
- </string>
- <string name="TooltipFlagNoScripts">
- Não são Permitidos Scripts
- </string>
- <string name="TooltipLand">
- Terreno:
- </string>
- <string name="TooltipMustSingleDrop">
- Apenas um item único pode ser arrastado para este local
- </string>
- <string name="RetrievingData">
- Buscando...
- </string>
- <string name="ReleaseNotes">
- Notas de Distribuição
- </string>
- <string name="LoadingData">
- Carregando...
- </string>
- <string name="AvatarNameNobody">
- (ninguém)
- </string>
- <string name="AvatarNameWaiting">
- (aguardando)
- </string>
- <string name="AvatarNameHippos">
- (hippos)
- </string>
- <string name="GroupNameNone">
- (nenhum)
- </string>
- <string name="AssetErrorNone">
- Nenhum erro
- </string>
- <string name="AssetErrorRequestFailed">
- Item pedido falhou
- </string>
- <string name="AssetErrorNonexistentFile">
- Item pedido: arquivo inexistente
- </string>
- <string name="AssetErrorNotInDatabase">
- Item pedido: item não encontrado na base de dados.
- </string>
- <string name="AssetErrorEOF">
- Fim do arquivo
- </string>
- <string name="AssetErrorCannotOpenFile">
- Não é possÃvel abrir arquivo
- </string>
- <string name="AssetErrorFileNotFound">
- Arquivo não encontrado
- </string>
- <string name="AssetErrorTCPTimeout">
- Tempo de transferência de arquivo expirado
- </string>
- <string name="AssetErrorCircuitGone">
- Circuito caiu
- </string>
- <string name="AssetErrorUnknownStatus">
- Status desconhecido
- </string>
- <string name="AvatarEditingApparance">
- (Editando Aparência)
- </string>
- <string name="AvatarAway">
- Distante
- </string>
- <string name="AvatarBusy">
- Ocupado
- </string>
- <string name="AvatarMuted">
- Mudo
- </string>
- <string name="anim_express_afraid">
- Temeroso
- </string>
- <string name="anim_express_anger">
- Bravo
- </string>
- <string name="anim_away">
- Distante
- </string>
- <string name="anim_backflip">
- Virar para trás
- </string>
- <string name="anim_express_laugh">
- Rir segurando a barriga
- </string>
- <string name="anim_express_toothsmile">
- Sorriso largo
- </string>
- <string name="anim_blowkiss">
- Mandar beijo
- </string>
- <string name="anim_express_bored">
- Entediado
- </string>
- <string name="anim_bow">
- Saudar curvando
- </string>
- <string name="anim_clap">
- Aplaudir
- </string>
- <string name="anim_courtbow">
- Saudação formal
- </string>
- <string name="anim_express_cry">
- Chorar
- </string>
- <string name="anim_dance1">
- Dança 1
- </string>
- <string name="anim_dance2">
- Dança 2
- </string>
- <string name="anim_dance3">
- Dança 3
- </string>
- <string name="anim_dance4">
- Dança 4
- </string>
- <string name="anim_dance5">
- Dança 5
- </string>
- <string name="anim_dance6">
- Dança 6
- </string>
- <string name="anim_dance7">
- Dança 7
- </string>
- <string name="anim_dance8">
- Dança 8
- </string>
- <string name="anim_express_disdain">
- Desdém
- </string>
- <string name="anim_drink">
- Beber
- </string>
- <string name="anim_express_embarrased">
- Envergonhado
- </string>
- <string name="anim_angry_fingerwag">
- Negar com o dedo.
- </string>
- <string name="anim_fist_pump">
- Vibrar provocando
- </string>
- <string name="anim_yoga_float">
- Levitar Yoga
- </string>
- <string name="anim_express_frown">
- Careta
- </string>
- <string name="anim_impatient">
- Impaciente
- </string>
- <string name="anim_jumpforjoy">
- Pular de Alegria
- </string>
- <string name="anim_kissmybutt">
- Beije meu Bumbum
- </string>
- <string name="anim_express_kiss">
- Beijar
- </string>
- <string name="anim_laugh_short">
- Rir
- </string>
- <string name="anim_musclebeach">
- Exibir músculos
- </string>
- <string name="anim_no_unhappy">
- Não (descontente)
- </string>
- <string name="anim_no_head">
- Não
- </string>
- <string name="anim_nyanya">
- Nya-nya-nya
- </string>
- <string name="anim_punch_onetwo">
- Soco Um-Dois
- </string>
- <string name="anim_express_open_mouth">
- Abrir a boca
- </string>
- <string name="anim_peace">
- Paz
- </string>
- <string name="anim_point_you">
- Apontar para o outro
- </string>
- <string name="anim_point_me">
- Apontar para si
- </string>
- <string name="anim_punch_l">
- Socar Esquerda
- </string>
- <string name="anim_punch_r">
- Socar Direita
- </string>
- <string name="anim_rps_countdown">
- RPS contar
- </string>
- <string name="anim_rps_paper">
- RPS papel
- </string>
- <string name="anim_rps_rock">
- RPS pedra
- </string>
- <string name="anim_rps_scissors">
- RPS tesoura
- </string>
- <string name="anim_express_repulsed">
- Repulsa
- </string>
- <string name="anim_kick_roundhouse_r">
- Chute giratório
- </string>
- <string name="anim_express_sad">
- Triste
- </string>
- <string name="anim_salute">
- Saúde
- </string>
- <string name="anim_shout">
- Gritar
- </string>
- <string name="anim_express_shrug">
- Encolher ombros
- </string>
- <string name="anim_express_smile">
- Sorrir
- </string>
- <string name="anim_smoke_idle">
- Fumar à toa
- </string>
- <string name="anim_smoke_inhale">
- Inalar Fumaça
- </string>
- <string name="anim_smoke_throw_down">
- Expelir Fumaça
- </string>
- <string name="anim_express_surprise">
- Surpresa
- </string>
- <string name="anim_sword_strike_r">
- Golpe de Espada
- </string>
- <string name="anim_angry_tantrum">
- Enraivecer
- </string>
- <string name="anim_express_tongue_out">
- Mostrar a lÃngua
- </string>
- <string name="anim_hello">
- Onda
- </string>
- <string name="anim_whisper">
- Sussurrar
- </string>
- <string name="anim_whistle">
- Assobiar
- </string>
- <string name="anim_express_wink">
- Piscar
- </string>
- <string name="anim_wink_hollywood">
- Piscar (Hollywood)
- </string>
- <string name="anim_express_worry">
- Preocupar-se
- </string>
- <string name="anim_yes_happy">
- Sim (Feliz)
- </string>
- <string name="anim_yes_head">
- Sim
- </string>
- <string name="texture_loading">
- Carregando...
- </string>
- <string name="worldmap_offline">
- Desconectado
- </string>
- <string name="whisper">
- sussurra:
- </string>
- <string name="shout">
- grita:
- </string>
-</strings>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This file contains strings that used to be hardcoded in the source.
+ It is only for those strings which don't belong in a floater.
+ For example, the strings used in avatar chat bubbles, and strings
+ that are returned from one component and may appear in many places-->
+<strings>
+ <string name="LoginInProgress">
+ Fazendo Login. [APP_NAME] pode parecer congelado. Por favor, aguarde.
+ </string>
+ <string name="LoginAuthenticating">
+ Autenticando
+ </string>
+ <string name="LoginMaintenance">
+ Executando manutenção da conta...
+ </string>
+ <string name="LoginAttempt">
+ Falha na tentativa anterior de login. Fazendo Login, tentativa [NUMBER]
+ </string>
+ <string name="LoginPrecaching">
+ Carregando mundo...
+ </string>
+ <string name="LoginInitializingBrowser">
+ Inicializando navegador embutido...
+ </string>
+ <string name="LoginInitializingMultimedia">
+ Inicializando multimÃdia...
+ </string>
+ <string name="LoginVerifyingCache">
+ Verificando arquivos no cache (pode levar 60-90 segundos)...
+ </string>
+ <string name="LoginProcessingResponse">
+ Processando Resposta...
+ </string>
+ <string name="LoginInitializingWorld">
+ Inicializando Mundo...
+ </string>
+ <string name="LoginDecodingImages">
+ Decodificando imagens...
+ </string>
+ <string name="LoginInitializingQuicktime">
+ Inicializando o QuickTime...
+ </string>
+ <string name="LoginQuicktimeNotFound">
+ O QuickTime não foi encontrado - incapaz de inicializar.
+ </string>
+ <string name="LoginQuicktimeOK">
+ O QuickTime foi inicializado com sucesso.
+ </string>
+ <string name="LoginWaitingForRegionHandshake">
+ Aguardando o handshake com a região...
+ </string>
+ <string name="LoginConnectingToRegion">
+ Conectando à região...
+ </string>
+ <string name="LoginDownloadingClothing">
+ Baixando roupas...
+ </string>
+ <string name="LoginFailedNoNetwork">
+ Erro de Rede: Não foi possÃvel estabelecer uma conexão. Por favor, verifique sua conexão de rede.
+ </string>
+ <string name="AgentLostConnection">
+ Esta região pode estar passando por problemas. Por favor, verifique sua conexão com a internet.
+ </string>
+ <string name="TooltipPerson">
+ Pessoa
+ </string>
+ <string name="TooltipNoName">
+ (sem nome)
+ </string>
+ <string name="TooltipOwner">
+ Proprietário:
+ </string>
+ <string name="TooltipPublic">
+ Público
+ </string>
+ <string name="TooltipIsGroup">
+ (Grupo)
+ </string>
+ <string name="TooltipFlagScript">
+ Script
+ </string>
+ <string name="TooltipFlagPhysics">
+ FÃsica
+ </string>
+ <string name="TooltipFlagTouch">
+ Toque
+ </string>
+ <string name="TooltipFlagL$">
+ L$
+ </string>
+ <string name="TooltipFlagDropInventory">
+ Dar Inventário
+ </string>
+ <string name="TooltipFlagPhantom">
+ Imaterial
+ </string>
+ <string name="TooltipFlagTemporary">
+ Temporário
+ </string>
+ <string name="TooltipFlagRightClickMenu">
+ (Clique com o botão direito para acessar o menu)
+ </string>
+ <string name="TooltipFreeToCopy">
+ Cópia Permitida
+ </string>
+ <string name="TooltipForSaleL$">
+ À venda: L$[AMOUNT]
+ </string>
+ <string name="TooltipForSaleMsg">
+ À venda: [MESSAGE]
+ </string>
+ <string name="TooltipFlagGroupBuild">
+ ConstruÃdo por Grupo
+ </string>
+ <string name="TooltipFlagNoBuild">
+ Não é Permitido Construir
+ </string>
+ <string name="TooltipFlagNoEdit">
+ ConstruÃdo por Grupo
+ </string>
+ <string name="TooltipFlagNotSafe">
+ Não é Seguro
+ </string>
+ <string name="TooltipFlagNoFly">
+ Não é Permitido Voar
+ </string>
+ <string name="TooltipFlagGroupScripts">
+ Scripts de Grupo
+ </string>
+ <string name="TooltipFlagNoScripts">
+ Não são Permitidos Scripts
+ </string>
+ <string name="TooltipLand">
+ Terreno:
+ </string>
+ <string name="TooltipMustSingleDrop">
+ Apenas um item único pode ser arrastado para este local
+ </string>
+ <string name="RetrievingData">
+ Buscando...
+ </string>
+ <string name="ReleaseNotes">
+ Notas de Distribuição
+ </string>
+ <string name="LoadingData">
+ Carregando...
+ </string>
+ <string name="AvatarNameNobody">
+ (ninguém)
+ </string>
+ <string name="AvatarNameWaiting">
+ (aguardando)
+ </string>
+ <string name="AvatarNameHippos">
+ (hippos)
+ </string>
+ <string name="GroupNameNone">
+ (nenhum)
+ </string>
+ <string name="AssetErrorNone">
+ Nenhum erro
+ </string>
+ <string name="AssetErrorRequestFailed">
+ Item pedido falhou
+ </string>
+ <string name="AssetErrorNonexistentFile">
+ Item pedido: arquivo inexistente
+ </string>
+ <string name="AssetErrorNotInDatabase">
+ Item pedido: item não encontrado na base de dados.
+ </string>
+ <string name="AssetErrorEOF">
+ Fim do arquivo
+ </string>
+ <string name="AssetErrorCannotOpenFile">
+ Não é possÃvel abrir arquivo
+ </string>
+ <string name="AssetErrorFileNotFound">
+ Arquivo não encontrado
+ </string>
+ <string name="AssetErrorTCPTimeout">
+ Tempo de transferência de arquivo expirado
+ </string>
+ <string name="AssetErrorCircuitGone">
+ Circuito caiu
+ </string>
+ <string name="AssetErrorUnknownStatus">
+ Status desconhecido
+ </string>
+ <string name="AvatarEditingApparance">
+ (Editando Aparência)
+ </string>
+ <string name="AvatarAway">
+ Distante
+ </string>
+ <string name="AvatarBusy">
+ Ocupado
+ </string>
+ <string name="AvatarMuted">
+ Mudo
+ </string>
+ <string name="anim_express_afraid">
+ Temeroso
+ </string>
+ <string name="anim_express_anger">
+ Bravo
+ </string>
+ <string name="anim_away">
+ Distante
+ </string>
+ <string name="anim_backflip">
+ Virar para trás
+ </string>
+ <string name="anim_express_laugh">
+ Rir segurando a barriga
+ </string>
+ <string name="anim_express_toothsmile">
+ Sorriso largo
+ </string>
+ <string name="anim_blowkiss">
+ Mandar beijo
+ </string>
+ <string name="anim_express_bored">
+ Entediado
+ </string>
+ <string name="anim_bow">
+ Saudar curvando
+ </string>
+ <string name="anim_clap">
+ Aplaudir
+ </string>
+ <string name="anim_courtbow">
+ Saudação formal
+ </string>
+ <string name="anim_express_cry">
+ Chorar
+ </string>
+ <string name="anim_dance1">
+ Dança 1
+ </string>
+ <string name="anim_dance2">
+ Dança 2
+ </string>
+ <string name="anim_dance3">
+ Dança 3
+ </string>
+ <string name="anim_dance4">
+ Dança 4
+ </string>
+ <string name="anim_dance5">
+ Dança 5
+ </string>
+ <string name="anim_dance6">
+ Dança 6
+ </string>
+ <string name="anim_dance7">
+ Dança 7
+ </string>
+ <string name="anim_dance8">
+ Dança 8
+ </string>
+ <string name="anim_express_disdain">
+ Desdém
+ </string>
+ <string name="anim_drink">
+ Beber
+ </string>
+ <string name="anim_express_embarrased">
+ Envergonhado
+ </string>
+ <string name="anim_angry_fingerwag">
+ Negar com o dedo.
+ </string>
+ <string name="anim_fist_pump">
+ Vibrar provocando
+ </string>
+ <string name="anim_yoga_float">
+ Levitar Yoga
+ </string>
+ <string name="anim_express_frown">
+ Careta
+ </string>
+ <string name="anim_impatient">
+ Impaciente
+ </string>
+ <string name="anim_jumpforjoy">
+ Pular de Alegria
+ </string>
+ <string name="anim_kissmybutt">
+ Beije meu Bumbum
+ </string>
+ <string name="anim_express_kiss">
+ Beijar
+ </string>
+ <string name="anim_laugh_short">
+ Rir
+ </string>
+ <string name="anim_musclebeach">
+ Exibir músculos
+ </string>
+ <string name="anim_no_unhappy">
+ Não (descontente)
+ </string>
+ <string name="anim_no_head">
+ Não
+ </string>
+ <string name="anim_nyanya">
+ Nya-nya-nya
+ </string>
+ <string name="anim_punch_onetwo">
+ Soco Um-Dois
+ </string>
+ <string name="anim_express_open_mouth">
+ Abrir a boca
+ </string>
+ <string name="anim_peace">
+ Paz
+ </string>
+ <string name="anim_point_you">
+ Apontar para o outro
+ </string>
+ <string name="anim_point_me">
+ Apontar para si
+ </string>
+ <string name="anim_punch_l">
+ Socar Esquerda
+ </string>
+ <string name="anim_punch_r">
+ Socar Direita
+ </string>
+ <string name="anim_rps_countdown">
+ RPS contar
+ </string>
+ <string name="anim_rps_paper">
+ RPS papel
+ </string>
+ <string name="anim_rps_rock">
+ RPS pedra
+ </string>
+ <string name="anim_rps_scissors">
+ RPS tesoura
+ </string>
+ <string name="anim_express_repulsed">
+ Repulsa
+ </string>
+ <string name="anim_kick_roundhouse_r">
+ Chute giratório
+ </string>
+ <string name="anim_express_sad">
+ Triste
+ </string>
+ <string name="anim_salute">
+ Saúde
+ </string>
+ <string name="anim_shout">
+ Gritar
+ </string>
+ <string name="anim_express_shrug">
+ Encolher ombros
+ </string>
+ <string name="anim_express_smile">
+ Sorrir
+ </string>
+ <string name="anim_smoke_idle">
+ Fumar à toa
+ </string>
+ <string name="anim_smoke_inhale">
+ Inalar Fumaça
+ </string>
+ <string name="anim_smoke_throw_down">
+ Expelir Fumaça
+ </string>
+ <string name="anim_express_surprise">
+ Surpresa
+ </string>
+ <string name="anim_sword_strike_r">
+ Golpe de Espada
+ </string>
+ <string name="anim_angry_tantrum">
+ Enraivecer
+ </string>
+ <string name="anim_express_tongue_out">
+ Mostrar a lÃngua
+ </string>
+ <string name="anim_hello">
+ Onda
+ </string>
+ <string name="anim_whisper">
+ Sussurrar
+ </string>
+ <string name="anim_whistle">
+ Assobiar
+ </string>
+ <string name="anim_express_wink">
+ Piscar
+ </string>
+ <string name="anim_wink_hollywood">
+ Piscar (Hollywood)
+ </string>
+ <string name="anim_express_worry">
+ Preocupar-se
+ </string>
+ <string name="anim_yes_happy">
+ Sim (Feliz)
+ </string>
+ <string name="anim_yes_head">
+ Sim
+ </string>
+ <string name="texture_loading">
+ Carregando...
+ </string>
+ <string name="worldmap_offline">
+ Desconectado
+ </string>
+ <string name="whisper">
+ sussurra:
+ </string>
+ <string name="shout">
+ grita:
+ </string>
+</strings>
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
index 788a215454..6eecc45bcf 100644
--- a/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<teleport_messages>
- <message_set name="errors">
- <message name="invalid_tport">
- Problema encontrado ao processar seu pedido de Teletransporte. Você pode tentar reiniciar antes de tentar teletransportar-se. Se você continuar a receber esta mensagem, por favor verifique a FAQ do Suporte Técnico em:
-www.secondlife.com/support
- </message>
- <message name="invalid_region_handoff">
- Problema encontrado ao processar a passagem de regiões. Você pode tentar reiniciar antes de tentar atravessar regiões novamente. Se você continuar a receber esta mensagem, por favor verifique a FAQ do Suporte Técnico em:
-www.secondlife.com/support
- </message>
- <message name="blocked_tport">
- Desculpe, teletransportes estão atualmente bloqueados. Tente novamente dentro de alguns instantes. Se você continuar com problemas de teletransporte, por favor tente deslogar e relogar para resolver o problema.
- </message>
- <message name="nolandmark_tport">
- Desculpe, mas o sistema não conseguiu localizar a landmark de destino.
- </message>
- <message name="timeout_tport">
- Desculpe, não foi possÃvel para o sistema executar o teletransporte. Tente novamente dentro de alguns instantes.
- </message>
- <message name="noaccess_tport">
- Desculpe, você não tem acesso ao destino deste teletransporte.
- </message>
- <message name="missing_attach_tport">
- Seu anexos ainda não chegaram. Tente esperar por alguns momentos ou deslogar e logar antes de tentar teleransportar-se novamente.
- </message>
- <message name="too_many_uploads_tport">
- Afluxo nesta região é atualmente tão alto que seu pedido de teletransporte não será possÃvel em tempo oportuno. Por favor, tente novamente em alguns minutos ou vá a uma área menos ocupada.
- </message>
- <message name="expired_tport">
- Desculpe, mas o sistema não conseguiu concluir o seu pedido de teletransporte em tempo hábil. Por favor, tente novamente em alguns minutos.
- </message>
- <message name="expired_region_handoff">
- Desculpe, mas o sistema não pôde concluir a sua travessia de região em tempo hábil. Por favor, tente novamente em alguns minutos.
- </message>
- <message name="no_host">
- Não foi possÃvel encontrar o destino do teletransporte. O destino pode estar temporariamente indisponÃvel ou não existir mais. Por favor, tente novamente em poucos minutos.
- </message>
- <message name="no_inventory_host">
- O sistema de inventário está indisponÃvel no momento.
- </message>
- </message_set>
- <message_set name="progress">
- <message name="sending_dest">
- Enviando para o destino.
- </message>
- <message name="redirecting">
- Redirecionando para uma localidade diferente.
- </message>
- <message name="relaying">
- Transferindo para o destino.
- </message>
- <message name="sending_home">
- Enviando solicitação de localização da casa.
- </message>
- <message name="sending_landmark">
- Enviando solicitação de localização de landmark.
- </message>
- <message name="completing">
- Completando teletransporte.
- </message>
- <message name="resolving">
- Identificando destino.
- </message>
- <message name="contacting">
- Contactando nova região.
- </message>
- <message name="arriving">
- Chegando...
- </message>
- <message name="requesting">
- Solicitando teletransporte...
- </message>
- </message_set>
-</teleport_messages>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<teleport_messages>
+ <message_set name="errors">
+ <message name="invalid_tport">
+ Problema encontrado ao processar seu pedido de Teletransporte. Você pode tentar reiniciar antes de tentar teletransportar-se. Se você continuar a receber esta mensagem, por favor verifique a FAQ do Suporte Técnico em:
+www.secondlife.com/support
+ </message>
+ <message name="invalid_region_handoff">
+ Problema encontrado ao processar a passagem de regiões. Você pode tentar reiniciar antes de tentar atravessar regiões novamente. Se você continuar a receber esta mensagem, por favor verifique a FAQ do Suporte Técnico em:
+www.secondlife.com/support
+ </message>
+ <message name="blocked_tport">
+ Desculpe, teletransportes estão atualmente bloqueados. Tente novamente dentro de alguns instantes. Se você continuar com problemas de teletransporte, por favor tente deslogar e relogar para resolver o problema.
+ </message>
+ <message name="nolandmark_tport">
+ Desculpe, mas o sistema não conseguiu localizar a landmark de destino.
+ </message>
+ <message name="timeout_tport">
+ Desculpe, não foi possÃvel para o sistema executar o teletransporte. Tente novamente dentro de alguns instantes.
+ </message>
+ <message name="noaccess_tport">
+ Desculpe, você não tem acesso ao destino deste teletransporte.
+ </message>
+ <message name="missing_attach_tport">
+ Seu anexos ainda não chegaram. Tente esperar por alguns momentos ou deslogar e logar antes de tentar teleransportar-se novamente.
+ </message>
+ <message name="too_many_uploads_tport">
+ Afluxo nesta região é atualmente tão alto que seu pedido de teletransporte não será possÃvel em tempo oportuno. Por favor, tente novamente em alguns minutos ou vá a uma área menos ocupada.
+ </message>
+ <message name="expired_tport">
+ Desculpe, mas o sistema não conseguiu concluir o seu pedido de teletransporte em tempo hábil. Por favor, tente novamente em alguns minutos.
+ </message>
+ <message name="expired_region_handoff">
+ Desculpe, mas o sistema não pôde concluir a sua travessia de região em tempo hábil. Por favor, tente novamente em alguns minutos.
+ </message>
+ <message name="no_host">
+ Não foi possÃvel encontrar o destino do teletransporte. O destino pode estar temporariamente indisponÃvel ou não existir mais. Por favor, tente novamente em poucos minutos.
+ </message>
+ <message name="no_inventory_host">
+ O sistema de inventário está indisponÃvel no momento.
+ </message>
+ </message_set>
+ <message_set name="progress">
+ <message name="sending_dest">
+ Enviando para o destino.
+ </message>
+ <message name="redirecting">
+ Redirecionando para uma localidade diferente.
+ </message>
+ <message name="relaying">
+ Transferindo para o destino.
+ </message>
+ <message name="sending_home">
+ Enviando solicitação de localização da casa.
+ </message>
+ <message name="sending_landmark">
+ Enviando solicitação de localização de landmark.
+ </message>
+ <message name="completing">
+ Completando teletransporte.
+ </message>
+ <message name="resolving">
+ Identificando destino.
+ </message>
+ <message name="contacting">
+ Contactando nova região.
+ </message>
+ <message name="arriving">
+ Chegando...
+ </message>
+ <message name="requesting">
+ Solicitando teletransporte...
+ </message>
+ </message_set>
+</teleport_messages>
diff --git a/indra/newview/skins/default/xui/pt/xui_version.xml b/indra/newview/skins/default/xui/pt/xui_version.xml
index ee2a0be745..0e777751d3 100644
--- a/indra/newview/skins/default/xui/pt/xui_version.xml
+++ b/indra/newview/skins/default/xui/pt/xui_version.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xui_version>
- 1.0
-</xui_version>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xui_version>
+ 1.0
+</xui_version>
diff --git a/indra/newview/tests/llagentaccess_test.cpp b/indra/newview/tests/llagentaccess_test.cpp
index fc18f10e7d..42872d85fb 100644
--- a/indra/newview/tests/llagentaccess_test.cpp
+++ b/indra/newview/tests/llagentaccess_test.cpp
@@ -3,59 +3,73 @@
* @brief LLAgentAccess tests
*
* $LicenseInfo:firstyear=2001&license=viewergpl$
+ *
* Copyright (c) 2001-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#include "../test/lltut.h"
#include "../llagentaccess.h"
-#include "llcontrolgroupreader.h"
+#include "llcontrol.h"
#include "indra_constants.h"
#include <iostream>
-class LLControlGroupReader_Test : public LLControlGroupReader
+//----------------------------------------------------------------------------
+// Implementation of enough of LLControlGroup to support the tests:
+
+static U32 test_preferred_maturity = SIM_ACCESS_PG;
+
+LLControlGroup::LLControlGroup(const std::string& name)
+ : LLInstanceTracker<LLControlGroup, std::string>(name)
{
-public:
- LLControlGroupReader_Test() : test_preferred_maturity(SIM_ACCESS_PG) {}
-
- virtual std::string getString(const std::string& name)
- {
- return "";
- }
- virtual std::string getText(const std::string& name)
- {
- return "";
- }
- virtual BOOL getBOOL(const std::string& name)
- {
- return false;
- }
- virtual S32 getS32(const std::string& name)
- {
- return 0;
- }
- virtual F32 getF32(const std::string& name)
- {
- return 0;
- }
- virtual U32 getU32(const std::string& name)
- {
- return test_preferred_maturity;
- }
-
- //--------------------------------------
- // Everything from here down is test code and not part of the interface
- void setPreferredMaturity(U32 m)
- {
- test_preferred_maturity = m;
- }
-private:
- U32 test_preferred_maturity;
-
-};
+}
+LLControlGroup::~LLControlGroup()
+{
+}
+
+// Implementation of just the LLControlGroup methods we requre
+BOOL LLControlGroup::declareU32(const std::string& name, U32 initial_val, const std::string& comment, BOOL persist)
+{
+ test_preferred_maturity = initial_val;
+ return true;
+}
+
+void LLControlGroup::setU32(const std::string& name, U32 val)
+{
+ test_preferred_maturity = val;
+}
+
+U32 LLControlGroup::getU32(const std::string& name)
+{
+ return test_preferred_maturity;
+}
+//----------------------------------------------------------------------------
+
namespace tut
{
struct agentaccess
@@ -69,20 +83,21 @@ namespace tut
template<> template<>
void agentaccess_object_t::test<1>()
{
- LLControlGroupReader_Test cgr;
+ LLControlGroup cgr("test");
+ cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
LLAgentAccess aa(cgr);
- cgr.setPreferredMaturity(SIM_ACCESS_PG);
+ cgr.setU32("PreferredMaturity", SIM_ACCESS_PG);
ensure("1 prefersPG", aa.prefersPG());
ensure("1 prefersMature", !aa.prefersMature());
ensure("1 prefersAdult", !aa.prefersAdult());
- cgr.setPreferredMaturity(SIM_ACCESS_MATURE);
+ cgr.setU32("PreferredMaturity", SIM_ACCESS_MATURE);
ensure("2 prefersPG", !aa.prefersPG());
ensure("2 prefersMature", aa.prefersMature());
ensure("2 prefersAdult", !aa.prefersAdult());
- cgr.setPreferredMaturity(SIM_ACCESS_ADULT);
+ cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
ensure("3 prefersPG", !aa.prefersPG());
ensure("3 prefersMature", aa.prefersMature());
ensure("3 prefersAdult", aa.prefersAdult());
@@ -91,7 +106,8 @@ namespace tut
template<> template<>
void agentaccess_object_t::test<2>()
{
- LLControlGroupReader_Test cgr;
+ LLControlGroup cgr("test");
+ cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
LLAgentAccess aa(cgr);
// make sure default is PG
@@ -140,7 +156,8 @@ namespace tut
template<> template<>
void agentaccess_object_t::test<3>()
{
- LLControlGroupReader_Test cgr;
+ LLControlGroup cgr("test");
+ cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
LLAgentAccess aa(cgr);
ensure("starts normal", !aa.isGodlike());
@@ -163,7 +180,8 @@ namespace tut
template<> template<>
void agentaccess_object_t::test<4>()
{
- LLControlGroupReader_Test cgr;
+ LLControlGroup cgr("test");
+ cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
LLAgentAccess aa(cgr);
ensure("1 pg to start", aa.wantsPGOnly());
@@ -188,12 +206,12 @@ namespace tut
ensure("2 mature pref pg", !aa.canAccessMature());
ensure("3 mature pref pg", !aa.canAccessAdult());
- cgr.setPreferredMaturity(SIM_ACCESS_MATURE);
+ cgr.setU32("PreferredMaturity", SIM_ACCESS_MATURE);
ensure("1 mature", !aa.wantsPGOnly());
ensure("2 mature", aa.canAccessMature());
ensure("3 mature", !aa.canAccessAdult());
- cgr.setPreferredMaturity(SIM_ACCESS_PG);
+ cgr.setU32("PreferredMaturity", SIM_ACCESS_PG);
ensure("1 mature pref pg", aa.wantsPGOnly());
ensure("2 mature pref pg", !aa.canAccessMature());
ensure("3 mature pref pg", !aa.canAccessAdult());
@@ -203,14 +221,14 @@ namespace tut
ensure("2 adult pref pg", !aa.canAccessMature());
ensure("3 adult pref pg", !aa.canAccessAdult());
- cgr.setPreferredMaturity(SIM_ACCESS_ADULT);
+ cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
ensure("1 adult", !aa.wantsPGOnly());
ensure("2 adult", aa.canAccessMature());
ensure("3 adult", aa.canAccessAdult());
// make sure that even if pref is high, if access is low we block access
// this shouldn't occur in real life but we want to be safe
- cgr.setPreferredMaturity(SIM_ACCESS_ADULT);
+ cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
aa.setMaturity('P');
ensure("1 pref adult, actual pg", aa.wantsPGOnly());
ensure("2 pref adult, actual pg", !aa.canAccessMature());
@@ -221,7 +239,8 @@ namespace tut
template<> template<>
void agentaccess_object_t::test<5>()
{
- LLControlGroupReader_Test cgr;
+ LLControlGroup cgr("test");
+ cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
LLAgentAccess aa(cgr);
ensure("1 transition starts false", !aa.isInTransition());
@@ -229,6 +248,20 @@ namespace tut
ensure("2 transition now true", aa.isInTransition());
}
+ template<> template<>
+ void agentaccess_object_t::test<6>()
+ {
+ LLControlGroup cgr("test");
+ cgr.declareU32("PreferredMaturity", SIM_ACCESS_PG, "declared_for_test", FALSE);
+ LLAgentAccess aa(cgr);
+
+ cgr.setU32("PreferredMaturity", SIM_ACCESS_ADULT);
+ aa.setMaturity('M');
+ ensure("1 preferred maturity pegged to M when maturity is M", cgr.getU32("PreferredMaturity") == SIM_ACCESS_MATURE);
+
+ aa.setMaturity('P');
+ ensure("1 preferred maturity pegged to P when maturity is P", cgr.getU32("PreferredMaturity") == SIM_ACCESS_PG);
+ }
}
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 599882500c..583dba4fd9 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -84,6 +84,7 @@ class ViewerManifest(LLManifest):
self.path("textures.xml")
self.end_prefix("*/textures")
self.path("*/xui/*/*.xml")
+ self.path("*/xui/*/widgets/*.xml")
self.path("*/*.xml")
# Local HTML files (e.g. loading screen)
diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt
index c8682c8ea7..c74ef06636 100644
--- a/indra/test/CMakeLists.txt
+++ b/indra/test/CMakeLists.txt
@@ -34,6 +34,7 @@ set(test_SOURCE_FILES
llblowfish_tut.cpp
llbuffer_tut.cpp
lldate_tut.cpp
+ lldoubledispatch_tut.cpp
llerror_tut.cpp
llhost_tut.cpp
llhttpdate_tut.cpp
@@ -64,6 +65,7 @@ set(test_SOURCE_FILES
lltimestampcache_tut.cpp
lltiming_tut.cpp
lltranscode_tut.cpp
+ lltreeiterators_tut.cpp
lltut.cpp
lluri_tut.cpp
lluuidhashmap_tut.cpp
@@ -104,7 +106,7 @@ endif (NOT DARWIN)
set_source_files_properties(${test_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
-list(APPEND test_SOURC_FILES ${test_HEADER_FILES})
+list(APPEND test_SOURCE_FILES ${test_HEADER_FILES})
add_executable(test ${test_SOURCE_FILES})
@@ -120,6 +122,8 @@ target_link_libraries(test
${APRICONV_LIBRARIES}
${PTHREAD_LIBRARY}
${WINDOWS_LIBRARIES}
+ ${BOOST_PROGRAM_OPTIONS_LIBRARY}
+ ${BOOST_REGEX_LIBRARY}
${DL_LIBRARY}
)
diff --git a/indra/test/lldoubledispatch_tut.cpp b/indra/test/lldoubledispatch_tut.cpp
new file mode 100755
index 0000000000..63ef4d4497
--- /dev/null
+++ b/indra/test/lldoubledispatch_tut.cpp
@@ -0,0 +1,245 @@
+/**
+ * @file lldoubledispatch_tut.cpp
+ * @author Nat Goodspeed
+ * @date 2008-11-13
+ * @brief Test for lldoubledispatch.h
+ *
+ * This program tests the DoubleDispatch class, using a variation on the example
+ * from Scott Meyers' "More Effective C++", Item 31.
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008-2009, Linden Research, Inc.
+ *
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab. Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ *
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ *
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ *
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+// Precompiled header
+#include "linden_common.h"
+// associated header
+#include "lldoubledispatch.h"
+// STL headers
+// std headers
+#include <string>
+#include <iostream>
+#include <typeinfo>
+// external library headers
+// other Linden headers
+#include "lltut.h"
+
+
+/*---------------------------- Class hierarchy -----------------------------*/
+// All objects are GameObjects.
+class GameObject
+{
+public:
+ GameObject(const std::string& name): mName(name) {}
+ virtual ~GameObject() {}
+ virtual std::string stringize() { return std::string(typeid(*this).name()) + " " + mName; }
+
+protected:
+ std::string mName;
+};
+
+// SpaceStation, Asteroid and SpaceShip are peer GameObjects.
+struct SpaceStation: public GameObject
+{
+ SpaceStation(const std::string& name): GameObject(name) {}
+ // Only a dummy SpaceStation is constructed without a name
+ SpaceStation(): GameObject("dummy") {}
+};
+
+struct Asteroid: public GameObject
+{
+ Asteroid(const std::string& name): GameObject(name) {}
+ Asteroid(): GameObject("dummy") {}
+};
+
+struct SpaceShip: public GameObject
+{
+ SpaceShip(const std::string& name): GameObject(name) {}
+ SpaceShip(): GameObject("dummy") {}
+};
+
+// SpaceShip is specialized further into CommercialShip and MilitaryShip.
+struct CommercialShip: public SpaceShip
+{
+ CommercialShip(const std::string& name): SpaceShip(name) {}
+ CommercialShip(): SpaceShip("dummy") {}
+};
+
+struct MilitaryShip: public SpaceShip
+{
+ MilitaryShip(const std::string& name): SpaceShip(name) {}
+ MilitaryShip(): SpaceShip("dummy") {}
+};
+
+/*-------------------------- Collision functions ---------------------------*/
+// This mechanism permits us to overcome a limitation of Meyers' approach: we
+// can declare the parameter types exactly as we want, rather than having to
+// make them all GameObject& parameters.
+std::string shipAsteroid(SpaceShip& ship, Asteroid& rock)
+{
+// std::cout << rock.stringize() << " has pulverized " << ship.stringize() << std::endl;
+ return "shipAsteroid";
+}
+
+std::string militaryShipAsteroid(MilitaryShip& ship, Asteroid& rock)
+{
+// std::cout << rock.stringize() << " has severely damaged " << ship.stringize() << std::endl;
+ return "militaryShipAsteroid";
+}
+
+std::string shipStation(SpaceShip& ship, SpaceStation& dock)
+{
+// std::cout << ship.stringize() << " has docked at " << dock.stringize() << std::endl;
+ return "shipStation";
+}
+
+std::string asteroidStation(Asteroid& rock, SpaceStation& dock)
+{
+// std::cout << rock.stringize() << " has damaged " << dock.stringize() << std::endl;
+ return "asteroidStation";
+}
+
+/*------------------------------- Test code --------------------------------*/
+namespace tut
+{
+ struct dispatch_data
+ {
+ dispatch_data():
+ home(new SpaceStation("Terra Station")),
+ obstacle(new Asteroid("Ganymede")),
+ tug(new CommercialShip("Pilotfish")),
+ patrol(new MilitaryShip("Enterprise"))
+ {}
+
+ // Instantiate and populate the DoubleDispatch object.
+ typedef LLDoubleDispatch<std::string, GameObject> DD;
+ DD dispatcher;
+
+ // Instantiate a few GameObjects. Make sure we refer to them
+ // polymorphically, and don't let them leak.
+ std::auto_ptr<GameObject> home;
+ std::auto_ptr<GameObject> obstacle;
+ std::auto_ptr<GameObject> tug;
+ std::auto_ptr<GameObject> patrol;
+
+ // prototype objects
+ Asteroid dummyAsteroid;
+ SpaceShip dummyShip;
+ MilitaryShip dummyMilitary;
+ CommercialShip dummyCommercial;
+ SpaceStation dummyStation;
+ };
+ typedef test_group<dispatch_data> dispatch_group;
+ typedef dispatch_group::object dispatch_object;
+ tut::dispatch_group ddgr("double dispatch");
+
+ template<> template<>
+ void dispatch_object::test<1>()
+ {
+ // Describe param types using explicit DD::Type objects
+ // (order-sensitive add() variant)
+ dispatcher.add(DD::Type<SpaceShip>(), DD::Type<Asteroid>(), shipAsteroid, true);
+ // naive adding, won't work
+ dispatcher.add(DD::Type<MilitaryShip>(), DD::Type<Asteroid>(), militaryShipAsteroid, true);
+ dispatcher.add(DD::Type<SpaceShip>(), DD::Type<SpaceStation>(), shipStation, true);
+ dispatcher.add(DD::Type<Asteroid>(), DD::Type<SpaceStation>(), asteroidStation, true);
+
+ // Try colliding them.
+ ensure_equals(dispatcher(*home, *tug), // reverse params, SpaceShip subclass
+ "shipStation");
+ ensure_equals(dispatcher(*patrol, *home), // forward params, SpaceShip subclass
+ "shipStation");
+ ensure_equals(dispatcher(*obstacle, *home), // forward params
+ "asteroidStation");
+ ensure_equals(dispatcher(*home, *obstacle), // reverse params
+ "asteroidStation");
+ ensure_equals(dispatcher(*tug, *obstacle), // forward params, SpaceShip subclass
+ "shipAsteroid");
+ ensure_equals(dispatcher(*obstacle, *patrol), // reverse params, SpaceShip subclass
+ // won't use militaryShipAsteroid() because it was added
+ // in wrong order
+ "shipAsteroid");
+ }
+
+ template<> template<>
+ void dispatch_object::test<2>()
+ {
+ // Describe param types using explicit DD::Type objects
+ // (order-sensitive add() variant)
+ // adding in correct order
+ dispatcher.add(DD::Type<MilitaryShip>(), DD::Type<Asteroid>(), militaryShipAsteroid, true);
+ dispatcher.add(DD::Type<SpaceShip>(), DD::Type<Asteroid>(), shipAsteroid, true);
+ dispatcher.add(DD::Type<SpaceShip>(), DD::Type<SpaceStation>(), shipStation, true);
+ dispatcher.add(DD::Type<Asteroid>(), DD::Type<SpaceStation>(), asteroidStation, true);
+
+ ensure_equals(dispatcher(*patrol, *obstacle), "militaryShipAsteroid");
+ ensure_equals(dispatcher(*tug, *obstacle), "shipAsteroid");
+ }
+
+ template<> template<>
+ void dispatch_object::test<3>()
+ {
+ // Describe param types with actual prototype instances
+ // (order-insensitive add() variant)
+ dispatcher.add(dummyMilitary, dummyAsteroid, militaryShipAsteroid);
+ dispatcher.add(dummyShip, dummyAsteroid, shipAsteroid);
+ dispatcher.add(dummyShip, dummyStation, shipStation);
+ dispatcher.add(dummyAsteroid, dummyStation, asteroidStation);
+
+ ensure_equals(dispatcher(*patrol, *obstacle), "militaryShipAsteroid");
+ ensure_equals(dispatcher(*tug, *obstacle), "shipAsteroid");
+ ensure_equals(dispatcher(*obstacle, *patrol), "");
+ }
+
+ template<> template<>
+ void dispatch_object::test<4>()
+ {
+ // Describe param types with actual prototype instances
+ // (order-insensitive add() variant)
+ dispatcher.add(dummyShip, dummyAsteroid, shipAsteroid);
+ // Even if we add the militaryShipAsteroid in the wrong order, it
+ // should still work.
+ dispatcher.add(dummyMilitary, dummyAsteroid, militaryShipAsteroid);
+ dispatcher.add(dummyShip, dummyStation, shipStation);
+ dispatcher.add(dummyAsteroid, dummyStation, asteroidStation);
+
+ ensure_equals(dispatcher(*patrol, *obstacle), "militaryShipAsteroid");
+ ensure_equals(dispatcher(*tug, *obstacle), "shipAsteroid");
+ }
+
+ template<> template<>
+ void dispatch_object::test<5>()
+ {
+ dispatcher.add<SpaceShip, Asteroid>(shipAsteroid);
+ dispatcher.add<MilitaryShip, Asteroid>(militaryShipAsteroid);
+ dispatcher.add<SpaceShip, SpaceStation>(shipStation);
+ dispatcher.add<Asteroid, SpaceStation>(asteroidStation);
+
+ ensure_equals(dispatcher(*patrol, *obstacle), "militaryShipAsteroid");
+ ensure_equals(dispatcher(*tug, *obstacle), "shipAsteroid");
+ }
+} // namespace tut
diff --git a/indra/test/llpermissions_tut.cpp b/indra/test/llpermissions_tut.cpp
index 9dbb9642dd..4eadc64b5a 100644
--- a/indra/test/llpermissions_tut.cpp
+++ b/indra/test/llpermissions_tut.cpp
@@ -485,15 +485,8 @@ namespace tut
template<> template<>
void permission_object_t::test<22>()
{
- LLPermissions perm,perm1;
- LLUUID creator("abf0d56b-82e5-47a2-a8ad-74741bb2c29e");
- LLUUID owner("68edcf47-ccd7-45b8-9f90-1649d7f12806");
- LLUUID lastOwner("5e47a0dc-97bf-44e0-8b40-de06718cee9d");
- LLUUID group("9c8eca51-53d5-42a7-bb58-cef070395db8");
- perm.init(creator,owner,lastOwner,group);
- LLXMLNode* xml_node = perm.exportFileXML();
- perm1.importXML(xml_node);
- ensure("exportFileXML()/importXML():failed to export and import the data ", perm1 == perm);
+ // Deleted LLPermissions::exportFileXML() and LLPermissions::importXML()
+ // because I can't find any non-test code references to it. 2009-05-04 JC
}
template<> template<>
diff --git a/indra/test/llsaleinfo_tut.cpp b/indra/test/llsaleinfo_tut.cpp
index 7f8219cdc8..fa5e047513 100644
--- a/indra/test/llsaleinfo_tut.cpp
+++ b/indra/test/llsaleinfo_tut.cpp
@@ -167,19 +167,8 @@ namespace tut
template<> template<>
void llsaleinfo_test_t::test<4>()
{
-// LLXMLNode is teh suck.
-#if 0
- S32 sale_price = 23445;
- LLSaleInfo saleinfo(LLSaleInfo::FS_CONTENTS, sale_price);
-
- LLXMLNode* x_node = saleinfo.exportFileXML();
-
- LLSaleInfo saleinfo1(LLSaleInfo::FS_NOT, 0);
-
- saleinfo1.importXML(x_node);
- ensure_equals("1.importXML() fn failed", saleinfo.getSalePrice(), saleinfo1.getSalePrice());
- ensure_equals("2.importXML() fn failed", saleinfo.getSaleType(), saleinfo1.getSaleType());
-#endif
+ // Deleted LLSaleInfo::exportFileXML() and LLSaleInfo::importXML()
+ // because I can't find any non-test code references to it. 2009-05-04 JC
}
template<> template<>
diff --git a/indra/test/llscriptresource_tut.cpp b/indra/test/llscriptresource_tut.cpp
index e384c275a3..705fdd16ae 100644
--- a/indra/test/llscriptresource_tut.cpp
+++ b/indra/test/llscriptresource_tut.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2006-2007, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/test/lltimestampcache_tut.cpp b/indra/test/lltimestampcache_tut.cpp
index 9e0de0fe60..3b102a3366 100644
--- a/indra/test/lltimestampcache_tut.cpp
+++ b/indra/test/lltimestampcache_tut.cpp
@@ -5,7 +5,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2008, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -13,12 +13,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/test/lltranscode_tut.cpp b/indra/test/lltranscode_tut.cpp
index 8abf9dc224..eb21979db0 100644
--- a/indra/test/lltranscode_tut.cpp
+++ b/indra/test/lltranscode_tut.cpp
@@ -4,7 +4,7 @@
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
- * Copyright (c) 2006-2007, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
@@ -12,12 +12,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
diff --git a/indra/test/test.h b/indra/test/test.h
index 16ec4effcf..cee185140c 100644
--- a/indra/test/test.h
+++ b/indra/test/test.h
@@ -13,12 +13,13 @@
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
--
GitLab