ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-08 21:01:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,118 Commits 5 Branches 97 Tags
68b910c1ff03d241e2aec65ebe67ffaa58babbf6
Commit Graph

2355 Commits

Author SHA1 Message Date
Melanie
b9146a7922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/BaseOpenSimServer.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-15 23:45:32 +00:00
Robert Adams
c10c43d6f6 Fix server statistics always reporting zero for total network bytes in/out. 
Clean up some parameter code in Statistics.Binary.
 2013-03-15 13:59:34 -07:00
Melanie
710381e838 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
 2013-03-13 02:02:46 +00:00
Justin Clark-Casey (justincc)
f8a4d95bdd minor: Remove mono compiler warning in LLClientView 2013-03-13 00:22:07 +00:00
Justin Clark-Casey (justincc)
e898a5fec5 minor: Remove mono compiler warnings in EventQueueTests 2013-03-11 22:42:27 +00:00
Melanie
70f0587558 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2013-03-08 01:07:05 +00:00
teravus
33dab49d22 * Just another one of those new packet blocks causing a null ref. Defaulting to zero length array..... 2013-03-07 19:19:36 -05:00
Melanie
81552f41c6 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
 2013-03-05 23:57:53 +00:00
teravus
7556b42d7a * Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9 
* Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter..    which adds up the Length property all of the blocks.
 2013-03-04 21:26:26 -05:00
Justin Clark-Casey (justincc)
fa9f4ef1ba Fix issue in the mesh upload flag module where the ID of the last agent to request the capability was always used instead of the original requesting agent for each cap. 
Should address http://opensimulator.org/mantis/view.php?id=6556
 2013-03-04 23:20:00 +00:00
Melanie
f39e4abf0e Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
 2013-03-03 13:24:37 +00:00
Melanie
2ad72db0ec Make a viewer sent XML error prettier 2013-03-03 11:40:46 +01:00
Melanie
da2b598484 Make banking no longer break sit rotations. Fix spinning avatars. 2013-02-25 18:26:59 +01:00
Melanie
e0e9118f81 The viewer tries to parse the error message body to LLSD - give it some. 2013-02-24 18:31:49 +01:00
Melanie
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Robert Adams
681653ca13 Add a method to IStatsCollector for returning stats as an OSDMap. 
Extend implementors of IStatsCollector to return an OSDMap of stats.
Update UserStatsCollector and AssetStatsCollector to return both
string and OSDMap data (as well as console format).
 2013-02-20 16:13:51 -08:00
Diva Canto
4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Justin Clark-Casey (justincc)
8a6f2432fc minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linden.Caps.dll 2013-02-20 00:01:20 +00:00
Melanie
8c0b9080a4 Fix an issue where the viewer would request the seed cap before 
there was a handler for it.
 2013-02-18 21:09:14 +01:00
Melanie
3108d18ffb Fix shape parameters sent for meshes tosupport the full number of faces 2013-02-16 05:44:41 +00:00
Melanie
4be35df5fa Fix shape parameters sent for meshes tosupport the full number of faces 2013-02-16 05:09:27 +01:00
Melanie
a5a56a8755 Merge branch 'avination' into careminster 2013-02-14 09:12:27 +00:00
Melanie
ef662fc959 Add an event and some logic to allow customizing Simulator Features by avatar 2013-02-14 09:11:57 +00:00
Melanie
d5cd9308d5 Merge branch 'avination' into careminster 2013-02-14 07:45:30 +00:00
Melanie
32c4e1a850 Add an event and some logic to allow customizing Simulator Features by avatar 2013-02-14 08:40:15 +01:00
Melanie
4c7df6a147 Small fix to sim features module 2013-02-14 07:17:27 +01:00
Melanie
c2bfdaa026 Make the sim features module register it's interface so it can be used 2013-02-13 01:52:25 +00:00
Melanie
14c064c65d Revert "Push updates from keyframe directly to the front of the output queue rather" 
This reverts commit 04235e58e8.
 2013-02-12 03:15:40 +01:00
Melanie
2065590232 Revert "Use actual time dilation for unqueued updates" 
This reverts commit 048e904f05.
 2013-02-12 03:15:32 +01:00
Melanie
048e904f05 Use actual time dilation for unqueued updates 2013-02-12 01:13:30 +01:00
Melanie
04235e58e8 Push updates from keyframe directly to the front of the output queue rather 
than through the update system.
 2013-02-12 01:02:16 +01:00
Melanie
7bf33d333a Plumb the path from the client to the extra physics params and back 2013-02-07 22:25:28 +00:00
Melanie
8b78b9429d Merge branch 'avination' into careminster 2013-02-07 21:26:55 +00:00
Melanie
bbda7b94b3 Rename Bounciness to Restitution 2013-02-07 21:25:55 +00:00
Melanie
338b02a8bc Send the new physics params to the viewer build dialog 2013-02-07 21:23:35 +00:00
Melanie
6aa876a83b Rename Bounciness to Restitution 2013-02-07 03:40:48 +00:00
Melanie
598f891d70 Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP 2013-02-06 04:03:32 +01:00
teravus
2104e4d4d4 * the root prim was being given an OffsetPosition in addition to setting the position when creating the root prim. The offset position caused the positioning code to re-move the root prim when you selected it and released it. 2013-02-05 18:46:02 -05:00
Melanie
d3892bbd06 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-05 21:30:12 +00:00
Melanie
6bce4bc112 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-02-05 20:09:45 +00:00
Melanie
2163bebeb4 Try to fix uploaded mesh rotations - code from Avination code base. 2013-02-05 20:09:02 +00:00
Justin Clark-Casey (justincc)
1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6 
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
 2013-02-05 00:23:17 +00:00
Melanie
7482ad1c22 Merge branch 'master' into careminster 2013-02-04 19:21:39 +00:00
teravus
6b0310b829 Adds the ability to load more then one IClientNetworkServer thereby allowing additional client network servers at the same time. Use comma separated values in clientstack_plugin in your config. Additional plugins lying around shouldn't be picked up because the loader only loads configured dll assemblies and breaks at the first IClientNetworkServer found in the assembly. (the only new functionality is the ability to specify more in config). Note: The existing functionality also passes in a nini config.. and has a boolean to determine if the client network server should be initialized for a specific scene. 2013-02-03 08:13:52 -05:00
Melanie
cc1781926b * Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff. 
Conflicts:

	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-01-31 20:37:58 +00:00
Melanie
9a4de546fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-01-31 02:53:11 +00:00
teravus
7c4e0ff03c * Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff. 2013-01-30 06:22:05 -05:00
Melanie
e6e6e8ab15 Merge branch 'avination' into careminster 2013-01-27 01:09:07 +00:00
teravus
9d1989e64f * Handle a NRE with Baked Textures that may result in a failed appearance. This may be an issue, or it may be a symptom. 2013-01-22 18:49:50 -05:00
Melanie
2d3a57a002 Merge branch 'avination' 
Conflicts:
	OpenSim/Framework/ThrottleOutPacketType.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
 2013-01-19 21:49:33 +01:00