OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,627 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

13627 Commits (e0866faacc8a91b8e85fe6a5ecfe0655582d1470)

Author SHA1 Message Date
Jonathan Freedman 4e4fb93fae Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-17 18:45:25 -04:00
opensim mirror account e37566b4fb Merge branch 'master' of /var/git/opensim/ 2010-10-17 10:50:07 -07:00
Diva Canto 6df4ca7de1 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-10-17 10:42:04 -07:00
Diva Canto 7038f2b406 Deleted all [XmlIgnore] from SOP, since those are meaningless now. 2010-10-17 10:41:38 -07:00
Diva Canto 22eff055d4 .NET automagical serialization of SOPs replaced by manual serialization across the board. 2010-10-17 10:35:38 -07:00
opensim mirror account fa7d2f6538 Merge branch 'master' of /var/git/opensim/ 2010-10-17 02:40:07 -07:00
BlueWall 06b61b68c7 Adding osFunctions for light projection 
Set the projection parameters in the host prim ...
	osSetProjectionParam(bool Enabled,
				key TextureMaskUUID,
				float FOV,
				float Focus,
				float Ambiance);

	Set the projection parameters in a target prim ...
	osSetProjectionParam(ikey target uuid,
				bool Enabled,
				key TextureMaskUUID,
				float FOV,
				float Focus,
				float Ambiance);

	Threat Level very high

Signed-off-by: Melanie <melanie@t-data.com>
 2010-10-17 09:52:12 +01:00
opensim mirror account 89b236d17d Merge branch 'master' of /var/git/opensim/ 2010-10-16 18:50:03 -07:00
Teravus Ovares (Dan Olivares) 551d927ed5 typical non-effectual build trigger 2010-10-16 21:48:15 -04:00
opensim mirror account f90b2ef918 Merge branch 'master' of /var/git/opensim/ 2010-10-16 18:00:09 -07:00
BlueWall 9e421868e3 Add missing check for !_projectionEntry 
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
 2010-10-16 20:59:18 -04:00
opensim mirror account 4c0bbc8661 Merge branch 'master' of /var/git/opensim/ 2010-10-15 23:30:04 -07:00
Justin Clark-Casey (justincc) 06d37d06e6 Drop max oar loading version back to 0 from 1 2010-10-16 07:25:55 +01:00
opensim mirror account 6998f9268b Merge branch 'master' of /var/git/opensim/ 2010-10-15 23:20:03 -07:00
Justin Clark-Casey (justincc) edc31adf95 Rip out version option since it turns out that the changed object serialization format can actually be loaded by older OpenSims after all 
This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now.
 2010-10-16 07:09:13 +01:00
opensim mirror account 907c576c00 Merge branch 'master' of /var/git/opensim/ 2010-10-15 21:40:03 -07:00
Justin Clark-Casey (justincc) e41b23a1a4 change --old-guids switch on the save oar command line to --version=<x> 
if x is 0, then an old version 0.3 archive is saved.  If it is anything else or missing, then a version 1.0 archive is saved
version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier
also add various informational notices about what version we've saving/loading
 2010-10-16 05:38:44 +01:00
opensim mirror account 4f6badca04 Merge branch 'master' of /var/git/opensim/ 2010-10-15 21:10:02 -07:00
Justin Clark-Casey (justincc) 3df8d8ff76 Have OpenSim throw a strop if it tries to load an OAR with a major version that is too high for it to handle 2010-10-16 04:59:51 +01:00
opensim mirror account e2c04e15b9 Merge branch 'master' of /var/git/opensim/ 2010-10-15 20:00:08 -07:00
Justin Clark-Casey (justincc) 1bd4219078 save oar control file first rather than in the middle so that it's the first thing we come accross on load 
this exposes a weekness with using tar where we don't control the order in which files are loaded.  can't be helped for now
 2010-10-16 03:52:11 +01:00
opensim mirror account 2a2bb5ebf1 Merge branch 'master' of /var/git/opensim/ 2010-10-15 18:40:03 -07:00
Justin Clark-Casey (justincc) fe4e6ff811 Fix test break - TestSerializeXml2() still requires old-guids option 2010-10-16 02:38:46 +01:00
opensim mirror account 06b17841e2 Merge branch 'master' of /var/git/opensim/ 2010-10-15 17:30:05 -07:00
Diva Canto 1499607215 Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>. 2010-10-15 17:27:19 -07:00
opensim mirror account 1341ad1c91 Merge branch 'master' of /var/git/opensim/ 2010-10-15 15:50:04 -07:00
Diva Canto e039a8c8c2 UPdated the MySql driver to 6.2.4. Also established a much larger MySqlCommand timeout on fetching prims. 2010-10-15 15:43:06 -07:00
opensim mirror account d99d7e2f63 Merge branch 'master' of /var/git/opensim/ 2010-10-15 06:50:07 -07:00
BlueWall dd1058e6b3 Adding projected light filters to prim propeties 
Requires the LL Mesh Beta viewer
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
 2010-10-15 09:46:49 -04:00
opensim mirror account bec522cc09 Merge branch 'master' of /var/git/opensim/ 2010-10-14 23:00:04 -07:00
Latif Khalifa cd4d7a7c35 A couple of more ways attachment point is sent 
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
 2010-10-15 01:56:08 -04:00
opensim mirror account 44b163bba7 Merge branch 'master' of /var/git/opensim/ 2010-10-14 22:50:03 -07:00
Teravus Ovares (Dan Olivares) de696a2fc6 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-10-15 01:46:00 -04:00
Teravus Ovares (Dan Olivares) 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
opensim mirror account 28a45a7914 Merge branch 'master' of /var/git/opensim/ 2010-10-14 20:40:09 -07:00
Teravus Ovares (Dan Olivares) 657ff01212 one more silly line ending thing.... 
*If you have problems, fetch the tree and rebase.
 2010-10-14 23:32:33 -04:00
opensim mirror account 19fdfc1a97 Merge branch 'master' of /var/git/opensim/ 2010-10-14 20:30:04 -07:00
dahlia bcdd03c1cf more work in progress on mesh physics - still non-functional 2010-10-14 20:25:31 -07:00
opensim mirror account 49b4281ac6 Merge branch 'master' of /var/git/opensim/ 2010-10-14 18:30:05 -07:00
Latif Khalifa 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
opensim mirror account ad5e6da4df Merge branch 'master' of /var/git/opensim/ 2010-10-14 13:20:04 -07:00
dahlia 2d88394cd5 laying some groundwork for mesh physics 2010-10-14 13:10:03 -07:00
opensim mirror account cb2c1d794c Merge branch 'master' of /var/git/opensim/ 2010-10-14 09:30:05 -07:00
Teravus Ovares (Dan Olivares) 486eede9be Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-10-14 12:24:07 -04:00
Teravus Ovares (Dan Olivares) c148ef25a9 * Replacing Magic numbers with Enums 2010-10-14 12:23:41 -04:00
opensim mirror account 8f16d65896 Merge branch 'master' of /var/git/opensim/ 2010-10-14 09:20:04 -07:00
opensim mirror account 5dc8638d8b Merge branch 'master' of /var/git/opensim/ 2010-10-14 09:10:02 -07:00
Diva Canto 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
Latif Khalifa 405935492b Don't distroy attachments when using viewer 2.1+, strip multiple attachment data 2010-10-14 16:28:51 +01:00
Melanie 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