Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Add 'contributors' notice for zlib.net.dll to keep track of its origin and ↵ | Justin Clark-Casey (justincc) | 2010-10-19 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version. Dahlia, please correct the details if they're wrong. | |||||
| * | | | | | | | | | Stop the InventoryTransferModule logging every IM notification it receives, ↵ | Justin Clark-Casey (justincc) | 2010-10-19 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even if they are nothing to do with it. | |||||
| * | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-19 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | COmmented the wrong line instead, now I commented them all to be on the safe ↵ | Melanie | 2010-10-19 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | side | |||||
| * | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-19 | 15 | -175/+292 | |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | ||||||
| * | | | | | | | | | | Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC ↵ | Justin Clark-Casey (justincc) | 2010-10-19 | 2 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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... | |||||
| * | | | | | | | | | | Display more information when xmlrpcgroupsserver comms fails | Justin Clark-Casey (justincc) | 2010-10-19 | 2 | -13/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve debugging messages | |||||
* | | | | | | | | | | | COmmented the wrong line instead, now I commented them all to be on the safe ↵ | Melanie | 2010-10-19 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | side | |||||
* | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | Comment a spammy debug message in the serializer | Melanie | 2010-10-19 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Change substring matching to prefix matching in region search. This affects | Melanie | 2010-10-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | both map and login, as they use the same method. | |||||
* | | | | | | | | | | | Change substring matching to prefix matching in region search. This affects | Melanie | 2010-10-18 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | both map and login, as they use the same method. | |||||
* | | | | | | | | | | | Fix merge issues | Melanie | 2010-10-18 | 1 | -12/+0 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-18 | 13 | -167/+296 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Alphabetize results on region search by prefix matching | Melanie | 2010-10-18 | 1 | -0/+2 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-18 | 7 | -165/+180 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | remove some cruft from last commit | dahlia | 2010-10-18 | 1 | -8/+0 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | initial support for meshies physics. Must set ini option ↵ | dahlia | 2010-10-18 | 4 | -44/+101 | |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example. | |||||
| | * | | | | | | | | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-10-17 | 5 | -7/+107 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | Deleted all [XmlIgnore] from SOP, since those are meaningless now. | Diva Canto | 2010-10-17 | 2 | -58/+58 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | .NET automagical serialization of SOPs replaced by manual serialization ↵ | Diva Canto | 2010-10-17 | 3 | -62/+28 | |
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | across the board. | |||||
| * | | | | | | | | | | Bump migration version on LastSeen field so it is actually run | Melanie | 2010-10-18 | 1 | -1/+1 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Adding osFunctions for light projection | BlueWall | 2010-10-17 | 4 | -5/+105 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | |||||
| * | | | | | | | | | typical non-effectual build trigger | Teravus Ovares (Dan Olivares) | 2010-10-16 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add missing check for !_projectionEntry | BlueWall | 2010-10-16 | 1 | -1/+1 | |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | |||||
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 14 | -181/+281 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Drop max oar loading version back to 0 from 1 | Justin Clark-Casey (justincc) | 2010-10-16 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Rip out version option since it turns out that the changed object ↵ | Justin Clark-Casey (justincc) | 2010-10-16 | 3 | -10/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | | | | | | change --old-guids switch on the save oar command line to --version=<x> | Justin Clark-Casey (justincc) | 2010-10-16 | 6 | -11/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | | Have OpenSim throw a strop if it tries to load an OAR with a major version ↵ | Justin Clark-Casey (justincc) | 2010-10-16 | 2 | -1/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that is too high for it to handle | |||||
| * | | | | | | | | save oar control file first rather than in the middle so that it's the first ↵ | Justin Clark-Casey (justincc) | 2010-10-16 | 3 | -38/+41 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | | Fix test break - TestSerializeXml2() still requires old-guids option | Justin Clark-Casey (justincc) | 2010-10-16 | 1 | -3/+6 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Made OARs use the new serialization procedure. (TPs/crossings still on the ↵ | Diva Canto | 2010-10-15 | 11 | -143/+189 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>. | |||||
| * | | | | | | | | UPdated the MySql driver to 6.2.4. Also established a much larger ↵ | Diva Canto | 2010-10-15 | 2 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySqlCommand timeout on fetching prims. | |||||
* | | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-10-16 | 20 | -28269/+28913 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 20 | -28269/+28913 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | ||||||
| | * | | | | | | | | Adding projected light filters to prim propeties | BlueWall | 2010-10-15 | 1 | -0/+80 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requires the LL Mesh Beta viewer Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | |||||
| | * | | | | | | | | A couple of more ways attachment point is sent | Latif Khalifa | 2010-10-15 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | |||||
| | * | | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-15 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | one more silly line ending thing.... | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -71/+71 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *If you have problems, fetch the tree and rebase. | |||||
| | * | | | | | | | | | one more silly line ending thing.... *If you have problems, fetch the tree ↵ | Teravus Ovares (Dan Olivares) | 2010-10-15 | 1 | -71/+71 | |
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and rebase. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | |||||
| | * | | | | | | | | more work in progress on mesh physics - still non-functional | dahlia | 2010-10-14 | 3 | -24/+75 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | libomv update to support headerless llsd binary deserialization needed for ↵ | Latif Khalifa | 2010-10-14 | 6 | -6/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mesh asset decoding Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | |||||
| | * | | | | | | | | laying some groundwork for mesh physics | dahlia | 2010-10-14 | 1 | -70/+80 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-14 | 4 | -108/+171 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | Don't distroy attachments when using viewer 2.1+, strip multiple attachment data | Latif Khalifa | 2010-10-14 | 1 | -0/+4 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Kill some magic numbers in the mesh upload module and change the mesh asset | Melanie | 2010-10-14 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type from 45 to 49 to match OMV trunk | |||||
| | | * | | | | | | | | Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems ↵ | Diva Canto | 2010-10-14 | 2 | -105/+164 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to be generating xml's that are successfully parsed. Needs more testing. | |||||
| | * | | | | | | | | | * Replacing Magic numbers with Enums | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -4/+4 | |
| | |/ / / / / / / / | ||||||
| | * | | | | | | | | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-10-14 | 2 | -0/+6 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> |