4eb05dabf4
Merge branch 'master' of /var/git/opensim/
2010-10-18 23:00:07 -07:00
b2c1a1c9bd
* This concludes UploadObjectAsset for now until the permissions and physics shape are added to the message serialization.
...
* You should now be able to upload multiple mesh collada mesh objects. They should appear in front of you (or on top of you!) when you upload them.
* Once again, thanks to John Hurliman and Latif Khalifa for insight and smxy for cheering me on :D
2010-10-19 01:53:56 -04:00
8d38c4593e
Merge branch 'master' of /var/git/opensim/
2010-10-18 20:50:03 -07:00
158e43d4fd
* Almost complete implementation of UploadObjectAsset cap. all meshes get uploaded but they're improperly positioned/oriented at the moment.
2010-10-18 23:47:35 -04:00
12128f1917
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-18 23:00:48 -04:00
a2475a7b8c
Merge branch 'master' of /var/git/opensim/
2010-10-18 18:30:05 -07:00
e561070d3f
Add 'contributors' notice for zlib.net.dll to keep track of its origin and version. Dahlia, please correct the details if they're wrong.
2010-10-19 02:28:10 +01:00
37a6be7ca9
Stop the InventoryTransferModule logging every IM notification it receives, even if they are nothing to do with it.
2010-10-19 02:20:47 +01:00
929321de57
Merge branch 'master' of /var/git/opensim/
2010-10-18 18:20:03 -07:00
5dd372edc4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:12:36 +01:00
f6eaa1e6af
Merge branch 'master' of /var/git/opensim/
2010-10-18 18:10:03 -07:00
99388ce610
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:08:50 +01:00
478b44f231
Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC groups module
...
This allows the groups xmlrpc server to act appropriately if the requesting agent has permission to see all group members
Not sure why this wasn't being done before...
2010-10-19 02:04:23 +01:00
b9bef50852
Display more information when xmlrpcgroupsserver comms fails
...
Improve debugging messages
2010-10-19 02:04:14 +01:00
963b129389
Merge branch 'master' of /var/git/opensim/
2010-10-18 17:40:03 -07:00
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
5b29b975ee
Comment a spammy debug message in the serializer
2010-10-19 00:51:04 +01:00
48127ba943
Merge branch 'master' of /var/git/opensim/
2010-10-18 15:50:04 -07:00
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
da29a1a1a1
Merge branch 'master' of /var/git/opensim/
2010-10-18 13:20:03 -07:00
551015db63
Alphabetize results on region search by prefix matching
2010-10-18 20:29:00 +01:00
bc6a9cf8ba
Merge branch 'master' of /var/git/opensim/
2010-10-18 12:00:10 -07:00
e48ac93803
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-18 19:08:55 +01:00
2be93066da
Bump migration version on LastSeen field so it is actually run
2010-10-18 19:08:26 +01:00
c48b051c71
Merge branch 'master' of /var/git/opensim/
2010-10-18 04:30:07 -07:00
e3bd10829f
remove some cruft from last commit
2010-10-18 04:26:23 -07:00
c524c0e375
Merge branch 'master' of /var/git/opensim/
2010-10-18 04:20:05 -07:00
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
4e4fb93fae
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-17 18:45:25 -04:00
e37566b4fb
Merge branch 'master' of /var/git/opensim/
2010-10-17 10:50:07 -07:00
6df4ca7de1
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-10-17 10:42:04 -07:00
7038f2b406
Deleted all [XmlIgnore] from SOP, since those are meaningless now.
2010-10-17 10:41:38 -07:00
22eff055d4
.NET automagical serialization of SOPs replaced by manual serialization across the board.
2010-10-17 10:35:38 -07:00
fa7d2f6538
Merge branch 'master' of /var/git/opensim/
2010-10-17 02:40:07 -07:00
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
89b236d17d
Merge branch 'master' of /var/git/opensim/
2010-10-16 18:50:03 -07:00
551d927ed5
typical non-effectual build trigger
2010-10-16 21:48:15 -04:00
f90b2ef918
Merge branch 'master' of /var/git/opensim/
2010-10-16 18:00:09 -07:00
9e421868e3
Add missing check for !_projectionEntry
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-16 20:59:18 -04:00
4c0bbc8661
Merge branch 'master' of /var/git/opensim/
2010-10-15 23:30:04 -07:00
06d37d06e6
Drop max oar loading version back to 0 from 1
2010-10-16 07:25:55 +01:00
6998f9268b
Merge branch 'master' of /var/git/opensim/
2010-10-15 23:20:03 -07:00
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
907c576c00
Merge branch 'master' of /var/git/opensim/
2010-10-15 21:40:03 -07:00
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
4f6badca04
Merge branch 'master' of /var/git/opensim/
2010-10-15 21:10:02 -07:00
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
e2c04e15b9
Merge branch 'master' of /var/git/opensim/
2010-10-15 20:00:08 -07:00
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
2a2bb5ebf1
Merge branch 'master' of /var/git/opensim/
2010-10-15 18:40:03 -07:00
opensim mirror account