| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 3 | -23/+87 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | 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 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | 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 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-11-02 | 3 | -14/+14 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| | * | | | | | | | | 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 | |
| | | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| | * | | | | | | | Make texture sedning use only two threads to make things less harsh on bandwidth | Melanie | 2012-10-14 | 1 | -2/+2 | |
| | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 3 | -3/+3 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | just remove the damm thing | UbitUmarov | 2012-09-26 | 3 | -3/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 2 | -11/+2 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | Seems nothing actually need the request body for getevents. so change | UbitUmarov | 2012-09-26 | 2 | -11/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | control flag to false | |||||
| * | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-26 | 2 | -1/+7 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | more changes to PollService | UbitUmarov | 2012-09-26 | 2 | -1/+7 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-25 | 3 | -67/+62 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | 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 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 2 | -68/+128 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | more upload changes (plus untouch prebuild.xml) | UbitUmarov | 2012-09-24 | 2 | -68/+128 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 4 | -22/+37 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | add missing transactionID in SendInventoryItemCreateUpdate. and make use | UbitUmarov | 2012-09-24 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero | |||||
| | * | | | | | | 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 | |||||
| | * | | | | | | | 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 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-23 | 2 | -41/+210 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | | 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 | |||||
| * | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-22 | 2 | -29/+75 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | * | | | | | | | report asset upload errors the right away | UbitUmarov | 2012-09-22 | 2 | -29/+75 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-22 | 1 | -42/+24 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | * | | | | | | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some | UbitUmarov | 2012-09-22 | 1 | -42/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more needed fields in request | |||||
| * | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-22 | 3 | -12/+31 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | * | | | | | | | 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 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-21 | 1 | -103/+56 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| | * | | | | | | | Fix model upload rotations and offsets ( i hope ) | UbitUmarov | 2012-09-20 | 1 | -103/+56 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-19 | 2 | -16/+82 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | 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) | |||||
| * | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-19 | 2 | -217/+310 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | 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. | |||||
| * | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-18 | 1 | -2/+4 | |
| |\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| | * | | | | | | Add booleans to control whether we actually crete inventory items | Melanie | 2012-09-18 | 1 | -2/+4 | |
| | | | | | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |