ce9962b338
Merged in viewer-release
2013-07-11 17:49:13 -07:00
8642f57dd9
Removed debugging.
2013-05-16 10:31:33 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04: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
ae2e611dfb
CHUI-315 (Nearby chat messages do not appear in conversation floater): cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it.
2012-08-31 16:52:50 +03:00
6e2739b76c
SH-3625 - some associated cleanup, do_update field is useless in various calls because of possible race conditions
2012-08-22 16:16:54 -04:00
14708a3ace
CHUI_310 make NearbyChat a singletone
2012-08-22 18:27:29 +03:00
bba0f4f74e
CHUI-119 WIP
2012-05-31 16:37:22 +03:00
ae8ed3fc2d
Merge with viewer-development
2011-05-17 19:21:55 +00:00
e26bfe00ef
STORM-380 FIXED Added syncing animations and sounds before the gesture starts playing.
...
The actual playing of animations and sounds of a gesture starts only when all needed animations and sound files are loaded into viewer cache. This reduces the delay between animations and sounds meant to be played simultaneously but may increase the delay between the moment a gesture is triggered and the moment it starts playing.
Fixed calling assets callback to clean up the void pointer in getAssetData() and avoid potential memory leaks.
2011-04-22 01:07:52 +03:00
f2bb81d176
Added LLEventHost API for gestures. Have new llgesturelistener.cpp and .h files, wired up to LLGestureMgr class. Reviewed by Kelly
2011-03-28 16:54:40 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
9ae6672a15
EXT-8221 WIP Crash in LLGesture::notifyObservers
...
Code cleanup for help with diagnosing this issue.
2010-07-09 10:19:02 -04:00
347e88961c
EXT-4919 WIP - populating new users with more gestures, and activating appropriate ones
2010-06-17 17:37:28 -04:00
516ec63f52
EXT-6749 : Have all observers persist/retry when items are missing after notifications
...
Added mNumTries and took out mRetryIfMissing
2010-04-07 14:40:36 -04:00
f096f02278
EXT-6728 : Have LLInventoryFetchItems/DescendentsObserver inherit from a base abstract LLInventoryFetchObserver class
...
Added a new abstract class LLInventoryFetchObserver from which LLInventoryFetchItems and LLInventoryFetchDescendents inherit.
Also changed isEverythingComplete to isFinished and made some other minor superficial changes.
2010-04-06 18:58:26 -04:00
cdbdb11686
EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
...
FetchObservers now take in a list of IDs to check against.
Made some naming changes.
2010-04-06 14:47:20 -04:00
785d4c34b6
EXT-4151 : Immediately check if a fetchObserver filter is done, else add to observer list automatically
...
Preliminary work to clean up naming conventions.
2010-04-06 10:19:15 -04:00
568d6ed229
EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'s
...
Fixed some more typedefs that I missed in first checkin.
2010-04-02 15:19:44 -04:00
114e5ca083
EXT-5940 : Typedef all vector<LLUUID>'s
...
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
b6e7850c0a
Merge
2010-03-29 12:30:09 -04:00
58d76a9ecf
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
94e6e10739
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
b2a667b722
For EXT-4666: changed LLGestureManager to LLGestureMgr throughout
2010-03-29 11:10:54 -04:00
4ff53b9066
For EXT-4666: changed LLAppearanceManager to LLAppearanceMgr throughout
2010-03-29 11:02:39 -04:00
46fe5d49ca
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
9ab7d647c1
EXT-3416 Can't name a new gesture on creation (and renaming is HARD)
...
reviewed by Callum
2010-01-21 15:09:38 -08:00
eb800ade7e
At last! Implemented normal task EXT-3477 (Change gesture list implementation).
...
Created a new widget consisting of button and scrollist. List is added to NonSideTrayView
to properly draw it without using topcontrol (because it caused problems).
This commit also fixes following bugs:
EXT-3301 (Opening Gestures on Bottom Tray Disables Move Button)
EXT-3190 (No bottom tray's context menu appears if right mouse click was perform over enabled Gesture button)
EXT-2610 ('Gesture' btn: floater opens on OnMouseDown)
--HG--
branch : product-engine
2010-01-14 17:42:21 +02:00
4fc7b91a79
implemented EXT-2323 “Get rid from obsolete notification widgets”;
...
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
009c62f13e
Remove gesture links from COF when gesture is deactivated
...
--HG--
branch : avatar-pipeline
2009-12-04 18:57:08 -05:00
34d3d02101
fixed bug EXT-2785 All gestures appear in Gestures window only after inventory/gestures has been invoked
...
Cause:
Specific implementation of LLInventoryCompletionObserver. It call done() on startup before all items had been loaded.
Changes:
LLGesturemanager will be loaded appropriated inventory item itself.
LLGestureInventoryfetchObserver has been removed.
--HG--
branch : product-engine
2009-11-27 16:07:14 +02:00
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
0e351bedb6
Removed llnotifications.h from all headers by adding llnotificationsptr.h
...
Fixed many more includes
2009-11-24 22:55:56 -08:00
4a38c90adb
EXT-2641 : Linked gestures aren't showing up as being worn (and possibly more serious problems with linked gestures)
...
Gestures now properly handle link indirection.
2009-11-18 17:03:17 -05:00
0ec8d0aacf
implemented major task EXT-1897 Ctl + G Gestures floater should show ALL gestures from inventory, not just Active Gestures
...
refactoring of gesture's manager
--HG--
branch : product-engine
2009-11-13 15:51:22 +02:00
7447454e7e
Fix for a crash bug on login after clearing the cache.
2009-08-04 23:41:19 +00:00
eb853f55c0
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-08-04 01:12:59 +00:00
e97f7728a9
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
2009-07-30 23:22:41 +00:00
73a97010e6
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1059 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1070 -> svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-07-21 00:57:23 +00:00
39905b927d
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4
2009-07-02 00:38:13 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
b01c75cb42
svn merge -r117314:117337
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
667ca55bad
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2009-01-05 18:59:12 +00:00
d725e5b240
QAR-872 Viewer 1.21 RC 3
...
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
25de7377c1
QAR-377 maintenance-6 merge:
...
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
2008-03-19 00:01:42 +00:00
Aura Linden