Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | Implement guard against trying to load incompatible version IARs | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -3/+20 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | start parsing iar control file | Justin Clark-Casey (justincc) | 2010-10-22 | 3 | -2/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml | |||||
| * | | | | | | | | | | | | | | slightly simplify oar control file loading code | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -10/+3 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | write IAR control file first in the archive rather than last | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -5/+8 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | minor: add some text to the oar abort messages on assets timeout to make it ↵ | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear that the oar will not be usable | |||||
| * | | | | | | | | | | | | | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -8/+71 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Change some exception to use ToString(). e.Message is not sufficient to fix | Melanie | 2010-10-22 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | errors. Please don't use e.Message, devs NEED to see the dumps! | |||||
* | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 5 | -14/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | This fixes a delay in llSetLinkPrimitiveParamsFast | AdelleF | 2010-10-21 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | |||||
| * | | | | | | | | | | | | | | Deleted a verbose and unneeded log message. | Diva Canto | 2010-10-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Make SImStatsReporter pick ObjectCapacity striaght out of region info | Melanie | 2010-10-21 | 2 | -9/+3 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Remove a bit of dead code relating to ObjectCapacity | Melanie | 2010-10-21 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | COnvert some funky K&R notation to proper (MS) style | Melanie | 2010-10-21 | 1 | -20/+41 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix the OOB error (#5102). Sorry, my bad. | Melanie | 2010-10-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 31 | -201/+581 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | Skip empty strings in ParseString* functions | Melanie | 2010-10-21 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge branch 'master' of ssh://MyConnection01/var/git/opensim | dahlia | 2010-10-20 | 21 | -166/+123 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 3 | -20/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | |||||
| | * | | | | | | | | | | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-20 | 8 | -45/+56 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 8 | -54/+20 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 14 | -94/+72 | |
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | fix combining of multiple physics submeshes | dahlia | 2010-10-20 | 1 | -3/+4 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Deleted verbose debug messages that are bringing sims to an halt. Increased ↵ | Diva Canto | 2010-10-19 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the user cache expiration period to 33 hours. | |||||
| * | | | | | | | | | | | * One more goofy thing. I note that the sculpt texture id is broken out of ↵ | Teravus Ovares (Dan Olivares) | 2010-10-20 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the ExtraParams data in UploadObjectAsset. At this moment, if you're uploading a Sculpt, make sure to break out the Texture ID into the object data or it might not get applied appropriately. | |||||
| * | | | | | | | | | | | * This removes an ugly extraparams hack that I used and makes ↵ | Teravus Ovares (Dan Olivares) | 2010-10-20 | 1 | -17/+62 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadObjectAsset into a generic linkset upload tool. | |||||
| * | | | | | | | | | | It looks like Vector3s also got written down in lower case at some point in ↵ | Diva Canto | 2010-10-19 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | time. Added code to account for that. 17:45:59 - [SceneObjectSerializer]: exception while parsing SitTargetPosition: System.Xml.XmlException: Expecting X tag from namespace , got x and instead Line 1, position 2838. | |||||
| * | | | | | | | | | | Another take related to the previous commit. | Diva Canto | 2010-10-19 | 1 | -13/+17 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Added code to quaternion deserialization to try to cope with an exception ↵ | Diva Canto | 2010-10-19 | 1 | -4/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seen in Wright Plaza related to SitTargetOrientation. 17:23:05 - [SceneObjectSerializer]: exception while parsing SitTargetOrientation: System.Xml.XmlException: Expecting X tag from namespace , got w and instead Line 1, position 30064. | |||||
| * | | | | | | | | | | Added TextureAnimation and ParticleSystem to serialization. | Diva Canto | 2010-10-19 | 1 | -0/+27 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | * This concludes UploadObjectAsset for now until the permissions and physics ↵ | Teravus Ovares (Dan Olivares) | 2010-10-19 | 1 | -48/+76 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | | | | | | | | * Almost complete implementation of UploadObjectAsset cap. all meshes get ↵ | Teravus Ovares (Dan Olivares) | 2010-10-18 | 1 | -0/+301 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | uploaded but they're improperly positioned/oriented at the moment. | |||||
| * | | | | | | | | | 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. |