| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | |/ / | |||||
| | * | | be more tolerant to small prims, skipping them, only failing if they are | UbitUmarov | 2012-09-19 | 2 | -16/+82 |
| | | | | | | | | | | | | | | | | more than half of total. Add a state control to NewFileAgentInventory to avoid more than one at a time per client. ( Incomplete and possible not that good) | ||||
| | * | | create a single ModelCost provider for the caps instance. Let it know and | UbitUmarov | 2012-09-19 | 2 | -14/+56 |
| | | | | | | | | | | | | | check scene prim size limits. | ||||
| | * | | coment out mesh model upload code to add textures and individual meshs | UbitUmarov | 2012-09-19 | 2 | -204/+255 |
| | | | | | | | | | | | | | | | | | | | assets to inventory, since it may actually be a bad ideia since good model textures are deply related to it and there is no current use for independent mesh assets. Added the option to have a reduced free for textures (2.5 C$ as is, total textures cost rounded to nearest int) compensating for the fact that they can't be used outside the model or its parts. | ||||
| | * | | Add booleans to control whether we actually crete inventory items | Melanie | 2012-09-18 | 1 | -2/+4 |
| | | | | |||||
| | * | | ***TEST*** still bad... create inventory itens for model textures and ↵ | UbitUmarov | 2012-09-18 | 1 | -7/+76 |
| | | | | | | | | | | | | | meshs. Issues: meshs get into root folder, viewer and viewer does not update inventory until relog ( the upload funtion needs to return more information) ,etc. Droping a mesh into a prim, makes viewer think we dropped a sculpt map, but it does work, viewer displays the mesh and physics work (as physics is stored at the sculpt information fields). Textures show up in Textures folder, just its to costly to find that default folder as is.. | ||||
| | * | | add some locks to GetTextureModule | UbitUmarov | 2012-09-17 | 1 | -10/+13 |
| | | | | |||||
| | * | | on upload store mesh list contents as mesh assets. Build prims by instances not | UbitUmarov | 2012-09-17 | 1 | -8/+23 |
| | | | | | | | | | | | | | meshs. (some prims can have same mesh) | ||||
| | * | | make sure client still has money at upload | UbitUmarov | 2012-09-17 | 1 | -0/+16 |
| | | | | |||||
| | * | | same cleanup | UbitUmarov | 2012-09-17 | 1 | -38/+41 |
| | | | | |||||
| | * | | removed broken fee compression | UbitUmarov | 2012-09-17 | 1 | -15/+1 |
| | | | | |||||
| | * | | let mesh model estimator work even without money module, so other | UbitUmarov | 2012-09-17 | 1 | -22/+22 |
| | | | | | | | | | | | | | estimations can work | ||||
| | * | | Make use of mesh cost functions | UbitUmarov | 2012-09-17 | 2 | -24/+13 |
| | | | | |||||
| | * | | missing file for suport of mesh upload cost | UbitUmarov | 2012-09-17 | 1 | -0/+596 |
| | | | | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-09-16 | 4 | -428/+400 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs | ||||
| | * | | Revamp the HTTP textures handler to allow a maximum of four fetches | Melanie | 2012-09-14 | 1 | -44/+179 |
| | | | | | | | | | | | | | at any time and to drop requests for avatars n longer in the scene | ||||
| | * | | Allow some more connections to try to ease lag. | Melanie | 2012-09-14 | 1 | -1/+3 |
| | | | | |||||
| | * | | Add a logger so the prior commit will work | Melanie | 2012-09-12 | 1 | -0/+3 |
| | | | | |||||
| | * | | Stop expiry timer when upload is complete. Log if timeout is reached. | Melanie | 2012-09-12 | 1 | -0/+2 |
| | | | | |||||
| | * | | Add a timer to time out upload caps handlers that are not used. | Melanie | 2012-09-12 | 1 | -0/+12 |
| | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |