livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,501 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

55 Commits (de1e1db9600a03ab5b0dc3f04a5bdcee30632f05)

Author SHA1 Message Date
Seth ProductEngine bdf6363e6a EXP-1282 FIXED Bottom bar removed. 
- LLBottomTray code and XUI removed.
- "Speak" buttom which resided in Bottom bar removed.
- Voice connection status update moved from LLBottomTray to LLVivoxVoiceClient.
 2011-10-14 01:07:16 +03:00
Leyla Farazha 0207d7e9e4 EXP-1247 Nearby chat as part of chat floater 2011-09-27 15:41:06 -07:00
Dave SIMmONs 5e486cf21b Cleanup: use CHAT_CHANNEL_DEBUG instead of 2147483647 2011-04-05 10:34:24 -07:00
Dave SIMmONs acb7638785 ER-614: Add lleventhost API to send chat messages. Cleanup code a bit, now invoking proper routine to make viewer do chat animations. 
Commented out some un-used chat related code in llchatbar.cpp and llnotificationmanager.h.
Also re-named a singleton class in llnearbychatbar.cpp so we don't have multiple LLChatHandler classes.
Reviewed by Kelly
 2011-03-16 13:20:18 -07:00
Richard Linden 1911993cc7 merge 2010-09-16 19:45:57 -07:00
Oz Linden bf2849ef23 [STORM-176] Clean up handling of the maximum length of chat messages 2010-09-15 11:33:59 -04:00
Ardy Lay bdd1017d0d [mq]: VWR-19499-AppUriChatLimit 2010-08-30 14:18:48 -05:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b 
back-out the back-out for this branch.  yay.
 2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21 
Backing out this merge that I pushed (prematurely) to the wrong place.
 2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Richard Nelson be50a053ed first pass at hints 2010-08-12 09:46:45 -07:00
Richard Nelson 566e3969f9 deprecated LLPanel::child*() methods 2010-07-30 10:02:30 -07:00
Leyla Farazha 83a7a342ea removing fullscreen functionality 
reviewed by richard cc#212
 2010-06-15 17:21:27 -07:00
Brad Payne (Vir Linden) b2a667b722 For EXT-4666: changed LLGestureManager to LLGestureMgr throughout 2010-03-29 11:10:54 -04:00
Ychebotarev ProductEngine f28778b8b8 work on EXT-4322 Remove the Communicate floater 
leave some LLFloaterChat usages commented for later review...

--HG--
branch : product-engine
 2010-01-18 17:50:19 +02:00
Denis Serdjuk 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
Richard Nelson 6c70154cd1 converted focus change callbacks to use signals 
replaced mFocusChangedSignal that PE added with our hierarchical focus mgmt

reviewed by Leyla
 2009-09-30 01:00:51 +00:00
Martin Reddy cb926640b7 DEV-15182 VWR-5474 SEC-20: re-enabled support for clicking on the 
following SLAPP URL types in an untrusted browser:

  secondlife:///app/agent/...
  secondlife:///app/group/...
  secondlife:///app/parcel/...

In order to find a compromise between supporting these commands and
security concerns over potential griefing vectors, we use a throttling
solution when these commands are issued by untrusted web browsers.
That is, we only process one command per 15 seconds.

This applies to external browsers, like Firefox, as well as the
internal SL browser.

Notably, we continue to block secondlife:///app/teleport URLs.

Reviewed by james.
 2009-09-14 17:09:45 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
 2009-08-27 19:00:18 +00:00
Richard Nelson 138bf11322 merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3 
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
 2009-08-24 20:04:52 +00:00
Steven Bennetts 0bf4b5f222 merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0 
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring
 2009-08-12 01:12:27 +00:00
Richard Nelson 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
Steven Bennetts 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
Steven Bennetts 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
Steven Bennetts 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
Adam Moss e188badaf2 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme 
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
 2009-02-03 17:56:26 +00:00
Aaron Brashears 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
Melinda Green e1d8dac25a svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge 
Resolving QAR-1051 Merge featurettes batch #4
 2008-12-15 21:21:19 +00:00
Adam Moss fd46865a50 QAR-1040 maint-viewer-11 + OpenAL combo mergeme 
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
 2008-12-02 20:35:40 +00:00
Mark Palange f89f19990c QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
Steven Bennetts d725e5b240 QAR-872 Viewer 1.21 RC 3 
merge viewer_1-21 96116-97380 -> release
 2008-09-29 19:14:50 +00:00
Steven Bennetts b9b4a4d934 QAR-782 Merge featurettes batch #2 
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
 2008-08-13 19:37:05 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 
dataserver-is-deprecated
 2008-06-26 00:39:00 +00:00
James Cook 2b863df7c8 svn merge -r87877:87878 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui/maint-ui-12-qa-5 which is the last iteration of the maint-ui series of branches. Future work will be in featurettes. 2008-05-20 23:24:16 +00:00
James Cook 36fccc3888 svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 maint-ui-11-qa). 2008-04-30 23:30:09 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release 
QAR-424
 2008-04-01 17:45:04 +00:00
James Cook 9d12bd5e27 svn merge -r81924:81925 svn+ssh://svn.lindenlab.com/svn/linden/branches/browser-hud/browser-hud-4-merge-2 
QAR-345 Browser HUD web based tutorial for new users
 2008-03-11 00:09:44 +00:00
Josh Bell a10f963900 svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge 
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
 2008-03-04 16:59:57 +00:00
Steven Bennetts 2e32d44e71 merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 
QAR-290 = QAR-271 + QAR-191
 2008-02-19 21:42:32 +00:00
Josh Bell 3cb5c6864e QAR-211: Logical merge of: 
svn merge -r 76578:76594 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxbhear-based-on-release-r76573
svn merge -r 77016:77668 svn+ssh://svn.lindenlab.com/svn/linden/branches/scrolllist_fixes
svn merge -r 75889:75948 svn+ssh://svn.lindenlab.com/svn/linden/branches/simcrash-economy-fix
svn merge -r 77312:77356 svn+ssh://svn.lindenlab.com/svn/linden/branches/revoke-gods
plus addition to MANIFEST for revoke-gods

Actual merge:

svn merge -r 77525:77696 svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-2008-01-15-a

* QAR-177 Linux Voice Support Merge BuildMe
* QAR-197 merge of scrolllist_fixes into release for 1.19.0 (plus QAR-216 additions)
* QAR-194 simcrash-economy-fix
* QAR-201 Revoke gods added to deploy
 2008-01-17 23:29:26 +00:00
Jon Wolk 7dd08303a3 svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134 2007-12-19 00:56:59 +00:00
Don Kjer 1b550aaec2 EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release 
ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
 2007-10-11 00:28:42 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Josh Bell e8e6679454 svn merge -r 67483:67657 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1 
This is "really" the merge of everything that went out in the 1.18.2(0) viewer release.
 2007-08-14 00:27:49 +00:00
Monroe Williams 7138fb673a Merge down from Branch_1-18-1: 
svn merge --ignore-ancestry  svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
 2007-08-02 01:18:34 +00:00
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
Kelly Washington 3e9872a297 merge -r61423:62602 svn/branches/maintenance --> release 2007-05-30 17:39:09 +00:00
Don Kjer 1c909afe39 svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00