Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | 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 | |||||
* | | | | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-21 | 2 | -8/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -8/+71 | |
| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-21 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | This fixes a delay in llSetLinkPrimitiveParamsFast | AdelleF | 2010-10-21 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | |||||
* | | | | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | Deleted a verbose and unneeded log message. | Diva Canto | 2010-10-21 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-21 | 2 | -9/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Make SImStatsReporter pick ObjectCapacity striaght out of region info | Melanie | 2010-10-21 | 2 | -9/+3 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-21 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Remove a bit of dead code relating to ObjectCapacity | Melanie | 2010-10-21 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Fix the OOB error (#5102). Sorry, my bad. | Melanie | 2010-10-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-21 | 1 | -0/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Skip empty strings in ParseString* functions | Melanie | 2010-10-21 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-20 | 1 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | Merge branch 'master' of ssh://MyConnection01/var/git/opensim | dahlia | 2010-10-20 | 21 | -166/+123 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | fix combining of multiple physics submeshes | dahlia | 2010-10-20 | 1 | -3/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 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 | |
| |/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 3 | -4/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | 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. | |||||
* | | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -17/+62 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | * 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. | |||||
* | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | 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. | |||||
* | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -13/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Another take related to the previous commit. | Diva Canto | 2010-10-19 | 1 | -13/+17 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -4/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | 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. | |||||
* | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -0/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Added TextureAnimation and ParticleSystem to serialization. | Diva Canto | 2010-10-19 | 1 | -0/+27 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -48/+76 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | * 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 | |||||
* | | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -0/+301 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | * 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. | |||||
* | | | | | | | | | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 2 | -3/+4 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | 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 /var/git/opensim/ | opensim mirror account | 2010-10-18 | 3 | -14/+18 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-19 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | 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... |