Age | Commit message (Collapse) | Author |
|
|
|
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.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.cpp
# 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/llimpanel.cpp
# indra/newview/llimpanel.h
# 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/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# 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/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
|
|
|
|
LF, and trim trailing whitespaces as needed
|
|
|
|
llDialog buttons
|
|
|
|
|
|
|
|
|
|
renamed fast timers to have unique names, changes instance tracker to never allow duplicates
|
|
|
|
containing a shared object
potential fix by making instance tracker allow key collisions for LLToastNotifyPanel
changed assertion macro to use original unpreprocessed source code
renamed instance tracker behavior macros to use LL prefix
added RestoreCameraPosOnLogin setting to optionally restore old camera positioning behavior
|
|
if they were sent before his first accept
|
|
|
|
Problem was that LLIMToastNotifyPanel::snapToMessageHeight was calling LLToastPanel::reshape, which would then call LLIMToastNotifyPanel::reshape again. Resolution: Modified LLIMToastNotifyPanel::snapToMessageHeight to cleanly replicate what LLToastPanel::reshape was doing.
|
|
dismiss toast
removed special case logic for dealing with user online/offline collisions
added ability to cancel old duplicate notifications
|
|
phase 1, removal of most of llnotificationhandler
|
|
plaintext mode.
- Added argument show_images to constructors of LLIMToastNotifyPanel and LLToastNotifyPanel. Depending on it plaintext attribute for textbox with notification text is set. Used this argument when adding notification to chat history if IM is in plaintext mode.
|
|
|
|
and doesn't fit on toast
* Unbolded startup toast message text;
* Avoided increasing complexity of LLToastNotifyPanel class that in future
should be decoupled on separate independent toast panel implementations and
added LLPanelGenericTip class to represent generic notifytip panels.
reviewed by Vadim Savchuk and Mike Antipov at
https://codereview.productengine.com/secondlife/r/214/
--HG--
branch : product-engine
|
|
plain text chat was enabled while unresolved offer was in hided IM window”,
Added check to LLToastNotifyPanel destructor whether we should close
notification since notification will be reused by IM floater when reload
messages, the rule is: if LLToastNotifyPanel destroying but IM floater is
exists – we shouldn't close notification.
The problem is that notification was incorrectly deleted when IM floater
reloads messages on chat log fromat change event.
reviewed by Vadim Savchuk at
https://codereview.productengine.com/secondlife/r/80/
--HG--
branch : product-engine
|
|
by height on IM window resize
Added new Toast panel class for use in IM floater. New class handles IM floater reshape and updates Toast height.
--HG--
branch : product-engine
|
|
Implemented requested feature - "Resolving offer in the notification toast shouldn't remove offer panel form IM log until IM session is restarted"
--HG--
branch : product-engine
|
|
--HG--
branch : product-engine
|
|
Added functionality to make Toasts accept multiple user inputs(clicks on option buttons).
--HG--
branch : product-engine
|
|
than in 1.23 viewer
Cause:
Dialog floater had arranged own shape to the shape of toast panel. So there is no way to change such behaviour from xml without changing of other toasts
Solution:
New param has been added to constructor of toast panel to make possible setting an initial shape of panel before update buttons layout
--HG--
branch : product-engine
|
|
made all type offers be embedded to the IM floater;
made showing offer toast if IM floater isn't visible;
corrected IM message counter on showing offer toast;
--HG--
branch : product-engine
|
|
Notifications wells”,
embedded inventory offer panel into IM window;
--HG--
branch : product-engine
|
|
wrong order
Order of the buttons has been recovered to viewer 1.23 behavior.
--HG--
branch : product-engine
|
|
internationalization
Changes:
1. Remove hard coded button's width. Now buttons will be reshaped to required size if the required width is bigger then default.
2. Default width is configurable now.
--HG--
branch : product-engine
|
|
Fixed many more includes
|
|
creation of dummy icon
removed commented code from XML file
removed from toast notify panel Icon member and a corresponding code
--HG--
branch : product-engine
|
|
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231
* Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476
* IM changes
|
|
1078-1091 -> viewer-2.0.0-3
|