| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 3 | -17/+6 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| | * | Add comment about setting client.SceneAgent in AddNewClient() | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -0/+3 |
| | | | |||||
| | * | Simplify friends caching by only doing this for root agents - no functions ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | 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. | ||||
| | * | HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the ↵ | Diva Canto | 2012-03-28 | 1 | -16/+0 |
| | | | | | | | | | hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 2 | -15/+18 |
| |\ \ | |/ | |||||
| | * | More on switching the root folder from under the viewer. More experiments. | Diva Canto | 2012-03-27 | 2 | -15/+18 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 2 | -4/+26 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 1 | -0/+15 |
| | |\ | |||||
| | | * | Add "friends show cache <first-name> <last-name>" command for debugging ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | purposes. This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly. | ||||
| | * | | HG: Switch root folders from under the viewer. Towards HG 2.0. This is ↵ | Diva Canto | 2012-03-27 | 1 | -4/+11 |
| | |/ | | | | | | | guarded by an obscure config that no one but me should be using at this point. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -2/+10 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Framework/Client/IClientInventory.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | ||||
| | * | minor: Add some documentation to OnNewClient and OnClientClosed events | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -2/+10 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 2 | -1/+3 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Two new scripting functions osInviteToGroup(userID) and ↵ | Snoopy Pfeffer | 2012-03-27 | 1 | -0/+2 |
| | | | | | | | | | osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-03-27 | 24 | -593/+818 |
| | |\ | |||||
| | * | | When loading objects from DB, first add to scene, then call ↵ | Dan Lake | 2012-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | TriggerOnSceneObjectLoaded. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 1 | -0/+8 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | HG: beginning of a more restrictive inventory access procedure (optional). ↵ | Diva Canto | 2012-03-27 | 1 | -0/+8 |
| | | | | | | | | | | | | | Experimental: we'll try switching the root folder from under the viewer. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 1 | -0/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Add some more overloads to allow registering overloaded methods and lists | Melanie | 2012-03-26 | 1 | -0/+2 |
| | | | | | | | | | | | | | of methods. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-26 | 1 | -1/+1 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs | ||||
| | * | | Add a hust UUID to the script invocations | Melanie | 2012-03-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix the omission on the interface declaration | Melanie | 2012-03-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Dynamically create the delegate type to reduce complexity in the caller | Melanie | 2012-03-26 | 1 | -1/+2 |
| | | | | |||||
| | * | | Correct the design error I introduced into ScriptComms. Untested but about to | Melanie | 2012-03-26 | 1 | -4/+3 |
| | | | | | | | | | | | | | be. | ||||
| * | | | Fix the omission on the interface declaration | Melanie | 2012-03-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Dynamically create the delegate type to reduce complexity in the caller | Melanie | 2012-03-26 | 1 | -1/+2 |
| | | | | |||||
| * | | | Correct the design error I introduced into ScriptComms. Untested but about to | Melanie | 2012-03-26 | 1 | -4/+3 |
| | | | | | | | | | | | | | be. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-25 | 1 | -1/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Simplify the module invocation registration. The types and method name | Melanie | 2012-03-25 | 1 | -1/+2 |
| | | | | | | | | | | | | | can be pulled fromt he delegate so we don't need to pass them explicitly | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-23 | 1 | -0/+16 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Comment out log message about sending periodic appearance updates. | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add experimental SendPeriodicAppearanceUpdates = true/false setting to ↵ | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Startup] in OpenSim.ini On osgrid and other places, I have observed that manually sending appearance updates from the console often relieves grey avatar syndrome. Despite hunting high and low, I haven't been able to find where this packet is sometimes being lost - it might be a persistent viewer bug for all I know. Therefore, this experimental setting resends appearance data for everybody in the scene every 60 seconds. These packets are small and the viewer only fetches texture data if it doesn't already have it. Default is false. | ||||
| * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-23 | 1 | -14/+29 |
| |\ \ \ | | | | | | | | | | | | | careminster | ||||
| | * | | | Make anims way more snappy. Decouple SP animation handling from physics frame | Melanie | 2012-03-23 | 1 | -14/+29 |
| | | | | | | | | | | | | | | | | | time. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-23 | 1 | -14/+77 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Add a scene maintenance thread in parallel to the heartbeat thread. The ↵ | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -14/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maintenance thread will end up running regular jobs that don't need to be in the main scene loop. The idea is to make the critical main scene loop as skinny as possible - it doesn't need to run things that aren't time critical and don't depend on update ordering. This will be done gradually over time to try and uncover any issues. Many non-criticial scene loop activities are being launched on separate threadpool threads anyway. This may also allow modules to register their own maintenance jobs without having to maintain their own timers and threads. Currently the maintenance loop runs once a second, as opposed to the 89ms scene loop. | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-23 | 2 | -56/+70 |
| |\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Remove unnecessary shutting down check in Scene.Heartbeat(). Add some ↵ | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -17/+20 |
| | | | | | | | | | | | | | method doc. Rename HeartbeatThread, shuttingdown to conform to code standards. | ||||
| | * | | Rename Scene.StartTimer() to Start() - this method no longer uses a timer. ↵ | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -24/+25 |
| | | | | | | | | | | | | | Comment out more effectively unused old heartbeat code. | ||||
| | * | | Fix build break | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769e | Justin Clark-Casey (justincc) | 2012-03-23 | 2 | -3/+3 |
| | | | | | | | | | | | | | Forgot to uppercase the animation name for default animations, since for some reason we store and use them in upper rather than lowercase. | ||||
| | * | | Comment out unused scene loop restart code. | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -19/+22 |
| | | | | | | | | | | | | | This has actually been unused since at least 0.7.2 due to earlier changes. | ||||
| | * | | Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). ↵ | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | m_lastUpdate is no longer properly updated and is redundant anyway. | ||||
| | * | | Add commented out section on collisions switch in Scene.SetSceneCoreDebug(). | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -0/+6 |
| | | | | | | | | | | | | | This was not implemented before the recent changes but should be at some point. | ||||
| | * | | refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -11/+8 |
| | | | | | | | | | | | | | MoveTaskInventoryItem() | ||||
| * | | | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster | Melanie | 2012-03-22 | 4 | -11/+22 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | | Fix llGiveInventory() so that it checks the destination part for ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | AllowInventoryDrop, not the source. This allows llAllowInventoryDrop() to work. Regression test added for this case. | ||||
| | * | | Add llGiveInventory() test from object to object where both objects are ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 3 | -6/+17 |
| | | | | | | | | | | | | | owned by the same user. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 6 | -102/+190 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |