ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-15 03:55:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,010 Commits 5 Branches 86 Tags
dfa9ba0937f6e2d30e1d541d64533ede4ecb671e
Commit Graph

4258 Commits

Author SHA1 Message Date
UbitUmarov
c3f9c99fb3 DANGER... changed bakedtextures caching. Assuming grid baking is cache 
only, reduced number of accesses to it. TESTING
 2014-08-07 05:20:45 +01:00
UbitUmarov
6eca2475d4 dont assume that all zero folded perms are to ignore ( coerence with old 
code in avn-current )
 2014-08-05 17:55:30 +01:00
UbitUmarov
a5e9429f2b MESS: changes in MakeRootAgent and CompleteMovement reordering things. 
Added sending of land overlay and parcel information. This in order to
only send avatar related information after having its position well
defined and on the right parcel. THIS MAY STILL BE BAD :)
 2014-07-31 03:10:50 +01:00
UbitUmarov
d6dbfd1687 missing file in commit 5fe1f87837 2014-07-30 15:43:54 +01:00
Melanie Thielker
0c2537bb24 Try to plumb the other half 2014-07-29 04:41:38 +02:00
Melanie Thielker
dfa9780c8c Send new parcel permissions to activate viewer options - done right this time 2014-07-29 04:19:01 +02:00
UbitUmarov
86a9710e77 change previus code, send a NoEvents response back to http server, even 
if we know there is no one there, so that the server finishes handling
 it.
 2014-07-24 23:32:39 +01:00
UbitUmarov
05d071a430 let BlockingQueue timeout work as its suposed to and not wait for ever 2014-07-24 05:37:56 +01:00
UbitUmarov
f236b2e5d3 request.DoHTTPGruntWork(..) is now identical to our version, so use 
those again, getting code closer to os
 again
 2014-07-23 02:14:15 +01:00
Melanie Thielker
e1b2ecdfdc Merge branch 'avination-current' 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
 2014-07-19 22:32:07 +02:00
UbitUmarov
19d33c571d Merge branch 'avination-current' into ubitwork 2014-07-16 16:22:32 +01:00
Melanie Thielker
159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2014-06-21 00:39:55 +02:00
Melanie Thielker
1d1e444aed Convert region loading to new format 2014-04-26 02:43:13 +02:00
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
c6e9db5866 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/RegionSettings.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
 2014-01-28 21:02:20 +00:00
Melanie
4ccb15290e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2014-01-28 20:47:36 +00:00
Justin Clark-Casey (justincc)
2cf7478b9a Merge branch 'justincc-master' 2014-01-20 19:34:55 +00:00
Justin Clark-Casey (justincc)
8e72b53edc Stop exceptions being generated on agent connection if a telehub object has been deleted or has no spawn points. 2014-01-20 19:16:19 +00:00
Oren Hurvitz
3018b2c5d7 Materials module: a) Store materials as assets; b) Finalized it (removed the "Demo" label; removed most of the logging); c) Enabled by default 
Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
 2014-01-20 00:38:42 -08:00
Robert Adams
4fb3d314b8 Fix casting error for float type INI file parameter parsing. 2014-01-19 07:37:14 -08:00
Justin Clark-Casey (justincc)
d381da81d6 minor: Add method doc to IImproveAssetCache 2014-01-18 00:15:38 +00:00
Justin Clark-Casey (justincc)
b5ef585069 Merge branch 'justincc-master' 2014-01-11 01:22:42 +00:00
Oren Hurvitz
bc0ff5e7d4 Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that. 2014-01-11 00:54:41 +00:00
Justin Clark-Casey (justincc)
5e72de1908 Merge branch 'justincc-master' 2014-01-10 20:19:38 +00:00
Oren Hurvitz
91fd9c4670 Refactored: use a single function to apply an object's folded permissions to its main permissions 2014-01-10 19:50:03 +00:00
Oren Hurvitz
13f31fdf85 Refactored setting permissions when rezzing items: use the same function when rezzing from user inventory and prim inventory. 
Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
 2014-01-10 19:37:59 +00:00
Melanie
e79fab91db Intermediate commit. Sill errors. 
Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Services/UserProfilesService/UserProfilesService.cs
 2014-01-05 20:12:32 +00:00
Robert Adams
7e32313a49 varregion: Add region size to teleport event messages (EnableSimulator, 
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).

Conflicts:

	OpenSim/Framework/RegionInfo.cs
 2014-01-04 19:01:04 -08:00
Robert Adams
d9848943a9 Add routines in Util.cs for conversion of region handles to region 
locations and for the conversion of region world location to region
'region' location. These routines will replace all the arithmatic
scattered throughout OpenSimulator.
 2014-01-04 19:01:03 -08:00
Robert Adams
6869633d76 Add serialization/deserialization of region size to RegionInfo, GridRegion, and RegionData. 
This does not modify interfaces or handling of variable sized regions. This only
enables the loading and storing of the region size and the reporting of the
region size in grid service responses.
The database tables already have the code to load and store the region size.
 2013-12-28 06:58:15 -08:00
Justin Clark-Casey (justincc)
e298bf41ff Add missing viewer param elements for butt and breast physics. 
Patch from http://opensimulator.org/mantis/view.php?id=6864 except with tabs replaced by spaces
Thanks cinderblocks!
 2013-12-19 01:24:36 +00:00
Justin Clark-Casey (justincc)
38d7d46c17 Merge branch 'justincc-master' 2013-12-14 02:33:08 +00:00
Kevin Cozens
957449e62c ParseNotecardToList() returned data past end of notecard text (mantis #6881). 2013-12-14 02:25:28 +00:00
Justin Clark-Casey (justincc)
ee163b5751 Merge branch 'justincc-master' 2013-12-14 02:23:12 +00:00
Justin Clark-Casey (justincc)
996a6c2eea After previous discussion, put eye-catcher 'SCRIPT READY' messages to console rather than log as warning 
The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems.
Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
 2013-12-14 01:34:28 +00:00
Melanie
92aad6f1bb Add missing files *blush* 2013-12-11 01:44:03 +00:00
Melanie
5b73b9c4a8 Committing the Avination Scene Presence and related texture code 
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
 2013-12-11 01:39:56 +00:00
Melanie
958a8f274b Revert "Add support for user preferences (im via email)" 
This reverts commit 1842388bb4.
 2013-12-07 01:29:15 +00:00
Melanie
ba48816fb6 Merge branch 'master' into careminster 2013-12-07 01:19:20 +00:00
BlueWall
1842388bb4 Add support for user preferences (im via email) 2013-12-06 02:52:13 -05:00
Melanie
3589acdab1 Merge branch 'master' into careminster 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
 2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc)
f9984a9685 rename private field ACD.ViewerInternal to m_viewerInternal in line with conventions used elsewhere in code 2013-11-19 23:39:52 +00:00
Justin Clark-Casey (justincc)
b71952df49 Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has been set. 
Continue to return null instead.
 2013-11-19 23:36:44 +00:00
Latif Khalifa
9ba5a7e190 Normalize viewer version string to accomodate new style version reporting in the viewers 2013-11-19 23:29:10 +00:00
Justin Clark-Casey (justincc)
7cab41f422 refactor: replace verbose checks with String.IsNullOrEmpty where applicable. 
Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
 2013-11-15 21:45:08 +00:00
Melanie
91b70bf3fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2013-11-08 17:55:01 +00:00
Melanie
ba203ed94f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-11-03 21:34:36 +00:00
Justin Clark-Casey (justincc)
39de7614ec Remove legacy sqlite lines added internally by OpenSimulator to the [Startup] section. 
These are long unused but confusingly will be seen in the [Startup] section on a "config save".
 2013-10-28 18:03:34 +00:00
teravus
75f63ecfcd * Add a session concurrency option per key. Allows developer/config to specify number of concurrent requests on a service. 2013-10-09 22:21:25 -05:00
teravus
1df58d04b1 * Move the BasicDOSProtector.cs to OpenSim.Framework (all useful classes belong there.....) 
* Add an IsBlocked(string Key) method so it can be used more generically.   (think..   if we want to rate limit login failures, we could have a call in the Login Service to IsBlocked(uuid.ToString()) and ignore the connection if it returns true, if IsBlocked returns false, we could run the login information and if the login fails we could run the Process method to count the login failures.
 2013-10-07 23:48:24 -05:00