Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-16 | 1 | -0/+1 |
|\ | |||||
| * | just a kick git | UbitUmarov | 2012-07-15 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-16 | 1 | -23/+34 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | ||||
| * | Remove instrumentation and fix the message delivery issue | Melanie | 2012-07-15 | 1 | -24/+28 |
| | | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-16 | 1 | -2/+23 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | ||||
| * | Testing changes and instrumentation | Melanie | 2012-07-15 | 1 | -3/+20 |
| | | |||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-15 | 1 | -0/+38 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | ||||
| * | Save packets received while the client is added and replay them later. | Melanie | 2012-07-15 | 1 | -0/+34 |
| | | |||||
| * | Revert "Experimentally handle UseCircuitCode synchrnonously" | Melanie | 2012-07-15 | 1 | -2/+1 |
| | | | | | | | | This reverts commit e3fa73da96f5612da52d140425f1633494d6edef. | ||||
| * | Experimentally handle UseCircuitCode synchrnonously | Melanie | 2012-07-15 | 1 | -1/+2 |
| | | |||||
* | | to stash | ubit | 2012-07-15 | 1 | -2/+2 |
|/ | |||||
* | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵ | UbitUmarov | 2012-07-04 | 1 | -1/+1 |
| | | | | it's timeout | ||||
* | in CreateAvatarUpdateBlock() change updateflags to 0. Original flags seem ↵ | UbitUmarov | 2012-06-29 | 1 | -0/+3 |
| | | | | prim related only. This does fix the wrong viewer side move of a avatar in prim edition mode (anv mantis 854), with no apparent side effects .. may need more testing | ||||
* | coment out some of previus debug messaged before forgetting about them... | UbitUmarov | 2012-06-22 | 1 | -2/+2 |
| | |||||
* | more debug | UbitUmarov | 2012-06-22 | 1 | -0/+3 |
| | |||||
* | i more debug | UbitUmarov | 2012-06-22 | 1 | -1/+1 |
| | |||||
* | add a temp debug message | UbitUmarov | 2012-06-22 | 1 | -0/+3 |
| | |||||
* | Fix not sending TransferInfo when an asset is not found. This clogs | Melanie | 2012-06-07 | 1 | -4/+29 |
| | | | | up the sound pipeline in the viewer. | ||||
* | Remove the kill record. Core has removed it long ago and it really does more ↵ | Melanie | 2012-06-01 | 1 | -19/+19 |
| | | | | harm than good these days | ||||
* | Fix the log standing attach-from-world bug. | Melanie | 2012-05-30 | 1 | -18/+32 |
| | |||||
* | udp transfer: make number packets estimation coerent with number actually ↵ | UbitUmarov | 2012-05-17 | 1 | -2/+8 |
| | | | | sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100). | ||||
* | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵ | UbitUmarov | 2012-05-12 | 1 | -1/+21 |
| | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc | ||||
* | Fix moving no-mod objects. Fixes a regression introduced with the undo fix | Melanie | 2012-05-07 | 1 | -4/+2 |
| | |||||
* | Help big boobies to dance (avatar visualParams). May not persist and need ↵ | UbitUmarov | 2012-04-26 | 1 | -1/+1 |
| | | | | more lobe ? | ||||
* | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 1 | -3/+4 |
|\ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | Rather than having a FromFolderID property on every single prim and only ↵ | Justin Clark-Casey (justincc) | 2012-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | | ever using the root prim one, store on SOG instead. This reduces pointless memory usage. | ||||
| * | Store FromItemID for attachments once on SOG instead of on every SOP and ↵ | Justin Clark-Casey (justincc) | 2012-04-07 | 1 | -1/+1 |
| | | | | | | | | | | | | only ever using the root part entry. This eliminates some pointless memory use. | ||||
| * | Packing of folder in SendBulkUpdateInventory always set the folder type to ↵ | Diva Canto | 2012-04-06 | 1 | -1/+2 |
| | | | | | | | | -1. Not sure if there's a reason for it, but I'm changing it to the given folder type. | ||||
| * | Implement bulk inventory update over CAPS (not recursive by design, | Melanie | 2012-03-31 | 1 | -1/+47 |
| | | | | | | | | do NOT CHANGE THIS, needed for HG 2.0) | ||||
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-31 | 1 | -1/+47 |
|\ \ | | | | | | | | | | careminster | ||||
| * | | Implement bulk inventory update over CAPS (not recursive by design, | Melanie | 2012-03-31 | 1 | -1/+47 |
| | | | | | | | | | | | | do NOT CHANGE THIS, needed for HG 2.0) | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-31 | 1 | -7/+6 |
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs | ||||
| * | refactor: Stop passing both IClientAPI and agentID to friend event ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -7/+6 |
| | | | | | | | | listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere. | ||||
| * | Add back parts of reverted changes that were not concerned with child agent ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | caching. This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin() Also add a code comment as to why we're caching friend information for child agents. | ||||
| * | Revert "Simplify friends caching by only doing this for root agents - no ↵ | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | functions require caching for child agents." We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators. This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 1 | -2/+2 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| * | Simplify friends caching by only doing this for root agents - no functions ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | require caching for child agents. This allows us to avoid unnecessary multiple calls to the friends service. All friends functions originate from the root agent and only go to other root agents in existing code. This also allows us to eliminate complex ref counting. | ||||
| * | Typo fix | Melanie | 2012-03-28 | 1 | -1/+1 |
| | | |||||
* | | Typo fix | Melanie | 2012-03-28 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Fix typos | Melanie | 2012-03-28 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -0/+48 |
|\ \ | |/ | |||||
| * | Start on Bulk inventory update via CAPS. Not functional yet. HG v2 | Melanie | 2012-03-28 | 1 | -0/+48 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -0/+38 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Framework/Client/IClientInventory.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | ||||
| * | Add a corresponding method for items. HG v2 | Melanie | 2012-03-28 | 1 | -0/+38 |
| | | |||||
| * | Add SendRemoveInventoryFolders which allows to remove one or more | Melanie | 2012-03-28 | 1 | -1/+40 |
| | | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come | ||||
* | | Add SendRemoveInventoryFolders which allows to remove one or more | Melanie | 2012-03-28 | 1 | -1/+40 |
| | | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 2 | -20/+58 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | User level based restrictions for HyperGrid teleports, asset uploads, group ↵ | Snoopy Pfeffer | 2012-03-27 | 2 | -20/+58 |
| | | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 1 | -6/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs |