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
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
Leslie Linden
8874ac39c1
EXP-1462 FIX -- Moving speak button or voice settings button between toolbars can cause viewer to crash on Mac
...
* Updated iterator code to not erase stuff while we're iterating through it!
Reviewed by Richard.
2011-10-24 17:06:48 -07:00
Seth ProductEngine
0297f55c6d
EXP-1416 FIXED "Speak" and "Voice controls" buttons added as control views in LLTransientFloaterMgr to prevent hiding the transient IM floater.
2011-10-21 17:26:47 +02:00
Monroe Linden
1e050c2ed8
merge
2010-12-02 14:33:42 -08:00
Mark Palange (Mani)
8c2026d6b7
CHOP-135 Bug fixes.
2010-11-18 21:57:27 -08:00
Richard Nelson
01b28ddf5d
EXP-156 WIP Implement custom Skylight hints
2010-10-06 20:10:36 -07:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Alexei Arabadji
6ffc21e00d
fixed EXT-3395 "Docked IM/Chat windows shouldn't hide when voice control panel is opened",
...
added transient controls group 'DOCKED' for temporary excluded docked floaters and dock widgets;
--HG--
branch : product-engine
2010-01-25 12:07:23 +02:00
Alexei Arabadji
d18c46bc15
win build fixed
...
--HG--
branch : product-engine
2010-01-22 14:47:51 +02:00
Alexei Arabadji
74429f2ed9
fixed EXT-3670 “Clicking on IM session in IM session well closes IM floater”,
...
implemented exclude sets for groups of transient floaters, now transient floaters not closes if user click on view from global exclude set or from floater group set;
made IM floater goes foreground if it visible but not focused instead hide floater;
--HG--
branch : product-engine
2010-01-22 13:42:52 +02:00
Alexei Arabadji
2b873b073c
fixed EXT-3395 “Docked IM/Chat windows shouldn't hide when voice control panel
...
is opened”,
made transient floaters visible if clicked any context menu;
--HG--
branch : product-engine
2009-12-21 12:46:11 +02:00
Steven Bennetts
2c1aacf814
Merging revisions 2102-2104 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
...
* Bugs: EXT-1609 EXT-1255 EXT-1299
2009-10-21 04:47:55 +00:00