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
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
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
b71c7f37ea
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llagent.cpp
# indra/newview/llagent.h
# indra/newview/llagentcamera.cpp
# indra/newview/llagentcamera.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llattachmentsmgr.cpp
# indra/newview/llattachmentsmgr.h
# indra/newview/llavataractions.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llcompilequeue.cpp
# indra/newview/llcontrolavatar.h
# indra/newview/lldirpicker.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolalpha.h
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfasttimerview.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfloateravatarpicker.cpp
# indra/newview/llfloaterbeacons.cpp
# indra/newview/llfloaterbvhpreview.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llfloaterdisplayname.cpp
# indra/newview/llfloatergotoline.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llfloatertools.h
# indra/newview/llfloateruipreview.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgesturemgr.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/llhudeffectlookat.cpp
# indra/newview/llhudeffectlookat.h
# indra/newview/llhudicon.cpp
# indra/newview/llhudmanager.cpp
# indra/newview/llhudtext.cpp
# indra/newview/llhudtext.h
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/llinventorymodel.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/lllocalbitmaps.cpp
# indra/newview/lllogininstance.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llmodelpreview.h
# indra/newview/llmutelist.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
# indra/newview/llnotificationlistitem.cpp
# indra/newview/lloutputmonitorctrl.cpp
# indra/newview/llpanelcontents.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelexperiencepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelgrouproles.cpp
# indra/newview/llpanellandaudio.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobject.h
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaces.cpp
# indra/newview/llpanelpresetspulldown.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelvolume.cpp
# indra/newview/llpanelwearing.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llpreviewnotecard.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llpreviewtexture.cpp
# indra/newview/llpreviewtexture.h
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepaneliteminfo.cpp
# indra/newview/llsidepaneltaskinfo.cpp
# indra/newview/llsnapshotlivepreview.cpp
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturecache.h
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltoastimpanel.cpp
# indra/newview/lltoolbarview.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/lltoolface.cpp
# indra/newview/lltoolfocus.cpp
# indra/newview/lltoolgrab.cpp
# indra/newview/lltoolgun.cpp
# indra/newview/lltoolgun.h
# indra/newview/lltoolpie.cpp
# indra/newview/lltoolplacer.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/lluploaddialog.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerfoldertype.cpp
# indra/newview/llviewerinput.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewermenu.h
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobject.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerobjectlist.h
# indra/newview/llviewerparcelmgr.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerregion.h
# indra/newview/llviewershadermgr.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexlayer.h
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvoavatarself.h
# indra/newview/llvoiceclient.h
# indra/newview/llvosky.cpp
# indra/newview/llvosurfacepatch.cpp
# indra/newview/llvotree.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvovolume.h
# indra/newview/llvowater.cpp
# indra/newview/llworld.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/llworldmipmap.cpp
# indra/newview/pipeline.cpp
2024-02-22 11:43:04 +01:00
314639426d
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llchat.h
# indra/llui/llcombobox.cpp
# indra/llui/llcontainerview.h
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.cpp
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmultifloater.cpp
# indra/llui/llmultifloater.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/llui/llspinctrl.cpp
# indra/llui/llspinctrl.h
# indra/llui/lltabcontainer.cpp
# indra/llui/lltabcontainer.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llui/llview.h
# indra/llui/llviewereventrecorder.cpp
# indra/llxml/llcontrol.cpp
# indra/llxml/llcontrol.h
# indra/newview/llagentlanguage.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchicletbar.cpp
# indra/newview/llfloaterbuildoptions.cpp
# indra/newview/llfloaterbuildoptions.h
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llfloaterconversationpreview.h
# indra/newview/llfloaterdestinations.h
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterjoystick.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llfloaterpay.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloaterscriptdebug.h
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llfloatersearch.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llmediactrl.h
# indra/newview/llmoveview.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnotificationlistitem.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelprofileclassifieds.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotlocal.cpp
# indra/newview/llpanelsnapshotpostcard.cpp
# indra/newview/llpreviewnotecard.h
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/llsyswellwindow.h
# indra/newview/lltexturectrl.h
# indra/newview/lltoolbarview.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/llwearableitemslist.cpp
2024-02-21 13:07:42 +01:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
b6c1e98b3e
FIRE-31079 - remove references to unused LLPanelTopInfoBar
2021-08-21 19:51:24 +02:00
d2db64d75f
FIRE-7179: Width of chiclet bar seems to change randomly (and was affected by completely unrelated location text in navigation bar)
2020-10-29 09:42:40 +01:00
d93b92ec1d
Merge viewer-bear
2018-09-12 20:13:12 +02:00
f1d4e788e7
SL-967 simplify viewer log file field syntax
...
MAINT-8991: only escape log message characters once, add unit test
remove extra log line created by LL_ERRS
document that tags may not contain spaces
2018-08-29 16:43:45 -04:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
d2c3c2f9fe
MAINT-5232: Normalize LLSingleton subclasses.
...
A shocking number of LLSingleton subclasses had public constructors -- and in
several instances, were being explicitly instantiated independently of the
LLSingleton machinery. This breaks the new LLSingleton dependency-tracking
machinery. It seems only fair that if you say you want an LLSingleton, there
should only be ONE INSTANCE!
Introduce LLSINGLETON() and LLSINGLETON_EMPTY_CTOR() macros. These handle the
friend class LLSingleton<whatevah>;
and explicitly declare a private nullary constructor.
To try to enforce the LLSINGLETON() convention, introduce a new pure virtual
LLSingleton method you_must_use_LLSINGLETON_macro() which is, as you might
suspect, defined by the macro. If you declare an LLSingleton subclass without
using LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() in the class body, you can't
instantiate the subclass for lack of a you_must_use_LLSINGLETON_macro()
implementation -- which will hopefully remind the coder.
Trawl through ALL LLSingleton subclass definitions, sprinkling in
LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() as appropriate. Remove all explicit
constructor declarations, public or private, along with relevant 'friend class
LLSingleton<myself>' declarations. Where destructors are declared, move them
into private section as well. Where the constructor was inline but nontrivial,
move out of class body.
Fix several LLSingleton abuses revealed by making ctors/dtors private:
LLGlobalEconomy was both an LLSingleton and the base class for
LLRegionEconomy, a non-LLSingleton. (Therefore every LLRegionEconomy instance
contained another instance of the LLGlobalEconomy "singleton.") Extract
LLBaseEconomy; LLGlobalEconomy is now a trivial subclass of that.
LLRegionEconomy, as you might suspect, now derives from LLBaseEconomy.
LLToolGrab, an LLSingleton, was also explicitly instantiated by
LLToolCompGun's constructor. Extract LLToolGrabBase, explicitly instantiated,
with trivial subclass LLToolGrab, the LLSingleton instance.
(WARNING: LLToolGrabBase methods have an unnerving tendency to go after
LLToolGrab::getInstance(). I DO NOT KNOW what should be the relationship
between the instance in LLToolCompGun and the LLToolGrab singleton instance.)
LLGridManager declared a variant constructor accepting (const std::string&),
with the comment:
// initialize with an explicity grid file for testing.
As there is no evidence of this being called from anywhere, delete it.
LLChicletBar's constructor accepted an optional (const LLSD&). As the LLSD
parameter wasn't used, and as there is no evidence of it being passed from
anywhere, delete the parameter.
LLViewerWindow::shutdownViews() was checking LLNavigationBar::
instanceExists(), then deleting its getInstance() pointer -- leaving a
dangling LLSingleton instance pointer, a land mine if any subsequent code
should attempt to reference it. Use deleteSingleton() instead.
~LLAppViewer() was calling LLViewerEventRecorder::instance() and then
explicitly calling ~LLViewerEventRecorder() on that instance -- leaving the
LLSingleton instance pointer pointing to an allocated-but-destroyed instance.
Use deleteSingleton() instead.
2016-09-15 20:18:12 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
d7282efb6f
FIRE-17318: Add option to use legacy notification well window (simple list view)
2015-11-19 21:32:47 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
0e0795b602
Merge viewer-notice
2015-10-05 13:08:48 +02:00
9a93bb1861
merge changes for MAINT-4734
2015-05-18 21:08:22 +03:00
b147d659dc
MAINT-4734 (Separate transaction notices from group notice/invites)
...
1) stripped off attachment field;
2) made logos (group's, sender's, etc) in expanded view the same size as in condensed view;
3) turned on notification showing upon click;
4) fixed cropped right border of Invite and Transactions notifications;
5) enabled "Collapse All" button;
6) stripped off unnecessary icons.
2015-03-17 18:26:28 +02:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
e5d6a14f05
MAINT-4734 (Separate transaction notices from group notice/invites) - initial version
...
Works:
1) All new notices shown on "Invites" tab of new floater "NOTIFICATIONS TABBED" in condensed view
To be done:
1) Show other types of notices, like transactions and system
2) Separate notices between tabs "Invites", "System", "Transactions"
3) Design full notice view (in addition to condensed view)
2015-01-09 20:17:39 +02:00
ae54e5160e
Update to build on Xcode 6.0: remove unused variables and functions
2014-10-18 11:39:21 -07:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
2bb5f3a7f4
Comment out some unused functions
2013-10-12 23:18:57 -06:00
9e9b3938ce
FIRE-11172 / FIRE-11222 / FS communication UI:
...
* Re-add IM/group/adhoc chiclets
* Re-add IM well chiclet
* Re-enable stand-alone IM floaters
2013-08-05 14:35:28 +02:00
8146bbda39
Merge
2013-07-09 16:26:07 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
64b001cda3
Fix some more CHUI merge issues including old merge bug in llavatarlist.cpp
2013-07-08 14:19:57 +02:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
cc900b732d
CHUI-592 FIXED Unread notifications are not being saved in notification chiclet
2012-12-19 02:44:48 +02:00
f1155c4fa5
CHUI-573 FIXED Notification chiclet shown when object chiclets are shown
2012-12-04 04:14:51 +02:00
15157ecb09
CHUI-553 FIXED Remove the conversation chiclet
2012-11-29 03:27:45 +02:00
4094972434
CHUI-389 FIXED Added parameter for sessionAdded to get access to has_offline_msg value.
...
Set UnreadIMs icon to visible if messages were sent while offline.
2012-11-14 15:28:05 +02:00
486bdf3284
CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
...
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02:00
a8ca9dc5a9
CHUI-374 ADD. FIX, CHUI-442 FIXED (Nearby chat is torn off and cannot be docked if nearby chat is received while conversation floater is closed) - implement. lazy creating of container
2012-10-31 17:51:55 +02:00
63ef2950e9
CHUI preparation phase 1: Move FS-specific communication parts into a separate domain and out of the way for CHUI merge to reduce conflicts
...
* LLChatHistory moved to FSChatHistory
* LLFloaterNearbyChat moved to FSFloaterNearbyChat
* LLIMFloater moved to FSFloaterIM
* LLIMFloaterContainer moved to FSFloaterIMContainer
* LLNearbyChatbarListener moved to FSNearbyChatbarListener
* LLNearbyChatControl moved to FSNearbyChatControl
* LLNearbyChatHub moved to FSNearbyChatHub
* floater_im_container.xml moved to floater_fs_im_container.xml
* floater_im_session.xml moved to floater_fs_im_session.xml
* floater_nearby_chat.xml moved to floater_fs_nearby_chat.xml
* widget chat_history.xml moved to fs_chat_history
* widget nearby_chat_control.xml moved to fs_nearby_chat_control.xml
2013-02-28 18:57:38 +01:00
f0986b43d9
More trivial EOL fixes
2013-01-30 20:09:55 -07:00
c09eb7d05c
FIRE-2371: Make hide chiclet option work instantly without relog & added German translation
2012-12-09 19:11:00 +01:00
7e67852f0c
FIRE-2371: Making chiclets optional.
...
* Notifications envelope and sum of IMs will remain on the screen all the time anyway, when option is checked.
2012-12-09 16:12:41 +01:00
0e316a1510
CHUI-125 FIXED Supressed of a commented out code
2012-06-27 21:30:05 +03:00
695ca70b2b
Merge
2012-06-21 16:40:52 +03:00
fd247320ce
CHUI-125 FIXED if a call is accept then open im-session's floater
2012-06-20 17:51:56 +03:00
c0842339e7
CHUI-138 : Suppress chiclets for conversations when using tabbed UI; Make sure list is cleaned up on close
2012-06-19 15:05:20 -07:00
d11f542ffe
CHUI-120 WIP Added starting ad hoc conference in the same floater as P2P chat, after adding more participants.
...
- Added a parameter to LLAvatarActions::startConference() and LLIMMgr::addSession() to pass the uuid of a P2P IM floater which should be used to start a new conference in it.
- In LLChicletBar::sessionRemoved() we don't close the IM floater if it is going to be re-used for a new conference.
2012-06-07 00:59:05 +03:00
29ad432c8b
made layoutPanels have constant user_resize and auto_resize attributes
2012-01-19 19:52:49 -08:00
cd4204b273
EXP-1758 WIP Progress spinner not shown during merketplace synch if Merchant Outbox floater was previously minimized
...
rewrote layout_stack resizing logic to be symmetrical
2012-01-16 11:03:33 -08:00
7359a5f34b
EXP-1463 ADDITIONAL FIX (IM chiclets overlay Mini-Location bar)
...
- Don't let chiclet list left side to be out of chiclet_container
2011-12-02 19:05:22 +02:00
Ansariel