| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-04-22 | 2 | -8/+6 |
| |\ | |||||
| | * | Merge branch 'master' into careminster | Melanie | 2013-04-21 | 1 | -3/+6 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML | ||||
| | | * | amend previous commit, a line was left out | dahlia | 2013-04-17 | 1 | -0/+1 |
| | | | | |||||
| | | * | Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential ↵ | dahlia | 2013-04-17 | 1 | -2/+6 |
| | | | | | | | | | | | | | crash with Server-side baking enabled viewers | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2013-04-16 | 1 | -5/+0 |
| | |\ \ | | |/ | |||||
| | | * | refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing ↵ | Justin Clark-Casey (justincc) | 2013-04-16 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | Stop(). This was an undocumented interface which I think was for long defunct region load balancing experiments. Also adds method doc for some IClientNetworkServer methods. | ||||
| * | | | Allow callers to set the invoice parameter for GenericMessage | Melanie | 2013-04-22 | 1 | -2/+12 |
| |/ / | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-28 | 1 | -1/+24 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | ||||
| | * | minor: Fix usage error message for "debug eq" console command | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -1/+1 |
| | | | |||||
| | * | Add "show eq" console command to show numbers of messages in agent event queues. | Justin Clark-Casey (justincc) | 2013-03-28 | 1 | -0/+23 |
| | | | | | | | | | For debugging purposes. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-26 | 1 | -0/+6 |
| |\ \ | |/ | |||||
| | * | Implement a pref to turn on the simulator ExportSupported feature entry. | Melanie | 2013-03-26 | 1 | -0/+6 |
| | | | | | | | | | | | | | This tells the viewer to enable the UI for export permissions. WARNING: If your inventory store contains invalid flags data, this will result in items becoming exportable! Don't turn this on in production until it's complete! | ||||
| | * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask | Melanie | 2013-03-26 | 3 | -5/+9 |
| | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions" | ||||
| * | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask | Melanie | 2013-03-24 | 2 | -7/+10 |
| | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions" | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-15 | 1 | -19/+32 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Fix server statistics always reporting zero for total network bytes in/out. | Robert Adams | 2013-03-15 | 1 | -19/+32 |
| | | | | | | | | | Clean up some parameter code in Statistics.Binary. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-13 | 2 | -2/+4 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs | ||||
| | * | minor: Remove mono compiler warning in LLClientView | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -1/+1 |
| | | | |||||
| | * | minor: Remove mono compiler warnings in EventQueueTests | Justin Clark-Casey (justincc) | 2013-03-11 | 1 | -1/+3 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-08 | 1 | -1/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| | * | * Just another one of those new packet blocks causing a null ref. ↵ | teravus | 2013-03-07 | 1 | -1/+1 |
| | | | | | | | | | Defaulting to zero length array..... | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-03-05 | 2 | -7/+9 |
| |\ \ | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | ||||
| | * | * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9 | teravus | 2013-03-04 | 1 | -2/+4 |
| | | | | | | | | | * Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter.. which adds up the Length property all of the blocks. | ||||
| | * | Fix issue in the mesh upload flag module where the ID of the last agent to ↵ | Justin Clark-Casey (justincc) | 2013-03-04 | 1 | -6/+6 |
| | | | | | | | | | | | | | request the capability was always used instead of the original requesting agent for each cap. Should address http://opensimulator.org/mantis/view.php?id=6556 | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2013-03-03 | 4 | -5/+23 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | ||||
| | * | | Make a viewer sent XML error prettier | Melanie | 2013-03-03 | 1 | -0/+4 |
| | | | | |||||
| | * | | Make banking no longer break sit rotations. Fix spinning avatars. | Melanie | 2013-02-25 | 1 | -3/+6 |
| | | | | |||||
| | * | | The viewer tries to parse the error message body to LLSD - give it some. | Melanie | 2013-02-24 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fix an issue where the viewer would request the seed cap before | Melanie | 2013-02-18 | 1 | -0/+3 |
| | | | | | | | | | | | | | there was a handler for it. | ||||
| | * | | Fix shape parameters sent for meshes tosupport the full number of faces | Melanie | 2013-02-16 | 1 | -0/+8 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 5 | -7/+20 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Add a method to IStatsCollector for returning stats as an OSDMap. | Robert Adams | 2013-02-20 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | Extend implementors of IStatsCollector to return an OSDMap of stats. Update UserStatsCollector and AssetStatsCollector to return both string and OSDMap data (as well as console format). | ||||
| | * | | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 2 | -2/+2 |
| | | | | |||||
| | * | | minor: remove some mono compiler warnings in ↵ | Justin Clark-Casey (justincc) | 2013-02-20 | 2 | -5/+5 |
| | | | | | | | | | | | | | OpenSim.Region.ClientStack.Linden.Caps.dll | ||||
| | * | | Fix shape parameters sent for meshes tosupport the full number of faces | Melanie | 2013-02-16 | 1 | -0/+8 |
| | | | | |||||
| | * | | Add an event and some logic to allow customizing Simulator Features by avatar | Melanie | 2013-02-14 | 1 | -4/+21 |
| | | | | |||||
| | * | | Make the sim features module register it's interface so it can be used | Melanie | 2013-02-13 | 1 | -0/+2 |
| | | | | |||||
| | * | | Plumb the path from the client to the extra physics params and back | Melanie | 2013-02-07 | 3 | -4/+83 |
| | | | | |||||
| | * | | Send the new physics params to the viewer build dialog | Melanie | 2013-02-07 | 1 | -0/+35 |
| | | | | |||||
| | * | | * the root prim was being given an OffsetPosition in addition to setting the ↵ | teravus | 2013-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | position when creating the root prim. The offset position caused the positioning code to re-move the root prim when you selected it and released it. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-14 | 1 | -4/+21 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Add an event and some logic to allow customizing Simulator Features by avatar | Melanie | 2013-02-14 | 1 | -4/+21 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-14 | 1 | -0/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Small fix to sim features module | Melanie | 2013-02-14 | 1 | -0/+2 |
| | | | | |||||
| | * | | Revert "Push updates from keyframe directly to the front of the output queue ↵ | Melanie | 2013-02-12 | 1 | -20/+0 |
| | | | | | | | | | | | | | | | | | | | rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e. | ||||
| | * | | Revert "Use actual time dilation for unqueued updates" | Melanie | 2013-02-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | This reverts commit 048e904f051ccc38e7d00936b45288af3c6fc010. | ||||
| | * | | Use actual time dilation for unqueued updates | Melanie | 2013-02-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Push updates from keyframe directly to the front of the output queue rather | Melanie | 2013-02-12 | 1 | -0/+20 |
| | | | | | | | | | | | | | than through the update system. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-07 | 2 | -115/+70 |
| |\ \ \ | |/ / | |||||
| | * | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 2 | -2/+2 |
| | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |