6dda7c65ae
Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled or disabled at any point, not just during initial startup.
...
This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled
and was affected by a bug where it would never fire if the region started with logins disabled.
2012-07-19 00:09:22 +01:00
0797736fba
Merge branch 'ubitwork' into avination
2012-07-17 10:25:13 +02:00
5874dfd342
fix PollServiceRequestManager
2012-07-17 09:47:20 +01:00
b35f97db46
Replace PollServiceRequestManager with older version, add extra logging to
...
event exceptions to see call path leading up to it.
2012-07-17 10:21:12 +02:00
c256447f46
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-07-16 22:22:42 +01:00
ad75a4b50b
Eliminate a spurious exception report when a https url is accessed with a wrong
...
CN
2012-07-15 12:28:58 +02:00
64393a7ca8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-07-13 02:27:16 +01:00
884d603cac
Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding.
...
This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
2012-07-13 01:03:28 +01:00
3b3d9967b1
Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.RemoteEndpoint.
2012-07-12 23:29:57 +01:00
15283d35f1
Extend "show circuits" to show circuit code, ip and viewer name.
...
Also change to use standard table formatting
"show circuits" and "show connections" console commands are very similar but access different data structures.
2012-07-12 23:09:36 +01:00
d632fd7124
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-07-12 08:55:16 +01:00
916e3bf886
Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.
...
The encodings are thread-safe and already used in such a manner in other places.
This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
2012-07-11 22:54:22 +01:00
89c9528e38
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-07-11 14:27:33 +01:00
bb78b327c0
stop keeping references to objects on released items
2012-07-11 06:43:03 +01:00
0bc8238a6c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Watchdog.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-11 03:56:50 +01:00
ac3a2296fa
Make sure handles stay intact when removing from the MinHeap
2012-07-11 04:01:20 +02:00
7676ae6f74
clear released minheap items so they don't keep holding references to
...
objects.
2012-07-11 03:56:39 +01:00
b5b763f7e1
add some more memory information to StatsCollector
2012-07-10 19:13:24 +01:00
26d89777d8
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-06 20:51:18 +01:00
b8c2efa49c
Convert the slow request queue into a regular queue and add some cleanup
...
and locking.
2012-07-06 00:23:05 +02:00
7e73f609e5
Log warning if time between invocations of the watchdog thread is twice the timer setting.
...
This is to help detect situations where thread timeout warnings are being generated because of general machine issues rather than deadlock, network or other problems.
2012-07-05 23:15:59 +01:00
bf292ce26f
Fix the boo-boo
2012-07-05 23:24:15 +02:00
5776351f6a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-05 22:17:39 +01:00
4854d77904
Add an EventType enum and Type field to the poll service event args. This allows
...
the manager to tell what type of event it is. All events except for lsl http in
go to the "slow queue" which is run once per second as before.
2012-07-05 23:09:20 +02:00
bc5d554f54
use the pollEvent timeout paramenter on pooling
2012-07-04 17:58:32 +01:00
02cb0bf80a
added a timeout paramenter to PollServiceEventArgs, so each type can define it's timeout
2012-07-04 17:40:02 +01:00
e533eef962
*test2* http poll: increased again the pool rate do 10/s but increased timeout to 1s. So data there is less delay when there is new data, but enought waiting time for it to be avaiable
2012-07-04 15:07:10 +01:00
b2fa20001f
*test* slow http retries pool rate to original 1s
2012-07-04 06:14:47 +01:00
5691a8b860
refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS to reflect what it actually is
2012-07-04 00:15:03 +01:00
d32cf21576
Add preservation of running state of scripts when drag-copying.
2012-07-01 18:30:59 +01:00
e5eef139ed
Merge branch 'master' into careminster
2012-07-01 03:04:23 +01:00
d3f1fc79e5
*TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued to unified requests queue directly. Retries get into that every 100ms. 3 working threads as before plus another that only does retries timming.
2012-07-01 01:33:20 +01:00
1926de5a05
Remove some mono compiler warnings
2012-06-30 01:25:39 +01:00
6137f37028
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-06-29 22:24:53 +01:00
05cf51cbbd
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
2012-06-29 22:11:49 +01:00
f202c36106
Add IScene.Name for code clarity to replace the RegionInfo.RegionName used in many, many log messages.
2012-06-29 00:03:22 +01:00
a1a22a2f10
Revert "Mantis 5977 Corrections to llRegionSayTo"
...
This reverts commit 679da63da6
2012-06-28 22:02:20 +01:00
c87f0ac226
Fix llRegionSayTo the right way
2012-06-28 21:23:42 +02:00
41a1903c60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-06-28 03:21:08 +01:00
7cc5b3d7d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-26 17:35:55 +01:00
9a8de52940
Add an event to the poll service manager thread to allow starting it
...
when needed rather than once per second. That is just too slow!
2012-06-26 10:49:37 +02:00
1f22b29ca3
Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods.
...
Use these for new "show regions" command rather than old cumbersome stuff.
2012-06-26 00:40:46 +01:00
dca04c7b61
Avoid a race condition where an incoming request to a script external URL can trigger an exception is the URL was being removed at the same time.
...
This involves three steps
1) Return gracefully in UrlModule.HttpRequestHandler() instead of throwing an exception when the url cannot be found in its index
2) Return true instead of false in HasEvents() if no matching request is found in the map. This call will only happen in the first place for raced requests.
3) Return a 404 in GetEvents() if the request is not in the index, rather than a blank 200 OK.
Many thanks to Tom Haines in http://opensimulator.org/mantis/view.php?id=6051 for doing some of the work on this.
2012-06-22 23:16:18 +01:00
9f3feeff8d
If starting scripts on initial sim start, provide INFO level log feedback each time 50 scripts have been started.
...
This is to provide an indication of what's happening now that the default isn't to report every single script start.
Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
2012-06-22 02:10:27 +01:00
eab211f94d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-21 01:10:13 +01:00
4cfaa01c0a
Remove STARTUP COMPLETE message from the startuplogo.txt file and into main logging
2012-06-20 01:06:55 +01:00
6b3f9fcde0
Comment out the neighbour and land in connectors from info logging that they are starting up
2012-06-20 00:42:54 +01:00
ed513fc7be
Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses would always return OK even if some other status code had been set
2012-06-16 03:43:45 +01:00
32cc9c6094
Merge branch 'master' into careminster
2012-06-15 15:59:49 +01:00
c935f03467
Put all debug console commands into a single Debug section rather than scattering them over other categories
2012-06-15 03:32:43 +01:00
30d872caad
Merge branch 'master' into careminster
2012-06-15 02:53:34 +01:00
ca4e6d9b5b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2012-06-15 02:52:56 +01:00
94517c8d5c
Make the "debug http" command available for robust as well as the simulator. This allows one to see incoming requests as they happen.
...
This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
2012-06-15 02:51:52 +01:00
257b1b517d
Add main instance to internal MainServer.m_Servers list to simplify internal logic.
...
This does require the server to be added before it is set as the main Instance
2012-06-15 02:03:50 +01:00
478acfff34
When setting debug http level, do this for all known http servers, not just the main instance.
2012-06-15 01:24:36 +01:00
6993a26ba5
Get rid of some unnecessary null checks in RegionApplicationBase.StartupSpecific() - a constructor can never return null.
...
Also adds some method doc to MainServer
2012-06-15 00:40:12 +01:00
9825861f4a
Shuffle "debug http" levels so that 1 and 2 now cause different levels of warn to be logged if we receive invalid xml for xmlrpc.
2012-06-14 23:46:09 +01:00
f4b02f8e39
Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752
...
Accidentally make responseString null by default instead of String.Empty.
It needs to be something in case the XmlRpcRequest deserialize throws an exception due to bad xml (a failure which we silently swallow!)
2012-06-14 04:29:15 +01:00
d893e54f4b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-14 00:10:52 +01:00
cf080a68d6
Remove long obsolete and unused IClientAPI.KillEndDone()
2012-06-13 23:42:22 +01:00
12621201ba
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
2012-06-13 02:15:12 +01:00
c6e375291a
Don't include time to transmit response back to requester when assessing slow handling of requests.
...
This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response.
This is not something we can do much about on the server end - it's server-side delay that we're interested in.
To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change.
IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this.
Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers.
2012-06-13 00:03:44 +01:00
dfafb5ca14
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-06-12 03:09:52 +01:00
1b1f0a2d77
OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather than scanning all scene for the presence with the right id
...
Stop checking IsLoggingOut on these listeners, if called with a root agent then we always want to perform these actions.
This covers cases where the client is closed due to manual kick, simulator shutdown, etc.
2012-06-12 02:43:33 +01:00
b099f26376
Set IClientAPI.IsActive = false early on client removal due to ack timeout rather than using IsLoggingOut flag.
...
IsActive is more appropriate since unack timeout is not due to voluntary logout.
This is in line with operations such as manual kick that do not set the IsLoggingOut flag.
It's also slightly better race-wise since it reduces the chance of this operation clashing with another reason for client deactivation (e.g. manual kick).
2012-06-12 02:16:36 +01:00
8c7149063b
In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes.
2012-06-12 01:25:09 +01:00
8c91e761c8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-06-09 16:28:22 +01:00
5f4f9f0230
Add regression test for client logout due to ack timeout.
2012-06-08 03:12:23 +01:00
e8cd9fbbb7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-06-07 23:33:40 +01:00
a1e857932a
Make change to fix Windows builds
2012-06-07 10:17:37 -04:00
98b46d48fe
Allow the thread watchdog to accept an alarm method that is invoked if the timeout is breached.
...
This alarm can then invoke this to log extra information.
This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
2012-06-07 02:44:13 +01:00
a12336390f
Remove useless logging of a bare-names stack trace. It's meaningless
...
to a non-programmer and insufficient for a programmer.
Add commented debug output and data collection to troubleshoot
future locking issues.
2012-06-06 20:37:29 +02:00
884c0e7bb1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-27 19:24:30 +01:00
99cebec4ab
adding status codes from rfc 6585
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-24 12:09:15 -04:00
87f9aa9d08
porting IDE tooltip-friendly documentation tweaks from Aurora-Sim
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-24 12:09:15 -04:00
8f88c17df9
refactor: Rename ConsoleTableRow and ConsoleTableColumn to ConsoleDisplayTableRow and ConsoleDisplayTableColumn
2012-05-23 03:23:37 +01:00
059a1e90b9
Add ConsoleDisplayList for more consistent formatting of console output in list form.
...
Convert "show region" to use this structure rather than hand-constructing
2012-05-23 03:19:25 +01:00
2222d979cc
refactor: rename ConsoleTable -> ConsoleDisplayTable for clarity
2012-05-23 02:37:38 +01:00
6126b6da72
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-05-14 23:32:49 +01:00
52a32878a9
Save the Telehub and its Spawn Points in the OAR
2012-05-14 19:59:45 +01:00
fe029cf4e8
Merge branch 'avination' into careminster
2012-05-13 01:25:03 +01:00
e2dc04586a
Merge branch 'master' into careminster
2012-05-13 01:24:01 +01:00
7461fe4554
TEST MESS* reduce animation packets send. Added onchangeanim event with parameters to define if to add or remove, and if to send anims pack on that evocation, etc
2012-05-12 15:27:37 +01:00
8b958e7e74
Revert "Save the Telehub and its Spawn Points in the OAR"
...
This reverts commit b0b7b45b94
2012-05-12 02:36:56 +01:00
b0b7b45b94
Save the Telehub and its Spawn Points in the OAR
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-10 22:56:37 -04:00
903cff9264
Add ConsoleTable framework class for future uniform formatting of console output tables.
...
Still subject to change - if you use this be prepared to change your output code if/when the methods change.
Make new "attachments show" command use this.
2012-05-10 23:47:39 +01:00
a90822f4b8
Merge branch 'master' into careminster
2012-05-10 00:42:10 +01:00
6987aef38d
Improve logging on the prim inventory script asset request path for future use.
...
This adds name and description of the request handler to http request logging when DebugLevel >= 1
2012-05-09 23:12:30 +01:00
05634907e9
Merge branch 'master' into careminster
2012-05-08 00:07:18 +01:00
15844da3af
Log the full exception when errors occur in BaseHttpServer
2012-05-07 19:56:00 +01:00
df7abbb367
Merge branch 'master' into careminster
2012-05-07 12:07:47 +01:00
4032455332
add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for OpenMetaverse.Primitive object
2012-05-07 00:33:50 -07:00
b62cc3ce0a
Merge branch 'avination' into careminster
2012-05-05 10:32:22 +01:00
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
01b00ad0d5
Fire the scripting changed event with CHANGED_OWNER when an object that has changed owners is rezzed.
...
This needs to occur after the script is resumed rather than before, when the event is just dropped.
Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
2012-05-05 00:29:14 +01:00
6096a1f30e
Change LongCallTime on WebUtil to 3000, to match the time where request handling is considered "slow".
...
This may be the wrong thing to do but stops lots of log spam in HG setups now that the monitoring is extended to other outgoing calls.
LongCallTime may need to be made configurable.
2012-05-04 20:53:30 +01:00
197163e12a
Fix teleporting from older to newer regions
2012-05-04 21:00:41 +02:00
333d013b5c
Add the default animation to the child agent data update
2012-05-04 20:33:48 +02:00
fb99ee6774
minor: Tweak BaseHttpServer message to make it clear that this relates to slow handling of inbound requests.
2012-05-04 01:16:56 +01:00
c9faf0df74
Extend 'slow' request logging to other server outbound requests (forms, rest, async rest) as well as the existing logging on outbound OSD requests.
...
Also prints out the first 100 chars of any slow request data since this can contain useful info (such as agent ID).
2012-05-04 01:12:56 +01:00
231a3bf147
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
...
This is most useful for capabilities where the url is not self-describing.
2012-05-03 01:45:49 +01:00
9f9693dab8
Clear permissions given to the object we stand up from
2012-05-03 01:18:51 +02:00
ad12b5df49
Merge branch 'master' into careminster
2012-04-29 02:23:54 +01:00
133f05dc41
Add text about using double quotes to surround console command arguments containing spaces to "help" text.
...
e.g. show object name "My long object name"
2012-04-28 00:29:08 +01:00
737e177163
Revert "Log the full exception when errors occur in BaseHttpServer"
...
This reverts commit e31e7c68c8
2012-04-27 23:46:46 +01:00
e31e7c68c8
Log the full exception when errors occur in BaseHttpServer
2012-04-27 21:52:04 +01:00
90305001de
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
7397c9a68e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-27 01:31:12 +01:00
0da8fe3124
Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.
2012-04-26 22:49:14 +01:00
fc576df273
revert last add commit
2012-04-26 18:24:36 +01:00
f194c48cd3
add wearable type PHYSICS
2012-04-26 17:42:11 +01:00
fd19601c6b
Help big boobies to dance (avatar visualParams). May not persist and need more lobe ?
2012-04-26 16:17:46 +01:00
4c4ffb9868
Add request verb and url to error messages in WebUtil that lack this.
...
Make exception printing consistent across windows and mono.
2012-04-26 00:43:31 +01:00
def65cd94a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-04-25 01:22:09 +01:00
ef1668adb3
Revert "Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type."
...
This reverts commit d3a4d67a20
2012-04-24 21:42:32 +01:00
2f398231ac
Minor improvements to logging
...
Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
2012-04-24 21:38:09 +01:00
d3a4d67a20
Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.
2012-04-24 20:52:18 +01:00
e903709847
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-04-23 20:44:41 +01:00
679da63da6
Mantis 5977 Corrections to llRegionSayTo
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-23 07:16:33 -04:00
464fb2533f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
2012-04-20 16:48:43 +01:00
f3dda2d85d
Add more exception detail to Exception and IOException throws in BaseHttpServer.HandleRequest()
2012-04-20 03:12:25 +01:00
c2be894330
Fx up estate settings
2012-04-18 23:23:01 +01:00
74aa8eee12
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-17 01:54:54 +01:00
24a0cc5261
refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does.
...
This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities.
As per opensim-dev mailing list.
2012-04-17 01:25:41 +01:00
b39de2425c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-07 04:52:14 +01:00
cdbe34716f
Thank you, BaseHttpServer, for telling me where things go wrong.
2012-04-06 11:21:27 -07:00
f3132c45d9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2012-03-31 02:18:02 +01:00
e5343bccdf
Add Extended flavour option to opensim version information.
...
This flavour is for changes in addition to the 0.7.3-post-fixes branch that are too large to be considered fixes but should be reasonably stable.
This flavour will almost certainly never see a formal release.
2012-03-30 02:11:32 +01:00
bf09d6a22b
refactor: Stop passing both IClientAPI and agentID to friend event listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
2012-03-29 18:31:57 +01:00
22a85b947a
Add back parts of reverted changes that were not concerned with child agent caching.
...
This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin()
Also add a code comment as to why we're caching friend information for child agents.
2012-03-29 01:26:30 +01:00
bd83676d6c
Change namespace on CallingCardModule and correct interface file placemant. Also ass OpenSource header
2012-03-29 01:13:08 +01:00
93ac47f0d3
Revert "Simplify friends caching by only doing this for root agents - no functions require caching for child agents."
...
We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators.
This reverts commit d9f7b8549b
2012-03-29 01:08:47 +01:00
5a82d939e6
Adding the Avination calling card interface
2012-03-29 00:34:28 +01:00
d9f7b8549b
Simplify friends caching by only doing this for root agents - no functions require caching for child agents.
...
This allows us to avoid unnecessary multiple calls to the friends service.
All friends functions originate from the root agent and only go to other root agents in existing code.
This also allows us to eliminate complex ref counting.
2012-03-28 23:40:25 +01:00
874bf1f8e5
Enable voice by default on parcels to weaken effects of viewer 2/3 ParcelVoiceInfoRequest bug
...
Viewer 2/3 contains a bug where the viewer will constantly retry ParcelVoiceInfoRequest requests on voice-disabled parcels where voice is otherwise available.
Attempts to fix this server-side have not been successful - sending a non-OK http code (e.g. a 404) just makes the viewer request again immediately.
Dropping the request entirely is a bit better but the viewer still retries after a minute.
Estate settings already enabled voice by default so doing the same for parcels. This only has an effect if you have any voice system active at all.
Ultimately, the re-request bug needs to be fixed viewer-side (LL suffers from the same issue!) but it might be worth implementing the drop request hack.
2012-03-28 23:30:28 +01:00
7dad1ded2e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-29 00:27:35 +01:00
0463a00d34
Start on Bulk inventory update via CAPS. Not functional yet. HG v2
2012-03-28 02:45:50 +01:00
8c0f1e9058
Add a corresponding method for items. HG v2
2012-03-28 02:10:07 +01:00
710c14fb57
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:49:06 +01:00
300488f862
Merge branch 'master' into careminster
2012-03-28 02:46:54 +01:00
b519cf6383
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Client/IClientInventory.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2012-03-28 02:20:40 +01:00
2a8b9a47b2
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:15:56 +02:00
44f1f87656
Merge branch 'master' into careminster
2012-03-25 20:07:43 +01:00
4f17537555
Allow the user to enter help topics in upper or lowercase.
...
Forcing uppercase (e.g. help Assets) is too annoying.
Thanks to WhiteStar for pointing this out.
2012-03-24 03:07:01 +00:00
cf61c74e90
Give feedback when "terrain save-tile" is not successfully invoked.
2012-03-24 02:16:44 +00:00
3381899481
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-22 20:38:49 +00:00
b5d0bc2488
Rework Diva's patch to simplify it
2012-03-22 20:25:20 +00:00
45b588cf00
Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch."
...
This reverts commit 6146e7ef25
2012-03-22 20:10:38 +00:00
6146e7ef25
Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
2012-03-22 12:57:12 -07:00
1a8769e6ef
Instead of loading default avatar animations in both SLUtil and AvatarAnimations, load just in AvatarAnimations instead.
...
This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").
2012-03-21 23:57:39 +00:00
8652f277df
Revert "Stop messing order of updates, destroing the defined order of the selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out."
...
This reverts commit 68981d01f0
2012-03-21 22:45:34 +01:00
68981d01f0
Stop messing order of updates, destroing the defined order of the selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out.
2012-03-21 21:19:29 +00:00
312f0c6970
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-21 02:45:33 +00:00
54a8a5baba
If "debug scene updates true" then print out to log when a garbage collection occurs.
2012-03-21 02:02:14 +00:00
2e41294da9
add convex state to mesh key, so a change is detected.
2012-03-21 01:24:30 +00:00
ee9210f656
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-21 00:26:02 +00:00
7a0d7be44c
Refix the fixed fix!
2012-03-21 00:17:58 +00:00
f7c61790b7
Fixed borkness with previous merge.
2012-03-20 17:25:52 -07:00
841b4232f6
Line endings
2012-03-20 17:19:55 -07:00
3fa51f66ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Framework/Util.cs
2012-03-20 17:19:14 -07:00
d08ad6459a
HG Friends: allow the establishment of HG friendships without requiring co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
2012-03-20 17:14:19 -07:00
35c3124c3b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-20 23:39:02 +00:00
30b2a8c778
Move frame loop entirely within Scene.Update() for better future performance analysis and stat accuracy.
...
Update() now accepts a frames parameter which can control the number of frames updated.
-1 will update until shutdown.
The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
2012-03-20 23:12:21 +00:00
c7e302864a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-18 20:44:56 +00:00
59b6f6a6e0
minor: reuse threadpool count we just fetched instead of fetching it again
2012-03-16 03:56:56 +00:00
bece2023e7
Add total scripts count to "show threads"
...
However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
2012-03-16 03:52:13 +00:00
6e8f80f1ab
Improve threadpool reporting to "show threads" console command (also gets printed out periodically)
2012-03-16 03:26:47 +00:00
421b562a04
Add process working memory to "show stats" memory statistics.
...
This shows the actual amount of RAM being taken up by OpenSimulator (objects + vm overhead)
2012-03-16 02:43:33 +00:00
84ca09f7c5
added ObjectPhysicsProperties http event message to send viewer that data. For now on caps/EventQueue, and still only used on a material change...
2012-03-15 02:24:13 +00:00
c0f70d17fc
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-03-14 11:33:51 +00:00
3de3b9e63c
initial suport for ExtraPhysical parts parameters. Reading from llclientView to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
2012-03-13 17:56:32 +00:00
ebcd4910a2
Refactor, move OjectChangeData into it's own file and rename
...
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
2012-03-13 13:08:32 +01:00
e0dd38f672
Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().
...
.NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5
and before, WebUtil defined an extension method for Stream with the signature
Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter
is different in the two forms and depending on which compiler and/or
runtime you use, you could get one form or the other. Crashes ensue.
This change renames the WebUtil stream copy method to something that
cannot be confused with the new CopyTo method defined in .NET 4.0.
2012-03-12 10:07:04 -07:00
4f7ec1d691
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-03-11 01:55:36 +01:00
f292e19689
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-03-11 02:29:43 +00:00
908abb1c3d
BIG MESS. changed Iclient interface so only one event is used to inform scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
2012-03-10 20:32:19 +00:00
291dc39691
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-10 08:09:43 -08:00
7b8e9d88e3
Serialize all web requests to a particular host:port pair; only applied to the PostToService variants.
2012-03-09 16:53:51 -08:00
bdc968f1fc
Factor out common default animations code into SLUtil. LLClientView now makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy.
...
As per opensim-users mailing list discussion.
2012-03-09 23:57:24 +00:00
b0fc96c17d
Merge branch 'master' into careminster
2012-03-08 19:10:22 +00:00
749c3fef8a
Change "help" to display categories/module list then "help <category/module>" to display commands in a category.
...
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
2012-03-08 01:51:37 +00:00
1f32730798
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-03-03 09:58:57 +00:00
0007711eb5
Use a fully stubbed out MockConsole for unit tests rather than inheriting from CommandConsole.
...
This is so that the static MainConsole.Instance doesn't retain references to methods registered by scene and other modules to service commands.
This prevents the scene from being garbage collected at the end of a test.
This is not the final thing preventing GC - next up is the timer started by SimStatsReporter that holds a reference to Scene that prevents end of test gc.
2012-03-01 03:23:10 +00:00
aabbbb32ff
Flick master up to 0.7.4
2012-02-29 23:45:14 +00:00
4268427ac3
Some clean up in WebUtil, remove unused ServiceRequest function.
2012-02-27 15:15:03 -08:00
37068d17c5
Merge branch 'master' into careminster
2012-02-24 09:56:06 +00:00
bafef292f4
Take watchdog alarm calling back outside the m_threads lock.
...
This is how it was originally. This stops a very long running alarm callback from causing a problem.
2012-02-24 05:25:18 +00:00
9e6ffe7798
Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually returns and for consistency.
2012-02-24 05:15:47 +00:00
f67f37074f
Stop spurious scene loop startup timeout alarms for scenes with many prims.
...
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
2012-02-24 05:02:33 +00:00
03e7bc1526
Merge branch 'master' into careminster
...
Conflicts:
2012-02-21 10:20:56 +00:00
68a4ef5ef6
Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.
2012-02-21 02:52:20 +00:00
985526b662
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
2012-02-18 22:21:10 +00:00
b817c337dc
On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit
...
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
2012-02-18 00:33:52 +00:00
7be9ba5564
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-02-15 01:11:35 +00:00
272ba5a741
Merge branch 'master' into careminster
2012-02-15 01:11:17 +00:00
2d3381b795
Implement region crossing of sitting avatars. Edit mode and llSetPos work
...
but unscripted default sit anim is lost. Still some Gfx glitching. Physical
crossing doesn't work yet.
2012-02-14 23:16:20 +01:00
21393af631
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-13 20:48:50 +00:00
189c67db95
On object deserialization, go back to logging errors at DEBUG level rather than ERROR. Restore extra log message if shape processing fails.
...
Logging level was DEBUG before 312e145312e145
2012-02-13 20:43:26 +00:00
acfe7e555e
Merge branch 'master' into careminster
2012-02-10 23:59:10 +00:00
5023cc86f0
Change parser to leave embedded quotes alone if the pattern is recognized
...
as an OptionSet long option
2012-02-10 23:58:39 +00:00
4455140f30
Change parser to leave embedded quotes alone if the pattern is recognized
...
as an OptionSet long option
2012-02-10 23:52:06 +00:00
71e484516a
minor: Remove warning from RegionInfo due to repeated config.GetString() call where the first was unused.
2012-02-10 23:41:14 +00:00
d80422eba7
Add line numbers to Util.PrintCallStack()
2012-02-10 23:39:32 +00:00
54fc78013d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-02-05 20:58:04 +00:00
13999dfc1d
Set PhysPrimMax default to 0 so ini files won't be overridden
2012-02-04 21:52:55 -05:00
df07b97abd
Make NonphysicalPrimMax setting work properly
...
RegionInfo setting will override only if it is > 0
2012-02-04 21:30:16 -05:00
ce5e900721
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-02-04 11:48:20 +00:00
6c252a0fa1
Add TestRegionSettingsDeserialize
2012-02-04 00:55:03 +00:00
2b6c5fcb31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-03 23:48:12 +00:00
312e1457dd
Change SceneObjectSerializer to use common ExternalRepresentationUtils.ExecuteReadProcessors() methods.
...
Adds ability to submit a customized exception message to match logging.
2012-02-03 23:47:01 +00:00
bd9d7484f0
Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim
2012-02-04 00:39:58 +01:00
0742630d81
Merge branch 'master' of /home/opensim/src/opensim
2012-02-03 18:20:26 -05:00
5c545d1d2e
Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-02-03 18:02:51 -05:00
83ef13a79a
Changed save oar and save iar parameter -p|--profile to -h|--home, including corresponding RemoteAdmin parameter
2012-02-03 23:53:18 +01:00
6234264211
Refactor common deserialization processor code to generic method ExternalRepresentationUtils.ExecuteReadProcessors()
2012-02-03 22:45:50 +00:00
f17066b7bf
Change LandDataSerializer deserialization so that in the future it won't care about extra elements or element order.
...
This brings it into line with other deserializations such as object and will improve future backward compatibility.
2012-02-03 22:21:54 +00:00
0dbfa70443
Merge branch 'master' into careminster
2012-02-03 08:47:26 +00:00
3257dbe76d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-02 17:44:11 -08:00
ee2b2aadc3
fix line endings
2012-02-02 17:39:05 -08:00
573a64ad24
Merge branch 'master' into careminster
2012-02-03 00:05:59 +00:00
574c240202
Fix test failure
2012-02-03 00:05:36 +00:00
447a66d660
Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more
...
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
2012-02-02 23:40:56 +00:00
07c487a28f
Make ban, eject, freeze and the scripted versions of those work.
2012-02-02 21:36:45 +01:00
567f4c51f8
Improve reliability of script state saving by covering various saving
...
and loading scenarios which resulted in loss of continuity on item ids
2012-02-02 01:52:17 +00:00
dbc3f1ff92
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-02-02 01:53:13 +00:00
c10193c72b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-01 16:25:35 -08:00
45ad9e39a6
Improve reliability of script state saving by covering various saving
...
and loading scenarios which resulted in loss of continuity on item ids
2012-02-02 01:05:14 +01:00
727ddffb71
Merge branch 'master' into careminster
2012-01-31 21:53:32 +00:00
1505c22995
Use Environment.TickCount & Int32.MaxValue; instead of Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound.
...
This matches the tickcount masking in the thread watchdog.
For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
2012-01-31 21:09:26 +00:00
1b600e7803
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-01-30 16:38:11 +00:00
3de534896e
Add ParcelImageID to RegionSettings so we can have that overlay.
...
Warning: Contains a Migration.
Warning: May contain nuts.
2012-01-30 16:22:21 +00:00
428407c5e4
Merge branch 'master' into careminster
2012-01-28 01:01:23 +00:00
7352aea9ac
Remove IClientAPI from the money module. It was only used to pass in the
...
agent id anyway
2012-01-28 00:18:12 +00:00
9d60b84f78
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/EstateSettings.cs
2012-01-26 23:07:31 +00:00
616373db16
llManageEstateAccess implementation http://wiki.secondlife.com/wiki/LlManageEstateAccess
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-26 16:15:23 -05:00
4ce42762ee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-01-26 00:21:21 +00:00
8f53c768f5
llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParcelMusicURL
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-25 15:48:38 -05:00
427ab55058
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 00:45:57 +00:00
09baa3e679
Comment out asset statistics section from periodic stats as these have not been recorded for a very long time.
...
Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness.
Some data is available via other means (e.g. "fcache status").
2012-01-24 22:14:21 +00:00
e8f1e7e96e
Comment out inventory statistics section from periodic stats, since this only contained the now uncollected and irrelevant inventory cache number.
2012-01-24 22:03:30 +00:00
a4977bbe19
Simplify and streamline telehub editing code. Verify rotations and fix
...
spwan point positioning on rotated telehubs.
2012-01-24 02:36:35 +00:00
0d2e02efb1
Reverse the spawn point distance vector
2012-01-24 01:30:41 +00:00
c0e1784e86
Correct a coordinate to make the viewer like it
2012-01-24 01:18:13 +00:00
cc02f78d4e
Simplify and streamline telehub editing code. Verify rotations and fix
...
spwan point positioning on rotated telehubs.
2012-01-24 01:48:38 +01:00
696fbdfa24
Reverse the spawn point distance vector
2012-01-24 01:29:50 +00:00
090bf7acca
Correct a coordinate to make the viewer like it
2012-01-24 01:17:41 +00:00
07ad821157
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/RegionSettings.cs
2012-01-24 00:36:42 +00:00
87799c1f3d
Change Telehubs to store only the data that is really needed and not
...
additional redundant information.
2012-01-24 00:32:10 +00:00
cd2bf64b87
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-01-23 00:24:31 +00:00
74c1ed77a4
Finish connecting Telehub to database
2012-01-22 14:51:15 -05:00
02572ab1d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
2012-01-22 16:35:14 +00:00
68365c20c0
Move Telehub tables and data from EstateSettings to RegionSettings.
...
This is damage control es EstateSettings is not the place this can be put.
EstateSettings is nt unique to a region and therefore would introduce
a hard limit of one telehub per estate, completely shutting off the
option of having SL style telehubs, e.g. one per region. Whole
estate teleport routing can still be implemented id desiresd, this
way all options are open while the other way most options get closed
off.
2012-01-22 11:36:04 +00:00
32d58d6e3e
Telehub Support:
...
Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
2012-01-21 23:26:27 -05:00
ba3b0c69f1
Merge branch 'master' into careminster
2012-01-21 19:52:33 +00:00
b6f3de5028
Telehub Support:
...
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
2012-01-20 23:50:37 -05:00
f8079bcd72
Fixed bugs in earlier commit on custom user parameters in Regions.ini
2012-01-19 02:52:05 -08:00
b14a6acd2f
Merge branch 'master' into careminster
2012-01-16 23:08:47 +00:00
82ad9d4e04
Remove monocov and other obsolete nant build targets.
...
monocov was a code coverage attempt 3 years ago which no longer works.
other removed targets have been commented out or unused for a very long time
2012-01-16 22:58:58 +00:00
9dc7fef4f6
Merge branch 'master' into careminster
2012-01-13 02:27:20 +00:00
d40ec1c346
Move some interfaces to a more apropriate place
2012-01-12 20:49:50 -05:00
8bdd80abfa
HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
2012-01-12 09:56:35 -08:00
4492bc1bcd
Merge branch 'master' into careminster
2012-01-12 17:52:29 +00:00
fdfc4ab2a8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
2012-01-06 00:08:18 +00:00
2b4edd659f
Adding empty ISearchModule interface
2012-01-05 17:53:03 -05:00
1ebc9d04aa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-01-05 08:15:33 +00:00
6941058824
Profile Updates
...
Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
2012-01-03 11:10:23 -05:00
ca6113a4d5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-12-20 21:51:43 +00:00
dd69c9fd20
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-20 09:53:05 -08:00
efa4284391
Merge branch 'master' into careminster
2011-12-19 21:30:57 +00:00
0b91ec8dd2
Migrate detailed "appearance show" report generation up to AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive).
...
Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25.
Adjust some method doc
Minor changes to some logging messages.
2011-12-19 18:58:05 +00:00
759f1d2dbe
Merge branch 'master' into careminster
2011-12-18 10:49:45 +00:00
f9137c923b
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
...
There were two problems here:
1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session
2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag.
This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588
This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
2011-12-17 02:23:24 +00:00
99623894c7
Commented a couple of verbose debug messages.
2011-12-16 17:23:30 -08:00
52a4dbccbe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-12 11:42:22 +00:00
db8fd1eb9f
Added an option for extra settings within region ini file. Any non-hardcoded key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo
2011-12-12 00:21:19 -08:00
3a91085ac2
Implement handler for TeleportCancel inbound packet
2011-12-10 15:17:34 +00:00
6b080d57cb
Merge branch 'master' into careminster
2011-12-10 15:19:31 +00:00
3f42183797
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
2011-12-10 00:40:41 +00:00
0daa5d8b4d
minor: comment out "unpacked appearance" log mesasge for now
2011-12-09 23:44:34 +00:00
f24898d049
Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.
2011-12-09 23:24:52 +00:00
af3cd00048
Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
2011-12-09 23:07:53 +00:00
d913303875
Merge branch 'master' into bigmerge
2011-12-09 08:13:57 +00:00
bc13855e64
Reactivate BasicCircuitTests.TestAddClient()
...
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
2011-12-08 20:52:34 +00:00
0e265889dd
Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().
...
The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists.
This allows us to eliminate another null check elsewhere and simplifies the method contract
2011-12-08 19:25:24 +00:00
f61e54892f
On a new client circuit, send the initial reply ack to let the client know it's live before sending other data.
...
This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before.
This may stop some avatars appearing grey on login.
This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity
This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
2011-12-08 18:34:23 +00:00
96539ffc79
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 18:29:19 +00:00
50aa89dae6
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 03:24:25 +00:00
415b7b7ec4
Implement XMLRPCAdmin command admin_teleport_agent.
...
This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
2011-12-07 17:31:57 +00:00
e6272b8d56
Stop also adding an ordinary http handler when we set up a poll http handler.
...
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
2011-12-07 12:28:42 +00:00
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
...
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
bc17e2e9cf
Merge branch 'master' into bigmerge
2011-12-05 20:32:35 +00:00
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
ec8c93aa5e
Implement ChangeInventoryItemFlagsPacket handling
2011-12-04 12:35:01 +01:00
4919c60560
Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()
...
This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate.
Normal standalone operation unaffected.
2011-12-03 18:59:54 +00:00
ced820bd5e
Improve locking in AgentCircuitManager
2011-12-03 16:19:11 +00:00
c934901a05
Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions
2011-12-03 16:11:47 +00:00
b60ff651a3
Merge branch 'master' into bigmerge
2011-12-01 12:16:59 +00:00
fa63054c4f
On "show caps", stop excluding the seed cap but do exclude it elsewhere
2011-11-29 20:37:03 +00:00
679a5f6c0b
With "debug http 1", show the path with the query string instead of just the path.
...
Also simplifies debug levels to just 0 and 1
2011-11-29 17:26:45 +00:00
b6b0bc7b32
Add "debug http" command for currently simple extra debug logging of non-event queue inbound http requests to a simulator
2011-11-29 16:15:52 +00:00
dc612d0f08
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-11-28 11:06:38 +00:00
b785f204ce
remove some mono compiler warnings
2011-11-25 22:19:57 +00:00
0688861aa7
Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conversion rather than the arrays in TaskInventoryItem
2011-11-25 22:15:29 +00:00
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
b0fe0464af
Stop an exception being thrown and a teleport/border cross failing if the desintation sim has no active script engines.
...
This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry.
Callers adjusted to stop checking for the list reference being null (which never happened anyway)
2011-11-22 22:13:57 +00:00
bdb5ac96d9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-11-19 22:39:15 +00:00
10a23a823e
Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages
...
These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
2011-11-19 01:16:07 +00:00
31736b1aac
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-11-17 19:04:27 +00:00
aea547cd11
fix build break on UserManagementModule.
...
This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
2011-11-15 23:24:51 +00:00
29eb3b2eb5
improve formatting of "show threads"
2011-11-15 22:51:12 +00:00
ccae787d03
send a watchdog heartbeat for a poll worker thread when it's actually run
2011-11-15 22:20:44 +00:00
7db38a351c
Add number of milliseconds since last update to "show threads"
2011-11-15 21:49:13 +00:00
20f26eeb17
Remove unused RegionCommsListener/IRegionCommsListener.
...
All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time.
2011-11-15 17:38:55 +00:00
6daa61d6ba
Merge branch 'master' into bigmerge
2011-11-12 12:36:52 +00:00
e61ea79c72
doh - correct build break
2011-11-12 00:27:43 +00:00
f130e1a86f
Add threads to the watchdog thread list before we start them.
...
Hopefully this wil make "WATCHDOG: Asked to update thread ## which is not being monitored" messages." go away.
2011-11-12 00:24:45 +00:00
a1426739a2
Merge branch 'master' into bigmerge
2011-11-10 17:35:35 +00:00
7e488cd635
Remove unused avariable in PollServiceRequestManager
2011-11-07 23:24:13 +00:00
c7dd7b13a2
Convert SendKillObject to take a list of uint rather than sending one
...
packet per prim. More to come as we change to make use of this.
2011-11-06 20:38:07 +00:00
03f5bbcaf2
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 11:17:40 +00:00
e182cc198d
Fix avatar height, removes the hip offset hack
...
Author: Mana Janus <mana@mjm-labs.com>
2011-11-05 02:56:52 -07:00
6a96c9546d
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-26 17:48:51 +01:00
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
c275c22928
Restart the event queue worker threads that I accidentally disabled earlier today in 8a0a78c.
...
Also adds these to the watchdogs with very large timeouts (should really be infinite)
2011-10-25 23:26:21 +01:00
182908d216
In Watchdog, add ability to specific timeout for a thread.
...
This also changes the point of registration to the StartThread() call rather than the first Update()
2011-10-25 23:16:01 +01:00
e549f2f443
Add m_threads dictionary locking to Watchdog.GetThreads()
2011-10-25 22:51:23 +01:00
a4d4f54848
minor: add "threads show" as synonym for "show threads" for consistency
2011-10-25 20:59:27 +01:00
968cae6c17
Add "threads abort <thread-id>" simulator console command that allows us to abort a watchdog managed thread.
...
This is for diagnostic purposes.
2011-10-25 20:49:46 +01:00
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
...
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-25 20:24:21 +01:00
27aca49a1f
Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge
2011-10-25 03:26:51 +01:00
c8dfef1583
Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge
2011-10-25 03:26:44 +01:00
02f0aa592d
Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge
2011-10-25 03:19:10 +01:00
dc24ac4f20
Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge
2011-10-25 02:54:34 +01:00
353f0c0e03
Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-25 02:14:39 +01:00
f50538c81a
Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-10-25 01:55:01 +01:00
8841b77cd1
Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge
2011-10-25 01:53:53 +01:00
2895789bd0
Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge
2011-10-25 01:51:24 +01:00
9ceb98344a
Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge
2011-10-25 01:37:11 +01:00
e14cb45b9b
Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()
...
Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
2011-10-24 23:26:41 +01:00
9ec672c70b
Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler
...
Actually doing the tear down appear to have no ill effects with region crossing and teleport.
2011-10-24 23:16:03 +01:00
ffdf59a57c
Get UUIDGatherer to scan notecards in the graph for asset uuids.
...
This is to support npc baked texture saving in oars and iars.
May address http://opensimulator.org/mantis/view.php?id=5743
2011-10-22 02:16:46 +01:00
120114e96b
refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter without a getter
2011-10-17 20:50:29 +01:00
ddf54b5537
move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with the others
2011-10-15 03:03:05 +01:00
528cc8136e
fetch physical_prim switch from [Startup] config from inside scene, as is done for most other scene config params
2011-10-15 02:54:43 +01:00
3843efe478
Restore [Startup] physical_prim flag which can stop any prims being subject to physics
...
This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed.
Default for this flag is true as previously.
2011-10-15 02:42:43 +01:00
aa19ccf65c
refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it sends entity updates (including presence ones), not just prims.
2011-10-14 01:45:46 +01:00
631d5e16ef
Get rid of some traces of the old pre-ROBUST grid architecture config
2011-10-12 21:51:34 +01:00
2f6cc77154
Adjust CM version tag
2011-10-12 07:08:23 +01:00
336f6f7ec4
Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge
2011-10-12 07:07:37 +01:00
1b3ea64fe9
Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-11 23:21:36 +01:00
ef9a811ea6
Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
2011-10-11 23:17:47 +01:00
d1e681f682
Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2011-10-11 23:14:23 +01:00
5536cdf90c
Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
2011-10-11 23:01:52 +01:00
b40157fc9b
Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
2011-10-11 22:51:44 +01:00
652c59c0a9
Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge
2011-10-11 22:42:18 +01:00
a8747b3888
Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmerge
2011-10-11 21:41:30 +01:00
3ac15c03b2
Merge commit '923f2459cfa8106c6de52dc694c700ab07d8109b' into bigmerge
2011-10-11 21:32:14 +01:00
f8c06c6114
flip master version up to 0.7.3
2011-10-07 23:41:55 +01:00
34026887fe
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-03 23:26:52 +01:00
37ae6451f9
Remove vestigal RegionStatus.SlaveScene.
...
This appears to be code clutter since the code that uses this has long gone.
2011-10-03 23:25:09 +01:00
e77c919290
Remove usage of Linden packet types from inside Attachments Module and interface
2011-10-03 11:55:54 -07:00
e742cffe15
Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to allow attachments to be temporarily turned off.
...
This is for debugging purposes. Defaults to Attachments Enabled
2011-09-30 01:19:22 +01:00
39d7945efc
Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.
...
I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.
2011-09-24 01:59:02 +01:00
c8304b7f84
Fix avatar parameter updating for viewer 3 and maybe 2.
...
When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it.
Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated.
However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded.
This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place.
A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one.
This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made.
2011-09-23 02:59:33 +01:00
d358125cac
Reinstate option to land an npc when it reaches a target.
...
This is moved into ScenePresence for now as a general facility
2011-09-22 00:16:05 +01:00
903d5c02cb
Updated some variables to be closer to the coding standards (and easier to understand).
...
There were a few variables in LocalConsole with single character names, and the class fields did not use the m_ prefix.
I also removed a redundant variable, h. It was being set to 1 in a couple of places, and incremented in another, but never actually used.
2011-09-16 20:24:47 +01:00
923f2459cf
Passwords could be revealed in console by pressing backspace.
...
Pressing backspace causes hidden input (such as passwords) to be revealed on the console. The echo state was not being taken into account when handling a backspace key press.
2011-09-16 19:25:38 +01:00
5484c9b585
Bring us up to date.
2011-09-14 19:11:32 -07:00
306af9934a
In an object return message, send a null-terminated empty string in binary bucket to prevent a viewer 3 crash.
...
This is the message sent to the client when the object is returned.
We were sending byte[0] in the binary bucket. This didn't kill viewer 1 but did terminate viewer 3 (don't know about viewer 2).
So sending "\0" instead.
This is to address http://opensimulator.org/mantis/view.php?id=5683
2011-09-13 17:13:42 +01:00
dab6387bba
lock AvatarAppearance.m_attachments when we use it
...
This is partly to address http://opensimulator.org/mantis/view.php?id=5644 , though something more thorough is needed.
2011-09-12 21:05:26 +01:00
728fd0b1b8
lock attachments when enumerating through them in ScenePresence.CopyTo().
...
May have some effect on http://opensimulator.org/mantis/view.php?id=5644
2011-09-10 01:09:17 +01:00
b903d2ca96
In SetAttachment, if the existing attachment has no asset id then carry on rather than abort.
...
When a user logs in, the attachment item ids are pulled from persistence in the Avatars table. However,
the asset ids are not saved. When the avatar enters a simulator the attachments are set again. If
we simply perform an item check then the asset ids (which are now present) are never set, and NPC attachments
later fail unless the attachment is detached and reattached.
Hopefully resolves part of http://opensimulator.org/mantis/view.php?id=5653
2011-09-06 01:59:21 +01:00
0cb0140a1d
Stop the pointless double setting of every attachment in AvatarAppearance.
...
The second was already being filtered out so this has no user level effect
2011-09-06 00:29:37 +01:00
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
5c1fa968ab
Stop NPCs losing attachments when the source avatar takes them off.
...
This was happening because we were using the source avatar's item IDs in the clone appearance.
Switch to using the asset IDs of attachments instead for NPCs.
The InventoryAccessModule and AttachmentModule had to be changed to allow rezzing of an object without an associated inventory item.
Hopefully goes some way towards resolving http://opensimulator.org/mantis/view.php?id=5653
2011-09-03 01:11:16 +01:00
3aa86d22d1
If a FireAndForget thread terminates with an exception, then catch and log rather than letting it terminate the simulator.
...
Exceptions don't appear to do this with the SmartThreadPool but they do with UnsafeQueueUserWorkItem (and maybe others)
2011-08-31 17:38:32 +01:00
a90e1cf3aa
add Name property to ISceneEntity
2011-08-30 22:39:16 +01:00
1de68b34d9
refactor: migrate DropObject handling fully into AttachmentsModule from Scene
2011-08-30 22:25:38 +01:00
e7a515bab0
Fix bug where attachments were remaining on the avatar after being dropped.
...
If the inventory service is configured not to allow deletion then these will not disappear from inventory
2011-08-30 22:06:24 +01:00
18037d41c4
Move GetMeshKey from buried inside Meshmerizer to a public method on PrimitiveBaseShape
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-28 16:50:54 -04:00
d74686fd51
read m_rpcHandlersKeepAlive under appropriate lock
2011-08-22 02:25:58 +01:00
c587b0a3a3
oops, fix build break from last commit
2011-08-22 02:10:45 +01:00
9469c62098
improve locking of m_agentHandlers in BaseHttpServer
2011-08-22 02:07:51 +01:00
f9a367e2f6
improve locking of m_HTTPHandlers in BaseHttpServer
2011-08-22 01:59:40 +01:00
5a11cffd23
improve locking of m_streamHandlers in BaseHttpServer
2011-08-22 01:58:50 +01:00
20a4367827
remove necessity to catch a KeyNotFoundException in BaseHttpServer.RemoveLLSDHandler()
2011-08-22 01:58:19 +01:00
8254116dc6
improve locking of m_llsdHandlers in BaseHttpServer
2011-08-22 01:52:08 +01:00
2f1ac1d144
minor: remove mono compiler warning
2011-08-22 01:45:46 +01:00
94a8ab80c8
improve locking of m_rpcHandlers in BaseHttpServer
2011-08-22 01:43:34 +01:00
c1a34cd8da
Don't try to save changed attachment states when an NPC with attachments is removed from the scene.
...
This is done by introducing a PresenceType enum into ScenePresence which currently has two values, User and Npc.
This seems better than a SaveAttachments flag in terms of code comprehension, though I'm still slightly uneasy about introducing these semantics to core objects
2011-08-18 00:53:05 +01:00
57e54d84d6
Add new FireAndForgetMethod.None.
...
This executes the callback on the same thread that made the request. Designed for use only by regression tests that rely on a predicable event ordering.
2011-08-16 23:05:08 +01:00
5d6c9644fa
early code to allow scripts to force npcs not to fly when moving to target
...
this is to allow walking on prims. it will be up to the script writer to be sure that there is a continuous path.
currently implemented in osNpcMoveToTarget(), but none of this is final.
2011-08-10 01:47:37 +01:00
4cb8d6379d
Stop trying to deregister caps or close child agents when an NPC is removed
2011-08-10 00:59:31 +01:00
92e96d394a
When an NPC is created, stop telling neighbouring regions to expect a child agent
2011-08-09 23:11:07 +01:00
e869eeb0bf
Implement first draft functions for saving and loading NPC appearance from storage.
...
This works by serializing and deserializing NPC AvatarAppearance to a notecard in the prim inventory and making the required baked textures permanent.
By using notecards, we avoid lots of awkward, technical and user-unfriendly issues concerning retaining asset references and creating a new asset type.
Notecards also allow different appearances to be swapped and manipulated easily.
This also allows stored NPC appearances to work transparently with OARs/IARs since the UUID scan will pick up and store the necessary references from the notecard text.
This works in my basic test but is not at all ready for user use or bug reporting yet.
2011-08-09 03:51:34 +01:00
dad1d6df18
rename TestHelper => TestHelpers for consistency
2011-08-06 00:31:03 +01:00
2964467708
get rid of vestigal move to parameters
2011-08-03 22:11:05 +01:00
b6ac1c46cd
Get rid of AvatarAppearance.Owner to simplify the code.
...
This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
2011-08-02 00:13:04 +01:00
59f548cda8
Get osNpcCreate appearance working with avatars that are currently in the scene.
...
Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing).
Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing.
Extended TestCreate() to check this.
2011-08-01 23:41:29 +01:00
450bdb3657
In the packetpool, if we encounter a data block that somehow wasn't retrieved via GetDataBlock() then create a new stack instead of throwing an exception
2011-07-31 02:30:40 +01:00
9a5e0ede7c
For all Util.FireAndForget invocations, set thread to en_US before continuing wtih the invocation.
...
This is to avoid bugs where the locale is not manually set on the thread and bad data values get sent to the database or over the wire.
Lots of code does this manually but as we've seen, a subtle change can hit code which has forgotton to do this.
Since en_US show be used throughout the server at present, setting it at FireAndForget seems reasonable.
Arguably, it would be better to do this where data is sent, but doing it here is much easier.
All the manual BeginInvokes() remaining in the code should probably call FireAndForget instead.
2011-07-29 23:21:57 +01:00
4cdc8806fb
Fix LLTextBox to work with the updated libOMV
2011-07-23 11:40:38 +01:00
96174595da
Fix LLTextBox to work with the updated libOMV
2011-07-23 11:39:32 +01:00
504de8bc47
Pass the first name and last name from the agent circuit data to the authorization service rather than from the account.
...
This is to accomodate situations where the authorization service is being used by the hypergrid, where visitors have no user account.
See http://opensimulator.org/mantis/view.php?id=5517 , this code is somewhat adapted/cleaned up from Michelle's patch
I'm a little ambivalent about this since visitors could put anything in firstname/lastname so it's not much of an auth measure.
It's up to the auth service to decide which data it actually uses.
Possibly we should be passing through other info such as agent circuit ip
2011-07-23 03:48:53 +01:00
f0895028e9
Remove manually permissions settings on all current library items so that they use the defaults instead.
...
Some items had completely wrong permissions - this is easier than correcting them all.
The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts)
2011-07-23 02:13:11 +01:00
fcaa4f6012
Revert "Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default)."
...
There actually are uses for this. I will correct the perms instead since some entries appear to be wrong.
This reverts commit 667b54f5a2
2011-07-23 02:05:51 +01:00
667b54f5a2
Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default).
...
Library items always need the same permissions, so it doesn't make sense to load them from the xml files. This just opens the door to permissions mistakes.
2011-07-23 01:59:14 +01:00
705f70064e
Fix merge artefact
2011-07-22 12:38:08 +01:00
0e52010c0e
Thank you, Michelle Argus, for a patch that adds reading the agent limit
...
from XML properly.
2011-07-22 12:36:49 +01:00
6ac0bc7259
Thank you, Michelle Argus, for a patch that adds reading the agent limit
...
from XML properly.
2011-07-22 12:36:05 +01:00
f97278610c
Fixed updating avatar appearance
...
Signed-off-by: root <root@grid00001.t-data.com>
2011-07-21 20:13:32 +01:00
aec3b58a57
use standard sdk stack in terrain model rather than OpenSim.Framework.UndoStack.
...
remove OpenSim.Framework.UndoStack
2011-07-18 02:06:06 +01:00
3f8e571b78
Use a standard generic system stack for the undo/redo stacks instead of our own homebrew.
...
system stack also uses an array, so no performance penalty.
Also exposes undo count and adds a test assertion for correct undo count after resize
2011-07-18 02:01:12 +01:00
c7e8529122
minor: remove whitespace
2011-07-13 01:25:17 +01:00
0d64155bb5
Remove an unused 404 checker since on a 404, GetResponse() throws a WebException rather than proceeding.
2011-07-13 01:24:22 +01:00
938b4f8bf8
if a SynchronousRestObjectRequester request fails, then unless it's due to a 404, log the exception for diagnostic purposes
...
This is instead of logging "Invalid XML" for all failures, even if they weren't a result of invalid xml.
A default TReponse is returned in the event of a 404, which is the same behaviour as previously.
2011-07-13 01:19:12 +01:00
e434ba5e8e
Remove the obsoleted SynchronousRestObjectPoster
2011-07-13 00:52:32 +01:00
b59b1ff3d9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-07-10 18:16:09 +02:00
9c9b3e3976
Dammit, loggin the type of an exception without providing the FULL DUMP is NOT
...
going to help squash bugs!
2011-07-10 17:27:20 +02:00
c920ff9d1d
Merge branch 'master' into careminster-presence-refactor
2011-07-09 01:06:46 +01:00
d79c6c8820
Rename SetSculptData() to SetSculptProperties(), since this is what it does (setting SculptData is done through the property)
2011-07-09 00:42:48 +01:00
5e8900dfd0
minor: code tidy and inserted log lines for future use.
...
Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does
After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory
When phantom is toggled, the sculptdata is regenerated before remeshing.
But on resize, the sculptdata is not regenerated.
So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
2011-07-09 00:35:30 +01:00
c3d82bdcb1
When loading library asset set, only store an asset if it's different from an existing one with the same id.
...
We compare existing and loaded asset by doing an SHA1 on both, so that a changed library asset will still update the store.
This cuts asset library load time from 10 seconds to <1 sec.
Note, a fix on the previous commit revealed a bug where a library script cannot be copied except on the first login after a cache clear.
This is unrelated to this commit and needs to be fixed at some subsequent time.
2011-07-08 22:53:19 +01:00
b18ef976ff
Fix interpretation of physics mesh proxies from mesh data
...
As per http://wiki.secondlife.com/wiki/Mesh/Mesh_Asset_Format , some submesh blocks may just have the flag "NoGeometry" to signal that they provide no mesh data.
If a block contains this, ignore it for meshing purposes rather than suffer a ClassCastException
This fixes physics proxy meshing, so you can now walk through mesh doorways, properly stand on the trailer of mesh trucks, etc.
To get mesh physics proxy, the UseMeshiesPhysicsMesh must be true in a [Mesh] config section in OpenSim.ini (example in OpenSimDefaults.ini).
Convex hull physics not currently supported.
2011-07-08 19:43:22 +01:00
47cf9c8fe0
Merge branch 'master' into careminster-presence-refactor
2011-07-05 04:01:59 +01:00
46f5893d55
Add basic flotsam asset cache test for retrieved cached asset.
...
Disabled temporarily since file system caching disrupts subsequent test runs
2011-07-04 21:35:15 +01:00
fba961c63f
Make default serverside_object_permissions = true since this better matches user expectations.
...
It also matches the default setting in the OpenSim.ini.example file
2011-07-01 23:06:46 +01:00
e765759f50
If OpenSim has been built from a git tree, then include version information automatically by dereferencing .git/HEAD
...
A blank bin/.version file will stop this being displayed.
2011-07-01 22:48:00 +01:00
759e855566
refactor: rename gitCommitFileName to manualVersionFileName since bin/.version doesn't necessary have to be a git hash
2011-07-01 21:47:30 +01:00
9f72fbcb75
Add an async inventory details sender to respond to FetchInventory packets.
...
If a user with a very large inventory right-clicks on their "My Inventory" folder, viewer 1 code will send a massive number of Fetchinventory requests.
Even though each is handled asynchronously via a pool thread, the sheer frequency of requests overwhelms the pool and freezes inbound packet handling.
This change makes the first Fetchinventory thread also handle subsequent requests, freeing up the other threads.
Further efficiencies could be made by handling all the items in a particular FetchInventory request together, rather than separately.
2011-07-01 21:25:40 +01:00
f4f55c4d6b
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-06-20 03:08:56 +02:00
163ee82168
Add some flags to control content in search better
2011-06-20 02:29:09 +02:00
9b1d3f0c38
Merge branch 'master' into careminster-presence-refactor
2011-06-13 12:38:17 +01:00
fd57c91b4a
First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD.
2011-06-12 15:37:42 -07:00
a1c16a4200
Merge branch 'master' into careminster-presence-refactor
2011-06-11 12:08:02 +01:00
804fe2d9b0
Save the sun's position in OARs
2011-06-10 20:55:58 +01:00
326c46ba70
Merge branch 'master' into careminster-presence-refactor
2011-06-09 02:05:04 +01:00
e33cedfd42
HG Landmarks now working.
2011-06-03 10:26:58 -07:00
8129e64e2a
Fill in the new OwnerData field in the LLUDP ScriptDialog message.
...
If we don't do this then viewer 2.8 crashes.
Resolves http://opensimulator.org/mantis/view.php?id=5510
2011-05-31 19:25:01 +01:00
03525959c9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-05-26 03:42:45 -07:00
b000d9ba72
Some additional protection, it seems that responsedata needs to be locked, but I can't immediately see where it's being accessed from another thread. For now, this will protect the server
2011-05-26 03:42:01 -07:00
336665e035
More on HG Friends. Added Delete(string, string) across the board. Added security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.
2011-05-22 16:51:03 -07:00
be1996f121
Merge branch 'master' into careminster-presence-refactor
2011-05-22 20:23:25 +01:00
80457111e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-21 14:07:30 -07:00
bb9b317f15
Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Tests.Common instead
2011-05-21 01:05:20 +01:00
e62d1cc480
Merge branch 'master' into careminster-presence-refactor
2011-05-20 22:38:05 +01:00
d21e9c755f
HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
2011-05-19 16:54:46 -07:00
74dd619575
If a response cannot be obtained (the script has no handler) return a more friendly 500 error instead of crashing out with a null reference and letting the connection hang
2011-05-17 19:12:37 -07:00
a2f034c554
Changed yet more Warns to Debugs.
2011-05-14 13:36:55 -07:00
be6feff331
Also changed a couple of messages in WebUtil from Wanr/Info to Debug.
2011-05-14 13:09:59 -07:00
37a7b87862
Merge branch 'master' into careminster-presence-refactor
2011-05-14 21:09:52 +01:00
082a9ecd31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-14 12:57:34 -07:00
a3aa839d75
Stop spamming Nebadon's console when assets aren't found in the asset server.
2011-05-14 12:56:50 -07:00
340e3ccf16
refactor: remove thisObject argument from ILandObject.Get*MaxPrimCount() instance methods since it didn't make sense to use anything other than the instance themselves.
2011-05-14 02:42:47 +01:00
75d4956ee5
Merge branch 'master' into careminster-presence-refactor
2011-05-13 12:05:46 +01:00
e39dec6f37
Hopefully this fixes offline messages. The problem was: the server is not setting the ContentLength of the response. That comes up to OpenSim as ContentLength=-1, which made the existing test fail.
2011-05-12 20:48:24 -07:00
1cc70df3b4
One more thing printed out. #OfflineIM
2011-05-12 20:20:08 -07:00
301321c853
Instrument the heck out of offline messages. THIS IS VERY VERBOSE.
2011-05-12 19:56:59 -07:00
691283c44e
One more debug message for offline IMs.
2011-05-12 19:10:44 -07:00
9e310a0c0f
Sequencing the using and try clauses as they were before, but this shows that that obsolete function is not catching 404's as it should...
2011-05-12 18:53:22 -07:00
42bfab84b8
Bummer, can't print the data I wanted to see. Printing just the context.
2011-05-12 18:47:14 -07:00
f54a36bd59
Tracking a problem with offline IMs coming in as null list.
2011-05-12 17:34:26 -07:00
e9e4c009b4
This makes compression of fatpacks actually work. Previously they always failed. See comment in WebUtil.
2011-05-11 20:44:03 -07:00
1bd949614a
Merge branch 'master' into careminster-presence-refactor
2011-05-09 18:37:35 +01:00
c0a69bfaab
The map is seriously broken. This doesn't fix it, but at least provides one more piece of data that seems to be required -- agent flags, which seem to be different in Viewer 2. WARNING: changes IClientAPI.
2011-05-08 22:50:04 -07:00
00f10c900a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-05-08 16:51:41 -07:00
3a5e841b0b
Fix content-type to be application/x-www-form-urlencoded
2011-05-08 16:51:04 -07:00
66a5906548
Merge branch 'master' into careminster-presence-refactor
2011-05-09 01:04:55 +01:00
c8b9558039
Also compress the actual fatpacks
2011-05-08 23:52:31 +01:00
ade09d0fa1
Also compress the actual fatpacks
2011-05-08 23:23:33 +02:00
b451cc1ebb
Merge branch 'master' into careminster-presence-refactor
2011-05-08 20:23:06 +01:00
1be67914fa
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-05-08 20:20:40 +01:00
9688db2f68
Enable compressed (gzip) fatpack transfers.
2011-05-08 20:20:00 +01:00
763666e2d6
Enable compressed (gzip) fatpack transfers.
2011-05-08 19:50:35 +02:00
737add1683
Removed SimpleRegionInfo, which was obsolete and not used anywhere.
2011-05-06 17:02:46 -07:00
b140aef87a
refactor: simplify ConfigSettings
2011-05-06 22:51:36 +01:00
3d095e84d6
minor: remove mono compiler warnings
2011-05-06 22:45:03 +01:00
f5ec332474
remove obsolete [StandAlone] config section parsing, none of which was actually used since being superseded by the connector architecture in 0.7
2011-05-06 22:41:07 +01:00
8ca7938753
Adding ssl support
...
Adding ssl support for "Out of Band" applications such as the remote
admin module or Robust services
2011-05-05 19:56:54 -04:00
4beb0c9b9b
Merge branch 'master' into careminster-presence-refactor
2011-05-05 09:49:10 +01:00
af55eda16b
Merge branch 'master' into careminster-presence-refactor
2011-05-03 14:26:18 +01:00
2d403d5b18
Merge branch 'master' into caps
2011-05-02 11:56:51 -07:00
8cc547c277
Turns out that it's a bad idea to let Agent position updates linger for a long time on certain versions of mono. It's better to abort them if they take too long. So timeout is now an argument. Currently: 20secs for CreateAgent, 100secs for UpdateAgent (fat), 10 secs for UpdateAgent (Position); all of these divided by 4, for ReadWrite, as Mic had before.
2011-05-02 09:04:34 -07:00
f0bf64b6de
Merge branch 'master' into caps
2011-05-01 09:11:16 -07:00
d4323dd753
Increased Timeout to 30 secs.
2011-04-30 18:08:48 -07:00
91a604d4b6
Removed XXX Debug. Increased ReadWriteTimeout on ServiceOSDRequest, because it was _way_ too low and is probably making writes abort in the middle.
2011-04-30 17:40:21 -07:00
56df746133
XXX DEBUGGING!
2011-04-30 16:53:43 -07:00
3e79842312
Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll
2011-04-30 11:03:22 -07:00
27891fddcf
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-30 14:23:20 +02:00
d1cf1fe3d7
Merge branch 'master' into careminster-presence-refactor
2011-04-30 14:37:37 +01:00
98fe37051a
Set the attachment data on scripted rez to allow toasters to work.
2011-04-30 14:22:46 +02:00
9892e115cc
Fatpack message on agent transfers: 1 message only (UpdateAgent) containing the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service.
2011-04-28 20:19:54 -07:00
35f190cc92
One less [Serializable] -- ClientInfo.
2011-04-28 09:06:57 -07:00
549dc5aeb9
Eliminated sAgentCircuitData, a data structure that has been obsolete for quite some time.
2011-04-28 08:58:04 -07:00
a6c53b1ba2
Merge branch 'queuetest' into careminster-presence-refactor
2011-04-25 23:26:37 +01:00
9bf5e94b70
Merge branch 'master' into careminster-presence-refactor
2011-04-25 23:18:32 +01:00
1d7c83c39f
Merge branch 'master' into queuetest
2011-04-25 08:41:21 -07:00
507f0e9ffd
Upped VERSION_NUMBER in master to 0.7.2.
2011-04-24 16:21:01 -07:00
e2c6ed236d
Fix a bug looping through the priority queues. This should fix the problem
...
of not all prims being sent without reprioritization.
2011-04-23 12:17:10 -07:00
44e43d9d24
Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources.
2011-04-23 00:40:08 +01:00
d5256094d9
print invalid command message to the console, not the log
2011-04-23 00:16:55 +01:00
a3bd769cb3
Added a second immediate queue to be used for the BestAvatar policy
...
and currently used for all of an avatars attachments by the other
policies. Also changed the way items are pulled from the update queues
to bias close objects even more.
2011-04-22 14:55:23 -07:00
3534f4492a
Various clean ups. Removed some debugging code. Added a new "show pqueues"
...
command to look at the entity update priority queue. Added a "name" parameter
to show queues, show pqueues and show throttles to look at data for a specific
user.
2011-04-22 14:01:12 -07:00
204b8b7b7e
Merge branch 'queuetest' into careminster-presence-refactor
2011-04-21 16:51:39 +01:00
09b6d717bf
Merge branch 'master' into careminster-presence-refactor
2011-04-21 16:28:29 +01:00
371576d1dd
Merge branch 'master' into queuetest
2011-04-21 08:23:01 -07:00
7759bda833
Added an "immediate" queue to the priority queue. This is
...
per Melanie's very good suggestion. The immediate queue is
serviced completely before all others, making it a very good
place to put avatar updates & attachments.
Moved the priority queue out of the LLUDP directory and
into the framework. It is now a fairly general utility.
2011-04-20 21:58:49 -07:00
ccc26f7443
Get Viewer 2 voice working with OpenSim.
...
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
2011-04-20 01:02:40 +01:00
08d8a3e580
Requeue unacknowledged entity updates rather than resend then "as is".
...
Often, by the time the UDPServer realizes that an entity update packet
has not been acknowledged, there is a newer update for the same entity
already queued up or there is a higher priority update that should be
sent first. This patch eliminates 1:1 packet resends for unacked entity
update packets. Insteawd, unacked update packets are decomposed into the
original entity updates and those updates are placed back into the
priority queues based on their new priority but the original update
timestamp. This will generally place them at the head of the line to be
put back on the wire as a new outgoing packet but prevents the resend
queue from filling up with multiple stale updates for the same entity.
This new approach takes advantage of the UDP nature of the Linden protocol
in that the intent of a reliable update packet is that if it goes
unacknowledge, SOMETHING has to happen to get the update to the client.
We are simply making sure that we are resending current object state
rather than stale object state.
Additionally, this patch includes a generalized callback mechanism so
that any caller can specify their own method to call when a packet
expires without being acknowledged. We use this mechanism to requeue
update packets and otherwise use the UDPServer default method of just
putting expired packets in the resend queue.
2011-04-19 08:10:01 -07:00
d1913f2429
Merge branch 'master' into careminster-presence-refactor
2011-04-18 20:17:29 +01:00
452ae375f0
Merge branch 'master' into test-merge0418
2011-04-18 11:29:43 -07:00
dbf52b8cd1
Correct the delegate for classified deletes
2011-04-17 22:54:23 +01:00
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
70084c5e3a
More descriptive debug msg for ServiceOSDRequest failures.
2011-04-16 15:29:28 -07:00
b33aac737a
Fixed the update of items in the priority queue to enable both
...
types of property updates to be specified. Not sure if one form
of property update should supercede another. But for now the old
OpenSim behavior is preserved by sending both.
2011-04-13 15:37:25 -07:00
3fe22126ca
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-13 15:37:25 -07:00
7592a033df
Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
2011-04-12 20:24:28 -07:00
738daadace
Merge branch 'master' into careminster-presence-refactor
2011-04-08 04:16:29 +01:00
0ced677510
Revert master version number to 0.7.1 for now to make merging easier.
2011-04-07 23:22:19 +01:00
a6b1927cff
bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes branch now exists.
2011-04-06 22:05:07 +01:00
63533412f8
Improve previous ILandObject method doc.
...
For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs
2011-04-06 18:57:50 +01:00
fa202a05e9
Add method doc to some land bitmap methods in ILandObject.
...
Also changes prim count tests to use the correct upper region bounds, though the method actually ignores the overage.
2011-04-06 17:19:31 +01:00
407c2b1823
Merge branch 'master' into careminster-presence-refactor
2011-04-06 09:22:55 +01:00
2497962360
Change some text to make the autoreturn mechanism more obvious, and align with the fact that it's one word rather than two.
2011-04-05 22:25:00 +01:00
0e465da187
remove now unused individual LandData prim counts.
...
However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc.
This is probably why prim counts were being done there in the first place.
2011-04-05 21:25:54 +01:00
329fa73695
Merge branch 'master' into careminster-presence-refactor
2011-04-01 07:44:43 +01:00
88bd38690a
Remove unused RegionInfo.getInternalEndPointPort() in favour of RegionInfo.InternalEndPoint.Port
2011-03-31 23:03:42 +01:00
8022400bd4
Remove unused Datastore parameter from RegionInfo (legacy from early 2008)
2011-03-31 22:16:09 +01:00
83c78029e3
Make the login service's call to the sim time out quicker so we have a
...
chance to try fallback before the client quits
2011-03-31 15:48:42 +02:00
8b16f7d976
(re)implement selected prim count.
...
This does not currently count objects that are sat upon (which the viewer ui implies should be included in this count)
2011-03-30 00:13:07 +01:00
a62b435a39
Merge branch 'master' into careminster-presence-refactor
2011-03-27 21:41:54 +01:00
541cd3e8c8
move total parcel prim calculations into IPrimCounts instead of doing this in LLClientView
...
need to move selected prim counts from LandData/LMM still
2011-03-26 02:19:28 +00:00
3d0e072d50
Merge branch 'master' into primcounts
2011-03-26 00:57:52 +00:00
cc8897fceb
Add test for PCM taint. This currently fails due to unexpected behaviour of SceneGraph.ForEachSOG(). This will be corrected soon.
...
Also adds lots of temproarily debug logging
2011-03-26 00:34:49 +00:00
d8e1c380e6
minor: make it clearer in the log where we're loading region config files and not the regions themselves
2011-03-25 23:36:58 +00:00
3a55d59b45
in region web loader, print out url that config is being loaded from (this wasn't being done anywhere).
2011-03-25 23:29:06 +00:00
ea72745d43
Log the xml/ini regions config files that opensim loads from, and the regions that it loaded from them
...
This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc.
2011-03-25 23:18:47 +00:00
6ae04448f7
Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule.
...
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
2011-03-25 23:05:51 +00:00
c330f89fb1
Add some more fields to Estate settings and make them work.
...
Run alter table estate_settings add column AllowLandmark tinyint not null default 1, add column AllowParcelChanges tinyint not null default 1, add column AllowSetHome tinyint not null default 1;
to make this work.
2011-03-22 10:43:43 +01:00
3cfaf4c225
Adding a helper function lifted from Aurora. Not for core.
2011-03-22 09:29:40 +01:00
e4f143fb1c
Merge branch 'master' into careminster-presence-refactor
2011-03-21 07:57:56 +00:00
a3651eb5d0
Thanks Kevin Cozens for a patch that:
...
Fixes several spelling mistakes
2011-03-17 05:48:42 -04:00
aadd0e8d42
minor: bring comment into line with code reality
2011-03-16 00:14:58 +00:00
cee5e3e264
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 14:51:13 +00:00
f54ddd88a2
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 12:56:50 +01:00
9165a5207d
Merge branch 'master' into careminster-presence-refactor
2011-03-10 07:14:03 +00:00
9456bb77fb
Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
...
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
8a2360bf81
Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
2011-03-09 01:21:31 +00:00
9f85ee29ac
Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false
...
Implement test for ClearMediaEntry()
2011-03-05 02:18:03 +00:00
9be1d2aef1
Merge branch 'master' into careminster-presence-refactor
2011-02-24 02:37:21 +00:00
5a16fa882c
Parameterizes the view distance used to compute and manage
...
child agents in neighbor regions. This means you can extend
the view on a simulator beyond the default 3x3 regions.
This uses a region default draw distance and should be
replaced at some point by the avatar specified draw distance.
That will require more careful, dynamic recomputation of child
agents every time the draw distance changes.
WARNING: this is experimental and has known instabilities. specifically
all regions "within site" should be running the same default draw distance
or agents will not be closed correctly.
2011-02-22 13:23:54 -08:00
4834b47679
Merge branch 'master' into careminster-presence-refactor
2011-02-19 01:59:49 +00:00
60fe3d48ee
Put some CapabilitiesModule null checks in Scene
...
Stop tests setting up a capabilities module by default
2011-02-18 23:50:54 +00:00
c79f79fc84
Add needed dummy to sample money
2011-02-17 18:51:43 +01:00
fc84225038
XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386
2011-02-16 08:18:49 -08:00
ccd6e5d071
Merge branch 'master' into careminster-presence-refactor
2011-02-16 02:41:49 +00:00
19d3792278
Fix and simplify QBasedComparer.
...
Make parsing of qvalues independent from a system's language setting and ensure that the comparison adheres to a descending order.
2011-02-13 11:11:49 +01:00
076f2ac8db
Merge branch 'master' into careminster-presence-refactor
2011-02-07 23:07:36 +00:00
3889e68c54
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
2011-02-07 22:08:53 +00:00
cc81d924ca
Fixed Caps handlers leak
2011-02-05 19:34:02 -08:00
b20ab1063f
Added a couple of console commands to help diagnose issues:
...
show circuits: shows the lists of agent circuit data
show http-handlers: shows the currently registered http handlers
2011-02-05 17:57:30 -08:00
3a2a48a8ca
Add sane packing of ServiceURLs -- OSDMap. The old way (OSDArray) is still supported for backwards compatibility, but will be removed in the future.
2011-02-05 08:20:13 -08:00
722f0ba18c
Put something in the ImprovedInstantMessage.BinaryBucket for llInstantMessage() to stop this crashing viewer 2.4.0 (1.23.5 was fine with this).
...
We're putting in a string of format "<region name><x pos floor int><y pos floor int><z pos floor int> which appears to be the expected value.
This resolves http://opensimulator.org/mantis/view.php?id=5356
2011-02-04 23:07:47 +00:00
ba8826d2b8
Fix "set log level" to once again display current log level if it's not given a parameter
...
This addresses http://opensimulator.org/mantis/view.php?id=5345
2011-02-04 17:11:35 +00:00
8fdc810a23
Addresses mantis #5360 : CreatorData was being written as long as it wasn't null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information.
2011-02-03 04:07:36 -08:00
4a56038d11
Change the timeout on WebUtil to 20s to help make more tps succeed
2011-02-02 03:28:47 +01:00
5a0cb7d37e
Thank you, Goetz, for a patch to fix prim count display in cut regions.
2011-01-28 02:34:07 +00:00
3f200da878
Merge branch 'master' into careminster-presence-refactor
2011-01-28 02:36:20 +00:00
42c22f41dd
Merge branch 'master' into careminster-presence-refactor
2011-01-27 05:18:28 +00:00
3ecf712e4d
Add userFlags check to isBanned. This checks bans against DenyAnonymous and DenyMinors. Note that the ban doesn't actually work yet due to some stuff mel's working on .
2011-01-26 14:20:39 -08:00
a0469daf75
Implement command "land show". This shows all the parcels on the currently selected region/s
...
This is useful for diagnostics. The command is "land show" rather than "show land" because it's implemented as a module specific subcommand.
2011-01-26 21:12:41 +00:00
04c62c4959
Revert my previous SHA1 commit in favour of a better implementation
2011-01-26 12:54:12 -08:00
63dcd44e87
Provide an SL compatible llMD5String function across all platforms
2011-01-26 12:47:43 -08:00
c4727645b8
Removed a few more spurious appearance saves. When an avatar
...
enters a region the attachments module tries to update the
appearance with attachments that are already part of the appearance.
Just added a check to only save if the attachments weren't there
before.
2011-01-25 14:23:58 -08:00
105deab601
Merge branch 'master' into careminster-presence-refactor
2011-01-23 23:29:25 +00:00
cb14e1d272
Update the "config get <section> <key>" command to "config get [<section>] [<key>]"
...
The config get command shows a current config value on the console.
Now, if <key> is omitted then all the values for the given section are printed.
If <section> is ommitted then all sections and all keys are printed.
Current config can also be dumped to a file using "config save <path>". This can be handy for resolving or eliminating config issues
2011-01-21 23:59:55 +00:00
e44ceaaea3
make "show info" and "show version" show the same version text
2011-01-21 23:07:19 +00:00
43f948d691
add current console log level to "show info"
2011-01-21 23:05:53 +00:00
b0aebc6f3d
minor: make "show info" help slightly clearer
2011-01-20 21:41:48 +00:00
28fda1cab6
with mic's permission, reduce appearance, baked texture logging verbosity for now
2011-01-19 01:41:32 +00:00
a42faca5b9
With mic's permission, adjust long call time info messages to 500ms from 200ms
2011-01-19 01:13:10 +00:00
ddb5f4e44a
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 20:01:50 +00:00
3fc5b6a8ec
Merge branch 'master' into careminster-presence-refactor
2011-01-13 19:53:44 +00:00
69c8cc787f
Make FireAndForgetWrapper a singleton class
...
Made FireAndForgetWrapper a singleton class to allow us to drop
dependancy on the BclExtras35 library. BclExtras is broken in
Mono 2.8.2 and we used the library in only one function.
2011-01-13 19:52:34 +00:00
e4bb8dc385
Guard against invalid light color specifiers from the database
2011-01-13 00:19:39 +01:00
c271bbcc8a
Preserve the script running flag when copying an object.
2011-01-08 16:44:28 +01:00
de4eaab584
Merge branch 'master' into careminster-presence-refactor
2011-01-06 19:08:15 +00:00
984a9b4085
Added more performance checks to the HTTP server. Each request
...
coming through the WebUtil fns has a request id in the header
that can match the request to the actual work done by the service
2011-01-05 14:32:00 -08:00
e0da281e3d
Cleaned up debugging messages in the WebRequest handlers
2011-01-03 17:16:22 -08:00
df5e4a1e5b
Standardize the way WebRequests are made in the SimulationServiceConnector. Added
...
debugging calls for tracking performance of web requests.
2010-12-29 20:47:51 -08:00
3b50066ceb
Merge branch 'master' into careminster-presence-refactor
2010-12-30 01:40:38 +00:00
a32f80b9e3
Implement SendPlacesReply
2010-12-30 01:36:09 +00:00
2cb2bff9b2
Implement SendPlacesReply
2010-12-30 00:31:59 +01:00
b16173e3e8
Drop the static from default wearables. It isn't
...
static.
2010-12-27 12:43:54 -08:00
42d44c00f3
Change the mute list parts of the client interface so that all data is provided
...
to the module
2010-12-24 03:46:57 +01:00
2cc07de0ba
Merge branch 'master' into careminster-presence-refactor
2010-12-23 12:08:38 +00:00
46db73b62b
* Re-Adding Scene TimeDilation to Object Update Packets.
...
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05:00
cf37b3b943
Prevent a null ref when an avatar login doesn't go as planned
2010-12-22 03:25:30 +01:00
25ecd62b1f
* Adds AbortXfer to the ClientAPI mix
...
* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time.
* Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes.
* The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
2010-12-21 19:15:44 -05:00
e9382c2939
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:09:12 +00:00
b1180a53dd
Merge branch 'master' into careminster-presence-refactor
2010-12-21 20:56:37 +00:00
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -08:00
b32dcc6913
Fix notecards that end with an embedded object causing an exception
2010-12-17 22:50:00 +00:00
d7622cbedc
Fix notecards that end with an embedded object causing an exception
2010-12-16 21:01:38 +01:00
9bd7f3b03a
Revamp the viewer -> banlist packet processing so fix a number of bugs.
...
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:35:56 +00:00
6b374fa547
Revamp the viewer -> banlist packet processing so fix a number of bugs.
...
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:19:52 +01:00
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
7fef89847c
Merge branch 'master' into careminster-presence-refactor
2010-12-09 02:24:12 +00:00
1070cffcf9
Added ability for GetTexture to serve multiple formats. The format may come as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
2010-12-08 18:53:15 -08:00
549f90c5b5
Update calling card interface
2010-12-07 04:45:28 +01:00
a4f7937eb3
Add the interface needed to revive calling cards
2010-12-07 03:08:48 +01:00
b325721d6f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 01:07:57 +01:00
b1a5c03985
Lock the attachments dict so it doesn't get out of sync when iterating
2010-12-06 17:40:07 +01:00
45314c6622
Merge branch 'master' into careminster-presence-refactor
2010-12-06 02:54:51 +00:00
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
835103af82
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-04 21:50:48 +00:00
9b9ce8fb27
add more detail to the log in case of FORM Timeout
...
cause nothing relevant are in the services logs
2010-12-04 21:40:18 +00:00
24af7b8384
Merge branch 'master' into careminster-presence-refactor
2010-12-04 00:09:32 +00:00
df860516bf
Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
...
Cleaned up (and added) debugging.
2010-12-03 23:45:00 +00:00
342dc532ec
Merge branch 'master' into careminster-presence-refactor
...
Also prevent god takes from ending up in Lost and Found
2010-12-03 02:36:13 +00:00
7d24dbca3c
Added some comments. Better than listening to the boring speaker...
2010-12-01 16:01:22 -08:00
ab2adaf341
Various bug fixes for appearance handling
2010-11-30 16:20:43 +01:00
f3835fe15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-29 09:58:20 -08:00
49b59fffee
Fix unit test.
2010-11-29 09:57:41 -08:00
f86c438653
Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
2010-11-29 08:43:33 -08:00
ca8d015733
Changed the parser for InventoryItem deserialization. Moved some utility functions around.
2010-11-27 11:40:54 -08:00
2412b3cb4a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-27 13:07:23 +01:00
0b41606e73
Instrument TI Dictionary to finally find that pesky script-caused deadlock
2010-11-27 13:02:51 +01:00
541a7660e0
Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login.
...
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
2010-11-27 01:14:36 +00:00
e05f728b08
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:08:12 +00:00
0bc5ffbe96
Fix handling of landmarks for systems with culture settings other than en_US. This fixes Mantis #5177 .
2010-11-26 11:50:51 +01:00
57c4def254
Change all restarting to use the restart module. Remove hardcoded behavior
2010-11-25 03:16:52 +00:00
6c3eb21440
Merge branch 'master' into careminster-presence-refactor
2010-11-25 03:27:35 +00:00
b3a71c6df1
Prevent an overlength button label from producing a debug dump and aborting
...
the script.
2010-11-24 18:56:25 +01:00
bc51dfc45e
Merge branch 'master-core' into mantis5110
2010-11-23 22:27:54 -08:00
6557d5f359
Merge branch 'master' into careminster-presence-refactor
2010-11-23 14:05:09 +00:00
2527aeb40c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-23 14:03:52 +00:00
61a49ec4a8
Initialize InventoryItemBase.creatorData properly. Could throw.
2010-11-23 06:36:57 -08:00
7796b90ebb
Fix some crashes caused by the addition of the CreatorData column
2010-11-23 14:02:06 +00:00
571becefb6
Fix some crashes caused by the addition of the CreatorData column
2010-11-22 23:31:29 +01:00
b7f5e82843
Merge branch 'master-core' into mantis5110
2010-11-21 20:01:48 -08:00
562147475c
Merge https://github.com/opensim/opensim into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
c617d658dd
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
...
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
22ff06ba17
Merge branch 'master' into careminster-presence-refactor
2010-11-22 01:09:26 +00:00
164007dd00
Merge branch 'master' into careminster-presence-refactor
2010-11-18 19:06:09 +00:00
859234f963
small refactor: reuse existing commandLine string rather than calling cmdline.ToString() again
2010-11-17 23:50:23 +00:00
c072a9cfb3
save all lines to history, not just those which turn out to be valid comands. does not store passwords
...
also, blank lines are not stored to history
this makes it easier to go back and correct a command which was simply mistyped rather than having to type it out again
2010-11-17 23:34:39 +00:00
e6eeaaea67
minor: add some method comments
2010-11-17 22:55:06 +00:00
7bb005b0d1
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 21:01:56 +00:00
4f15b8d4e6
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 20:44:39 +01:00
ee85a530f6
Merge branch 'master' into careminster-presence-refactor
2010-11-09 22:16:48 +00:00
ccfbce3176
Remove "OpenSimulator" from startup message
2010-11-09 16:07:43 +01:00
09ea73f7cc
Change "OpenSim" to "Careminster" and remove CM suffix.
2010-11-09 15:33:03 +01:00
ae9c4a4d11
Formatting cleanup.
2010-11-08 07:48:35 -05:00
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
f985775962
Revert "Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready."
...
This reverts commit 91b1d17e5b
2010-11-05 14:27:14 +01:00
5f8ab9f018
Merge branch 'master' into careminster-presence-refactor
2010-11-03 02:34:36 +00:00
4ab9d37a8e
When LightShare is enabled, the standard day cycle is bypassed and replaced by
...
midday defaults when no specific LightShare profile is set.
This prevents LightShare info being send out when the region has no LightShare
profile, allowing normal day/night cycles to happen.
2010-11-03 02:04:17 +00:00
1f77f05f02
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:12:48 +00:00
d5d0e81df2
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:09:38 +00:00
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +00:00
43ac44b028
Fix default club feet
2010-11-02 21:41:27 +00:00
4fdab71c8d
Add support for cross-domain AJAX requests to REST console.
...
Enables RemoteConsole to add the appropriate HTTP header when responding to requests that use Cross-Origin Resource Sharing (CORS with simple requests). The allowed origin is set with configuration option "ConsoleAllowedOrigin" in section [Network]. For a suggestion to make this configuration option more flexible, see the TODO comment in the source code.
The WifiConsole uses this functionality with grid mode.
2010-11-02 14:12:25 -07:00
4d1f0c5348
Support for CORS with simple requests in BaseHttpServer
2010-11-02 14:11:49 -07:00
63ffdcf53a
Try to not make avatars switch outfits
2010-11-02 19:55:05 +00:00
95a0ea78f9
Merge branch 'master' into mantis5110
2010-10-30 18:28:07 -04:00
96a29c43b0
Merge branch 'master' into mantis5110
2010-10-30 14:11:02 -04:00
e371d3208c
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2010-10-30 14:10:13 -04:00
e98d8d500f
Fix logins and avatar appearance. Contains a Migration. May contain nuts.
...
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
2010-10-30 19:06:47 +01:00
9e7d3e0f25
Merge branch 'master' into mantis5110
2010-10-29 23:59:16 -04:00
c8d65c359f
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:58:14 -04:00
d219317074
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:12:51 -04:00
d0895a4a3a
On first login, Ruth is back now. Strangely, inventory items are created for
...
tattoo and alpha layers. Any change of appearance in the sim makes the green
gnome reappear on next login. Progress of sorts.
2010-10-30 03:28:59 +01:00
adef6b04cb
Logins work now, but avatars are green ugly gnomes.
2010-10-30 02:52:59 +01:00
ff7da2082d
This commit fixes all the appearance related null refs. Still can't log in,
...
client displays a blank error box.
2010-10-30 02:25:25 +01:00
7503c4ad61
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:42 +01:00
818ed2032a
READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
...
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
2010-10-30 00:41:36 +01:00
e66ec432af
Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic
2010-10-29 23:45:10 +01:00
69c1e0b2f7
Merge branch 'master' into careminster-presence-refactor
2010-10-29 21:22:35 +01:00
934e536738
Merge commit 'cmickeyb/dev-appearance'
2010-10-29 21:06:46 +01:00
f5c9a56c8b
Bunch of fixes that reduce the number of times appearance
...
and avatar data are sent. And the number of times they
are stored.
2010-10-29 13:43:35 -07:00
5f4badf9e2
Add my work on top of cmickeyb's
2010-10-29 20:44:29 +01:00
05d2302c62
Merge branch 'dev-appearance'
2010-10-29 20:24:14 +01:00
e6fe83cd93
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This work conflicts with cmickeyb's more extensive, related work
This reverts commit 9c829c0410
2010-10-29 20:17:59 +01:00
840b75ca9b
Add my work on top of cmickeyb's
2010-10-29 20:48:37 +02:00
9331898c32
Merge branch 'master' into careminster-presence-refactor
2010-10-29 20:40:48 +01:00
3231602b88
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This reverts commit e6a8d2872c
2010-10-29 20:34:53 +02:00
9c829c0410
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:58:22 +01:00
e6a8d2872c
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:59:53 +02:00
68666efd25
Configuration of persistent baked textures and save/send delays.
2010-10-28 12:00:04 -07:00
f2c1d0e34f
Merge branch 'opensim-master' into dev-appearance
2010-10-28 09:09:42 -07:00
0f28fa400d
Added background thread to handle delayed send and save of appearance
...
to accommodate batching of the many updates that happen on login
and teleport.
Fixed handling of the serial property in appearance.
2010-10-28 09:00:39 -07:00
9cfd3e1d5a
Small cleanup and add more debugging information
2010-10-26 12:54:28 -07:00
6e58c3d563
Half of the compatibility is working. Login into a new region with
...
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
2010-10-25 14:11:47 -07:00
657cceb884
Intermediate commit for backward compatability; does not compile yet
2010-10-25 09:42:28 -07:00
7f74dc1b14
Merge branch 'master' into careminster-presence-refactor
2010-10-23 00:21:42 +01:00
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e8f34e46d74
2010-10-22 23:52:07 +01:00
38e76d71ac
Merge branch 'hg16' into mantis5110
2010-10-22 18:34:50 -04:00
6d7ce63085
Allow OARs and IARs to save and load meshes.
...
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem. Needs more investigation.
2010-10-22 18:33:55 -04:00
267f18925d
First attempt to get multiple attachments working to support viewer2.
...
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
2010-10-21 16:48:58 -07:00
08e14d653e
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
2010-10-21 17:09:42 +01:00
fc33d569cd
Merge branch 'master' into careminster-presence-refactor
2010-10-21 07:33:01 +01:00
017b83d0a3
* remove some spurious debug info
...
* The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it.
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-20 22:36:29 -04:00
58f75fa19d
* more url / hg cleanup
2010-10-20 22:21:45 -04:00
55974df14b
* refactor refactor refactor ServerURI 4 lyfe
2010-10-20 22:21:23 -04:00
b1c8d05888
Major refactoring of appearance handling.
...
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.
AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.
AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.
AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
2010-10-20 16:17:54 -07:00
94684a2251
* remove some spurious debug info
2010-10-20 02:36:59 -04:00
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
2010-10-18 20:30:46 +01:00
4e4fb93fae
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-17 18:45:25 -04:00
06b61b68c7
Adding osFunctions for light projection
...
Set the projection parameters in the host prim ...
osSetProjectionParam(bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Set the projection parameters in a target prim ...
osSetProjectionParam(ikey target uuid,
bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Threat Level very high
Signed-off-by: Melanie <melanie@t-data.com>
2010-10-17 09:52:12 +01:00
9e421868e3
Add missing check for !_projectionEntry
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-16 20:59:18 -04:00
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01:00
dd1058e6b3
Adding projected light filters to prim propeties
...
Requires the LL Mesh Beta viewer
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 09:46:49 -04:00
7e363b79c7
* Tweaked the upload response and now at least uploading the mesh works.
...
* Binary error on downloading the mesh though.. so still not yet working.
2010-10-14 09:24:15 -04:00
6ac6ca057d
Kill some magic numbers in the caps module
2010-10-14 07:28:20 +01:00
3384f643eb
* Partially complete stuff for Mesh support that Melanie wanted to see before it was done.
...
* Shouldn't break the build.
* Doesn't work yet either.
2010-10-14 02:19:42 -04:00
537905d81b
Add a setter to OldItemID so it can be deserialized
2010-10-13 19:45:55 +01:00
a2167b0f0d
* more url / hg cleanup
2010-10-11 16:53:00 -04:00
2654ab6300
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-10 18:06:27 -04:00
231feab57f
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2010-10-09 01:07:41 +01:00
ed161020e2
minor: remove some mono compiler warnings
2010-10-09 01:46:29 +01:00
211ea5d521
Limit formatting of local console output to actual logging messages.
...
The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level.
This fixes the issue of colons being added to help texts on the local console.
2010-10-09 00:47:39 +01:00
52dd547863
Make SendKillObject send multiple localIDs in one packet. This avoids the
...
halting visual behavior of large group deletes and eliminates the packet flood
2010-10-08 11:31:52 +02:00
8f1acb890a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 14:17:18 -04:00
da6816c805
Merge branch 'master' into careminster-presence-refactor
2010-10-04 04:49:54 +01:00
0772e19af2
Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there.
2010-10-03 20:01:59 -07:00
e3099d48f9
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-03 18:04:38 -04:00
5910be236f
Merge branch 'master' into careminster-presence-refactor
2010-10-03 16:52:27 +01:00
0b13cfa4dd
Port ExecutingDirectory from omfOS Util class.
2010-10-03 16:50:50 +01:00
32ccc7a9d9
* refactor refactor refactor ServerURI 4 lyfe
2010-10-02 19:17:02 -04:00
33bd4fe789
When clearing the addin registry, respect a custom path
2010-09-24 22:00:51 +02:00
41847e8fdf
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-21 04:03:40 +01:00
9feef34a81
Merge branch 'master' into careminster-presence-refactor
2010-09-21 04:03:14 +01:00
9cf8795ecf
Fix a merge artefact that broke script state persistence in XAttachments
2010-09-19 22:53:05 +02:00
27d5976b87
* Tweaked the LocationTests for maximum coverage.
...
* Added more mundane tests.
2010-09-18 03:42:37 -04:00
c203fae26b
* Covered the type converters in SLUtil with unit tests.
...
* Does anyone have an example raw notecard to look at and test the notecard parser?
2010-09-18 02:49:42 -04:00
4d83879704
* More Mundane Tests
...
* SL Util tests of AssetType2ContentType and ContentType2AssetType
2010-09-17 23:27:41 -04:00
cd42cdcc89
REST Console delivers responses with content type text/xml instead of text/plain.
...
Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload.
2010-09-18 02:24:04 +01:00
2501372d3b
Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurliman
...
Though this is actually thread-safe on .net 4.0 and mono today, the .net sdk states that Dictionary instance members are not guaranteed thread-safe
2010-09-18 01:57:13 +01:00
4327c795f8
Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
...
I'm assuming the lowercase tests was a mistake. Please revert if it actually wasn't
2010-09-18 00:25:22 +01:00
94f35890e7
* Fixed and re-enabled CacheTests
...
* Added MundaneFrameworkTests.cs for the really mundane tests like testing properties,constructors, etc in OpenSim.Framework.
* Fixed LeftAxis and UpAxis unpacking from OSD to AgentPosition (copy and paste error caught while writing mundane test) (Good thing nobody uses the camera frustum from remote regions yet)
2010-09-17 18:41:12 -04:00
bdd4dcf69b
Merge branch 'master' into careminster-presence-refactor
2010-09-17 22:12:48 +01:00
69749b81f9
* Add a few more tests to help our meager code coverage %.
...
* Tests Animation Constructors
* Tests Animation OSD Packing/Unpacking
* Tests the PrimeNumberHelper class which is used in the cache.
2010-09-17 03:11:57 -04:00
7df4383235
Merge branch 'master' into careminster-presence-refactor
...
Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
2010-09-17 03:49:30 +01:00
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
8ed08a10d9
Remove long unused Region/Framework/ThreadTracker
...
All methods had already been deleted, only GetThreads() was left
2010-09-14 22:34:55 +01:00
609375bf37
Fix "show threads" to show threads now being managed by OpenSim.Framework.Watchdog
2010-09-14 22:24:11 +01:00
356b1ef1d9
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:16:02 +01:00
1212cb0c74
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:03:42 +01:00
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
c03b24cbfd
Merged
2010-09-12 14:21:51 -07:00
0db1ed0b5a
* Added ISimulationDataService and IEstateDataService
...
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
20cd1da6bf
Add copyright headers.
2010-09-12 12:54:31 -04:00
30306a775a
Made it impossible to create a user with names containing spaces and prevented passwords from being echoed after enter is pressed.
2010-09-10 23:19:18 +01:00
a7f4e10f42
Remove parenthesis around the release flavour to get the version string back under 27 chars
...
Can't quite remember why this has to be <=27 chars, maybe something to do with the space available for the version string in a typical client
2010-09-10 21:56:04 +01:00
b8d14fcc4a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 01:05:56 +01:00
9be1c0ff44
* Cache null account responses in the SimianUserAccountServiceConnector to avoid repeated requests for missing avatar IDs
...
* Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
2010-09-07 14:41:13 -07:00
f7b28dd321
If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well
2010-09-07 03:41:29 +01:00
06adbc1324
Revert "Workaround for mono bug #312968"
...
This reverts commit f2e343d530
2010-09-06 17:24:10 +02:00
f2e343d530
Workaround for mono bug #312968
2010-09-06 14:09:46 +02:00
09c75b30f3
Fix build break
2010-09-05 16:45:24 +01:00
e4c2b44e5c
Merge branch 'master' into careminster-presence-refactor
2010-09-05 15:06:00 +01:00
6a0a878f7c
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:28:33 +01:00
e593607171
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:16:42 +02:00
9fd9836841
Make User Agent Service and Login Service separable.
2010-09-04 16:39:03 -07:00
8fc68c6d98
Added XFF header processing. Untested, for lack of proxy.
2010-09-03 17:18:53 -07:00
b8da15c104
In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod rather than an older XML one
...
This is a patch from http://opensimulator.org/mantis/view.php?id=4973 . Thanks randomhuman
2010-09-03 22:38:40 +01:00
4e0d6e8e41
Merge branch 'master' into careminster-presence-refactor
2010-09-03 03:37:18 +01:00
7128e1a4ba
Implement UploadBakedTexture cap
2010-09-02 16:20:44 +01:00
0f40ec5c65
Implement UploadBakedTexture cap
2010-09-02 16:10:44 +02:00
7b03cb09e4
minor: Add some method doc to BaseHttpServer.HandleRequest()
2010-08-30 22:33:45 +01:00
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
0a83fde85c
Implements parcel media setting persistence and packet / CAPS handling
...
properly for the new media settings.
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-30 02:07:55 +01:00
75e2a2b3ce
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:19:55 +01:00
739eb14741
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:18:15 +01:00
1096f43f0d
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:34:39 +02:00
1bcb2e788f
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:04:12 +02:00
483fc88b07
Merge branch 'master' into careminster-presence-refactor
2010-08-24 17:37:11 +01:00
de85aabcbe
Plumb the region type through to the ProductName field in estate messages
2010-08-24 12:41:21 +01:00
1bfec00a88
Merge branch 'master' into careminster-presence-refactor
2010-08-23 23:55:15 +01:00
f445659dd3
Finally putting estate_settings.xml to rest. There will be no more attempts
...
to read or write this file.
2010-08-21 17:38:47 +01:00
f8ff98577e
Merge branch 'master' into careminster-presence-refactor
2010-08-21 00:32:26 +01:00
5155915de1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-20 19:36:04 +01:00
7aad5af498
Some code cleanup for console command "create region".
...
Make region name an optional command parameter.
Avoid question for region name if it has already been specified.
Extend help text.
2010-08-20 19:35:52 +01:00
f347d25675
Unit test breakage fix.
2010-08-20 11:09:02 -07:00
a39ea07158
Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
2010-08-19 19:54:40 -07:00
1955b79759
Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer.
2010-08-19 18:55:30 -07:00
2b172bef72
Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943."
...
Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way.
This reverts commit e47608fc62
2010-08-19 09:14:20 -07:00
e47608fc62
One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943 .
...
(Files .xml and .txt also want to be committed)
2010-08-18 16:22:50 -07:00
e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
a8b80ef800
Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files affected.
2010-08-16 11:39:46 -07:00
77de28965a
Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
2010-08-16 11:33:59 -07:00
d806741e9d
* Cleaned up the magic UUID definitions in AvatarWearable.cs
2010-08-13 17:39:45 -07:00
fb14390fb0
Note to self: don't break the build
2010-08-10 09:17:30 -07:00
1ead2ed5ee
Add a stack trace to the error output on the recursive read lock warning on my RWlocks. Whilst recursive locks are safe, coupled with other issues we're experiencing with the TaskInventoryDictionary it implies that somewhere the lock is not being freed possibly due to a merge error somewhere, and thus it needs to be looked into.
2010-08-10 09:07:17 -07:00
8fd3f6cf7f
Merge branch 'master' into careminster-presence-refactor
2010-08-07 05:41:41 +01:00
a04efe4a4d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-07 05:39:20 +01:00
00fd2e0446
Correct display of landmark about info. Also correct region maturity rating
...
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
2010-08-07 05:33:49 +01:00
c554de7501
Correct display of landmark about info. Also correct region maturity rating
...
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
2010-08-07 05:45:52 +02:00
85d7d0583e
Fix XStats formatting:
...
Recent libomv update broke the json serialization for
XStats. This uses String.Format to convert all data to
strings with fixed decimal (2 places ), or integer formats
as appropriate.
2010-08-06 23:27:57 +01:00
f9f776e407
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 11:44:57 -07:00
330343505c
Implement CreateNewOutfitAttachments. This addresses mantis #199 .
2010-08-06 11:39:10 -07:00
2369063640
HACK ALERT! There's some underlying bug in the HTTP server that makes requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in.
2010-08-06 10:59:19 -07:00
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
1270727c96
Merge branch 'moap'
2010-08-06 18:29:30 +01:00
a133acbd5f
Merge branch 'iar-merge'
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
2010-08-04 20:56:52 +01:00
757929012e
Merge branch 'master' into careminster-presence-refactor
2010-08-04 01:11:47 +01:00
71cd4d6e84
Revert "remove long unused OpenSim/Framework/Configuration/* projects"
...
This reverts commit cdd3f17b2b
2010-08-04 01:10:01 +01:00
6e3c79f31e
don't mask current time reads (since we don't mask the corresponding subtract)
...
if you mask the reads you have to mask the subtract as well.
simplest is just don't mask any of it.
2010-08-03 20:09:00 +00:00
f04d51378f
Drop the RestClient timeout from 15 minutes to 30 seconds. This does not address the problem, but it will allow the regions to recover in the event that the remote server goes away.
2010-08-03 11:06:41 -07:00
99c0f4c9c7
Simplify serialized version string. Change element capitalization for consistency
...
THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database.
This commit also improves locking for manipulation of media entries.
2010-08-03 17:09:20 +01:00
9d8a67fe13
get rid of PrimitiveBaseShape.MediaRaw staging post
...
using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
2010-08-03 16:26:27 +01:00
ac07d853b8
remove duplicated serialization code
2010-08-03 15:58:17 +01:00
60df76314f
serialize media textures to inventory with a largely osd representation rather than .net auto-serialization
...
THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases.
This makes media textures serialized in the same way, which is probably better in the long term.
2010-08-03 15:45:49 +01:00
3302e8ddc4
Merge branch 'master' into careminster-presence-refactor
2010-07-31 00:57:50 +01:00
86bc25b84f
Slight improvement on previous commit.
2010-07-30 14:27:53 -07:00
f3fa10fa15
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-07-30 14:04:29 -07:00
8ab7d80b09
Changed the way HG client verification is done: now transforming local and LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
2010-07-30 14:04:13 -07:00
cdd3f17b2b
remove long unused OpenSim/Framework/Configuration/* projects
2010-07-30 20:19:46 +01:00
68b1d6f0af
Remove unused ILoginServiceToRegionsConnector
2010-07-30 20:02:00 +01:00
315b065bce
Remove unused LLFileTransfer
2010-07-30 19:58:29 +01:00
ce358db159
remove long superseded HGNetworkServersInfo
2010-07-30 19:54:27 +01:00
4596c78073
remove unused FriendRegionInfo
2010-07-30 19:50:47 +01:00
c7652d287b
remove now unused GridConfig, MessageServerConfig, UserConfig
2010-07-30 19:44:39 +01:00
f393e10ea4
remove unused ACL class
2010-07-30 19:34:55 +01:00
550c3572a1
* Tweaked WebUtil.PostToService() to help debug an object disposed exception
2010-07-29 14:39:08 -07:00
7a9e246ccd
Merge branch 'master' into careminster-presence-refactor
2010-07-29 16:20:59 +01:00
a349703279
comment out further debug line in BaseHttpServer
2010-07-27 22:51:57 +01:00
412fed975f
relocate serialization code from SQLiteRegionData to MoapModule using load and save events.
...
This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future.
Remaining non-modularity:
PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer.
The database also needs to know about MediaRaw though not about Media.
IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
2010-07-26 23:34:23 +01:00
a5ad792e6c
implement llSetPrimMediaParams()
...
Untested
2010-07-26 23:34:19 +01:00
acac47830e
start storing incoming MediaEntry on a new Media field on PrimitiveBaseShape
...
This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost
Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
2010-07-26 23:34:18 +01:00
701f39c8c2
do a whole load of crappy hacking to get cubes to display google.com
...
currently, for smoe reason the page only appears when you click a face.
also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason
you can still change the url and normal navigation will work again
2010-07-26 23:34:17 +01:00
0c0ac65d38
Added ': ' to password prompt. Mantis #4851
2010-07-22 04:00:24 -07:00
d1040c9ff9
Replace the screenful of code i deleted.
2010-07-17 02:46:04 +02:00
e06b7ee368
Make webloading more robust by addign retries
2010-07-17 02:38:00 +02:00
e1ea82b329
Major attachments cleanup. Remove unused AttachObject ClientView method
...
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:51:12 +01:00
a7b5fe6a88
Remove useless quaternion parameter from AttachObject sig
2010-07-14 19:49:54 +01:00
bebbe407ee
Major attachments cleanup. Remove unused AttachObject ClientView method
...
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:58:23 +02:00
0c445239a6
Remove useless quaternion parameter from AttachObject sig
2010-07-14 19:21:01 +02:00
26621ca500
Add scripted controllers into agent intersim messaging
2010-07-11 14:50:14 +01:00
7f0f11304f
Add scripted controllers into agent intersim messaging
2010-07-11 14:26:57 +02:00
cea856cfc2
Fix the synchronousrestformsrequester so it will successfully handle a response from a server which does not provide a valid content length header
2010-07-10 19:00:12 -07:00
cecd660388
Fix an issue where the SynchronousRestObjectRequester will fail if a webserver does not report a content length (-1), but the content is still valid
2010-07-10 18:48:49 -07:00
5f400a50be
Merge branch 'master' into careminster-presence-refactor
2010-07-08 17:32:57 +01:00
baebefeb05
Handle a specific exception without spewing red ink.
2010-07-08 16:30:36 +01:00
5b68343361
The majority of the Undo fix. There is still an issue with Rotation which i'll address next; however position undo and scale undo should be working just fine now. Also removed some residual debug logging.
2010-07-04 19:28:39 -07:00
7665013ad8
Correct positioning of timeout modifier in the SynchronousRestObjectRequester
2010-07-04 19:25:54 -07:00
e4739523d3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-03 06:11:46 -07:00
39ae1def85
Re-implement the Undo stack as a List; the old implementation was buggy
2010-07-03 06:10:02 -07:00
3d495b709e
Implement a timeout value in the SynchronousRestObjectRequester. Default is 100 seconds.
2010-07-03 06:08:18 -07:00
e15f6905a5
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:13:58 +01:00
c87e6a289c
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:20:36 +02:00
fda9d7b75e
Remove GetEconomyData and the economy data structure (unused)
2010-07-02 04:45:03 +01:00
beb5259cd1
Remove GetEconomyData and the economy data structure (unused)
2010-07-02 04:51:31 +02:00
3d5d44279b
ANother stab at LSL compatibility
2010-07-01 17:06:29 +02:00
9012084d11
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-29 23:19:08 -07:00
8dc7c0849e
The other half of the asset fix. Implement an exponentially incrementing retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets.
2010-06-29 23:18:48 -07:00
5925aac859
Add --merge switch to load iar.
...
When this switch is used, iar folders are merged with existing same-name user inventory folders.
This makes it a little easier to back and restore entire individual user inventories, among other things
Added unit test to check behaviour
2010-06-30 00:10:44 +01:00
6f4d4543b9
Make newly created prims be named "Object" and make newly created scripts
...
have a default touch handler. Compatibility patch
2010-06-29 03:51:16 +02:00
49272657d7
Make RegionLightShareData serializable
2010-06-26 15:30:47 -07:00
c7e7cb04a3
fix web request exception reporting properly this time
2010-06-25 20:57:38 +01:00
8629ba80bf
Revert "Report http server onRequest() exception properly."
...
This reverts commit c09451a034
2010-06-25 20:51:21 +01:00
dc9e9931eb
Merge branch 'master' into careminster-presence-refactor
2010-06-25 20:26:48 +01:00
c09451a034
Report http server onRequest() exception properly.
2010-06-25 19:11:22 +01:00
2c4df19805
minor: Move log information about SYSTEMIP to the place where it's resolved
2010-06-25 18:29:02 +01:00
3101d53064
Make "Allow other residents to edit terrain" default to FALSE
2010-06-25 05:25:41 -07:00
6848465ae2
* SimianAssetServiceConnector Delete() was expecting the wrong type of response, reporting false errors
...
* Fixed a typo in a WebUtil error message
2010-06-24 13:43:38 -07:00
7e22be3441
Merge branch 'master' into careminster-presence-refactor
2010-06-17 03:08:55 +01:00
544627c79c
Force newly connecting remote consoles to display a prompt
2010-06-17 03:03:55 +01:00
0031d4a618
Readjust master version and flavor
2010-06-15 01:53:11 +01:00
3c3ad08868
Merge branch 'master' into careminster-presence-refactor
...
0.7.1CM Dev
2010-06-12 02:46:11 +01:00
85d2e21558
Change trunk versio to 0.7.1 Dev
2010-06-12 02:45:21 +01:00
4dd9cf1ce4
Change flavor to 0.7-RC1
2010-06-12 02:44:01 +01:00
508bfa1de8
Merge branch 'master' into careminster-presence-refactor
2010-06-12 01:26:55 +01:00
c8ed972443
Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet
...
we used to send before slimupdates and explicitly send it
2010-06-12 01:25:25 +01:00
a791689ceb
Make the text mode remote console really work. It can now be used to send
...
multi-word commands with proper quoting, handles arguments with spaces
and allows interactive use, e.g. user creation.
2010-06-08 22:05:06 +01:00
4921d5ac2d
Make the text mode remote console really work. It can now be used to send
...
multi-word commands with proper quoting, handles arguments with spaces
and allows interactive use, e.g. user creation.
2010-06-08 22:03:08 +02:00
542e6b8af4
Merge branch 'master' into careminster-presence-refactor
2010-05-28 21:56:42 +01:00
3c0f34bc2b
If a command has descriptive help, add a line above and below the print out for readability
2010-05-28 20:51:02 +01:00
fff5459f4d
Add ability to load IARs directly from URIs
...
So, something like
load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar
Will load my IAR directly from the web.
2010-05-28 20:07:15 +01:00
565db4635f
add a smidgen more log debug information in the form of the operating system version
2010-05-28 18:30:33 +01:00
a9dad99432
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-05-23 06:09:54 +01:00
4e45718833
Added overload of SendGenericMessage to LLClientView with string list as parameter. Now modules themselfs don't necessarily need to convert strings to byte arrays. Added this as it was removed in LightShare patch.
2010-05-21 23:08:07 +01:00
93ef65c690
* Moving all of the prioritization/reprioritization code into a new file Prioritizer.cs
...
* Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now
* Improved the distance and front back policies to always give your avatar the highest priority
2010-05-21 13:55:36 -07:00
297bcb5c3d
Merge branch 'master' into careminster-presence-refactor
2010-05-21 21:16:04 +01:00
721c1085da
make oar object filename/pathname creation a helper method
...
reused in both tests and oar code
reduction in checking is outweighed by greater test clarity
2010-05-21 20:43:11 +01:00
74ef1ed36f
add prim item and test asset save in save oar unit test
2010-05-21 19:36:39 +01:00
a92780fe5f
Merge branch 'master' into careminster-presence-refactor
2010-05-21 03:51:58 +01:00
beed74096c
Merging slimupdates2
2010-05-20 12:28:13 -07:00
e4b8d76b10
Change appender to deal with line feeds more intelligently.
...
Change migration error reporting to not truncate the statement when
reporting. It's a bit messier than the old error reporting, but at least
one gets an idea of what could be wrong again. And things look a lot
neater now.
2010-05-19 04:17:56 +01:00
0c209a469b
Clean up output a bit
2010-05-19 03:48:03 +01:00
91b1d17e5b
Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready.
2010-05-18 01:09:47 -07:00
8f838c722d
When killing a zombie session, don't send the stop packet since it often has the effect of killing a newly connected client.
2010-05-17 14:14:19 -07:00
a003c36de5
Merge branch 'master' into careminster-presence-refactor
2010-05-16 20:32:58 +01:00
a6023ea89e
Prevent a crash when the two agent dictionaries get out of sync
2010-05-16 20:31:02 +01:00
b94cace547
Merge branch 'master' into careminster-presence-refactor
2010-05-16 15:01:56 +01:00
2a1e45f657
Finalized the client's TCP IP address verification process for HG1.5.
2010-05-15 19:25:14 -07:00
9dbe90801b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
2010-05-15 02:20:47 -07:00
4b755c6d80
delete now unused MessageServerInfo
2010-05-15 02:17:10 +01:00
bf5c81d77e
* Initial commit of the slimupdates2 rewrite. This pass maintains the original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates
2010-05-12 15:59:48 -07:00
fada4cb6c4
Merge branch 'master' into careminster-presence-refactor
2010-05-10 04:05:04 +01:00
b233a4b2ca
* Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
...
* Fixed small bug with map search where the local sim regions weren't found.
2010-05-09 13:39:56 -07:00
4e0d62547d
Merge branch 'master' into careminster-presence-refactor
2010-05-09 17:04:23 +01:00
9b22393cf3
Add a field asset_flags and a corresponding enum to the asset database. This
...
CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS
WITH LATER ONES. It may also eat your babies, yada, yada, yada.
The usual cautions for migrations to the assets table apply.
Coding: Can not guarantee nut free.
2010-05-09 17:02:22 +01:00
11971fb302
Merge branch 'master' into careminster-presence-refactor
2010-05-06 16:09:36 +01:00
4183cef409
* Fixes LandDataSerializerTests on Windows by stripping CR from the serialization result since the reference serialization has LF only.
...
* Added a bool result and then an Assert.That(result) because resharper was having a hard time with the equality compare in Assert.That.
2010-05-05 21:22:29 -04:00
7e0d5b8665
Merge branch 'master' into careminster-presence-refactor
2010-05-05 22:50:11 +01:00
733a07e061
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-06 00:34:49 +02:00
2ebe148266
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-05 22:15:32 +01:00
a9db266d93
* Added an important comment to warn people not to use MockConsole for anything but testing.
2010-05-04 22:16:07 -04:00
f005e570aa
* This should fix the tests failing because of a MainConsole.Instance null reference
...
* Added a MockConsole that doesn't require a handle to System.Console
2010-05-04 22:13:25 -04:00
9f8acbfe3e
Merge branch 'master' into careminster-presence-refactor
2010-05-03 01:40:24 +01:00
45301d8a49
Defer sending of CHANGED_OWNER to make it work on rezzed objects and
...
attachments in addition to objects sold in place
2010-05-03 01:14:38 +01:00
7dc5ebc929
Merge branch 'careminster' into careminster-presence-refactor
2010-04-30 11:49:16 +01:00
8b70477556
Merge branch '0.6.9-post-fixes' into careminster
2010-04-30 11:48:57 +01:00
04845c1898
Fix link security issue
2010-04-30 11:48:09 +01:00
22b3217113
Fix link security issue
2010-04-30 11:46:50 +01:00
08ebcdb0b8
Merge branch 'master' into careminster-presence-refactor
2010-04-29 23:33:26 +01:00
59ac792e44
* Thanks cmickeyb, for a patch that corrects an invalid construction of Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
2010-04-27 17:11:24 -07:00
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
31d040dc1e
Better error message.
2010-04-26 17:40:00 -07:00
8692ac53f5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-22 18:56:06 -07:00
67990ea7e4
* Better error logging for failed SimianGrid web service calls
2010-04-22 18:55:31 -07:00
98cb4f74b2
Merge branch 'master' into careminster-presence-refactor
2010-04-19 07:00:40 +01:00
f8d49e0a30
Merge branch '0.6.9-post-fixes' into careminster
2010-04-19 06:32:29 +01:00
48f3733963
Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserServer.exe fails on startup if no previous config
...
probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
2010-04-16 20:43:23 +01:00
c77444a821
Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserServer.exe fails on startup if no previous config
...
probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
2010-04-16 20:40:01 +01:00
bdc03dbff9
* Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.
...
* PrimitiveBaseShape wants to be be committed too -- EOF.
2010-04-14 10:36:03 -07:00
6892fc41f7
Applying patch from lkalif to add support for inventory links to the SimianGrid connectors
2010-04-13 18:59:05 -07:00
9920e219dd
Merge branch 'careminster' into careminster-presence-refactor
2010-04-13 04:36:08 +01:00
3d0860ae61
thanks lkalif for Mantis #4676 - a patch that adds support for inventory links
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-04-12 17:10:51 -07:00
56c176f0a3
minor - add some documentation to PrimitiveBaseShape constructor with OpenMetaverse.Primitive parameter
2010-04-09 19:59:58 -07:00
54cedfe432
Changed the GetTextureModule backport to work with the 0.6.9 codebase
2010-04-08 15:57:57 -07:00
c4c4c3696e
Backported WebUtil.cs from master to 0.6.9-postfixes to fix the build break
2010-04-08 15:26:51 -07:00
a573b5767b
Test commit
2010-04-05 22:31:30 +02:00
5c04d768a6
Bump version number
2010-04-05 22:26:18 +02:00
ba31b31ed0
Merge branch 'careminster' into careminster-presence-refactor
2010-04-05 18:22:15 +01:00
fe034dc3e4
Merge branch 'master' into careminster-presence-refactor
2010-04-05 18:12:29 +01:00
04a68db195
Merge branch '0.6.9-post-fixes' into careminster
2010-04-05 18:10:36 +01:00
e0eba26f7b
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-01 23:59:00 +01:00
08ba34da03
First attempt at fixing mantis #4641 . It's better but there are now some issues with permissions.
...
(looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
2010-03-31 21:30:44 -07:00
2bf1761ad8
When saving an oar/iar, don't attempt to write out the data byte array if it's empty
...
On Mono 2.6 (and probably before) this causes a non-obvious IOException
2010-03-31 19:51:17 +01:00
ec637e2b8c
Committing the LightShare code, which was developed by TomMeta of Meta7.
...
This allows scripts to set WindLight parameters for clients connecting
to a region. Currently, this is only supported by the Meta7 viewer.
2010-03-31 04:20:20 +01:00
7d917e7c5c
Rename Meta7Windlight to LightShare
2010-03-30 23:29:03 +01:00
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
3e8cb7a9a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-26 12:21:24 -07:00
5a2315c68c
* Fixed a bug with null value handling in WebUtil.BuildQueryString()
...
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
2010-03-26 12:21:05 -07:00
dd544f811a
switch flavor to RC1
2010-03-26 19:09:09 +00:00
4565e5dfbc
change trunk version to 0.7.Dev
2010-03-26 18:56:05 +00:00
87fe96ae2c
replace recent IModule.GetGroup() with better GetGroupRecord(string name)
2010-03-26 00:10:29 +00:00
bfbf25c542
minor: Print out port that http servers are using
...
do this in callers so that we know who is setting up these things
2010-03-25 21:36:57 +00:00
6ad85dc259
put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
...
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-03-25 20:33:46 +00:00
70b0e07d1e
Remove the reading of estate_settings.xml and the associated processing of
...
defaults. Adding code to facilitate estate creation / managemment as part of
first time start up
2010-03-22 18:49:56 +00:00
62e0b53ca4
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
2010-03-19 15:16:44 -07:00
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
a647f50087
minor logging changes to BaseHttpServer, OSHttpRequest
2010-03-16 22:58:12 +00:00
b4dcdffb50
Fixed several unhandled exceptions and performance issues with PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time
2010-03-16 11:50:22 -07:00
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
db61d66e74
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 17:58:25 +00:00
2313d14acb
minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell the caller that the best match for an incoming request URI is invoked
2010-03-11 23:33:55 +00:00
a578feefba
very minor spacing adjustment
2010-03-11 20:20:38 +00:00
f58a0394ed
Formatting cleanup. Add copyright notices.
2010-03-10 13:15:36 +09:00
40873504dc
Merge branch 'master' into careminster-presence-refactor
2010-03-09 22:46:17 +00:00
98f91a252c
- parcel blocking, region crossing blocking, teleport blocking
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-09 22:43:55 +00:00
fce9e499e4
- parcel blocking, region crossing blocking, teleport blocking
2010-03-09 22:38:58 +00:00
d71ed7081b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-07 16:05:12 -08:00
3ecccbb77d
* Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional)
2010-03-07 16:03:15 -08:00
2e5f7ec926
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-06 20:05:33 +00:00
2dcf73dd93
- supporting llTextBox
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 20:05:11 +00:00
f4c165afe7
Bug fix: store correct position information upon logout. Fixes mantis #4608
2010-03-06 08:21:54 -08:00
8180c72cbc
Merge branch 'master' into careminster-presence-refactor
2010-03-06 12:37:24 +00:00
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
e39fc95659
Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData
...
Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
2010-03-05 00:54:46 +00:00
e07548d703
move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules can use it
2010-03-04 20:08:25 +00:00
107a0a4905
Merge branch 'master' into careminster-presence-refactor
2010-03-04 11:02:01 +00:00
60fde0c83a
minor: remove a couple of compiler warnings
2010-03-03 23:03:41 +00:00
61a63ff851
* Added three new helper utility files to OpenSim.Framework. MultipartForm is used for constructing multipart/form-data requests. UntrustedWebRequest places sanity checks and policy on requests to HTTP endpoints that are not in the same trust domain (useful for Hypergrid, OpenID, etc). WebUtil contains misc. functions for managing URLs and network streams
2010-03-03 14:38:00 -08:00
13a8d11c46
Removing the sLLVector3 dinosaur
2010-03-03 12:12:32 -08:00
028a87fe37
Merge branch 'master' into careminster-presence-refactor
...
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
cfaf087b89
More work on GrantRights. Still not right.
2010-03-01 09:23:33 -08:00
38ea1dd5c8
Merge branch 'master' into presence-refactor
2010-03-01 01:01:32 +00:00
86c621fdc7
Change the signature of SendChangeUserRights, because we have to send
...
this to both parties
2010-02-28 22:56:31 +00:00
44e7224b86
Add missing ChangeUserRights packet sender
2010-02-28 22:47:31 +00:00
5c5966545d
Initial Online friends notification seems to be working reliably now. All this needs more testing, but everything is there.
2010-02-28 12:07:38 -08:00
393a782858
Fix the crashed session notification from the userserver.
2010-02-25 18:05:30 +01:00
4aa37e995d
Remove the overlooked remnants of core profile support
2010-02-24 06:28:16 +00:00
df76e95aa2
Changed asset CreatorID to a string
2010-02-22 14:18:59 -08:00
71c6559a91
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
2010-02-22 14:10:19 -08:00
7665aad002
* Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
2010-02-22 13:27:17 -08:00
e635570cf3
minor formatting tweak - try to trigger a build on panda
2010-02-22 02:13:01 -08:00
03706e3f08
add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitive
2010-02-22 01:15:12 -08:00
1f45e6c649
Merge branch 'master' into presence-refactor
...
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
bb171717ce
Deleted obsolete files in the Data layer. Compiles.
2010-02-21 15:38:52 -08:00
845a390e93
* Added a sanity check for missing asset data in LLClientView
...
* Moved the SL asset type to content type conversion methods from ServerUtils to OpenSim.Framework.SLUtil
* Linked content type to asset type in AssetMetadata
2010-02-20 16:21:13 -08:00
842b68eeff
Change handling of the SYSTEMIP constant to be more sane.
...
This will now choose the first network interface IP address, or the loopback
interface if no external interfaces are found. It will log the IP address
used as [NETWORK]: Using x.x.x.x for SYSTEMIP.
2010-02-18 04:19:33 +00:00
92f8f3e9d2
Revert "change "SYSTEMIP" to "localhost" in the create region console command prompt" after speaking to Dahlia
...
This reverts commit c62a6adb2b
2010-02-18 03:31:06 +00:00
c62a6adb2b
change "SYSTEMIP" to "localhost" in the create region console command prompt
2010-02-17 19:56:30 -08:00
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
c033223c63
Merge branch 'master' into presence-refactor
2010-02-15 00:20:48 +00:00
2084e08ad7
Merge branch 'master' into careminster
2010-02-14 22:27:39 +00:00
9821c4f566
Revolution is on the roll again! :)
...
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).
Direct flames and kudos to Revolution, please
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-14 22:18:46 +00:00
00800c59d3
Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
...
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +00:00
802a969267
Fix http://opensimulator.org/mantis/view.php?id=4224
...
This resolves the problem where eyes and hair would turn white on standalone configurations
When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it.
This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white.
This bug did not affect grids since they use a different service connector.
2010-02-12 21:32:03 +00:00
35925942fc
Deleted unused class that came back because of merge conflicts.
2010-02-08 15:02:50 -08:00
baaf660511
Merge branch 'master' into presence-refactor
...
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
041594ed07
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
2010-01-31 13:01:23 -08:00
3112b04c85
Changed an error message to w warning message.
2010-01-30 16:18:38 -08:00
5001f61c08
* HGGridConnector is no longer necessary.
...
* Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken.
2010-01-29 18:59:41 -08:00
0c81966c0a
Works for grid login.
2010-01-29 09:12:22 -08:00
00f7d622cb
HG 1.5 is in place. Tested in standalone only.
2010-01-28 19:19:42 -08:00
2d9b69c186
Merge branch 'master' into careminster
2010-01-28 02:07:18 +00:00
7c00469cd2
Added ExternalName config on Gatekeeper.
2010-01-27 08:00:29 -08:00
910d2177ad
* .. More Endlines...
2010-01-26 12:49:53 -05:00
ccf7bfe09b
* a few more endlines..
2010-01-26 12:44:42 -05:00
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
19d4867af7
* Quick fix to Remote Console session ID handling.
2010-01-26 07:40:33 +11:00
946e06eb58
Merge branch 'master' into careminster
2010-01-21 23:47:40 +00:00
c211a120a5
Console output no longer requires loglevel to be set to info; you can run the simulator with log level WARN or ERROR and see the output of console commands
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-20 00:16:08 +00:00
5908b8ed7c
Change a member of the friendslist module to better reflect the client side
...
data storage paradigm of the friends list and avoid repeated, unneccessary
fetches of the entire friends list.
2010-01-19 11:33:42 +00:00
b2e6ec9e12
Agent gets there through the Gatekeeper, but still a few quirks to fix.
2010-01-17 18:04:55 -08:00
a7309d90da
* Added ServiceURLs to AgentCircuitData.
...
* Fixed a configuration buglet introduced yesterday in StandaloneHypergrid.ini.
2010-01-17 08:40:05 -08:00
8c39392eaa
Merge branch 'master' into careminster
2010-01-16 00:15:26 +00:00
10f8c2ea9b
Merge branch 'master' into presence-refactor
...
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
88d2adc93c
add an agent position field to AgentUpdateArgs for use by some non-LL clients
2010-01-14 02:16:40 -08:00
4de82891a9
Bug in Teleport fixed -- Appearance was missing from AgentCircuitData.
2010-01-13 09:34:08 -08:00
66920a9047
Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be.
2010-01-12 09:22:58 -08:00
c5ea783526
OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.
2010-01-11 07:51:33 -08:00
001d369568
CommunicationsManager deleted.
2010-01-11 07:45:47 -08:00
751e70af78
NetworkServersInfo removed from CommsManager.
2010-01-10 21:37:36 -08:00
cddd48aeea
Some more unnecessary things deleted in Framework.Communications.
2010-01-10 21:00:03 -08:00
dc4bbf6065
All Framework.Communications.Clients and Framework.Communications.Services deleted, including old LoginService.
2010-01-10 20:29:09 -08:00
20e748205e
Merge branch 'master' into careminster
2010-01-11 03:50:24 +00:00
0c2946031b
CommunicationsManager is practically empty. Only NetworkServersInfo is there.
2010-01-10 19:42:36 -08:00
e966e51b89
Add a console_port setting to let the rest console use a different port
...
from the region server
2010-01-11 03:29:24 +00:00
49618dc102
Moved GridInfo service from where it was to Handlers/Grid
2010-01-10 19:19:34 -08:00
68b7307f4f
Forgot to remove 'using'
2010-01-10 16:34:01 -08:00
53e83e5dbb
* Starting to clean the house...
...
* Fixed circular dependency
2010-01-10 16:20:59 -08:00
3c90d834ea
Remove all references to master avatar, replacing with estate owner where
...
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
2010-01-10 22:41:42 +00:00
1e1b2ab221
* OMG! All but one references to UserProfileCacheService have been rerouted!
...
* HG is seriously broken here
* Compiles. Untested.
2010-01-10 10:40:07 -08:00
1676e70dfe
Merge branch 'master' into careminster
2010-01-10 04:16:06 +00:00
81d5a4b6d8
Remove "login disable", "login enable" and "login status" commands.
2010-01-10 03:03:18 +00:00
25fdbd6cbc
Less refs to UserProfileCacheService. Compiles but likely doesn't run.
2010-01-09 09:09:32 -08:00
121c6b4835
Merge branch 'master' into careminster
2010-01-09 15:34:58 +00:00
332463ca94
Fix up the weird Lindenish "setaccess" message. Talk about strange....
2010-01-09 15:28:52 +00:00
a764eb5dc7
Merge branch 'master' into careminster
2010-01-09 14:21:50 +00:00
063f106cbb
Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users
...
will be honored now, while allowed groups will not. This requires additional
groups module integration work
2010-01-09 14:17:44 +00:00
d22bdb5095
Merge branch 'master' into careminster
2010-01-09 12:02:48 +00:00
6b60f3cce5
A few more inches... Old friends things removed. Less references to UserProfileService.
2010-01-08 20:31:29 -08:00
c76c80a28a
Adds IClientAPI voids for GroupProposals.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-08 18:27:49 +00:00
b63405c1a7
Inching ahead... This compiles, but very likely does not run.
2010-01-08 10:43:34 -08:00
22b1ffdc6c
Fix repeated ArgumentOutOfRangeException when a local OpenSim console is resized under mono
...
May fix mantises 3186, 3270, 4022, 4238
2010-01-08 14:45:40 +00:00
17efecd6c5
Moving the new group data structures out of LLClientView into GroupData.
...
The new methods are still not in IClientAPI, so some work remains to be done.
2010-01-08 05:29:29 +00:00
f11a97f12d
* Finished SimulationServiceConnector
...
* Started rerouting calls to UserService.
* Compiles. May run.
2010-01-07 15:53:55 -08:00
b67470af91
Fixes the newly added packets as per Melanie's request.
...
Provisionally applied to fix the naming. Signatures are still subject to change.
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-07 15:09:13 +00:00
7f960cd595
Merge branch 'master' into presence-refactor
2010-01-04 21:41:33 +00:00
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
872387d278
Merge branch 'master' into presence-refactor
2009-12-31 23:30:41 +00:00
b321c0a932
Merge branch 'master' into careminster
2009-12-31 21:53:39 +00:00
004c751a1b
Whitespace cleanup (changed hard tabs to 4 spaces)
2009-12-31 21:36:04 +00:00
234d4e1105
Adds tons of packets.
...
Applied with change: Changed spelling to Summary (from Summery)
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 21:24:56 +00:00
f4efa325bb
More progress on both the Simulation service and the Login service. Both still unfinished.
2009-12-31 11:42:33 -08:00
a8901a40f4
Simulation handlers (agents & objects) completed.
2009-12-31 09:25:16 -08:00
b29ae72460
First pass at the new login service. Still incomplete, but doesn't disrupt the existing code.
2009-12-30 21:00:16 -08:00
67cfac0cf1
Merge branch 'master' into careminster
2009-12-29 18:41:45 +00:00
0b5cdc539c
Change teleports so the TeleportFlags are sent to the destination sim. It
...
can now determine if a connection is from login, teleport or crossing.
Needed for a meaningful banlines implementation
2009-12-29 18:35:06 +00:00
f3a4860635
Merge branch 'master' into careminster
2009-12-26 04:13:27 +00:00
88b3b98811
Add AvatarInterestsReply
2009-12-26 04:12:51 +00:00
59f683066a
Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS
...
in the repo. This is the Caremninster repo and the number follows CORE. Always.
2009-12-25 23:23:49 +00:00
b19e564317
Restore version suffix.
2009-12-25 23:20:30 +00:00
e7439efc74
Recover out-of-region objects during db load.
2009-12-24 19:19:44 -05:00
6eecbc95e4
Merge branch 'master' into careminster
2009-12-23 21:22:19 +00:00
c27aa3749c
Change in how the Library returns its descendant folders, so that it includes folders added after the initial load off the file system, by other mechanisms.
2009-12-23 11:45:39 -08:00
9c294c5663
- commented out unused method ConvertIHttpClientContextToOSHttp
2009-12-23 18:33:54 +01:00
bde26a8282
Add missing file
2009-12-22 06:43:03 +01:00
b53b871669
Add a data path for error messages
2009-12-22 06:25:32 +01:00
e68c7a1f23
Add missing file
2009-12-22 05:08:15 +00:00
05e8b4e72c
Add a data path for error messages
...
Committed from my other box where git is not configured properly
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-22 04:55:43 +00:00
84a1a0a729
Merge branch 'master' into careminster
2009-12-21 22:07:22 +00:00
68187f7245
Bug fix: in standalone, HGInventoryBroker needs to get the local inventory server URL from NetworkServersInfo.
2009-12-21 07:44:17 -08:00
b891291135
Merge branch 'master' into careminster
2009-12-21 15:02:57 +00:00
c0a8c2e707
Making the library read the item's flag, so that clothing items can have the proper icons.
2009-12-21 06:58:21 -08:00
3d3e0ea4f3
Merge branch 'master' into careminster
2009-12-20 16:45:28 +00:00
eecaa3d9dd
Merge branch 'tests'
2009-12-19 20:00:00 -05:00
e38e8ae987
Fix mantis #10 & #14
2009-12-19 19:54:44 -05:00
6dbe25360e
Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.
2009-12-17 18:40:34 +01:00
87e9062862
Make sure that we catch and display any exceptions that get right to the top of our incoming http request handling stack
2009-12-15 16:34:27 +00:00
57d60a95a2
minor: make logging messages consistent in BaseHttpServer
2009-12-15 16:23:57 +00:00
f8b6bc8d11
Merge branch 'master' into careminster
2009-12-15 15:46:18 +00:00
ffff12f7c1
Change default grid and inventory service ports in ConfigSettings to the ROBUST default of 8003
2009-12-15 15:37:03 +00:00
824d7190c2
Merge branch 'master' into careminster
2009-12-14 00:40:56 +00:00
963cf25813
* Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level).
...
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
2009-12-13 03:04:16 +11:00
30d64444a0
And reverse
2009-12-12 16:01:53 +00:00
9904700dfd
Another whitespace test commit
2009-12-12 16:00:44 +00:00
c00158b238
Reverse test commit (again)
2009-12-12 14:35:12 +00:00
794419852b
Another test
2009-12-12 14:23:20 +00:00
fbafd22124
Reverse text commit whitespace change
2009-12-12 13:43:49 +00:00
b9cd66d510
test commit
2009-12-12 13:33:45 +00:00
0fdf883cbd
Merge branch 'master' into careminster
2009-12-12 04:56:28 +00:00
d89f3e9811
Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-12 04:44:32 +00:00
1382dc976c
Merge branch 'master' into careminster
2009-12-12 04:14:47 +00:00
83ca7db4b8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-12 04:14:12 +00:00
62ec60ca76
Getting rid of a bunch of old classes, that are likely left over from the ROBUST change.
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-12 04:13:39 +00:00
d20fe7bfdd
A couple of more sanity guards, but this won't fix things when user profile fetching is borked.
2009-12-11 20:06:42 -08:00
5f0478c4c4
Fix to make [bad] tests happy.
2009-12-11 08:28:24 -08:00
decd51f081
Attempt at fixing mantis #4411 .
2009-12-11 08:11:26 -08:00
0889b5aef1
Fix version number
2009-12-10 18:20:40 +00:00
59ca92b10b
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-10 18:17:29 +00:00
dbd8c400ce
Merge branch 'careminster' into windlight
2009-12-07 18:14:02 +01:00
29a740ec8c
Initial windlight codebase commit
2009-12-07 18:05:40 +01:00
9155c9ee37
Merge branch 'master' into careminster
2009-12-07 14:14:00 +00:00
172e2f4e76
Fix to existing ReaderWriterLockSlim implementations
2009-12-06 17:23:07 +01:00
4c61fcfc40
Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-06 03:57:15 +00:00
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
8e089b6d8d
* Fix line endings in BaseHttpServer.cs
2009-12-05 13:23:05 -05:00
cc8246206d
Secnond revision of Sit and Stand for unscripted prims; Comment out
...
spammy debug messages in Interregion....
2009-12-05 09:03:02 +01:00
504bfd87d5
if an xml rpc method throws an exception, log as an error to the console as well as returning the exception to the caller
2009-12-03 18:05:42 +00:00
4234c64147
handle a condition where the http headers apparently have multiple remote ports designated
2009-12-02 04:10:53 -08:00
ded16d3529
Merge branch 'master' into careminster
2009-12-02 00:36:53 +00:00
4af77e84b1
* Fix Inconsistent line ending style in Util
2009-12-01 10:21:22 -05:00
69d83e1548
Merge branch 'master' into careminster
2009-11-30 08:25:40 +00:00
4338f4e1d7
* Patch from Misterblue to fix Environment.TickCount for statistics purposes. Resolves the wrap-around of the 32 bit uint.
...
* Teravus moved the Environment methods to the Util class
2009-11-29 05:06:25 -05:00
d3e7a52933
Merge branch 'master' into careminster
2009-11-28 09:26:00 +00:00
251fd8c948
Apply patch to reduce git revision text length if running sim directly from a git tree
...
See http://opensimulator.org/mantis/view.php?id=4030
Thanks ChrisDown (and Bruce for reporting)
2009-11-27 18:24:21 +00:00
ad2f0a1290
Remove OS version crap from about dialog
2009-11-26 18:04:58 +00:00
bd3b9f79c2
Update CM version
2009-11-26 17:59:28 +00:00
ed148eba32
Merge branch 'master' into careminster
2009-11-26 17:45:09 +00:00
377bc27c1f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-11-26 19:02:41 +00:00
52dc9ec003
Bump trunk version number to 0.6.9.
...
This is a place holder name and not necessarily the version number that will be used
2009-11-26 19:00:57 +00:00
06f41bb017
Merge branch 'master' into careminster
2009-11-26 17:27:03 +00:00
9d63f90467
Remove the old (Remoting) region crossing code. Fix the new code to
...
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
2009-11-26 17:03:09 +00:00
a27d33cb63
Remove the old remoting-type interregion code for prim/script crossing
2009-11-26 13:13:56 +00:00
05fc504ff3
Remove the old remoting-type interregion code for prim/script crossing
2009-11-26 12:16:42 +00:00
79395bc7db
Merge branch 'master' into careminster
2009-11-25 17:04:05 +00:00
a4d2a97bc6
minor: remove some mono compiler warnings, add --merge load oar switch to help information
2009-11-25 16:14:08 +00:00
d114713694
Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lock handler. This gives us:
...
- Faster prim inventory actions. Multiple threads can read at once.
- Fixes the known prim inventory thread locks
- In the event of a thread lock occurring, it will usually self heal after sixty seconds with an error message in the console
2009-11-24 18:02:12 +01:00
9f5c2acd12
Formatting cleanup.
2009-11-23 11:26:06 +09:00
0561cf7d93
Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim
2009-11-20 03:12:36 -08:00
54b5677f23
remove early return from PrimitiveBaseShape.ToOmvPrimitive() when prim is a sculpty
2009-11-20 03:12:07 -08:00
7166f3748a
minor: correct error messages when queryfolder fails
2009-11-18 18:44:47 +00:00
47e482217e
minor: remove duplicate copyright notice in PollServiceWorkerThread
2009-11-18 16:28:00 +00:00
1afd347615
Correct formatting of Primitive.Textures in PrimitiveBaseShape.ToOmvPrimitive method
2009-11-17 23:17:50 -08:00
0712196c26
make logging less verbose when loading iars
2009-11-13 18:56:23 +00:00
89a63c9a8b
Some corrections to PrimitiveBaseShape.ToOmvPrimitive()
2009-11-13 01:18:52 -08:00
d95df603df
move fake user service to a separate mock user service class
...
delete asset cache tests shell
2009-11-12 19:33:38 +00:00
2f092d271e
Rename test services to mock services, since this is a more accurate description
...
remove duplicate mock inventory service
2009-11-12 18:44:03 +00:00
1fa037a0c3
minor: remove some mono compiler warnings
2009-11-11 15:56:14 +00:00
a8a01e2bc7
add a ToOmvPrimitive() method to PrimitiveBaseShape
2009-11-11 02:54:58 -08:00
5145dfa53c
* Removing the redundant SendPrimitiveTerseData.State field, it duplicates AttachPoint
...
* LLClientView.CreateImprovedTerseBlock() now uses AttachPoint and does the proper high-low swap (this should fix disappearing attachment pieces)
2009-11-09 17:13:56 -08:00
5300e8506d
Reintroduce AssetBase's old behavior. A Parameterless constructor is required
...
for .NET serialization and removing it breaks the OpenSim asset server
protocol.
2009-11-06 10:33:49 +00:00
afef1ac191
Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen
2009-11-05 13:10:58 -08:00
83b4b4440b
Patch by revolution, thank you. Mantis #1789 . Implement friends permissions.
...
Applied with major changes. Core functionality commented pending review
for possible rights escalation. No user functionality yet.
2009-11-05 02:09:07 +00:00
c72f78215b
Backport the fixes to WebFetchInventoryDescendents to the UDP
...
InventoryDescendents packet. Testing has shown that UDP inventory now
works flawlessly and, unlike CAPS inventory, doesn't download the entire
agent inventory on start. Neither does it incessantly re-request folder
NULL_KEY. Therefore, I have disabled CAPS inventory.
2009-11-04 01:56:19 +00:00
865d3f4b09
minor: remove a few mono compiler warnings
2009-11-03 19:35:18 +00:00
fb08133999
* Remove the locklessqueue tests since I guess I didn't understand what it was when I wrote the test.
2009-10-30 19:24:14 -04:00
5101f688ee
* Add LocklessQueueTests. One Test is commented out because it fails. It should probably work.. but I'm awaiting clarification.
2009-10-30 19:13:57 -04:00
2e81acec48
* Adding Tests for OpenSim.Framework.Cache. Some test cases disabled until mantis resolutions.
2009-10-30 18:13:58 -04:00
4563f00852
* Another ACL Test
2009-10-30 17:27:44 -04:00
120c731a3b
* Moving A test from the OpenSim.Framework.ACL object to the OpenSim.Framework.Tests assembly. Fixing the test.
2009-10-30 17:04:10 -04:00
b81c829576
* Standalone logins will now go through the sequence of "requested region, default region, any region" before giving up
...
* Hip offset should have been added not subtracted (it's a negative offset). This puts avatar feet closer to the ground
* Improved duplicate checking for terse updates. This should reduce bandwidth and walking through walls
2009-10-28 14:13:17 -07:00
f89c2cac0f
Experimental test to rate limit the incoming packet handler and try to always leave a worker thread available for other tasks
2009-10-27 14:16:01 -07:00
c75d415648
* Converts ClientManager.ForEach() (and as a result, Scene.ForEachClient()) to use a non-blocking parallel method when operating in async mode
...
* Minor code readability cleanup
2009-10-27 00:26:56 -07:00
0b1726b524
Removing the ClientManager reference from IScene and hiding it entirely inside Scene as an implementation detail. This will reduce programming error and make it easier to refactor the avatar vs client vs presence mess later on
2009-10-26 16:48:43 -07:00
4847e62e9f
* Switched all operations on the list of clients that could be either sync or async to use Scene.ForEachClient() instead of referencing ClientManager directly
...
* Added a new [Startup] config option called use_async_when_possible to signal how to run operations that could be either sync or async
* Changed Scene.ForEachClient to respect use_async_when_possible
* Fixing a potential deadlock in Parallel.ForEach by locking on a temporary object instead of the enumerator (which may be shared across multiple invocations on ForEach). Thank you diva
2009-10-26 16:33:04 -07:00
ac7ccdf7d7
* Changed the watchdog timer to improve the speed of UpdateThread(), only track threads once the first call to UpdateThread() has been made, and allow re-tracking of threads that timed out but revived later
...
* Added a commented out call to Watchdog.UpdateThread() in OdeScene. If it turns out that loading a large OAR file or some other operation is timing out the heartbeat thread, we'll need to uncomment it
2009-10-26 14:41:27 -07:00
730930955a
Changing Scene.ForEachClient to use the synchronous for loop instead of Parallel. This is quite possibly the source of some deadlocking, and at the very least the synchronous version gives better stack traces
...
* Lock the LLUDPClient RTO math * Add a helper function for backing off the RTO, and follow the optional advice in RFC 2988 to clear existing SRTT and RTTVAR values during a backoff
* Removing the unused PrimitiveBaseShape.SculptImage parameter * Improved performance of SceneObjectPart instantiation * ZeroMesher now drops SculptData bytes like Meshmerizer, to allow the texture data to be GCed * Improved typecasting speed in MySQLLegacyRegionData.BuildShape()
* Improved the instantiation of PrimitiveBaseShape
2009-10-25 00:40:21 -07:00
52a4534f7f
* Change the way Util.FireAndForget() calls SmartThreadPool to avoid using a delegate (which STP appears to hold on to). This removes the slow leak I was seeing when using async_call_method=SmartThreadPool and stabilizes allocated memory for an idle OpenSim instance
2009-10-23 13:45:18 -07:00
a41cd1d069
* Unregister Mono.Addins event handlers in PluginLoader.Dispose() and always handle PluginLoader with the using pattern. This freed up 121,634,796 bytes on my system
...
* Avoid allocating an Action<IClientAPI> object every round of the OutgoingPacketHandler
* Removed unnecessary semi-colon endings from OpenSim.ini.example [InterestManagement] section
2009-10-23 13:14:29 -07:00
b2ed348aa2
Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated
2009-10-22 12:33:23 -07:00
36b0e5e1d3
Terrible typo in the previous commit!
2009-10-22 11:07:23 -07:00
6ca4b0f366
* Added a check if Util.m_ThreadPool is null before trying to use it, and if so initialize it to sane defaults
...
* Simplified the InitThreadPool() function
2009-10-22 10:37:11 -07:00
d756fa01ae
Add copyright header. Formatting cleanup.
2009-10-22 18:57:24 +09:00
2f394b7e7e
* Allow SmartThreadPool to be initialized without setting max stack size (like the original implementation)
...
* Only initialize Util's SmartThreadPool if it is actually being used
* No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads."
2009-10-22 01:30:12 -07:00
1e71e3f910
Remove the "mel_t" from version string
2009-10-22 07:03:40 +01:00
b35fbe1f98
Merge branch 'melanie_test' into prioritization
...
This makes SmartThreadPool configurable and also makes it the default, since
the regular thread pool simply stinks.
2009-10-22 07:02:21 +01:00
32ccd5bb40
* Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to Util.FireAndForget()
...
* Changed Util.FireAndForget() to use any of five different methods set with async_call_method in the [Startup] section of OpenSim.ini. Look at the example config for possible values
2009-10-21 23:03:18 -07:00
8ce4fd7234
Reduce the default pool threads to 15 (from 30) and the minimum from 5 to 2
2009-10-22 04:02:26 +01:00
8a336c6860
Add MaxPoolThreads in startup to limit the size of the thread pool used
...
for FireAndForget. This lets us limit concurrency to make OpenSim play nice
2009-10-22 02:28:53 +01:00
6492640e72
* Change the OnQueueEmpty signature to send the flags of the queues that are empty instead of firing once per empty queue
...
* Change the OnQueueEmpty firing to use a minimum time until next fire instead of a sleep
* Set OutgoingPacket.TickCount = 0 earlier to avoid extra resends when things are running slowly (inside a profiler, for example)
2009-10-21 18:03:41 -07:00
9ec55df988
Mark new version
2009-10-22 01:51:27 +01:00
2b39ff0a39
Merged master into prioritization
2009-10-21 16:24:17 -07:00
93b24b5207
Fix web map retrieval for regions configured via .ini
2009-10-21 03:44:40 +01:00
2a886fd76c
Really make module port selection work. Implement port setting in
...
LLProxyLoginModule.
2009-10-21 02:19:45 +01:00
8151190a45
* Removing ODEPrim and ODECharacter GetHashCode() overrides since they were based on something that could change
...
* Tweaked a few other GetHashCode() overrides to bring them in line with MSDN recommendations
2009-10-20 10:56:15 -07:00
9bc303d293
Add MainServer.GetHttpServer(port) method for using multiple listener
...
ports in region modules
2009-10-20 16:57:22 +01:00
fdce1be3db
* Removed OpenSim.Data.NHibernate
...
* Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
2009-10-19 16:52:27 -07:00
bd03cbd815
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-19 15:19:37 -07:00
142008121e
* Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This avoids .NET remoting and a managed->unmanaged->managed jump. Overall, a night and day performance difference
...
* Initialize the LLClientView prim full update queue to the number of prims in the scene for a big performance boost
* Reordered some comparisons on hot code paths for a minor speed boost
* Removed an unnecessary call to the expensive DateTime.Now function (if you *have* to get the current time as opposed to Environment.TickCount, always use DateTime.UtcNow)
* Don't fire the queue empty callback for the Resend category
* Run the outgoing packet handler thread loop for each client synchronously. It seems like more time was being spent doing the execution asynchronously, and it made deadlocks very difficult to track down
* Rewrote some expensive math in LandObject.cs
* Optimized EntityManager to only lock on operations that need locking, and use TryGetValue() where possible
* Only update the attachment database when an object is attached or detached
* Other small misc. performance improvements
2009-10-19 15:19:09 -07:00
0a259caeef
Minor formatting cleanup.
2009-10-19 15:48:07 +09:00
233e16b99c
* Rewrote the methods that build ObjectUpdate and ImprovedTerseObjectUpdate packets to fill in the data more accurately and avoid allocating memory that is immediately thrown away
...
* Changed the Send*Data structs in IClientAPI to use public readonly members instead of private members and getters
* Made Parallel.ProcessorCount public
* Started switching over packet building methods in LLClientView to use Util.StringToBytes[256/1024]() instead of Utils.StringToBytes()
* More cleanup of the ScenePresences vs. ClientManager nightmare
* ScenePresence.HandleAgentUpdate() will now time out and drop incoming AgentUpdate packets after three seconds. This fixes a deadlock on m_AgentUpdates that was blocking up the LLUDP server
2009-10-18 20:24:20 -07:00
0d29614ca1
Formatting cleanup.
2009-10-19 08:58:03 +09:00
b4526a5a6d
* Big performance increase in loading prims from the region database with MySQL
...
* Handle the AgentFOV packet
* Bypass queuing and throttles for ping checks to make ping times more closely match network latency
* Only track reliable bytes in LLUDPCLient.BytesSinceLastACK
2009-10-18 02:00:42 -07:00
fdb2a75ad3
Committing the second part of Jim Greensky @ Intel Lab's patch, re-prioritizing updates
2009-10-17 18:01:22 -07:00
3a63de8d02
Added a description for RegionType
2009-10-17 15:55:30 -07:00
cdcbd22ba8
Merge branch 'master' into prioritization
2009-10-17 14:51:17 +01:00
c7da13eb23
Adds SendAvatarInterestsUpdate to IClientAPI
...
Thank you, Fly-Man
2009-10-17 14:50:21 +01:00
e5ccd3f793
Merge branch 'master' into prioritization
2009-10-17 14:34:48 +01:00
a95741cdd6
Re-rename ProductName back to it's original RegionType
2009-10-17 14:33:46 +01:00
077f473167
Merge branch 'master' into prioritization
2009-10-17 13:41:32 +01:00
72b96bcd84
Add ProductName to RegionInfo (for search)
2009-10-17 13:36:45 +01:00
80a8a9c4a7
Converted FireAndForget methods to use a singleton pattern to attempt to work around a Mono bug with nested delegates
2009-10-16 14:34:42 -07:00
4b75353cbf
Object update prioritization by Jim Greensky of Intel Labs, part one. This implements a simple distance prioritizer based on initial agent positions. Re-prioritizing and more advanced priority algorithms will follow soon
2009-10-15 16:35:27 -07:00
df2d5a460f
Replaced the update lists with a priority queue implementation in LLClientView
...
Replaced the update lists with a priority queue implementation in LLClientView.
The priority queues are based on the MinHeap implementation also included in
this commit within the OpneSim.Framework namespace. Initially setup to exactly
mimic the behavior beofre the change which was a first come first serve queue.
2009-10-15 15:52:53 -07:00
82012ec4e3
* Clean up the SetThrottle() code and add a maxBurstRate parameter to allow more tweaking in the future
2009-10-14 16:21:48 -07:00
1e9e9df0b3
* Switched to a plain lock for the ClientManager collections and protected the TryGetValues with try/catch instead of a lock
...
* Added ClientManager.ForEachSync() for operations that need to run synchronously, such as "show connections"
2009-10-14 14:25:58 -07:00
4135b0c4dc
* Split Task category into Task and State
...
* Crude prioritization hack
2009-10-13 19:45:38 -07:00
e8c1e69a0d
* Copied LocklessQueue.cs into OpenSim.Framework and added the .Count property and .Clear() method
...
* Changed the way the QueueEmpty callback is fired. It will be fired asynchronously as soon as an empty queue is detected (this can happen immediately following a dequeue), and will not be fired again until at least one packet is dequeued from that queue. This will give callbacks advanced notice of an empty queue and prevent callbacks from stacking up while the queue is empty
* Added LLUDPClient.IsConnected checks in several places to prevent unwanted network activity after a client disconnects
* Prevent LLClientView.Close() from being called twice every disconnect
* Removed the packet resend limit and improved the client timeout check
2009-10-13 18:56:54 -07:00
dc11643c00
* Consolidated adding / removing ClientManager IClientAPIs to two places in Scene
...
* Added some missing implementations of IClientAPI.RemoteEndPoint
* Added a ClientManager.Remove(UUID) overload
* Removed a reference to a missing project from prebuild.xml
2009-10-13 17:33:45 -07:00
395a8680c3
* Fixed a bug where clients were being added to ClientManager twice
...
* Changed the ClientManager interface to reduce potential errors with duplicate or mismatched keys
* Added IClientAPI.RemoteEndPoint, which can (hopefully) eventually replace IClientAPI.CircuitCode
* Changed the order of operations during client shutdown
2009-10-13 16:53:19 -07:00
23a334b9f5
* Rewrote ClientManager to remove Lindenisms from OpenSim core, improve performance by removing locks, and replace LLUDPClientCollection
...
* Removed the confusing (and LL-specific) shutdowncircuit parameter from IClientAPI.Close()
* Updated the LLUDP code to only use ClientManager instead of trying to synchronize ClientManager and m_clients
* Remove clients asynchronously since it is a very slow operation (including a 2000ms sleep)
2009-10-13 14:50:03 -07:00
c893761319
* Unregister event handlers in LLUDPServer when a client logs out and disconnects
...
* Move ViewerEffect handling to Scene.PacketHandlers
* Removing the unused CloseAllAgents function
* Trimming ClientManager down. This class needs to be reworked to keep LLUDP circuit codes from intruding into the abstract OpenSim core code
2009-10-13 12:50:59 -07:00
170d2c4660
Merge branch 'master' into htb-throttle
2009-10-12 15:25:42 +01:00
8030ed89b0
Use Util.UTF8 instead of creating a new heap object every time.
2009-10-10 06:35:31 -07:00
5e6e31591c
Merge branch 'master' into htb-throttle
...
This is hand-edited to not let master changes creep into here and may cause a
somewhat rocky merge to master later.
2009-10-10 10:26:47 +01:00
f29bd8036d
A slight improvement on name fetching -- using the local name cache, since it exists.
2009-10-09 14:36:08 -07:00
c146f2c8c4
Use the cache, Luke!
2009-10-09 13:49:55 -07:00
527c94825b
Merge branch 'master' into htb-throttle
2009-10-09 17:23:18 +01:00
1c220e173c
Adding a hair item to the default wearables, fixes newly created avatars appearing as a cloud
2009-10-09 17:22:02 +01:00
494a1e922d
Calling .Close() on AutoResetEvent and ManualResetEvent (those classes contain an unmanaged resource that will not automatically be disposed when they are GCed), and commenting out some ManualResetEvents that are not in use yet
2009-10-09 02:10:53 -07:00
1eb390beda
Remove ThreadTrackerTest. It's no longer relevant because the thread
...
tracker now uses the system thread list
2009-10-08 08:32:34 +01:00
29f03d95f3
Bug fix.
2009-10-07 19:20:34 -07:00
ab3bfca546
Printout one more field in show threads, but this won't buy us much.
2009-10-07 17:29:21 -07:00
6f2d183107
Merge branch 'master' into htb-throttle
2009-10-07 03:01:11 +01:00
b5b53dd3eb
* One more debug message on FetchInventoryDescendants
...
* More streams close on finally
2009-10-06 19:55:35 -07:00
89d23a1fa2
Revert "Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed."
...
This reverts commit e992ca0255
2009-10-07 01:45:49 +01:00
9618c196c2
Revert "Merging in diva's locking fixes"
...
This reverts commit 832cc68513
2009-10-07 01:44:36 +01:00
832cc68513
Merging in diva's locking fixes
2009-10-06 15:54:00 -07:00
e992ca0255
Rewrote parts of the code that were double-locking different objects. This is about half of the code base reviewed.
2009-10-06 15:39:53 -07:00
99c85b5ef5
* Change some more default ports to the robust default of 8003
...
* Make these use existing constants rather than hardcoding
* These will probably go away soon anyway once all services are under ROBUST
2009-10-06 20:32:33 +01:00
fa6027aa09
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-06 12:15:24 -07:00
fb19d1ca0a
* Try/catch around EndInvoke() when Util.FireAndForget() returns to catch exceptions thrown in the async method
...
* Added packet stats handling to the new LLUDP implementation
* Attempting to avoid a race condition when creating a new LLUDPClient
2009-10-06 10:12:59 -07:00
e474fc2fdb
Corrected words in error message.
2009-10-06 08:50:25 -07:00
2519f071f2
Fixing a few compile errors in the previous commit
2009-10-06 02:50:59 -07:00
e7c877407f
* Continued work on the new LLUDP implementation. Appears to be functioning, although not everything is reimplemented yet
...
* Replaced logic in ThreadTracker with a call to System.Diagnostics that does the same thing
* Added Util.StringToBytes256() and Util.StringToBytes1024() to clamp output at byte[256] and byte[1024], respectively
* Fixed formatting for a MySQLAssetData error logging line
2009-10-06 02:38:00 -07:00
7ddb6fbced
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-05 17:38:27 -07:00
429a84f390
Beginning work on the new LLUDP implementation
2009-10-05 17:38:14 -07:00
2753f4d62c
* GridServerPostHandler.cs: Try/catch in Handle
...
* BaseOpenSimServer.cs: Added thread pool numbers in show threads
2009-10-05 16:06:21 -07:00
75b35ddf4a
More error messages to warn when/if things go wrong.
2009-10-05 09:18:51 -07:00
30aac00f6b
Closing more streams even if things fail.
2009-10-04 10:12:19 -07:00
f21f3727df
Leaving the MemoryStreams unclosed.
2009-10-04 09:20:01 -07:00
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
2d9c27a28f
Slightly better message with status code for WebException.
2009-10-03 20:18:21 -07:00
b6920267f0
Close was being called to early on the Memory stream.
2009-10-03 16:27:55 -07:00
df7049008a
More streams closed.
2009-10-03 08:57:30 -07:00
e1112ff879
MOre streams closed. Corrected word in GridCommon.ini.example
2009-10-03 08:46:06 -07:00
4843edfeb7
Closing more streams.
2009-10-03 08:33:19 -07:00
006dfd6d9a
Closing another stream.
2009-10-02 20:35:15 -07:00
387e9f7a7f
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
...
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
e66321227e
Close streams in MakeRequest.
2009-10-02 16:23:46 -07:00
73fa409318
Merge branch 'diva-textures-osgrid'
2009-10-02 23:25:17 +01:00
ce8974539e
Merge branch 'master' into diva-textures
2009-10-02 19:03:22 +01:00
2107b67f1b
- cleaning up LandData/ILandObject capitalization issues
...
- adding LandDataSerializer to OAR mechanics
2009-10-02 11:31:30 +02:00
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
133a4a9906
- adding new LandDataSerializer testcase to "test-xml" target as well
...
- adding another LandDataSerializer testcase
2009-10-01 15:03:16 +02:00
05da73c300
fixing LandDataSerializer (yeah! for testcases)
2009-10-01 12:01:41 +02:00
18416ec518
Merge branch 'oar-parcel' into x-opensim
2009-10-01 10:30:43 +02:00
77ed8e977a
adding meat to the LandDataSerializerTest cases.
2009-10-01 10:30:26 +02:00
5b378a793b
Merge branch 'oar-parcel' into x-opensim
2009-10-01 09:48:30 +02:00
40cf840df2
adding testcase for LandDataSerializer; fixing LandDataSerializer ;-)
2009-10-01 09:47:45 +02:00
44776fea72
Fixing LLClientView memory leak
...
Fixing LLClientView memory leak by disposing of all timers utilized
in LLClientView as they contain references to the callback method.
This required the use of the Terminate and Close infrastructure that
was already in place but was not being utilized.
2009-10-01 04:11:32 +01:00
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
5dfd2643df
* Change the signature of the agent set appearance callback to prevent unnecessary serialization/deserialization of TextureEntry objects and allow TextureEntry to be inspected for missing bakes
...
* Inspect incoming TextureEntry updates for bakes that do not exist on the simulator and request the missing textures
* Properly handle appearance updates that do not have a TextureEntry set
2009-09-30 15:53:03 -07:00
79ba96ad6f
Limit the number of packet data blocks to 50, as packets are already limited
...
This is enough to prevent the fast back and forth of allocation and release
the pool is meant to prevent, but not too much so we don't hog memory
2009-09-30 21:33:29 +01:00
400abed271
Add RebakeAvatarTexturesPacket to the client view
2009-09-30 21:33:20 +01:00
41e4f3afdb
Remove some tests that no longer apply
2009-09-30 19:14:58 +01:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
33515c75e4
adding LandDataSerializer (not connected anywhere, work-in-progress)
...
[hi, there, justin!]
2009-09-30 16:19:39 +02:00
1006a2254c
Make create user to the Right Thing with regard to salting user passwords
2009-09-30 13:36:03 +01:00
77f5e41631
Remove empty CheckSumServer.cs file.
2009-09-29 21:21:53 +09:00
0709149313
Merge branch 'grid-service-redux'
2009-09-28 23:03:47 +01:00
7cd03abab5
Bump main version to 0.6.8-Dev
2009-09-28 18:41:21 +01:00
69da82b39f
Bug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, which was causing an extra \n to be written into the buffer.
2009-09-28 06:44:57 -07:00
0f05bbb4a2
Deleted some files that aren't being used anymore.
2009-09-28 05:54:37 -07:00
5d09c53a1a
Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules.
2009-09-27 10:14:10 -07:00
68e40a87ca
Poof! on LocalBackend. CommsManager.GridServices deleted.
2009-09-26 21:29:54 -07:00
f4bf581b96
Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
...
Fixed small bugs with hyperlinked regions' map positions.
2009-09-26 21:00:51 -07:00
632bb71262
Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional.
...
Also fixed the notification of the message server in standalone -- that server doesn't usually exist.
2009-09-26 08:49:48 -07:00
5757afe766
First pass at the heart surgery for grid services. Compiles and runs minimally. A few bugs to catch now.
2009-09-26 07:48:21 -07:00
dd3d52ae1f
Added test GridClient, which allowed me to remove a few bugs out of the new code.
2009-09-24 13:33:58 -07:00
ad753d784c
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-24 17:35:03 +01:00
e67341f24c
minor: replace xmlprc 'no method found' magic number with constant from xmlrpc library
2009-09-24 15:02:55 +01:00
7870152d23
Allow load/save iar password checks to be done in grid mode
...
This should allow load/save iar to work for grid mode as long as the grid user service is later than this revision
Grid services of earlier revisions will always erroneously report incorrect password. This will be addressed shortly.
2009-09-24 14:54:12 +01:00
71a4b02c7e
* Minor commit, added two new math utility functions.
2009-09-24 20:56:01 +10:00
b8f039897b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-23 15:40:35 -07:00
03438f7d44
minor: remove double initialization of user appearance module in Grid.UserServer.Main
2009-09-23 16:24:26 +01:00
882d2c9cc3
Added hg console commands to the module.
...
Added the IN connector module for link-region and corresponding handler to be used in the regions only. No service as such is needed.
This will replace the current link-region machinery. Compiles but not tested.
2009-09-22 20:25:00 -07:00
ffd30b8ac3
Moved RegionName from RegionInfo to SimpleRegionInfo.
2009-09-22 14:46:05 -07:00
97c18caa76
Thank you, Intari, for a patch that implements the missing pieces of
...
Http-in and makes the host name for URL generation configurable.
Applied with changes:
llGetSimulatorHostname was not changed, because the change breaks
existing behavior and carries a data exposure risk. That value needs
to be configurable, the proposed fixed change is not acceptable.
2009-09-22 17:04:34 +01:00
dafe5bf05f
Completely remove the prior implementation of the request event handling
...
on poll handlers. Introduce a new delegate on the PollServiceEventArgs that
allow access to the request headers and body.
2009-09-22 06:19:02 +01:00
c5be401d46
Remove support for executing a handler on poll. It caused other issues
2009-09-22 05:24:22 +01:00
06871d51dd
Disable the handler execution for poll services until the ramifications
...
can be studied
2009-09-22 05:13:50 +01:00
b6b8a18d37
Add the headers collection to the keysvals for HTT requests
2009-09-21 20:21:01 +01:00
61aaf3532a
Add X-PollServiceID pseudo-header to the request handling for polls
2009-09-21 20:10:26 +01:00
69b76acce1
Make the poll service handler call the handler method on incoming requests.
2009-09-21 19:46:29 +01:00
5511c62580
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-21 18:12:12 +01:00
6d0e7b6a6c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-21 11:05:20 -07:00
390137d540
Added grid handler and grid remote connector.
2009-09-21 11:05:01 -07:00
bc9e4cfd96
Add a RequestID (UUID.Random()) to the PollRequest and pass it to all
...
even hander delegates.
2009-09-21 18:11:40 +01:00
Justin Clark-Casey (justincc)