| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Add IDynamicTextureManager.ConvertData() to match AsyncConvertData(). ↵ | Justin Clark-Casey (justincc) | 2012-08-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | Remove mismatching ConvertStream() where there is no AsyncConvertStream and neither IDynamicTextureManager implementer implements this method. | |||||
| * | | | renaming to be similar to equivalent Set command | Melanie | 2012-08-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||||
| * | | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminster | Melanie | 2012-08-25 | 5 | -5/+7 | |
| |\ \ \ | |/ / | ||||||
| | * | | minor: Fix bad log message for failure to create an inventory folder | Justin Clark-Casey (justincc) | 2012-08-25 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Log initial script startup info notice when xengine actually starts to do ↵ | Justin Clark-Casey (justincc) | 2012-08-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | this for debugging purposes, rather than before it actually starts to do this. | |||||
| | * | | Extend "Restarting scripts in attachments" debug log message to show actual ↵ | Justin Clark-Casey (justincc) | 2012-08-24 | 1 | -1/+3 | |
| | | | | | | | | | | | | | name of user and the region they are in | |||||
| | * | | If a connecting scene presence is replacing an existing scene presence then ↵ | Justin Clark-Casey (justincc) | 2012-08-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | bypass close checks. | |||||
| | * | | Pass the "attachToBackup" bool given to SceneGraph.AddNewSceneObject() down ↵ | Justin Clark-Casey (justincc) | 2012-08-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | into the 3-parameter AddNewSceneObject() method instead of always hardcoding true. This doesn't affect any core OpenSimulator code since all callers were passing true anyway But it allows region modules to create objects that are never persisted. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-08-24 | 1 | -0/+3 | |
| |\ \ \ | |/ / | ||||||
| | * | | Fix bad child prim permissions that can make objects change perms after rezzing | Melanie | 2012-08-24 | 3 | -3/+39 | |
| | | | | | | | | | | | | | Port from Avination | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-08-24 | 3 | -3/+39 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Fix bad child prim permissions that can make objects change perms after rezzing | Melanie | 2012-08-23 | 3 | -3/+39 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-08-23 | 3 | -17/+37 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | | refactoring out SetFaceColor | SignpostMarv | 2012-08-20 | 1 | -52/+15 | |
| | | | | ||||||
| | * | | making use of implicit operators and Util.Clip handling of Vector3 | SignpostMarv | 2012-08-20 | 1 | -21/+26 | |
| | | | | ||||||
| | * | | single operation for PRIM_COLOR | SignpostMarv | 2012-08-20 | 1 | -0/+49 | |
| | | | | ||||||
| | * | | fix typo | SignpostMarv | 2012-08-20 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Add --force flag to "kick user" console command to allow bypassing of recent ↵ | Justin Clark-Casey (justincc) | 2012-08-20 | 2 | -4/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-08-23 | 4 | -2/+18 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Make terrain save every 1000 frames instead of every 50. Database load is a ↵ | Melanie | 2012-08-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | sim killer. | |||||
| | * | | Fix group return stuff | Melanie | 2012-08-21 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Cause a persistence save if prim flags change | Melanie | 2012-08-21 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | Add Camera Offsets to serialization | Melanie | 2012-08-21 | 1 | -0/+14 | |
| | | | | ||||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-08-20 | 1 | -0/+4 | |
| |\ \ \ | |/ / | ||||||
| | * | | Make the console output from the reigon console hookable | Melanie | 2012-08-18 | 1 | -0/+4 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-08-18 | 5 | -25/+155 | |
| |\ \ \ | |/ / |/| / | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||||
| | * | fixing bug that get/set the wrong property for prim types other than sphere ↵ | SignpostMarv | 2012-08-17 | 1 | -1/+2 | |
| | | | | | | | | | & box | |||||
| | * | implemented | SignpostMarv | 2012-08-17 | 1 | -0/+50 | |
| | | | ||||||
| | * | BulletSim: Properly regenerate hulls when objects made physical. | Robert Adams | 2012-08-17 | 1 | -8/+8 | |
| | | | | | | | | | | | This fixes the problem of non-base shapes (cubes and spheres) falling through the terrain. | |||||
| | * | Modify order of code so SOP doesn't set the physics actor flying | Robert Adams | 2012-08-17 | 1 | -7/+12 | |
| | | | | | | | | | | | | | property multiple times every time Update is called. This eliminates zillions of settings which is better for BulletSim. The should be no functionality change. | |||||
| | * | Correct an exception report in SceneObjectPart so it outputs the stack. | Robert Adams | 2012-08-15 | 1 | -1/+1 | |
| | | | ||||||
| | * | enables configurable minimum sizes for physical & non-physical prims | SignpostMarv | 2012-08-15 | 4 | -20/+93 | |
| | | | ||||||
| | * | Add support for the extra params to scene and the event manager | Melanie | 2012-08-15 | 2 | -0/+62 | |
| | | | ||||||
| | * | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 3 | -0/+15 | |
| | | | ||||||
| | * | Allow the use of the region debug console found in recent viewers. This console | Melanie | 2012-08-14 | 1 | -0/+39 | |
| | | | | | | | | | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console. | |||||
| * | | Remove AreUpdatesSuspended flag because it does nothing | Melanie | 2012-08-16 | 2 | -24/+0 | |
| | | | ||||||
| * | | Change case of areUpdatesSuspended to upper case as is proper for a property | Melanie | 2012-08-16 | 2 | -8/+8 | |
| | | | ||||||
| * | | Add support for the extra params to scene and the event manager | Melanie | 2012-08-15 | 2 | -0/+62 | |
| | | | ||||||
| * | | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 3 | -0/+16 | |
| | | | ||||||
| * | | Allow the use of the region debug console found in recent viewers. This console | Melanie | 2012-08-14 | 1 | -0/+39 | |
| | | | | | | | | | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console. | |||||
| * | | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 3 | -4/+11 | |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 2 | -2/+2 | |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | | * | Lay some groundwork for temp attachments. Decouple attachments from inventory. | Melanie | 2012-08-14 | 2 | -2/+2 | |
| | | | | ||||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-04 | 2 | -2/+9 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | | * | Restore SOG constructor chaining removed in recent 513b77b. This is not a ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | functional change. | |||||
| | | * | Move previously unadvertised SendPeriodicAppearanceUpdates setting from ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Startup] to [Appearance] config section. Add description and default of false (as before) to OpenSimDefaults.ini If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds. For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent. However, this switch will not help with other appearance failure situations (e.g. failure to bake assets). This setting is experimental but will not have any significant impact on the simulator if turned to true. | |||||
| * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-08-03 | 1 | -0/+7 | |
| |\ \ \ | ||||||
| | * | | | on presence close(), release animator and OnRegionHeartbeatEnd event | UbitUmarov | 2012-08-03 | 1 | -0/+7 | |
| | | | | | ||||||
| * | | | | Merge branch 'careminster' into avination | Melanie | 2012-08-03 | 3 | -2/+13 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 3 | -2/+13 | |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |