| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'avination' into careminster | Melanie | 2012-11-20 | 1 | -18/+72 |
| |\ | |||||
| | * | * Plumbing and basic setting of the GetMesh Cap Throttler. | teravus | 2012-11-17 | 1 | -18/+72 |
| | | | | | | | | | * Last step is to flip the throttle distribution. | ||||
| | * | Revert "Merge master into teravuswork", it should have been avination, not ↵ | teravus | 2012-11-15 | 4 | -13/+21 |
| | | | | | | | | | | | | | | | master. This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64. | ||||
| | * | Merge master into teravuswork | teravus | 2012-11-15 | 4 | -21/+13 |
| | |\ | |||||
| * | \ | Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster | Melanie | 2012-11-20 | 2 | -72/+409 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | ||||
| | * | | * Prep work switching the GetMeshModule over to a poll service. | teravus | 2012-11-09 | 2 | -73/+410 |
| | | | | | | | | | | | | | * This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-11-17 | 1 | -14/+172 |
| |\ \ \ | |/ / | |||||
| | * | | This implements the Caps throttler. After some testing, the system seemed ↵ | teravus | 2012-11-05 | 1 | -13/+106 |
| | | | | | | | | | | | | | | | | | | | to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference. Tested with Two Clients on a region with 1800 textures all visible at once. | ||||
| | * | | Another step in the chain. Pipe the throttle update to the appropriate ↵ | teravus | 2012-11-05 | 1 | -12/+35 |
| | | | | | | | | | | | | | | | | | | | PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator. Next step is hooking it up to HasEvents | ||||
| | * | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> ↵ | teravus | 2012-11-04 | 1 | -0/+42 |
| | | | | | | | | | | | | | EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 1 | -0/+33 |
| |\ \ \ | |||||
| | * | | | Added AssemblyInfos to every dll in the OpenSim.Region namespace. | Diva Canto | 2012-11-14 | 1 | -0/+33 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 11 | -13/+10 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs | ||||
| | * | | | Cleanup on region modules: gave short node id's to all of them. | Diva Canto | 2012-11-12 | 12 | -12/+12 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 2 | -3/+3 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs | ||||
| | * | | | Remove any mention of IRegionModule from region names and comments to aid | Melanie | 2012-11-12 | 3 | -5/+5 |
| | | | | | | | | | | | | | | | | | grepping for remaining uses | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-11-11 | 2 | -102/+102 |
| |\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | ||||
| | * | | One more module converted: ObjectAdd. | Diva Canto | 2012-11-10 | 1 | -51/+66 |
| | | | | |||||
| | * | | One more module: EventQueueGetModule. Also making it non-optional for this dll. | Diva Canto | 2012-11-10 | 1 | -53/+38 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-10-18 | 2 | -12/+12 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs | ||||
| | * | | Remove redundant and annoyingly modal message box in upload processing. | Melanie | 2012-10-18 | 1 | -11/+11 |
| | | | | |||||
| | * | | Allow the console to be used by gods as well as region owners. | Melanie | 2012-10-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-10-17 | 1 | -2/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Make texture sedning use only two threads to make things less harsh on bandwidth | Melanie | 2012-10-14 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-16 | 3 | -9/+10 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs | ||||
| | * | | minor: Add missing newlines and spacing to help for "debug eq" console command | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -4/+4 |
| | | | | |||||
| | * | | minor: comment out "Registered seed capability" message for "Received SEED ↵ | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | caps request" message for now. I think this is more useful right now since it tells us if the viewer requested a seed caps at all in various scenarios (such as when teleporting to a new region). | ||||
| | * | | minor: Comment out the region console caps message for now. | Justin Clark-Casey (justincc) | 2012-10-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-10-12 | 1 | -11/+2 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to ↵ | Justin Clark-Casey (justincc) | 2012-10-10 | 1 | -11/+2 |
| | | | | | | | | | | | | | | | | | | | prevent an inactive connection being left behind if the user closes the viewer whilst the connection is being established. This should remove the need to run the console command "kick user --force" when these connections are left around. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 6 | -303/+1371 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | just remove the damm thing | UbitUmarov | 2012-09-26 | 3 | -3/+3 |
| | | | | |||||
| | * | | Seems nothing actually need the request body for getevents. so change | UbitUmarov | 2012-09-26 | 2 | -11/+2 |
| | | | | | | | | | | | | | control flag to false | ||||
| | * | | more changes to PollService | UbitUmarov | 2012-09-26 | 2 | -1/+7 |
| | | | | |||||
| | * | | missed change | UbitUmarov | 2012-09-25 | 1 | -1/+2 |
| | | | | |||||
| | * | | do the same to webFecthInvDescModule | UbitUmarov | 2012-09-25 | 1 | -33/+25 |
| | | | | |||||
| | * | | change GetTextureModule processing | UbitUmarov | 2012-09-25 | 1 | -29/+31 |
| | | | | |||||
| | * | | Text changes for upload messages | Melanie | 2012-09-24 | 1 | -4/+4 |
| | | | | |||||
| | * | | more upload changes (plus untouch prebuild.xml) | UbitUmarov | 2012-09-24 | 2 | -68/+128 |
| | | | | |||||
| | * | | Protect the responses map with a lock. Also remove ugly "this." type of | Melanie | 2012-09-23 | 2 | -18/+24 |
| | | | | | | | | | | | | | member notation. | ||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-23 | 3 | -203/+373 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | ||||
| | | * | | try to allow free uploads for testing, if users prefix names with "TEST-". Let | UbitUmarov | 2012-09-23 | 2 | -41/+210 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures get into inventory again. Both features under config control. Have direct warnings to client, including a final one on upload complete since i see nothing. problems: textures don't showup in inventory til relog, also issues with permitions. A few more changes | ||||
| | | * | | report asset upload errors the right away | UbitUmarov | 2012-09-22 | 2 | -29/+75 |
| | | | | | |||||
| | | * | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some | UbitUmarov | 2012-09-22 | 1 | -42/+24 |
| | | | | | | | | | | | | | | | | | more needed fields in request | ||||
| | | * | | removed unused data in MeshUploadFlag response | UbitUmarov | 2012-09-22 | 1 | -8/+8 |
| | | | | | |||||
| | | * | | read model upload cost parameters from config [Economy] section | UbitUmarov | 2012-09-21 | 2 | -4/+23 |
| | | | | | |||||
| | | * | | Fix model upload rotations and offsets ( i hope ) | UbitUmarov | 2012-09-20 | 1 | -103/+56 |
| | | | | | |||||
| | * | | | refix prior commit | Melanie | 2012-09-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Make uploads free for now - we will have to announce this | Melanie | 2012-09-20 | 1 | -3/+6 |
| | | | | | |||||
| | * | | | Change texture price back to 10 C$ | Melanie | 2012-09-19 | 1 | -3/+2 |
| | |/ / | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |