aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
Diffstat (limited to 'linden')
-rw-r--r--linden/doc/contributions.txt1
-rwxr-xr-xlinden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp37
-rwxr-xr-xlinden/indra/media_plugins/webkit/media_plugin_webkit.cpp10
-rw-r--r--linden/indra/newview/llfloaterchat.cpp2
-rw-r--r--linden/indra/newview/llglsandbox.cpp10
-rw-r--r--linden/indra/newview/llpaneldisplay.cpp29
-rw-r--r--linden/indra/newview/llpaneldisplay.h3
-rw-r--r--linden/indra/newview/llprefscolors.cpp1
-rw-r--r--linden/indra/newview/llselectmgr.cpp35
-rw-r--r--linden/indra/newview/llviewercamera.cpp4
-rw-r--r--linden/indra/newview/llvograss.cpp91
-rw-r--r--linden/indra/newview/llvograss.h9
-rw-r--r--linden/indra/newview/llvotree.cpp125
-rw-r--r--linden/indra/newview/llvotree.h14
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml45
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_radar.xml8
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml21
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py2
-rwxr-xr-xlinden/install.xml22
19 files changed, 346 insertions, 123 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index a54424c..cd6544a 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -89,6 +89,7 @@ Aleric Inglewood
89 IMP-664 89 IMP-664
90 IMP-667 90 IMP-667
91 IMP-670 91 IMP-670
92 IMP-688
92Alissa Sabre 93Alissa Sabre
93 VWR-81 94 VWR-81
94 VWR-83 95 VWR-83
diff --git a/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
index 68b9679..999f754 100755
--- a/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
+++ b/linden/indra/media_plugins/quicktime/media_plugin_quicktime.cpp
@@ -3,33 +3,26 @@
3 * @brief QuickTime plugin for LLMedia API plugin system 3 * @brief QuickTime plugin for LLMedia API plugin system
4 * 4 *
5 * @cond 5 * @cond
6 * $LicenseInfo:firstyear=2008&license=viewergpl$ 6 * $LicenseInfo:firstyear=2008&license=viewerlgpl$
7 *
8 * Copyright (c) 2008-2010, Linden Research, Inc.
9 *
10 * Second Life Viewer Source Code 7 * Second Life Viewer Source Code
11 * The source code in this file ("Source Code") is provided by Linden Lab 8 * Copyright (C) 2010, Linden Research, Inc.
12 * to you under the terms of the GNU General Public License, version 2.0
13 * ("GPL"), unless you have obtained a separate licensing agreement
14 * ("Other License"), formally executed by you and Linden Lab. Terms of
15 * the GPL can be found in doc/GPL-license.txt in this distribution, or
16 * online at http://secondlife.com/developers/opensource/gplv2
17 * 9 *
18 * There are special exceptions to the terms and conditions of the GPL as 10 * This library is free software; you can redistribute it and/or
19 * it is applied to this Source Code. View the full text of the exception 11 * modify it under the terms of the GNU Lesser General Public
20 * in the file doc/FLOSS-exception.txt in this software distribution, or 12 * License as published by the Free Software Foundation;
21 * online at 13 * version 2.1 of the License only.
22 * http://secondlife.com/developers/opensource/flossexception
23 * 14 *
24 * By copying, modifying or distributing this software, you acknowledge 15 * This library is distributed in the hope that it will be useful,
25 * that you have read and understood your obligations described above, 16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
26 * and agree to abide by those obligations. 17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
18 * Lesser General Public License for more details.
27 * 19 *
28 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 20 * You should have received a copy of the GNU Lesser General Public
29 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 21 * License along with this library; if not, write to the Free Software
30 * COMPLETENESS OR PERFORMANCE. 22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
31 * $/LicenseInfo$
32 * 23 *
24 * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
25 * $/LicenseInfo$
33 * @endcond 26 * @endcond
34 */ 27 */
35 28
diff --git a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
index eed59a2..4a00557 100755
--- a/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/linden/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -37,7 +37,6 @@
37 37
38#include "linden_common.h" 38#include "linden_common.h"
39#include "indra_constants.h" // for indra keyboard codes 39#include "indra_constants.h" // for indra keyboard codes
40#include <iomanip>
41 40
42#include "llgl.h" 41#include "llgl.h"
43 42
@@ -45,10 +44,10 @@
45#include "llpluginmessage.h" 44#include "llpluginmessage.h"
46#include "llpluginmessageclasses.h" 45#include "llpluginmessageclasses.h"
47#include "media_plugin_base.h" 46#include "media_plugin_base.h"
47#include <iomanip>
48 48
49// set to 1 if you're using the version of llqtwebkit that's QPixmap-ified 49// set to 1 if you're using the version of llqtwebkit that's QPixmap-ified
50#if LL_LINUX 50#if LL_LINUX
51# include <iomanip>
52# define LL_QTWEBKIT_USES_PIXMAPS 0 51# define LL_QTWEBKIT_USES_PIXMAPS 0
53extern "C" { 52extern "C" {
54# include <glib.h> 53# include <glib.h>
@@ -341,6 +340,12 @@ private:
341 // append details to agent string 340 // append details to agent string
342 LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent ); 341 LLQtWebKit::getInstance()->setBrowserAgentId( mUserAgent );
343 342
343// Viewer 2+ -- MC
344#if LL_WINDOWS
345 // Set up window open behavior
346 LLQtWebKit::getInstance()->setWindowOpenBehavior(mBrowserWindowId, LLQtWebKit::WOB_SIMULATE_BLANK_HREF_CLICK);
347#endif
348
344#if !LL_QTWEBKIT_USES_PIXMAPS 349#if !LL_QTWEBKIT_USES_PIXMAPS
345 // don't flip bitmap 350 // don't flip bitmap
346 LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true ); 351 LLQtWebKit::getInstance()->flipWindow( mBrowserWindowId, true );
@@ -539,6 +544,7 @@ private:
539 // This will work as long as we don't need "uuid", which will be needed for MoaP. 544 // This will work as long as we don't need "uuid", which will be needed for MoaP.
540 message.setValue("uri", event.getStringValue()); 545 message.setValue("uri", event.getStringValue());
541 message.setValue("target", event.getStringValue2()); 546 message.setValue("target", event.getStringValue2());
547 message.setValueU32("target_type", event.getLinkType());
542#endif 548#endif
543 sendMessage(message); 549 sendMessage(message);
544 } 550 }
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index a453c39..e9ea14b 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -482,7 +482,7 @@ BOOL LLFloaterChat::isOwnNameInText(const std::string &text_line)
482 for (int i=1; i<=3; i++) 482 for (int i=1; i<=3; i++)
483 { 483 {
484 std::stringstream key; 484 std::stringstream key;
485 key << "nick0" << i; 485 key << "HighlightNickname0" << i;
486 std::string nick = gSavedSettings.getString(key.str()); 486 std::string nick = gSavedSettings.getString(key.str());
487 if (! nick.empty()) 487 if (! nick.empty())
488 { 488 {
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index a487150..98c4d06 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -275,7 +275,11 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
275 virtual bool apply(LLViewerObject* vobjp) 275 virtual bool apply(LLViewerObject* vobjp)
276 { 276 {
277 LLDrawable* drawable = vobjp->mDrawable; 277 LLDrawable* drawable = vobjp->mDrawable;
278 if (!drawable || vobjp->getPCode() != LL_PCODE_VOLUME || vobjp->isAttachment()) 278 if (!drawable ||
279 ((vobjp->getPCode() != LL_PCODE_VOLUME) &&
280 (vobjp->getPCode() != LL_PCODE_LEGACY_TREE) &&
281 (vobjp->getPCode() != LL_PCODE_LEGACY_GRASS) )||
282 vobjp->isAttachment())
279 { 283 {
280 return true; 284 return true;
281 } 285 }
@@ -326,7 +330,9 @@ void LLToolSelectRect::handleRectangleSelection(S32 x, S32 y, MASK mask)
326 LLViewerObject* vobjp = drawable->getVObj(); 330 LLViewerObject* vobjp = drawable->getVObj();
327 331
328 if (!drawable || !vobjp || 332 if (!drawable || !vobjp ||
329 vobjp->getPCode() != LL_PCODE_VOLUME || 333 ((vobjp->getPCode() != LL_PCODE_VOLUME) &&
334 (vobjp->getPCode() != LL_PCODE_LEGACY_TREE) &&
335 (vobjp->getPCode() != LL_PCODE_LEGACY_GRASS) )||
330 vobjp->isAttachment() || 336 vobjp->isAttachment() ||
331 (deselect && !vobjp->isSelected())) 337 (deselect && !vobjp->isSelected()))
332 { 338 {
diff --git a/linden/indra/newview/llpaneldisplay.cpp b/linden/indra/newview/llpaneldisplay.cpp
index 15b4615..a5c0d97 100644
--- a/linden/indra/newview/llpaneldisplay.cpp
+++ b/linden/indra/newview/llpaneldisplay.cpp
@@ -267,9 +267,6 @@ BOOL LLPanelDisplay::postBuild()
267 267
268 // Object detail slider 268 // Object detail slider
269 mCtrlDrawDistance = getChild<LLSliderCtrl>("DrawDistance"); 269 mCtrlDrawDistance = getChild<LLSliderCtrl>("DrawDistance");
270 mDrawDistanceMeterText1 = getChild<LLTextBox>("DrawDistanceMeterText1");
271 mDrawDistanceMeterText2 = getChild<LLTextBox>("DrawDistanceMeterText2");
272 mCtrlDrawDistance->setCommitCallback(&LLPanelDisplay::updateMeterText);
273 mCtrlDrawDistance->setCallbackUserData(this); 270 mCtrlDrawDistance->setCallbackUserData(this);
274 271
275 // Object detail slider 272 // Object detail slider
@@ -636,8 +633,6 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
636 llassert(mAvatarText != NULL); 633 llassert(mAvatarText != NULL);
637 llassert(mLightingText != NULL); 634 llassert(mLightingText != NULL);
638 llassert(mTerrainText != NULL); 635 llassert(mTerrainText != NULL);
639 llassert(mDrawDistanceMeterText1 != NULL);
640 llassert(mDrawDistanceMeterText2 != NULL);
641 llassert(mAvatarCountText != NULL); 636 llassert(mAvatarCountText != NULL);
642 637
643 // enable/disable the states 638 // enable/disable the states
@@ -684,16 +679,8 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
684 mAvatarText->setVisible(!isHidden); 679 mAvatarText->setVisible(!isHidden);
685 mLightingText->setVisible(!isHidden); 680 mLightingText->setVisible(!isHidden);
686 mTerrainText->setVisible(!isHidden); 681 mTerrainText->setVisible(!isHidden);
687 mDrawDistanceMeterText1->setVisible(!isHidden);
688 mDrawDistanceMeterText2->setVisible(!isHidden);
689 mAvatarCountText->setVisible(!isHidden); 682 mAvatarCountText->setVisible(!isHidden);
690 683
691 // hide one meter text if we're making things visible
692 if(!isHidden)
693 {
694 updateMeterText(mCtrlDrawDistance, this);
695 }
696
697 mMeshDetailText->setVisible(!isHidden); 684 mMeshDetailText->setVisible(!isHidden);
698 685
699 mCtrlAvatarMaxVisible->setVisible(!isHidden); 686 mCtrlAvatarMaxVisible->setVisible(!isHidden);
@@ -998,22 +985,6 @@ void LLPanelDisplay::updateSliderText(LLUICtrl* ctrl, void* user_data)
998 } 985 }
999} 986}
1000 987
1001void LLPanelDisplay::updateMeterText(LLUICtrl* ctrl, void* user_data)
1002{
1003 // get our UI widgets
1004 LLPanelDisplay* panel = (LLPanelDisplay*)user_data;
1005 LLSliderCtrl* slider = (LLSliderCtrl*) ctrl;
1006
1007 LLTextBox* m1 = panel->getChild<LLTextBox>("DrawDistanceMeterText1");
1008 LLTextBox* m2 = panel->getChild<LLTextBox>("DrawDistanceMeterText2");
1009
1010 // toggle the two text boxes based on whether we have 1 or two digits
1011 F32 val = slider->getValueF32();
1012 bool two_digits = val < 100;
1013 m1->setVisible(two_digits);
1014 m2->setVisible(!two_digits);
1015}
1016
1017// static 988// static
1018void LLPanelDisplay::onImpostorsEnable(LLUICtrl* ctrl, void* user_data) 989void LLPanelDisplay::onImpostorsEnable(LLUICtrl* ctrl, void* user_data)
1019{ 990{
diff --git a/linden/indra/newview/llpaneldisplay.h b/linden/indra/newview/llpaneldisplay.h
index e92cd2f..d7727e7 100644
--- a/linden/indra/newview/llpaneldisplay.h
+++ b/linden/indra/newview/llpaneldisplay.h
@@ -128,8 +128,6 @@ protected:
128 LLTextBox *mAvatarText; 128 LLTextBox *mAvatarText;
129 LLTextBox *mTerrainText; 129 LLTextBox *mTerrainText;
130 LLTextBox *mLightingText; 130 LLTextBox *mLightingText;
131 LLTextBox *mDrawDistanceMeterText1;
132 LLTextBox *mDrawDistanceMeterText2;
133 131
134 LLTextBox *mMeshDetailText; 132 LLTextBox *mMeshDetailText;
135 LLTextBox *mLODFactorText; 133 LLTextBox *mLODFactorText;
@@ -194,7 +192,6 @@ protected:
194 static void onCommitWindowedMode(LLUICtrl* ctrl, void *data); 192 static void onCommitWindowedMode(LLUICtrl* ctrl, void *data);
195 static void onApplyResolution(LLUICtrl* ctrl, void* data); 193 static void onApplyResolution(LLUICtrl* ctrl, void* data);
196 static void updateSliderText(LLUICtrl* ctrl, void* user_data); 194 static void updateSliderText(LLUICtrl* ctrl, void* user_data);
197 static void updateMeterText(LLUICtrl* ctrl, void* user_data);
198 static void onImpostorsEnable(LLUICtrl* ctrl, void* user_data); 195 static void onImpostorsEnable(LLUICtrl* ctrl, void* user_data);
199 196
200 /// callback for defaults 197 /// callback for defaults
diff --git a/linden/indra/newview/llprefscolors.cpp b/linden/indra/newview/llprefscolors.cpp
index 36e98a4..b0bc345 100644
--- a/linden/indra/newview/llprefscolors.cpp
+++ b/linden/indra/newview/llprefscolors.cpp
@@ -71,6 +71,7 @@ BOOL LLPrefsColors::postBuild()
71 updateSelfCheck(); 71 updateSelfCheck();
72 updateFriendsCheck(); 72 updateFriendsCheck();
73 73
74 // All three of these settings must exist, they are read by LLFloaterChat::isOwnNameInText.
74 childSetValue("nick01", gSavedSettings.getString("HighlightNickname01")); 75 childSetValue("nick01", gSavedSettings.getString("HighlightNickname01"));
75 childSetValue("nick02", gSavedSettings.getString("HighlightNickname02")); 76 childSetValue("nick02", gSavedSettings.getString("HighlightNickname02"));
76 childSetValue("nick03", gSavedSettings.getString("HighlightNickname03")); 77 childSetValue("nick03", gSavedSettings.getString("HighlightNickname03"));
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 0d53e82..b0a6834 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -85,6 +85,8 @@
85#include "llviewerregion.h" 85#include "llviewerregion.h"
86#include "llviewerstats.h" 86#include "llviewerstats.h"
87#include "llvoavatar.h" 87#include "llvoavatar.h"
88#include "llvograss.h"
89#include "llvotree.h"
88#include "llvovolume.h" 90#include "llvovolume.h"
89#include "pipeline.h" 91#include "pipeline.h"
90 92
@@ -832,7 +834,10 @@ void LLSelectMgr::highlightObjectOnly(LLViewerObject* objectp)
832 return; 834 return;
833 } 835 }
834 836
835 if (objectp->getPCode() != LL_PCODE_VOLUME) 837 if ((objectp->getPCode() != LL_PCODE_VOLUME) &&
838 (objectp->getPCode() != LL_PCODE_LEGACY_TREE) &&
839 (objectp->getPCode() != LL_PCODE_LEGACY_GRASS))
840
836 { 841 {
837 return; 842 return;
838 } 843 }
@@ -880,7 +885,10 @@ void LLSelectMgr::highlightObjectAndFamily(const std::vector<LLViewerObject*>& o
880 { 885 {
881 continue; 886 continue;
882 } 887 }
883 if (object->getPCode() != LL_PCODE_VOLUME) 888
889 if ((object->getPCode() != LL_PCODE_VOLUME) &&
890 (object->getPCode() != LL_PCODE_LEGACY_TREE) &&
891 (object->getPCode() != LL_PCODE_LEGACY_GRASS))
884 { 892 {
885 continue; 893 continue;
886 } 894 }
@@ -900,7 +908,14 @@ void LLSelectMgr::highlightObjectAndFamily(const std::vector<LLViewerObject*>& o
900 908
901void LLSelectMgr::unhighlightObjectOnly(LLViewerObject* objectp) 909void LLSelectMgr::unhighlightObjectOnly(LLViewerObject* objectp)
902{ 910{
903 if (!objectp || (objectp->getPCode() != LL_PCODE_VOLUME)) 911 if (!objectp)
912 {
913 return;
914 }
915
916 if ((objectp->getPCode() != LL_PCODE_VOLUME) &&
917 (objectp->getPCode() != LL_PCODE_LEGACY_TREE) &&
918 (objectp->getPCode() != LL_PCODE_LEGACY_GRASS))
904 { 919 {
905 return; 920 return;
906 } 921 }
@@ -5020,6 +5035,14 @@ void LLSelectMgr::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_
5020 { 5035 {
5021 ((LLVOVolume*)objectp)->generateSilhouette(nodep, view_point); 5036 ((LLVOVolume*)objectp)->generateSilhouette(nodep, view_point);
5022 } 5037 }
5038 else if (objectp && objectp->getPCode() == LL_PCODE_LEGACY_GRASS)
5039 {
5040 ((LLVOGrass*)objectp)->generateSilhouette(nodep, view_point);
5041 }
5042 else if (objectp && objectp->getPCode() == LL_PCODE_LEGACY_TREE)
5043 {
5044 ((LLVOTree*)objectp)->generateSilhouette(nodep, view_point);
5045 }
5023} 5046}
5024 5047
5025// 5048//
@@ -5355,8 +5378,10 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color)
5355 glMultMatrixf((F32*) objectp->getRenderMatrix().mMatrix); 5378 glMultMatrixf((F32*) objectp->getRenderMatrix().mMatrix);
5356 } 5379 }
5357 5380
5358 LLVolume *volume = objectp->getVolume(); 5381 //LLVolume *volume = objectp->getVolume();
5359 if (volume) 5382 //if (volume)
5383 // we used to only call this for volumes. but let's render silhouettes for any node that has them.
5384 if (1)
5360 { 5385 {
5361 F32 silhouette_thickness; 5386 F32 silhouette_thickness;
5362 if (is_hud_object && gAgent.getAvatarObject()) 5387 if (is_hud_object && gAgent.getAvatarObject())
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index dade65f..16f6e57 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -743,7 +743,9 @@ BOOL LLViewerCamera::areVertsVisible(LLViewerObject* volumep, BOOL all_verts)
743 LLVolume* volume = volumep->getVolume(); 743 LLVolume* volume = volumep->getVolume();
744 if (!volume) 744 if (!volume)
745 { 745 {
746 return FALSE; 746 BOOL inside = pointInFrustum(volumep->getRenderPosition());
747
748 return (inside > 0);
747 } 749 }
748 750
749 LLVOVolume* vo_volume = (LLVOVolume*) volumep; 751 LLVOVolume* vo_volume = (LLVOVolume*) volumep;
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp
index f738872..913ec33 100644
--- a/linden/indra/newview/llvograss.cpp
+++ b/linden/indra/newview/llvograss.cpp
@@ -48,6 +48,7 @@
48#include "llviewercamera.h" 48#include "llviewercamera.h"
49#include "llviewerimagelist.h" 49#include "llviewerimagelist.h"
50#include "llviewerregion.h" 50#include "llviewerregion.h"
51#include "llselectmgr.h"
51#include "pipeline.h" 52#include "pipeline.h"
52#include "llspatialpartition.h" 53#include "llspatialpartition.h"
53#include "llworld.h" 54#include "llworld.h"
@@ -721,3 +722,93 @@ BOOL LLVOGrass::lineSegmentIntersect(const LLVector3& start, const LLVector3& en
721 return ret; 722 return ret;
722} 723}
723 724
725void LLVOGrass::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
726 std::vector<LLVector3> &normals,
727 std::vector<S32> &segments,
728 const LLVector3& obj_cam_vec,
729 const LLMatrix4& mat,
730 const LLMatrix3& norm_mat)
731{
732 vertices.clear();
733 normals.clear();
734 segments.clear();
735
736 F32 width = sSpeciesTable[mSpecies]->mBladeSizeX;
737 F32 height = sSpeciesTable[mSpecies]->mBladeSizeY;
738
739 for (S32 i = 0; i < mNumBlades; i++)
740 {
741 F32 x = exp_x[i] * mScale.mV[VX];
742 F32 y = exp_y[i] * mScale.mV[VY];
743 F32 xf = rot_x[i] * GRASS_BLADE_BASE * width * w_mod[i];
744 F32 yf = rot_y[i] * GRASS_BLADE_BASE * width * w_mod[i];
745 F32 dzx = dz_x [i];
746 F32 dzy = dz_y [i];
747
748 F32 blade_height= GRASS_BLADE_HEIGHT * height * w_mod[i];
749
750 LLVector3 position1;
751
752 position1.mV[0] = mPosition.mV[VX] + x + xf;
753 position1.mV[1] = mPosition.mV[VY] + y + yf;
754 position1.mV[2] = mRegionp->getLand().resolveHeightRegion(position1);
755
756 LLVector3 position2 = position1;
757
758 position2.mV[0] += dzx;
759 position2.mV[1] += dzy;
760 position2.mV[2] += blade_height;
761
762 LLVector3 position3;
763
764 position3.mV[0] = mPosition.mV[VX] + x - xf;
765 position3.mV[1] = mPosition.mV[VY] + y - xf;
766 position3.mV[2] = mRegionp->getLand().resolveHeightRegion(position3);
767
768 LLVector3 position4 = position3;
769
770 position4.mV[0] += dzx;
771 position4.mV[1] += dzy;
772 position4.mV[2] += blade_height;
773
774
775 LLVector3 normal = (position1-position2) % (position2 - position3);
776 normal.normalize();
777
778 vertices.push_back(position1 + mRegionp->getOriginAgent());
779 normals.push_back(normal);
780 vertices.push_back(position2 + mRegionp->getOriginAgent());
781 normals.push_back(normal);
782 segments.push_back(vertices.size());
783
784 vertices.push_back(position2 + mRegionp->getOriginAgent());
785 normals.push_back(normal);
786 vertices.push_back(position4 + mRegionp->getOriginAgent());
787 normals.push_back(normal);
788 segments.push_back(vertices.size());
789
790 vertices.push_back(position4 + mRegionp->getOriginAgent());
791 normals.push_back(normal);
792 vertices.push_back(position3 + mRegionp->getOriginAgent());
793 normals.push_back(normal);
794 segments.push_back(vertices.size());
795
796 vertices.push_back(position3 + mRegionp->getOriginAgent());
797 normals.push_back(normal);
798 vertices.push_back(position1 + mRegionp->getOriginAgent());
799 normals.push_back(normal);
800 segments.push_back(vertices.size());
801 }
802}
803
804
805
806void LLVOGrass::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point)
807{
808 generateSilhouetteVertices(nodep->mSilhouetteVertices, nodep->mSilhouetteNormals,
809 nodep->mSilhouetteSegments,
810 LLVector3(0,0,0), LLMatrix4(), LLMatrix3());
811
812 nodep->mSilhouetteExists = TRUE;
813
814}
diff --git a/linden/indra/newview/llvograss.h b/linden/indra/newview/llvograss.h
index 25fa04c..c76ab93 100644
--- a/linden/indra/newview/llvograss.h
+++ b/linden/indra/newview/llvograss.h
@@ -37,6 +37,7 @@
37#include "lldarray.h" 37#include "lldarray.h"
38#include <map> 38#include <map>
39 39
40class LLSelectNode;
40class LLSurfacePatch; 41class LLSurfacePatch;
41class LLViewerImage; 42class LLViewerImage;
42 43
@@ -76,6 +77,8 @@ public:
76 /*virtual*/ BOOL updateLOD(); 77 /*virtual*/ BOOL updateLOD();
77 /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area 78 /*virtual*/ void setPixelAreaAndAngle(LLAgent &agent); // generate accurate apparent angle and area
78 79
80 void generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point);
81
79 void plantBlades(); 82 void plantBlades();
80 83
81 /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate. 84 /*virtual*/ BOOL isActive() const; // Whether this object needs to do an idleUpdate.
@@ -125,6 +128,12 @@ protected:
125 ~LLVOGrass(); 128 ~LLVOGrass();
126 129
127private: 130private:
131 void generateSilhouetteVertices(std::vector<LLVector3> &vertices,
132 std::vector<LLVector3> &normals,
133 std::vector<S32> &segments,
134 const LLVector3& view_vec,
135 const LLMatrix4& mat,
136 const LLMatrix3& norm_mat);
128 void updateSpecies(); 137 void updateSpecies();
129 F32 mLastHeight; // For cheap update hack 138 F32 mLastHeight; // For cheap update hack
130 S32 mNumBlades; 139 S32 mNumBlades;
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp
index 6a59253..8c6abdc 100644
--- a/linden/indra/newview/llvotree.cpp
+++ b/linden/indra/newview/llvotree.cpp
@@ -47,6 +47,7 @@
47#include "llagent.h" 47#include "llagent.h"
48#include "lldrawable.h" 48#include "lldrawable.h"
49#include "llface.h" 49#include "llface.h"
50#include "llselectmgr.h"
50#include "llviewercamera.h" 51#include "llviewercamera.h"
51#include "llviewerimagelist.h" 52#include "llviewerimagelist.h"
52#include "llviewerobjectlist.h" 53#include "llviewerobjectlist.h"
@@ -1327,3 +1328,127 @@ LLTreePartition::LLTreePartition()
1327 mLODPeriod = 1; 1328 mLODPeriod = 1;
1328} 1329}
1329 1330
1331
1332
1333void LLVOTree::generateSilhouetteVertices(std::vector<LLVector3> &vertices,
1334 std::vector<LLVector3> &normals,
1335 std::vector<S32> &segments,
1336 const LLVector3& obj_cam_vec,
1337 const LLMatrix4& local_matrix,
1338 const LLMatrix3& normal_matrix)
1339{
1340 vertices.clear();
1341 normals.clear();
1342 segments.clear();
1343
1344 F32 height = mBillboardScale; // *mBillboardRatio * 0.5;
1345 F32 width = height * mTrunkAspect;
1346
1347 LLVector3 position1 = LLVector3(-width * 0.5,0,0) * local_matrix;
1348 LLVector3 position2 = LLVector3(-width * 0.5,0,height) * local_matrix;
1349 LLVector3 position3 = LLVector3(+width * 0.5,0,height) * local_matrix;
1350 LLVector3 position4 = LLVector3(+width * 0.5,0,0) * local_matrix;
1351
1352 LLVector3 position5 = LLVector3(0,-width * 0.5,0) * local_matrix;
1353 LLVector3 position6 = LLVector3(0,-width * 0.5,height) * local_matrix;
1354 LLVector3 position7 = LLVector3(0,+width * 0.5,height) * local_matrix;
1355 LLVector3 position8 = LLVector3(0,+width * 0.5,0) * local_matrix;
1356
1357
1358 LLVector3 normal = (position1-position2) % (position2-position3);
1359 normal.normalize();
1360
1361 vertices.push_back(position1);
1362 normals.push_back(normal);
1363 vertices.push_back(position2);
1364 normals.push_back(normal);
1365 segments.push_back(vertices.size());
1366
1367 vertices.push_back(position2);
1368 normals.push_back(normal);
1369 vertices.push_back(position3);
1370 normals.push_back(normal);
1371 segments.push_back(vertices.size());
1372
1373 vertices.push_back(position3);
1374 normals.push_back(normal);
1375 vertices.push_back(position4);
1376 normals.push_back(normal);
1377 segments.push_back(vertices.size());
1378
1379 vertices.push_back(position4);
1380 normals.push_back(normal);
1381 vertices.push_back(position1);
1382 normals.push_back(normal);
1383 segments.push_back(vertices.size());
1384
1385 normal = (position5-position6) % (position6-position7);
1386 normal.normalize();
1387
1388 vertices.push_back(position5);
1389 normals.push_back(normal);
1390 vertices.push_back(position6);
1391 normals.push_back(normal);
1392 segments.push_back(vertices.size());
1393
1394 vertices.push_back(position6);
1395 normals.push_back(normal);
1396 vertices.push_back(position7);
1397 normals.push_back(normal);
1398 segments.push_back(vertices.size());
1399
1400 vertices.push_back(position7);
1401 normals.push_back(normal);
1402 vertices.push_back(position8);
1403 normals.push_back(normal);
1404 segments.push_back(vertices.size());
1405
1406 vertices.push_back(position8);
1407 normals.push_back(normal);
1408 vertices.push_back(position5);
1409 normals.push_back(normal);
1410 segments.push_back(vertices.size());
1411
1412}
1413
1414
1415void LLVOTree::generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point)
1416{
1417 LLVector3 position;
1418 LLQuaternion rotation;
1419
1420 if (mDrawable->isActive())
1421 {
1422 if (mDrawable->isSpatialRoot())
1423 {
1424 position = LLVector3();
1425 rotation = LLQuaternion();
1426 }
1427 else
1428 {
1429 position = mDrawable->getPosition();
1430 rotation = mDrawable->getRotation();
1431 }
1432 }
1433 else
1434 {
1435 position = getPosition() + getRegion()->getOriginAgent();;
1436 rotation = getRotation();
1437 }
1438
1439 // trees have bizzare scaling rules... because it's cool to make needless exceptions
1440 // PS: the trees are the last remaining tidbit of Philip's code. take a look sometime.
1441 F32 radius = getScale().length() * 0.05f;
1442 LLVector3 scale = LLVector3(1,1,1) * radius;
1443
1444 // compose final matrix
1445 LLMatrix4 local_matrix;
1446 local_matrix.initAll(scale, rotation, position);
1447
1448
1449 generateSilhouetteVertices(nodep->mSilhouetteVertices, nodep->mSilhouetteNormals,
1450 nodep->mSilhouetteSegments,
1451 LLVector3(0,0,0), local_matrix, LLMatrix3());
1452
1453 nodep->mSilhouetteExists = TRUE;
1454}
diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h
index 855c612..57116cc 100644
--- a/linden/indra/newview/llvotree.h
+++ b/linden/indra/newview/llvotree.h
@@ -39,7 +39,7 @@
39 39
40class LLFace; 40class LLFace;
41class LLDrawPool; 41class LLDrawPool;
42 42class LLSelectNode;
43 43
44class LLVOTree : public LLViewerObject 44class LLVOTree : public LLViewerObject
45{ 45{
@@ -124,6 +124,9 @@ public:
124 LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point 124 LLVector3* bi_normal = NULL // return the surface bi-normal at the intersection point
125 ); 125 );
126 126
127 void generateSilhouette(LLSelectNode* nodep, const LLVector3& view_point);
128
129
127 static S32 sMaxTreeSpecies; 130 static S32 sMaxTreeSpecies;
128 131
129 struct TreeSpeciesData 132 struct TreeSpeciesData
@@ -200,6 +203,15 @@ protected:
200 static S32 sLODVertexCount[4]; 203 static S32 sLODVertexCount[4];
201 static S32 sLODSlices[4]; 204 static S32 sLODSlices[4];
202 static F32 sLODAngles[4]; 205 static F32 sLODAngles[4];
206
207private:
208 void generateSilhouetteVertices(std::vector<LLVector3> &vertices,
209 std::vector<LLVector3> &normals,
210 std::vector<S32> &segments,
211 const LLVector3& view_vec,
212 const LLMatrix4& mat,
213 const LLMatrix3& norm_mat);
214
203}; 215};
204 216
205#endif 217#endif
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 72a6438..2ed0869 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -29,9 +29,6 @@
29 <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top" 29 <combo_box allow_text_entry="false" bottom="-67" enabled="true" follows="left|top"
30 height="18" left="185" max_chars="20" mouse_opaque="true" 30 height="18" left="185" max_chars="20" mouse_opaque="true"
31 name="windowsize combo" width="150"> 31 name="windowsize combo" width="150">
32 <combo_item type="string" length="1" enabled="true" name="640x480" value="640 x 480">
33 640x480
34 </combo_item>
35 <combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600"> 32 <combo_item type="string" length="1" enabled="true" name="800x600" value="800 x 600">
36 800x600 33 800x600
37 </combo_item> 34 </combo_item>
@@ -44,8 +41,16 @@
44 <combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768"> 41 <combo_item type="string" length="1" enabled="true" name="1024x768" value="1024 x 768">
45 1024x768 42 1024x768
46 </combo_item> 43 </combo_item>
47 44 <combo_item type="string" length="1" enabled="true" name="1280x720" value="1280 x 720">
48 </combo_box> 45 1280x720 (HDV720)
46 </combo_item>
47 <combo_item type="string" length="1" enabled="true" name="1440x1080" value="1440 x 1080">
48 1440x1080 (HDV1080)
49 </combo_item>
50 <combo_item type="string" length="1" enabled="true" name="1920x1080" value="1920 x 1080">
51 1920x1080 (HD1080)
52 </combo_item>
53 </combo_box>
49 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 54 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
50 bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top" 55 bottom="-62" drop_shadow_visible="true" enabled="true" follows="left|top"
51 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10" 56 font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
@@ -237,35 +242,21 @@
237 radio_style="false" width="256" /> 242 radio_style="false" width="256" />
238 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 243 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
239 bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" 244 bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
240 font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0" 245 font="SansSerifSmall" h_pad="0" halign="left" height="12" left_delta="0"
241 mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128"> 246 mouse_opaque="true" name="AvatarCountText" v_pad="0" width="128">
242 Max. non-imposters: 247 Max. non-imposters:
243 </text> 248 </text>
244 <slider bottom_delta="-20" can_edit_text="false" control_name="RenderAvatarMaxVisible" 249 <slider bottom_delta="-20" can_edit_text="true" control_name="RenderAvatarMaxVisible"
245 decimal_digits="0" enabled="true" follows="left|top" height="16" 250 decimal_digits="0" enabled="true" follows="left|top" height="16"
246 increment="1" initial_val="35" label="" 251 increment="1" initial_val="35" label=""
247 label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true" 252 label_width="0" left_delta="0" max_val="50" min_val="0" mouse_opaque="true"
248 name="AvatarMaxVisible" show_text="true" width="100" /> 253 name="AvatarMaxVisible" show_text="true" width="100" />
249 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 254 <slider bottom="-135" can_edit_text="true" control_name="RenderFarClip"
250 bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
251 font="SansSerifSmall" h_pad="0" halign="left" height="12"
252 left="457" mouse_opaque="true" name="DrawDistanceMeterText1" v_pad="0"
253 width="128">
254 m
255 </text>
256 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
257 bottom="-131" drop_shadow_visible="true" enabled="true" follows="left|top"
258 font="SansSerifSmall" h_pad="0" halign="left" height="12"
259 left="463" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
260 width="128">
261 m
262 </text>
263 <slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
264 decimal_digits="0" enabled="true" follows="left|top" height="16" 255 decimal_digits="0" enabled="true" follows="left|top" height="16"
265 increment="8" initial_val="160" label="Draw distance:" 256 increment="4" initial_val="160" label="Draw distance (meters):"
266 label_width="140" left="215" max_val="512" min_val="32" mouse_opaque="true" 257 label_width="140" left="215" max_val="1024" min_val="32" mouse_opaque="true"
267 name="DrawDistance" show_text="true" width="255" /> 258 name="DrawDistance" show_text="true" width="262" />
268 <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount" 259 <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
269 decimal_digits="0" enabled="true" follows="left|top" height="16" 260 decimal_digits="0" enabled="true" follows="left|top" height="16"
270 increment="256" initial_val="4096" 261 increment="256" initial_val="4096"
271 label="Max. particle count:" label_width="140" left_delta="0" 262 label="Max. particle count:" label_width="140" left_delta="0"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
index ce2d5ad..4639ef3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_radar.xml
@@ -41,12 +41,12 @@
41 </text> 41 </text>
42 42
43 <slider name="near_me_range" label="" control_name="NearMeRange" 43 <slider name="near_me_range" label="" control_name="NearMeRange"
44 bottom_delta="0" left_delta="62" width="150" height="15" 44 bottom_delta="0" left_delta="58" width="110" height="15"
45 follows="left|top" min_val="5" max_val="2048" increment="1" 45 follows="left|top" min_val="5" max_val="1024" increment="1"
46 initial_val="96" decimal_digits="0" /> 46 initial_val="96" decimal_digits="0" can_edit_text="true" />
47 47
48 <text name="meters" 48 <text name="meters"
49 bottom_delta="0" left_delta="10" height="15" width="40" 49 bottom_delta="0" left_delta="113" height="15" width="40"
50 h_pad="0" halign="left" v_pad="0" follows="left|top" 50 h_pad="0" halign="left" v_pad="0" follows="left|top"
51 bg_visible="false" border_drop_shadow_visible="false" 51 bg_visible="false" border_drop_shadow_visible="false"
52 border_visible="false" drop_shadow_visible="true" 52 border_visible="false" drop_shadow_visible="true"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
index 3849efd..c7769cc 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml
@@ -3,24 +3,17 @@
3 follows="right|bottom" height="67" left="0" mouse_opaque="true" 3 follows="right|bottom" height="67" left="0" mouse_opaque="true"
4 name="windlight_remote" use_bounding_rect="true" width="182"> 4 name="windlight_remote" use_bounding_rect="true" width="182">
5 <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" /> 5 <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="67" left="0" width="182" />
6 <slider bottom="-20" can_edit_text="false" control_name="RenderFarClip" 6 <slider bottom="-20" can_edit_text="true" control_name="RenderFarClip"
7 decimal_digits="0" enabled="true" height="18" 7 decimal_digits="0" enabled="true" height="18"
8 increment="8" initial_val="160" label="Draw distance:" 8 increment="4" initial_val="160" label="Draw distance:"
9 label_width="78" left="6" max_val="512" min_val="32" mouse_opaque="true" 9 label_width="74" left="4" max_val="1024" min_val="32" mouse_opaque="true"
10 name="DrawDistance" show_text="true" width="170" /> 10 name="DrawDistance" show_text="true" width="174" />
11 <slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount" 11 <slider bottom_delta="-20" can_edit_text="true" control_name="RenderMaxPartCount"
12 decimal_digits="0" enabled="true" follows="left|top" height="18" 12 decimal_digits="0" enabled="true" follows="left|top" height="18"
13 increment="256" initial_val="4096" 13 increment="256" initial_val="4096"
14 label="Max. particles:" label_width="78" left_delta="0" 14 label="Max. particles:" label_width="74" left_delta="0"
15 max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount" 15 max_val="8192" min_val="0" mouse_opaque="true" name="MaxParticleCount"
16 show_text="true" width="176" /> 16 show_text="true" width="174" />
17 <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
18 bottom="-14" drop_shadow_visible="true" enabled="true" follows="left|top"
19 font="SansSerifSmall" h_pad="0" halign="left" height="12"
20 left="170" mouse_opaque="true" name="DrawDistanceMeterText2" v_pad="0"
21 width="8">
22 m
23 </text>
24 <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" /> 17 <panel bottom="13" filename="panel_windlight_controls.xml" left="0" width="182" />
25 <string name="atmosphere"> 18 <string name="atmosphere">
26 Atmosphere 19 Atmosphere
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index e0f08b2..41495ca 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1087,7 +1087,7 @@ class Linux_x86_64Manifest(LinuxManifest):
1087 self.path("libuuid.so", "libuuid.so.1") 1087 self.path("libuuid.so", "libuuid.so.1")
1088 self.path("libSDL-1.2.so.0") 1088 self.path("libSDL-1.2.so.0")
1089 self.path("libELFIO.so") 1089 self.path("libELFIO.so")
1090 self.path("libjpeg.so.62") 1090 self.path("libjpeg.so.7")
1091 self.path("libpng12.so.0") 1091 self.path("libpng12.so.0")
1092 self.path("libopenjpeg.so.2") 1092 self.path("libopenjpeg.so.2")
1093 self.path("libxml2.so.2") 1093 self.path("libxml2.so.2")
diff --git a/linden/install.xml b/linden/install.xml
index 04d7b5e..95c7cec 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -794,10 +794,10 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
794 </map> 794 </map>
795 <key>linux64</key> 795 <key>linux64</key>
796 <map> 796 <map>
797 <key>md5sum</key> 797 <key>md5sum</key>
798 <string>8b5f413bdefec7cfe3d9ad2d69986bdc</string> 798 <string>64e7fa98568ef52b3b9d4a18b3515090</string>
799 <key>url</key> 799 <key>url</key>
800 <uri>http://imprudenceviewer.org/download/libs/jpeglib-6b-linux64-20101012.tar.bz2</uri> 800 <uri>http://imprudenceviewer.org/download/libs/jpeglib-7-linux64-20091230.tar.bz2</uri>
801 </map> 801 </map>
802 <key>windows</key> 802 <key>windows</key>
803 <map> 803 <map>
@@ -1048,18 +1048,18 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
1048 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20100923.tar.bz2</uri> 1048 <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20100923.tar.bz2</uri>
1049 </map> 1049 </map>
1050 <key>linux64</key> 1050 <key>linux64</key>
1051 <map> 1051 <map>
1052 <key>md5sum</key> 1052 <key>md5sum</key>
1053 <string>863f7b31556b1d368651f85457f4e46d</string> 1053 <string>d5deaf897fe8effa3d3537c875060379</string>
1054 <key>url</key> 1054 <key>url</key>
1055 <uri>http://imprudenceviewer.org/download/libs/llqtwebkit-linux64-20101012.1.tar.bz2</uri> 1055 <uri>http://imprudenceviewer.org/download/libs/llqtwebkit-linux64-20100907.tar.bz2</uri>
1056 </map> 1056 </map>
1057 <key>windows</key> 1057 <key>windows</key>
1058 <map> 1058 <map>
1059 <key>md5sum</key> 1059 <key>md5sum</key>
1060 <string>4b8412833c00f8cdaba26808f0ddb404</string> 1060 <string>df1bdd683128e060d60e435f65d8f7e8</string>
1061 <key>url</key> 1061 <key>url</key>
1062 <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100916.tar.bz2</uri> 1062 <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100617.tar.bz2</uri>
1063 </map> 1063 </map>
1064 </map> 1064 </map>
1065 </map> 1065 </map>
generated by cgit v1.1 at 2025-04-03 11:56:40 +0000