ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-13 19:14:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,944 Commits 5 Branches 86 Tags
f768effa87efb6ff00fc1808bf7f11c45f3695e5
Commit Graph

430 Commits

Author SHA1 Message Date
Melanie Thielker
4468aa0dcf Merge branch 'master' of opensimulator.org:/var/git/opensim 2016-07-04 03:37:45 +01:00
Melanie Thielker
ea8f3c83bf Finally remove the requirement for an InventoryItem/FolderBase object to 
be passed into inventory queries.
This makes the API more homogenous and also will more clearly show
coding
errors related to HG inventory where the .Owner field has a meaning
for a query but wasn't always set.
 2016-07-04 03:35:48 +01:00
UbitUmarov
3af437c8bc cleanup a bit 2016-07-01 19:20:04 +01:00
UbitUmarov
9358a6ad29 revert several changes to groups modules (agentGroupData is private). change interregions invite/eject messages, etc 2016-07-01 16:10:45 +01:00
Melanie Thielker
8e40bb6fb7 Make some more modules inheritable 2016-06-21 01:46:38 +02:00
Diva Canto
8d99fe095a Mantis #7920: group info was not being updated in many situations. (regression) Putting back the heavy messaging. 2016-06-19 17:35:11 -07:00
Diva Canto
76ab1ed10c Restored sending group membership data via EventQueue -- this had been a regression. Took the opportunity to refactor that code, so that both Groups V2 and XmlRpcGroups can use the same function. 2016-06-19 16:27:12 -07:00
Melanie Thielker
d42de53dda Allow default permissions from the viewer to be applied to uploaded objects. 
Make inventory items reflect coorect permissions immediately unstead of after relog
 2016-04-29 21:23:32 +02:00
Melanie Thielker
995655c445 Make the SimulatorFeaturesModule nonshared as it ought to be from it's code structure. 2016-04-27 00:48:56 +02:00
Melanie Thielker
57b6398b71 Make mesh upload respect the same parts maximum as what is set for the 
simulator
 2016-03-05 22:30:02 +01:00
Melanie Thielker
110297793c Fix a couple of typos 2016-03-05 22:22:09 +01:00
Diva Canto
ab12a14279 Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore. 2016-02-21 11:14:02 -08:00
UbitUmarov
844266c4d5 change the return list of objects costs, sending a answer if none found 2015-12-20 11:43:27 +00:00
UbitUmarov
eccec66359 fix the queue type in use 2015-12-09 16:12:21 +00:00
UbitUmarov
ca026ac735 fix the default shape type on upload, it is always convex 2015-11-29 00:19:25 +00:00
UbitUmarov
3029080d9b change threading on GetTexture and getMesh and WebFetch Modules. 2015-11-27 07:38:54 +00:00
UbitUmarov
f16d36627f change threading on GetTexture and GetMesh NonSharable region modules 2015-11-27 05:00:11 +00:00
UbitUmarov
156fdd4908 remove some duplicate using statements 2015-11-21 01:49:31 +00:00
UbitUmarov
36426b0db2 remove some compile warnings increasing total number by 2 2015-11-21 00:49:43 +00:00
UbitUmarov
bbfeca4b0c work around some 'tests' errors: a new event queue has a few null events 2015-11-17 06:19:45 +00:00
Diva Canto
f5799ff445 That didn't actually do anything for Simian, and it broke the locahost 
case
Revert "Also restoring proper function for Simian external GetTexture functionality."

This reverts commit 366e81b977.
 2015-11-14 08:10:27 -08:00
Diva Canto
59b63b6406 On to 0.8.3! 
Conflicts:
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
 2015-10-18 21:51:49 -07:00
Diva Canto
366e81b977 Also restoring proper function for Simian external GetTexture functionality. 2015-10-14 14:45:21 -07:00
UbitUmarov
6e12836d71 change copyright to opensim 2015-09-28 13:08:46 +01:00
UbitUmarov
118aff520e try to better merge avn and os fetchinventory and fetchinvdescendents 2015-09-12 06:10:52 +01:00
UbitUmarov
08187cb599 inventory mess return to the state before divas cache issue 2015-09-11 20:40:10 +01:00
UbitUmarov
7841628313 change to avn fecthinventory and webfecth.. code 2015-09-11 16:25:46 +01:00
UbitUmarov
cdaed11387 at last we can login and see objects ( friends is dead and disable in 
scenepresence)
 2015-09-03 18:39:08 +01:00
UbitUmarov
a11edceb00 seems to compile ( tests comented out) 2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
UbitUmarov
c7ddb790a7 change osd encoding of region size 2015-08-27 04:45:16 +01:00
UbitUmarov
018d855f28 turn off KeepAlive 2015-08-24 07:38:33 +01:00
UbitUmarov
0b105da626 Merge branch 'mbworkvar2' into ubitvar 2015-08-19 08:48:50 +01:00
UbitUmarov
fd82a0a0b7 add a Retry-After response header to the 503 sent when we are 2 busy to do 
the request. just 503 could mean server down (?)
 2015-08-19 00:26:43 +01:00
UbitUmarov
05d72f77ff do keepalive on mesh and texture GET. Dont use reusecontext any where. 
setting of keepalive is wrong, it should follow the requested one ( or
always as http1.1) only deny if needed (errors). KeepAlive may increase
stress on number of avaiable file descritors.
 2015-08-18 21:32:03 +01:00
Diva Canto
959872315f WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum. 
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
 2015-08-08 12:12:50 -07:00
Diva Canto
017d2cf417 Bug fix in inventory fetching: sometimes the caps request comes before there is a scene presence, and that's ok. 2015-06-17 15:55:07 -07:00
Cinder
3853904b80 Quell three new warnings I introduced with AgentPrefsData, return an empty llsd map instead of an empty llsd block when no AgentPrefs service is available to try and appease Firestorm 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-06-14 07:59:25 -07:00
Cinder
044654b5a9 Guard against scenes without an agent prefs service and a copy and paste fix 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-06-13 13:37:08 -07:00
Diva Canto
7f1a73cbda Fixed indentation 2015-06-13 10:27:48 -07:00
Diva Canto
bcb8a7d7f9 A few bug fixes for Agent Preferences to actually work. Also added missing config for standalone. 2015-06-13 08:36:06 -07:00
Cinder
0fa94f222d Refactor AgentPreferences so that database operations happen centrally. the opensim way. 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-06-13 07:27:42 -07:00
Cinder
c1ddb7f05e Relicense AgentPreferences files to BSD and OpenSimulator 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-06-13 07:27:26 -07:00
Cinder
6f71d5c2c6 Support for Linden AgentPreferences capability and friends (UpdateAgentLanguage and UpdateAgentInformation) and Mantis #7157 
Signed-off-by: Diva Canto <diva@metaverseink.com>
 2015-06-13 07:27:01 -07:00
Diva Canto
bac53387a9 Mantis #7567: added an 8-sec expiring item cache to the inventory network connector. This fixed the problem on my local test grid and generally made things faster. This cache has been needed for a while... there are many parts in the code where the sim gets an item multiple times in a short amount of time (rezzing attachs and objects, for example). 
Other minor changes:
- added the scene as a parameter to the constructor od FetchInvDescHandler, so that I could see in which scene the handler was being called
- brought linked items in linked folders back to being prefetched
 2015-06-03 17:42:41 -07:00
Diva Canto
c74cef0f42 Major change in the way inventory is downloaded: added a method throughout IIventoryService that fetches sets of folders at once. Also added folder id in the InventoryCollection data structure, so that we don't need to go to inventory server again just for that. This reduces the chatter between sims and inventory server by... a lot. On my tests, this reduces initial inventory download down to 30% of what it currently is. 2015-05-07 19:24:08 -07:00
Diva Canto
8676b017b2 Attempt at fixing mantis #7054. The two inventory threads are stepping on each other's feet. This needs real-world testing, as I'm not sure of all the consequences of reducing the number of worker threads to 1. 2015-05-05 21:28:27 -07:00
Diva Canto
da32512ea4 Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*") 2015-04-29 18:47:17 -07:00
Robert Adams
08c72a8dc1 varregion: remove use of Constants.RegionSize is various places. 
More use of the Util routines for conversion of region handles into addresses.
 2015-03-28 07:50:04 -07:00
Freaky Tech
4de10a45e9 revised GetMesh to not use intermediate base64 coding scheme 
it delivers binary and has binary as input.
base64 intermediate coding makes no sense.

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2015-03-05 18:15:42 -05:00