65d8872507
merge fix in unrelated file.
2010-06-15 15:35:47 +01:00
b9ea8cc0b5
final(?) merge to revert snapshot floater to 2.0.1 level.
2010-06-15 14:55:05 +01:00
9fd6bab430
Backed out changeset 1acc14a5e7ac
2010-06-15 14:51:03 +01:00
23b395b91d
merge backout.
2010-06-15 14:50:30 +01:00
e490d6974d
Backed out changeset 4206f9061a67
2010-06-15 14:50:15 +01:00
66caff142a
merge backout.
2010-06-15 14:49:55 +01:00
ea412a7377
Backed out changeset 388c6d09894a
2010-06-15 14:49:45 +01:00
90250cb36d
merge backout.
2010-06-15 14:49:26 +01:00
5ad91abfdf
Backed out changeset b447707f20f5
2010-06-15 14:49:16 +01:00
f8c91bad6b
merge backout.
2010-06-15 14:48:31 +01:00
f4b7164752
Backed out changeset 1c66b34b7fbe
2010-06-15 14:48:14 +01:00
472b7a94c0
merge backout.
2010-06-15 14:47:51 +01:00
565d177156
Backed out changeset c9dd9852d76b
2010-06-15 14:47:38 +01:00
ff4d30edf4
merge backout.
2010-06-15 14:46:01 +01:00
bc0b401359
Backed out changeset d632626f9b11
2010-06-15 14:45:51 +01:00
d5d3c85215
merge backout
2010-06-15 14:45:13 +01:00
4d852aba0e
Backed out changeset 688db499e2d1
2010-06-15 14:45:04 +01:00
a2cb781e59
merge backout
2010-06-15 14:43:31 +01:00
87e9828fc9
Backed out changeset ccbf22ff283c
2010-06-15 14:43:19 +01:00
3a651fe406
merge backout
2010-06-15 14:41:08 +01:00
b95bd0dc27
Backed out changeset 68feae2ef00a
2010-06-15 14:41:01 +01:00
10af942811
merge backout
2010-06-15 14:39:45 +01:00
0effcd8a9f
Backed out changeset fb6c9a1cebfc
2010-06-15 14:39:37 +01:00
597a26aca1
merge backout
2010-06-15 14:39:18 +01:00
c8dea8b6e5
Backed out changeset 2f4b18cc2bbf
2010-06-15 14:39:10 +01:00
44647bd3b1
merge reversion, leaving lldate intact.
2010-06-15 14:37:42 +01:00
10c722604a
Backed out changeset 6d51a12cb2d8
2010-06-15 14:35:21 +01:00
fce2653f6b
SNOW-620 PARTIAL Infinite loop in LLSphere::getBoundingSphere
...
Neither the test nor the code being tested are good - the unit test can hang. Skipping test for now, passing over to the sim maint backlog.
2010-06-15 13:26:40 +01:00
2fc77b8ee8
VWR-19683 llmediaimplgstreamervidplug gcc 4.4 build errors
2010-06-15 13:13:24 +01:00
c21c192d0c
EXT-7348 Can't open Advanced Menu in Linux Client
...
Added a new, preferred shortcut for Show Advanced Menu, that isn't eaten by the desktop on Linux. The old shortcut also works.
2010-06-15 13:01:11 +01:00
f9f5e140ed
merge
2010-06-15 12:34:44 +01:00
348d3a6ae5
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
2010-06-15 11:42:18 +01:00
cfb9a6e341
Merge from default branch
...
--HG--
branch : product-engine
2010-06-15 13:26:09 +03:00
11903fab73
EXT-7783 ADDITIONAL FIX Corerected emitting BOF changed/replaced signals in LLOutfitObserver.
...
Emitting COF changed shouldn't block emitting BOF changed/replaced signals.
reviewed by Mike Antipov
--HG--
branch : product-engine
2010-06-15 12:51:13 +03:00
300cb34291
EXT-7794 FIXED Implemented a common-used notification about wearing outfit to display loading indicator.
...
Details:
* Added signal "Wearable Loading Started" in AgentWearables (in parallel with "Wearables Loaded")
* Now it is raised from the LLAppearanceMgr::wearInventoryCategory.
Reviewed by Vadim Savchuk and Neal Orman at https://codereview.productengine.com/secondlife/r/583/
--HG--
branch : product-engine
2010-06-15 12:38:30 +03:00
d1cb678bac
Merge from default branch
...
--HG--
branch : product-engine
2010-06-15 11:15:51 +03:00
a43c997d0a
re-disabled old style properties floater
2010-06-14 17:55:50 -07:00
330b9dc6ee
merge
2010-06-14 17:52:56 -07:00
bdbd896cff
EXT-7742 WIP "Add to Outfit" type filter should contain items for each wearable type and for each category
...
added ability to filter inventory folder view by wearable type
2010-06-14 17:52:04 -07:00
339b9d3ee6
mergio mergio
2010-06-14 17:44:13 -07:00
5e5c1a6ff9
Fixing viewer_manifest.py. upper case True needed. Reviewed by Mani
2010-06-14 17:42:57 -07:00
89f3c3d129
merge
2010-06-14 17:29:25 -07:00
e0c404a866
EXT-7742 WIP "Add to Outfit" type filter should contain items for each wearable type and for each category
...
added ability to filter inventory folder view by wearable type
2010-06-14 17:26:32 -07:00
8f592d0ecd
Fix mac dev build error, mac always package.
2010-06-14 17:03:15 -07:00
566ad611d0
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
2010-06-14 17:00:07 -07:00
9fbaf88832
Fix mac dev build error.
2010-06-14 16:58:49 -07:00
175464b0fa
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
2010-06-14 16:05:53 -07:00
3894b745c5
Fix EXT-7583: changed message to something more reasonable.
2010-06-14 16:05:39 -07:00
b3fc9c79f5
EXT-7524 FIXED Save snapshot to inventory results in crash
...
Moved confirmSavingTexture() and onSavingTextureConfirmed() from LLSnapshotLivePreview to LLFloaterSnapshot::Impl so that the notification confirmation completes before LLFloaterSnapshot is closed.
2010-06-14 23:49:30 +01:00
e9a6d24fc1
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-release
2010-06-14 15:39:10 -07:00
Tofu Linden