aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' into careminsterMelanie2012-10-073-1/+260
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
| | * | | On receiving TaskInventoryAccepted with a destination folder in the binary ↵Justin Clark-Casey (justincc)2012-10-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bucket slot for RLV, notify the viewer about inventory folder updates. The viewer would not see the folder move without this, either on accept or decline. This commit also updates the TaskInventoryOffered message to better conform with the data LL uses Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail, message is just folder name in single quotes, message is not timestamped. However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side. Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
| | * | | Read PacketPool config in LLUDPServer with other config params rather than ↵Justin Clark-Casey (justincc)2012-10-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in Scene. This is to resolve previous build break. This unnecessarily but harmlessly reads and sets the parameter multiple times - scene was doing the same thing.
| | * | | refactor: Move OpenSim.Framework.PacketPool to ↵Justin Clark-Casey (justincc)2012-10-051-0/+249
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSim.Region.Clientstack.Linden.UDP This is to allow it to use OpenSim.Framework.Monitoring in the future. This is also a better location since the packet pool is linden udp specific
| * | | | Merge branch 'avination' into careminsterMelanie2012-09-277-304/+1378
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-09-164-428/+400
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-09-161-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| | * | | | | Added unit tests for multi-region OARsOren Hurvitz2012-09-141-1/+1
| | | | | | |
| * | | | | | Merge branch 'avination' into careminsterMelanie2012-09-103-23/+87
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-08-311-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 ↵Melanie2012-08-311-25/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | even test compiled.
| * | | | | | | Merge branch 'avination' into careminsterMelanie2012-08-312-60/+230
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-08-233-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-202-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 ↵Melanie2012-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now conforms to the behaviour in SL.
| | * | | | | | | Actually add the moduleMelanie2012-08-141-0/+234
| | | | | | | | |
* | | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-11-023-14/+14
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Remove redundant and annoyingly modal message box in upload processing.Melanie2012-10-181-11/+11
| | | | | | | | |
| * | | | | | | | Allow the console to be used by gods as well as region owners.Melanie2012-10-171-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Make texture sedning use only two threads to make things less harsh on bandwidthMelanie2012-10-141-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-263-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | just remove the damm thingUbitUmarov2012-09-263-3/+3
| | | | | | |
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-262-11/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-262-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | control flag to false
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-262-1/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | more changes to PollServiceUbitUmarov2012-09-262-1/+7
| | | | | | |
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-253-67/+62
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | missed changeUbitUmarov2012-09-251-1/+2
| | | | | | |
| * | | | | | do the same to webFecthInvDescModuleUbitUmarov2012-09-251-33/+25
| | | | | | |
| * | | | | | change GetTextureModule processingUbitUmarov2012-09-251-29/+31
| | | | | | |
| * | | | | | Text changes for upload messagesMelanie2012-09-241-4/+4
| | | | | | |
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-242-68/+128
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | more upload changes (plus untouch prebuild.xml)UbitUmarov2012-09-242-68/+128
| | | | | | |
* | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-244-22/+37
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-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 ofMelanie2012-09-232-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | member notation.
| * | | | | | Merge branch 'ubitwork' into avinationMelanie2012-09-233-203/+373
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
| * | | | | | | 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
| | | | | | | |
* | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-232-41/+210
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | try to allow free uploads for testing, if users prefix names with "TEST-". LetUbitUmarov2012-09-232-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 ubitworkubit2012-09-222-29/+75
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | report asset upload errors the right awayUbitUmarov2012-09-222-29/+75
| | | | | | | |
* | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-221-42/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of someUbitUmarov2012-09-221-42/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more needed fields in request
* | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-223-12/+31
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | removed unused data in MeshUploadFlag responseUbitUmarov2012-09-221-8/+8
| | | | | | | |
| * | | | | | | read model upload cost parameters from config [Economy] sectionUbitUmarov2012-09-212-4/+23
| | | | | | | |
* | | | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-09-211-103/+56
|\ \ \ \ \ \ \ \ | |/ / / / / / /
generated by cgit v1.1 at 2025-02-03 05:59:06 +0000