Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Tofu Linden 106d1b51bb merge 2009-11-03 17:08:35 +00:00
Eric M. Tulla (BigPapi) 52cb2fe46d Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-03 11:51:36 -05:00
Eric M. Tulla (BigPapi) 22e6c3f952 Added .DS_Store to .hgignore and removed the checked in version from the repos.
It's an OSX image cache file that was accidentally added to the repos.
-Reviewed by brad.
2009-11-03 11:45:54 -05:00
Tofu Linden 3cb64a8fdf Backed out changeset 8d2ba8bb62a5 2009-11-03 16:39:53 +00:00
Tofu Linden 27257fa210 Backed out changeset 8bb55c0994a2 2009-11-03 16:38:20 +00:00
Tofu Linden 29135c8154 Backed out changeset 30592b61e452 2009-11-03 16:38:06 +00:00
Tofu Linden ad5f5299fb Backed out changeset 776703433218 2009-11-03 16:37:57 +00:00
Tofu Linden fb8fa98367 Backed out changeset ba150ce614d0 2009-11-03 16:37:43 +00:00
Tofu Linden 33bced543b merge 2009-11-03 16:34:56 +00:00
Tofu Linden d37dcfd340 trivial comment change #3 2009-11-03 16:31:04 +00:00
Tofu Linden 3c59a22bcf trivial whitespace change #1 2009-11-03 16:30:40 +00:00
Tofu Linden 4d88830a0c trivial whitespace change #2 2009-11-03 16:30:22 +00:00
Eugene Mutavchi 5ea6474aeb Implemented low task EXT-1787 (Implement sorting of participant list)
--HG--
branch : product-engine
2009-11-03 17:47:20 +02:00
Mike Antipov 3483f9e0d0 Fixed major bug EXT-2098 (Unable to delete landmarks)
The reason of this bug is that moved (removed to trash) Inventory Item exists in Panel which has no Trash folder
 in View hierarchy (Favorites & Landmarks accordions).

I have updated LLInventoryPanel::modelChanged for case Inventory structure is changed:
- added condition to verify if moved item is in Inventory Panel having content of some Inventory Folder
 and is not moved into the same folder. In this case appropriate View is removed from the Panel hierarchy.

--HG--
branch : product-engine
2009-11-03 17:40:26 +02:00
Yuri Chebotarev 506f1787a5 merge
--HG--
branch : product-engine
2009-11-03 17:33:03 +02:00
Yuri Chebotarev f1d834c50d fix for normal task EXT-239 Save chat window state and position between sessions
--HG--
branch : product-engine
2009-11-03 17:31:26 +02:00
Andrew Polunin efa9c7a5ba fixed bug EXT-1480 [BSI] Cannot give invenotry offers by dragging an item to profile on the sidebar
--HG--
branch : product-engine
2009-11-03 17:26:57 +02:00
lynx@eniac45.lindenlab.com 1e4877244d Trivial whitespace change to test mercurial process with tofu and soft. 2009-11-03 06:39:21 -08:00
Vadim Savchuk 5599547f4f merge
--HG--
branch : product-engine
2009-11-03 15:41:50 +02:00
Vadim Savchuk 4a3eeda1ea Merge from default branch
--HG--
branch : product-engine
2009-11-03 15:32:54 +02:00
Dmitry Zaporozhan 6d292f0e81 Merge
--HG--
branch : product-engine
2009-11-03 15:00:10 +02:00
Dmitry Zaporozhan 4fa120feb4 Fixed low bug EXT-1620 - Collapsed accordion panels should expand while filtering if they contain matched items.
--HG--
branch : product-engine
2009-11-03 14:58:31 +02:00
Sergey Borushevsky a7d82c0d0e Temporary fix for normal task EXT-1510 (Implement left side sticking control panels for IM floaters)
Disabled resizing of left side control panel to not occupy space for chat history on the right side.
Changed follows properties for icon and buttons in panel_im_control_panel, icon sticked to top, buttons to bottom.

--HG--
branch : product-engine
2009-11-03 14:54:43 +02:00
Eugene Kondrashev 37742cbbf2 Added double click avatar list item callback showing new IM session
--HG--
branch : product-engine
2009-11-03 14:35:00 +02:00
Igor Borovkov 330a3a460b merge
--HG--
branch : product-engine
2009-11-03 14:26:51 +02:00
Igor Borovkov 24179cbcc6 fixed normal EXT-1131 Message Well counts non-interactive notifications however chiclet-window is opened
--HG--
branch : product-engine
2009-11-03 14:25:08 +02:00
Denis Serdjuk c4935ea25b no ticket. Mistyped class name has been corrected.
--HG--
branch : product-engine
2009-11-03 14:24:57 +02:00
Andrew Dyukov 645e258851 Fixed EXT-1854 (Area of working for nav bar context menu is changed)
--HG--
branch : product-engine
2009-11-03 14:01:33 +02:00
Yuri Chebotarev 3b17d74cb0 fix for normal task EXT-2099 Make the Log button toggleable
--HG--
branch : product-engine
2009-11-03 13:34:19 +02:00
Igor Borovkov 01724523cf IM: defensive fix to get rid of warnings about attempts to get speaker mgr for removed sessions
--HG--
branch : product-engine
2009-11-03 13:15:15 +02:00
Eugene Kondrashev c940d3d5b9 Added 'Loading...' message to avatarlist while opening group/adhoc chat
--HG--
branch : product-engine
2009-11-03 13:11:49 +02:00
Igor Borovkov 3a09e94c7c got rid of exit crash and warning messages 'Trying to access deleted singleton'
--HG--
branch : product-engine
2009-11-03 12:57:21 +02:00
Lynx Linden eff50b018c merged 2009-11-03 10:43:13 +00:00
Dmitry Zaporozhan 5f30904db4 Fixed Windows build.
--HG--
branch : product-engine
2009-11-03 12:30:09 +02:00
Lynx Linden 077025fa1e DEV-39999: Removed all legacy help buttons and notifications from the
code. All help should now go through the new help server, via the Help
Browser floater. There should no longer be any custom "?" buttons in
the UI - all <button> and <notification> XUI references relating to
custom help buttons have been expunged.

(I previously extracted all of the help strings from notifications.xml
and passed these to the doc team to include in the help server pages.)

I have checked that none of the XUI elements that are removed here are
still referenced by any C++ code. I've also confirmed that there are
no new notifications removed that I have not already passed on to the
doc team. And I've also done a pass through the UI to make sure that
all of the floaters still look as they should. Finally, I've confirmed
that the new help system for floaters and side panels still works.

2,276 lines deleted - 0 lines added.
2009-11-03 10:28:57 +00:00
Dmitry Zaporozhan 6508b4f13f Fixed potencial bug in People Panel.
--HG--
branch : product-engine
2009-11-03 11:39:43 +02:00
CG Linden d3bb2931ab Add missing eol at eof 2009-11-02 22:21:36 -08:00
angela b4af6c3da8 display the current URL in object inspector for media without going through media plugin 2009-11-03 14:14:39 +08:00
angela b270a792ab (i) in inspectors is squished, maybe rectangle too small 2009-11-03 13:28:39 +08:00
richard 995c18b1c7 removed picture_style from LLButton::Params and allow empty labels 2009-11-02 19:28:24 -08:00
angela 0b1ed9af5f merge 2009-11-03 11:09:44 +08:00
angela 399e922d33 merge + EXT-1926 I18N: the folder name Contents in Build tools > Contents wont honor its translation + EXT-648 Cannot edit an object you are sitting on 2009-11-03 11:06:59 +08:00
Monroe Linden 3c1c0d7544 Changed the operation of the "mute all" button in the nearby media floater to be closer to spec-compliant, per a design discussion this afternoon. 2009-11-02 17:58:10 -08:00
James Cook d220211b4d EXT-1803 Fix group inspectors closing before you can see them if you can't join the group.
Focus issue -- the inspector had no focusable widgets in that case.
Reviewed with Richard.
2009-11-02 17:32:36 -08:00
Loren Shih 2f2bdd83d6 For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]
svn merge -r136068:136089   svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-types__merge__viewer2.0.0-3-r135948 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3

Infrastructure changes for cleaning up Asset/Folder types.  Associated sim changes are only so that the sim still compiles.
2009-11-03 00:47:23 +00:00
Rick Pasetto 967e171ed6 merge from remote repo 2009-11-02 16:43:35 -08:00
Nyx (Neal Orman) a100a6e07f EXT-1947 EXT-1945 EXT-1919 EXT-2088 appearance edit dummy param + animation fix
Several fixes here:
1) minor rename in argument of setIsDummy
2) corrected parameter set_by_user to calls of setVisualParamWeight where we
   shouldn't be animating
3) ensured finally that mIsDummy is set properly for all wearable parameters
4) ensured that mIsDUmmy is set properly for non-wearable based parameters on
   your own avatar

Code reviewed by Bigpapi
2009-11-02 19:05:20 -05:00
Eric M. Tulla (BigPapi) 345c2a02cd Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-02 18:56:30 -05:00
Eric M. Tulla (BigPapi) f344c5b7ec Fix for EXT-894: upload anim preview was using bad texture data instead of grey.
Switched rendering of dummy mesh for previews (anim, etc) to use default image,
instead of default avatar image.
-Reviewed by nyx
2009-11-02 18:50:50 -05:00
Lynx Linden 7e3e89f127 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-11-02 23:46:51 +00:00