aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-143-3/+71
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-143-3/+71
| |
* | Merge branch 'avination' into careminsterMelanie2012-05-131-0/+3
|\ \
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵UbitUmarov2012-05-121-0/+3
| | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc
* | | Merge branch 'master' into careminsterMelanie2012-05-131-0/+139
|\ \ \ | | |/ | |/|
| * | Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-123-71/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b0b7b45b943dd94546bcfcf5d3bb871cfe35b507. Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc. I wouldn't normally revert but thinks get tricky when it comes to data formats. Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008
| * | Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-103-3/+71
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Add ConsoleTable framework class for future uniform formatting of console ↵Justin Clark-Casey (justincc)2012-05-101-0/+139
| | | | | | | | | | | | | | | | | | | | | output tables. Still subject to change - if you use this be prepared to change your output code if/when the methods change. Make new "attachments show" command use this.
* | | Merge branch 'master' into careminsterMelanie2012-05-101-2/+2
|\ \ \ | |/ /
| * | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-2/+2
| | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
* | | Merge branch 'master' into careminsterMelanie2012-05-081-19/+19
|\ \ \ | |/ /
| * | Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-05-071-19/+19
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-071-4/+8
|\ \ \ | |/ /
| * | add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for ↵dahlia2012-05-071-4/+8
| | | | | | | | | | | | OpenMetaverse.Primitive object
* | | Merge branch 'avination' into careminsterMelanie2012-05-051-1/+24
|\ \ \ | | |/ | |/|
| * | Fix teleporting from older to newer regionsMelanie2012-05-041-1/+8
| | |
| * | Add the default animation to the child agent data updateMelanie2012-05-041-0/+11
| | |
| * | Clear permissions given to the object we stand up fromMelanie2012-05-031-1/+6
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-0511-119/+297
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Fire the scripting changed event with CHANGED_OWNER when an object that has ↵Justin Clark-Casey (justincc)2012-05-051-3/+13
| | | | | | | | | | | | | | | | | | | | | changed owners is rezzed. This needs to occur after the script is resumed rather than before, when the event is just dropped. Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
| * | Change LongCallTime on WebUtil to 3000, to match the time where request ↵Justin Clark-Casey (justincc)2012-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | handling is considered "slow". This may be the wrong thing to do but stops lots of log spam in HG setups now that the monitoring is extended to other outgoing calls. LongCallTime may need to be made configurable.
| * | minor: Tweak BaseHttpServer message to make it clear that this relates to ↵Justin Clark-Casey (justincc)2012-05-041-1/+1
| | | | | | | | | | | | slow handling of inbound requests.
| * | Extend 'slow' request logging to other server outbound requests (forms, ↵Justin Clark-Casey (justincc)2012-05-041-79/+194
| | | | | | | | | | | | | | | | | | rest, async rest) as well as the existing logging on outbound OSD requests. Also prints out the first 100 chars of any slow request data since this can contain useful info (such as agent ID).
| * | Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-039-35/+88
| | | | | | | | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
* | | Merge branch 'master' into careminsterMelanie2012-04-291-2/+8
|\ \ \ | |/ /
| * | Add text about using double quotes to surround console command arguments ↵Justin Clark-Casey (justincc)2012-04-281-2/+8
| | | | | | | | | | | | | | | | | | containing spaces to "help" text. e.g. show object name "My long object name"
| * | Revert "Log the full exception when errors occur in BaseHttpServer"Justin Clark-Casey (justincc)2012-04-271-19/+19
| | | | | | | | | | | | | | | | | | This reverts commit e31e7c68c8abfd61fed6dabac5403d8adf42ae87. Applied for patch assessment and accidentally committed too early.
| * | Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-04-271-19/+19
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-273-245/+215
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Refactored how asset/inventory types are associated with content types: ↵Oren Hurvitz2012-04-262-228/+177
| | | | | | | | | | | | gathered all the knowledge into a single class. Added the Mesh content type.
| * | Add request verb and url to error messages in WebUtil that lack this.Justin Clark-Casey (justincc)2012-04-261-17/+38
| | | | | | | | | | | | Make exception printing consistent across windows and mono.
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-04-272-15/+37
|\ \ \ | | |/ | |/| | | | careminster
| * | revert last add commitUbitUmarov2012-04-261-2/+3
| | |
| * | add wearable type PHYSICSUbitUmarov2012-04-261-6/+13
| | |
| * | Help big boobies to dance (avatar visualParams). May not persist and need ↵UbitUmarov2012-04-261-10/+24
| | | | | | | | | | | | more lobe ?
* | | Merge branch 'master' into careminsterMelanie2012-04-251-0/+4
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * | Revert "Refactored how asset/inventory types are associated with content ↵Justin Clark-Casey (justincc)2012-04-242-177/+228
| | | | | | | | | | | | | | | | | | | | | | | | types: gathered all the knowledge into a single class. Added the Mesh content type." This reverts commit d3a4d67a207976cd0d116bb9021f7dfc896784e8. Accidentally committed this when I didn't mean to yet.
| * | Minor improvements to loggingOren Hurvitz2012-04-241-0/+4
| | | | | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
| * | Refactored how asset/inventory types are associated with content types: ↵Oren Hurvitz2012-04-242-228/+177
| | | | | | | | | | | | gathered all the knowledge into a single class. Added the Mesh content type.
* | | Merge branch 'master' into careminsterMelanie2012-04-231-0/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Mantis 5977 Corrections to llRegionSayToTalun2012-04-231-0/+20
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Merge branch 'master' into careminsterMelanie2012-04-201-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
| * | Add more exception detail to Exception and IOException throws in ↵Justin Clark-Casey (justincc)2012-04-201-2/+2
| | | | | | | | | | | | BaseHttpServer.HandleRequest()
* | | Fx up estate settingsMelanie2012-04-181-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-04-172-4/+4
|\ \ \ | |/ / | | / | |/ |/| Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: Rename EstateSettings.IsEstateManager() to ↵Justin Clark-Casey (justincc)2012-04-172-4/+4
| | | | | | | | | | | | | | EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does. This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities. As per opensim-dev mailing list.
* | Merge branch 'master' into careminsterMelanie2012-04-071-2/+2
|\ \ | |/ | | | | | | | | | | | | | | 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
| * Thank you, BaseHttpServer, for telling me where things go wrong.Diva Canto2012-04-061-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-03-313-17/+5
|\ \ | |/ | | | | | | | | | | | | 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
| * Add Extended flavour option to opensim version information.Justin Clark-Casey (justincc)2012-03-301-1/+2
| | | | | | | | | | This flavour is for changes in addition to the 0.7.3-post-fixes branch that are too large to be considered fixes but should be reasonably stable. This flavour will almost certainly never see a formal release.
generated by cgit v1.1 at 2024-12-15 23:24:36 +0000