Skip to content

Commit

Permalink
Added dependant libraries and modified visual studio to automatically…
Browse files Browse the repository at this point in the history
… copy neccessary files to output dir
  • Loading branch information
lkalif committed May 9, 2010
1 parent 58ccc13 commit 1325f8e
Show file tree
Hide file tree
Showing 78 changed files with 11,265 additions and 21 deletions.
2 changes: 1 addition & 1 deletion client/AjaxLife.Libs.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions client/AjaxLife.Network.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,14 +318,14 @@ AjaxLife.Network.Send = function(message, opts) {
// We have to do any alterations to the query before querystring is defined.
var signed = opts.signed;
delete opts.signed; // This doesn't throw errors, even if the opts.signed never existed.
var querystring = Object.toQueryString(opts);
var querystring = Hash.toQueryString(opts); // This is deprecated in Prototype 1.6 - if we upgrade, change to Object.toQueryString().
// Used to ensure that you can't impersonate someone by grabbing the SID -
// at least for important messages.
// This signs messages where signed is true, or the message is in the list of messages to sign,
// unless signed is explicitly false.
if(signed || (AjaxLife.Network.SignedMessages[message] && signed !== false))
{
querystring = Object.toQueryString(opts); // Do it again without the signed: true part.
querystring = Hash.toQueryString(opts); // Do it again without the signed: true part.
var tohash = (++AjaxLife.SignedCallCount).toString() + querystring + AjaxLife.Signature;
var hash = md5(tohash);
AjaxLife.Debug("Network: Signing '"+message+"' message with '"+hash+"' (from '"+tohash+"')");
Expand Down
5 changes: 5 additions & 0 deletions server/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*.bak
*.suo
AjaxLife.csproj.user
obj
bin
21 changes: 3 additions & 18 deletions server/Html/BasicStats.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
using System.Collections.Generic;
using System.Text;
using System.IO;
using System.Diagnostics;
using MiniHttpd;
using OpenMetaverse;
using OpenMetaverse.Packets;
Expand All @@ -45,6 +46,7 @@ public class BasicStats : IFile
private IDirectory parent;
private Dictionary<Guid, User> users;
private DateTime started;
private PerformanceCounter cpu = new PerformanceCounter("Processor", "% Processor Time");

// Methods
public BasicStats(string name, IDirectory parent, Dictionary<Guid, User> users)
Expand Down Expand Up @@ -82,24 +84,7 @@ public void OnFileRequested(HttpRequest request, IDirectory directory)
// Work out and write the time running in seconds.
TimeSpan span = DateTime.UtcNow.Subtract(started);
textWriter.WriteLine(span.TotalSeconds);
try
{
// This is .NET-speak for "print exec('free')".
// It's really rather complicated.
// (N.B. "free" spits out how much memory you're using)
System.Diagnostics.Process process = new System.Diagnostics.Process();
process.StartInfo.UseShellExecute = false;
process.StartInfo.RedirectStandardOutput = true;
process.StartInfo.FileName = "free";
process.Start();
textWriter.Write(process.StandardOutput.ReadToEnd());
process.WaitForExit();
process.Dispose();
}
catch
{
textWriter.Write("Unable to get memory info.");
}
textWriter.WriteLine(cpu.NextValue());
}
catch (Exception exception)
{
Expand Down
7 changes: 7 additions & 0 deletions server/OpenMetaverse.dll.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<configuration>
<dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
<dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
<dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet-x86_64.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-i686" />
</configuration>
Binary file added server/XMLRPC.dll
Binary file not shown.
Binary file added server/assemblies/Affirma.ThreeSharp.dll
Binary file not shown.
Binary file added server/assemblies/MiniHttpd.dll
Binary file not shown.
Binary file added server/assemblies/Newtonsoft.Json.dll
Binary file not shown.
Binary file not shown.
Binary file added server/assemblies/OpenMetaverse.dll
Binary file not shown.
Binary file added server/assemblies/OpenMetaverseTypes.dll
Binary file not shown.
Binary file added server/assemblies/log4net.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added server/libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib
Binary file not shown.
Binary file added server/openjpeg-dotnet-x86_64.dll
Binary file not shown.
Binary file added server/openjpeg-dotnet.dll
Binary file not shown.
Loading

0 comments on commit 1325f8e

Please sign in to comment.