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

96 Commits (2aa981ac23bbdf2fd609e04434179be0cfec79ce)

Author SHA1 Message Date
nyx@NyxTop 65f5348997 EXT-1945 visual parameter animations broken 
First round of fixes for trying to fix the visual param animations

Code reviewed by Seraph
 2009-10-29 15:13:27 -04:00
Palmer 0be3878182 EXT-1930 - Crash after failed region crossing then teleport. Null pointer accessed. 
Reviewed by Nyx
 2009-10-28 15:53:29 -07:00
Steve Bennetts 127b428863 merge 2009-10-23 12:15:22 -07:00
Loren Shih 584962d5c7 svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14-seraph into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 
Bugs: EXT-1785 EXT-1818 EXT-1820 EXT-1845
 2009-10-23 15:21:49 +00:00
Steve Bennetts 642d368ecc merge 2009-10-21 18:49:19 -07:00
Loren Shih 67c4555a37 svn merge -r136533:136919 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 
* Bugs: EXT-1779
 2009-10-21 23:08:48 +00:00
Loren Shih 5164ed388c Code audit for r136515 ("merging in new wearable infrastructure...") 
No expected functionality change; this mostly contains cosmetic cleanup.

Reviewed by: Nyx
 2009-10-21 21:37:27 +00:00
Steve Bennetts 9fc74de1a1 merge 2009-10-19 12:57:25 -07:00
Neal Orman 0d6f1d125e EXT-1664 bugfix for male avatars have female bodies 
Found a couple bugs in the code relating to cross-wearable visual param linking.
Fixed with this patch - cross-wearable and inter-wearable visual params should
now link properly for both wearable-owned and avatar-owned parameters.

Code reviewed by Seraph
 2009-10-19 18:23:19 +00:00
Steve Bennetts 65bf35cfed merge 2009-10-19 10:49:48 -07:00
Mark Palange (Mani) 3e10fa4d51 merge from latest svn/viewer-2-0 to hg/viewer-2-0 2009-10-16 16:42:45 -07:00
Loren Shih 89d92267e2 svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 
For DEV-32867 : Avatar Pipeline Project - Multi-Attachments

This is a viewer-side-only, infrastructure-only merge for multi-attachments.  This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly.

Reviewed by: Vir.
 2009-10-16 21:41:31 +00:00
Neal Orman d08b0b6ae8 merging in new wearable infrastructure to get a step closer to eventually supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command: 
svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 .

Progress can be tracked in DEV-32551.

 -Nyx
 2009-10-16 17:56:30 +00:00
Bradley Payne 3bd6c1919c Merging avatar-pipeline/currently-worn-folder-10 down to viewer-2. 
svn merge -r 134766:135946  svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .
 2009-10-12 18:40:11 +00:00
Nat Goodspeed eca30a2262 QAR-1619: merge up to 2009-09-26 viewer/viewer-20 2009-09-30 21:42:04 -04:00
Martin Reddy b5724bc0e9 SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This 
fixes all of the parentheses warnings in the code.

Original patch was reviewed by merov (and others).
 2009-09-25 16:51:25 +00:00
Bradley Payne 7eca974a11 Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT-1121: Attaching / detaching objects doesn't affect the Current Outfit folder, and EXT-1090: Attachments detach on login, as well as work in progress for ensemble support and look details. 2009-09-24 18:05:38 +00:00
Nat Goodspeed c3e8c1f738 Disable MSVC "fatal warning" 4702 for boost::lexical_cast in Release build 2009-09-24 13:46:02 -04:00
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2 
Self reviewed.
 2009-09-22 11:11:45 +00:00
Steven Bennetts 0aa2bc4831 svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2 
Bug Fixes:
* EXT-637 EXT-595
Dev work:
* EXT-694
QA:
* Be sure feature works on other locales
Known issues:
* If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts.
* It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy.
* If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
 2009-08-28 22:58:17 +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
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 db5cda2667 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3 
QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.
 2009-08-03 22:25:48 +00:00
James Cook ca51e8f33d Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes. 
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
 2009-07-27 16:50:01 +00:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files: 
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
 2009-07-07 00:53:05 +00:00
James Cook d6101558a1 Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux. 
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
 2009-07-06 21:58:04 +00:00
Xiaohong Bao cb8641a639 fix for DEV-27483/SEC-283: Viewer crash: LLXform::setParent Creating loop when setting parent 2009-06-27 01:05:56 +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 9dfe0ca9a0 svn merge -r121194:121210 
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1

QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
 2009-05-22 09:58:47 +00:00
Adam Moss cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3 
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
 2009-05-04 17:43:26 +00:00
Christian Goetze 1aa0416aef svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge 
Melinda (coco): 5th and final batch of featurettes. My work here is done.
 2009-03-13 21:28:40 +00:00
Eric Tulla 6db6d81b0a Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272). 
No conflicts in the merge.

Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
 2009-03-05 00:29:27 +00:00
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2) 
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
 2009-02-18 21:10:16 +00:00
Mark Palange 46f8fb8781 svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22 
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
 2009-02-03 21:15:57 +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
Mark Palange 446c55538e svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ 
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
 2009-01-13 03:46:56 +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
Mark Palange fb793870fe QAR-1142 merging 1.22 RC0-RC4 changes. 
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
 2008-12-23 19:39:58 +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 afe61eb994 QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
Steven Bennetts da94c0eaa2 QAR-855 Viewer 1.21 RC 2 
merge viewer_1-21 94770-96059 -> release
 2008-09-12 06:27:13 +00:00
Andrew Meadows 222bca24c1 svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841 
this is a combined mergeback of the following branches as per QAR-841:
  maint-server/maint-server-1 (absorbed by maint-server-2)
  maint-server/maint-server-2
  maint-server/maint-server-3
  havok4/havok4-8
  havok4/havok4-9

yes dataserver-is-deprecated
 2008-09-05 22:03:35 +00:00
Steven Bennetts 4a6bacea0f merge viewer/viewer_1-21 94170-94770 -> release 
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
 2008-08-28 23:57:41 +00:00
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge 
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
 2008-08-12 17:29:50 +00:00
Karl Steifvater 52562e2e66 svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge 
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
 2008-07-23 21:20:19 +00:00
Josh Bell 35b4a91129 svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> release 
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
 2008-07-22 20:55:02 +00:00
Karl Steifvater df4f20d4f5 merge uv-picking branch. 
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
 2008-07-22 20:12:37 +00:00