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

2817 Commits (4a376104f16e54651db298128f9c8f740e72bd83)

Author SHA1 Message Date
Rick Pasetto 4a376104f1 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 16:14:19 -08:00
Rick Pasetto bea3b937d9 Fix a potential crash if scroll button is not there 2009-11-11 16:12:25 -08:00
Rick Pasetto e3356c0695 some minor changes based on Richard's code review 
Code Collab #34
 2009-11-11 16:07:02 -08:00
Monroe Linden eda34b82ee Remove references to media_panel_scroll in LLPanelPrimMediaControls::updateShape(), as it was removed from the XUI file. 2009-11-11 15:50:43 -08:00
brad kittenbrink 8519205533 Changing VC Debugger working directory to be ${CMAKE_CURRENT_SOURCE_DIR} to restore ability to edit in place xui files, shaders, etc. 2009-11-11 18:49:32 -05:00
James Cook afb49ed36e Fix bad XML causing UI images not to load. 2009-11-11 15:09:28 -08:00
Rick Pasetto 9fe4b5a3c1 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 15:08:22 -08:00
Rick Pasetto d023672e59 Add ToolTip functionality to LLScrollListCell 
This change enables a user to set a custom tool tip on a particular
scroll list cell by calling setToolTip().  Then, this tool tip is
used.  If this is not done, the existing tooltip functionality is left
alone.

Reviewed by Richard
 2009-11-11 15:08:00 -08:00
Steve Bennetts 064c91ae52 Merge from product-engine 2009-11-11 14:56:51 -08:00
Nyx (Neal Orman) 310ce55275 merge: pulling changes from trunk 2009-11-11 17:28:51 -05:00
Nyx (Neal Orman) a24c4af67d fixing build - last commit had bad call to startAppearanceAnimation 
function definition of startAppearanceAnimation chagned - last patch
missed eliminating the parameters at line 6594 in llvoavatar.cpp.
This patch fixes the issue, confirmed builds and runs locally.
 2009-11-11 17:25:03 -05:00
Justin C. Rounds (Chuck) 2392cb2a6a Fixed typo. 
http://jira.secondlife.com/browse/EXT-2359
 2009-11-11 17:21:47 -05:00
Justin C. Rounds (Chuck) f59fce8582 Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 17:18:38 -05:00
Justin C. Rounds (Chuck) 20c9b13df6 Added tool-tip graphic. 2009-11-11 17:17:41 -05:00
Nyx (Neal Orman) bc5096ff3d DEV-34507 too many baked texture uploads 
Fixed a double-bake bug on hitting the "OK" button of the appearance editor
Also cleaned up extraneous calls to requestLayersetUpload.
Behavior should now be consistent with resident expectations.

Code reviewed by Bigpapi
 2009-11-11 16:40:15 -05:00
Nyx (Neal Orman) f6406b7174 EXT-2173 use of visual param animation inconsistent at best 
removed ambiguous parameter "set_by_user" from many places in codebase,
renaming it to be upload_bake, which is a more accurate descriptor.
This allowed me to see several inconsistencies in how this variable was
being set - these errors were also fixed. User-visible result should be
that baked textures are not reuploaded on changing avatar sex until the
save button is pressed. primary win here is code clarity.

Code reviewed by Bigpapi.
 2009-11-11 16:37:59 -05:00
Vadim Savchuk b4e3d34791 Merge from default branch 
--HG--
branch : product-engine
 2009-11-11 23:18:49 +02:00
richard b7740ee0c5 unbreak build 2009-11-11 13:06:14 -08:00
Vadim Savchuk db3991ca23 Merge from default branch 
--HG--
branch : product-engine
 2009-11-11 22:55:32 +02:00
richard b34ee7f9f4 merge 2009-11-11 12:21:23 -08:00
richard 0a095bdaed added stylized text to tooltips for showxuinames 2009-11-11 12:19:54 -08:00
richard fedf86c216 fix wrapping of text segment containing multiple newlines and ending on a newline 
reviewed by leyla
 2009-11-11 12:01:57 -08:00
richard 854e2eaf9a added viewports to LLRenderTarget to speed up animation of sidetray 
reviewed by Leyla
 2009-11-11 12:01:17 -08:00
richard abc76784d5 EXT-2382 - fix for clipping of minimap 2009-11-11 11:19:37 -08:00
Vadim Savchuk 2fd51b4c71 Manual merge. 
Resolved conflicts in panel_bottomtray.xml and llavataractions.cpp.

--HG--
branch : product-engine
 2009-11-11 21:11:54 +02:00
James Cook 41a2849a20 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 10:56:37 -08:00
James Cook a758a799cf Add widgets/ui_ctrl.xml that can set default font size across all widgets. 
Individual widgets/*.xml files will need to have explicit font="foo" params
removed to start using the defaults.
Discussed with Richard.
 2009-11-11 10:56:31 -08:00
brad kittenbrink d4846af9fb Fix for DLL linkage error in new LLEventAPI class. 2009-11-11 12:30:23 -05:00
Eugene Kondrashev 196e350629 Additional fix for EXT-2137-[BSI] Copy/pasted text chat logs are now much harder to read or post-process. 
--HG--
branch : product-engine
 2009-11-11 19:26:19 +02:00
Igor Borovkov aa15d6016f merge 
--HG--
branch : product-engine
 2009-11-11 19:23:39 +02:00
Igor Borovkov 14c668bb97 fixed reopened subtask EXT-2265 IM unread messages counter should not be increased for system messages (comming from "Second Life", zero uuid) 
now not counting messages with from = "Second Life" and from_id = receiver's uuid

--HG--
branch : product-engine
 2009-11-11 19:19:07 +02:00
Mike Antipov b112b9ae75 merge 
--HG--
branch : product-engine
 2009-11-11 18:50:07 +02:00
Andrew Dyukov b8a672adaf Fixed low bug EXT-1499 (Finalize the Home panel and add tooltips to the tab grabs). 
--HG--
branch : product-engine
 2009-11-11 18:49:23 +02:00
Dmitry Oleshko 8a2da9a6b5 fixed low bug (EXT-573) There is paragraph indent in the toasts text 
--HG--
branch : product-engine
 2009-11-11 18:19:52 +02:00
Mike Antipov ee759fb32e merge 
--HG--
branch : product-engine
 2009-11-11 18:12:32 +02:00
Mike Antipov b360b994a8 Fixed major bug EXT-2205 (Message well counter is truncated) 
- place counter exactly over the message well icon.

Fixed in theis way becouse style guide does not have correct UI.
Probably color sheme should be changes to have counter more visible

--HG--
branch : product-engine
 2009-11-11 17:57:17 +02:00
Vadim Savchuk 6146cfc5c1 Merge from default branch 
--HG--
branch : product-engine
 2009-11-11 17:47:20 +02:00
Alexei Arabadji 8dacef13c0 Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/ 
--HG--
branch : product-engine
 2009-11-11 17:45:34 +02:00
Alexei Arabadji 3176622afe fixed EXT-2353 "IM window should auto-undock when dragged" 
made all dockable floaters undock on dragging;

--HG--
branch : product-engine
 2009-11-11 17:45:14 +02:00
Eugene Kondrashev 88f71ead30 Implemented Low sub-task EXT-2366-ALL Avatar specific buttons on IM P2P control panel should be disabled when interacting with AVALINE caller 
--HG--
branch : product-engine
 2009-11-11 17:34:08 +02:00
Yuri Chebotarev 5f8771ea9e merge 
--HG--
branch : product-engine
 2009-11-11 17:06:35 +02:00
Yuri Chebotarev 8523d2d5b6 fix for normal bug EXT-2303 Distinguish Object-generated Nearby Chat from other Nearby Chat 
--HG--
branch : product-engine
 2009-11-11 17:05:36 +02:00
Mike Antipov 51d35efa23 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Code cleaned up:
  - removed test code to show background in chiclet panel

--HG--
branch : product-engine
 2009-11-11 17:05:31 +02:00
Igor Borovkov 73bba2bab4 implemented EXT-2363 Get rid of 'Friends Conference' hardcode and rename it to 'Ad-hoc Conference' 
--HG--
branch : product-engine
 2009-11-11 16:56:13 +02:00
Mike Antipov 454c02102c Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Code refactored:
  - moved code to process width increasing into separate method

--HG--
branch : product-engine
 2009-11-11 16:42:18 +02:00
Mike Antipov 3862e97219 Work on major sub-task EXT-991 (Update bottom bar behavior on resize) 
Code refactored:
  - processShowButton() now gets type of buttons should be shown instead of object
  - removed unnecessary code

--HG--
branch : product-engine
 2009-11-11 16:17:29 +02:00
Eugene Kondrashev 61fdd33f79 Fixed Low bug EXT-1052-IM message window show messages, that were sent in offline mode 
--HG--
branch : product-engine
 2009-11-11 16:11:57 +02:00
Eugene Kondrashev 5ca8c5f61d Fixed normal bug EXT-2166-[BSI] Nearby Chat floater always jumps to most recent chat 
--HG--
branch : product-engine
 2009-11-11 15:48:55 +02:00
Yuri Chebotarev 9a88d4b02d merge 
--HG--
branch : product-engine
 2009-11-11 15:28:24 +02:00
Yuri Chebotarev ef721de720 fix for major bug EXT-2219 New Group profile layout breaks...everything 
lots of small problems...

--HG--
branch : product-engine
 2009-11-11 15:27:50 +02:00