aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | removed unused data in MeshUploadFlag responseUbitUmarov2012-09-221-8/+8
| | | | |
| | * | | read model upload cost parameters from config [Economy] sectionUbitUmarov2012-09-212-4/+23
| | | | |
| | * | | Fix model upload rotations and offsets ( i hope )UbitUmarov2012-09-201-103/+56
| | | | |
| * | | | refix prior commitMelanie2012-09-201-1/+1
| | | | |
| * | | | Make uploads free for now - we will have to announce thisMelanie2012-09-201-3/+6
| | | | |
| * | | | Change texture price back to 10 C$Melanie2012-09-191-3/+2
| |/ / /
| * | | be more tolerant to small prims, skipping them, only failing if they areUbitUmarov2012-09-192-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 andUbitUmarov2012-09-192-14/+56
| | | | | | | | | | | | | | | | check scene prim size limits.
| * | | coment out mesh model upload code to add textures and individual meshsUbitUmarov2012-09-192-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 itemsMelanie2012-09-181-2/+4
| | | |
| * | | ***TEST*** still bad... create inventory itens for model textures and ↵UbitUmarov2012-09-181-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 GetTextureModuleUbitUmarov2012-09-171-10/+13
| | | |
| * | | on upload store mesh list contents as mesh assets. Build prims by instances notUbitUmarov2012-09-171-8/+23
| | | | | | | | | | | | | | | | meshs. (some prims can have same mesh)
| * | | make sure client still has money at uploadUbitUmarov2012-09-171-0/+16
| | | |
| * | | same cleanupUbitUmarov2012-09-171-38/+41
| | | |
| * | | removed broken fee compressionUbitUmarov2012-09-171-15/+1
| | | |
| * | | let mesh model estimator work even without money module, so otherUbitUmarov2012-09-171-22/+22
| | | | | | | | | | | | | | | | estimations can work
| * | | Make use of mesh cost functionsUbitUmarov2012-09-172-24/+13
| | | |
| * | | missing file for suport of mesh upload costUbitUmarov2012-09-171-0/+596
| | | |
| * | | Remove spammy "axislock" debug.Melanie2012-09-171-1/+1
| | | |
| * | | Change the close tmeout from 2 to 3 seconds on teleport. This mayMelanie2012-09-161-1/+1
| | | | | | | | | | | | | | | | prevent being logged out after a successful teleport.
| * | | Make IncomingCloseChildAgent not send a stop packet. This may preventMelanie2012-09-161-1/+1
| | | | | | | | | | | | | | | | a viewer from being logged out after an otherwise successful teleport.
| * | | Make the agent being kicked a child agent first so there won't be a ghostMelanie2012-09-161-1/+2
| | | |
* | | | Remove a core undo call that we don't need.Melanie2012-09-271-2/+0
| | | |
* | | | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-272-31/+42
| | | |
* | | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-275-15/+68
|\ \ \ \ | | |_|/ | |/| |
| * | | Use GridUser properly for foreign users.Diva Canto2012-09-262-3/+5
| | | |
| * | | Show the user's home url too on the console command.Diva Canto2012-09-261-4/+3
| | | |
| * | | Not really a change, just added a reminder to fix something here.Diva Canto2012-09-261-0/+3
| | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-253-199/+183
| |\ \
| | * | Fix very recently introduced race condition where a CreateNewItem outracing ↵Justin Clark-Casey (justincc)2012-09-251-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an UploadAsset request could throw an exception because m_asset did not yet exist. This was accidentally introduced in 4fc0cfb This commit also consistently removes the AssetXferUploader when the transaction completes, no matter if it completed on asset upload or item operation. The amount of data being retained was small, since this was clothing/bodypart metadata in the asset rather than textures themselves.
| | * | Comment out old m_storeLocal from AssetXferUploader.Justin Clark-Casey (justincc)2012-09-251-6/+6
| | | | | | | | | | | | | | | | | | | | This was only used if none of new item, update item or update task item had been set. But since all transactions go through these paths this old code is redundant.
| | * | Insert transaction ID into AssetXferUploader constructor rather than at ↵Justin Clark-Casey (justincc)2012-09-252-36/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first. This was preventing the previous race condition fix in 4fc0cfb from actually working. This commit also removes some of the pointless transaction id checks - these conditions are already being enforced in AgentAssetsTransactions.
| | * | Move UDP update task item code to AssetXferUploader to match existing create ↵Justin Clark-Casey (justincc)2012-09-253-64/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | user item and update user item mechanisms This is done for consistency and to allow removal or some access methods that increase code complexity. However, this path has not been used for a long time, not even by LL 1.23 - viewers use caps http upload for this instead
| | * | Fix occasional race condition failure when creating new clothing/body parts ↵Justin Clark-Casey (justincc)2012-09-253-110/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the viewer or updating existing assets. On creating these items, the viewer sends a UDP AssetUploadRequest followed by a CreateInventoryItem. It was possible for the CreateInventoryItem/UpdateInventoryItem to occasionally outrace the AssetUploadRequest and fail to find an initialized Xfer object, at which point the item create would fail. So instead we always set up a Xfer object on either the asset or inventory item update request. This does not introduce a new race because code already exists to delay the item operation until the asset is uploaded if necessary (but this only worked if the xfer object already existed)
| * | | TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-252-5/+54
| | | |
| * | | Oops, that should be inside the curly bracket.Diva Canto2012-09-251-3/+3
| | | |
* | | | Fix very recently introduced race condition where a CreateNewItem outracing ↵Justin Clark-Casey (justincc)2012-09-271-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an UploadAsset request could throw an exception because m_asset did not yet exist. This was accidentally introduced in 4fc0cfb This commit also consistently removes the AssetXferUploader when the transaction completes, no matter if it completed on asset upload or item operation. The amount of data being retained was small, since this was clothing/bodypart metadata in the asset rather than textures themselves.
* | | | Comment out old m_storeLocal from AssetXferUploader.Justin Clark-Casey (justincc)2012-09-271-6/+6
| | | | | | | | | | | | | | | | | | | | This was only used if none of new item, update item or update task item had been set. But since all transactions go through these paths this old code is redundant.
* | | | Insert transaction ID into AssetXferUploader constructor rather than at ↵Justin Clark-Casey (justincc)2012-09-272-36/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first. This was preventing the previous race condition fix in 4fc0cfb from actually working. This commit also removes some of the pointless transaction id checks - these conditions are already being enforced in AgentAssetsTransactions.
* | | | Move UDP update task item code to AssetXferUploader to match existing create ↵Justin Clark-Casey (justincc)2012-09-273-50/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | user item and update user item mechanisms This is done for consistency and to allow removal or some access methods that increase code complexity. However, this path has not been used for a long time, not even by LL 1.23 - viewers use caps http upload for this instead
* | | | Fix occasional race condition failure when creating new clothing/body parts ↵Justin Clark-Casey (justincc)2012-09-273-110/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the viewer or updating existing assets. On creating these items, the viewer sends a UDP AssetUploadRequest followed by a CreateInventoryItem. It was possible for the CreateInventoryItem/UpdateInventoryItem to occasionally outrace the AssetUploadRequest and fail to find an initialized Xfer object, at which point the item create would fail. So instead we always set up a Xfer object on either the asset or inventory item update request. This does not introduce a new race because code already exists to delay the item operation until the asset is uploaded if necessary (but this only worked if the xfer object already existed)
* | | | Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminsterMelanie2012-09-272-4/+190
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-251-2/+190
| |\ \ \ | | |/ /
| | * | Documenting object-related eventsSignpostMarv2012-09-241-0/+43
| | | |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-09-244-12/+55
| | |\ \
| | * | | Documenting LSL script-related eventsSignpostMarv2012-09-241-2/+147
| | | | |
| * | | | Deleted extraneous debug messageDiva Canto2012-09-251-2/+0
| | |/ / | |/| |
* | | | Merge branch 'master' into careminsterMelanie2012-09-2416-181/+515
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | HG Rez object: warn the user if the item or asset cannot be found.Diva Canto2012-09-221-2/+7
| | | |
generated by cgit v1.1 at 2024-12-20 11:32:57 +0000