| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | 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 | |
| | | | | ||||||
| | * | | Add a missing brace, remove a useless temp variable, enable charging. | Melanie | 2012-09-11 | 1 | -6/+3 | |
| | | | | ||||||
| | * | | report mesh upload costs ( fake values) | UbitUmarov | 2012-09-11 | 1 | -2/+46 | |
| | | | | ||||||
| | * | | let LLSDAssetUploadRequest include asset_resources information plus let | UbitUmarov | 2012-09-11 | 1 | -0/+1 | |
| | | | | | | | | | | | | | NewAgentInventoryRequest know about mesh (does nothing with it still) | |||||
| | * | | Removing the variable prica handler again. It's never called, was misnamed and | Melanie | 2012-09-11 | 1 | -332/+0 | |
| | | | | | | | | | | | | | probably never worked past the mesh beta. | |||||
| | * | | Re-add the module and fix a typo | Melanie | 2012-09-11 | 1 | -0/+332 | |
| | | | | ||||||
| | * | | Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePrice | Melanie | 2012-09-11 | 1 | -332/+0 | |
| | | | | | | | | | | | | | which is the name actually used in viewer code. | |||||
| | * | | Add cost calculation suppor tto the VariablePrice one as well | Melanie | 2012-09-11 | 2 | -9/+44 | |
| | | | | ||||||
| | * | | Revert "Remove the unused NewFileAgentInventoryVariablePrice module." | Melanie | 2012-09-11 | 1 | -0/+296 | |
| | | | | | | | | | | | | | | | | | | | It's actually used. This reverts commit 94a8e5572b1529190a174f29f866b65e7b2ccc0e. | |||||
| | * | | Add the option to have variable costing for uploads | Melanie | 2012-09-11 | 1 | -7/+44 | |
| | | | | ||||||
| | * | | Remove the unused NewFileAgentInventoryVariablePrice module. | Melanie | 2012-09-11 | 1 | -296/+0 | |
| | | | | ||||||
| | * | | Revamp the v3 inventory sending. Uses threads and some nifty mechanics to | Melanie | 2012-09-11 | 1 | -81/+117 | |
| | | | | | | | | | | | | | leverage the Poll Service without blocking it's workers. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 1 | -1/+1 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs | |||||
| | * | | Added unit tests for multi-region OARs | Oren Hurvitz | 2012-09-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 3 | -23/+87 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Remove commented code | Melanie | 2012-09-10 | 1 | -11/+0 | |
| | | | | ||||||
| | * | | webFetchInventory: change control event to simple flag, adjust locking | UbitUmarov | 2012-09-10 | 1 | -11/+32 | |
| | | | | ||||||
| | * | | llClientView: try to have only one thread per client processing | UbitUmarov | 2012-09-08 | 1 | -4/+49 | |
| | | | | | | | | | | | | | RegionHandleRequests. (code assumes packet handle is called async as it is not) | |||||
| | * | | bug fix | UbitUmarov | 2012-09-04 | 1 | -4/+6 | |
| | | | | ||||||
| | * | | a forgotten file plus minor changes. Imp and SL viewer seem to preserve | UbitUmarov | 2012-09-04 | 2 | -2/+9 | |
| | | | | | | | | | | | | | flight. FS 4.2.2 does not. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-08-31 | 1 | -1/+1 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||||
| | * | | Replace SendBannedUserList with Avination's version. Untested in core. Not ↵ | Melanie | 2012-08-31 | 1 | -25/+32 | |
| | | | | | | | | | | | | | even test compiled. | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-08-31 | 2 | -60/+230 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Sequence inventory descendents requests to reduce inventory server load and | Melanie | 2012-08-30 | 1 | -0/+1 | |
| | | | | | | | | | | | | | movement lag. | |||||
| | * | | Fix issue with the quit packet being stuck int he queue and a one packet delay. | Melanie | 2012-08-29 | 1 | -2/+8 | |
| | | | | | | | | | | | | | Also fix semaphore excetion caused by enqueueing while dequque is taking place. | |||||
| | * | | Remove Justin's addition to avoid sending incoming packets to inactive clients | Melanie | 2012-08-29 | 1 | -9/+9 | |
| | | | | | | | | | | | | | | | | This also causes the initial AgentUpdate to be rejected because our processing is asynchronous. | |||||
| | * | | Add a queue with two priority levels. This is a drop in replacement for | Melanie | 2012-08-28 | 1 | -2/+111 | |
| | | | | | | | | | | | | | the BlockingQueue from OMV, but allows two priorities. | |||||
| | * | | Remove debug spam | Melanie | 2012-08-24 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Fix background inventory loading (Viewer 3) so it won't lag out the sim | Melanie | 2012-08-24 | 1 | -49/+103 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-08-23 | 3 | -9/+8 | |
| |\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | Add --force flag to "kick user" console command to allow bypassing of recent ↵ | Justin Clark-Casey (justincc) | 2012-08-20 | 2 | -6/+10 | |
| | | | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place. | |||||
| | * | Fix llDialog responses so that they can be heard throughout the region. This ↵ | Melanie | 2012-08-19 | 1 | -1/+1 | |
| | | | | | | | | | now conforms to the behaviour in SL. | |||||
| | * | Actually add the module | Melanie | 2012-08-14 | 1 | -0/+234 | |
| | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |