aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-151-0/+80
|\
| * Adding projected light filters to prim propetiesBlueWall2010-10-151-0/+80
| | | | | | | | | | Requires the LL Mesh Beta viewer Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-0/+8
|\ \ | |/
| * A couple of more ways attachment point is sentLatif Khalifa2010-10-151-0/+8
| | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-140-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-150-0/+0
| |\
| * | one more silly line ending thing.... *If you have problems, fetch the tree ↵Teravus Ovares (Dan Olivares)2010-10-151-71/+71
| | | | | | | | | | | | | | | | | | and rebase. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-71/+71
|\ \ \ | | |/ | |/|
| * | one more silly line ending thing....Teravus Ovares (Dan Olivares)2010-10-141-71/+71
| |/ | | | | | | *If you have problems, fetch the tree and rebase.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-143-24/+75
|\ \ | |/
| * more work in progress on mesh physics - still non-functionaldahlia2010-10-143-24/+75
| |
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-146-6/+63
|\ \ | |/
| * libomv update to support headerless llsd binary deserialization needed for ↵Latif Khalifa2010-10-146-6/+63
| | | | | | | | | | | | mesh asset decoding Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-70/+80
|\ \ | |/
| * laying some groundwork for mesh physicsdahlia2010-10-141-70/+80
| |
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-4/+4
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-144-108/+171
| |\
| * | * Replacing Magic numbers with EnumsTeravus Ovares (Dan Olivares)2010-10-142-4/+4
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-3/+7
|\ \ \ | | |/ | |/|
| * | Don't distroy attachments when using viewer 2.1+, strip multiple attachment dataLatif Khalifa2010-10-141-0/+4
| | |
| * | Kill some magic numbers in the mesh upload module and change the mesh assetMelanie2010-10-141-3/+3
| | | | | | | | | | | | type from 45 to 49 to match OMV trunk
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-105/+164
|\ \ \ | |/ /
| * | Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ↵Diva Canto2010-10-142-105/+164
| |/ | | | | | | to be generating xml's that are successfully parsed. Needs more testing.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-147-15645/+15726
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| |\ | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| * | Updated to libomv-opensim r3449Latif Khalifa2010-10-147-15645/+15726
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-0/+6
|\ \ \ | | |/ | |/|
| * | * A few additional cleanup elementsTeravus Ovares (Dan Olivares)2010-10-142-0/+6
| |/ | | | | | | | | * 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.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-1/+1
|\ \ | |/
| * * Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'Teravus Ovares (Dan Olivares)2010-10-141-1/+1
| | | | | | | | * 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.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-143-16/+35
|\ \ | |/
| * * Tweaked the upload response and now at least uploading the mesh works.Teravus Ovares (Dan Olivares)2010-10-143-16/+35
| | | | | | | | * Binary error on downloading the mesh though.. so still not yet working.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-141-9/+17
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-142-3/+4
| |\
| * | Rename file + more testing and tweakingTeravus Ovares (Dan Olivares)2010-10-141-9/+17
| | |
* | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-142-3/+4
|\ \ \ | | |/ | |/|
| * | Kill some magic numbers in the caps moduleMelanie2010-10-142-3/+4
| |/
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-133-1/+451
|\ \ | |/
| * * Partially complete stuff for Mesh support that Melanie wanted to see ↵Teravus Ovares (Dan Olivares)2010-10-143-1/+451
| | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either.
* | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-135-27890/+27890
|\ \ | |/
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-134-216/+35
| |\ | | | | | | | | | | | | Conflicts: bin/OpenSimDefaults.ini
| * | * Normalizing endlines so git stops complaining about them being inconsistent.Teravus Ovares (Dan Olivares)2010-10-135-27893/+27893
| | | | | | | | | | | | * People will hate me for updating OpenSimDefaults.. but meh. Gotta be done or git is unhappy.
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-10-133-15/+1389
| |\ \
| * | | *typical non-effectual commit to trigger a buildTeravus Ovares (Dan Olivares)2010-10-131-3/+3
| | | |
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-131-204/+14
|\ \ \ \ | | |_|/ | |/| |
| * | | Added SOP.MediaUrl and Shape.Media to the deserializationDiva Canto2010-10-131-204/+14
| | | |
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-131-1/+1
|\ \ \ \ | |/ / /
| * | | fix build breakJustin Clark-Casey (justincc)2010-10-131-1/+1
| | | |
* | | | Merge branch 'master' of /var/git/opensim/opensim mirror account2010-10-132-2/+12
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-131-1/+1
| |\ \ \