e2d56363f1
viewer2 merge.
2010-02-16 16:50:21 +00:00
23e173631d
Fix odd spacing/punctuation in failed search result string.
2010-02-16 16:48:20 +00:00
eefdbced38
fix implicit cast in 2ea5dc26d479 / EXT-5251
2010-02-16 16:41:16 +00:00
d2ef287e9c
defensiveness added to 81fc7fe78ca6 / EXT-5376
2010-02-16 16:38:16 +00:00
d0d9ad2b36
PE merge.
2010-02-16 16:34:04 +00:00
6a4aea4571
Fixed low bug EXT-5376(Gesture button has stripped label after unhide if it was hidden with stripped label)
...
--HG--
branch : product-engine
2010-02-16 18:17:22 +02:00
f836b8527a
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2010-02-16 18:10:39 +02:00
58f75f4fd8
fixed EXT-5070 “Modal Login Failed popup prevents interaction with Media Browser”;
...
--HG--
branch : product-engine
2010-02-16 18:09:35 +02:00
a301ad63c2
Fixed bug EXT-5290 (TP failed if try to teleport from 'Teleport completed from...' toast).
...
Reason: LLUrlEntrySLURL::getLocation() failed to parse maps.secondlife.com SLURLs (though worked fine for slurl.com ones).
--HG--
branch : product-engine
2010-02-16 17:58:41 +02:00
3dc2a730fa
EXT-5449 Difficult to see where drop lists end and the interface behind it begins
...
Slightly changed combo-list background color, made it definable in colors.xml
2010-02-16 15:57:59 +00:00
cef352006c
(EXT-5251) Status text isn't aligned to top in inventory SP.
...
- Removed some magic numbers in status textbox positioning.
--HG--
branch : product-engine
2010-02-16 17:32:29 +02:00
2893ef25a2
EXT-3620 Unable to locate other avatars in God mode on map via "map" button (previously "show on map")
2010-02-16 15:28:26 +00:00
a623f852cd
EXT-5394 [crashhunters] Crash in LLViewerMediaImpl::calculateInterest()
2010-02-16 14:17:09 +00:00
28b18148f5
EXT-5434 Texture Preview floater "Cancel" button DELETES TEXTURES
...
The 'Cancel' button was completely mis-named. Everything in the code - and even the button name - says this is the 'Discard' button. And that's what it does. So I simply changed the label to indicate this.
2010-02-16 13:58:56 +00:00
50a77cd2d3
merge.
2010-02-16 13:50:12 +00:00
e033f24531
trivial whitespace reformatting.
2010-02-16 13:49:46 +00:00
2582f759b8
merge with remote repo
2010-02-16 20:36:26 +08:00
4a9c68d8e6
EXT-618 Low/Mid/High response is broken in Preferences > Graphics
2010-02-16 20:34:00 +08:00
7133af28c4
EXT-1467 Preferences > Chat > small/medium/large should change chat text size
2010-02-16 20:00:34 +08:00
07a5274e8c
Merge from default branch
...
--HG--
branch : product-engine
2010-02-16 13:20:05 +02:00
3f6a19ddd3
EXT-5172 prefs review: Allow media to auto-play should be set by default
2010-02-16 19:03:49 +08:00
f808bafa66
fixed major EXT-5387 “Private IM Window Steals Focus from Nearby Chat”,
...
prevented focus stealing when IM opened in multitab mode;
--HG--
branch : product-engine
2010-02-16 12:47:54 +02:00
aa7fadfde0
merge from viewer2.
2010-02-16 10:28:35 +00:00
e3367fad36
PE merge.
2010-02-16 09:45:25 +00:00
481e26ae2d
Fixed normal bug EXT - 5383 ('Save as outfit' floater has no title)
...
--HG--
branch : product-engine
2010-02-16 11:24:06 +02:00
59e93da87b
Fixed major bug EXT - 5400 (erroneously blinking IM tab on group chat message)
...
--HG--
branch : product-engine
2010-02-16 10:58:50 +02:00
41c8ad6efe
additional fix for reopened EXT-5429 IM chat history of active tab in IM container is not updated when IM container is unminimized
...
--HG--
branch : product-engine
2010-02-16 10:47:29 +02:00
c892ac9313
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-02-15 18:20:51 -05:00
852bd5ef24
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
2010-02-15 18:20:02 -05:00
d6027f5432
Second round of polish on side-panels (People, groups, et al).
...
https://jira.secondlife.com/browse/EXT-4335
2010-02-15 18:17:32 -05:00
9c5de93387
Fixed low bug EXT-5421 (IM floater doesn't remember minimized state when leaving mouselook)
...
--HG--
branch : product-engine
2010-02-15 22:20:52 +02:00
ef21d64c84
Fixed normal bug EXT-5328 (Focus is lost after LEFT arrow button has been pressed in Landmarks tab)
...
--HG--
branch : product-engine
2010-02-15 22:07:38 +02:00
ba68a7c8a0
Merge
...
--HG--
branch : product-engine
2010-02-15 21:27:18 +02:00
876369f615
fixed Bug Major EXT-5086 llDialog buttons are displayed in wrong order
...
Order of the buttons has been recovered to viewer 1.23 behavior.
--HG--
branch : product-engine
2010-02-15 21:24:14 +02:00
699f44ca85
Merge
...
--HG--
branch : product-engine
2010-02-15 21:24:01 +02:00
c97704b394
No ticket. Minor cleanup in LLGroupMgr::sendGroupMemberEjects()
...
- Removed warnings used to deal with fixed EXT-4778
- Replaced (*it) with ejected_member_id where it wasn't to make code more clear
--HG--
branch : product-engine
2010-02-15 21:22:35 +02:00
f25fda6edc
Fixed major bug EXT-4778 ([crashhunters] Crash @ LLGroupMgr::sendGroupMemberEjects [secondlife-bin llgroupmgr.cpp:1708])
...
- Replaced usage of map iterator (which later became invalid and this caused crash) with pointer to data.
--HG--
branch : product-engine
2010-02-15 21:07:12 +02:00
9ebd99d8ae
Fixed low bug (EXT-5251) Status text isn't aligned to top in inventory SP
...
- Changed status textbox rect in folder view.
--HG--
branch : product-engine
2010-02-15 20:57:34 +02:00
9c5e4d315a
viewer2 merge
2010-02-15 18:46:12 +00:00
f349c30d71
PE merge
2010-02-15 18:42:18 +00:00
7286516e91
viewer2 merge
2010-02-15 18:21:08 +00:00
398af7dd40
CID-34
...
Checker: DEADCODE
Function: LLDockableFloater::toggleInstance(const LLSD &)
File: /indra/llui/lldockablefloater.cpp
bool logic precendence assumptions were wrong.
2010-02-15 18:06:49 +00:00
dab54100f5
CID-37
...
Checker: DEADCODE
Function: LLToolsSelectedScriptAction::handleEvent(const LLSD &)
File: /indra/newview/llviewermenu.cpp
2010-02-15 18:04:22 +00:00
4bb57fde32
CID-39
...
Checker: DEADCODE
Function: LLToolPie::handleMediaClick(const LLPickInfo &)
File: /indra/newview/lltoolpie.cpp
simply some redundant checking, cleared-up for clarity
2010-02-15 17:56:33 +00:00
6810ea5c4a
CID-40
...
Checker: DEADCODE
Function: LLAvatarListItem::getItemChildView(LLAvatarListItem::e_avatar_item_child)
File: /indra/newview/llavatarlistitem.cpp
simply very redundant checking. removed the least-paranoid.
2010-02-15 17:54:59 +00:00
dda7e3f7a2
some const'ness for previous fixes.
2010-02-15 17:47:06 +00:00
f763033db2
CID-87
...
Checker: FORWARD_NULL
Function: LLLocationInputCtrl::refreshLocation()
File: /indra/newview/lllocationinputctrl.cpp
2010-02-15 17:44:32 +00:00
be03975a94
CID-131
...
Checker: NULL_RETURNS
Function: LLFloaterWorldMap::friendsChanged()
File: /indra/newview/llfloaterworldmap.cpp
actually the logic looks a bit suspicious (esp for isGodLike) but I've preserved it.
2010-02-15 17:43:02 +00:00
1ce4089fe7
CID-133
...
Checker: NULL_RETURNS
Function: is_agent_mappable(const LLUUID &)
File: /indra/newview/llviewermenu.cpp
2010-02-15 17:39:15 +00:00
fecaf7b64f
CID-135 followup
2010-02-15 17:35:45 +00:00
Tofu Linden