| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 4 | -38/+9 |
| |\ | |||||
| | * | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 3 | -38/+7 |
| | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| | * | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 3 | -7/+38 |
| | |\ | |||||
| | | * | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| | | | | |||||
| | | * | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 4 | -6/+146 |
| | | |\ | |||||
| | | * | | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 2 | -4/+29 |
| | | | | | |||||
| | | * | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 2 | -17/+21 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -1/+36 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 1 | -0/+11 |
| | | |\ \ \ \ | |||||
| | | * | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 2 | -6/+12 |
| | | | | | | | | |||||
| | * | | | | | | Allow OARs and IARs to save and load meshes. | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -0/+2 |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/ However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer). Not sure if this is really and OAR load problem. Needs more investigation. | ||||
| * | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 3 | -7/+38 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 2 | -4/+29 |
| | | | | | | | | |||||
| | * | | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 2 | -6/+12 |
| | |/ / / / / | |||||
| * | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-18 | 1 | -6/+51 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Adding osFunctions for light projection | BlueWall | 2010-10-17 | 1 | -5/+50 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| | * | | | | | 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 | 4 | -4/+99 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | 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> | ||||
| | * | | | | | * Tweaked the upload response and now at least uploading the mesh works. | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Binary error on downloading the mesh though.. so still not yet working. | ||||
| | * | | | | | Kill some magic numbers in the caps module | Melanie | 2010-10-14 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | * Partially complete stuff for Mesh support that Melanie wanted to see ↵ | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -1/+2 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either. | ||||
| * | | | | | Add a setter to OldItemID so it can be deserialized | Melanie | 2010-10-13 | 1 | -0/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-09 | 2 | -17/+21 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| | * | | | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-10-09 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | Limit formatting of local console output to actual logging messages. | Marck | 2010-10-09 | 1 | -13/+17 |
| | | |_|/ | |/| | | | | | | | | | | | | | | The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level. This fixes the issue of colons being added to help texts on the local console. | ||||
| * | | | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood | ||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 1 | -1/+36 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 1 | -1/+36 |
| | | |/ | |/| | | | | | | | client ip address to agent circuit data, so that it's always there. | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 1 | -0/+11 |
| |\ \ \ | |/ / | |||||
| | * | | Port ExecutingDirectory from omfOS Util class. | Melanie | 2010-10-03 | 1 | -0/+11 |
| | |/ | |||||
| * | | When clearing the addin registry, respect a custom path | Melanie | 2010-09-24 | 1 | -4/+13 |
| | | | |||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-09-21 | 1 | -5/+3 |
| |\ \ | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | Fix a merge artefact that broke script state persistence in XAttachments | Melanie | 2010-09-19 | 1 | -5/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 8 | -19/+484 |
| |\ \ \ | |/ / |/| / | |/ | |||||
| | * | * Tweaked the LocationTests for maximum coverage. | Teravus Ovares (Dan Olivares) | 2010-09-18 | 2 | -1/+60 |
| | | | | | | | | | * Added more mundane tests. | ||||
| | * | * Covered the type converters in SLUtil with unit tests. | Teravus Ovares (Dan Olivares) | 2010-09-18 | 1 | -1/+57 |
| | | | | | | | | | * Does anyone have an example raw notecard to look at and test the notecard parser? | ||||
| | * | * More Mundane Tests | Teravus Ovares (Dan Olivares) | 2010-09-17 | 2 | -0/+198 |
| | | | | | | | | | * SL Util tests of AssetType2ContentType and ContentType2AssetType | ||||
| | * | REST Console delivers responses with content type text/xml instead of ↵ | Marck | 2010-09-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | text/plain. Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload. | ||||
| | * | Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurliman | Justin Clark-Casey (justincc) | 2010-09-18 | 1 | -2/+3 |
| | | | | | | | | | Though this is actually thread-safe on .net 4.0 and mono today, the .net sdk states that Dictionary instance members are not guaranteed thread-safe | ||||
| | * | Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to ↵ | Justin Clark-Casey (justincc) | 2010-09-18 | 1 | -0/+0 |
| | | | | | | | | | | | | | OpenSim/Framework/Tests/PrimeNumberHelperTests.cs I'm assuming the lowercase tests was a mistake. Please revert if it actually wasn't | ||||
| | * | * Fixed and re-enabled CacheTests | Teravus Ovares (Dan Olivares) | 2010-09-17 | 3 | -15/+166 |
| | | | | | | | | | | | * Added MundaneFrameworkTests.cs for the really mundane tests like testing properties,constructors, etc in OpenSim.Framework. * Fixed LeftAxis and UpAxis unpacking from OSD to AgentPosition (copy and paste error caught while writing mundane test) (Good thing nobody uses the camera frustum from remote regions yet) | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 2 | -0/+242 |
| |\ \ | |/ | |||||
| | * | * Add a few more tests to help our meager code coverage %. | Teravus Ovares (Dan Olivares) | 2010-09-17 | 2 | -0/+242 |
| | | | | | | | | | | | | | * Tests Animation Constructors * Tests Animation OSD Packing/Unpacking * Tests the PrimeNumberHelper class which is used in the cache. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -0/+188 |
| |\ \ | |/ | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| | * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 1 | -0/+188 |
| | | | | | | | | | MapAndArray collection | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 1 | -46/+0 |
| |\ \ | |/ | |||||
| | * | Remove long unused Region/Framework/ThreadTracker | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -46/+0 |
| | | | | | | | | | All methods had already been deleted, only GetThreads() was left | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 2 | -18/+22 |
| |\ \ | |/ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |