Rick Pasetto
f82e57a9c7
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclasses
2010-02-12 17:36:51 -08:00
Richard Linden
e159873eec
added popup panel to hold nearby media popup and stopped using top view
2010-02-12 16:54:47 -08:00
Rick Pasetto
9cc4eccac5
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclasses
2010-02-12 14:47:51 -08:00
Rick Pasetto
ffd962f3a3
EXT-5267 EXT-5268: Add Parcel Media and Parcel Audio items to nearby media panel
...
Review #109
This (fairly major) change adds new "items" to the media list for
Parcel Media and Parcel Audio. Since these items are special (before
the items were always MoaP impls), they had to be treated
special. Moreover, actions on all of "media" had to be centralized so
that they would have similar behavior.
2010-02-12 13:38:17 -08:00
Richard Linden
9f3c3d8f64
merge
2010-02-12 13:33:40 -08:00
Richard Linden
8f54407fe6
can resize bottom of nearby media panel now, and remembers size when expanding/collapsing
2010-02-12 13:33:10 -08:00
Rick Pasetto
e47dc498e8
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
2010-02-12 11:04:10 -08:00
Tofu Linden
6e0ebfe18c
CID-215
...
Checker: REVERSE_INULL
File: /indra/newview/llfloatergesture.cpp
2010-02-12 17:55:39 +00:00
Tofu Linden
a80fdcd8f2
CID-217
...
Checker: REVERSE_INULL
Function: LLFloaterGesture::postBuild()
File: /indra/newview/llfloatergesture.cpp
2010-02-12 17:53:02 +00:00
Tofu Linden
21e86251c0
CID-218
...
Checker: REVERSE_INULL
Function: LLAgentWearables::setWearableOutfit(const LLDynamicArray<LLPointer<LLInventoryItem>, (int)32> &, LLDynamicArray<LLWearable *, (int)32>&, int)
File: /indra/newview/llagentwearables.cpp
2010-02-12 17:51:23 +00:00
Tofu Linden
290a5846fc
CID-218
...
Checker: REVERSE_INULL
Function: LLAgentWearables::setWearableOutfit(const LLDynamicArray<LLPointer<LLInventoryItem>, (int)32> &, LLDynamicArray<LLWearable *, (int)32>&, int)
File: /indra/newview/llagentwearables.cpp
2010-02-12 17:49:55 +00:00
Tofu Linden
41bd792032
CID-285
...
Checker: UNINIT_CTOR
Function: LLScriptState::LLScriptState(int, int, e_lscript_state_type, LLScriptIdentifier *, LLScriptEventHandler *)
File: /indra/lscript/lscript_compile/lscript_tree.h
2010-02-12 17:47:21 +00:00
Tofu Linden
23b1c3d16f
CID-286
...
Checker: UNINIT_CTOR
Function: LLScriptStateChange::LLScriptStateChange(int, int, LLScriptIdentifier *)
File: /indra/lscript/lscript_compile/lscript_tree.h
2010-02-12 17:46:34 +00:00
Tofu Linden
69aa73656e
CID-287
...
Checker: UNINIT_CTOR
Function: LLScriptScript::LLScriptScript(LLScritpGlobalStorage *, LLScriptState *)
File: /indra/lscript/lscript_compile/lscript_tree.cpp
2010-02-12 17:43:47 +00:00
Tofu Linden
6d80e75e0b
CID-412
...
Checker: UNUSED_VALUE
Function: LLFloaterWindLight::deleteAlertCallback(const LLSD &, const LLSD &)
File: /indra/newview/llfloaterwindlight.cpp
dead code.
2010-02-12 17:41:55 +00:00
Tofu Linden
947aeb1915
CID-413
...
Checker: UNUSED_VALUE
Function: LLFloaterWater::deleteAlertCallback(const LLSD &, const LLSD &)
File: /indra/newview/llfloaterwater.cpp
dead code.
2010-02-12 17:40:39 +00:00
Tofu Linden
4fa10e3596
CID-427
...
Checker: FORWARD_NULL
Function: LLFolderBridge::pasteFromClipboard()
File: /indra/newview/llinventorybridge.cpp
2010-02-12 17:38:19 +00:00
Tofu Linden
df6af052e0
CID-428
...
Checker: FORWARD_NULL
Function: LLCallFloater::updateSession()
File: /indra/newview/llcallfloater.cpp
2010-02-12 17:37:08 +00:00
Andrew Dyukov
713eb289b0
Fixed normal bug EXT-5117 (Voice Control Panel sorting should default to by Recent speaker).
...
- Changed sort order of participant list in VCP to by Recent speaker after it's creation.
--HG--
branch : product-engine
2010-02-12 17:54:57 +02:00
Dmitry Zaporozhan
6ead0d131f
Fixed normal bug EXT-1093 - Dialog boxes should be centered in the viewport(game area).
...
--HG--
branch : product-engine
2010-02-12 16:56:29 +02:00
Denis Serdjuk
b1a5d52f75
merge
...
--HG--
branch : product-engine
2010-02-12 16:29:00 +02:00
Mike Antipov
951fd66000
Completed normal task EXT-3410 (Liberate filter_editor clear_button height width parameters - art is distorted)
...
- improved calculation of clear_button position (to be xml driven)
- replaced clear_button art with suggested Icon_Close_Toast in filter_editor widget
--HG--
branch : product-engine
2010-02-12 16:26:52 +02:00
Paul Guslisty
5a5262bbdc
Fixed normal bug EXT - 5248 (Default group icon for IM sessions in multifloater). The problem was in LLAgent::isInGroup() logic. In God Mode it always returned true, even if it was not so. Added ability to ignore God Mode in LLAgent::isInGroup().
...
--HG--
branch : product-engine
2010-02-12 16:24:24 +02:00
Denis Serdjuk
c06742b231
fixed Bug Low EXT-4732 Group invitation is broken for offline avatars
...
Cause:
gObjectList does contain offline avatars and panel could get avatar name and fill the list
Solution:
This situation is possible only for offline friend, therefore extra avatartracker search has been added.
--HG--
branch : product-engine
2010-02-12 16:09:18 +02:00
Igor Borovkov
8b609519ea
fixed reopened EXT-926 System notification toast has avatar's icon
...
--HG--
branch : product-engine
2010-02-12 15:15:49 +02:00
Sergei Litovchuk
b1fad9d38c
Merge with 391ec5cd9368c2711e836415b21f8e8421226b10
...
--HG--
branch : product-engine
2010-02-12 14:21:39 +02:00
Sergei Litovchuk
2c72deb0b0
Backed out of changeset 9306:f5c332c1ddcb. Restored fix of (EXT-5245) Cannot create a new line in group notice creation with enter key
...
--HG--
branch : product-engine
2010-02-12 14:19:16 +02:00
Dmitry Zaporozhan
074a5b6566
Removed old function declaration.
...
--HG--
branch : product-engine
2010-02-12 13:42:07 +02:00
Dmitry Zaporozhan
8c2a6a691a
Fixed low bug EXT-5166 - Undocked lldialogs respawn in chiclet tray.
...
LLDialog floater position is saved per originating object.
--HG--
branch : product-engine
2010-02-12 13:41:34 +02:00
Tofu Linden
b4c13247f7
PE merge.
2010-02-12 04:46:49 +00:00
richard
31e08f5a53
more/less button sorta working
2010-02-11 19:38:26 -08:00
richard
48a66364a1
merge
2010-02-11 18:11:08 -08:00
richard
6c5b984bf6
converted llfloaternearbymedia to llpanelnearbymedia
...
moved from LLTransientDockableFloater model to popup panel model like volume popup
2010-02-11 18:06:25 -08:00
Xiaohong Bao
a5c725c189
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2010-02-11 18:02:43 -08:00
Xiaohong Bao
e0e82c908d
more refinement for EXT-4352: texture problem in viewer 2.0.
2010-02-11 18:02:16 -08:00
Xiaohong Bao
17707455d2
additional fix for EXT-4632: LLViewerMediaTexture::getMaxVirtualSize() sometimes returns bad values
2010-02-11 15:35:22 -08:00
Xiaohong Bao
fb994809f4
fix for EXT-5353: prim visibility issues.
2010-02-11 14:58:08 -08:00
Rick Pasetto
cd73d68846
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2010-02-11 14:05:54 -08:00
Rick Pasetto
53d827781e
Merge from viewer-2-0
2010-02-11 14:05:44 -08:00
Callum Prentice
f791d103c8
Merge with tip
2010-02-11 14:04:40 -08:00
Callum Prentice
92468f0dea
Fix for EXT-5175 (prefs review: Chat Prefs tab settings need labels)
...
Not reviewed - coordinate and whitespace changes only
2010-02-11 14:04:06 -08:00
Loren Shih
dc61885aa6
automated merge viewer2.0->viewer2.0
2010-02-11 16:34:24 -05:00
Loren Shih
35d43f2562
EXT-5105 Incorrect keyboard shortcut for Inventory in main menu
...
EXT-5334 CTRL+SHIFT+I now brings up InventorySP instead of InventoryFloater
Fixed a regression due to EXT-5105 where CTRL+SHIFT+I was bringing up the InventorySP instead of InventoryFloater. Note that this reverts some code checked in for EXT-5105 (i.e. it re-adds in some functions that were deleted).
As a side bonus, now the Gestures CTRL+G menu option shows as being checked when the gestures floater is active.
2010-02-11 16:33:56 -05:00
Nyx (Neal Orman)
af96d8c061
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-11 15:22:49 -05:00
Nyx (Neal Orman)
0459dd1e39
EXT-5343 appearance editor "save as" does not affect Current outfit
...
changed logic of the save as button to copy a link from the newly created
inventory item to the current outfit folder. This makes your changes
persist on relog.
Reviewed by Vir.
2010-02-11 15:22:38 -05:00
Callum Prentice
c7715a74fd
Merge with tip
2010-02-11 11:44:21 -08:00
Callum Prentice
494a42a680
Added reference to updated version of LLQtWebKit (Disables right click breakage in Flash)
...
Not reviewed (no useful info in this change)
2010-02-11 11:41:43 -08:00
Callum Prentice
109fd91c8b
Fix for EXT-4961 www.slurl.com will not DnD while slurl.com will
...
Ccollab reviewed by Rick - http://10.1.19.90:8080/go?page=ReviewDisplay&reviewid=101
2010-02-11 11:40:21 -08:00
Tofu Linden
a97c4d3ad8
merge
2010-02-11 19:02:20 +00:00
Tofu Linden
c61e1cef91
PE merge
2010-02-11 18:45:33 +00:00