2d88394cd5
laying some groundwork for mesh physics
2010-10-14 13:10:03 -07:00
cb2c1d794c
Merge branch 'master' of /var/git/opensim/
2010-10-14 09:30:05 -07:00
486eede9be
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 12:24:07 -04:00
c148ef25a9
* Replacing Magic numbers with Enums
2010-10-14 12:23:41 -04:00
8f16d65896
Merge branch 'master' of /var/git/opensim/
2010-10-14 09:20:04 -07:00
5dc8638d8b
Merge branch 'master' of /var/git/opensim/
2010-10-14 09:10:02 -07:00
41ce392d9b
Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems to be generating xml's that are successfully parsed. Needs more testing.
2010-10-14 09:05:46 -07:00
405935492b
Don't distroy attachments when using viewer 2.1+, strip multiple attachment data
2010-10-14 16:28:51 +01:00
ba247f729d
Kill some magic numbers in the mesh upload module and change the mesh asset
...
type from 45 to 49 to match OMV trunk
2010-10-14 16:28:51 +01:00
64a41f67c5
Merge branch 'master' of /var/git/opensim/
2010-10-14 07:20:09 -07:00
3cb716d291
Merge branch 'master' of ssh://MyConnection/var/git/opensim
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-14 10:12:57 -04:00
a3eeca174e
Merge branch 'master' of /var/git/opensim/
2010-10-14 07:00:06 -07:00
05c4e27a30
* A few additional cleanup elements
...
* At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong.
* Special thanks to John Hurliman and Latif Khalifa for their valuable insight.
2010-10-14 09:57:42 -04:00
69dbfe2a69
Updated to libomv-opensim r3449
2010-10-14 15:46:36 +02:00
88959e045b
Merge branch 'master' of /var/git/opensim/
2010-10-14 06:40:25 -07:00
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
5af10a61e4
Merge branch 'master' of /var/git/opensim/
2010-10-14 06:30:13 -07:00
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
b75dfdd151
Merge branch 'master' of /var/git/opensim/
2010-10-14 00:30:06 -07:00
9c5f8a6802
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 03:23:37 -04:00
b4a5ce148c
Rename file + more testing and tweaking
2010-10-14 03:22:44 -04:00
84fc9e003f
Merge branch 'master' of /var/git/opensim/
2010-10-14 00:20:04 -07:00
eb606559e7
Merge branch 'master' of /var/git/opensim/
2010-10-13 23:30:06 -07:00
6ac6ca057d
Kill some magic numbers in the caps module
2010-10-14 07:28:20 +01:00
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
2f582500ce
Merge branch 'master' of /var/git/opensim/
2010-10-13 17:40:06 -07:00
46738bbd16
Merge branch 'master' of ssh://MyConnection/var/git/opensim
...
Conflicts:
bin/OpenSimDefaults.ini
2010-10-13 20:29:55 -04:00
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
b44c894ba1
Merge branch 'master' of /var/git/opensim/
2010-10-13 15:50:03 -07:00
45e0cdfcad
Added SOP.MediaUrl and Shape.Media to the deserialization
2010-10-13 15:44:25 -07:00
6e37e55063
Merge branch 'master' of /var/git/opensim/
2010-10-13 14:20:03 -07:00
aa60c4b129
fix build break
2010-10-13 22:18:57 +01:00
537905d81b
Add a setter to OldItemID so it can be deserialized
2010-10-13 19:45:55 +01:00
cc8498a31a
Merge branch 'master' of /var/git/opensim/
2010-10-13 11:30:07 -07:00
bb1e35fbd9
Merge branch 'master' into careminster-presence-refactor
2010-10-13 18:44:58 +01:00
eeac2a9e6a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-13 18:41:52 +01:00
ccd5610997
Correctly update the LastSeen field
2010-10-13 18:41:09 +01:00
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
12c0a05ae7
Merge branch 'master' of /var/git/opensim/
2010-10-13 10:40:04 -07:00
d7c9bc3b1c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-10-13 10:39:01 -07:00
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
e96621b27f
Merge branch 'master' of /var/git/opensim/
2010-10-13 10:00:08 -07:00
a132edbdae
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-13 12:42:02 -04:00
14a0f4fe9b
*typical non-effectual commit to trigger a build
2010-10-13 12:40:21 -04:00
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
e863c0052b
Merge branch 'master' of /var/git/opensim/
2010-10-13 08:20:07 -07:00
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
3eb68c319e
change default next owner persm to mod/trans to match SL.
2010-10-13 08:24:18 +02:00
a2167b0f0d
* more url / hg cleanup
2010-10-11 16:53:00 -04:00
2654ab6300
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-10 18:06:27 -04:00
dahlia