opensim mirror account
963b129389
Merge branch 'master' of /var/git/opensim/
2010-10-18 17:40:03 -07:00
Melanie
43a4b7b735
COmmented the wrong line instead, now I commented them all to be on the safe side
2010-10-19 01:23:25 +01:00
Melanie
8853c21763
COmmented the wrong line instead, now I commented them all to be on the safe side
2010-10-19 01:22:31 +01:00
Melanie
e0a02d6ca3
Merge branch 'master' into careminster-presence-refactor
2010-10-19 00:52:35 +01:00
Melanie
5b29b975ee
Comment a spammy debug message in the serializer
2010-10-19 00:51:04 +01:00
opensim mirror account
48127ba943
Merge branch 'master' of /var/git/opensim/
2010-10-18 15:50:04 -07:00
Melanie
7de30cc57b
Change substring matching to prefix matching in region search. This affects
...
both map and login, as they use the same method.
2010-10-18 22:59:00 +01:00
Melanie
ce3594f7f2
Change substring matching to prefix matching in region search. This affects
...
both map and login, as they use the same method.
2010-10-18 22:58:04 +01:00
opensim mirror account
da29a1a1a1
Merge branch 'master' of /var/git/opensim/
2010-10-18 13:20:03 -07:00
Melanie
551015db63
Alphabetize results on region search by prefix matching
2010-10-18 20:29:00 +01:00
opensim mirror account
bc6a9cf8ba
Merge branch 'master' of /var/git/opensim/
2010-10-18 12:00:10 -07:00
Melanie
78a6e5489b
Fix merge issues
2010-10-18 20:50:16 +02:00
Melanie
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
2010-10-18 20:30:46 +01:00
Melanie
e48ac93803
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-18 19:08:55 +01:00
Melanie
2be93066da
Bump migration version on LastSeen field so it is actually run
2010-10-18 19:08:26 +01:00
opensim mirror account
c48b051c71
Merge branch 'master' of /var/git/opensim/
2010-10-18 04:30:07 -07:00
dahlia
e3bd10829f
remove some cruft from last commit
2010-10-18 04:26:23 -07:00
opensim mirror account
c524c0e375
Merge branch 'master' of /var/git/opensim/
2010-10-18 04:20:05 -07:00
dahlia
7fa3335fd5
initial support for meshies physics. Must set ini option UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example.
2010-10-18 04:17:36 -07:00
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
Melanie
46e5c8e919
Merge branch 'master' into careminster-presence-refactor
2010-10-16 10:52:56 +01:00
Melanie
e6d0fb0b0e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-16 10:51:44 +02:00
Melanie
efc555ca22
Actually set the PrivateBinPath in XEngine so relocating the scripts
...
directory works
2010-10-16 10:50:07 +02: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
Melanie
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +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