Latif Khalifa
69dbfe2a69
Updated to libomv-opensim r3449
2010-10-14 15:46:36 +02:00
opensim mirror account
88959e045b
Merge branch 'master' of /var/git/opensim/
2010-10-14 06:40:25 -07:00
Teravus Ovares (Dan Olivares)
6d99f0c627
* Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'
...
* At this point. Visually, Mesh works OK. Remember peeps, this is still highly experimental from the viewer side as well as the Simulator side. There are known problems with the new beta viewers and attachment breaking so be careful until that's fixed. Additionally there some new properties in the Mesh Viewer that determine physics settings that are non-functional. More work will be done on that.
2010-10-14 09:34:37 -04:00
opensim mirror account
5af10a61e4
Merge branch 'master' of /var/git/opensim/
2010-10-14 06:30:13 -07:00
Teravus Ovares (Dan Olivares)
7e363b79c7
* Tweaked the upload response and now at least uploading the mesh works.
...
* Binary error on downloading the mesh though.. so still not yet working.
2010-10-14 09:24:15 -04:00
opensim mirror account
b75dfdd151
Merge branch 'master' of /var/git/opensim/
2010-10-14 00:30:06 -07:00
Teravus Ovares (Dan Olivares)
9c5f8a6802
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 03:23:37 -04:00
Teravus Ovares (Dan Olivares)
b4a5ce148c
Rename file + more testing and tweaking
2010-10-14 03:22:44 -04:00
opensim mirror account
84fc9e003f
Merge branch 'master' of /var/git/opensim/
2010-10-14 00:20:04 -07:00
opensim mirror account
eb606559e7
Merge branch 'master' of /var/git/opensim/
2010-10-13 23:30:06 -07:00
Melanie
6ac6ca057d
Kill some magic numbers in the caps module
2010-10-14 07:28:20 +01:00
Teravus Ovares (Dan Olivares)
3384f643eb
* Partially complete stuff for Mesh support that Melanie wanted to see before it was done.
...
* Shouldn't break the build.
* Doesn't work yet either.
2010-10-14 02:19:42 -04:00
opensim mirror account
2f582500ce
Merge branch 'master' of /var/git/opensim/
2010-10-13 17:40:06 -07:00
Teravus Ovares (Dan Olivares)
46738bbd16
Merge branch 'master' of ssh://MyConnection/var/git/opensim
...
Conflicts:
bin/OpenSimDefaults.ini
2010-10-13 20:29:55 -04:00
Teravus Ovares (Dan Olivares)
1a57c65810
* Normalizing endlines so git stops complaining about them being inconsistent.
...
* People will hate me for updating OpenSimDefaults.. but meh. Gotta be done or git is unhappy.
2010-10-13 20:26:46 -04:00
opensim mirror account
b44c894ba1
Merge branch 'master' of /var/git/opensim/
2010-10-13 15:50:03 -07:00
Diva Canto
45e0cdfcad
Added SOP.MediaUrl and Shape.Media to the deserialization
2010-10-13 15:44:25 -07:00
opensim mirror account
6e37e55063
Merge branch 'master' of /var/git/opensim/
2010-10-13 14:20:03 -07:00
Justin Clark-Casey (justincc)
aa60c4b129
fix build break
2010-10-13 22:18:57 +01:00
opensim mirror account
cc8498a31a
Merge branch 'master' of /var/git/opensim/
2010-10-13 11:30:07 -07:00
Melanie
eeac2a9e6a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-13 18:41:52 +01:00
Melanie Thielker
ccd5610997
Correctly update the LastSeen field
2010-10-13 18:41:09 +01:00
Melanie Thielker
01728fb19e
Ensure no UUID.Zero region ID is ever written to presence. Add a Migration
...
to add a LastSeen field of type "Timestamp" to Presence for MySQL
2010-10-13 18:40:33 +01:00
opensim mirror account
12c0a05ae7
Merge branch 'master' of /var/git/opensim/
2010-10-13 10:40:04 -07:00
Diva Canto
d7c9bc3b1c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-10-13 10:39:01 -07:00
Diva Canto
d890390ecf
Comment a debug message so that it doesn't spew the console upon encountering unknown xml elements.
2010-10-13 10:38:34 -07:00
opensim mirror account
e96621b27f
Merge branch 'master' of /var/git/opensim/
2010-10-13 10:00:08 -07:00
Teravus Ovares (Dan Olivares)
a132edbdae
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-13 12:42:02 -04:00
Teravus Ovares (Dan Olivares)
14a0f4fe9b
*typical non-effectual commit to trigger a build
2010-10-13 12:40:21 -04:00
Melanie
b4c718f93b
Remove carriage returns from OpenSimDefaults.ini. Correct one typo. Change
...
.ini.example ";;" format to normal ini format, since the defaults file
is not parsed that way.
2010-10-13 17:07:13 +01:00
opensim mirror account
e863c0052b
Merge branch 'master' of /var/git/opensim/
2010-10-13 08:20:07 -07:00
Diva Canto
54a3b8e079
New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for load oar and load xml2, but not for packing objects on crossings/TPs yet.
2010-10-13 08:16:41 -07:00
Jonathan Freedman
a2167b0f0d
* more url / hg cleanup
2010-10-11 16:53:00 -04:00
Jonathan Freedman
2654ab6300
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-10 18:06:27 -04:00
opensim mirror account
873e551bb3
Merge branch 'master' of /var/git/opensim/
2010-10-10 15:00:12 -07:00
Melanie
30f926aab6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-10 22:07:51 +01:00
Melanie
f2febb89fc
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:07:36 +01:00
opensim mirror account
1ee628c7d5
Merge branch 'master' of git@github.com:opensim/opensim
2010-10-09 11:06:33 -07:00
Teravus Ovares (Dan Olivares)
cf61cf7b32
* Make line endings consistant in Meshmerizer.cs
2010-10-09 13:50:53 -04:00
Latif Khalifa
0dd4071156
Fix a typo in previouis commit: start must not pass the end of the file
2010-10-09 18:22:21 +02:00
Diva Canto
aeecdd1430
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-10-09 09:09:38 -07:00
Diva Canto
78f6fe0b31
Added missing sections to StandaloneHypergrid.ini
2010-10-09 09:09:16 -07:00
Teravus Ovares (Dan Olivares)
3454dfbcb3
weird line endings fix commit
2010-10-09 12:07:58 -04:00
Latif Khalifa
5e381ec67c
Return error code instead of the last byte of the file if range is not satisfiable
2010-10-09 18:01:11 +02:00
Latif Khalifa
06d3a529a9
In case when 1 single byte is requested (yes viewer does this)
...
start of the ranges gets clamped with a wrong value. In case of a texture with
601 byte long texture the viewer request range 0-599 first, then 600- in which case
both start and end should be 600.
End can also be 0, valid request for the firt byte of the file is 0-0.
Thanks to Thickbrick for explaining how HTTP range header works.
2010-10-09 17:46:09 +02:00
Melanie
96080dc492
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-09 01:05:05 +01:00
Justin Clark-Casey (justincc)
ed161020e2
minor: remove some mono compiler warnings
2010-10-09 01:46:29 +01:00
Marck
211ea5d521
Limit formatting of local console output to actual logging messages.
...
The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level.
This fixes the issue of colons being added to help texts on the local console.
2010-10-09 00:47:39 +01:00
Melanie
4a57288577
Fix an infinite recursion
2010-10-08 23:23:07 +01:00
Melanie
4a0911bdbd
Guard against locking a nullref to avoid build break
2010-10-08 19:19:07 +01:00