ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-19 22:45:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,465 Commits 5 Branches 93 Tags
5c661baf6c197caef73e6a8fe5a2223d00a2a6ba
Commit Graph

2437 Commits

Author SHA1 Message Date
Melanie Thielker
5c661baf6c Allow opening a https port using only http so that nginx can be used for ssl 2014-04-26 02:42:30 +02:00
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
root
823e8b5d19 Add support for simple external CAPS texture services 2013-09-07 17:57:02 +02:00
Melanie
745a209bf2 Explicitly set uploaded mesh object perms 2013-06-10 01:16:22 +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
4cb7ee47f2 Let the event queue do lees work - expire every 40s as per Teravus instead of every seconds - whoever put that in.... 2013-05-22 23:49:34 +02:00
Melanie
f9daf921f7 Explicitly zero avatar velocity on sit 2013-05-13 03:29:11 +02:00
Melanie
0af1d8fe19 Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list. 
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
 2013-04-30 23:35:59 +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
e39156c656 Send 503 when throttling textures 2013-04-25 01:38:21 +02:00
Melanie
6571e7ead2 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:24:41 +02:00
Melanie
f548a41fb8 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
 2013-03-28 02:29:07 +00:00
Justin Clark-Casey (justincc)
617637c788 minor: Fix usage error message for "debug eq" console command 2013-03-28 01:41:41 +00:00
Justin Clark-Casey (justincc)
876d0d310f Add "show eq" console command to show numbers of messages in agent event queues. 
For debugging purposes.
 2013-03-28 01:36:34 +00:00
Melanie
4365daa8e1 Merge branch 'master' into careminster 2013-03-26 19:06:44 +00:00
Melanie
e82fab34d7 Implement a pref to turn on the simulator ExportSupported feature entry. 
This tells the viewer to enable the UI for export permissions.
WARNING: If your inventory store contains invalid flags data, this will result
in items becoming exportable! Don't turn this on in production until it's complete!
 2013-03-26 19:00:30 +00:00
Melanie
5f4c4df227 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-26 03:40:06 +00: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
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