[hippo-commits] SF.net SVN: opensim-viewer:[18] web
Status: Beta
Brought to you by:
manaj
Menu
▾
▴
[hippo-commits] SF.net SVN: opensim-viewer:[18] web
|
From: Hippo O. V. S. C. <ope...@li...> - 2008-11-30 19:00:48
|
Revision: 18
http://opensim-viewer.svn.sourceforge.net/opensim-viewer/?rev=18&view=rev
Author: manaj
Date: 2008-11-30 19:00:44 +0000 (Sun, 30 Nov 2008)
Log Message:
-----------
Updated for v0.4.0.
Modified Paths:
--------------
web/htdocs/build.php
web/htdocs/changes.php
web/htdocs/index.php
web/php/menu.inc
web/php/page_header.inc
web/php/stats.inc
Added Paths:
-----------
web/htdocs/db/
web/htdocs/db/grids.php
web/htdocs/limits.php
web/php/grids.inc
Modified: web/htdocs/build.php
===================================================================
--- web/htdocs/build.php 2008-09-12 06:47:58 UTC (rev 17)
+++ web/htdocs/build.php 2008-11-30 19:00:44 UTC (rev 18)
@@ -5,8 +5,8 @@
$platforms[] = "Windows";
$platforms[] = "Linux";
-$slwiki["Windows"] = "http://wiki.secondlife.com/wiki/Microsoft_Windows_Builds";
-$slwiki["Linux"] = "http://wiki.secondlife.com/wiki/Compiling_the_viewer_%28Linux%29";
+$slwiki["Windows"] = "http://wiki.secondlife.com/wiki/Get_source_and_compile";
+$slwiki["Linux"] = "http://wiki.secondlife.com/wiki/Get_source_and_compile";
$sllibs["Windows"] = "http://secondlife.com/developers/opensource/downloads/2008/07/slviewer-win32-libs-Branch_1-20-Viewer-2-r92456.zip";
$sllibs["Linux"] = "http://secondlife.com/developers/opensource/downloads/2008/07/slviewer-linux-libs-Branch_1-20-Viewer-2-r92456.tar.gz";
@@ -68,65 +68,23 @@
>OpenSimulator Forge Subversion Repositiory</a>.</p>
<p>You can check out the latest release with an empty password:</p>
-<pre class="code">svn co --username anonymous http://forge.opensimulator.org/svn/opensim-viewer/tags/v0.2.1_LL1.20.15</pre>
+<pre class="code">svn co --username anonymous http://forge.opensimulator.org/svn/opensim-viewer/tags/v0.4.0_LL1.21.6 source</pre>
<p>The latest version is available at:</p>
-<pre class="code">svn co --username anonymous http://forge.opensimulator.org/svn/opensim-viewer/trunk</pre>
+<pre class="code">svn co --username anonymous http://forge.opensimulator.org/svn/opensim-viewer/trunk source</pre>
<p>Note that the trunk might have incomplete features or might not even compile.</p>
-<h2>Additional Archives</h2>
+<? if ($platform == "Windows"): ?>
-<p>Download the following archives and unpack them into the trunk directory:</p>
-<ul>
-<li><a href="<?=$sllibs[$platform]?>">Second Life Viewer <?=$platform?> Libraries</a>
-<li><a href="<?=$slartwork?>">Second Life Viewer Artwork</a>
-<li><a href="<?=$hippofiles?>">Hippo OpenSim Viewer Resources</a>
-</ul>
-
-
-<h2>FMOD Audio Library</h2>
-
-<p>You need the <a href="http://www.fmod.org/">FMOD 3 audio
-library</a>. Make sure to get FMOD 3, the newer FMOD Ex does not
-work.<p>
-
-<? if ($platform == "Linux"): ?>
-
-<p>From a Linux shell you can download and install the library with the following commands:</p>
-<pre class="code">
-wget http://www.fmod.org/index.php/release/version/fmodapi375linux.tar.gz
-tar xzvf fmodapi375linux.tar.gz
-cd fmodapi375linux/
-cp api/inc/* ../linden/libraries/i686-linux/include/
-cp api/libfmod-3.75.so ../linden/libraries/i686-linux/lib_release_client/
-</pre>
-
-
-<? elseif ($platform == "Windows"): ?>
-
-<ul>
-<li>Download and unpack <a
- href="http://www.fmod.org/index.php/release/version/fmodapi375win.zip"
- ><tt>fmodapi375win.zip</tt></a>.</li>
-<li>Copy <tt>fmodapi375win/api/inc/*.h</tt> to <tt>linden/libraries/include</tt></li>
-<li>Copy <tt>fmodapi375win/api/lib/fmodvc.lib</tt> to <tt>linden/libraries/i686-win32\lib_debug</tt></li>
-<li>Copy <tt>fmodapi375win/api/lib/fmodvc.lib</tt> to <tt>linden/libraries/i686-win32\lib_release</tt></li>
-<li>Copy <tt>fmodapi375win/api/fmodvc.dll</tt> to <tt>linden/indra/newview</tt></li>
-</ul>
-
-
<h2>Quicktime SDK</h2>
<p><i>Note: Quicktime is required for playing movies in-world. The
download is free, but you have to register at the Apple web
site.</i></p>
<ul>
-<li>Download and install the <a
+<li>Download and install <a
href="http://connect.apple.com/cgi-bin/WebObjects/MemberSite.woa/203/wa/getSoftware?fileID=20525&code=y&source=x&wosid=4h16WcyMtVfd2P1EffGafkoxFcr"
>Apple Quicktime SDK for Windows</a>.</li>
-<li>Copy directory <tt>QuicktimeSDK/CIncludes/</tt> as <tt>linden/libraries/i686-win32/include/quicktime/</tt></li>
-<li>Copy <tt>QuicktimeSDK/Libraries/QTMLClient.lib</tt> to <tt>linden/libraries/i686-win32/lib_debug</tt></li>
-<li>Copy <tt>QuicktimeSDK/Libraries/QTMLClient.lib</tt> to <tt>linden/libraries/i686-win32/lib_release</tt></li>
</ul>
@@ -134,11 +92,12 @@
<p><i>Note: These DLLs are only required for packaging your build into an installer.</i></p>
<ul>
+<li>Copy <tt>msvcp71.dll</tt> to <tt>linden/indra/newview</tt></li>
+<li>Copy <tt>msvcr71.dll</tt> to <tt>linden/indra/newview</tt></li>
<li>Copy <tt>msvcp80.dll</tt> to <tt>linden/indra/newview</tt></li>
<li>Copy <tt>msvcr80.dll</tt> to <tt>linden/indra/newview</tt></li>
</ul>
-
<? endif; ?>
@@ -146,29 +105,35 @@
<? if ($platform == "Linux"): ?>
-<p>To build the viewer and package it into an archive run the following commands:</p>
+<p>To build the viewer and package it into an archive run the following commands::</p>
<pre class="code">
-cd linden/indra
-ln -s ../../hippo/hippoViewer
-scons DISTCC=no BTARGET=client BUILD=releasefordownload MOZLIB=yes OPENSOURCE=false
+cd source
+scripts/build.sh
</pre>
<? elseif ($platform == "Windows"): ?>
-<p>Open the VS2005 solution
-<tt>linden/indra/indra_complete/indra_complete.sln</tt> and select
-your build target:</p>
+<p>First you need to prepare the build tree:</p>
+<pre class="code">
+cd source
+scripts/addons_get_fmod.sh
+cd scripts
+./build.bat
+cd ..
+</pre>
+
+<p>Then open the VS2005 solution
+<tt>linden/indra/build-VC80/SecondLife.sln</tt> and select your build
+target:</p>
<ul>
<li><strong>Debug</strong><br/>
- Full debugging information and debug libraries. Currently crashes
- at startup.</li>
-<li><strong>ReleaseNoOpt</strong><br/>
- Release libraries, but full debugging information and incremental
- linking. Recommended for testing and debugging.
+ Full debugging information and debug libraries. Not tested my
+ me.</li>
+<li><strong>RelWithDebInfo</strong><br/>
+ Release libraries, but full debugging information. Recommended for
+ testing and debugging.</li>
<li><strong>ReleaseForDownload</strong><br/>
- Recommended for the final release build only. This target uses
- link time code generation, so don't be surprised if linking takes
- 2-3 hours.</li>
+ Recommended for the final release build only.</li>
</ul>
<p>Then build the solution...</p>
Modified: web/htdocs/changes.php
===================================================================
--- web/htdocs/changes.php 2008-09-12 06:47:58 UTC (rev 17)
+++ web/htdocs/changes.php 2008-11-30 19:00:44 UTC (rev 18)
@@ -9,6 +9,34 @@
together with the major changes.</p>
+<h2>Version 0.4.0 (LL 1.21.6)</h2>
+<ul>
+<li>Based on the <a
+ href="http://secondlife.com/app/releasenotes/?version=1.21.6"
+ target="_blank">Linden viewer 1.21.6</a>.</li>
+<li>Includes all patches from the <a href="http://sldev.free.fr/"
+ target="_blank">Cool SL Viewer</a>. Those changing the look and
+ feel of the viewer are disabled by default and can be enabled in
+ the new "Hippo" tab in the viewer preferences.</li>
+<li>Torley's windlight settings are installed with the viewer.</li>
+<li>The limits for building are now set depending on the simulator
+ platform. <a href="limits.php">Details...</a>.</li>
+<li>Opt in to extended range for hollow and minimum hole size on a
+ per-grid basis. <a href="limits.php">Details...</a>.</li>
+<li>Grid settings are updated from the web server automatically.</li>
+<li>The currency symbol is now OS$ (OpenSim Dollar), when connected to
+ OpenSim, and L$, when connected to SecondLife.</li>
+<li>New "Offer Teleport" button next to "Profile" in the IM
+ window. For now it is permanently enabled. This will be changed,
+ once presence is properly reported in OpenSim.</li>
+<li>The grid manager now has fields for support/help, registration and
+ forgotten password. The links for registration and password show
+ on the login screen only, when a URL is available.</li>
+<li>More references to SecondLife replaced with the grid name and
+ another SL logo replaced.</li>
+</ul>
+
+
<h2>Version 0.2.1 (LL 1.20.15)</h2>
<ul>
<li>Fixed a group of crashes, for example when saving a script (<a
Added: web/htdocs/db/grids.php
===================================================================
--- web/htdocs/db/grids.php (rev 0)
+++ web/htdocs/db/grids.php 2008-11-30 19:00:44 UTC (rev 18)
@@ -0,0 +1,39 @@
+<?php
+
+require_once "../../php/db_mysql.inc";
+
+DB_Connect();
+
+$res = DB_Query("SELECT `value` FROM `general` WHERE `key`='grids_version'");
+if ($row = mysql_fetch_array($res, MYSQL_NUM)) {
+ $version = $row[0];
+} else {
+ exit();
+}
+mysql_free_result($res);
+
+echo "<llsd>\n";
+echo " <array>\n";
+
+echo " <map>\n";
+echo " <key>default_grids_version</key><string>$version</string>\n";
+echo " </map>\n";
+
+$res = DB_Query("SELECT * FROM `grids` WHERE `active`='1'");
+while ($row = mysql_fetch_array($res, MYSQL_ASSOC)) {
+ echo "\n";
+ echo " <!-- $row[gridname] -->\n";
+ echo " <map>\n";
+ foreach ($row as $key => $value)
+ if (($key != "active") && ($value != ""))
+ echo " <key>$key</key><string>$value</string>\n";
+ echo " </map>\n";
+}
+mysql_free_result($res);
+
+echo " </array>\n";
+echo "</llsd>\n";
+
+DB_Close();
+
+?>
\ No newline at end of file
Modified: web/htdocs/index.php
===================================================================
--- web/htdocs/index.php 2008-09-12 06:47:58 UTC (rev 17)
+++ web/htdocs/index.php 2008-11-30 19:00:44 UTC (rev 18)
@@ -5,19 +5,11 @@
<h1>News</h1>
-<p><strong>2008-08-22:</strong> Major bug fix release v0.2.1. Fixes a
- group of crashes, for example when saving a script (<a
- href="http://forge.opensimulator.org/gf/project/opensim-viewer/tracker/?action=TrackerItemEdit&tracker_item_id=27"
- >more details</a>). The maximum hollow has been reverted back to
- 95, as the LL viewer cannot render prims with hollow greater than
- 95 (<a
- href="http://forge.opensimulator.org/gf/project/opensim-viewer/tracker/?action=TrackerItemEdit&tracker_item_id=26"
- >more details</a>).</p>
+<p><strong>2008-11-30:</strong> MJM Labs proudly presents Hippo
+ OpenSim Viewer v0.4.0. This is the first version based on Linden
+ viewer 1.21. For more details please see the <a
+ href="changes.php">list of changes</a>.</p>
-<p><strong>2008-08-15:</strong> New Release v0.2.0. Check out the new
- grid manager!</p>
-
-
<p> </p>
<h1>Features</h1>
@@ -30,22 +22,23 @@
features. More specific OpenSim features are under development.</p>
<p>The current version is based on the official Linden Lab release
-<b>1.20.15</b>.</p>
+<b>1.21.6</b>.</p>
<p><b>NOTE:</b> This viewer can connect to the Second Life grid, but
there the usual limits of Second Life apply.</p>
<h2>Limitations Removed or Extended</h2>
+
+<p>Limits are depending on the simulator platform. For more details
+please see the <a href="limits.php">limits page</a>. Some highlights
+for OpenSim:</p>
<ul>
<li>Build up to 10,000 m.</li>
<li>Scale prims up to 256x256x256 m.</li>
<li>Set transparency up to 100 in the edit window.</li>
-<li>Set the hole size down to 0.01 for prim shapes like torus.</li>
+<li>Set the hole size down to 0.01 for prim shapes like torus (optional).</li>
+<li>Set hollow up to 99 (optional).</li>
<li>Join up to 100 groups.</li>
-<li><strike>Set hollow up to 99.</strike> This was reverted to 95 in
- v0.2.1 (<a
- href="http://forge.opensimulator.org/gf/project/opensim-viewer/tracker/?action=TrackerItemEdit&tracker_item_id=26"
- >more details</a>).</li>
</ul>
<h2>Grid Manager</h2>
@@ -79,6 +72,7 @@
<h2>General</h2>
<ul>
+<li>Torley's windlight settings are installed with the viewer.</li>
<li>Only the English language setting is implemented.</li>
<li>Replace references to Second Life with OpenSim and OSGrid (ongoing).</li>
</ul>
@@ -93,10 +87,16 @@
<!--
<p> </p>
-
<h1>Coming soon...</h1>
-<p>A short preview of the features that will be in Hippo OpenSim Viewer 0.2.0 (LL 1.20.15)</p>
+<p>A short preview of the features that will be in Hippo OpenSim Viewer 0.2.2 (LL 1.20.15)</p>
+<ul>
+<li>Torley's windlight settings.</li>
+<li>Fixed: client freezes on texture cache cleanup [patch by Nicholaz
+Beresford (VWR-3878)].</li>
+<li>More grids added to default list.</li>
+</ul>
-->
+
<?php include "../php/page_footer.inc"; ?>
\ No newline at end of file
Added: web/htdocs/limits.php
===================================================================
--- web/htdocs/limits.php (rev 0)
+++ web/htdocs/limits.php 2008-11-30 19:00:44 UTC (rev 18)
@@ -0,0 +1,67 @@
+<?php
+$pageName = ":Limits";
+include "../php/page_header.inc";
+?>
+
+<h1>Limits</h1>
+
+<p>The limits for building are based on the platform, for example in
+SecondLife the maximum prim size is 10x10x10, while in OpenSim it is
+256x256x256. This avoids that a prim you have carefully resized snaps
+back to smaller limits once you select a different prim.</p>
+
+<center>
+<table class="content">
+<tr>
+ <td></td>
+ <th colspan="2" class="label">OpenSim</th>
+ <th colspan="2" class="label">Second Life</th>
+</tr><tr>
+ <td class="label">Max. Prim Scale</td>
+ <td class="item">256x256x256</td><td class="note"></td>
+ <td class="item">10x10x10</td><td class="note"></td>
+</tr>
+</tr><tr>
+ <td class="label">Max. Height</td>
+ <td class="item">10,000 m</td><td class="note"></td>
+ <td class="item">4096 m</td><td class="note"></td>
+</tr>
+</tr><tr>
+ <td class="label">Max. Transparency</td>
+ <td class="item">100</td><td class="note"></td>
+ <td class="item">100</td><td class="note"></td>
+</tr>
+</tr><tr>
+ <td class="label">Max. Hollow</td>
+ <td class="item">95/99</td><td class="note">(1)</td>
+ <td class="item">95</td><td class="note"></td>
+</tr>
+</tr><tr>
+ <td class="label">Min. Hole Size</td>
+ <td class="item">0.05/0.01</td><td class="note">(1)</td>
+ <td class="item">0.05</td><td class="note"></td>
+</tr>
+</tr><tr>
+ <td class="label">Max. Groups</td>
+ <td class="item">100</td><td class="note">(2)</td>
+ <td class="item">25</td><td class="note"></td>
+</tr>
+</table>
+</center>
+
+<h2>Notes</h2>
+<ol>
+<li>As the extended range for hollow and minimum hole size is not
+ properly rendered on other viewers, the Hippo OpenSim Viewer
+ restricts editing by default to the range supported by all
+ viewers. You can opt in to the extended range for each grid
+ independently in the <a href="grids.php">grid manager</a>.<br/>
+ The Hippo OpenSim Viewer always renders prims using the extended
+ range properly, even if turned off for editing.</li>
+<li>The extended group limit is set only in the viewer. This will
+ probably need to be adapted, once the details of group support in
+ OpenSim get defined.</li>
+</ol>
+
+
+<?php include "../php/page_footer.inc"; ?>
\ No newline at end of file
Added: web/php/grids.inc
===================================================================
--- web/php/grids.inc (rev 0)
+++ web/php/grids.inc 2008-11-30 19:00:44 UTC (rev 18)
@@ -0,0 +1,13 @@
+
+<div id="gridsPanel" class="panel" style="background-color:#ffffff; margin-left:0px; margin-right:0px;">
+
+</div>
+
+<div id="gridsPanel" class="panel">
+<center class="grids">
+<p class="gridstitle" align="center">Hippo OpenSim Viewer<br/>
+is supported by<br/>the following grids:</p>
+<p class="grids" align="center"><a href="http://avatarhangout.com/" target="_blank"><img src="http://avatarhangout.com/images/ah_logo.jpg" width="150" height="100" border="0" alt="Avatar Hangout - Free Access Virtual World Using The Opensim Software"/></a></p>
+</center>
+</div>
+</div>
Modified: web/php/menu.inc
===================================================================
--- web/php/menu.inc 2008-09-12 06:47:58 UTC (rev 17)
+++ web/php/menu.inc 2008-11-30 19:00:44 UTC (rev 18)
@@ -17,6 +17,7 @@
menuItem("Downloads", "download.php");
menuItem("Support", "support.php");
menuItem("Documentation", "docu.php");
+menuItem(":Limits", "limits.php");
menuItem(":Grid Manager", "grids.php");
menuItem(":Trees & Grass", "trees.php");
menuItem(":Build Source", "build.php");
Modified: web/php/page_header.inc
===================================================================
--- web/php/page_header.inc 2008-09-12 06:47:58 UTC (rev 17)
+++ web/php/page_header.inc 2008-11-30 19:00:44 UTC (rev 18)
@@ -16,9 +16,10 @@
h2 { font:bold 17/17px Arial,sans; margin-top:15px; margin-bottom:-2px; color:334499; }
h3 { font:bold 13/13px Arial,sans; margin-top:12px; margin-bottom:0px; color:334499; }
ul { margin-top:8px; margin-bottom:0px; }
+ol { margin-top:8px; margin-bottom:0px; }
p { margin-top:8px; margin-bottom:0px; }
pre.code { background-color:#dddddd; border:1px solid #000000; padding:2px; margin-left:15px; margin-right:15px; }
-b,strong { color:334499; }
+b,strong { color:#334499; }
/* page layout */
table.page { width:95%; min-width:800px; margin-top:15px; }
@@ -29,10 +30,11 @@
#contentPanel { padding:20px; }
#statsColumn { float:right; margin-left:15px; margin-bottom:15px; }
#statsPanel { margin:5px; }
+#gridsPanel { margin:5px; padding:0px; }
/* panel colors */
table.page { background-color:#5577ff; border:4px solid #334499; }
-#titlePanel,#menuPanel,#statsPanel
+#titlePanel,#menuPanel,#statsPanel,#gridsPanel
{ background-color:#334499; border:2px solid #ffffff; }
#contentPanel { background-color:#ffffff; border:4px solid #334499; }
#statsColumn { background-color:#5577ff; }
@@ -57,6 +59,15 @@
#menuActive:hover { color:#ffaaaa; }
#menuActive:active { color:#ff0000; }
+ /* tables for content */
+table.content { border:4px solid #334499; margin-top:12px; margin-bottom:0px;
+ padding:0px; border-spacing:0px; border-collapse:collapse; }
+th.label { border:2px solid #5577ff; padding:2px; }
+td.label { border:2px solid #5577ff; padding:2px; }
+td.item { text-align:right; padding:2px;
+ border-left:2px solid #5577ff; border-top:2px solid #5577ff; }
+td.note { border-top:2px solid #5577ff; padding:2px; }
+
/* statistics */
table.stats { width:160px; }
td.statsItem { color:#ffffff; padding-left:8px; padding-right:5px; }
@@ -66,6 +77,10 @@
td.statsItem a { color:#cccccc; }
td.statsItem b { color:#ffffff; }
+ /* grids */
+center.grids { width:160px; padding:0px; }
+p.gridstitle { color:#ffffff; padding:5px; margin:0px; margin-bottom:3px; }
+p.grids { background-color:#5577ff; padding:5px; margin:0px; }
</style>
</head>
@@ -112,4 +127,10 @@
<!-- Statistics -->
<?php include "../php/stats.inc"; ?>
-</div></div>
+</div><?php /*
+
+ <!-- Supporting Grids -->
+ <?php if ($pageName == "Home")
+ include "../php/grids.inc"; ?>
+
+ */ ?></div>
Modified: web/php/stats.inc
===================================================================
--- web/php/stats.inc 2008-09-12 06:47:58 UTC (rev 17)
+++ web/php/stats.inc 2008-11-30 19:00:44 UTC (rev 18)
@@ -1,12 +1,10 @@
<table class="stats" cellspacing="0">
<tr class="statsLine0"><td class="statsItem" colspan="2"
align="center"><b>Statistics</b> <a href="stats.php">(?)</a></td></tr>
-<tr class="statsLine1"><td class="statsItem">Total Users:</td><td class="statsValue">0</td></tr>
-<tr class="statsLine0"><td class="statsItem">Last 24 Hours:</td><td class="statsValue">0</td></tr>
-<tr class="statsLine1"><td class="statsItem">Last 30 Days:</td><td class="statsValue">0</td></tr>
-<tr class="statsLine0"><td class="statsItem">Total Windows:</td><td class="statsValue">0</td></tr>
-<tr class="statsLine1"><td class="statsItem">Total Linux:</td><td class="statsValue">0</td></tr>
-<tr class="statsLine0"><td colspan="2" class="statsValue"><font size="-2">0000-00-00 00:00 UTC</font></td></tr>
+<tr class="statsLine1"><td class="statsItem">Total Users:</td><td class="statsValue">8639</td></tr>
+<tr class="statsLine0"><td class="statsItem">Last 24 Hours:</td><td class="statsValue">825</td></tr>
+<tr class="statsLine1"><td class="statsItem">Last 30 Days:</td><td class="statsValue">6357</td></tr>
+<tr class="statsLine0"><td class="statsItem">Total Windows:</td><td class="statsValue">7769</td></tr>
+<tr class="statsLine1"><td class="statsItem">Total Linux:</td><td class="statsValue">576</td></tr>
+<tr class="statsLine0"><td colspan="2" class="statsValue"><font size="-2">2008-11-30 18:31 UTC</font></td></tr>
</table>
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
