Ansariel
|
0ecfbc3de9
|
Merge remote-tracking branch 'LGPL/master'
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
|
2024-05-16 14:10:55 +02:00 |
|
Andrey Lihatskiy
|
1b68f71348
|
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
|
2024-04-29 07:56:09 +03:00 |
|
Ansariel
|
a5261a5fa8
|
Convert BOOL to bool in llui
|
2024-02-21 03:00:25 +02:00 |
|
Andrey Kleshchev
|
bdedaf5872
|
SL-14728 Im session without id should be closable
|
2021-01-21 23:18:18 +02:00 |
|
Andrey Lihatskiy
|
aaaf3189c4
|
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
|
2020-05-19 22:37:41 +03:00 |
|
maxim_productengine
|
dcbbe66e0a
|
SL-12566 Select current preset in 'Select preset' combo when opening the floater
|
2020-01-16 13:48:45 +02:00 |
|
Graham Linden
|
ac2fc3029f
|
Backout tabs v spaces changes.
'warn-on-failure:no-tabs'
|
2019-03-12 08:56:26 -07:00 |
|
Graham Linden
|
3e56002245
|
Tabs -> spaces.
|
2019-03-11 08:11:09 -07:00 |
|
Jonathan Yap
|
3afaa79962
|
STORM-2145 Fixed bug. Now you can only have one of the load/save/delete floaters open at once.
|
2018-01-15 11:40:32 -05:00 |
|
Jonathan Yap
|
1b7c00b558
|
STORM-2082 Rearrange Reset, load, save, delete buttons.
Make load, save, and delete floaters close when preferences floater closes.
|
2015-02-22 10:19:41 -05:00 |
|
Jonathan Yap
|
58577702a8
|
STORM-2082 Finally(?) deal properly with dirty UI processing.
Code cleanup, some per bitbucket comments.
|
2015-01-20 18:24:02 -05:00 |
|
Jonathan Yap
|
611391a818
|
STORM-2082 Update to new UI design. Bugs are not worked out yet.
|
2015-01-20 09:17:23 -05:00 |