ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-09-01 10:46:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,465 Commits 5 Branches 97 Tags
5c661baf6c197caef73e6a8fe5a2223d00a2a6ba
Commit Graph

452 Commits

Author SHA1 Message Date
Melanie Thielker
f93dac9239 Implement Oren's fix to prevent a privilege escalation with groups 2014-04-20 10:47:31 +02:00
Melanie
ddf67bf929 Mono 2.0 fix - call ToArray() explicitly 2013-09-08 19:41:51 +02:00
Melanie
9589a09eda Fix multi-wear of alpha and tattoo layers. 2013-05-31 22:02:31 +02:00
Melanie
0086c3b5fb Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency 
This will require all money modules to be refactored!
 2013-05-25 01:58:50 +02:00
Melanie
f9daf921f7 Explicitly zero avatar velocity on sit 2013-05-13 03:29:11 +02:00
Melanie
4275d7a839 Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 
Conflicts:
	bin/Regions/Regions.ini.example
 2013-04-28 19:03:39 +02:00
Melanie
40036ca05f Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. 
Sending the reply requires having the IClientAPI.
 2013-04-25 21:37:40 +01:00
Melanie
6571e7ead2 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:24:41 +02:00
Melanie
c341664c1b Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
 2013-03-24 18:56:28 +01:00
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
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
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
da2b598484 Make banking no longer break sit rotations. Fix spinning avatars. 2013-02-25 18:26:59 +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
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
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
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
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
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
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
ubit
2eab339b87 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-26 04:40:48 +01: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
Melanie
7bd9a0edb7 Remove group IM test code also mentioning "OpenSimulator Testing" 2013-01-19 14:30:38 +01:00
ubit
5b86af36e6 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-16 20:23:45 +01:00
Melanie
582cb89beb Add a way to put things at the front of the queue for any throttle group. 
Adds a DoubleLocklessQueue and uses it for the outgoing buckets. Added
a flag value to the Throttle Type (again) because although it's hacky, it's
the best of a bad bunch to get the message through the UDP stack to where it's
needed.
 2013-01-16 19:29:27 +01:00
Melanie
206bfe0657 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
 2013-01-16 17:05:37 +00:00
Melanie
9c99ed26eb Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-01-16 16:52:57 +00:00
Melanie
5563a8916e Complete removal of the now unused state queue 2013-01-16 16:45:18 +00:00
Melanie
91138014e2 Change all uses of the removed state queue to the task queue for now. 2013-01-16 17:12:56 +00:00
Melanie
85aa1804df Complete removal of the now unused state queue 2013-01-16 17:06:25 +00:00
ubit
778ed1c05a Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-16 16:35:09 +01:00
UbitUmarov
4d92c6b39f fix STATE udp queue data rate since it is in use again, after being 
removed by intel folks (?)( should it be used or removed ??)
 2013-01-16 15:30:58 +00:00