| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 3 | -20/+92 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 3 | -23/+96 | |
| | |\ \ | ||||||
| | | * | | Clean up some cruft from the last commit. Re-add the initial update | Master ScienceSim | 2010-10-29 | 2 | -2/+41 | |
| | | | | | | | | | | | | | | | | | | | | | send in the scene presence constructor... need to figure this out later. | |||||
| | | * | | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 2 | -20/+53 | |
| | | | | | | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored. | |||||
| | * | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 3 | -159/+48 | |
| | |\ \ \ | | |_|/ | |/| | | ||||||
| | | * | | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 3 | -160/+50 | |
| | | |\ \ | | | | | | | | | | | | | | | | dev-appearance | |||||
| | | * | | | Make SImStatsReporter pick ObjectCapacity striaght out of region info | Melanie | 2010-10-21 | 2 | -9/+3 | |
| | | | | | | ||||||
| | | * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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> | |||||
| * | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 6 | -177/+86 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 5 | -25/+88 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Prevent nullrefs in scene object deletion. Mantis #5156 | Melanie | 2010-10-27 | 1 | -1/+4 | |
| | | | | | | ||||||
| | | * | | | Merge branch 'master' of ssh://MyConnection01/var/git/opensim | dahlia | 2010-10-26 | 2 | -4/+4 | |
| | | |\ \ \ | ||||||
| | | | * | | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 2 | -4/+4 | |
| | | | | | | | ||||||
| | | * | | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region ↵ | dahlia | 2010-10-26 | 1 | -9/+27 | |
| | | |/ / / | | | | | | | | | | | | | | | | specific applications | |||||
| | * | | | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -4/+5 | |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly. | |||||
| | * | | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 3 | -159/+49 | |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations. | |||||
| * | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-24 | 1 | -3/+16 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Added inner exception handling in Shape deserialization processing, so that ↵ | Diva Canto | 2010-10-23 | 1 | -3/+16 | |
| | | | | | | | | | | | | | the whole Shape processing returns a valid Shape object. | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -3/+3 | |
| | |\ \ | |/ / |/| | | ||||||
| | * | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -7/+2 | |
| | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | |||||
| * | | | 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 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 2 | -2/+7 | |
| |\ \ | ||||||
| | * | | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 2 | -2/+5 | |
| | | | | ||||||
| | * | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -0/+2 | |
| | |/ | ||||||
| * | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -0/+35 | |
| | | | ||||||
| * | | Make SImStatsReporter pick ObjectCapacity striaght out of region info | Melanie | 2010-10-22 | 2 | -9/+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. | |||||
| * | 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 | |
| | | ||||||
| * | COmmented the wrong line instead, now I commented them all to be on the safe ↵ | Melanie | 2010-10-19 | 1 | -2/+2 | |
| | | | | | side | |||||
| * | Comment a spammy debug message in the serializer | Melanie | 2010-10-19 | 1 | -1/+1 | |
| | | ||||||
| * | 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 | 2 | -59/+21 | |
| | | | | | across the board. | |||||
| * | Made OARs use the new serialization procedure. (TPs/crossings still on the ↵ | Diva Canto | 2010-10-15 | 4 | -123/+157 | |
| | | | | | 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>. | |||||
| * | 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. | |||||
| * | Added SOP.MediaUrl and Shape.Media to the deserialization | Diva Canto | 2010-10-13 | 1 | -204/+14 | |
| | | ||||||
| * | Comment a debug message so that it doesn't spew the console upon ↵ | Diva Canto | 2010-10-13 | 1 | -1/+1 | |
| | | | | | encountering unknown xml elements. | |||||
| * | New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for ↵ | Diva Canto | 2010-10-13 | 2 | -7/+1381 | |
| | | | | | load oar and load xml2, but not for packing objects on crossings/TPs yet. | |||||
| * | Change the part for sound playback to be the root part / object UUID instead | Melanie | 2010-10-10 | 1 | -8/+8 | |
| | | | | | of the child prim because using the child prim plain doesn't work. | |||||
| * | Guard against locking a nullref to avoid build break | Melanie | 2010-10-08 | 1 | -0/+3 | |
| | | ||||||
| * | Change the order of actions to address a possible nullref | Melanie | 2010-10-08 | 1 | -3/+2 | |
| | | ||||||
| * | Fix autoreturn to not return zero objects | Melanie | 2010-10-07 | 1 | -6/+2 | |
| | | ||||||
| * | Plumb the path for multiple object deletes | Melanie | 2010-10-06 | 4 | -40/+18 | |
| | | ||||||
| * | Add and plumb the usetex URL parameter to worldview. Required but not yet | Melanie | 2010-10-06 | 1 | -1/+1 | |
| | | | | | functional | |||||
| * | Add the view generating method to the image generator interface | Melanie | 2010-10-05 | 1 | -0/+2 | |
| | | ||||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 3 | -4/+4 | |
| | | ||||||
| * | I really have to say it again and again: e.Message is NOT enough data for | Melanie | 2010-10-03 | 1 | -2/+1 | |
| | | | | | | | troubleshooting. It MUST be combined with e.StackTrace, or e.ToString() must be used. Fix one more instance of that cr.p | |||||
| * | Initial port of the Warp3D map tile renderer | Melanie | 2010-10-03 | 1 | -2/+2 | |
| | | ||||||
| * | Reapplying the parts of the prior revert that were not derived from the | Melanie | 2010-10-02 | 1 | -2/+2 | |
| | | | | | original patch | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |