44b163bba7
Merge branch 'master' of /var/git/opensim/
2010-10-14 22:50:03 -07:00
de696a2fc6
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-15 01:46:00 -04:00
0308982c58
one more silly line ending thing.... *If you have problems, fetch the tree and rebase.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:45:25 -04:00
28a45a7914
Merge branch 'master' of /var/git/opensim/
2010-10-14 20:40:09 -07:00
657ff01212
one more silly line ending thing....
...
*If you have problems, fetch the tree and rebase.
2010-10-14 23:32:33 -04:00
19fdfc1a97
Merge branch 'master' of /var/git/opensim/
2010-10-14 20:30:04 -07:00
bcdd03c1cf
more work in progress on mesh physics - still non-functional
2010-10-14 20:25:31 -07:00
49b4281ac6
Merge branch 'master' of /var/git/opensim/
2010-10-14 18:30:05 -07:00
b4c54765d2
libomv update to support headerless llsd binary deserialization needed for mesh asset decoding
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-14 21:26:26 -04:00
cf5aeb9a68
Merge branch 'sceneapi' of ssh://island.sciencesim.com/home/sceneapi/sceneapi into sceneapi
2010-10-14 14:35:14 -07:00
de9427e545
Border crossing in multi-region CMs and many debug messages for appearance
2010-10-14 14:31:28 -07:00
ad5e6da4df
Merge branch 'master' of /var/git/opensim/
2010-10-14 13:20:04 -07:00
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
cc8498a31a
Merge branch 'master' of /var/git/opensim/
2010-10-13 11:30:07 -07: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
opensim mirror account